diff --git a/.github/VOUCHED.td b/.github/VOUCHED.td
index 69c1ea6575a4..315ff5742fd5 100644
--- a/.github/VOUCHED.td
+++ b/.github/VOUCHED.td
@@ -22,6 +22,7 @@ github:btsouth
 github:cestercian
 github:chrisdeeming
 github:chuks-qua
+-github:coygeek Filed over 270 automated issues, about 50 a day at peak, far past what maintainers can triage
 github:cursoragent
 github:D3OXY
 github:dbalders
diff --git a/.github/actions/setup-ci-deps/action.yml b/.github/actions/setup-ci-deps/action.yml
index e27a8c90fdff..cc6dc80511ac 100644
--- a/.github/actions/setup-ci-deps/action.yml
+++ b/.github/actions/setup-ci-deps/action.yml
@@ -35,7 +35,7 @@ runs:
     - name: Cache Vite+
       id: vp_cache
       if: steps.vp.outputs.version != ''
-      uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6
+      uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
       with:
         path: ~/.vite-plus
         key: vite-plus-home-v2-${{ runner.os }}-${{ runner.arch }}-${{ steps.vp.outputs.version }}-node${{ steps.vp.outputs.node }}-${{ steps.vp.outputs.pnpm }}
@@ -56,7 +56,7 @@ runs:
     # partial bytes, so a shorter limit costs a slow download only a retry.
     - name: Setup Vite+
       if: steps.vp_cache.outputs.cache-hit != 'true'
-      uses: voidzero-dev/setup-vp@250f29ce396baf5e8f24498e17c0dfdebabc26eb # v1
+      uses: voidzero-dev/setup-vp@250f29ce396baf5e8f24498e17c0dfdebabc26eb # v1.15.0
       env:
         VP_DOWNLOAD_TIMEOUT: "120"
       with:
@@ -92,7 +92,7 @@ runs:
     - name: Restore pnpm store
       id: pnpm_cache
       if: inputs.install == 'true'
-      uses: actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6
+      uses: actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
       with:
         path: ${{ steps.pnpm_store.outputs.path }}
         key: pnpm-${{ steps.pnpm_store.outputs.namespace }}-v1-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('pnpm-lock.yaml', 'pnpm-workspace.yaml', 'package.json') }}
@@ -106,7 +106,7 @@ runs:
     - name: Restore lockfile verification
       id: pnpm_verified
       if: inputs.install == 'true'
-      uses: actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6
+      uses: actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
       with:
         path: ${{ steps.pnpm_store.outputs.verified }}
         key: pnpm-verified-v1-${{ hashFiles('pnpm-lock.yaml', 'pnpm-workspace.yaml', 'package.json') }}
@@ -121,7 +121,7 @@ runs:
 
     - name: Save lockfile verification
       if: inputs.install == 'true' && steps.pnpm_verified.outputs.cache-hit != 'true'
-      uses: actions/cache/save@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6
+      uses: actions/cache/save@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
       with:
         path: ${{ steps.pnpm_store.outputs.verified }}
         key: ${{ steps.pnpm_verified.outputs.cache-primary-key }}
@@ -138,7 +138,7 @@ runs:
         steps.pnpm_cache.outputs.cache-hit != 'true' &&
         (steps.pnpm_store.outputs.namespace == 'full' ||
           steps.pnpm_cache.outputs.cache-matched-key != format('pnpm-full-v1-{0}-{1}-{2}', runner.os, runner.arch, hashFiles('pnpm-lock.yaml', 'pnpm-workspace.yaml', 'package.json')))
-      uses: actions/cache/save@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6
+      uses: actions/cache/save@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
       with:
         path: ${{ steps.pnpm_store.outputs.path }}
         key: ${{ steps.pnpm_cache.outputs.cache-primary-key }}
diff --git a/.github/scripts/check-nightly-release.cjs b/.github/scripts/check-nightly-release.cjs
index 95581e2b2278..a9502b26c8c8 100644
--- a/.github/scripts/check-nightly-release.cjs
+++ b/.github/scripts/check-nightly-release.cjs
@@ -121,9 +121,54 @@ async function resolveLatestNightlyCommit({ github, context, core }) {
   return { tag, sha: commit.sha, version };
 }
 
+// The two places a nightly install looks for an update: the `update-feed` pointer, and
+// releases.atom, which holds the 10 newest git tags of any kind. Older installs take the first
+// nightly in the feed. Reports what each names beside the newest published nightly.
+async function readNightlyUpdateFeed({ github, context, fetch = globalThis.fetch }) {
+  const latest = await findLatestNightly({ github, context });
+  if (!latest) return {};
+
+  const base = `https://github.com/${context.repo.owner}/${context.repo.repo}`;
+  // Only a missing or malformed pointer is stale. Rewriting deletes the old file first, so a
+  // GitHub outage must not look like one.
+  // Node waits five minutes for a stalled response, which is this job's whole time limit.
+  const signal = () => AbortSignal.timeout(30_000);
+  const pointer = await fetch(`${base}/releases/download/update-feed/nightly.json`, {
+    signal: signal(),
+  });
+  if (!pointer.ok && pointer.status !== 404) {
+    throw new Error(`The update-feed pointer answered HTTP ${pointer.status}.`);
+  }
+  let pointerTag;
+  if (pointer.ok) {
+    // A body that fails to arrive throws here; only one that is not JSON counts as malformed.
+    const body = await pointer.text();
+    try {
+      pointerTag = JSON.parse(body)?.tag_name;
+    } catch {}
+  }
+
+  // An unreadable feed leaves `feedTags` unset, so the pointer is still repaired. An error page
+  // can answer HTTP 200, so only an Atom document counts as read.
+  let feedTags;
+  try {
+    const feed = await fetch(`${base}/releases.atom`, { signal: signal() });
+    const body = feed.ok ? await feed.text() : "";
+    if (/<feed[\s>]/.test(body)) {
+      feedTags = Array.from(body.matchAll(/href="[^"]*\/releases\/tag\/([^"]+)"/g), (match) =>
+        decodeURIComponent(match[1]),
+      );
+    }
+  } catch {}
+  const feedNightly = feedTags?.find((tag) => /^v?\d+\.\d+\.\d+-nightly\./.test(tag));
+
+  return { tag: latest.tagName, pointerTag, feedNightly, feedTags };
+}
+
 module.exports = {
   assertCommitOnDefaultBranch,
   assertReleaseSource,
   shouldReleaseNightly,
   resolveLatestNightlyCommit,
+  readNightlyUpdateFeed,
 };
diff --git a/.github/scripts/check-nightly-release.test.cjs b/.github/scripts/check-nightly-release.test.cjs
index 3030080d946c..2f3d385755ca 100644
--- a/.github/scripts/check-nightly-release.test.cjs
+++ b/.github/scripts/check-nightly-release.test.cjs
@@ -237,3 +237,81 @@ test("stable releases fail when no nightly is published", async () => {
   const { options } = nightlyCommitFixture({ releases: [nightly(1, { tagName: "v1.0.0" })] });
   await assert.rejects(resolveLatestNightlyCommit(options), /No published nightly found/);
 });
+
+const { readNightlyUpdateFeed } = require("./check-nightly-release.cjs");
+
+// GitHub percent-encodes tag names in the feed, and any tag in the repository takes a slot.
+const atomEntry = (tag) =>
+  `<entry><link rel="alternate" type="text/html" href="https://github.com/example/app/releases/tag/${encodeURIComponent(tag)}"/></entry>`;
+const atomFeed = (tags) => new Response(`<feed>${tags.map(atomEntry).join("")}</feed>`);
+const NEWEST = "v1.0.1-nightly.20260905.123";
+const OLDER = "v1.0.1-nightly.20260905.100";
+
+function updateFeedFixture({ feed, pointer }) {
+  const { options } = fixture({
+    releases: [nightly(1), nightly(0, { tagName: "v1.0.2-preview.1" })],
+  });
+  options.fetch = async (url) =>
+    url === "https://github.com/example/app/releases.atom"
+      ? feed
+      : url === "https://github.com/example/app/releases/download/update-feed/nightly.json"
+        ? pointer
+        : assert.fail(`unexpected fetch ${url}`);
+  return options;
+}
+
+const missing = () => new Response("Not Found", { status: 404 });
+// HTTP 200, then the connection drops before the body arrives.
+const brokenBody = () =>
+  new Response(new ReadableStream({ start: (controller) => controller.error(new Error("reset")) }));
+for (const [name, { feed, pointer }, expected] of [
+  [
+    "a nightly crowded out of the feed and a missing pointer",
+    { feed: atomFeed(["v1.0.2-preview.1", "mobile-android-build/2.3.0/abc"]), pointer: missing() },
+    { pointerTag: undefined, feedNightly: undefined },
+  ],
+  [
+    "the first nightly in the feed, which is the one older installs take",
+    { feed: atomFeed(["update-feed", OLDER, NEWEST]), pointer: Response.json({ tag_name: OLDER }) },
+    { pointerTag: OLDER, feedNightly: OLDER },
+  ],
+  [
+    "a malformed pointer as stale and an unreadable feed as naming nothing",
+    { feed: new Response("", { status: 503 }), pointer: Response.json(null) },
+    { pointerTag: undefined, feedNightly: undefined, unreadable: true },
+  ],
+  [
+    "an HTML page with release links as an unreadable feed",
+    {
+      feed: new Response(
+        `<html><feedback-form></feedback-form><a href="/example/app/releases/tag/${OLDER}">x</a></html>`,
+      ),
+      pointer: Response.json({ tag_name: NEWEST }),
+    },
+    { pointerTag: NEWEST, feedNightly: undefined, unreadable: true },
+  ],
+  [
+    "the pointer when the feed's body fails to arrive",
+    { feed: brokenBody(), pointer: Response.json({ tag_name: NEWEST }) },
+    { pointerTag: NEWEST, feedNightly: undefined, unreadable: true },
+  ],
+]) {
+  test(`update feed check reports ${name}`, async () => {
+    const { tag, pointerTag, feedNightly, feedTags } = await readNightlyUpdateFeed(
+      updateFeedFixture({ feed, pointer }),
+    );
+    const { unreadable = false, ...named } = expected;
+    assert.deepEqual({ tag, pointerTag, feedNightly }, { tag: NEWEST, ...named });
+    assert.equal(feedTags === undefined, unreadable);
+  });
+}
+
+for (const [name, pointer, error] of [
+  ["answers with an error", () => new Response("", { status: 503 }), /pointer answered HTTP 503/],
+  ["drops the connection", brokenBody, /reset/],
+]) {
+  test(`update feed check does not call a pointer stale when GitHub ${name}`, async () => {
+    const options = updateFeedFixture({ feed: atomFeed([NEWEST]), pointer: pointer() });
+    await assert.rejects(readNightlyUpdateFeed(options), error);
+  });
+}
diff --git a/.github/workflows/agent-context-budget.yml b/.github/workflows/agent-context-budget.yml
index 41efb7b69a5a..5935fb4653c3 100644
--- a/.github/workflows/agent-context-budget.yml
+++ b/.github/workflows/agent-context-budget.yml
@@ -10,10 +10,7 @@ on:
 permissions:
   contents: read
 
-concurrency:
-  group: agent-context-budget-${{ github.event.pull_request.number }}
-  cancel-in-progress: true
-
+# No concurrency group: label events arrive in bursts, and a cancelled run reports as a failed check.
 jobs:
   budget:
     name: Agent context budget
@@ -24,7 +21,7 @@ jobs:
       ALLOW_INCREASE: ${{ contains(github.event.pull_request.labels.*.name, 'agent-context-increase') }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6.1.0
         with:
           sparse-checkout: apps/server/src/provider/agentContextBudget.json
           sparse-checkout-cone-mode: false
diff --git a/.github/workflows/coil-ci.yml b/.github/workflows/coil-ci.yml
index 71ba5cef4069..7d3fe1310cae 100644
--- a/.github/workflows/coil-ci.yml
+++ b/.github/workflows/coil-ci.yml
@@ -103,10 +103,17 @@ jobs:
       - name: Test
         run: vp run --filter '!t3' --filter '!@t3tools/monorepo' --filter '!@t3tools/web' test --testTimeout=120000 --hookTimeout=120000
 
+  # Split in two because one headless Chromium running all ~585 web files on these runners lost its
+  # page late in the run in 5 of 6 runs on 2026-11-13 (`Browser connection was closed`), with no
+  # test failing.
   test_web:
-    name: Test Web
+    name: Test Web ${{ matrix.shard }}
     runs-on: ubuntu-latest
     timeout-minutes: 20
+    strategy:
+      fail-fast: false
+      matrix:
+        shard: [1, 2]
     steps:
       - name: Checkout
         uses: actions/checkout@v6
@@ -127,7 +134,7 @@ jobs:
         # falls back to GITHUB_REPOSITORY, which on the fork's runners is radroid/t3code.
         env:
           T3CODE_DESKTOP_UPDATE_REPOSITORY: pingdotgg/t3code
-        run: vp run --filter @t3tools/web test --testTimeout=120000 --hookTimeout=120000
+        run: vp run --filter @t3tools/web test --shard ${{ matrix.shard }}/${{ strategy.job-total }} --testTimeout=120000 --hookTimeout=120000
 
   # apps/server sets `fileParallelism: false`, so its 524 test files run one at a time. Upstream
   # shards them six ways by recorded duration (apps/server/src/testUtils/weightedShardSequencer.ts).
diff --git a/.github/workflows/coil-sync-resolve.yml b/.github/workflows/coil-sync-resolve.yml
index ed9387991804..543ca98fbd0d 100644
--- a/.github/workflows/coil-sync-resolve.yml
+++ b/.github/workflows/coil-sync-resolve.yml
@@ -146,7 +146,8 @@ jobs:
             4. Verify: run `vp run typecheck`, `vp run lint`, then the tests in two runs, web
                last and alone:
                `vp run --filter '!@t3tools/monorepo' --filter '!@t3tools/web' test --testTimeout=120000 --hookTimeout=120000`
-               then `vp run --filter @t3tools/web test --testTimeout=120000 --hookTimeout=120000`.
+               then `vp run --filter @t3tools/web test --shard 1/2 --testTimeout=120000 --hookTimeout=120000`
+               and the same with `--shard 2/2`.
                The timeout flags are required: apps/web pins 15s, which is too tight for this
                runner, and 120s matches the fork's CI gate without lowering any package's own
                budget. Web runs alone because a web test's in-file 30s hook budget times out
diff --git a/.github/workflows/mobile-dev-client.yml b/.github/workflows/mobile-dev-client.yml
index 5f8cb86befb5..e204b16f0162 100644
--- a/.github/workflows/mobile-dev-client.yml
+++ b/.github/workflows/mobile-dev-client.yml
@@ -83,7 +83,7 @@ jobs:
       T3_NATIVE_CLIENT_VERBOSE: "1"
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6.1.0
         with:
           ref: ${{ inputs.ref || github.sha }}
 
@@ -144,7 +144,7 @@ jobs:
       # the runs holding the cache login restore.
       - name: Mount build cache
         if: github.event_name != 'pull_request'
-        uses: useblacksmith/stickydisk@v1
+        uses: useblacksmith/stickydisk@3f6be1451e3cad893b778bc93495c80452a5da26 # v1.7.2
         with:
           key: ${{ github.repository }}-android-dev-client-${{ matrix.abi }}
           path: ~/.cache/t3-android-dev-client
@@ -165,7 +165,7 @@ jobs:
           install-args: --filter=@t3tools/mobile... --filter=@t3tools/scripts...
 
       - name: Setup Java
-        uses: actions/setup-java@v5
+        uses: actions/setup-java@b6effb05e454b25005698d916606bdc6ffcbf961 # v5.7.0
         with:
           distribution: temurin
           java-version: 17
@@ -232,7 +232,7 @@ jobs:
       T3_NATIVE_CLIENT_VERBOSE: "1"
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6.1.0
         with:
           ref: ${{ inputs.ref || github.sha }}
 
diff --git a/.github/workflows/mobile-fingerprint-label.yml b/.github/workflows/mobile-fingerprint-label.yml
index 45e4c9f2ad42..a48462eec8c5 100644
--- a/.github/workflows/mobile-fingerprint-label.yml
+++ b/.github/workflows/mobile-fingerprint-label.yml
@@ -33,7 +33,7 @@ jobs:
     steps:
       - id: pr
         name: Resolve the pull request behind the check
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8
+        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
         with:
           script: |
             const run = context.payload.workflow_run;
@@ -100,7 +100,7 @@ jobs:
 
       - name: Sync native change label
         if: steps.pr.outputs.pr_number != ''
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8
+        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
         env:
           PR_NUMBER: ${{ steps.pr.outputs.pr_number }}
           CHANGED_PLATFORMS: ${{ steps.result.outputs.changed_platforms }}
diff --git a/.github/workflows/pr-limits.yml b/.github/workflows/pr-limits.yml
index 75943062735c..d6a2864f94a9 100644
--- a/.github/workflows/pr-limits.yml
+++ b/.github/workflows/pr-limits.yml
@@ -34,13 +34,13 @@ jobs:
       # branch and never run PR code. Cone mode also checks out the files beside
       # .github/scripts, which is where TRIAGE_EXEMPTIONS.td and VOUCHED.td live.
       - name: Checkout trusted scripts
-        uses: actions/checkout@v6
+        uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6.1.0
         with:
           ref: ${{ github.event.repository.default_branch }}
           sparse-checkout: .github/scripts
 
       - name: Close PRs over the limit
-        uses: actions/github-script@v8
+        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
         env:
           DRY_RUN: ${{ vars.PR_LIMITS_ENFORCE != 'true' }}
         with:
@@ -57,13 +57,13 @@ jobs:
       cancel-in-progress: false
     steps:
       - name: Checkout trusted scripts
-        uses: actions/checkout@v6
+        uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6.1.0
         with:
           ref: ${{ github.event.repository.default_branch }}
           sparse-checkout: .github/scripts
 
       - name: Request rebases and close what went unanswered
-        uses: actions/github-script@v8
+        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
         env:
           DRY_RUN: ${{ vars.PR_LIMITS_ENFORCE != 'true' || (github.event_name == 'workflow_dispatch' && inputs.dry_run) }}
         with:
diff --git a/.github/workflows/windows-tests.yml b/.github/workflows/windows-tests.yml
index 3a70ad5a26a0..9a8e69d69cc2 100644
--- a/.github/workflows/windows-tests.yml
+++ b/.github/workflows/windows-tests.yml
@@ -30,7 +30,7 @@ jobs:
     timeout-minutes: 45
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6.1.0
         with:
           sparse-checkout: |
             /*
@@ -40,7 +40,7 @@ jobs:
       # setup-vp's own cache restores a Linux-shaped store on Windows, which is
       # slower than no cache (see #7975). Cache pnpm's Windows store directly.
       - name: Setup Vite+
-        uses: voidzero-dev/setup-vp@v1
+        uses: voidzero-dev/setup-vp@250f29ce396baf5e8f24498e17c0dfdebabc26eb # v1.15.0
         with:
           node-version-file: package.json
           cache: false
@@ -52,7 +52,7 @@ jobs:
         run: '"path=$(vp pm cache dir)" >> $env:GITHUB_OUTPUT'
 
       - name: Cache packages
-        uses: actions/cache@v6
+        uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
         with:
           path: ${{ steps.package_cache_path.outputs.path }}
           key: windows-tests-packages-v1-${{ hashFiles('pnpm-lock.yaml') }}
diff --git a/.gitignore b/.gitignore
index 85b7c5b4bf02..1637f475fbbd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,3 +49,5 @@ node_modules/
 
 # pnpm content-addressable store; never belongs in the repo.
 .pnpm-store/
+
+/packages/ssh/.ssh-launcher-test-*/
diff --git a/AGENTS.md b/AGENTS.md
index 6feb8399aee7..da3bc4a35b81 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -1,6 +1,6 @@
 # T3 Code
 
-T3 Code is a minimal GUI for coding agents. A Node WebSocket server wraps provider CLIs and agents (Codex, Claude Code, Cursor, Grok, OpenCode, Antigravity, Kiro) and serves web, desktop, and mobile clients.
+T3 Code is a minimal GUI for coding agents. A Node WebSocket server wraps provider CLIs and agents (Codex, Claude Code, Cursor, Grok, OpenCode, Antigravity, Kiro, Pi, Muse Code, fx) and serves web, desktop, and mobile clients.
 
 You can think of T3 Code as an open source "bring-your-own-subscription" alternative to apps like Claude Desktop, Codex App, Cursor Glass and Conductor.
 
@@ -68,7 +68,7 @@ The most common defect in this repo is a change that works on the path you teste
 
 - **Entry points.** A behavior reachable from the chat view is usually also reachable from Settings, the command palette, and a keybinding. Fixing one is not fixing the feature.
 - **Clients.** Web, desktop (wraps web, adds Electron shell/IPC), and mobile (React Native, separate navigation). Shared logic lives in `packages/client-runtime`
-- **Providers.** Codex, Claude, Cursor, Grok, OpenCode, Antigravity, and Kiro each have an adapter. Provider-shaped features need a decision per adapter, even if the decision is "not supported here".
+- **Providers.** Codex, Claude, Cursor, Grok, OpenCode, Antigravity, Kiro, Pi, Muse Code, fx, and ACP Registry each have an adapter. Provider-shaped features need a decision per adapter, even if the decision is "not supported here".
 - **Agents.** A capability a user can trigger is usually one an agent should reach through MCP tools, and scheduled tasks run the same paths. That only works when it is a service method, not handler code.
 - **Contracts.** Anything crossing the wire is typed in `packages/contracts`. Change the schema and the server, web, mobile, and desktop all follow.
 - **Reverse states.** If you added a way in, add the way out and the way to see it. Snooze needs unsnooze. Close needs reopen. A one-way door is a bug.
@@ -83,7 +83,8 @@ The most common defect in this repo is a change that works on the path you teste
 - Ports derive from the worktree path and are stable across restarts, but read the real ones from the `[dev-runner]` line since occupied ports shift.
 - Sharing over the tailnet is three steps: run `vp run dev --share` in the background, wait for the `pairingUrl:` line in its output, then give that full URL to an unpaired browser. Do not wire up `tailscale serve` by hand, open the URL yourself, or consume the user's pairing link. A browser with the reusable dev cookie can use the bare origin. If a normal one-time token was consumed, mint a fresh one with `node apps/server/src/bin.ts pair`. It carries standard scopes, while the startup URL carries admin scopes needed for Connections settings.
 - To reuse web dev auth across worktrees, configure one fixed `T3CODE_DEV_AUTH_TOKEN` in the main checkout's gitignored `.env`. The `t3.json` setup links that file into worktrees. Never commit or publish the token or a startup URL. See [Reusable dev credential](docs/operations/development.md#reusable-dev-credential).
-- Stop what you started, by the PID you tracked. See rule 1.
+- Stop what you started, by the PID you tracked. See rule 1. `vp` does not pass SIGTERM on, so signalling the `vp run dev` PID alone leaves Vite and the server running. Stop the background task with your harness's own stop, which ends the whole tree.
+- Run dev servers, Metro, and builds from your own shell so they end with your session. Do not detach them with `systemd-run`, `nohup`, `setsid`, or `tmux` unless the user asks for one that outlives the session. Detached servers ran for weeks and filled RAM and swap. The dev runner stops itself above `--memory-limit-gb` (half of RAM, at most 16 GiB) on Linux.
 - Need a second checkout? `git worktree add` it next to this worktree, not in `/tmp`. Remove it when done.
 
 ## Test data
@@ -149,7 +150,7 @@ For mobile verification, a missing or outdated native client is an install step,
 ## Pull requests
 
 - Never make a PR unless the developer explicitly asks you to do so.
-- If `origin` is git.cafe, follow [GitCafe mirror](docs/operations/development.md#gitcafe-mirror-optional): push to `origin`, open and track PRs with `cafe` and their git.cafe URLs, and keep `gh` for merging.
+- `origin` is not always GitHub. Check `git remote get-url origin` before your first forge command and use that forge's CLI and skill. See [Forge mirror](docs/operations/development.md#forge-mirror-optional).
 - Conventional commit titles, plain language: `fix(web): new threads no longer spike CPU`.
 - Body: the problem in a sentence or two, then how you fixed it. End with the model and harness that did the work.
 - UI changes need before/after images. Motion or timing needs a short video.
diff --git a/apps/desktop/src/app/DesktopClerk.test.ts b/apps/desktop/src/app/DesktopClerk.test.ts
index 8a823cde8db7..de687d41a4e6 100644
--- a/apps/desktop/src/app/DesktopClerk.test.ts
+++ b/apps/desktop/src/app/DesktopClerk.test.ts
@@ -424,7 +424,7 @@ it.effect.each(["startup", "open-url", "early-second-instance"] as const)(
         ),
         Effect.provideService(DesktopWebLinks.DesktopWebLinks, ignoreWebLinks),
       );
-    }).pipe(Effect.scoped),
+    }),
 );
 
 it.effect("hands web and app links to the renderer and leaves other links alone", () =>
@@ -481,5 +481,5 @@ it.effect("hands web and app links to the renderer and leaves other links alone"
         }),
       ),
     );
-  }).pipe(Effect.scoped),
+  }),
 );
diff --git a/apps/desktop/src/app/DesktopCliCommand.test.ts b/apps/desktop/src/app/DesktopCliCommand.test.ts
index 2dc59c58899e..dd61b7984ec1 100644
--- a/apps/desktop/src/app/DesktopCliCommand.test.ts
+++ b/apps/desktop/src/app/DesktopCliCommand.test.ts
@@ -160,7 +160,7 @@ it.layer(NodeServices.layer)("DesktopCliCommand", (it) => {
         expect(yield* fs.exists(upgradedLink)).toBe(false);
         expect((yield* upgraded.install).installedPath).toBe(upgradedLink);
       }
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("never replaces or removes a t3 it did not create", () =>
@@ -202,7 +202,7 @@ it.layer(NodeServices.layer)("DesktopCliCommand", (it) => {
       expect((yield* Effect.flip(command.install)).message).toContain("Could not set up");
       yield* command.uninstall;
       expect(yield* fs.readFileString(launcher)).toBe("npm's t3\n");
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("finds and removes a link left by a previous T3 home", () =>
@@ -259,7 +259,7 @@ it.layer(NodeServices.layer)("DesktopCliCommand", (it) => {
       );
       expect(yield* fs.exists(path.join(home, ".local", "bin", "t3"))).toBe(false);
       expect(yield* fs.readFileString(path.join(home, "bin", "t3.staging"))).toBe("mine");
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("refuses to install behind another t3 that runs first", () =>
@@ -309,7 +309,7 @@ it.layer(NodeServices.layer)("DesktopCliCommand", (it) => {
         installedPath: path.join(home, ".local", "bin", "t3"),
       });
       expect(installed.shadowedBy).toBeUndefined();
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect.skipIf(HostProcess.Platform.defaultValue() === "win32")(
@@ -343,7 +343,7 @@ it.layer(NodeServices.layer)("DesktopCliCommand", (it) => {
           onPath: true,
           installedPath: path.join(home, ".local", "bin", "t3"),
         });
-      }).pipe(Effect.scoped),
+      }),
   );
 
   it.effect("does not treat its own launcher as another t3 when its folder is first on PATH", () =>
@@ -372,7 +372,7 @@ it.layer(NodeServices.layer)("DesktopCliCommand", (it) => {
       expect(yield* command.state).toEqual(removed);
       expect(yield* fs.exists(installed.installedPath!)).toBe(false);
       expect(yield* fs.exists(launcher)).toBe(true);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("leaves the Windows PATH alone when it cannot be read", () =>
@@ -411,7 +411,7 @@ it.layer(NodeServices.layer)("DesktopCliCommand", (it) => {
       const reader = yield* commandIn({ home, platform: "win32" }, inherited.spawner);
       yield* reader.install;
       expect(inherited.registry).toMatchObject({ path: `${userPath};${launcherDir}`, writes: 1 });
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("does not claim or remove a Windows PATH entry the user added", () =>
@@ -441,6 +441,6 @@ it.layer(NodeServices.layer)("DesktopCliCommand", (it) => {
       yield* (yield* commandIn({ home: besideHome, platform: "win32" }, beside.spawner))
         .installOnFirstLaunch;
       expect(beside.registry).toMatchObject({ path: "C:\\Tools", writes: 0 });
-    }).pipe(Effect.scoped),
+    }),
   );
 });
diff --git a/apps/desktop/src/app/DesktopCliShim.test.ts b/apps/desktop/src/app/DesktopCliShim.test.ts
index e2f97c7d2ff7..3e8b4967dfde 100644
--- a/apps/desktop/src/app/DesktopCliShim.test.ts
+++ b/apps/desktop/src/app/DesktopCliShim.test.ts
@@ -39,7 +39,7 @@ const run = (shim: string, args: ReadonlyArray<string>, env: NodeJS.ProcessEnv =
   });
 
 const REPORTER =
-  '#!/bin/sh\necho "node=$ELECTRON_RUN_AS_NODE cli=$T3CODE_CLI_PATH home=$T3CODE_HOME"\nprintf "%s\\n" "$@"\nexit 3\n';
+  '#!/bin/sh\necho "node=$ELECTRON_RUN_AS_NODE cli=$T3CODE_CLI_PATH home=$T3CODE_HOME appimage=$APPIMAGE"\nprintf "%s\\n" "$@"\nexit 3\n';
 
 const fakeAppImage = (canMount = true, app = REPORTER) => {
   const root = tempRoot();
@@ -56,7 +56,7 @@ const fakeAppImage = (canMount = true, app = REPORTER) => {
       `echo $$ >'${root}/mounter.pid'`,
       canMount ? `echo '${image}'` : 'echo "Cannot mount AppImage"; exit 1',
       // Like the FUSE runtime, any of these unmounts. fd 3 reports to the test when it is open.
-      `trap 'echo unmounted >&3 2>/dev/null; touch "${root}/unmounted"; exit 0' TERM HUP INT`,
+      "trap 'echo unmounted >&3 2>/dev/null; exit 0' TERM HUP INT",
       "trap 'echo mounted >&3 2>/dev/null' WINCH",
       "while :; do sleep 0.05; done",
       "",
@@ -150,6 +150,14 @@ describe("renderCliShim", () => {
     );
   });
 
+  // The server skips its compile cache only under APPIMAGE; each mount path is new.
+  it("tells the CLI it runs from the mounted AppImage", () => {
+    const { appImage, shim } = fakeAppImage();
+    const result = run(shim, ["--version"]);
+    expect(result.status).toBe(3);
+    expect(result.stdout).toContain(`appimage=${appImage}`);
+  });
+
   it("keeps the install's T3 home under sudo, unless one is set", () => {
     const root = tempRoot();
     writeExecutable(NodePath.join(root, "app"), REPORTER);
diff --git a/apps/desktop/src/app/DesktopCliShim.ts b/apps/desktop/src/app/DesktopCliShim.ts
index eba61f561f52..217f3b327dc9 100644
--- a/apps/desktop/src/app/DesktopCliShim.ts
+++ b/apps/desktop/src/app/DesktopCliShim.ts
@@ -109,6 +109,8 @@ export const renderCliShim = (input: {
     '  (cd "$work" && "$app" --appimage-extract >/dev/null) || { echo "Could not open $app." >&2; exit 1; }',
     '  mount="$work/squashfs-root"',
     "fi",
+    // The runtime sets this when it launches the app; the CLI skips its path-keyed compile cache on it.
+    'export APPIMAGE="$app"',
     run("$mount"),
     "",
   ].join("\n");
diff --git a/apps/desktop/src/app/DesktopConnectionCatalogStore.test.ts b/apps/desktop/src/app/DesktopConnectionCatalogStore.test.ts
index 98c75385afc5..5dfde9103f15 100644
--- a/apps/desktop/src/app/DesktopConnectionCatalogStore.test.ts
+++ b/apps/desktop/src/app/DesktopConnectionCatalogStore.test.ts
@@ -99,7 +99,7 @@ const withStore = <A, E, R>(
       prefix: "t3-desktop-connection-catalog-test-",
     });
     return yield* effect.pipe(Effect.provide(layerFor(baseDir, encryptionAvailable)));
-  }).pipe(Effect.provide(NodeServices.layer), Effect.scoped);
+  }).pipe(Effect.provide(NodeServices.layer));
 
 describe("DesktopConnectionCatalogStore", () => {
   it.effect("persists and reads an encrypted connection catalog", () =>
@@ -298,6 +298,6 @@ describe("DesktopConnectionCatalogStore", () => {
       assert.notEqual(error.message, decryptError.message);
       yield* Ref.set(failDecrypt, false);
       assert.deepStrictEqual(yield* store.get, Option.some('{"schemaVersion":1,"targets":[]}'));
-    }).pipe(Effect.provide(NodeServices.layer), Effect.scoped),
+    }).pipe(Effect.provide(NodeServices.layer)),
   );
 });
diff --git a/apps/desktop/src/app/DesktopExitChildren.test.ts b/apps/desktop/src/app/DesktopExitChildren.test.ts
index 490c6740f0e0..800a0f5bd4c0 100644
--- a/apps/desktop/src/app/DesktopExitChildren.test.ts
+++ b/apps/desktop/src/app/DesktopExitChildren.test.ts
@@ -3,7 +3,7 @@ import * as NodeChildProcess from "node:child_process";
 import * as NodeFS from "node:fs";
 import { assert, describe, it } from "@effect/vitest";
 
-import { stopChildProcessesBeforeExit } from "./DesktopExitChildren.ts";
+import { stopChildProcessesBeforeExit, stopZygotesBeforeExit } from "./DesktopExitChildren.ts";
 
 const isRunning = (pid: number) => {
   try {
@@ -39,4 +39,24 @@ describe.runIf(NodeFS.existsSync("/proc/self/task"))("stopChildProcessesBeforeEx
       parent.kill("SIGKILL");
     }
   });
+
+  it("kills zygote children before returning and leaves other helpers running", async () => {
+    const spawnTitled = async (title: string) => {
+      const child = NodeChildProcess.spawn("sleep", ["60"], { argv0: title, stdio: "ignore" });
+      await new Promise((resolve) => child.once("spawn", resolve));
+      return child;
+    };
+    // Chromium rewrites a zygote's argv into one space-separated title.
+    const zygote = await spawnTitled("/opt/T3 Code/t3code --type=zygote --no-sandbox");
+    const utility = await spawnTitled("/opt/T3 Code/t3code --type=utility");
+    try {
+      stopZygotesBeforeExit(process.pid);
+
+      assert.isFalse(isRunning(zygote.pid!));
+      assert.isTrue(isRunning(utility.pid!));
+    } finally {
+      zygote.kill("SIGKILL");
+      utility.kill("SIGKILL");
+    }
+  });
 });
diff --git a/apps/desktop/src/app/DesktopExitChildren.ts b/apps/desktop/src/app/DesktopExitChildren.ts
index 7cc64c43833e..9426c1b4ff88 100644
--- a/apps/desktop/src/app/DesktopExitChildren.ts
+++ b/apps/desktop/src/app/DesktopExitChildren.ts
@@ -29,6 +29,13 @@ const childPids = (pid: number): ReadonlyArray<number> => {
   );
 };
 
+// A zygote rewrites its argv into one space-separated title.
+const isZygote = (pid: number): boolean =>
+  (readProc(`/proc/${pid}/cmdline`) ?? "")
+    .replaceAll("\0", " ")
+    .split(" ")
+    .includes("--type=zygote");
+
 // A zombie has already released its memory mappings.
 const isRunning = (pid: number): boolean => {
   const stat = readProc(`/proc/${pid}/stat`);
@@ -68,3 +75,13 @@ export const stopChildProcessesBeforeExit = (pid: number): ReadonlyArray<number>
   waitUntilStopped(survivors, KILL_WAIT_MS);
   return survivors;
 };
+
+/**
+ * Chromium's zygotes exit only after main does, so on an AppImage they outlive the mount even on
+ * an orderly quit. Kills them while main still holds the image mounted. Linux only (/proc).
+ */
+export const stopZygotesBeforeExit = (pid: number): void => {
+  const zygotes = childPids(pid).filter(isZygote);
+  signal(zygotes, "SIGKILL");
+  waitUntilStopped(zygotes, KILL_WAIT_MS);
+};
diff --git a/apps/desktop/src/app/DesktopLifecycle.test.ts b/apps/desktop/src/app/DesktopLifecycle.test.ts
index 30df96c58ad7..e11e946dd41b 100644
--- a/apps/desktop/src/app/DesktopLifecycle.test.ts
+++ b/apps/desktop/src/app/DesktopLifecycle.test.ts
@@ -2,6 +2,7 @@ import { assert, describe, it } from "@effect/vitest";
 import * as Deferred from "effect/Deferred";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
+import * as Option from "effect/Option";
 import * as Ref from "effect/Ref";
 import * as TestClock from "effect/testing/TestClock";
 
@@ -117,6 +118,7 @@ describe("DesktopLifecycle", () => {
       const layerEnvironment = Layer.succeed(DesktopEnvironment.DesktopEnvironment, {
         platform,
         isDevelopment: false,
+        appImagePath: Option.none(),
       } as DesktopEnvironment.DesktopEnvironment["Service"]);
 
       const layer = DesktopLifecycle.layer.pipe(
diff --git a/apps/desktop/src/app/DesktopLifecycle.ts b/apps/desktop/src/app/DesktopLifecycle.ts
index 56fb25fcfa90..9568e72dde31 100644
--- a/apps/desktop/src/app/DesktopLifecycle.ts
+++ b/apps/desktop/src/app/DesktopLifecycle.ts
@@ -3,6 +3,7 @@ import * as Context from "effect/Context";
 import * as Duration from "effect/Duration";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
+import * as Option from "effect/Option";
 import * as Ref from "effect/Ref";
 import * as Schema from "effect/Schema";
 import * as Scope from "effect/Scope";
@@ -12,7 +13,7 @@ import type * as Electron from "electron";
 import * as HostProcess from "@t3tools/shared/HostProcess";
 
 import * as DesktopEnvironment from "./DesktopEnvironment.ts";
-import { stopChildProcessesBeforeExit } from "./DesktopExitChildren.ts";
+import { stopChildProcessesBeforeExit, stopZygotesBeforeExit } from "./DesktopExitChildren.ts";
 import { makeComponentLogger } from "./DesktopObservability.ts";
 import * as DesktopShutdown from "./DesktopShutdown.ts";
 import * as ElectronApp from "../electron/ElectronApp.ts";
@@ -340,6 +341,13 @@ export const make = DesktopLifecycle.of({
         quitFromSignal("SIGTERM", runEffect, quit);
       });
     }
+
+    // Unscoped: the app scope closes before Electron exits, and every exit path must run this.
+    if (environment.platform === "linux" && Option.isSome(environment.appImagePath)) {
+      yield* Effect.sync(() => {
+        process.once("exit", () => stopZygotesBeforeExit(process.pid));
+      });
+    }
   }).pipe(Effect.withSpan("desktop.lifecycle.register")),
 });
 
diff --git a/apps/desktop/src/app/DesktopLinuxUrlHandler.test.ts b/apps/desktop/src/app/DesktopLinuxUrlHandler.test.ts
index 7e685358865c..e9c8336feaf4 100644
--- a/apps/desktop/src/app/DesktopLinuxUrlHandler.test.ts
+++ b/apps/desktop/src/app/DesktopLinuxUrlHandler.test.ts
@@ -602,7 +602,7 @@ it.layer(NodeServices.layer)("DesktopLinuxUrlHandler theme icons", (it) => {
       }
       assert.isFalse(yield* fileSystem.exists(fixture.cachePath));
       assert.equal(iconCacheRuns(run), 0);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("replaces same-length stale icons and refreshes an existing cache once", () =>
@@ -634,7 +634,7 @@ it.layer(NodeServices.layer)("DesktopLinuxUrlHandler theme icons", (it) => {
         run.commands.filter(({ command }) => command === "gtk-update-icon-cache"),
         [{ command: "gtk-update-icon-cache", args: ["-f", "-t", fixture.hicolorDir] }],
       );
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("refreshes when this launch changed an icon even if the cache looks newer", () =>
@@ -655,7 +655,7 @@ it.layer(NodeServices.layer)("DesktopLinuxUrlHandler theme icons", (it) => {
 
       assert.isTrue(yield* fileSystem.exists(path.join(fixture.appsDir, "com.t3tools.T3Code.png")));
       assert.equal(iconCacheRuns(run), 1);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("retries a failed icon cache refresh on the next launch", () =>
@@ -678,7 +678,7 @@ it.layer(NodeServices.layer)("DesktopLinuxUrlHandler theme icons", (it) => {
       yield* registerWithRealFileSystem(recovering);
       yield* registerWithRealFileSystem(recovering);
       assert.equal(iconCacheRuns(recovering), 1);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("still registers the handler when the theme icon install fails", () =>
@@ -702,6 +702,6 @@ it.layer(NodeServices.layer)("DesktopLinuxUrlHandler theme icons", (it) => {
         missingTool.commands.map(({ command }) => command),
         ["gtk-update-icon-cache", "update-desktop-database", "xdg-mime"],
       );
-    }).pipe(Effect.scoped),
+    }),
   );
 });
diff --git a/apps/desktop/src/backend/DesktopBackendManager.test.ts b/apps/desktop/src/backend/DesktopBackendManager.test.ts
index 3126d12a2e93..8a8389082ce8 100644
--- a/apps/desktop/src/backend/DesktopBackendManager.test.ts
+++ b/apps/desktop/src/backend/DesktopBackendManager.test.ts
@@ -5,6 +5,11 @@ import {
   type DesktopBackendBootstrap as DesktopBackendBootstrapValue,
   DesktopTelemetryControlMessage,
 } from "@t3tools/contracts";
+import {
+  DATABASE_MIGRATION_PROGRESS_MESSAGE,
+  DATABASE_MIGRATIONS_FINISHED_MESSAGE,
+  DATABASE_MIGRATIONS_STARTED_MESSAGE,
+} from "@t3tools/shared/databaseMigrationLog";
 import { assert, describe, it } from "@effect/vitest";
 import * as Deferred from "effect/Deferred";
 import * as Duration from "effect/Duration";
@@ -194,129 +199,125 @@ function makeTestInstance(input: MakeInstanceInput) {
 
 describe("DesktopBackendManager", () => {
   it.effect("notifies readiness waiters on HTTP readiness and stop without clock advancement", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const probe = yield* Deferred.make<void>();
-        const ready = yield* Deferred.make<void>();
-        const exit = yield* Deferred.make<ChildProcessSpawner.ExitCode>();
-        const instance = yield* makeTestInstance({
-          spawnerLayer: Layer.succeed(
-            ChildProcessSpawner.ChildProcessSpawner,
-            ChildProcessSpawner.make(() =>
-              Effect.acquireRelease(
-                Effect.succeed(
-                  makeProcess({
-                    exitCode: Deferred.await(exit),
-                    kill: () =>
-                      Deferred.succeed(exit, ChildProcessSpawner.ExitCode(0)).pipe(Effect.asVoid),
-                  }),
-                ),
-                () => Deferred.succeed(exit, ChildProcessSpawner.ExitCode(0)),
+    Effect.gen(function* () {
+      const probe = yield* Deferred.make<void>();
+      const ready = yield* Deferred.make<void>();
+      const exit = yield* Deferred.make<ChildProcessSpawner.ExitCode>();
+      const instance = yield* makeTestInstance({
+        spawnerLayer: Layer.succeed(
+          ChildProcessSpawner.ChildProcessSpawner,
+          ChildProcessSpawner.make(() =>
+            Effect.acquireRelease(
+              Effect.succeed(
+                makeProcess({
+                  exitCode: Deferred.await(exit),
+                  kill: () =>
+                    Deferred.succeed(exit, ChildProcessSpawner.ExitCode(0)).pipe(Effect.asVoid),
+                }),
               ),
+              () => Deferred.succeed(exit, ChildProcessSpawner.ExitCode(0)),
             ),
           ),
-          httpClientLayer: Layer.succeed(
-            HttpClient.HttpClient,
-            HttpClient.make((request) =>
-              Deferred.succeed(probe, undefined).pipe(
-                Effect.andThen(Deferred.await(ready)),
-                Effect.as(HttpClientResponse.fromWeb(request, new Response("{}"))),
-              ),
+        ),
+        httpClientLayer: Layer.succeed(
+          HttpClient.HttpClient,
+          HttpClient.make((request) =>
+            Deferred.succeed(probe, undefined).pipe(
+              Effect.andThen(Deferred.await(ready)),
+              Effect.as(HttpClientResponse.fromWeb(request, new Response("{}"))),
             ),
           ),
-        });
-        yield* instance.start;
-        yield* Deferred.await(probe);
-        const waiter = yield* instance.waitForReady(Duration.seconds(15)).pipe(Effect.forkChild);
-        yield* Deferred.succeed(ready, undefined);
-        assert.isTrue(yield* Fiber.join(waiter));
-        yield* instance.stop();
-        assert.isFalse(yield* instance.waitForReady(Duration.seconds(15)));
-      }),
-    ),
+        ),
+      });
+      yield* instance.start;
+      yield* Deferred.await(probe);
+      const waiter = yield* instance.waitForReady(Duration.seconds(15)).pipe(Effect.forkChild);
+      yield* Deferred.succeed(ready, undefined);
+      assert.isTrue(yield* Fiber.join(waiter));
+      yield* instance.stop();
+      assert.isFalse(yield* instance.waitForReady(Duration.seconds(15)));
+    }),
   );
 
   it.effect("spawns the backend with fd3 bootstrap and fd4 telemetry", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        let spawnedCommand: ChildProcess.Command | undefined;
-        let bootstrapJson = "";
-        let telemetryJson = "";
-        let readyCount = 0;
-        const ready = yield* Deferred.make<void>();
-        const exited = yield* Queue.unbounded<void>();
-
-        const layerSpawner = Layer.succeed(
-          ChildProcessSpawner.ChildProcessSpawner,
-          ChildProcessSpawner.make((command) =>
-            Effect.gen(function* () {
-              spawnedCommand = command;
-              if (command._tag === "StandardCommand") {
-                const fd3 = command.options.additionalFds?.fd3;
-                if (fd3?.type === "input" && fd3.stream) {
-                  bootstrapJson = yield* fd3.stream.pipe(Stream.decodeText(), Stream.mkString);
-                }
-                const fd4 = command.options.additionalFds?.fd4;
-                if (fd4?.type === "input" && fd4.stream) {
-                  telemetryJson = yield* fd4.stream.pipe(Stream.decodeText(), Stream.mkString);
-                }
+    Effect.gen(function* () {
+      let spawnedCommand: ChildProcess.Command | undefined;
+      let bootstrapJson = "";
+      let telemetryJson = "";
+      let readyCount = 0;
+      const ready = yield* Deferred.make<void>();
+      const exited = yield* Queue.unbounded<void>();
+
+      const layerSpawner = Layer.succeed(
+        ChildProcessSpawner.ChildProcessSpawner,
+        ChildProcessSpawner.make((command) =>
+          Effect.gen(function* () {
+            spawnedCommand = command;
+            if (command._tag === "StandardCommand") {
+              const fd3 = command.options.additionalFds?.fd3;
+              if (fd3?.type === "input" && fd3.stream) {
+                bootstrapJson = yield* fd3.stream.pipe(Stream.decodeText(), Stream.mkString);
+              }
+              const fd4 = command.options.additionalFds?.fd4;
+              if (fd4?.type === "input" && fd4.stream) {
+                telemetryJson = yield* fd4.stream.pipe(Stream.decodeText(), Stream.mkString);
               }
+            }
 
-              return makeProcess({
-                exitCode: Deferred.await(ready).pipe(Effect.as(ChildProcessSpawner.ExitCode(0))),
-              });
-            }),
-          ),
-        );
+            return makeProcess({
+              exitCode: Deferred.await(ready).pipe(Effect.as(ChildProcessSpawner.ExitCode(0))),
+            });
+          }),
+        ),
+      );
 
-        const instance = yield* makeTestInstance({
-          config: {
-            ...baseConfig,
-            bootstrap: configWithObservability,
-          },
-          spawnerLayer: layerSpawner,
-          desktopTelemetryStream: Stream.encodeText(
-            Stream.make('{"version":1,"type":"desktopTelemetryHello","electronPid":123}\n'),
-          ),
-          onReady: Effect.sync(() => {
-            readyCount += 1;
-          }).pipe(Effect.andThen(Deferred.succeed(ready, void 0)), Effect.asVoid),
-          backendOutputLog: {
-            persistFailure: () => Queue.offer(exited, void 0).pipe(Effect.asVoid),
-          },
-        });
+      const instance = yield* makeTestInstance({
+        config: {
+          ...baseConfig,
+          bootstrap: configWithObservability,
+        },
+        spawnerLayer: layerSpawner,
+        desktopTelemetryStream: Stream.encodeText(
+          Stream.make('{"version":1,"type":"desktopTelemetryHello","electronPid":123}\n'),
+        ),
+        onReady: Effect.sync(() => {
+          readyCount += 1;
+        }).pipe(Effect.andThen(Deferred.succeed(ready, void 0)), Effect.asVoid),
+        backendOutputLog: {
+          persistFailure: () => Queue.offer(exited, void 0).pipe(Effect.asVoid),
+        },
+      });
 
-        yield* instance.start;
-        yield* Queue.take(exited);
-
-        assert.equal(readyCount, 1);
-        assert.isDefined(spawnedCommand);
-        if (spawnedCommand._tag !== "StandardCommand") {
-          throw new Error("Expected backend to spawn a standard command.");
-        }
-
-        assert.equal(spawnedCommand.command, "/electron");
-        assert.deepEqual(spawnedCommand.args, ["/server/bin.mjs", "--bootstrap-fd", "3"]);
-        assert.equal(spawnedCommand.options.cwd, "/server");
-        assert.equal(spawnedCommand.options.extendEnv, true);
-        assert.equal(spawnedCommand.options.stdout, "pipe");
-        assert.equal(spawnedCommand.options.stderr, "pipe");
-        assert.equal(spawnedCommand.options.killSignal, "SIGTERM");
-        assert.isDefined(spawnedCommand.options.forceKillAfter);
-        assert.equal(spawnedCommand.options.additionalFds?.fd4?.type, "input");
-        assert.equal(spawnedCommand.options.additionalFds?.fd5?.type, "output");
-        assert.equal(
-          Duration.toMillis(Duration.fromInputUnsafe(spawnedCommand.options.forceKillAfter)),
-          5_000,
-        );
-
-        assert.deepEqual(yield* decodeBootstrap(bootstrapJson), configWithObservability);
-        assert.equal(
-          telemetryJson,
-          '{"version":1,"type":"desktopTelemetryHello","electronPid":123}\n',
-        );
-      }),
-    ),
+      yield* instance.start;
+      yield* Queue.take(exited);
+
+      assert.equal(readyCount, 1);
+      assert.isDefined(spawnedCommand);
+      if (spawnedCommand._tag !== "StandardCommand") {
+        throw new Error("Expected backend to spawn a standard command.");
+      }
+
+      assert.equal(spawnedCommand.command, "/electron");
+      assert.deepEqual(spawnedCommand.args, ["/server/bin.mjs", "--bootstrap-fd", "3"]);
+      assert.equal(spawnedCommand.options.cwd, "/server");
+      assert.equal(spawnedCommand.options.extendEnv, true);
+      assert.equal(spawnedCommand.options.stdout, "pipe");
+      assert.equal(spawnedCommand.options.stderr, "pipe");
+      assert.equal(spawnedCommand.options.killSignal, "SIGTERM");
+      assert.isDefined(spawnedCommand.options.forceKillAfter);
+      assert.equal(spawnedCommand.options.additionalFds?.fd4?.type, "input");
+      assert.equal(spawnedCommand.options.additionalFds?.fd5?.type, "output");
+      assert.equal(
+        Duration.toMillis(Duration.fromInputUnsafe(spawnedCommand.options.forceKillAfter)),
+        5_000,
+      );
+
+      assert.deepEqual(yield* decodeBootstrap(bootstrapJson), configWithObservability);
+      assert.equal(
+        telemetryJson,
+        '{"version":1,"type":"desktopTelemetryHello","electronPid":123}\n',
+      );
+    }),
   );
 
   it.effect("reports a SIGKILL exit without an exit code", () =>
@@ -344,285 +345,272 @@ describe("DesktopBackendManager", () => {
   );
 
   it.effect("reports child exit before waiting for trailing output to drain", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const exitObserved = yield* Deferred.make<void>();
-        const finishOutputDrain = yield* Deferred.make<void>();
-        const layerSpawner = Layer.succeed(
-          ChildProcessSpawner.ChildProcessSpawner,
-          ChildProcessSpawner.make(() =>
-            Effect.succeed(
-              makeProcess({
-                stdout: Stream.fromEffect(
-                  Deferred.await(finishOutputDrain).pipe(
-                    Effect.as(new TextEncoder().encode("trailing output\n")),
-                  ),
+    Effect.gen(function* () {
+      const exitObserved = yield* Deferred.make<void>();
+      const finishOutputDrain = yield* Deferred.make<void>();
+      const layerSpawner = Layer.succeed(
+        ChildProcessSpawner.ChildProcessSpawner,
+        ChildProcessSpawner.make(() =>
+          Effect.succeed(
+            makeProcess({
+              stdout: Stream.fromEffect(
+                Deferred.await(finishOutputDrain).pipe(
+                  Effect.as(new TextEncoder().encode("trailing output\n")),
                 ),
-                exitCode: Effect.succeed(ChildProcessSpawner.ExitCode(1)),
-              }),
-            ),
+              ),
+              exitCode: Effect.succeed(ChildProcessSpawner.ExitCode(1)),
+            }),
           ),
-        );
+        ),
+      );
 
-        const runFiber = yield* DesktopBackendManager.runBackendProcess({
-          ...baseConfig,
-          desktopTelemetryStream: Stream.empty,
-          onExitObserved: () => Deferred.succeed(exitObserved, void 0).pipe(Effect.asVoid),
-        }).pipe(
-          Effect.provide(Layer.merge(layerSpawner, layerHealthyHttpClient)),
-          Effect.forkChild,
-        );
-
-        yield* Deferred.await(exitObserved);
-        assert.isUndefined(runFiber.pollUnsafe());
-
-        yield* Deferred.succeed(finishOutputDrain, void 0);
-        assert.equal((yield* Fiber.join(runFiber)).code.pipe(Option.getOrUndefined), 1);
-      }),
-    ),
+      const runFiber = yield* DesktopBackendManager.runBackendProcess({
+        ...baseConfig,
+        desktopTelemetryStream: Stream.empty,
+        onExitObserved: () => Deferred.succeed(exitObserved, void 0).pipe(Effect.asVoid),
+      }).pipe(Effect.provide(Layer.merge(layerSpawner, layerHealthyHttpClient)), Effect.forkChild);
+
+      yield* Deferred.await(exitObserved);
+      assert.isUndefined(runFiber.pollUnsafe());
+
+      yield* Deferred.succeed(finishOutputDrain, void 0);
+      assert.equal((yield* Fiber.join(runFiber)).code.pipe(Option.getOrUndefined), 1);
+    }),
   );
 
   it.effect("continues routing desktop telemetry control messages after an invalid line", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const handled = yield* Deferred.make<boolean>();
-        const controlMessage = encodeDesktopTelemetryControl({
-          version: 1,
-          type: "setDiagnosticsDemand",
-          enabled: true,
-        });
-        const layerSpawner = Layer.succeed(
-          ChildProcessSpawner.ChildProcessSpawner,
-          ChildProcessSpawner.make(() =>
-            Effect.succeed(
-              makeProcess({
-                getOutputFd: (fd) =>
-                  fd === 5
-                    ? Stream.encodeText(Stream.make(`not-json\n${controlMessage}\n`))
-                    : Stream.empty,
-                exitCode: Deferred.await(handled).pipe(Effect.as(ChildProcessSpawner.ExitCode(0))),
-              }),
-            ),
+    Effect.gen(function* () {
+      const handled = yield* Deferred.make<boolean>();
+      const controlMessage = encodeDesktopTelemetryControl({
+        version: 1,
+        type: "setDiagnosticsDemand",
+        enabled: true,
+      });
+      const layerSpawner = Layer.succeed(
+        ChildProcessSpawner.ChildProcessSpawner,
+        ChildProcessSpawner.make(() =>
+          Effect.succeed(
+            makeProcess({
+              getOutputFd: (fd) =>
+                fd === 5
+                  ? Stream.encodeText(Stream.make(`not-json\n${controlMessage}\n`))
+                  : Stream.empty,
+              exitCode: Deferred.await(handled).pipe(Effect.as(ChildProcessSpawner.ExitCode(0))),
+            }),
           ),
-        );
-        const instance = yield* makeTestInstance({
-          spawnerLayer: layerSpawner,
-          desktopTelemetryPublisher: {
-            handleControlForSource: (_sourceId, message) =>
-              message.type === "setDiagnosticsDemand"
-                ? Deferred.succeed(handled, message.enabled).pipe(Effect.asVoid)
-                : Effect.void,
-          },
-        });
+        ),
+      );
+      const instance = yield* makeTestInstance({
+        spawnerLayer: layerSpawner,
+        desktopTelemetryPublisher: {
+          handleControlForSource: (_sourceId, message) =>
+            message.type === "setDiagnosticsDemand"
+              ? Deferred.succeed(handled, message.enabled).pipe(Effect.asVoid)
+              : Effect.void,
+        },
+      });
 
-        yield* instance.start;
-        assert.isTrue(yield* Deferred.await(handled));
-      }),
-    ),
+      yield* instance.start;
+      assert.isTrue(yield* Deferred.await(handled));
+    }),
   );
 
   it.effect("stops the scoped process with output still pending", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        let startCount = 0;
-        let closedCount = 0;
-        const closed = yield* Deferred.make<void>();
-        const teardownStarted = yield* Deferred.make<void>();
-        const finishTeardown = yield* Deferred.make<void>();
-        const startedPids = yield* Queue.unbounded<number>();
-        const ready = yield* Deferred.make<void>();
-        const backendReadyFlag = yield* Ref.make(false);
-        let shutdownCount = 0;
-        let persistedFailureCount = 0;
-        let discardedSessionCount = 0;
-        let removedTelemetrySources = 0;
-
-        const layerSpawner = Layer.succeed(
-          ChildProcessSpawner.ChildProcessSpawner,
-          ChildProcessSpawner.make(() =>
-            Effect.gen(function* () {
-              const scope = yield* Scope.Scope;
-              startCount += 1;
-              yield* Queue.offer(startedPids, 123);
-              const close = Deferred.succeed(teardownStarted, undefined).pipe(
-                Effect.andThen(Deferred.await(finishTeardown)),
-                Effect.andThen(
-                  Effect.sync(() => {
-                    closedCount += 1;
-                  }),
-                ),
-                Effect.andThen(Deferred.succeed(closed, void 0)),
-                Effect.asVoid,
-              );
+    Effect.gen(function* () {
+      let startCount = 0;
+      let closedCount = 0;
+      const closed = yield* Deferred.make<void>();
+      const teardownStarted = yield* Deferred.make<void>();
+      const finishTeardown = yield* Deferred.make<void>();
+      const startedPids = yield* Queue.unbounded<number>();
+      const ready = yield* Deferred.make<void>();
+      const backendReadyFlag = yield* Ref.make(false);
+      let shutdownCount = 0;
+      let persistedFailureCount = 0;
+      let discardedSessionCount = 0;
+      let removedTelemetrySources = 0;
 
-              yield* Scope.addFinalizer(scope, close);
+      const layerSpawner = Layer.succeed(
+        ChildProcessSpawner.ChildProcessSpawner,
+        ChildProcessSpawner.make(() =>
+          Effect.gen(function* () {
+            const scope = yield* Scope.Scope;
+            startCount += 1;
+            yield* Queue.offer(startedPids, 123);
+            const close = Deferred.succeed(teardownStarted, undefined).pipe(
+              Effect.andThen(Deferred.await(finishTeardown)),
+              Effect.andThen(
+                Effect.sync(() => {
+                  closedCount += 1;
+                }),
+              ),
+              Effect.andThen(Deferred.succeed(closed, void 0)),
+              Effect.asVoid,
+            );
+
+            yield* Scope.addFinalizer(scope, close);
+
+            return makeProcess({
+              stdout: Stream.never,
+              exitCode: Deferred.await(closed).pipe(Effect.as(ChildProcessSpawner.ExitCode(0))),
+              kill: () => close,
+            });
+          }),
+        ),
+      );
 
-              return makeProcess({
-                stdout: Stream.never,
-                exitCode: Deferred.await(closed).pipe(Effect.as(ChildProcessSpawner.ExitCode(0))),
-                kill: () => close,
-              });
+      const instance = yield* makeTestInstance({
+        spawnerLayer: layerSpawner,
+        onReady: Ref.set(backendReadyFlag, true).pipe(
+          Effect.andThen(Deferred.succeed(ready, void 0)),
+          Effect.asVoid,
+        ),
+        onShutdown: Ref.set(backendReadyFlag, false).pipe(
+          Effect.andThen(
+            Effect.sync(() => {
+              shutdownCount += 1;
             }),
           ),
-        );
-
-        const instance = yield* makeTestInstance({
-          spawnerLayer: layerSpawner,
-          onReady: Ref.set(backendReadyFlag, true).pipe(
-            Effect.andThen(Deferred.succeed(ready, void 0)),
-            Effect.asVoid,
-          ),
-          onShutdown: Ref.set(backendReadyFlag, false).pipe(
-            Effect.andThen(
-              Effect.sync(() => {
-                shutdownCount += 1;
-              }),
-            ),
-          ),
-          backendOutputLog: {
-            persistFailure: () =>
-              Effect.sync(() => {
-                persistedFailureCount += 1;
-              }),
-            discardSession: Effect.sync(() => {
-              discardedSessionCount += 1;
+        ),
+        backendOutputLog: {
+          persistFailure: () =>
+            Effect.sync(() => {
+              persistedFailureCount += 1;
             }),
-          },
-          desktopTelemetryPublisher: {
-            removeControlSource: () =>
-              Effect.sync(() => {
-                removedTelemetrySources += 1;
-              }),
-          },
-        });
-        assert.isTrue(Option.isNone(yield* instance.currentConfig));
-
-        yield* instance.start;
-        assert.equal(yield* Queue.take(startedPids), 123);
-        yield* Deferred.await(ready);
-        assert.isTrue(yield* Ref.get(backendReadyFlag));
-        assert.deepEqual(yield* instance.currentConfig, Option.some(baseConfig));
-
-        const runningSnapshot = yield* instance.snapshot;
-        assert.equal(runningSnapshot.ready, true);
-        assert.deepEqual(runningSnapshot.activePid, Option.some(123));
-
-        const stopFiber = yield* instance.stop().pipe(Effect.forkChild);
-        yield* Deferred.await(teardownStarted).pipe(Effect.timeout("1 second"));
-        assert.isFalse(yield* Ref.get(backendReadyFlag));
-        assert.equal(shutdownCount, 1);
-        yield* Deferred.succeed(finishTeardown, undefined);
-        yield* Fiber.join(stopFiber).pipe(Effect.timeout("1 second"));
-        assert.equal(startCount, 1);
-        assert.equal(closedCount, 1);
-        assert.equal(persistedFailureCount, 0);
-        assert.equal(discardedSessionCount, 1);
-        assert.equal(removedTelemetrySources, 1);
-
-        const stoppedSnapshot = yield* instance.snapshot;
-        assert.isFalse(yield* Ref.get(backendReadyFlag));
-        assert.equal(shutdownCount, 1);
-        assert.equal(stoppedSnapshot.desiredRunning, false);
-        assert.equal(stoppedSnapshot.ready, false);
-        assert.equal(Option.isNone(stoppedSnapshot.activePid), true);
-      }),
-    ),
+          discardSession: Effect.sync(() => {
+            discardedSessionCount += 1;
+          }),
+        },
+        desktopTelemetryPublisher: {
+          removeControlSource: () =>
+            Effect.sync(() => {
+              removedTelemetrySources += 1;
+            }),
+        },
+      });
+      assert.isTrue(Option.isNone(yield* instance.currentConfig));
+
+      yield* instance.start;
+      assert.equal(yield* Queue.take(startedPids), 123);
+      yield* Deferred.await(ready);
+      assert.isTrue(yield* Ref.get(backendReadyFlag));
+      assert.deepEqual(yield* instance.currentConfig, Option.some(baseConfig));
+
+      const runningSnapshot = yield* instance.snapshot;
+      assert.equal(runningSnapshot.ready, true);
+      assert.deepEqual(runningSnapshot.activePid, Option.some(123));
+
+      const stopFiber = yield* instance.stop().pipe(Effect.forkChild);
+      yield* Deferred.await(teardownStarted).pipe(Effect.timeout("1 second"));
+      assert.isFalse(yield* Ref.get(backendReadyFlag));
+      assert.equal(shutdownCount, 1);
+      yield* Deferred.succeed(finishTeardown, undefined);
+      yield* Fiber.join(stopFiber).pipe(Effect.timeout("1 second"));
+      assert.equal(startCount, 1);
+      assert.equal(closedCount, 1);
+      assert.equal(persistedFailureCount, 0);
+      assert.equal(discardedSessionCount, 1);
+      assert.equal(removedTelemetrySources, 1);
+
+      const stoppedSnapshot = yield* instance.snapshot;
+      assert.isFalse(yield* Ref.get(backendReadyFlag));
+      assert.equal(shutdownCount, 1);
+      assert.equal(stoppedSnapshot.desiredRunning, false);
+      assert.equal(stoppedSnapshot.ready, false);
+      assert.equal(Option.isNone(stoppedSnapshot.activePid), true);
+    }),
   );
 
   it.effect("restarts when start is requested during stop teardown", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const starts = yield* Queue.unbounded<number>();
-        const teardownStarted = yield* Deferred.make<void>();
-        const finishTeardown = yield* Deferred.make<void>();
-        let startCount = 0;
+    Effect.gen(function* () {
+      const starts = yield* Queue.unbounded<number>();
+      const teardownStarted = yield* Deferred.make<void>();
+      const finishTeardown = yield* Deferred.make<void>();
+      let startCount = 0;
 
-        const layerSpawner = Layer.succeed(
-          ChildProcessSpawner.ChildProcessSpawner,
-          ChildProcessSpawner.make(() =>
-            Effect.gen(function* () {
-              const scope = yield* Scope.Scope;
-              const closed = yield* Deferred.make<void>();
-              startCount += 1;
-              yield* Queue.offer(starts, startCount);
-              if (startCount === 1) {
-                yield* Scope.addFinalizer(
-                  scope,
-                  Deferred.succeed(teardownStarted, undefined).pipe(
-                    Effect.andThen(Deferred.await(finishTeardown)),
-                    Effect.andThen(Deferred.succeed(closed, undefined)),
-                    Effect.asVoid,
-                  ),
-                );
-              } else {
-                yield* Scope.addFinalizer(
-                  scope,
-                  Deferred.succeed(closed, undefined).pipe(Effect.asVoid),
-                );
-              }
-              return makeProcess({
-                exitCode: Deferred.await(closed).pipe(Effect.as(ChildProcessSpawner.ExitCode(0))),
-              });
-            }),
-          ),
-        );
+      const layerSpawner = Layer.succeed(
+        ChildProcessSpawner.ChildProcessSpawner,
+        ChildProcessSpawner.make(() =>
+          Effect.gen(function* () {
+            const scope = yield* Scope.Scope;
+            const closed = yield* Deferred.make<void>();
+            startCount += 1;
+            yield* Queue.offer(starts, startCount);
+            if (startCount === 1) {
+              yield* Scope.addFinalizer(
+                scope,
+                Deferred.succeed(teardownStarted, undefined).pipe(
+                  Effect.andThen(Deferred.await(finishTeardown)),
+                  Effect.andThen(Deferred.succeed(closed, undefined)),
+                  Effect.asVoid,
+                ),
+              );
+            } else {
+              yield* Scope.addFinalizer(
+                scope,
+                Deferred.succeed(closed, undefined).pipe(Effect.asVoid),
+              );
+            }
+            return makeProcess({
+              exitCode: Deferred.await(closed).pipe(Effect.as(ChildProcessSpawner.ExitCode(0))),
+            });
+          }),
+        ),
+      );
 
-        const instance = yield* makeTestInstance({
-          spawnerLayer: layerSpawner,
-          httpClientLayer: layerHttpClient(() => Effect.never),
-        });
+      const instance = yield* makeTestInstance({
+        spawnerLayer: layerSpawner,
+        httpClientLayer: layerHttpClient(() => Effect.never),
+      });
 
-        yield* instance.start;
-        assert.equal(yield* Queue.take(starts), 1);
+      yield* instance.start;
+      assert.equal(yield* Queue.take(starts), 1);
 
-        const stopFiber = yield* instance.stop().pipe(Effect.forkChild);
-        yield* Deferred.await(teardownStarted).pipe(Effect.timeout("1 second"));
-        yield* instance.start;
-        assert.equal((yield* instance.snapshot).desiredRunning, true);
+      const stopFiber = yield* instance.stop().pipe(Effect.forkChild);
+      yield* Deferred.await(teardownStarted).pipe(Effect.timeout("1 second"));
+      yield* instance.start;
+      assert.equal((yield* instance.snapshot).desiredRunning, true);
 
-        yield* Deferred.succeed(finishTeardown, undefined);
-        yield* Fiber.join(stopFiber).pipe(Effect.timeout("1 second"));
-        yield* TestClock.adjust(Duration.millis(500));
+      yield* Deferred.succeed(finishTeardown, undefined);
+      yield* Fiber.join(stopFiber).pipe(Effect.timeout("1 second"));
+      yield* TestClock.adjust(Duration.millis(500));
 
-        assert.equal(yield* Queue.take(starts).pipe(Effect.timeout("1 second")), 2);
-        const restarted = yield* instance.snapshot;
-        assert.equal(restarted.desiredRunning, true);
-        assert.deepEqual(restarted.activePid, Option.some(123));
-      }).pipe(Effect.provide(TestClock.layer())),
-    ),
+      assert.equal(yield* Queue.take(starts).pipe(Effect.timeout("1 second")), 2);
+      const restarted = yield* instance.snapshot;
+      assert.equal(restarted.desiredRunning, true);
+      assert.deepEqual(restarted.activePid, Option.some(123));
+    }).pipe(Effect.provide(TestClock.layer())),
   );
 
   it.effect("reports state-directory ownership once without scheduling another backend", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        let startCount = 0;
-        const refused = yield* Deferred.make<void>();
-        const instance = yield* makeTestInstance({
-          spawnerLayer: Layer.succeed(
-            ChildProcessSpawner.ChildProcessSpawner,
-            ChildProcessSpawner.make(() =>
-              Effect.sync(() => {
-                startCount += 1;
-                return makeProcess({
-                  exitCode: Effect.succeed(
-                    ChildProcessSpawner.ExitCode(SERVER_EXIT_CODE_STATE_DIR_OWNED),
-                  ),
-                });
-              }),
-            ),
+    Effect.gen(function* () {
+      let startCount = 0;
+      const refused = yield* Deferred.make<void>();
+      const instance = yield* makeTestInstance({
+        spawnerLayer: Layer.succeed(
+          ChildProcessSpawner.ChildProcessSpawner,
+          ChildProcessSpawner.make(() =>
+            Effect.sync(() => {
+              startCount += 1;
+              return makeProcess({
+                exitCode: Effect.succeed(
+                  ChildProcessSpawner.ExitCode(SERVER_EXIT_CODE_STATE_DIR_OWNED),
+                ),
+              });
+            }),
           ),
-          httpClientLayer: layerHttpClient(() => Effect.never),
-          onStateDirOwned: Deferred.succeed(refused, undefined).pipe(Effect.asVoid),
-        });
-        yield* instance.start;
-        yield* Deferred.await(refused);
-        const snapshot = yield* instance.snapshot;
-        assert.isFalse(snapshot.desiredRunning);
-        assert.isFalse(snapshot.restartScheduled);
-        yield* TestClock.adjust(Duration.minutes(1));
-        assert.equal(startCount, 1);
-      }).pipe(Effect.provide(TestClock.layer())),
-    ),
+        ),
+        httpClientLayer: layerHttpClient(() => Effect.never),
+        onStateDirOwned: Deferred.succeed(refused, undefined).pipe(Effect.asVoid),
+      });
+      yield* instance.start;
+      yield* Deferred.await(refused);
+      const snapshot = yield* instance.snapshot;
+      assert.isFalse(snapshot.desiredRunning);
+      assert.isFalse(snapshot.restartScheduled);
+      yield* TestClock.adjust(Duration.minutes(1));
+      assert.equal(startCount, 1);
+    }).pipe(Effect.provide(TestClock.layer())),
   );
 
   // A policy refusal is reported on the first exit, since retrying cannot fix it.
@@ -632,145 +620,167 @@ describe("DesktopBackendManager", () => {
   ])(
     "reports exit $code with the server output after $exits exits",
     ({ code, exits, managedPolicy }) =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const message = "Error: Cannot find module 'zod/v4' in /Users/René";
-          let exitCount = 0;
-          const firstExit = yield* Deferred.make<void>();
-          const reports = yield* Queue.unbounded<{
-            readonly exitCount: number;
-            readonly failure: DesktopBackendManager.BackendStartupFailure;
-          }>();
-          const instance = yield* makeTestInstance({
-            spawnerLayer: Layer.succeed(
-              ChildProcessSpawner.ChildProcessSpawner,
-              ChildProcessSpawner.make(() =>
-                Effect.succeed(
-                  makeProcess({
-                    // "é" split across chunks must not decode as U+FFFD, and the 4,000-char cut
-                    // lands inside the emoji's surrogate pair.
-                    stderr: Stream.make(
-                      new TextEncoder().encode(
-                        `😀${"x".repeat(3_999 - message.length)}${message.slice(0, -1)}`,
-                      ),
-                      new Uint8Array([0xc3]),
-                      new Uint8Array([0xa9]),
+      Effect.gen(function* () {
+        const message = "Error: Cannot find module 'zod/v4' in /Users/René";
+        let exitCount = 0;
+        const firstExit = yield* Deferred.make<void>();
+        const reports = yield* Queue.unbounded<{
+          readonly exitCount: number;
+          readonly failure: DesktopBackendManager.BackendStartupFailure;
+        }>();
+        const instance = yield* makeTestInstance({
+          spawnerLayer: Layer.succeed(
+            ChildProcessSpawner.ChildProcessSpawner,
+            ChildProcessSpawner.make(() =>
+              Effect.succeed(
+                makeProcess({
+                  // "é" split across chunks must not decode as U+FFFD, and the 4,000-char cut
+                  // lands inside the emoji's surrogate pair.
+                  stderr: Stream.make(
+                    new TextEncoder().encode(
+                      `😀${"x".repeat(3_999 - message.length)}${message.slice(0, -1)}`,
                     ),
-                    exitCode: Effect.succeed(ChildProcessSpawner.ExitCode(code)),
-                  }),
-                ),
+                    new Uint8Array([0xc3]),
+                    new Uint8Array([0xa9]),
+                  ),
+                  exitCode: Effect.succeed(ChildProcessSpawner.ExitCode(code)),
+                }),
               ),
             ),
-            httpClientLayer: layerHttpClient(() => Effect.never),
-            backendOutputLog: {
-              persistFailure: () => {
-                exitCount += 1;
-                return Deferred.succeed(firstExit, undefined).pipe(Effect.asVoid);
-              },
+          ),
+          httpClientLayer: layerHttpClient(() => Effect.never),
+          backendOutputLog: {
+            persistFailure: () => {
+              exitCount += 1;
+              return Deferred.succeed(firstExit, undefined).pipe(Effect.asVoid);
             },
-            onStartupFailure: (failure) =>
-              Queue.offer(reports, { exitCount, failure }).pipe(Effect.asVoid),
-          });
-          yield* instance.start;
-          yield* Deferred.await(firstExit);
-          yield* TestClock.adjust(Duration.minutes(1));
-          const { exitCount: exitsWhenReported, failure } = yield* Queue.take(reports);
-          assert.equal(exitsWhenReported, exits);
-          assert.equal(failure.reason, `The server could not start (code=${code}).`);
-          assert.equal(failure.managedPolicy, managedPolicy);
-          assert.isTrue(failure.output.endsWith(message));
-          assert.isTrue(failure.output.isWellFormed());
-        }).pipe(Effect.provide(TestClock.layer())),
-      ),
+          },
+          onStartupFailure: (failure) =>
+            Queue.offer(reports, { exitCount, failure }).pipe(Effect.asVoid),
+        });
+        yield* instance.start;
+        yield* Deferred.await(firstExit);
+        yield* TestClock.adjust(Duration.minutes(1));
+        const { exitCount: exitsWhenReported, failure } = yield* Queue.take(reports);
+        assert.equal(exitsWhenReported, exits);
+        assert.equal(failure.reason, `The server could not start (code=${code}).`);
+        assert.equal(failure.managedPolicy, managedPolicy);
+        assert.isTrue(failure.output.endsWith(message));
+        assert.isTrue(failure.output.isWellFormed());
+      }).pipe(Effect.provide(TestClock.layer())),
   );
 
   it.effect("waits out a slow startup and reports one that never becomes ready", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const reports = yield* Queue.unbounded<DesktopBackendManager.BackendStartupFailure>();
-        const startInstance = (status: Ref.Ref<number>, onReady?: Effect.Effect<void>) =>
-          makeTestInstance({
-            spawnerLayer: Layer.succeed(
-              ChildProcessSpawner.ChildProcessSpawner,
-              ChildProcessSpawner.make(() =>
-                Effect.succeed(makeProcess({ exitCode: Effect.never })),
+    Effect.gen(function* () {
+      const reports = yield* Queue.unbounded<DesktopBackendManager.BackendStartupFailure>();
+      const startInstance = (status: Ref.Ref<number>, onReady?: Effect.Effect<void>, stdout = "") =>
+        makeTestInstance({
+          spawnerLayer: Layer.succeed(
+            ChildProcessSpawner.ChildProcessSpawner,
+            ChildProcessSpawner.make(() =>
+              Effect.succeed(
+                makeProcess({
+                  exitCode: Effect.never,
+                  stdout: Stream.make(new TextEncoder().encode(stdout)),
+                }),
               ),
             ),
-            httpClientLayer: layerHttpClient((request) =>
-              Ref.get(status).pipe(Effect.map((code) => responseForRequest(request, code))),
-            ),
-            onStartupFailure: (failure) => Queue.offer(reports, failure).pipe(Effect.asVoid),
-            ...(onReady ? { onReady } : {}),
-          }).pipe(Effect.tap((instance) => instance.start));
-
-        const slowStatus = yield* Ref.make(503);
-        const ready = yield* Deferred.make<void>();
-        yield* startInstance(slowStatus, Deferred.succeed(ready, undefined).pipe(Effect.asVoid));
-        yield* TestClock.adjust(Duration.seconds(66));
-        yield* Ref.set(slowStatus, 200);
-        yield* TestClock.adjust(Duration.millis(100));
-        yield* Deferred.await(ready);
-        assert.isTrue(Option.isNone(yield* Queue.poll(reports)));
-
-        yield* startInstance(yield* Ref.make(503));
-        yield* TestClock.adjust(Duration.seconds(179));
-        assert.isTrue(Option.isNone(yield* Queue.poll(reports)));
-        yield* TestClock.adjust(Duration.seconds(1));
-        const failure = yield* Queue.take(reports);
-        assert.equal(failure.reason, "The server started but did not become ready in time.");
-      }).pipe(Effect.provide(TestClock.layer())),
-    ),
+          ),
+          httpClientLayer: layerHttpClient((request) =>
+            Ref.get(status).pipe(Effect.map((code) => responseForRequest(request, code))),
+          ),
+          onStartupFailure: (failure) => Queue.offer(reports, failure).pipe(Effect.asVoid),
+          ...(onReady ? { onReady } : {}),
+        }).pipe(Effect.tap((instance) => instance.start));
+
+      const slowStatus = yield* Ref.make(503);
+      const ready = yield* Deferred.make<void>();
+      yield* startInstance(slowStatus, Deferred.succeed(ready, undefined).pipe(Effect.asVoid));
+      yield* TestClock.adjust(Duration.seconds(66));
+      yield* Ref.set(slowStatus, 200);
+      yield* TestClock.adjust(Duration.millis(100));
+      yield* Deferred.await(ready);
+      assert.isTrue(Option.isNone(yield* Queue.poll(reports)));
+
+      const migratingStatus = yield* Ref.make(503);
+      const migrated = yield* Deferred.make<void>();
+      yield* startInstance(
+        migratingStatus,
+        Deferred.succeed(migrated, undefined).pipe(Effect.asVoid),
+        // Enough progress lines that the start line scrolls out of the output tail.
+        `INFO ${DATABASE_MIGRATIONS_STARTED_MESSAGE}\n` +
+          Array.from(
+            { length: 80 },
+            (_, index) =>
+              `INFO ${DATABASE_MIGRATION_PROGRESS_MESSAGE} migration=${index}_Migration progress="${index + 1} of 80"\n`,
+          ).join(""),
+      );
+      yield* TestClock.adjust(Duration.minutes(10));
+      assert.isTrue(Option.isNone(yield* Queue.poll(reports)));
+      yield* Ref.set(migratingStatus, 200);
+      yield* TestClock.adjust(Duration.millis(100));
+      yield* Deferred.await(migrated);
+
+      yield* startInstance(
+        yield* Ref.make(503),
+        undefined,
+        `${DATABASE_MIGRATIONS_STARTED_MESSAGE}\n${DATABASE_MIGRATIONS_FINISHED_MESSAGE}\n`,
+      );
+      yield* TestClock.adjust(Duration.seconds(179));
+      assert.isTrue(Option.isNone(yield* Queue.poll(reports)));
+      yield* TestClock.adjust(Duration.seconds(1));
+      const failure = yield* Queue.take(reports);
+      assert.equal(failure.reason, "The server started but did not become ready in time.");
+    }).pipe(Effect.provide(TestClock.layer())),
   );
 
   it.effect("the quit stop keeps waiting for a backend that outlasts its deadline", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const spawned = yield* Deferred.make<void>();
-        const teardownStarted = yield* Deferred.make<void>();
-        const teardownFinished = yield* Deferred.make<void>();
-        const instance = yield* makeTestInstance({
-          spawnerLayer: Layer.succeed(
-            ChildProcessSpawner.ChildProcessSpawner,
-            ChildProcessSpawner.make(() =>
-              Effect.gen(function* () {
-                const scope = yield* Scope.Scope;
-                yield* Deferred.succeed(spawned, undefined);
-                yield* Scope.addFinalizer(
-                  scope,
-                  Deferred.succeed(teardownStarted, undefined).pipe(
-                    Effect.andThen(Effect.sleep(Duration.seconds(10))),
-                    Effect.andThen(Deferred.succeed(teardownFinished, undefined)),
-                    Effect.asVoid,
-                  ),
-                );
-                return makeProcess({
-                  exitCode: Deferred.await(teardownFinished).pipe(
-                    Effect.as(ChildProcessSpawner.ExitCode(0)),
-                  ),
-                });
-              }),
-            ),
+    Effect.gen(function* () {
+      const spawned = yield* Deferred.make<void>();
+      const teardownStarted = yield* Deferred.make<void>();
+      const teardownFinished = yield* Deferred.make<void>();
+      const instance = yield* makeTestInstance({
+        spawnerLayer: Layer.succeed(
+          ChildProcessSpawner.ChildProcessSpawner,
+          ChildProcessSpawner.make(() =>
+            Effect.gen(function* () {
+              const scope = yield* Scope.Scope;
+              yield* Deferred.succeed(spawned, undefined);
+              yield* Scope.addFinalizer(
+                scope,
+                Deferred.succeed(teardownStarted, undefined).pipe(
+                  Effect.andThen(Effect.sleep(Duration.seconds(10))),
+                  Effect.andThen(Deferred.succeed(teardownFinished, undefined)),
+                  Effect.asVoid,
+                ),
+              );
+              return makeProcess({
+                exitCode: Deferred.await(teardownFinished).pipe(
+                  Effect.as(ChildProcessSpawner.ExitCode(0)),
+                ),
+              });
+            }),
           ),
-          httpClientLayer: layerHttpClient(() => Effect.never),
-        });
-        yield* instance.start;
-        yield* Deferred.await(spawned);
-
-        // App quit and the updater stop every backend with this deadline.
-        const quitDone = yield* Deferred.make<void>();
-        const quitFiber = yield* instance
-          .stop({ timeout: DesktopBackendManager.BACKEND_QUIT_STOP_TIMEOUT })
-          .pipe(Effect.andThen(Deferred.succeed(quitDone, undefined)), Effect.forkChild);
-
-        yield* Deferred.await(teardownStarted);
-        // Past the quit deadline, quit must still wait for the backend to exit.
-        yield* TestClock.adjust(Duration.seconds(9));
-        assert.isFalse(yield* Deferred.isDone(quitDone));
-
-        yield* TestClock.adjust(Duration.seconds(1));
-        yield* Fiber.join(quitFiber);
-        assert.isTrue(yield* Deferred.isDone(teardownFinished));
-      }).pipe(Effect.provide(TestClock.layer())),
-    ),
+        ),
+        httpClientLayer: layerHttpClient(() => Effect.never),
+      });
+      yield* instance.start;
+      yield* Deferred.await(spawned);
+
+      // App quit and the updater stop every backend with this deadline.
+      const quitDone = yield* Deferred.make<void>();
+      const quitFiber = yield* instance
+        .stop({ timeout: DesktopBackendManager.BACKEND_QUIT_STOP_TIMEOUT })
+        .pipe(Effect.andThen(Deferred.succeed(quitDone, undefined)), Effect.forkChild);
+
+      yield* Deferred.await(teardownStarted);
+      // Past the quit deadline, quit must still wait for the backend to exit.
+      yield* TestClock.adjust(Duration.seconds(9));
+      assert.isFalse(yield* Deferred.isDone(quitDone));
+
+      yield* TestClock.adjust(Duration.seconds(1));
+      yield* Fiber.join(quitFiber);
+      assert.isTrue(yield* Deferred.isDone(teardownFinished));
+    }).pipe(Effect.provide(TestClock.layer())),
   );
 });
diff --git a/apps/desktop/src/backend/DesktopBackendManager.ts b/apps/desktop/src/backend/DesktopBackendManager.ts
index d24b2f52f295..89ebc9e862ec 100644
--- a/apps/desktop/src/backend/DesktopBackendManager.ts
+++ b/apps/desktop/src/backend/DesktopBackendManager.ts
@@ -25,6 +25,7 @@ import {
   DesktopTelemetryControlMessage,
   type DesktopTelemetryControlMessage as DesktopTelemetryControlMessageValue,
 } from "@t3tools/contracts";
+import { isRunningDatabaseMigrations } from "@t3tools/shared/databaseMigrationLog";
 import { waitForHttpReady as waitForHttpReadyShared } from "@t3tools/shared/httpReadiness";
 
 import * as DesktopObservability from "../app/DesktopObservability.ts";
@@ -204,7 +205,7 @@ interface RunBackendProcessOptions extends DesktopBackendStartConfig {
   readonly outputDrainTimeout?: Duration.Duration;
   readonly onStarted?: (pid: number) => Effect.Effect<void>;
   readonly onExitObserved?: () => Effect.Effect<void>;
-  readonly onReady?: () => Effect.Effect<void>;
+  readonly onReady?: (pid: number) => Effect.Effect<void>;
   readonly onReadinessFailure?: (error: BackendReadinessTimeoutError) => Effect.Effect<void>;
   readonly onOutput?: (
     streamName: BackendProcessOutputStream,
@@ -251,8 +252,8 @@ export interface BackendInstanceSpec {
   readonly id: BackendInstanceId;
   readonly label: Effect.Effect<string>;
   readonly configResolve: Effect.Effect<DesktopBackendStartConfig, PlatformError.PlatformError>;
-  /** Receives the ready run's resolved URL; reading current config could race a subsequent restart. */
-  readonly onReady?: (httpBaseUrl: URL) => Effect.Effect<void>;
+  /** Receives the ready run's URL and pid; reading current config could race a subsequent restart. */
+  readonly onReady?: (httpBaseUrl: URL, pid: number) => Effect.Effect<void>;
   readonly onShutdown?: () => Effect.Effect<void>;
   readonly onPreflightFailed?: (failure: PreflightFailure) => Effect.Effect<boolean>;
   readonly onStateDirOwned?: () => Effect.Effect<void>;
@@ -577,7 +578,7 @@ export const runBackendProcess = Effect.fn("runBackendProcess")(function* (
       httpBaseUrl: options.httpBaseUrl,
       timeout: options.readinessTimeout ?? DEFAULT_BACKEND_READINESS_TIMEOUT,
     }).pipe(
-      Effect.flatMap(() => options.onReady?.() ?? Effect.void),
+      Effect.flatMap(() => options.onReady?.(handle.pid) ?? Effect.void),
       Effect.as(true),
       Effect.catchTags({
         BackendReadinessTimeoutError: (error) =>
@@ -938,7 +939,7 @@ export const makeBackendInstance = Effect.fn("makeBackendInstance")(function* (
               ...run,
               exitObserved: true,
             })),
-          onReady: Effect.fn("desktop.backendInstance.onReady")(function* () {
+          onReady: Effect.fn("desktop.backendInstance.onReady")(function* (pid) {
             const isCurrentRun = yield* SubscriptionRef.modify(state, (latest) => {
               const activeRun = Option.getOrUndefined(latest.active);
               if (activeRun?.id !== runId) {
@@ -958,7 +959,7 @@ export const makeBackendInstance = Effect.fn("makeBackendInstance")(function* (
               return;
             }
 
-            yield* spec.onReady?.(config.value.httpBaseUrl) ?? Effect.void;
+            yield* spec.onReady?.(config.value.httpBaseUrl, pid) ?? Effect.void;
             if (
               config.value.runningDistro !== undefined &&
               config.value.wslRuntimeId !== undefined
@@ -971,6 +972,12 @@ export const makeBackendInstance = Effect.fn("makeBackendInstance")(function* (
           }),
           onReadinessFailure: Effect.fn("desktop.backendInstance.onReadinessFailure")(
             function* (error) {
+              if (isRunningDatabaseMigrations(yield* Ref.get(outputTail))) {
+                yield* logInstanceWarning("backend is still migrating its database; waiting", {
+                  error: error.message,
+                });
+                return;
+              }
               yield* logInstanceWarning("backend readiness check failed during bootstrap", {
                 error: error.message,
               });
diff --git a/apps/desktop/src/backend/DesktopBackendPool.test.ts b/apps/desktop/src/backend/DesktopBackendPool.test.ts
index c46e0b3a2607..8e9f4320c08c 100644
--- a/apps/desktop/src/backend/DesktopBackendPool.test.ts
+++ b/apps/desktop/src/backend/DesktopBackendPool.test.ts
@@ -1,5 +1,5 @@
-import * as NodeServices from "@effect/platform-node/NodeServices";
 import { assert, describe, it } from "@effect/vitest";
+import { DESKTOP_UPDATE_IN_PROGRESS_TTL_MS } from "@t3tools/contracts";
 import * as Deferred from "effect/Deferred";
 import * as Duration from "effect/Duration";
 import * as Effect from "effect/Effect";
@@ -110,27 +110,52 @@ const runningConfig = {
 
 function layerPool(
   labelRef: Ref.Ref<string>,
-  backend?: Effect.Success<ReturnType<typeof makeFakeBackendProcess>>,
+  options: {
+    readonly config?: DesktopBackendStartConfig;
+    readonly fileSystem?: Partial<FileSystem.FileSystem>;
+    readonly spawner?: ChildProcessSpawner.ChildProcessSpawner["Service"];
+    readonly httpClient?: HttpClient.HttpClient;
+    readonly onReady?: Effect.Effect<void>;
+    readonly backend?: Effect.Success<ReturnType<typeof makeFakeBackendProcess>>;
+  } = {},
 ): Layer.Layer<DesktopBackendPool.DesktopBackendPool> {
   return DesktopBackendPool.layer.pipe(
     Layer.provideMerge(
       Layer.mergeAll(
-        FileSystem.layerNoop({ exists: () => Effect.succeed(true) }),
+        DesktopEnvironment.layer({
+          dirname: "/repo/apps/desktop/src",
+          homeDirectory: "/test-home",
+          platform: "linux",
+          processArch: "x64",
+          appVersion: "1.2.3",
+          appPath: "/repo",
+          isPackaged: true,
+          resourcesPath: "/missing/resources",
+          runningUnderArm64Translation: false,
+        }).pipe(
+          Layer.provide(
+            Layer.mergeAll(Path.layer, DesktopConfig.layerTest({ T3CODE_HOME: "/test-home" })),
+          ),
+          Layer.orDie,
+        ),
+        FileSystem.layerNoop(options.fileSystem ?? { exists: () => Effect.succeed(true) }),
         Path.layer,
-        backend?.layer ??
+        options.backend?.layer ??
           Layer.succeed(
             ChildProcessSpawner.ChildProcessSpawner,
-            ChildProcessSpawner.make(() => Effect.die("unexpected child process spawn")),
+            options.spawner ??
+              ChildProcessSpawner.make(() => Effect.die("unexpected child process spawn")),
           ),
         Layer.succeed(
           HttpClient.HttpClient,
-          HttpClient.make((request) =>
-            backend === undefined
-              ? Effect.die("unexpected HTTP request")
-              : Effect.succeed(
-                  HttpClientResponse.fromWeb(request, new Response(null, { status: 200 })),
-                ),
-          ),
+          options.httpClient ??
+            HttpClient.make((request) =>
+              options.backend === undefined
+                ? Effect.die("unexpected HTTP request")
+                : Effect.succeed(
+                    HttpClientResponse.fromWeb(request, new Response(null, { status: 200 })),
+                  ),
+            ),
         ),
         Layer.succeed(DesktopObservability.DesktopBackendOutputLogFactory, {
           forInstance: () =>
@@ -155,26 +180,14 @@ function layerPool(
         }),
         DesktopBrowserHost.layer,
         Layer.succeed(DesktopBackendConfiguration.DesktopBackendConfiguration, {
-          resolvePrimary: Effect.die("unexpected primary config resolve"),
+          resolvePrimary: options.config
+            ? Effect.succeed(options.config)
+            : Effect.die("unexpected primary config resolve"),
           resolvePrimaryLabel: Ref.get(labelRef),
           resolveWsl: () => Effect.die("unexpected WSL config resolve"),
           currentBootstrapToken: Effect.die("unexpected bootstrap token read"),
         } satisfies DesktopBackendConfiguration.DesktopBackendConfiguration["Service"]),
         DesktopAppSettings.layerTest(),
-        DesktopEnvironment.layer({
-          dirname: "/repo/apps/desktop/src",
-          homeDirectory: "/home/test",
-          platform: "linux",
-          processArch: "x64",
-          appVersion: "0.0.0",
-          appPath: "/repo",
-          isPackaged: true,
-          resourcesPath: "/missing/resources",
-          runningUnderArm64Translation: false,
-        }).pipe(
-          Layer.provide(Layer.mergeAll(NodeServices.layer, DesktopConfig.layerTest({}))),
-          Layer.orDie,
-        ),
         DesktopState.layer,
         DesktopWslEnvironment.layerTest(),
         ElectronDialog.layer,
@@ -186,7 +199,7 @@ function layerPool(
           activate: Effect.die("unexpected window activate"),
           createMainIfBackendReady: Effect.die("unexpected window create"),
           showConnectingSplash: Effect.void,
-          handleBackendReady: () => Effect.void,
+          handleBackendReady: () => options.onReady ?? Effect.void,
           handleBackendNotReady: Effect.void,
           flushMainWindowBounds: Effect.void,
           prepareCaptureReveal: Effect.void,
@@ -201,86 +214,268 @@ function layerPool(
   );
 }
 
+const markerPath = "/test-home/runtime/desktop-update-in-progress";
+const runtimePath = "/test-home/userdata/server-runtime.json";
+
+const makeUpdateMarkerFixture = () =>
+  Effect.gen(function* () {
+    const allowReady = yield* Deferred.make<void>();
+    const runtimeChecked = yield* Deferred.make<void>();
+    const markerRemoved = yield* Deferred.make<void>();
+    const readyRuns = yield* Queue.unbounded<void>();
+    let nextPid = 123;
+    const files = new Map([[markerPath, JSON.stringify({ startedAt: 0, expiresAt: 60_000 })]]);
+    const removed: string[] = [];
+    const config: DesktopBackendStartConfig = {
+      executablePath: "/electron",
+      args: [],
+      entryPath: "/server/bin.mjs",
+      cwd: "/server",
+      env: {},
+      bootstrap: {
+        mode: "desktop",
+        noBrowser: true,
+        port: 3774,
+        t3Home: "/test-home",
+        host: "127.0.0.1",
+        desktopBootstrapToken: "token",
+        tailscaleServeEnabled: false,
+        tailscaleServePort: 443,
+      },
+      bootstrapDelivery: "fd3",
+      extendEnv: true,
+      httpBaseUrl: new URL("http://127.0.0.1:3774"),
+      captureOutput: false,
+      preflightFailure: Option.none(),
+    };
+    const layer = layerPool(Ref.makeUnsafe("Local"), {
+      config,
+      fileSystem: {
+        exists: (path) => Effect.succeed(files.has(path) || path === config.entryPath),
+        readFileString: (path) =>
+          (path === runtimePath ? Deferred.succeed(runtimeChecked, undefined) : Effect.void).pipe(
+            Effect.andThen(Effect.sync(() => files.get(path) ?? "")),
+          ),
+        remove: (path) =>
+          Effect.sync(() => {
+            removed.push(path);
+            files.delete(path);
+          }).pipe(
+            Effect.andThen(
+              path === markerPath ? Deferred.succeed(markerRemoved, undefined) : Effect.void,
+            ),
+            Effect.asVoid,
+          ),
+      },
+      spawner: ChildProcessSpawner.make(() =>
+        Effect.gen(function* () {
+          const exited = yield* Deferred.make<ChildProcessSpawner.ExitCode>();
+          const exit = Deferred.succeed(exited, ChildProcessSpawner.ExitCode(0)).pipe(
+            Effect.asVoid,
+          );
+          // Like the real spawner, closing the run's scope ends the process.
+          yield* Effect.addFinalizer(() => exit);
+          return ChildProcessSpawner.makeHandle({
+            pid: ChildProcessSpawner.ProcessId(nextPid++),
+            stdout: Stream.empty,
+            stderr: Stream.empty,
+            all: Stream.empty,
+            exitCode: Deferred.await(exited),
+            isRunning: Effect.succeed(true),
+            kill: () => exit,
+            stdin: Sink.drain,
+            getInputFd: () => Sink.drain,
+            getOutputFd: () => Stream.empty,
+            unref: Effect.succeed(Effect.void),
+          });
+        }),
+      ),
+      httpClient: HttpClient.make((request) =>
+        Deferred.await(allowReady).pipe(
+          Effect.as(HttpClientResponse.fromWeb(request, new Response(null, { status: 200 }))),
+        ),
+      ),
+      onReady: Queue.offer(readyRuns, undefined).pipe(Effect.asVoid),
+    });
+    const publishRuntime = (pid: number) =>
+      files.set(
+        runtimePath,
+        JSON.stringify({
+          version: 1,
+          pid,
+          port: 3774,
+          origin: "http://127.0.0.1:3774",
+          startedAt: "2026-10-27T00:00:00.000Z",
+        }),
+      );
+    return {
+      layer,
+      files,
+      removed,
+      allowReady,
+      readyRuns,
+      runtimeChecked,
+      markerRemoved,
+      publishRuntime,
+    };
+  });
+
 describe("DesktopBackendPool", () => {
-  it.effect("unregister during pool quit does not interrupt sibling stops", () =>
-    Effect.scoped(
+  it.effect(
+    "keeps the update marker after HTTP readiness until the backend publishes its runtime",
+    () =>
       Effect.gen(function* () {
-        const backend = yield* makeFakeBackendProcess();
+        const fixture = yield* makeUpdateMarkerFixture();
         yield* Effect.gen(function* () {
           const pool = yield* DesktopBackendPool.DesktopBackendPool;
-          const id = DesktopBackendPool.BackendInstanceId("wsl:Ubuntu");
-          const ready = yield* Deferred.make<void>();
-          const siblingStarted = yield* Deferred.make<void>();
-          const finishSibling = yield* Deferred.make<void>();
-          let siblingCompleted = false;
-          const instance = yield* pool.register({
-            id,
-            label: Effect.succeed("WSL (Ubuntu)"),
-            configResolve: Effect.succeed(runningConfig),
-            onReady: () => Deferred.succeed(ready, undefined).pipe(Effect.asVoid),
-          });
-          yield* instance.start;
-          yield* backend.started;
-          yield* Deferred.await(ready);
-          const quitFiber = yield* Effect.all(
-            [
-              instance.stop({ timeout: Duration.seconds(5) }),
-              Deferred.succeed(siblingStarted, undefined).pipe(
-                Effect.andThen(Deferred.await(finishSibling)),
-                Effect.andThen(
-                  Effect.sync(() => {
-                    siblingCompleted = true;
-                  }),
-                ),
-              ),
-            ],
-            { concurrency: "unbounded" },
-          ).pipe(Effect.forkChild);
-          yield* Deferred.await(siblingStarted);
-          assert.equal(yield* Queue.take(backend.signals), "SIGTERM");
-          const unregisterFiber = yield* pool.unregister(id).pipe(Effect.forkChild);
+          const primary = yield* pool.primary;
+          yield* primary.start;
+          yield* Deferred.succeed(fixture.allowReady, undefined);
+          yield* Queue.take(fixture.readyRuns);
+          assert.isTrue(
+            fixture.files.has(markerPath),
+            "a launcher could neither wait nor adopt between readiness and publication",
+          );
+          yield* Deferred.await(fixture.runtimeChecked);
           yield* TestClock.adjust(Duration.seconds(5));
-          assert.equal(yield* Queue.take(backend.signals), "SIGKILL");
-          assert.isUndefined(quitFiber.pollUnsafe());
-          assert.isUndefined(unregisterFiber.pollUnsafe());
-          assert.isTrue(yield* backend.isRunning);
-          yield* TestClock.adjust(backend.killWait);
-          yield* Fiber.join(unregisterFiber);
-          yield* Deferred.succeed(finishSibling, undefined);
-          yield* Fiber.join(quitFiber);
-
-          assert.isTrue(siblingCompleted);
-          assert.isFalse(yield* backend.isRunning);
-          assert.isTrue(Option.isNone((yield* instance.snapshot).activePid));
-          assert.isTrue(Option.isNone(yield* pool.get(id)));
-        }).pipe(Effect.provide(layerPool(Ref.makeUnsafe("Windows"), backend)));
+          assert.isTrue(fixture.files.has(markerPath));
+          fixture.publishRuntime(456);
+          yield* TestClock.adjust(Duration.seconds(1));
+          assert.isTrue(
+            fixture.files.has(markerPath),
+            "another process's runtime is not the replacement",
+          );
+          fixture.publishRuntime(123);
+          yield* TestClock.adjust(Duration.seconds(1));
+          yield* Deferred.await(fixture.markerRemoved);
+          assert.deepEqual(fixture.removed, [markerPath]);
+        }).pipe(Effect.provide(fixture.layer));
       }),
-    ),
   );
 
-  it.effect("unregister stops the registered instance", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const id = DesktopBackendPool.BackendInstanceId("wsl:Ubuntu");
+  it.effect("leaves a replacement update marker written while an earlier wait is pending", () =>
+    Effect.gen(function* () {
+      const fixture = yield* makeUpdateMarkerFixture();
+      yield* Effect.gen(function* () {
+        const pool = yield* DesktopBackendPool.DesktopBackendPool;
+        const primary = yield* pool.primary;
+        yield* primary.start;
+        yield* Deferred.succeed(fixture.allowReady, undefined);
+        yield* Queue.take(fixture.readyRuns);
+        yield* Deferred.await(fixture.runtimeChecked);
+        yield* TestClock.adjust(Duration.millis(DESKTOP_UPDATE_IN_PROGRESS_TTL_MS - 1_000));
+        const replacement = JSON.stringify({ startedAt: 59_000, expiresAt: 119_000 });
+        fixture.files.set(markerPath, replacement);
+        yield* TestClock.adjust(Duration.millis(DESKTOP_UPDATE_IN_PROGRESS_TTL_MS));
+        assert.equal(fixture.files.get(markerPath), replacement);
+        assert.deepEqual(fixture.removed, []);
+      }).pipe(Effect.provide(fixture.layer));
+    }),
+  );
+
+  it.effect("a later backend run's readiness supersedes the earlier run's marker wait", () =>
+    Effect.gen(function* () {
+      const fixture = yield* makeUpdateMarkerFixture();
+      yield* Effect.gen(function* () {
         const pool = yield* DesktopBackendPool.DesktopBackendPool;
+        const primary = yield* pool.primary;
+        yield* primary.start;
+        yield* Deferred.succeed(fixture.allowReady, undefined);
+        yield* Queue.take(fixture.readyRuns);
+        yield* Deferred.await(fixture.runtimeChecked);
+        yield* TestClock.adjust(Duration.seconds(30));
+        yield* primary.stop();
+        yield* primary.start;
+        yield* Queue.take(fixture.readyRuns);
+        yield* TestClock.adjust(Duration.seconds(31));
+        assert.isTrue(
+          fixture.files.has(markerPath),
+          "the earlier run's wait must not end the later run's handoff",
+        );
+        assert.deepEqual(fixture.removed, []);
+        fixture.publishRuntime(124);
+        yield* TestClock.adjust(Duration.millis(100));
+        yield* Deferred.await(fixture.markerRemoved);
+        assert.deepEqual(fixture.removed, [markerPath]);
+      }).pipe(Effect.provide(fixture.layer));
+    }),
+  );
+
+  it.effect("unregister during pool quit does not interrupt sibling stops", () =>
+    Effect.gen(function* () {
+      const backend = yield* makeFakeBackendProcess();
+      yield* Effect.gen(function* () {
+        const pool = yield* DesktopBackendPool.DesktopBackendPool;
+        const id = DesktopBackendPool.BackendInstanceId("wsl:Ubuntu");
+        const ready = yield* Deferred.make<void>();
+        const siblingStarted = yield* Deferred.make<void>();
+        const finishSibling = yield* Deferred.make<void>();
+        let siblingCompleted = false;
         const instance = yield* pool.register({
           id,
           label: Effect.succeed("WSL (Ubuntu)"),
-          configResolve: Effect.succeed({
-            ...runningConfig,
-            preflightFailure: Option.some({ reason: "WSL starting", fatal: false }),
-          }),
+          configResolve: Effect.succeed(runningConfig),
+          onReady: () => Deferred.succeed(ready, undefined).pipe(Effect.asVoid),
         });
         yield* instance.start;
-        assert.equal((yield* instance.snapshot).restartScheduled, true);
+        yield* backend.started;
+        yield* Deferred.await(ready);
+        const quitFiber = yield* Effect.all(
+          [
+            instance.stop({ timeout: Duration.seconds(5) }),
+            Deferred.succeed(siblingStarted, undefined).pipe(
+              Effect.andThen(Deferred.await(finishSibling)),
+              Effect.andThen(
+                Effect.sync(() => {
+                  siblingCompleted = true;
+                }),
+              ),
+            ),
+          ],
+          { concurrency: "unbounded" },
+        ).pipe(Effect.forkChild);
+        yield* Deferred.await(siblingStarted);
+        assert.equal(yield* Queue.take(backend.signals), "SIGTERM");
+        const unregisterFiber = yield* pool.unregister(id).pipe(Effect.forkChild);
+        yield* TestClock.adjust(Duration.seconds(5));
+        assert.equal(yield* Queue.take(backend.signals), "SIGKILL");
+        assert.isUndefined(quitFiber.pollUnsafe());
+        assert.isUndefined(unregisterFiber.pollUnsafe());
+        assert.isTrue(yield* backend.isRunning);
+        yield* TestClock.adjust(backend.killWait);
+        yield* Fiber.join(unregisterFiber);
+        yield* Deferred.succeed(finishSibling, undefined);
+        yield* Fiber.join(quitFiber);
 
-        yield* pool.unregister(id);
+        assert.isTrue(siblingCompleted);
+        assert.isFalse(yield* backend.isRunning);
+        assert.isTrue(Option.isNone((yield* instance.snapshot).activePid));
+        assert.isTrue(Option.isNone(yield* pool.get(id)));
+      }).pipe(Effect.provide(layerPool(Ref.makeUnsafe("Windows"), { backend })));
+    }),
+  );
 
-        const stopped = yield* instance.snapshot;
-        assert.equal(stopped.desiredRunning, false);
-        assert.equal(stopped.restartScheduled, false);
-        assert.equal(Option.isNone(yield* pool.get(id)), true);
-      }).pipe(Effect.provide(layerPool(Ref.makeUnsafe("Windows")))),
-    ),
+  it.effect("unregister stops the registered instance", () =>
+    Effect.gen(function* () {
+      const id = DesktopBackendPool.BackendInstanceId("wsl:Ubuntu");
+      const pool = yield* DesktopBackendPool.DesktopBackendPool;
+      const instance = yield* pool.register({
+        id,
+        label: Effect.succeed("WSL (Ubuntu)"),
+        configResolve: Effect.succeed({
+          ...runningConfig,
+          preflightFailure: Option.some({ reason: "WSL starting", fatal: false }),
+        }),
+      });
+      yield* instance.start;
+      assert.equal((yield* instance.snapshot).restartScheduled, true);
+
+      yield* pool.unregister(id);
+
+      const stopped = yield* instance.snapshot;
+      assert.equal(stopped.desiredRunning, false);
+      assert.equal(stopped.restartScheduled, false);
+      assert.equal(Option.isNone(yield* pool.get(id)), true);
+    }).pipe(Effect.provide(layerPool(Ref.makeUnsafe("Windows")))),
   );
 });
diff --git a/apps/desktop/src/backend/DesktopBackendPool.ts b/apps/desktop/src/backend/DesktopBackendPool.ts
index 82d542b322c8..d69e1ce1427f 100644
--- a/apps/desktop/src/backend/DesktopBackendPool.ts
+++ b/apps/desktop/src/backend/DesktopBackendPool.ts
@@ -1,10 +1,17 @@
+import {
+  DESKTOP_UPDATE_IN_PROGRESS_MARKER_FILE,
+  DESKTOP_UPDATE_IN_PROGRESS_TTL_MS,
+} from "@t3tools/contracts";
 import * as Context from "effect/Context";
 import * as Deferred from "effect/Deferred";
+import * as Duration from "effect/Duration";
 import * as Effect from "effect/Effect";
 import * as Exit from "effect/Exit";
+import * as FiberHandle from "effect/FiberHandle";
 import * as Layer from "effect/Layer";
 import * as Option from "effect/Option";
 import * as Path from "effect/Path";
+import * as Schedule from "effect/Schedule";
 import * as Schema from "effect/Schema";
 import * as Scope from "effect/Scope";
 import * as SubscriptionRef from "effect/SubscriptionRef";
@@ -31,6 +38,10 @@ import * as ElectronApp from "../electron/ElectronApp.ts";
 const { logWarning: logBackendPoolWarning } =
   DesktopObservability.makeComponentLogger("desktop-backend-pool");
 
+const decodeServerRuntime = Schema.decodeUnknownEffect(
+  Schema.fromJsonString(Schema.Struct({ pid: Schema.Number, port: Schema.Number })),
+);
+
 export type BackendInstanceId = DesktopBackendManager.BackendInstanceId;
 export const BackendInstanceId = DesktopBackendManager.BackendInstanceId;
 export const PRIMARY_INSTANCE_ID = DesktopBackendManager.PRIMARY_INSTANCE_ID;
@@ -106,6 +117,8 @@ type UnregisterAction =
 export const layer = Layer.effect(
   DesktopBackendPool,
   Effect.gen(function* () {
+    const environment = yield* DesktopEnvironment.DesktopEnvironment;
+    const fileSystem = yield* FileSystem.FileSystem;
     const configuration = yield* DesktopBackendConfiguration.DesktopBackendConfiguration;
     const desktopWindow = yield* DesktopWindow.DesktopWindow;
     const electronDialog = yield* ElectronDialog.ElectronDialog;
@@ -119,6 +132,41 @@ export const layer = Layer.effect(
       FileSystem.FileSystem | Path.Path | DesktopEnvironment.DesktopEnvironment
     >();
 
+    const updateMarkerPath = environment.path.join(
+      environment.baseDir,
+      "runtime",
+      DESKTOP_UPDATE_IN_PROGRESS_MARKER_FILE,
+    );
+    const serverRuntimePath = environment.path.join(environment.stateDir, "server-runtime.json");
+    // The server publishes its runtime after HTTP readiness. Until then an SSH launcher
+    // finds nothing to adopt, so dropping the marker earlier lets it start a competing server.
+    const releaseUpdateMarker = Effect.fn("desktop.backendPool.releaseUpdateMarker")(function* (
+      httpBaseUrl: URL,
+      pid: number,
+    ) {
+      const marker = yield* fileSystem.readFileString(updateMarkerPath).pipe(Effect.option);
+      if (Option.isNone(marker)) {
+        return;
+      }
+      yield* fileSystem.readFileString(serverRuntimePath).pipe(
+        Effect.flatMap(decodeServerRuntime),
+        Effect.map((runtime) => runtime.pid === pid && runtime.port === Number(httpBaseUrl.port)),
+        Effect.orElseSucceed(() => false),
+        Effect.repeat({
+          until: (published) => published,
+          schedule: Schedule.spaced(Duration.millis(100)),
+        }),
+        Effect.timeoutOption(Duration.millis(DESKTOP_UPDATE_IN_PROGRESS_TTL_MS)),
+      );
+      // A later update may have replaced the marker; that handoff is not ours to end.
+      const current = yield* fileSystem.readFileString(updateMarkerPath).pipe(Effect.option);
+      if (Option.isSome(current) && current.value === marker.value) {
+        yield* fileSystem.remove(updateMarkerPath, { force: true }).pipe(Effect.ignore);
+      }
+    });
+    // One wait at a time: each run's shutdown or readiness ends the previous run's wait.
+    const updateMarkerWait = yield* FiberHandle.make<void>();
+
     // Persist fatal Windows fallbacks; transient transport failures must preserve the user's WSL preference.
     const handlePrimaryPreflightFailure = Effect.fn("desktop.backendPool.primaryPreflightFailed")(
       function* (failure: DesktopBackendManager.PreflightFailure) {
@@ -165,8 +213,9 @@ export const layer = Layer.effect(
       label: configuration.resolvePrimaryLabel,
       configResolve: configuration.resolvePrimary,
       // Absorb window errors so readiness can reset restartAttempt.
-      onReady: (httpBaseUrl) =>
-        desktopWindow.handleBackendReady(httpBaseUrl).pipe(
+      onReady: (httpBaseUrl, pid) =>
+        FiberHandle.run(updateMarkerWait, releaseUpdateMarker(httpBaseUrl, pid)).pipe(
+          Effect.andThen(desktopWindow.handleBackendReady(httpBaseUrl)),
           // Only once the main window exists, so the recovery window never closes into nothing.
           Effect.andThen(SubscriptionRef.set(primaryBackendStartup, { _tag: "Ready" })),
           Effect.catch((error) =>
@@ -177,7 +226,10 @@ export const layer = Layer.effect(
         ),
       onStartupFailure: (failure) =>
         SubscriptionRef.set(primaryBackendStartup, { _tag: "Failing", ...failure }),
-      onShutdown: () => desktopWindow.handleBackendNotReady,
+      onShutdown: () =>
+        FiberHandle.clear(updateMarkerWait).pipe(
+          Effect.andThen(desktopWindow.handleBackendNotReady),
+        ),
       onPreflightFailed: handlePrimaryPreflightFailure,
       onStateDirOwned: () =>
         DesktopHomeOwner.readLiveHomeOwner().pipe(
diff --git a/apps/desktop/src/backend/tailscaleEndpointProvider.test.ts b/apps/desktop/src/backend/tailscaleEndpointProvider.test.ts
index 054655917cec..397a75770483 100644
--- a/apps/desktop/src/backend/tailscaleEndpointProvider.test.ts
+++ b/apps/desktop/src/backend/tailscaleEndpointProvider.test.ts
@@ -1,7 +1,7 @@
 import { assert, describe, it } from "@effect/vitest";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
-import { HttpClient } from "effect/http";
+import { HttpClient, HttpClientResponse } from "effect/http";
 import { ChildProcessSpawner } from "effect/process";
 
 import { resolveTailscaleAdvertisedEndpoints } from "./tailscaleEndpointProvider.ts";
@@ -79,4 +79,41 @@ describe("tailscale endpoint provider", () => {
         );
       }).pipe(Effect.provide(layerUnusedTailscaleExternalServices)),
   );
+
+  it.effect("offers Tailscale HTTPS only when Serve reaches this desktop's backend", () =>
+    Effect.gen(function* () {
+      const magicDnsStatus = (servedEnvironmentId: string) =>
+        resolveTailscaleAdvertisedEndpoints({
+          port: 3773,
+          serveEnabled: true,
+          networkInterfaces: {},
+          statusJson: `{"Self":{"DNSName":"desktop.example.ts.net.","TailscaleIPs":[]}}`,
+        }).pipe(
+          Effect.map((endpoints) => endpoints.map((endpoint) => endpoint.status)),
+          Effect.provideService(
+            HttpClient.HttpClient,
+            HttpClient.make((request) =>
+              Effect.succeed(
+                HttpClientResponse.fromWeb(
+                  request,
+                  Response.json({
+                    environmentId:
+                      new URL(request.url).hostname === "127.0.0.1"
+                        ? "desktop-backend"
+                        : servedEnvironmentId,
+                    label: "T3 server",
+                    platform: { os: "linux", arch: "x64" },
+                    serverVersion: "0.1.9",
+                    capabilities: { repositoryIdentity: true },
+                  }),
+                ),
+              ),
+            ),
+          ),
+        );
+
+      assert.deepEqual(yield* magicDnsStatus("desktop-backend"), ["available"]);
+      assert.deepEqual(yield* magicDnsStatus("another-server"), ["unavailable"]);
+    }).pipe(Effect.provide(layerUnusedTailscaleExternalServices)),
+  );
 });
diff --git a/apps/desktop/src/backend/tailscaleEndpointProvider.ts b/apps/desktop/src/backend/tailscaleEndpointProvider.ts
index 4b75afccdb5b..1b8d9dff4ed4 100644
--- a/apps/desktop/src/backend/tailscaleEndpointProvider.ts
+++ b/apps/desktop/src/backend/tailscaleEndpointProvider.ts
@@ -1,5 +1,9 @@
 import { createAdvertisedEndpoint } from "@t3tools/shared/advertisedEndpoint";
-import type { AdvertisedEndpoint, AdvertisedEndpointProvider } from "@t3tools/contracts";
+import {
+  ExecutionEnvironmentDescriptor,
+  type AdvertisedEndpoint,
+  type AdvertisedEndpointProvider,
+} from "@t3tools/contracts";
 import {
   buildTailscaleHttpsBaseUrl,
   isTailscaleIpv4Address,
@@ -11,6 +15,7 @@ import {
 import * as Effect from "effect/Effect";
 import * as Option from "effect/Option";
 import * as HttpClient from "effect/http/HttpClient";
+import * as HttpClientResponse from "effect/http/HttpClientResponse";
 import * as ChildProcessSpawner from "effect/process/ChildProcessSpawner";
 
 import type { NetworkInterfaces } from "./DesktopNetworkInterfaces.ts";
@@ -71,10 +76,20 @@ function resolveTailscaleIpAdvertisedEndpoints(input: {
   return endpoints;
 }
 
+// The backend may run elsewhere (WSL), so ask it for its id instead of reading the state dir.
+const probeServesThisBackend = (localHttpUrl: string) => (baseUrl: string) =>
+  HttpClient.get(new URL("/.well-known/t3/environment", localHttpUrl)).pipe(
+    Effect.flatMap(HttpClientResponse.filterStatusOk),
+    Effect.flatMap(HttpClientResponse.schemaBodyJson(ExecutionEnvironmentDescriptor)),
+    Effect.flatMap(({ environmentId }) => probeTailscaleHttpsEndpoint({ baseUrl, environmentId })),
+    Effect.orElseSucceed(() => false),
+  );
+
 const resolveTailscaleMagicDnsAdvertisedEndpoint = Effect.fn(
   "resolveTailscaleMagicDnsAdvertisedEndpoint",
 )(function* (input: {
   readonly dnsName: string | null;
+  readonly localHttpUrl: string;
   readonly serveEnabled: boolean;
   readonly servePort?: number;
   readonly probe?: (baseUrl: string) => Effect.Effect<boolean, never, HttpClient.HttpClient>;
@@ -87,11 +102,7 @@ const resolveTailscaleMagicDnsAdvertisedEndpoint = Effect.fn(
     magicDnsName: input.dnsName,
     ...(input.servePort === undefined ? {} : { servePort: input.servePort }),
   });
-  const probe =
-    input.probe?.(httpBaseUrl) ??
-    probeTailscaleHttpsEndpoint({
-      baseUrl: httpBaseUrl,
-    });
+  const probe = (input.probe ?? probeServesThisBackend(input.localHttpUrl))(httpBaseUrl);
   const isReachable = input.serveEnabled ? yield* probe : false;
 
   return Option.some(
@@ -140,6 +151,7 @@ export const resolveTailscaleAdvertisedEndpoints = Effect.fn("resolveTailscaleAd
     const ipEndpoints = resolveTailscaleIpAdvertisedEndpoints({ ...input, status });
     const magicDnsEndpoint = yield* resolveTailscaleMagicDnsAdvertisedEndpoint({
       dnsName: status?.magicDnsName ?? null,
+      localHttpUrl: `http://127.0.0.1:${input.port}`,
       serveEnabled: input.serveEnabled === true,
       ...(input.servePort === undefined ? {} : { servePort: input.servePort }),
       ...(input.probe === undefined ? {} : { probe: input.probe }),
diff --git a/apps/desktop/src/electron/ElectronProtocol.test.ts b/apps/desktop/src/electron/ElectronProtocol.test.ts
index aec3a2d5b45c..b0cf4823126e 100644
--- a/apps/desktop/src/electron/ElectronProtocol.test.ts
+++ b/apps/desktop/src/electron/ElectronProtocol.test.ts
@@ -63,7 +63,7 @@ describe("ElectronProtocol", () => {
       assert.equal((yield* request("/%invalid")).status, 400);
       assert.equal((yield* request("/", { method: "POST" })).status, 405);
       assert.equal(netFetchMock.mock.calls.length, 0);
-    }).pipe(Effect.provide(Layer.merge(layerProtocol, NodeServices.layer)), Effect.scoped),
+    }).pipe(Effect.provide(Layer.merge(layerProtocol, NodeServices.layer))),
   );
 
   it.effect("proxies the stable renderer origin to the current app server", () =>
diff --git a/apps/desktop/src/electron/ElectronShell.test.ts b/apps/desktop/src/electron/ElectronShell.test.ts
index 9864c19b0d0a..e8618b4f5cc4 100644
--- a/apps/desktop/src/electron/ElectronShell.test.ts
+++ b/apps/desktop/src/electron/ElectronShell.test.ts
@@ -54,18 +54,30 @@ describe("ElectronShell", () => {
     }).pipe(Effect.provide(ElectronShell.layer)),
   );
 
-  it.effect("opens only the bare Grok Bot launch link", () =>
+  it.effect("opens only the Grok Bot prompt link", () =>
     Effect.gen(function* () {
       openExternalMock.mockResolvedValue(undefined);
 
+      const prompt = "grokbot://app/v1/prompt?text=Add%20the%20MCP%20server";
       const electronShell = yield* ElectronShell.ElectronShell;
       const results = yield* Effect.forEach(
-        ["grokbot://app", "grokbot://app/v1/prompt?id=bot&text=hi", "grokbot://"],
+        [
+          prompt,
+          "grokbot://app",
+          "grokbot://app/v1/prompt?id=bot&text=hi",
+          "grokbot://app/v1/prompt?text=a&text=b",
+          "grokbot://app/v1/other?text=hi",
+          "grokbot://app/v1/prompt?text=hi#x",
+          "grokbot://:secret@app/v1/prompt?text=hi",
+          "grokbot://user@app/v1/prompt?text=hi",
+          "grokbot://other/v1/prompt?text=hi",
+          "other://app/v1/prompt?text=hi",
+        ],
         (url) => electronShell.openExternal(url),
       );
 
-      assert.deepEqual(results, [true, false, false]);
-      assert.deepEqual(openExternalMock.mock.calls, [["grokbot://app"]]);
+      assert.deepEqual(results, [true, ...Array<boolean>(9).fill(false)]);
+      assert.deepEqual(openExternalMock.mock.calls, [[prompt]]);
     }).pipe(Effect.provide(ElectronShell.layer)),
   );
 
diff --git a/apps/desktop/src/electron/ElectronShell.ts b/apps/desktop/src/electron/ElectronShell.ts
index e342361750f4..d27c51d57c6e 100644
--- a/apps/desktop/src/electron/ElectronShell.ts
+++ b/apps/desktop/src/electron/ElectronShell.ts
@@ -21,9 +21,16 @@ const REMOTE_EDITOR_PROTOCOLS = new Set(
   }),
 );
 
-// "Use T3 Code in another app" opens these apps (apps/web/src/components/mcp/mcpApps.ts). List
+// "Use T3 Code in another app" opens these apps (apps/web/src/components/mcp/mcpApps.ts). Match
 // each exact link shape the wizard sends, never a whole scheme.
-const APP_LAUNCH_URLS = new Set(["grokbot://app"]);
+const isAppLaunchUrl = (url: URL) =>
+  url.protocol === "grokbot:" &&
+  url.host === "app" &&
+  url.pathname === "/v1/prompt" &&
+  url.username.length === 0 &&
+  url.password.length === 0 &&
+  url.hash.length === 0 &&
+  [...url.searchParams.keys()].join() === "text";
 
 // Zed embeds [user@]host in the path; reject passwords and ports there.
 const ZED_SSH_PATHNAME = /^\/(?:[^/@:]+@)?[^/@:]+\/.*$/;
@@ -50,7 +57,7 @@ export function parseSafeExternalUrl(rawUrl: unknown): Option.Option<string> {
   try {
     const url = new URL(rawUrl);
     return SAFE_WEB_PROTOCOLS.has(url.protocol) ||
-      APP_LAUNCH_URLS.has(url.href) ||
+      isAppLaunchUrl(url) ||
       isRemoteEditorUrl(url) ||
       isLocalEditorFileUrl(url)
       ? Option.some(url.href)
diff --git a/apps/desktop/src/electron/ElectronTheme.test.ts b/apps/desktop/src/electron/ElectronTheme.test.ts
index 4239bfe4c5bc..47aa0ce1f8df 100644
--- a/apps/desktop/src/electron/ElectronTheme.test.ts
+++ b/apps/desktop/src/electron/ElectronTheme.test.ts
@@ -42,7 +42,7 @@ describe("ElectronTheme", () => {
       assert.equal(nativeTheme.themeSource, "light");
       portal.report(null);
       assert.equal(nativeTheme.themeSource, "system");
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("keeps an explicit appearance over the desktop color scheme", () =>
@@ -57,7 +57,7 @@ describe("ElectronTheme", () => {
 
       yield* theme.setSource("system");
       assert.equal(nativeTheme.themeSource, "dark");
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("stops following the desktop when the layer is released", () =>
@@ -76,6 +76,6 @@ describe("ElectronTheme", () => {
       });
       yield* theme.setSource("system");
       assert.equal(nativeTheme.themeSource, "system");
-    }).pipe(Effect.scoped),
+    }),
   );
 });
diff --git a/apps/desktop/src/ipc/DesktopIpc.test.ts b/apps/desktop/src/ipc/DesktopIpc.test.ts
index 45f63b951f36..1973ab49cefe 100644
--- a/apps/desktop/src/ipc/DesktopIpc.test.ts
+++ b/apps/desktop/src/ipc/DesktopIpc.test.ts
@@ -63,5 +63,5 @@ it.effect("answers only the main window's top frame", () =>
       appSubframe: ["rejected", undefined],
       previewGuest: ["rejected", undefined],
     });
-  }).pipe(Effect.scoped),
+  }),
 );
diff --git a/apps/desktop/src/ipc/channels.ts b/apps/desktop/src/ipc/channels.ts
index 5a1d1bdc2fd9..e5a2565aafe8 100644
--- a/apps/desktop/src/ipc/channels.ts
+++ b/apps/desktop/src/ipc/channels.ts
@@ -88,6 +88,7 @@ export const PREVIEW_REGISTER_WEBVIEW_CHANNEL = "desktop:preview-register-webvie
 export const PREVIEW_NAVIGATE_CHANNEL = "desktop:preview-navigate";
 export const PREVIEW_GO_BACK_CHANNEL = "desktop:preview-go-back";
 export const PREVIEW_GO_FORWARD_CHANNEL = "desktop:preview-go-forward";
+export const PREVIEW_STOP_LOADING_CHANNEL = "desktop:preview-stop-loading";
 export const PREVIEW_REFRESH_CHANNEL = "desktop:preview-refresh";
 export const PREVIEW_ZOOM_IN_CHANNEL = "desktop:preview-zoom-in";
 export const PREVIEW_ZOOM_OUT_CHANNEL = "desktop:preview-zoom-out";
diff --git a/apps/desktop/src/ipc/methods/preview.ts b/apps/desktop/src/ipc/methods/preview.ts
index ea291b66b314..cc810fee072a 100644
--- a/apps/desktop/src/ipc/methods/preview.ts
+++ b/apps/desktop/src/ipc/methods/preview.ts
@@ -168,6 +168,11 @@ const refresh = tabMethod(
   "desktop.ipc.preview.refresh",
   (manager, tabId) => manager.refresh(tabId),
 );
+const stopLoading = tabMethod(
+  IpcChannels.PREVIEW_STOP_LOADING_CHANNEL,
+  "desktop.ipc.preview.stopLoading",
+  (manager, tabId) => manager.stopLoading(tabId),
+);
 const zoomIn = tabMethod(
   IpcChannels.PREVIEW_ZOOM_IN_CHANNEL,
   "desktop.ipc.preview.zoomIn",
@@ -472,6 +477,7 @@ export const methods = [
   goBack,
   goForward,
   refresh,
+  stopLoading,
   zoomIn,
   zoomOut,
   resetZoom,
diff --git a/apps/desktop/src/preload.ts b/apps/desktop/src/preload.ts
index c7a530da4fc9..d4f5e27261eb 100644
--- a/apps/desktop/src/preload.ts
+++ b/apps/desktop/src/preload.ts
@@ -406,6 +406,7 @@ contextBridge.exposeInMainWorld("desktopBridge", {
     goBack: (tabId) => ipcRenderer.invoke(IpcChannels.PREVIEW_GO_BACK_CHANNEL, { tabId }),
     goForward: (tabId) => ipcRenderer.invoke(IpcChannels.PREVIEW_GO_FORWARD_CHANNEL, { tabId }),
     refresh: (tabId) => ipcRenderer.invoke(IpcChannels.PREVIEW_REFRESH_CHANNEL, { tabId }),
+    stopLoading: (tabId) => ipcRenderer.invoke(IpcChannels.PREVIEW_STOP_LOADING_CHANNEL, { tabId }),
     zoomIn: (tabId) => ipcRenderer.invoke(IpcChannels.PREVIEW_ZOOM_IN_CHANNEL, { tabId }),
     zoomOut: (tabId) => ipcRenderer.invoke(IpcChannels.PREVIEW_ZOOM_OUT_CHANNEL, { tabId }),
     resetZoom: (tabId) => ipcRenderer.invoke(IpcChannels.PREVIEW_RESET_ZOOM_CHANNEL, { tabId }),
diff --git a/apps/desktop/src/preview/AnnotationStroke.test.ts b/apps/desktop/src/preview/AnnotationStroke.test.ts
new file mode 100644
index 000000000000..ad8a21c140b4
--- /dev/null
+++ b/apps/desktop/src/preview/AnnotationStroke.test.ts
@@ -0,0 +1,73 @@
+import type { PreviewAnnotationPoint } from "@t3tools/contracts";
+import { describe, expect, it } from "vite-plus/test";
+
+import {
+  addStrokePoint,
+  openStrokePath,
+  startStroke,
+  strokeBounds,
+  STROKE_SEGMENTS_PER_PATH,
+} from "./AnnotationStroke.ts";
+
+// The Draw tool used to rebuild the whole path and rescan every point on each move.
+const fullPath = (points: ReadonlyArray<PreviewAnnotationPoint>): string => {
+  let path = `M ${points[0]!.x} ${points[0]!.y}`;
+  for (let index = 1; index < points.length - 1; index += 1) {
+    const current = points[index]!;
+    const next = points[index + 1]!;
+    path += ` Q ${current.x} ${current.y} ${(current.x + next.x) / 2} ${(current.y + next.y) / 2}`;
+  }
+  const last = points[points.length - 1]!;
+  return `${path} L ${last.x} ${last.y}`;
+};
+
+const fullBounds = (points: ReadonlyArray<PreviewAnnotationPoint>, width: number) => {
+  const xs = points.map((point) => point.x);
+  const ys = points.map((point) => point.y);
+  const padding = width + 3;
+  const left = Math.min(...xs) - padding;
+  const top = Math.min(...ys) - padding;
+  const right = Math.max(...xs) + padding;
+  const bottom = Math.max(...ys) + padding;
+  return { x: left, y: top, width: right - left, height: bottom - top };
+};
+
+// Each later path starts with a move to where the previous one ended.
+const joinPaths = (paths: ReadonlyArray<string>): string =>
+  paths
+    .map((path, index) => {
+      if (index === 0) return path;
+      const resume = path.match(/^M (\S+ \S+)/)![1]!;
+      expect(paths[index - 1]!.endsWith(` ${resume}`)).toBe(true);
+      return path.slice(`M ${resume}`.length);
+    })
+    .join("");
+
+describe("stroke geometry", () => {
+  it("draws the same curve and bounds as a full rescan at every length", () => {
+    const points = Array.from({ length: STROKE_SEGMENTS_PER_PATH * 2 + 30 }, (_, index) => ({
+      x: index * 3 + ((index * 7) % 11),
+      y: 200 + ((index * 13) % 29) - index,
+    }));
+    const geometry = startStroke(points[0]!);
+    const closedPaths: string[] = [];
+    for (let index = 1; index < points.length; index += 1) {
+      const closedPath = addStrokePoint(geometry, points[index]!);
+      if (closedPath !== null) closedPaths.push(closedPath);
+      const drawn = points.slice(0, index + 1);
+      expect(joinPaths([...closedPaths, openStrokePath(geometry)])).toBe(fullPath(drawn));
+      expect(strokeBounds(geometry, 4)).toEqual(fullBounds(drawn, 4));
+    }
+    expect(closedPaths).toHaveLength(2);
+    expect(geometry.points).toEqual(points);
+  });
+
+  it("keeps the rewritten path short for a stroke past the engine's argument limit", () => {
+    const geometry = startStroke({ x: 0, y: 0 });
+    for (let index = 1; index < 250_000; index += 1) {
+      addStrokePoint(geometry, { x: index % 800, y: index % 600 });
+    }
+    expect(strokeBounds(geometry, 4)).toEqual({ x: -7, y: -7, width: 813, height: 613 });
+    expect(openStrokePath(geometry).length).toBeLessThan(STROKE_SEGMENTS_PER_PATH * 40);
+  });
+});
diff --git a/apps/desktop/src/preview/AnnotationStroke.ts b/apps/desktop/src/preview/AnnotationStroke.ts
new file mode 100644
index 000000000000..66510fc0b7cf
--- /dev/null
+++ b/apps/desktop/src/preview/AnnotationStroke.ts
@@ -0,0 +1,69 @@
+import type { PreviewAnnotationPoint, PreviewAnnotationRect } from "@t3tools/contracts";
+
+// Setting a path's `d` makes Chromium parse the whole string again, so a long
+// stroke is drawn as a run of paths and only the last one is rewritten per move.
+export const STROKE_SEGMENTS_PER_PATH = 100;
+
+export interface StrokeGeometry {
+  readonly points: PreviewAnnotationPoint[];
+  minX: number;
+  minY: number;
+  maxX: number;
+  maxY: number;
+  // The curve through the newest point is still open: where it ends depends on
+  // the point after it. This holds only the settled segments of the last path.
+  openPath: string;
+  openSegments: number;
+}
+
+export function startStroke(point: PreviewAnnotationPoint): StrokeGeometry {
+  return {
+    points: [point],
+    minX: point.x,
+    minY: point.y,
+    maxX: point.x,
+    maxY: point.y,
+    openPath: `M ${point.x} ${point.y}`,
+    openSegments: 0,
+  };
+}
+
+// Returns the final `d` of the path this point filled, if it filled one.
+export function addStrokePoint(
+  geometry: StrokeGeometry,
+  point: PreviewAnnotationPoint,
+): string | null {
+  const previous = geometry.points[geometry.points.length - 1]!;
+  let closedPath: string | null = null;
+  if (geometry.points.length > 1) {
+    const midX = (previous.x + point.x) / 2;
+    const midY = (previous.y + point.y) / 2;
+    geometry.openPath += ` Q ${previous.x} ${previous.y} ${midX} ${midY}`;
+    geometry.openSegments += 1;
+    if (geometry.openSegments === STROKE_SEGMENTS_PER_PATH) {
+      closedPath = geometry.openPath;
+      geometry.openPath = `M ${midX} ${midY}`;
+      geometry.openSegments = 0;
+    }
+  }
+  geometry.points.push(point);
+  geometry.minX = Math.min(geometry.minX, point.x);
+  geometry.minY = Math.min(geometry.minY, point.y);
+  geometry.maxX = Math.max(geometry.maxX, point.x);
+  geometry.maxY = Math.max(geometry.maxY, point.y);
+  return closedPath;
+}
+
+export function openStrokePath(geometry: StrokeGeometry): string {
+  const last = geometry.points[geometry.points.length - 1]!;
+  return `${geometry.openPath} L ${last.x} ${last.y}`;
+}
+
+export function strokeBounds(geometry: StrokeGeometry, width: number): PreviewAnnotationRect {
+  const padding = width + 3;
+  const left = geometry.minX - padding;
+  const top = geometry.minY - padding;
+  const right = geometry.maxX + padding;
+  const bottom = geometry.maxY + padding;
+  return { x: left, y: top, width: right - left, height: bottom - top };
+}
diff --git a/apps/desktop/src/preview/BrowserImport/BrowserImport.test.ts b/apps/desktop/src/preview/BrowserImport/BrowserImport.test.ts
index 6309c4ea993f..484ba6f9358f 100644
--- a/apps/desktop/src/preview/BrowserImport/BrowserImport.test.ts
+++ b/apps/desktop/src/preview/BrowserImport/BrowserImport.test.ts
@@ -89,7 +89,7 @@ describe("BrowserImport.importCookies", () => {
 
       assert.instanceOf(error, BrowserImport.BrowserImportFailedError);
       assert.equal(error.reason, "unknownSourceProfile");
-    }).pipe(Effect.provide(NodeServices.layer), Effect.scoped),
+    }).pipe(Effect.provide(NodeServices.layer)),
   );
 
   it.effect.skipIf(!symlinksSupported)(
@@ -114,7 +114,7 @@ describe("BrowserImport.importCookies", () => {
 
         assert.instanceOf(error, BrowserImport.BrowserImportFailedError);
         assert.equal(error.reason, "browserRunning");
-      }).pipe(Effect.provide(NodeServices.layer), Effect.scoped),
+      }).pipe(Effect.provide(NodeServices.layer)),
   );
 });
 
diff --git a/apps/desktop/src/preview/BrowserImport/ChromiumCookies.test.ts b/apps/desktop/src/preview/BrowserImport/ChromiumCookies.test.ts
index e5aa05f268e4..92ab35320dab 100644
--- a/apps/desktop/src/preview/BrowserImport/ChromiumCookies.test.ts
+++ b/apps/desktop/src/preview/BrowserImport/ChromiumCookies.test.ts
@@ -134,7 +134,7 @@ describe("readChromiumCookieDatabase", () => {
         const partitioned = yield* readChromiumCookieDatabase(filename, keys, "linux");
         expect(partitioned.cookies).toEqual([]);
         expect(partitioned.undecryptable).toBe(1);
-      }).pipe(Effect.provide(NodeServices.layer), Effect.scoped),
+      }).pipe(Effect.provide(NodeServices.layer)),
   );
 
   it.effect("reads plaintext, encrypted, and genuinely empty cookie values", () =>
@@ -186,7 +186,7 @@ describe("readChromiumCookieDatabase", () => {
         { name: "encrypted", value: "stored encrypted" },
         { name: "empty", value: "" },
       ]);
-    }).pipe(Effect.provide(NodeServices.layer), Effect.scoped),
+    }).pipe(Effect.provide(NodeServices.layer)),
   );
 
   it.effect("enforces domain binding only for schema 24 and newer", () =>
@@ -227,7 +227,7 @@ describe("readChromiumCookieDatabase", () => {
       ]);
       expect(result.undecryptable).toBe(2);
       expect(result.undecryptableHosts).toEqual(["wrong.example", "short.example"]);
-    }).pipe(Effect.provide(NodeServices.layer), Effect.scoped),
+    }).pipe(Effect.provide(NodeServices.layer)),
   );
 
   it.effect("decrypts mixed v10 and v11 cookies with their respective keys", () =>
@@ -273,7 +273,7 @@ describe("readChromiumCookieDatabase", () => {
       ]);
       expect(v10Only.undecryptable).toBe(1);
       expect(v10Only.undecryptableHosts).toEqual(["v11.example"]);
-    }).pipe(Effect.provide(NodeServices.layer), Effect.scoped),
+    }).pipe(Effect.provide(NodeServices.layer)),
   );
 
   it.effect("recovers records written with the empty-passphrase key", () =>
@@ -320,7 +320,7 @@ describe("readChromiumCookieDatabase", () => {
       const noV11 = yield* readChromiumCookieDatabase(filename, { cbcV10, cbcEmpty }, "linux");
       expect(noV11.cookies.map(({ name }) => name)).toEqual(["empty-v10"]);
       expect(noV11.undecryptableHosts).toEqual(["ev11.example"]);
-    }).pipe(Effect.provide(NodeServices.layer), Effect.scoped),
+    }).pipe(Effect.provide(NodeServices.layer)),
   );
 
   it.effect("treats unversioned encrypted values as legacy plaintext on macOS and Linux", () =>
@@ -355,7 +355,7 @@ describe("readChromiumCookieDatabase", () => {
       expect(mac.undecryptable).toBe(0);
       expect(linux.cookies[0]?.value).toBe("legacy cleartext");
       expect(linux.undecryptable).toBe(0);
-    }).pipe(Effect.provide(NodeServices.layer), Effect.scoped),
+    }).pipe(Effect.provide(NodeServices.layer)),
   );
 
   it.effect("skips partitioned cookies without breaking pre-CHIPS schemas", () =>
@@ -409,6 +409,6 @@ describe("readChromiumCookieDatabase", () => {
       expect(chips.cookies.map(({ name }) => name)).toEqual(["plain"]);
       expect(chips.undecryptable).toBe(1);
       expect(chips.undecryptableHosts).toEqual(["partitioned.example"]);
-    }).pipe(Effect.provide(NodeServices.layer), Effect.scoped),
+    }).pipe(Effect.provide(NodeServices.layer)),
   );
 });
diff --git a/apps/desktop/src/preview/BrowserImport/CookieDatabase.test.ts b/apps/desktop/src/preview/BrowserImport/CookieDatabase.test.ts
index 402397d3fde6..ca0a86cedacd 100644
--- a/apps/desktop/src/preview/BrowserImport/CookieDatabase.test.ts
+++ b/apps/desktop/src/preview/BrowserImport/CookieDatabase.test.ts
@@ -11,7 +11,7 @@ import { snapshotCookieDatabase } from "./CookieDatabase.ts";
 
 const runNode = <A, E>(
   effect: Effect.Effect<A, E, FileSystem.FileSystem | Path.Path | Scope.Scope>,
-) => effect.pipe(Effect.provide(NodeServices.layer), Effect.scoped);
+) => effect.pipe(Effect.provide(NodeServices.layer));
 
 describe("snapshotCookieDatabase", () => {
   it.effect("includes committed WAL data in one consistent database", () =>
diff --git a/apps/desktop/src/preview/BrowserImport/FirefoxCookies.test.ts b/apps/desktop/src/preview/BrowserImport/FirefoxCookies.test.ts
index be41318fa01e..33e32ec030be 100644
--- a/apps/desktop/src/preview/BrowserImport/FirefoxCookies.test.ts
+++ b/apps/desktop/src/preview/BrowserImport/FirefoxCookies.test.ts
@@ -78,7 +78,7 @@ const writeFirefoxCookieDatabase = Effect.fnUntraced(function* (
 });
 
 const run = <A, E>(effect: Effect.Effect<A, E, FileSystem.FileSystem | Path.Path | Scope.Scope>) =>
-  effect.pipe(Effect.provide(NodeServices.layer), Effect.scoped);
+  effect.pipe(Effect.provide(NodeServices.layer));
 
 describe("readFirefoxCookies", () => {
   it.effect("converts millisecond expiries from schema 16 and newer", () =>
diff --git a/apps/desktop/src/preview/BrowserImport/LinuxBrowserSecret.test.ts b/apps/desktop/src/preview/BrowserImport/LinuxBrowserSecret.test.ts
index 8358088bc134..8ef376e4887b 100644
--- a/apps/desktop/src/preview/BrowserImport/LinuxBrowserSecret.test.ts
+++ b/apps/desktop/src/preview/BrowserImport/LinuxBrowserSecret.test.ts
@@ -64,6 +64,6 @@ it.layer(NodeServices.layer)("Linux browser secret path", (it) => {
       assert.isUndefined(yield* resolve(false, "win32"));
       yield* fileSystem.remove(staged);
       assert.isUndefined(yield* resolve(false));
-    }).pipe(Effect.scoped),
+    }),
   );
 });
diff --git a/apps/desktop/src/preview/BrowserImport/SafariCookies.test.ts b/apps/desktop/src/preview/BrowserImport/SafariCookies.test.ts
index 7e92334c957d..f82f2319baeb 100644
--- a/apps/desktop/src/preview/BrowserImport/SafariCookies.test.ts
+++ b/apps/desktop/src/preview/BrowserImport/SafariCookies.test.ts
@@ -240,7 +240,7 @@ describe("safariAccessDenied", () => {
       yield* fileSystem.writeFile(jar, new Uint8Array([0x63, 0x6f, 0x6f, 0x6b]));
       assert.isFalse(yield* safariAccessDenied(jar));
       assert.isFalse(yield* safariAccessDenied(`${directory}/absent.binarycookies`));
-    }).pipe(Effect.provide(NodeServices.layer), Effect.scoped),
+    }).pipe(Effect.provide(NodeServices.layer)),
   );
 });
 
diff --git a/apps/desktop/src/preview/BrowserImport/SafariPermission.test.ts b/apps/desktop/src/preview/BrowserImport/SafariPermission.test.ts
index 3b33f872d124..dc225b04bac7 100644
--- a/apps/desktop/src/preview/BrowserImport/SafariPermission.test.ts
+++ b/apps/desktop/src/preview/BrowserImport/SafariPermission.test.ts
@@ -39,7 +39,7 @@ it.effect("detects Safari access becoming available without reading or importing
     assert.isTrue(yield* Effect.promise(check));
     yield* fs.remove(jar);
     assert.isFalse(yield* Effect.promise(check));
-  }).pipe(Effect.provide(NodeServices.layer), Effect.scoped),
+  }).pipe(Effect.provide(NodeServices.layer)),
 );
 
 it.effect("recognizes access when cookies exist only in a named Safari profile", () =>
@@ -55,5 +55,5 @@ it.effect("recognizes access when cookies exist only in a named Safari profile",
     yield* fs.makeDirectory(directory, { recursive: true });
     yield* fs.writeFileString(`${directory}/Cookies.binarycookies`, "not parsed");
     assert.isTrue(yield* Effect.promise(check));
-  }).pipe(Effect.provide(NodeServices.layer), Effect.scoped),
+  }).pipe(Effect.provide(NodeServices.layer)),
 );
diff --git a/apps/desktop/src/preview/BrowserImport/Sources.test.ts b/apps/desktop/src/preview/BrowserImport/Sources.test.ts
index 720a57e64a9d..9b2c3cb26c8f 100644
--- a/apps/desktop/src/preview/BrowserImport/Sources.test.ts
+++ b/apps/desktop/src/preview/BrowserImport/Sources.test.ts
@@ -51,7 +51,7 @@ const run = <A, E>(
     E,
     FileSystem.FileSystem | Path.Path | Scope.Scope | ChildProcessSpawner.ChildProcessSpawner
   >,
-) => effect.pipe(Effect.provide(NodeServices.layer), Effect.scoped);
+) => effect.pipe(Effect.provide(NodeServices.layer));
 
 const writeCookieDatabase = (file: string, count: number) =>
   Effect.sync(() => {
diff --git a/apps/desktop/src/preview/CdpRelay.test.ts b/apps/desktop/src/preview/CdpRelay.test.ts
index 6e657ba5fc4d..ccc2b868720b 100644
--- a/apps/desktop/src/preview/CdpRelay.test.ts
+++ b/apps/desktop/src/preview/CdpRelay.test.ts
@@ -16,6 +16,7 @@ const makeTarget = (
   title: () => "Fixture",
   userAgent: () => "Electron",
   setDownloadDirectory,
+  receivesScreencast: () => true,
 });
 
 const makeRelay = (target: CdpRelayTarget, write: (raw: string) => void) =>
diff --git a/apps/desktop/src/preview/CdpRelay.ts b/apps/desktop/src/preview/CdpRelay.ts
index 94a78f47db68..658e1cf70623 100644
--- a/apps/desktop/src/preview/CdpRelay.ts
+++ b/apps/desktop/src/preview/CdpRelay.ts
@@ -9,6 +9,8 @@ export interface CdpRelayTarget {
     owner?: string,
   ) => Promise<unknown>;
   readonly sessionDetached?: (owner: string) => void;
+  /** Whether a page session, by owner as `send` names it, gets the page's screencast frames. */
+  readonly receivesScreencast: (owner: string | undefined) => boolean;
   /** The page's own CDP target id; Playwright keys the main frame by it. */
   readonly targetId: () => Promise<string>;
   readonly url: () => string;
@@ -260,8 +262,15 @@ export function createCdpRelayConnection(
         send({ method, params, sessionId });
         return;
       }
-      for (const [id, kind] of sessions)
-        if (kind === "page") send({ method, params, sessionId: id });
+      for (const [id, kind] of sessions) {
+        if (kind !== "page") continue;
+        if (
+          method === "Page.screencastFrame" &&
+          !target.receivesScreencast(id === PAGE_SESSION_ID ? undefined : id)
+        )
+          continue;
+        send({ method, params, sessionId: id });
+      }
     },
   };
 }
diff --git a/apps/desktop/src/preview/DesktopBrowserHost.test.ts b/apps/desktop/src/preview/DesktopBrowserHost.test.ts
index 94809f0d10cf..393e4cccccf9 100644
--- a/apps/desktop/src/preview/DesktopBrowserHost.test.ts
+++ b/apps/desktop/src/preview/DesktopBrowserHost.test.ts
@@ -16,6 +16,15 @@ const encodeJson = Schema.encodeSync(Schema.fromJsonString(Schema.Unknown));
 const decodeCdpReply = Schema.decodeUnknownSync(
   Schema.fromJsonString(Schema.Struct({ id: Schema.Number })),
 );
+const decodeCdpMessage = Schema.decodeUnknownSync(
+  Schema.fromJsonString(
+    Schema.Struct({
+      id: Schema.optional(Schema.Number),
+      method: Schema.optional(Schema.String),
+      sessionId: Schema.optional(Schema.String),
+    }),
+  ),
+);
 const key = { threadId: "thread-1", tabId: "tab-1" };
 /** Sends a page command whose id the fake debugger records as it receives it. */
 const command = (
@@ -43,6 +52,8 @@ const makeDebuggee = (
   const pending: Array<() => void> = [];
   const focusChanges: Array<() => void> = [];
   const sent: Array<unknown> = [];
+  const methods: Array<string> = [];
+  const rejects: Array<() => void> = [];
   const sendWaiters: Array<() => void> = [];
   const focusEmulation: Array<boolean> = [];
   const debuggee = Object.assign(emitter, {
@@ -67,6 +78,8 @@ const makeDebuggee = (
           return;
         }
         sent.push(params?.id);
+        methods.push(method);
+        rejects.push(() => reject(new Error("Refused")));
         pending.push(() => resolve({ method }));
         sendWaiters.shift()?.();
       }),
@@ -94,6 +107,10 @@ const makeDebuggee = (
       webContents.emit("did-fail-load", {}, code, "Failed", "http://localhost/", true),
     /** Ids of the commands the debugger received, in order. */
     sent,
+    /** Methods of the same commands, in order. */
+    methods,
+    /** Refuses the pending command the debugger received with this id. */
+    refuse: (id: number) => rejects[sent.indexOf(id)]?.(),
     focusEmulation,
     nextSend: () => new Promise<void>((resolve) => sendWaiters.push(resolve)),
     release: () => pending.splice(0).forEach((resolve) => resolve()),
@@ -116,16 +133,24 @@ const takeEvents = (host: DesktopBrowserHost.DesktopBrowserHost["Service"], coun
 /**
  * Ids of the replies the host sends, in order. A screenshot's reply leaves after its turn
  * has passed on, so by then the next waiting screenshot, if any, has been sent. Subscribe
- * before sending commands: a new subscriber releases the tab's relay.
+ * before sending commands: a new subscriber releases the tab's relay. Screencast frames
+ * go to `frames` by the session they were sent to.
  */
-const watchReplies = (host: DesktopBrowserHost.DesktopBrowserHost["Service"]) =>
+const watchReplies = (
+  host: DesktopBrowserHost.DesktopBrowserHost["Service"],
+  frames: Array<string | undefined> = [],
+) =>
   Effect.gen(function* () {
     const replies = yield* Queue.unbounded<number>();
     yield* host.events.pipe(
       Stream.map((line) => decodeEvent(new TextDecoder().decode(line))),
-      Stream.runForEach((event) =>
-        event.type === "cdp" ? Queue.offer(replies, decodeCdpReply(event.message).id) : Effect.void,
-      ),
+      Stream.runForEach((event) => {
+        if (event.type !== "cdp") return Effect.void;
+        const { id, method, sessionId } = decodeCdpMessage(event.message);
+        if (id !== undefined) return Queue.offer(replies, id);
+        if (method === "Page.screencastFrame") frames.push(sessionId);
+        return Effect.void;
+      }),
       Effect.forkScoped,
     );
     yield* Effect.yieldNow;
@@ -283,7 +308,7 @@ describe("DesktopBrowserHost", () => {
 
       expect(reply).toMatchObject({ type: "cdp" });
       expect(decodeCdpReply((reply as { message: string }).message).id).toBe(2);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("sends a page one screenshot at a time", () =>
@@ -302,7 +327,7 @@ describe("DesktopBrowserHost", () => {
       debuggee.releaseFirst();
       expect(yield* Queue.take(replies)).toBe(1);
       expect(debuggee.sent).toEqual([1, 3, 2]);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("stops waiting on a screenshot the page navigated away from", () =>
@@ -327,7 +352,7 @@ describe("DesktopBrowserHost", () => {
       debuggee.releaseFirst();
       expect(yield* Queue.take(replies)).toBe(2);
       expect(debuggee.sent).toEqual([1, 2, 3]);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("drops screenshots a released relay left waiting", () =>
@@ -399,7 +424,7 @@ describe("DesktopBrowserHost", () => {
       expect(yield* Queue.take(replies)).toBe(1);
       yield* TestClock.adjust("1 minute");
       expect(debuggee.focusEmulation).toEqual([true, false]);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("lets a guest throttle once Chromium can no longer answer its pending command", () =>
@@ -587,7 +612,7 @@ describe("DesktopBrowserHost", () => {
       yield* turn(false);
       yield* TestClock.adjust("1 minute");
       expect(debuggee.focusEmulation).toEqual([true, false, true]);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("paints for a screenshot queued behind one its viewer abandoned mid-capture", () =>
@@ -625,7 +650,7 @@ describe("DesktopBrowserHost", () => {
       expect(yield* Queue.take(replies)).toBe(4);
       yield* settle;
       expect(painting).toEqual([true, false]);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("stops painting for a queued screenshot once its session detaches", () =>
@@ -664,7 +689,7 @@ describe("DesktopBrowserHost", () => {
       expect(painting).toEqual([true, false]);
       yield* TestClock.adjust("1 minute");
       expect(debuggee.focusEmulation).toEqual([true, false]);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("never sends a screenshot whose session detached while focus was changing", () =>
@@ -688,7 +713,7 @@ describe("DesktopBrowserHost", () => {
       debuggee.settleFocus();
       yield* settle;
       expect(debuggee.sent).toEqual([]);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("holds no focus for a screenshot still queued when the agent's turn ends", () =>
@@ -718,7 +743,7 @@ describe("DesktopBrowserHost", () => {
       debuggee.release();
       yield* settle;
       expect(painting).toEqual([true, false]);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("lets a guest throttle when Chromium refuses a viewer's screencast", () =>
@@ -739,7 +764,7 @@ describe("DesktopBrowserHost", () => {
       expect(painting).toEqual([true, false]);
       yield* TestClock.adjust("1 minute");
       expect(debuggee.focusEmulation).toEqual([true, false]);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("lets a guest throttle after a person's input through a viewer that then closed", () =>
@@ -768,7 +793,7 @@ describe("DesktopBrowserHost", () => {
       yield* settle;
       yield* TestClock.adjust("1 minute");
       expect(debuggee.focusEmulation).toEqual([true, false]);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("keeps a page's screencast when a child session's screencast is refused", () =>
@@ -790,7 +815,7 @@ describe("DesktopBrowserHost", () => {
       expect(yield* Queue.take(replies)).toBe(2);
       yield* TestClock.adjust("1 minute");
       expect(debuggee.focusEmulation).toEqual([true]);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("ignores a screencast that arrives on a session after it detached", () =>
@@ -816,7 +841,7 @@ describe("DesktopBrowserHost", () => {
       yield* settle;
       yield* TestClock.adjust("1 minute");
       expect(debuggee.focusEmulation).toEqual([true, false]);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("lets a guest throttle once the session waiting on its command detaches", () =>
@@ -843,7 +868,7 @@ describe("DesktopBrowserHost", () => {
       });
       yield* TestClock.adjust("1 minute");
       expect(debuggee.focusEmulation).toEqual([true, false]);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("never sends a screenshot queued by a session that has since detached", () =>
@@ -874,7 +899,7 @@ describe("DesktopBrowserHost", () => {
 
       yield* TestClock.adjust("1 minute");
       expect(debuggee.focusEmulation).toEqual([true, false]);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("keeps a streamed guest focused until its screencast ends", () =>
@@ -935,7 +960,7 @@ describe("DesktopBrowserHost", () => {
       });
       yield* TestClock.adjust("1 minute");
       expect(debuggee.focusEmulation).toEqual([true, false]);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("paints a hidden guest only while the screenshot it is taking is pending", () =>
@@ -961,7 +986,7 @@ describe("DesktopBrowserHost", () => {
       debuggee.release();
       yield* settle;
       expect(painting).toEqual([true, false]);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("stops painting for a screenshot Chromium never answers once its document goes", () =>
@@ -1006,7 +1031,7 @@ describe("DesktopBrowserHost", () => {
       host.detach(key);
       yield* settle;
       expect(painting).toEqual([true, false, true, false, true, false, true, false]);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("paints a streamed guest until its last screencast ends", () =>
@@ -1037,7 +1062,176 @@ describe("DesktopBrowserHost", () => {
       });
       yield* settle;
       expect(painting).toEqual([true, false]);
-    }).pipe(Effect.scoped),
+    }),
+  );
+
+  it.effect("keeps a guest's one screencast running until its last streaming session stops", () =>
+    Effect.gen(function* () {
+      const host = yield* DesktopBrowserHost.make;
+      const debuggee = makeDebuggee();
+      host.attach(key, debuggee.tab);
+      const frames: Array<string | undefined> = [];
+      const replies = yield* watchReplies(host, frames);
+      const raw = (message: Record<string, unknown>) =>
+        host.handleCommandLine(encodeJson({ type: "cdp", ...key, message: encodeJson(message) }));
+      const nativeStops = () =>
+        debuggee.methods.filter((method) => method === "Page.stopScreencast").length;
+
+      // A viewer and a recording share Chromium's single screencast for the guest.
+      yield* raw({ id: 0, method: "Target.setAutoAttach", params: { autoAttach: true } });
+      expect(yield* Queue.take(replies)).toBe(0);
+      yield* raw({ id: 1, method: "Target.attachToTarget", params: { targetId: "GUEST" } });
+      yield* raw({ id: 2, method: "Target.attachToTarget", params: { targetId: "GUEST" } });
+      expect([yield* Queue.take(replies), yield* Queue.take(replies)]).toEqual([1, 2]);
+      yield* raw({ id: 3, method: "Page.startScreencast", sessionId: "t3-preview-page-1" });
+      yield* raw({ id: 4, method: "Page.startScreencast", sessionId: "t3-preview-page-2" });
+      yield* settle;
+      debuggee.release();
+      yield* raw({ id: 5, method: "Page.stopScreencast", sessionId: "t3-preview-page-1" });
+      yield* settle;
+      expect(nativeStops(), "stopped the screencast another session still streams").toBe(0);
+      debuggee.emit("Page.screencastFrame", { data: "frame", sessionId: 1 });
+      yield* settle;
+      expect(frames, "sent a stopped or idle session the screencast's frames").toEqual([
+        "t3-preview-page-2",
+      ]);
+
+      yield* raw({ id: 6, method: "Page.stopScreencast", sessionId: "t3-preview-page-2" });
+      yield* settle;
+      expect(nativeStops()).toBe(1);
+    }),
+  );
+
+  it.effect("keeps a session's screencast when another of its starts is refused", () =>
+    Effect.gen(function* () {
+      const host = yield* DesktopBrowserHost.make;
+      const debuggee = makeDebuggee();
+      host.attach(key, debuggee.tab);
+      const frames: Array<string | undefined> = [];
+      const replies = yield* watchReplies(host, frames);
+      const raw = (message: Record<string, unknown>) =>
+        host.handleCommandLine(encodeJson({ type: "cdp", ...key, message: encodeJson(message) }));
+
+      yield* raw({ id: 0, method: "Target.setAutoAttach", params: { autoAttach: true } });
+      expect(yield* Queue.take(replies)).toBe(0);
+      yield* raw({ id: 1, method: "Target.attachToTarget", params: { targetId: "GUEST" } });
+      expect(yield* Queue.take(replies)).toBe(1);
+      yield* raw({
+        id: 2,
+        method: "Page.startScreencast",
+        params: { id: 2 },
+        sessionId: "t3-preview-page-1",
+      });
+      yield* raw({
+        id: 3,
+        method: "Page.startScreencast",
+        params: { id: 3 },
+        sessionId: "t3-preview-page-1",
+      });
+      yield* settle;
+      debuggee.refuse(2);
+      debuggee.release();
+      expect([yield* Queue.take(replies), yield* Queue.take(replies)].toSorted()).toEqual([2, 3]);
+      yield* settle;
+      expect(debuggee.methods).not.toContain("Page.stopScreencast");
+      debuggee.emit("Page.screencastFrame", { data: "frame", sessionId: 1 });
+      yield* settle;
+      expect(frames).toContain("t3-preview-page-1");
+
+      // A refused replacement leaves the session's running stream, shared with another session.
+      yield* raw({ id: 4, method: "Target.attachToTarget", params: { targetId: "GUEST" } });
+      expect(yield* Queue.take(replies)).toBe(4);
+      yield* raw({
+        id: 5,
+        method: "Page.startScreencast",
+        params: { id: 5 },
+        sessionId: "t3-preview-page-2",
+      });
+      yield* raw({
+        id: 6,
+        method: "Page.startScreencast",
+        params: { id: 6 },
+        sessionId: "t3-preview-page-1",
+      });
+      yield* settle;
+      debuggee.refuse(6);
+      debuggee.release();
+      expect([yield* Queue.take(replies), yield* Queue.take(replies)].toSorted()).toEqual([5, 6]);
+      yield* settle;
+      frames.length = 0;
+      debuggee.emit("Page.screencastFrame", { data: "frame", sessionId: 2 });
+      yield* settle;
+      expect(frames).toEqual(["t3-preview-page-1", "t3-preview-page-2"]);
+    }),
+  );
+
+  it.effect("stops a guest's screencast once its last streaming session detaches", () =>
+    Effect.gen(function* () {
+      const host = yield* DesktopBrowserHost.make;
+      const debuggee = makeDebuggee();
+      host.attach(key, debuggee.tab);
+      const replies = yield* watchReplies(host);
+      const raw = (message: Record<string, unknown>) =>
+        host.handleCommandLine(encodeJson({ type: "cdp", ...key, message: encodeJson(message) }));
+      const nativeStops = () =>
+        debuggee.methods.filter((method) => method === "Page.stopScreencast").length;
+
+      yield* raw({ id: 1, method: "Target.attachToTarget", params: { targetId: "GUEST" } });
+      yield* raw({ id: 2, method: "Target.attachToTarget", params: { targetId: "GUEST" } });
+      expect([yield* Queue.take(replies), yield* Queue.take(replies)]).toEqual([1, 2]);
+      yield* raw({ id: 3, method: "Page.startScreencast", sessionId: "t3-preview-page-1" });
+      yield* raw({ id: 4, method: "Page.startScreencast", sessionId: "t3-preview-page-2" });
+      yield* settle;
+      debuggee.release();
+      // Streamers go without stopping, such as viewers that closed.
+      yield* raw({
+        id: 5,
+        method: "Target.detachFromTarget",
+        params: { sessionId: "t3-preview-page-1" },
+      });
+      yield* settle;
+      expect(nativeStops(), "stopped the screencast another session still streams").toBe(0);
+      yield* raw({
+        id: 6,
+        method: "Target.detachFromTarget",
+        params: { sessionId: "t3-preview-page-2" },
+      });
+      const answered = [];
+      for (let reply = 0; reply < 4; reply++) answered.push(yield* Queue.take(replies));
+      expect(answered.toSorted()).toEqual([3, 4, 5, 6]);
+      yield* settle;
+      expect(nativeStops()).toBe(1);
+    }),
+  );
+
+  it.effect("stops a screencast whose start lands after its session detached", () =>
+    Effect.gen(function* () {
+      const host = yield* DesktopBrowserHost.make;
+      const debuggee = makeDebuggee({ deferFocus: true });
+      host.attach(key, debuggee.tab);
+      const replies = yield* watchReplies(host);
+      const raw = (message: Record<string, unknown>) =>
+        host.handleCommandLine(encodeJson({ type: "cdp", ...key, message: encodeJson(message) }));
+
+      yield* raw({ id: 1, method: "Target.attachToTarget", params: { targetId: "GUEST" } });
+      expect(yield* Queue.take(replies)).toBe(1);
+      // The start waits on focus emulation while the viewer closes.
+      yield* raw({ id: 2, method: "Page.startScreencast", sessionId: "t3-preview-page-1" });
+      yield* raw({
+        id: 3,
+        method: "Target.detachFromTarget",
+        params: { sessionId: "t3-preview-page-1" },
+      });
+      expect(yield* Queue.take(replies)).toBe(3);
+      debuggee.settleFocus();
+      yield* settle;
+      debuggee.release();
+      expect(yield* Queue.take(replies)).toBe(2);
+      yield* settle;
+      expect(debuggee.methods.at(-1), "left the late screencast running").toBe(
+        "Page.stopScreencast",
+      );
+    }),
   );
 
   it.effect("saves a server tab's download under its CDP guid where the server asked", () =>
@@ -1072,7 +1266,7 @@ describe("DesktopBrowserHost", () => {
       expect(host.placeDownload(debuggee.tab.webContents, item)).toBe(true);
       expect(paths).toEqual(["/srv/downloads/guid-1"]);
       expect(host.placeDownload(debuggee.tab.webContents, item)).toBe(false);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("tells a download the person clicked from one the agent's input started", () =>
@@ -1170,6 +1364,6 @@ describe("DesktopBrowserHost", () => {
       expect(JSON.parse((next as { message: string }).message)).toMatchObject({
         method: "Page.loadEventFired",
       });
-    }).pipe(Effect.scoped),
+    }),
   );
 });
diff --git a/apps/desktop/src/preview/DesktopBrowserHost.ts b/apps/desktop/src/preview/DesktopBrowserHost.ts
index a53fc0e3e6ec..e5f43634d204 100644
--- a/apps/desktop/src/preview/DesktopBrowserHost.ts
+++ b/apps/desktop/src/preview/DesktopBrowserHost.ts
@@ -75,8 +75,8 @@ interface AttachedTab {
    */
   agentUsed: boolean;
   focusReleasing: boolean;
-  /** The sessions streaming the guest; one stopping leaves the others' screencasts running. */
-  readonly screencasts: Set<string | undefined>;
+  /** The sessions sharing the guest's one Chromium screencast; it stops with the last of them. */
+  readonly screencasts: Map<string | undefined, { started: boolean; pending: number }>;
   readonly onMessage: (
     event: Electron.Event,
     method: string,
@@ -289,9 +289,15 @@ export const make = Effect.gen(function* () {
     dropFocusHolds(tab);
   };
 
+  /** An owner that leaves without stopping would otherwise keep the screencast running unseen. */
+  const leaveScreencast = (tab: AttachedTab, owner: string | undefined) => {
+    if (!tab.screencasts.delete(owner) || tab.screencasts.size > 0) return;
+    void tab.debuggee.debugger.sendCommand("Page.stopScreencast").catch(() => {});
+  };
+
   /** A detached session, such as a closed viewer, waits on nothing it sent. */
   const dropSessionHolds = (tab: AttachedTab, owner: string) => {
-    tab.screencasts.delete(owner);
+    leaveScreencast(tab, owner);
     for (const [pending, holder] of tab.focusPending) {
       if (holder === owner) tab.focusPending.delete(pending);
     }
@@ -330,13 +336,19 @@ export const make = Effect.gen(function* () {
       {
         send: (method, params, sessionId, owner) => {
           // A child session's screencast is not the page's, such as a late one on a detached session.
-          if (sessionId === undefined && method === "Page.startScreencast") {
-            tab.screencasts.add(owner);
+          const stream =
+            sessionId === undefined && method === "Page.startScreencast"
+              ? (tab.screencasts.get(owner) ?? { started: false, pending: 0 })
+              : undefined;
+          if (stream) {
+            stream.pending += 1;
+            tab.screencasts.set(owner, stream);
             if (owner !== undefined) streamingOwners.add(owner);
             syncPainting(tab);
           } else if (sessionId === undefined && method === "Page.stopScreencast") {
             tab.screencasts.delete(owner);
             syncPainting(tab);
+            if (tab.screencasts.size > 0) return Promise.resolve({});
           }
           // A person's input through a viewer, or Playwright's own housekeeping, is not the agent's.
           if (
@@ -365,19 +377,42 @@ export const make = Effect.gen(function* () {
                   held ? holdFocus(tab, owner, () => forward(current)) : forward(current),
               )
             : method === "Page.startScreencast"
-              ? holdFocus(tab, owner, forward).catch((cause: unknown) => {
-                  // A viewer can outlive a refused stream; nothing is streaming for it.
-                  if (sessionId === undefined && tab.relay === relay) tab.screencasts.delete(owner);
-                  releaseFocusWhenIdle(tab);
-                  syncPainting(tab);
-                  throw cause;
-                })
+              ? holdFocus(tab, owner, forward).then(
+                  (result) => {
+                    if (stream) {
+                      stream.pending -= 1;
+                      stream.started = true;
+                      // A detach's stop can overtake a start still waiting on focus; nobody owns it now.
+                      if (tab.screencasts.get(owner) !== stream && tab.screencasts.size === 0) {
+                        void debuggee.sendCommand("Page.stopScreencast").catch(() => {});
+                      }
+                    }
+                    return result;
+                  },
+                  (cause: unknown) => {
+                    if (stream) stream.pending -= 1;
+                    // A viewer can outlive a refused start; its running or pending stream still holds it.
+                    if (
+                      stream &&
+                      !stream.started &&
+                      stream.pending === 0 &&
+                      tab.relay === relay &&
+                      tab.screencasts.get(owner) === stream
+                    ) {
+                      leaveScreencast(tab, owner);
+                    }
+                    releaseFocusWhenIdle(tab);
+                    syncPainting(tab);
+                    throw cause;
+                  },
+                )
               : holdFocus(tab, owner, forward);
         },
         sessionDetached: (owner) => {
           detachedOwners.add(owner);
           dropSessionHolds(tab, owner);
         },
+        receivesScreencast: (owner) => tab.screencasts.has(owner),
         targetId: () =>
           debuggee
             .sendCommand("Target.getTargetInfo")
@@ -463,7 +498,7 @@ export const make = Effect.gen(function* () {
       painting: false,
       agentUsed: false,
       focusReleasing: false,
-      screencasts: new Set(),
+      screencasts: new Map(),
       onMessage: (_event, method, params, sessionId) => {
         if (method === "Page.downloadWillBegin") {
           const guid = (params as { guid?: unknown } | undefined)?.guid;
diff --git a/apps/desktop/src/preview/GuestInput.test.ts b/apps/desktop/src/preview/GuestInput.test.ts
index a0889940a668..48191ce2c4b9 100644
--- a/apps/desktop/src/preview/GuestInput.test.ts
+++ b/apps/desktop/src/preview/GuestInput.test.ts
@@ -44,6 +44,30 @@ describe("preview guest input", () => {
     expect(guest.sendCommand).not.toHaveBeenCalledWith("Input.insertText", expect.anything());
   });
 
+  it("stops the guest navigation without stopping its embedder", async () => {
+    let guestLoading = true;
+    let hostLoading = true;
+    const guest = {
+      stop: () => {
+        guestLoading = false;
+      },
+    };
+    const debuggee = {
+      sendCommand: async () => {
+        hostLoading = false;
+        return {};
+      },
+    };
+    await sendPageCommand(
+      guest as unknown as Electron.WebContents,
+      debuggee as unknown as Electron.Debugger,
+      "Page.stopLoading",
+      {},
+    );
+    expect(guestLoading).toBe(false);
+    expect(hostLoading).toBe(true);
+  });
+
   it.each([
     {
       sessionId: undefined,
diff --git a/apps/desktop/src/preview/GuestInput.ts b/apps/desktop/src/preview/GuestInput.ts
index 2af13af8d7da..4d794beea62b 100644
--- a/apps/desktop/src/preview/GuestInput.ts
+++ b/apps/desktop/src/preview/GuestInput.ts
@@ -185,6 +185,10 @@ export const sendPageCommand = async (
     else webContents.reload();
     return {};
   }
+  if (method === "Page.stopLoading") {
+    webContents.stop();
+    return {};
+  }
   if (!FOCUS_ROUTED_INPUT.has(method) || webContents.focusedFrame) {
     return debuggee.sendCommand(method, params);
   }
diff --git a/apps/desktop/src/preview/GuestProtocol.ts b/apps/desktop/src/preview/GuestProtocol.ts
index 09d4eff6d201..0a9f4cb85c00 100644
--- a/apps/desktop/src/preview/GuestProtocol.ts
+++ b/apps/desktop/src/preview/GuestProtocol.ts
@@ -6,6 +6,9 @@ export const ANNOTATION_THEME_CHANNEL = "preview:annotation-theme";
 export const ANNOTATION_SEND_ENABLED_CHANNEL = "preview:annotation-send-enabled";
 export const HUMAN_INPUT_CHANNEL = "preview:human-input";
 export const MOUSE_NAVIGATE_CHANNEL = "preview:mouse-navigate";
+// Sent to the hosting <webview> element (ipc-message). The web app mirrors this
+// literal in HostedBrowserWebview because it cannot import from the desktop app.
+export const POINTER_DOWN_HOST_CHANNEL = "preview:pointer-down";
 export const PAGE_UNHANDLED_SHORTCUT_CHANNEL = "preview:page-unhandled-shortcut";
 export const RECORDING_CURSOR_CHANNEL = "preview:recording-cursor";
 export const RECORDING_POINTER_CHANNEL = "preview:recording-pointer";
diff --git a/apps/desktop/src/preview/Manager.test.ts b/apps/desktop/src/preview/Manager.test.ts
index 6db04b389ab6..b344b1ac93b2 100644
--- a/apps/desktop/src/preview/Manager.test.ts
+++ b/apps/desktop/src/preview/Manager.test.ts
@@ -671,7 +671,7 @@ describe("PreviewManager", () => {
         if (existing) {
           expect(yield* fs.readFileString(`${downloads}/report.txt`)).toBe("existing download");
         }
-      }).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)), Effect.scoped),
+      }).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
   );
 
   effectIt.effect.each([
@@ -820,7 +820,7 @@ describe("PreviewManager", () => {
     ["linux", false],
     ["win32", false],
   ] as const)(
-    "lets the page and its iframes claim the find shortcut before the host opens find on %s",
+    "lets the page and its iframes claim the find and zoom shortcuts before the host acts on %s",
     ([platform, usesMeta]) =>
       withManager(
         (manager) =>
@@ -838,8 +838,23 @@ describe("PreviewManager", () => {
             yield* manager.registerWebview("tab_page_find", 42);
             yield* manager.setForwardedShortcuts([
               { command: "preview.find", shortcut: parseKeybindingShortcut("mod+f")! },
+              { command: "preview.zoomIn", shortcut: parseKeybindingShortcut("mod+=")! },
             ]);
             const beforeInput = preview.listeners.get("before-input-event")!;
+            const keepsZoom = vi.fn();
+            beforeInput(
+              { preventDefault: keepsZoom } as never,
+              {
+                type: "keyDown",
+                key: "=",
+                code: "Equal",
+                meta: usesMeta,
+                control: !usesMeta,
+                shift: false,
+                alt: false,
+              } as never,
+            );
+            expect(keepsZoom).not.toHaveBeenCalled();
             const findKey = {
               type: "keyDown",
               key: "f",
@@ -2056,7 +2071,7 @@ describe("PreviewManager", () => {
       expect(yield* nextType).toBe("attached");
       yield* manager.closeTab("tab_1");
       expect(yield* nextType).toBe("detached");
-    }).pipe(Effect.provide(managerLayer()), Effect.scoped),
+    }).pipe(Effect.provide(managerLayer())),
   );
 
   effectIt.effect(
@@ -2115,7 +2130,7 @@ describe("PreviewManager", () => {
         expect(yield* Queue.take(capturing)).toBe(true);
         screenshot.resolve({ data: "" });
         expect(yield* Queue.take(capturing)).toBe(false);
-      }).pipe(Effect.provide(managerLayer()), Effect.scoped),
+      }).pipe(Effect.provide(managerLayer())),
   );
 
   effectIt.effect("reports early and subsequent load failures for the current guest", () =>
@@ -2206,7 +2221,7 @@ describe("PreviewManager", () => {
       expect(JSON.parse(yield* Queue.take(lines))).toEqual({ type: "detached", ...serverTab });
       expect(JSON.parse(yield* Queue.take(lines))).toEqual({ type: "attached", ...serverTab });
       expect(statuses.at(-1)?.kind).toBe("Success");
-    }).pipe(Effect.provide(managerLayer()), Effect.scoped),
+    }).pipe(Effect.provide(managerLayer())),
   );
 
   effectIt.effect("discards a screenshot that resolves after its guest is replaced", () =>
diff --git a/apps/desktop/src/preview/Manager.ts b/apps/desktop/src/preview/Manager.ts
index 189885b9b217..0fc48165ffcc 100644
--- a/apps/desktop/src/preview/Manager.ts
+++ b/apps/desktop/src/preview/Manager.ts
@@ -444,6 +444,9 @@ type FindResultListener = (event: DesktopPreviewFindResultEvent) => Effect.Effec
 
 const PAGE_FIRST_FORWARDED_COMMANDS: ReadonlySet<PreviewForwardedShortcut["command"]> = new Set([
   "preview.find",
+  "preview.zoomIn",
+  "preview.zoomOut",
+  "preview.resetZoom",
 ]);
 
 const decodePageShortcutKeys = Schema.decodeUnknownOption(
@@ -1553,7 +1556,7 @@ const makeNativeOperations = Effect.fn("PreviewManager.makeOperations")(function
         });
       if (forwarded && host) {
         // The page keeps these keys. Only the main-frame preload can report one it
-        // left unhandled, so a focused iframe (e.g. Google Docs' input) keeps its own find.
+        // left unhandled, so a focused iframe (e.g. Google Docs' input) keeps its own find or zoom.
         if (PAGE_FIRST_FORWARDED_COMMANDS.has(forwarded.command)) return;
         event.preventDefault();
         if (!input.isAutoRepeat) {
@@ -2145,6 +2148,7 @@ const makeNativeOperations = Effect.fn("PreviewManager.makeOperations")(function
       if (wc.navigationHistory.canGoForward()) wc.navigationHistory.goForward();
     });
   const refresh = (tabId: string) => withWebContents("refresh", tabId, (wc) => wc.reload());
+  const stopLoading = (tabId: string) => withWebContents("stopLoading", tabId, (wc) => wc.stop());
   const hardReload = (tabId: string) =>
     withWebContents("hardReload", tabId, (wc) => wc.reloadIgnoringCache());
   const findInPage = (
@@ -3528,6 +3532,7 @@ const makeNativeOperations = Effect.fn("PreviewManager.makeOperations")(function
     prepareWebview,
     reapplyZoom,
     refresh,
+    stopLoading,
     registerWebview,
     resetZoom: (tabId: string) => applyZoom(tabId, () => DEFAULT_ZOOM_FACTOR),
     setZoomFactor: (tabId: string, zoomFactor: number) =>
@@ -3729,6 +3734,7 @@ export class PreviewManager extends Context.Service<
     readonly goBack: (tabId: string) => Effect.Effect<void, PreviewManagerError>;
     readonly goForward: (tabId: string) => Effect.Effect<void, PreviewManagerError>;
     readonly refresh: (tabId: string) => Effect.Effect<void, PreviewManagerError>;
+    readonly stopLoading: (tabId: string) => Effect.Effect<void, PreviewManagerError>;
     readonly zoomIn: (tabId: string) => Effect.Effect<void, PreviewManagerError>;
     readonly zoomOut: (tabId: string) => Effect.Effect<void, PreviewManagerError>;
     readonly resetZoom: (tabId: string) => Effect.Effect<void, PreviewManagerError>;
@@ -3903,6 +3909,7 @@ export const make = Effect.gen(function* PreviewManagerMake() {
     goBack: operations.goBack,
     goForward: operations.goForward,
     refresh: operations.refresh,
+    stopLoading: operations.stopLoading,
     zoomIn: operations.zoomIn,
     zoomOut: operations.zoomOut,
     resetZoom: operations.resetZoom,
diff --git a/apps/desktop/src/preview/PickPreload.test.ts b/apps/desktop/src/preview/PickPreload.test.ts
index 8a080183b383..61d3941ba41a 100644
--- a/apps/desktop/src/preview/PickPreload.test.ts
+++ b/apps/desktop/src/preview/PickPreload.test.ts
@@ -62,3 +62,46 @@ it("keeps the tool while typing a tool key in the comment", () => {
 
   expect(document.documentElement.getAttribute("data-t3code-annotation-tool")).toBe("select");
 });
+
+it("keeps comment keystrokes away from the page's capture-phase shortcuts", () => {
+  const pageShortcut = vi.fn((event: KeyboardEvent) => event.preventDefault());
+  window.addEventListener("keydown", pageShortcut, { capture: true });
+  const shadowRoot = startAnnotation();
+  const comment = shadowRoot.querySelector("textarea");
+  if (!comment) throw new Error("comment textarea not found");
+
+  comment.focus();
+  const space = new KeyboardEvent("keydown", {
+    key: " ",
+    code: "Space",
+    bubbles: true,
+    cancelable: true,
+    composed: true,
+  });
+  comment.dispatchEvent(space);
+  window.removeEventListener("keydown", pageShortcut, { capture: true });
+
+  expect(pageShortcut).not.toHaveBeenCalled();
+  expect(space.defaultPrevented).toBe(false);
+});
+
+it("keeps the annotation when Escape dismisses an IME candidate in the comment", () => {
+  const shadowRoot = startAnnotation();
+  const comment = shadowRoot.querySelector("textarea");
+  if (!comment) throw new Error("comment textarea not found");
+
+  comment.value = "draft";
+  comment.focus();
+  comment.dispatchEvent(
+    new KeyboardEvent("keydown", {
+      key: "Escape",
+      isComposing: true,
+      bubbles: true,
+      cancelable: true,
+      composed: true,
+    }),
+  );
+
+  expect(shadowRoot.host.isConnected).toBe(true);
+  expect(comment.value).toBe("draft");
+});
diff --git a/apps/desktop/src/preview/PickPreload.ts b/apps/desktop/src/preview/PickPreload.ts
index a9f479d32b81..cbaf873e4933 100644
--- a/apps/desktop/src/preview/PickPreload.ts
+++ b/apps/desktop/src/preview/PickPreload.ts
@@ -20,6 +20,13 @@ import type {
 
 import { createAnnotationIdSource } from "./AnnotationIds.ts";
 import { resolveAnnotationSubmission } from "./AnnotationKeyboard.ts";
+import {
+  addStrokePoint,
+  openStrokePath,
+  startStroke,
+  strokeBounds,
+  type StrokeGeometry,
+} from "./AnnotationStroke.ts";
 import { previewAnnotationStyles } from "./AnnotationStyles.generated.ts";
 import { installRecordingCursor } from "./RecordingCursor.ts";
 import { DEFAULT_RECORDING_INPUT_OPTIONS } from "./RecordingInput.ts";
@@ -33,6 +40,7 @@ import {
   ELEMENT_PICKED_CHANNEL,
   HUMAN_INPUT_CHANNEL,
   MOUSE_NAVIGATE_CHANNEL,
+  POINTER_DOWN_HOST_CHANNEL,
   PAGE_UNHANDLED_SHORTCUT_CHANNEL,
   RECORDING_CURSOR_CHANNEL,
   RECORDING_POINTER_CHANNEL,
@@ -149,6 +157,7 @@ interface AnnotationSession {
   teardown: (notifyMain: boolean) => void;
   applyTheme: (theme: DesktopPreviewAnnotationTheme) => void;
   setSendEnabled: (enabled: boolean) => void;
+  handleOverlayKey: (event: KeyboardEvent) => void;
 }
 
 let activeSession: AnnotationSession | null = null;
@@ -185,6 +194,9 @@ const applyAnnotationTheme = (
 
 const reportHumanPointerInput = (event: PointerEvent): void => {
   if (!event.isTrusted) return;
+  // The guest does not always take focus on a click, so the host's webview
+  // `focus` event can't be relied on to dismiss open menus and popovers.
+  ipcRenderer.sendToHost(POINTER_DOWN_HOST_CHANNEL);
   ipcRenderer.send(HUMAN_INPUT_CHANNEL, {
     kind: "pointer",
     x: event.clientX,
@@ -225,6 +237,18 @@ const reportUnhandledShortcut = (event: KeyboardEvent): void => {
 
 window.addEventListener("keydown", reportUnhandledShortcut, true);
 
+// Registered before page scripts so their capture listeners never see keys typed into the
+// overlay; the closed shadow root retargets those to the host, hiding that they edit text.
+const isolateOverlayKey = (event: KeyboardEvent): void => {
+  if (!activeSession || !(event.target instanceof Element) || !isAnnotationNode(event.target))
+    return;
+  activeSession.handleOverlayKey(event);
+  event.stopImmediatePropagation();
+};
+
+for (const type of ["keydown", "keypress", "keyup"] as const)
+  window.addEventListener(type, isolateOverlayKey, true);
+
 const MOUSE_BUTTON_BACK = 3;
 const MOUSE_BUTTON_FORWARD = 4;
 
@@ -533,34 +557,6 @@ function createUnitInput(unit: string, placeholder = "0"): HTMLInputElement {
   return input;
 }
 
-function pathFromPoints(points: ReadonlyArray<PreviewAnnotationPoint>): string {
-  if (points.length === 0) return "";
-  if (points.length === 1) return `M ${points[0]!.x} ${points[0]!.y} l 0.01 0.01`;
-  let path = `M ${points[0]!.x} ${points[0]!.y}`;
-  for (let index = 1; index < points.length - 1; index += 1) {
-    const current = points[index]!;
-    const next = points[index + 1]!;
-    path += ` Q ${current.x} ${current.y} ${(current.x + next.x) / 2} ${(current.y + next.y) / 2}`;
-  }
-  const last = points[points.length - 1]!;
-  path += ` L ${last.x} ${last.y}`;
-  return path;
-}
-
-function strokeBounds(
-  points: ReadonlyArray<PreviewAnnotationPoint>,
-  width: number,
-): PreviewAnnotationRect {
-  const xs = points.map((point) => point.x);
-  const ys = points.map((point) => point.y);
-  const padding = width + 3;
-  const left = Math.min(...xs) - padding;
-  const top = Math.min(...ys) - padding;
-  const right = Math.max(...xs) + padding;
-  const bottom = Math.max(...ys) + padding;
-  return { x: left, y: top, width: right - left, height: bottom - top };
-}
-
 function startAnnotation(
   sendEnabled: boolean,
   voice: DesktopPreviewAnnotationVoiceConfig | undefined,
@@ -897,7 +893,12 @@ function startAnnotation(
   }
   let tool: AnnotationTool = isPdf ? "marquee" : "select";
   let dragStart: PreviewAnnotationPoint | null = null;
-  let activeStroke: { target: PreviewAnnotationStrokeTarget; path: SVGPathElement } | null = null;
+  let activeStroke: {
+    target: PreviewAnnotationStrokeTarget;
+    geometry: StrokeGeometry;
+    group: SVGGElement;
+    path: SVGPathElement;
+  } | null = null;
   let pendingCapture = false;
   let editorExpanded = false;
   let editorWasShown = false;
@@ -1497,15 +1498,18 @@ function startAnnotation(
       return;
     }
     if (tool === "draw" && activeStroke) {
-      activeStroke.target.points = [
-        ...activeStroke.target.points,
-        { x: event.clientX, y: event.clientY },
-      ];
-      activeStroke.target.bounds = strokeBounds(
-        activeStroke.target.points,
-        activeStroke.target.width,
-      );
-      activeStroke.path.setAttribute("d", pathFromPoints(activeStroke.target.points));
+      const closedPath = addStrokePoint(activeStroke.geometry, {
+        x: event.clientX,
+        y: event.clientY,
+      });
+      activeStroke.target.bounds = strokeBounds(activeStroke.geometry, activeStroke.target.width);
+      if (closedPath !== null) {
+        activeStroke.path.setAttribute("d", closedPath);
+        activeStroke.path = activeStroke.group.appendChild(
+          document.createElementNS("http://www.w3.org/2000/svg", "path"),
+        );
+      }
+      activeStroke.path.setAttribute("d", openStrokePath(activeStroke.geometry));
     }
   };
 
@@ -1524,23 +1528,27 @@ function startAnnotation(
     }
     dragStart = { x: event.clientX, y: event.clientY };
     if (tool === "draw") {
+      const geometry = startStroke(dragStart);
       const stroke: PreviewAnnotationStrokeTarget = {
         id: nextId("stroke"),
         color: annotationTheme?.primary ?? "#2563eb",
         width: 4,
-        points: [dragStart],
+        points: geometry.points,
         bounds: { x: dragStart.x, y: dragStart.y, width: 1, height: 1 },
       };
-      const path = document.createElementNS("http://www.w3.org/2000/svg", "path");
-      path.setAttribute(OVERLAY_ATTRIBUTE, "");
-      path.setAttribute("data-stroke-id", stroke.id);
-      path.setAttribute("fill", "none");
-      path.setAttribute("stroke", stroke.color);
-      path.setAttribute("stroke-width", String(stroke.width));
-      path.setAttribute("stroke-linecap", "round");
-      path.setAttribute("stroke-linejoin", "round");
-      svg.appendChild(path);
-      activeStroke = { target: stroke, path };
+      const group = document.createElementNS("http://www.w3.org/2000/svg", "g");
+      group.setAttribute(OVERLAY_ATTRIBUTE, "");
+      group.setAttribute("data-stroke-id", stroke.id);
+      group.setAttribute("fill", "none");
+      group.setAttribute("stroke", stroke.color);
+      group.setAttribute("stroke-width", String(stroke.width));
+      group.setAttribute("stroke-linecap", "round");
+      group.setAttribute("stroke-linejoin", "round");
+      const path = group.appendChild(
+        document.createElementNS("http://www.w3.org/2000/svg", "path"),
+      );
+      svg.appendChild(group);
+      activeStroke = { target: stroke, geometry, group, path };
     }
   };
 
@@ -1567,7 +1575,7 @@ function startAnnotation(
       }
     } else if (tool === "draw" && activeStroke) {
       if (activeStroke.target.points.length > 1) strokes.push(activeStroke.target);
-      else activeStroke.path.remove();
+      else activeStroke.group.remove();
       activeStroke = null;
     }
     dragStart = null;
@@ -1673,7 +1681,7 @@ function startAnnotation(
         return;
       }
     }
-    if (event.key === "Escape") {
+    if (event.key === "Escape" && !event.isComposing) {
       event.preventDefault();
       event.stopPropagation();
       teardown(true);
@@ -1762,15 +1770,17 @@ function startAnnotation(
       });
   };
   submit.addEventListener("click", () => submitAnnotation("attach"));
-  root.addEventListener("keydown", (event) => {
+  const handleOverlayKey = (event: KeyboardEvent): void => {
+    if (event.type === "keyup") onVoiceKeyUp(event);
+    if (event.type !== "keydown") return;
+    onKeyDown(event);
+    if (event.cancelBubble) return;
     const submission =
-      event.target === comment ? resolveAnnotationSubmission(event, sendEnabled) : null;
-    // Bubble phase lets editor inputs handle events before hiding them from the page.
-    event.stopImmediatePropagation();
+      shadowRoot.activeElement === comment ? resolveAnnotationSubmission(event, sendEnabled) : null;
     if (!submission) return;
     event.preventDefault();
     submitAnnotation(submission);
-  });
+  };
 
   window.addEventListener("pointermove", onPointerMove, { capture: true, passive: false });
   window.addEventListener("pointerdown", onPointerDown, { capture: true, passive: false });
@@ -1806,6 +1816,7 @@ function startAnnotation(
       sendEnabled = enabled;
       updateSendHint();
     },
+    handleOverlayKey,
   };
 }
 
diff --git a/apps/desktop/src/settings/DesktopAppSettings.test.ts b/apps/desktop/src/settings/DesktopAppSettings.test.ts
index 868e1c139fbd..04406f63c6b3 100644
--- a/apps/desktop/src/settings/DesktopAppSettings.test.ts
+++ b/apps/desktop/src/settings/DesktopAppSettings.test.ts
@@ -4,6 +4,7 @@ import { assert, describe, it } from "@effect/vitest";
 import * as Effect from "effect/Effect";
 import * as FileSystem from "effect/FileSystem";
 import * as Layer from "effect/Layer";
+import * as PlatformError from "effect/PlatformError";
 import * as Schema from "effect/Schema";
 import * as Tracer from "effect/Tracer";
 
@@ -160,6 +161,49 @@ describe("DesktopSettings", () => {
     ),
   );
 
+  it.effect("keeps saved preferences when a read fails before a bounds save", () =>
+    withSettings(
+      Effect.gen(function* () {
+        const environment = yield* DesktopEnvironment.DesktopEnvironment;
+        const fileSystem = yield* FileSystem.FileSystem;
+        yield* writeSettingsPatch({ serverExposureMode: "network-accessible" });
+        const cause = PlatformError.systemError({
+          _tag: "PermissionDenied",
+          module: "FileSystem",
+          method: "readFileString",
+          pathOrDescriptor: environment.desktopSettingsPath,
+        });
+        let failRead = true;
+        const settings = yield* DesktopAppSettings.make.pipe(
+          Effect.provideService(
+            FileSystem.FileSystem,
+            FileSystem.FileSystem.of({
+              ...fileSystem,
+              readFileString: (path) =>
+                Effect.suspend(() => {
+                  if (failRead && path === environment.desktopSettingsPath) {
+                    failRead = false;
+                    return Effect.fail(cause);
+                  }
+                  return fileSystem.readFileString(path);
+                }),
+            }),
+          ),
+        );
+
+        yield* Effect.exit(settings.load);
+        yield* Effect.exit(
+          settings.setMainWindowBounds({ x: 10, y: 20, width: 900, height: 600 }, false),
+        );
+
+        const persisted = yield* decodeDesktopSettingsPatch(
+          yield* fileSystem.readFileString(environment.desktopSettingsPath),
+        );
+        assert.equal(persisted.serverExposureMode, "network-accessible");
+      }),
+    ),
+  );
+
   it.effect("loads lenient persisted desktop settings JSON", () =>
     withSettings(
       Effect.gen(function* () {
@@ -196,6 +240,28 @@ describe("DesktopSettings", () => {
     ),
   );
 
+  it.effect("keeps Local environment off when another value in the file is unreadable", () =>
+    withSettings(
+      Effect.gen(function* () {
+        const environment = yield* DesktopEnvironment.DesktopEnvironment;
+        const fileSystem = yield* FileSystem.FileSystem;
+        const settings = yield* DesktopAppSettings.DesktopAppSettings;
+        yield* fileSystem.makeDirectory(environment.stateDir, { recursive: true });
+        yield* fileSystem.writeFileString(
+          environment.desktopSettingsPath,
+          `{ "localEnvironmentEnabled": false, "serverExposureMode": "tailnet" }\n`,
+        );
+
+        assert.isFalse((yield* settings.load).localEnvironmentEnabled);
+        yield* settings.setMainWindowBounds({ x: 10, y: 20, width: 800, height: 600 }, false);
+        assert.include(
+          yield* fileSystem.readFileString(environment.desktopSettingsPath),
+          `"localEnvironmentEnabled":false`,
+        );
+      }),
+    ),
+  );
+
   it.effect("rejects window bounds that do not satisfy the domain schema", () =>
     withSettings(
       Effect.gen(function* () {
diff --git a/apps/desktop/src/settings/DesktopAppSettings.ts b/apps/desktop/src/settings/DesktopAppSettings.ts
index 4c2ae8d1d134..e81da7066064 100644
--- a/apps/desktop/src/settings/DesktopAppSettings.ts
+++ b/apps/desktop/src/settings/DesktopAppSettings.ts
@@ -13,6 +13,8 @@ import * as FileSystem from "effect/FileSystem";
 import * as Layer from "effect/Layer";
 import * as Option from "effect/Option";
 import * as Path from "effect/Path";
+import * as PlatformError from "effect/PlatformError";
+import * as Ref from "effect/Ref";
 import * as Schema from "effect/Schema";
 import * as SynchronizedRef from "effect/SynchronizedRef";
 
@@ -88,20 +90,25 @@ const DesktopWindowBoundsDocument = Schema.Struct({
   height: Schema.Number,
 });
 
+// A value this build cannot read drops only its own key, so the rest of the file
+// still loads and is written back instead of every setting resetting to defaults.
+const optionalReadableKey = <S extends Schema.Top>(schema: S) =>
+  Schema.optionalKey(schema.pipe(Schema.catchDecoding(() => Effect.succeedNone)));
+
 const DesktopSettingsDocument = Schema.Struct({
-  localEnvironmentEnabled: Schema.optionalKey(Schema.Boolean),
-  linuxPasswordStore: Schema.optionalKey(Schema.Unknown),
-  mainWindowBounds: Schema.optionalKey(Schema.NullOr(DesktopWindowBoundsDocument)),
-  mainWindowMaximized: Schema.optionalKey(Schema.Boolean),
-  serverExposureMode: Schema.optionalKey(DesktopServerExposureModeSchema),
-  tailscaleServeEnabled: Schema.optionalKey(Schema.Boolean),
-  tailscaleServePort: Schema.optionalKey(Schema.Number),
-  updateChannel: Schema.optionalKey(DesktopUpdateChannelSchema),
-  updateChannelConfiguredByUser: Schema.optionalKey(Schema.Boolean),
-  wslBackendEnabled: Schema.optionalKey(Schema.Boolean),
-  wslMode: Schema.optionalKey(Schema.Literals(["local", "wsl"])),
-  wslDistro: Schema.optionalKey(Schema.NullOr(Schema.String)),
-  wslOnly: Schema.optionalKey(Schema.Boolean),
+  localEnvironmentEnabled: optionalReadableKey(Schema.Boolean),
+  linuxPasswordStore: optionalReadableKey(Schema.Unknown),
+  mainWindowBounds: optionalReadableKey(Schema.NullOr(DesktopWindowBoundsDocument)),
+  mainWindowMaximized: optionalReadableKey(Schema.Boolean),
+  serverExposureMode: optionalReadableKey(DesktopServerExposureModeSchema),
+  tailscaleServeEnabled: optionalReadableKey(Schema.Boolean),
+  tailscaleServePort: optionalReadableKey(Schema.Number),
+  updateChannel: optionalReadableKey(DesktopUpdateChannelSchema),
+  updateChannelConfiguredByUser: optionalReadableKey(Schema.Boolean),
+  wslBackendEnabled: optionalReadableKey(Schema.Boolean),
+  wslMode: optionalReadableKey(Schema.Literals(["local", "wsl"])),
+  wslDistro: optionalReadableKey(Schema.NullOr(Schema.String)),
+  wslOnly: optionalReadableKey(Schema.Boolean),
 });
 
 type DesktopSettingsDocument = typeof DesktopSettingsDocument.Type;
@@ -379,15 +386,20 @@ function applyWslWindowsFallback(settings: DesktopSettings): DesktopSettings {
   return setWslOnly(setWslBackendEnabled(settings, false), false);
 }
 
+// Fails only when the file may exist but could not be read; a missing file means defaults.
 function readSettings(
   fileSystem: FileSystem.FileSystem,
   settingsPath: string,
   appVersion: string,
-): Effect.Effect<DesktopSettings> {
+): Effect.Effect<DesktopSettings, PlatformError.PlatformError> {
   const defaultSettings = resolveDefaultDesktopSettings(appVersion);
 
   return fileSystem.readFileString(settingsPath).pipe(
-    Effect.option,
+    Effect.asSome,
+    Effect.catchIf(
+      (cause) => cause.reason._tag === "NotFound",
+      () => Effect.succeed(Option.none<string>()),
+    ),
     Effect.flatMap(
       Option.match({
         onNone: () => Effect.succeed(defaultSettings),
@@ -476,6 +488,8 @@ export const make = Effect.gen(function* () {
   const path = yield* Path.Path;
   const random = yield* SecureRandom.SecureRandom;
   const settingsRef = yield* SynchronizedRef.make(environment.defaultDesktopSettings);
+  // Writing over a settings file we could not read would erase the preferences it holds.
+  const persistenceEnabled = yield* Ref.make(true);
 
   const updateInMemory = (update: (settings: DesktopSettings) => DesktopSettings) =>
     SynchronizedRef.modify(settingsRef, (settings) => {
@@ -492,17 +506,23 @@ export const make = Effect.gen(function* () {
         return Effect.succeed([settingsChange(settings, false), settings] as const);
       }
 
-      return random.uuidV4().pipe(
-        Effect.map((uuid) => uuid.replace(/-/g, "")),
-        Effect.flatMap((suffix) =>
-          writeSettings({
-            fileSystem,
-            path,
-            settingsPath: environment.desktopSettingsPath,
-            settings: nextSettings,
-            defaultSettings: environment.defaultDesktopSettings,
-            suffix,
-          }),
+      return Ref.get(persistenceEnabled).pipe(
+        Effect.flatMap((enabled) =>
+          enabled
+            ? random.uuidV4().pipe(
+                Effect.map((uuid) => uuid.replace(/-/g, "")),
+                Effect.flatMap((suffix) =>
+                  writeSettings({
+                    fileSystem,
+                    path,
+                    settingsPath: environment.desktopSettingsPath,
+                    settings: nextSettings,
+                    defaultSettings: environment.defaultDesktopSettings,
+                    suffix,
+                  }),
+                ),
+              )
+            : Effect.void,
         ),
         Effect.as([settingsChange(nextSettings, true), nextSettings] as const),
       );
@@ -515,6 +535,17 @@ export const make = Effect.gen(function* () {
         fileSystem,
         environment.desktopSettingsPath,
         environment.appVersion,
+      ).pipe(
+        Effect.catch((cause) =>
+          Effect.logWarning(
+            "Could not read desktop settings; using defaults without saving changes.",
+            cause,
+          ).pipe(
+            Effect.annotateLogs({ settingsPath: environment.desktopSettingsPath }),
+            Effect.andThen(Ref.set(persistenceEnabled, false)),
+            Effect.as(resolveDefaultDesktopSettings(environment.appVersion)),
+          ),
+        ),
       );
       return yield* SynchronizedRef.setAndGet(settingsRef, settings);
     }).pipe(Effect.withSpan("desktop.settings.load")),
diff --git a/apps/desktop/src/settings/DesktopClientSettings.test.ts b/apps/desktop/src/settings/DesktopClientSettings.test.ts
index 1ab9b3159e1f..90c8740f8372 100644
--- a/apps/desktop/src/settings/DesktopClientSettings.test.ts
+++ b/apps/desktop/src/settings/DesktopClientSettings.test.ts
@@ -110,7 +110,7 @@ const withClientSettings = <A, E, R>(
       prefix: "t3-desktop-client-settings-test-",
     });
     return yield* effect.pipe(Effect.provide(layer(baseDir)));
-  }).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)), Effect.scoped);
+  }).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)));
 
 describe("DesktopClientSettings", () => {
   it.effect("saves through a symlinked client settings file without replacing the link", () =>
diff --git a/apps/desktop/src/settings/DesktopSavedEnvironments.test.ts b/apps/desktop/src/settings/DesktopSavedEnvironments.test.ts
index 0001548f4534..7be39dbe1562 100644
--- a/apps/desktop/src/settings/DesktopSavedEnvironments.test.ts
+++ b/apps/desktop/src/settings/DesktopSavedEnvironments.test.ts
@@ -150,7 +150,7 @@ const withSavedEnvironments = <A, E, R>(
       prefix: "t3-desktop-saved-environments-test-",
     });
     return yield* effect.pipe(Effect.provide(layer(baseDir, options)));
-  }).pipe(Effect.provide(NodeServices.layer), Effect.scoped);
+  }).pipe(Effect.provide(NodeServices.layer));
 
 describe("DesktopSavedEnvironments", () => {
   it.effect("loads lenient saved environment registry documents", () =>
diff --git a/apps/desktop/src/ssh/DesktopSshPasswordPrompts.test.ts b/apps/desktop/src/ssh/DesktopSshPasswordPrompts.test.ts
index 1e5b6dafc6ca..15977b34f398 100644
--- a/apps/desktop/src/ssh/DesktopSshPasswordPrompts.test.ts
+++ b/apps/desktop/src/ssh/DesktopSshPasswordPrompts.test.ts
@@ -144,7 +144,7 @@ describe("DesktopSshPasswordPrompts", () => {
 
       yield* prompts.resolve({ requestId: request.requestId, password: "secret" });
       assert.equal(yield* Fiber.join(fiber), "secret");
-    }).pipe(Effect.provide(layer(testWindow.window)), Effect.scoped);
+    }).pipe(Effect.provide(layer(testWindow.window)));
   });
 
   it.effect.each(["answered", "cancelled", "timed out", "interrupted"] as const)(
@@ -189,7 +189,7 @@ describe("DesktopSshPasswordPrompts", () => {
             .map((message) => message.args),
           [[request.requestId]],
         );
-      }).pipe(Effect.provide(layer(testWindow.window)), Effect.scoped);
+      }).pipe(Effect.provide(layer(testWindow.window)));
     },
   );
 
@@ -219,6 +219,6 @@ describe("DesktopSshPasswordPrompts", () => {
       assert.equal(password, "secret");
       assert.equal(testWindow.isFocused(), false);
       assert.equal(testWindow.closedListenerCount(), 0);
-    }).pipe(Effect.provide(layer(testWindow.window)), Effect.scoped);
+    }).pipe(Effect.provide(layer(testWindow.window)));
   });
 });
diff --git a/apps/desktop/src/updates/DesktopUpdates.test.ts b/apps/desktop/src/updates/DesktopUpdates.test.ts
index 15c481f488db..7ee2ff5dd51c 100644
--- a/apps/desktop/src/updates/DesktopUpdates.test.ts
+++ b/apps/desktop/src/updates/DesktopUpdates.test.ts
@@ -247,6 +247,26 @@ describe("DesktopUpdates", () => {
     ).pipe(Effect.provide(Layer.merge(TestClock.layer(), harness.layer)));
   });
 
+  it.effect("checks shortly after startup and then every four hours", () => {
+    const harness = makeHarness();
+
+    return Effect.scoped(
+      Effect.gen(function* () {
+        const updates = yield* DesktopUpdates.DesktopUpdates;
+        yield* updates.configure;
+
+        yield* TestClock.adjust("15 seconds");
+        assert.equal(harness.checkCount(), 1);
+
+        yield* TestClock.adjust("3 hours");
+        assert.equal(harness.checkCount(), 1);
+
+        yield* TestClock.adjust("1 hour");
+        assert.equal(harness.checkCount(), 2);
+      }),
+    ).pipe(Effect.provide(Layer.merge(TestClock.layer(), harness.layer)));
+  });
+
   it.effect(
     "rejects install while a refresh check is in progress and releases the reservation",
     () =>
@@ -524,14 +544,17 @@ describe("DesktopUpdates", () => {
 
   it.effect("marks the backend stop for an install as an update restart", () => {
     let markersAtStop: ReadonlyArray<string> = [];
+    let inProgressAtStop: string | undefined;
     const harness = makeHarness({
       stopBackend: Effect.sync(() => {
         markersAtStop = [...harness.updateRestartMarkers];
+        inProgressAtStop = harness.updateInProgressMarker();
       }),
     });
 
     return Effect.scoped(
       Effect.gen(function* () {
+        yield* TestClock.setTime(1_000);
         const environment = yield* DesktopEnvironment.DesktopEnvironment;
         const updates = yield* DesktopUpdates.DesktopUpdates;
         yield* updates.configure;
@@ -542,6 +565,12 @@ describe("DesktopUpdates", () => {
         assert.deepEqual(markersAtStop, [
           environment.path.join(environment.baseDir, "runtime", DESKTOP_UPDATE_RESTART_MARKER_FILE),
         ]);
+        // SSH launchers wait on this until the replacement backend publishes its runtime.
+        assert.deepEqual(JSON.parse(inProgressAtStop ?? "null"), {
+          startedAt: 1_000,
+          expiresAt: 61_000,
+        });
+        assert.isDefined(harness.updateInProgressMarker());
       }),
     ).pipe(Effect.provide(Layer.merge(TestClock.layer(), harness.layer)));
   });
@@ -624,9 +653,11 @@ describe("DesktopUpdates", () => {
           const installFiber = yield* updates.install.pipe(Effect.forkScoped);
           yield* Deferred.await(stopping);
           assert.equal(harness.updateRestartMarkers.size, 1);
+          assert.isDefined(harness.updateInProgressMarker());
 
           yield* Fiber.interrupt(installFiber);
           assert.equal(harness.updateRestartMarkers.size, 0);
+          assert.isUndefined(harness.updateInProgressMarker());
         }),
       ).pipe(Effect.provide(Layer.merge(TestClock.layer(), harness.layer)));
     }),
@@ -661,6 +692,7 @@ describe("DesktopUpdates", () => {
           "startBackend",
         ]);
         assert.equal(harness.updateRestartMarkers.size, 0);
+        assert.isUndefined(harness.updateInProgressMarker());
         assert.equal(harness.installRecords.size, 0);
       }),
     ).pipe(Effect.provide(Layer.merge(TestClock.layer(), harness.layer)));
diff --git a/apps/desktop/src/updates/DesktopUpdates.ts b/apps/desktop/src/updates/DesktopUpdates.ts
index 077cad616147..db31e0bc112b 100644
--- a/apps/desktop/src/updates/DesktopUpdates.ts
+++ b/apps/desktop/src/updates/DesktopUpdates.ts
@@ -1,5 +1,7 @@
 import {
   DESKTOP_UPDATE_RESTART_MARKER_FILE,
+  DESKTOP_UPDATE_IN_PROGRESS_MARKER_FILE,
+  DESKTOP_UPDATE_IN_PROGRESS_TTL_MS,
   DesktopUpdateChannelSchema,
   type DesktopRuntimeInfo,
   type DesktopUpdateActionResult,
@@ -60,7 +62,7 @@ import {
 const CHANNEL_CHANGE_RETRY_DELAY = Duration.seconds(1);
 const CHANNEL_CHANGE_RETRIES = 30;
 const AUTO_UPDATE_STARTUP_DELAY = "15 seconds";
-const AUTO_UPDATE_POLL_INTERVAL = "4 minutes";
+const AUTO_UPDATE_POLL_INTERVAL = "4 hours";
 const PREPARED_INSTALL_CHECK_WAIT = Duration.seconds(90);
 
 type UpdateAction = "check" | "download" | "install" | "install-recovery" | "channel";
@@ -669,6 +671,34 @@ export const make = Effect.gen(function* () {
       ),
     );
 
+  const updateInProgressMarkerPath = environment.path.join(
+    updateRestartMarkerDir,
+    DESKTOP_UPDATE_IN_PROGRESS_MARKER_FILE,
+  );
+  const encodeUpdateMarker = Schema.encodeEffect(
+    Schema.fromJsonString(Schema.Struct({ startedAt: Schema.Number, expiresAt: Schema.Number })),
+  );
+  const updateInProgressTempPath = `${updateInProgressMarkerPath}.tmp`;
+  const writeUpdateInProgressMarker = Effect.gen(function* () {
+    const startedAt = DateTime.toEpochMillis(yield* DateTime.now);
+    const contents = yield* encodeUpdateMarker({
+      startedAt,
+      expiresAt: startedAt + DESKTOP_UPDATE_IN_PROGRESS_TTL_MS,
+    });
+    yield* fileSystem.writeFileString(updateInProgressTempPath, contents);
+    yield* fileSystem.rename(updateInProgressTempPath, updateInProgressMarkerPath);
+  }).pipe(
+    Effect.ensuring(
+      fileSystem.remove(updateInProgressTempPath, { force: true }).pipe(Effect.ignore),
+    ),
+    Effect.catch((error) =>
+      logUpdaterWarning("Could not write the update-in-progress marker.", { errorTag: error._tag }),
+    ),
+  );
+  const removeUpdateInProgressMarker = fileSystem
+    .remove(updateInProgressMarkerPath, { force: true })
+    .pipe(Effect.ignore);
+
   // Failed or interrupted installs leave no replacement backend; later quits must release the tunnel.
   const removeUpdateRestartMarker = fileSystem
     .remove(updateRestartMarkerPath, { force: true })
@@ -724,6 +754,7 @@ export const make = Effect.gen(function* () {
       Ref.set(desktopState.quitting, false),
       Ref.set(installRunningBackendsRef, []),
       removeUpdateRestartMarker,
+      removeUpdateInProgressMarker,
       removeInstallRecord,
     ],
     { discard: true },
@@ -741,6 +772,7 @@ export const make = Effect.gen(function* () {
 
     yield* Ref.set(desktopState.quitting, false);
     yield* removeUpdateRestartMarker;
+    yield* removeUpdateInProgressMarker;
     yield* removeInstallRecord;
     yield* Effect.gen(function* () {
       const runningInstances = yield* Ref.getAndSet(installRunningBackendsRef, []);
@@ -816,6 +848,7 @@ export const make = Effect.gen(function* () {
 
         return yield* Effect.gen(function* () {
           yield* writeUpdateRestartMarker;
+          yield* writeUpdateInProgressMarker;
           const { downloadedVersion } = yield* Ref.get(updateStateRef);
           if (downloadedVersion !== null) yield* writeInstallRecord(downloadedVersion);
           // Stop pooled backends and SSH tunnels before quitAndInstall can outrun their scope finalizers.
diff --git a/apps/desktop/src/updates/githubUpdateFeed.test.ts b/apps/desktop/src/updates/githubUpdateFeed.test.ts
new file mode 100644
index 000000000000..d9e928fce186
--- /dev/null
+++ b/apps/desktop/src/updates/githubUpdateFeed.test.ts
@@ -0,0 +1,107 @@
+import * as NodeModule from "node:module";
+
+import { GitHubProvider } from "electron-updater/out/providers/GitHubProvider.js";
+import { describe, expect, it } from "vite-plus/test";
+
+type ProviderArgs = ConstructorParameters<typeof GitHubProvider>;
+
+// electron-updater's own dependency, which apps/desktop does not declare.
+const semver = NodeModule.createRequire(
+  NodeModule.createRequire(import.meta.url).resolve("electron-updater"),
+)("semver") as { parse: (version: string) => ProviderArgs[1]["currentVersion"] };
+
+const REPO = "/pingdotgg/t3code";
+const nightly = (build: number) => `v0.1.10-nightly.20261112.${build}`;
+
+const atomFeed = (tags: ReadonlyArray<string>) =>
+  `<feed xmlns="http://www.w3.org/2005/Atom">${tags
+    .map(
+      (tag) =>
+        `<entry><link rel="alternate" type="text/html" href="https://github.com${REPO}/releases/tag/${tag}"/><title>${tag}</title><content type="html">${tag} feed notes</content></entry>`,
+    )
+    .join("")}</feed>`;
+
+/**
+ * The release a nightly install on 4580 is offered when GitHub serves this feed, this `update-feed`
+ * pointer, and this newest nightly from the REST API scan.
+ */
+const offeredRelease = async (
+  feedTags: ReadonlyArray<string>,
+  pointerTag: string | undefined,
+  listedTag?: string | Error,
+) => {
+  let apiScans = 0;
+  const request = async ({ path = "" }: { readonly path?: string | null }) => {
+    if (path === `${REPO}/releases.atom`) return atomFeed(feedTags);
+    if (path === `${REPO}/releases/download/update-feed/nightly.json`) {
+      if (pointerTag === undefined) throw new Error("404");
+      return JSON.stringify({ tag_name: pointerTag, name: pointerTag, body: "pointer notes" });
+    }
+    const manifest = /\/releases\/download\/v([^/]+)\/nightly\.yml$/.exec(path ?? "");
+    if (manifest) return `version: ${manifest[1]}\npath: T3-Code.exe\nsha512: abc\n`;
+    apiScans += 1;
+    if (listedTag instanceof Error) throw listedTag;
+    return JSON.stringify(listedTag ? [{ tag_name: listedTag, body: "API notes" }] : []);
+  };
+  const provider = new GitHubProvider(
+    { provider: "github", owner: "pingdotgg", repo: "t3code" },
+    // Only the four fields the provider reads; a real AppUpdater needs Electron.
+    {
+      allowPrerelease: true,
+      channel: "nightly",
+      currentVersion: semver.parse("0.1.10-nightly.20261112.4580"),
+      fullChangelog: true,
+    } as ProviderArgs[1],
+    {
+      isUseMultipleRangeRequest: false,
+      platform: "win32",
+      executor: { request },
+    } as ProviderArgs[2],
+  );
+  const { tag, releaseNotes } = await provider.getLatestVersion();
+  return { tag, releaseNotes, apiScans };
+};
+
+// What filled releases.atom on 2026-11-12: ten tags, none of them a nightly.
+const crowdedFeed = Array.from({ length: 10 }, (_, i) => `v0.1.10-preview.20261112.${4550 + i}`);
+
+describe("GitHubProvider nightly lookup", () => {
+  it.each([
+    ["other tags fill the feed", crowdedFeed],
+    ["the feed's first nightly is an older one", [nightly(4603)]],
+  ])("finds the newest nightly at the fixed pointer when %s", async (_case, feedTags) => {
+    expect(await offeredRelease(feedTags, nightly(4606))).toEqual({
+      tag: nightly(4606),
+      releaseNotes: "pointer notes",
+      apiScans: 0,
+    });
+  });
+
+  it("still scans the API when the feed has no nightly and the pointer offers nothing new", async () => {
+    expect(await offeredRelease(crowdedFeed, nightly(4580), nightly(4606))).toEqual({
+      tag: nightly(4606),
+      releaseNotes: "API notes",
+      apiScans: 1,
+    });
+  });
+
+  it("keeps the pointer's answer when the API scan fails", async () => {
+    const rateLimited = new Error("403");
+    expect(await offeredRelease(crowdedFeed, nightly(4580), rateLimited)).toMatchObject({
+      tag: nightly(4580),
+      apiScans: 1,
+    });
+  });
+
+  it.each([
+    ["the feed is newer than the pointer", nightly(4603)],
+    ["there is no pointer", undefined],
+    ["the pointer names another channel", "v0.1.10-preview.20261112.4700"],
+  ])("keeps the feed's nightly when %s", async (_case, pointerTag) => {
+    expect(await offeredRelease([nightly(4606)], pointerTag)).toEqual({
+      tag: nightly(4606),
+      releaseNotes: [{ version: nightly(4606).slice(1), note: `${nightly(4606)} feed notes` }],
+      apiScans: 0,
+    });
+  });
+});
diff --git a/apps/desktop/src/updates/updatesTestHarness.ts b/apps/desktop/src/updates/updatesTestHarness.ts
index 06f9e86a97d5..b118d15ced67 100644
--- a/apps/desktop/src/updates/updatesTestHarness.ts
+++ b/apps/desktop/src/updates/updatesTestHarness.ts
@@ -244,6 +244,7 @@ export function makeHarness(options: UpdatesHarnessOptions = {}) {
       : DesktopAppSettings.layer;
 
   const updateRestartMarkers = new Set<string>();
+  const updateMarkerContents = new Map<string, string>();
   const installRecords = new Map<string, string>();
   let previousInstallRecord = options.installRecord;
   const isInstallRecord = (path: string) =>
@@ -269,11 +270,21 @@ export function makeHarness(options: UpdatesHarnessOptions = {}) {
     writeFileString: (path, data) =>
       Effect.sync(() => {
         if (isInstallRecord(path)) installRecords.set(path, data);
-        else updateRestartMarkers.add(path);
+        else {
+          if (path.endsWith("/desktop-update-restart")) updateRestartMarkers.add(path);
+          updateMarkerContents.set(path, data);
+        }
+      }),
+    rename: (from, to) =>
+      Effect.sync(() => {
+        const contents = updateMarkerContents.get(from);
+        if (contents !== undefined) updateMarkerContents.set(to, contents);
+        updateMarkerContents.delete(from);
       }),
     remove: (path) =>
       Effect.sync(() => {
         updateRestartMarkers.delete(path);
+        updateMarkerContents.delete(path);
         installRecords.delete(path);
         if (isInstallRecord(path)) previousInstallRecord = undefined;
       }),
@@ -306,6 +317,8 @@ export function makeHarness(options: UpdatesHarnessOptions = {}) {
     quitAndInstalls: () => quitAndInstallCount,
     installSteps,
     updateRestartMarkers,
+    updateInProgressMarker: () =>
+      [...updateMarkerContents].find(([path]) => path.endsWith("/desktop-update-in-progress"))?.[1],
     installRecords,
     previousInstallRecord: () => previousInstallRecord,
     downloadCount: () => downloadCount,
diff --git a/apps/desktop/src/wsl/DesktopWslBackend.test.ts b/apps/desktop/src/wsl/DesktopWslBackend.test.ts
index 8468a9538630..d9ae6e76c29c 100644
--- a/apps/desktop/src/wsl/DesktopWslBackend.test.ts
+++ b/apps/desktop/src/wsl/DesktopWslBackend.test.ts
@@ -154,7 +154,7 @@ describe("DesktopWslBackend", () => {
       assert.equal(startCount, 1);
       assert.deepEqual(yield* backend.lastPreflightError, refusal);
 
-      yield* clearFailure(new URL("http://127.0.0.1:41773"));
+      yield* clearFailure(new URL("http://127.0.0.1:41773"), 123);
       assert.deepEqual(yield* backend.lastPreflightError, Option.none());
       yield* recordOwnershipFailure();
       const settings = yield* DesktopAppSettings.DesktopAppSettings;
diff --git a/apps/desktop/src/wsl/DesktopWslServerTree.test.ts b/apps/desktop/src/wsl/DesktopWslServerTree.test.ts
index 7eaf362a326a..34dcbea08a0e 100644
--- a/apps/desktop/src/wsl/DesktopWslServerTree.test.ts
+++ b/apps/desktop/src/wsl/DesktopWslServerTree.test.ts
@@ -6,7 +6,6 @@ import * as Layer from "effect/Layer";
 import * as Path from "effect/Path";
 import * as PlatformError from "effect/PlatformError";
 import * as Ref from "effect/Ref";
-import * as Scope from "effect/Scope";
 
 import * as DesktopConfig from "../app/DesktopConfig.ts";
 import * as DesktopEnvironment from "../app/DesktopEnvironment.ts";
@@ -42,20 +41,14 @@ const layerEnvironment = (input: {
     ),
   );
 
-const withTempDir = <A, E, R>(
-  run: (tempDir: string) => Effect.Effect<A, E, R>,
-): Effect.Effect<
-  A,
-  E | PlatformError.PlatformError,
-  FileSystem.FileSystem | Exclude<R, Scope.Scope>
-> =>
+const withTempDir = <A, E, R>(run: (tempDir: string) => Effect.Effect<A, E, R>) =>
   Effect.gen(function* () {
     const fileSystem = yield* FileSystem.FileSystem;
     const tempDir = yield* fileSystem.makeTempDirectoryScoped({
       prefix: "t3-wsl-server-tree-test-",
     });
     return yield* run(tempDir);
-  }).pipe(Effect.scoped);
+  });
 
 const ensureWith = (input: {
   readonly baseDir: string;
diff --git a/apps/desktop/src/wsl/wslPathParsing.test.ts b/apps/desktop/src/wsl/wslPathParsing.test.ts
index 0a814229665d..ed491f58381a 100644
--- a/apps/desktop/src/wsl/wslPathParsing.test.ts
+++ b/apps/desktop/src/wsl/wslPathParsing.test.ts
@@ -77,8 +77,15 @@ describe("wslUncPathToLinuxPath", () => {
     expect(wslUncPathToLinuxPath("\\\\wsl.localhost\\Debian\\")).toBe("/");
   });
 
+  it("maps UNC paths of distros whose names start or end with a dot or hyphen", () => {
+    for (const name of ["Ubuntu-", "Ubuntu.", ".Ubuntu", "-Ubuntu"]) {
+      expect(wslUncPathToLinuxPath(`\\\\wsl.localhost\\${name}\\home\\josh`)).toBe("/home/josh");
+    }
+  });
+
   it("rejects invalid distro names and non-WSL paths", () => {
     expect(wslUncPathToLinuxPath("\\\\wsl.localhost\\bad!name\\home")).toBeNull();
+    expect(wslUncPathToLinuxPath("\\\\wsl.localhost\\..\\home")).toBeNull();
     expect(wslUncPathToLinuxPath("C:\\Users\\Josh\\repo")).toBeNull();
   });
 });
@@ -107,9 +114,13 @@ describe("resolveWslPickFolderDefaultPath", () => {
 });
 
 describe("isValidDistroName", () => {
-  it("rejects names with trailing whitespace, hyphen, or dot", () => {
-    for (const name of ["Ubuntu ", "Ubuntu-", "Ubuntu."]) {
-      expect(isValidDistroName(name)).toBe(false);
+  it("rejects names with trailing whitespace", () => {
+    expect(isValidDistroName("Ubuntu ")).toBe(false);
+  });
+
+  it("accepts names WSL registers with a leading or trailing dot or hyphen", () => {
+    for (const name of ["Ubuntu-", "Ubuntu.", ".Ubuntu", "-Ubuntu"]) {
+      expect(isValidDistroName(name)).toBe(true);
     }
   });
 
diff --git a/apps/desktop/src/wsl/wslPathParsing.ts b/apps/desktop/src/wsl/wslPathParsing.ts
index a1ce99c129d1..1df64f91dac0 100644
--- a/apps/desktop/src/wsl/wslPathParsing.ts
+++ b/apps/desktop/src/wsl/wslPathParsing.ts
@@ -9,7 +9,8 @@ export interface WslConfig {
 }
 
 // Literal spaces only; \s would accept controls and corrupt UNC distro paths.
-const DISTRO_NAME_PATTERN = /^\w(?:[\w \-.]*\w)?$/;
+// "." and ".." would be path segments in a UNC path, not distro names.
+const DISTRO_NAME_PATTERN = /^(?!\.{1,2}$)[\w.-](?:[\w .-]*[\w.-])?$/;
 
 export function parseWslDistroList(stdout: Buffer): readonly WslDistro[] {
   const hasUtf16Bom = stdout.length >= 2 && stdout[0] === 0xff && stdout[1] === 0xfe;
diff --git a/apps/mobile/deps/README.md b/apps/mobile/deps/README.md
index 2abb1858b3c6..e7623faa8fe2 100644
--- a/apps/mobile/deps/README.md
+++ b/apps/mobile/deps/README.md
@@ -1,4 +1,4 @@
-The Enriched Markdown tarball comes from Julius's [`fork/t3-mobile` branch](https://github.com/pingdotgg/enriched-markdown/tree/fork/t3-mobile). Its `t3-fork.json` records the exact source commit and upstream base. React block renderers, signed image sources, the `onLinksChange` link list (`renderers`, `resolveImageSource`, `onLinksChange`) and the iOS streaming memory bounds are upstream. The fork carries only changes with an open upstream PR: clipboard link metadata ([#962](https://github.com/software-mansion/enriched-markdown/pull/962)), development-host autolinks ([#961](https://github.com/software-mansion/enriched-markdown/pull/961)) and hash-route link fragments ([mity/md4c#454](https://github.com/mity/md4c/pull/454), arriving through [md4c#7](https://github.com/software-mansion-labs/md4c/pull/7)), `md4cFlags.preserveWindowsPaths`, which keeps backslashes in Windows drive paths in prose ([#1105](https://github.com/software-mansion/enriched-markdown/pull/1105), after [mity/md4c#477](https://github.com/mity/md4c/pull/477)), GitHub's strikethrough rules for `~` ([md4c#6](https://github.com/software-mansion-labs/md4c/pull/6)), `\(…\)` and `\[…\]` math delimiters ([#1043](https://github.com/software-mansion/enriched-markdown/pull/1043), [md4c#4](https://github.com/software-mansion-labs/md4c/pull/4)), iOS Copy as Markdown keeping bold spans whole ([#1143](https://github.com/software-mansion/enriched-markdown/pull/1143)), line breaks in copied table cells written as `<br>` ([#1144](https://github.com/software-mansion/enriched-markdown/pull/1144)), and Android measuring text in the span order its view draws it, so code blocks nested in list items no longer make a reply overlap the next message ([#1145](https://github.com/software-mansion/enriched-markdown/pull/1145)).
+The Enriched Markdown tarball comes from Julius's [`fork/t3-mobile` branch](https://github.com/pingdotgg/enriched-markdown/tree/fork/t3-mobile). Its `t3-fork.json` records the exact source commit and upstream base. React block renderers, signed image sources, the `onLinksChange` link list (`renderers`, `resolveImageSource`, `onLinksChange`) and the iOS streaming memory bounds are upstream. The fork carries only changes with an open upstream PR: clipboard link metadata ([#962](https://github.com/software-mansion/enriched-markdown/pull/962)), development-host autolinks ([#961](https://github.com/software-mansion/enriched-markdown/pull/961)) and hash-route link fragments ([mity/md4c#454](https://github.com/mity/md4c/pull/454), arriving through [md4c#7](https://github.com/software-mansion-labs/md4c/pull/7)), `md4cFlags.preserveWindowsPaths`, which keeps backslashes in Windows drive paths in prose ([#1105](https://github.com/software-mansion/enriched-markdown/pull/1105), after [mity/md4c#477](https://github.com/mity/md4c/pull/477)), GitHub's strikethrough rules for `~` ([md4c#6](https://github.com/software-mansion-labs/md4c/pull/6)), `\(…\)` and `\[…\]` math delimiters ([#1043](https://github.com/software-mansion/enriched-markdown/pull/1043), [md4c#4](https://github.com/software-mansion-labs/md4c/pull/4)), iOS Copy as Markdown keeping bold spans whole ([#1143](https://github.com/software-mansion/enriched-markdown/pull/1143)), line breaks in copied table cells written as `<br>` ([#1144](https://github.com/software-mansion/enriched-markdown/pull/1144)), and Android measuring text in the span order its view draws it, so code blocks nested in list items no longer make a reply overlap the next message ([#1145](https://github.com/software-mansion/enriched-markdown/pull/1145)). It also carries one fork-only change: iOS code blocks too big for one backing store draw through tiles, so a tall block with long lines no longer shows an empty pane ([pingdotgg/enriched-markdown#15](https://github.com/pingdotgg/enriched-markdown/pull/15)).
 
 To replace it, commit the fork changes, run `yarn install --immutable` and `yarn workspace react-native-enriched-markdown prepare` in the fork checkout, then `node scripts/pack-t3.mjs /path/to/t3code/apps/mobile/deps`. Keep the package version aligned with Julius's `fork/t3-mobile` branch. Rename the archive to include the first eight characters of the source commit, such as `react-native-enriched-markdown-1.2.0-t3.18-4287c5d3.tgz`, so each build has a distinct dependency path without version bumps. Update the tarball path in `apps/mobile/package.json` and `pnpm-workspace.yaml`'s `allowBuilds`, and run `vp i` to update the lockfile. Native clients need rebuilding when this dependency changes.
 
diff --git a/apps/mobile/deps/react-native-enriched-markdown-1.2.0-t3.18-0dc7ed81.tgz b/apps/mobile/deps/react-native-enriched-markdown-1.2.0-t3.18-0dc7ed81.tgz
new file mode 100644
index 000000000000..74fcb8768906
Binary files /dev/null and b/apps/mobile/deps/react-native-enriched-markdown-1.2.0-t3.18-0dc7ed81.tgz differ
diff --git a/apps/mobile/deps/react-native-enriched-markdown-1.2.0-t3.18-497fbe63.tgz b/apps/mobile/deps/react-native-enriched-markdown-1.2.0-t3.18-497fbe63.tgz
deleted file mode 100644
index 2dbfd6d79604..000000000000
Binary files a/apps/mobile/deps/react-native-enriched-markdown-1.2.0-t3.18-497fbe63.tgz and /dev/null differ
diff --git a/apps/mobile/deps/react-native-screens-5.0.0-t3.48.tgz b/apps/mobile/deps/react-native-screens-5.0.0-t3.48.tgz
deleted file mode 100644
index f1eb3858e986..000000000000
Binary files a/apps/mobile/deps/react-native-screens-5.0.0-t3.48.tgz and /dev/null differ
diff --git a/apps/mobile/deps/react-native-screens-5.0.0-t3.50.tgz b/apps/mobile/deps/react-native-screens-5.0.0-t3.50.tgz
new file mode 100644
index 000000000000..74c351ddc337
Binary files /dev/null and b/apps/mobile/deps/react-native-screens-5.0.0-t3.50.tgz differ
diff --git a/apps/mobile/modules/t3-native-controls/android/src/main/java/expo/modules/t3nativecontrols/T3SecretInputModule.kt b/apps/mobile/modules/t3-native-controls/android/src/main/java/expo/modules/t3nativecontrols/T3SecretInputModule.kt
index 1df8c646d483..4ac5b47a42f3 100644
--- a/apps/mobile/modules/t3-native-controls/android/src/main/java/expo/modules/t3nativecontrols/T3SecretInputModule.kt
+++ b/apps/mobile/modules/t3-native-controls/android/src/main/java/expo/modules/t3nativecontrols/T3SecretInputModule.kt
@@ -7,6 +7,7 @@ import android.os.Build
 import android.text.Editable
 import android.text.InputType
 import android.text.TextWatcher
+import android.text.method.PasswordTransformationMethod
 import android.util.TypedValue
 import android.view.Gravity
 import android.view.KeyEvent
@@ -42,6 +43,7 @@ class T3SecretInputModule : Module() {
         view.input.setTextSize(TypedValue.COMPLEX_UNIT_DIP, value)
       }
       Prop("editable") { view: T3SecretInputView, value: Boolean -> view.input.isEnabled = value }
+      Prop("revealed") { view: T3SecretInputView, value: Boolean -> view.setRevealed(value) }
       Events("onChangeText", "onSubmit")
     }
   }
@@ -133,6 +135,18 @@ class T3SecretInputView(context: Context, appContext: AppContext) : ExpoView(con
     applyingValue = false
   }
 
+  /** Swapping the transformation re-sets the text, so it neither echoes to JS nor moves the caret. */
+  fun setRevealed(revealed: Boolean) {
+    val method = if (revealed) null else PasswordTransformationMethod.getInstance()
+    if (input.transformationMethod == method) return
+    val start = input.selectionStart
+    val end = input.selectionEnd
+    applyingValue = true
+    input.transformationMethod = method
+    if (start >= 0 && end >= 0) input.setSelection(start, end)
+    applyingValue = false
+  }
+
   fun setCursorColor(color: Int) {
     input.highlightColor = Color.argb(0x52, Color.red(color), Color.green(color), Color.blue(color))
     if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) return
diff --git a/apps/mobile/modules/t3-terminal/android/src/main/java/expo/modules/t3terminal/T3TerminalView.kt b/apps/mobile/modules/t3-terminal/android/src/main/java/expo/modules/t3terminal/T3TerminalView.kt
index e5c8f6c0fd8f..c41d2d545ca6 100644
--- a/apps/mobile/modules/t3-terminal/android/src/main/java/expo/modules/t3terminal/T3TerminalView.kt
+++ b/apps/mobile/modules/t3-terminal/android/src/main/java/expo/modules/t3terminal/T3TerminalView.kt
@@ -67,6 +67,7 @@ class T3TerminalView(context: Context, appContext: AppContext) : ExpoView(contex
   private var streamedOutput: TerminalOutputBuffer? = null
   private var cols = 0
   private var rows = 0
+  private var cellSize = 0 to 0
   private var measuredCols = 0
   private var measuredRows = 0
   private var clearingInput = false
@@ -356,25 +357,24 @@ class T3TerminalView(context: Context, appContext: AppContext) : ExpoView(contex
     applyGrid()
   }
 
+  @Suppress("ComplexCondition")
   private fun applyGrid() {
     if (measuredCols <= 0 || measuredRows <= 0 || isCleanedUp) return
     val shared = sharedGrid.takeIf { it.size == 2 && it[0] > 0 && it[1] > 0 }
     val nextCols = shared?.get(0)?.coerceAtMost(measuredCols) ?: measuredCols
     val nextRows = shared?.get(1)?.coerceAtMost(measuredRows) ?: measuredRows
-    if (nextCols == cols && nextRows == rows && terminalHandle != 0L) return
+    val nextCellSize = terminalCanvas.cellWidthPx.toInt() to terminalCanvas.cellHeightPx.toInt()
+    if (nextCols == cols && nextRows == rows && nextCellSize == cellSize && terminalHandle != 0L) {
+      return
+    }
     cols = nextCols
     rows = nextRows
+    cellSize = nextCellSize
     val response = if (terminalHandle == 0L) {
       createTerminal()
       ByteArray(0)
     } else {
-      GhosttyBridge.nativeResize(
-        terminalHandle,
-        cols,
-        rows,
-        terminalCanvas.cellWidthPx.toInt(),
-        terminalCanvas.cellHeightPx.toInt(),
-      )
+      GhosttyBridge.nativeResize(terminalHandle, cols, rows, cellSize.first, cellSize.second)
     }
     emitResponse(response)
     if (!hasPendingBuffer) feedPendingBuffer()
@@ -387,8 +387,8 @@ class T3TerminalView(context: Context, appContext: AppContext) : ExpoView(contex
     terminalHandle = GhosttyBridge.nativeCreate(
       cols,
       rows,
-      terminalCanvas.cellWidthPx.toInt(),
-      terminalCanvas.cellHeightPx.toInt(),
+      cellSize.first,
+      cellSize.second,
       foregroundColorValue,
       backgroundColorValue,
       cursorColorValue,
diff --git a/apps/mobile/modules/t3-terminal/ios/T3TerminalView.swift b/apps/mobile/modules/t3-terminal/ios/T3TerminalView.swift
index d8f0b29ebce5..1ed02e6a16cb 100644
--- a/apps/mobile/modules/t3-terminal/ios/T3TerminalView.swift
+++ b/apps/mobile/modules/t3-terminal/ios/T3TerminalView.swift
@@ -285,7 +285,7 @@ public final class T3TerminalView: ExpoView, UITextFieldDelegate, UIEditMenuInte
     didSet {
       guard oldValue != fontSize else { return }
       inputField.font = UIFont.monospacedSystemFont(ofSize: max(fontSize, 13), weight: .regular)
-      resetSurface()
+      applyConfigInPlace()
     }
   }
 
@@ -321,14 +321,14 @@ public final class T3TerminalView: ExpoView, UITextFieldDelegate, UIEditMenuInte
     didSet {
       guard oldValue != appearanceScheme else { return }
       appearance = TerminalAppearanceScheme(value: appearanceScheme)
-      resetSurface()
+      applyConfigInPlace()
     }
   }
 
   var themeConfig: String = "" {
     didSet {
       guard oldValue != themeConfig else { return }
-      resetSurface()
+      applyConfigInPlace()
     }
   }
 
@@ -663,7 +663,8 @@ public final class T3TerminalView: ExpoView, UITextFieldDelegate, UIEditMenuInte
       surfaceCreationFailed = true
       return
     }
-    loadThemeConfig(into: config)
+    // Creation proceeds without the file, as before; font_size is also set on the surface config.
+    _ = loadThemeConfig(into: config)
     ghostty_config_finalize(config)
     defer { ghostty_config_free(config) }
 
@@ -710,6 +711,27 @@ public final class T3TerminalView: ExpoView, UITextFieldDelegate, UIEditMenuInte
     setNeedsLayout()
   }
 
+  // Font and theme change in place: a new surface would replay output and re-answer its queries.
+  private func applyConfigInPlace() {
+    guard let app, let surface else {
+      resetSurface()
+      return
+    }
+    guard let config = ghostty_config_new() else { return }
+    defer { ghostty_config_free(config) }
+    let loaded = loadThemeConfig(into: config)
+    ghostty_config_finalize(config)
+    ghostty_app_set_color_scheme(app, appearance.ghosttyColorScheme)
+    ghostty_surface_set_color_scheme(surface, appearance.ghosttyColorScheme)
+    tickApp()
+    // Without the file, the config lacks font-size and would reset the surface to defaults.
+    if loaded {
+      ghostty_surface_update_config(surface, config)
+    }
+    resizeSurface()
+    setNeedsLayout()
+  }
+
   private func destroySurface() {
     // Unblock the io thread before ghostty_surface_free joins it.
     tickApp()
@@ -933,16 +955,16 @@ public final class T3TerminalView: ExpoView, UITextFieldDelegate, UIEditMenuInte
     terminalViewport.backgroundColor = backgroundColorValue
   }
 
-  private func loadThemeConfig(into config: ghostty_config_t) {
-    guard let path = writeThemeConfigFile() else { return }
+  private func loadThemeConfig(into config: ghostty_config_t) -> Bool {
+    guard let path = writeThemeConfigFile() else { return false }
     path.withCString { cString in
       ghostty_config_load_file(config, cString)
     }
+    return true
   }
 
   private func writeThemeConfigFile() -> String? {
-    guard !themeConfig.isEmpty else { return nil }
-    let configContents = themeConfig
+    let configContents = "\(themeConfig)\nfont-size = \(String(format: "%g", Double(fontSize)))\n"
     let url = URL(fileURLWithPath: NSTemporaryDirectory())
       .appendingPathComponent("t3-terminal-theme-\(appearance.rawValue).ghostty")
 
diff --git a/apps/mobile/package.json b/apps/mobile/package.json
index ca0b86a7a06d..1892b649061f 100644
--- a/apps/mobile/package.json
+++ b/apps/mobile/package.json
@@ -126,7 +126,7 @@
     "react": "catalog:",
     "react-dom": "catalog:",
     "react-native": "0.88.1",
-    "react-native-enriched-markdown": "file:deps/react-native-enriched-markdown-1.2.0-t3.18-497fbe63.tgz",
+    "react-native-enriched-markdown": "file:deps/react-native-enriched-markdown-1.2.0-t3.18-0dc7ed81.tgz",
     "react-native-gesture-handler": "~3.5.0",
     "react-native-image-viewing": "^0.2.2",
     "react-native-keyboard-controller": "1.23.0",
@@ -134,7 +134,7 @@
     "react-native-pdf-jsi": "6.1.0",
     "react-native-reanimated": "4.7.1",
     "react-native-safe-area-context": "~5.11.1",
-    "react-native-screens": "file:deps/react-native-screens-5.0.0-t3.48.tgz",
+    "react-native-screens": "file:deps/react-native-screens-5.0.0-t3.50.tgz",
     "react-native-svg": "15.16.1",
     "react-native-webview": "14.0.1",
     "react-native-worklets": "0.13.1",
diff --git a/apps/mobile/src/App.tsx b/apps/mobile/src/App.tsx
index d2577b07c004..fc4dfdf3a417 100644
--- a/apps/mobile/src/App.tsx
+++ b/apps/mobile/src/App.tsx
@@ -4,7 +4,7 @@ import { installThreadOutboxDelivery } from "./state/threadOutboxDelivery";
 import * as Linking from "expo-linking";
 import * as SplashScreen from "expo-splash-screen";
 import { requireNativeModule } from "expo";
-import { useEffect, useState } from "react";
+import { useEffect, useRef, useState } from "react";
 import { Platform, StatusBar } from "react-native";
 import { GestureHandlerRootView } from "react-native-gesture-handler";
 import { KeyboardProvider } from "react-native-keyboard-controller";
@@ -77,6 +77,12 @@ import { installUiRuntimeMemoryWarningGc } from "./lib/useUiRuntimeMemoryWarning
 import { SubscriptionUsageCoordinator } from "./widgets/SubscriptionUsageCoordinator";
 import { installSubscriptionUsageRefresh } from "./widgets/useSubscriptionUsage";
 import { GlobalVoiceInputControl } from "./features/voice-input/GlobalVoiceInputControl";
+import {
+  launchSplashHomeRowsPending,
+  settleLaunchSplashHomeRows,
+  splashCanHide,
+  useLaunchSplashHomeRowsPending,
+} from "./features/home/home-launch-splash";
 import { restoreSettingsLinkState } from "./features/settings/settings-navigation";
 import {
   hydrateWorkspaceSelections,
@@ -166,6 +172,8 @@ function handleNavigationStateChange(state: NavigationState | undefined): void {
   resolvePendingNewTaskPromptLink(state);
   resolvePendingThreadPromptLink(state);
   if (!state) return;
+  // A launch that opens another route has no Home rows for the splash to wait for.
+  if (state.routes[state.index]?.name !== "Home") settleLaunchSplashHomeRows();
   setAgentNotificationPathname(workspaceLocationFromState(state).pathname);
   recordAppShortcutNavigationState(state);
   pruneNewTaskFlowStates(state);
@@ -204,28 +212,38 @@ disposeOnFoundationReplace(typeof module === "undefined" ? undefined : module.ho
   for (const dispose of appServiceDisposers) dispose();
 });
 
-// Cached shells are local reads that end in a fraction of this time; the limit only keeps a
-// failed read from holding the splash screen.
-const SPLASH_SHELL_CACHE_WAIT_MS = 1_500;
+// Cached shells are local reads that end in a fraction of this time; the limit keeps a failed
+// read, or a list that does not lay out, from holding the splash screen.
+const SPLASH_WAIT_MS = 1_500;
 
 function SplashScreenCoordinator() {
   const { isReady } = useAppearancePreferences();
   const shellCachesRead = useAtomValue(shellCachesReadAtom);
+  const homeRowsPending = useLaunchSplashHomeRowsPending();
   const [waitEnded, setWaitEnded] = useState(false);
+  const hidden = useRef(false);
 
-  // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- starts the limit on how long the native splash screen waits for cached shells
+  // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- starts the limit on how long the native splash screen waits for cached shells and their rows
   useEffect(() => {
-    const timer = setTimeout(() => setWaitEnded(true), SPLASH_SHELL_CACHE_WAIT_MS);
+    const timer = setTimeout(() => setWaitEnded(true), SPLASH_WAIT_MS);
     return () => clearTimeout(timer);
   }, []);
 
-  // The thread list paints every environment's cached rows at once when the splash hides
-  // after they are read.
-  const canHide = isReady && (shellCachesRead || waitEnded);
-  // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- hides the native splash screen once preferences and cached shells have loaded
+  // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- hides the native splash screen once preferences have loaded and the cached rows are laid out
   useEffect(() => {
-    if (canHide) void SplashScreen.hide();
-  }, [canHide]);
+    const canHide = splashCanHide({
+      preferencesReady: isReady,
+      shellCachesRead,
+      // Home holds the splash in a layout effect of the commit that gives it rows. That can be
+      // this commit, after this render read the store.
+      homeRowsPending: homeRowsPending || launchSplashHomeRowsPending(),
+      waitEnded,
+    });
+    if (!canHide || hidden.current) return;
+    hidden.current = true;
+    settleLaunchSplashHomeRows();
+    void SplashScreen.hide();
+  }, [isReady, shellCachesRead, homeRowsPending, waitEnded]);
 
   return null;
 }
diff --git a/apps/mobile/src/components/ui/AppBar.android.tsx b/apps/mobile/src/components/ui/AppBar.android.tsx
index f647535a1d42..731872951180 100644
--- a/apps/mobile/src/components/ui/AppBar.android.tsx
+++ b/apps/mobile/src/components/ui/AppBar.android.tsx
@@ -2,6 +2,7 @@ import { type RefObject, use, useRef, useState } from "react";
 import { Keyboard, type TextInputInstance, View } from "react-native";
 import { useHardwareBack } from "../../lib/backHandler";
 import { useToolbarLayout } from "./useToolbarLayout";
+import { BottomSheetContext } from "./BottomSheetContext";
 import { RoutedFormSheetContext } from "./RoutedFormSheetContext";
 import { NativeStackScreenOptions } from "../../native/StackHeader";
 import { useSidebarToggle } from "../../features/layout/useSidebarToggle";
@@ -82,12 +83,14 @@ function AppBarView(props: AppBarProps & { readonly searchState?: SearchState })
   const inWorkspace = useHasWorkspaceAppBar();
   const sidebarToggle = useSidebarToggle();
   const closeInspector = use(InspectorCloseContext);
+  // A bottom sheet owns the pull at its top, so refresh needs a button there.
+  const inBottomSheet = use(BottomSheetContext);
   const inline = search?.mode === "inline";
   const searching = searchState?.searching === true;
   const actions = props.refresh
     ? [
         ...(props.actions ?? []),
-        { ...props.refresh, icon: "arrow.clockwise" as const, overflowOnly: true },
+        { ...props.refresh, icon: "arrow.clockwise" as const, overflowOnly: !inBottomSheet },
       ]
     : props.actions;
   const openSearch = () => searchState?.open();
diff --git a/apps/mobile/src/components/ui/AppBar.tsx b/apps/mobile/src/components/ui/AppBar.tsx
index 7f76d9106613..b691faa300da 100644
--- a/apps/mobile/src/components/ui/AppBar.tsx
+++ b/apps/mobile/src/components/ui/AppBar.tsx
@@ -1,8 +1,8 @@
 import { Toolbar } from "./Toolbar";
 import { AppActivityIndicator } from "./AppActivityIndicator";
-import type { HeaderBarButtonMailSearchToolbarItem } from "react-native-screens";
-import { NavigationContext } from "@react-navigation/native";
-import { use, useId, useLayoutEffect } from "react";
+import type { HeaderBarButtonMailSearchToolbarItem, SearchBarCommands } from "react-native-screens";
+import { NavigationContext, NavigationRouteContext } from "@react-navigation/native";
+import { use, useId, useLayoutEffect, useRef, useSyncExternalStore } from "react";
 import { View } from "react-native";
 import { createNativeHeaderMenu } from "./nativeHeaderMenu.ios";
 import { ScreenHeaderButton } from "./ScreenHeaderButton";
@@ -63,6 +63,17 @@ export function AppBar(props: AppBarProps) {
       ? { ...props.backInSplitView, onPress: splitBackPress }
       : null;
   const navigation = use(NavigationContext);
+  const route = use(NavigationRouteContext);
+  // A thread opened from another thread sits on it, not beside the list, so it keeps Back.
+  const threadBelow = useSyncExternalStore(
+    (onChange) => navigation?.addListener("state", onChange) ?? (() => {}),
+    () => {
+      const routes = navigation?.getState()?.routes;
+      const index = routes?.findIndex((candidate) => candidate.key === route?.key) ?? -1;
+      return route?.name === "Thread" && index > 0 && routes?.[index - 1]?.name === "Thread";
+    },
+  );
+  const listBeside = layout.usesSplitView && props.onBackToList !== undefined && !threadBelow;
   const rootBack =
     !layout.usesSplitView && props.onBackToList && navigation?.canGoBack() === false
       ? props.onBackToList
@@ -78,6 +89,19 @@ export function AppBar(props: AppBarProps) {
   const usesNativeMailSearchToolbar = useNativeMailSearchToolbar();
   const { search, menus } = props;
   const menu = menus?.[0];
+  const searchBarRef = useRef<SearchBarCommands>(null);
+  const nativeSearchText = useRef(search?.value ?? "");
+  const searchValue = search?.value;
+  // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- the native search bar keeps its own text; a value the caller changes (a reset) has to be pushed into it
+  useLayoutEffect(() => {
+    if (searchValue === undefined || searchValue === nativeSearchText.current) return;
+    nativeSearchText.current = searchValue;
+    searchBarRef.current?.setText(searchValue);
+  }, [searchValue]);
+  const reportSearchText = (text: string) => {
+    nativeSearchText.current = text;
+    search?.onChangeText(text);
+  };
   const compactSearch =
     search !== undefined &&
     (search.compactToolbar ?? !layout.usesSplitView) &&
@@ -100,7 +124,7 @@ export function AppBar(props: AppBarProps) {
           headerBackVisible:
             props.onClose === undefined &&
             splitBack === null &&
-            !(layout.usesSplitView && props.onBackToList) &&
+            !listBeside &&
             !(props.guardBack && props.onBack),
           ...(props.guardBack ? { gestureEnabled: false } : undefined),
           title: props.title,
@@ -142,8 +166,9 @@ export function AppBar(props: AppBarProps) {
                         ? { obscureBackground: false }
                         : undefined),
                       placeholder: search.placeholder,
-                      onChangeText: (event) => search.onChangeText(event.nativeEvent.text),
-                      onCancelButtonPress: () => search.onChangeText(""),
+                      ref: searchBarRef,
+                      onChangeText: (event) => reportSearchText(event.nativeEvent.text),
+                      onCancelButtonPress: () => reportSearchText(""),
                     },
               }
             : undefined),
diff --git a/apps/mobile/src/components/ui/AppBar.types.ts b/apps/mobile/src/components/ui/AppBar.types.ts
index 88d711be7154..071b0609606e 100644
--- a/apps/mobile/src/components/ui/AppBar.types.ts
+++ b/apps/mobile/src/components/ui/AppBar.types.ts
@@ -78,7 +78,10 @@ export interface AppBarProps {
   readonly titleContent?: ReactNode;
   readonly subtitle?: string | null;
   readonly actions?: ReadonlyArray<AppBarAction>;
-  /** Pull-to-refresh is the gesture on both platforms; Android also lists this in the overflow menu. */
+  /**
+   * Pull-to-refresh is the gesture on both platforms. Android also lists this in the overflow
+   * menu, or shows it as a button in a bottom sheet, where the sheet owns the pull.
+   */
   readonly refresh?: Pick<AppBarAction, "accessibilityLabel" | "disabled" | "onPress">;
   readonly menus?: ReadonlyArray<AppBarMenu>;
   readonly search?: AppBarSearch;
diff --git a/apps/mobile/src/components/ui/BottomSheetContext.ts b/apps/mobile/src/components/ui/BottomSheetContext.ts
new file mode 100644
index 000000000000..c635f860e02d
--- /dev/null
+++ b/apps/mobile/src/components/ui/BottomSheetContext.ts
@@ -0,0 +1,4 @@
+import { createContext } from "react";
+
+/** True inside a draggable bottom sheet, which owns the downward drag at the top of its content. */
+export const BottomSheetContext = createContext(false);
diff --git a/apps/mobile/src/components/ui/ContentBand.android.tsx b/apps/mobile/src/components/ui/ContentBand.android.tsx
new file mode 100644
index 000000000000..5a1eb8354302
--- /dev/null
+++ b/apps/mobile/src/components/ui/ContentBand.android.tsx
@@ -0,0 +1,46 @@
+import { View } from "react-native";
+
+import { cn } from "../../lib/cn";
+import { AppActivityIndicator } from "./AppActivityIndicator";
+import { AppText as Text } from "./AppText";
+import type { ContentBandProps, ContentStatusProps } from "./ContentBand.types";
+export type { ContentBandProps, ContentStatusProps } from "./ContentBand.types";
+
+/** A rounded card floating in the content's margin. */
+export function ContentBand(props: ContentBandProps) {
+  return (
+    <View
+      className={cn(
+        "m-2 rounded-[20px] px-4",
+        props.spacing === "roomy" ? "gap-3 py-4" : "py-3",
+        props.tone === "warning" ? "bg-warning" : "bg-card",
+      )}
+    >
+      {props.children}
+    </View>
+  );
+}
+
+/** Material centers an empty state in the space it has. */
+export function ContentStatus(props: ContentStatusProps) {
+  if (props.loading) {
+    return (
+      <View className="items-center gap-3 px-4 py-6">
+        <AppActivityIndicator size="small" />
+        <Text className="text-xs text-foreground-muted">{props.detail}</Text>
+      </View>
+    );
+  }
+  return (
+    <View className="items-center px-6 py-5">
+      {props.title ? (
+        <Text className="text-sm font-t3-bold text-foreground">{props.title}</Text>
+      ) : null}
+      <Text className="mt-2 text-center text-xs leading-normal text-foreground-muted">
+        {props.detail}
+      </Text>
+    </View>
+  );
+}
+
+export const contentStatusContainerStyle = { flexGrow: 1, justifyContent: "center" } as const;
diff --git a/apps/mobile/src/components/ui/ContentBand.tsx b/apps/mobile/src/components/ui/ContentBand.tsx
new file mode 100644
index 000000000000..cb6bca78fdca
--- /dev/null
+++ b/apps/mobile/src/components/ui/ContentBand.tsx
@@ -0,0 +1,44 @@
+import { View } from "react-native";
+
+import { cn } from "../../lib/cn";
+import { AppActivityIndicator } from "./AppActivityIndicator";
+import { AppText as Text } from "./AppText";
+import type { ContentBandProps, ContentStatusProps } from "./ContentBand.types";
+export type { ContentBandProps, ContentStatusProps } from "./ContentBand.types";
+
+/** A full-width band above or in place of content, ruled off from what follows. */
+export function ContentBand(props: ContentBandProps) {
+  return (
+    <View
+      className={cn(
+        "border-b px-4",
+        props.spacing === "roomy" ? "gap-3 py-4" : "py-3",
+        props.tone === "warning" ? "border-warning-border bg-warning" : "border-border bg-card",
+      )}
+    >
+      {props.children}
+    </View>
+  );
+}
+
+export function ContentStatus(props: ContentStatusProps) {
+  if (props.loading) {
+    return (
+      <View className="items-center gap-3 border-b border-border bg-card px-4 py-6">
+        <AppActivityIndicator size="small" />
+        <Text className="text-xs text-foreground-muted">{props.detail}</Text>
+      </View>
+    );
+  }
+  return (
+    <View className="border-b border-border bg-card px-4 py-5">
+      {props.title ? (
+        <Text className="text-sm font-t3-bold text-foreground">{props.title}</Text>
+      ) : null}
+      <Text className="text-xs leading-normal text-foreground-muted">{props.detail}</Text>
+    </View>
+  );
+}
+
+/** The scroll content style for a ContentStatus with nothing else in the scroll view. */
+export const contentStatusContainerStyle = undefined;
diff --git a/apps/mobile/src/components/ui/ContentBand.types.ts b/apps/mobile/src/components/ui/ContentBand.types.ts
new file mode 100644
index 000000000000..95843c3e0765
--- /dev/null
+++ b/apps/mobile/src/components/ui/ContentBand.types.ts
@@ -0,0 +1,15 @@
+import type { ReactNode } from "react";
+
+export interface ContentBandProps {
+  readonly tone?: "card" | "warning";
+  /** "roomy" for a band holding a block of content, such as a raw patch. */
+  readonly spacing?: "compact" | "roomy";
+  readonly children: ReactNode;
+}
+
+/** A status at the top of otherwise empty content, such as "No changes" or a loading diff. */
+export interface ContentStatusProps {
+  readonly title?: string;
+  readonly detail: string;
+  readonly loading?: boolean;
+}
diff --git a/apps/mobile/src/components/ui/FitSheet.android.tsx b/apps/mobile/src/components/ui/FitSheet.android.tsx
new file mode 100644
index 000000000000..a797e87a8a65
--- /dev/null
+++ b/apps/mobile/src/components/ui/FitSheet.android.tsx
@@ -0,0 +1,74 @@
+import type { ReactNode } from "react";
+import { ScrollView, useWindowDimensions, View } from "react-native";
+import { KeyboardAvoidingView } from "react-native-keyboard-controller";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
+
+import { fitSheetBottomInset, type FitSheetProps } from "./FitSheet.types";
+import { ScreenContent } from "./ScreenContent";
+export type { FitSheetProps } from "./FitSheet.types";
+
+/** The route sizes the sheet to this content, so the column shrinks to fit and stops short of the top. */
+export function FitSheet({
+  header,
+  footer,
+  avoidsKeyboard,
+  children,
+  contentContainerClassName = "gap-2 p-2",
+  contentContainerStyle,
+  ...scrollProps
+}: FitSheetProps) {
+  const insets = useSafeAreaInsets();
+  return (
+    // Material sheet drags follow the first nested-scrolling native view, and a header's
+    // Compose button is one, so the content renders first in a reversed column.
+    <SheetContainer avoidsKeyboard={avoidsKeyboard}>
+      <ScreenContent fitToContents>
+        <ScrollView
+          {...scrollProps}
+          nestedScrollEnabled
+          contentContainerClassName={contentContainerClassName}
+          className="shrink grow-0"
+          contentContainerStyle={[
+            footer ? undefined : { paddingBottom: fitSheetBottomInset(insets.bottom) },
+            contentContainerStyle,
+          ]}
+        >
+          {children}
+          {/* Partial-height sheets keep submit actions inside the scrolling form. */}
+          {footer ? (
+            <View
+              className="mt-4 bg-sheet-solid pt-3"
+              style={{ paddingBottom: Math.max(insets.bottom, 16) }}
+            >
+              <View style={{ minHeight: 48 }}>{footer}</View>
+            </View>
+          ) : null}
+        </ScrollView>
+      </ScreenContent>
+      {header}
+    </SheetContainer>
+  );
+}
+
+function SheetContainer(props: {
+  readonly avoidsKeyboard?: boolean;
+  readonly children: ReactNode;
+}) {
+  const { height } = useWindowDimensions();
+  const style = { maxHeight: height * 0.92 };
+  return props.avoidsKeyboard ? (
+    <KeyboardAvoidingView
+      automaticOffset
+      behavior="padding"
+      collapsable={false}
+      className="flex-col-reverse bg-sheet"
+      style={style}
+    >
+      {props.children}
+    </KeyboardAvoidingView>
+  ) : (
+    <View collapsable={false} className="flex-col-reverse bg-sheet" style={style}>
+      {props.children}
+    </View>
+  );
+}
diff --git a/apps/mobile/src/components/ui/FitSheet.tsx b/apps/mobile/src/components/ui/FitSheet.tsx
new file mode 100644
index 000000000000..f783dbcd964a
--- /dev/null
+++ b/apps/mobile/src/components/ui/FitSheet.tsx
@@ -0,0 +1,68 @@
+import type { ReactNode } from "react";
+import { ScrollView, View } from "react-native";
+import { KeyboardAvoidingView } from "react-native-keyboard-controller";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
+
+import { fitSheetBottomInset, type FitSheetProps } from "./FitSheet.types";
+import { ScreenContent } from "./ScreenContent";
+export type { FitSheetProps } from "./FitSheet.types";
+
+export function FitSheet({
+  header,
+  footer,
+  avoidsKeyboard,
+  children,
+  contentContainerClassName = "gap-4 px-5 pt-2",
+  contentContainerStyle,
+  ...scrollProps
+}: FitSheetProps) {
+  const insets = useSafeAreaInsets();
+  return (
+    <SheetContainer avoidsKeyboard={avoidsKeyboard}>
+      {header}
+      <ScreenContent>
+        <ScrollView
+          {...scrollProps}
+          nestedScrollEnabled
+          contentContainerClassName={contentContainerClassName}
+          contentInsetAdjustmentBehavior="automatic"
+          className="flex-1"
+          contentContainerStyle={[
+            footer ? undefined : { paddingBottom: fitSheetBottomInset(insets.bottom) },
+            contentContainerStyle,
+          ]}
+        >
+          {children}
+        </ScrollView>
+        {footer ? (
+          <View
+            className="bg-sheet px-4 pt-3"
+            style={{ paddingBottom: Math.max(insets.bottom, 16) }}
+          >
+            {footer}
+          </View>
+        ) : null}
+      </ScreenContent>
+    </SheetContainer>
+  );
+}
+
+function SheetContainer(props: {
+  readonly avoidsKeyboard?: boolean;
+  readonly children: ReactNode;
+}) {
+  return props.avoidsKeyboard ? (
+    <KeyboardAvoidingView
+      automaticOffset
+      behavior="padding"
+      collapsable={false}
+      className="flex-1 bg-sheet"
+    >
+      {props.children}
+    </KeyboardAvoidingView>
+  ) : (
+    <View collapsable={false} className="flex-1 bg-sheet">
+      {props.children}
+    </View>
+  );
+}
diff --git a/apps/mobile/src/components/ui/FitSheet.types.ts b/apps/mobile/src/components/ui/FitSheet.types.ts
new file mode 100644
index 000000000000..a47fb124ea36
--- /dev/null
+++ b/apps/mobile/src/components/ui/FitSheet.types.ts
@@ -0,0 +1,17 @@
+import type { ReactNode } from "react";
+import type { ScrollViewProps } from "react-native";
+
+/** The body of a `sheetRoute({ androidFit: true })` screen: a header over one scrolling form. */
+export interface FitSheetProps extends Omit<
+  ScrollViewProps,
+  "children" | "className" | "nestedScrollEnabled" | "contentInsetAdjustmentBehavior"
+> {
+  readonly header: ReactNode;
+  readonly children: ReactNode;
+  /** Submit actions, kept reachable below the form. */
+  readonly footer?: ReactNode;
+  /** Lifts the sheet above the keyboard, for forms whose inputs sit low. */
+  readonly avoidsKeyboard?: boolean;
+}
+
+export const fitSheetBottomInset = (bottom: number) => Math.max(bottom, 18) + 18;
diff --git a/apps/mobile/src/components/ui/FormSection.android.tsx b/apps/mobile/src/components/ui/FormSection.android.tsx
new file mode 100644
index 000000000000..8f68b99477e1
--- /dev/null
+++ b/apps/mobile/src/components/ui/FormSection.android.tsx
@@ -0,0 +1,23 @@
+import { View } from "react-native";
+
+import { AppText as Text, AppTextInput as TextInput } from "./AppText";
+import type { FormFieldProps, FormSectionProps } from "./FormSection.types";
+export type { FormFieldProps, FormSectionProps } from "./FormSection.types";
+
+export function FormSection(props: FormSectionProps) {
+  return (
+    <View className="gap-3 rounded-[20px] bg-card p-4">
+      <Text className="text-base font-t3-medium text-foreground">{props.title}</Text>
+      {props.children}
+    </View>
+  );
+}
+
+export function FormField({ label, ...props }: FormFieldProps) {
+  return (
+    <>
+      {label ? <Text className="text-sm text-foreground-secondary">{label}</Text> : null}
+      <TextInput {...props} className="rounded-xl bg-sheet-solid" />
+    </>
+  );
+}
diff --git a/apps/mobile/src/components/ui/FormSection.tsx b/apps/mobile/src/components/ui/FormSection.tsx
new file mode 100644
index 000000000000..7f3e7a5d8063
--- /dev/null
+++ b/apps/mobile/src/components/ui/FormSection.tsx
@@ -0,0 +1,20 @@
+import { View } from "react-native";
+
+import { AppText as Text, AppTextInput as TextInput } from "./AppText";
+import type { FormFieldProps, FormSectionProps } from "./FormSection.types";
+export type { FormFieldProps, FormSectionProps } from "./FormSection.types";
+
+export function FormSection(props: FormSectionProps) {
+  return (
+    <View className="gap-2 rounded-[18px] border border-border bg-card p-4">
+      <Text className="text-2xs font-t3-bold tracking-[1px] uppercase text-foreground-secondary">
+        {props.title}
+      </Text>
+      {props.children}
+    </View>
+  );
+}
+
+export function FormField({ label: _label, ...props }: FormFieldProps) {
+  return <TextInput {...props} className="rounded-[18px]" />;
+}
diff --git a/apps/mobile/src/components/ui/FormSection.types.ts b/apps/mobile/src/components/ui/FormSection.types.ts
new file mode 100644
index 000000000000..4ef7015aa98c
--- /dev/null
+++ b/apps/mobile/src/components/ui/FormSection.types.ts
@@ -0,0 +1,15 @@
+import type { ReactNode } from "react";
+
+import type { AppTextInputProps } from "./AppText";
+
+/** A titled card holding a short form: its fields and the action that submits them. */
+export interface FormSectionProps {
+  readonly title: string;
+  readonly children: ReactNode;
+}
+
+export interface FormFieldProps extends Omit<AppTextInputProps, "className"> {
+  /** Shown where the platform labels fields; the placeholder carries it elsewhere. */
+  readonly label?: string;
+  readonly accessibilityLabel: string;
+}
diff --git a/apps/mobile/src/components/ui/KeyboardSheetBody.android.tsx b/apps/mobile/src/components/ui/KeyboardSheetBody.android.tsx
new file mode 100644
index 000000000000..8f889fd9682d
--- /dev/null
+++ b/apps/mobile/src/components/ui/KeyboardSheetBody.android.tsx
@@ -0,0 +1,41 @@
+import { View } from "react-native";
+import { KeyboardAvoidingView, KeyboardStickyView } from "react-native-keyboard-controller";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
+
+import type { KeyboardSheetBodyProps } from "./KeyboardSheetBody.types";
+export type { KeyboardSheetBodyProps } from "./KeyboardSheetBody.types";
+
+const TOOLBAR_CLEARANCE = 72;
+
+/** The toolbar sticks to the keyboard on its own, over the body's bottom edge. */
+export function KeyboardSheetBody(props: KeyboardSheetBodyProps) {
+  const insets = useSafeAreaInsets();
+  return (
+    <>
+      <KeyboardAvoidingView automaticOffset behavior="padding" className="flex-1">
+        <View
+          className="flex-1 px-5"
+          style={{
+            paddingTop: 8,
+            paddingBottom: props.toolbar ? TOOLBAR_CLEARANCE : Math.max(insets.bottom, 18),
+          }}
+        >
+          {props.children}
+        </View>
+      </KeyboardAvoidingView>
+      {props.toolbar ? (
+        <KeyboardStickyView
+          className="absolute inset-x-0 bottom-0"
+          offset={{ closed: 0, opened: 0 }}
+        >
+          <View
+            className="flex-row items-center gap-3 border-t border-border bg-sheet px-5 pt-2"
+            style={{ paddingBottom: Math.max(insets.bottom, 10) }}
+          >
+            {props.toolbar}
+          </View>
+        </KeyboardStickyView>
+      ) : null}
+    </>
+  );
+}
diff --git a/apps/mobile/src/components/ui/KeyboardSheetBody.tsx b/apps/mobile/src/components/ui/KeyboardSheetBody.tsx
new file mode 100644
index 000000000000..c09e9f5ce727
--- /dev/null
+++ b/apps/mobile/src/components/ui/KeyboardSheetBody.tsx
@@ -0,0 +1,30 @@
+import { View } from "react-native";
+import { KeyboardAvoidingView } from "react-native-keyboard-controller";
+import { useSafeAreaInsets } from "react-native-safe-area-context";
+
+import type { KeyboardSheetBodyProps } from "./KeyboardSheetBody.types";
+import { useBarOverlap } from "./useBarInset";
+export type { KeyboardSheetBodyProps } from "./KeyboardSheetBody.types";
+
+/** A sheet's body that stays above the keyboard, with its toolbar between the two. */
+export function KeyboardSheetBody(props: KeyboardSheetBodyProps) {
+  const insets = useSafeAreaInsets();
+  // The sheet's glass bar floats over its content, and only scroll views inset for it on their own.
+  const barOverlap = useBarOverlap();
+  return (
+    <KeyboardAvoidingView automaticOffset behavior="padding" className="flex-1">
+      <View
+        className="flex-1 px-5"
+        style={{
+          paddingTop: barOverlap + 8,
+          paddingBottom: props.toolbar ? 0 : Math.max(insets.bottom, 18),
+        }}
+      >
+        {props.children}
+      </View>
+      {props.toolbar ? (
+        <View className="flex-row items-center gap-3 bg-sheet px-5 py-2">{props.toolbar}</View>
+      ) : null}
+    </KeyboardAvoidingView>
+  );
+}
diff --git a/apps/mobile/src/components/ui/KeyboardSheetBody.types.ts b/apps/mobile/src/components/ui/KeyboardSheetBody.types.ts
new file mode 100644
index 000000000000..00c2ac30f3c6
--- /dev/null
+++ b/apps/mobile/src/components/ui/KeyboardSheetBody.types.ts
@@ -0,0 +1,7 @@
+import type { ReactNode } from "react";
+
+export interface KeyboardSheetBodyProps {
+  readonly children: ReactNode;
+  /** A row of actions that rides the keyboard, such as attach and send. */
+  readonly toolbar?: ReactNode;
+}
diff --git a/apps/mobile/src/components/ui/PaneListItem.android.tsx b/apps/mobile/src/components/ui/PaneListItem.android.tsx
new file mode 100644
index 000000000000..bcc227457b36
--- /dev/null
+++ b/apps/mobile/src/components/ui/PaneListItem.android.tsx
@@ -0,0 +1,21 @@
+import { Pressable } from "react-native";
+
+import { cn } from "../../lib/cn";
+import type { PaneListItemProps } from "./PaneListItem.types";
+export type { PaneListItemProps } from "./PaneListItem.types";
+
+export function PaneListItem(props: PaneListItemProps) {
+  return (
+    <Pressable
+      accessibilityRole="button"
+      accessibilityState={{ selected: props.selected }}
+      className={cn(
+        "mt-1 min-h-12 justify-center rounded-[20px] px-3 py-2 active:bg-subtle",
+        props.selected && "bg-subtle-strong",
+      )}
+      onPress={props.onPress}
+    >
+      {props.children}
+    </Pressable>
+  );
+}
diff --git a/apps/mobile/src/components/ui/PaneListItem.tsx b/apps/mobile/src/components/ui/PaneListItem.tsx
new file mode 100644
index 000000000000..4a4346872917
--- /dev/null
+++ b/apps/mobile/src/components/ui/PaneListItem.tsx
@@ -0,0 +1,22 @@
+import { Pressable } from "react-native";
+
+import type { PaneListItemProps } from "./PaneListItem.types";
+export type { PaneListItemProps } from "./PaneListItem.types";
+
+/** A selectable entry in a pane's navigation list, such as a changed file. */
+export function PaneListItem(props: PaneListItemProps) {
+  return (
+    <Pressable
+      accessibilityRole="button"
+      accessibilityState={{ selected: props.selected }}
+      className={
+        props.selected
+          ? "mt-1 min-h-12 justify-center rounded-xl bg-subtle-strong px-3 py-2"
+          : "mt-1 min-h-12 justify-center rounded-xl px-3 py-2 active:bg-subtle"
+      }
+      onPress={props.onPress}
+    >
+      {props.children}
+    </Pressable>
+  );
+}
diff --git a/apps/mobile/src/components/ui/PaneListItem.types.ts b/apps/mobile/src/components/ui/PaneListItem.types.ts
new file mode 100644
index 000000000000..2f661883ea0b
--- /dev/null
+++ b/apps/mobile/src/components/ui/PaneListItem.types.ts
@@ -0,0 +1,7 @@
+import type { ReactNode } from "react";
+
+export interface PaneListItemProps {
+  readonly selected: boolean;
+  readonly onPress: () => void;
+  readonly children: ReactNode;
+}
diff --git a/apps/mobile/src/components/ui/PaneSheet.android.tsx b/apps/mobile/src/components/ui/PaneSheet.android.tsx
new file mode 100644
index 000000000000..c0e572f53451
--- /dev/null
+++ b/apps/mobile/src/components/ui/PaneSheet.android.tsx
@@ -0,0 +1,26 @@
+import { View } from "react-native";
+import { FormSheet } from "react-native-screens";
+import { useResolveClassNames } from "uniwind";
+
+import { BottomSheetContext } from "./BottomSheetContext";
+import type { PaneSheetProps } from "./PaneSheet.types";
+export type { PaneSheetProps } from "./PaneSheet.types";
+
+/** A native sheet holding a pane that draws its own bar, which runs up under the drawn grabber. */
+export function PaneSheet({ children, ...props }: PaneSheetProps) {
+  const containerStyle = useResolveClassNames("bg-header");
+  return (
+    <FormSheet {...props} preferredCornerRadius={28} nativeContainerStyle={containerStyle}>
+      <BottomSheetContext value>
+        {/* Android FormSheet does not bound flex children. */}
+        <View collapsable={false} className="absolute inset-0 bg-header pt-3">
+          {children}
+          <View
+            pointerEvents="none"
+            className="absolute top-1 h-1 w-8 self-center rounded-full bg-header-foreground/40"
+          />
+        </View>
+      </BottomSheetContext>
+    </FormSheet>
+  );
+}
diff --git a/apps/mobile/src/components/ui/PaneSheet.tsx b/apps/mobile/src/components/ui/PaneSheet.tsx
new file mode 100644
index 000000000000..422635120cc6
--- /dev/null
+++ b/apps/mobile/src/components/ui/PaneSheet.tsx
@@ -0,0 +1,21 @@
+import { View } from "react-native";
+import { FormSheet } from "react-native-screens";
+import { useResolveClassNames } from "uniwind";
+
+import { BottomSheetContext } from "./BottomSheetContext";
+import type { PaneSheetProps } from "./PaneSheet.types";
+export type { PaneSheetProps } from "./PaneSheet.types";
+
+/** A native sheet holding a pane that draws its own bar. */
+export function PaneSheet({ children, ...props }: PaneSheetProps) {
+  const containerStyle = useResolveClassNames("bg-sheet");
+  return (
+    <FormSheet {...props} prefersGrabberVisible nativeContainerStyle={containerStyle}>
+      <BottomSheetContext value>
+        <View collapsable={false} className="flex-1 bg-sheet">
+          {children}
+        </View>
+      </BottomSheetContext>
+    </FormSheet>
+  );
+}
diff --git a/apps/mobile/src/components/ui/PaneSheet.types.ts b/apps/mobile/src/components/ui/PaneSheet.types.ts
new file mode 100644
index 000000000000..3b9bc8634133
--- /dev/null
+++ b/apps/mobile/src/components/ui/PaneSheet.types.ts
@@ -0,0 +1,7 @@
+import type { ComponentProps } from "react";
+import type { FormSheet } from "react-native-screens";
+
+export type PaneSheetProps = Omit<
+  ComponentProps<typeof FormSheet>,
+  "prefersGrabberVisible" | "preferredCornerRadius" | "nativeContainerStyle"
+>;
diff --git a/apps/mobile/src/components/ui/RefreshControl.android.tsx b/apps/mobile/src/components/ui/RefreshControl.android.tsx
new file mode 100644
index 000000000000..e83dd2663398
--- /dev/null
+++ b/apps/mobile/src/components/ui/RefreshControl.android.tsx
@@ -0,0 +1,22 @@
+import { use } from "react";
+// oxlint-disable-next-line eslint/no-restricted-imports -- The wrapper every screen must use.
+import { RefreshControl as NativeRefreshControl } from "react-native";
+import { View, type RefreshControlProps } from "react-native";
+
+import { BottomSheetContext } from "./BottomSheetContext";
+
+/**
+ * A bottom sheet takes the pull at the top, and Material reads the swipe-refresh layout as unable
+ * to scroll up, so the sheet collapses instead of scrolling back. Sheets get a plain wrapper that
+ * keeps the layout style the scroll view hands its refresh control.
+ */
+export function RefreshControl(props: RefreshControlProps) {
+  if (use(BottomSheetContext)) {
+    return (
+      <View collapsable={false} style={props.style}>
+        {props.children}
+      </View>
+    );
+  }
+  return <NativeRefreshControl {...props} />;
+}
diff --git a/apps/mobile/src/components/ui/RefreshControl.tsx b/apps/mobile/src/components/ui/RefreshControl.tsx
new file mode 100644
index 000000000000..02b2b648b7bd
--- /dev/null
+++ b/apps/mobile/src/components/ui/RefreshControl.tsx
@@ -0,0 +1,2 @@
+// oxlint-disable-next-line eslint/no-restricted-imports -- The wrapper every screen must use.
+export { RefreshControl } from "react-native";
diff --git a/apps/mobile/src/components/ui/SecretRevealButton.tsx b/apps/mobile/src/components/ui/SecretRevealButton.tsx
new file mode 100644
index 000000000000..2ba628eec181
--- /dev/null
+++ b/apps/mobile/src/components/ui/SecretRevealButton.tsx
@@ -0,0 +1,25 @@
+import { Pressable } from "react-native";
+
+import { SymbolView } from "./AppSymbol";
+
+/** Eye toggle that shows or hides a secret field's typed text. */
+export function SecretRevealButton(props: {
+  readonly revealed: boolean;
+  readonly onPress: () => void;
+}) {
+  return (
+    <Pressable
+      onPress={props.onPress}
+      hitSlop={6}
+      accessibilityRole="button"
+      accessibilityLabel={props.revealed ? "Hide secret" : "Show secret"}
+      className="size-10 items-center justify-center"
+    >
+      <SymbolView
+        name={props.revealed ? "eye.slash" : "eye"}
+        size={18}
+        tintColorClassName="accent-icon-muted"
+      />
+    </Pressable>
+  );
+}
diff --git a/apps/mobile/src/components/ui/SecretTextInput.android.tsx b/apps/mobile/src/components/ui/SecretTextInput.android.tsx
index f93b091cf9b5..9a9f98bd55c1 100644
--- a/apps/mobile/src/components/ui/SecretTextInput.android.tsx
+++ b/apps/mobile/src/components/ui/SecretTextInput.android.tsx
@@ -1,8 +1,10 @@
 import { requireNativeView } from "expo";
+import { useState } from "react";
 import { processColor, View, type NativeSyntheticEvent, type ViewProps } from "react-native";
 
 import { flattenThemeColor } from "../../lib/mobileTheme";
 import { useUniwindTheme } from "../../lib/useUniwindTheme";
+import { SecretRevealButton } from "./SecretRevealButton";
 import type { SecretTextInputProps } from "./SecretTextInput.types";
 
 interface NativeSecretInputProps extends ViewProps {
@@ -14,6 +16,7 @@ interface NativeSecretInputProps extends ViewProps {
   readonly cursorColor: number;
   readonly fontSize: number;
   readonly editable: boolean;
+  readonly revealed: boolean;
   readonly onChangeText: (event: NativeSyntheticEvent<{ readonly value: string }>) => void;
   readonly onSubmit: (event: NativeSyntheticEvent<{ readonly value: string }>) => void;
 }
@@ -36,8 +39,9 @@ function nativeColor(value: string) {
 export function SecretTextInput(props: SecretTextInputProps) {
   const theme = useUniwindTheme();
   const surface = theme["--color-input"];
+  const [revealed, setRevealed] = useState(false);
   return (
-    <View className="min-h-13.5 justify-center rounded-2xl border border-input-border bg-input px-3.5">
+    <View className="min-h-13.5 flex-row items-center gap-1 rounded-2xl border border-input-border bg-input pr-1.5 pl-3.5">
       <NativeSecretInput
         inputLabel={props.accessibilityLabel}
         value={props.value}
@@ -47,10 +51,12 @@ export function SecretTextInput(props: SecretTextInputProps) {
         cursorColor={nativeColor(flattenThemeColor(theme["--color-focus"], surface))}
         fontSize={FONT_SIZE}
         editable={props.editable}
+        revealed={revealed}
         onChangeText={(event) => props.onChangeText(event.nativeEvent.value)}
         onSubmit={(event) => props.onSubmitEditing(event.nativeEvent.value)}
-        style={{ height: LINE_HEIGHT }}
+        style={{ flex: 1, height: LINE_HEIGHT }}
       />
+      <SecretRevealButton revealed={revealed} onPress={() => setRevealed(!revealed)} />
     </View>
   );
 }
diff --git a/apps/mobile/src/components/ui/SecretTextInput.tsx b/apps/mobile/src/components/ui/SecretTextInput.tsx
index ed8bba58daaa..643fe5acbb63 100644
--- a/apps/mobile/src/components/ui/SecretTextInput.tsx
+++ b/apps/mobile/src/components/ui/SecretTextInput.tsx
@@ -1,24 +1,35 @@
+import { useState } from "react";
+import { View } from "react-native";
+
 import { AppTextInput } from "./AppText";
+import { SecretRevealButton } from "./SecretRevealButton";
 import type { SecretTextInputProps } from "./SecretTextInput.types";
 
 /** Masked field for a value that must stay out of password managers and suggestions. */
 export function SecretTextInput(props: SecretTextInputProps) {
+  const [revealed, setRevealed] = useState(false);
   return (
-    <AppTextInput
-      accessibilityLabel={props.accessibilityLabel}
-      placeholder={props.placeholder}
-      value={props.value}
-      onChangeText={props.onChangeText}
-      editable={props.editable}
-      secureTextEntry
-      autoCorrect={false}
-      autoCapitalize="none"
-      autoComplete="off"
-      textContentType="none"
-      importantForAutofill="no"
-      spellCheck={false}
-      returnKeyType="done"
-      onSubmitEditing={(event) => props.onSubmitEditing(event.nativeEvent.text)}
-    />
+    <View className="justify-center">
+      <AppTextInput
+        className="pr-12"
+        accessibilityLabel={props.accessibilityLabel}
+        placeholder={props.placeholder}
+        value={props.value}
+        onChangeText={props.onChangeText}
+        editable={props.editable}
+        secureTextEntry={!revealed}
+        autoCorrect={false}
+        autoCapitalize="none"
+        autoComplete="off"
+        textContentType="none"
+        importantForAutofill="no"
+        spellCheck={false}
+        returnKeyType="done"
+        onSubmitEditing={(event) => props.onSubmitEditing(event.nativeEvent.text)}
+      />
+      <View className="absolute right-1.5">
+        <SecretRevealButton revealed={revealed} onPress={() => setRevealed(!revealed)} />
+      </View>
+    </View>
   );
 }
diff --git a/apps/mobile/src/components/ui/Sheet.android.tsx b/apps/mobile/src/components/ui/Sheet.android.tsx
index d4eac0cb94c1..29efc04d810d 100644
--- a/apps/mobile/src/components/ui/Sheet.android.tsx
+++ b/apps/mobile/src/components/ui/Sheet.android.tsx
@@ -3,6 +3,7 @@ import { View } from "react-native";
 import { FormSheet } from "react-native-screens";
 import { useResolveClassNames } from "uniwind";
 import { AppBar } from "./AppBar";
+import { BottomSheetContext } from "./BottomSheetContext";
 import { RoutedFormSheetContext } from "./RoutedFormSheetContext";
 import { ScreenContent } from "./ScreenContent";
 import type { SheetProps } from "./Sheet.types";
@@ -21,22 +22,24 @@ export function Sheet(props: SheetProps) {
       onDismiss={props.onClose}
       onNativeDismiss={props.onClose}
     >
-      <RoutedFormSheetContext value={false}>
-        {/* Android FormSheet does not bound flex children. Material drags target the first scroll view, so place content before the header. */}
-        <View collapsable={false} className="absolute inset-0 flex-col-reverse bg-header">
-          <ScreenContent>{props.children}</ScreenContent>
-          <AppBar
-            sheet
-            title={props.title}
-            onBack={props.dismissDisabled ? undefined : () => setIsOpen(false)}
-            hideBottomBorder
-          />
-          <View
-            pointerEvents="none"
-            className="absolute top-1 h-1 w-8 self-center rounded-full bg-header-foreground/40"
-          />
-        </View>
-      </RoutedFormSheetContext>
+      <BottomSheetContext value>
+        <RoutedFormSheetContext value={false}>
+          {/* Android FormSheet does not bound flex children. */}
+          <View collapsable={false} className="absolute inset-0 bg-header">
+            <AppBar
+              sheet
+              title={props.title}
+              onBack={props.dismissDisabled ? undefined : () => setIsOpen(false)}
+              hideBottomBorder
+            />
+            <ScreenContent>{props.children}</ScreenContent>
+            <View
+              pointerEvents="none"
+              className="absolute top-1 h-1 w-8 self-center rounded-full bg-header-foreground/40"
+            />
+          </View>
+        </RoutedFormSheetContext>
+      </BottomSheetContext>
     </FormSheet>
   );
 }
diff --git a/apps/mobile/src/components/ui/SheetIntro.android.tsx b/apps/mobile/src/components/ui/SheetIntro.android.tsx
new file mode 100644
index 000000000000..0dd6ac142b4f
--- /dev/null
+++ b/apps/mobile/src/components/ui/SheetIntro.android.tsx
@@ -0,0 +1,17 @@
+import { View } from "react-native";
+
+import { AppText as Text } from "./AppText";
+import type { SheetIntroProps } from "./SheetIntro.types";
+export type { SheetIntroProps } from "./SheetIntro.types";
+
+/** Material sheets lead with the question itself, so the eyebrow is left out. */
+export function SheetIntro(props: SheetIntroProps) {
+  return (
+    <View className="gap-2 rounded-[20px] bg-card p-3">
+      <Text className="text-xl font-t3-medium">{props.title}</Text>
+      <Text className="text-base leading-normal text-foreground-secondary">
+        {props.description}
+      </Text>
+    </View>
+  );
+}
diff --git a/apps/mobile/src/components/ui/SheetIntro.tsx b/apps/mobile/src/components/ui/SheetIntro.tsx
new file mode 100644
index 000000000000..a3b8e507445d
--- /dev/null
+++ b/apps/mobile/src/components/ui/SheetIntro.tsx
@@ -0,0 +1,21 @@
+import { View } from "react-native";
+
+import { AppText as Text } from "./AppText";
+import type { SheetIntroProps } from "./SheetIntro.types";
+export type { SheetIntroProps } from "./SheetIntro.types";
+
+export function SheetIntro(props: SheetIntroProps) {
+  return (
+    <View className="items-center gap-1 pt-2 pb-1">
+      {props.eyebrow ? (
+        <Text className="text-xs font-t3-bold tracking-[1px] uppercase text-foreground-muted">
+          {props.eyebrow}
+        </Text>
+      ) : null}
+      <Text className="text-center text-3xl font-t3-bold">{props.title}</Text>
+      <Text className="text-center text-sm font-medium leading-normal text-foreground-secondary">
+        {props.description}
+      </Text>
+    </View>
+  );
+}
diff --git a/apps/mobile/src/components/ui/SheetIntro.types.ts b/apps/mobile/src/components/ui/SheetIntro.types.ts
new file mode 100644
index 000000000000..d9ed545d6bed
--- /dev/null
+++ b/apps/mobile/src/components/ui/SheetIntro.types.ts
@@ -0,0 +1,7 @@
+/** The lead of a decision sheet: what is being asked, above the choices. */
+export interface SheetIntroProps {
+  /** A short kicker such as "Confirm", where the platform uses one. */
+  readonly eyebrow?: string;
+  readonly title: string;
+  readonly description: string;
+}
diff --git a/apps/mobile/src/components/ui/SheetPane.android.tsx b/apps/mobile/src/components/ui/SheetPane.android.tsx
new file mode 100644
index 000000000000..7f707a976092
--- /dev/null
+++ b/apps/mobile/src/components/ui/SheetPane.android.tsx
@@ -0,0 +1,13 @@
+import { View } from "react-native";
+
+import type { SheetPaneProps } from "./SheetPane.types";
+export type { SheetPaneProps } from "./SheetPane.types";
+
+/** The root of a pane or sheet: the bar's color, so ScreenContent's card reads as set into it. */
+export function SheetPane(props: SheetPaneProps) {
+  return (
+    <View collapsable={false} className="flex-1 bg-header">
+      {props.children}
+    </View>
+  );
+}
diff --git a/apps/mobile/src/components/ui/SheetPane.tsx b/apps/mobile/src/components/ui/SheetPane.tsx
new file mode 100644
index 000000000000..f420964034f4
--- /dev/null
+++ b/apps/mobile/src/components/ui/SheetPane.tsx
@@ -0,0 +1,16 @@
+import { View } from "react-native";
+
+import type { SheetPaneProps } from "./SheetPane.types";
+export type { SheetPaneProps } from "./SheetPane.types";
+
+/** The root of a pane or sheet that draws an AppBar above its ScreenContent. */
+export function SheetPane(props: SheetPaneProps) {
+  return (
+    <View
+      collapsable={false}
+      className={props.surface === "screen" ? "flex-1 bg-screen" : "flex-1 bg-sheet"}
+    >
+      {props.children}
+    </View>
+  );
+}
diff --git a/apps/mobile/src/components/ui/SheetPane.types.ts b/apps/mobile/src/components/ui/SheetPane.types.ts
new file mode 100644
index 000000000000..743ff1cae132
--- /dev/null
+++ b/apps/mobile/src/components/ui/SheetPane.types.ts
@@ -0,0 +1,7 @@
+import type { ReactNode } from "react";
+
+export interface SheetPaneProps {
+  /** The iOS surface under the bar: a sheet's, or the screen's where the pane sits in a column. */
+  readonly surface?: "sheet" | "screen";
+  readonly children: ReactNode;
+}
diff --git a/apps/mobile/src/components/ui/listMetrics.android.ts b/apps/mobile/src/components/ui/listMetrics.android.ts
new file mode 100644
index 000000000000..63ded41c1514
--- /dev/null
+++ b/apps/mobile/src/components/ui/listMetrics.android.ts
@@ -0,0 +1,10 @@
+/** Material's 48dp touch target and 56dp one-line list item. */
+export const ROW_MIN_HEIGHT = { control: 48, item: 56 } as const;
+
+/** Android sheets span the window, so a list stops at a readable width on a tablet or fold. */
+export const READABLE_WIDTH_STYLE = { width: "100%", maxWidth: 720, alignSelf: "center" } as const;
+
+/** Sections are cards with their own padding, set close in from ScreenContent's edges. */
+export function groupedListInsets(_inInspector: boolean) {
+  return { paddingHorizontal: 8, gap: 8 };
+}
diff --git a/apps/mobile/src/components/ui/listMetrics.ts b/apps/mobile/src/components/ui/listMetrics.ts
new file mode 100644
index 000000000000..c7f8e2f2d221
--- /dev/null
+++ b/apps/mobile/src/components/ui/listMetrics.ts
@@ -0,0 +1,10 @@
+/** Minimum heights of tappable rows: a header control, and a list item. */
+export const ROW_MIN_HEIGHT = { control: 44, item: 44 } as const;
+
+/** Keeps a list at a readable width. iOS sheets and columns already bound it. */
+export const READABLE_WIDTH_STYLE = undefined;
+
+/** Insets for a scroll view of grouped list sections. */
+export function groupedListInsets(inInspector: boolean) {
+  return { paddingHorizontal: inInspector ? 12 : 20, gap: 14 };
+}
diff --git a/apps/mobile/src/components/ui/useBarInset.ts b/apps/mobile/src/components/ui/useBarInset.ts
index f00b64c8e0b7..3a917d67dee4 100644
--- a/apps/mobile/src/components/ui/useBarInset.ts
+++ b/apps/mobile/src/components/ui/useBarInset.ts
@@ -65,3 +65,18 @@ export function useSearchToolbarInset(search: AppBarSearch | undefined): number
     ? NATIVE_MAIL_SEARCH_TOOLBAR_CONTENT_INSET
     : 0;
 }
+
+/** Where a sheet's scrolling content ends: clear of the bottom safe area, with a little room. */
+export function useSheetContentBottomInset(): number {
+  const insets = useSafeAreaInsets();
+  const columnMetrics = useNativeColumnLayoutMetrics();
+  return Platform.OS === "ios"
+    ? (columnMetrics?.safeArea.bottom ?? insets.bottom) + 8
+    : Math.max(insets.bottom, 18) + 18;
+}
+
+/** The bottom safe area a list in a sheet pads itself: Android's, which its sheets don't adjust for. */
+export function useUnadjustedBottomInset(): number {
+  const insets = useSafeAreaInsets();
+  return Platform.OS === "android" ? insets.bottom : 0;
+}
diff --git a/apps/mobile/src/connection/environment-cache-store.test.ts b/apps/mobile/src/connection/environment-cache-store.test.ts
index e9a24552ce36..1205c746e9fa 100644
--- a/apps/mobile/src/connection/environment-cache-store.test.ts
+++ b/apps/mobile/src/connection/environment-cache-store.test.ts
@@ -24,6 +24,7 @@ import * as Fiber from "effect/Fiber";
 import * as Logger from "effect/Logger";
 import * as Option from "effect/Option";
 import * as Schema from "effect/Schema";
+import * as TestClock from "effect/testing/TestClock";
 
 import * as MobileDatabase from "../persistence/mobile-database";
 import { make } from "./environment-cache-store";
@@ -567,7 +568,7 @@ describe("mobile SQLite environment cache store", () => {
     }),
   );
 
-  it.live("returns cached threads before their pull request links, which load after", () =>
+  it.effect("returns cached threads before their pull request links, which load after", () =>
     Effect.gen(function* () {
       const memory = makeDatabase();
       const store = yield* make().pipe(
@@ -592,12 +593,13 @@ describe("mobile SQLite environment cache store", () => {
 
       const shell = Option.getOrThrow(yield* store.loadShell(ENVIRONMENT_ID));
       expect(shell.threads.map((thread) => thread.pullRequests)).toEqual([undefined, undefined]);
-      const links = yield* shell.loadPullRequests!;
-      expect([...links]).toEqual([[THREAD_ID, [link]]]);
+      const links = yield* Effect.forkChild(shell.loadPullRequests!);
+      yield* TestClock.adjust("1 millis");
+      expect([...(yield* Fiber.join(links))]).toEqual([[THREAD_ID, [link]]]);
     }),
   );
 
-  it.live("keeps cached threads when their pull request links cannot be read", () => {
+  it.effect("keeps cached threads when their pull request links cannot be read", () => {
     const messages: Array<unknown> = [];
     const logger = Logger.make(({ message }) => {
       messages.push(message);
@@ -633,7 +635,9 @@ describe("mobile SQLite environment cache store", () => {
 
       const shell = Option.getOrThrow(yield* store.loadShell(ENVIRONMENT_ID));
       expect(shell.threads.map((thread) => thread.id)).toEqual([THREAD_ID, readable.id]);
-      expect([...(yield* shell.loadPullRequests!)]).toEqual([[readable.id, [link]]]);
+      const links = yield* Effect.forkChild(shell.loadPullRequests!);
+      yield* TestClock.adjust("1 millis");
+      expect([...(yield* Fiber.join(links))]).toEqual([[readable.id, [link]]]);
       expect(messages).toHaveLength(1);
       expect(memory.removed).toEqual([]);
     }).pipe(Effect.provide(Logger.layer([logger], { mergeWithExisting: false })));
diff --git a/apps/mobile/src/features/archive/ArchivedThreadsScreen.tsx b/apps/mobile/src/features/archive/ArchivedThreadsScreen.tsx
index fd3ce42403c8..4a1c77371b86 100644
--- a/apps/mobile/src/features/archive/ArchivedThreadsScreen.tsx
+++ b/apps/mobile/src/features/archive/ArchivedThreadsScreen.tsx
@@ -16,7 +16,8 @@ import { AppActivityIndicator } from "../../components/ui/AppActivityIndicator";
 import { AppBar } from "../../components/ui/AppBar";
 import { SymbolView } from "../../components/ui/AppSymbol";
 import { useMemo, useRef, type ComponentProps } from "react";
-import { RefreshControl, useWindowDimensions, View } from "react-native";
+import { useWindowDimensions, View } from "react-native";
+import { RefreshControl } from "../../components/ui/RefreshControl";
 import { GestureDetector, useNativeGesture } from "react-native-gesture-handler";
 import type { SwipeableMethods } from "react-native-gesture-handler/ReanimatedSwipeable";
 
diff --git a/apps/mobile/src/features/browser/BrowserPreviewRouteScreen.tsx b/apps/mobile/src/features/browser/BrowserPreviewRouteScreen.tsx
index d83852f26046..b312eeb64534 100644
--- a/apps/mobile/src/features/browser/BrowserPreviewRouteScreen.tsx
+++ b/apps/mobile/src/features/browser/BrowserPreviewRouteScreen.tsx
@@ -35,16 +35,33 @@ type BrowserPreviewRouteScreenProps = StaticScreenProps<{
 export function BrowserPreviewRouteScreen({ route }: BrowserPreviewRouteScreenProps) {
   const navigation = useNavigation();
   const onClose = () => navigation.goBack();
+  const { environmentId, threadId } = route.params;
+  if (!environmentId?.trim() || !threadId?.trim()) {
+    return <BrowserUnavailableScreen onClose={onClose} />;
+  }
   return (
     <BrowserPreviewScreen
-      environmentId={EnvironmentId.make(route.params.environmentId)}
-      threadId={ThreadId.make(route.params.threadId)}
+      environmentId={EnvironmentId.make(environmentId)}
+      threadId={ThreadId.make(threadId)}
       initialTabId={route.params.tabId ?? null}
       onClose={onClose}
     />
   );
 }
 
+function BrowserUnavailableScreen({ onClose }: { readonly onClose: () => void }) {
+  const insets = useSafeAreaInsets();
+  const contentTopInset = useContentTopInset();
+  return (
+    <View
+      className="flex-1 bg-sheet"
+      style={{ paddingTop: contentTopInset, paddingBottom: insets.bottom }}
+    >
+      <SheetHeader title="Browser" onClose={onClose} accessibilityLabel="Close browser" />
+    </View>
+  );
+}
+
 function BrowserPreviewScreen({
   environmentId,
   threadId,
diff --git a/apps/mobile/src/features/browser/PreviewStreamWebView.tsx b/apps/mobile/src/features/browser/PreviewStreamWebView.tsx
index 3fae93f483bc..d4a4690dbaf4 100644
--- a/apps/mobile/src/features/browser/PreviewStreamWebView.tsx
+++ b/apps/mobile/src/features/browser/PreviewStreamWebView.tsx
@@ -405,7 +405,7 @@ function PreviewStreamDocumentView({
                 onPictureInPicture?.(message, message.detail);
                 return;
               case "status":
-                clearBootstrapTimer();
+                if (message.status !== "connecting") clearBootstrapTimer();
                 if (message.status === "error") {
                   fail(message.detail ?? "Browser stream failed.");
                   return;
diff --git a/apps/mobile/src/features/cloud/ConnectOnboardingRouteScreen.tsx b/apps/mobile/src/features/cloud/ConnectOnboardingRouteScreen.tsx
index 463c11aaf648..3913eaa47557 100644
--- a/apps/mobile/src/features/cloud/ConnectOnboardingRouteScreen.tsx
+++ b/apps/mobile/src/features/cloud/ConnectOnboardingRouteScreen.tsx
@@ -5,7 +5,8 @@ import { ScreenScrollView as ScrollView } from "../../components/ui/ScreenScroll
 import { useAuth } from "@clerk/expo";
 import { useNavigation } from "@react-navigation/native";
 import { useState } from "react";
-import { RefreshControl, View } from "react-native";
+import { View } from "react-native";
+import { RefreshControl } from "../../components/ui/RefreshControl";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 
 import { reportAtomCommandResult, settlePromise } from "@t3tools/client-runtime/state/runtime";
diff --git a/apps/mobile/src/features/cloud/T3ConnectProfilePage.tsx b/apps/mobile/src/features/cloud/T3ConnectProfilePage.tsx
index 03b6daaa4e71..71de00071fda 100644
--- a/apps/mobile/src/features/cloud/T3ConnectProfilePage.tsx
+++ b/apps/mobile/src/features/cloud/T3ConnectProfilePage.tsx
@@ -7,7 +7,8 @@ import type { MenuAction } from "@react-native-menu/menu";
 import type { EnvironmentId } from "@t3tools/contracts";
 import type { RelayClientEnvironmentRecord } from "@t3tools/contracts/relay";
 import { type ReactNode, useRef, useState } from "react";
-import { Pressable, RefreshControl, ScrollView, Text, View } from "react-native";
+import { Pressable, ScrollView, Text, View } from "react-native";
+import { RefreshControl } from "../../components/ui/RefreshControl";
 
 import { AppActivityIndicator } from "../../components/ui/AppActivityIndicator";
 import { SymbolView } from "../../components/ui/AppSymbol";
diff --git a/apps/mobile/src/features/files/FileMarkdownPreview.tsx b/apps/mobile/src/features/files/FileMarkdownPreview.tsx
index 73629f02fd25..2d0de616bc69 100644
--- a/apps/mobile/src/features/files/FileMarkdownPreview.tsx
+++ b/apps/mobile/src/features/files/FileMarkdownPreview.tsx
@@ -5,7 +5,8 @@ import { getBrowseDirectoryPath } from "@t3tools/client-runtime/state/projects";
 import { maskMarkdownFrontmatter } from "@t3tools/shared/markdownFrontmatter";
 import { useState } from "react";
 import { StackActions, useNavigation } from "@react-navigation/native";
-import { RefreshControl, ScrollView, View } from "react-native";
+import { ScrollView, View } from "react-native";
+import { RefreshControl } from "../../components/ui/RefreshControl";
 
 import { tryOpenExternalUrl } from "../../lib/openExternalUrl";
 import { FONT_FAMILIES } from "../../lib/fontFamilies";
diff --git a/apps/mobile/src/features/files/FileTreeBrowser.tsx b/apps/mobile/src/features/files/FileTreeBrowser.tsx
index 279269b8a13c..24d82a93daa7 100644
--- a/apps/mobile/src/features/files/FileTreeBrowser.tsx
+++ b/apps/mobile/src/features/files/FileTreeBrowser.tsx
@@ -5,7 +5,8 @@ import type { ProjectEntry } from "@t3tools/contracts";
 import { AppActivityIndicator } from "../../components/ui/AppActivityIndicator";
 import { SymbolView } from "../../components/ui/AppSymbol";
 import { useEffect, useRef, useState } from "react";
-import { Pressable, RefreshControl, View } from "react-native";
+import { Pressable, View } from "react-native";
+import { RefreshControl } from "../../components/ui/RefreshControl";
 
 import { AppText as Text } from "../../components/ui/AppText";
 import { PierreEntryIcon } from "../../components/PierreEntryIcon";
diff --git a/apps/mobile/src/features/files/SourceFileSurface.tsx b/apps/mobile/src/features/files/SourceFileSurface.tsx
index 36da917e83d5..6c796848b6c2 100644
--- a/apps/mobile/src/features/files/SourceFileSurface.tsx
+++ b/apps/mobile/src/features/files/SourceFileSurface.tsx
@@ -7,13 +7,13 @@ import { useLayoutEffect, useRef, useState } from "react";
 import {
   Platform,
   Pressable,
-  RefreshControl,
   ScrollView,
   Text as NativeText,
   useWindowDimensions,
   View,
 } from "react-native";
 import { NativeScrollView } from "../../native/NativeScrollViewMarker";
+import { RefreshControl } from "../../components/ui/RefreshControl";
 import { WebView } from "react-native-webview";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { AppText as Text } from "../../components/ui/AppText";
diff --git a/apps/mobile/src/features/files/ThreadFilesRouteScreen.tsx b/apps/mobile/src/features/files/ThreadFilesRouteScreen.tsx
index 11fa0a0c7af4..6de31137fb7d 100644
--- a/apps/mobile/src/features/files/ThreadFilesRouteScreen.tsx
+++ b/apps/mobile/src/features/files/ThreadFilesRouteScreen.tsx
@@ -226,7 +226,7 @@ function FileSourceSurface(props: ComponentProps<typeof SourceFileSurface>) {
     <SourceFileSurface
       {...props}
       initialLine={selection?.line ?? props.initialLine}
-      selectable={selection?.active === true}
+      selectable={props.selectable === true || selection?.active === true}
       onLongPressLine={
         Platform.OS === "android" ? (line) => setSelection({ line, active: true }) : undefined
       }
@@ -250,6 +250,7 @@ function FileContent(props: {
   readonly threadId: ThreadId | null;
   readonly initialLine: number | null;
   readonly truncated: boolean;
+  readonly selectable: boolean;
   readonly onRefresh?: () => Promise<void> | void;
 }) {
   // Reopening a mutable host file must not reuse a poster from an earlier visit.
@@ -351,6 +352,7 @@ function FileContent(props: {
           path={props.relativePath}
           initialLine={props.initialLine}
           headerInsetTop={props.truncated ? 0 : undefined}
+          selectable={props.selectable}
           onRefresh={props.onRefresh}
         />
       )}
@@ -650,6 +652,7 @@ export function ThreadFileScreen(props: ThreadFileRouteScreenProps) {
     readonly path: string;
     readonly mode: FileViewMode;
   } | null>(null);
+  const [textSelectionPath, setTextSelectionPath] = useState<string | null>(null);
   const [previewRevision, setPreviewRevision] = useState(0);
   const previewKey = JSON.stringify([environmentId, cwd, relativePath, previewRevision]);
   const [fullScreenPreview, setFullScreenPreview] = useState<FilePreviewSource | null>(null);
@@ -749,6 +752,10 @@ export function ThreadFileScreen(props: ThreadFileRouteScreenProps) {
       : null,
   );
   const fileData = fileQuery.data as ProjectReadFileResult | null;
+  // iOS only: Android lays out a whole-file selectable TextView on the UI thread, which stalls.
+  const canSelectText =
+    Platform.OS === "ios" && resolvedActiveMode === "source" && fileData?.contents != null;
+  const selectingText = canSelectText && textSelectionPath === relativePath;
 
   const handleSelectFile = (path: string) => {
     const targetPath =
@@ -837,6 +844,15 @@ export function ThreadFileScreen(props: ThreadFileRouteScreenProps) {
             onPress: () => setCodeWordBreak(!appearance.codeWordBreak),
           } as const)
         : null,
+      canSelectText
+        ? ({
+            id: "select-text",
+            title: selectingText ? "Done selecting" : "Select text",
+            icon: "character.cursor.ibeam",
+            inline: false,
+            onPress: () => setTextSelectionPath(selectingText ? null : relativePath),
+          } as const)
+        : null,
       ...(mediaSource
         ? mediaActions.actions
             .filter(({ id }) => id !== "open-file")
@@ -1046,6 +1062,7 @@ export function ThreadFileScreen(props: ThreadFileRouteScreenProps) {
           relativePath={relativePath}
           threadId={threadId}
           truncated={fileData?.truncated ?? false}
+          selectable={selectingText}
           onRefresh={() => fileQuery.refresh()}
         />
       </ScreenContent>
diff --git a/apps/mobile/src/features/files/filePath.test.ts b/apps/mobile/src/features/files/filePath.test.ts
index 46b26d7e3bf3..c58316af3698 100644
--- a/apps/mobile/src/features/files/filePath.test.ts
+++ b/apps/mobile/src/features/files/filePath.test.ts
@@ -2,6 +2,8 @@ import { describe, expect, it } from "vite-plus/test";
 
 import {
   fileRoutePathSegments,
+  isAudioPreviewFile,
+  isMarkdownPreviewFile,
   needsWorkspaceFileContents,
   resolveFileLinkPath,
   resolveWorkspaceRelativeFilePath,
@@ -58,3 +60,14 @@ describe("needsWorkspaceFileContents", () => {
     expect(needsWorkspaceFileContents({ ...input, metadataKind: "directory" })).toBe(false);
   });
 });
+
+describe("workspace preview classifiers", () => {
+  it("treat # and ? as literal filename characters", () => {
+    for (const path of ["notes/clip#1.wav", "notes/clip?1.wav", "notes#old/clip.wav"]) {
+      expect(isAudioPreviewFile(path)).toBe(true);
+    }
+    for (const path of ["docs/draft#1.md", "docs/draft?1.md", "docs#old/draft.md"]) {
+      expect(isMarkdownPreviewFile(path)).toBe(true);
+    }
+  });
+});
diff --git a/apps/mobile/src/features/files/filePath.ts b/apps/mobile/src/features/files/filePath.ts
index e38ff86fa665..330ff5784da6 100644
--- a/apps/mobile/src/features/files/filePath.ts
+++ b/apps/mobile/src/features/files/filePath.ts
@@ -100,15 +100,15 @@ export function isVideoPreviewFile(path: string): boolean {
 }
 
 export function isAudioPreviewFile(path: string): boolean {
-  return isWorkspaceAudioPreviewPath(path.split(/[?#]/, 1)[0] ?? "");
+  return isWorkspaceAudioPreviewPath(path);
 }
 
 export function isSvgImagePreviewFile(path: string): boolean {
-  return /\.svg$/i.test(path.split(/[?#]/, 1)[0] ?? "");
+  return /\.svg$/i.test(path);
 }
 
 export function isMarkdownPreviewFile(path: string): boolean {
-  return /\.(?:md|mdx)$/i.test(path.split(/[?#]/, 1)[0] ?? "");
+  return /\.(?:md|mdx)$/i.test(path);
 }
 
 export function needsWorkspaceFileContents(input: {
diff --git a/apps/mobile/src/features/files/thread-file-navigator-pane.test.tsx b/apps/mobile/src/features/files/thread-file-navigator-pane.test.tsx
new file mode 100644
index 000000000000..21f64998a3be
--- /dev/null
+++ b/apps/mobile/src/features/files/thread-file-navigator-pane.test.tsx
@@ -0,0 +1,79 @@
+import { EnvironmentId } from "@t3tools/contracts";
+import { act, type ReactNode } from "react";
+import { createRoot } from "react-dom/client";
+import { expect, it, vi } from "vite-plus/test";
+
+const queries = vi.hoisted(() => [] as { cwd: string | null; searchQuery: string }[]);
+
+vi.mock("@t3tools/client-runtime/state/filesystem", () => ({
+  resolveFilesystemReadAccess: () => ({ canReadFiles: true, isPending: false }),
+}));
+vi.mock("../../state/session", () => ({ environmentSession: { sessionStateAtom: () => null } }));
+vi.mock("../../state/query", () => ({ useEnvironmentQuery: () => ({ data: null, error: null }) }));
+vi.mock("../../state/presentation", () => ({
+  useEnvironmentPresentation: () => ({ isReady: true, presentation: null }),
+}));
+vi.mock("../settings/appearance/AppearancePreferencesProvider", () => ({
+  useAppearancePreferences: () => ({ themeAppearance: "dark" }),
+}));
+vi.mock("./preload-workspace-file", () => ({ preloadWorkspaceFileContents: () => {} }));
+vi.mock("./FileTreeBrowser", () => ({ FileTreeBrowser: () => null }));
+vi.mock("./useFileTreeEntries", () => ({
+  useFileTreeEntries: (input: { cwd: string | null; searchQuery: string }) => {
+    queries.push({ cwd: input.cwd, searchQuery: input.searchQuery });
+    return { refresh: () => {}, selectPath: () => {} };
+  },
+}));
+vi.mock("../../components/ui/SheetPane", () => ({
+  SheetPane: ({ children }: { children: ReactNode }) => children,
+}));
+vi.mock("../../components/ui/ScreenContent", () => ({
+  ScreenContent: ({ children }: { children: ReactNode }) => children,
+}));
+vi.mock("../../components/ui/AppBar", () => ({
+  AppBar: (props: { search: { value: string; onChangeText: (value: string) => void } }) => (
+    <input
+      value={props.search.value}
+      onChange={(event) => props.search.onChangeText(event.target.value)}
+    />
+  ),
+}));
+
+import { ThreadFileNavigatorPane } from "./thread-file-navigator-pane";
+
+it("starts unfiltered when the mounted pane switches to another workspace", () => {
+  (globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }).IS_REACT_ACT_ENVIRONMENT = true;
+  const container = document.body.appendChild(document.createElement("div"));
+  const root = createRoot(container);
+  const render = (cwd: string) =>
+    act(() =>
+      root.render(
+        <ThreadFileNavigatorPane
+          cwd={cwd}
+          environmentId={EnvironmentId.make("env")}
+          projectName="Files"
+          selectedPath={null}
+          onSelectFile={() => {}}
+        />,
+      ),
+    );
+  try {
+    render("/first");
+    const input = container.querySelector("input")!;
+    act(() => {
+      Object.getOwnPropertyDescriptor(HTMLInputElement.prototype, "value")!.set!.call(
+        input,
+        "alpha",
+      );
+      input.dispatchEvent(new Event("input", { bubbles: true }));
+    });
+    expect(queries.at(-1)).toEqual({ cwd: "/first", searchQuery: "alpha" });
+
+    render("/second");
+    expect(queries.at(-1)).toEqual({ cwd: "/second", searchQuery: "" });
+    expect(container.querySelector("input")!.value).toBe("");
+  } finally {
+    act(() => root.unmount());
+    container.remove();
+  }
+});
diff --git a/apps/mobile/src/features/files/thread-file-navigator-pane.tsx b/apps/mobile/src/features/files/thread-file-navigator-pane.tsx
index dd95959b3089..cc0c86e6d3e4 100644
--- a/apps/mobile/src/features/files/thread-file-navigator-pane.tsx
+++ b/apps/mobile/src/features/files/thread-file-navigator-pane.tsx
@@ -4,7 +4,7 @@ import type { EnvironmentId } from "@t3tools/contracts";
 import { AppBar } from "../../components/ui/AppBar";
 import { ScreenContent } from "../../components/ui/ScreenContent";
 import { useState } from "react";
-import { View } from "react-native";
+import { SheetPane } from "../../components/ui/SheetPane";
 
 import { useEnvironmentQuery } from "../../state/query";
 import { useEnvironmentPresentation } from "../../state/presentation";
@@ -20,7 +20,11 @@ export function ThreadFileNavigatorPane(props: {
   readonly selectedPath: string | null;
   readonly onSelectFile: (path: string) => void;
 }) {
-  const [searchQuery, setSearchQuery] = useState("");
+  const workspaceKey = JSON.stringify([props.environmentId, props.cwd]);
+  // The pane stays mounted across thread switches; a query only filters the workspace it was typed in.
+  const [search, setSearch] = useState({ workspaceKey, query: "" });
+  const searchQuery = search.workspaceKey === workspaceKey ? search.query : "";
+  const setSearchQuery = (query: string) => setSearch({ workspaceKey, query });
   const { themeAppearance: highlightTheme } = useAppearancePreferences();
   const fileAccessSession = useEnvironmentQuery(
     environmentSession.sessionStateAtom(props.environmentId),
@@ -48,7 +52,7 @@ export function ThreadFileNavigatorPane(props: {
   };
   const fileTree = (
     <FileTreeBrowser
-      key={JSON.stringify([props.environmentId, props.cwd])}
+      key={workspaceKey}
       revealSelection={entriesQuery.revealSelection}
       expandedPaths={entriesQuery.expandedPaths}
       setExpandedPaths={entriesQuery.setExpandedPaths}
@@ -78,9 +82,7 @@ export function ThreadFileNavigatorPane(props: {
   );
 
   return (
-    // Material drags target the first scroll view, so place content before the header.
-    <View className="flex-1 ios:bg-sheet android:bg-header android:flex-col-reverse">
-      <ScreenContent insetHorizontal>{fileTree}</ScreenContent>
+    <SheetPane>
       <AppBar
         title="Files"
         subtitle={props.projectName}
@@ -91,6 +93,7 @@ export function ThreadFileNavigatorPane(props: {
         }}
         refresh={{ accessibilityLabel: "Refresh files", onPress: entriesQuery.refresh }}
       />
-    </View>
+      <ScreenContent insetHorizontal>{fileTree}</ScreenContent>
+    </SheetPane>
   );
 }
diff --git a/apps/mobile/src/features/home/HomeRouteScreen.tsx b/apps/mobile/src/features/home/HomeRouteScreen.tsx
index 78b4eca22a47..df5142c15e24 100644
--- a/apps/mobile/src/features/home/HomeRouteScreen.tsx
+++ b/apps/mobile/src/features/home/HomeRouteScreen.tsx
@@ -26,7 +26,11 @@ import {
 import { AndroidHomeFabLayout } from "./AndroidHomeFab";
 import { HomeScreen } from "./HomeScreen";
 import { useHomeListOptions } from "./home-list-options";
-import { useAtomValueWhileVisible, useHomeRouteVisible } from "./home-route-visibility";
+import {
+  runWhenHomeCovered,
+  useAtomValueWhileVisible,
+  useHomeRouteVisible,
+} from "./home-route-visibility";
 import { buildHomeProjectScopes } from "./homeThreadList";
 import { usePendingTaskListActions } from "./usePendingTaskListActions";
 import { useThreadListActions } from "./useThreadListActions";
@@ -64,13 +68,16 @@ export function HomeRouteScreen() {
     else if (workspace) workspace.dispatch({ type: "query", query, tab: "threads" });
     else setLocalSearchQuery(query);
   };
-  const handleSelectThread = (thread: EnvironmentThreadShell) =>
-    selectDetail({
-      name: "Thread",
-      params: { environmentId: String(thread.environmentId), threadId: String(thread.id) },
-    });
-  const selectThreadRoute = (params: ReactNavigation.RootParamList["Thread"]) =>
+  // Split layouts keep the query; only the stacked layout opens the thread over the list.
+  // Android's search field keeps its own open state, which a cleared query would leave open.
+  const clearsSearchOnOpen = Platform.OS !== "android" && !layout.usesSplitView;
+  const selectThreadRoute = (params: ReactNavigation.RootParamList["Thread"]) => {
+    if (searchQuery !== "" && clearsSearchOnOpen && workspace)
+      runWhenHomeCovered(() => workspace.cancelSearch("threads"));
     selectDetail({ name: "Thread", params });
+  };
+  const handleSelectThread = (thread: EnvironmentThreadShell) =>
+    selectThreadRoute({ environmentId: String(thread.environmentId), threadId: String(thread.id) });
   const handleNewThreadOnBranch = (thread: EnvironmentThreadShell) => {
     selectThreadRoute({
       draft: {
@@ -232,6 +239,7 @@ export function HomeRouteScreen() {
           selectedEnvironmentId={selectedEnvironmentId}
           selectedProjectKey={selectedProjectKey}
           threads={threads}
+          visible={visible}
         />
         <ThreadUndoNotice visible={visible} />
       </>
diff --git a/apps/mobile/src/features/home/HomeScreen.tsx b/apps/mobile/src/features/home/HomeScreen.tsx
index d39bb1381baf..af25be18bb46 100644
--- a/apps/mobile/src/features/home/HomeScreen.tsx
+++ b/apps/mobile/src/features/home/HomeScreen.tsx
@@ -16,7 +16,15 @@ import { pickableProjectGroups } from "@t3tools/client-runtime/state/project-gro
 import { threadSearchMatchKey } from "@t3tools/client-runtime/state/thread-search";
 import { type EnvironmentId, type SidebarProjectGroupingMode } from "@t3tools/contracts";
 import { useAtomValue } from "@effect/atom-react";
-import { use, useEffect, useMemo, useRef, useState, type ComponentProps } from "react";
+import {
+  use,
+  useEffect,
+  useLayoutEffect,
+  useMemo,
+  useRef,
+  useState,
+  type ComponentProps,
+} from "react";
 import {
   Platform,
   ScrollView,
@@ -88,10 +96,14 @@ import {
 import { createSwipeRowActivation } from "./swipe-row-activation";
 import { SwipeableScrollGateProvider, useSwipeableScrollGate } from "./thread-swipe-actions";
 import { useFabScroll } from "./FabScrollContext";
+import { holdLaunchSplashForHomeRows, settleLaunchSplashHomeRows } from "./home-launch-splash";
 import { useWorkspaceTabs } from "../layout/workspace/WorkspaceTabsContext";
 import { ThreadListFilters } from "./ThreadListFilters";
+import { deriveHomeEmptyState } from "./home-empty-state";
 
 interface HomeScreenProps {
+  /** Whether this list is the one on screen; see `useHomeRouteVisible`. */
+  readonly visible: boolean;
   readonly projects: ReadonlyArray<EnvironmentProject>;
   readonly threads: ReadonlyArray<EnvironmentThreadShell>;
   readonly pendingTasks: ReadonlyArray<PendingNewTask>;
@@ -145,73 +157,6 @@ const ESTIMATED_THREAD_LIST_V2_ROW_HEIGHT = 72;
 // rows that are already built instead of rows still being rebuilt.
 const THREAD_LIST_V2_DRAW_DISTANCE = 1_000;
 
-function deriveEmptyState(props: {
-  readonly catalogState: WorkspaceState;
-  readonly projectCount: number;
-}): { readonly title: string; readonly detail: string; readonly loading: boolean } {
-  const { catalogState } = props;
-  if (catalogState.isLoadingConnections) {
-    return {
-      title: "Loading environments",
-      detail: "Checking saved environments on this device.",
-      loading: true,
-    };
-  }
-
-  if (!catalogState.hasConnections) {
-    return {
-      title: "No environments connected",
-      detail: "Add an environment to load projects and start coding sessions.",
-      loading: false,
-    };
-  }
-
-  if (
-    (catalogState.connectionState === "available" ||
-      catalogState.connectionState === "offline" ||
-      catalogState.connectionState === "error" ||
-      catalogState.connectionState === "unsupported") &&
-    !catalogState.hasLoadedShellSnapshot
-  ) {
-    return {
-      title:
-        catalogState.connectionState === "unsupported"
-          ? "Client not supported"
-          : "Environment unavailable",
-      detail:
-        catalogState.connectionError ??
-        "The saved environment is offline. Check the URL or start the environment, then retry.",
-      loading: false,
-    };
-  }
-
-  if (
-    catalogState.hasConnectingEnvironment &&
-    !catalogState.hasLoadedShellSnapshot &&
-    catalogState.connectionError === null
-  ) {
-    return {
-      title: "Connecting to environment",
-      detail: "Loading projects and threads from the saved environment.",
-      loading: true,
-    };
-  }
-
-  if (props.projectCount === 0 && catalogState.hasLoadedShellSnapshot) {
-    return {
-      title: "No projects found",
-      detail: "The connected environment did not report any projects.",
-      loading: false,
-    };
-  }
-
-  return {
-    title: "No threads yet",
-    detail: "Create a task to start a new coding runtime in one of your connected projects.",
-    loading: false,
-  };
-}
-
 function HomeTopContentSpacer() {
   return <View className="h-4" />;
 }
@@ -663,15 +608,18 @@ export function HomeScreen(props: HomeScreenProps) {
     props.threads.some((thread) => thread.archivedAt === null) ||
     props.pendingTasks.length > 0 ||
     threadListV2Layout.settledCount > 0;
+  // A hidden list gets no layout, so it never reports its rows as laid out.
+  const hasRowsToLayOut = props.visible && hasAnyThreads && threadListV2Items.length > 0;
+  // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- holds the native launch splash, which is outside React, until the rows are gone or this list unmounts; a layout effect runs before the splash hides in this commit
+  useLayoutEffect(() => {
+    return hasRowsToLayOut ? holdLaunchSplashForHomeRows() : undefined;
+  }, [hasRowsToLayOut]);
   const selectedEnvironmentLabel =
     props.selectedEnvironmentId === null
       ? null
       : (props.savedConnectionsById[props.selectedEnvironmentId]?.environmentLabel ??
         "this environment");
-  const emptyState = deriveEmptyState({
-    catalogState: props.catalogState,
-    projectCount: props.projects.length,
-  });
+  const emptyState = deriveHomeEmptyState(props.catalogState, props.projects.length);
 
   if (!hasAnyThreads) {
     return (
@@ -694,14 +642,10 @@ export function HomeScreen(props: HomeScreenProps) {
               <EmptyState
                 title={emptyState.title}
                 detail={emptyState.detail}
-                actionLabel={
-                  !props.catalogState.hasReadyEnvironment ? "Add environment" : undefined
-                }
-                onAction={
-                  !props.catalogState.hasReadyEnvironment ? props.onAddConnection : undefined
-                }
+                actionLabel={emptyState.showsAddEnvironment ? "Add environment" : undefined}
+                onAction={emptyState.showsAddEnvironment ? props.onAddConnection : undefined}
                 action={
-                  Platform.OS === "android" && !props.catalogState.hasReadyEnvironment ? (
+                  Platform.OS === "android" && emptyState.showsAddEnvironment ? (
                     <FloatingActionButton
                       label="Add environment"
                       icon="plus"
@@ -802,7 +746,10 @@ export function HomeScreen(props: HomeScreenProps) {
               <AnimatedLegendList
                 itemLayoutAnimation={sidebarSurface ? THREAD_SIDEBAR_ROW_LAYOUT : undefined}
                 ref={listRef}
-                onLoad={() => activateVisibleRows(threadListV2Items)}
+                onLoad={() => {
+                  settleLaunchSplashHomeRows();
+                  activateVisibleRows(threadListV2Items);
+                }}
                 onTouchStart={(event) => trackListTouches(event, true)}
                 onTouchEnd={(event) => trackListTouches(event, false)}
                 onTouchCancel={(event) => trackListTouches(event, false)}
diff --git a/apps/mobile/src/features/home/home-empty-state.test.ts b/apps/mobile/src/features/home/home-empty-state.test.ts
new file mode 100644
index 000000000000..c7703a865533
--- /dev/null
+++ b/apps/mobile/src/features/home/home-empty-state.test.ts
@@ -0,0 +1,104 @@
+import { EnvironmentId } from "@t3tools/contracts";
+import { describe, expect, it } from "vite-plus/test";
+
+import type { WorkspaceEnvironment, WorkspaceState } from "../../state/workspaceModel";
+import { deriveHomeEmptyState } from "./home-empty-state";
+
+function connectingEnvironment(
+  connectionState: "connecting" | "reconnecting",
+  connectionError: string | null,
+): WorkspaceEnvironment {
+  return {
+    environmentId: EnvironmentId.make("environment-1"),
+    environmentLabel: "corex",
+    displayUrl: "",
+    isRelayManaged: false,
+    isEnabled: true,
+    connectionState,
+    connectionError,
+    connectionErrorTraceId: null,
+  };
+}
+
+function workspaceState(overrides: Partial<WorkspaceState> = {}): WorkspaceState {
+  return {
+    isLoadingConnections: false,
+    hasConnections: true,
+    hasLoadedShellSnapshot: true,
+    hasPendingShellSnapshot: false,
+    hasSyncingConnectedEnvironment: false,
+    hasReadyEnvironment: true,
+    hasConnectingEnvironment: false,
+    connectingEnvironments: [],
+    connectionState: "connected",
+    connectionError: null,
+    shellSnapshotError: null,
+    networkStatus: "online",
+    ...overrides,
+  };
+}
+
+const RETAINED_FAILURE = "Environment did not respond before the connection timeout.";
+const reconnecting = connectingEnvironment("reconnecting", RETAINED_FAILURE);
+
+describe("home empty state", () => {
+  it.each([
+    [
+      "waits while a saved environment retries after a retained failure",
+      workspaceState({
+        hasLoadedShellSnapshot: false,
+        hasPendingShellSnapshot: true,
+        hasReadyEnvironment: false,
+        hasConnectingEnvironment: true,
+        connectingEnvironments: [reconnecting],
+        connectionState: "reconnecting",
+        connectionError: RETAINED_FAILURE,
+      }),
+      1,
+      { title: "Connecting to environment", loading: true, showsAddEnvironment: false },
+    ],
+    [
+      "waits for a connected environment's first shell snapshot",
+      workspaceState({
+        hasLoadedShellSnapshot: false,
+        hasPendingShellSnapshot: true,
+        hasSyncingConnectedEnvironment: true,
+      }),
+      0,
+      { title: "Loading threads", loading: true, showsAddEnvironment: false },
+    ],
+    [
+      "waits while another environment is still connecting after one loaded empty",
+      workspaceState({
+        hasPendingShellSnapshot: true,
+        hasConnectingEnvironment: true,
+        connectingEnvironments: [reconnecting],
+        connectionError: RETAINED_FAILURE,
+      }),
+      0,
+      { title: "Loading threads", loading: true, showsAddEnvironment: false },
+    ],
+    [
+      "reports no threads once every environment has resolved",
+      workspaceState(),
+      1,
+      { title: "No threads yet", loading: false, showsAddEnvironment: false },
+    ],
+    [
+      "does not wait on retries while the device is offline",
+      workspaceState({
+        hasPendingShellSnapshot: true,
+        hasReadyEnvironment: false,
+        hasConnectingEnvironment: true,
+        connectingEnvironments: [reconnecting],
+        connectionState: "offline",
+        networkStatus: "offline",
+      }),
+      1,
+      { title: "No threads yet", loading: false, showsAddEnvironment: true },
+    ],
+  ] as const)("%s", (_name, state, projectCount, expected) => {
+    const { title, loading, showsAddEnvironment } = deriveHomeEmptyState(state, projectCount);
+    expect({ title, loading, showsAddEnvironment }).toEqual(expected);
+  });
+});
diff --git a/apps/mobile/src/features/home/home-empty-state.ts b/apps/mobile/src/features/home/home-empty-state.ts
new file mode 100644
index 000000000000..66f231a54684
--- /dev/null
+++ b/apps/mobile/src/features/home/home-empty-state.ts
@@ -0,0 +1,81 @@
+import { isWorkspaceCatalogPending, type WorkspaceState } from "../../state/workspaceModel";
+
+export interface HomeEmptyState {
+  readonly title: string;
+  readonly detail: string;
+  readonly loading: boolean;
+  readonly showsAddEnvironment: boolean;
+}
+
+export function deriveHomeEmptyState(
+  catalogState: WorkspaceState,
+  projectCount: number,
+): HomeEmptyState {
+  const emptyState = deriveEmptyState(catalogState, projectCount);
+  return {
+    ...emptyState,
+    showsAddEnvironment: !emptyState.loading && !catalogState.hasReadyEnvironment,
+  };
+}
+
+function deriveEmptyState(
+  catalogState: WorkspaceState,
+  projectCount: number,
+): Omit<HomeEmptyState, "showsAddEnvironment"> {
+  if (catalogState.isLoadingConnections) {
+    return {
+      title: "Loading environments",
+      detail: "Checking saved environments on this device.",
+      loading: true,
+    };
+  }
+
+  if (!catalogState.hasConnections) {
+    return {
+      title: "No environments connected",
+      detail: "Add an environment to load projects and start coding sessions.",
+      loading: false,
+    };
+  }
+
+  if (
+    (catalogState.connectionState === "available" ||
+      catalogState.connectionState === "offline" ||
+      catalogState.connectionState === "error" ||
+      catalogState.connectionState === "unsupported") &&
+    !catalogState.hasLoadedShellSnapshot
+  ) {
+    return {
+      title:
+        catalogState.connectionState === "unsupported"
+          ? "Client not supported"
+          : "Environment unavailable",
+      detail:
+        catalogState.connectionError ??
+        "The saved environment is offline. Check the URL or start the environment, then retry.",
+      loading: false,
+    };
+  }
+
+  if (isWorkspaceCatalogPending(catalogState)) {
+    return {
+      title: catalogState.hasReadyEnvironment ? "Loading threads" : "Connecting to environment",
+      detail: "Loading projects and threads from the saved environment.",
+      loading: true,
+    };
+  }
+
+  if (projectCount === 0 && catalogState.hasLoadedShellSnapshot) {
+    return {
+      title: "No projects found",
+      detail: "The connected environment did not report any projects.",
+      loading: false,
+    };
+  }
+
+  return {
+    title: "No threads yet",
+    detail: "Create a task to start a new coding runtime in one of your connected projects.",
+    loading: false,
+  };
+}
diff --git a/apps/mobile/src/features/home/home-launch-splash.test.ts b/apps/mobile/src/features/home/home-launch-splash.test.ts
new file mode 100644
index 000000000000..d571811b33d7
--- /dev/null
+++ b/apps/mobile/src/features/home/home-launch-splash.test.ts
@@ -0,0 +1,70 @@
+import { expect, it, vi } from "vite-plus/test";
+
+import { createLaunchSplashHomeRows, splashCanHide } from "./home-launch-splash";
+
+const launched = {
+  preferencesReady: true,
+  shellCachesRead: true,
+  homeRowsPending: false,
+  waitEnded: false,
+};
+
+it.each([
+  {
+    name: "hides when the cached shells are read and no rows wait for layout",
+    input: launched,
+    hides: true,
+  },
+  {
+    name: "waits while Home still lays out the cached rows",
+    input: { ...launched, homeRowsPending: true },
+    hides: false,
+  },
+  {
+    name: "waits for the cached shells when Home has no rows yet",
+    input: { ...launched, shellCachesRead: false },
+    hides: false,
+  },
+  {
+    name: "stops waiting for rows at the limit",
+    input: { ...launched, homeRowsPending: true, waitEnded: true },
+    hides: true,
+  },
+  {
+    name: "stops waiting for a cache read that fails at the limit",
+    input: { ...launched, shellCachesRead: false, homeRowsPending: true, waitEnded: true },
+    hides: true,
+  },
+  {
+    name: "waits for preferences even after the limit",
+    input: { ...launched, preferencesReady: false, waitEnded: true },
+    hides: false,
+  },
+])("the launch splash $name", ({ input, hides }) => {
+  expect(splashCanHide(input)).toBe(hides);
+});
+
+it("the launch splash is held only while a Home list has rows to lay out", () => {
+  const rows = createLaunchSplashHomeRows();
+  const onChange = vi.fn();
+  rows.subscribe(onChange);
+
+  const release = rows.hold();
+  expect(rows.pending()).toBe(true);
+  // The server answered with no rows, or the list unmounted, before its first layout.
+  release();
+  expect(rows.pending(), "a list that lost its rows releases the splash").toBe(false);
+  expect(onChange).toHaveBeenCalledTimes(2);
+
+  const releaseLater = rows.hold();
+  const releaseOther = rows.hold();
+  releaseLater();
+  release();
+  expect(rows.pending(), "another list still has rows to lay out").toBe(true);
+
+  rows.settle();
+  expect(rows.pending()).toBe(false);
+  releaseOther();
+  rows.hold();
+  expect(rows.pending(), "a list that mounts after the launch holds nothing").toBe(false);
+});
diff --git a/apps/mobile/src/features/home/home-launch-splash.ts b/apps/mobile/src/features/home/home-launch-splash.ts
new file mode 100644
index 000000000000..16069f051d45
--- /dev/null
+++ b/apps/mobile/src/features/home/home-launch-splash.ts
@@ -0,0 +1,75 @@
+import { useSyncExternalStore } from "react";
+
+/**
+ * Whether the launch splash still waits for Home's list. A list holds the splash while it
+ * has cached rows to lay out, so the first frame after the splash shows them.
+ */
+export function createLaunchSplashHomeRows() {
+  let holds = 0;
+  let settled = false;
+  const listeners = new Set<() => void>();
+  const pending = () => !settled && holds > 0;
+  const change = (apply: () => void) => {
+    const before = pending();
+    apply();
+    if (pending() !== before) for (const listener of listeners) listener();
+  };
+  return {
+    pending,
+    /**
+     * A Home list has rows that are not laid out yet. Call the returned release when it no
+     * longer has them or unmounts; rows that come later can hold again.
+     */
+    hold: () => {
+      let held = true;
+      change(() => {
+        holds += 1;
+      });
+      return () => {
+        if (!held) return;
+        held = false;
+        change(() => {
+          holds -= 1;
+        });
+      };
+    },
+    /**
+     * The rows are laid out, the launch opened another route, or the splash is gone. It is
+     * final: lists that mount after the launch must not hold anything.
+     */
+    settle: () =>
+      change(() => {
+        settled = true;
+      }),
+    subscribe: (onChange: () => void) => {
+      listeners.add(onChange);
+      return () => {
+        listeners.delete(onChange);
+      };
+    },
+  };
+}
+
+const homeRows = createLaunchSplashHomeRows();
+
+export const holdLaunchSplashForHomeRows = homeRows.hold;
+export const settleLaunchSplashHomeRows = homeRows.settle;
+export const launchSplashHomeRowsPending = homeRows.pending;
+
+export function useLaunchSplashHomeRowsPending(): boolean {
+  return useSyncExternalStore(homeRows.subscribe, homeRows.pending);
+}
+
+/**
+ * Whether the native splash can hide: after the cached shells are read and Home's list has
+ * laid out their rows. One limit ends both waits.
+ */
+export function splashCanHide(input: {
+  readonly preferencesReady: boolean;
+  readonly shellCachesRead: boolean;
+  readonly homeRowsPending: boolean;
+  readonly waitEnded: boolean;
+}): boolean {
+  if (!input.preferencesReady) return false;
+  return input.waitEnded || (input.shellCachesRead && !input.homeRowsPending);
+}
diff --git a/apps/mobile/src/features/home/home-route-visibility.test.ts b/apps/mobile/src/features/home/home-route-visibility.test.ts
new file mode 100644
index 000000000000..2ab23be17a71
--- /dev/null
+++ b/apps/mobile/src/features/home/home-route-visibility.test.ts
@@ -0,0 +1,35 @@
+import { describe, expect, it, vi } from "vite-plus/test";
+
+import {
+  recordHomeTransitionEnd,
+  recordHomeTransitionStart,
+  runWhenHomeCovered,
+} from "./home-route-visibility";
+
+vi.mock("@react-navigation/native", () => ({ useNavigation: vi.fn() }));
+
+describe("runWhenHomeCovered", () => {
+  it("waits for the page opening over Home to finish covering it, then runs once", () => {
+    const clearSearch = vi.fn();
+    runWhenHomeCovered(clearSearch);
+    recordHomeTransitionStart(true);
+    expect(clearSearch).not.toHaveBeenCalled();
+    recordHomeTransitionEnd(true, true);
+    expect(clearSearch).not.toHaveBeenCalled();
+    recordHomeTransitionEnd(true, false);
+    expect(clearSearch).toHaveBeenCalledTimes(1);
+    recordHomeTransitionStart(false);
+    recordHomeTransitionEnd(true, false);
+    expect(clearSearch).toHaveBeenCalledTimes(1);
+  });
+
+  it("drops the action when Home reappears before it is covered", () => {
+    const clearSearch = vi.fn();
+    runWhenHomeCovered(clearSearch);
+    recordHomeTransitionStart(true);
+    recordHomeTransitionStart(false);
+    recordHomeTransitionEnd(false, false);
+    recordHomeTransitionEnd(true, false);
+    expect(clearSearch).not.toHaveBeenCalled();
+  });
+});
diff --git a/apps/mobile/src/features/home/home-route-visibility.ts b/apps/mobile/src/features/home/home-route-visibility.ts
index 7a8837b582a1..51bd29234759 100644
--- a/apps/mobile/src/features/home/home-route-visibility.ts
+++ b/apps/mobile/src/features/home/home-route-visibility.ts
@@ -33,8 +33,17 @@ function subscribeHomeVisibility(onChange: () => void) {
   };
 }
 
+let onHomeCovered: (() => void) | null = null;
+
+/** Runs `action` once the page opening over Home covers it; Home starting to reappear first drops it. */
+export function runWhenHomeCovered(action: () => void): void {
+  onHomeCovered = action;
+}
+
 export function recordHomeTransitionStart(closing: boolean): void {
-  if (!closing) setHomeVisible(true);
+  if (closing) return;
+  onHomeCovered = null;
+  setHomeVisible(true);
 }
 
 /**
@@ -42,7 +51,11 @@ export function recordHomeTransitionStart(closing: boolean): void {
  * disappears last. So a disappear hides Home only when another route has the focus.
  */
 export function recordHomeTransitionEnd(closing: boolean, homeFocused: boolean): void {
-  if (closing && !homeFocused) setHomeVisible(false);
+  if (!closing || homeFocused) return;
+  setHomeVisible(false);
+  const action = onHomeCovered;
+  onHomeCovered = null;
+  action?.();
 }
 
 /** Popping a sheet or a deep-linked route above Home has no appear event. */
diff --git a/apps/mobile/src/features/home/useThreadListActions.test.ts b/apps/mobile/src/features/home/useThreadListActions.test.ts
index b0f0ce78d0a8..0bea39e419e2 100644
--- a/apps/mobile/src/features/home/useThreadListActions.test.ts
+++ b/apps/mobile/src/features/home/useThreadListActions.test.ts
@@ -7,6 +7,7 @@ import {
   ProviderInstanceId,
   RunId,
   ThreadId,
+  type ThreadTitleRegenerationOutcome,
 } from "@t3tools/contracts";
 import * as Cause from "effect/Cause";
 import { AsyncResult } from "effect/reactivity";
@@ -18,6 +19,7 @@ const state = vi.hoisted(() => ({
   dropBusy: false,
   holdingRows: false,
   failedAction: null as string | null,
+  titleOutcome: null as ThreadTitleRegenerationOutcome | null,
   archivedRefreshes: [] as string[],
   scopes: new Map<string, Set<string>>(),
   shells: [] as EnvironmentThreadShell[],
@@ -141,6 +143,7 @@ vi.mock("../../state/threads", () => ({
       "reorderPin",
       "reorderActive",
       "updateMetadata",
+      "regenerateTitle",
     ].map((action) => [
       action,
       async (request: {
@@ -155,7 +158,7 @@ vi.mock("../../state/threads", () => ({
         if (action === state.failedAction)
           return AsyncResult.failure(Cause.fail(new Error("Server rejected action")));
         state.afterRequest?.();
-        return AsyncResult.success(undefined);
+        return AsyncResult.success(action === "regenerateTitle" ? state.titleOutcome : undefined);
       },
     ]),
   ),
@@ -186,12 +189,13 @@ const mutationCases = [
   ["unsnoozeThread", "unsnooze"],
   ["pinThread", "pin"],
   ["unpinThread", "unpin"],
-  ["regenerateThreadTitle", "updateMetadata"],
+  ["regenerateThreadTitle", "regenerateTitle"],
 ] as const;
 
 beforeEach(() => {
   state.connectedEnvironmentIds = [primaryEnvironmentId, otherEnvironmentId];
   state.failedAction = null;
+  state.titleOutcome = null;
   state.archivedRefreshes = [];
   state.pendingOrder = null;
   state.dropBusy = false;
@@ -214,6 +218,16 @@ afterEach(() => {
   vi.unstubAllEnvs();
 });
 
+it("reports a failed title generation as unsuccessful and allows another request", async () => {
+  const actions = useThreadListActions();
+  const thread = makeThread();
+  state.titleOutcome = { status: "failed", message: "Model unavailable" };
+  expect(await actions.regenerateThreadTitle(thread)).toBe(false);
+
+  state.titleOutcome = { status: "renamed" };
+  expect(await actions.regenerateThreadTitle(thread)).toBe(true);
+});
+
 describe("thread list operation permissions", () => {
   it.each(mutationCases)(
     "%s rejects a retained callback after its environment loses permission",
diff --git a/apps/mobile/src/features/home/useThreadListActions.ts b/apps/mobile/src/features/home/useThreadListActions.ts
index aaba12dd8f41..3cd180db6273 100644
--- a/apps/mobile/src/features/home/useThreadListActions.ts
+++ b/apps/mobile/src/features/home/useThreadListActions.ts
@@ -240,6 +240,9 @@ export function useThreadListActions(): {
   const updateThreadMetadata = useAtomCommand(threadEnvironment.updateMetadata, {
     reportFailure: false,
   });
+  const regenerateTitle = useAtomCommand(threadEnvironment.regenerateTitle, {
+    reportFailure: false,
+  });
   const snoozeInFlightThreadKeys = useRef(new Set<string>());
   const titleRegenerationInFlightThreadKeys = useRef(new Set<string>());
 
@@ -529,9 +532,9 @@ export function useThreadListActions(): {
     titleRegenerationInFlightThreadKeys.current.add(key);
     selectionHaptic();
     const succeeded = await (async () => {
-      const result = await updateThreadMetadata({
+      const result = await regenerateTitle({
         environmentId: thread.environmentId,
-        input: { threadId: thread.id, regenerateTitle: true },
+        input: { threadId: thread.id },
       });
       if (result._tag === "Failure") {
         const error = Cause.squash(result.cause);
@@ -543,6 +546,13 @@ export function useThreadListActions(): {
         );
         return false;
       }
+      if (result.value?.status === "failed") {
+        Dialog.alert(
+          "Could not regenerate title",
+          result.value.message ?? "The thread title could not be regenerated.",
+        );
+        return false;
+      }
       return true;
     })();
     titleRegenerationInFlightThreadKeys.current.delete(key);
diff --git a/apps/mobile/src/features/layout/AdaptiveWorkspaceLayout.tsx b/apps/mobile/src/features/layout/AdaptiveWorkspaceLayout.tsx
index 19ffe072fb58..3a32e3352361 100644
--- a/apps/mobile/src/features/layout/AdaptiveWorkspaceLayout.tsx
+++ b/apps/mobile/src/features/layout/AdaptiveWorkspaceLayout.tsx
@@ -112,7 +112,7 @@ import {
   workspaceTabColumns,
   workspaceTabNavigationState,
 } from "./workspace/workspace-tab-navigation";
-import type { WorkspaceTab } from "./workspace/workspace-tabs-state";
+import { workspaceTabOf, type WorkspaceTab } from "./workspace/workspace-tabs-state";
 import { workspaceRoutesOf } from "./workspace-overlay-routes";
 import { SettingsWorkspaceLayout } from "../settings/SettingsWorkspaceLayout";
 import { WorkspaceThreadSidebar } from "./workspace/WorkspaceThreadSidebar";
@@ -570,10 +570,7 @@ function AdaptiveWorkspaceLayoutContent(
       setFileInspectorPreferredVisible(false);
       setInspectorSheetRoute(null);
       if (layout.variant === "medium") setPrimarySidebarVisible(false);
-      workspace?.dispatch({
-        type: "select",
-        tab: detail.name === "Thread" ? "threads" : "pullRequests",
-      });
+      workspace?.dispatch({ type: "select", tab: workspaceTabOf(detail.name) });
       startOpeningDetail(detail);
       navigation.dispatch(selectWorkspaceDetail(detail, sheet));
     });
diff --git a/apps/mobile/src/features/layout/createWorkspaceStackNavigator.android.tsx b/apps/mobile/src/features/layout/createWorkspaceStackNavigator.android.tsx
index 2ee2000d400f..d4930f4cdecb 100644
--- a/apps/mobile/src/features/layout/createWorkspaceStackNavigator.android.tsx
+++ b/apps/mobile/src/features/layout/createWorkspaceStackNavigator.android.tsx
@@ -19,6 +19,7 @@ import {
 } from "@react-navigation/native-stack";
 import { use, type ComponentProps } from "react";
 
+import { BottomSheetContext } from "../../components/ui/BottomSheetContext";
 import { RoutedFormSheetContext } from "../../components/ui/RoutedFormSheetContext";
 
 import {
@@ -131,7 +132,11 @@ function WorkspaceStackNavigator({
                 ...(descriptor.options.presentation === "formSheet"
                   ? {
                       render: () => (
-                        <RoutedFormSheetContext value>{descriptor.render()}</RoutedFormSheetContext>
+                        <BottomSheetContext value>
+                          <RoutedFormSheetContext value>
+                            {descriptor.render()}
+                          </RoutedFormSheetContext>
+                        </BottomSheetContext>
                       ),
                     }
                   : undefined),
diff --git a/apps/mobile/src/features/layout/workspace-inspector-sheet.tsx b/apps/mobile/src/features/layout/workspace-inspector-sheet.tsx
index 9fec5e64df69..f2f9c0242563 100644
--- a/apps/mobile/src/features/layout/workspace-inspector-sheet.tsx
+++ b/apps/mobile/src/features/layout/workspace-inspector-sheet.tsx
@@ -1,10 +1,8 @@
 import { createContext, useRef, useState } from "react";
-import { Platform, View } from "react-native";
 import { SafeAreaInsetsContext, useSafeAreaInsets } from "react-native-safe-area-context";
-import { FormSheet } from "react-native-screens";
-import { useResolveClassNames } from "uniwind";
 
 import { PaneContext } from "../../components/ui/Pane";
+import { PaneSheet } from "../../components/ui/PaneSheet";
 import { RoutedFormSheetContext } from "../../components/ui/RoutedFormSheetContext";
 import { formSheetDetents } from "../../native/sheet-surface";
 import { InspectorPanes } from "./inspector-host";
@@ -22,7 +20,6 @@ export function WorkspaceInspectorSheet(props: {
   readonly onClose: () => void;
   readonly content: InspectorContent | undefined;
 }) {
-  const containerStyle = useResolveClassNames(Platform.OS === "android" ? "bg-header" : "bg-sheet");
   const insets = useSafeAreaInsets();
   // Stays mounted until the sheet has finished closing, so it doesn't empty as it slides away.
   // Each opening gets a fresh native sheet, even one that starts while the last is closing.
@@ -51,15 +48,12 @@ export function WorkspaceInspectorSheet(props: {
   };
   if (!presented.mounted) return null;
   return (
-    <FormSheet
+    <PaneSheet
       key={presented.session}
       isOpen={props.open}
       detents={formSheetDetents(0.6, 0.95)}
-      prefersGrabberVisible={Platform.OS === "ios"}
       // The inspector's bar holds its actions, so the Duo needs no rail inside this sheet.
       prefersHorizontalBars
-      preferredCornerRadius={Platform.OS === "android" ? 28 : undefined}
-      nativeContainerStyle={containerStyle}
       onDismiss={closed}
       onNativeDismiss={() => {
         props.onClose();
@@ -71,25 +65,11 @@ export function WorkspaceInspectorSheet(props: {
           {/* The sheet starts below the status bar. */}
           <SafeAreaInsetsContext value={{ ...insets, top: 0 }}>
             <PaneContext value="inspector">
-              {/* Android FormSheet does not bound flex children. */}
-              <View
-                collapsable={false}
-                className={
-                  Platform.OS === "android" ? "absolute inset-0 bg-header pt-3" : "flex-1 bg-sheet"
-                }
-              >
-                <InspectorPanes content={props.content} onClose={() => close()} />
-                {Platform.OS === "android" ? (
-                  <View
-                    pointerEvents="none"
-                    className="absolute top-1 h-1 w-8 self-center rounded-full bg-header-foreground/40"
-                  />
-                ) : null}
-              </View>
+              <InspectorPanes content={props.content} onClose={() => close()} />
             </PaneContext>
           </SafeAreaInsetsContext>
         </RoutedFormSheetContext>
       </InspectorSheetContext>
-    </FormSheet>
+    </PaneSheet>
   );
 }
diff --git a/apps/mobile/src/features/layout/workspace/AndroidWorkspaceTabsProvider.tsx b/apps/mobile/src/features/layout/workspace/AndroidWorkspaceTabsProvider.tsx
index 5fc9b50097ba..3612561ede6c 100644
--- a/apps/mobile/src/features/layout/workspace/AndroidWorkspaceTabsProvider.tsx
+++ b/apps/mobile/src/features/layout/workspace/AndroidWorkspaceTabsProvider.tsx
@@ -3,6 +3,7 @@ import { createContext, use, type ReactNode } from "react";
 import { Platform } from "react-native";
 import { androidWorkspaceSettingsOpen } from "./android-workspace-tabs";
 import { WorkspaceTabsProvider } from "./WorkspaceTabsContext";
+import { workspaceTabOf } from "./workspace-tabs-state";
 
 interface AndroidWorkspaceRoot {
   /**
@@ -35,7 +36,10 @@ export function AndroidWorkspaceTabsProvider(props: {
     settingsIndex < 0 ? null : (props.state.routes[settingsIndex + 1]?.name ?? null);
   const root = { key, settingsOpen, settingsRoute, settingsPage };
   return Platform.OS === "android" ? (
-    <WorkspaceTabsProvider>
+    // A cold-start link lands on a page with no list selection; start on that page's list.
+    <WorkspaceTabsProvider
+      initialTab={workspaceTabOf(props.state.routes.find((route) => route.name !== "Home")?.name)}
+    >
       <AndroidWorkspaceRootContext value={root}>{props.children}</AndroidWorkspaceRootContext>
     </WorkspaceTabsProvider>
   ) : (
diff --git a/apps/mobile/src/features/layout/workspace/WorkspaceRootScreen.android.tsx b/apps/mobile/src/features/layout/workspace/WorkspaceRootScreen.android.tsx
index a03a36bc9476..75d139621562 100644
--- a/apps/mobile/src/features/layout/workspace/WorkspaceRootScreen.android.tsx
+++ b/apps/mobile/src/features/layout/workspace/WorkspaceRootScreen.android.tsx
@@ -24,6 +24,8 @@ import { WorkspaceAppBarScope } from "../../../components/ui/WorkspaceAppBar.and
 import { usePaneRole } from "../../../components/ui/Pane";
 import { AndroidWorkspaceSidebar } from "./AndroidWorkspaceSidebar.android";
 import type { WorkspaceTab } from "./workspace-tabs-state";
+import { useSelectWorkspaceTab } from "./useSelectWorkspaceTab";
+import { useHardwareBack } from "../../../lib/backHandler";
 
 const TABS: readonly WorkspaceTab[] = NAVIGATION_TAB_ORDER;
 
@@ -49,6 +51,18 @@ function WorkspaceRoot() {
           : 16,
   };
   const tab = workspace.state.selectedTab;
+  const selectTab = useSelectWorkspaceTab();
+  // Tabs are panes of Home, not routes, so Back has nothing to pop and would leave the app.
+  // An open search keeps Back for itself.
+  useHardwareBack(
+    tab !== "threads" &&
+      enabled.includes("threads") &&
+      workspace.state.tabs[tab].searchMode === "resting",
+    () => {
+      selectTab("threads");
+      return true;
+    },
+  );
 
   return (
     <WorkspaceTabsContext value={context}>
diff --git a/apps/mobile/src/features/layout/workspace/WorkspaceTabsContext.tsx b/apps/mobile/src/features/layout/workspace/WorkspaceTabsContext.tsx
index 9ecb6fa933fa..81344be55e4d 100644
--- a/apps/mobile/src/features/layout/workspace/WorkspaceTabsContext.tsx
+++ b/apps/mobile/src/features/layout/workspace/WorkspaceTabsContext.tsx
@@ -26,6 +26,8 @@ export const WorkspaceTabsContext = createContext<{
   readonly settingsOpen: boolean;
   readonly getScrollOffset: (tab: WorkspaceSearchTab) => number;
   readonly recordScrollOffset: (tab: WorkspaceSearchTab, offset: number) => void;
+  /** Leaves search and returns the list to where it was when search began. */
+  readonly cancelSearch: (tab: WorkspaceSearchTab) => void;
 } | null>(null);
 
 export function useWorkspaceTabs() {
@@ -52,8 +54,8 @@ function resolveWorkspaceTabsSelection(
 
 // One model per provider. Handlers on frozen screens keep stale closures, so
 // they read the current selection from the registry at call time.
-function createWorkspaceTabsModel() {
-  const stored = Atom.make(initialWorkspaceTabsState());
+function createWorkspaceTabsModel(selectedTab?: WorkspaceTab) {
+  const stored = Atom.make(initialWorkspaceTabsState(selectedTab));
   const scrollOffsets: Record<WorkspaceSearchTab, number> = {
     threads: 0,
     pullRequests: 0,
@@ -75,19 +77,25 @@ function createWorkspaceTabsModel() {
 export function WorkspaceTabsProvider(props: {
   readonly children: ReactNode;
   readonly settingsOpen?: boolean;
+  readonly initialTab?: WorkspaceTab;
 }) {
   const registry = use(RegistryContext);
-  const [model] = useState(createWorkspaceTabsModel);
+  const [model] = useState(() => createWorkspaceTabsModel(props.initialTab));
   const state = useAtomValue(model.resolved);
+  const dispatch = (action: WorkspaceTabsAction) =>
+    registry.set(model.stored, workspaceTabsReducer(registry.get(model.resolved), action));
   const context = {
     state,
-    dispatch: (action: WorkspaceTabsAction) =>
-      registry.set(model.stored, workspaceTabsReducer(registry.get(model.resolved), action)),
+    dispatch,
     isTabActive: (tab: WorkspaceTab) => registry.get(model.resolved).selectedTab === tab,
     bottomClearance: 0,
     settingsOpen: props.settingsOpen ?? false,
     getScrollOffset: model.getScrollOffset,
     recordScrollOffset: model.recordScrollOffset,
+    cancelSearch: (tab: WorkspaceSearchTab) => {
+      model.recordScrollOffset(tab, registry.get(model.resolved).tabs[tab].searchEntryOffset);
+      dispatch({ type: "cancel", tab });
+    },
   };
   return <WorkspaceTabsContext value={context}>{props.children}</WorkspaceTabsContext>;
 }
diff --git a/apps/mobile/src/features/layout/workspace/WorkspaceToolbar.tsx b/apps/mobile/src/features/layout/workspace/WorkspaceToolbar.tsx
index 5557432ce494..f07076a8fb14 100644
--- a/apps/mobile/src/features/layout/workspace/WorkspaceToolbar.tsx
+++ b/apps/mobile/src/features/layout/workspace/WorkspaceToolbar.tsx
@@ -80,10 +80,7 @@ export function WorkspaceToolbar(props: {
     searchRef.current?.focus();
     return true;
   };
-  const cancelSearch = () => {
-    workspace.recordScrollOffset(selectedTab, tab.searchEntryOffset);
-    workspace.dispatch({ type: "cancel", tab: selectedTab });
-  };
+  const cancelSearch = () => workspace.cancelSearch(selectedTab);
   const searchFocused = () =>
     tab.searchMode === "resting"
       ? enterSearch()
@@ -96,6 +93,8 @@ export function WorkspaceToolbar(props: {
   // The sidebar remains visible while its detail owns navigation focus.
   const searchHostVisible = focused || settingsListOnTop || primaryColumn?.presented === true;
   const restoreSearch = () => {
+    // A search cancelled while its screen was covered leaves its text in the native field.
+    if (tab.searchMode === "resting") searchRef.current?.setText("");
     if (
       searchHostVisible &&
       searchVisible &&
diff --git a/apps/mobile/src/features/layout/workspace/useAndroidWorkspaceNavigation.ts b/apps/mobile/src/features/layout/workspace/useAndroidWorkspaceNavigation.ts
index dfc8e13d162c..0165634f0a31 100644
--- a/apps/mobile/src/features/layout/workspace/useAndroidWorkspaceNavigation.ts
+++ b/apps/mobile/src/features/layout/workspace/useAndroidWorkspaceNavigation.ts
@@ -1,50 +1,29 @@
 import { StackActions, useFocusEffect, useNavigation } from "@react-navigation/native";
 import { useCallback } from "react";
 import { BackHandler, Keyboard, Platform } from "react-native";
-import {
-  resetAndroidWorkspace,
-  returnToAndroidWorkspaceList,
-} from "../../../lib/android-workspace-navigation";
-import { useWorkspaceTabs } from "./WorkspaceTabsContext";
-import type { WorkspaceTab } from "./workspace-tabs-state";
+import { returnToAndroidWorkspaceList } from "../../../lib/android-workspace-navigation";
 
-function useWorkspaceListNavigation(tab: WorkspaceTab) {
+export function useWorkspaceBackNavigation() {
   const navigation = useNavigation();
-  const dispatch = useWorkspaceTabs()?.dispatch;
   return () => {
-    if (Platform.OS === "android") {
-      dispatch?.({ type: "select", tab });
-      resetAndroidWorkspace(navigation);
-    } else if (navigation.canGoBack()) navigation.goBack();
+    if (Platform.OS === "android") returnToAndroidWorkspaceList(navigation);
+    else if (navigation.canGoBack()) navigation.goBack();
     else navigation.dispatch(StackActions.replace("Home"));
   };
 }
 
-export function useWorkspaceBackNavigation(tab: WorkspaceTab) {
-  const navigation = useNavigation();
-  const dispatch = useWorkspaceTabs()?.dispatch;
-  const returnToList = useWorkspaceListNavigation(tab);
-  return () => {
-    if (Platform.OS === "android") {
-      returnToAndroidWorkspaceList(navigation, () => dispatch?.({ type: "select", tab }));
-    } else returnToList();
-  };
-}
-
-export function useAndroidWorkspaceBack(tab: WorkspaceTab) {
-  const dispatch = useWorkspaceTabs()?.dispatch;
-  const goBack = useWorkspaceBackNavigation(tab);
+export function useAndroidWorkspaceBack() {
+  const goBack = useWorkspaceBackNavigation();
   useFocusEffect(
     useCallback(() => {
       if (Platform.OS !== "android") return;
-      dispatch?.({ type: "select", tab });
       const subscription = BackHandler.addEventListener("hardwareBackPress", () => {
         if (Keyboard.isVisible()) Keyboard.dismiss();
         else goBack();
         return true;
       });
       return () => subscription.remove();
-    }, [goBack, dispatch, tab]),
+    }, [goBack]),
   );
   return goBack;
 }
diff --git a/apps/mobile/src/features/layout/workspace/workspace-tabs-state.test.ts b/apps/mobile/src/features/layout/workspace/workspace-tabs-state.test.ts
index f1c839630eb3..797da115a20e 100644
--- a/apps/mobile/src/features/layout/workspace/workspace-tabs-state.test.ts
+++ b/apps/mobile/src/features/layout/workspace/workspace-tabs-state.test.ts
@@ -11,6 +11,8 @@ import {
   workspaceSearchBottomClearance,
   workspaceDockBottomClearance,
   workspaceUsesColumns,
+  type WorkspaceTab,
+  type WorkspaceTabsState,
 } from "./workspace-tabs-state";
 
 describe("compact list clearance", () => {
@@ -179,12 +181,25 @@ describe("workspace root navigation", () => {
   });
 });
 
-const mocks = vi.hoisted(() => ({ split: false, floating: false }));
+const mocks = vi.hoisted(() => ({
+  split: false,
+  floating: false,
+  state: undefined as WorkspaceTabsState | undefined,
+  openWorkspaceTab: (_tab: string) => {},
+  backListeners: new Set<() => boolean>(),
+}));
 
 vi.mock("../../settings/appearance/AppearancePreferencesProvider", () => ({
   useAndroidFloatingTabs: () => mocks.floating,
 }));
 vi.mock("react-native", () => ({
+  BackHandler: {
+    addEventListener: (_event: string, listener: () => boolean) => {
+      mocks.backListeners.add(listener);
+      return { remove: () => mocks.backListeners.delete(listener) };
+    },
+  },
+  Keyboard: { dismiss: () => undefined },
   useWindowDimensions: () => ({ width: 400, height: 800 }),
   View: ({ children }: { children: ReactNode }) => createElement("div", null, children),
 }));
@@ -198,12 +213,16 @@ vi.mock("../AdaptiveWorkspaceLayout", () => ({
     startNewTask: () => undefined,
   }),
 }));
+vi.mock("@react-navigation/native", () => ({ useIsFocused: () => true }));
+vi.mock("../adaptive-workspace-context", () => ({
+  useAdaptiveWorkspaceLayout: () => ({ openWorkspaceTab: mocks.openWorkspaceTab }),
+}));
 vi.mock("./navigation-tabs", () => ({
   useEnabledNavigationTabs: () => ["threads", "pullRequests", "usage"],
 }));
 vi.mock("./WorkspaceTabsContext", () => ({
   WorkspaceTabsContext: createContext(null),
-  useWorkspaceTabs: () => ({ state: { selectedTab: "usage" } }),
+  useWorkspaceTabs: () => ({ state: mocks.state, dispatch: () => undefined }),
 }));
 vi.mock("./WorkspaceExtraTab", () => ({
   WorkspaceExtraTab: function UsageProbe() {
@@ -238,13 +257,37 @@ vi.mock("../../../components/ui/WorkspaceAppBar.android", () => ({
   WorkspaceAppBarScope: ({ children }: { children: ReactNode }) => children,
 }));
 
-function setup(split: boolean, floating: boolean) {
+function setup(split: boolean, floating: boolean, state = selected("usage")) {
   mocks.split = split;
   mocks.floating = floating;
+  mocks.state = state;
+  mocks.openWorkspaceTab = () => undefined;
+  mocks.backListeners.clear();
   vi.stubGlobal("IS_REACT_ACT_ENVIRONMENT", true);
   return { [Symbol.dispose]: () => vi.unstubAllGlobals() };
 }
 
+function selected(tab: WorkspaceTab) {
+  return workspaceTabsReducer(initialWorkspaceTabsState(), { type: "select", tab });
+}
+
+/** Android calls the newest listener first and stops at the first that handles Back. */
+function pressBack() {
+  return [...mocks.backListeners].reverse().some((listener) => listener());
+}
+
+it("Back from the Pulls tab returns to Threads instead of leaving the app", async () => {
+  using _actEnvironment = setup(false, false, selected("pullRequests"));
+  const opened: string[] = [];
+  mocks.openWorkspaceTab = (tab) => opened.push(tab);
+  const root = createRoot(document.createElement("div"));
+  using _root = { [Symbol.dispose]: () => act(() => root.unmount()) };
+  await act(async () => root.render(createElement(WorkspaceRootScreen)));
+
+  expect(pressBack()).toBe(true);
+  expect(opened).toEqual(["threads"]);
+});
+
 it.each([
   [false, false],
   [true, false],
diff --git a/apps/mobile/src/features/layout/workspace/workspace-tabs-state.ts b/apps/mobile/src/features/layout/workspace/workspace-tabs-state.ts
index 3598894115dc..3f6754c679c5 100644
--- a/apps/mobile/src/features/layout/workspace/workspace-tabs-state.ts
+++ b/apps/mobile/src/features/layout/workspace/workspace-tabs-state.ts
@@ -38,9 +38,16 @@ function emptyTab(): WorkspaceTabState {
   return { query: "", searchMode: "resting", scrollOffset: 0, searchEntryOffset: 0 };
 }
 
-export function initialWorkspaceTabsState(): WorkspaceTabsState {
+/** The list a workspace page belongs to. */
+export function workspaceTabOf(routeName: string | undefined): WorkspaceTab {
+  return routeName === "PullRequest" ? "pullRequests" : "threads";
+}
+
+export function initialWorkspaceTabsState(
+  selectedTab: WorkspaceTab = "threads",
+): WorkspaceTabsState {
   return {
-    selectedTab: "threads",
+    selectedTab,
     selectionRevision: 0,
     tabs: {
       threads: emptyTab(),
diff --git a/apps/mobile/src/features/pull-requests/PullRequestReviewSheet.tsx b/apps/mobile/src/features/pull-requests/PullRequestReviewSheet.tsx
index ab121d0c41e7..f495e39cbd26 100644
--- a/apps/mobile/src/features/pull-requests/PullRequestReviewSheet.tsx
+++ b/apps/mobile/src/features/pull-requests/PullRequestReviewSheet.tsx
@@ -6,7 +6,7 @@ import { settlePromise, squashAtomCommandFailure } from "@t3tools/client-runtime
 import type { PullRequestReviewVerdict } from "@t3tools/contracts";
 import { useRef, useState } from "react";
 import { useFocusEffect } from "@react-navigation/native";
-import { Platform, Pressable, View } from "react-native";
+import { Pressable, View } from "react-native";
 import { clearSubmittedReview } from "./pullRequestReviewDrafts";
 import { usePullRequestReviewDraft } from "./usePullRequestReviewDraft";
 import { reviewPositionLabel } from "./pullRequestDiffComments";
@@ -158,7 +158,7 @@ export function PullRequestReviewSheet({
                 : "Post comment"
           }
           fullWidth
-          tone={Platform.OS === "android" ? "primary" : "contrast"}
+          tone="contrast"
           loading={submission.busy}
           disabled={!canSubmit || result.isPending || result.error !== null}
           onPress={() => void perform()}
diff --git a/apps/mobile/src/features/pull-requests/PullRequestRouteScreen.tsx b/apps/mobile/src/features/pull-requests/PullRequestRouteScreen.tsx
index f68236379203..f3c47e258285 100644
--- a/apps/mobile/src/features/pull-requests/PullRequestRouteScreen.tsx
+++ b/apps/mobile/src/features/pull-requests/PullRequestRouteScreen.tsx
@@ -61,7 +61,8 @@ import { PullRequestOverviewLoading } from "./PullRequestOverviewLoading";
 import { copyPullRequestLink, sharePullRequestLink } from "./pullRequestLink";
 import { pullRequestStatus } from "./pullRequestStatus";
 import { use, useEffect, useEffectEvent, useMemo, useRef, useState } from "react";
-import { Linking, Platform, Pressable, RefreshControl, StyleSheet, View } from "react-native";
+import { Linking, Platform, Pressable, StyleSheet, View } from "react-native";
+import { RefreshControl } from "../../components/ui/RefreshControl";
 import { NativeScrollView } from "../../native/NativeScrollViewMarker";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 
@@ -358,7 +359,7 @@ function usePullRequestToolbarHeight(bottomInset: number) {
 }
 
 export function PullRequestRouteScreen({ route }: StaticScreenProps<PullRequestParams>) {
-  const returnToList = useAndroidWorkspaceBack("pullRequests");
+  const returnToList = useAndroidWorkspaceBack();
   const { layout } = useAdaptiveWorkspaceLayout();
   const navigation = useNavigation();
   const insets = useSafeAreaInsets();
diff --git a/apps/mobile/src/features/pull-requests/PullRequestSearchSheet.tsx b/apps/mobile/src/features/pull-requests/PullRequestSearchSheet.tsx
index d51b88258c29..691a3ebcc828 100644
--- a/apps/mobile/src/features/pull-requests/PullRequestSearchSheet.tsx
+++ b/apps/mobile/src/features/pull-requests/PullRequestSearchSheet.tsx
@@ -1,11 +1,10 @@
 import { useNavigation } from "@react-navigation/native";
 import type { ReactNode } from "react";
-import { Platform, View } from "react-native";
-import { useSafeAreaInsets } from "react-native-safe-area-context";
+import { View } from "react-native";
 
 import { AppBar } from "../../components/ui/AppBar";
-import { useNativeMailSearchToolbar } from "../../native/use-native-mail-search-toolbar";
-import { NATIVE_MAIL_SEARCH_TOOLBAR_CONTENT_INSET } from "../layout/native-mail-search-toolbar";
+import type { AppBarSearch } from "../../components/ui/AppBar.types";
+import { useSearchToolbarInset, useUnadjustedBottomInset } from "../../components/ui/useBarInset";
 
 /** A searchable picker over a pull request list or a pull request. */
 export function PullRequestSearchSheet(props: {
@@ -19,9 +18,17 @@ export function PullRequestSearchSheet(props: {
   readonly children: (list: { readonly paddingBottom: number }) => ReactNode;
 }) {
   const navigation = useNavigation();
+  const search: AppBarSearch = {
+    mode: "inline",
+    compactToolbar: true,
+    value: props.query,
+    onChangeText: props.onQueryChange,
+    placeholder: props.placeholder,
+    clearAccessibilityLabel: props.clearAccessibilityLabel,
+  };
   // The compact search toolbar floats over the end of the list.
-  const bottomSearch = useNativeMailSearchToolbar();
-  const insets = useSafeAreaInsets();
+  const searchToolbarInset = useSearchToolbarInset(search);
+  const bottomInset = useUnadjustedBottomInset();
   return (
     <View className="flex-1 bg-sheet" collapsable={false}>
       <AppBar
@@ -29,23 +36,11 @@ export function PullRequestSearchSheet(props: {
         onClose={() => navigation.goBack()}
         closeAccessibilityLabel={props.closeAccessibilityLabel}
         hideBottomBorder
-        search={{
-          mode: "inline",
-          compactToolbar: true,
-          value: props.query,
-          onChangeText: props.onQueryChange,
-          placeholder: props.placeholder,
-          clearAccessibilityLabel: props.clearAccessibilityLabel,
-        }}
+        search={search}
       />
       {props.children({
         // Android's bottom inset also covers the floating workspace tabs while Settings is open.
-        paddingBottom:
-          Platform.OS === "android"
-            ? insets.bottom + 16
-            : bottomSearch
-              ? NATIVE_MAIL_SEARCH_TOOLBAR_CONTENT_INSET + 16
-              : 16,
+        paddingBottom: bottomInset + searchToolbarInset + 16,
       })}
     </View>
   );
diff --git a/apps/mobile/src/features/pull-requests/PullRequestSheetContent.tsx b/apps/mobile/src/features/pull-requests/PullRequestSheetContent.tsx
index ec3352b40ea3..f60a13bd9dea 100644
--- a/apps/mobile/src/features/pull-requests/PullRequestSheetContent.tsx
+++ b/apps/mobile/src/features/pull-requests/PullRequestSheetContent.tsx
@@ -1,10 +1,8 @@
 import { SheetHeader } from "../../components/ui/SheetHeader";
 import { useNavigation } from "@react-navigation/native";
 import type { ReactNode } from "react";
-import { Platform, ScrollView, useWindowDimensions, View } from "react-native";
-import { KeyboardAvoidingView } from "react-native-keyboard-controller";
-import { useSafeAreaInsets } from "react-native-safe-area-context";
-import { ScreenContent } from "../../components/ui/ScreenContent";
+import { View } from "react-native";
+import { FitSheet } from "../../components/ui/FitSheet";
 
 export function PullRequestSheetContent(props: {
   readonly title: string;
@@ -14,49 +12,24 @@ export function PullRequestSheetContent(props: {
   readonly footer?: ReactNode;
 }) {
   const navigation = useNavigation();
-  const insets = useSafeAreaInsets();
-  const { height: windowHeight } = useWindowDimensions();
-  const android = Platform.OS === "android";
-  const footer = props.footer ? (
-    <View
-      className={android ? "bg-sheet-solid pt-3" : "bg-sheet px-4 pt-3"}
-      style={{ paddingBottom: Math.max(insets.bottom, 16) }}
-    >
-      {android ? <View style={{ minHeight: 48 }}>{props.footer}</View> : props.footer}
-    </View>
-  ) : null;
   return (
-    // Material sheet drags follow the first nested-scrolling native view, and the inline
-    // header's Compose button is one, so Android renders content first and reverses the column.
-    <KeyboardAvoidingView
-      automaticOffset
-      behavior="padding"
-      collapsable={false}
-      className="bg-sheet ios:flex-1 android:flex-col-reverse"
-      style={android ? { maxHeight: windowHeight * 0.92 } : undefined}
+    <FitSheet
+      avoidsKeyboard
+      header={
+        <SheetHeader
+          title={props.title}
+          subtitle={props.subtitle}
+          onCancel={() => navigation.goBack()}
+          dismissDisabled={props.busy}
+        />
+      }
+      footer={props.footer}
+      keyboardShouldPersistTaps="handled"
+      contentContainerStyle={{ paddingHorizontal: 16, paddingTop: 16, paddingBottom: 20 }}
     >
-      <ScreenContent fitToContents={android}>
-        <ScrollView
-          nestedScrollEnabled
-          className="android:shrink android:grow-0 ios:flex-1"
-          contentInsetAdjustmentBehavior="automatic"
-          keyboardShouldPersistTaps="handled"
-          contentContainerStyle={{ paddingHorizontal: 16, paddingTop: 16, paddingBottom: 20 }}
-        >
-          <View className="gap-4" pointerEvents={props.busy ? "none" : "auto"}>
-            {props.children}
-            {/* Android partial-height sheets keep submit actions within the scrollable form. */}
-            {android ? footer : null}
-          </View>
-        </ScrollView>
-        {android ? null : footer}
-      </ScreenContent>
-      <SheetHeader
-        title={props.title}
-        subtitle={props.subtitle}
-        onCancel={() => navigation.goBack()}
-        dismissDisabled={props.busy}
-      />
-    </KeyboardAvoidingView>
+      <View className="gap-4" pointerEvents={props.busy ? "none" : "auto"}>
+        {props.children}
+      </View>
+    </FitSheet>
   );
 }
diff --git a/apps/mobile/src/features/pull-requests/PullRequestStackCard.tsx b/apps/mobile/src/features/pull-requests/PullRequestStackCard.tsx
index 0b2637b7c6b6..6e69e267e3fe 100644
--- a/apps/mobile/src/features/pull-requests/PullRequestStackCard.tsx
+++ b/apps/mobile/src/features/pull-requests/PullRequestStackCard.tsx
@@ -1,6 +1,6 @@
+import { StackActions, useNavigation } from "@react-navigation/native";
 import { useState } from "react";
 import { View } from "react-native";
-import { useOpenWorkspaceDetail } from "../layout/useOpenWorkspaceDetail";
 import { AppText as Text } from "../../components/ui/AppText";
 import { PullRequestCardGroup, PullRequestCardRow } from "./PullRequestControls";
 import { pullRequestLayerParams } from "./pullRequestStack";
@@ -14,7 +14,7 @@ export function PullRequestStackCard(props: {
   readonly params: PullRequestParams;
   readonly state: PullRequestStackState;
 }) {
-  const openDetail = useOpenWorkspaceDetail();
+  const navigation = useNavigation();
   const [expanded, setExpanded] = useState(false);
   const stack = props.state.stack;
   if (!stack) {
@@ -66,12 +66,14 @@ export function PullRequestStackCard(props: {
                     selected
                       ? undefined
                       : () =>
-                          openDetail({
-                            name: "PullRequest",
-                            params: withKnownPullRequestSummary(
-                              pullRequestLayerParams(props.params, layer.number),
+                          navigation.dispatch(
+                            StackActions.push(
+                              "PullRequest",
+                              withKnownPullRequestSummary(
+                                pullRequestLayerParams(props.params, layer.number),
+                              ),
                             ),
-                          })
+                          )
                   }
                   last={index === stack.layers.length - 1}
                 />
diff --git a/apps/mobile/src/features/pull-requests/PullRequestsScreen.tsx b/apps/mobile/src/features/pull-requests/PullRequestsScreen.tsx
index 4a4dec4e7a6b..d0672f064064 100644
--- a/apps/mobile/src/features/pull-requests/PullRequestsScreen.tsx
+++ b/apps/mobile/src/features/pull-requests/PullRequestsScreen.tsx
@@ -9,7 +9,8 @@ import { LegendList, type LegendListRef } from "@legendapp/list/react-native";
 import { useNavigation } from "@react-navigation/native";
 import { use, useMemo, useRef, useState, type ReactNode } from "react";
 import { useAtomValue } from "@effect/atom-react";
-import { Keyboard, Platform, Pressable, RefreshControl, View } from "react-native";
+import { Keyboard, Platform, Pressable, View } from "react-native";
+import { RefreshControl } from "../../components/ui/RefreshControl";
 import { NativeScrollView } from "../../native/NativeScrollViewMarker";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 
diff --git a/apps/mobile/src/features/pull-requests/pullRequestActions.ts b/apps/mobile/src/features/pull-requests/pullRequestActions.ts
index e6c04f192b41..132501b60a24 100644
--- a/apps/mobile/src/features/pull-requests/pullRequestActions.ts
+++ b/apps/mobile/src/features/pull-requests/pullRequestActions.ts
@@ -33,6 +33,10 @@ export const MERGE_METHODS = {
     description: "Keep the commits and add a merge commit.",
   },
   rebase: { title: "Rebase and merge", description: "Add the commits without a merge commit." },
+  "fast-forward": {
+    title: "Fast-forward merge",
+    description: "Add the commits as they are. Needs the branch to contain the base.",
+  },
 } as const satisfies Record<PullRequestMergeMethod, { title: string; description: string }>;
 
 export function pullRequestActionLabel(
diff --git a/apps/mobile/src/features/pull-requests/usePullRequestThreads.ts b/apps/mobile/src/features/pull-requests/usePullRequestThreads.ts
index 85a77a254967..d79682f94488 100644
--- a/apps/mobile/src/features/pull-requests/usePullRequestThreads.ts
+++ b/apps/mobile/src/features/pull-requests/usePullRequestThreads.ts
@@ -3,7 +3,12 @@ import { visibleLinkedThreads } from "@t3tools/client-runtime/state/threads";
 import { AsyncResult } from "effect/reactivity";
 import { settlePromise, squashAtomCommandFailure } from "@t3tools/client-runtime/state/runtime";
 import * as Dialog from "../../components/ui/Dialog";
-import { useNavigationState, useRoute } from "@react-navigation/native";
+import {
+  StackActions,
+  useNavigation,
+  useNavigationState,
+  useRoute,
+} from "@react-navigation/native";
 import { threadPullRequestLinkMode } from "@t3tools/client-runtime/thread-pull-request-compatibility";
 import {
   AuthOrchestrationOperateScope,
@@ -16,7 +21,6 @@ import { formatComposerContextReference } from "@t3tools/shared/composerContextR
 import { sourceControlClients } from "@t3tools/client-runtime/source-control-clients";
 import { normalizeThreadPullRequestKey } from "@t3tools/client-runtime/thread-pull-requests";
 import { useRef, useState } from "react";
-import { useOpenWorkspaceDetail } from "../layout/useOpenWorkspaceDetail";
 import { pullRequestComposerContext } from "../../lib/composerContext";
 import { scopedThreadKey } from "../../lib/scopedEntities";
 import { uuidv4 } from "../../lib/uuid";
@@ -82,14 +86,15 @@ export function usePullRequestThreads(
   const canOperate = useEnvironmentScope(target.environmentId, AuthOrchestrationOperateScope);
   const canAsk = !connected || canOperate;
   const canCheckout = useEnvironmentScope(target.environmentId, AuthSourceControlWriteScope);
-  const openDetail = useOpenWorkspaceDetail();
+  const navigation = useNavigation();
   const pending = useRef(false);
   const previousPrompts = useRef(new Map<string, string>());
   const openThread = (thread: LinkedThread) => {
     openThreadRoute({ environmentId: params.environmentId, threadId: thread.id });
   };
-  const openThreadRoute = (destination: ReactNavigation.RootParamList["Thread"]) =>
-    openDetail({ name: "Thread", params: destination });
+  const openThreadRoute = (destination: ReactNavigation.RootParamList["Thread"]) => {
+    navigation.dispatch(StackActions.push("Thread", destination));
+  };
   const [busy, setBusy] = useState(false);
   const ask = async (thread?: LinkedThread, task: PullRequestAgentTask = "ask") => {
     if (!pr || !canAsk || pending.current) return;
diff --git a/apps/mobile/src/features/review/ReviewCommentComposerSheet.tsx b/apps/mobile/src/features/review/ReviewCommentComposerSheet.tsx
index d5fa085eb18f..f2164bf49f99 100644
--- a/apps/mobile/src/features/review/ReviewCommentComposerSheet.tsx
+++ b/apps/mobile/src/features/review/ReviewCommentComposerSheet.tsx
@@ -2,12 +2,12 @@ import { useNavigation, type StaticScreenProps } from "@react-navigation/native"
 import { TextInputWrapper } from "expo-paste-input";
 import type { EnvironmentId, ThreadId } from "@t3tools/contracts";
 import { useMemo, useState } from "react";
-import { Platform, ScrollView, View, useWindowDimensions } from "react-native";
-import { KeyboardAvoidingView, KeyboardStickyView } from "react-native-keyboard-controller";
-import { useSafeAreaInsets } from "react-native-safe-area-context";
+import { ScrollView, View, useWindowDimensions } from "react-native";
+import * as Dialog from "../../components/ui/Dialog";
 import { FilePreviewModal, type FilePreviewSource } from "../../components/ui/FilePreviewModal";
 
 import { AppText as Text, AppTextInput as TextInput } from "../../components/ui/AppText";
+import { KeyboardSheetBody } from "../../components/ui/KeyboardSheetBody";
 import { SheetHeader } from "../../components/ui/SheetHeader";
 import { ComposerAttachmentStrip } from "../../components/ComposerAttachmentStrip";
 import { ControlPill } from "../../components/ui/ControlPill";
@@ -39,9 +39,7 @@ type ReviewCommentComposerSheetProps = StaticScreenProps<{
 }>;
 
 export function ReviewCommentComposerSheet(props: ReviewCommentComposerSheetProps) {
-  const isAndroid = Platform.OS === "android";
   const navigation = useNavigation();
-  const insets = useSafeAreaInsets();
   const { width } = useWindowDimensions();
   const { themeAppearance: selectedTheme } = useAppearancePreferences();
   const target = useReviewCommentTarget();
@@ -89,13 +87,14 @@ export function ReviewCommentComposerSheet(props: ReviewCommentComposerSheetProp
   const handleNativePaste = useNativePaste((uris) => {
     void (async () => {
       try {
-        const images = await convertPastedImagesToAttachments({
+        const result = await convertPastedImagesToAttachments({
           uris,
           existingCount: attachments.length,
         });
-        if (images.length > 0) {
-          setAttachments((current) => [...current, ...images]);
+        if (result.attachments.length > 0) {
+          setAttachments((current) => [...current, ...result.attachments]);
         }
+        if (result.error) Dialog.alert("Could not paste image", result.error);
       } catch (error) {
         console.error("[review comment] error converting pasted images", error);
       }
@@ -130,167 +129,136 @@ export function ReviewCommentComposerSheet(props: ReviewCommentComposerSheetProp
   return (
     <View className="flex-1 bg-sheet">
       <SheetHeader title="Add Comment" onClose={dismissComposer} />
-      <KeyboardAvoidingView automaticOffset behavior="padding" className="flex-1">
-        <View
-          className="flex-1 px-5"
-          style={{
-            paddingTop: 8,
-            paddingBottom: target ? (isAndroid ? 72 : 0) : Math.max(insets.bottom, 18),
-          }}
-        >
-          {!target ? (
-            <View className="rounded-[22px] border border-border bg-card px-4 py-5">
-              <Text className="text-base font-t3-bold text-foreground">No selection</Text>
-              <Text className="mt-1 text-sm leading-normal text-foreground-muted">
-                Select a diff line or range first.
+      <KeyboardSheetBody
+        toolbar={
+          target ? (
+            <>
+              <ControlPill
+                accessibilityLabel="Add image"
+                icon="plus"
+                onPress={() => void handlePickImages()}
+              />
+              <View className="flex-1" />
+              <ControlPill
+                accessibilityLabel="Comment"
+                icon="arrow.up"
+                label="Comment"
+                variant="primary"
+                disabled={!canSubmit}
+                onPress={handleSubmit}
+              />
+            </>
+          ) : undefined
+        }
+      >
+        {!target ? (
+          <View className="rounded-[22px] border border-border bg-card px-4 py-5">
+            <Text className="text-base font-t3-bold text-foreground">No selection</Text>
+            <Text className="mt-1 text-sm leading-normal text-foreground-muted">
+              Select a diff line or range first.
+            </Text>
+          </View>
+        ) : (
+          <View className="min-h-0 flex-1 gap-4">
+            <View className="gap-1 px-1">
+              <Text className="text-2xs font-t3-bold uppercase text-foreground-muted">
+                {selectionLabel}
+              </Text>
+              <Text
+                className="font-mono text-xs leading-snug text-foreground-muted"
+                ellipsizeMode="middle"
+                numberOfLines={2}
+              >
+                {target.filePath}
               </Text>
             </View>
-          ) : (
-            <View className="min-h-0 flex-1 gap-4">
-              <View className="gap-1 px-1">
-                <Text className="text-2xs font-t3-bold uppercase text-foreground-muted">
-                  {selectionLabel}
-                </Text>
-                <Text
-                  className="font-mono text-xs leading-snug text-foreground-muted"
-                  ellipsizeMode="middle"
-                  numberOfLines={2}
-                >
-                  {target.filePath}
-                </Text>
-              </View>
 
-              <View className="overflow-hidden rounded-[22px] border border-border bg-card">
+            <View className="overflow-hidden rounded-[22px] border border-border bg-card">
+              <ScrollView
+                horizontal
+                bounces={false}
+                keyboardShouldPersistTaps="always"
+                showsHorizontalScrollIndicator={false}
+              >
                 <ScrollView
-                  horizontal
                   bounces={false}
+                  scrollEnabled={selectedLines.length > REVIEW_COMMENT_PREVIEW_MAX_LINES}
+                  nestedScrollEnabled
                   keyboardShouldPersistTaps="always"
-                  showsHorizontalScrollIndicator={false}
+                  showsVerticalScrollIndicator={
+                    selectedLines.length > REVIEW_COMMENT_PREVIEW_MAX_LINES
+                  }
+                  style={{ height: previewHeight }}
                 >
-                  <ScrollView
-                    bounces={false}
-                    scrollEnabled={selectedLines.length > REVIEW_COMMENT_PREVIEW_MAX_LINES}
-                    nestedScrollEnabled
-                    keyboardShouldPersistTaps="always"
-                    showsVerticalScrollIndicator={
-                      selectedLines.length > REVIEW_COMMENT_PREVIEW_MAX_LINES
-                    }
-                    style={{ height: previewHeight }}
-                  >
-                    <View style={{ minWidth: previewViewportWidth }}>
-                      {selectedLines.map((line) => {
-                        const lineNumber = getReviewUnifiedLineNumber(line);
+                  <View style={{ minWidth: previewViewportWidth }}>
+                    {selectedLines.map((line) => {
+                      const lineNumber = getReviewUnifiedLineNumber(line);
 
-                        return (
-                          <View
-                            key={line.id}
-                            className={cn("flex-row items-start", changeTone(line.change))}
-                            style={{ height: codeSurface.rowHeight }}
-                          >
-                            <ReviewChangeBar change={line.change} height={codeSurface.rowHeight} />
-                            <Text className="w-9 py-1 pr-1 text-right text-2xs font-mono text-foreground-muted">
-                              {lineNumber ?? ""}
-                            </Text>
-                            <View className="min-w-0 flex-1 shrink-0 px-1 py-1">
-                              <DiffTokenText
-                                fallback={line.content}
-                                tokens={highlightedLinesById[line.id] ?? null}
-                                change={line.change}
-                                fontSize={codeSurface.fontSize}
-                                lineHeight={codeSurface.rowHeight}
-                              />
-                            </View>
+                      return (
+                        <View
+                          key={line.id}
+                          className={cn("flex-row items-start", changeTone(line.change))}
+                          style={{ height: codeSurface.rowHeight }}
+                        >
+                          <ReviewChangeBar change={line.change} height={codeSurface.rowHeight} />
+                          <Text className="w-9 py-1 pr-1 text-right text-2xs font-mono text-foreground-muted">
+                            {lineNumber ?? ""}
+                          </Text>
+                          <View className="min-w-0 flex-1 shrink-0 px-1 py-1">
+                            <DiffTokenText
+                              fallback={line.content}
+                              tokens={highlightedLinesById[line.id] ?? null}
+                              change={line.change}
+                              fontSize={codeSurface.fontSize}
+                              lineHeight={codeSurface.rowHeight}
+                            />
                           </View>
-                        );
-                      })}
-                    </View>
-                  </ScrollView>
+                        </View>
+                      );
+                    })}
+                  </View>
                 </ScrollView>
-              </View>
+              </ScrollView>
+            </View>
 
-              <View className="min-h-0 flex-1 gap-2">
-                <Text className="text-sm font-t3-bold text-foreground">Comment</Text>
-                <View className="min-h-[132px] flex-1 overflow-hidden rounded-[20px] border border-border bg-card">
-                  <View className="min-h-0 flex-1 px-4 pt-3.5">
-                    <TextInputWrapper onPaste={handleNativePaste} style={{ flex: 1, minHeight: 0 }}>
-                      <TextInput
-                        autoFocus
-                        multiline
-                        scrollEnabled
-                        placeholder="Leave a comment..."
-                        textAlignVertical="top"
-                        value={commentText}
-                        onChangeText={setCommentText}
-                        className="h-full min-h-0 flex-1 border-0 bg-transparent px-0 py-0 font-sans text-base"
-                      />
-                    </TextInputWrapper>
-                  </View>
-                  {attachments.length > 0 ? (
-                    <View className="px-4 pb-3 pt-2">
-                      <ComposerAttachmentStrip
-                        attachments={attachments}
-                        imageBorderRadius={16}
-                        imageSize={60}
-                        onPressPreview={setPreviewFile}
-                        removeButtonPlacement="gutter"
-                        onRemove={(imageId) => {
-                          setAttachments((current) =>
-                            current.filter((image) => image.id !== imageId),
-                          );
-                        }}
-                      />
-                    </View>
-                  ) : null}
+            <View className="min-h-0 flex-1 gap-2">
+              <Text className="text-sm font-t3-bold text-foreground">Comment</Text>
+              <View className="min-h-[132px] flex-1 overflow-hidden rounded-[20px] border border-border bg-card">
+                <View className="min-h-0 flex-1 px-4 pt-3.5">
+                  <TextInputWrapper onPaste={handleNativePaste} style={{ flex: 1, minHeight: 0 }}>
+                    <TextInput
+                      autoFocus
+                      multiline
+                      scrollEnabled
+                      placeholder="Leave a comment..."
+                      textAlignVertical="top"
+                      value={commentText}
+                      onChangeText={setCommentText}
+                      className="h-full min-h-0 flex-1 border-0 bg-transparent px-0 py-0 font-sans text-base"
+                    />
+                  </TextInputWrapper>
                 </View>
+                {attachments.length > 0 ? (
+                  <View className="px-4 pb-3 pt-2">
+                    <ComposerAttachmentStrip
+                      attachments={attachments}
+                      imageBorderRadius={16}
+                      imageSize={60}
+                      onPressPreview={setPreviewFile}
+                      removeButtonPlacement="gutter"
+                      onRemove={(imageId) => {
+                        setAttachments((current) =>
+                          current.filter((image) => image.id !== imageId),
+                        );
+                      }}
+                    />
+                  </View>
+                ) : null}
               </View>
             </View>
-          )}
-        </View>
-        {!isAndroid && target ? (
-          <View className="flex-row items-center gap-3 bg-sheet px-5 py-2">
-            <ControlPill
-              accessibilityLabel="Add image"
-              icon="plus"
-              onPress={() => void handlePickImages()}
-            />
-            <View className="flex-1" />
-            <ControlPill
-              accessibilityLabel="Comment"
-              icon="arrow.up"
-              label="Comment"
-              variant="primary"
-              disabled={!canSubmit}
-              onPress={handleSubmit}
-            />
-          </View>
-        ) : null}
-      </KeyboardAvoidingView>
-      {isAndroid && target ? (
-        <KeyboardStickyView
-          className="absolute inset-x-0 bottom-0"
-          offset={{ closed: 0, opened: 0 }}
-        >
-          <View
-            className="flex-row items-center gap-3 border-t border-border bg-sheet px-5 pt-2"
-            style={{ paddingBottom: Math.max(insets.bottom, 10) }}
-          >
-            <ControlPill
-              accessibilityLabel="Add image"
-              icon="plus"
-              onPress={() => void handlePickImages()}
-            />
-            <View className="flex-1" />
-            <ControlPill
-              accessibilityLabel="Comment"
-              icon="arrow.up"
-              label="Comment"
-              variant="primary"
-              disabled={!canSubmit}
-              onPress={handleSubmit}
-            />
           </View>
-        </KeyboardStickyView>
-      ) : null}
+        )}
+      </KeyboardSheetBody>
       <FilePreviewModal source={previewFile} onRequestClose={() => setPreviewFile(null)} />
     </View>
   );
diff --git a/apps/mobile/src/features/review/ReviewSheet.tsx b/apps/mobile/src/features/review/ReviewSheet.tsx
index 2673865359f0..21bf033b761b 100644
--- a/apps/mobile/src/features/review/ReviewSheet.tsx
+++ b/apps/mobile/src/features/review/ReviewSheet.tsx
@@ -4,31 +4,28 @@ import type { EnvironmentId, ThreadId } from "@t3tools/contracts";
 import { formatDiffCount } from "@t3tools/client-runtime/diff-count";
 import { LegendList } from "@legendapp/list/react-native";
 import { useNavigation, type StaticScreenProps } from "@react-navigation/native";
-import { AppActivityIndicator } from "../../components/ui/AppActivityIndicator";
 import { AppBar } from "../../components/ui/AppBar";
 import type { AppBarMenuItem } from "../../components/ui/AppBar.types";
 import type { ReviewSectionItem } from "./reviewModel";
 import { useReviewHeaderPresentation } from "./useReviewHeaderPresentation";
 import { type Ref, type ReactElement, useImperativeHandle, useRef, useState } from "react";
-import {
-  Platform,
-  Pressable,
-  RefreshControl,
-  ScrollView,
-  type NativeSyntheticEvent,
-  StyleSheet,
-  View,
-} from "react-native";
+import { Pressable, ScrollView, type NativeSyntheticEvent, StyleSheet, View } from "react-native";
+import { RefreshControl } from "../../components/ui/RefreshControl";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { useReduceMotionEnabled } from "../../lib/appState";
-import { useNativeColumnLayoutMetrics } from "../../native/native-layout-metrics";
-import { useContentTopInset } from "../../components/ui/useBarInset";
+import { useContentTopInset, useSheetContentBottomInset } from "../../components/ui/useBarInset";
 import { NativeScrollView } from "../../native/NativeScrollViewMarker";
 
 import { AppText as Text } from "../../components/ui/AppText";
 import { SymbolView } from "../../components/ui/AppSymbol";
+import {
+  ContentBand,
+  ContentStatus,
+  contentStatusContainerStyle,
+} from "../../components/ui/ContentBand";
+import { PaneListItem } from "../../components/ui/PaneListItem";
 import { ScreenContent } from "../../components/ui/ScreenContent";
-import { cn } from "../../lib/cn";
+import { SheetPane } from "../../components/ui/SheetPane";
 import { environmentCatalog } from "../../connection/catalog";
 import { useEnvironmentPresentation } from "../../state/presentation";
 import { useAtomCommand } from "../../state/use-atom-command";
@@ -149,15 +146,10 @@ const SHOWCASE_ENABLED = process.env.EXPO_PUBLIC_SHOWCASE === "1";
 
 const ReviewNotice = function ReviewNotice(props: { readonly notice: string }) {
   return (
-    <View
-      className={cn(
-        "bg-warning px-4 py-3",
-        Platform.OS === "android" ? "m-2 rounded-[20px]" : "border-b border-warning-border",
-      )}
-    >
+    <ContentBand tone="warning">
       <Text className="text-xs font-t3-bold uppercase text-warning-foreground">Partial diff</Text>
       <Text className="text-xs leading-normal text-warning-foreground">{props.notice}</Text>
-    </View>
+    </ContentBand>
   );
 };
 
@@ -242,21 +234,7 @@ const ReviewFileNavigatorRow = function ReviewFileNavigatorRow(props: {
   };
 
   return (
-    <Pressable
-      accessibilityRole="button"
-      accessibilityState={{ selected }}
-      className={
-        Platform.OS === "android"
-          ? cn(
-              "mt-1 min-h-12 justify-center rounded-[20px] px-3 py-2 active:bg-subtle",
-              selected && "bg-subtle-strong",
-            )
-          : selected
-            ? "mt-1 min-h-12 justify-center rounded-xl bg-subtle-strong px-3 py-2"
-            : "mt-1 min-h-12 justify-center rounded-xl px-3 py-2 active:bg-subtle"
-      }
-      onPress={handlePress}
-    >
+    <PaneListItem selected={selected} onPress={handlePress}>
       <Text
         className={
           selected
@@ -275,7 +253,7 @@ const ReviewFileNavigatorRow = function ReviewFileNavigatorRow(props: {
           -{formatDiffCount(file.deletions)}
         </Text>
       </View>
-    </Pressable>
+    </PaneListItem>
   );
 };
 
@@ -334,7 +312,7 @@ function ReviewFileNavigator({ files, sectionId, onSelectFile, ref }: ReviewFile
   );
 
   return (
-    <View className="flex-1 ios:bg-sheet android:bg-header">
+    <SheetPane>
       <AppBar
         title="Changed files"
         subtitle={`${files.length} ${files.length === 1 ? "file" : "files"}`}
@@ -354,7 +332,7 @@ function ReviewFileNavigator({ files, sectionId, onSelectFile, ref }: ReviewFile
           renderItem={renderFile}
         />
       </ScreenContent>
-    </View>
+    </SheetPane>
   );
 }
 
@@ -378,11 +356,8 @@ export function ReviewSheet(props: ReviewSheetProps) {
   const { draftMessage, draftContext } = useThreadDraftForThread({ environmentId, threadId });
   const reviewCache = useReviewCacheForThread({ environmentId, threadId });
   const { selectedThreadCwd } = useSelectedThreadWorktree();
-  const columnMetrics = useNativeColumnLayoutMetrics();
-  const safeArea = columnMetrics?.safeArea ?? insets;
   const topContentInset = useContentTopInset();
-  const bottomContentInset =
-    Platform.OS === "ios" ? safeArea.bottom + 8 : Math.max(insets.bottom, 18) + 18;
+  const bottomContentInset = useSheetContentBottomInset();
 
   const {
     error,
@@ -577,16 +552,10 @@ export function ReviewSheet(props: ReviewSheetProps) {
 
     if (error) {
       children.push(
-        <View
-          key="review-error"
-          className={cn(
-            "bg-card px-4 py-3",
-            Platform.OS === "android" ? "m-2 rounded-[20px]" : "border-b border-border",
-          )}
-        >
+        <ContentBand key="review-error">
           <Text className="text-sm font-t3-bold text-foreground">Review unavailable</Text>
           <Text className="text-xs leading-normal text-foreground-muted">{error}</Text>
-        </View>,
+        </ContentBand>,
       );
     }
 
@@ -636,7 +605,7 @@ export function ReviewSheet(props: ReviewSheetProps) {
       />
 
       <ScreenContent>
-        <View className="flex-1 bg-sheet android:bg-sheet-solid">
+        <View className="flex-1 bg-sheet">
           {showConnectionNotice ? (
             <View className="flex-1" style={{ paddingTop: topContentInset }}>
               <EnvironmentConnectionNotice
@@ -704,8 +673,8 @@ export function ReviewSheet(props: ReviewSheetProps) {
             <ScrollView
               key={fallbackScrollViewKey}
               contentContainerStyle={
-                Platform.OS === "android" && (parsedDiff.kind === "empty" || !selectedSection)
-                  ? { flexGrow: 1, justifyContent: "center" }
+                parsedDiff.kind === "empty" || !selectedSection
+                  ? contentStatusContainerStyle
                   : undefined
               }
               contentInsetAdjustmentBehavior="never"
@@ -726,59 +695,20 @@ export function ReviewSheet(props: ReviewSheetProps) {
               {listHeader}
               {!selectedSection ? (
                 error ? null : (
-                  <View
-                    className={
-                      Platform.OS === "android"
-                        ? "items-center px-6 py-5"
-                        : "border-b border-border bg-card px-4 py-5"
-                    }
-                  >
-                    <Text className="text-sm font-t3-bold text-foreground">No review diffs</Text>
-                    <Text
-                      className={cn(
-                        "text-xs leading-normal text-foreground-muted",
-                        Platform.OS === "android" && "mt-2 text-center",
-                      )}
-                    >
-                      This thread has no ready turn diffs and the worktree diff is empty.
-                    </Text>
-                  </View>
+                  <ContentStatus
+                    title="No review diffs"
+                    detail="This thread has no ready turn diffs and the worktree diff is empty."
+                  />
                 )
               ) : selectedSection.isLoading && selectedSection.diff === null ? (
-                <View
-                  className={cn(
-                    "items-center gap-3 px-4 py-6",
-                    Platform.OS !== "android" && "border-b border-border bg-card",
-                  )}
-                >
-                  <AppActivityIndicator size="small" />
-                  <Text className="text-xs text-foreground-muted">Loading diff…</Text>
-                </View>
+                <ContentStatus loading detail="Loading diff…" />
               ) : parsedDiff.kind === "empty" ? (
-                <View
-                  className={
-                    Platform.OS === "android"
-                      ? "items-center px-6 py-5"
-                      : "border-b border-border bg-card px-4 py-5"
-                  }
-                >
-                  <Text className="text-sm font-t3-bold text-foreground">No changes</Text>
-                  <Text
-                    className={cn(
-                      "text-xs leading-normal text-foreground-muted",
-                      Platform.OS === "android" && "mt-2 text-center",
-                    )}
-                  >
-                    {selectedSection.subtitle ?? "This diff is empty."}
-                  </Text>
-                </View>
+                <ContentStatus
+                  title="No changes"
+                  detail={selectedSection.subtitle ?? "This diff is empty."}
+                />
               ) : parsedDiff.kind === "raw" ? (
-                <View
-                  className={cn(
-                    "gap-3 bg-card px-4 py-4",
-                    Platform.OS === "android" ? "m-2 rounded-[20px]" : "border-b border-border",
-                  )}
-                >
+                <ContentBand spacing="roomy">
                   <Text className="text-xs leading-normal text-foreground-muted">
                     {parsedDiff.reason}
                   </Text>
@@ -787,14 +717,9 @@ export function ReviewSheet(props: ReviewSheetProps) {
                       {parsedDiff.text}
                     </Text>
                   </ScrollView>
-                </View>
+                </ContentBand>
               ) : parsedDiff.kind === "files" ? (
-                <View
-                  className={cn(
-                    "gap-3 bg-card px-4 py-4",
-                    Platform.OS === "android" ? "m-2 rounded-[20px]" : "border-b border-border",
-                  )}
-                >
+                <ContentBand spacing="roomy">
                   <Text className="text-xs leading-normal text-foreground-muted">
                     Native diff view unavailable. Showing the raw patch.
                   </Text>
@@ -803,7 +728,7 @@ export function ReviewSheet(props: ReviewSheetProps) {
                       {selectedSection?.diff ?? ""}
                     </Text>
                   </ScrollView>
-                </View>
+                </ContentBand>
               ) : null}
             </ScrollView>
           )}
diff --git a/apps/mobile/src/features/review/reviewFileVisibility.test.tsx b/apps/mobile/src/features/review/reviewFileVisibility.test.tsx
new file mode 100644
index 000000000000..ac983a81ab1c
--- /dev/null
+++ b/apps/mobile/src/features/review/reviewFileVisibility.test.tsx
@@ -0,0 +1,69 @@
+import { renderToStaticMarkup } from "react-dom/server";
+import { expect, it, vi } from "vite-plus/test";
+
+import { buildReviewParsedDiff, type ReviewRenderableFile } from "./reviewModel";
+import { useReviewFileVisibility } from "./reviewFileVisibility";
+
+const stored = vi.hoisted(() => ({ expanded: undefined as ReadonlyArray<string> | undefined }));
+vi.mock("./reviewState", () => ({
+  updateReviewExpandedFileIds: (
+    _threadKey: string,
+    _sectionId: string,
+    update: (current: ReadonlyArray<string> | undefined) => ReadonlyArray<string> | undefined,
+  ) => {
+    stored.expanded = update(stored.expanded);
+  },
+  updateReviewViewedFileIds: () => {},
+}));
+
+function patch(path: string, line: string) {
+  return `diff --git a/${path} b/${path}\n--- a/${path}\n+++ b/${path}\n@@ -1 +1 @@\n-old\n+${line}\n`;
+}
+
+function files(diff: string): ReadonlyArray<ReviewRenderableFile> {
+  const parsed = buildReviewParsedDiff(diff, "turn:3");
+  if (parsed.kind !== "files") throw new Error("Expected structured diff");
+  return parsed.files;
+}
+
+function visibility(current: ReadonlyArray<ReviewRenderableFile>) {
+  let result: ReturnType<typeof useReviewFileVisibility> | undefined;
+  function Probe({ report }: { report: (value: typeof result) => void }) {
+    report(
+      useReviewFileVisibility({
+        threadKey: "thread",
+        sectionId: "turn:3",
+        files: current,
+        cachedExpandedFileIds: stored.expanded,
+        cachedViewedFileIds: undefined,
+      }),
+    );
+    return null;
+  }
+  renderToStaticMarkup(<Probe report={(value) => (result = value)} />);
+  return result!;
+}
+
+it("keeps files the reader left open expanded when the section's diff changes", () => {
+  stored.expanded = undefined;
+  const before = files(patch("a.ts", "one") + patch("b.ts", "two"));
+  visibility(before).toggleExpandedFile(before[0]!.id);
+  expect(visibility(before).collapsedFileIds).toEqual([before[0]!.id]);
+
+  const after = files(patch("a.ts", "changed") + patch("b.ts", "two"));
+  const collapsedPaths = visibility(after).collapsedFileIds.map(
+    (id) => after.find((file) => file.id === id)!.path,
+  );
+  expect(collapsedPaths).not.toContain("b.ts");
+});
+
+it("folds only the selected entry when a file becomes a symlink", () => {
+  stored.expanded = undefined;
+  const current = files(
+    "diff --git a/a.ts b/a.ts\ndeleted file mode 100644\n--- a/a.ts\n+++ /dev/null\n@@ -1 +0,0 @@\n-old\n" +
+      "diff --git a/a.ts b/a.ts\nnew file mode 120000\n--- /dev/null\n+++ b/a.ts\n@@ -0,0 +1 @@\n+b.ts\n\\ No newline at end of file\n",
+  );
+  expect(current).toHaveLength(2);
+  visibility(current).toggleExpandedFile(current[0]!.id);
+  expect(visibility(current).collapsedFileIds).toEqual([current[0]!.id]);
+});
diff --git a/apps/mobile/src/features/review/reviewFileVisibility.ts b/apps/mobile/src/features/review/reviewFileVisibility.ts
index 5d01de5700ed..7e1379d2b5ff 100644
--- a/apps/mobile/src/features/review/reviewFileVisibility.ts
+++ b/apps/mobile/src/features/review/reviewFileVisibility.ts
@@ -3,10 +3,25 @@ import { useCallback, useMemo } from "react";
 import { updateReviewExpandedFileIds, updateReviewViewedFileIds } from "./reviewState";
 import type { ReviewRenderableFile } from "./reviewModel";
 
-function getDefaultReviewExpandedFileIds(
+// File ids are scoped to one diff text, so a refresh renames every file. Expansion is
+// stored by path, which survives a refresh; the occurrence index keeps apart entries
+// that share a path, such as the deletion and addition when a file becomes a symlink.
+function getReviewFileExpansionKeys(
   files: ReadonlyArray<ReviewRenderableFile>,
 ): ReadonlyArray<string> {
-  return files.map((file) => file.id);
+  const seen = new Map<string, number>();
+  return files.map((file) => {
+    const occurrence = seen.get(file.path) ?? 0;
+    seen.set(file.path, occurrence + 1);
+    return `${occurrence}:${file.path}`;
+  });
+}
+
+function getExpandedReviewFileKeys(
+  keys: ReadonlyArray<string>,
+  storedKeys: ReadonlyArray<string> | undefined,
+): ReadonlyArray<string> {
+  return storedKeys === undefined ? keys : keys.filter((key) => storedKeys.includes(key));
 }
 
 function getValidReviewFileIds(
@@ -14,7 +29,7 @@ function getValidReviewFileIds(
   fileIds: ReadonlyArray<string> | undefined,
 ): ReadonlyArray<string> {
   if (fileIds === undefined) {
-    return getDefaultReviewExpandedFileIds(files);
+    return files.map((file) => file.id);
   }
 
   const fileIdSet = new Set(files.map((file) => file.id));
@@ -49,10 +64,13 @@ export function useReviewFileVisibility(input: {
 }) {
   const { cachedExpandedFileIds, cachedViewedFileIds, files, sectionId, threadKey } = input;
 
-  const expandedFileIds = useMemo(
-    () => getValidReviewFileIds(files, cachedExpandedFileIds),
-    [cachedExpandedFileIds, files],
-  );
+  const expansionKeys = useMemo(() => getReviewFileExpansionKeys(files), [files]);
+  const expandedFileIds = useMemo(() => {
+    const expandedKeys = new Set(getExpandedReviewFileKeys(expansionKeys, cachedExpandedFileIds));
+    return files
+      .filter((_, index) => expandedKeys.has(expansionKeys[index]!))
+      .map((file) => file.id);
+  }, [cachedExpandedFileIds, expansionKeys, files]);
   const viewedFileIds = useMemo(
     () => getValidExplicitReviewFileIds(files, cachedViewedFileIds),
     [cachedViewedFileIds, files],
@@ -73,11 +91,15 @@ export function useReviewFileVisibility(input: {
         return;
       }
 
+      const key = expansionKeys[files.findIndex((file) => file.id === fileId)];
+      if (key === undefined) {
+        return;
+      }
       updateReviewExpandedFileIds(threadKey, sectionId, (existing) =>
-        toggleReviewFileId(getValidReviewFileIds(files, existing), fileId),
+        toggleReviewFileId(getExpandedReviewFileKeys(expansionKeys, existing), key),
       );
     },
-    [files, sectionId, threadKey],
+    [expansionKeys, files, sectionId, threadKey],
   );
 
   const toggleViewedFile = useCallback(
@@ -91,13 +113,14 @@ export function useReviewFileVisibility(input: {
         toggleReviewFileId(getValidExplicitReviewFileIds(files, existing), fileId),
       );
 
-      if (shouldCollapse) {
+      const key = expansionKeys[files.findIndex((file) => file.id === fileId)];
+      if (shouldCollapse && key !== undefined) {
         updateReviewExpandedFileIds(threadKey, sectionId, (existing) =>
-          removeReviewFileId(getValidReviewFileIds(files, existing), fileId),
+          removeReviewFileId(getExpandedReviewFileKeys(expansionKeys, existing), key),
         );
       }
     },
-    [files, sectionId, threadKey, viewedFileIds],
+    [expansionKeys, files, sectionId, threadKey, viewedFileIds],
   );
 
   return {
diff --git a/apps/mobile/src/features/settings/SettingsEnvironmentsRouteScreen.tsx b/apps/mobile/src/features/settings/SettingsEnvironmentsRouteScreen.tsx
index 75b0cd4e9166..d37d405280a0 100644
--- a/apps/mobile/src/features/settings/SettingsEnvironmentsRouteScreen.tsx
+++ b/apps/mobile/src/features/settings/SettingsEnvironmentsRouteScreen.tsx
@@ -4,7 +4,7 @@ import { useAtomValue } from "@effect/atom-react";
 import { managedRelaySessionAtom } from "@t3tools/client-runtime/relay";
 import type { EnvironmentId } from "@t3tools/contracts";
 import { useRef, useState } from "react";
-import { RefreshControl } from "react-native";
+import { RefreshControl } from "../../components/ui/RefreshControl";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 
 import { SettingsScreen } from "./components/SettingsScreen";
diff --git a/apps/mobile/src/features/settings/SettingsScheduledTasksRouteScreen.tsx b/apps/mobile/src/features/settings/SettingsScheduledTasksRouteScreen.tsx
index f4604ca4a2f6..3f552c1f0c46 100644
--- a/apps/mobile/src/features/settings/SettingsScheduledTasksRouteScreen.tsx
+++ b/apps/mobile/src/features/settings/SettingsScheduledTasksRouteScreen.tsx
@@ -87,9 +87,7 @@ import { useScheduledTaskDestinationLabel, useScheduledTaskEditor } from "./sche
 import {
   discardScheduledTaskEditor,
   markScheduledTaskEditorSaved,
-  scheduledTaskEditorSessionAtom,
 } from "./scheduled-task-editor-state";
-import { appAtomRegistry } from "../../state/atom-registry";
 import {
   formatNextScheduledTaskRun,
   formatScheduledTaskInterval,
@@ -519,8 +517,6 @@ function SettingsScheduledTaskEditorScreen({ title }: { readonly title: string }
   const voiceInput = useVoiceInputController({
     ownerKey,
     label: editor?.draft.title.trim() || title,
-    subscribeToDraftChanges: (onChange) =>
-      appAtomRegistry.subscribe(scheduledTaskEditorSessionAtom, onChange),
     selection,
     readDraftMessage: () => {
       const current = readEditor();
diff --git a/apps/mobile/src/features/settings/SettingsServerControlsRouteScreen.tsx b/apps/mobile/src/features/settings/SettingsServerControlsRouteScreen.tsx
index 77b845637062..5026a90e13b9 100644
--- a/apps/mobile/src/features/settings/SettingsServerControlsRouteScreen.tsx
+++ b/apps/mobile/src/features/settings/SettingsServerControlsRouteScreen.tsx
@@ -582,6 +582,21 @@ function ServerSettingsDetail(props: { readonly page: SettingsPage }) {
                       onValueChange={(value) => write({ continueThreadsAfterServerUpdate: value })}
                     />
                   </View>
+                  <View className="border-t border-border-subtle">
+                    <SettingsSwitchRow
+                      icon="bolt.circle"
+                      label="Keep awake while agents work"
+                      subtitle={managedSubtitle(
+                        "keepAwakeWhileAgentsWork",
+                        projectSelected
+                          ? "Environment-wide setting. Select All projects to change it."
+                          : "Stop the computer from sleeping while agents work. Closing a laptop lid still sleeps it.",
+                      )}
+                      value={uniform("keepAwakeWhileAgentsWork")}
+                      disabled={disabledFor("keepAwakeWhileAgentsWork")}
+                      onValueChange={(value) => write({ keepAwakeWhileAgentsWork: value })}
+                    />
+                  </View>
                 </SettingsSection>
               </>
             ) : null}
diff --git a/apps/mobile/src/features/threads/LinkRequestCard.tsx b/apps/mobile/src/features/threads/LinkRequestCard.tsx
index 229ef86273b8..aee091d9f598 100644
--- a/apps/mobile/src/features/threads/LinkRequestCard.tsx
+++ b/apps/mobile/src/features/threads/LinkRequestCard.tsx
@@ -299,8 +299,8 @@ function LinkRequestSheet(props: {
       >
         <View className="gap-1">
           <Text className="font-sans text-sm leading-5 text-foreground-muted">
-            Agents here can then launch, message and wait on threads there. It appears in that
-            machine's Connections, where it can be revoked.
+            Agents here can then launch, message and wait on threads there. It appears under
+            Authorized clients in that machine's Sharing & access, where it can be revoked.
           </Text>
           {item.url !== undefined && target.kind === "machine" ? (
             <Text className="font-sans text-xs text-foreground-muted" numberOfLines={1}>
@@ -375,7 +375,7 @@ function LinkRequestSheet(props: {
         {useExisting ? (
           <Text className="font-sans text-sm leading-5 text-foreground-muted">
             This environment is already linked to {targetName}. The agent can use that link as it
-            is; change its access in Settings → Connections.
+            is; change its access in Settings → Environments.
           </Text>
         ) : target.kind === "none" ? null : (
           <>
@@ -394,8 +394,8 @@ function LinkRequestSheet(props: {
                   spellCheck={false}
                 />
                 <Text className="font-sans text-xs text-foreground-muted">
-                  Create a link on {targetName}: Settings → Connections → Create link, then paste
-                  its code here.
+                  Create a link on {targetName}: Settings → Sharing & access → Authorized clients →
+                  Create link, then paste its code here.
                 </Text>
               </View>
             )}
diff --git a/apps/mobile/src/features/threads/McpAppFullscreenScreen.tsx b/apps/mobile/src/features/threads/McpAppFullscreenScreen.tsx
index de3041c06b57..747b9a9fc186 100644
--- a/apps/mobile/src/features/threads/McpAppFullscreenScreen.tsx
+++ b/apps/mobile/src/features/threads/McpAppFullscreenScreen.tsx
@@ -56,6 +56,41 @@ function descendsFrom(
 
 /** Resolve apps from stored tool calls so links cannot supply apps the call never produced. */
 export function McpAppFullscreenScreen({ route }: McpAppFullscreenScreenProps) {
+  const navigation = useNavigation();
+  const { environmentId, threadId, itemId } = route.params;
+  if (!environmentId?.trim() || !threadId?.trim() || !itemId?.trim()) {
+    return (
+      <View className="flex-1 bg-screen">
+        <AppBar
+          title="App"
+          onClose={() => navigation.goBack()}
+          closeAccessibilityLabel="Exit full screen"
+        />
+        <Text className="m-6 text-sm text-foreground-muted">This app cannot be shown.</Text>
+      </View>
+    );
+  }
+  return (
+    <McpAppFullscreen
+      params={route.params}
+      environmentId={EnvironmentId.make(environmentId)}
+      threadId={ThreadId.make(threadId)}
+      itemId={TurnItemId.make(itemId)}
+    />
+  );
+}
+
+function McpAppFullscreen({
+  params,
+  environmentId,
+  threadId,
+  itemId,
+}: {
+  readonly params: McpAppFullscreenScreenProps["route"]["params"];
+  readonly environmentId: EnvironmentId;
+  readonly threadId: ThreadId;
+  readonly itemId: TurnItemId;
+}) {
   const navigation = useNavigation();
   const insets = useSafeAreaInsets();
   // Wait for focus before goBack; an exit under another screen must not pop that screen.
@@ -74,10 +109,6 @@ export function McpAppFullscreenScreen({ route }: McpAppFullscreenScreenProps) {
     });
   };
   const [size, setSize] = useState({ width: 0, height: 0 });
-  const params = route.params;
-  const environmentId = EnvironmentId.make(params.environmentId);
-  const threadId = ThreadId.make(params.threadId);
-  const itemId = TurnItemId.make(params.itemId);
   const conversationThreadId = useConversationThreadId(
     environmentId,
     threadId,
diff --git a/apps/mobile/src/features/threads/NewTaskDraftRouteScreen.tsx b/apps/mobile/src/features/threads/NewTaskDraftRouteScreen.tsx
index 4b77761b600a..abb35e793edc 100644
--- a/apps/mobile/src/features/threads/NewTaskDraftRouteScreen.tsx
+++ b/apps/mobile/src/features/threads/NewTaskDraftRouteScreen.tsx
@@ -90,7 +90,7 @@ const idleBranchCheckoutAtom = Atom.make(AsyncResult.initial<BranchCheckoutResul
 
 export function NewTaskDraftRouteScreen({ route }: StaticScreenProps<NewTaskDraftRouteParams>) {
   const currentRoute = useRoute();
-  const goBack = useWorkspaceBackNavigation("threads");
+  const goBack = useWorkspaceBackNavigation();
   const params = route.params ?? {};
   const draftId = Array.isArray(params.draftId) ? params.draftId[0] : params.draftId;
   const projects = useProjects();
diff --git a/apps/mobile/src/features/threads/NewTaskDraftScreen.tsx b/apps/mobile/src/features/threads/NewTaskDraftScreen.tsx
index 0fe4f8e267a2..1c90d5fa2df1 100644
--- a/apps/mobile/src/features/threads/NewTaskDraftScreen.tsx
+++ b/apps/mobile/src/features/threads/NewTaskDraftScreen.tsx
@@ -163,7 +163,7 @@ export function NewTaskDraftScreen(props: {
   const flow = useNewTaskFlow();
   const navigation = useNavigation();
   const isFocused = useIsFocused();
-  const goBack = useWorkspaceBackNavigation("threads");
+  const goBack = useWorkspaceBackNavigation();
   const currentRoute = useRoute();
   const flowKey = newTaskFlowKey(currentRoute);
   const { getShare, isLoading: isIncomingShareInboxLoading } = useIncomingShare();
diff --git a/apps/mobile/src/features/threads/PendingUserInputCard.tsx b/apps/mobile/src/features/threads/PendingUserInputCard.tsx
index 0793537aa0ae..12640fdb6e7e 100644
--- a/apps/mobile/src/features/threads/PendingUserInputCard.tsx
+++ b/apps/mobile/src/features/threads/PendingUserInputCard.tsx
@@ -273,6 +273,7 @@ export function PendingUserInputCard(props: PendingUserInputCardProps) {
                 threadId={props.threadId}
                 workspaceRoot={props.workspaceRoot}
                 setDirection={setDirection}
+                preserveSoftBreaks
               />
               <View className="gap-2">
                 {question.options.map((option) => {
diff --git a/apps/mobile/src/features/threads/QuestionAttachments.tsx b/apps/mobile/src/features/threads/QuestionAttachments.tsx
index 2c369c1e5b7b..b8fa75318860 100644
--- a/apps/mobile/src/features/threads/QuestionAttachments.tsx
+++ b/apps/mobile/src/features/threads/QuestionAttachments.tsx
@@ -109,14 +109,17 @@ export function QuestionAttachments(props: {
       uris,
       existingCount: appAtomRegistry.get(composerDraftsAtom)[key]?.attachments.length ?? 0,
     })
-      .then(async (images) => {
+      .then(async (result) => {
         if (
           scope.active &&
           (appAtomRegistry.get(questionAttachmentPreparationAtom)[key] ?? 0) > 0
         ) {
-          if (append(key, images) > 0)
-            Dialog.alert("Could not paste image", "Too many attachments.");
-        } else await releaseUnusedComposerAttachmentFiles(images);
+          const problems = [
+            ...(result.error ? [result.error] : []),
+            ...(append(key, result.attachments) > 0 ? ["Too many attachments."] : []),
+          ];
+          if (problems.length) Dialog.alert("Could not paste image", problems.join("\n\n"));
+        } else await releaseUnusedComposerAttachmentFiles(result.attachments);
       })
       .catch((error) =>
         Dialog.alert(
diff --git a/apps/mobile/src/features/threads/ThreadComposer.tsx b/apps/mobile/src/features/threads/ThreadComposer.tsx
index 9c2eb6d4c38d..3b1b927ef8a9 100644
--- a/apps/mobile/src/features/threads/ThreadComposer.tsx
+++ b/apps/mobile/src/features/threads/ThreadComposer.tsx
@@ -57,13 +57,11 @@ import { armAgentAwarenessLiveActivityForLocalWork } from "../agent-awareness/re
 import { scopedThreadKey } from "../../lib/scopedEntities";
 import {
   getComposerDraftSnapshot,
-  composerDraftsAtom,
   setComposerDraftText,
   composerContextImportsAtom,
   countComposerDraftAttachmentsAfterSelection,
   useComposerDraft,
 } from "../../state/use-composer-drafts";
-import { appAtomRegistry } from "../../state/atom-registry";
 import type { ComposerDocumentAttachment } from "../../lib/composerContext";
 import { useProject, useVisibleThreadShells } from "../../state/entities";
 import { useMentionableEnvironments } from "../../state/environments";
@@ -579,7 +577,6 @@ export const ThreadComposer = function ThreadComposer(props: ThreadComposerProps
     ownerKey: composerDraftKey,
     label: props.selectedThread.title || "Untitled thread",
     readDraftMessage: () => getComposerDraftSnapshot(composerDraftKey).text,
-    subscribeToDraftChanges: (onChange) => appAtomRegistry.subscribe(composerDraftsAtom, onChange),
     selection: composerMenu.selection,
     onChangeDraftMessage: (text) => setComposerDraftText(composerDraftKey, text),
     onChangeSelection: composerMenu.onSelectionChange,
diff --git a/apps/mobile/src/features/threads/ThreadDetailScreen.tsx b/apps/mobile/src/features/threads/ThreadDetailScreen.tsx
index 3e7eec1449e2..b36e408c2a5d 100644
--- a/apps/mobile/src/features/threads/ThreadDetailScreen.tsx
+++ b/apps/mobile/src/features/threads/ThreadDetailScreen.tsx
@@ -1063,11 +1063,16 @@ function ThreadDetailBody(
       windowHeight: screenAreaHeight,
       keyboardHeight: keyboardStickyEnabled ? -keyboardTranslation.value : 0,
       navigationHeaderHeight,
-      composerOverlapHeight: composerBottomInset,
+      // An in-flow question shares the room above it with the floating control.
+      composerOverlapHeight:
+        composerBottomInset +
+        (questionInFlow && showFloatingStatus ? FLOATING_WORKING_CONTROL_COVERAGE : 0),
     }),
   );
+  // A question pads itself clear of the bottom inset, below the card's own height limit.
+  const questionBottomInset = activeUserInputRequestId !== null ? composerBottomInset : 0;
   const composerPanelsHeightStyle = useAnimatedStyle(() => ({
-    maxHeight: pendingUserInputMaxHeight.value,
+    maxHeight: pendingUserInputMaxHeight.value + questionBottomInset,
     flexGrow: 0,
   }));
   // Questions overlay the composer on iOS; an approval sits above it, so it gives up its height.
diff --git a/apps/mobile/src/features/threads/ThreadFeed.tsx b/apps/mobile/src/features/threads/ThreadFeed.tsx
index dbbcaa1fd9cf..8e8c1c4955b2 100644
--- a/apps/mobile/src/features/threads/ThreadFeed.tsx
+++ b/apps/mobile/src/features/threads/ThreadFeed.tsx
@@ -277,6 +277,7 @@ import {
   ThreadMarkdownImageUnavailable,
   ThreadMarkdownImageView,
 } from "./ThreadMarkdownImage";
+import { ZoomableImagePressable } from "./ZoomableImagePressable";
 import { openSettings } from "../settings/settings-navigation";
 import { useSelectWorkspaceDetail } from "../layout/workspace/useSelectWorkspaceDetail";
 import { formatMessageTimestamp } from "./messageTimestamp";
@@ -471,6 +472,8 @@ function MessageImage(props: {
   readonly className: string;
   readonly maxWidth?: number;
   readonly height?: number;
+  readonly accessibilityLabel: string;
+  readonly onPress: () => void;
   readonly onLoad?: () => void;
   readonly onError?: () => void;
 }) {
@@ -485,11 +488,13 @@ function MessageImage(props: {
         })
       : null;
   return (
-    <ExpoImage
-      source={props.source}
-      cachePolicy="memory-disk"
+    <ZoomableImagePressable
+      accessibilityRole="imagebutton"
+      accessibilityLabel={props.accessibilityLabel}
+      onPress={props.onPress}
       style={[
         imageStyle,
+        { overflow: "hidden" },
         props.maxWidth !== undefined
           ? (displaySize ?? {
               width: Math.min(props.maxWidth, MARKDOWN_IMAGE_MAX_WIDTH),
@@ -499,13 +504,19 @@ function MessageImage(props: {
             ? { height: props.height }
             : undefined,
       ]}
-      contentFit={props.maxWidth === undefined ? "cover" : "contain"}
-      onLoad={(event) => {
-        if (props.maxWidth !== undefined) setSize(event.source);
-        props.onLoad?.();
-      }}
-      onError={props.onError}
-    />
+    >
+      <ExpoImage
+        source={props.source}
+        cachePolicy="memory-disk"
+        style={{ width: "100%", height: "100%" }}
+        contentFit={props.maxWidth === undefined ? "cover" : "contain"}
+        onLoad={(event) => {
+          if (props.maxWidth !== undefined) setSize(event.source);
+          props.onLoad?.();
+        }}
+        onError={props.onError}
+      />
+    </ZoomableImagePressable>
   );
 }
 
@@ -550,8 +561,12 @@ function MessageAttachmentImage(props: {
 
   return (
     <PresentationSource identifier={sourceIdentifier}>
-      <Pressable
-        accessibilityRole="imagebutton"
+      <MessageImage
+        key={props.attachmentId}
+        source={assetImageSource(props.environmentId, resource, uri)}
+        className={props.className}
+        maxWidth={props.maxWidth}
+        height={props.height}
         accessibilityLabel={`Open ${props.name}`}
         onPress={() =>
           props.onPressPreview(
@@ -570,22 +585,15 @@ function MessageAttachmentImage(props: {
             }),
           )
         }
-      >
-        <MessageImage
-          source={assetImageSource(props.environmentId, resource, uri)}
-          className={props.className}
-          maxWidth={props.maxWidth}
-          height={props.height}
-          onLoad={() => {
-            retriedImage.current = false;
-          }}
-          onError={() => {
-            if (retriedImage.current) return;
-            retriedImage.current = true;
-            void refreshAssetUrl();
-          }}
-        />
-      </Pressable>
+        onLoad={() => {
+          retriedImage.current = false;
+        }}
+        onError={() => {
+          if (retriedImage.current) return;
+          retriedImage.current = true;
+          void refreshAssetUrl();
+        }}
+      />
     </PresentationSource>
   );
 }
@@ -960,21 +968,18 @@ function PendingMessageMedia(props: {
   if (isImageAttachment(attachment)) {
     const uri = fileBacked ? preview.uri : (attachment.dataUrl ?? attachment.previewUri);
     return (
-      <Pressable
-        accessibilityRole="imagebutton"
+      <MessageImage
+        key={attachment.id}
+        source={uri === null ? undefined : { uri }}
+        className={props.className}
+        maxWidth={props.maxWidth}
+        height={props.height}
         accessibilityLabel={`Open ${attachment.name}`}
         onPress={() => {
           const source = composerImageGallery([attachment])[0];
           if (source) props.onPressPreview(withGallery(source));
         }}
-      >
-        <MessageImage
-          source={uri === null ? undefined : { uri }}
-          className={props.className}
-          maxWidth={props.maxWidth}
-          height={props.height}
-        />
-      </Pressable>
+      />
     );
   }
   if (preview.uri === null) {
@@ -3326,7 +3331,7 @@ export const ThreadFeed = memo(function ThreadFeed(props: ThreadFeedProps) {
   const jumpRunId =
     jumpReady &&
     !presentedFeed.some((entry) => entry.type === "message" && entry.id === jumpToMessageId)
-      ? messageFoldRunId(props.feed, jumpToMessageId)
+      ? messageFoldRunId(props.feed, jumpToMessageId, presentedFeed)
       : null;
   if (jumpRunId && !expandedTurnIds.has(jumpRunId)) {
     setInteractionState((current) => ({
diff --git a/apps/mobile/src/features/threads/ThreadHeader.tsx b/apps/mobile/src/features/threads/ThreadHeader.tsx
index d0045bf5f284..0388bfb29929 100644
--- a/apps/mobile/src/features/threads/ThreadHeader.tsx
+++ b/apps/mobile/src/features/threads/ThreadHeader.tsx
@@ -22,7 +22,7 @@ export function ThreadHeader(props: {
   readonly inspectorMode: ThreadInspectorMode | null;
   readonly onOpenFilesInspector: () => void;
 }) {
-  const goBack = useWorkspaceBackNavigation("threads");
+  const goBack = useWorkspaceBackNavigation();
   const { toggleAuxiliaryPane, startNewTask } = useAdaptiveWorkspaceLayout();
   const { panes } = useWorkspacePaneState();
   const gitMenu = useThreadGitMenuDefinition(props.gitControls);
diff --git a/apps/mobile/src/features/threads/ThreadMarkdownImage.test.tsx b/apps/mobile/src/features/threads/ThreadMarkdownImage.test.tsx
index 209cccf8d2ef..82f5cc62a7b6 100644
--- a/apps/mobile/src/features/threads/ThreadMarkdownImage.test.tsx
+++ b/apps/mobile/src/features/threads/ThreadMarkdownImage.test.tsx
@@ -3,19 +3,71 @@ import { act } from "react";
 import { createRoot } from "react-dom/client";
 import { expect, it, vi } from "vite-plus/test";
 
+type HandlerProps = Record<string, ((event: unknown) => void) | undefined>;
+type GestureHandlers = Record<string, (event: unknown, manager?: unknown) => void>;
+type Transform = [{ translateX: number }, { translateY: number }, { scale: number }];
+
 const harness = vi.hoisted(() => ({
   failImage: () => {},
   loadImage: (_event: { source: { width: number; height: number } }) => {},
   Passthrough: ({ children }: { children?: unknown }) => children,
+  pressable: {} as HandlerProps,
+  gestures: {} as Record<string, GestureHandlers>,
+  contentStyle: () => ({}) as { transform?: Transform },
 }));
 
-vi.mock("react-native", () => ({
-  Pressable: harness.Passthrough,
-  StyleSheet: { absoluteFill: {} },
-  View: ({ children, style }: { children?: ReactNode; style?: unknown }) => (
+vi.mock("react-native", () => {
+  const View = ({ children, style }: { children?: ReactNode; style?: unknown }) => (
     <div data-style={JSON.stringify(style)}>{children}</div>
-  ),
-}));
+  );
+  return {
+    Platform: { OS: "ios" },
+    Pressable: (props: HandlerProps & { children?: ReactNode; style?: unknown }) => {
+      harness.pressable = props;
+      return <View style={props.style}>{props.children}</View>;
+    },
+    StyleSheet: { absoluteFill: {} },
+    View,
+  };
+});
+vi.mock("react-native-gesture-handler", () => {
+  // Records each gesture's callbacks so a test can drive the worklets with native-shaped events.
+  const builder = (kind: string) => () => {
+    const handlers: GestureHandlers = {};
+    harness.gestures[kind] = handlers;
+    const gesture: object = new Proxy(
+      {},
+      {
+        get: (_target, name) => (callback: GestureHandlers[string]) => {
+          if (typeof name === "string" && name.startsWith("on")) handlers[name] = callback;
+          return gesture;
+        },
+      },
+    );
+    return gesture;
+  };
+  return {
+    Gesture: { Pinch: builder("pinch"), Pan: builder("pan"), Simultaneous: () => ({}) },
+    GestureDetector: ({ children }: { children?: ReactNode }) => children,
+  };
+});
+vi.mock("react-native-reanimated", async () => {
+  const { useState } = await import("react");
+  return {
+    default: { View: ({ children }: { children?: ReactNode }) => <div>{children}</div> },
+    runOnJS: (callback: () => void) => callback,
+    // Reads the UI-thread style on demand, as Reanimated would after a gesture frame.
+    useAnimatedStyle: (updater: () => { transform?: Transform }) => {
+      harness.contentStyle = updater;
+      return {};
+    },
+    useSharedValue: <T,>(initial: T) =>
+      useState(() => {
+        let value = initial;
+        return { get: () => value, set: (next: T) => void (value = next) };
+      })[0],
+  };
+});
 vi.mock("expo-image", () => ({
   Image: (props: {
     onError: () => void;
@@ -203,3 +255,146 @@ it("does not parse an obsolete SVG response after its last reader unmounts", asy
     registry.dispose();
   }
 });
+
+const zoom = () => {
+  const [{ translateX }, { translateY }, { scale }] = harness.contentStyle().transform!;
+  // Clamping at fit can yield -0, which is the same position.
+  return { scale, x: translateX + 0, y: translateY + 0 };
+};
+const pinch = (phase: "onStart" | "onUpdate", focalX: number, focalY: number, scale: number) =>
+  act(async () => harness.gestures.pinch![phase]!({ focalX, focalY, scale, numberOfPointers: 2 }));
+const endPinch = () => act(async () => harness.gestures.pinch!.onFinalize!({}));
+const layout = (width: number, height: number) =>
+  act(async () => harness.pressable.onLayout?.({ nativeEvent: { layout: { width, height } } }));
+const markdownImage = (sourceKey: string, onPressPreview: () => void = () => {}) => (
+  <MarkdownImageAvailableWidthContext value={345}>
+    <ThreadMarkdownImageView
+      uri={`https://example.test/${sourceKey}.png`}
+      sourceKey={sourceKey}
+      unavailable={false}
+      alt={null}
+      knownSize={{ width: 1000, height: 585 }}
+      onPressPreview={onPressPreview}
+    />
+  </MarkdownImageAvailableWidthContext>
+);
+
+it("does not open the preview when a touch on the inline image pinches or pans it", async () => {
+  (globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }).IS_REACT_ACT_ENVIRONMENT = true;
+  const root = createRoot(document.createElement("div"));
+  const onPressPreview = vi.fn();
+  const touch = (fingers: number) =>
+    act(async () =>
+      harness.pressable.onTouchStart?.({
+        nativeEvent: { touches: Array.from({ length: fingers }, () => ({})) },
+      }),
+    );
+  const release = () =>
+    act(async () => harness.pressable.onPress?.({ nativeEvent: { identifier: 1 } }));
+  try {
+    await act(async () => root.render(markdownImage("hero", onPressPreview)));
+    await touch(1);
+    await touch(2);
+    await release();
+    expect(onPressPreview).not.toHaveBeenCalled();
+
+    await touch(1);
+    await act(async () => harness.gestures.pan!.onStart!({ translationX: 5, translationY: 0 }));
+    await release();
+    expect(onPressPreview).not.toHaveBeenCalled();
+
+    await touch(1);
+    await release();
+    expect(onPressPreview).toHaveBeenCalledOnce();
+
+    // VoiceOver activation has no touch, so an earlier pinch must not swallow it.
+    await touch(2);
+    await act(async () => harness.pressable.onPress?.({ nativeEvent: {} }));
+    expect(onPressPreview).toHaveBeenCalledTimes(2);
+  } finally {
+    await act(async () => root.unmount());
+  }
+});
+
+it("zooms the inline image around the pinch and keeps it until the source or frame changes", async () => {
+  (globalThis as { IS_REACT_ACT_ENVIRONMENT?: boolean }).IS_REACT_ACT_ENVIRONMENT = true;
+  const root = createRoot(document.createElement("div"));
+  const touchPan = () => {
+    const manager = { fail: vi.fn() };
+    harness.gestures.pan!.onTouchesDown!({}, manager);
+    return manager;
+  };
+  try {
+    await act(async () => root.render(markdownImage("a")));
+    // The frame center is (172.5, 101); the pinch is off center.
+    await layout(345, 202);
+    await pinch("onStart", 300, 150, 1);
+    await pinch("onUpdate", 300, 150, 2);
+    expect(zoom()).toEqual({ scale: 2, x: -127.5, y: -49 });
+    await pinch("onUpdate", 280, 140, 2);
+    expect(zoom()).toEqual({ scale: 2, x: -147.5, y: -59 });
+    await act(async () =>
+      harness.gestures.pinch!.onUpdate!({ focalX: 90, focalY: 90, scale: 2, numberOfPointers: 1 }),
+    );
+    expect(zoom()).toEqual({ scale: 2, x: -147.5, y: -59 });
+    await endPinch();
+
+    await act(async () => harness.loadImage({ source: { width: 1000, height: 585 } }));
+    await act(async () => root.render(markdownImage("a")));
+    await layout(345, 202);
+    expect(zoom()).toEqual({ scale: 2, x: -147.5, y: -59 });
+
+    await pinch("onStart", 100, 50, 1);
+    await pinch("onUpdate", 100, 50, 1.5);
+    expect(zoom()).toEqual({ scale: 3, x: -185, y: -63 });
+    await pinch("onUpdate", 100, 50, 10);
+    expect(zoom().scale).toBe(6);
+    await endPinch();
+
+    const zoomedPan = touchPan();
+    await act(async () => harness.gestures.pan!.onStart!({ translationX: 5, translationY: 0 }));
+    await act(async () =>
+      harness.gestures.pan!.onUpdate!({ translationX: 5000, translationY: -5000 }),
+    );
+    expect(zoomedPan.fail).not.toHaveBeenCalled();
+    expect(zoom()).toEqual({ scale: 6, x: 862.5, y: -505 });
+
+    await pinch("onStart", 172, 100, 1);
+    await pinch("onUpdate", 172, 100, 0.01);
+    await endPinch();
+    expect(zoom()).toEqual({ scale: 1, x: 0, y: 0 });
+    expect(touchPan().fail).toHaveBeenCalledOnce();
+
+    await pinch("onStart", 300, 150, 1);
+    await pinch("onUpdate", 300, 150, 2);
+    await endPinch();
+    await layout(300, 175);
+    expect(zoom()).toEqual({ scale: 1, x: 0, y: 0 });
+
+    await pinch("onStart", 300, 150, 1);
+    await pinch("onUpdate", 300, 150, 2);
+    await endPinch();
+    await act(async () => root.render(markdownImage("b")));
+    expect(zoom()).toEqual({ scale: 1, x: 0, y: 0 });
+
+    for (const panFirst of [true, false]) {
+      await act(async () => root.render(markdownImage(`handoff-${panFirst}`)));
+      await layout(300, 200);
+      await pinch("onStart", 150, 100, 1);
+      await pinch("onUpdate", 150, 100, 2);
+      await endPinch();
+      await act(async () => harness.gestures.pan!.onStart!({ translationX: 0, translationY: 0 }));
+      await pinch("onStart", 150, 100, 1);
+      const panUpdate = () =>
+        act(async () => harness.gestures.pan!.onUpdate!({ translationX: 10, translationY: 0 }));
+      if (panFirst) await panUpdate();
+      await pinch("onUpdate", 150, 100, 1.5);
+      if (!panFirst) await panUpdate();
+      await endPinch();
+      await act(async () => harness.gestures.pan!.onUpdate!({ translationX: 20, translationY: 0 }));
+      expect(zoom()).toEqual({ scale: 3, x: 10, y: 0 });
+    }
+  } finally {
+    await act(async () => root.unmount());
+  }
+});
diff --git a/apps/mobile/src/features/threads/ThreadMarkdownImage.tsx b/apps/mobile/src/features/threads/ThreadMarkdownImage.tsx
index da9ba935838c..90eb97f4e3b8 100644
--- a/apps/mobile/src/features/threads/ThreadMarkdownImage.tsx
+++ b/apps/mobile/src/features/threads/ThreadMarkdownImage.tsx
@@ -20,6 +20,7 @@ import { useMediaActions } from "../../state/mediaActions";
 import type { MediaActionsSource } from "../../lib/mediaActionsSource";
 import { useAssetUrlState } from "../../state/assets";
 import { WorkspaceMutationIdContext } from "./workspaceMutationIdContext";
+import { ZoomableImagePressable } from "./ZoomableImagePressable";
 import { assetImageCacheKey } from "../../lib/assetImageSource";
 import {
   MARKDOWN_IMAGE_MAX_WIDTH,
@@ -167,7 +168,8 @@ export function ThreadMarkdownImageView(props: {
       ) : (
         <PresentationSource identifier={sourceIdentifier} style={{ alignSelf: "flex-start" }}>
           <MediaActionsMenu media={mediaActions}>
-            <Pressable
+            <ZoomableImagePressable
+              key={props.sourceKey}
               accessibilityRole="imagebutton"
               accessibilityLabel={props.alt ?? "Markdown image"}
               accessibilityHint={
@@ -184,34 +186,29 @@ export function ThreadMarkdownImageView(props: {
                   }),
                 )
               }
-              style={{ alignSelf: "flex-start" }}
+              className="overflow-hidden rounded-[10px] bg-md-code-bg"
+              style={{ alignSelf: "flex-start", ...frameStyle }}
             >
-              <View
-                className="items-center justify-center overflow-hidden rounded-[10px] bg-md-code-bg"
-                style={frameStyle}
-              >
-                {props.format === "svg" ? (
-                  <ThreadMarkdownSvg ast={svgDocument?.ast ?? null} />
-                ) : (
-                  <ThreadMarkdownImageRequest
-                    key={props.sourceKey}
-                    uri={props.uri}
-                    cacheKey={props.cacheKey}
-                    onLoad={(size) =>
-                      // Only the first decode counts: later loads report the bitmap
-                      // downsampled for the current frame (969 vs 970 wide), so keeping
-                      // them resizes the frame, which reloads the image, and so on.
-                      setDecoded((current) =>
-                        current?.sourceKey === props.sourceKey
-                          ? current
-                          : { sourceKey: props.sourceKey, size },
-                      )
-                    }
-                    onError={() => setFailure({ uri: props.uri, failed: true })}
-                  />
-                )}
-              </View>
-            </Pressable>
+              {props.format === "svg" ? (
+                <ThreadMarkdownSvg ast={svgDocument?.ast ?? null} />
+              ) : (
+                <ThreadMarkdownImageRequest
+                  uri={props.uri}
+                  cacheKey={props.cacheKey}
+                  onLoad={(size) =>
+                    // Only the first decode counts: later loads report the bitmap
+                    // downsampled for the current frame (969 vs 970 wide), so keeping
+                    // them resizes the frame, which reloads the image, and so on.
+                    setDecoded((current) =>
+                      current?.sourceKey === props.sourceKey
+                        ? current
+                        : { sourceKey: props.sourceKey, size },
+                    )
+                  }
+                  onError={() => setFailure({ uri: props.uri, failed: true })}
+                />
+              )}
+            </ZoomableImagePressable>
           </MediaActionsMenu>
         </PresentationSource>
       )}
diff --git a/apps/mobile/src/features/threads/ThreadPullRequestsSheet.tsx b/apps/mobile/src/features/threads/ThreadPullRequestsSheet.tsx
index dd20c0a162f7..309c67c4999f 100644
--- a/apps/mobile/src/features/threads/ThreadPullRequestsSheet.tsx
+++ b/apps/mobile/src/features/threads/ThreadPullRequestsSheet.tsx
@@ -1,7 +1,7 @@
 import { useNavigation, type StaticScreenProps } from "@react-navigation/native";
 import { LegendList } from "@legendapp/list/react-native";
 import { useMemo } from "react";
-import { Platform, View } from "react-native";
+import { View } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 
 import { AppText as Text } from "../../components/ui/AppText";
@@ -44,7 +44,7 @@ export function ThreadPullRequestsSheet(
   const title = `Linked ${actions.terminology.plural}`;
 
   const content = (
-    <View className="flex-1 android:bg-sheet-solid ios:bg-screen">
+    <View className="flex-1 bg-screen">
       {/* oxlint-disable-next-line t3code/require-registered-list-scroll -- Sheet content; sheets sit outside workspace columns and keep their own header handling. */}
       <LegendList
         data={lines}
@@ -54,7 +54,7 @@ export function ThreadPullRequestsSheet(
           <LinkedPullRequestRow
             line={item}
             separator={index < lines.length - 1}
-            surfaceClassName={Platform.OS === "ios" ? "text-screen" : "text-sheet-solid"}
+            surfaceClassName="text-screen"
             openPullRequest={openPullRequest}
             actions={actions}
           />
diff --git a/apps/mobile/src/features/threads/ThreadQueueControl.tsx b/apps/mobile/src/features/threads/ThreadQueueControl.tsx
index 58129ebc0cec..d3b3ba600629 100644
--- a/apps/mobile/src/features/threads/ThreadQueueControl.tsx
+++ b/apps/mobile/src/features/threads/ThreadQueueControl.tsx
@@ -5,6 +5,10 @@ import {
   queuedRunEditBlockedReason,
 } from "@t3tools/client-runtime/queued-run-edit";
 import { scopeThreadRef } from "@t3tools/client-runtime/environment";
+import {
+  isAtomCommandInterrupted,
+  squashAtomCommandFailure,
+} from "@t3tools/client-runtime/state/runtime";
 import { resolveUserMessagePresentation } from "@t3tools/client-runtime/user-message";
 import type { ChatAttachment, EnvironmentId, RunId, ThreadId } from "@t3tools/contracts";
 import { Atom } from "effect/reactivity";
@@ -20,6 +24,7 @@ import { useUniwindTheme } from "../../lib/useUniwindTheme";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 
 import { Button } from "../../components/ui/Button";
+import * as Dialog from "../../components/ui/Dialog";
 import { SheetHeader } from "../../components/ui/SheetHeader";
 import { AppText as Text } from "../../components/ui/AppText";
 import { SymbolView } from "../../components/ui/AppSymbol";
@@ -132,6 +137,10 @@ export function ThreadQueueSheet({ route }: StaticScreenProps<QueueTarget>) {
   const promote = useAtomCommand(threadEnvironment.promoteQueuedRun, "promote queued message");
   const cancel = useAtomCommand(threadEnvironment.cancelQueuedRun, "remove queued message");
   const resume = useAtomCommand(threadEnvironment.resumeThreadQueue, "resume queue");
+  const resumeHeldQueue = useAtomCommand(threadEnvironment.resumeThreadQueue, {
+    label: "resume queue",
+    reportFailure: false,
+  });
   const [resuming, setResuming] = useState(false);
   const [busyRunId, setBusyRunId] = useState<RunId | null>(null);
   const busyRef = useRef(false);
@@ -217,9 +226,20 @@ export function ThreadQueueSheet({ route }: StaticScreenProps<QueueTarget>) {
               if (busyRef.current) return;
               busyRef.current = true;
               setResuming(true);
-              await resume({ ...target, input: { threadId: target.threadId } });
+              const result = await resumeHeldQueue({
+                ...target,
+                input: { threadId: target.threadId },
+              });
               busyRef.current = false;
               setResuming(false);
+              // A usage limit holds the queue until the composer's Resume thread continues the run.
+              if (result._tag === "Failure" && !isAtomCommandInterrupted(result)) {
+                const error = squashAtomCommandFailure(result);
+                Dialog.alert(
+                  "Could not resume queue",
+                  error instanceof Error ? error.message : "Try again.",
+                );
+              }
             }}
           />
         </View>
diff --git a/apps/mobile/src/features/threads/ThreadRouteScreen.tsx b/apps/mobile/src/features/threads/ThreadRouteScreen.tsx
index 6205fd128179..8f1463ce1bd8 100644
--- a/apps/mobile/src/features/threads/ThreadRouteScreen.tsx
+++ b/apps/mobile/src/features/threads/ThreadRouteScreen.tsx
@@ -136,7 +136,7 @@ function firstRouteParam(value: string | string[] | undefined): string | null {
 const InspectorHeaderShownContext = createContext(false);
 
 function ThreadRouteFallbackLayout(props: { readonly children: ReactNode }) {
-  const goBack = useWorkspaceBackNavigation("threads");
+  const goBack = useWorkspaceBackNavigation();
   const inspectorHeaderShown = use(InspectorHeaderShownContext);
   return (
     <ThreadScreenFallback
@@ -241,7 +241,7 @@ export function ThreadRouteScreen(props: ThreadRouteScreenProps) {
 }
 
 function LiveThreadRouteController(props: ThreadRouteScreenProps) {
-  useAndroidWorkspaceBack("threads");
+  useAndroidWorkspaceBack();
   const connectionsReady = useConnectionsReady();
   const { connectionState } = useRemoteConnectionStatus();
   const { selectedThread } = useThreadSelection();
@@ -1071,9 +1071,7 @@ function ThreadRouteContent(
           onRemoveDraftImage={composer.onRemoveDraftImage}
           serverConfig={serverConfig}
           onStopThread={awaitingBootstrapTurn ? handleCancelWorktreeSetup : handleStopThread}
-          onResumeQueue={
-            composer.queueHeld || composer.resumableRunId !== null ? handleResumeQueue : null
-          }
+          onResumeQueue={composer.canResume ? handleResumeQueue : null}
           onSendMessage={composer.onSendMessage}
           offersSideChat={composer.sideChatUnavailableReason === null}
           onReconnectEnvironment={handleReconnectEnvironment}
diff --git a/apps/mobile/src/features/threads/ThreadSettingsSheet.tsx b/apps/mobile/src/features/threads/ThreadSettingsSheet.tsx
index 2ddf85a88138..8014f1125719 100644
--- a/apps/mobile/src/features/threads/ThreadSettingsSheet.tsx
+++ b/apps/mobile/src/features/threads/ThreadSettingsSheet.tsx
@@ -45,7 +45,9 @@ import {
   useState,
   type ReactNode,
 } from "react";
-import { Platform, Pressable, RefreshControl, ScrollView, View } from "react-native";
+import { Pressable, ScrollView, View } from "react-native";
+import { READABLE_WIDTH_STYLE, ROW_MIN_HEIGHT } from "../../components/ui/listMetrics";
+import { RefreshControl } from "../../components/ui/RefreshControl";
 import Animated, {
   FadeIn,
   FadeOut,
@@ -182,7 +184,8 @@ function ProviderHeader(props: {
         accessibilityLabel={`${props.label}, ${props.modelCount} models`}
         accessibilityRole="button"
         accessibilityState={{ expanded: !props.collapsed }}
-        className="mx-4 mt-1 min-h-11 flex-row items-center gap-2 rounded-xl px-1 pt-2 active:opacity-60 android:min-h-12"
+        className="mx-4 mt-1 flex-row items-center gap-2 rounded-xl px-1 pt-2 active:opacity-60"
+        style={{ minHeight: ROW_MIN_HEIGHT.control }}
         onPress={props.onToggle}
       >
         {content}
@@ -208,9 +211,10 @@ function DisclosureRow(props: {
       accessibilityRole="button"
       onPress={props.onPress}
       className={cn(
-        "min-h-11 flex-row items-center gap-2 bg-grouped-card px-4 py-2 active:bg-subtle android:min-h-14",
+        "flex-row items-center gap-2 bg-grouped-card px-4 py-2 active:bg-subtle",
         !props.isLast && "border-b border-border-subtle",
       )}
+      style={{ minHeight: ROW_MIN_HEIGHT.item }}
     >
       <Text className="text-sm font-t3-medium text-foreground">{props.label}</Text>
       <View className="flex-1" />
@@ -1048,15 +1052,11 @@ function ThreadSettingsMainContent(props: {
       alwaysBounceVertical
       automaticallyAdjustsScrollIndicatorInsets
       className="flex-1 bg-sheet"
-      style={
-        Platform.OS === "android"
-          ? { width: "100%", maxWidth: 720, alignSelf: "center" }
-          : undefined
-      }
+      style={READABLE_WIDTH_STYLE}
       contentContainerStyle={{ paddingTop: 4 }}
       contentInsetAdjustmentBehavior="automatic"
       data={listItems}
-      estimatedItemSize={Platform.OS === "android" ? 56 : 48}
+      estimatedItemSize={ROW_MIN_HEIGHT.item}
       extraData={animationsReady}
       getItemType={(item) => item.kind}
       itemLayoutAnimation={THREAD_SETTINGS_CATALOG_LAYOUT_TRANSITION}
@@ -1151,11 +1151,7 @@ function ThreadSettingsChoiceContent(props: {
   return (
     <ScrollView
       className="flex-1 bg-sheet"
-      style={
-        Platform.OS === "android"
-          ? { width: "100%", maxWidth: 720, alignSelf: "center" }
-          : undefined
-      }
+      style={READABLE_WIDTH_STYLE}
       contentContainerStyle={{
         paddingBottom: insets.bottom + 12,
         paddingHorizontal: 16,
diff --git a/apps/mobile/src/features/threads/ZoomableImagePressable.tsx b/apps/mobile/src/features/threads/ZoomableImagePressable.tsx
new file mode 100644
index 000000000000..b0cb7818d132
--- /dev/null
+++ b/apps/mobile/src/features/threads/ZoomableImagePressable.tsx
@@ -0,0 +1,177 @@
+import { useEffectEvent, useRef, useState, type ComponentProps, type ReactNode } from "react";
+import { Platform, Pressable, StyleSheet } from "react-native";
+import { Gesture, GestureDetector } from "react-native-gesture-handler";
+import Animated, { runOnJS, useAnimatedStyle, useSharedValue } from "react-native-reanimated";
+
+const MAX_INLINE_ZOOM = 6;
+// Below UIScrollView's drag hysteresis, so a zoomed pan wins over the feed scroll.
+const ZOOMED_PAN_MIN_DISTANCE = 5;
+
+type Zoom = { readonly scale: number; readonly x: number; readonly y: number };
+type Size = { readonly width: number; readonly height: number };
+
+const FIT: Zoom = { scale: 1, x: 0, y: 0 };
+
+/** Keeps the scaled content covering the frame: translation is about the frame center. */
+function clampZoom(zoom: Zoom, size: Size): Zoom {
+  "worklet";
+  const scale = Math.min(Math.max(zoom.scale, 1), MAX_INLINE_ZOOM);
+  const maxX = ((scale - 1) * size.width) / 2;
+  const maxY = ((scale - 1) * size.height) / 2;
+  return {
+    scale,
+    x: Math.min(Math.max(zoom.x, -maxX), maxX),
+    y: Math.min(Math.max(zoom.y, -maxY), maxY),
+  };
+}
+
+type ZoomableImagePressableProps = Omit<ComponentProps<typeof Pressable>, "children"> & {
+  readonly children: ReactNode;
+};
+
+/**
+ * Inline chat image that pinch-zooms in place on iOS. Key it by image source so a
+ * new source starts at fit; ordinary rerenders keep the zoom and offset.
+ */
+export function ZoomableImagePressable(props: ZoomableImagePressableProps) {
+  if (Platform.OS !== "ios") return <Pressable {...props} />;
+  return <IosZoomableImagePressable {...props} />;
+}
+
+function IosZoomableImagePressable({
+  children,
+  onTouchStart,
+  onPress,
+  onLayout,
+  ...pressableProps
+}: ZoomableImagePressableProps) {
+  const gestured = useRef(false);
+  const layoutSize = useRef<Size | null>(null);
+  const zoom = useSharedValue(FIT);
+  const size = useSharedValue<Size>({ width: 0, height: 0 });
+  const pinching = useSharedValue(false);
+  const pinchStart = useSharedValue({ zoom: FIT, focalX: 0, focalY: 0, scale: 1, pointers: 0 });
+  const panStart = useSharedValue({ zoom: FIT, translationX: 0, translationY: 0 });
+
+  const markGestured = useEffectEvent(() => {
+    gestured.current = true;
+  });
+  const [gesture] = useState(() => {
+    // Focal points arrive in the untransformed frame; the transform is about its center.
+    const pinch = Gesture.Pinch()
+      .onStart((event) => {
+        const frame = size.get();
+        pinching.set(true);
+        pinchStart.set({
+          zoom: zoom.get(),
+          focalX: event.focalX - frame.width / 2,
+          focalY: event.focalY - frame.height / 2,
+          scale: event.scale,
+          pointers: event.numberOfPointers,
+        });
+        runOnJS(markGestured)();
+      })
+      .onUpdate((event) => {
+        const frame = size.get();
+        const start = pinchStart.get();
+        const focalX = event.focalX - frame.width / 2;
+        const focalY = event.focalY - frame.height / 2;
+        if (event.numberOfPointers !== start.pointers) {
+          // A lifted or added finger jumps the focal point; continue from here instead.
+          pinchStart.set({
+            zoom: zoom.get(),
+            focalX,
+            focalY,
+            scale: event.scale,
+            pointers: event.numberOfPointers,
+          });
+          return;
+        }
+        const scale = Math.min(
+          Math.max((start.zoom.scale * event.scale) / start.scale, 1),
+          MAX_INLINE_ZOOM,
+        );
+        // Keep the content point that started under the fingers under them.
+        const contentX = (start.focalX - start.zoom.x) / start.zoom.scale;
+        const contentY = (start.focalY - start.zoom.y) / start.zoom.scale;
+        zoom.set(
+          clampZoom({ scale, x: focalX - scale * contentX, y: focalY - scale * contentY }, frame),
+        );
+      })
+      .onFinalize(() => {
+        panStart.set({ ...panStart.get(), zoom: zoom.get() });
+        pinching.set(false);
+      });
+    const pan = Gesture.Pan()
+      .minDistance(ZOOMED_PAN_MIN_DISTANCE)
+      .onTouchesDown((_event, manager) => {
+        // At fit, a one-finger drag belongs to the feed.
+        if (zoom.get().scale <= 1) manager.fail();
+      })
+      .onStart((event) => {
+        panStart.set({
+          zoom: zoom.get(),
+          translationX: event.translationX,
+          translationY: event.translationY,
+        });
+        runOnJS(markGestured)();
+      })
+      .onUpdate((event) => {
+        if (pinching.get()) {
+          // The pinch owns the transform; resume panning from wherever it leaves it.
+          panStart.set({
+            zoom: zoom.get(),
+            translationX: event.translationX,
+            translationY: event.translationY,
+          });
+          return;
+        }
+        const start = panStart.get();
+        zoom.set(
+          clampZoom(
+            {
+              scale: start.zoom.scale,
+              x: start.zoom.x + event.translationX - start.translationX,
+              y: start.zoom.y + event.translationY - start.translationY,
+            },
+            size.get(),
+          ),
+        );
+      });
+    return Gesture.Simultaneous(pinch, pan);
+  });
+  const contentStyle = useAnimatedStyle(() => {
+    const { scale, x, y } = zoom.get();
+    return { transform: [{ translateX: x }, { translateY: y }, { scale }] };
+  });
+
+  return (
+    <GestureDetector gesture={gesture}>
+      <Pressable
+        {...pressableProps}
+        onTouchStart={(event) => {
+          gestured.current = event.nativeEvent.touches.length > 1;
+          onTouchStart?.(event);
+        }}
+        onPress={(event) => {
+          // Accessibility activation carries no touch identifier and no gesture.
+          if (typeof event.nativeEvent.identifier === "number" && gestured.current) return;
+          onPress?.(event);
+        }}
+        onLayout={(event) => {
+          const { width, height } = event.nativeEvent.layout;
+          const previous = layoutSize.current;
+          if (previous?.width !== width || previous?.height !== height) {
+            // The old offsets no longer fit the new frame, so a resize starts over at fit.
+            layoutSize.current = { width, height };
+            size.set({ width, height });
+            zoom.set(FIT);
+          }
+          onLayout?.(event);
+        }}
+      >
+        <Animated.View style={[StyleSheet.absoluteFill, contentStyle]}>{children}</Animated.View>
+      </Pressable>
+    </GestureDetector>
+  );
+}
diff --git a/apps/mobile/src/features/threads/git/GitBranchesSheet.occupancy.test.tsx b/apps/mobile/src/features/threads/git/GitBranchesSheet.occupancy.test.tsx
index b2d29db8c8c7..436fb4dd0b40 100644
--- a/apps/mobile/src/features/threads/git/GitBranchesSheet.occupancy.test.tsx
+++ b/apps/mobile/src/features/threads/git/GitBranchesSheet.occupancy.test.tsx
@@ -8,25 +8,26 @@ const checkout = vi.hoisted(() => ({
   branches: [] as Array<{ name: string; worktreePath: string | null }>,
 }));
 
-vi.mock("react-native", () => ({
-  Platform: { OS: "android" },
-  View: ({ children }: { children: ReactNode }) => <div>{children}</div>,
-  ScrollView: ({ children }: { children: ReactNode }) => <div>{children}</div>,
-  Pressable: ({ children, disabled }: { children: ReactNode; disabled: boolean }) => (
-    <button disabled={disabled}>{children}</button>
-  ),
-  useWindowDimensions: () => ({ height: 800 }),
-}));
 vi.mock("@react-navigation/native", () => ({ useNavigation: () => ({}) }));
-vi.mock("react-native-safe-area-context", () => ({ useSafeAreaInsets: () => ({ bottom: 0 }) }));
 vi.mock("../../../components/ui/SheetHeader", () => ({ SheetHeader: () => null }));
-vi.mock("../../../components/ui/ScreenContent", () => ({
-  ScreenContent: ({ children }: { children: ReactNode }) => <div>{children}</div>,
+vi.mock("../../../components/ui/FitSheet", () => ({
+  FitSheet: ({ children }: { children: ReactNode }) => <div>{children}</div>,
 }));
 vi.mock("../../../native/StackHeader", () => ({ NativeStackScreenOptions: () => null }));
-vi.mock("../../../components/ui/AppText", () => ({
-  AppText: ({ children }: { children: ReactNode }) => <span>{children}</span>,
-  AppTextInput: () => null,
+vi.mock("../../../components/ui/FormSection", () => ({
+  FormSection: () => null,
+  FormField: () => null,
+}));
+vi.mock("../../../components/ui/ListSection", () => ({
+  ListSection: ({ children }: { children: ReactNode }) => <div>{children}</div>,
+}));
+vi.mock("../../../components/ui/ListChoiceRow", () => ({
+  ListChoiceRow: (props: { label: string; description: string; disabled: boolean }) => (
+    <button disabled={props.disabled}>
+      <span>{props.label}</span>
+      <span>{props.description}</span>
+    </button>
+  ),
 }));
 vi.mock("./gitSheetComponents", () => ({ SheetActionButton: () => null }));
 vi.mock("../../../state/entities", () => ({}));
diff --git a/apps/mobile/src/features/threads/git/GitBranchesSheet.test.tsx b/apps/mobile/src/features/threads/git/GitBranchesSheet.test.tsx
index 6bd008116bab..fef45b5c8800 100644
--- a/apps/mobile/src/features/threads/git/GitBranchesSheet.test.tsx
+++ b/apps/mobile/src/features/threads/git/GitBranchesSheet.test.tsx
@@ -17,28 +17,20 @@ const state = vi.hoisted(() => ({
 }));
 
 vi.mock("@react-navigation/native", () => ({ useNavigation: () => ({ goBack() {} }) }));
-vi.mock("react-native", () => ({
-  Platform: { OS: "android" },
-  useWindowDimensions: () => ({ height: 800 }),
-  View: ({ children }: { children: ReactNode }) => children,
-  ScrollView: ({ children }: { children: ReactNode }) => children,
-  Pressable: () => null,
-}));
-vi.mock("react-native-safe-area-context", () => ({
-  useSafeAreaInsets: () => ({ bottom: 0 }),
-}));
 vi.mock("../../../components/ui/SheetHeader", () => ({ SheetHeader: () => null }));
-vi.mock("../../../components/ui/ScreenContent", () => ({
-  ScreenContent: ({ children }: { children: ReactNode }) => children,
+vi.mock("../../../components/ui/FitSheet", () => ({
+  FitSheet: ({ children }: { children: ReactNode }) => children,
 }));
 vi.mock("../../../native/StackHeader", () => ({ NativeStackScreenOptions: () => null }));
-vi.mock("../../../components/ui/AppText", () => ({
-  AppText: ({ children }: { children: ReactNode }) => children,
-  AppTextInput: (props: InputProps) => {
+vi.mock("../../../components/ui/FormSection", () => ({
+  FormSection: ({ children }: { children: ReactNode }) => children,
+  FormField: (props: InputProps) => {
     state.inputs.set(props.accessibilityLabel, props);
     return null;
   },
 }));
+vi.mock("../../../components/ui/ListSection", () => ({ ListSection: () => null }));
+vi.mock("../../../components/ui/ListChoiceRow", () => ({ ListChoiceRow: () => null }));
 vi.mock("../../../state/query", () => ({
   useEnvironmentQuery: () => ({
     data: state.refName === null ? undefined : { refName: state.refName },
diff --git a/apps/mobile/src/features/threads/git/GitBranchesSheet.tsx b/apps/mobile/src/features/threads/git/GitBranchesSheet.tsx
index 67d0818ee6c4..0f3d785b4104 100644
--- a/apps/mobile/src/features/threads/git/GitBranchesSheet.tsx
+++ b/apps/mobile/src/features/threads/git/GitBranchesSheet.tsx
@@ -1,13 +1,12 @@
 import { sanitizeFeatureBranchName } from "@t3tools/shared/git";
 import { useNavigation, type StaticScreenProps } from "@react-navigation/native";
 import { useState } from "react";
-import { Platform, Pressable, ScrollView, useWindowDimensions, View } from "react-native";
-import { useSafeAreaInsets } from "react-native-safe-area-context";
 
 import { SheetHeader } from "../../../components/ui/SheetHeader";
-import { ScreenContent } from "../../../components/ui/ScreenContent";
-import { AppText as Text, AppTextInput as TextInput } from "../../../components/ui/AppText";
-import { cn } from "../../../lib/cn";
+import { FitSheet } from "../../../components/ui/FitSheet";
+import { FormField, FormSection } from "../../../components/ui/FormSection";
+import { ListChoiceRow } from "../../../components/ui/ListChoiceRow";
+import { ListSection } from "../../../components/ui/ListSection";
 import { useEnvironmentQuery } from "../../../state/query";
 import { useThreadSelection } from "../../../state/use-thread-selection";
 import { useSelectedThreadGitActions } from "../../../state/use-selected-thread-git-actions";
@@ -23,8 +22,6 @@ type GitBranchesSheetProps = StaticScreenProps<{
 
 export function GitBranchesSheet(_props: GitBranchesSheetProps) {
   const navigation = useNavigation();
-  const insets = useSafeAreaInsets();
-  const { height: windowHeight } = useWindowDimensions();
   const { selectedThread } = useThreadSelection();
   const { selectedThreadCwd } = useSelectedThreadWorktree();
   const gitState = useSelectedThreadGitState();
@@ -62,160 +59,113 @@ export function GitBranchesSheet(_props: GitBranchesSheetProps) {
   const disabledExistingBranches = new Set(disabledExistingBranchNames);
 
   return (
-    <View
-      collapsable={false}
-      className="bg-sheet ios:flex-1 android:flex-col-reverse"
-      style={Platform.OS === "android" ? { maxHeight: windowHeight * 0.92 } : undefined}
+    <FitSheet
+      header={<SheetHeader title="Branches & worktrees" onClose={() => navigation.goBack()} />}
+      keyboardShouldPersistTaps="handled"
+      showsVerticalScrollIndicator={false}
     >
-      <ScreenContent fitToContents>
-        <ScrollView
-          nestedScrollEnabled
-          className="android:shrink android:grow-0 ios:flex-1"
-          contentInsetAdjustmentBehavior="automatic"
-          keyboardShouldPersistTaps="handled"
-          showsVerticalScrollIndicator={false}
-          contentInset={{ bottom: Math.max(insets.bottom, 18) + 18 }}
-          contentContainerClassName="android:gap-2 android:p-2 ios:gap-4 ios:px-5 ios:pt-2"
-          contentContainerStyle={
-            Platform.OS === "android"
-              ? { paddingBottom: Math.max(insets.bottom, 18) + 18 }
-              : undefined
+      <FormSection title="New branch">
+        <FormField
+          value={newBranchName}
+          onChangeText={setNewBranchName}
+          placeholder="feature/mobile-polish"
+          accessibilityLabel="New branch name"
+        />
+        <SheetActionButton
+          icon="plus"
+          label="Create & checkout"
+          tone="primary"
+          disabled={!canChangeThreadBranch || busy || newBranchName.trim().length === 0}
+          onPress={() => {
+            const branch = sanitizeFeatureBranchName(newBranchName.trim());
+            if (branch.length === 0) return;
+            void gitActions.onCreateSelectedThreadBranch(branch).then((result) => {
+              if (result === null) return;
+              setNewBranchName("");
+              navigation.goBack();
+            });
+          }}
+        />
+      </FormSection>
+
+      <FormSection title="New worktree">
+        <FormField
+          label="Base branch"
+          value={worktreeBaseBranch}
+          onChangeText={setWorktreeBaseBranchOverride}
+          placeholder="main"
+          accessibilityLabel="Worktree base branch"
+        />
+        <FormField
+          label="New branch"
+          value={worktreeBranchName}
+          onChangeText={setWorktreeBranchName}
+          placeholder="feature/mobile-thread"
+          accessibilityLabel="Worktree branch name"
+        />
+        <SheetActionButton
+          icon="square.split.2x1"
+          label="Create worktree"
+          tone="primary"
+          disabled={
+            !canChangeThreadBranch ||
+            busy ||
+            worktreeBaseBranch.trim().length === 0 ||
+            worktreeBranchName.trim().length === 0
           }
-        >
-          <View className="bg-card android:gap-3 android:rounded-[20px] android:p-4 ios:gap-2 ios:rounded-[18px] ios:border ios:border-border ios:px-4 ios:py-4">
-            <Text className="android:text-foreground android:text-base android:font-t3-medium ios:text-foreground-secondary ios:text-2xs ios:font-t3-bold ios:tracking-[1px] ios:uppercase">
-              New branch
-            </Text>
-            <TextInput
-              value={newBranchName}
-              onChangeText={setNewBranchName}
-              placeholder="feature/mobile-polish"
-              accessibilityLabel="New branch name"
-              className="android:rounded-xl android:bg-sheet-solid ios:rounded-[18px]"
-            />
-            <SheetActionButton
-              icon="plus"
-              label="Create & checkout"
-              tone="primary"
-              disabled={!canChangeThreadBranch || busy || newBranchName.trim().length === 0}
+          onPress={() => {
+            const baseBranch = worktreeBaseBranch.trim();
+            const newBranch = worktreeBranchName.trim();
+            if (baseBranch.length === 0 || newBranch.length === 0) return;
+            void gitActions
+              .onCreateSelectedThreadWorktree({ baseBranch, newBranch })
+              .then((result) => {
+                if (result === null) return;
+                setWorktreeBranchName("");
+                navigation.goBack();
+              });
+          }}
+        />
+      </FormSection>
+
+      <ListSection
+        title="Existing branches"
+        footer={
+          branchesLoading
+            ? "Loading branches..."
+            : availableBranches.length === 0
+              ? "No local branches found."
+              : undefined
+        }
+      >
+        {availableBranches.map((branch, index) => {
+          const disabled = disabledExistingBranches.has(branch.name);
+          const subtitle = branch.worktreePath
+            ? branch.worktreePath === currentWorktreePath
+              ? "Checked out in this thread"
+              : "Checked out in another worktree"
+            : branch.isDefault
+              ? "Default branch"
+              : "Local branch";
+
+          return (
+            <ListChoiceRow
+              key={branch.name}
+              label={branch.name}
+              description={subtitle}
+              selected={branch.current}
+              separated={index > 0}
+              disabled={!canChangeThreadBranch || busy || disabled}
               onPress={() => {
-                const branch = sanitizeFeatureBranchName(newBranchName.trim());
-                if (branch.length === 0) return;
-                void gitActions.onCreateSelectedThreadBranch(branch).then((result) => {
+                void gitActions.onCheckoutSelectedThreadBranch(branch.name).then((result) => {
                   if (result === null) return;
-                  setNewBranchName("");
                   navigation.goBack();
                 });
               }}
             />
-          </View>
-
-          <View className="bg-card android:gap-3 android:rounded-[20px] android:p-4 ios:gap-2 ios:rounded-[18px] ios:border ios:border-border ios:px-4 ios:py-4">
-            <Text className="android:text-foreground android:text-base android:font-t3-medium ios:text-foreground-secondary ios:text-2xs ios:font-t3-bold ios:tracking-[1px] ios:uppercase">
-              New worktree
-            </Text>
-            {Platform.OS === "android" ? (
-              <Text className="text-foreground-secondary text-sm">Base branch</Text>
-            ) : null}
-            <TextInput
-              value={worktreeBaseBranch}
-              onChangeText={setWorktreeBaseBranchOverride}
-              placeholder="main"
-              accessibilityLabel="Worktree base branch"
-              className="android:rounded-xl android:bg-sheet-solid ios:rounded-[18px]"
-            />
-            {Platform.OS === "android" ? (
-              <Text className="text-foreground-secondary text-sm">New branch</Text>
-            ) : null}
-            <TextInput
-              value={worktreeBranchName}
-              onChangeText={setWorktreeBranchName}
-              placeholder="feature/mobile-thread"
-              accessibilityLabel="Worktree branch name"
-              className="android:rounded-xl android:bg-sheet-solid ios:rounded-[18px]"
-            />
-            <SheetActionButton
-              icon="square.split.2x1"
-              label="Create worktree"
-              tone="primary"
-              disabled={
-                !canChangeThreadBranch ||
-                busy ||
-                worktreeBaseBranch.trim().length === 0 ||
-                worktreeBranchName.trim().length === 0
-              }
-              onPress={() => {
-                const baseBranch = worktreeBaseBranch.trim();
-                const newBranch = worktreeBranchName.trim();
-                if (baseBranch.length === 0 || newBranch.length === 0) return;
-                void gitActions
-                  .onCreateSelectedThreadWorktree({ baseBranch, newBranch })
-                  .then((result) => {
-                    if (result === null) return;
-                    setWorktreeBranchName("");
-                    navigation.goBack();
-                  });
-              }}
-            />
-          </View>
-
-          <View className="gap-2">
-            <Text className="text-foreground-secondary android:px-4 android:pb-1 android:pt-3 android:text-sm android:font-t3-medium ios:text-2xs ios:font-t3-bold ios:tracking-[1px] ios:uppercase">
-              Existing branches
-            </Text>
-            {branchesLoading ? (
-              <Text className="text-foreground-secondary text-sm font-medium android:px-4">
-                Loading branches...
-              </Text>
-            ) : null}
-            {!branchesLoading && availableBranches.length === 0 ? (
-              <Text className="text-foreground-secondary text-sm font-medium android:px-4">
-                No local branches found.
-              </Text>
-            ) : null}
-            {availableBranches.map((branch) => {
-              const disabled = disabledExistingBranches.has(branch.name);
-              const subtitle = branch.worktreePath
-                ? branch.worktreePath === currentWorktreePath
-                  ? "Checked out in this thread"
-                  : "Checked out in another worktree"
-                : branch.isDefault
-                  ? "Default branch"
-                  : "Local branch";
-
-              return (
-                <Pressable
-                  key={branch.name}
-                  className={cn(
-                    "gap-1 px-4 py-3 disabled:opacity-[0.45] android:rounded-[20px] android:active:bg-subtle ios:rounded-[18px] ios:border",
-                    branch.current
-                      ? "android:bg-secondary ios:border-subtle-strong"
-                      : "android:bg-card ios:border-border",
-                  )}
-                  accessibilityRole="button"
-                  accessibilityState={{ selected: branch.current, disabled: busy || disabled }}
-                  disabled={!canChangeThreadBranch || busy || disabled}
-                  onPress={() => {
-                    void gitActions.onCheckoutSelectedThreadBranch(branch.name).then((result) => {
-                      if (result === null) return;
-                      navigation.goBack();
-                    });
-                  }}
-                >
-                  {Platform.OS !== "android" ? (
-                    <View className="absolute inset-0 rounded-[18px] bg-card" />
-                  ) : null}
-                  <Text className="text-foreground text-base android:font-t3-medium ios:font-t3-bold">
-                    {branch.name}
-                  </Text>
-                  <Text className="text-foreground-secondary text-xs font-medium">{subtitle}</Text>
-                </Pressable>
-              );
-            })}
-          </View>
-        </ScrollView>
-      </ScreenContent>
-      <SheetHeader title="Branches & worktrees" onClose={() => navigation.goBack()} />
-    </View>
+          );
+        })}
+      </ListSection>
+    </FitSheet>
   );
 }
diff --git a/apps/mobile/src/features/threads/git/GitCommitSheet.tsx b/apps/mobile/src/features/threads/git/GitCommitSheet.tsx
index 637dab6768cf..fb1f7a19af67 100644
--- a/apps/mobile/src/features/threads/git/GitCommitSheet.tsx
+++ b/apps/mobile/src/features/threads/git/GitCommitSheet.tsx
@@ -1,11 +1,10 @@
-import { ScreenContent } from "../../../components/ui/ScreenContent";
+import { FitSheet } from "../../../components/ui/FitSheet";
 import { SheetHeader } from "../../../components/ui/SheetHeader";
 import { Button } from "../../../components/ui/Button";
 import { useNavigation, type StaticScreenProps } from "@react-navigation/native";
 import { useState } from "react";
-import { Platform, Pressable, ScrollView, useWindowDimensions, View } from "react-native";
+import { Pressable, View } from "react-native";
 import { formatDiffCount } from "@t3tools/client-runtime/diff-count";
-import { useSafeAreaInsets } from "react-native-safe-area-context";
 
 import { SymbolView } from "../../../components/ui/AppSymbol";
 import { AppText as Text, AppTextInput as TextInput } from "../../../components/ui/AppText";
@@ -24,8 +23,6 @@ type GitCommitSheetProps = StaticScreenProps<{
 
 export function GitCommitSheet(_props: GitCommitSheetProps) {
   const navigation = useNavigation();
-  const insets = useSafeAreaInsets();
-  const { height: windowHeight } = useWindowDimensions();
   const { selectedThread } = useThreadSelection();
   const { selectedThreadCwd } = useSelectedThreadWorktree();
   const gitState = useSelectedThreadGitState();
@@ -66,168 +63,149 @@ export function GitCommitSheet(_props: GitCommitSheetProps) {
     });
   };
 
-  const android = Platform.OS === "android";
-  const header = (
-    <SheetHeader
-      title="Commit changes"
-      subtitle={gitStatus.data?.refName ?? "(detached HEAD)"}
-      onCancel={() => navigation.goBack()}
-      accessibilityLabel="Cancel commit"
-    />
-  );
-
   return (
-    // Material sheet drags follow the first nested-scrolling native view, and the inline
-    // header's Compose button is one, so Android renders content first and reverses the column.
-    <View
-      collapsable={false}
-      className="bg-sheet ios:flex-1 android:flex-col-reverse"
-      style={android ? { maxHeight: windowHeight * 0.92 } : undefined}
+    <FitSheet
+      header={
+        <SheetHeader
+          title="Commit changes"
+          subtitle={gitStatus.data?.refName ?? "(detached HEAD)"}
+          onCancel={() => navigation.goBack()}
+          accessibilityLabel="Cancel commit"
+        />
+      }
+      keyboardShouldPersistTaps="handled"
+      keyboardDismissMode="on-drag"
+      automaticallyAdjustKeyboardInsets
+      contentContainerClassName="px-5 pt-4 gap-5"
     >
-      <ScreenContent fitToContents>
-        <ScrollView
-          nestedScrollEnabled
-          contentInsetAdjustmentBehavior="automatic"
-          className="android:shrink android:grow-0 ios:flex-1"
-          keyboardShouldPersistTaps="handled"
-          keyboardDismissMode="on-drag"
-          automaticallyAdjustKeyboardInsets
-          contentContainerClassName="px-5 pt-4 pb-6 gap-5"
-          contentContainerStyle={{ paddingBottom: Math.max(insets.bottom, 18) + 18 }}
-        >
-          {isDefaultRef ? (
-            <Text className="text-sm text-warning-foreground">
-              You’re on the default branch. You can create a new branch when committing.
-            </Text>
-          ) : null}
-          <View className="gap-2">
-            <Text className="text-sm font-t3-medium text-foreground">Commit message</Text>
-            <TextInput
-              multiline
-              accessibilityLabel="Commit message"
-              value={dialogCommitMessage}
-              onChangeText={setDialogCommitMessage}
-              placeholder="Describe your changes…"
-              textAlignVertical="top"
-              className="min-h-24 rounded-xl bg-subtle px-4 py-3 text-base"
-            />
+      {isDefaultRef ? (
+        <Text className="text-sm text-warning-foreground">
+          You’re on the default branch. You can create a new branch when committing.
+        </Text>
+      ) : null}
+      <View className="gap-2">
+        <Text className="text-sm font-t3-medium text-foreground">Commit message</Text>
+        <TextInput
+          multiline
+          accessibilityLabel="Commit message"
+          value={dialogCommitMessage}
+          onChangeText={setDialogCommitMessage}
+          placeholder="Describe your changes…"
+          textAlignVertical="top"
+          className="min-h-24 rounded-xl bg-subtle px-4 py-3 text-base"
+        />
+        <Text className="text-xs text-foreground-muted">
+          Leave empty to generate a message automatically.
+        </Text>
+      </View>
+      <View>
+        <View className="flex-row items-center justify-between gap-2 pb-2">
+          <View className="flex-1 gap-1">
+            <Text className="text-base font-t3-bold text-foreground">Changed files</Text>
             <Text className="text-xs text-foreground-muted">
-              Leave empty to generate a message automatically.
+              {selectedFiles.length} of {allFiles.length} selected · +
+              {formatDiffCount(selectedInsertions)} −{formatDiffCount(selectedDeletions)}
             </Text>
           </View>
-          <View>
-            <View className="flex-row items-center justify-between gap-2 pb-2">
-              <View className="flex-1 gap-1">
-                <Text className="text-base font-t3-bold text-foreground">Changed files</Text>
-                <Text className="text-xs text-foreground-muted">
-                  {selectedFiles.length} of {allFiles.length} selected · +
-                  {formatDiffCount(selectedInsertions)} −{formatDiffCount(selectedDeletions)}
-                </Text>
-              </View>
-              {allFiles.length > 0 ? (
-                <Button
-                  label={allSelected ? "Deselect all" : "Select all"}
-                  tone="text"
-                  onPress={() =>
-                    setExcludedFiles(
-                      allSelected ? new Set(allFiles.map((file) => file.path)) : new Set(),
-                    )
-                  }
-                />
-              ) : null}
-            </View>
-            {allFiles.length === 0 ? (
-              <Text className="py-4 text-sm text-foreground-muted">
-                No changed files to commit.
-              </Text>
-            ) : (
-              allFiles.map((file) => {
-                const included = !excludedFiles.has(file.path);
-                const slash = file.path.lastIndexOf("/");
-                const name = file.path.slice(slash + 1);
-                const directory = slash >= 0 ? file.path.slice(0, slash) : null;
-                return (
-                  <Pressable
-                    key={file.path}
-                    className="min-h-16 flex-row items-center gap-3 border-t border-border-subtle py-3"
-                    accessibilityRole="checkbox"
-                    accessibilityLabel={file.path}
-                    accessibilityState={{ checked: included }}
-                    onPress={() =>
-                      setExcludedFiles((current) => {
-                        const next = new Set(current);
-                        if (next.has(file.path)) next.delete(file.path);
-                        else next.add(file.path);
-                        return next;
-                      })
-                    }
-                  >
-                    <View
-                      className={cn(
-                        "size-5 items-center justify-center rounded-full",
-                        included ? "bg-primary" : "border border-input-border",
-                      )}
-                    >
-                      {included ? (
-                        <SymbolView
-                          name="checkmark"
-                          size={13}
-                          tintColorClassName="accent-primary-foreground"
-                        />
-                      ) : null}
-                    </View>
-                    <View className="flex-1 gap-1">
-                      <Text
-                        numberOfLines={1}
-                        ellipsizeMode="middle"
-                        className="text-sm font-t3-medium text-foreground"
-                      >
-                        {name}
-                      </Text>
-                      {directory ? (
-                        <Text
-                          numberOfLines={1}
-                          ellipsizeMode="middle"
-                          className="text-xs text-foreground-muted"
-                        >
-                          {directory}
-                        </Text>
-                      ) : null}
-                    </View>
-                    <View className="flex-row gap-2">
-                      <Text className="text-xs text-adaptive-emerald-700-300">
-                        +{formatDiffCount(file.insertions)}
-                      </Text>
-                      <Text className="text-xs text-adaptive-rose-700-300">
-                        −{formatDiffCount(file.deletions)}
-                      </Text>
-                    </View>
-                  </Pressable>
-                );
-              })
-            )}
-          </View>
-          <View className="gap-2">
-            <Button
-              label="Commit changes"
-              icon="checkmark"
-              tone="primary"
-              fullWidth
-              disabled={!canWriteSourceControl || noneSelected || busy}
-              onPress={() => void runCommitAction(false)}
-            />
+          {allFiles.length > 0 ? (
             <Button
-              label="Commit on a new branch"
-              icon="arrow.branch"
+              label={allSelected ? "Deselect all" : "Select all"}
               tone="text"
-              fullWidth
-              disabled={!canWriteSourceControl || !canChangeThreadBranch || noneSelected || busy}
-              onPress={() => void runCommitAction(true)}
+              onPress={() =>
+                setExcludedFiles(
+                  allSelected ? new Set(allFiles.map((file) => file.path)) : new Set(),
+                )
+              }
             />
-          </View>
-        </ScrollView>
-      </ScreenContent>
-      {header}
-    </View>
+          ) : null}
+        </View>
+        {allFiles.length === 0 ? (
+          <Text className="py-4 text-sm text-foreground-muted">No changed files to commit.</Text>
+        ) : (
+          allFiles.map((file) => {
+            const included = !excludedFiles.has(file.path);
+            const slash = file.path.lastIndexOf("/");
+            const name = file.path.slice(slash + 1);
+            const directory = slash >= 0 ? file.path.slice(0, slash) : null;
+            return (
+              <Pressable
+                key={file.path}
+                className="min-h-16 flex-row items-center gap-3 border-t border-border-subtle py-3"
+                accessibilityRole="checkbox"
+                accessibilityLabel={file.path}
+                accessibilityState={{ checked: included }}
+                onPress={() =>
+                  setExcludedFiles((current) => {
+                    const next = new Set(current);
+                    if (next.has(file.path)) next.delete(file.path);
+                    else next.add(file.path);
+                    return next;
+                  })
+                }
+              >
+                <View
+                  className={cn(
+                    "size-5 items-center justify-center rounded-full",
+                    included ? "bg-primary" : "border border-input-border",
+                  )}
+                >
+                  {included ? (
+                    <SymbolView
+                      name="checkmark"
+                      size={13}
+                      tintColorClassName="accent-primary-foreground"
+                    />
+                  ) : null}
+                </View>
+                <View className="flex-1 gap-1">
+                  <Text
+                    numberOfLines={1}
+                    ellipsizeMode="middle"
+                    className="text-sm font-t3-medium text-foreground"
+                  >
+                    {name}
+                  </Text>
+                  {directory ? (
+                    <Text
+                      numberOfLines={1}
+                      ellipsizeMode="middle"
+                      className="text-xs text-foreground-muted"
+                    >
+                      {directory}
+                    </Text>
+                  ) : null}
+                </View>
+                <View className="flex-row gap-2">
+                  <Text className="text-xs text-adaptive-emerald-700-300">
+                    +{formatDiffCount(file.insertions)}
+                  </Text>
+                  <Text className="text-xs text-adaptive-rose-700-300">
+                    −{formatDiffCount(file.deletions)}
+                  </Text>
+                </View>
+              </Pressable>
+            );
+          })
+        )}
+      </View>
+      <View className="gap-2">
+        <Button
+          label="Commit changes"
+          icon="checkmark"
+          tone="primary"
+          fullWidth
+          disabled={!canWriteSourceControl || noneSelected || busy}
+          onPress={() => void runCommitAction(false)}
+        />
+        <Button
+          label="Commit on a new branch"
+          icon="arrow.branch"
+          tone="text"
+          fullWidth
+          disabled={!canWriteSourceControl || !canChangeThreadBranch || noneSelected || busy}
+          onPress={() => void runCommitAction(true)}
+        />
+      </View>
+    </FitSheet>
   );
 }
diff --git a/apps/mobile/src/features/threads/git/GitConfirmSheet.tsx b/apps/mobile/src/features/threads/git/GitConfirmSheet.tsx
index ae840b63ad27..ffe2548f6d79 100644
--- a/apps/mobile/src/features/threads/git/GitConfirmSheet.tsx
+++ b/apps/mobile/src/features/threads/git/GitConfirmSheet.tsx
@@ -5,13 +5,11 @@ import * as Arr from "effect/Array";
 import * as Result from "effect/Result";
 import { StackActions, useNavigation, type StaticScreenProps } from "@react-navigation/native";
 import { useCallback, useMemo } from "react";
-import { Platform, ScrollView, useWindowDimensions, View } from "react-native";
-
-import { useSafeAreaInsets } from "react-native-safe-area-context";
+import { View } from "react-native";
 
 import { SheetHeader } from "../../../components/ui/SheetHeader";
-import { ScreenContent } from "../../../components/ui/ScreenContent";
-import { AppText as Text } from "../../../components/ui/AppText";
+import { FitSheet } from "../../../components/ui/FitSheet";
+import { SheetIntro } from "../../../components/ui/SheetIntro";
 import { useSelectedThreadGitActions } from "../../../state/use-selected-thread-git-actions";
 import { useSelectedThreadGitState } from "../../../state/use-selected-thread-git-state";
 import { useThreadSelection } from "../../../state/use-thread-selection";
@@ -29,8 +27,6 @@ type GitConfirmSheetProps = StaticScreenProps<{
 
 export function GitConfirmSheet(props: GitConfirmSheetProps) {
   const navigation = useNavigation();
-  const insets = useSafeAreaInsets();
-  const { height: windowHeight } = useWindowDimensions();
   const gitState = useSelectedThreadGitState();
   const gitActions = useSelectedThreadGitActions();
   const { canWriteSourceControl, canChangeThreadBranch } = gitActions;
@@ -115,62 +111,31 @@ export function GitConfirmSheet(props: GitConfirmSheetProps) {
   ]);
 
   return (
-    <View
-      collapsable={false}
-      className="bg-sheet ios:flex-1 android:flex-col-reverse"
-      style={Platform.OS === "android" ? { maxHeight: windowHeight * 0.92 } : undefined}
+    <FitSheet
+      header={<SheetHeader title="Confirm action" onClose={() => navigation.goBack()} />}
+      showsVerticalScrollIndicator={false}
     >
-      <ScreenContent fitToContents>
-        <ScrollView
-          nestedScrollEnabled
-          className="android:shrink android:grow-0 ios:flex-1"
-          showsVerticalScrollIndicator={false}
-          contentContainerClassName="android:gap-2 android:p-2"
-          contentContainerStyle={
-            Platform.OS === "android"
-              ? { paddingBottom: Math.max(insets.bottom, 18) + 8 }
-              : undefined
-          }
-        >
-          <View className="android:gap-2 android:rounded-[20px] android:bg-card android:p-3 ios:items-center ios:gap-1 ios:px-5 ios:pb-3 ios:pt-4">
-            {Platform.OS !== "android" ? (
-              <Text className="text-xs font-t3-bold tracking-[1px] uppercase text-foreground-muted">
-                Confirm
-              </Text>
-            ) : null}
-            <Text className="android:text-xl android:font-t3-medium ios:text-center ios:text-3xl ios:font-t3-bold">
-              {copy?.title ?? "Run action on default branch?"}
-            </Text>
-            <Text className="text-foreground-secondary leading-normal android:text-base ios:text-center ios:text-sm ios:font-medium">
-              {copy?.description ?? "Choose how to continue."}
-            </Text>
-          </View>
+      <SheetIntro
+        eyebrow="Confirm"
+        title={copy?.title ?? "Run action on default branch?"}
+        description={copy?.description ?? "Choose how to continue."}
+      />
 
-          <View
-            className="android:gap-2 ios:gap-3 ios:px-5 ios:pt-2"
-            style={
-              Platform.OS === "android"
-                ? undefined
-                : { paddingBottom: Math.max(insets.bottom, 18) + 8 }
-            }
-          >
-            <SheetActionButton
-              icon="arrow.right.circle"
-              label={copy?.continueLabel ?? "Continue"}
-              disabled={!canWriteSourceControl}
-              onPress={() => void continuePendingAction()}
-            />
-            <SheetActionButton
-              icon="arrow.branch"
-              label="Feature branch & continue"
-              disabled={!canChangeThreadBranch}
-              tone="primary"
-              onPress={() => void movePendingActionToFeatureBranch()}
-            />
-          </View>
-        </ScrollView>
-      </ScreenContent>
-      <SheetHeader title="Confirm action" onClose={() => navigation.goBack()} />
-    </View>
+      <View className="gap-3">
+        <SheetActionButton
+          icon="arrow.right.circle"
+          label={copy?.continueLabel ?? "Continue"}
+          disabled={!canWriteSourceControl}
+          onPress={() => void continuePendingAction()}
+        />
+        <SheetActionButton
+          icon="arrow.branch"
+          label="Feature branch & continue"
+          disabled={!canChangeThreadBranch}
+          tone="primary"
+          onPress={() => void movePendingActionToFeatureBranch()}
+        />
+      </View>
+    </FitSheet>
   );
 }
diff --git a/apps/mobile/src/features/threads/git/GitOverviewSheet.tsx b/apps/mobile/src/features/threads/git/GitOverviewSheet.tsx
index 43e541083688..c3a591f50ef4 100644
--- a/apps/mobile/src/features/threads/git/GitOverviewSheet.tsx
+++ b/apps/mobile/src/features/threads/git/GitOverviewSheet.tsx
@@ -1,5 +1,4 @@
 import * as Dialog from "../../../components/ui/Dialog";
-import { cn } from "../../../lib/cn";
 import { useOpenPullRequest } from "../../../native/useOpenPullRequest";
 import {
   type GitActionRequestInput,
@@ -16,14 +15,16 @@ import {
   type StaticScreenProps,
 } from "@react-navigation/native";
 import { use, useEffect, useState } from "react";
-import { Platform, RefreshControl, View } from "react-native";
+import { RefreshControl } from "../../../components/ui/RefreshControl";
 import { NativeScrollView } from "../../../native/NativeScrollViewMarker";
 
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { AppBar } from "../../../components/ui/AppBar";
 import { ListRow } from "../../../components/ui/ListRow";
 import { ListSection } from "../../../components/ui/ListSection";
+import { groupedListInsets } from "../../../components/ui/listMetrics";
 import { ScreenContent } from "../../../components/ui/ScreenContent";
+import { SheetPane } from "../../../components/ui/SheetPane";
 import { InspectorSheetContext } from "../../layout/workspace-inspector-sheet";
 import { AppText as Text } from "../../../components/ui/AppText";
 import { useEnvironmentQuery } from "../../../state/query";
@@ -231,15 +232,11 @@ function GitOverviewSheetContent(props: GitOverviewSheetProps) {
     <NativeScrollView
       nestedScrollEnabled
       alwaysBounceVertical
-      className="flex-1 android:bg-sheet-solid ios:bg-screen"
+      className="flex-1 bg-screen"
       contentInsetAdjustmentBehavior="automatic"
       showsVerticalScrollIndicator={false}
       contentInset={{ bottom: Math.max(insets.bottom, 18) + 18 }}
-      contentContainerStyle={{
-        paddingHorizontal: Platform.OS === "android" ? 8 : isInspector ? 12 : 20,
-        paddingTop: 8,
-        gap: Platform.OS === "android" ? 8 : 14,
-      }}
+      contentContainerStyle={{ ...groupedListInsets(isInspector), paddingTop: 8 }}
       refreshControl={
         <RefreshControl refreshing={isRefreshing} onRefresh={() => void handleRefresh()} />
       }
@@ -344,10 +341,7 @@ function GitOverviewSheetContent(props: GitOverviewSheetProps) {
   };
 
   return (
-    <View
-      collapsable={false}
-      className={cn("flex-1 android:bg-header", isInspector ? "ios:bg-screen" : "ios:bg-sheet")}
-    >
+    <SheetPane surface={isInspector ? "screen" : "sheet"}>
       <AppBar
         title={currentBranchLabel}
         subtitle={currentStatusSummary}
@@ -356,6 +350,6 @@ function GitOverviewSheetContent(props: GitOverviewSheetProps) {
         refresh={refresh}
       />
       <ScreenContent insetHorizontal={isInspector ? true : undefined}>{content}</ScreenContent>
-    </View>
+    </SheetPane>
   );
 }
diff --git a/apps/mobile/src/features/threads/new-task-flow-provider.test.tsx b/apps/mobile/src/features/threads/new-task-flow-provider.test.tsx
index 3b91dbb122ff..05ccf29b2ae7 100644
--- a/apps/mobile/src/features/threads/new-task-flow-provider.test.tsx
+++ b/apps/mobile/src/features/threads/new-task-flow-provider.test.tsx
@@ -4,6 +4,7 @@ import { EnvironmentRegistry } from "@t3tools/client-runtime/connection";
 import { createEnvironmentSubscriptionAtomFamily } from "@t3tools/client-runtime/state/runtime";
 import {
   AuthFilesystemReadScope,
+  DEFAULT_SERVER_SETTINGS,
   EnvironmentId,
   ProjectId,
   type VcsListRefsResult,
@@ -32,6 +33,9 @@ const mocks = vi.hoisted(() => ({
   retargetDraft: vi.fn(),
   writeSettings: vi.fn(),
   writeText: vi.fn(),
+  serverConfig: vi.fn(),
+  openScratch: vi.fn(),
+  prepareTriage: vi.fn(),
 }));
 vi.mock("../../state/atom-registry", () => ({
   appAtomRegistry: {
@@ -43,7 +47,7 @@ vi.mock("../../state/atom-registry", () => ({
 vi.mock("../../state/entities", () => ({
   useProjects: mocks.projects,
   useThreadShells: () => [],
-  useEnvironmentServerConfig: () => null,
+  useEnvironmentServerConfig: () => mocks.serverConfig() ?? null,
   useServerConfigs: () => new Map(),
 }));
 vi.mock("../../state/vcs", () => ({
@@ -66,7 +70,8 @@ vi.mock("../../state/project-grouping", () => ({
   useMobileProjectGroupingSettings: () => ({ sidebarProjectGroupingMode: "none" }),
 }));
 vi.mock("../../components/ui/Dialog", () => ({ alert: vi.fn() }));
-vi.mock("../../state/use-atom-command", () => ({ useAtomCommand: () => vi.fn() }));
+vi.mock("../../state/use-atom-command", () => ({ useAtomCommand: () => mocks.openScratch }));
+vi.mock("../triage/usePrepareTriage", () => ({ usePrepareTriage: () => mocks.prepareTriage }));
 vi.mock("../../state/use-remote-environment-registry", () => ({
   useSavedRemoteConnections: () => ({ savedConnectionsById: {} }),
   useRemoteConnectionStatus: () => ({ connectedEnvironments: [] }),
@@ -362,3 +367,78 @@ it("uses cached repository capability and branch defaults while offline", async
   expect(screen.current.draftKey).toBe(draftKey);
   expect(screen.current.selectedBranchName).toBe("main");
 });
+
+const playbookPrompt = (machine: string) =>
+  `Read [triage-playbook.md](/${machine}/triage-playbook.md) and follow it. `;
+
+/** A triage draft on machine one's No project home; machine two opens its own. */
+async function renderTriageDraft(screen: ReturnType<typeof setup>) {
+  mocks.serverConfig.mockReturnValue({
+    scratchWorkspaceRoot: "/a",
+    providers: [],
+    settings: DEFAULT_SERVER_SETTINGS,
+  });
+  mocks.openScratch.mockResolvedValue({ _tag: "Success", value: screen.projects[2] });
+  await screen.render(true);
+  act(() => screen.current.setPrompt(`${playbookPrompt("one")}It is slow.`));
+}
+
+it("takes a triage draft's session along when its machine changes", async () => {
+  using screen = setup();
+  await renderTriageDraft(screen);
+  mocks.prepareTriage.mockResolvedValue({
+    _tag: "Success",
+    value: { prompt: playbookPrompt("two") },
+  });
+
+  await act(async () => {
+    await screen.current.switchEnvironment(EnvironmentId.make("two"));
+  });
+
+  expect(screen.current.prompt).toBe(`${playbookPrompt("two")}It is slow.`);
+  expect(screen.current.selectedProject).toEqual(screen.projects[2]);
+});
+
+it.each([
+  [
+    "a project is picked",
+    1,
+    (flow: ReturnType<typeof useNewTaskFlow>, picked: EnvironmentProject) =>
+      flow.setProject(picked),
+  ],
+  [
+    "a send starts and ends",
+    0,
+    (flow: ReturnType<typeof useNewTaskFlow>) => {
+      flow.setSubmitting(true);
+      flow.setSubmitting(false);
+    },
+  ],
+] as const)(
+  "leaves a triage draft alone when %s while its new machine prepares",
+  async (_name, expectedProject, interrupt) => {
+    using screen = setup();
+    await renderTriageDraft(screen);
+    let finishPreparing!: (result: unknown) => void;
+    mocks.prepareTriage.mockReturnValue(
+      new Promise((resolve) => {
+        finishPreparing = resolve;
+      }),
+    );
+
+    let switching!: Promise<boolean>;
+    act(() => {
+      switching = screen.current.switchEnvironment(EnvironmentId.make("two"));
+    });
+    await act(async () => interrupt(screen.current, screen.projects[1]!));
+    let switched = true;
+    await act(async () => {
+      finishPreparing({ _tag: "Success", value: { prompt: playbookPrompt("two") } });
+      switched = await switching;
+    });
+
+    expect(switched).toBe(false);
+    expect(screen.current.prompt).toBe(`${playbookPrompt("one")}It is slow.`);
+    expect(screen.current.selectedProject).toEqual(screen.projects[expectedProject]);
+  },
+);
diff --git a/apps/mobile/src/features/threads/new-task-flow-provider.tsx b/apps/mobile/src/features/threads/new-task-flow-provider.tsx
index 5a8d7a1aa78f..d78dd73b1840 100644
--- a/apps/mobile/src/features/threads/new-task-flow-provider.tsx
+++ b/apps/mobile/src/features/threads/new-task-flow-provider.tsx
@@ -19,6 +19,7 @@ import {
   ThreadId,
 } from "@t3tools/contracts";
 import { threadContextsOutsideEnvironment } from "@t3tools/shared/composerContextReferences";
+import { isTriagePrompt, replaceTriagePlaybookLink } from "@t3tools/shared/triagePrompt";
 import * as Arr from "effect/Array";
 import { pipe } from "effect/Function";
 
@@ -102,6 +103,7 @@ import {
   stampedEnvironmentProjectsLoading,
   updateNewTaskFlowState,
 } from "./new-task-flow-state";
+import { usePrepareTriage } from "../triage/usePrepareTriage";
 import { useEnvironmentShellReadiness } from "../../state/shell";
 import { useConnectionsReady, useWorkspaceEnvironments } from "../../state/workspace";
 
@@ -589,6 +591,7 @@ export function NewTaskFlowProvider(
   };
 
   const openScratch = useAtomCommand(projectEnvironment.openScratch, { reportFailure: false });
+  const prepareTriage = usePrepareTriage();
   const [switchingToEnvironmentId, setSwitchingToEnvironmentId] = useState<EnvironmentId | null>(
     null,
   );
@@ -606,11 +609,27 @@ export function NewTaskFlowProvider(
     const request = {};
     latestSwitchRef.current = request;
     setSwitchingToEnvironmentId(environmentId);
-    const result = await openScratch({ environmentId, input: {} });
+    // A triage draft takes its session along: the playbook and context files
+    // exist only on the machine that prepared them.
+    const { draftKey, projectKey } = readFlow();
+    const triage =
+      draftKey !== null && isTriagePrompt(getComposerDraftSnapshot(draftKey).text)
+        ? await prepareTriage(environmentId)
+        : null;
+    const result =
+      triage?._tag === "Failure" ? triage : await openScratch({ environmentId, input: {} });
     if (latestSwitchRef.current !== request) return false;
     latestSwitchRef.current = null;
     setSwitchingToEnvironmentId(null);
+    // A project picked while this waited stands.
+    if (readFlow().projectKey !== projectKey) return false;
     if (result._tag === "Success") {
+      if (triage?._tag === "Success" && draftKey !== null && readFlow().draftKey === draftKey) {
+        // Read now, so text typed while the machine prepared the session is kept.
+        const text = getComposerDraftSnapshot(draftKey).text;
+        const nextText = replaceTriagePlaybookLink(text, triage.value.prompt);
+        if (nextText !== text) setComposerDraftText(draftKey, nextText);
+      }
       setProject(result.value);
       return true;
     }
@@ -620,7 +639,9 @@ export function NewTaskFlowProvider(
         "Could not switch machine",
         error instanceof Error
           ? error.message
-          : "The folder for threads without a project could not be created.",
+          : triage?._tag === "Failure"
+            ? "The server could not prepare triage."
+            : "The folder for threads without a project could not be created.",
       );
     }
     return false;
@@ -884,7 +905,14 @@ export function NewTaskFlowProvider(
     appendAttachments,
     removeAttachment,
     clearAttachments,
-    setSubmitting: (value: boolean) => updateFlow({ submitting: value }),
+    setSubmitting: (value: boolean) => {
+      // A send takes the draft as it is, so a machine switch still waiting is dropped.
+      if (value) {
+        latestSwitchRef.current = null;
+        setSwitchingToEnvironmentId(null);
+      }
+      updateFlow({ submitting: value });
+    },
     loadBranches,
     setRuntimeMode,
     setSelectedModelOptions,
diff --git a/apps/mobile/src/features/threads/use-composer-command-menu.ts b/apps/mobile/src/features/threads/use-composer-command-menu.ts
index 1e66bf4ee2c8..a77f7089c97b 100644
--- a/apps/mobile/src/features/threads/use-composer-command-menu.ts
+++ b/apps/mobile/src/features/threads/use-composer-command-menu.ts
@@ -1,3 +1,4 @@
+import { threadPullRequestKeyOf } from "@t3tools/client-runtime/thread-pull-requests";
 import * as Dialog from "../../components/ui/Dialog";
 import type {
   EnvironmentId,
@@ -358,7 +359,7 @@ export function useComposerCommandMenu({
 
     if (trigger.kind === "pull-request") {
       return pullRequestSearch.entries.map((entry) => ({
-        id: `pr:${entry.projectId}:${entry.repository}:${entry.number}`,
+        id: `pr:${entry.projectId}:${threadPullRequestKeyOf(entry)}`,
         type: "pull-request",
         pullRequest: {
           number: entry.number,
diff --git a/apps/mobile/src/features/triage/usePrepareTriage.ts b/apps/mobile/src/features/triage/usePrepareTriage.ts
new file mode 100644
index 000000000000..94194275b2cc
--- /dev/null
+++ b/apps/mobile/src/features/triage/usePrepareTriage.ts
@@ -0,0 +1,19 @@
+import type { EnvironmentId } from "@t3tools/contracts";
+import Constants from "expo-constants";
+
+import { authClientMetadata } from "../../lib/authClientMetadata";
+import { serverEnvironment } from "../../state/server";
+import { useAtomCommand } from "../../state/use-atom-command";
+
+/**
+ * Asks a machine to prepare a triage session. The result carries the prompt
+ * that links its playbook; the caller reports a failure.
+ */
+export function usePrepareTriage() {
+  const prepare = useAtomCommand(serverEnvironment.prepareTriage, { reportFailure: false });
+  return (environmentId: EnvironmentId) =>
+    prepare({
+      environmentId,
+      input: { client: authClientMetadata(Constants.expoConfig?.version) },
+    });
+}
diff --git a/apps/mobile/src/features/triage/useStartTriage.ts b/apps/mobile/src/features/triage/useStartTriage.ts
index eb9eef24b267..7f8851e39a4e 100644
--- a/apps/mobile/src/features/triage/useStartTriage.ts
+++ b/apps/mobile/src/features/triage/useStartTriage.ts
@@ -6,12 +6,9 @@ import {
 import type { EnvironmentId } from "@t3tools/contracts";
 import { useNavigation } from "@react-navigation/native";
 import * as Clipboard from "expo-clipboard";
-import Constants from "expo-constants";
 
 import * as Dialog from "../../components/ui/Dialog";
-import { authClientMetadata } from "../../lib/authClientMetadata";
 import { projectEnvironment } from "../../state/projects";
-import { serverEnvironment } from "../../state/server";
 import { useAtomCommand } from "../../state/use-atom-command";
 import {
   createNewTaskDraft,
@@ -19,6 +16,7 @@ import {
   waitForComposerDraftsLoaded,
 } from "../../state/use-composer-drafts";
 import { useSelectWorkspaceDetail } from "../layout/workspace/useSelectWorkspaceDetail";
+import { usePrepareTriage } from "./usePrepareTriage";
 
 const CLI_COMMAND = "npx t3 triage";
 
@@ -29,7 +27,7 @@ const CLI_COMMAND = "npx t3 triage";
 export function useStartTriage() {
   const navigation = useNavigation();
   const selectDetail = useSelectWorkspaceDetail();
-  const prepare = useAtomCommand(serverEnvironment.prepareTriage, { reportFailure: false });
+  const prepare = usePrepareTriage();
   const openScratch = useAtomCommand(projectEnvironment.openScratch, { reportFailure: false });
 
   const fail = (message: string) =>
@@ -77,10 +75,7 @@ export function useStartTriage() {
       }
       return;
     }
-    const prepared = await prepare({
-      environmentId,
-      input: { client: authClientMetadata(Constants.expoConfig?.version) },
-    });
+    const prepared = await prepare(environmentId);
     if (prepared._tag === "Failure") {
       if (!isAtomCommandInterrupted(prepared)) {
         pipe(
diff --git a/apps/mobile/src/features/usage/UsageRouteScreen.tsx b/apps/mobile/src/features/usage/UsageRouteScreen.tsx
index 1b31460842f3..c5596d0826a2 100644
--- a/apps/mobile/src/features/usage/UsageRouteScreen.tsx
+++ b/apps/mobile/src/features/usage/UsageRouteScreen.tsx
@@ -28,7 +28,8 @@ import {
   usageSourceMessages,
 } from "@t3tools/shared/usageFormat";
 import { useRef, useState, type ReactNode } from "react";
-import { RefreshControl, View } from "react-native";
+import { View } from "react-native";
+import { RefreshControl } from "../../components/ui/RefreshControl";
 import Animated, { FadeIn, ReduceMotion } from "react-native-reanimated";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 
diff --git a/apps/mobile/src/features/voice-input/lazyVoiceRecorder.test.ts b/apps/mobile/src/features/voice-input/lazyVoiceRecorder.test.ts
index c16519c0ec79..da4ecdb402d1 100644
--- a/apps/mobile/src/features/voice-input/lazyVoiceRecorder.test.ts
+++ b/apps/mobile/src/features/voice-input/lazyVoiceRecorder.test.ts
@@ -143,7 +143,6 @@ describe("createLazyVoiceRecorder", () => {
           ownerKey: "thread",
           text: "",
           selection: { start: 0, end: 0 },
-          revision: 0,
         }),
         commitDraft: () => undefined,
         onStateChange: () => undefined,
diff --git a/apps/mobile/src/features/voice-input/useVoiceInputController.ts b/apps/mobile/src/features/voice-input/useVoiceInputController.ts
index e26672b5b480..e3152f3627fd 100644
--- a/apps/mobile/src/features/voice-input/useVoiceInputController.ts
+++ b/apps/mobile/src/features/voice-input/useVoiceInputController.ts
@@ -15,7 +15,6 @@ export function useVoiceInputController(input: {
   readonly ownerKey: string | null;
   readonly label: string;
   readonly readDraftMessage: () => string | null;
-  readonly subscribeToDraftChanges: (onChange: () => void) => () => void;
   readonly selection: ComposerEditorSelection;
   readonly disabled?: boolean;
   readonly onChangeDraftMessage: (value: string) => void;
@@ -58,7 +57,6 @@ export function useVoiceInputController(input: {
           }
         },
         captured.selection,
-        captured.subscribeToDraftChanges,
       ),
       label: captured.label,
     });
diff --git a/apps/mobile/src/features/voice-input/voiceInputSession.test.ts b/apps/mobile/src/features/voice-input/voiceInputSession.test.ts
index 9d30e376b54e..a935422c89df 100644
--- a/apps/mobile/src/features/voice-input/voiceInputSession.test.ts
+++ b/apps/mobile/src/features/voice-input/voiceInputSession.test.ts
@@ -1,6 +1,5 @@
 import { beforeEach, describe, expect, it, vi } from "vite-plus/test";
 import type { PreparedVoiceTranscription } from "@t3tools/client-runtime/voice-input";
-import { Atom, AtomRegistry } from "effect/reactivity";
 import { resetVoiceInputGlobalsForTests } from "../../../../../packages/client-runtime/src/voice-input/controller";
 import {
   acquireAudioSession,
@@ -23,19 +22,9 @@ import {
   createVoiceInputTarget,
   VoiceInputSession,
   type VoiceInputSessionDependencies,
-  type VoiceInputTarget,
   type VoiceRecordingSample,
 } from "./voiceInputSession";
 
-function createTarget(
-  ownerKey: string,
-  readText: () => string | null,
-  commit: VoiceInputTarget["commitDraft"],
-  selection: { start: number; end: number },
-) {
-  return createVoiceInputTarget(ownerKey, readText, commit, selection, () => () => {});
-}
-
 function createSession(
   overrides?: Partial<
     Pick<
@@ -116,7 +105,7 @@ describe("global voice input", () => {
       if (outcome === "activation failure") {
         audio.setActive.mockRejectedValueOnce(new Error("Audio activation failed"));
       }
-      await session.start(createTarget("first", () => "", vi.fn(), { start: 0, end: 0 }));
+      await session.start(createVoiceInputTarget("first", () => "", vi.fn(), { start: 0, end: 0 }));
       expect(pause).toHaveBeenCalledOnce();
       expect(isAudioSessionOwner(playback)).toBe(false);
       if (outcome === "complete") {
@@ -154,9 +143,9 @@ describe("global voice input", () => {
     async ({ selection, expected, cursor }) => {
       const { session } = createSession();
       const commit = vi.fn();
-      await session.start(createTarget("first", () => "hello world", commit, selection));
+      await session.start(createVoiceInputTarget("first", () => "hello world", commit, selection));
       await session.start(
-        createTarget("second", () => "other prompt", vi.fn(), { start: 12, end: 12 }),
+        createVoiceInputTarget("second", () => "other prompt", vi.fn(), { start: 12, end: 12 }),
       );
       await session.controller.stop();
       expect(commit).toHaveBeenCalledWith(expected, {
@@ -175,7 +164,7 @@ describe("global voice input", () => {
     let visibleDraft = "first";
     const targetKey = visibleDraft;
     await session.start(
-      createTarget(
+      createVoiceInputTarget(
         targetKey,
         () => drafts.get(targetKey) ?? null,
         (text) => drafts.set(targetKey, text),
@@ -207,7 +196,7 @@ describe("global voice input", () => {
       const firstCommit = vi.fn();
       const secondCommit = vi.fn();
       const starting = session.start(
-        createTarget("first", () => "first", firstCommit, { start: 5, end: 5 }),
+        createVoiceInputTarget("first", () => "first", firstCommit, { start: 5, end: 5 }),
       );
       await preparationEntered.promise;
       let stopping: Promise<void> | null = null;
@@ -226,7 +215,7 @@ describe("global voice input", () => {
         await transcriptionEntered.promise;
       }
       await session.start(
-        createTarget("second", () => "second", secondCommit, { start: 6, end: 6 }),
+        createVoiceInputTarget("second", () => "second", secondCommit, { start: 6, end: 6 }),
       );
       expect(session.ownerKey).toBe("first");
       expect(session.controller.currentState.phase).toBe(phase);
@@ -247,7 +236,9 @@ describe("global voice input", () => {
       const { session } = createSession();
       let text: string | null = "first";
       const commit = vi.fn();
-      await session.start(createTarget("first", () => text, commit, { start: 5, end: 5 }));
+      await session.start(
+        createVoiceInputTarget("first", () => text, commit, { start: 5, end: 5 }),
+      );
       text = change === "removed" ? null : "edited prompt";
       await session.controller.stop();
       expect(commit).not.toHaveBeenCalled();
@@ -255,10 +246,26 @@ describe("global voice input", () => {
     },
   );
 
+  it("retries a failed start against the draft as edited since", async () => {
+    const { session, prepare } = createSession();
+    prepare.mockRejectedValueOnce(new Error("model unavailable"));
+    let text = "first";
+    const commit = vi.fn();
+    await session.start(createVoiceInputTarget("first", () => text, commit, { start: 5, end: 5 }));
+    expect(session.controller.currentState.phase).toBe("error");
+    text = "first draft";
+    await session.retry();
+    await session.controller.stop();
+    expect(prepare).toHaveBeenCalledTimes(2);
+    expect(commit).toHaveBeenCalledWith("first spoken text draft", { start: 17, end: 17 });
+  });
+
   it("finishes the original draft at the recording limit while it is off screen", async () => {
     const { session, recorder } = createSession();
     const commit = vi.fn();
-    await session.start(createTarget("first", () => "first", commit, { start: 5, end: 5 }));
+    await session.start(
+      createVoiceInputTarget("first", () => "first", commit, { start: 5, end: 5 }),
+    );
     await session.controller.handleRecorderStatus({
       isFinished: true,
       hasError: false,
@@ -269,41 +276,14 @@ describe("global voice input", () => {
     expect(session.controller.currentState.phase).toBe("idle");
   });
 
-  it("rejects a transcript when its off-screen draft changes and returns to the original text", async () => {
-    const registry = AtomRegistry.make();
-    const draft = Atom.make("hello world");
-    const unsubscribe = vi.fn();
-    const { session } = createSession();
-    const commit = vi.fn();
-    const target = createVoiceInputTarget(
-      "first",
-      () => registry.get(draft),
-      commit,
-      { start: 6, end: 6 },
-      (onChange) => {
-        const stop = registry.subscribe(draft, onChange);
-        return () => {
-          stop();
-          unsubscribe();
-        };
-      },
-    );
-    await session.start(target);
-    registry.set(draft, "changed");
-    registry.set(draft, "hello world");
-    await session.controller.stop();
-    expect(commit).not.toHaveBeenCalled();
-    expect(session.controller.currentState.error).toContain("draft changed");
-    expect(unsubscribe).toHaveBeenCalledTimes(1);
-    registry.dispose();
-  });
-
   it("stops recording when its queued edit is discarded", async () => {
     const { session, recorder } = createSession();
     const commit = vi.fn();
     let draft: string | null = "queued prompt";
     const ownerKey = "thread~queued-edit~run";
-    await session.start(createTarget(ownerKey, () => draft, commit, { start: 13, end: 13 }));
+    await session.start(
+      createVoiceInputTarget(ownerKey, () => draft, commit, { start: 13, end: 13 }),
+    );
     session.cancel(ownerKey);
     draft = null;
     await session.controller.stop();
@@ -319,7 +299,9 @@ describe("global voice input", () => {
   it("keeps another prompt's recording when a queued edit is discarded", async () => {
     const { session, recorder } = createSession();
     const commit = vi.fn();
-    await session.start(createTarget("other prompt", () => "hello", commit, { start: 5, end: 5 }));
+    await session.start(
+      createVoiceInputTarget("other prompt", () => "hello", commit, { start: 5, end: 5 }),
+    );
     session.cancel("thread~queued-edit~run");
     expect(recorder.stop).not.toHaveBeenCalled();
     expect(session.controller.currentState.phase).toBe("recording");
@@ -338,12 +320,12 @@ describe("global voice input", () => {
     const oldCommit = vi.fn();
     const nextCommit = vi.fn();
     const firstStart = session.start(
-      createTarget("first", () => "first", oldCommit, { start: 5, end: 5 }),
+      createVoiceInputTarget("first", () => "first", oldCommit, { start: 5, end: 5 }),
     );
     await preparationEntered.promise;
     session.cancel("first");
     const nextStart = session.start(
-      createTarget("second", () => "second", nextCommit, { start: 6, end: 6 }),
+      createVoiceInputTarget("second", () => "second", nextCommit, { start: 6, end: 6 }),
     );
     expect(prepare).toHaveBeenCalledTimes(1);
     expect(recorder.record).not.toHaveBeenCalled();
@@ -366,7 +348,9 @@ describe("global voice input", () => {
       const snapshots: number[] = [];
       session.subscribe(() => snapshots.push(session.getSnapshot().elapsedSeconds));
 
-      await session.start(createTarget("first", () => "first", vi.fn(), { start: 5, end: 5 }));
+      await session.start(
+        createVoiceInputTarget("first", () => "first", vi.fn(), { start: 5, end: 5 }),
+      );
       expect(session.getSnapshot().state.phase).toBe("recording");
       expect(keepAwake).toHaveBeenCalledTimes(1);
       // Silence on a silent history publishes nothing.
@@ -388,7 +372,9 @@ describe("global voice input", () => {
       expect(session.getSnapshot().elapsedSeconds).toBe(2);
 
       sample = { durationMillis: 0, metering: -100 };
-      await session.start(createTarget("first", () => "first", vi.fn(), { start: 5, end: 5 }));
+      await session.start(
+        createVoiceInputTarget("first", () => "first", vi.fn(), { start: 5, end: 5 }),
+      );
       expect(session.getSnapshot().elapsedSeconds).toBe(0);
       expect(publishAudioLevels).toHaveBeenLastCalledWith(expect.not.arrayContaining([1]));
       expect(keepAwake).toHaveBeenCalledTimes(2);
diff --git a/apps/mobile/src/features/voice-input/voiceInputSession.ts b/apps/mobile/src/features/voice-input/voiceInputSession.ts
index 5bf9395daf59..6a5ecd5bde22 100644
--- a/apps/mobile/src/features/voice-input/voiceInputSession.ts
+++ b/apps/mobile/src/features/voice-input/voiceInputSession.ts
@@ -19,7 +19,6 @@ export type VoiceInputTarget = {
   readonly label?: string;
   readonly readDraft: () => VoiceDraftSnapshot | null;
   readonly commitDraft: VoiceInputControllerDependencies["commitDraft"];
-  readonly subscribe: () => () => void;
 };
 
 export type VoiceInputSnapshot = {
@@ -52,27 +51,14 @@ export function createVoiceInputTarget(
   readText: () => string | null,
   commitDraft: VoiceInputTarget["commitDraft"],
   selection: VoiceDraftSnapshot["selection"],
-  subscribeToChanges: (onChange: () => void) => () => void,
 ): VoiceInputTarget {
-  let revision = 0;
   return {
     ownerKey,
     readDraft: () => {
       const text = readText();
-      if (text === null) return null;
-      return { ownerKey, text, selection, revision };
+      return text === null ? null : { ownerKey, text, selection };
     },
     commitDraft,
-    subscribe: () => {
-      let previousText = readText();
-      return subscribeToChanges(() => {
-        const text = readText();
-        if (text !== previousText) {
-          previousText = text;
-          revision += 1;
-        }
-      });
-    },
   };
 }
 
@@ -84,7 +70,7 @@ export class VoiceInputSession {
   readonly controller: VoiceInputController;
   private readonly dependencies: VoiceInputSessionDependencies;
   private target: VoiceInputTarget | null = null;
-  private unsubscribe: (() => void) | null = null;
+  private startText: string | null = null;
   private snapshot: VoiceInputSnapshot = {
     state: IDLE_STATE,
     ownerKey: null,
@@ -102,7 +88,11 @@ export class VoiceInputSession {
     this.controller = new VoiceInputController({
       ...dependencies,
       onStateChange: (state) => this.handleStateChange(state),
-      readDraft: () => this.target?.readDraft() ?? null,
+      // The target's selection is fixed at start, so a draft changed since refuses the transcript.
+      readDraft: () => {
+        const draft = this.target?.readDraft() ?? null;
+        return draft?.text === this.startText ? draft : null;
+      },
       commitDraft: (text, selection) => this.target?.commitDraft(text, selection),
     });
   }
@@ -141,23 +131,17 @@ export class VoiceInputSession {
   start(target: VoiceInputTarget): Promise<void> {
     if (voiceInputBlocksSubmission(this.controller.currentState)) return Promise.resolve();
     this.target = target;
-    this.unsubscribe = target.subscribe();
+    this.startText = target.readDraft()?.text ?? null;
     return this.controller.start();
   }
 
   dispose(): void {
     this.controller.dispose();
     this.stopRecordingActivity();
-    this.unsubscribe?.();
-    this.unsubscribe = null;
     this.listeners.clear();
   }
 
   private handleStateChange(state: VoiceInputState): void {
-    if (!voiceInputBlocksSubmission(state)) {
-      this.unsubscribe?.();
-      this.unsubscribe = null;
-    }
     const previousPhase = this.snapshot.state.phase;
     let elapsedSeconds = this.snapshot.elapsedSeconds;
     if (state.phase !== previousPhase) {
diff --git a/apps/mobile/src/lib/android-workspace-navigation.test.ts b/apps/mobile/src/lib/android-workspace-navigation.test.ts
index 059d5865513c..8b98f42cedeb 100644
--- a/apps/mobile/src/lib/android-workspace-navigation.test.ts
+++ b/apps/mobile/src/lib/android-workspace-navigation.test.ts
@@ -85,13 +85,12 @@ function names(state: ReturnType<typeof router.getInitialState>) {
 }
 
 describe("Android workspace navigation", () => {
-  it("returns to a distinct previous thread, otherwise to the workspace list", () => {
+  it("returns to the previous page, otherwise to the workspace list", () => {
     const parent = withThread();
     let state = apply(
       parent,
       StackActions.push("Thread", { ...thread.params, threadId: "child-a" }),
     );
-    let listSelected = false;
     const navigation = {
       dispatch: (action: RootStackResetAction) => {
         state = apply(state, action);
@@ -102,39 +101,41 @@ describe("Android workspace navigation", () => {
         state = apply(state, StackActions.pop());
       },
     };
-    const back = () =>
-      returnToAndroidWorkspaceList(navigation, () => {
-        listSelected = true;
-      });
+    const back = () => returnToAndroidWorkspaceList(navigation);
 
     back();
     expect(state.routes).toEqual(parent.routes);
     expect(state.index).toBe(parent.index);
-    expect(listSelected).toBe(false);
 
     back();
     expect(state.routes).toEqual([parent.routes[0]]);
     expect(state.index).toBe(0);
-    expect(listSelected).toBe(true);
 
     state = apply(
       parent,
       StackActions.push("Thread", { ...thread.params, environmentId: "environment-b" }),
     );
-    listSelected = false;
     back();
     expect(state.routes).toEqual(parent.routes);
     expect(state.index).toBe(parent.index);
-    expect(listSelected).toBe(false);
+
+    const pullRequestOverThread = legacyHistory();
+    state = pullRequestOverThread;
+    back();
+    expect(state.routes).toEqual(pullRequestOverThread.routes.slice(0, 2));
 
     // Confirming a Git action from the inline inspector can duplicate the current thread.
     state = apply(parent, StackActions.push("Thread", thread.params));
     back();
-    expect({ routes: names(state), index: state.index, listSelected }).toEqual({
-      routes: ["Home"],
-      index: 0,
-      listSelected: true,
-    });
+    expect({ routes: names(state), index: state.index }).toEqual({ routes: ["Home"], index: 0 });
+
+    const child = { ...thread.params, threadId: "child-a" };
+    state = apply(
+      apply(parent, StackActions.push("Thread", child)),
+      StackActions.push("Thread", child),
+    );
+    back();
+    expect(state.routes).toEqual(parent.routes);
   });
 
   it("opens a linked thread above the current one so Back returns to it", () => {
diff --git a/apps/mobile/src/lib/android-workspace-navigation.ts b/apps/mobile/src/lib/android-workspace-navigation.ts
index eed0adbd8e59..170fcc3acc66 100644
--- a/apps/mobile/src/lib/android-workspace-navigation.ts
+++ b/apps/mobile/src/lib/android-workspace-navigation.ts
@@ -2,15 +2,14 @@ import type { NavigationState } from "@react-navigation/native";
 import { isSettingsRoute } from "../features/settings/settings-navigation";
 import { resetRootStack, type RootStackNavigation } from "./root-stack-reset";
 
-function androidWorkspaceBackReturnsToThread(state: NavigationState) {
-  const current = state.routes[state.index];
-  const params = current?.params as ReactNavigation.RootParamList["Thread"] | undefined;
-  return (
-    current?.name === "Thread" &&
-    state.routes[state.index - 1]?.name === "Thread" &&
-    params !== undefined &&
-    !parentThreadIsBelow(state, params)
-  );
+// Back follows history; Git confirmations can stack copies of the current thread, so skip those too.
+function androidWorkspaceBackTarget(state: NavigationState) {
+  let index = state.index;
+  const params = state.routes[index]?.params as ReactNavigation.RootParamList["Thread"] | undefined;
+  if (state.routes[index]?.name === "Thread" && params) {
+    while (parentThreadIsBelow({ ...state, index }, params)) index -= 1;
+  }
+  return index - 1;
 }
 
 /** The root stack with only the workspace list. */
@@ -60,12 +59,12 @@ export function linkedThreadStep(
 
 export function returnToAndroidWorkspaceList(
   navigation: RootStackNavigation & { readonly goBack: () => void },
-  selectTab: () => void,
 ) {
   const state = navigation.getState();
-  if (state && androidWorkspaceBackReturnsToThread(state)) return navigation.goBack();
-  selectTab();
-  resetAndroidWorkspace(navigation);
+  const index = state ? androidWorkspaceBackTarget(state) : -1;
+  if (!state || index < 0) return resetAndroidWorkspace(navigation);
+  if (index === state.index - 1) return navigation.goBack();
+  resetRootStack(navigation, () => ({ ...state, index, routes: state.routes.slice(0, index + 1) }));
 }
 
 // Split view: Thread, PullRequest, and a Settings page picked from the list swap the detail pane
diff --git a/apps/mobile/src/lib/composerImagePreview.test.ts b/apps/mobile/src/lib/composerImagePreview.test.ts
index 84bcc13bbf7d..6e428d421efa 100644
--- a/apps/mobile/src/lib/composerImagePreview.test.ts
+++ b/apps/mobile/src/lib/composerImagePreview.test.ts
@@ -32,7 +32,7 @@ vi.mock("expo-file-system", () => ({
       return mocks.write(content, options);
     }
     async move(destination: { uri: string }) {
-      mocks.files.delete(this.uri);
+      if (!mocks.files.delete(this.uri)) throw new Error("source missing");
       mocks.files.add(destination.uri);
       this.uri = destination.uri;
     }
@@ -103,4 +103,32 @@ describe("materializedPreviewAtom", () => {
     expect(await materialize()).toBe("file:///cache/t3-composer-previews/image-failed.png");
     expect(mocks.write).toHaveBeenCalledTimes(2);
   });
+
+  it("shares one write when the atom is rebuilt while its preview is still being written", async () => {
+    const attachment: DraftComposerImageAttachment = {
+      id: "image-rebuilt",
+      type: "image",
+      name: "pasted.jpeg",
+      mimeType: "image/jpeg",
+      sizeBytes: 3,
+      previewUri: "data:image/jpeg;base64,AAAA",
+    };
+    const read = () => {
+      const registry = AtomRegistry.make();
+      const atom = materializedPreviewAtom(new MaterializedPreviewKey(attachment));
+      const unmount = registry.mount(atom);
+      return vi
+        .waitFor(() => {
+          const result = registry.get(atom);
+          expect(AsyncResult.isSuccess(result)).toBe(true);
+          return AsyncResult.isSuccess(result) ? result.value : undefined;
+        })
+        .finally(unmount);
+    };
+
+    expect(await Promise.all([read(), read()])).toEqual([
+      "file:///cache/t3-composer-previews/image-rebuilt.jpg",
+      "file:///cache/t3-composer-previews/image-rebuilt.jpg",
+    ]);
+  });
 });
diff --git a/apps/mobile/src/lib/composerImagePreview.ts b/apps/mobile/src/lib/composerImagePreview.ts
index 6c27d3889bf6..80a9a0d6d39e 100644
--- a/apps/mobile/src/lib/composerImagePreview.ts
+++ b/apps/mobile/src/lib/composerImagePreview.ts
@@ -32,6 +32,18 @@ async function materializeDataUrlPreview(id: string, dataUrl: string): Promise<s
   return file.uri;
 }
 
+const inFlightPreviews = new Map<string, Promise<string | null>>();
+
+// A render reads the atom before its effect subscribes, so the registry can drop and rebuild it
+// mid-write; a second writer would delete the first one's partial file and fail its own move.
+function materializePreviewOnce(id: string, dataUrl: string): Promise<string | null> {
+  const pending = inFlightPreviews.get(id);
+  if (pending) return pending;
+  const next = materializeDataUrlPreview(id, dataUrl).finally(() => inFlightPreviews.delete(id));
+  inFlightPreviews.set(id, next);
+  return next;
+}
+
 class ImagePreviewCacheError extends Schema.TaggedError<ImagePreviewCacheError>()(
   "ImagePreviewCacheError",
   { cause: Schema.Defect() },
@@ -59,7 +71,7 @@ export class MaterializedPreviewKey implements Equal.Equal {
 export const materializedPreviewAtom = Atom.family(({ attachment }: MaterializedPreviewKey) =>
   Atom.make(
     Effect.tryPromise({
-      try: () => materializeDataUrlPreview(attachment.id, attachment.previewUri),
+      try: () => materializePreviewOnce(attachment.id, attachment.previewUri),
       catch: (cause) => new ImagePreviewCacheError({ cause }),
     }).pipe(
       Effect.catch((error) =>
diff --git a/apps/mobile/src/lib/composerImages.test.ts b/apps/mobile/src/lib/composerImages.test.ts
index ac01bb09b426..c723293c8527 100644
--- a/apps/mobile/src/lib/composerImages.test.ts
+++ b/apps/mobile/src/lib/composerImages.test.ts
@@ -121,6 +121,15 @@ vi.mock("./uuid", () => ({
 
 import { convertPastedImagesToAttachments, persistComposerAttachmentFile } from "./composerImages";
 
+function oversizedPng(): string {
+  const png = Buffer.alloc(PROVIDER_SEND_TURN_MAX_IMAGE_BYTES + 1);
+  Buffer.from([0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a]).copy(png);
+  png.write("IHDR", 12);
+  png.writeUInt32BE(2000, 16);
+  png.writeUInt32BE(2000, 20);
+  return png.toString("base64");
+}
+
 describe("native pasted image cleanup", () => {
   beforeEach(() => {
     files.clear();
@@ -131,7 +140,10 @@ describe("native pasted image cleanup", () => {
     const uri = "content://media/external/images/media/42";
     files.set(uri, { base64: "aGVsbG8=", deleted: false, mimeType: "image/jpeg" });
 
-    const attachments = await convertPastedImagesToAttachments({ uris: [uri], existingCount: 0 });
+    const { attachments } = await convertPastedImagesToAttachments({
+      uris: [uri],
+      existingCount: 0,
+    });
 
     expect(attachments).toEqual([
       expect.objectContaining({
@@ -149,7 +161,10 @@ describe("native pasted image cleanup", () => {
     files.set(uri, { base64: "b3JpZ2luYWw=", deleted: false, mimeType: "image/heic" });
     manipulator.state.sourceSize = { width: 100, height: 100 };
 
-    const attachments = await convertPastedImagesToAttachments({ uris: [uri], existingCount: 0 });
+    const { attachments } = await convertPastedImagesToAttachments({
+      uris: [uri],
+      existingCount: 0,
+    });
 
     expect(attachments).toEqual([
       expect.objectContaining({
@@ -171,7 +186,10 @@ describe("native pasted image cleanup", () => {
       Math.ceil((PROVIDER_SEND_TURN_MAX_IMAGE_BYTES + 1) / 3) * 4,
     );
 
-    const attachments = await convertPastedImagesToAttachments({ uris: [uri], existingCount: 0 });
+    const { attachments } = await convertPastedImagesToAttachments({
+      uris: [uri],
+      existingCount: 0,
+    });
 
     expect(attachments).toEqual([]);
     expect(files.get("file:///cache/rendered.jpeg")?.deleted).toBe(true);
@@ -183,7 +201,7 @@ describe("native pasted image cleanup", () => {
       "file:///private/var/mobile/Containers/Data/Application/app/tmp/t3-composer-paste/id.png";
     files.set(uri, { base64: "aGVsbG8=", deleted: false });
 
-    const attachments = await convertPastedImagesToAttachments({
+    const { attachments } = await convertPastedImagesToAttachments({
       uris: [uri],
       existingCount: 0,
     });
@@ -216,6 +234,53 @@ describe("native pasted image cleanup", () => {
     expect(files.get(overflow)?.deleted).toBe(true);
     expect(files.get(userOwned)?.deleted).toBe(false);
   });
+
+  it("re-renders an over-limit paste whose dimensions already fit, like the photo picker", async () => {
+    const uri =
+      "file:///private/var/mobile/Containers/Data/Application/app/tmp/t3-composer-paste/photo.png";
+    files.set(uri, { base64: oversizedPng(), deleted: false });
+    manipulator.state.sourceSize = { width: 2000, height: 2000 };
+
+    const { attachments } = await convertPastedImagesToAttachments({
+      uris: [uri],
+      existingCount: 0,
+    });
+
+    expect(attachments).toHaveLength(1);
+    expect(attachments[0]?.sizeBytes).toBeLessThanOrEqual(PROVIDER_SEND_TURN_MAX_IMAGE_BYTES);
+    expect(files.get("file:///cache/rendered.jpeg")?.deleted).toBe(true);
+  });
+
+  it("keeps the readable images of a paste and still reports the one it dropped", async () => {
+    const gone =
+      "file:///private/var/mobile/Containers/Data/Application/app/tmp/t3-composer-paste/gone.png";
+    const kept =
+      "file:///private/var/mobile/Containers/Data/Application/app/tmp/t3-composer-paste/kept.png";
+    files.set(kept, { base64: "aGVsbG8=", deleted: false });
+
+    const result = await convertPastedImagesToAttachments({ uris: [gone, kept], existingCount: 0 });
+
+    expect(result.attachments).toEqual([
+      expect.objectContaining({ dataUrl: "data:image/png;base64,aGVsbG8=" }),
+    ]);
+    expect(result.error).toBe("Could not read a pasted image.");
+  });
+
+  it("reports the size limit when even the JPEG re-render is too large", async () => {
+    const uri =
+      "file:///private/var/mobile/Containers/Data/Application/app/tmp/t3-composer-paste/huge.png";
+    files.set(uri, { base64: oversizedPng(), deleted: false });
+    manipulator.state.sourceSize = { width: 2000, height: 2000 };
+    manipulator.state.renderedBase64 = oversizedPng();
+
+    const result = await convertPastedImagesToAttachments({ uris: [uri], existingCount: 0 });
+
+    expect(result).toEqual({
+      attachments: [],
+      error: "A pasted image exceeds the 10 MB attachment limit.",
+    });
+    expect(files.get(uri)?.deleted).toBe(true);
+  });
 });
 
 describe("persistComposerAttachmentFile", () => {
diff --git a/apps/mobile/src/lib/composerImages.ts b/apps/mobile/src/lib/composerImages.ts
index 5b8b0b803d3f..7f7718f540ca 100644
--- a/apps/mobile/src/lib/composerImages.ts
+++ b/apps/mobile/src/lib/composerImages.ts
@@ -572,10 +572,14 @@ function isOwnedPastedImageUri(uri: string): boolean {
 export async function convertPastedImagesToAttachments(input: {
   readonly uris: ReadonlyArray<string>;
   readonly existingCount: number;
-}): Promise<ReadonlyArray<DraftComposerImageAttachment>> {
+}): Promise<{
+  readonly attachments: ReadonlyArray<DraftComposerImageAttachment>;
+  readonly error: string | null;
+}> {
   const { File } = await import("expo-file-system");
   const remainingSlots = PROVIDER_SEND_TURN_MAX_ATTACHMENTS - input.existingCount;
-  const results: DraftComposerImageAttachment[] = [];
+  const attachments: DraftComposerImageAttachment[] = [];
+  let error: string | null = null;
 
   for (const [index, uri] of input.uris.entries()) {
     const temporaryUris = isOwnedPastedImageUri(uri) ? [uri] : [];
@@ -588,31 +592,46 @@ export async function convertPastedImagesToAttachments(input: {
       const sourceMimeType = reportedMimeType?.startsWith("image/")
         ? reportedMimeType
         : mimeTypeFromUri(uri);
-      const mimeType = isProviderSendTurnSupportedImageMimeType(sourceMimeType)
+      let mimeType = isProviderSendTurnSupportedImageMimeType(sourceMimeType)
         ? sourceMimeType
         : "image/jpeg";
       const rendered = mimeType === sourceMimeType ? null : await renderPhoto(uri);
-      if (rendered !== null) {
-        temporaryUris.push(rendered.uri);
-      }
       const pastedBase64 = rendered?.base64 ?? (await file.base64());
       const fitted = rendered ?? (await fitComposerImage({ uri, mimeType, base64: pastedBase64 }));
-      const base64 = fitted?.base64 ?? pastedBase64;
+      if (fitted !== null) {
+        temporaryUris.push(fitted.uri);
+      }
+      let base64 = fitted?.base64 ?? pastedBase64;
+      if (
+        rendered === null &&
+        estimateBase64ByteSize(base64) > PROVIDER_SEND_TURN_MAX_IMAGE_BYTES
+      ) {
+        const jpeg = await renderPhoto(uri);
+        temporaryUris.push(jpeg.uri);
+        mimeType = "image/jpeg";
+        base64 = jpeg.base64;
+      }
       const sizeBytes = estimateBase64ByteSize(base64);
       if (sizeBytes <= 0 || sizeBytes > PROVIDER_SEND_TURN_MAX_IMAGE_BYTES) {
+        error =
+          sizeBytes > 0
+            ? "A pasted image exceeds the 10 MB attachment limit."
+            : "Could not read a pasted image.";
         continue;
       }
-      results.push({
+      const dataUrl = `data:${mimeType};base64,${base64}`;
+      attachments.push({
         id: uuidv4(),
         type: "image",
         name: `pasted-image.${mimeType.split("/")[1] ?? "png"}`,
         mimeType,
         sizeBytes,
-        dataUrl: `data:${mimeType};base64,${base64}`,
-        previewUri: `data:${mimeType};base64,${base64}`,
+        dataUrl,
+        previewUri: dataUrl,
       });
-    } catch (error) {
-      console.warn("Failed to read pasted image", uri, error);
+    } catch (cause) {
+      console.warn("Failed to read pasted image", uri, cause);
+      error = "Could not read a pasted image.";
     } finally {
       for (const temporaryUri of temporaryUris) {
         try {
@@ -627,5 +646,5 @@ export async function convertPastedImagesToAttachments(input: {
     }
   }
 
-  return results;
+  return { attachments, error };
 }
diff --git a/apps/mobile/src/lib/enrichedLinkPresentation.ts b/apps/mobile/src/lib/enrichedLinkPresentation.ts
index 859c015c0533..5d2e9431339d 100644
--- a/apps/mobile/src/lib/enrichedLinkPresentation.ts
+++ b/apps/mobile/src/lib/enrichedLinkPresentation.ts
@@ -92,7 +92,7 @@ export function enrichedLinkVariantPattern(url: string) {
 }
 
 export const ENRICHED_INLINE_FILE_LINK_REGEX =
-  /^(?!\S*:\/\/)(?:(?:\.{1,2}[\\/]|~[\\/]|\/(?:Users|home|tmp|var|etc|opt|mnt|Volumes|private|root|usr|bin|sbin|lib|lib64|srv|dev|proc|sys|run|boot|media|workspace|workspaces)\/|[A-Za-z]:[\\/])[^\s`]+|(?:[A-Za-z0-9._-]+[\\/])+[A-Za-z0-9._-]+\.[A-Za-z0-9_-]+(?::\d+(?::\d+|-\d+)?)?|[A-Za-z0-9._-]+\.[A-Za-z0-9_-]+:\d+(?::\d+|-\d+)?)$/;
+  /^(?!\S*:\/\/)(?:(?:\.{1,2}[\\/]|~[\\/]|\/(?:Users|home|tmp|var|etc|opt|mnt|Volumes|private|root|usr|bin|sbin|lib|lib64|srv|dev|proc|sys|run|boot|media|workspace|workspaces)\/|[A-Za-z]:[\\/])[^\s`]+|(?:[\p{L}\p{M}\p{N}._-]+[\\/])+[\p{L}\p{M}\p{N}._-]+\.[A-Za-z0-9_-]+(?::\d+(?::\d+|-\d+)?)?|[\p{L}\p{M}\p{N}._-]+\.[A-Za-z0-9_-]+:\d+(?::\d+|-\d+)?)$/u;
 
 export function enrichedSkillLinkRegex(skills?: ReadonlyArray<SelectableMarkdownSkill>) {
   const names = [...new Set(skills?.map((skill) => skill.name) ?? [])].filter(Boolean);
diff --git a/apps/mobile/src/lib/filePreview.test.ts b/apps/mobile/src/lib/filePreview.test.ts
index 47f00f0e2f1f..8363b0ba5c95 100644
--- a/apps/mobile/src/lib/filePreview.test.ts
+++ b/apps/mobile/src/lib/filePreview.test.ts
@@ -297,6 +297,10 @@ vi.mock("../features/threads/ThreadMarkdownImage", async () => {
   const { createContext } = await import("react");
   return { MarkdownImageAvailableWidthContext: createContext(390) };
 });
+vi.mock("../features/threads/ZoomableImagePressable", async () => {
+  const { Pressable } = await import("react-native");
+  return { ZoomableImagePressable: Pressable };
+});
 vi.mock("../features/review/ReviewCommentCard", () => ({ useReviewCommentColors: () => ({}) }));
 vi.mock("../features/prompt-links/prompt-link-actions", () => ({}));
 vi.mock("@react-navigation/elements", async () => {
diff --git a/apps/mobile/src/lib/markdownDocument.ts b/apps/mobile/src/lib/markdownDocument.ts
index dc8d741559ab..dceebd418b1b 100644
--- a/apps/mobile/src/lib/markdownDocument.ts
+++ b/apps/mobile/src/lib/markdownDocument.ts
@@ -226,12 +226,13 @@ function htmlTagMarkdown(
     const alt = (attribute(tag, "alt") ?? "").replace(/[\\[\]&]/g, "\\$&");
     return `![${alt}](${markdownDestination(src)})`;
   }
+  // A raw newline would end the table row; both parsers decode this reference to one inside the cell.
+  const cellBreak = "&#10;";
   // A blank line inside an open link label would end the paragraph before its "]".
-  const blockBreak = anchors.open === 0 ? "\n\n" : " ";
+  const blockBreak = anchors.open > 0 ? " " : options.inTableCell ? cellBreak : "\n\n";
   if (/^<summary\b/i.test(tag)) return `${blockBreak}**`;
   if (/^<\/summary\s*>/i.test(tag)) return `**${blockBreak}`;
-  // A raw newline would end the table row; both parsers decode this reference to one inside the cell.
-  if (/^<br\b/i.test(tag)) return options.inTableCell ? "&#10;" : "  \n";
+  if (/^<br\b/i.test(tag)) return options.inTableCell ? cellBreak : "  \n";
   if (/^<\/?(?:p|div|details)\b/i.test(tag)) return blockBreak;
   return "";
 }
diff --git a/apps/mobile/src/lib/markdownHtml.test.ts b/apps/mobile/src/lib/markdownHtml.test.ts
index e7f5dd07e216..64c5d02df353 100644
--- a/apps/mobile/src/lib/markdownHtml.test.ts
+++ b/apps/mobile/src/lib/markdownHtml.test.ts
@@ -108,6 +108,28 @@ describe("HTML in native Markdown", () => {
     ]);
   });
 
+  it.each([
+    "one<p>two</p>",
+    "one<div>two</div>",
+    "one<summary>two</summary>",
+    "<p>one</p><p>two</p>",
+  ])("keeps a table row intact when a cell contains block HTML: %s", async (cell) => {
+    const native = await parseMarkdown(
+      markdownForNativeRendering(
+        `| A | B |\n| - | - |\n| ${cell} | x |`,
+        ENRICHED_INLINE_FILE_LINK_REGEX,
+      ),
+    );
+    const text = (node: { content?: string; children?: unknown[] }): string =>
+      (node.content ?? "") +
+      (node.children ?? []).map((child) => text(child as typeof node)).join("");
+    expect(native.children).toHaveLength(1);
+    expect(native.children?.[0]?.children?.[1]?.children?.[0]?.children?.map(text)).toEqual([
+      expect.stringMatching(/one\s*two/),
+      "x",
+    ]);
+  });
+
   it("keeps a table row intact when an anchor href contains a pipe", () => {
     const document = parseMarkdownDocument(
       "| Preview | Logs |\n| - | - |\n| <a href='https://example.com/?a=1&#124;2'>Open</a> | done |",
diff --git a/apps/mobile/src/lib/markdownInlineFileLinks.test.ts b/apps/mobile/src/lib/markdownInlineFileLinks.test.ts
index 5cce10e3c3e3..e2d81cf86956 100644
--- a/apps/mobile/src/lib/markdownInlineFileLinks.test.ts
+++ b/apps/mobile/src/lib/markdownInlineFileLinks.test.ts
@@ -93,6 +93,9 @@ describe("inline code that names a file", () => {
     expect(rewrite("See `src/math.ts:2` and `./README.md`.")).toBe(
       "See [src/math.ts:2](<src/math.ts:2>) and [./README.md](<./README.md>).",
     );
+    for (const path of ["src/數學.ts:2", "數學/math.ts:2", "數學.ts:2", "src/數學.ts:2-4"]) {
+      expect(rewrite(`See \`${path}\`.`), path).toBe(`See [${path}](<${path}>).`);
+    }
   });
 
   it("keeps commands, identifiers and URLs as code", () => {
diff --git a/apps/mobile/src/lib/threadActivity.test.ts b/apps/mobile/src/lib/threadActivity.test.ts
index d810563f7266..6de60afc1cb2 100644
--- a/apps/mobile/src/lib/threadActivity.test.ts
+++ b/apps/mobile/src/lib/threadActivity.test.ts
@@ -54,7 +54,36 @@ it("shows a captured MCP app for a failed deferred write", () => {
     input: {},
     output: { t3McpApp: mcpApp, result: { content: [], isError: true } },
   };
-  expect(buildThreadFeed([projected(item, 0)])).toMatchObject([{ type: "mcp-app", app: mcpApp }]);
+  expect(buildThreadFeed([projected(item, 0)])).toMatchObject([
+    { type: "activity-group" },
+    { type: "mcp-app", app: mcpApp },
+  ]);
+});
+
+it("keeps an MCP app call's tool activity beside its app card", () => {
+  const mcpApp = {
+    attachmentId: "repro-app-html",
+    server: "repro",
+    tool: "aggregate_rum_events",
+    resourceUri: "ui://repro/dataviz",
+  };
+  const item: OrchestrationV2TurnItem = {
+    ...base("repro-app", "2026-08-29T00:00:00.000Z", 1),
+    type: "dynamic_tool",
+    toolName: "repro.aggregate_rum_events",
+    input: { query: "@type:view" },
+    output: {
+      t3McpApp: mcpApp,
+      result: { content: [{ type: "text", text: "Notice\nview\tcount\n/home\t42" }] },
+    },
+  };
+  const feed = buildThreadFeed([projected(item, 0)]);
+  expect(feed).toContainEqual(expect.objectContaining({ type: "mcp-app", app: mcpApp }));
+  const activities = feed.flatMap((entry) =>
+    entry.type === "activity-group" ? entry.activities : [],
+  );
+  expect(activities).toHaveLength(1);
+  expect(activities[0]?.getFullDetail()).toContain("@type:view");
 });
 
 it("keeps historical plan detail accessible from its paged turn item", () => {
@@ -896,16 +925,20 @@ describe("buildThreadFeed", () => {
           projected(runless ? { ...item, runId: null } : item, position),
         ),
       );
-      const foldRunId = messageFoldRunId(feed, "message-middle");
-      expect(foldRunId, String(runless)).toBe(runless ? "runless:message-user" : runId);
       const ids = (expanded: ReadonlySet<RunId>) =>
         deriveThreadFeedPresentation(feed, null, expanded).map((entry) => entry.id);
+      const foldRunId = messageFoldRunId(
+        feed,
+        "message-middle",
+        deriveThreadFeedPresentation(feed, null, new Set()),
+      );
+      expect(foldRunId, String(runless)).toBe(runless ? "runless:message-user" : runId);
       expect(ids(new Set())).not.toContain("message-middle");
       expect(ids(new Set([foldRunId!]))).toContain("message-middle");
     }
-    expect(messageFoldRunId(buildThreadFeed([projected(userMessage(), 0)]), "message-user")).toBe(
-      null,
-    );
+    expect(
+      messageFoldRunId(buildThreadFeed([projected(userMessage(), 0)]), "message-user", []),
+    ).toBe(null);
   });
 
   it("folds progress messages while keeping the final assistant answer visible", () => {
@@ -1010,6 +1043,66 @@ describe("buildThreadFeed", () => {
     ]);
   });
 
+  it("splits a settled turn's work fold at a steer", () => {
+    const steer = {
+      ...userMessage("2026-06-20T00:00:04.000Z"),
+      id: TurnItemId.make("item-steer"),
+      messageId: MessageId.make("message-steer"),
+      inputIntent: "steer" as const,
+    };
+    const after = { ...command("2026-06-20T00:00:06.000Z"), id: TurnItemId.make("item-after") };
+    const progress = {
+      ...assistantMessage("2026-06-20T00:00:07.000Z"),
+      id: TurnItemId.make("item-progress"),
+      messageId: MessageId.make("message-progress"),
+    };
+    const feed = buildThreadFeed(
+      [
+        userMessage(),
+        command(),
+        steer,
+        after,
+        progress,
+        assistantMessage("2026-06-20T00:00:09.000Z"),
+      ].map((item, position) => projected(item, position)),
+    );
+
+    expect(
+      deriveThreadFeedPresentation(feed, null, new Set()).map((entry) =>
+        entry.type === "message" ? entry.id : entry.type,
+      ),
+    ).toEqual(["message-user", "run-fold", "message-steer", "run-fold", "message-assistant"]);
+    const foldRunId = messageFoldRunId(
+      feed,
+      "message-progress",
+      deriveThreadFeedPresentation(feed, null, new Set()),
+    );
+    expect(
+      deriveThreadFeedPresentation(feed, null, new Set([foldRunId!])).map((entry) =>
+        entry.type === "message" ? entry.id : entry.type,
+      ),
+    ).toEqual([
+      "message-user",
+      "run-fold",
+      "message-steer",
+      "run-fold",
+      "activity-group",
+      "message-progress",
+      "message-assistant",
+    ]);
+
+    // Hiding tools leaves no output before the steer, so nothing splits there.
+    const hideAll = (expanded: ReadonlySet<RunId>) =>
+      deriveThreadFeedPresentation(feed, null, expanded, new Set(), null, false, undefined, {
+        toolCallVisibility: "hideAll",
+        revealedMessageId: null,
+      });
+    const hiddenToolsFoldRunId = messageFoldRunId(feed, "message-progress", hideAll(new Set()));
+    expect(hideAll(new Set([hiddenToolsFoldRunId!])).map((entry) => entry.id)).toContain(
+      "message-progress",
+    );
+  });
+
   it("folds subagents while keeping created-thread and fork cards visible", () => {
     const { providerThreadId: _providerThreadId, ...forkBase } = base(
       "item-fork",
@@ -1404,6 +1497,16 @@ describe("buildThreadFeed", () => {
         phase === "final_answer",
       );
     }
+    const confirmed = { ...answer, phase: "final_answer" as const };
+    const continued = buildThreadFeed(
+      [user, confirmed, passed, final].map((item, index) => projected(item, index)),
+    );
+    expect(
+      deriveThreadFeedPresentation(continued, null, new Set()).some(
+        (row) => row.type === "message" && row.message.id === answer.messageId,
+      ),
+    ).toBe(true);
+    expect(rows([user, confirmed, passed, final], "zen")).toEqual(["user", "answer", "final"]);
     expect(rows([user, steer, step, passed, final], "zen")).toEqual(["user", "steer", "final"]);
     expect(rows([user, steer, answer, step], "zen", running)).toEqual([
       "user",
diff --git a/apps/mobile/src/lib/threadActivity.ts b/apps/mobile/src/lib/threadActivity.ts
index 16f16b200c8d..ec755ce12a2c 100644
--- a/apps/mobile/src/lib/threadActivity.ts
+++ b/apps/mobile/src/lib/threadActivity.ts
@@ -317,7 +317,7 @@ const projectedEntriesCache = new WeakMap<
   OrchestrationV2ProjectedTurnItem,
   {
     readonly attemptId: RunAttemptId | null;
-    readonly entry: RawThreadFeedEntry;
+    readonly entries: ReadonlyArray<RawThreadFeedEntry>;
   }
 >();
 const localMessageEntriesCache = new WeakMap<
@@ -1058,40 +1058,62 @@ export function failedFeedRunIds(
 /**
  * The key a run fold uses for the message `entryId`: its run, or for an
  * imported message with no run, the runless key of the user message before
- * it. Null for user messages, which never fold.
+ * it, or the segment after its run's last steer when `presented` shows that
+ * fold. Null for user messages, which never fold.
  */
 export function messageFoldRunId(
   feed: ReadonlyArray<ThreadFeedEntry>,
   entryId: string,
+  presented: ReadonlyArray<{ readonly type: string; readonly runId?: RunId | null }>,
 ): RunId | null {
   let runlessKey: RunId | null = null;
+  const lastSteerIdByRunId = new Map<RunId, string>();
   for (const entry of feed) {
     if (entry.type !== "message") continue;
     if (entry.message.role === "user") {
       if (entry.id === entryId) return null;
+      if (isSteerMessage(entry.message) && entry.message.runId != null) {
+        lastSteerIdByRunId.set(entry.message.runId, entry.id);
+      }
       runlessKey = entry.message.runId == null ? RunId.make(`runless:${entry.id}`) : null;
     } else if (entry.id === entryId) {
-      return entry.message.runId ?? runlessKey;
+      const runId = entry.message.runId ?? runlessKey;
+      const steerId = runId === null ? undefined : lastSteerIdByRunId.get(runId);
+      if (runId === null || steerId === undefined) return runId;
+      // Tool visibility can drop all output before the steer, leaving no split.
+      const steerKey = steerFoldRunId(runId, steerId);
+      return presented.some((row) => row.type === "run-fold" && row.runId === steerKey)
+        ? steerKey
+        : runId;
     }
   }
   return null;
 }
 
-function answersBeforeSteers(feed: ReadonlyArray<ThreadFeedEntry>): ReadonlySet<MessageId> {
+function steerFoldRunId(runId: RunId, steerEntryId: string): RunId {
+  return RunId.make(`${runId}:steer:${steerEntryId}`);
+}
+
+function feedEntryFoldRunId(entry: ThreadFeedEntry, runlessKey: RunId | null): RunId | null {
+  if (entry.type === "message") {
+    return entry.message.role === "assistant" ? (entry.message.runId ?? runlessKey) : null;
+  }
+  return entry.type === "activity-group" || entry.type === "html-render" || entry.type === "mcp-app"
+    ? (entry.runId ?? runlessKey)
+    : null;
+}
+
+function finalAnswerIds(feed: ReadonlyArray<ThreadFeedEntry>): ReadonlySet<MessageId> {
   const ids = new Set<MessageId>();
-  let previous: ThreadFeedEntry | undefined;
   for (const entry of feed) {
     if (
       entry.type === "message" &&
-      isSteerMessage(entry.message) &&
-      previous?.type === "message" &&
-      previous.message.role === "assistant" &&
-      previous.message.projectedItem?.item.type === "assistant_message" &&
-      previous.message.projectedItem.item.phase === "final_answer"
+      entry.message.role === "assistant" &&
+      entry.message.projectedItem?.item.type === "assistant_message" &&
+      entry.message.projectedItem.item.phase === "final_answer"
     ) {
-      ids.add(previous.message.id);
+      ids.add(entry.message.id);
     }
-    previous = entry;
   }
   return ids;
 }
@@ -1103,7 +1125,7 @@ function deriveThreadFeedRunFolds(
   feedFailedRunIds: ReadonlySet<RunId>,
 ): ReadonlyMap<string, ThreadFeedRunFold> {
   const terminalAssistantMessageIdByRun = new Map<RunId, string>();
-  const retainedAnswerIds = answersBeforeSteers(feed);
+  const retainedAnswerIds = finalAnswerIds(feed);
   const interruptedRunIds = new Set<RunId>();
   const failedRunIds = new Set(feedFailedRunIds);
   const promptIndexByRunId = new Map<RunId, number>();
@@ -1121,26 +1143,35 @@ function deriveThreadFeedRunFolds(
   }
   const groupsByRunId = new Map<
     RunId,
-    { entries: ThreadFeedEntry[]; startBoundary: string | null }
+    {
+      entries: ThreadFeedEntry[];
+      startBoundary: string | null;
+      /** Each steer after the run has output starts a segment at this index into `entries`. */
+      steerSegments: Array<{ startIndex: number; steer: ThreadFeedEntry }>;
+    }
   >();
   let runlessKey: RunId | null = null;
   let responseKey: RunId | null = null;
   let pendingUserBoundary: string | null = null;
   for (const [index, entry] of feed.entries()) {
     if (entry.type === "message" && entry.message.role === "user") {
+      const steerGroup =
+        isSteerMessage(entry.message) && entry.message.runId != null
+          ? groupsByRunId.get(entry.message.runId)
+          : undefined;
+      if (steerGroup && steerGroup.entries.length > 0) {
+        // Back-to-back steers split once, after the last of them.
+        if (steerGroup.steerSegments.at(-1)?.startIndex === steerGroup.entries.length) {
+          steerGroup.steerSegments.pop();
+        }
+        steerGroup.steerSegments.push({ startIndex: steerGroup.entries.length, steer: entry });
+      }
       pendingUserBoundary = entry.message.createdAt;
       runlessKey = entry.message.runId == null ? RunId.make(`runless:${entry.id}`) : null;
       responseKey = entry.message.runId ?? runlessKey;
       continue;
     }
-    const ownRunId =
-      entry.type === "message" && entry.message.role === "assistant"
-        ? (entry.message.runId ?? runlessKey)
-        : entry.type === "activity-group" ||
-            entry.type === "html-render" ||
-            entry.type === "mcp-app"
-          ? (entry.runId ?? runlessKey)
-          : null;
+    const ownRunId = feedEntryFoldRunId(entry, runlessKey);
     if (!ownRunId) continue;
     // Resumed subagents keep their original turn position and fold, leaving later run folds under their own prompts.
     const runId =
@@ -1149,7 +1180,7 @@ function deriveThreadFeedRunFolds(
         : ownRunId;
     let group = groupsByRunId.get(runId);
     if (!group) {
-      group = { entries: [], startBoundary: pendingUserBoundary };
+      group = { entries: [], startBoundary: pendingUserBoundary, steerSegments: [] };
       pendingUserBoundary = null;
       groupsByRunId.set(runId, group);
     }
@@ -1215,15 +1246,15 @@ function deriveThreadFeedRunFolds(
         .map((entry) => entry.id),
     );
     const firstEntry = group.entries[0];
-    const firstHiddenEntry = group.entries.find((entry) => hiddenEntryIds.has(entry.id));
     const lastEntry = group.entries.at(-1);
-    if (!firstHiddenEntry || !firstEntry || !lastEntry) continue;
-    const hidesNonCompactionWork = group.entries.some(
-      (entry) =>
-        hiddenEntryIds.has(entry.id) &&
-        !(entry.type === "activity-group" && isContextCompactionActivityGroup(entry)),
-    );
-    if (!hidesNonCompactionWork) continue;
+    if (!firstEntry || !lastEntry) continue;
+    const hidesNonCompactionWork = (entries: ReadonlyArray<ThreadFeedEntry>) =>
+      entries.some(
+        (entry) =>
+          hiddenEntryIds.has(entry.id) &&
+          !(entry.type === "activity-group" && isContextCompactionActivityGroup(entry)),
+      );
+    if (!hidesNonCompactionWork(group.entries)) continue;
     const terminalEntry = terminalAssistantId
       ? group.entries.find((entry) => entry.id === terminalAssistantId)
       : null;
@@ -1243,28 +1274,58 @@ function deriveThreadFeedRunFolds(
     const duration = elapsedMs === null ? null : formatDuration(elapsedMs);
     const interrupted =
       latestRunMatches && (latestRun.status === "interrupted" || latestRun.status === "cancelled");
-    const deferredWorkItemIds = group.entries.flatMap((entry) =>
-      entry.type === "activity-group"
-        ? entry.activities.flatMap((activity) =>
-            activity.projectedItem.item.deferredWork
-              ? [String(activity.projectedItem.sourceItemId)]
-              : [],
-          )
-        : [],
-    );
-    foldsByAnchorId.set(firstHiddenEntry.id, {
-      ...(deferredWorkItemIds.length > 0 ? { deferredWorkItemIds } : {}),
-      runId,
-      createdAt: firstHiddenEntry.createdAt,
-      hiddenEntryIds,
-      label: interrupted
-        ? duration
-          ? `You stopped after ${duration}`
-          : "You stopped this response"
-        : duration
-          ? `Worked for ${duration}`
-          : "Worked",
-    });
+    const label = interrupted
+      ? duration
+        ? `You stopped after ${duration}`
+        : "You stopped this response"
+      : duration
+        ? `Worked for ${duration}`
+        : "Worked";
+    // The top row keeps the whole turn's time. Work after a steer folds under
+    // its own row below that steer, keyed apart so each segment opens alone.
+    const segments = [
+      {
+        runId,
+        entries: group.entries.slice(0, group.steerSegments[0]?.startIndex),
+        label,
+      },
+      ...group.steerSegments.map(({ startIndex, steer }, index) => {
+        const entries = group.entries.slice(startIndex, group.steerSegments[index + 1]?.startIndex);
+        const segmentMs = computeElapsedMs(
+          steer.createdAt,
+          entries
+            .map((entry) => (entry.type === "message" ? entry.message.updatedAt : entry.createdAt))
+            .reduce<string | null>(maxIsoTimestamp, null) ?? steer.createdAt,
+        );
+        return {
+          runId: steerFoldRunId(runId, steer.id),
+          entries,
+          label: segmentMs !== null ? `Continued for ${formatDuration(segmentMs)}` : "Continued",
+        };
+      }),
+    ];
+    for (const segment of segments) {
+      const firstHiddenEntry = segment.entries.find((entry) => hiddenEntryIds.has(entry.id));
+      if (!firstHiddenEntry || !hidesNonCompactionWork(segment.entries)) continue;
+      const deferredWorkItemIds = segment.entries.flatMap((entry) =>
+        entry.type === "activity-group"
+          ? entry.activities.flatMap((activity) =>
+              activity.projectedItem.item.deferredWork
+                ? [String(activity.projectedItem.sourceItemId)]
+                : [],
+            )
+          : [],
+      );
+      foldsByAnchorId.set(firstHiddenEntry.id, {
+        ...(deferredWorkItemIds.length > 0 ? { deferredWorkItemIds } : {}),
+        runId: segment.runId,
+        createdAt: firstHiddenEntry.createdAt,
+        hiddenEntryIds: new Set(
+          segment.entries.flatMap((entry) => (hiddenEntryIds.has(entry.id) ? [entry.id] : [])),
+        ),
+        label: segment.label,
+      });
+    }
   }
   const covered = new Set(
     [...foldsByAnchorId.values()].flatMap((fold) => [...fold.hiddenEntryIds]),
@@ -1458,7 +1519,7 @@ function zenAnswerMessageIds(
 ): ReadonlySet<MessageId> {
   const replies: Array<{ readonly message: ThreadFeedMessage; readonly index: number }> = [];
   const lastReplyByResponse = new Map<string, MessageId>();
-  const steerAnswers = new Set(answersBeforeSteers(feed));
+  const keptAnswers = new Set(finalAnswerIds(feed));
   let userMessages = 0;
   let awaitingReply = false;
   let candidate: MessageId | null = null;
@@ -1473,7 +1534,7 @@ function zenAnswerMessageIds(
     }
     const reply =
       entry.type === "message" && entry.message.role === "assistant" ? entry.message : null;
-    if (candidate !== null && reply !== null) steerAnswers.add(candidate);
+    if (candidate !== null && reply !== null) keptAnswers.add(candidate);
     candidate = null;
     if (answering && startsResponse(entry)) answeringFrom = index + 1;
     if (entry.type === "message" && entry.message.role === "user") {
@@ -1493,7 +1554,7 @@ function zenAnswerMessageIds(
     replies
       .filter(
         ({ message, index }) =>
-          steerAnswers.has(message.id) ||
+          keptAnswers.has(message.id) ||
           (terminal.has(message.id) &&
             index < answeringFrom &&
             (answeringRunId === null || message.runId !== answeringRunId)),
@@ -2344,8 +2405,10 @@ export function buildThreadFeed(
     const attemptId = resolveAttemptId(item);
     const cached = projectedEntriesCache.get(row);
     if (cached?.attemptId === attemptId) {
-      entries.push(cached.entry);
-      entryRows.push(index);
+      for (const entry of cached.entries) {
+        entries.push(entry);
+        entryRows.push(index);
+      }
       continue;
     }
     const createdAt = DateTime.formatIso(item.startedAt ?? item.updatedAt);
@@ -2361,24 +2424,7 @@ export function buildThreadFeed(
         runId: item.runId,
         render,
       };
-      projectedEntriesCache.set(row, { attemptId, entry });
-      entries.push(entry);
-      entryRows.push(index);
-      continue;
-    }
-    const app = item.type === "dynamic_tool" ? mcpAppFromToolItem(item) : undefined;
-    if (app) {
-      const entry: RawThreadFeedEntry = {
-        type: "mcp-app",
-        id: `mcp-app:${row.visibility}:${row.sourceThreadId}:${row.sourceItemId}`,
-        createdAt,
-        runId: item.runId,
-        sourceThreadId: row.sourceThreadId,
-        itemId: row.sourceItemId,
-        revision: turnItemDetailRevision(item),
-        app,
-      };
-      projectedEntriesCache.set(row, { attemptId, entry });
+      projectedEntriesCache.set(row, { attemptId, entries: [entry] });
       entries.push(entry);
       entryRows.push(index);
       continue;
@@ -2415,22 +2461,34 @@ export function buildThreadFeed(
           projectedItem: row,
         },
       };
-      projectedEntriesCache.set(row, { attemptId, entry });
+      projectedEntriesCache.set(row, { attemptId, entries: [entry] });
       entries.push(entry);
       entryRows.push(index);
       continue;
     }
     const activity = toFeedActivity(row, attemptId);
-    const entry: RawThreadFeedEntry = {
-      type: "activity",
-      id: activity.id,
-      createdAt,
-      runId: item.runId,
-      activity,
-    };
-    projectedEntriesCache.set(row, { attemptId, entry });
-    entries.push(entry);
-    entryRows.push(index);
+    const rowEntries: RawThreadFeedEntry[] = [
+      { type: "activity", id: activity.id, createdAt, runId: item.runId, activity },
+    ];
+    // The card follows its tool activity: a feed restart resumes after a row's last entry.
+    const app = item.type === "dynamic_tool" ? mcpAppFromToolItem(item) : undefined;
+    if (app) {
+      rowEntries.push({
+        type: "mcp-app",
+        id: `mcp-app:${row.visibility}:${row.sourceThreadId}:${row.sourceItemId}`,
+        createdAt,
+        runId: item.runId,
+        sourceThreadId: row.sourceThreadId,
+        itemId: row.sourceItemId,
+        revision: turnItemDetailRevision(item),
+        app,
+      });
+    }
+    projectedEntriesCache.set(row, { attemptId, entries: rowEntries });
+    for (const entry of rowEntries) {
+      entries.push(entry);
+      entryRows.push(index);
+    }
   }
   const retainedMessageIds = new Set([
     ...foldedAnswerRunIdByMessageId.keys(),
diff --git a/apps/mobile/src/native/nativeWebSocket.ios.test.ts b/apps/mobile/src/native/nativeWebSocket.ios.test.ts
index 0a1a38850b55..8b2b128b5f7f 100644
--- a/apps/mobile/src/native/nativeWebSocket.ios.test.ts
+++ b/apps/mobile/src/native/nativeWebSocket.ios.test.ts
@@ -126,6 +126,6 @@ describe("NativeWebSocket", () => {
         code: 1011,
         closeReason: "boom",
       });
-    }).pipe(Effect.scoped),
+    }),
   );
 });
diff --git a/apps/mobile/src/native/useOpenPullRequest.ts b/apps/mobile/src/native/useOpenPullRequest.ts
index 6608b7b5493d..ed080ade2f96 100644
--- a/apps/mobile/src/native/useOpenPullRequest.ts
+++ b/apps/mobile/src/native/useOpenPullRequest.ts
@@ -1,7 +1,5 @@
 import { useNavigation, useRoute, StackActions } from "@react-navigation/native";
 import { nativePullRequestDestination } from "../lib/pullRequestNavigation";
-import { Platform } from "react-native";
-import { useSelectWorkspaceDetail } from "../features/layout/workspace/useSelectWorkspaceDetail";
 import { EnvironmentId, ThreadId } from "@t3tools/contracts";
 import { useProjects, useThreadShell } from "../state/entities";
 import { tryOpenExternalUrl } from "../lib/openExternalUrl";
@@ -17,7 +15,6 @@ type PullRequestContext = { readonly environmentId: string; readonly projectId:
 // Avoid useRoute so layouts without route context can open any thread's pull requests.
 export function useNavigateToPullRequest(options?: { readonly replace?: boolean }) {
   const navigation = useNavigation();
-  const selectDetail = useSelectWorkspaceDetail();
   const projects = useProjects();
   const replace = options?.replace;
   return async (url: string, context: PullRequestContext | null) => {
@@ -31,9 +28,7 @@ export function useNavigateToPullRequest(options?: { readonly replace?: boolean
       ...destination,
       ...(destination.navigationUrl ? { navigationId: nextLinkNavigationId() } : {}),
     });
-    // Android shows one page at a time; iOS opens it over the current page, so Back returns.
-    if (Platform.OS === "android") selectDetail({ name: "PullRequest", params });
-    else if (replace) navigation.dispatch(StackActions.replace("PullRequest", params));
+    if (replace) navigation.dispatch(StackActions.replace("PullRequest", params));
     else navigation.dispatch(StackActions.push("PullRequest", params));
     return true;
   };
diff --git a/apps/mobile/src/persistence/mobile-database.test.ts b/apps/mobile/src/persistence/mobile-database.test.ts
index a30717f7e7cb..a0b9985cf05b 100644
--- a/apps/mobile/src/persistence/mobile-database.test.ts
+++ b/apps/mobile/src/persistence/mobile-database.test.ts
@@ -39,23 +39,21 @@ describe("offline pull request cache", () => {
   }
 
   it.effect("restores saved records and clears them with the environment", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        yield* Effect.promise(sqliteDatabase);
-        const database = yield* MobileDatabase.make;
-        yield* database.saveCache(environmentId, "pull-request", "v1:list", 1, '{"entries":[]}');
-        yield* database.saveCache(otherEnvironment, "pull-request", "v1:list", 1, "other");
-        expect(yield* database.loadCache(environmentId, "pull-request", "v1:list")).toEqual(
-          Option.some('{"entries":[]}'),
-        );
-        yield* database.clearEnvironmentCache(environmentId);
-        expect((yield* database.loadCache(environmentId, "pull-request", "v1:list"))._tag).toBe(
-          "None",
-        );
-        expect((yield* database.loadCache(otherEnvironment, "pull-request", "v1:list"))._tag).toBe(
-          "Some",
-        );
-      }),
-    ),
+    Effect.gen(function* () {
+      yield* Effect.promise(sqliteDatabase);
+      const database = yield* MobileDatabase.make;
+      yield* database.saveCache(environmentId, "pull-request", "v1:list", 1, '{"entries":[]}');
+      yield* database.saveCache(otherEnvironment, "pull-request", "v1:list", 1, "other");
+      expect(yield* database.loadCache(environmentId, "pull-request", "v1:list")).toEqual(
+        Option.some('{"entries":[]}'),
+      );
+      yield* database.clearEnvironmentCache(environmentId);
+      expect((yield* database.loadCache(environmentId, "pull-request", "v1:list"))._tag).toBe(
+        "None",
+      );
+      expect((yield* database.loadCache(otherEnvironment, "pull-request", "v1:list"))._tag).toBe(
+        "Some",
+      );
+    }),
   );
 });
diff --git a/apps/mobile/src/persistence/mobile-preferences.ts b/apps/mobile/src/persistence/mobile-preferences.ts
index 852d96c60852..f29fbc8c119b 100644
--- a/apps/mobile/src/persistence/mobile-preferences.ts
+++ b/apps/mobile/src/persistence/mobile-preferences.ts
@@ -11,7 +11,7 @@ import {
   PullRequestListFilters,
   PullRequestListState,
   type ProviderInstanceId,
-  type PullRequestMergeMethod,
+  PullRequestMergeMethod,
   type SidebarProjectGroupingMode,
 } from "@t3tools/contracts";
 import { ToolCallVisibility } from "@t3tools/contracts/settings";
@@ -174,6 +174,7 @@ export class MobilePreferencesStore extends Context.Service<
 >()("@t3tools/mobile/persistence/mobile-preferences/MobilePreferencesStore") {}
 
 const isToolCallVisibility = Schema.is(ToolCallVisibility);
+const isPullRequestMergeMethod = Schema.is(PullRequestMergeMethod);
 
 function sanitizePreferences(parsed: Preferences): Preferences {
   const preferences: {
@@ -232,11 +233,7 @@ function sanitizePreferences(parsed: Preferences): Preferences {
     preferences.pullRequestHideTestFiles = parsed.pullRequestHideTestFiles;
   }
 
-  if (
-    parsed.pullRequestMergeMethod === "squash" ||
-    parsed.pullRequestMergeMethod === "merge" ||
-    parsed.pullRequestMergeMethod === "rebase"
-  ) {
+  if (isPullRequestMergeMethod(parsed.pullRequestMergeMethod)) {
     preferences.pullRequestMergeMethod = parsed.pullRequestMergeMethod;
   }
 
diff --git a/apps/mobile/src/state/queries.test.ts b/apps/mobile/src/state/queries.test.ts
index 12f36dfe2e24..dba11b2e56ea 100644
--- a/apps/mobile/src/state/queries.test.ts
+++ b/apps/mobile/src/state/queries.test.ts
@@ -1,8 +1,10 @@
+import { threadPullRequestKeyOf } from "@t3tools/client-runtime/thread-pull-requests";
 import { filterComposerPullRequestMatches } from "@t3tools/shared/composerPullRequestMatches";
 import { expect, it } from "@effect/vitest";
 
 it("keeps an older exact PR in the mobile menu ahead of twenty newer substring matches", () => {
   const exact = {
+    host: "github.com",
     number: 42,
     projectId: "project",
     repository: "example/repo",
@@ -14,6 +16,7 @@ it("keeps an older exact PR in the mobile menu ahead of twenty newer substring m
     updatedAt: "2026-01-01",
   }));
   const matches = filterComposerPullRequestMatches({
+    keyOf: threadPullRequestKeyOf,
     entries: [exact, ...recent, exact],
     projectId: exact.projectId,
     repository: exact.repository,
diff --git a/apps/mobile/src/state/queries.ts b/apps/mobile/src/state/queries.ts
index 837d77ce851c..a4cdbc624420 100644
--- a/apps/mobile/src/state/queries.ts
+++ b/apps/mobile/src/state/queries.ts
@@ -1,3 +1,7 @@
+import {
+  legacyThreadPullRequestKey,
+  threadPullRequestKeyOf,
+} from "@t3tools/client-runtime/thread-pull-requests";
 import {
   composerPullRequestsFromLinks,
   filterComposerPullRequestMatches,
@@ -148,11 +152,16 @@ export function useComposerPullRequestSearch(input: {
         })
       : null,
   );
+  // Only the host: the URL's full repository path would not match the project's selector.
+  const exactEntry = exact.data
+    ? { ...exact.data, host: legacyThreadPullRequestKey(exact.data).host }
+    : null;
   const entries = (() => {
     if (input.query === null || input.projectId === null || input.repository === null) return [];
     if (/^\d*$/.test(input.query)) {
       return filterComposerPullRequestMatches({
-        entries: ready ? [...(exact.data ? [exact.data] : []), ...(list.data?.entries ?? [])] : [],
+        keyOf: threadPullRequestKeyOf,
+        entries: ready ? [...(exactEntry ? [exactEntry] : []), ...(list.data?.entries ?? [])] : [],
         linked,
         projectId: input.projectId,
         repository: input.repository,
@@ -162,6 +171,7 @@ export function useComposerPullRequestSearch(input: {
     }
     if (!ready) {
       return withLinkedComposerPullRequestsFirst({
+        keyOf: threadPullRequestKeyOf,
         matches: [],
         linked,
         query: input.query,
@@ -169,7 +179,7 @@ export function useComposerPullRequestSearch(input: {
       });
     }
     const words = (query ?? "").toLowerCase().split(/\s+/).filter(Boolean);
-    const found = [...(exact.data ? [exact.data] : []), ...(list.data?.entries ?? [])].filter(
+    const found = [...(exactEntry ? [exactEntry] : []), ...(list.data?.entries ?? [])].filter(
       (entry) =>
         entry.projectId === input.projectId &&
         entry.repository.toLowerCase() === input.repository?.toLowerCase() &&
@@ -177,9 +187,13 @@ export function useComposerPullRequestSearch(input: {
           `${entry.title} ${entry.headBranch} ${entry.baseBranch}`.toLowerCase().includes(word),
         ),
     );
-    const unique = new Map<number, (typeof found)[number]>();
-    for (const entry of found) if (!unique.has(entry.number)) unique.set(entry.number, entry);
+    const unique = new Map<string, (typeof found)[number]>();
+    for (const entry of found) {
+      const key = threadPullRequestKeyOf(entry);
+      if (!unique.has(key)) unique.set(key, entry);
+    }
     return withLinkedComposerPullRequestsFirst({
+      keyOf: threadPullRequestKeyOf,
       matches: [...unique.values()].sort((left, right) =>
         right.updatedAt.localeCompare(left.updatedAt),
       ),
diff --git a/apps/mobile/src/state/use-composer-attachment-actions.ts b/apps/mobile/src/state/use-composer-attachment-actions.ts
index d4fefec5361f..eeb874201085 100644
--- a/apps/mobile/src/state/use-composer-attachment-actions.ts
+++ b/apps/mobile/src/state/use-composer-attachment-actions.ts
@@ -101,11 +101,15 @@ export function useComposerAttachmentActions(props: {
     const insertion = captureComposerDraftInsertion(key);
     await withDraftOperation(key, async (signal) => {
       try {
-        const images = await convertPastedImagesToAttachments({
+        const result = await convertPastedImagesToAttachments({
           uris,
           existingCount: countComposerDraftAttachmentsAfterSelection(key, insertion),
         });
-        report("Could not paste images", null, await append(key, signal, images, insertion));
+        report(
+          "Could not paste images",
+          result.error,
+          await append(key, signal, result.attachments, insertion),
+        );
       } catch (error) {
         Dialog.alert(
           "Could not paste images",
diff --git a/apps/mobile/src/state/use-thread-composer-state.ts b/apps/mobile/src/state/use-thread-composer-state.ts
index 11b38251cec7..a3a191d54cbd 100644
--- a/apps/mobile/src/state/use-thread-composer-state.ts
+++ b/apps/mobile/src/state/use-thread-composer-state.ts
@@ -13,6 +13,7 @@ import {
   isDetailBehindShell,
 } from "@t3tools/client-runtime/state/thread-activity-announcement";
 import {
+  canResumeThread,
   deriveProviderSubagentStatus,
   deriveProviderExtensionStatuses,
   deriveResumableRunId,
@@ -401,6 +402,9 @@ export function useThreadComposerState(input: {
   const resumableRunId = selectedThreadProjection
     ? deriveResumableRunId(selectedThreadProjection.projection, selectedThreadRuntime)
     : null;
+  const canResume = selectedThreadProjection
+    ? canResumeThread(selectedThreadProjection.projection, resumableRunId, queueHeld)
+    : queueHeld;
 
   const runlessWorkStartedAt = selectedThreadProjection
     ? deriveRunlessWorkStartedAt(selectedThreadProjection.projection)
@@ -919,6 +923,7 @@ export function useThreadComposerState(input: {
     canSteerActiveTurn,
     queueHeld,
     resumableRunId,
+    canResume,
     queuedRunEdit,
     isSavingQueuedEdit,
     cancelQueuedRunEdit,
diff --git a/apps/mobile/src/state/workspace.ts b/apps/mobile/src/state/workspace.ts
index c15ec215aacc..00e8fdcbbb7b 100644
--- a/apps/mobile/src/state/workspace.ts
+++ b/apps/mobile/src/state/workspace.ts
@@ -2,7 +2,7 @@ import { useAtomValue } from "@effect/atom-react";
 import { Atom } from "effect/reactivity";
 
 import { environmentShell, environmentShellSummaryAtom } from "./shell";
-import { projectWorkspaceState } from "./workspaceModel";
+import { isEnvironmentShellPending, projectWorkspaceState } from "./workspaceModel";
 import { environmentCatalog } from "../connection/catalog";
 import { environmentPresentations } from "./presentation";
 import { createWorkspaceConnectionAtoms } from "./workspace-connection-atoms";
@@ -19,7 +19,7 @@ const hasSyncingConnectedEnvironmentAtom = Atom.make((get) =>
     (environment) =>
       environment.isEnabled &&
       environment.connectionState === "connected" &&
-      get(environmentShell.stateValueAtom(environment.environmentId)).status === "synchronizing",
+      isEnvironmentShellPending(get(environmentShell.stateValueAtom(environment.environmentId))),
   ),
 ).pipe(Atom.withLabel("mobile:has-syncing-connected-environment"));
 
diff --git a/apps/mobile/src/state/workspaceModel.test.ts b/apps/mobile/src/state/workspaceModel.test.ts
index eb4cffe8e377..6f0bcbd3ee92 100644
--- a/apps/mobile/src/state/workspaceModel.test.ts
+++ b/apps/mobile/src/state/workspaceModel.test.ts
@@ -1,4 +1,7 @@
-import type { EnvironmentShellSummary } from "@t3tools/client-runtime/state/shell";
+import {
+  EMPTY_SHELL_STATE,
+  type EnvironmentShellSummary,
+} from "@t3tools/client-runtime/state/shell";
 import {
   BearerConnectionProfile,
   BearerConnectionTarget,
@@ -7,7 +10,7 @@ import { EnvironmentId } from "@t3tools/contracts";
 import { describe, expect, it } from "@effect/vitest";
 import * as Option from "effect/Option";
 
-import { projectWorkspaceState } from "./workspaceModel";
+import { isEnvironmentShellPending, projectWorkspaceState } from "./workspaceModel";
 import { projectEnvironmentConnectionSummary as projectWorkspaceEnvironment } from "@t3tools/client-runtime/state/presentation";
 import type { EnvironmentPresentation } from "./environments";
 
@@ -76,6 +79,15 @@ describe("mobile workspace projection", () => {
     expect(state.hasReadyEnvironment).toBe(false);
   });
 
+  it("waits for shell cache initialization and synchronization, but not completed reads", () => {
+    expect(isEnvironmentShellPending(EMPTY_SHELL_STATE)).toBe(true);
+    expect(isEnvironmentShellPending({ ...EMPTY_SHELL_STATE, status: "synchronizing" })).toBe(true);
+    expect(isEnvironmentShellPending({ ...EMPTY_SHELL_STATE, status: "cached" })).toBe(false);
+    expect(
+      isEnvironmentShellPending({ ...EMPTY_SHELL_STATE, error: Option.some("Cache failed.") }),
+    ).toBe(false);
+  });
+
   it("keeps retained snapshots visible while reconnecting without claiming readiness", () => {
     const environments = [projectWorkspaceEnvironment(ENVIRONMENT_ID, environment("reconnecting"))];
     const state = projectWorkspaceState({
diff --git a/apps/mobile/src/state/workspaceModel.ts b/apps/mobile/src/state/workspaceModel.ts
index a246163ef781..710d050afcb5 100644
--- a/apps/mobile/src/state/workspaceModel.ts
+++ b/apps/mobile/src/state/workspaceModel.ts
@@ -1,4 +1,8 @@
-import { type EnvironmentShellSummary } from "@t3tools/client-runtime/state/shell";
+import {
+  EMPTY_SHELL_STATE,
+  type EnvironmentShellState,
+  type EnvironmentShellSummary,
+} from "@t3tools/client-runtime/state/shell";
 import type { EnvironmentId, ServerConfig } from "@t3tools/contracts";
 
 import {
@@ -103,4 +107,17 @@ export function projectWorkspaceState(input: {
   };
 }
 
+// The atom starts at EMPTY_SHELL_STATE itself; any state after the cache read is a new object.
+export function isEnvironmentShellPending(state: EnvironmentShellState): boolean {
+  return state === EMPTY_SHELL_STATE || state.status === "synchronizing";
+}
+
+// Reconnecting environments keep their last failure, so an error alone does not end the wait.
+export function isWorkspaceCatalogPending(state: WorkspaceState): boolean {
+  return (
+    state.networkStatus !== "offline" &&
+    (state.hasConnectingEnvironment || state.hasSyncingConnectedEnvironment)
+  );
+}
+
 export type ServerConfigByEnvironmentId = ReadonlyMap<EnvironmentId, ServerConfig>;
diff --git a/apps/mobile/vite.config.ts b/apps/mobile/vite.config.ts
index 56fafe6d676c..2b688fee30ad 100644
--- a/apps/mobile/vite.config.ts
+++ b/apps/mobile/vite.config.ts
@@ -10,6 +10,7 @@ const reactTests = [
   "src/state/use-thread-pr.demand.test.tsx",
   "src/features/threads/git/GitBranchesSheet.occupancy.test.tsx",
   "src/features/files/useFileTreeEntries.test.tsx",
+  "src/features/files/thread-file-navigator-pane.test.tsx",
   "src/features/files/source-file-document.test.ts",
   "src/features/projects/AddProjectScreen.test.ts",
   "src/lib/useMediaVideoPlayback.test.tsx",
diff --git a/apps/server/scripts/acp-mock-agent.ts b/apps/server/scripts/acp-mock-agent.ts
index 547f1ad8bcf8..a97aab9cdf2b 100644
--- a/apps/server/scripts/acp-mock-agent.ts
+++ b/apps/server/scripts/acp-mock-agent.ts
@@ -23,6 +23,12 @@ const copilotModesProfile = process.env.T3_ACP_COPILOT_MODES === "1";
 const copilotModeId = (name: string) =>
   `https://agentclientprotocol.com/protocol/session-modes#${name}`;
 const modeOptionCategory = process.env.T3_ACP_MODE_OPTION_CATEGORY ?? "mode";
+// Comma-separated command names the mock advertises, so `/compact` support is testable.
+const advertisedCommandNames = (process.env.T3_ACP_AVAILABLE_COMMANDS ?? "")
+  .split(",")
+  .map((name) => name.trim())
+  .filter((name) => name.length > 0);
+const loadedCommandNames = process.env.T3_ACP_LOADED_COMMANDS?.split(",").filter(Boolean);
 const emitToolCalls = process.env.T3_ACP_EMIT_TOOL_CALLS === "1";
 const emitInterleavedAssistantToolCalls =
   process.env.T3_ACP_EMIT_INTERLEAVED_ASSISTANT_TOOL_CALLS === "1";
@@ -77,6 +83,10 @@ const failPromptOrdinal = Number(process.env.T3_ACP_FAIL_PROMPT_ORDINAL);
 const compactionPromptOrdinals = new Set(
   (process.env.T3_ACP_COMPACTION_PROMPT_ORDINALS ?? "").split(",").map(Number),
 );
+// These prompts end while their compaction is still in progress.
+const openCompactionPromptOrdinals = new Set(
+  (process.env.T3_ACP_OPEN_COMPACTION_PROMPT_ORDINALS ?? "").split(",").map(Number),
+);
 const failSetModeConfigOption = process.env.T3_ACP_FAIL_SET_MODE_CONFIG_OPTION === "1";
 const emitEmptyDefaultAgentOption = process.env.T3_ACP_EMIT_EMPTY_DEFAULT_AGENT_OPTION === "1";
 const promptResponseText = process.env.T3_ACP_PROMPT_RESPONSE_TEXT;
@@ -610,6 +620,18 @@ const program = Effect.gen(function* () {
       if (antigravityProfile) {
         yield* publishAntigravityCommands(sessionId);
       }
+      if (advertisedCommandNames.length > 0) {
+        yield* agent.client.sessionUpdate({
+          sessionId,
+          update: {
+            sessionUpdate: "available_commands_update",
+            availableCommands: advertisedCommandNames.map((name) => ({
+              name,
+              description: `${name} command`,
+            })),
+          },
+        });
+      }
       return {
         sessionId,
         configOptions: configOptions(),
@@ -665,6 +687,15 @@ const program = Effect.gen(function* () {
   yield* agent.handleLoadSession((request) =>
     Effect.gen(function* () {
       const requestedSessionId = String(request.sessionId ?? sessionId);
+      if (loadedCommandNames !== undefined) {
+        yield* agent.client.sessionUpdate({
+          sessionId: requestedSessionId,
+          update: {
+            sessionUpdate: "available_commands_update",
+            availableCommands: loadedCommandNames.map((name) => ({ name, description: name })),
+          },
+        });
+      }
       if (failLoadSession) {
         return yield* AcpError.AcpRequestError.internalError("Mock load session failure");
       }
@@ -1342,6 +1373,16 @@ const program = Effect.gen(function* () {
         yield* Effect.sleep(`${promptDelayMs} millis`);
       }
 
+      if (openCompactionPromptOrdinals.has(promptCount)) {
+        yield* agent.client.sessionUpdate({
+          sessionId: requestedSessionId,
+          update: {
+            sessionUpdate: "compaction_update",
+            compactionId: `compact-${promptCount}`,
+            status: "in_progress",
+          },
+        });
+      }
       if (compactionPromptOrdinals.has(promptCount)) {
         for (const status of ["in_progress", "completed"] as const) {
           yield* agent.client.sessionUpdate({
diff --git a/apps/server/scripts/migrate-dev-db.test.ts b/apps/server/scripts/migrate-dev-db.test.ts
index 6898eff9ccbf..c81b01b0fe60 100644
--- a/apps/server/scripts/migrate-dev-db.test.ts
+++ b/apps/server/scripts/migrate-dev-db.test.ts
@@ -9,9 +9,9 @@ import { runMigrations } from "../src/persistence/Migrations.ts";
 import * as NodeSqliteClient from "@t3tools/shared/nodeSqliteClient";
 import { runMigrateDevDb } from "./migrate-dev-db.ts";
 
-const withDatabase = <A, E>(
+const withDatabase = <A, E, R>(
   databasePath: string,
-  effect: Effect.Effect<A, E, SqlClient.SqlClient>,
+  effect: Effect.Effect<A, E, R | SqlClient.SqlClient>,
 ) => effect.pipe(Effect.provide(NodeSqliteClient.layer({ filename: databasePath })));
 
 const insertPeerLink = (sql: SqlClient.SqlClient) => sql`INSERT INTO peer_environment_links
@@ -34,10 +34,21 @@ const createFixtureSource = Effect.fn("createMigrateDevDbFixtureSource")(functio
       const sql = yield* SqlClient.SqlClient;
       yield* runMigrations({ toMigrationInclusive });
 
+      const scripts = JSON.stringify([
+        { id: "lint", name: "Lint", command: "vp lint", icon: "lint", runOnWorktreeCreate: false },
+        {
+          id: "teardown",
+          name: "Teardown",
+          command: "./teardown",
+          icon: "configure",
+          runOnWorktreeCreate: false,
+          runOnSettle: true,
+        },
+      ]);
       yield* sql`INSERT INTO projection_projects
         (project_id, title, workspace_root, scripts_json, created_at, updated_at, deleted_at)
         VALUES
-        ('project-kept', 'Kept', '/tmp/kept', '[]', '2026-08-01', '2026-08-01', NULL),
+        ('project-kept', 'Kept', '/tmp/kept', ${scripts}, '2026-08-01', '2026-08-01', NULL),
         ('project-deleted', 'Deleted', '/tmp/deleted', '[]', '2026-08-01', '2026-08-02', '2026-08-02')`;
 
       const forkPayload =
@@ -100,9 +111,14 @@ const createFixtureSource = Effect.fn("createMigrateDevDbFixtureSource")(functio
           (run_id, thread_id, ordinal, provider, status, requested_at, payload_json)
           VALUES (${`run-${threadId}`}, ${threadId}, 1, 'codex', ${runStatus}, '2026-08-01', '{}')`;
         yield* sql`INSERT INTO orchestration_events
-          (event_id, aggregate_kind, stream_id, stream_version, event_type, occurred_at, actor_kind, payload_json, metadata_json)
-          VALUES (${`event-${threadId}`}, 'thread', ${threadId}, 0, 'thread.created', '2026-08-01', 'user', '{}', '{}')`;
+          (event_id, aggregate_kind, stream_id, stream_version, event_type, occurred_at, actor_kind, payload_json, metadata_json, application_event_version)
+          VALUES (${`event-${threadId}`}, 'thread', ${threadId}, 0, 'thread.created', '2026-08-01', 'user', '{}', '{}', 2)`;
       }
+      // A V1 thread the server already imported must not trip the legacy guard.
+      yield* sql`INSERT INTO projection_threads
+        (thread_id, project_id, title, model_selection_json, runtime_mode, created_at, updated_at)
+        VALUES ('stopped-thread', 'project-kept', 'stopped-thread',
+          '{"instanceId":"codex","model":"gpt-5.4"}', 'full-access', '2026-08-01', '2026-08-01')`;
       yield* sql`INSERT INTO orchestration_v2_projection_provider_sessions
         (provider_session_id, thread_id, provider, status, updated_at, payload_json)
         VALUES ('session-shared', 'running-thread', 'codex', 'stopped', '2026-08-01', '{}')`;
@@ -162,6 +178,8 @@ it.layer(NodeServices.layer)("migrate-dev-db", (it) => {
               json_extract(payload_json, '$.pullRequests[0].url') AS url,
               json_extract(payload_json, '$.pullRequests[0].watch') AS watch
             FROM orchestration_v2_projection_threads WHERE thread_id = 'stopped-thread'`;
+          const [project] = yield* sql<{ scripts_json: string }>`
+            SELECT scripts_json FROM projection_projects WHERE project_id = 'project-kept'`;
           const [leftovers] = yield* sql<{
             auth: number;
             tasks: number;
@@ -176,7 +194,7 @@ it.layer(NodeServices.layer)("migrate-dev-db", (it) => {
                 (SELECT COUNT(*) FROM scheduled_task_webhook_pending) AS webhooks,
               (SELECT COUNT(*) FROM orchestration_v2_projection_context_transfers) AS transfers,
               (SELECT COUNT(*) FROM peer_environment_links) AS links`;
-          return { threads, events, sessions, pullRequest, leftovers };
+          return { threads, events, sessions, pullRequest, project, leftovers };
         }),
       );
       assert.deepStrictEqual(
@@ -196,6 +214,26 @@ it.layer(NodeServices.layer)("migrate-dev-db", (it) => {
         { url: "https://github.com/owner/repo/pull/7", watch: null },
         "copied pull request links keep their history but stop being watched",
       );
+      assert.deepStrictEqual(
+        JSON.parse(kept.project?.scripts_json ?? "[]"),
+        [
+          {
+            id: "lint",
+            name: "Lint",
+            command: "vp lint",
+            icon: "lint",
+            runOnWorktreeCreate: false,
+          },
+          {
+            id: "teardown",
+            name: "Teardown",
+            command: "./teardown",
+            icon: "configure",
+            runOnWorktreeCreate: false,
+          },
+        ],
+        "copied project scripts stay listed but never run on settle in the original checkout",
+      );
       assert.deepStrictEqual(kept.leftovers, {
         auth: 0,
         tasks: 0,
@@ -291,6 +329,61 @@ it.layer(NodeServices.layer)("migrate-dev-db", (it) => {
     }),
   );
 
+  // The server imports V1 threads at boot, not in a migration, so a source can
+  // reach the V2 schema with its legacy threads still unimported.
+  it.effect.each([
+    { name: "a pre-V2 source", migrateToLatest: false },
+    { name: "a V2 source whose legacy threads were never imported", migrateToLatest: true },
+  ])("refuses $name", ({ migrateToLatest }) =>
+    Effect.gen(function* () {
+      const fs = yield* FileSystem.FileSystem;
+      const path = yield* Path.Path;
+      const sourceDir = yield* fs.makeTempDirectoryScoped({ prefix: "migrate-dev-db-v1-data-" });
+      const destDir = yield* fs.makeTempDirectoryScoped({
+        prefix: "migrate-dev-db-v1-data-dest-",
+      });
+      const stateDir = path.join(sourceDir, "userdata");
+      const source = path.join(stateDir, "statev2.sqlite");
+      yield* fs.makeDirectory(stateDir, { recursive: true });
+      yield* withDatabase(
+        source,
+        Effect.gen(function* () {
+          const sql = yield* SqlClient.SqlClient;
+          yield* runMigrations({ toMigrationInclusive: 54 });
+          yield* sql`INSERT INTO projection_projects
+            (project_id, title, workspace_root, scripts_json, created_at, updated_at)
+            VALUES ('project-legacy', 'Legacy', '/tmp/legacy', '[]', '2026-08-01', '2026-08-01')`;
+          yield* sql`INSERT INTO projection_threads
+            (thread_id, project_id, title, model_selection_json, runtime_mode, created_at, updated_at)
+            VALUES ('thread-legacy', 'project-legacy', 'Legacy thread',
+              '{"instanceId":"codex","model":"gpt-5.4"}', 'full-access', '2026-08-01', '2026-08-01')`;
+          if (migrateToLatest) yield* runMigrations();
+        }),
+      );
+
+      // A live destination connection keeps uncheckpointed rows in the WAL;
+      // the rejected run must leave those bytes alone.
+      const destination = yield* createFixtureSource(destDir);
+      yield* withDatabase(
+        destination,
+        Effect.gen(function* () {
+          const sql = yield* SqlClient.SqlClient;
+          yield* sql.unsafe("PRAGMA journal_mode = WAL").unprepared;
+          yield* sql`UPDATE projection_projects SET title = 'Edited' WHERE project_id = 'project-kept'`;
+          const walBefore = yield* fs.readFile(`${destination}-wal`);
+          assert.isAbove(walBefore.length, 0);
+
+          const error = yield* runMigrateDevDb(
+            { baseDir: destDir, source, projects: 5, threadsPerProject: 10 },
+            { sharedHome: sourceDir },
+          ).pipe(Effect.flip);
+          assert.equal(error._tag, "MigrateDevDbLegacySourceError");
+          assert.deepStrictEqual(yield* fs.readFile(`${destination}-wal`), walBefore);
+        }),
+      );
+    }),
+  );
+
   it.effect("seeds from a source that recorded another migration below V2", () =>
     Effect.gen(function* () {
       const fs = yield* FileSystem.FileSystem;
diff --git a/apps/server/scripts/migrate-dev-db.ts b/apps/server/scripts/migrate-dev-db.ts
index afec0c9458b8..b44e7c52ea14 100644
--- a/apps/server/scripts/migrate-dev-db.ts
+++ b/apps/server/scripts/migrate-dev-db.ts
@@ -60,6 +60,18 @@ export class MigrateDevDbSourceIsDestinationError extends Schema.TaggedError<Mig
   }
 }
 
+export class MigrateDevDbLegacySourceError extends Schema.TaggedError<MigrateDevDbLegacySourceError>()(
+  "MigrateDevDbLegacySourceError",
+  {
+    sourcePath: Schema.String,
+    legacyThreads: Schema.Number,
+  },
+) {
+  override get message(): string {
+    return `Source database '${this.sourcePath}' holds ${this.legacyThreads} legacy threads the server has not imported into V2 yet, which this command cannot carry over. Start a server once on a T3 home holding a copy of it so it imports them, then pass the userdata/statev2.sqlite that server leaves behind as --source.`;
+  }
+}
+
 export class MigrateDevDbServerRunningError extends Schema.TaggedError<MigrateDevDbServerRunningError>()(
   "MigrateDevDbServerRunningError",
   {
@@ -210,47 +222,71 @@ const rootIsVisible = (sql: SqlClient.SqlClient) => sql`
   AND json_extract(root.payload_json, '$.deletedAt') IS NULL
   AND json_extract(root.payload_json, '$.archivedAt') IS NULL`;
 
-// A single read transaction keeps the copy consistent with concurrent server writes.
+// One read transaction keeps the copy, and its legacy-thread guard, consistent with concurrent
+// server writes. The server imports V1 threads at boot, and the copy keeps only threads with V2
+// rows, so unimported ones would vanish silently (see LegacyV1ThreadImporter.pendingThreadCount).
 const copySourceSlice = Effect.fn("copyDevDbSourceSlice")(function* (sourcePath: string) {
   const sql = yield* SqlClient.SqlClient;
   yield* sql`ATTACH DATABASE ${`${NodeURL.pathToFileURL(sourcePath).href}?mode=ro`} AS src`;
-  const schema = yield* sql<{ type: string; name: string; sql: string }>`
-    SELECT type, name, sql FROM src.sqlite_master
-    WHERE sql IS NOT NULL AND name NOT LIKE 'sqlite_%'`;
-  const threadColumns = yield* sql<{ name: string; notnull: number }>`
-    SELECT m.name, c."notnull" FROM src.sqlite_master m, pragma_table_info(m.name, 'src') c
-    WHERE m.type = 'table' AND c.name = 'thread_id'`;
-  const threadIdNullable = new Map(threadColumns.map((row) => [row.name, row.notnull === 0]));
-  // FTS5 makes its own shadow tables and contentless rows cannot be copied:
-  // create the virtual table, skip its shadow tables and rows, and rebuild the
-  // index once the messages and triggers are in.
-  const virtualTables = schema
-    .filter((entry) => entry.type === "table" && /^CREATE VIRTUAL TABLE/i.test(entry.sql))
-    .map((entry) => entry.name);
-  const isShadowTable = (name: string) =>
-    virtualTables.some((virtual) =>
-      FTS5_SHADOW_SUFFIXES.some((suffix) => name === `${virtual}${suffix}`),
-    );
-  const tables = schema.filter((entry) => entry.type === "table" && !isShadowTable(entry.name));
-  const filtered = tables.some((table) => table.name === "orchestration_v2_projection_threads");
-  // A row that points into a cleared table cannot be copied, so whatever references one is
-  // cleared with it, however far down the chain a newer migration added it.
-  const references = yield* sql<{ name: string; parent: string }>`
-    SELECT m.name, f."table" AS parent FROM src.sqlite_master m, pragma_foreign_key_list(m.name, 'src') f
-    WHERE m.type = 'table'`;
-  const cleared = new Set(CLEARED_TABLES);
-  for (let grew = true; grew;) {
-    grew = false;
-    for (const { name, parent } of references) {
-      if (cleared.has(parent) && !cleared.has(name)) {
-        cleared.add(name);
-        grew = true;
-      }
-    }
-  }
 
   yield* sql.withTransaction(
     Effect.gen(function* () {
+      const schema = yield* sql<{ type: string; name: string; sql: string }>`
+        SELECT type, name, sql FROM src.sqlite_master
+        WHERE sql IS NOT NULL AND name NOT LIKE 'sqlite_%'`;
+      const threadColumns = yield* sql<{ name: string; notnull: number }>`
+        SELECT m.name, c."notnull" FROM src.sqlite_master m, pragma_table_info(m.name, 'src') c
+        WHERE m.type = 'table' AND c.name = 'thread_id'`;
+      const threadIdNullable = new Map(threadColumns.map((row) => [row.name, row.notnull === 0]));
+      // FTS5 makes its own shadow tables and contentless rows cannot be copied:
+      // create the virtual table, skip its shadow tables and rows, and rebuild the
+      // index once the messages and triggers are in.
+      const virtualTables = schema
+        .filter((entry) => entry.type === "table" && /^CREATE VIRTUAL TABLE/i.test(entry.sql))
+        .map((entry) => entry.name);
+      const isShadowTable = (name: string) =>
+        virtualTables.some((virtual) =>
+          FTS5_SHADOW_SUFFIXES.some((suffix) => name === `${virtual}${suffix}`),
+        );
+      const tables = schema.filter((entry) => entry.type === "table" && !isShadowTable(entry.name));
+      const filtered = tables.some((table) => table.name === "orchestration_v2_projection_threads");
+      // A row that points into a cleared table cannot be copied, so whatever references one is
+      // cleared with it, however far down the chain a newer migration added it.
+      const references = yield* sql<{ name: string; parent: string }>`
+        SELECT m.name, f."table" AS parent FROM src.sqlite_master m, pragma_foreign_key_list(m.name, 'src') f
+        WHERE m.type = 'table'`;
+      const cleared = new Set(CLEARED_TABLES);
+      for (let grew = true; grew;) {
+        grew = false;
+        for (const { name, parent } of references) {
+          if (cleared.has(parent) && !cleared.has(name)) {
+            cleared.add(name);
+            grew = true;
+          }
+        }
+      }
+
+      if (tables.some((table) => table.name === "projection_threads")) {
+        // The V2 tables, application_event_version, and the partial index arrive in
+        // the same migration. Without the hint SQLite scans each thread's stream.
+        const [pending] = filtered
+          ? yield* sql<{ count: number }>`
+              SELECT COUNT(*) AS count FROM src.projection_threads AS thread
+              WHERE NOT EXISTS (
+                SELECT 1
+                FROM src.orchestration_events AS event INDEXED BY orchestration_events_v2_created_threads_idx
+                WHERE event.application_event_version = 2
+                  AND event.aggregate_kind = 'thread'
+                  AND event.stream_id = thread.thread_id
+                  AND event.event_type = 'thread.created'
+              )`
+          : yield* sql<{ count: number }>`SELECT COUNT(*) AS count FROM src.projection_threads`;
+        const legacyThreads = Number(pending?.count ?? 0);
+        if (legacyThreads > 0) {
+          return yield* new MigrateDevDbLegacySourceError({ sourcePath, legacyThreads });
+        }
+      }
+
       for (const table of tables) yield* sql.unsafe(table.sql).unprepared;
       if (filtered) {
         yield* sql`CREATE TEMP TABLE copied_threads (thread_id TEXT PRIMARY KEY)`;
@@ -382,12 +418,20 @@ const pruneSnapshot = Effect.fn("pruneDevDbSnapshot")(function* (input: RunMigra
            OR (aggregate_kind = 'project'
             AND stream_id NOT IN (SELECT project_id FROM kept_projects))`;
       yield* sql`UPDATE orchestration_v2_projection_threads
-        SET payload_json = json_set(payload_json, '$.pullRequests', (
+        SET payload_json = json_set(payload_json, '$.pullRequests', json((
           SELECT json_group_array(json_remove(link.value, '$.watch') ORDER BY link.key)
-          FROM json_each(payload_json, '$.pullRequests') AS link))
+          FROM json_each(payload_json, '$.pullRequests') AS link)))
         WHERE EXISTS (
           SELECT 1 FROM json_each(payload_json, '$.pullRequests') AS link
           WHERE json_extract(link.value, '$.watch') IS NOT NULL)`;
+      // Copied threads keep their real worktree paths, where a settle script would run.
+      yield* sql`UPDATE projection_projects
+        SET scripts_json = (
+          SELECT json_group_array(json_remove(script.value, '$.runOnSettle') ORDER BY script.key)
+          FROM json_each(scripts_json) AS script)
+        WHERE EXISTS (
+          SELECT 1 FROM json_each(scripts_json) AS script
+          WHERE json_extract(script.value, '$.runOnSettle') IS NOT NULL)`;
       for (const table of CLEARED_TABLES) {
         yield* sql`DELETE FROM ${sql(table)}`;
       }
@@ -488,7 +532,6 @@ export const runMigrateDevDb = Effect.fn("runMigrateDevDb")(function* (
   }
 
   yield* fs.makeDirectory(stateDir, { recursive: true });
-  yield* ensureNotInUse(databasePath);
 
   const wrapPhase =
     (phase: MigrateDevDbPhaseError["phase"], phaseDatabasePath: string) =>
@@ -504,8 +547,15 @@ export const runMigrateDevDb = Effect.fn("runMigrateDevDb")(function* (
     yield* Console.log(`Copying visible threads from ${sourcePath} (read-only)...`);
     yield* copySourceSlice(sourcePath).pipe(
       Effect.provide(NodeSqliteClient.layer({ filename: snapshotPath })),
-      wrapPhase("snapshot", sourcePath),
+      Effect.catchTags({
+        SqlError: (cause) =>
+          Effect.fail(
+            new MigrateDevDbPhaseError({ phase: "snapshot", databasePath: sourcePath, cause }),
+          ),
+      }),
     );
+    // Checkpoints the destination, so it runs after the copy's legacy guard.
+    yield* ensureNotInUse(databasePath);
 
     // Migrate first so prune queries can use columns missing from older sources.
     yield* Console.log("Running migrations on the snapshot...");
diff --git a/apps/server/scripts/record-cursor-agent-sdk-replay-fixture.ts b/apps/server/scripts/record-cursor-agent-sdk-replay-fixture.ts
index e873215b0c1a..8f0bcdb634e6 100644
--- a/apps/server/scripts/record-cursor-agent-sdk-replay-fixture.ts
+++ b/apps/server/scripts/record-cursor-agent-sdk-replay-fixture.ts
@@ -219,6 +219,6 @@ const recordCursorReplayCommand = Command.make(
 );
 
 Command.run(recordCursorReplayCommand, { version: "0.0.0" }).pipe(
-  Effect.provide(Layer.mergeAll(CursorSdk.layer, NodeServices.layer)),
+  Effect.provide(CursorSdk.layer.pipe(Layer.provideMerge(NodeServices.layer))),
   NodeRuntime.runMain,
 );
diff --git a/apps/server/src/assets/AssetAccess.test.ts b/apps/server/src/assets/AssetAccess.test.ts
index d762a15a830f..681af43bdf34 100644
--- a/apps/server/src/assets/AssetAccess.test.ts
+++ b/apps/server/src/assets/AssetAccess.test.ts
@@ -1566,10 +1566,7 @@ describe("AssetAccess", () => {
       // A pull request's own repository wins over the checkout it is shown in.
       yield* sourceControlMediaResponse({ ...asset, repository: "enterprise/private" }, {});
       expect(fetched.at(-1)?.repository).toBe("enterprise/private");
-    }).pipe(
-      Effect.provide(Layer.mergeAll(layerTest, layerDrivers, layerIdentities)),
-      Effect.scoped,
-    );
+    }).pipe(Effect.provide(Layer.mergeAll(layerTest, layerDrivers, layerIdentities)));
   });
 
   it.effect("refuses media no host keeps behind a credential, without echoing the URL", () =>
diff --git a/apps/server/src/auth/McpOAuth.test.ts b/apps/server/src/auth/McpOAuth.test.ts
index c7cf59db9386..4cd276c51133 100644
--- a/apps/server/src/auth/McpOAuth.test.ts
+++ b/apps/server/src/auth/McpOAuth.test.ts
@@ -193,7 +193,7 @@ const authorizeParams = (clientId: string, redirect = "http://localhost:51234/ca
   resource: `${ORIGIN}/mcp`,
 });
 
-it.live("derives discovery metadata from the origin the client reached", () =>
+it.effect("derives discovery metadata from the origin the client reached", () =>
   withRoutes((handler) =>
     Effect.gen(function* () {
       const resource = yield* handler(at("/.well-known/oauth-protected-resource/mcp"));
@@ -215,7 +215,7 @@ it.live("derives discovery metadata from the origin the client reached", () =>
   ),
 );
 
-it.live("registers loopback and https clients and never redirects for an unverified client", () =>
+it.effect("registers loopback and https clients and never redirects for an unverified client", () =>
   withRoutes((handler) =>
     Effect.gen(function* () {
       for (const refused of [
@@ -622,7 +622,7 @@ it.live("an app approval code approves only an app sign-in, at its own level", (
   ),
 );
 
-it.live(
+it.effect(
   "sends an app sign-in on the linked tunnel to the hosted app, and a link to its own page",
   () =>
     Effect.gen(function* () {
diff --git a/apps/server/src/auth/RpcAuthorization.test.ts b/apps/server/src/auth/RpcAuthorization.test.ts
index aab7445e9577..88596577db3c 100644
--- a/apps/server/src/auth/RpcAuthorization.test.ts
+++ b/apps/server/src/auth/RpcAuthorization.test.ts
@@ -135,7 +135,7 @@ describe("RPC scope middleware", () => {
         requiredPermission: missing,
       });
       expect(handled).toEqual([]);
-    }).pipe(Effect.scoped),
+    }),
   );
 });
 
@@ -191,7 +191,7 @@ it.effect.each([WS_METHODS.subscribeVcsBranch, WS_METHODS.subscribeVcsStatus] as
           : granted[method]({ cwd: "/repo" }).pipe(Stream.drain),
       );
       expect(handled).toBe(1);
-    }).pipe(Effect.scoped),
+    }),
 );
 
 describe("settings mutation authorization", () => {
@@ -260,7 +260,7 @@ describe("settings mutation authorization", () => {
         }).pipe(Effect.flip),
       ).toMatchObject({ requiredPermission: AuthSettingsWriteScope });
       expect(handled).toBe(2);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("does not let a settings grant create or remove providers or secret providers", () =>
@@ -291,7 +291,7 @@ describe("settings mutation authorization", () => {
         }).pipe(Effect.flip),
       ).toMatchObject({ requiredPermission: AuthProvidersManageScope });
       expect(handled).toBe(false);
-    }).pipe(Effect.scoped),
+    }),
   );
 });
 
@@ -329,7 +329,7 @@ it.effect("requires task permission before attaching a prepared worktree to a th
       }).pipe(Effect.flip),
     ).toMatchObject({ requiredPermission: AuthOrchestrationOperateScope });
     expect(handled).toBe(false);
-  }).pipe(Effect.scoped),
+  }),
 );
 
 describe("thread context authorization", () => {
@@ -381,7 +381,7 @@ describe("thread context authorization", () => {
           reader[WS_METHODS.gitRunStackedAction]({ ...withThread, actionId: "allowed" }),
         );
         expect(handled.at(-1)).toBe("allowed");
-      }).pipe(Effect.scoped),
+      }),
   );
 });
 
@@ -429,7 +429,7 @@ it.effect("separates host file URLs from readable attachment URLs", () =>
       });
     }
     expect(handled).toBe(2);
-  }).pipe(Effect.scoped),
+  }),
 );
 
 it.effect("denies manual cleanup before the handler without settings permission", () =>
@@ -470,5 +470,5 @@ it.effect("denies manual cleanup before the handler without settings permission"
       requiredPermission: AuthSettingsWriteScope,
     });
     expect(handled).toBe(false);
-  }).pipe(Effect.scoped),
+  }),
 );
diff --git a/apps/server/src/auth/RpcAuthorization.ts b/apps/server/src/auth/RpcAuthorization.ts
index 180f053f111f..7823c3a14622 100644
--- a/apps/server/src/auth/RpcAuthorization.ts
+++ b/apps/server/src/auth/RpcAuthorization.ts
@@ -142,6 +142,7 @@ export const RPC_REQUIRED_SCOPES = {
   [WS_METHODS.pullRequestsInvalidate]: AuthOrchestrationReadScope,
   [WS_METHODS.pullRequestsReportState]: AuthOrchestrationReadScope,
   [WS_METHODS.pullRequestsSubscribeRefreshes]: AuthOrchestrationReadScope,
+  [WS_METHODS.pullRequestsSubscribeLinkedThreadRefreshes]: AuthOrchestrationReadScope,
   [WS_METHODS.pullRequestsReviewerCandidates]: AuthOrchestrationReadScope,
   [WS_METHODS.pullRequestsLabelCandidates]: AuthOrchestrationReadScope,
   [WS_METHODS.sourceControlLookupRepository]: AuthOrchestrationReadScope,
diff --git a/apps/server/src/background/KeepAwake.test.ts b/apps/server/src/background/KeepAwake.test.ts
new file mode 100644
index 000000000000..8984102729ce
--- /dev/null
+++ b/apps/server/src/background/KeepAwake.test.ts
@@ -0,0 +1,36 @@
+import { describe, expect, it } from "@effect/vitest";
+import * as Effect from "effect/Effect";
+import * as Queue from "effect/Queue";
+import * as Stream from "effect/Stream";
+import * as TestClock from "effect/testing/TestClock";
+
+import * as KeepAwake from "./KeepAwake.ts";
+
+describe("KeepAwake.holdWhileWanted", () => {
+  it.effect("keeps one hold across a gap shorter than the grace and releases after it", () =>
+    Effect.gen(function* () {
+      const wanted = yield* Queue.unbounded<boolean>();
+      const transitions = yield* Queue.unbounded<"held" | "released">();
+      const hold = Effect.acquireRelease(Queue.offer(transitions, "held"), () =>
+        Queue.offer(transitions, "released"),
+      ).pipe(Effect.andThen(Effect.never), Effect.scoped);
+      yield* KeepAwake.holdWhileWanted(Stream.fromQueue(wanted), hold, "60 seconds").pipe(
+        Effect.forkScoped,
+      );
+
+      yield* Queue.offer(wanted, true);
+      expect(yield* Queue.take(transitions)).toBe("held");
+
+      yield* Queue.offer(wanted, false);
+      yield* TestClock.adjust("30 seconds");
+      yield* Queue.offer(wanted, true);
+      yield* TestClock.adjust("120 seconds");
+      expect(yield* Queue.size(transitions)).toBe(0);
+
+      yield* Queue.offer(wanted, false);
+      yield* TestClock.adjust("120 seconds");
+      expect(yield* Queue.take(transitions)).toBe("released");
+      expect(yield* Queue.size(transitions)).toBe(0);
+    }),
+  );
+});
diff --git a/apps/server/src/background/KeepAwake.ts b/apps/server/src/background/KeepAwake.ts
new file mode 100644
index 000000000000..5c9c3efc502e
--- /dev/null
+++ b/apps/server/src/background/KeepAwake.ts
@@ -0,0 +1,191 @@
+import * as Duration from "effect/Duration";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as ChildProcess from "effect/process/ChildProcess";
+import * as ChildProcessSpawner from "effect/process/ChildProcessSpawner";
+import * as Schedule from "effect/Schedule";
+import * as Schema from "effect/Schema";
+import * as Stream from "effect/Stream";
+import * as SqlClient from "effect/sql/SqlClient";
+
+import * as HostProcess from "@t3tools/shared/HostProcess";
+
+import * as OrchestrationEventStore from "../persistence/OrchestrationEventStore.ts";
+import { forkParked } from "../serverActivation.ts";
+import * as Settings from "../serverSettings.ts";
+
+// Bridges gaps between back-to-back runs, so a long-idle machine does not sleep mid-queue.
+const RELEASE_GRACE = Duration.seconds(60);
+
+/** Each command holds its inhibitor until it exits, and exits on its own if the server dies. */
+function inhibitorCommand(
+  platform: NodeJS.Platform,
+  serverPid: number,
+): { readonly command: string; readonly args: ReadonlyArray<string> } | undefined {
+  switch (platform) {
+    case "darwin":
+      return { command: "caffeinate", args: ["-i", "-w", String(serverPid)] };
+    case "linux":
+      return {
+        command: "systemd-inhibit",
+        args: [
+          "--what=idle:sleep",
+          "--who=T3 Code",
+          "--why=Agents are working",
+          "--mode=block",
+          "tail",
+          `--pid=${serverPid}`,
+          "-f",
+          "/dev/null",
+        ],
+      };
+    case "win32":
+      return {
+        command: "powershell.exe",
+        args: [
+          "-NoProfile",
+          "-NonInteractive",
+          "-Command",
+          // ES_CONTINUOUS | ES_SYSTEM_REQUIRED, held by this thread until Wait-Process returns.
+          `$t = Add-Type -Name Power -Namespace T3 -PassThru -MemberDefinition '[DllImport("kernel32.dll")] public static extern uint SetThreadExecutionState(uint f);'; [void]$t::SetThreadExecutionState([uint32]2147483649); Wait-Process -Id ${serverPid}`,
+        ],
+      };
+    default:
+      return undefined;
+  }
+}
+
+/**
+ * Runs `hold` while `wanted` is true and for `grace` after it turns false; a true inside the
+ * grace keeps the same hold. `hold` runs until interrupted.
+ */
+export const holdWhileWanted = <E, R>(
+  wanted: Stream.Stream<boolean, E, R>,
+  hold: Effect.Effect<void>,
+  grace: Duration.Input = RELEASE_GRACE,
+) =>
+  wanted.pipe(
+    Stream.changes,
+    Stream.switchMap((on) =>
+      on ? Stream.succeed(true) : Stream.fromEffect(Effect.as(Effect.sleep(grace), false)),
+    ),
+    Stream.changes,
+    Stream.switchMap((on) => (on ? Stream.fromEffect(hold) : Stream.empty)),
+    Stream.runDrain,
+  );
+
+// Reads, the event subscription and the inhibitor retry until they succeed; the cap keeps a
+// host without an inhibitor (e.g. no logind) from retrying and warning constantly.
+const backoff = Schedule.exponential("5 seconds").pipe(
+  Schedule.modifyDelay(({ duration }) =>
+    Effect.succeed(Duration.min(duration, Duration.minutes(10))),
+  ),
+);
+const retryWithBackoff =
+  (message: string) =>
+  <A, E, R>(effect: Effect.Effect<A, E, R>) =>
+    effect.pipe(
+      Effect.tapCause((cause) => Effect.logWarning(message, { cause })),
+      Effect.retry(backoff),
+    );
+
+class KeepAwakeInhibitorExited extends Schema.TaggedError<KeepAwakeInhibitorExited>()(
+  "KeepAwakeInhibitorExited",
+  { exitCode: Schema.Number },
+) {}
+
+export const layer = Layer.effectDiscard(
+  Effect.gen(function* () {
+    const command = inhibitorCommand(yield* HostProcess.Platform, process.pid);
+    if (command === undefined) return;
+    const settings = yield* Settings.ServerSettingsService;
+    const events = yield* OrchestrationEventStore.OrchestrationEventStore;
+    const sql = yield* SqlClient.SqlClient;
+    const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
+
+    const hasActiveRun = sql<{ readonly active: number }>`
+      SELECT EXISTS (
+        SELECT 1 FROM orchestration_v2_projection_runs
+        WHERE status IN ('preparing', 'starting', 'running')
+      ) AS active
+    `.pipe(
+      Effect.map((rows) => rows[0]?.active === 1),
+      retryWithBackoff("keep-awake could not read active runs"),
+    );
+    // Read the cursor before the snapshot so a run changing in between is replayed, not missed.
+    const active = Stream.unwrap(
+      events.latestApplicationSequence.pipe(
+        retryWithBackoff("keep-awake could not read the event cursor"),
+        Effect.map((afterSequence) =>
+          Stream.concat(
+            Stream.succeed(undefined),
+            events
+              .streamApplicationEvents({ afterSequence })
+              .pipe(
+                Stream.filter(
+                  (stored) =>
+                    "event" in stored &&
+                    (stored.event.type === "run.created" || stored.event.type === "run.updated"),
+                ),
+              ),
+          ),
+        ),
+      ),
+    ).pipe(
+      Stream.mapEffect(() => hasActiveRun),
+      // A failed subscription resubscribes, which re-reads the cursor and the snapshot.
+      Stream.tapCause((cause) =>
+        Effect.logWarning("keep-awake run event stream failed", { cause }),
+      ),
+      Stream.retry(backoff),
+    );
+    const enabled = Stream.unwrap(
+      Effect.gen(function* () {
+        const changes = yield* settings.subscribeChanges;
+        const current = yield* settings.getSettings.pipe(
+          Effect.map((value) => value.keepAwakeWhileAgentsWork),
+          Effect.orElseSucceed(() => true),
+        );
+        return Stream.concat(
+          Stream.succeed(current),
+          Stream.map(changes, (value) => value.keepAwakeWhileAgentsWork),
+        );
+      }),
+    );
+
+    const holdOnce = spawner
+      .spawn(
+        ChildProcess.make(command.command, command.args, {
+          detached: false,
+          shell: false,
+          stdin: "ignore",
+          stdout: "ignore",
+          stderr: "ignore",
+        }),
+      )
+      .pipe(
+        Effect.tap((child) =>
+          Effect.logInfo("keep-awake holding sleep inhibitor", { pid: Number(child.pid) }),
+        ),
+        Effect.tap(() =>
+          Effect.addFinalizer(() => Effect.logInfo("keep-awake released sleep inhibitor")),
+        ),
+        Effect.flatMap((child) => child.exitCode),
+        Effect.flatMap((exitCode) =>
+          Effect.fail(new KeepAwakeInhibitorExited({ exitCode: Number(exitCode) })),
+        ),
+        Effect.scoped,
+      );
+    const hold = holdOnce.pipe(
+      retryWithBackoff("keep-awake sleep inhibitor stopped"),
+      Effect.ignore,
+    );
+
+    yield* forkParked(
+      holdWhileWanted(
+        Stream.zipLatestWith(enabled, active, (on, busy) => on && busy),
+        hold,
+      ).pipe(Effect.catchCause((cause) => Effect.logWarning("keep-awake stopped", { cause }))),
+    );
+  }),
+);
diff --git a/apps/server/src/checkpointing/CheckpointDiffQuery.test.ts b/apps/server/src/checkpointing/CheckpointDiffQuery.test.ts
index aae4a4a38b66..7c516e97fa73 100644
--- a/apps/server/src/checkpointing/CheckpointDiffQuery.test.ts
+++ b/apps/server/src/checkpointing/CheckpointDiffQuery.test.ts
@@ -300,7 +300,7 @@ it.effect("shares the turn and full-thread diff budget across real Git batches",
       turnPatchSizes.reduce((sum, size) => sum + size, 0),
       10_000_001,
     );
-  }).pipe(Effect.provide(layerTest), Effect.scoped),
+  }).pipe(Effect.provide(layerTest)),
 );
 
 it.effect("truncates a storage-cut UTF-8 character without replacement text", () => {
diff --git a/apps/server/src/checkpointing/CheckpointDiffQuery.ts b/apps/server/src/checkpointing/CheckpointDiffQuery.ts
index 062405d53321..bf9543919de6 100644
--- a/apps/server/src/checkpointing/CheckpointDiffQuery.ts
+++ b/apps/server/src/checkpointing/CheckpointDiffQuery.ts
@@ -1,4 +1,5 @@
 import {
+  CHECKPOINT_DIFF_TRUNCATED_MARKER,
   OrchestrationGetTurnDiffResult,
   type OrchestrationGetFullThreadDiffInput,
   type OrchestrationGetFullThreadDiffResult,
@@ -28,7 +29,6 @@ import { isGitImport, parseTurnDiffFilesFromNumstat, type TurnDiffFileSummary }
 
 // Windows limits a command line to 32,767 characters. Leave room for the rest of git's arguments.
 const MAX_PATHSPEC_CHARS = 24_000;
-const DIFF_TRUNCATED_MARKER = "\n\n[truncated]";
 
 function batchFilePaths(files: ReadonlyArray<TurnDiffFileSummary>) {
   const batches: string[][] = [];
@@ -243,10 +243,11 @@ export const make = Effect.gen(function* () {
             new TextDecoder().decode(
               Buffer.from(diff).subarray(
                 0,
-                CHECKPOINT_DIFF_MAX_OUTPUT_BYTES - Buffer.byteLength(DIFF_TRUNCATED_MARKER),
+                CHECKPOINT_DIFF_MAX_OUTPUT_BYTES -
+                  Buffer.byteLength(CHECKPOINT_DIFF_TRUNCATED_MARKER),
               ),
               { stream: true },
-            ) + DIFF_TRUNCATED_MARKER;
+            ) + CHECKPOINT_DIFF_TRUNCATED_MARKER;
           break;
         }
         remainingBytes -= patchBytes;
diff --git a/apps/server/src/cli/doctor.test.ts b/apps/server/src/cli/doctor.test.ts
index 87fccaeca5f5..aec121749498 100644
--- a/apps/server/src/cli/doctor.test.ts
+++ b/apps/server/src/cli/doctor.test.ts
@@ -1,24 +1,59 @@
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
 import * as NodeServices from "@effect/platform-node/NodeServices";
+import * as HostProcess from "@t3tools/shared/HostProcess";
 import { assert, it } from "@effect/vitest";
 import * as Console from "effect/Console";
 import * as Effect from "effect/Effect";
+import * as FileSystem from "effect/FileSystem";
 import * as Layer from "effect/Layer";
+import * as Path from "effect/Path";
 import * as TestClock from "effect/testing/TestClock";
 
 import * as BootService from "../cloud/bootService.ts";
 import { runDoctor } from "./doctor.ts";
 import { DatabaseMaintenance } from "../persistence/DatabaseMaintenance.ts";
+import * as ProcessRunner from "../processRunner.ts";
+import { acquireServerOwnership } from "../serverOwnership.ts";
+import { makePersistedServerRuntimeState } from "../serverRuntimeState.ts";
+
+// An empty home, so no boot service unit installed on this machine is read.
+const layerHost = Layer.mergeAll(
+  ProcessRunner.layer,
+  Layer.effect(
+    HostProcess.HomeDirectory,
+    Effect.gen(function* () {
+      return yield* (yield* FileSystem.FileSystem).makeTempDirectoryScoped();
+    }),
+  ),
+  Layer.succeed(HostProcess.Environment, {}),
+).pipe(Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)));
 
 it.effect(
-  "--fix reclaims space with the service paused and keeps the V1 database, and --dry-run changes nothing",
+  "--fix locks the home while the service is paused, names a server that holds it, keeps the V1 database, and --dry-run changes nothing",
   () =>
     Effect.gen(function* () {
+      const fs = yield* FileSystem.FileSystem;
+      const path = yield* Path.Path;
+      const stateDir = yield* fs.makeTempDirectoryScoped({ prefix: "t3-doctor-" });
+      const serverRuntimeStatePath = path.join(stateDir, "server-runtime.json");
       const calls: string[] = [];
+      const services =
+        yield* Effect.context<Effect.Services<ReturnType<typeof acquireServerOwnership>>>();
+      // Stands in for a server launched for the same home, for example over SSH.
+      const startServer = Effect.scoped(acquireServerOwnership(serverRuntimeStatePath)).pipe(
+        Effect.result,
+        Effect.map((result) =>
+          calls.push(result._tag === "Success" ? "server started" : result.failure._tag),
+        ),
+        Effect.provide(services),
+      );
       const doctor = (dryRun: boolean) =>
-        runDoctor("/test/statev2.sqlite", { fix: true, dryRun, interactive: false }).pipe(
+        runDoctor(
+          { dbPath: path.join(stateDir, "statev2.sqlite"), serverRuntimeStatePath },
+          { fix: true, dryRun, interactive: false },
+        ).pipe(
           Effect.provide(
             Layer.mergeAll(
-              NodeServices.layer,
               Layer.mock(BootService.BootService)({
                 withStopped: (operation) =>
                   Effect.sync(() => calls.push("pause")).pipe(
@@ -35,15 +70,17 @@ it.effect(
                     legacyDatabaseBytes: 4000,
                   }),
                 compact: () =>
-                  Effect.sync(() => {
-                    calls.push("compact");
-                    return {
-                      beforeBytes: 2000,
-                      afterBytes: 1000,
-                      deletedEventCount: 1,
-                      deletedReceiptCount: 0,
-                    };
-                  }),
+                  startServer.pipe(
+                    Effect.map(() => {
+                      calls.push("compact");
+                      return {
+                        beforeBytes: 2000,
+                        afterBytes: 1000,
+                        deletedEventCount: 1,
+                        deletedReceiptCount: 0,
+                      };
+                    }),
+                  ),
                 removeLegacyDatabase: () => Effect.sync(() => calls.push("remove legacy")),
               }),
             ),
@@ -52,8 +89,32 @@ it.effect(
       yield* doctor(true);
       assert.deepEqual(calls, []);
       yield* doctor(false);
-      assert.deepEqual(calls, ["pause", "compact", "resume"]);
-    }),
+      yield* startServer;
+      assert.deepEqual(calls, [
+        "pause",
+        "ServerAlreadyRunningError",
+        "compact",
+        "resume",
+        "server started",
+      ]);
+
+      calls.length = 0;
+      const state = yield* makePersistedServerRuntimeState({
+        config: { host: undefined, devUrl: undefined },
+        port: 3773,
+      });
+      const refused = yield* Effect.scoped(
+        acquireServerOwnership(serverRuntimeStatePath).pipe(
+          Effect.tap((owner) => owner.publish(state)),
+          Effect.andThen(doctor(false)),
+        ),
+      ).pipe(Effect.flip);
+      assert.equal(
+        refused.message,
+        `Stop T3 Code server process ${state.pid}, which the background service did not start, before repairing the database.`,
+      );
+      assert.deepEqual(calls, ["pause", "resume"]);
+    }).pipe(Effect.provide(layerHost)),
 );
 
 it.effect("warns how long reclaiming can take and reports each step with its elapsed time", () =>
@@ -65,10 +126,17 @@ it.effect("warns how long reclaiming can take and reports each step with its ela
       ["rebuild-search", "1 second"],
       ["checkpoint", "1 second"],
     ] as const;
-    yield* runDoctor("/test/statev2.sqlite", { fix: true, dryRun: false, interactive: false }).pipe(
+    const stateDir = yield* (yield* FileSystem.FileSystem).makeTempDirectoryScoped();
+    const path = yield* Path.Path;
+    yield* runDoctor(
+      {
+        dbPath: path.join(stateDir, "statev2.sqlite"),
+        serverRuntimeStatePath: path.join(stateDir, "server-runtime.json"),
+      },
+      { fix: true, dryRun: false, interactive: false },
+    ).pipe(
       Effect.provide(
         Layer.mergeAll(
-          NodeServices.layer,
           Layer.mock(BootService.BootService)({
             withStopped: (operation) =>
               Effect.sync(() => output.push("<pause>")).pipe(
@@ -125,5 +193,5 @@ it.effect("warns how long reclaiming can take and reports each step with its ela
       ["0:00", "1:05", "12:46", "12:47"],
       "each compaction step must print one line with the elapsed time as it starts",
     );
-  }),
+  }).pipe(Effect.provide(layerHost)),
 );
diff --git a/apps/server/src/cli/doctor.ts b/apps/server/src/cli/doctor.ts
index 6047f4cede24..a0bda9935164 100644
--- a/apps/server/src/cli/doctor.ts
+++ b/apps/server/src/cli/doctor.ts
@@ -3,10 +3,13 @@ import * as Clock from "effect/Clock";
 import * as Console from "effect/Console";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
+import * as Option from "effect/Option";
 import { Command, Flag, GlobalFlag, Prompt } from "effect/cli";
 
 import * as BootService from "../cloud/bootService.ts";
 import * as DatabaseMaintenance from "../persistence/DatabaseMaintenance.ts";
+import * as ServerOwnership from "../serverOwnership.ts";
+import { isProcessAlive, readPersistedServerRuntimeState } from "../serverRuntimeState.ts";
 import { projectLocationFlags, resolveCliAuthConfig } from "./config.ts";
 import * as CliService from "./service.ts";
 
@@ -29,10 +32,37 @@ const COMPACT_STEP_LABELS: Record<DatabaseMaintenance.DatabaseCompactStep, strin
   checkpoint: "Flushing the write-ahead log",
 };
 
+// Holding the server lock refuses a server launched mid-repair, such as one started over SSH.
+// Lock only: acquireServerOwnership would also refuse the older service doctor just stopped.
+const lockServerHome = Effect.fn("runDoctor.lockServerHome")(function* (paths: {
+  readonly dbPath: string;
+  readonly serverRuntimeStatePath: string;
+}) {
+  yield* ServerOwnership.holdServerOwnershipLock(paths.serverRuntimeStatePath).pipe(
+    Effect.catchTags({
+      ServerAlreadyRunningError: Effect.fn("runDoctor.nameServerHolder")(function* (cause) {
+        const owner = yield* readPersistedServerRuntimeState(paths.serverRuntimeStatePath).pipe(
+          Effect.map(Option.filter((state) => isProcessAlive(state.pid))),
+          Effect.orElseSucceed(() => Option.none()),
+        );
+        return yield* new DatabaseMaintenance.DatabaseInUseError({
+          path: paths.dbPath,
+          cause,
+          ...(Option.isSome(owner) && {
+            pid: owner.value.pid,
+            serviceManaged: owner.value.serviceManaged === true,
+          }),
+        });
+      }),
+    }),
+  );
+});
+
 export const runDoctor = Effect.fn("runDoctor")(function* (
-  databasePath: string,
+  paths: { readonly dbPath: string; readonly serverRuntimeStatePath: string },
   options: { readonly fix: boolean; readonly dryRun: boolean; readonly interactive?: boolean },
 ) {
+  const databasePath = paths.dbPath;
   const maintenance = yield* DatabaseMaintenance.DatabaseMaintenance;
   const status = yield* maintenance.inspect(databasePath);
   yield* Console.log(
@@ -123,19 +153,19 @@ export const runDoctor = Effect.fn("runDoctor")(function* (
       );
     // Report the repair before restarting, which can fail independently.
     yield* service.withStopped(
-      maintenance
-        .compact(databasePath, reportStep)
-        .pipe(
-          Effect.tap((result) =>
-            Clock.monotonicTimeNanos.pipe(
-              Effect.flatMap((now) =>
-                Console.log(
-                  `Done in ${formatElapsed(now - startedAt)}: ${formatBytes(result.beforeBytes)} -> ${formatBytes(result.afterBytes)}, ${result.deletedEventCount} superseded events removed.`,
-                ),
+      lockServerHome(paths).pipe(
+        Effect.andThen(maintenance.compact(databasePath, reportStep)),
+        Effect.tap((result) =>
+          Clock.monotonicTimeNanos.pipe(
+            Effect.flatMap((now) =>
+              Console.log(
+                `Done in ${formatElapsed(now - startedAt)}: ${formatBytes(result.beforeBytes)} -> ${formatBytes(result.afterBytes)}, ${result.deletedEventCount} superseded events removed.`,
               ),
             ),
           ),
         ),
+        Effect.scoped,
+      ),
     );
   }
   if (selected.includes("legacy")) {
@@ -163,7 +193,7 @@ export const doctorCommand = Command.make("doctor", {
     Effect.gen(function* () {
       const logLevel = yield* GlobalFlag.LogLevel;
       const config = yield* resolveCliAuthConfig(flags, logLevel);
-      yield* runDoctor(config.dbPath, { fix: flags.fix, dryRun: flags.dryRun }).pipe(
+      yield* runDoctor(config, { fix: flags.fix, dryRun: flags.dryRun }).pipe(
         Effect.provide(Layer.merge(DatabaseMaintenance.layer, CliService.layer(config))),
       );
     }),
diff --git a/apps/server/src/cli/environment.ts b/apps/server/src/cli/environment.ts
index 51ce21339e8b..7d7e35b0bea2 100644
--- a/apps/server/src/cli/environment.ts
+++ b/apps/server/src/cli/environment.ts
@@ -104,7 +104,7 @@ const environmentLinkCommand = Command.make("link", {
   ),
 }).pipe(
   Command.withDescription(
-    "Link another T3 Code environment, so agents here can work there. It shows up there under Settings → Connections, where it can be revoked.",
+    "Link another T3 Code environment, so agents here can work there. It shows up there under Authorized clients in Settings → Sharing & access, where it can be revoked.",
   ),
   Command.withHandler((flags) =>
     runWithPeerLinks(flags, (links) =>
@@ -145,7 +145,7 @@ const environmentUnlinkCommand = Command.make("unlink", {
   ),
 }).pipe(
   Command.withDescription(
-    "Forget a linked environment here. Revoke it in that environment's Connections to end its session there too.",
+    "Forget a linked environment here. Revoke it in that environment's Sharing & access to end its session there too.",
   ),
   Command.withHandler((flags) =>
     runWithPeerLinks(flags, (links) =>
@@ -153,7 +153,7 @@ const environmentUnlinkCommand = Command.make("unlink", {
         const removed = yield* links.unlink(EnvironmentId.make(flags.environmentId));
         yield* Console.log(
           removed
-            ? `Forgot ${flags.environmentId}. Revoke it in that environment's Connections to end its session there.\n`
+            ? `Forgot ${flags.environmentId}. Revoke it in that environment's Sharing & access to end its session there.\n`
             : `No linked environment ${flags.environmentId}.\n`,
         );
       }),
diff --git a/apps/server/src/cli/install.test.ts b/apps/server/src/cli/install.test.ts
index 36deef5df342..80b3041d24e7 100644
--- a/apps/server/src/cli/install.test.ts
+++ b/apps/server/src/cli/install.test.ts
@@ -162,7 +162,7 @@ it.layer(NodeServices.layer)("t3 install", (it) => {
         ),
       ).pipe(Effect.flip);
       assert.include(unrunnable.message, "has % or non-ASCII characters");
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("asks npx users without a t3 command once per minor release and installs on yes", () =>
@@ -267,7 +267,7 @@ it.layer(NodeServices.layer)("t3 install", (it) => {
       assert.isTrue(yield* Fiber.join(unanswered));
       assert.isTrue(yield* fs.exists(declined));
       assert.isFalse(yield* fs.exists(link));
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("reads the terminal's foreground group from /proc and ps", () =>
diff --git a/apps/server/src/cli/invocation.test.ts b/apps/server/src/cli/invocation.test.ts
index ba3bc840e744..4d41bf40f1a0 100644
--- a/apps/server/src/cli/invocation.test.ts
+++ b/apps/server/src/cli/invocation.test.ts
@@ -53,7 +53,7 @@ it.layer(NodeServices.layer)("root CLI commands", (it) => {
           path: yield* pathWithT3,
         }),
       ).toBe('sudo env "PATH=$PATH" t3 browser setup');
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("keeps the arguments, so root runs setup on the same T3 home", () =>
@@ -70,7 +70,7 @@ it.layer(NodeServices.layer)("root CLI commands", (it) => {
       expect(
         yield* rootCommand({ node: "/opt/t3/t3", entry: "/opt/t3/t3", executable: true, args }),
       ).toBe("sudo /opt/t3/t3 browser setup --base-dir '/srv/t3 home'");
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("names this install's launcher when t3 is not on PATH", () =>
@@ -143,7 +143,7 @@ it.layer(NodeServices.layer)("root CLI commands", (it) => {
       expect(
         yield* rootCommand({ ...desktop, env: { T3CODE_CLI_PATH: path.join(home, "gone") } }),
       ).toBe('sudo env "PATH=$PATH" t3 browser setup');
-    }).pipe(Effect.scoped),
+    }),
   );
 });
 
@@ -184,7 +184,7 @@ it.layer(NodeServices.layer)("host CLI commands", (it) => {
       expect((yield* hostCommand("linux", { T3CODE_CLI_PATH: shim })).command).toMatch(
         / doctor --base-dir 'C:\\Users\\Jane Doe\\\.t3'$/,
       );
-    }).pipe(Effect.scoped),
+    }),
   );
 });
 
@@ -291,6 +291,43 @@ it.layer(NodeServices.layer)("manual server installation ownership", (it) => {
     }),
   );
 
+  it.effect("names the launcher symlink that started a downloaded runtime", () =>
+    Effect.gen(function* () {
+      const fs = yield* FileSystem.FileSystem;
+      const path = yield* Path.Path;
+      const root = yield* fs.realPath(yield* fs.makeTempDirectoryScoped());
+      // The install script's launcher names ~/.t3, which here links to a home elsewhere.
+      const executable = path.join(root, "data/t3/runtime/versions/1.0.0/t3");
+      const launcher = path.join(root, "bin/t3");
+      const copy = path.join(root, "bin/t3-copy");
+      yield* fs.makeDirectory(path.dirname(executable), { recursive: true });
+      yield* fs.makeDirectory(path.dirname(launcher), { recursive: true });
+      yield* fs.writeFileString(executable, "", { mode: 0o755 });
+      yield* fs.writeFileString(copy, "", { mode: 0o755 });
+      yield* fs.symlink(path.join(root, "data/t3"), path.join(root, ".t3"));
+      yield* fs.symlink(path.join(root, ".t3/runtime/versions/1.0.0/t3"), launcher);
+      // Earlier PATH entries hold a directory and a non-executable file named t3.
+      yield* fs.makeDirectory(path.join(root, "shadow-dir/t3"), { recursive: true });
+      yield* fs.makeDirectory(path.join(root, "shadow-file"));
+      yield* fs.writeFileString(path.join(root, "shadow-file/t3"), "");
+      const resolve = (invokedAs: string) =>
+        resolveServerInstallation.pipe(
+          Effect.provideService(HostProcess.ExecutablePath, executable),
+          Effect.provideService(HostProcess.IsExecutable, true),
+          Effect.provideService(HostProcess.InvokedAs, invokedAs),
+          Effect.provideService(HostProcess.WorkingDirectory, root),
+          Effect.provideService(HostProcess.Environment, { PATH: "shadow-dir:shadow-file:bin" }),
+          Effect.provideService(HostProcess.Platform, "linux"),
+        );
+      const baseDir = path.join(root, ".t3");
+
+      expect(yield* resolve("t3")).toEqual({ kind: "t3-launcher", launcher, baseDir });
+      expect(yield* resolve(launcher)).toEqual({ kind: "t3-launcher", launcher, baseDir });
+      expect(yield* resolve(executable)).toBeNull();
+      expect(yield* resolve(copy)).toBeNull();
+    }),
+  );
+
   it.effect("leaves local, standalone, missing and unreadable installs unknown", () =>
     Effect.gen(function* () {
       const fs = yield* FileSystem.FileSystem;
diff --git a/apps/server/src/cli/invocation.ts b/apps/server/src/cli/invocation.ts
index 2a1991fd3070..71738820ccde 100644
--- a/apps/server/src/cli/invocation.ts
+++ b/apps/server/src/cli/invocation.ts
@@ -9,6 +9,9 @@ import * as HostProcess from "@t3tools/shared/HostProcess";
 import { resolveCommandPath } from "@t3tools/shared/shell";
 
 import packageJson from "../../package.json" with { type: "json" };
+import { resolveLauncherPath } from "../cloud/pinnedRuntime.ts";
+
+const PINNED_RUNTIME_ENTRY = /^(.*)\/runtime\/versions\/[^/]+\/t3$/;
 
 export type CliRunner = "npx" | "pnpm dlx" | "bunx";
 
@@ -67,6 +70,21 @@ export const resolveServerInstallation = Effect.gen(function* () {
   const path = yield* Path.Path;
   const platform = yield* HostProcess.Platform;
   const entry = yield* fs.realPath(yield* resolveEntryPath);
+  const runtime = PINNED_RUNTIME_ENTRY.exec(entry);
+  if (runtime) {
+    const launcher = yield* resolveLauncherPath;
+    if (launcher === undefined) return null;
+    // Fails for a runtime started directly, as SSH launches do, or through a copy.
+    const link = yield* fs.readLink(launcher);
+    // Keep the home as the link spells it; `t3 update` only repoints links into that spelling.
+    const linked = PINNED_RUNTIME_ENTRY.exec(path.resolve(path.dirname(launcher), link));
+    if (!linked || (yield* fs.realPath(linked[1] || "/")) !== (runtime[1] || "/")) return null;
+    return {
+      kind: "t3-launcher",
+      launcher,
+      baseDir: linked[1] || "/",
+    } satisfies ServerInstallation;
+  }
   const match = /^(.*)\/lib\/node_modules\/t3\/(?:dist\/bin\.mjs|bin\/t3\.mjs)$/.exec(entry);
   if (!match) {
     const runner = detectCliRunner(entry);
@@ -127,7 +145,7 @@ const powershellWord = (value: string) =>
     .replaceAll("$", "`$")
     .replace(/["\u201C\u201D\u201E]/g, "$&$&")}"`;
 
-const hostShellWord = (platform: NodeJS.Platform, value: string) =>
+export const hostShellWord = (platform: NodeJS.Platform, value: string) =>
   platform === "win32" ? powershellWord(value) : shellWord(value);
 
 /** Script installs have no single launcher; desktop shims and standalone binaries do. */
diff --git a/apps/server/src/cli/pair.test.ts b/apps/server/src/cli/pair.test.ts
index e626461914a0..9619030be2fa 100644
--- a/apps/server/src/cli/pair.test.ts
+++ b/apps/server/src/cli/pair.test.ts
@@ -35,7 +35,12 @@ import {
   type PersistedServerRuntimeState,
 } from "../serverRuntimeState.ts";
 import { resolveHostCliCommand } from "./invocation.ts";
-import { DevServerNotProxiableError, resolveTailscaleLocalTarget } from "./pair.ts";
+import {
+  DevServerNotProxiableError,
+  resolveTailscaleLocalTarget,
+  ServePortOccupiedError,
+  TailscaleServeTargetRefusedError,
+} from "./pair.ts";
 
 import packageJson from "../../package.json" with { type: "json" };
 import { buildPairingAppLink } from "@t3tools/shared/remote";
@@ -136,7 +141,7 @@ describe("t3 pair", () => {
             Effect.gen(function* () {
               if (!ChildProcess.isStandardCommand(command))
                 return yield* Effect.die("Unexpected pipeline");
-              if (command.args[0] === "serve") {
+              if (command.args[0] === "serve" && command.args[1] === "--bg") {
                 const target = String(command.args.at(-1));
                 const descriptor = yield* Effect.promise(async () =>
                   (await fetch(new URL("/.well-known/t3/environment", target))).json(),
@@ -194,6 +199,87 @@ describe("t3 pair", () => {
     ).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
   );
 
+  // The MagicDNS probe fails whenever the host cannot reach its own *.ts.net name,
+  // so it cannot be what decides that the port is free.
+  it.effect(
+    "leaves another app's Serve route alone when the host cannot reach its MagicDNS URL",
+    () =>
+      withDescriptorServer((origin) =>
+        // Another live app on loopback; a dead port's route may be taken back.
+        withDescriptorServer((otherAppOrigin) =>
+          Effect.gen(function* () {
+            const fetch = yield* FetchHttpClient.Fetch;
+            const tailscaleCalls: Array<ReadonlyArray<string>> = [];
+            const spawner = ChildProcessSpawner.make((command) => {
+              const { args } = command as unknown as { readonly args: ReadonlyArray<string> };
+              tailscaleCalls.push(args);
+              const stdout =
+                args[0] === "status"
+                  ? '{"BackendState":"Running","Self":{"DNSName":"host-a.tail.ts.net.","TailscaleIPs":["100.64.0.1"],"CapMap":{"https":null}}}'
+                  : args[0] === "serve" && args[1] === "status"
+                    ? JSON.stringify({
+                        TCP: { "443": { HTTPS: true } },
+                        Web: {
+                          "host-a.tail.ts.net:443": {
+                            Handlers: { "/": { Proxy: otherAppOrigin } },
+                          },
+                        },
+                      })
+                    : "";
+              return Effect.succeed(
+                ChildProcessSpawner.makeHandle({
+                  pid: ChildProcessSpawner.ProcessId(1),
+                  // A recorded takeover fails fast instead of waiting out the HTTPS retries.
+                  exitCode: Effect.succeed(
+                    ChildProcessSpawner.ExitCode(
+                      args[0] === "serve" && args[1] !== "status" ? 1 : 0,
+                    ),
+                  ),
+                  isRunning: Effect.succeed(false),
+                  kill: () => Effect.void,
+                  unref: Effect.succeed(Effect.void),
+                  stdin: Sink.drain,
+                  stdout: Stream.make(new TextEncoder().encode(stdout)),
+                  stderr: Stream.empty,
+                  all: Stream.empty,
+                  getInputFd: () => Sink.drain,
+                  getOutputFd: () => Stream.empty,
+                }),
+              );
+            });
+
+            const baseDir = NodeFS.mkdtempSync(NodePath.join(NodeOS.tmpdir(), "t3-pair-ts-held-"));
+            yield* persistServerRuntimeState({
+              path: NodePath.join(baseDir, "userdata", "server-runtime.json"),
+              state: yield* makePersistedServerRuntimeState({
+                config: { host: "127.0.0.1", devUrl: undefined },
+                port: Number(new URL(origin).port),
+              }),
+            });
+
+            const exit = yield* runCli(["pair", "--base-dir", baseDir, "--tailscale"]).pipe(
+              Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, spawner),
+              Effect.provideService(HostProcess.Platform, "linux"),
+              Effect.provideService(FetchHttpClient.Fetch, async (input, init) => {
+                if (String(input).startsWith(origin)) return fetch(input, init);
+                throw new TypeError("getaddrinfo ENOTFOUND host-a.tail.ts.net");
+              }),
+              Effect.exit,
+            );
+
+            assert.deepEqual(
+              tailscaleCalls.filter((args) => args[0] === "serve" && args[1] !== "status"),
+              [],
+            );
+            assert.isTrue(Exit.isFailure(exit));
+            if (Exit.isFailure(exit)) {
+              assert.instanceOf(Cause.squash(exit.cause), ServePortOccupiedError);
+            }
+          }),
+        ),
+      ).pipe(Effect.provide(layerCliRuntime)),
+  );
+
   it.effect("mints a token and prints a QR pairing URL for a live server", () =>
     withDescriptorServer((origin) =>
       Effect.gen(function* () {
@@ -409,7 +495,10 @@ describe("t3 pair", () => {
           ]);
           assert.isTrue(Exit.isFailure(exit));
           if (Exit.isFailure(exit)) {
-            assert.include(String(Cause.squash(exit.cause)), "t3@0.0.45 pair");
+            assert.include(
+              String(Cause.squash(exit.cause)),
+              `t3@0.0.45 pair --base-dir ${baseDir}`,
+            );
           }
         }),
       "127.0.0.1",
@@ -468,6 +557,72 @@ describe("t3 pair", () => {
       }),
     ).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
   );
+
+  // regression: #35517 - the macOS Tailscale apps refuse Serve targets other than
+  // localhost, 127.0.0.1 and ::1, so a specific bind needs an explanation.
+  it.effect("names the bind address when Tailscale refuses it as a Serve target", () =>
+    Effect.gen(function* () {
+      const baseDir = NodeFS.mkdtempSync(NodePath.join(NodeOS.tmpdir(), "t3-pair-remote-"));
+      yield* persistServerRuntimeState({
+        path: NodePath.join(baseDir, "userdata", "server-runtime.json"),
+        state: yield* makePersistedServerRuntimeState({
+          config: { host: "127.0.0.2", devUrl: undefined },
+          port: 3773,
+        }),
+      });
+      const spawner = ChildProcessSpawner.make((command) => {
+        const { args } = command as unknown as { readonly args: ReadonlyArray<string> };
+        const serve = args[0] === "serve" && args[1] !== "status";
+        return Effect.succeed(
+          ChildProcessSpawner.makeHandle({
+            pid: ChildProcessSpawner.ProcessId(1),
+            exitCode: Effect.succeed(ChildProcessSpawner.ExitCode(serve ? 1 : 0)),
+            isRunning: Effect.succeed(false),
+            kill: () => Effect.void,
+            unref: Effect.succeed(Effect.void),
+            stdin: Sink.drain,
+            stdout: Stream.make(
+              new TextEncoder().encode(
+                serve
+                  ? ""
+                  : args[0] === "status"
+                    ? '{"Self":{"DNSName":"pair-test.tail.ts.net."}}'
+                    : "{}",
+              ),
+            ),
+            stderr: Stream.make(
+              new TextEncoder().encode(
+                serve
+                  ? "Warning: the MacOS extension doesn't support connecting to remote destinations from non-default route\n"
+                  : "",
+              ),
+            ),
+            all: Stream.empty,
+            getInputFd: () => Sink.drain,
+            getOutputFd: () => Stream.empty,
+          }),
+        );
+      });
+
+      const error = yield* provideCliTestLayers(
+        runCli(["pair", "--base-dir", baseDir, "--tailscale"]).pipe(
+          Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, spawner),
+          Effect.provideService(HostProcess.Platform, "darwin"),
+          Effect.provideService(FetchHttpClient.Fetch, async (input) => {
+            if (String(input) === "http://127.0.0.2:3773/.well-known/t3/environment") {
+              return Response.json(testDescriptor);
+            }
+            assert.equal(String(input), "https://pair-test.tail.ts.net/.well-known/t3/environment");
+            return new Response(null, { status: 503 });
+          }),
+          Effect.flip,
+        ),
+      );
+
+      assert.instanceOf(error, TailscaleServeTargetRefusedError);
+      assert.include(String(error), "127.0.0.2");
+    }).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
+  );
 });
 
 describe("auth scope options", () => {
diff --git a/apps/server/src/cli/pair.ts b/apps/server/src/cli/pair.ts
index e1af3be829ab..622b47f91a65 100644
--- a/apps/server/src/cli/pair.ts
+++ b/apps/server/src/cli/pair.ts
@@ -15,6 +15,7 @@ import {
   buildTailscaleHttpsBaseUrl,
   DEFAULT_TAILSCALE_SERVE_PORT,
   ensureTailscaleServe,
+  readTailscaleServeRootHolder,
   readTailscaleStatus,
 } from "@t3tools/tailscale";
 import * as Config from "effect/Config";
@@ -47,7 +48,7 @@ import {
 } from "../startupAccess.ts";
 import { authScopesFlag } from "./authScopes.ts";
 import { baseDirFlag, DurationFromString } from "./config.ts";
-import { resolveHostCliCommand } from "./invocation.ts";
+import { hostShellWord, resolveHostCliCommand } from "./invocation.ts";
 
 const WELL_KNOWN_ENVIRONMENT_PATH = "/.well-known/t3/environment";
 const PAIR_PROBE_TIMEOUT = Duration.millis(2_500);
@@ -83,12 +84,16 @@ export class NoRunningServerError extends Schema.TaggedError<NoRunningServerErro
 
 export class IncompatibleServerProtocolError extends Schema.TaggedError<IncompatibleServerProtocolError>()(
   "IncompatibleServerProtocolError",
-  { serverVersion: Schema.String, serverProtocolVersion: Schema.Number },
+  {
+    serverVersion: Schema.String,
+    serverProtocolVersion: Schema.Number,
+    pairCommand: Schema.String,
+  },
 ) {
   override get message(): string {
     return [
       `The running T3 Code server (${this.serverVersion}) speaks orchestration protocol ${String(this.serverProtocolVersion)}, but this CLI speaks protocol ${String(ORCHESTRATION_PROTOCOL_VERSION)}.`,
-      `Pair with the matching CLI instead: \`npx t3@${this.serverVersion} pair\`.`,
+      `Pair with the matching CLI instead: \`${this.pairCommand}\`.`,
     ].join("\n");
   }
 }
@@ -138,6 +143,15 @@ export class TailscaleServeFailedError extends Schema.TaggedError<TailscaleServe
   }
 }
 
+export class TailscaleServeTargetRefusedError extends Schema.TaggedError<TailscaleServeTargetRefusedError>()(
+  "TailscaleServeTargetRefusedError",
+  { localHost: Schema.String },
+) {
+  override get message(): string {
+    return `This Tailscale install can only proxy to localhost, and the server listens on ${this.localHost}. Restart it with \`--host 127.0.0.1\` or \`--host 0.0.0.0\`, then run this command again.`;
+  }
+}
+
 export class ServePortOccupiedError extends Schema.TaggedError<ServePortOccupiedError>()(
   "ServePortOccupiedError",
   { servePort: Schema.Number },
@@ -405,13 +419,26 @@ const resolveTailscalePairingBase = Effect.fn("pair.resolveTailscalePairingBase"
     if (isDevServerNotProxiableError(localTarget)) {
       return yield* localTarget;
     }
+    // The probe above fails whenever this host cannot reach its own MagicDNS name, so the Serve
+    // config, not the probe, decides whether the port is free.
+    const holder = yield* readTailscaleServeRootHolder(input.servePort, {
+      host: (localTarget.localHost ?? "127.0.0.1").replace(/^\[|\]$/gu, ""),
+      port: localTarget.localPort,
+    }).pipe(Effect.mapError((cause) => new TailscaleUnavailableError({ cause })));
+    if (holder === "other") {
+      return yield* new ServePortOccupiedError({ servePort: input.servePort });
+    }
     yield* ensureTailscaleServe({
       localPort: localTarget.localPort,
       servePort: input.servePort,
       ...(localTarget.localHost !== undefined ? { localHost: localTarget.localHost } : {}),
     }).pipe(
-      Effect.mapError(
-        (cause) => new TailscaleServeFailedError({ servePort: input.servePort, cause }),
+      Effect.mapError((cause) =>
+        cause._tag === "TailscaleCommandExitError" &&
+        cause.stderrDiagnostic === "unsupported-target" &&
+        localTarget.localHost !== undefined
+          ? new TailscaleServeTargetRefusedError({ localHost: localTarget.localHost })
+          : new TailscaleServeFailedError({ servePort: input.servePort, cause }),
       ),
     );
     notes.push(
@@ -498,15 +525,22 @@ export const pairCommand = Command.make("pair", {
       const cliLogLevel = yield* GlobalFlag.LogLevel;
       const logLevel = Option.getOrElse(cliLogLevel, () => "Warn" as const);
 
-      const target = yield* discoverPairTarget(Option.getOrUndefined(flags.baseDir));
+      const explicitBaseDir = Option.getOrUndefined(flags.baseDir);
+      const target = yield* discoverPairTarget(explicitBaseDir);
       // Each protocol keeps auth in its own database, so a token minted here
       // for another protocol's server would never be accepted by it. Refuse
       // before any local layer opens (and migrates) that database.
       const serverProtocolVersion = target.descriptor.orchestrationProtocolVersion ?? 1;
       if (serverProtocolVersion !== ORCHESTRATION_PROTOCOL_VERSION) {
+        const platform = yield* HostProcess.Platform;
+        const baseDirArgs =
+          explicitBaseDir !== undefined && explicitBaseDir.trim().length > 0
+            ? ` --base-dir ${hostShellWord(platform, explicitBaseDir)}`
+            : "";
         return yield* new IncompatibleServerProtocolError({
           serverVersion: target.descriptor.serverVersion,
           serverProtocolVersion,
+          pairCommand: `npx t3@${target.descriptor.serverVersion} pair${baseDirArgs}`,
         });
       }
 
diff --git a/apps/server/src/cli/project.test.ts b/apps/server/src/cli/project.test.ts
index 407905815f43..bca02daaf291 100644
--- a/apps/server/src/cli/project.test.ts
+++ b/apps/server/src/cli/project.test.ts
@@ -191,7 +191,7 @@ it.effect.each(["snapshot", "mutation"] as const)(
       assert.equal(snapshotRequests, 2);
       assert.equal(mutations, 1);
       assert.deepEqual((yield* readProjects(baseDir)).projects, []);
-    }).pipe(Effect.provide(NodeServices.layer), Effect.scoped),
+    }).pipe(Effect.provide(NodeServices.layer)),
 );
 
 it.effect("does not send a token to whatever took over a dead server's port", () =>
@@ -222,7 +222,7 @@ it.effect("does not send a token to whatever took over a dead server's port", ()
 
     assert.equal(requests, 0);
     assert.equal((yield* readProjects(baseDir)).projects[0]?.workspaceRoot, workspaceRoot);
-  }).pipe(Effect.provide(NodeServices.layer), Effect.scoped),
+  }).pipe(Effect.provide(NodeServices.layer)),
 );
 
 const makeProjectLookupFixture = Effect.fn("ProjectCliTest.makeProjectLookupFixture")(function* () {
diff --git a/apps/server/src/cli/service.test.ts b/apps/server/src/cli/service.test.ts
index 900c41e66174..7dd4e852adba 100644
--- a/apps/server/src/cli/service.test.ts
+++ b/apps/server/src/cli/service.test.ts
@@ -115,6 +115,12 @@ it.layer(Layer.mergeAll(NodeServices.layer, NetService.layer))("service commands
       env: "T3CODE_HOST=::\n",
       expected: "T3CODE_HOST=::\n",
     },
+    {
+      label: "a quoted multiline value",
+      installed: false,
+      env: 'CUSTOM="first\nT3CODE_LAN=example\nlast"\n',
+      expected: 'CUSTOM="first\nT3CODE_LAN=example\nlast"\nT3CODE_LAN=false\n',
+    },
   ])("install keeps $label off the local network only when it is new", (input) =>
     Effect.gen(function* () {
       const fs = yield* FileSystem.FileSystem;
diff --git a/apps/server/src/cli/service.ts b/apps/server/src/cli/service.ts
index dedc095f62ff..2a34eb09dd08 100644
--- a/apps/server/src/cli/service.ts
+++ b/apps/server/src/cli/service.ts
@@ -47,14 +47,37 @@ export const upsertServiceEnv = (
   entries: Readonly<Record<string, string | undefined>>,
 ): string => {
   const written = new Set<string>();
-  const lines = contents.split("\n").flatMap((line) => {
-    const key = SERVICE_ENV_KEY.exec(line)?.[1];
-    if (key === undefined || !Object.hasOwn(entries, key)) return [line];
+  const source = contents.split("\n");
+  const lines: string[] = [];
+  for (let index = 0, offset = 0; index < source.length;) {
+    const line = source[index]!;
+    const match = SERVICE_ENV_KEY.exec(line);
+    let end = index + 1;
+    if (match !== null) {
+      // util.parseEnv lets a quoted value run to its closing quote across lines,
+      // skipping only spaces, tabs and CRs before the opening quote.
+      const rest = line.slice(match[0].length).replace(/^[ \t\r]+/u, "");
+      const quote = rest[0];
+      if ((quote === '"' || quote === "'" || quote === "`") && !rest.includes(quote, 1)) {
+        const closing = contents.indexOf(quote, offset + line.length);
+        if (closing !== -1) {
+          end += contents.slice(offset + line.length, closing).split("\n").length - 1;
+        }
+      }
+    }
+    const span = source.slice(index, end);
+    offset += span.reduce((length, part) => length + part.length + 1, 0);
+    index = end;
+    const key = match?.[1];
+    if (key === undefined || !Object.hasOwn(entries, key)) {
+      lines.push(span.join("\n"));
+      continue;
+    }
     const value = entries[key];
-    if (value === undefined || written.has(key)) return [];
+    if (value === undefined || written.has(key)) continue;
     written.add(key);
-    return [`${key}=${value}`];
-  });
+    lines.push(`${key}=${value}`);
+  }
   while (lines.at(-1) === "") lines.pop();
   for (const [key, value] of Object.entries(entries)) {
     if (value !== undefined && !written.has(key)) lines.push(`${key}=${value}`);
diff --git a/apps/server/src/cli/sshHelper.ts b/apps/server/src/cli/sshHelper.ts
index 419b096c6a90..09a729ef4489 100644
--- a/apps/server/src/cli/sshHelper.ts
+++ b/apps/server/src/cli/sshHelper.ts
@@ -6,8 +6,11 @@ import * as NodeHttp from "node:http";
 import * as NodeNet from "node:net";
 
 import * as Effect from "effect/Effect";
+import * as Option from "effect/Option";
 import { Argument, Command } from "effect/cli";
 
+import * as DesktopUpdateMarker from "../desktopUpdate/DesktopUpdateMarker.ts";
+
 const canBind = (port: number) =>
   new Promise<boolean>((resolve) => {
     const server = NodeNet.createServer();
@@ -124,7 +127,22 @@ const runtimePort = Command.make("runtime-port", {
   ),
 );
 
+const updateRemaining = Command.make("update-remaining", {
+  markerFile: Argument.String("marker-file"),
+}).pipe(
+  Command.withHandler(({ markerFile }) =>
+    DesktopUpdateMarker.DesktopUpdateMarker.use((marker) => marker.remainingWait(markerFile)).pipe(
+      Effect.flatMap((remaining) =>
+        Effect.sync(() => {
+          process.stdout.write(Option.match(remaining, { onNone: () => "", onSome: String }));
+        }),
+      ),
+    ),
+  ),
+  Command.provide(DesktopUpdateMarker.layer),
+);
+
 export const sshHelperCommand = Command.make("__ssh-helper").pipe(
   Command.unlisted,
-  Command.withSubcommands([pickPort, waitReady, runtimePort]),
+  Command.withSubcommands([pickPort, waitReady, runtimePort, updateRemaining]),
 );
diff --git a/apps/server/src/cli/thread.ts b/apps/server/src/cli/thread.ts
index 7e2959c767d0..5218d0aa2576 100644
--- a/apps/server/src/cli/thread.ts
+++ b/apps/server/src/cli/thread.ts
@@ -50,6 +50,7 @@ const TERMINAL_RUN_STATUSES = new Set<OrchestratorMcpThreadRun["status"]>([
   "rolled_back",
 ]);
 const READ_PAGE_LIMIT = 100;
+const READ_ITEM_MAX_CHARS = 20_000;
 const TITLE_MAX_CHARS = 80;
 
 export class ThreadServerNotRunningError extends Schema.TaggedError<ThreadServerNotRunningError>()(
@@ -394,6 +395,7 @@ const readTimeline = Effect.fn("cli.thread.readTimeline")(function* (
         threadId,
         view,
         limit: READ_PAGE_LIMIT,
+        maxCharsPerItem: READ_ITEM_MAX_CHARS,
         runLimit: 1,
         ...(afterPosition === undefined ? {} : { afterPosition }),
       },
@@ -439,6 +441,7 @@ export const readLatestMessages = Effect.fn("cli.thread.readLatestMessages")(fun
           threadId,
           view: "messages",
           limit: READ_PAGE_LIMIT,
+          maxCharsPerItem: READ_ITEM_MAX_CHARS,
           runLimit: 1,
           ...(afterPosition < 0 ? {} : { afterPosition }),
         },
@@ -473,7 +476,13 @@ const readFullText = Effect.fn("cli.thread.readFullText")(function* (
   while (nextTextOffset !== null) {
     const page = yield* tools.call(
       "t3_thread_read",
-      { threadId, itemId: item.itemId, textOffset: nextTextOffset, runLimit: 1 },
+      {
+        threadId,
+        itemId: item.itemId,
+        textOffset: nextTextOffset,
+        runLimit: 1,
+        maxCharsPerItem: READ_ITEM_MAX_CHARS,
+      },
       OrchestratorMcpThreadReadResult,
     );
     const chunk = page.items.find((candidate) => candidate.itemId === item.itemId);
diff --git a/apps/server/src/cli/uninstall.test.ts b/apps/server/src/cli/uninstall.test.ts
index 4dcdc59e30a7..3e1e37a274b4 100644
--- a/apps/server/src/cli/uninstall.test.ts
+++ b/apps/server/src/cli/uninstall.test.ts
@@ -1,12 +1,78 @@
 import * as NodeServices from "@effect/platform-node/NodeServices";
 import { assert, it } from "@effect/vitest";
 import * as Config from "effect/Config";
+import * as ConfigProvider from "effect/ConfigProvider";
 import * as Effect from "effect/Effect";
 import * as FileSystem from "effect/FileSystem";
+import * as Layer from "effect/Layer";
 import * as Path from "effect/Path";
+import * as TestConsole from "effect/testing/TestConsole";
+import { Command } from "effect/cli";
 import * as HostProcess from "@t3tools/shared/HostProcess";
+import * as NetService from "@t3tools/shared/Net";
+import { afterEach, vi } from "vite-plus/test";
 
-import { findOwnedLauncher, findRecordedLaunchers, spawnWindowsRemoval } from "./uninstall.ts";
+import packageJson from "../../package.json" with { type: "json" };
+import * as BootService from "../cloud/bootService.ts";
+import {
+  findOwnedLauncher,
+  findRecordedLaunchers,
+  spawnWindowsRemoval,
+  uninstallCommand,
+} from "./uninstall.ts";
+
+afterEach(() => vi.restoreAllMocks());
+
+it.layer(Layer.mergeAll(NodeServices.layer, NetService.layer))("t3 uninstall command", (it) => {
+  it.effect("names another home's service it leaves installed", () =>
+    Effect.gen(function* () {
+      const fs = yield* FileSystem.FileSystem;
+      const baseDir = yield* fs.makeTempDirectoryScoped({ prefix: "t3-uninstall-cli-test-" });
+      const uninstalls: Array<true> = [];
+      vi.spyOn(BootService, "layer").mockReturnValue(
+        Layer.succeed(
+          BootService.BootService,
+          BootService.BootService.of({
+            status: Effect.succeed({
+              supported: true,
+              installed: true,
+              current: true,
+              installedBaseDir: "/home/me/.t3",
+              unitPath: "/home/me/.config/systemd/user/t3code.service",
+              logPath: "/home/me/.t3/userdata/logs/boot-service.log",
+            }),
+            withStopped: (operation) => operation,
+            restart: Effect.die("unexpected restart"),
+            install: () => Effect.die("unexpected install"),
+            uninstall: Effect.sync(() => {
+              uninstalls.push(true);
+              return true;
+            }),
+          }),
+        ),
+      );
+
+      const output = yield* Command.runWith(uninstallCommand, { version: packageJson.version })([
+        "--base-dir",
+        baseDir,
+        "--yes",
+      ]).pipe(
+        Effect.andThen(TestConsole.logLines),
+        Effect.map((lines) => lines.join("\n")),
+        Effect.provideService(HostProcess.Environment, {}),
+        Effect.provideService(HostProcess.IsExecutable, false),
+        Effect.provide(
+          Layer.mergeAll(
+            ConfigProvider.layer(ConfigProvider.fromEnv({ env: {} })),
+            Layer.fresh(TestConsole.layer),
+          ),
+        ),
+      );
+      assert.deepStrictEqual(uninstalls, []);
+      assert.include(output, "--base-dir '/home/me/.t3'");
+    }),
+  );
+});
 
 it.layer(NodeServices.layer)("t3 uninstall launcher", (it) => {
   it.effect("claims only a launcher that points into this home's runtime tree", () =>
@@ -83,7 +149,7 @@ it.layer(NodeServices.layer)("t3 uninstall launcher", (it) => {
         ),
         [cmd],
       );
-    }).pipe(Effect.scoped, Effect.provideService(HostProcess.Platform, "linux")),
+    }).pipe(Effect.provideService(HostProcess.Platform, "linux")),
   );
 });
 
diff --git a/apps/server/src/cli/uninstall.ts b/apps/server/src/cli/uninstall.ts
index 5cf6f0c5e64c..bfbc45bf5615 100644
--- a/apps/server/src/cli/uninstall.ts
+++ b/apps/server/src/cli/uninstall.ts
@@ -16,10 +16,11 @@ import {
   generatedWindowsShimTarget,
   isVersionExecutable,
   pinnedRuntimeVersionsDir,
+  resolveLauncherPath,
 } from "../cloud/pinnedRuntime.ts";
 import { projectLocationFlags, resolveCliAuthConfig } from "./config.ts";
 import * as CliService from "./service.ts";
-import { findWindowsShim, resolveLauncherPath } from "./update.ts";
+import { findWindowsShim } from "./update.ts";
 
 export class CliUninstallError extends Schema.TaggedError<CliUninstallError>()(
   "CliUninstallError",
@@ -32,6 +33,7 @@ export class CliUninstallError extends Schema.TaggedError<CliUninstallError>()(
 
 export interface UninstallPlan {
   readonly service: boolean;
+  readonly otherHomeService: string | undefined;
   readonly versionsDir: string;
   readonly launchers: ReadonlyArray<string>;
   readonly runtimeDir: string | undefined;
@@ -146,15 +148,18 @@ const planUninstall = Effect.fn("cli.uninstall.plan")(function* (input: {
   const path = yield* Path.Path;
   const service = yield* BootService.BootService;
   const status = yield* service.status;
+  const installedBaseDir =
+    status.supported && status.installed ? status.installedBaseDir : undefined;
   const servesThisHome =
-    status.installedBaseDir !== undefined &&
-    path.resolve(status.installedBaseDir) === path.resolve(input.baseDir);
+    installedBaseDir !== undefined &&
+    path.resolve(installedBaseDir) === path.resolve(input.baseDir);
   const versionsDir = pinnedRuntimeVersionsDir(path, input.baseDir);
   const runtimeDir = path.dirname(versionsDir);
   const launchedAs = (yield* HostProcess.IsExecutable) ? yield* resolveLauncherPath : undefined;
   const launchedFrom = yield* findOwnedLauncher({ launchedAs, versionsDir });
   const plan: UninstallPlan = {
-    service: status.supported && status.installed && servesThisHome,
+    service: servesThisHome,
+    otherHomeService: servesThisHome ? undefined : installedBaseDir,
     versionsDir,
     launchers: [
       ...new Set([
@@ -194,6 +199,13 @@ export const uninstallCommand = Command.make("uninstall", {
   ),
 );
 
+const logOtherHomeService = (plan: UninstallPlan) =>
+  plan.otherHomeService === undefined
+    ? Effect.void
+    : Console.log(
+        `The T3 Code service serves ${plan.otherHomeService}, so it was not removed. Pass \`${BootService.formatBootServiceBaseDirOption(plan.otherHomeService)}\` to remove it.`,
+      );
+
 const runUninstall = Effect.fn("cli.uninstall.run")(function* (input: {
   readonly baseDir: string;
   readonly assumeYes: boolean;
@@ -211,6 +223,7 @@ const runUninstall = Effect.fn("cli.uninstall.run")(function* (input: {
         "  This t3 runs from a Node script, so it was installed by npm or built from source. Remove it the same way (`npm uninstall -g t3`, or delete the checkout).",
       );
     }
+    yield* logOtherHomeService(plan);
     return;
   }
 
@@ -285,4 +298,5 @@ const runUninstall = Effect.fn("cli.uninstall.run")(function* (input: {
   }
   yield* Console.log("");
   yield* Console.log("t3 is uninstalled. Thanks for trying T3 Code.");
+  yield* logOtherHomeService(plan);
 });
diff --git a/apps/server/src/cli/up.test.ts b/apps/server/src/cli/up.test.ts
index 659edc2e3fd1..05d4185593a3 100644
--- a/apps/server/src/cli/up.test.ts
+++ b/apps/server/src/cli/up.test.ts
@@ -167,6 +167,8 @@ it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer, NetService.layer))
     /** Runs as if in a terminal, answering each question with this text. */
     readonly answer?: string;
     readonly prints?: string;
+    readonly omits?: string;
+    readonly json?: object;
     readonly env: string;
     readonly args: ReadonlyArray<string>;
     readonly installs: number;
@@ -271,12 +273,28 @@ it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer, NetService.layer))
       installed: true,
       status: { current: false, otherBaseDir: "/srv/t3 home" },
       reportStatus: true,
+      json: {
+        service: { otherBaseDir: "/srv/t3 home" },
+        lan: { enabled: false, inheritedDefault: false },
+      },
       env: "",
       args: ["--json"],
       installs: 0,
       restarts: 0,
       envAfter: "",
     },
+    {
+      label: "a host override gets no --no-lan hint it would ignore",
+      installed: true,
+      reportStatus: true,
+      prints: "overridden · T3CODE_HOST=0.0.0.0",
+      omits: "t3 up --no-lan",
+      env: "T3CODE_HOST=0.0.0.0\n",
+      args: [],
+      installs: 0,
+      restarts: 0,
+      envAfter: "T3CODE_HOST=0.0.0.0\n",
+    },
     {
       label: "no service manager still records the choice",
       installed: false,
@@ -371,11 +389,11 @@ it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer, NetService.layer))
       if (input.prints !== undefined) {
         expect(lines.join("\n")).toContain(input.prints.replace("<baseDir>", baseDir));
       }
-      if (input.reportStatus) {
-        expect(JSON.parse(lines.join("\n"))).toMatchObject({
-          service: { otherBaseDir: "/srv/t3 home" },
-          lan: { enabled: false, inheritedDefault: false },
-        });
+      if (input.omits !== undefined) {
+        expect(lines.join("\n")).not.toContain(input.omits);
+      }
+      if (input.json !== undefined) {
+        expect(JSON.parse(lines.join("\n"))).toMatchObject(input.json);
       }
       expect(exit._tag).toBe(
         input.restartFails === true || input.fails === true ? "Failure" : "Success",
@@ -395,4 +413,18 @@ it("rewrites only the named service.env keys and keeps the user's lines", () =>
     ["# my settings", "T3CODE_PORT=4000", "T3CODE_LAN=true", ""].join("\n"),
   );
   expect(upsertServiceEnv("", { T3CODE_LAN: "false" })).toBe("T3CODE_LAN=false\n");
+  expect(
+    upsertServiceEnv('T3CODE_LAN="a\nb"\nCUSTOM="x\nT3CODE_LAN=y"\nT3CODE_LAN=true\n', {
+      T3CODE_LAN: "false",
+    }),
+  ).toBe('T3CODE_LAN=false\nCUSTOM="x\nT3CODE_LAN=y"\n');
+  expect(
+    upsertServiceEnv('T3CODE_LAN=\u00a0"unused\nCUSTOM=keep\nEND="\nT3CODE_LAN=true\n', {
+      T3CODE_LAN: "false",
+    }),
+  ).toBe('T3CODE_LAN=false\nCUSTOM=keep\nEND="\n');
+  const long = `CUSTOM="${"\n".repeat(130_000)}"\n`;
+  expect(upsertServiceEnv(`${long}T3CODE_LAN=true\n`, { T3CODE_LAN: "false" })).toBe(
+    `${long}T3CODE_LAN=false\n`,
+  );
 });
diff --git a/apps/server/src/cli/up.ts b/apps/server/src/cli/up.ts
index 9bd0409f6ef9..27a972d7bfe3 100644
--- a/apps/server/src/cli/up.ts
+++ b/apps/server/src/cli/up.ts
@@ -42,7 +42,7 @@ interface Setup {
   /** T3 Connect revoked the link; `t3 connect` links again. */
   readonly connectRevoked: boolean;
   readonly lan: boolean;
-  /** An installed service with no T3CODE_LAN keeps the old default: on. */
+  /** An installed service with no T3CODE_LAN or T3CODE_HOST keeps the old default: on. */
   readonly lanFromOldDefault: boolean;
   readonly host: string | undefined;
 }
@@ -86,7 +86,7 @@ const readSetup = Effect.fn("cli.up.read_setup")(function* () {
     connect,
     connectRevoked,
     lan: Option.getOrElse(lan, () => servesThisHome),
-    lanFromOldDefault: Option.isNone(lan) && servesThisHome,
+    lanFromOldDefault: Option.isNone(lan) && servesThisHome && entries.T3CODE_HOST === undefined,
     host: entries.T3CODE_HOST,
   } satisfies Setup;
 });
diff --git a/apps/server/src/cli/update.test.ts b/apps/server/src/cli/update.test.ts
index 98ec13d32808..2fc2e29b6223 100644
--- a/apps/server/src/cli/update.test.ts
+++ b/apps/server/src/cli/update.test.ts
@@ -17,12 +17,15 @@ import { afterEach, vi } from "vite-plus/test";
 
 import packageJson from "../../package.json" with { type: "json" };
 import * as BootService from "../cloud/bootService.ts";
-import { pinnedRuntimePaths, prunePinnedRuntimes } from "../cloud/pinnedRuntime.ts";
+import {
+  pinnedRuntimePaths,
+  prunePinnedRuntimes,
+  resolveLauncherPath,
+} from "../cloud/pinnedRuntime.ts";
 import * as ManagedPolicy from "../policy/ManagedPolicy.ts";
 import * as ProcessRunner from "../processRunner.ts";
 import {
   repointLauncher,
-  resolveLauncherPath,
   resolveMirrorVersion,
   resolveNewestVersion,
   runUpdate,
@@ -216,7 +219,7 @@ it.layer(NodeServices.layer)("t3 update launcher", (it) => {
 
       assert.deepStrictEqual(Option.getOrUndefined(repointed), launcher);
       assert.equal(yield* fs.readLink(launcher), newExe);
-    }).pipe(Effect.scoped, Effect.provideService(HostProcess.Platform, "linux")),
+    }).pipe(Effect.provideService(HostProcess.Platform, "linux")),
   );
 
   it.effect.each([
@@ -282,7 +285,7 @@ it.layer(NodeServices.layer)("t3 update launcher", (it) => {
         yield* fs.realPath(launcher),
         yield* fs.realPath(path.join(root, "runtime/versions/2.0.0/t3")),
       );
-    }).pipe(Effect.scoped, Effect.provideService(HostProcess.Platform, "linux")),
+    }).pipe(Effect.provideService(HostProcess.Platform, "linux")),
   );
 
   const launcherFixture = Effect.fnUntraced(function* () {
@@ -313,7 +316,7 @@ it.layer(NodeServices.layer)("t3 update launcher", (it) => {
       });
 
       assert.equal(yield* fs.readFileString(launchersFile), `\n${launcher}\n`);
-    }).pipe(Effect.scoped, Effect.provideService(HostProcess.Platform, "linux")),
+    }).pipe(Effect.provideService(HostProcess.Platform, "linux")),
   );
 
   it.effect("fails instead of repointing a launcher it cannot record", () =>
@@ -331,7 +334,7 @@ it.layer(NodeServices.layer)("t3 update launcher", (it) => {
 
       assert.isTrue(Exit.isFailure(result));
       assert.equal(yield* fs.readLink(launcher), oldExe);
-    }).pipe(Effect.scoped, Effect.provideService(HostProcess.Platform, "linux")),
+    }).pipe(Effect.provideService(HostProcess.Platform, "linux")),
   );
 
   it.effect.each(["recording", "repointing"] as const)(
@@ -367,7 +370,7 @@ it.layer(NodeServices.layer)("t3 update launcher", (it) => {
           .split("\n")
           .includes(launcher);
         assert.isFalse(repointed && !recorded);
-      }).pipe(Effect.scoped, Effect.provideService(HostProcess.Platform, "linux")),
+      }).pipe(Effect.provideService(HostProcess.Platform, "linux")),
   );
 
   it.effect("leaves a plain copy or a foreign symlink alone", () =>
@@ -400,7 +403,7 @@ it.layer(NodeServices.layer)("t3 update launcher", (it) => {
       }
       assert.equal(yield* fs.readLink(foreign), elsewhere);
       assert.equal(yield* fs.readLink(otherLauncher), otherHome);
-    }).pipe(Effect.scoped, Effect.provideService(HostProcess.Platform, "linux")),
+    }).pipe(Effect.provideService(HostProcess.Platform, "linux")),
   );
 
   it.effect("finds the launcher a bare command name resolved to on PATH", () =>
@@ -411,7 +414,7 @@ it.layer(NodeServices.layer)("t3 update launcher", (it) => {
       const root = yield* fs.makeTempDirectoryScoped({ prefix: "t3-update-" });
       const launcher = path.join(root, "bin/t3");
       yield* fs.makeDirectory(path.dirname(launcher), { recursive: true });
-      yield* fs.writeFileString(launcher, "");
+      yield* fs.writeFileString(launcher, "", { mode: 0o755 });
 
       const bare = yield* resolveLauncherPath.pipe(
         Effect.provideService(HostProcess.InvokedAs, "t3"),
@@ -434,7 +437,7 @@ it.layer(NodeServices.layer)("t3 update launcher", (it) => {
       assert.equal(bare, launcher);
       assert.equal(relative, launcher);
       assert.equal(absent, undefined);
-    }).pipe(Effect.scoped),
+    }),
   );
 });
 
@@ -524,7 +527,6 @@ it.layer(NodeServices.layer)("t3 update with a background service", (it) => {
         `Background service still running the version before ${version}. Run \`t3 service restart\` when you are ready to switch it to ${version}.`,
       );
     }).pipe(
-      Effect.scoped,
       Effect.provideService(HostProcess.Platform, "linux"),
       Effect.provideService(HostProcess.Environment, { PATH: "" }),
     ),
diff --git a/apps/server/src/cli/update.ts b/apps/server/src/cli/update.ts
index 53ff536e6d11..9a4fbc67b4ef 100644
--- a/apps/server/src/cli/update.ts
+++ b/apps/server/src/cli/update.ts
@@ -32,6 +32,7 @@ import {
   pinnedRuntimeVersionsDir,
   prunePinnedRuntimes,
   recordPinnedRuntimeLauncher,
+  resolveLauncherPath,
   windowsShimTarget,
 } from "../cloud/pinnedRuntime.ts";
 import { compareExactServiceVersions, isExactServiceVersion } from "../cloud/serviceProtocol.ts";
@@ -194,28 +195,6 @@ export const repointLauncher = Effect.fn("cli.update.repoint_launcher")(function
   return Option.some(input.launchedAs);
 });
 
-/** Node preserves argv0's spelling; resolve bare names on PATH to find the launcher symlink. */
-export const resolveLauncherPath = Effect.gen(function* () {
-  const path = yield* Path.Path;
-  const fs = yield* FileSystem.FileSystem;
-  const invokedAs = yield* HostProcess.InvokedAs;
-  const cwd = yield* HostProcess.WorkingDirectory;
-  const environment = yield* HostProcess.Environment;
-  const platform = yield* HostProcess.Platform;
-  if (invokedAs.includes("/") || invokedAs.includes("\\")) {
-    return path.resolve(cwd, invokedAs);
-  }
-  const delimiter = platform === "win32" ? ";" : ":";
-  for (const directory of (environment["PATH"] ?? "").split(delimiter)) {
-    if (directory.length === 0) continue;
-    const candidate = path.join(directory, invokedAs);
-    if (yield* fs.exists(candidate).pipe(Effect.orElseSucceed(() => false))) {
-      return candidate;
-    }
-  }
-  return undefined;
-});
-
 /** Windows executables see their own path, so find the installer shim by matching t3.cmd targets on PATH. */
 export const findWindowsShim = Effect.fn("cli.update.find_windows_shim")(function* (
   executablePath: string,
diff --git a/apps/server/src/cliCompileCache.test.ts b/apps/server/src/cliCompileCache.test.ts
index b58e7969999d..4c733df134f5 100644
--- a/apps/server/src/cliCompileCache.test.ts
+++ b/apps/server/src/cliCompileCache.test.ts
@@ -77,9 +77,14 @@ it.live("loads the CLI with its cache settings only when the command needs it",
     expect(launcherFlags.exitCode).toBe(1);
     expect(launcherFlags.stderr).toContain("LOADED_CLI_MAIN");
     expect(launcherFlags.stderr).toContain("[service-launcher] T3CODE_HOME is required");
+    const cacheDir = `${root}/cache/t3code/compile-cache`;
+    yield* fs.makeDirectory(`${cacheDir}/v24.0.0-x64-legacy-1000`, { recursive: true });
+    yield* fs.writeFileString(`${cacheDir}/v24.0.0-x64-legacy-1000/0123abcd`, "stale");
+    yield* fs.makeDirectory(`${cacheDir}/server`, { recursive: true });
     const appImage = yield* run({ APPIMAGE: `${root}/T3Code.AppImage` });
     expect(appImage.exitCode).toBe(0);
     expect(appImage.stderr).toContain("CACHE=disabled");
+    expect((yield* fs.readDirectory(cacheDir)).toSorted()).toEqual(["server"]);
     const existing = yield* run({ NODE_COMPILE_CACHE: `${root}/explicit` });
     expect(existing.exitCode).toBe(0);
     expect(existing.stderr.replaceAll("\\", "/")).toContain(
diff --git a/apps/server/src/cliCompileCache.ts b/apps/server/src/cliCompileCache.ts
index 4387de73ba4c..9ae842afadd4 100644
--- a/apps/server/src/cliCompileCache.ts
+++ b/apps/server/src/cliCompileCache.ts
@@ -1,4 +1,5 @@
 // @effect-diagnostics nodeBuiltinImport:off -- Runs before the CLI's Effect runtime loads.
+import * as NodeFS from "node:fs";
 import * as NodeModule from "node:module";
 import * as NodeOS from "node:os";
 import * as NodePath from "node:path";
@@ -6,12 +7,22 @@ import * as NodeSea from "node:sea";
 
 export function enableCliCompileCache(): void {
   try {
-    // AppImage paths change each launch; SEA has no separate modules to cache.
-    if (process.env.APPIMAGE || NodeSea.isSea()) return;
+    // SEA has no separate modules to cache.
+    if (NodeSea.isSea()) return;
     const cacheRoot =
       process.env.XDG_CACHE_HOME ||
       // oxlint-disable-next-line t3code/no-global-process-runtime -- Runs before the CLI's Effect runtime loads.
       (process.platform === "linux" ? NodePath.join(NodeOS.homedir(), ".cache") : NodeOS.tmpdir());
-    NodeModule.enableCompileCache(NodePath.join(cacheRoot, "t3code", "compile-cache"));
+    const directory = NodePath.join(cacheRoot, "t3code", "compile-cache");
+    if (process.env.APPIMAGE) {
+      // AppImage paths change each launch. Older shims cached anyway, filling Node's engine folders.
+      for (const entry of NodeFS.readdirSync(directory, { withFileTypes: true })) {
+        if (entry.isDirectory() && /^v\d/.test(entry.name)) {
+          NodeFS.rmSync(NodePath.join(directory, entry.name), { recursive: true, force: true });
+        }
+      }
+      return;
+    }
+    NodeModule.enableCompileCache(directory);
   } catch {}
 }
diff --git a/apps/server/src/cloud/bootService.test.ts b/apps/server/src/cloud/bootService.test.ts
index c9f7d1a77c3d..cd4921ac452b 100644
--- a/apps/server/src/cloud/bootService.test.ts
+++ b/apps/server/src/cloud/bootService.test.ts
@@ -119,7 +119,7 @@ it("protects the server unit from agents under CPU and memory pressure", () => {
 });
 
 it.each([
-  ["a unit", '/home/theo/T3 "Data"/100%\\x', BootService.renderBootServiceUnit],
+  ["a unit", "/home/theo/T3 Data/100%$x", BootService.renderBootServiceUnit],
   [
     "a plist",
     "/Users/theo/a&b <c>",
@@ -141,6 +141,41 @@ it.each([
   ).toBe(program);
 });
 
+// systemd rejects a unit whose executable has a control character, quote or backslash, even quoted.
+it.each([
+  ["a double quote", '/home/theo/T3 "Data"'],
+  ["a single quote", "/home/theo/Theo's T3"],
+  ["a backslash", "/home/theo/T3\\Data"],
+  ["a newline", "/home/theo/T3\nData"],
+])("renders a loadable unit, or refuses, for a T3 home with %s", (_, baseDir) => {
+  let unit: string;
+  try {
+    unit = BootService.renderBootServiceUnit({
+      program: [`${baseDir}/runtime/versions/1.2.3/t3`, "__service-launcher"],
+      baseDir,
+      logPath: `${baseDir}/userdata/logs/boot-service.log`,
+      unitPath: "/home/theo/.config/systemd/user/t3code.service",
+    });
+  } catch {
+    return;
+  }
+  for (const line of unit.split("\n")) {
+    expect(line === "" || line.startsWith("[") || line.includes("=")).toBe(true);
+  }
+  const execStart = unit.split("\n").find((line) => line.startsWith("ExecStart="));
+  const executable = execStart
+    ?.slice("ExecStart=".length)
+    .match(/^"((?:\\.|[^"\\])*)"|^(\S+)/)
+    ?.slice(1)
+    .find((group) => group !== undefined)
+    ?.replace(/\\(.)/g, "$1");
+  expect(executable).toBeDefined();
+  const unsafe = [...(executable ?? "")].filter(
+    (char) => char.charCodeAt(0) < 0x20 || `"'\\`.includes(char),
+  );
+  expect(unsafe).toEqual([]);
+});
+
 const macInstallerPath =
   "/opt/homebrew/bin:/Users/theo/.npm-global/bin:/Users/theo/.nvm/versions/node/v22.16.0/bin:/usr/bin:/bin";
 
@@ -593,7 +628,7 @@ it.layer(NodeServices.layer)("boot service install", (it) => {
     "preserves the custom install bin directory in the installed service on %s",
     (platform) =>
       Effect.gen(function* () {
-        const installBinDir = '/custom/T3 & <100%>/"quoted"\\bin';
+        const installBinDir = '/custom/T3\t& <100%>/"quoted"\\bin';
         const { service, makeService, fs } = yield* makeHarness(
           platform,
           "",
@@ -605,8 +640,8 @@ it.layer(NodeServices.layer)("boot service install", (it) => {
         const unit = yield* fs.readFileString(plan.unitPath);
         expect(unit).toContain(
           platform === "linux"
-            ? 'Environment=T3CODE_INSTALL_BIN_DIR="/custom/T3 & <100%%>/\\"quoted\\"\\\\bin"'
-            : '<key>T3CODE_INSTALL_BIN_DIR</key>\n    <string>/custom/T3 &amp; &lt;100%&gt;/"quoted"\\bin</string>',
+            ? 'Environment=T3CODE_INSTALL_BIN_DIR="/custom/T3\t& <100%%>/\\"quoted\\"\\\\bin"'
+            : '<key>T3CODE_INSTALL_BIN_DIR</key>\n    <string>/custom/T3\t&amp; &lt;100%&gt;/"quoted"\\bin</string>',
         );
         expect((yield* service.status).current).toBe(true);
 
@@ -1185,6 +1220,14 @@ process.disconnect();
       expect(yield* fs.readFileString(plan.unitPath)).toBe(unit);
       expect(commands).toEqual([]);
       expect((yield* other.status).otherBaseDir).toBe(baseDir);
+
+      const quoted = yield* makeService(undefined, "1.2.3", path.join(otherHome, 'T3 "Data"'));
+      commands.length = 0;
+      const unloadable = yield* quoted.install().pipe(Effect.flip);
+      expect(unloadable._tag).toBe("BootServiceBaseDirUnsupportedError");
+      expect(CliError.getUserMessage(unloadable)).toBe(unloadable.message);
+      expect(yield* fs.readFileString(plan.unitPath)).toBe(unit);
+      expect(commands).toEqual([]);
     }),
   );
 
diff --git a/apps/server/src/cloud/bootService.ts b/apps/server/src/cloud/bootService.ts
index 1f5bc0c0d355..bea0f8de6ae8 100644
--- a/apps/server/src/cloud/bootService.ts
+++ b/apps/server/src/cloud/bootService.ts
@@ -45,6 +45,7 @@ import {
   parseServiceState,
   serviceStateActiveVersion,
   serviceStateHasPendingUpdate,
+  systemdUnitDirectoryOf,
   type ServiceState,
 } from "./serviceProtocol.ts";
 
@@ -90,8 +91,16 @@ export interface BootServicePlan {
   readonly handedOff?: boolean;
 }
 
+// systemd refuses an executable with a quote, backslash or control character even when
+// quoted. The executable lives under the T3 home, so this also catches a home with a newline.
+const systemdUnsafeValue = (plan: BootServicePlan) =>
+  /[\x00-\x1f\x7f"'\\]/.test(plan.program[0] ?? "");
+
 /** Service units cannot rely on the user's shell or PATH. */
 export function renderBootServiceUnit(plan: BootServicePlan): string {
+  if (systemdUnsafeValue(plan)) {
+    throw new BootServiceBaseDirUnsupportedError({ baseDir: plan.baseDir });
+  }
   // The user manager has no reliable network-online target; server networking retries itself.
   return [
     "[Unit]",
@@ -550,7 +559,7 @@ const decodeSystemdUnitPaths = Schema.decodeUnknownEffect(
 
 // The manager may not share the installer's environment; JSON preserves spaces in its paths.
 const readSystemdUnitDirectory = Effect.fn("cloud.boot_service.read_systemd_unit_directory")(
-  function* (runner: ProcessRunner.ProcessRunner["Service"], path: Path.Path) {
+  function* (runner: ProcessRunner.ProcessRunner["Service"]) {
     const result = yield* runner.run({
       command: "busctl",
       args: [
@@ -566,14 +575,7 @@ const readSystemdUnitDirectory = Effect.fn("cloud.boot_service.read_systemd_unit
     });
     if (result.code !== 0) return undefined;
     const { data } = yield* decodeSystemdUnitPaths(result.stdout);
-    // The persistent control directory identifies the manager's config root despite UnitPath overrides.
-    const controlDirectory = data.find(
-      (directory) =>
-        path.isAbsolute(directory) &&
-        directory.endsWith("/systemd/user.control") &&
-        data.includes(directory.slice(0, -".control".length)),
-    );
-    return controlDirectory?.slice(0, -".control".length);
+    return systemdUnitDirectoryOf(data);
   },
   Effect.orElseSucceed(() => undefined),
 );
@@ -591,7 +593,7 @@ export const bootServiceUnitPath = Effect.fn("cloud.boot_service.unit_path")(fun
   }
   if (platform !== "linux") return undefined;
   const unitDir =
-    (yield* readSystemdUnitDirectory(yield* ProcessRunner.ProcessRunner, path)) ??
+    (yield* readSystemdUnitDirectory(yield* ProcessRunner.ProcessRunner)) ??
     defaultSystemdUnitDir(path, homeDir, (yield* HostProcess.Environment).XDG_CONFIG_HOME ?? "");
   return path.join(unitDir, BOOT_SERVICE_UNIT_FILE);
 });
@@ -711,8 +713,22 @@ export class BootServiceOtherBaseDirError extends Schema.TaggedError<BootService
   }
 }
 
+export class BootServiceBaseDirUnsupportedError extends Schema.TaggedError<BootServiceBaseDirUnsupportedError>()(
+  "BootServiceBaseDirUnsupportedError",
+  { baseDir: Schema.String },
+) {
+  override get message(): string {
+    return `systemd cannot run T3 Code from ${JSON.stringify(this.baseDir)}: the path contains a quote, backslash or control character. Choose another T3 home with --base-dir.`;
+  }
+
+  override get [CliError.userMessage]() {
+    return this.message;
+  }
+}
+
 export type BootServiceError =
   | BootServiceUnsupportedError
+  | BootServiceBaseDirUnsupportedError
   | BootServiceOtherBaseDirError
   | BootServiceCommandError
   | BootServiceInstallError
@@ -972,8 +988,7 @@ export const make = Effect.fn("cloud.boot_service.make")(function* (input: {
     };
     return { manager, unitPath, plan };
   };
-  let systemdUnitDir =
-    platform === "linux" ? yield* readSystemdUnitDirectory(runner, path) : undefined;
+  let systemdUnitDir = platform === "linux" ? yield* readSystemdUnitDirectory(runner) : undefined;
   let { manager: detectedManager, unitPath, plan } = resolveTarget(systemdUnitDir);
   const statePath = path.join(input.baseDir, "runtime", SERVICE_STATE_FILE);
   const restartPendingPath = path.join(input.baseDir, "runtime", SERVICE_RESTART_PENDING_FILE);
@@ -1181,6 +1196,9 @@ export const make = Effect.fn("cloud.boot_service.make")(function* (input: {
     readonly start?: boolean;
   }) {
     let manager = yield* requireManager;
+    if (manager.kind === "systemd" && systemdUnsafeValue(plan)) {
+      return yield* new BootServiceBaseDirUnsupportedError({ baseDir: input.baseDir });
+    }
     // The unit is per user. Rewriting one that serves another home moves the
     // service onto this home's data, which looks like every thread vanished.
     const refuseOtherBaseDir = Effect.gen(function* () {
@@ -1205,7 +1223,7 @@ export const make = Effect.fn("cloud.boot_service.make")(function* (input: {
       // Without a session the manager was unreachable at construction, and the one lingering
       // started may use another config root than this shell's XDG_CONFIG_HOME.
       if (systemdUnitDir === undefined) {
-        systemdUnitDir = yield* readSystemdUnitDirectory(runner, path);
+        systemdUnitDir = yield* readSystemdUnitDirectory(runner);
         ({ manager: detectedManager, unitPath, plan } = resolveTarget(systemdUnitDir));
         manager = yield* requireManager;
         yield* refuseOtherBaseDir;
@@ -1544,6 +1562,7 @@ export const make = Effect.fn("cloud.boot_service.make")(function* (input: {
       problems,
       current:
         problems.length === 0 &&
+        !(manager.kind === "systemd" && systemdUnsafeValue(planForUnit(unit))) &&
         normalizeUnit(unit) === normalizeUnit(manager.render(planForUnit(unit))) &&
         runtimeEntryExists &&
         Option.isSome(runtimeSentinel) &&
diff --git a/apps/server/src/cloud/pinnedRuntime.test.ts b/apps/server/src/cloud/pinnedRuntime.test.ts
index 68870bd96943..0c016a504c9b 100644
--- a/apps/server/src/cloud/pinnedRuntime.test.ts
+++ b/apps/server/src/cloud/pinnedRuntime.test.ts
@@ -7,9 +7,10 @@ import * as Effect from "effect/Effect";
 import * as FileSystem from "effect/FileSystem";
 import * as Fiber from "effect/Fiber";
 import * as Path from "effect/Path";
+import * as Stream from "effect/Stream";
 import * as NodePath from "node:path";
 import * as TestClock from "effect/testing/TestClock";
-import { HttpClient, HttpClientResponse } from "effect/http";
+import { HttpClient, HttpClientError, HttpClientResponse } from "effect/http";
 import * as ChildProcess from "effect/process/ChildProcess";
 import * as ChildProcessSpawner from "effect/process/ChildProcessSpawner";
 
@@ -189,7 +190,127 @@ it.layer(NodeServices.layer)("ensurePinnedRuntimeInstalled", (it) => {
           validate: () => Effect.die("must not validate a missing archive"),
         }).pipe(Effect.flip);
       assert.isTrue(isUnpublishedRelease(yield* failsWith(404)));
-      assert.isFalse(isUnpublishedRelease(yield* failsWith(500)));
+      assert.isFalse(isUnpublishedRelease(yield* failsWith(403)));
+    }),
+  );
+
+  it.effect("retries a release download that GitHub answers with a gateway timeout", () =>
+    Effect.gen(function* () {
+      const fs = yield* FileSystem.FileSystem;
+      const path = yield* Path.Path;
+      const baseDir = yield* fs.makeTempDirectoryScoped({ prefix: "t3-pinned-retry-" });
+      const checksums = yield* validChecksums;
+      const requests: string[] = [];
+      const gatewayTimeoutServed = yield* Deferred.make<void>();
+      const install = yield* ensurePinnedRuntimeInstalled({
+        baseDir,
+        version,
+        fs,
+        path,
+        platform: "linux",
+        arch: "x64",
+        httpClient: HttpClient.make((request) => {
+          requests.push(request.url);
+          const isChecksums = request.url.endsWith("/SHA256SUMS");
+          if (requests.length === 1) {
+            Deferred.doneUnsafe(gatewayTimeoutServed, Effect.void);
+            return Effect.succeed(
+              HttpClientResponse.fromWeb(request, new Response("", { status: 504 })),
+            );
+          }
+          return Effect.succeed(
+            HttpClientResponse.fromWeb(
+              request,
+              new Response(isChecksums ? checksums : archiveBytes),
+            ),
+          );
+        }),
+        runner: extractingRunner(fs, path),
+        validate: () => Effect.void,
+      }).pipe(Effect.forkScoped);
+      yield* Deferred.await(gatewayTimeoutServed);
+      yield* TestClock.adjust(Duration.seconds(2));
+      const paths = yield* Fiber.join(install);
+      assert.equal(yield* fs.readFileString(paths.sentinelPath), `${version}\n`);
+      assert.equal(requests.filter((url) => url.endsWith("/SHA256SUMS")).length, 2);
+    }),
+  );
+
+  it.effect("retries a release archive whose body fails after the host answered", () =>
+    Effect.gen(function* () {
+      const fs = yield* FileSystem.FileSystem;
+      const path = yield* Path.Path;
+      const baseDir = yield* fs.makeTempDirectoryScoped({ prefix: "t3-pinned-retry-body-" });
+      const checksums = yield* validChecksums;
+      let archiveRequests = 0;
+      const archiveRequested = yield* Deferred.make<void>();
+      const install = yield* ensurePinnedRuntimeInstalled({
+        baseDir,
+        version,
+        fs,
+        path,
+        platform: "linux",
+        arch: "x64",
+        httpClient: HttpClient.make((request) => {
+          const isChecksums = request.url.endsWith("/SHA256SUMS");
+          const response = HttpClientResponse.fromWeb(
+            request,
+            new Response(isChecksums ? checksums : archiveBytes),
+          );
+          if (isChecksums || ++archiveRequests > 1) return Effect.succeed(response);
+          const failingBody = Stream.concat(
+            Stream.make(archiveBytes.slice(0, 4)),
+            Stream.fail(
+              new HttpClientError.HttpClientError({
+                reason: new HttpClientError.DecodeError({ request, response }),
+              }),
+            ),
+          );
+          Deferred.doneUnsafe(archiveRequested, Effect.void);
+          // TestClock follows the work a woken sleep starts, so one adjust reaches the retry wait.
+          return Effect.sleep("1 second").pipe(
+            Effect.as<HttpClientResponse.HttpClientResponse>(
+              Object.create(response, { stream: { value: failingBody } }),
+            ),
+          );
+        }),
+        runner: extractingRunner(fs, path),
+        validate: () => Effect.void,
+      }).pipe(Effect.forkScoped);
+      yield* Deferred.await(archiveRequested);
+      yield* TestClock.adjust(Duration.seconds(3));
+      const paths = yield* Fiber.join(install);
+      assert.equal(yield* fs.readFileString(paths.sentinelPath), `${version}\n`);
+      assert.equal(archiveRequests, 2);
+    }),
+  );
+
+  it.effect("fails at once when the release host cannot be reached", () =>
+    Effect.gen(function* () {
+      const fs = yield* FileSystem.FileSystem;
+      const path = yield* Path.Path;
+      const baseDir = yield* fs.makeTempDirectoryScoped({ prefix: "t3-pinned-offline-" });
+      let requests = 0;
+      const error = yield* ensurePinnedRuntimeInstalled({
+        baseDir,
+        version,
+        fs,
+        path,
+        platform: "linux",
+        arch: "x64",
+        httpClient: HttpClient.make((request) => {
+          requests += 1;
+          return Effect.fail(
+            new HttpClientError.HttpClientError({
+              reason: new HttpClientError.TransportError({ request }),
+            }),
+          );
+        }),
+        runner: extractingRunner(fs, path),
+        validate: () => Effect.die("must not validate without a download"),
+      }).pipe(Effect.flip);
+      assert.instanceOf(error, PinnedRuntimeInstallError);
+      assert.equal(requests, 1);
     }),
   );
 
diff --git a/apps/server/src/cloud/pinnedRuntime.ts b/apps/server/src/cloud/pinnedRuntime.ts
index 77bcb39f09dc..b698be272775 100644
--- a/apps/server/src/cloud/pinnedRuntime.ts
+++ b/apps/server/src/cloud/pinnedRuntime.ts
@@ -7,6 +7,7 @@ import * as FileSystem from "effect/FileSystem";
 import * as Path from "effect/Path";
 import * as Schema from "effect/Schema";
 import * as Option from "effect/Option";
+import * as Schedule from "effect/Schedule";
 import * as Stream from "effect/Stream";
 import * as Semaphore from "effect/Semaphore";
 import { HttpClient, HttpClientError, HttpClientRequest, HttpClientResponse } from "effect/http";
@@ -119,6 +120,20 @@ interface PinnedRuntimeInstallInput {
   readonly onProgress?: (progress: PinnedRuntimeProgress) => void;
 }
 
+// GitHub release downloads intermittently answer 5xx during incidents; a retry usually lands.
+const DOWNLOAD_RETRY = { times: 3, schedule: Schedule.exponential("2 seconds") } as const;
+
+const isTransientDownloadFailure = (
+  error: HttpClientError.HttpClientError | Cause.TimeoutError,
+): boolean => {
+  // No answer or a stall means the host cannot reach the release source; retrying only delays that.
+  if (error._tag === "TimeoutError") return false;
+  // Body bytes are read raw, so a DecodeError is a body that failed after the host answered.
+  if (error.reason._tag === "DecodeError") return true;
+  const status = error.response?.status;
+  return status !== undefined && (status >= 500 || status === 429 || status === 408);
+};
+
 const fetchReleaseAsset = Effect.fn("cloud.pinned_runtime.fetch_release_asset")(function* (
   httpClient: HttpClient.HttpClient,
   url: string,
@@ -161,6 +176,7 @@ const fetchReleaseAsset = Effect.fn("cloud.pinned_runtime.fetch_release_asset")(
         return bytes;
       }),
     ),
+    Effect.retry({ ...DOWNLOAD_RETRY, while: isTransientDownloadFailure }),
     Effect.mapError(
       (cause) =>
         new PinnedRuntimeInstallError({
@@ -431,6 +447,34 @@ export function launcherOwnsVersionsDir(
   return relative.length > 0 && !relative.startsWith("..") && !path.isAbsolute(relative);
 }
 
+/** Node preserves argv0's spelling; resolve bare names on PATH to find the launcher symlink. */
+export const resolveLauncherPath = Effect.gen(function* () {
+  const path = yield* Path.Path;
+  const fs = yield* FileSystem.FileSystem;
+  const invokedAs = yield* HostProcess.InvokedAs;
+  const cwd = yield* HostProcess.WorkingDirectory;
+  const environment = yield* HostProcess.Environment;
+  const platform = yield* HostProcess.Platform;
+  if (invokedAs.includes("/") || invokedAs.includes("\\")) {
+    return path.resolve(cwd, invokedAs);
+  }
+  const delimiter = platform === "win32" ? ";" : ":";
+  for (const directory of (environment["PATH"] ?? "").split(delimiter)) {
+    if (directory.length === 0) continue;
+    const candidate = path.resolve(cwd, directory, invokedAs);
+    const info = yield* fs.stat(candidate).pipe(Effect.option);
+    // Like the shell, pass over directories and non-executable files named the same.
+    if (
+      Option.isSome(info) &&
+      info.value.type === "File" &&
+      (platform === "win32" || (info.value.mode & 0o111) !== 0)
+    ) {
+      return candidate;
+    }
+  }
+  return undefined;
+});
+
 /**
  * `t3 update` repoints the launcher it was started through, which may be on neither PATH nor the
  * default bin dir. Unrecorded, the next prune would remove the runtime it now points at.
diff --git a/apps/server/src/cloud/selfUpdate.test.ts b/apps/server/src/cloud/selfUpdate.test.ts
index 184bd1deb485..4cae117b2bcc 100644
--- a/apps/server/src/cloud/selfUpdate.test.ts
+++ b/apps/server/src/cloud/selfUpdate.test.ts
@@ -184,21 +184,29 @@ it.layer(NodeServices.layer)("server self update", (it) => {
   ])("reports an HTTP $status downloading $asset and allows retry", ({ asset, status }) =>
     Effect.gen(function* () {
       let failDownload = true;
+      const downloadFailed = yield* Deferred.make<void>();
       const { selfUpdate, order, baseDir } = yield* makeHarness({
         httpClient: releaseHttpClient([], []).pipe(
-          HttpClient.transform((response, request) =>
-            failDownload && request.url.endsWith("/SHA256SUMS") === (asset === "checksums")
-              ? Effect.succeed(
-                  HttpClientResponse.fromWeb(
-                    HttpClientRequest.get("https://user:password@cdn.example/private?token=secret"),
-                    new Response("private response body", { status }),
-                  ),
-                )
-              : response,
-          ),
+          HttpClient.transform((response, request) => {
+            if (!failDownload || request.url.endsWith("/SHA256SUMS") !== (asset === "checksums"))
+              return response;
+            Deferred.doneUnsafe(downloadFailed, Effect.void);
+            return Effect.succeed(
+              HttpClientResponse.fromWeb(
+                HttpClientRequest.get("https://user:password@cdn.example/private?token=secret"),
+                new Response("private response body", { status }),
+              ),
+            );
+          }),
         ),
       });
-      const error = yield* selfUpdate.update({ targetVersion: "1.1.0" }).pipe(Effect.flip);
+      const failing = yield* selfUpdate
+        .update({ targetVersion: "1.1.0" })
+        .pipe(Effect.flip, Effect.forkScoped);
+      yield* Deferred.await(downloadFailed);
+      // A 5xx is retried after 2, 4, then 8 seconds before the update gives up.
+      yield* TestClock.adjust("14 seconds");
+      const error = yield* Fiber.join(failing);
       expect(error.reason).toBe(
         `Could not prepare t3@1.1.0 while downloading the t3 release ${asset} (HTTP ${status} from cdn.example).`,
       );
diff --git a/apps/server/src/cloud/serviceLauncherClient.test.ts b/apps/server/src/cloud/serviceLauncherClient.test.ts
index 2c8dc31da24f..f8de584ff2c8 100644
--- a/apps/server/src/cloud/serviceLauncherClient.test.ts
+++ b/apps/server/src/cloud/serviceLauncherClient.test.ts
@@ -238,7 +238,7 @@ it.layer(NodeServices.layer)("self-update launchers", (it) => {
 
         assert.equal(yield* fs.readLink(installed), exe("2.0.0"));
         assert.equal(yield* fs.readLink(onPath), exe("2.0.0"));
-      }).pipe(Effect.scoped, Effect.provideService(HostProcess.Platform, "linux")),
+      }).pipe(Effect.provideService(HostProcess.Platform, "linux")),
   );
 
   it.effect("still moves the PATH launcher when the install bin one cannot be rewritten", () =>
@@ -292,7 +292,7 @@ it.layer(NodeServices.layer)("self-update launchers", (it) => {
       assert.include(JSON.stringify(warnings), installed);
       assert.equal(yield* fs.readLink(installed), exe("1.0.0"));
       assert.equal(yield* fs.readLink(onPath), exe("2.0.0"));
-    }).pipe(Effect.scoped, Effect.provideService(HostProcess.Platform, "linux")),
+    }).pipe(Effect.provideService(HostProcess.Platform, "linux")),
   );
 
   it.effect("leaves unowned install files and PATH symlinks untouched after self-update", () =>
@@ -321,6 +321,6 @@ it.layer(NodeServices.layer)("self-update launchers", (it) => {
 
       assert.equal(yield* fs.readFileString(installed), "user-owned file");
       assert.equal(yield* fs.readLink(onPath), foreign);
-    }).pipe(Effect.scoped, Effect.provideService(HostProcess.Platform, "linux")),
+    }).pipe(Effect.provideService(HostProcess.Platform, "linux")),
   );
 });
diff --git a/apps/server/src/cloud/serviceProtocol.ts b/apps/server/src/cloud/serviceProtocol.ts
index f3264b841c51..c0a43bfe23e1 100644
--- a/apps/server/src/cloud/serviceProtocol.ts
+++ b/apps/server/src/cloud/serviceProtocol.ts
@@ -63,6 +63,20 @@ export function serviceUnitBaseDirOf(contents: string): string | undefined {
   return task === undefined ? undefined : unquoteWindowsArgument(task);
 }
 
+/**
+ * The user unit directory a systemd manager reads, from its UnitPath property. The persistent
+ * control directory identifies the manager's config root despite UnitPath overrides.
+ */
+export function systemdUnitDirectoryOf(unitPath: ReadonlyArray<string>): string | undefined {
+  const controlDirectory = unitPath.find(
+    (directory) =>
+      directory.startsWith("/") &&
+      directory.endsWith("/systemd/user.control") &&
+      unitPath.includes(directory.slice(0, -".control".length)),
+  );
+  return controlDirectory?.slice(0, -".control".length);
+}
+
 /** The file systemd or launchd appends the service's output to. */
 export function serviceUnitLogPathOf(contents: string): string | undefined {
   const systemd = /^StandardOutput=append:(.*)$/m.exec(contents)?.[1];
diff --git a/apps/server/src/desktopUpdate/DesktopUpdateMarker.test.ts b/apps/server/src/desktopUpdate/DesktopUpdateMarker.test.ts
new file mode 100644
index 000000000000..6f78c6bd044e
--- /dev/null
+++ b/apps/server/src/desktopUpdate/DesktopUpdateMarker.test.ts
@@ -0,0 +1,57 @@
+import { assert, describe, it } from "@effect/vitest";
+import * as Effect from "effect/Effect";
+import * as FileSystem from "effect/FileSystem";
+import * as Layer from "effect/Layer";
+import * as Option from "effect/Option";
+import * as TestClock from "effect/testing/TestClock";
+
+import * as DesktopUpdateMarker from "./DesktopUpdateMarker.ts";
+
+const remainingWait = (fileSystem: Partial<FileSystem.FileSystem>) =>
+  DesktopUpdateMarker.DesktopUpdateMarker.use((marker) => marker.remainingWait("/marker")).pipe(
+    Effect.provide(DesktopUpdateMarker.layer.pipe(Layer.provide(FileSystem.layerNoop(fileSystem)))),
+  );
+
+describe("DesktopUpdateMarker", () => {
+  it.effect.each([
+    ["fresh", '{"startedAt":0,"expiresAt":60000}', 0, Option.some(60000)],
+    ["partly elapsed", '{"startedAt":0,"expiresAt":60000}', 8000, Option.some(52000)],
+    ["expired", '{"startedAt":0,"expiresAt":60000}', 60000, Option.none()],
+    ["future", '{"startedAt":1000,"expiresAt":61000}', 0, Option.none()],
+    ["long host TTL", '{"startedAt":0,"expiresAt":600000}', 0, Option.some(60000)],
+    ["reversed", '{"startedAt":1000,"expiresAt":0}', 0, Option.none()],
+    ["missing fields", "{}", 0, Option.none()],
+    ["malformed", "not json", 0, Option.none()],
+  ] as const)("%s", ([name, contents, now, expected]) =>
+    Effect.gen(function* () {
+      let removed = false;
+      yield* TestClock.setTime(now);
+      const remaining = yield* remainingWait({
+        readFileString: () => Effect.succeed(contents),
+        remove: () =>
+          Effect.sync(() => {
+            removed = true;
+          }),
+      });
+      assert.deepStrictEqual(remaining, expected);
+      assert.isFalse(removed, `${name}: the launcher must never delete the shared marker`);
+    }),
+  );
+
+  it.effect("honours a marker published while it is being read", () =>
+    Effect.gen(function* () {
+      yield* TestClock.setTime(0);
+      const remaining = yield* remainingWait({
+        readFileString: () =>
+          TestClock.adjust(1000).pipe(Effect.as('{"startedAt":1000,"expiresAt":61000}')),
+      });
+      assert.deepStrictEqual(remaining, Option.some(60000));
+    }),
+  );
+
+  it.effect("a missing marker allows launch", () =>
+    Effect.gen(function* () {
+      assert.isTrue(Option.isNone(yield* remainingWait({})));
+    }),
+  );
+});
diff --git a/apps/server/src/desktopUpdate/DesktopUpdateMarker.ts b/apps/server/src/desktopUpdate/DesktopUpdateMarker.ts
new file mode 100644
index 000000000000..1f175bbe7db1
--- /dev/null
+++ b/apps/server/src/desktopUpdate/DesktopUpdateMarker.ts
@@ -0,0 +1,54 @@
+import { DESKTOP_UPDATE_IN_PROGRESS_TTL_MS } from "@t3tools/contracts";
+import * as Clock from "effect/Clock";
+import * as Context from "effect/Context";
+import * as Effect from "effect/Effect";
+import * as FileSystem from "effect/FileSystem";
+import * as Layer from "effect/Layer";
+import * as Option from "effect/Option";
+import * as Schema from "effect/Schema";
+
+const UpdateMarker = Schema.fromJsonString(
+  Schema.Struct({ startedAt: Schema.Number, expiresAt: Schema.Number }),
+);
+
+export class DesktopUpdateMarker extends Context.Service<
+  DesktopUpdateMarker,
+  {
+    /**
+     * Remaining SSH launch wait in ms, capped at this build's TTL.
+     * Read-only: a newer update may have just replaced the marker.
+     */
+    readonly remainingWait: (markerFile: string) => Effect.Effect<Option.Option<number>>;
+  }
+>()("t3/desktopUpdate/DesktopUpdateMarker") {}
+
+const make = Effect.gen(function* () {
+  const fileSystem = yield* FileSystem.FileSystem;
+
+  const remainingWait: DesktopUpdateMarker["Service"]["remainingWait"] = Effect.fn(
+    "DesktopUpdateMarker.remainingWait",
+  )(function* (markerFile) {
+    const marker = yield* fileSystem
+      .readFileString(markerFile)
+      .pipe(Effect.flatMap(Schema.decodeUnknownEffect(UpdateMarker)), Effect.option);
+    // Sampled after the read so a marker published mid-read is not seen as future-dated.
+    const now = yield* Clock.currentTimeMillis;
+    if (Option.isSome(marker)) {
+      const { startedAt, expiresAt } = marker.value;
+      if (
+        Number.isFinite(startedAt) &&
+        Number.isFinite(expiresAt) &&
+        startedAt <= now &&
+        expiresAt > now &&
+        expiresAt > startedAt
+      ) {
+        return Option.some(Math.min(expiresAt - now, DESKTOP_UPDATE_IN_PROGRESS_TTL_MS));
+      }
+    }
+    return Option.none();
+  });
+
+  return DesktopUpdateMarker.of({ remainingWait });
+});
+
+export const layer = Layer.effect(DesktopUpdateMarker, make);
diff --git a/apps/server/src/device/DeviceService.test.ts b/apps/server/src/device/DeviceService.test.ts
index f2e0bcdf0c72..e196b4cb7c3b 100644
--- a/apps/server/src/device/DeviceService.test.ts
+++ b/apps/server/src/device/DeviceService.test.ts
@@ -379,7 +379,7 @@ describe("device setup consent", () => {
         status: "failed",
         detail: startupError.message,
       });
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("names the missing npm in the host status when device support cannot install", () =>
@@ -473,7 +473,7 @@ describe("device setup consent", () => {
             detail: expected,
           });
         }
-      }).pipe(Effect.scoped),
+      }),
   );
 
   it.effect("listing and provider startup do not start helpers before consent", () =>
@@ -485,7 +485,7 @@ describe("device setup consent", () => {
       expect(readiness._tag).toBe("Failure");
       expect(starts).toEqual([]);
       expect(requests).toEqual([]);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect(
@@ -505,7 +505,7 @@ describe("device setup consent", () => {
         expect((yield* Ref.get(settings)).enableDeviceSupport).toBe(false);
         expect(yield* service.readinessIfSupported()).toBeNull();
         expect(starts).toEqual(["start", "stop"]);
-      }).pipe(Effect.scoped),
+      }),
   );
 
   it.effect("boots a stopped Android AVD and uses its emulator serial without duplicating it", () =>
@@ -522,7 +522,7 @@ describe("device setup consent", () => {
       const state = yield* service.state;
       expect(state.devices.map((device) => device.id)).toEqual(["emulator-5554"]);
       expect(state.bootingDevices).toEqual([]);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("blocks only emulator video until ffmpeg is usable, then allows retry", () =>
@@ -604,7 +604,7 @@ describe("device setup consent", () => {
       const emulator = yield* openEmulator;
       expect(emulator.deviceId).toBe("emulator-5554");
       expect(requests.filter((url) => url.endsWith("/boot"))).toHaveLength(1);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("opens emulators on hosts that route their own streams without ffmpeg", () =>
@@ -627,7 +627,7 @@ describe("device setup consent", () => {
       });
       expect(session.deviceId).toBe("emulator-5554");
       expect(requests.filter((url) => url.endsWith("/boot"))).toHaveLength(1);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("installs agent support only after the separate agent permission", () =>
@@ -646,7 +646,7 @@ describe("device setup consent", () => {
       expect(agentStops).toEqual(["stop"]);
       expect((yield* service.state).onboardingCompleted).toBe(true);
       expect((yield* Ref.get(settings)).deviceOnboardingCompleted).toBe(true);
-    }).pipe(Effect.scoped),
+    }),
   );
 });
 
@@ -726,7 +726,6 @@ it.effect.each([1, 9009])(
           NetService.layer,
         ).pipe(Layer.provideMerge(NodeServices.layer)),
       ),
-      Effect.scoped,
     ),
 );
 
@@ -753,7 +752,7 @@ it.effect("publishes boot progress and does not restore sessions after support i
     expect(state.devices).toEqual([]);
     expect(state.sessions).toEqual([]);
     expect(state.bootingDevices).toEqual([]);
-  }).pipe(Effect.scoped),
+  }),
 );
 
 it.effect.each([
@@ -783,7 +782,7 @@ it.effect.each([
     endDevice();
     yield* service.list;
     expect((yield* service.state).sessions).toHaveLength(kept);
-  }).pipe(Effect.scoped),
+  }),
 );
 
 describe("device discovery after server restart", () => {
@@ -796,7 +795,7 @@ describe("device discovery after server restart", () => {
       expect(capture.device.id).toBe("Pixel_API_35");
       expect(Array.from(capture.png)).toEqual([137, 80, 78, 71]);
       expect(requests.some((url) => url.endsWith("/api/devices"))).toBe(true);
-    }).pipe(Effect.scoped),
+    }),
   );
 });
 
@@ -817,7 +816,7 @@ it.effect("keeps other discovery warnings and clears them when only a deleted pl
     const refreshed = yield* service.list;
     expect(refreshed.hostStatusDetail).toBeUndefined();
     expect(refreshed.hostStatuses.local?.detail).toBeUndefined();
-  }).pipe(Effect.scoped),
+  }),
 );
 
 it.effect("hides Android discovery failures when the host has no Android SDK", () =>
@@ -831,7 +830,7 @@ it.effect("hides Android discovery failures when the host has no Android SDK", (
     yield* Ref.set(androidAvailable, true);
     const withSdk = yield* service.list;
     expect(withSdk.hostStatusDetail).toBe(`${avdmanagerFailure.message}\niOS discovery failed.`);
-  }).pipe(Effect.scoped),
+  }),
 );
 
 // The hub reports `error` as a util.inspect of Node's exec error.
@@ -882,7 +881,7 @@ it.effect("keeps the cause from the hub's error in discovery warnings, without t
     );
     expect(state.hostStatusDetail).not.toContain("    at ");
     expect(state.hostStatusDetail).not.toContain("stderr:");
-  }).pipe(Effect.scoped),
+  }),
 );
 
 it.effect(
@@ -916,7 +915,7 @@ it.effect(
       const recovered = yield* service.list;
       expect(recovered.devices.map((device) => device.id)).toEqual(["Pixel_API_35"]);
       expect(recovered.hostStatuses.local).toEqual({ status: "ready" });
-    }).pipe(Effect.scoped),
+    }),
 );
 
 it.effect.each([
@@ -955,7 +954,7 @@ it.effect.each([
         detail: "The device hub did not answer within 40 seconds.",
         incompletePlatforms,
       });
-    }).pipe(Effect.scoped),
+    }),
 );
 
 it.effect("does not open a retained pre-boot entry when the post-boot listing is incomplete", () =>
@@ -977,7 +976,7 @@ it.effect("does not open a retained pre-boot entry when the post-boot listing is
     yield* TestClock.adjust("40 seconds");
     expect((yield* Fiber.join(opening))._tag).toBe("DeviceNotFoundError");
     expect((yield* android.service.state).sessions).toEqual([]);
-  }).pipe(Effect.scoped),
+  }),
 );
 
 it.effect.each([
@@ -1012,7 +1011,7 @@ it.effect.each([
     expect(error.message).toContain(message);
     expect(error.message).toContain(diagnostic);
     expect((yield* service.state).bootingDevices).toEqual([]);
-  }).pipe(Effect.scoped),
+  }),
 );
 
 // regression: #22012 report Android emulator boot failures
@@ -1040,7 +1039,7 @@ it.effect("includes nested hub boot diagnostics and bounds them to 2,000 charact
     const roundTrip = decodeBootError(encodeBootError(error));
     expect(roundTrip.message).toBe(error.message);
     expect((yield* service.state).bootingDevices).toEqual([]);
-  }).pipe(Effect.scoped),
+  }),
 );
 
 it.effect("keeps shutdown successful when subsequent discovery fails", () =>
@@ -1057,7 +1056,7 @@ it.effect("keeps shutdown successful when subsequent discovery fails", () =>
     const state = yield* service.state;
     expect(state.sessions).toEqual([]);
     expect(state.devices.find((device) => device.id === session.deviceId)?.booted).toBe(false);
-  }).pipe(Effect.scoped),
+  }),
 );
 
 it.effect.each(["shutdown", "close"] as const)(
@@ -1239,7 +1238,7 @@ it.effect.each(["shutdown", "close"] as const)(
       yield* Fiber.join(binding);
       yield* Fiber.await(retiring);
       expect(launchers).toEqual(new Set());
-    }).pipe(Effect.provide(ServerSettings.layerTest({ enableDeviceSupport: true })), Effect.scoped),
+    }).pipe(Effect.provide(ServerSettings.layerTest({ enableDeviceSupport: true }))),
 );
 
 it.effect("leaves a session its host leases to every thread open when one thread closes", () =>
@@ -1335,7 +1334,6 @@ it.effect("leaves a session its host leases to every thread open when one thread
     Effect.provide(
       ServerSettings.layerTest({ enableDeviceSupport: true, enableAgentDeviceAccess: true }),
     ),
-    Effect.scoped,
   ),
 );
 
@@ -1441,7 +1439,7 @@ it.effect.each([
           (yield* service.state).devices.find((device) => device.id === deviceId)?.booted,
         ).toBe(true);
       }
-    }).pipe(Effect.provide(ServerSettings.layerTest({ enableDeviceSupport: true })), Effect.scoped),
+    }).pipe(Effect.provide(ServerSettings.layerTest({ enableDeviceSupport: true }))),
 );
 
 it.effect.each([LOCAL_DEVICE_HOST_ID, "ssh-fixture"])(
@@ -1527,7 +1525,7 @@ it.effect.each([LOCAL_DEVICE_HOST_ID, "ssh-fixture"])(
       ]);
       expect(recovered.hostStatuses[hostId]).toEqual({ status: "ready" });
       if (hostId === LOCAL_DEVICE_HOST_ID) expect(recovered.hostStatusDetail).toBeUndefined();
-    }).pipe(Effect.provide(ServerSettings.layerTest({ enableDeviceSupport: true })), Effect.scoped),
+    }).pipe(Effect.provide(ServerSettings.layerTest({ enableDeviceSupport: true }))),
 );
 
 it.effect("retry keeps device and agent consent unchanged", () =>
@@ -1543,7 +1541,7 @@ it.effect("retry keeps device and agent consent unchanged", () =>
     const before = agentStarts.length;
     yield* service.retryHost(LOCAL_DEVICE_HOST_ID);
     expect(agentStarts.length).toBe(before + 1);
-  }).pipe(Effect.scoped),
+  }),
 );
 
 it.effect("failed read-only discovery preserves lifecycle status and installed inventory", () =>
@@ -1555,7 +1553,7 @@ it.effect("failed read-only discovery preserves lifecycle status and installed i
     expect(state.hosts[0]?.hubInstalled).toBe(true);
     expect(state.hosts[0]?.toolInspectionError).toContain("Reconnect the host");
     expect(starts).toEqual([]);
-  }).pipe(Effect.scoped),
+  }),
 );
 
 it.effect(
@@ -1586,7 +1584,7 @@ it.effect(
       expect(requests).toEqual([]);
       yield* service.updateTool("hub");
       expect(installed).toEqual(["agent", "hub"]);
-    }).pipe(Effect.scoped),
+    }),
 );
 
 it.effect("failed manual installation leaves lifecycle state unchanged and can be retried", () =>
@@ -1619,7 +1617,7 @@ it.effect("failed manual installation leaves lifecycle state unchanged and can b
     expect(attempts).toBe(2);
     expect(starts).toEqual([]);
     expect(agentStarts).toEqual([]);
-  }).pipe(Effect.scoped),
+  }),
 );
 
 it.effect("reconciles SSH host settings without publishing no-op changes", () =>
@@ -1798,7 +1796,6 @@ it.effect("a failed tool update reports npm's exit code but not its output", ()
         NetService.layer,
       ).pipe(Layer.provideMerge(NodeServices.layer)),
     ),
-    Effect.scoped,
   ),
 );
 
@@ -2021,7 +2018,7 @@ describe("agent session release on close", () => {
         )
         .filter((label, index, labels) => label !== labels[index - 1]);
       expect(published).toEqual(["none", "reopened"]);
-    }).pipe(Effect.scoped),
+    }),
   );
 });
 
diff --git a/apps/server/src/device/LocalDeviceHost.test.ts b/apps/server/src/device/LocalDeviceHost.test.ts
index e133b4f9db36..5f7cef54f527 100644
--- a/apps/server/src/device/LocalDeviceHost.test.ts
+++ b/apps/server/src/device/LocalDeviceHost.test.ts
@@ -1,7 +1,9 @@
 import { describe, expect, it } from "@effect/vitest";
 import * as NodePath from "@effect/platform-node/NodePath";
 import * as HostProcess from "@t3tools/shared/HostProcess";
+import * as Deferred from "effect/Deferred";
 import * as Effect from "effect/Effect";
+import * as Fiber from "effect/Fiber";
 import * as Layer from "effect/Layer";
 import * as Option from "effect/Option";
 import * as Path from "effect/Path";
@@ -45,7 +47,8 @@ const agentFixture = Effect.fn("agentFixture")(function* (
   const fs = yield* FileSystem.FileSystem;
   const path = yield* Path.Path;
   const baseDir = yield* fs.makeTempDirectoryScoped({ prefix: "t3-device-agent-start-" });
-  const hub = { running: true, spawnFails: false };
+  const hub = { running: true, spawnFails: false, cleanup: Effect.void };
+  const daemonStopRequested = yield* Deferred.make<ReadonlyArray<string>>();
   const stateDir = agentDeviceStateDir(path, path.join(baseDir, "userdata"));
   const daemonHealthy = yield* Ref.make(true);
   const runs: Array<ProcessRunner.ProcessRunInput> = [];
@@ -80,20 +83,22 @@ const agentFixture = Effect.fn("agentFixture")(function* (
                 description: "Hub entry missing",
               }),
             )
-          : Effect.succeed(
-              ChildProcessSpawner.makeHandle({
-                pid: ChildProcessSpawner.ProcessId(123),
-                stdout: Stream.empty,
-                stderr: Stream.empty,
-                all: Stream.empty,
-                exitCode: Effect.never,
-                isRunning: Effect.sync(() => hub.running),
-                kill: () => Effect.void,
-                stdin: Sink.drain,
-                getInputFd: () => Sink.drain,
-                getOutputFd: () => Stream.empty,
-                unref: Effect.succeed(Effect.void),
-              }),
+          : Effect.addFinalizer(() => hub.cleanup).pipe(
+              Effect.as(
+                ChildProcessSpawner.makeHandle({
+                  pid: ChildProcessSpawner.ProcessId(123),
+                  stdout: Stream.empty,
+                  stderr: Stream.empty,
+                  all: Stream.empty,
+                  exitCode: Effect.never,
+                  isRunning: Effect.sync(() => hub.running),
+                  kill: () => Effect.void,
+                  stdin: Sink.drain,
+                  getInputFd: () => Sink.drain,
+                  getOutputFd: () => Stream.empty,
+                  unref: Effect.succeed(Effect.void),
+                }),
+              ),
             ),
       ),
     ),
@@ -102,7 +107,9 @@ const agentFixture = Effect.fn("agentFixture")(function* (
         runs.push(input);
         return input.args.includes("devices")
           ? startup(stateDir)
-          : Effect.succeed(input.args.includes("-list-avds") ? avdOutput : processOutput(0));
+          : input.args.includes("daemon")
+            ? Deferred.succeed(daemonStopRequested, input.args).pipe(Effect.as(processOutput(0)))
+            : Effect.succeed(input.args.includes("-list-avds") ? avdOutput : processOutput(0));
       },
     }),
     Effect.provideService(
@@ -122,7 +129,7 @@ const agentFixture = Effect.fn("agentFixture")(function* (
     ),
   );
   yield* host.ensureReady(() => Effect.void);
-  return { host, fs, baseDir, stateDir, hub, daemonHealthy, runs };
+  return { host, fs, baseDir, stateDir, hub, daemonHealthy, daemonStopRequested, runs };
 });
 
 describe("AgentDevice startup", () => {
@@ -353,6 +360,33 @@ describe("AgentDevice startup", () => {
       expect(yield* fs.exists(path.join(stateDir, "daemon.json"))).toBe(false);
     }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
   );
+
+  it.effect("stops the agent daemon while the hub is still shutting down", () =>
+    Effect.gen(function* () {
+      const fs = yield* FileSystem.FileSystem;
+      const { host, hub, stateDir, daemonStopRequested } = yield* agentFixture((stateDir) =>
+        fs
+          .writeFileString(
+            `${stateDir}/daemon.json`,
+            JSON.stringify({ httpPort: 12345, token: "test-token" }),
+          )
+          .pipe(Effect.orDie, Effect.as(processOutput(0))),
+      );
+      yield* host.ensureAgentReady(() => Effect.void);
+      const hubExited = yield* Deferred.make<void>();
+      hub.cleanup = Deferred.await(hubExited);
+      const stopping = yield* Effect.forkChild(host.stop);
+      expect((yield* Deferred.await(daemonStopRequested)).slice(1)).toEqual([
+        "daemon",
+        "stop",
+        "--state-dir",
+        stateDir,
+      ]);
+      yield* Deferred.succeed(hubExited, undefined);
+      yield* Fiber.join(stopping);
+      expect(yield* fs.exists(`${stateDir}/hub.json`)).toBe(false);
+    }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
+  );
 });
 
 const diagnose = (
diff --git a/apps/server/src/device/LocalDeviceHost.ts b/apps/server/src/device/LocalDeviceHost.ts
index c5097509dcad..e657d0dcdfc1 100644
--- a/apps/server/src/device/LocalDeviceHost.ts
+++ b/apps/server/src/device/LocalDeviceHost.ts
@@ -870,9 +870,16 @@ export const make = Effect.fn("LocalDeviceHost.make")(function* () {
   const stop: DeviceHost.DeviceHost["Service"]["stop"] = startLock.withPermits(1)(
     Effect.gen(function* () {
       const running = yield* Ref.getAndSet(runningRef, null);
-      yield* stopHub(running?.hub);
-      yield* fs.remove(hubStatePath(), { force: true }).pipe(Effect.ignore);
-      yield* stopAgentDeviceDaemon;
+      // Hub cleanup waits for its exit unbounded; it must not strand the detached agent daemon.
+      yield* Effect.all(
+        [
+          stopHub(running?.hub).pipe(
+            Effect.andThen(fs.remove(hubStatePath(), { force: true }).pipe(Effect.ignore)),
+          ),
+          stopAgentDeviceDaemon,
+        ],
+        { concurrency: "unbounded", discard: true },
+      );
     }),
   );
 
diff --git a/apps/server/src/device/SimlockDeviceHost.test.ts b/apps/server/src/device/SimlockDeviceHost.test.ts
index 752a63c038b8..8726a7a7c03d 100644
--- a/apps/server/src/device/SimlockDeviceHost.test.ts
+++ b/apps/server/src/device/SimlockDeviceHost.test.ts
@@ -4,6 +4,7 @@ import { SecretProviderId, type SimlockDeviceHostConfig } from "@t3tools/contrac
 import * as SecretResolver from "@t3tools/secret-provider-core/server/SecretResolver";
 import * as HostProcess from "@t3tools/shared/HostProcess";
 import * as Effect from "effect/Effect";
+import * as Clock from "effect/Clock";
 import * as Fiber from "effect/Fiber";
 import * as Deferred from "effect/Deferred";
 import * as Exit from "effect/Exit";
@@ -56,6 +57,8 @@ const fakePool = (
       readonly entered: Deferred.Deferred<void>;
       readonly proceed: Deferred.Deferred<void>;
     };
+    /** The gateway's `lease.maxTtlMs`: leases expire one TTL after their last renewal. */
+    readonly maxTtlMs?: number;
   } = {},
 ) =>
   Effect.gen(function* () {
@@ -66,8 +69,10 @@ const fakePool = (
     let leases = 0;
     let renewStatus = 200;
     let catalog: unknown = CATALOG;
+    let leaseDeadline = Infinity;
     const http = HttpClient.make((request) =>
-      Effect.sync(() => {
+      Effect.gen(function* () {
+        const now = yield* Clock.currentTimeMillis;
         const url = new URL(request.url);
         requests.push(`${request.method} ${url.pathname}`);
         const json = (body: unknown, status = 200) =>
@@ -75,6 +80,17 @@ const fakePool = (
         if (request.headers.authorization !== "Bearer agent-token")
           return json({ error: { code: "UNAUTHENTICATED", message: "Unknown bearer token" } }, 401);
         if (url.pathname === "/v1/catalog") return json(catalog);
+        if (url.pathname.endsWith("/renew") && options.maxTtlMs !== undefined) {
+          if (now >= leaseDeadline) return json({}, 404);
+          const body =
+            request.body._tag === "Uint8Array"
+              ? (JSON.parse(new TextDecoder().decode(request.body.body)) as { ttlMs?: number })
+              : {};
+          if ((body.ttlMs ?? 0) > options.maxTtlMs)
+            return json({ error: { code: "BAD_REQUEST", message: "ttlMs exceeds maxTtlMs" } }, 400);
+          leaseDeadline = now + (body.ttlMs ?? options.maxTtlMs);
+          return json({});
+        }
         if (url.pathname.endsWith("/renew")) return json({}, renewStatus);
         if (request.method === "DELETE") return json({}, 202);
         return json({}, 404);
@@ -114,6 +130,8 @@ const fakePool = (
               path.join(dir, `${session}.json`),
               JSON.stringify({ leaseId: `lease-${++leases}` }),
             );
+            if (options.maxTtlMs !== undefined)
+              leaseDeadline = (yield* Clock.currentTimeMillis) + options.maxTtlMs;
           }
           if (command === "screenshot") yield* fs.writeFile(args[1]!, new Uint8Array([1, 2, 3]));
           return {
@@ -475,6 +493,21 @@ describe("Simlock device host", () => {
     }).pipe(Effect.scoped, Effect.provide(layer)),
   );
 
+  it.effect("keeps a watched lease renewed when the gateway caps lease TTLs", () =>
+    Effect.gen(function* () {
+      const pool = yield* fakePool({ maxTtlMs: 5 * 60_000 });
+      const host = yield* makeHost(pool, config(), yield* Scope.make());
+      const ready = yield* host.ensureReady(() => Effect.void);
+      const [iphone] = (yield* ready.devices.list).devices;
+      const leaseId = yield* ready.devices.boot(iphone!);
+
+      yield* TestClock.adjust("6 minutes");
+      expect((yield* ready.devices.list).devices.some((device) => device.id === leaseId)).toBe(
+        true,
+      );
+    }).pipe(Effect.scoped, Effect.provide(layer)),
+  );
+
   it.effect("returns a lease whose open finishes after the host stopped", () =>
     Effect.gen(function* () {
       const holdOpen = {
diff --git a/apps/server/src/device/SimlockDeviceHost.ts b/apps/server/src/device/SimlockDeviceHost.ts
index bab0558614dc..417399c9114c 100644
--- a/apps/server/src/device/SimlockDeviceHost.ts
+++ b/apps/server/src/device/SimlockDeviceHost.ts
@@ -42,9 +42,9 @@ const REQUEST_TIMEOUT = Duration.seconds(15);
 // The gateway queues a lease request for up to five minutes when every device is busy.
 const OPEN_TIMEOUT = Duration.minutes(7);
 const COMMAND_TIMEOUT = Duration.minutes(2);
-// Renewal keeps a watched but idle device; a lease this server stops renewing ends after LEASE_TTL.
+// Renewal keeps a watched but idle device. It sends no ttlMs: Simlock then keeps the lease's own
+// length, while one above the gateway's lease.maxTtlMs is refused rather than shortened.
 const RENEW_INTERVAL = Duration.minutes(2);
-const LEASE_TTL_MS = 10 * 60_000;
 const STREAM_PATH = /^\/vendor\/serve-sim\/helper\/([^/]+)\/stream\.avcc$/;
 const INPUT_PATH = "/vendor/serve-sim/helper/ws";
 
@@ -422,7 +422,6 @@ export const make = Effect.fn("SimlockDeviceHost.make")(function* (
         lease.token,
         "POST",
         `/v1/leases/${encodeURIComponent(lease.leaseId)}/renew`,
-        { ttlMs: LEASE_TTL_MS },
       ).pipe(Effect.result);
       if (renewed._tag === "Success") continue;
       const error = renewed.failure;
diff --git a/apps/server/src/device/SshDeviceHost.test.ts b/apps/server/src/device/SshDeviceHost.test.ts
index 5bba5d084c54..8249afb1e51c 100644
--- a/apps/server/src/device/SshDeviceHost.test.ts
+++ b/apps/server/src/device/SshDeviceHost.test.ts
@@ -2,7 +2,9 @@ import { expect, it } from "@effect/vitest";
 import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
 import * as NodeServices from "@effect/platform-node/NodeServices";
 import * as Net from "@t3tools/shared/Net";
+import * as Deferred from "effect/Deferred";
 import * as Effect from "effect/Effect";
+import * as Fiber from "effect/Fiber";
 import * as FileSystem from "effect/FileSystem";
 import * as Layer from "effect/Layer";
 import * as PlatformError from "effect/PlatformError";
@@ -196,6 +198,97 @@ it.effect("preserves installed status after probes and cleans failed agent activ
   }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
 );
 
+it.effect("releases the forward of a bootstrap interrupted before its hub answered", () =>
+  Effect.gen(function* () {
+    const fs = yield* FileSystem.FileSystem;
+    const home = yield* fs.makeTempDirectoryScoped();
+    const probing = yield* Deferred.make<void>();
+    let holdReadiness = true;
+    let forwards = 0;
+    const spawner = ChildProcessSpawner.make((command) =>
+      Effect.gen(function* () {
+        const forwarding = command._tag === "StandardCommand" && command.args.includes("-L");
+        if (forwarding) {
+          forwards++;
+          yield* Effect.addFinalizer(() =>
+            Effect.sync(() => {
+              forwards--;
+            }),
+          );
+        }
+        const output = forwarding
+          ? ""
+          : JSON.stringify({
+              nodePath: "/node",
+              platforms: [{ platform: "ios", available: true }],
+              hubPort: 1234,
+              helpers: { serveSimAxSettings: null, serveSimCli: null },
+            });
+        return ChildProcessSpawner.makeHandle({
+          pid: ChildProcessSpawner.ProcessId(123),
+          stdout: Stream.make(new TextEncoder().encode(output)),
+          stderr: Stream.empty,
+          all: Stream.empty,
+          exitCode: forwarding ? Effect.never : Effect.succeed(ChildProcessSpawner.ExitCode(0)),
+          isRunning: Effect.succeed(forwarding),
+          kill: () => Effect.void,
+          stdin: Sink.drain,
+          getInputFd: () => Sink.drain,
+          getOutputFd: () => Stream.empty,
+          unref: Effect.succeed(Effect.void),
+        });
+      }),
+    );
+    const publishing = yield* Deferred.make<void>();
+    let holdReadyStatus = false;
+    const host = yield* SshDeviceHost.make(
+      {
+        kind: "ssh",
+        id: "test",
+        label: "Test",
+        target: "test.example",
+      },
+      undefined,
+      (status) =>
+        status === "ready" && holdReadyStatus
+          ? Deferred.succeed(publishing, undefined).pipe(Effect.andThen(Effect.never))
+          : Effect.void,
+    ).pipe(
+      Effect.provide(Layer.mergeAll(ServerConfig.layerTest(home, home), Net.layer)),
+      Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, spawner),
+      Effect.provideService(
+        HttpClient.HttpClient,
+        HttpClient.make((request) =>
+          Effect.gen(function* () {
+            if (holdReadiness) {
+              yield* Deferred.succeed(probing, undefined);
+              return yield* Effect.never;
+            }
+            return HttpClientResponse.fromWeb(request, new Response("ok"));
+          }),
+        ),
+      ),
+    );
+    const first = yield* host.ensureReady(() => Effect.void).pipe(Effect.forkChild);
+    yield* Deferred.await(probing);
+    yield* Fiber.interrupt(first);
+    expect(forwards).toBe(0);
+    holdReadiness = false;
+    yield* host.ensureReady(() => Effect.void);
+    yield* host.stop;
+    expect(forwards).toBe(0);
+    holdReadyStatus = true;
+    const second = yield* host.ensureReady(() => Effect.void).pipe(Effect.forkChild);
+    yield* Deferred.await(publishing);
+    yield* Fiber.interrupt(second);
+    holdReadyStatus = false;
+    yield* host.ensureReady(() => Effect.void);
+    expect(forwards).toBe(1);
+    yield* host.stop;
+    expect(forwards).toBe(0);
+  }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
+);
+
 it.effect("lists Android devices without probing the host again once it reports Android", () =>
   Effect.gen(function* () {
     const fs = yield* FileSystem.FileSystem;
diff --git a/apps/server/src/device/SshDeviceHost.ts b/apps/server/src/device/SshDeviceHost.ts
index d769a85ddb08..c1d57869ead9 100644
--- a/apps/server/src/device/SshDeviceHost.ts
+++ b/apps/server/src/device/SshDeviceHost.ts
@@ -473,13 +473,21 @@ export const make = Effect.fn("SshDeviceHost.make")(function* (
     return next;
   });
 
+  const closeConnection = Effect.suspend(() => {
+    const failedScope = connectionScope;
+    connectionScope = null;
+    ready = null;
+    return failedScope ? Scope.close(failedScope, Exit.void) : Effect.void;
+  });
+
   const connect = Effect.fn("SshDeviceHost.connect")(function* () {
     for (let attempt = 0; ; attempt++) {
-      const result = yield* connectOnce().pipe(Effect.result);
+      const result = yield* connectOnce().pipe(
+        Effect.onInterrupt(() => closeConnection),
+        Effect.result,
+      );
       if (result._tag === "Success") return result.success;
-      const failedScope = connectionScope;
-      connectionScope = null;
-      if (failedScope) yield* Scope.close(failedScope, Exit.void);
+      yield* closeConnection;
       // SSH binds after the reservation is released, so a competing bind needs fresh ports.
       if (
         attempt >= 2 ||
diff --git a/apps/server/src/device/localSshDeviceHost.test.ts b/apps/server/src/device/localSshDeviceHost.test.ts
index 91b9895916c6..4021be704a06 100644
--- a/apps/server/src/device/localSshDeviceHost.test.ts
+++ b/apps/server/src/device/localSshDeviceHost.test.ts
@@ -27,6 +27,7 @@ const spawner = ChildProcessSpawner.make((command) =>
       remote: "hostname 192.0.2.1\nport 22\n",
       loopback: "hostname 127.0.1.1\nport 22\n",
       ipv6: "hostname ::1\nport 22\n",
+      mapped: "hostname ::ffff:127.0.0.1\nport 22\n",
       forwarded: "hostname 127.0.0.1\nport 2222\n",
       proxy: "hostname 127.0.0.1\nport 22\nproxyjump bastion\n",
       command: "hostname 127.0.0.1\nport 22\nproxycommand nc remote 22\n",
@@ -59,7 +60,7 @@ const provide = <A, E>(
 it.effect("skips SSH aliases resolving to this machine, including loopback", () =>
   provide(
     Effect.gen(function* () {
-      for (const target of ["mac-mini", "loopback", "ipv6"]) {
+      for (const target of ["mac-mini", "loopback", "ipv6", "mapped"]) {
         expect(yield* isLocalSshDeviceHost(host(target))).toBe(true);
       }
     }),
diff --git a/apps/server/src/device/localSshDeviceHost.ts b/apps/server/src/device/localSshDeviceHost.ts
index 434aa7541b5d..4151786ce739 100644
--- a/apps/server/src/device/localSshDeviceHost.ts
+++ b/apps/server/src/device/localSshDeviceHost.ts
@@ -19,6 +19,21 @@ export const LocalDeviceHostAddresses = Context.Reference<ReadonlySet<string>>(
   },
 );
 
+/** Unwraps IPv4-mapped IPv6 (`::ffff:127.0.0.1`, `::ffff:7f00:1`) to plain IPv4. */
+const unmapIPv4 = (address: string) => {
+  if (NodeNet.isIP(address) !== 6) return address;
+  let canonical: string;
+  try {
+    canonical = new URL(`http://[${address}]`).hostname;
+  } catch {
+    return address;
+  }
+  const match = /^\[::ffff:([0-9a-f]{1,4}):([0-9a-f]{1,4})\]$/.exec(canonical);
+  if (!match) return address;
+  const [high, low] = [parseInt(match[1]!, 16), parseInt(match[2]!, 16)];
+  return [high >> 8, high & 0xff, low >> 8, low & 0xff].join(".");
+};
+
 export const isLocalSshDeviceHost = Effect.fn("isLocalSshDeviceHost")(function* (
   host: SshDeviceHostConfig,
 ) {
@@ -57,9 +72,11 @@ export const isLocalSshDeviceHost = Effect.fn("isLocalSshDeviceHost")(function*
   const localAddresses = yield* LocalDeviceHostAddresses;
   return (
     addresses.length > 0 &&
-    addresses.every(
-      (address) => localAddresses.has(address) || address === "::1" || address.startsWith("127."),
-    )
+    addresses
+      .map(unmapIPv4)
+      .every(
+        (address) => localAddresses.has(address) || address === "::1" || address.startsWith("127."),
+      )
   );
 });
 
diff --git a/apps/server/src/device/sshDeviceScript.test.ts b/apps/server/src/device/sshDeviceScript.test.ts
index d855320d3103..f048b88bbfef 100644
--- a/apps/server/src/device/sshDeviceScript.test.ts
+++ b/apps/server/src/device/sshDeviceScript.test.ts
@@ -46,6 +46,21 @@ it.effect("preserves shell metacharacters and newlines in remote arguments", ()
   }),
 );
 
+it.effect("rejects a Node release below the pinned agent-device engine floor", () =>
+  Effect.gen(function* () {
+    if ((yield* HostProcess.Platform) === "win32") return;
+    const probe = NodeChildProcess.spawnSync(process.execPath, [], {
+      input:
+        `Object.defineProperty(process.versions, "node", { value: "22.11.0" });\n` +
+        remoteDeviceScript("owner", "probe"),
+      env: { HOME: NodeOS.tmpdir(), PATH: NodePath.dirname(process.execPath) },
+      encoding: "utf8",
+    });
+    expect(probe.status).not.toBe(0);
+    expect(probe.stderr).toContain("Node 22.12 or newer");
+  }),
+);
+
 it.effect("stops a daemon left for its owner when starting without agent tools", () =>
   Effect.gen(function* () {
     if ((yield* HostProcess.Platform) === "win32") return;
diff --git a/apps/server/src/device/sshDeviceScript.ts b/apps/server/src/device/sshDeviceScript.ts
index 2e3e895293fa..beb998e04008 100644
--- a/apps/server/src/device/sshDeviceScript.ts
+++ b/apps/server/src/device/sshDeviceScript.ts
@@ -139,7 +139,8 @@ async function install(name, version, entry) {
     { platform: 'android', available: android, ...(!android ? { reason: 'Android SDK missing. Set ANDROID_HOME or put adb on the SSH PATH.' } : {}) },
   ];
   if (mode === 'probe') {
-    if (Number(process.versions.node.split('.')[0]) < 22) throw Error('Node 22 or newer is required on the device host.');
+    const [nodeMajor, nodeMinor] = process.versions.node.split('.').map(Number);
+    if (nodeMajor < 22 || (nodeMajor === 22 && nodeMinor < 12)) throw Error('Node 22.12 or newer is required on the device host.');
     if (run('npm', ['--version']).status !== 0) throw Error('npm is missing from the non-interactive SSH PATH.');
     console.log(JSON.stringify({ nodePath: process.execPath, platforms, tools: versions() })); return;
   }
diff --git a/apps/server/src/environment/DirectEndpoints.test.ts b/apps/server/src/environment/DirectEndpoints.test.ts
index 2b022cd069d2..6548b2ccd8c0 100644
--- a/apps/server/src/environment/DirectEndpoints.test.ts
+++ b/apps/server/src/environment/DirectEndpoints.test.ts
@@ -1,4 +1,5 @@
 import * as NodeServices from "@effect/platform-node/NodeServices";
+import { EnvironmentId } from "@t3tools/contracts";
 import { it as effectIt } from "@effect/vitest";
 import type * as NodeOS from "node:os";
 import * as Effect from "effect/Effect";
@@ -16,6 +17,7 @@ import { describe, expect, it } from "vite-plus/test";
 
 import * as ServerConfig from "../config.ts";
 import * as DirectEndpoints from "./DirectEndpoints.ts";
+import * as ServerEnvironment from "./ServerEnvironment.ts";
 import { resolveBoundEndpoints } from "./DirectEndpoints.ts";
 
 const INTERFACES: ReturnType<typeof NodeOS.networkInterfaces> = {
@@ -284,6 +286,12 @@ const layerServeConfig = (host = "127.0.0.1") =>
   ).pipe(
     Layer.provide(ServerConfig.layerTest(process.cwd(), { prefix: "t3-direct-" })),
     Layer.provide(NodeServices.layer),
+    Layer.merge(
+      Layer.succeed(ServerEnvironment.ServerEnvironment, {
+        getEnvironmentId: Effect.succeed(EnvironmentId.make("serve-test")),
+        getDescriptor: Effect.die("unused"),
+      }),
+    ),
   );
 
 const resolveWithServe = (probeStatus: number) =>
@@ -358,7 +366,7 @@ describe("DirectEndpoints Tailscale Serve", () => {
         yield* Deferred.succeed(finishRevalidation, undefined);
         expect(yield* Fiber.join(revalidating)).toEqual([bound]);
         expect(yield* service.resolveAvailable()).toEqual([bound]);
-      }).pipe(Effect.scoped),
+      }),
   );
 
   effectIt.effect("leaves the tailnet name out when Serve is not forwarding", () =>
diff --git a/apps/server/src/environment/DirectEndpoints.ts b/apps/server/src/environment/DirectEndpoints.ts
index 5b9ecc98299c..1f7d9f705620 100644
--- a/apps/server/src/environment/DirectEndpoints.ts
+++ b/apps/server/src/environment/DirectEndpoints.ts
@@ -23,6 +23,7 @@ import {
 } from "@t3tools/shared/hostClassification";
 
 import * as ServerConfig from "../config.ts";
+import * as ServerEnvironment from "./ServerEnvironment.ts";
 import { isLoopbackHost, isPrivateNetworkAddress, VIRTUAL_INTERFACE } from "../startupAccess.ts";
 
 type NetworkInterfacesMap = ReturnType<typeof NodeOS.networkInterfaces>;
@@ -120,6 +121,7 @@ export const make = Effect.gen(function* () {
   const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
   const httpClient = yield* HttpClient.HttpClient;
   const platform = yield* HostProcess.Platform;
+  const environmentId = yield* (yield* ServerEnvironment.ServerEnvironment).getEnvironmentId;
   // Only the service default listens on every interface without being asked,
   // so only it checks once whether it runs in a cloud. The check starts now so
   // the first client does not wait for its timeout.
@@ -155,7 +157,7 @@ export const make = Effect.gen(function* () {
             magicDnsName,
             servePort: config.tailscaleServePort,
           });
-          return probeTailscaleHttpsEndpoint({ baseUrl: httpBaseUrl }).pipe(
+          return probeTailscaleHttpsEndpoint({ baseUrl: httpBaseUrl, environmentId }).pipe(
             Effect.map((reachable) => (reachable ? httpBaseUrl : null)),
           );
         }),
diff --git a/apps/server/src/environment/RemoteOpenTargets.test.ts b/apps/server/src/environment/RemoteOpenTargets.test.ts
index 562321055f86..0d0da302efa5 100644
--- a/apps/server/src/environment/RemoteOpenTargets.test.ts
+++ b/apps/server/src/environment/RemoteOpenTargets.test.ts
@@ -162,6 +162,32 @@ describe("RemoteOpenTargets", () => {
     }),
   );
 
+  it.effect("drops the tailnet name after `tailscale down` while sshd listens", () =>
+    Effect.gen(function* () {
+      const targets = yield* resolveTargets({
+        sshd: { ipv4: true, ipv6: false },
+        tailscale: {
+          // After `tailscale down`, status still exits 0 and keeps Self from the last netmap.
+          status: {
+            exitCode: 0,
+            stdout: JSON.stringify({
+              BackendState: "Stopped",
+              Self: {
+                DNSName: "bb-1.tail1234.ts.net.",
+                TailscaleIPs: ["100.64.1.2"],
+                Online: false,
+              },
+            }),
+          },
+          prefs: prefsJson({ RunSSH: false, WantRunning: false }),
+        },
+        hostname: "bb-1",
+        username: "t3-user",
+      });
+      expect(targets).toEqual([{ kind: "mdns", host: "bb-1.local", username: "t3-user" }]);
+    }),
+  );
+
   it.effect("accepts an sshd bound to IPv6 loopback only", () =>
     Effect.gen(function* () {
       const targets = yield* resolveTargets({
diff --git a/apps/server/src/environment/RemoteOpenTargets.ts b/apps/server/src/environment/RemoteOpenTargets.ts
index d6837560790f..beb216339f06 100644
--- a/apps/server/src/environment/RemoteOpenTargets.ts
+++ b/apps/server/src/environment/RemoteOpenTargets.ts
@@ -37,7 +37,8 @@ export const make = Effect.gen(function* () {
       Effect.orElseSucceed(() => null),
       Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, spawner),
     );
-    const magicDnsName = tailscaleStatus?.magicDnsName ?? null;
+    const magicDnsName =
+      tailscaleStatus?.running === false ? null : (tailscaleStatus?.magicDnsName ?? null);
 
     const targets: Array<RemoteOpenTarget> = [];
 
diff --git a/apps/server/src/environment/ServerEnvironment.ts b/apps/server/src/environment/ServerEnvironment.ts
index 1f56d49c88b0..2c79189878e8 100644
--- a/apps/server/src/environment/ServerEnvironment.ts
+++ b/apps/server/src/environment/ServerEnvironment.ts
@@ -227,6 +227,7 @@ export const make = Effect.gen(function* () {
       fileAttachments: { maxUploadBytes: PROVIDER_SEND_TURN_MAX_FILE_BYTES },
       pullRequests: true,
       pullRequestChecks: true,
+      linkedThreadRefreshes: true,
       sideChats: true,
       vcsBranchStatus: true,
       inlineMessageContext: true,
@@ -237,6 +238,7 @@ export const make = Effect.gen(function* () {
       storageCleanupRun: true,
       databaseStorage: true,
       otlpEndpointCheck: true,
+      secretSourceCheck: true,
       projectWorktreeCleanup: true,
       settledWorktreeCleanup: true,
       worktreesDirectory: true,
@@ -272,6 +274,7 @@ export const make = Effect.gen(function* () {
       projectCloneTracking: true,
       projectOrganization: true,
       ignoredFileListing: true,
+      ignoredFileSearch: true,
       triage: true,
       oneTimeSchedules: true,
       freshContext: true,
diff --git a/apps/server/src/environment/staleWhileRevalidate.test.ts b/apps/server/src/environment/staleWhileRevalidate.test.ts
index 6fa0faa9c4cb..03216a4febdf 100644
--- a/apps/server/src/environment/staleWhileRevalidate.test.ts
+++ b/apps/server/src/environment/staleWhileRevalidate.test.ts
@@ -21,7 +21,7 @@ it.effect("computes once, then answers from memory until the ttl lapses", () =>
     yield* TestClock.adjust("59 seconds");
     assert.equal(yield* read, 1);
     assert.equal(yield* Ref.get(calls), 1);
-  }).pipe(Effect.scoped),
+  }),
 );
 
 it.effect("serves the stale value while one background refresh replaces it", () =>
@@ -80,7 +80,7 @@ it.effect("shares one first scan that an interrupted caller does not cancel", ()
     yield* Deferred.succeed(release, undefined);
     assert.equal(yield* Fiber.join(next), 1);
     assert.equal(yield* Ref.get(calls), 1);
-  }).pipe(Effect.scoped),
+  }),
 );
 
 it.effect("starts over after a failed first scan", () =>
@@ -98,7 +98,7 @@ it.effect("starts over after a failed first scan", () =>
 
     assert.isTrue(Exit.isFailure(yield* Effect.exit(read)));
     assert.equal(yield* read, 2);
-  }).pipe(Effect.scoped),
+  }),
 );
 
 it.effect("abandons a hung refresh so a later call can start another", () =>
@@ -144,7 +144,7 @@ it.effect("abandons a hung refresh so a later call can start another", () =>
     yield* Fiber.await(yield* Deferred.await(refreshed));
     assert.equal(yield* Ref.get(calls), 3);
     assert.equal(yield* read, 3);
-  }).pipe(Effect.scoped),
+  }),
 );
 
 it.effect("interrupts a background refresh when the owning scope closes", () =>
diff --git a/apps/server/src/environmentTheme.test.ts b/apps/server/src/environmentTheme.test.ts
index bb3b74c668e6..e44f32e60f5a 100644
--- a/apps/server/src/environmentTheme.test.ts
+++ b/apps/server/src/environmentTheme.test.ts
@@ -59,7 +59,7 @@ const withEnvironmentThemes = <A, E>(
         ),
       ),
     );
-  }).pipe(Effect.scoped);
+  });
 
 const currentThemes = Effect.gen(function* () {
   const environmentTheme = yield* EnvironmentTheme.EnvironmentThemeService;
diff --git a/apps/server/src/git/GitManager.test.ts b/apps/server/src/git/GitManager.test.ts
index d1904945dadc..04d825385edb 100644
--- a/apps/server/src/git/GitManager.test.ts
+++ b/apps/server/src/git/GitManager.test.ts
@@ -21,6 +21,7 @@ import * as Result from "effect/Result";
 import * as Scope from "effect/Scope";
 import * as Stream from "effect/Stream";
 import * as TestClock from "effect/testing/TestClock";
+import * as HostProcess from "@t3tools/shared/HostProcess";
 import { ChildProcessSpawner } from "effect/process";
 import { expect } from "vite-plus/test";
 import type {
@@ -94,8 +95,9 @@ interface FakeProviderScenario {
   /** Check out the pull request head from its pull ref: fast-forward only unless forced. */
   syncCheckoutWithPullHead?: boolean;
   /**
-   * The host's `headBranchProbe`. By default the fake probes only bare branch names, a hundred
-   * at a time, so tests see GitManager defer to the hook; null leaves the probe to GitManager.
+   * The host's `headBranchProbe`. By default the fake probes bare branch names, a hundred at a
+   * time, or only the owner-qualified default branch, as GitHub does, so tests see GitManager
+   * defer to the hook; null leaves the probe to GitManager.
    */
   headBranchProbe?: SourceControlProvider["Service"]["headBranchProbe"] | null;
 }
@@ -205,34 +207,55 @@ function runGit(
   });
 }
 
+/** A committed repository and an empty bare remote, built once and copied into each test. */
+class GitFixtureTemplates extends Context.Service<
+  GitFixtureTemplates,
+  { readonly repo: string; readonly bareRemote: string }
+>()("t3/git/GitManager.test/GitFixtureTemplates") {}
+
+const layerGitFixtureTemplates = Layer.effect(
+  GitFixtureTemplates,
+  Effect.gen(function* () {
+    const fs = yield* FileSystem.FileSystem;
+    const repo = yield* makeTempDir("t3code-git-template-");
+    // An empty template skips copying git's sample hooks into every test repository.
+    yield* runGit(repo, ["init", "--initial-branch=main", "--template="]);
+    yield* runGit(repo, ["config", "user.email", "test@example.com"]);
+    yield* runGit(repo, ["config", "user.name", "Test User"]);
+    // Override global autocrlf on Windows for LF assertions, including linked worktrees.
+    yield* runGit(repo, ["config", "core.autocrlf", "false"]);
+    yield* fs.writeFileString(NodePath.join(repo, "README.md"), "hello\n");
+    yield* runGit(repo, ["add", "README.md"]);
+    yield* runGit(repo, ["commit", "-m", "Initial commit"]);
+    const bareRemote = yield* makeTempDir("t3code-git-remote-template-");
+    yield* runGit(bareRemote, ["init", "--bare", "--template="]);
+    yield* fs.makeDirectory(NodePath.join(bareRemote, "hooks"), { recursive: true });
+    return { repo, bareRemote };
+  }),
+);
+
 function initRepo(
   cwd: string,
-): Effect.Effect<
-  void,
-  PlatformError.PlatformError | GitCommandError,
-  FileSystem.FileSystem | Scope.Scope | GitVcsDriver.GitVcsDriver
-> {
+): Effect.Effect<void, PlatformError.PlatformError, FileSystem.FileSystem | GitFixtureTemplates> {
   return Effect.gen(function* () {
     const fs = yield* FileSystem.FileSystem;
-    yield* runGit(cwd, ["init", "--initial-branch=main"]);
-    yield* runGit(cwd, ["config", "user.email", "test@example.com"]);
-    yield* runGit(cwd, ["config", "user.name", "Test User"]);
-    // Override global autocrlf on Windows for LF assertions, including linked worktrees.
-    yield* runGit(cwd, ["config", "core.autocrlf", "false"]);
-    yield* fs.writeFileString(NodePath.join(cwd, "README.md"), "hello\n");
-    yield* runGit(cwd, ["add", "README.md"]);
-    yield* runGit(cwd, ["commit", "-m", "Initial commit"]);
+    const templates = yield* GitFixtureTemplates;
+    for (const entry of [".git", "README.md"]) {
+      yield* fs.copy(NodePath.join(templates.repo, entry), NodePath.join(cwd, entry));
+    }
   });
 }
 
 function createBareRemote(): Effect.Effect<
   string,
-  PlatformError.PlatformError | GitCommandError,
-  FileSystem.FileSystem | Scope.Scope | GitVcsDriver.GitVcsDriver
+  PlatformError.PlatformError,
+  FileSystem.FileSystem | Scope.Scope | GitFixtureTemplates
 > {
   return Effect.gen(function* () {
+    const fs = yield* FileSystem.FileSystem;
+    const templates = yield* GitFixtureTemplates;
     const remoteDir = yield* makeTempDir("t3code-git-remote-");
-    yield* runGit(remoteDir, ["init", "--bare"]);
+    yield* fs.copy(templates.bareRemote, remoteDir, { overwrite: true });
     return remoteDir;
   });
 }
@@ -438,8 +461,10 @@ function createFakeSourceControlProvider(scenario: FakeProviderScenario = {}): {
       : {
           headBranchProbe:
             scenario.headBranchProbe ??
-            (({ headSelectors }: { readonly headSelectors: ReadonlyArray<string> }) => ({
-              headSelectors: headSelectors.filter((selector) => !selector.includes(":")),
+            (({ headSelectors, defaultBranchHeadSelector }) => ({
+              headSelectors: defaultBranchHeadSelector
+                ? [defaultBranchHeadSelector]
+                : headSelectors.filter((selector) => !selector.includes(":")),
               limit: 100,
             })),
         };
@@ -740,7 +765,8 @@ function makeManager(input?: {
 
 const asThreadId = (threadId: string) => threadId as ThreadId;
 
-const layerGitManagerTest = GitVcsDriver.layer.pipe(
+const layerGitManagerTest = layerGitFixtureTemplates.pipe(
+  Layer.provideMerge(GitVcsDriver.layer),
   Layer.provide(ServerConfig.layerTest(process.cwd(), { prefix: "t3-git-manager-test-" })),
   Layer.provideMerge(VcsProcess.layer),
   Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
@@ -1126,6 +1152,12 @@ it.layer(layerGitManagerTest)("GitManager", (it) => {
         "for-each-ref",
       ]);
       expect(freshLookups()).toBe(0);
+      gitCommands.length = 0;
+      yield* manager.branchPullRequest(
+        { cwd: repoDir, branch: "feature/settled" },
+        { confirmTerminal: false },
+      );
+      expect(gitCommands).toEqual([]);
 
       NodeFS.writeFileSync(NodePath.join(repoDir, "settled.txt"), "new work\n");
       yield* runGit(repoDir, ["add", "settled.txt"]);
@@ -2388,7 +2420,7 @@ it.layer(layerGitManagerTest)("GitManager", (it) => {
       const { manager, providerCalls } = yield* makeManager({
         providerScenario: {
           prListByHeadSelector: {
-            main: [
+            "contributor:main": [
               {
                 number: 777,
                 title: "Fork PR from main",
@@ -2419,7 +2451,7 @@ it.layer(layerGitManagerTest)("GitManager", (it) => {
       });
       expect(providerCalls).toContainEqual({
         operation: "listChangeRequests",
-        headSelector: "main",
+        headSelector: "contributor:main",
         state: "all",
         limit: 100,
       });
@@ -5321,66 +5353,277 @@ it.layer(layerGitManagerTest)("GitManager", (it) => {
     }),
   );
 
-  it.effect("preserves fork upstream tracking when preparing a worktree PR thread", () =>
-    Effect.gen(function* () {
-      const repoDir = yield* makeTempDir("t3code-git-manager-");
-      yield* initRepo(repoDir);
-      const originDir = yield* createBareRemote();
-      const forkDir = yield* createBareRemote();
-      yield* runGit(repoDir, ["remote", "add", "origin", originDir]);
-      yield* runGit(repoDir, ["push", "-u", "origin", "main"]);
-      yield* runGit(repoDir, ["remote", "add", "fork-seed", forkDir]);
-      yield* runGit(repoDir, ["checkout", "-b", "feature/pr-fork"]);
-      NodeFS.writeFileSync(NodePath.join(repoDir, "fork.txt"), "fork\n");
-      yield* runGit(repoDir, ["add", "fork.txt"]);
-      yield* runGit(repoDir, ["commit", "-m", "Fork PR branch"]);
-      yield* runGit(repoDir, ["push", "-u", "fork-seed", "feature/pr-fork"]);
-      yield* runGit(repoDir, ["checkout", "main"]);
+  it.effect.each([{ blocker: null }, { blocker: "t3code" }, { blocker: "t3code/pr-81" }])(
+    "preserves fork upstream tracking when preparing a worktree PR thread (local branch $blocker)",
+    ({ blocker }) =>
+      Effect.gen(function* () {
+        const repoDir = yield* makeTempDir("t3code-git-manager-");
+        yield* initRepo(repoDir);
+        const originDir = yield* createBareRemote();
+        const forkDir = yield* createBareRemote();
+        yield* runGit(repoDir, ["remote", "add", "origin", originDir]);
+        yield* runGit(repoDir, ["push", "-u", "origin", "main"]);
+        yield* runGit(repoDir, ["remote", "add", "fork-seed", forkDir]);
+        yield* runGit(repoDir, ["checkout", "-b", "feature/pr-fork"]);
+        NodeFS.writeFileSync(NodePath.join(repoDir, "fork.txt"), "fork\n");
+        yield* runGit(repoDir, ["add", "fork.txt"]);
+        yield* runGit(repoDir, ["commit", "-m", "Fork PR branch"]);
+        yield* runGit(repoDir, ["push", "-u", "fork-seed", "feature/pr-fork"]);
+        yield* runGit(repoDir, ["checkout", "main"]);
+        const mainHead = (yield* runGit(repoDir, ["rev-parse", "main"])).stdout.trim();
+        // A local branch owning a parent of the generated `t3code/pr-<n>/<head>` ref must not block checkout.
+        if (blocker !== null) yield* runGit(repoDir, ["branch", blocker]);
 
-      const { manager } = yield* makeManager({
-        providerScenario: {
-          pullRequest: {
-            number: 81,
-            title: "Fork PR",
-            url: "https://github.com/pingdotgg/codething-mvp/pull/81",
-            baseRefName: "main",
-            headRefName: "feature/pr-fork",
-            state: "open",
-            isCrossRepository: true,
-            headRepositoryNameWithOwner: "octocat/codething-mvp",
-            headRepositoryOwnerLogin: "octocat",
+        const { manager } = yield* makeManager({
+          providerScenario: {
+            pullRequest: {
+              number: 81,
+              title: "Fork PR",
+              url: "https://github.com/pingdotgg/codething-mvp/pull/81",
+              baseRefName: "main",
+              headRefName: "feature/pr-fork",
+              state: "open",
+              isCrossRepository: true,
+              headRepositoryNameWithOwner: "octocat/codething-mvp",
+              headRepositoryOwnerLogin: "octocat",
+            },
+            repositoryCloneUrls: {
+              "octocat/codething-mvp": {
+                url: forkDir,
+                sshUrl: forkDir,
+              },
+            },
           },
-          repositoryCloneUrls: {
-            "octocat/codething-mvp": {
-              url: forkDir,
-              sshUrl: forkDir,
+        });
+
+        const result = yield* preparePullRequestThread(manager, {
+          cwd: repoDir,
+          reference: "81",
+          mode: "worktree",
+        });
+
+        expect(result.worktreePath).not.toBeNull();
+        const upstreamRef = (yield* runGit(result.worktreePath as string, [
+          "rev-parse",
+          "--abbrev-ref",
+          "@{upstream}",
+        ])).stdout.trim();
+        expect(upstreamRef).toBe("fork-seed/feature/pr-fork");
+        expect(upstreamRef.startsWith("origin/")).toBe(false);
+        expect(
+          (yield* runGit(result.worktreePath as string, [
+            "config",
+            "--get",
+            "remote.fork-seed.url",
+          ])).stdout.trim(),
+        ).toBe(forkDir);
+        expect(
+          (yield* runGit(result.worktreePath as string, ["rev-parse", "HEAD"])).stdout.trim(),
+        ).toBe((yield* runGit(repoDir, ["rev-parse", "fork-seed/feature/pr-fork"])).stdout.trim());
+        if (blocker !== null) {
+          expect(
+            (yield* runGit(repoDir, ["rev-parse", `refs/heads/${blocker}`])).stdout.trim(),
+          ).toBe(mainHead);
+        }
+      }),
+  );
+
+  it.effect.each([
+    { localBranch: "ahead", expectedHead: "local", isOnPullRequestHead: false },
+    { localBranch: "behind", expectedHead: "pull request", isOnPullRequestHead: true },
+    { localBranch: "rewritten", expectedHead: "pull request", isOnPullRequestHead: true },
+    { localBranch: "rewritten-fetched", expectedHead: "pull request", isOnPullRequestHead: true },
+    { localBranch: "wrong-ref", expectedHead: "pull request", isOnPullRequestHead: true },
+    { localBranch: "stale-head", expectedHead: "local", isOnPullRequestHead: false },
+    { localBranch: "checkout-race", expectedHead: "pull request", isOnPullRequestHead: true },
+  ] as const)(
+    "moves an existing PR branch into a new worktree only when nothing is lost ($localBranch)",
+    ({ localBranch, expectedHead, isOnPullRequestHead }) =>
+      Effect.gen(function* () {
+        const repoDir = yield* makeTempDir("t3code-git-manager-");
+        yield* initRepo(repoDir);
+        const remoteDir = yield* createBareRemote();
+        yield* runGit(repoDir, ["remote", "add", "origin", remoteDir]);
+        yield* runGit(repoDir, ["push", "-u", "origin", "main"]);
+        yield* runGit(repoDir, ["checkout", "-b", "feature/pr-existing"]);
+        NodeFS.writeFileSync(NodePath.join(repoDir, "existing.txt"), "pushed\n");
+        yield* runGit(repoDir, ["add", "existing.txt"]);
+        yield* runGit(repoDir, ["commit", "-m", "Pushed PR commit"]);
+        yield* runGit(repoDir, ["push", "-u", "origin", "feature/pr-existing"]);
+        if (localBranch === "ahead") {
+          NodeFS.writeFileSync(NodePath.join(repoDir, "mine.txt"), "mine\n");
+          yield* runGit(repoDir, ["add", "mine.txt"]);
+          yield* runGit(repoDir, ["commit", "-m", "My unpublished commit"]);
+        } else if (!localBranch.startsWith("rewritten")) {
+          yield* runGit(repoDir, ["checkout", "-b", "author-push"]);
+          NodeFS.writeFileSync(NodePath.join(repoDir, "authored.txt"), "authored\n");
+          yield* runGit(repoDir, ["add", "authored.txt"]);
+          yield* runGit(repoDir, ["commit", "-m", "New PR head commit"]);
+          yield* runGit(repoDir, ["push", "origin", "author-push:feature/pr-existing"]);
+        } else {
+          const staleHead = (yield* runGit(repoDir, ["rev-parse", "HEAD"])).stdout.trim();
+          yield* runGit(repoDir, ["checkout", "-b", "author-rewrite"]);
+          NodeFS.writeFileSync(NodePath.join(repoDir, "existing.txt"), "rewritten\n");
+          yield* runGit(repoDir, ["add", "existing.txt"]);
+          yield* runGit(repoDir, ["commit", "--amend", "-m", "Rewritten PR head"]);
+          yield* runGit(repoDir, [
+            "push",
+            "--force",
+            "origin",
+            "author-rewrite:feature/pr-existing",
+          ]);
+          if (localBranch === "rewritten") {
+            yield* runGit(repoDir, [
+              "update-ref",
+              "refs/remotes/origin/feature/pr-existing",
+              staleHead,
+            ]);
+          }
+        }
+        const localHead = (yield* runGit(repoDir, [
+          "rev-parse",
+          "feature/pr-existing",
+        ])).stdout.trim();
+        const pullHead = (yield* runGit(repoDir, [
+          "ls-remote",
+          "origin",
+          "refs/heads/feature/pr-existing",
+        ])).stdout.split("\t")[0];
+        yield* runGit(repoDir, ["checkout", "main"]);
+
+        if (localBranch === "wrong-ref") {
+          yield* runGit(repoDir, ["push", "origin", "main:refs/pull/88/head"]);
+        }
+        const gate = {
+          matches: (args: ReadonlyArray<string>) =>
+            args[0] === "fetch" &&
+            args.some((arg) => arg.startsWith("+refs/heads/feature/pr-existing:")),
+          reached: yield* Deferred.make<void>(),
+          release: yield* Deferred.make<void>(),
+        };
+        const { manager } = yield* makeManager({
+          ...(localBranch === "checkout-race" ? { gitSpawnGate: gate } : {}),
+          providerScenario: {
+            pullRequest: {
+              number: 88,
+              title: "Existing branch PR",
+              url: "https://github.com/pingdotgg/codething-mvp/pull/88",
+              baseRefName: "main",
+              headRefName: "feature/pr-existing",
+              state: "open",
+              headSha: localBranch === "stale-head" ? localHead : pullHead,
+              isCrossRepository: false,
+              headRepositoryNameWithOwner: "pingdotgg/codething-mvp",
+              headRepositoryOwnerLogin: "pingdotgg",
+            },
+            repositoryCloneUrls: {
+              "pingdotgg/codething-mvp": { url: remoteDir, sshUrl: remoteDir },
             },
           },
-        },
-      });
+        });
 
-      const result = yield* preparePullRequestThread(manager, {
-        cwd: repoDir,
-        reference: "81",
-        mode: "worktree",
-      });
+        const preparing = yield* Effect.forkChild(
+          preparePullRequestThread(manager, {
+            cwd: repoDir,
+            reference: "88",
+            mode: "worktree",
+          }),
+        );
+        if (localBranch === "checkout-race") {
+          yield* Deferred.await(gate.reached);
+          const checkout = yield* runGit(repoDir, ["checkout", "feature/pr-existing"], true);
+          yield* Deferred.succeed(gate.release, undefined);
+          expect(checkout.exitCode).not.toBe(0);
+          expect((yield* runGit(repoDir, ["branch", "--show-current"])).stdout.trim()).toBe("main");
+        }
+        const result = yield* Fiber.join(preparing);
 
-      expect(result.worktreePath).not.toBeNull();
-      const upstreamRef = (yield* runGit(result.worktreePath as string, [
-        "rev-parse",
-        "--abbrev-ref",
-        "@{upstream}",
-      ])).stdout.trim();
-      expect(upstreamRef).toBe("fork-seed/feature/pr-fork");
-      expect(upstreamRef.startsWith("origin/")).toBe(false);
-      expect(
-        (yield* runGit(result.worktreePath as string, [
-          "config",
-          "--get",
-          "remote.fork-seed.url",
-        ])).stdout.trim(),
-      ).toBe(forkDir);
-    }),
+        const head = expectedHead === "local" ? localHead : pullHead;
+        expect((yield* runGit(repoDir, ["rev-parse", "feature/pr-existing"])).stdout.trim()).toBe(
+          head,
+        );
+        expect(
+          (yield* runGit(result.worktreePath as string, ["rev-parse", "HEAD"])).stdout.trim(),
+        ).toBe(head);
+        expect(result).toMatchObject({ branch: "feature/pr-existing", isOnPullRequestHead });
+      }),
+  );
+
+  it.effect.each(["adds", "removes"] as const)(
+    "checks out the submodules of the head an existing PR branch moves onto (head %s one)",
+    (headChange) =>
+      Effect.gen(function* () {
+        const submoduleDir = yield* makeTempDir("t3code-git-submodule-");
+        yield* initRepo(submoduleDir);
+        const repoDir = yield* makeTempDir("t3code-git-manager-");
+        yield* initRepo(repoDir);
+        const remoteDir = yield* createBareRemote();
+        yield* runGit(repoDir, ["remote", "add", "origin", remoteDir]);
+        yield* runGit(repoDir, ["push", "-u", "origin", "main"]);
+        yield* runGit(repoDir, ["checkout", "-b", "feature/pr-existing"]);
+        if (headChange === "removes") {
+          yield* runGit(repoDir, ["submodule", "add", submoduleDir, "shared"]);
+          yield* runGit(repoDir, ["commit", "-m", "Add shared submodule"]);
+        }
+        yield* runGit(repoDir, ["push", "-u", "origin", "feature/pr-existing"]);
+        yield* runGit(repoDir, ["checkout", "-b", "author-push"]);
+        if (headChange === "adds") {
+          yield* runGit(repoDir, ["submodule", "add", submoduleDir, "shared"]);
+          yield* runGit(repoDir, ["commit", "-m", "Add shared submodule"]);
+        } else {
+          yield* runGit(repoDir, ["rm", "shared"]);
+          yield* runGit(repoDir, ["commit", "-m", "Remove shared submodule"]);
+        }
+        yield* runGit(repoDir, ["push", "origin", "author-push:feature/pr-existing"]);
+        const pullHead = (yield* runGit(repoDir, ["rev-parse", "author-push"])).stdout.trim();
+        yield* runGit(repoDir, ["checkout", "main"]);
+
+        const { manager } = yield* makeManager({
+          providerScenario: {
+            pullRequest: {
+              number: 89,
+              title: "Submodule PR",
+              headSha: pullHead,
+              url: "https://github.com/pingdotgg/codething-mvp/pull/89",
+              baseRefName: "main",
+              headRefName: "feature/pr-existing",
+              state: "open",
+              isCrossRepository: false,
+              headRepositoryNameWithOwner: "pingdotgg/codething-mvp",
+              headRepositoryOwnerLogin: "pingdotgg",
+            },
+            repositoryCloneUrls: {
+              "pingdotgg/codething-mvp": { url: remoteDir, sshUrl: remoteDir },
+            },
+          },
+        });
+
+        const result = yield* preparePullRequestThread(manager, {
+          cwd: repoDir,
+          reference: "89",
+          mode: "worktree",
+        });
+
+        const worktreePath = result.worktreePath as string;
+        expect((yield* runGit(worktreePath, ["rev-parse", "HEAD"])).stdout.trim()).toBe(pullHead);
+        expect(NodeFS.existsSync(NodePath.join(worktreePath, "shared", "README.md"))).toBe(
+          headChange === "adds",
+        );
+        expect((yield* runGit(worktreePath, ["status", "--porcelain"])).stdout).toBe("");
+        expect(result).toMatchObject({ isOnPullRequestHead: true });
+      }).pipe(
+        // Git refuses `file:` submodule transports by default (CVE-2022-39253) and ignores
+        // repo-level config for it, so a local fixture needs the env allowance.
+        (effect) =>
+          Effect.flatMap(HostProcess.Environment, (env) =>
+            effect.pipe(
+              Effect.provideService(HostProcess.Environment, {
+                ...env,
+                GIT_ALLOW_PROTOCOL: "file",
+              }),
+            ),
+          ),
+      ),
   );
 
   it.effect("refreshes a reused PR worktree onto the updated pull request head", () =>
diff --git a/apps/server/src/git/GitManager.ts b/apps/server/src/git/GitManager.ts
index d10b09b1be96..aa06c85ad420 100644
--- a/apps/server/src/git/GitManager.ts
+++ b/apps/server/src/git/GitManager.ts
@@ -136,10 +136,18 @@ export class GitManager extends Context.Service<
       input: VcsStatusInput,
       options?: GitRemoteStatusOptions,
     ) => Effect.Effect<VcsStatusRemoteResult | null, GitManagerServiceError>;
-    /** refresh queries the host; freshGitState rereads only git state and is required before persisting. */
+    /**
+     * refresh queries the host; freshGitState rereads only git state and is required before persisting.
+     * A merged or closed answer is confirmed against git state unless confirmTerminal is false;
+     * callers that opt out confirm before acting on it.
+     */
     readonly branchPullRequest: (
       input: { readonly cwd: string; readonly branch: string },
-      options?: { readonly refresh?: boolean; readonly freshGitState?: boolean },
+      options?: {
+        readonly refresh?: boolean;
+        readonly freshGitState?: boolean;
+        readonly confirmTerminal?: boolean;
+      },
     ) => Effect.Effect<GitBranchPullRequest | null, GitManagerServiceError>;
     /** Whether T3 checked this pull request out onto the branch, which ties it to later threads. */
     readonly checkedOutPullRequest: (input: {
@@ -266,6 +274,7 @@ function resolveHeadRepositoryNameWithOwner(pullRequest: PullRequestHeadRemoteIn
 
 function resolvePullRequestWorktreeLocalBranchName(
   pullRequest: ResolvedPullRequest & PullRequestHeadRemoteInfo,
+  localBranches: ReadonlySet<string>,
 ): string {
   if (!pullRequest.isCrossRepository) {
     return pullRequest.headBranch;
@@ -273,7 +282,24 @@ function resolvePullRequestWorktreeLocalBranchName(
 
   const sanitizedHeadBranch = sanitizeBranchFragment(pullRequest.headBranch).trim();
   const suffix = sanitizedHeadBranch.length > 0 ? sanitizedHeadBranch : "head";
-  return `t3code/pr-${pullRequest.number}/${suffix}`;
+  // Git cannot create a ref whose path is a parent or child of an existing one (`t3code` blocks `t3code/...`).
+  const isCreatable = (name: string) =>
+    !name
+      .split("/")
+      .slice(0, -1)
+      .some((_, index, segments) => localBranches.has(segments.slice(0, index + 1).join("/"))) &&
+    ![...localBranches].some((branch) => branch.startsWith(`${name}/`));
+  const preferred = `t3code/pr-${pullRequest.number}/${suffix}`;
+  if (isCreatable(preferred)) {
+    return preferred;
+  }
+  const flat = `t3code-pr-${pullRequest.number}-${suffix.replaceAll("/", "-")}`;
+  for (let attempt = 1; ; attempt++) {
+    const candidate = attempt === 1 ? flat : `${flat}-${attempt}`;
+    if (isCreatable(candidate)) {
+      return candidate;
+    }
+  }
 }
 
 export function parseRepositoryNameWithOwnerFromRemoteUrl(
@@ -575,9 +601,10 @@ function headBranchProbe(
   provider: SourceControlProvider.SourceControlProvider["Service"],
   headSelectors: ReadonlyArray<string>,
   state: "open" | "all",
+  defaultBranchHeadSelector?: string,
 ) {
   return (
-    provider.headBranchProbe?.({ headSelectors, state }) ?? {
+    provider.headBranchProbe?.({ headSelectors, state, defaultBranchHeadSelector }) ?? {
       headSelectors,
       limit: state === "open" ? 1 : 20,
     }
@@ -1266,7 +1293,7 @@ export const make = Effect.gen(function* () {
         ) {
           return { latest: null, headContext };
         }
-        const latest = yield* findLatestPrForHeadContext(cwd, headContext);
+        const latest = yield* findLatestPrForHeadContext(cwd, headContext, details.defaultBranch);
         if (latest !== null) yield* noteLookupState(latest);
         return { latest, headContext };
       });
@@ -1926,11 +1953,19 @@ export const make = Effect.gen(function* () {
   const findLatestPrForHeadContext = Effect.fn("findLatestPrForHeadContext")(function* (
     cwd: string,
     headContext: BranchHeadContext,
+    defaultBranch: string | null,
   ) {
     const parsedByNumber = new Map<number, PullRequestInfo>();
 
     const provider = yield* sourceControlProvider(cwd);
-    const probe = headBranchProbe(provider, headContext.headSelectors, "all");
+    const probe = headBranchProbe(
+      provider,
+      headContext.headSelectors,
+      "all",
+      headContext.headBranch === defaultBranch && headContext.headRepositoryOwnerLogin
+        ? `${headContext.headRepositoryOwnerLogin}:${defaultBranch}`
+        : undefined,
+    );
     for (const headSelector of probe.headSelectors) {
       const pullRequests = yield* provider.listChangeRequests({
         cwd,
@@ -2483,7 +2518,8 @@ export const make = Effect.gen(function* () {
     });
     return mergeGitStatusParts(local, remote);
   });
-  // Closed PR results can settle threads or remove worktrees; confirm fresh git state before persisting.
+  // Closed PR results can settle threads or remove worktrees; confirm fresh git state before
+  // persisting, and before acting when a caller skipped confirmation (`confirmTerminal: false`).
   const prLookupGitStateByKey = new Map<
     string,
     { readonly readAtMs: number; readonly value: string | null }
@@ -2780,7 +2816,14 @@ export const make = Effect.gen(function* () {
       refresh,
       freshGitState,
     });
-    if (pullRequest === null || pullRequest.state === "open" || freshGitState) return pullRequest;
+    if (
+      pullRequest === null ||
+      pullRequest.state === "open" ||
+      freshGitState ||
+      options?.confirmTerminal === false
+    ) {
+      return pullRequest;
+    }
     // A confirmed closed or merged result stays final until the branch or remotes change,
     // with a periodic fresh lookup so a new PR from a reused branch still shows up.
     const settledKey = `${cacheCwd}\u0000${branch}`;
@@ -2963,8 +3006,22 @@ export const make = Effect.gen(function* () {
         ...pullRequest,
         ...toPullRequestHeadRemoteInfo(pullRequestSummary),
       } as const;
-      const localPullRequestBranch =
-        resolvePullRequestWorktreeLocalBranchName(pullRequestWithRemoteInfo);
+      const localBranches = pullRequestWithRemoteInfo.isCrossRepository
+        ? new Set(
+            (yield* gitCore.execute({
+              operation: "GitManager.preparePullRequestThread.localBranches",
+              cwd: input.cwd,
+              args: ["for-each-ref", "--format=%(refname:lstrip=2)", "refs/heads"],
+              timeoutMs: 5_000,
+            })).stdout
+              .split("\n")
+              .filter((name) => name.length > 0),
+          )
+        : new Set<string>();
+      const localPullRequestBranch = resolvePullRequestWorktreeLocalBranchName(
+        pullRequestWithRemoteInfo,
+        localBranches,
+      );
 
       // Git refuses to move checked-out branches; advance reused checkouts from inside their worktree.
       const reuseExistingWorktree = Effect.fn("reuseExistingWorktree")(function* (
@@ -3085,6 +3142,97 @@ export const make = Effect.gen(function* () {
         return null;
       });
 
+      // Claim the branch before refreshing, but initialize submodules only after selecting its head.
+      const refreshNewWorktree = Effect.fn("refreshNewWorktree")(function* (cwd: string) {
+        const upstreamCommitBeforeFetch = yield* gitCore
+          .resolveCommit({ cwd, revision: "@{upstream}" })
+          .pipe(
+            Effect.map((resolved) => resolved.commitSha),
+            Effect.orElseSucceed(() => null),
+          );
+        yield* configurePullRequestHeadUpstream(
+          cwd,
+          pullRequestWithRemoteInfo,
+          localPullRequestBranch,
+        );
+        const target = yield* changeRequestHeadRef(cwd, pullRequest.number).pipe(
+          Effect.flatMap((ref) => gitCore.fetchRefCommit({ cwd, ref })),
+          Effect.filterOrFail(
+            (resolved) =>
+              pullRequestSummary.headSha === undefined ||
+              resolved.commitSha === pullRequestSummary.headSha,
+            () =>
+              new GitManagerError({
+                operation: "preparePullRequestThread",
+                cwd,
+                detail: "The fetched ref does not match the pull request head.",
+              }),
+          ),
+          Effect.catch(() =>
+            gitCore.resolveCommit({ cwd, revision: "@{upstream}" }).pipe(
+              Effect.filterOrFail(
+                (resolved) => resolved.commitSha === pullRequestSummary.headSha,
+                () =>
+                  new GitManagerError({
+                    operation: "preparePullRequestThread",
+                    cwd,
+                    detail: "The configured upstream does not match the pull request head.",
+                  }),
+              ),
+            ),
+          ),
+        );
+        const { commitSha: headCommit } = yield* gitCore.resolveCommit({ cwd, revision: "HEAD" });
+        // A head that was ever published loses nothing when reset, even if a fetch already moved its upstream.
+        const gitLines = (args: ReadonlyArray<string>) =>
+          gitCore
+            .execute({
+              operation: "GitManager.preparePullRequestThread.publishedHead",
+              cwd,
+              args,
+              allowNonZeroExit: true,
+              timeoutMs: 5_000,
+            })
+            .pipe(
+              Effect.map((result) =>
+                result.exitCode === 0 ? result.stdout.split("\n").filter(Boolean) : [],
+              ),
+            );
+        const publishedHead =
+          (yield* gitLines(["for-each-ref", "--contains", headCommit, "refs/remotes"])).length >
+            0 ||
+          (yield* gitLines(["log", "--walk-reflogs", "--format=%H", "@{upstream}"])).includes(
+            headCommit,
+          );
+        return yield* gitCore
+          .refreshCheckedOutBranch({
+            cwd,
+            targetCommit: target.commitSha,
+            resetWhenHeadCommit: publishedHead ? headCommit : upstreamCommitBeforeFetch,
+          })
+          .pipe(Effect.map((result) => result.onTarget));
+      });
+
+      const createPullRequestWorktree = Effect.fn("createPullRequestWorktree")(function* (
+        onWorktreeClaimed?: (path: string) => Effect.Effect<void>,
+      ) {
+        return yield* gitCore.createWorktree(
+          {
+            cwd: input.cwd,
+            refName: localPullRequestBranch,
+            path: null,
+          },
+          {
+            ...(onWorktreeClaimed ? { progress: { onWorktreeClaimed } } : {}),
+            ...(yield* readWorktreeCreationSettings),
+            submodules: yield* projectSettingsFor(input).pipe(
+              Effect.map(({ settings }) => settings.worktreeSubmodules),
+              Effect.orElseSucceed(() => null),
+            ),
+          },
+        );
+      });
+
       const existingBranchBeforeFetch = yield* findLocalHeadBranch(input.cwd);
       const existingBranchBeforeFetchPath = existingBranchBeforeFetch?.worktreePath
         ? yield* canonicalizeExistingPath(existingBranchBeforeFetch.worktreePath)
@@ -3106,6 +3254,36 @@ export const make = Effect.gen(function* () {
             "This PR branch is already checked out in the main repo. Use Local, or switch the main repo off that branch before creating a worktree thread.",
         });
       }
+      // Materializing would force this branch onto the head.
+      if (existingBranchBeforeFetch !== null) {
+        let isOnPullRequestHead = false;
+        const worktree = yield* createPullRequestWorktree((cwd) =>
+          refreshNewWorktree(cwd).pipe(
+            Effect.catch((error) =>
+              Effect.logWarning(
+                "GitManager.preparePullRequestThread existing branch refresh failed",
+                {
+                  localBranch: localPullRequestBranch,
+                  cause: error,
+                },
+              ).pipe(Effect.as(false)),
+            ),
+            Effect.tap((onTarget) =>
+              Effect.sync(() => {
+                isOnPullRequestHead = onTarget;
+              }),
+            ),
+            Effect.asVoid,
+          ),
+        );
+        yield* maybeRunSetupScript(worktree.worktree.path);
+        return {
+          pullRequest,
+          branch: worktree.worktree.refName,
+          worktreePath: worktree.worktree.path,
+          isOnPullRequestHead,
+        };
+      }
 
       yield* materializePullRequestHeadBranch(
         input.cwd,
@@ -3135,20 +3313,7 @@ export const make = Effect.gen(function* () {
         });
       }
 
-      const worktree = yield* gitCore.createWorktree(
-        {
-          cwd: input.cwd,
-          refName: localPullRequestBranch,
-          path: null,
-        },
-        {
-          ...(yield* readWorktreeCreationSettings),
-          submodules: yield* projectSettingsFor(input).pipe(
-            Effect.map(({ settings }) => settings.worktreeSubmodules),
-            Effect.orElseSucceed(() => null),
-          ),
-        },
-      );
+      const worktree = yield* createPullRequestWorktree();
       yield* ensureExistingWorktreeUpstream(worktree.worktree.path);
       yield* maybeRunSetupScript(worktree.worktree.path);
 
diff --git a/apps/server/src/git/GitWorkflowService.ts b/apps/server/src/git/GitWorkflowService.ts
index c6075b4e2320..a614ebdfb568 100644
--- a/apps/server/src/git/GitWorkflowService.ts
+++ b/apps/server/src/git/GitWorkflowService.ts
@@ -53,6 +53,14 @@ export class GitWorkflowService extends Context.Service<
       input: VcsStatusInput,
     ) => Effect.Effect<VcsStatusLocalResult, GitManagerServiceError>;
     readonly currentBranch: (cwd: string) => Effect.Effect<string | null, GitManagerServiceError>;
+    readonly upstreamDivergence: (cwd: string) => Effect.Effect<
+      {
+        readonly refName: string;
+        readonly aheadCount: number;
+        readonly behindCount: number;
+      } | null,
+      GitManagerServiceError
+    >;
     readonly remoteStatus: (
       input: VcsStatusInput,
       options?: GitManager.GitRemoteStatusOptions,
@@ -95,6 +103,7 @@ export class GitWorkflowService extends Context.Service<
       readonly remoteName: string;
       readonly refName: string;
     }) => Effect.Effect<boolean, GitCommandError>;
+    readonly resolvePrimaryRemoteName: (cwd: string) => Effect.Effect<string, GitCommandError>;
     readonly resolveRemoteTrackingCommit: (input: {
       readonly cwd: string;
       readonly refName: string;
@@ -362,6 +371,16 @@ export const make = Effect.gen(function* () {
         detail: "Failed to read the checked-out branch.",
       });
     }),
+    upstreamDivergence: Effect.fn("GitWorkflowService.upstreamDivergence")(function* (cwd) {
+      const details = yield* git.statusDetailsRemote(cwd, { refreshUpstream: false });
+      return details.hasUpstream && details.branch !== null
+        ? {
+            refName: details.branch,
+            aheadCount: details.aheadCount,
+            behindCount: details.behindCount,
+          }
+        : null;
+    }),
     remoteStatus: Effect.fn("GitWorkflowService.remoteStatus")(function (input, options) {
       return detectGitRepositoryForStatus("GitWorkflowService.remoteStatus", input.cwd).pipe(
         Effect.flatMap((isGitRepository) =>
@@ -450,6 +469,13 @@ export const make = Effect.gen(function* () {
         Effect.andThen(git.remoteBranchExists(input)),
       );
     }),
+    resolvePrimaryRemoteName: Effect.fn("GitWorkflowService.resolvePrimaryRemoteName")(
+      function (cwd) {
+        return ensureGitCommand("GitWorkflowService.resolvePrimaryRemoteName", cwd).pipe(
+          Effect.andThen(git.resolvePrimaryRemoteName(cwd)),
+        );
+      },
+    ),
     resolveRemoteTrackingCommit: Effect.fn("GitWorkflowService.resolveRemoteTrackingCommit")(
       function (input) {
         return ensureGitCommand("GitWorkflowService.resolveRemoteTrackingCommit", input.cwd).pipe(
diff --git a/apps/server/src/htmlRender/HtmlRender.test.ts b/apps/server/src/htmlRender/HtmlRender.test.ts
index 9d84d29e43e1..a5a89e3d1970 100644
--- a/apps/server/src/htmlRender/HtmlRender.test.ts
+++ b/apps/server/src/htmlRender/HtmlRender.test.ts
@@ -622,6 +622,6 @@ fs.createReadStream(null, { fd: 3 }).on("end", quit).on("data", (chunk) => {
       }).pipe(Effect.provide(layerHtmlRender(executable)));
       expect(requests).toEqual([]);
       expect(datagrams).toEqual([]);
-    }).pipe(Effect.scoped),
+    }),
   );
 });
diff --git a/apps/server/src/htmlRender/publicProxy.test.ts b/apps/server/src/htmlRender/publicProxy.test.ts
index f04b7fafb30b..a268e4581b60 100644
--- a/apps/server/src/htmlRender/publicProxy.test.ts
+++ b/apps/server/src/htmlRender/publicProxy.test.ts
@@ -121,7 +121,7 @@ describe("publicProxy", () => {
       const { code, socket } = yield* connectThrough(port, ipv4Target("1.1.1.1", 0));
       socket.destroy();
       expect(code).toBe(7);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("refuses fake-IP names and records hosts whose every address is fake", () =>
@@ -133,7 +133,7 @@ describe("publicProxy", () => {
         expect(code).toBe(2);
       }
       expect([...fakeIpHosts]).toEqual([["cdn.fake-ip.test", "198.18.2.40"]]);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("refuses every address this machine holds, even a public one", () =>
@@ -156,7 +156,7 @@ describe("publicProxy", () => {
         socket.destroy();
         expect(code).toBe(2);
       }
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("closes every connection when its scope closes", () =>
diff --git a/apps/server/src/legacyServerOwner.ts b/apps/server/src/legacyServerOwner.ts
new file mode 100644
index 000000000000..9ed24c9c838f
--- /dev/null
+++ b/apps/server/src/legacyServerOwner.ts
@@ -0,0 +1,29 @@
+// Effect-free so the service launcher shares the pre-lock owner identity check with server startup.
+
+export const legacyOwnerStartTimeCommand = (pid: number, platform: NodeJS.Platform) => {
+  const windows = platform === "win32";
+  return {
+    command: windows ? "powershell.exe" : "ps",
+    args: windows
+      ? [
+          "-NoProfile",
+          "-NonInteractive",
+          "-Command",
+          `(Get-Process -Id ${pid} -ErrorAction Stop).StartTime.ToUniversalTime().ToString('o')`,
+        ]
+      : ["-p", String(pid), "-o", "lstart="],
+    env: { LC_ALL: "C", TZ: "UTC" },
+  };
+};
+
+// ps reports whole seconds. Unknown identity (no output) stays conservative.
+export const legacyOwnerStartedBeforeRecord = (
+  output: string | undefined,
+  recordedAt: number,
+  platform: NodeJS.Platform,
+): boolean => {
+  if (output === undefined) return true;
+  const trimmed = output.trim();
+  const startedAt = Date.parse(platform === "win32" ? trimmed : `${trimmed} UTC`);
+  return !Number.isFinite(startedAt) || startedAt <= recordedAt + 1_000;
+};
diff --git a/apps/server/src/mcp/AcpMcpStdioBridge.test.ts b/apps/server/src/mcp/AcpMcpStdioBridge.test.ts
index 3887a0368b99..89b320770ebf 100644
--- a/apps/server/src/mcp/AcpMcpStdioBridge.test.ts
+++ b/apps/server/src/mcp/AcpMcpStdioBridge.test.ts
@@ -392,6 +392,41 @@ describe("AcpMcpStdioBridge", () => {
     }),
   );
 
+  it.effect("answers a server ping that arrives before the tool result on its SSE stream", () =>
+    Effect.gen(function* () {
+      const sent: Array<{ id?: unknown; method?: string; result?: unknown }> = [];
+      const result = yield* mcpToolSession({
+        endpoint: "http://127.0.0.1:1/mcp",
+        authorization: "Bearer bridge-test",
+        clientName: "t3-code-acp-cli",
+        fetchImplementation: async (_url, init) => {
+          if (init?.method === "DELETE") return new Response(null, { status: 204 });
+          const message = JSON.parse(String(init?.body)) as (typeof sent)[number];
+          sent.push(message);
+          if (message.method === "initialize") {
+            return Response.json(
+              { jsonrpc: "2.0", id: message.id, result: { protocolVersion: "2025-06-18" } },
+              { headers: { "mcp-session-id": "session-42" } },
+            );
+          }
+          if (message.method !== "tools/call") return new Response(null, { status: 202 });
+          const ping = { jsonrpc: "2.0", id: "server-ping", method: "ping" };
+          const reply = { jsonrpc: "2.0", id: message.id, result: { content: [] } };
+          return new Response(
+            `data: ${JSON.stringify(ping)}\n\ndata: ${JSON.stringify(reply)}\n\n`,
+            { headers: { "content-type": "text/event-stream" } },
+          );
+        },
+      }).pipe(
+        Effect.flatMap((session) => session.call("orchestrator_capabilities", {})),
+        Effect.scoped,
+      );
+
+      expect(result).toEqual({ content: [] });
+      expect(sent).toContainEqual({ jsonrpc: "2.0", id: "server-ping", result: {} });
+    }),
+  );
+
   it.effect("aborts the pending fetch when the stdio bridge is interrupted", () =>
     Effect.gen(function* () {
       const started = yield* Deferred.make<AbortSignal | undefined>();
diff --git a/apps/server/src/mcp/AcpMcpStdioBridge.ts b/apps/server/src/mcp/AcpMcpStdioBridge.ts
index 485f85e1837c..ffddcf7d5866 100644
--- a/apps/server/src/mcp/AcpMcpStdioBridge.ts
+++ b/apps/server/src/mcp/AcpMcpStdioBridge.ts
@@ -58,6 +58,12 @@ function protocolVersionOf(entry: unknown): string | null {
   return typeof version === "string" && version.length > 0 ? version : null;
 }
 
+function replyToServerRequest(envelope: JsonRpcEnvelope): unknown {
+  return envelope.method === "ping"
+    ? { jsonrpc: "2.0", id: envelope.id, result: {} }
+    : { jsonrpc: "2.0", id: envelope.id, error: { code: -32601, message: "Method not found" } };
+}
+
 export interface McpToolSessionOptions {
   readonly endpoint: string;
   readonly authorization: string;
@@ -112,10 +118,16 @@ export const mcpToolSession = (
         message: `T3 Code MCP endpoint responded with HTTP ${response.status}.`,
       });
     }
-    const payloads = yield* Stream.runCollect(responsePayloads(response, bridgeError));
-    for (const payload of payloads) {
+    const payloads: Array<unknown> = [];
+    yield* Stream.runForEach(responsePayloads(response, bridgeError), (payload) => {
       protocolVersion = protocolVersionOf(payload) ?? protocolVersion;
-    }
+      const envelope = asEnvelope(payload);
+      if (envelope?.id !== undefined && typeof envelope.method === "string") {
+        return send(replyToServerRequest(envelope)).pipe(Effect.asVoid);
+      }
+      payloads.push(payload);
+      return Effect.void;
+    });
     return payloads;
   });
 
diff --git a/apps/server/src/mcp/McpHttpServer.test.ts b/apps/server/src/mcp/McpHttpServer.test.ts
index 8f0966f46834..395d9dfe04fe 100644
--- a/apps/server/src/mcp/McpHttpServer.test.ts
+++ b/apps/server/src/mcp/McpHttpServer.test.ts
@@ -44,6 +44,7 @@ import * as ManagedPolicy from "../policy/ManagedPolicy.ts";
 
 import * as DeviceService from "../device/DeviceService.ts";
 import * as PullRequestReviewGuideService from "../pullRequest/PullRequestReviewGuideService.ts";
+import * as PullRequestService from "../pullRequest/PullRequestService.ts";
 import * as ServerConfig from "../config.ts";
 import * as ServerSettings from "../serverSettings.ts";
 import { advertisedJsonSchema } from "./advertisedJsonSchema.ts";
@@ -100,6 +101,7 @@ const layerPullRequestsTest = McpHttpServer.layerPullRequestsToolkit.pipe(
     Layer.mergeAll(
       Layer.mock(ProjectService.ProjectService)({}),
       Layer.mock(PullRequestReviewGuideService.PullRequestReviewGuideService)({}),
+      Layer.mock(PullRequestService.PullRequestService)({}),
       Layer.mock(Orchestrator.OrchestratorV2)({}),
       Layer.mock(ProjectionStore.ProjectionStoreV2)({}),
       NodeServices.layer,
@@ -266,7 +268,6 @@ it.effect.each([
           Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
         ),
       ),
-      Effect.scoped,
     ),
 );
 
@@ -535,6 +536,26 @@ it.effect("saves the uncapped screenshot while the agent sees the capped one", (
   ).pipe(Effect.provide(layerTest)),
 );
 
+it.effect("names the screenshot destination when saving it fails", () =>
+  Effect.scoped(
+    Effect.gen(function* () {
+      const config = yield* ServerConfig.ServerConfig;
+      yield* (yield* FileSystem.FileSystem).writeFileString(config.browserArtifactsDir, "occupied");
+      yield* serveSnapshots("mcp-save-failure-client", snapshotResult);
+
+      const snapshot = yield* callSnapshot({ tabId: alternateTabId, save: true });
+      const text = snapshot.content[0]?.type === "text" ? snapshot.content[0].text : "";
+
+      expect(snapshot.isError).toBe(true);
+      expect(text).toMatch(/^Preview snapshot failed: Could not save preview screenshot to /);
+      expect(text).toContain(config.browserArtifactsDir);
+      expect(snapshot.structuredContent).toMatchObject({
+        error: { _tag: "PreviewScreenshotSaveError", message: text.slice(25) },
+      });
+    }),
+  ).pipe(Effect.provide(layerTest)),
+);
+
 it.effect("refuses preview tools to a client outside a thread before they run", () =>
   Effect.gen(function* () {
     const server = yield* McpServer.McpServer;
@@ -674,13 +695,13 @@ it.effect(
         ...thread,
         limit: 100,
         runLimit: 50,
-        maxCharsPerItem: 50_000,
+        maxCharsPerItem: 20_000,
       });
       yield* callTool("t3_thread_read", { ...thread, limit: 7, runLimit: 1, maxCharsPerItem: 1 });
 
       expect(calls).toEqual([
-        { ...thread, limit: 100, runLimit: 50, maxCharsPerItem: 50_000 },
-        { ...thread, limit: 100, runLimit: 50, maxCharsPerItem: 50_000 },
+        { ...thread, limit: 100, runLimit: 50, maxCharsPerItem: 20_000 },
+        { ...thread, limit: 100, runLimit: 50, maxCharsPerItem: 20_000 },
         { ...thread, limit: 7, runLimit: 1, maxCharsPerItem: 1 },
       ]);
     }).pipe(Effect.provide(layerRecordingTools(calls)));
@@ -994,6 +1015,123 @@ it.effect("terminates HTTP MCP sessions with DELETE", () =>
   ).pipe(Effect.provide(NodeHttpServer.layerTest)),
 );
 
+it.effect("answers 2026-07-28 discovery and keeps 2025-06-18 as the initialize fallback", () =>
+  Effect.scoped(
+    Effect.gen(function* () {
+      const token = "providerTokenWithoutDots";
+      const scope: McpInvocationContext.McpInvocationScope = {
+        environmentId,
+        requestNamespace: "provider-session",
+        thread: {
+          threadId: ThreadId.make("thread-provider"),
+          providerSessionId: "provider-session",
+          providerInstanceId: ProviderInstanceId.make("codex"),
+        },
+        client: undefined,
+        capabilities: new Set(["orchestration"]),
+        issuedAt: 1,
+      };
+      const ProbeToolkit = Toolkit.make(
+        Tool.make("probe", {
+          description: "Reports success.",
+          success: Schema.Struct({ ok: Schema.Boolean }),
+        }),
+      );
+      const layerServer = McpHttpServer.layerMcpTransport(
+        McpHttpServer.toolkitRegistration(
+          ProbeToolkit,
+          McpToolAccess.toLayer(ProbeToolkit, {
+            probe: McpToolAccess.reads(() => Effect.succeed({ ok: true })),
+          }),
+        ),
+      ).pipe(
+        Layer.provide(ServerSettings.layerTest()),
+        Layer.provide(
+          Layer.mock(McpSessionRegistry.McpSessionRegistry)({
+            resolve: (presented) =>
+              Effect.succeed(
+                presented === token
+                  ? (scope as McpInvocationContext.McpThreadInvocationScope)
+                  : undefined,
+              ),
+          }),
+        ),
+      );
+      yield* HttpRouter.serve(layerServer, {
+        disableListenLog: true,
+        disableLogger: true,
+      }).pipe(Layer.build);
+      const httpClient = (yield* HttpClient.HttpClient).pipe(
+        HttpClient.mapRequest(HttpClientRequest.bearerToken(token)),
+      );
+
+      const discoverResponse = yield* httpClient.post("/mcp", {
+        headers: {
+          accept: "application/json, text/event-stream",
+          "mcp-method": "server/discover",
+          "mcp-protocol-version": "2026-07-28",
+        },
+        body: HttpBody.text(
+          `{"jsonrpc":"2.0","id":1,"method":"server/discover","params":{"_meta":{"io.modelcontextprotocol/protocolVersion":"2026-07-28","io.modelcontextprotocol/clientCapabilities":{},"io.modelcontextprotocol/clientInfo":{"name":"mcp-test","version":"1.0.0"}}}}`,
+          "application/json",
+        ),
+      });
+      expect(discoverResponse.status).toBe(200);
+      const discovered = (yield* discoverResponse.json) as {
+        result: { supportedVersions: ReadonlyArray<string> };
+      };
+      expect(discovered.result.supportedVersions).toEqual(
+        expect.arrayContaining(["2026-07-28", "2025-06-18"]),
+      );
+
+      const toolsResponse = yield* httpClient.post("/mcp", {
+        headers: {
+          accept: "application/json, text/event-stream",
+          "mcp-method": "tools/list",
+          "mcp-protocol-version": "2026-07-28",
+        },
+        body: HttpBody.text(
+          JSON.stringify({
+            jsonrpc: "2.0",
+            id: 3,
+            method: "tools/list",
+            params: {
+              _meta: {
+                "io.modelcontextprotocol/protocolVersion": "2026-07-28",
+                "io.modelcontextprotocol/clientCapabilities": {},
+                "io.modelcontextprotocol/clientInfo": { name: "mcp-test", version: "1.0.0" },
+              },
+            },
+          }),
+          "application/json",
+        ),
+      });
+      expect(toolsResponse.status).toBe(200);
+      const tools = (yield* toolsResponse.json) as {
+        error?: unknown;
+        result: { tools: ReadonlyArray<{ name: string }> };
+      };
+      expect(tools.error).toBeUndefined();
+      expect(tools.result.tools).toEqual(
+        expect.arrayContaining([expect.objectContaining({ name: "probe" })]),
+      );
+
+      const initializeResponse = yield* httpClient.post("/mcp", {
+        headers: { accept: "application/json, text/event-stream" },
+        body: HttpBody.text(
+          `{"jsonrpc":"2.0","id":2,"method":"initialize","params":{"protocolVersion":"2099-01-01","capabilities":{},"clientInfo":{"name":"mcp-test","version":"1.0.0"}}}`,
+          "application/json",
+        ),
+      });
+      expect(initializeResponse.status).toBe(200);
+      const initialized = (yield* initializeResponse.json) as {
+        result: { protocolVersion: string };
+      };
+      expect(initialized.result.protocolVersion).toBe("2025-06-18");
+    }),
+  ).pipe(Effect.provide(NodeHttpServer.layerTest)),
+);
+
 it.effect("admits provider and OAuth client credentials and points only clients at OAuth", () =>
   Effect.scoped(
     Effect.gen(function* () {
@@ -1406,6 +1544,7 @@ it.effect("lists pull request watch tools only to threads that are not delegated
             McpToolAccessTestkit.liveThreadsLayer,
             Layer.mock(ProjectService.ProjectService)({}),
             Layer.mock(PullRequestReviewGuideService.PullRequestReviewGuideService)({}),
+            Layer.mock(PullRequestService.PullRequestService)({}),
             Layer.mock(Orchestrator.OrchestratorV2)({}),
             Layer.mock(ProjectionStore.ProjectionStoreV2)({}),
             NodeServices.layer,
diff --git a/apps/server/src/mcp/McpHttpServer.ts b/apps/server/src/mcp/McpHttpServer.ts
index a9f21d8eef29..eaf54214ba07 100644
--- a/apps/server/src/mcp/McpHttpServer.ts
+++ b/apps/server/src/mcp/McpHttpServer.ts
@@ -33,6 +33,7 @@ import * as DeviceService from "../device/DeviceService.ts";
 import * as HtmlRender from "../htmlRender/HtmlRender.ts";
 import * as ThreadCommandExecutor from "../orchestration-v2/ThreadCommandExecutor.ts";
 import * as ThreadManagementService from "../orchestration-v2/ThreadManagementService.ts";
+import * as PullRequestWatchService from "../pullRequest/PullRequestWatchService.ts";
 import * as ProviderRegistry from "../provider/ProviderRegistry.ts";
 import * as AnalyticsService from "../telemetry/AnalyticsService.ts";
 import {
@@ -549,6 +550,7 @@ const parameterValidationMessage = (error: unknown) =>
     : undefined;
 
 const isPreviewAutomationError = Schema.is(PreviewAutomationError);
+const isPreviewScreenshotSaveError = Schema.is(PreviewScreenshotSaveError);
 
 const previewSnapshotFailure = Effect.fn("previewSnapshotFailure")(function <E>(
   cause: Cause.Cause<E>,
@@ -566,9 +568,10 @@ const previewSnapshotFailure = Effect.fn("previewSnapshotFailure")(function <E>(
       ? firstFailure._tag
       : "PreviewSnapshotError";
   // Preview errors contain server-authored recovery guidance, never page output.
-  const message = isPreviewAutomationError(firstFailure)
-    ? firstFailure.message
-    : parameterValidationMessage(firstFailure);
+  const message =
+    isPreviewAutomationError(firstFailure) || isPreviewScreenshotSaveError(firstFailure)
+      ? firstFailure.message
+      : parameterValidationMessage(firstFailure);
   const result = new McpSchema.CallToolResult({
     isError: true,
     structuredContent: {
@@ -778,7 +781,7 @@ const registerImageTool = Effect.fn("McpHttpServer.registerImageTool")(function*
   R,
 >(
   tool: T,
-  handle: (payload: Tool.Parameters<T>) => Effect.Effect<{ readonly encodedResult: unknown }, E, R>,
+  handle: (payload: Schema.Json) => Effect.Effect<{ readonly encodedResult: unknown }, E, R>,
   provide: (
     effect: Effect.Effect<{ readonly encodedResult: unknown }, E, R>,
   ) => Effect.Effect<
@@ -813,7 +816,7 @@ const registerImageTool = Effect.fn("McpHttpServer.registerImageTool")(function*
           fiber.context,
           McpInvocationContext.McpInvocationContext,
         );
-        return provide(handle(payload as Tool.Parameters<T>)).pipe(
+        return provide(handle(payload)).pipe(
           Effect.provideService(McpInvocationContext.McpInvocationContext, invocation),
           Effect.matchCauseEffect({
             onFailure: imageToolFailure(tool.name, operation, failureText),
@@ -1002,21 +1005,16 @@ const withToolAnalytics =
     const scheduledRunOf = (threadId: string, runId: RunId | null) =>
       Option.isNone(threads) || runId === null
         ? Effect.succeed(false)
-        : threads.value
-            .getThreadRecords(ThreadId.make(threadId), ["runs", "messages"], {
+        : Effect.gen(function* () {
+            const id = ThreadId.make(threadId);
+            const { runs } = yield* threads.value.getThreadRecords(id, ["runs"], {
               runIds: [runId],
-              messageRoles: ["user"],
-            })
-            .pipe(
-              Effect.map((records) => {
-                const run = records.runs.find((candidate) => candidate.id === runId);
-                return records.messages.some(
-                  (message) =>
-                    message.id === run?.userMessageId && message.scheduledTaskId !== undefined,
-                );
-              }),
-              Effect.orElseSucceed(() => false),
-            );
+            });
+            const run = runs.find((candidate) => candidate.id === runId);
+            if (run === undefined) return false;
+            const messages = yield* threads.value.getMessagesById(id, [run.userMessageId]);
+            return messages.get(run.userMessageId)?.scheduledTaskId !== undefined;
+          }).pipe(Effect.orElseSucceed(() => false));
     const record =
       /* Request instrumentation already owns the span; keep this helper in that context. */
       Effect.fnUntraced(
@@ -1266,7 +1264,7 @@ export const layerAttachmentToolkit = toolkitRegistration(
 export const layerPullRequestsToolkit = toolkitRegistration(
   PullRequestsToolkit,
   PullRequestsHandlers.layer,
-);
+).pipe(Layer.provide(PullRequestWatchService.layer));
 
 const layerDeviceStandardToolkitRegistration = toolkitRegistration(
   DeviceStandardToolkit,
@@ -1307,7 +1305,8 @@ export const layerMcpTransport = <RA, RE, RR>(registrations: Layer.Layer<RA, RE,
     name: "T3 Code",
     version: packageJson.version,
     path: "/mcp",
-    protocols: [McpProtocol.v2025_06_18],
+    // The first protocol is the fallback for clients that offer an unknown version.
+    protocols: [McpProtocol.v2025_06_18, McpProtocol.v2026_07_28],
     allowSessionTermination: true,
     registrations,
   }).pipe(Layer.provide(layerMcpAuthMiddleware));
diff --git a/apps/server/src/mcp/OrchestratorMcpService.activity.test.ts b/apps/server/src/mcp/OrchestratorMcpService.activity.test.ts
index 123b5e6fcb8d..2ff2125a5180 100644
--- a/apps/server/src/mcp/OrchestratorMcpService.activity.test.ts
+++ b/apps/server/src/mcp/OrchestratorMcpService.activity.test.ts
@@ -1,6 +1,7 @@
 import {
   EnvironmentId,
   NodeId,
+  type OrchestratorMcpThreadReadResult,
   type OrchestrationV2ThreadProjection,
   type OrchestrationV2ThreadShell,
   ProjectId,
@@ -130,7 +131,7 @@ it("readThread preserves caller access errors and prefers activity-run status ov
     number,
     url: `https://github.com/acme/web/pull/${number}`,
     source: "agent",
-    linkedAt: "2026-08-04T11:00:00.000Z",
+    linkedAt: `2026-08-04T11:0${number}:00.000Z`,
     snapshot: { state },
     stack: null,
     ...(watched
@@ -157,7 +158,11 @@ it("readThread preserves caller access errors and prefers activity-run status ov
         instanceId: parentInstanceId,
         model: "gpt-5.4",
       }),
-      pullRequests: [pullRequestLink(1, "merged", false), pullRequestLink(2, "open", true)],
+      pullRequests: [
+        pullRequestLink(1, "merged", false),
+        pullRequestLink(2, "open", true),
+        ...[3, 4, 5, 6, 7, 8].map((number) => pullRequestLink(number, "open", false)),
+      ],
     },
     runs: [
       makeRun({ id: activeRunId, ordinal: 1, status: "running" }),
@@ -176,7 +181,8 @@ it("readThread preserves caller access errors and prefers activity-run status ov
     Layer.provide(
       Layer.mergeAll(
         Layer.mock(ThreadManagementService.ThreadManagementService)({
-          getTimelinePage: () => Effect.succeed({ items: [], totalItems: 0, hasMore: false }),
+          getTimelinePage: () =>
+            Effect.succeed({ items: [], totalItems: 0, hasMore: false, hasEarlier: false }),
           getThreadRecords: (threadId) =>
             callerUnavailable
               ? Effect.fail(
@@ -193,7 +199,19 @@ it("readThread preserves caller access errors and prefers activity-run status ov
               ? Effect.die("A failed caller read must not reach the target")
               : Effect.succeed(
                   threadId === parentThreadId
-                    ? (projection.thread as unknown as OrchestrationV2ThreadShell)
+                    ? ({
+                        ...projection.thread,
+                        blockedOnThreadWait: true,
+                        pendingBackgroundTasks: [
+                          {
+                            taskId: "task-subagent",
+                            kind: "subagent",
+                            parentTaskId: "task-parent",
+                            providerInstanceId: parentInstanceId,
+                            childThreadId,
+                          },
+                        ],
+                      } as unknown as OrchestrationV2ThreadShell)
                     : null,
                 ),
           getProjectThreadRecords: (input) =>
@@ -225,9 +243,15 @@ it("readThread preserves caller access errors and prefers activity-run status ov
     expect(result.thread.status).toBe("running");
     expect(result.thread.latestRunId).toBe(cancelledRunId);
     expect(result.thread.activeRunId).toBe(activeRunId);
+    expect(result.thread.blockedOnThreadWait).toBe(true);
+    expect(result.thread.pendingBackgroundTasks).toEqual([
+      { taskId: "task-subagent", kind: "subagent", childThreadId },
+    ]);
     // Every page read must not repeat each linked PR, and an open PR shows whether it is watched.
+    // A thread with many open PRs previews a few, watched first, then newest.
     const listed = result.thread.pullRequests ?? [];
-    expect(listed.map((link) => link.number)).not.toContain(1);
+    expect(listed.map((link) => link.number)).toEqual([2, 8, 7, 6, 5]);
+    expect(result.thread.openPullRequestCount).toBe(7);
     expect(listed.find((link) => link.number === 2)).toMatchObject({
       watching: true,
       watchStartedAt: "2026-08-04T11:30:00.000Z",
@@ -237,7 +261,7 @@ it("readThread preserves caller access errors and prefers activity-run status ov
       afterPosition: 0,
     });
     expect(laterPage.thread.pullRequests).toBeUndefined();
-    expect(laterPage.thread.pullRequestCount).toBe(2);
+    expect(laterPage.thread.pullRequestCount).toBe(8);
 
     callerUnavailable = true;
     const denied = yield* service
@@ -285,17 +309,36 @@ it("readThread pages cut-off text without splitting an emoji across pages", asyn
       updatedAt: now,
     },
   };
+  const rows = [
+    row,
+    ...Array.from({ length: 11 }, (_, index) => ({
+      ...row,
+      position: index + 1,
+      sourceItemId: TurnItemId.make(`turn-item-mcp-${index}`),
+      item: { ...row.item, text: "x".repeat(600) },
+    })),
+  ];
 
   const layer = layerOrchestratorService.pipe(
     Layer.provide(
       Layer.mergeAll(
         Layer.mock(ThreadManagementService.ThreadManagementService)({
-          getTimelinePage: () =>
-            Effect.succeed({
-              items: [row] as unknown as OrchestrationV2ThreadProjection["visibleTurnItems"],
-              totalItems: 1,
-              hasMore: false,
-            }),
+          getTimelinePage: (_threadId, options) => {
+            const remaining = rows.filter(
+              (candidate) =>
+                candidate.position > (options.afterPosition ?? -1) &&
+                (options.itemId === undefined || candidate.sourceItemId === options.itemId),
+            );
+            return Effect.succeed({
+              items: remaining.slice(
+                0,
+                options.limit,
+              ) as unknown as OrchestrationV2ThreadProjection["visibleTurnItems"],
+              totalItems: rows.length,
+              hasMore: remaining.length > options.limit,
+              hasEarlier: false,
+            });
+          },
           getThreadRecords: () => Effect.succeed(projection),
           getProjectThreadRecords: () => Effect.succeed(projection),
           getThreadShell: () =>
@@ -342,6 +385,245 @@ it("readThread pages cut-off text without splitting an emoji across pages", asyn
         });
       }
     }
+    const first = yield* service.readThread(makeScope(), {
+      threadId: parentThreadId,
+      view: "activity",
+    });
+    expect(first.items[1]).toMatchObject({
+      text: "x".repeat(500),
+      textTruncated: true,
+      nextTextOffset: 500,
+    });
+    expect(first.items).toHaveLength(10);
+    expect(first).toMatchObject({ nextPosition: 9, hasMore: true });
+  }).pipe(Effect.provide(layer), Effect.runPromise);
+});
+
+it("readThread returns the newest items that fit the response budget", async () => {
+  const projection = {
+    thread: baseThread({
+      threadId: parentThreadId,
+      title: "Parent",
+      instanceId: parentInstanceId,
+      model: "gpt-5.4",
+    }),
+    runs: [makeRun({ id: activeRunId, ordinal: 1, status: "running" })],
+    visibleTurnItems: [],
+    providerTurns: [],
+    runtimeRequests: [],
+    messages: [],
+    contextTransfers: [],
+    subagents: [],
+    updatedAt: now,
+  } as unknown as OrchestrationV2ThreadProjection;
+  // A long thread's newest 100 activity items, the read agents make most.
+  const rows = Array.from({ length: 100 }, (_, position) => ({
+    position,
+    visibility: "local",
+    sourceThreadId: parentThreadId,
+    sourceItemId: TurnItemId.make(`turn-item-mcp-long-${position}`),
+    item: {
+      type: "reasoning",
+      runId: activeRunId,
+      status: "completed",
+      title: null,
+      text: "x".repeat(1_500),
+      updatedAt: now,
+    },
+  }));
+  const pageOptions: Array<unknown> = [];
+
+  const layer = layerOrchestratorService.pipe(
+    Layer.provide(
+      Layer.mergeAll(
+        Layer.mock(ThreadManagementService.ThreadManagementService)({
+          getTimelinePage: (_threadId, options) => {
+            pageOptions.push(options);
+            return Effect.succeed({
+              items: rows as unknown as OrchestrationV2ThreadProjection["visibleTurnItems"],
+              totalItems: 3_000,
+              hasMore: false,
+              hasEarlier: true,
+            });
+          },
+          getThreadRecords: () => Effect.succeed(projection),
+          getProjectThreadRecords: () => Effect.succeed(projection),
+          getThreadShell: () =>
+            Effect.succeed(projection.thread as unknown as OrchestrationV2ThreadShell),
+        } satisfies Partial<ThreadManagementService.ThreadManagementService["Service"]>),
+        ServerSettings.layerTest(),
+        Layer.mock(ProviderRegistry.ProviderRegistry)({
+          getProviders: Effect.succeed([]),
+        } satisfies Partial<ProviderRegistry.ProviderRegistry["Service"]>),
+        Layer.mock(ProjectService.ProjectService)({}),
+        Layer.mock(SecretRequests.SecretRequests)({}),
+        Layer.mock(RemoteDelegation.RemoteDelegation)({}),
+        Layer.mock(ScheduledTaskService.ScheduledTaskService)({
+          list: () => Effect.succeed({ tasks: [] }),
+        } satisfies Partial<ScheduledTaskService.ScheduledTaskService["Service"]>),
+        Layer.mock(ProviderAdapterRegistry.ProviderAdapterRegistryV2)({
+          list: () => Effect.succeed([]),
+        } satisfies Partial<ProviderAdapterRegistry.ProviderAdapterRegistryV2["Service"]>),
+        NodeCrypto.layer,
+      ),
+    ),
+  );
+
+  await Effect.gen(function* () {
+    const service = yield* OrchestratorMcpService.OrchestratorMcpService;
+    const read = {
+      threadId: parentThreadId,
+      view: "activity" as const,
+      limit: 100,
+      maxCharsPerItem: 1_500,
+    };
+    const result = yield* service.readThread(makeScope(), read);
+    // Linked environments and the CLI read as clients without a cursor and follow only hasMore.
+    const first = yield* service.readThread({ ...makeScope(), thread: undefined }, read);
+    const fromStart = yield* service.readThread(makeScope(), { ...read, afterPosition: -1 });
+
+    expect(pageOptions).toEqual([
+      { beforePosition: Number.POSITIVE_INFINITY, limit: 100, view: "activity" },
+      { limit: 100, view: "activity" },
+      { afterPosition: -1, limit: 100, view: "activity" },
+    ]);
+    // Claude Code saves results over ~50k chars of this JSON to a file instead of showing them.
+    expect(JSON.stringify(result).length).toBeLessThan(31_000);
+    expect(result.items.length).toBeLessThan(100);
+    expect(result.items.at(-1)?.position).toBe(99);
+    expect(result.earlierPosition).toBe(result.items[0]?.position);
+    expect(result.hasMore).toBe(false);
+    expect(first.items[0]?.position).toBe(0);
+    expect(first.hasMore).toBe(true);
+    expect(first.nextPosition).toBe(first.items.at(-1)?.position);
+    expect(fromStart.items[0]?.position).toBe(0);
+  }).pipe(Effect.provide(layer), Effect.runPromise);
+});
+
+it("readThread keeps an activity page within an MCP client's output limit and pages the rest", async () => {
+  const projection = {
+    thread: baseThread({
+      threadId: parentThreadId,
+      title: "Parent",
+      instanceId: parentInstanceId,
+      model: "gpt-5.4",
+    }),
+    runs: [makeRun({ id: activeRunId, ordinal: 1, status: "running" })],
+    visibleTurnItems: [],
+    providerTurns: [],
+    runtimeRequests: [],
+    messages: [],
+    contextTransfers: [],
+    subagents: [],
+    updatedAt: now,
+  } as unknown as OrchestrationV2ThreadProjection;
+  const rows = Array.from({ length: 60 }, (_, position) => ({
+    position,
+    visibility: "visible",
+    sourceThreadId: parentThreadId,
+    sourceItemId: TurnItemId.make(`turn-item-mcp-reasoning-${position}`),
+    item: {
+      type: "reasoning",
+      runId: activeRunId,
+      status: "completed",
+      // Command titles can carry a whole command.
+      title: position === 1 ? "標".repeat(60_000) : null,
+      text: position === 0 ? "😀a".repeat(30_000) : `${position} `.padEnd(3_000, "x"),
+      updatedAt: now,
+    },
+  }));
+
+  const layer = layerOrchestratorService.pipe(
+    Layer.provide(
+      Layer.mergeAll(
+        Layer.mock(ThreadManagementService.ThreadManagementService)({
+          getTimelinePage: (_threadId, options) => {
+            const after =
+              options.itemId === undefined
+                ? rows.filter((row) => row.position > (options.afterPosition ?? -1))
+                : rows.filter((row) => row.sourceItemId === options.itemId);
+            return Effect.succeed({
+              items: after.slice(
+                0,
+                options.limit,
+              ) as unknown as OrchestrationV2ThreadProjection["visibleTurnItems"],
+              totalItems: rows.length,
+              hasMore: after.length > options.limit,
+              hasEarlier: false,
+            });
+          },
+          getThreadRecords: () => Effect.succeed(projection),
+          getProjectThreadRecords: () => Effect.succeed(projection),
+          getThreadShell: () =>
+            Effect.succeed(projection.thread as unknown as OrchestrationV2ThreadShell),
+        } satisfies Partial<ThreadManagementService.ThreadManagementService["Service"]>),
+        ServerSettings.layerTest(),
+        Layer.mock(ProviderRegistry.ProviderRegistry)({
+          getProviders: Effect.succeed([]),
+        } satisfies Partial<ProviderRegistry.ProviderRegistry["Service"]>),
+        Layer.mock(ProjectService.ProjectService)({}),
+        Layer.mock(SecretRequests.SecretRequests)({}),
+        Layer.mock(RemoteDelegation.RemoteDelegation)({}),
+        Layer.mock(ScheduledTaskService.ScheduledTaskService)({
+          list: () => Effect.succeed({ tasks: [] }),
+        } satisfies Partial<ScheduledTaskService.ScheduledTaskService["Service"]>),
+        Layer.mock(ProviderAdapterRegistry.ProviderAdapterRegistryV2)({
+          list: () => Effect.succeed([]),
+        } satisfies Partial<ProviderAdapterRegistry.ProviderAdapterRegistryV2["Service"]>),
+        NodeCrypto.layer,
+      ),
+    ),
+  );
+
+  await Effect.gen(function* () {
+    const service = yield* OrchestratorMcpService.OrchestratorMcpService;
+    const positions: Array<number> = [];
+    let afterPosition: number | undefined;
+    for (let page = 0; page < rows.length; page++) {
+      const result = yield* service.readThread(makeScope(), {
+        threadId: parentThreadId,
+        view: "activity",
+        limit: 100,
+        maxCharsPerItem: 1_500,
+        afterPosition: afterPosition ?? -1,
+      });
+      // Claude Code rejects MCP results over 25k tokens; CJK text is about a token per char.
+      expect(Buffer.byteLength(JSON.stringify(result))).toBeLessThanOrEqual(50_000);
+      if (page === 0) expect(result.hasMore).toBe(true);
+      positions.push(...result.items.map((item) => item.position));
+      if (!result.hasMore) break;
+      afterPosition = result.nextPosition ?? undefined;
+    }
+    expect(positions).toEqual(rows.map((row) => row.position));
+
+    const longText = rows[0]!.item.text;
+    const pages: Array<string> = [];
+    let textOffset: number | null = 0;
+    while (textOffset !== null) {
+      const result: OrchestratorMcpThreadReadResult = yield* service.readThread(makeScope(), {
+        threadId: parentThreadId,
+        view: "activity",
+        itemId: rows[0]!.sourceItemId,
+        textOffset,
+        maxCharsPerItem: 50_000,
+      });
+      expect(Buffer.byteLength(JSON.stringify(result))).toBeLessThanOrEqual(50_000);
+      const [item] = result.items;
+      expect(item?.text?.isWellFormed()).toBe(true);
+      pages.push(item!.text!);
+      textOffset = item!.nextTextOffset ?? null;
+    }
+    expect(pages.length).toBeGreaterThan(1);
+    expect(pages.join("")).toBe(longText);
+
+    (projection.thread as { title: string }).title = "標".repeat(30_000);
+    const underHugeTitle = yield* service.readThread(makeScope(), {
+      threadId: parentThreadId,
+      view: "activity",
+      itemId: rows[0]!.sourceItemId,
+      maxCharsPerItem: 50_000,
+    });
+    expect(underHugeTitle.items[0]?.text?.length).toBeGreaterThan(1_000);
   }).pipe(Effect.provide(layer), Effect.runPromise);
 });
 
@@ -429,7 +711,8 @@ it("taskStatus returns task.providerInstanceId rather than the driver kind", asy
     Layer.provide(
       Layer.mergeAll(
         Layer.mock(ThreadManagementService.ThreadManagementService)({
-          getTimelinePage: () => Effect.succeed({ items: [], totalItems: 0, hasMore: false }),
+          getTimelinePage: () =>
+            Effect.succeed({ items: [], totalItems: 0, hasMore: false, hasEarlier: false }),
           getThreadRecords: (threadId) => {
             if (threadId === parentThreadId) return Effect.succeed(parentProjection);
             if (threadId === childThreadId) return Effect.succeed(childProjection);
@@ -550,6 +833,7 @@ it("readThread and sendToThread reach threads in other projects", async () => {
               items: foreignProjection(threadId).visibleTurnItems,
               totalItems: 1,
               hasMore: false,
+              hasEarlier: false,
             }),
           getProjectThreadRecords: (input) =>
             input.threadId === foreignThreadId && input.projectId === foreignProjectId
diff --git a/apps/server/src/mcp/OrchestratorMcpService.test.ts b/apps/server/src/mcp/OrchestratorMcpService.test.ts
index 7bf7d2efe2c8..03810fbefe59 100644
--- a/apps/server/src/mcp/OrchestratorMcpService.test.ts
+++ b/apps/server/src/mcp/OrchestratorMcpService.test.ts
@@ -2202,176 +2202,171 @@ describe("OrchestratorMcpService provider resolution", () => {
       }),
   );
 
-  it.live.each([
+  it.effect.each([
     { name: "parent instance", parentEnabled: true, model: "gpt-5.4" },
     { name: "alternate instance", parentEnabled: false, model: "gpt-5.5" },
   ])(
     "replays accepted creation on the $name without authorizing new disabled work",
     ({ parentEnabled, model }) =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const altInstanceId = ProviderInstanceId.make("codex-alt");
-          const driver = ProviderDriverKind.make("codex");
-          const cwd = yield* checkpointWorkspace("mcp-create-retry");
-          const layerRegistry = ProviderAdapterRegistry.layerFromAdapters(
-            [codexInstanceId, altInstanceId].map((instanceId) => ({
-              instanceId,
-              driver,
-              getCapabilities: () => Effect.succeed(CodexProviderCapabilitiesV2),
-              planSelectionTransition: () =>
-                Effect.succeed({ type: "apply_on_next_turn" as const }),
-              openSession: () =>
-                Effect.die("These tests exercise committed commands before provider execution."),
-            })),
-          );
-          const layerDatabase = SqlitePersistence.layerMemory;
-          const layerOrchestrator = ProviderReplayHarness.layerWithRegistry(
-            { name: "mcp-create-retry", runtimePolicyOverride: { cwd } },
-            layerRegistry,
-            { databaseLayer: layerDatabase, runEffectWorker: false },
-          );
-          const layerSettings = ServerSettings.layerTest({
-            providerInstances: {
-              [codexInstanceId]: { driver: "codex", enabled: true },
-              [altInstanceId]: { driver: "codex", enabled: true },
-            },
-            projectSettingsOverrides: {
-              [projectId]: { providerInstances: { [codexInstanceId]: { enabled: parentEnabled } } },
-            },
-          });
-          const layerThreads = ThreadManagementService.layer.pipe(
-            Layer.provideMerge(layerOrchestrator),
-            Layer.provide(
-              LegacyV1ThreadImporter.layer.pipe(
-                Layer.provide(layerOrchestrator),
-                Layer.provide(layerDatabase),
-              ),
+      Effect.gen(function* () {
+        const altInstanceId = ProviderInstanceId.make("codex-alt");
+        const driver = ProviderDriverKind.make("codex");
+        const cwd = yield* checkpointWorkspace("mcp-create-retry");
+        const layerRegistry = ProviderAdapterRegistry.layerFromAdapters(
+          [codexInstanceId, altInstanceId].map((instanceId) => ({
+            instanceId,
+            driver,
+            getCapabilities: () => Effect.succeed(CodexProviderCapabilitiesV2),
+            planSelectionTransition: () => Effect.succeed({ type: "apply_on_next_turn" as const }),
+            openSession: () =>
+              Effect.die("These tests exercise committed commands before provider execution."),
+          })),
+        );
+        const layerDatabase = SqlitePersistence.layerMemory;
+        const layerOrchestrator = ProviderReplayHarness.layerWithRegistry(
+          { name: "mcp-create-retry", runtimePolicyOverride: { cwd } },
+          layerRegistry,
+          { databaseLayer: layerDatabase, runEffectWorker: false },
+        );
+        const layerSettings = ServerSettings.layerTest({
+          providerInstances: {
+            [codexInstanceId]: { driver: "codex", enabled: true },
+            [altInstanceId]: { driver: "codex", enabled: true },
+          },
+          projectSettingsOverrides: {
+            [projectId]: { providerInstances: { [codexInstanceId]: { enabled: parentEnabled } } },
+          },
+        });
+        const layerThreads = ThreadManagementService.layer.pipe(
+          Layer.provideMerge(layerOrchestrator),
+          Layer.provide(
+            LegacyV1ThreadImporter.layer.pipe(
+              Layer.provide(layerOrchestrator),
+              Layer.provide(layerDatabase),
             ),
-            Layer.provide(CommandReceiptStore.layer.pipe(Layer.provide(layerDatabase))),
-            Layer.provideMerge(layerSettings),
-          );
-          const layerTest = layerOrchestratorService.pipe(
-            Layer.provideMerge(layerThreads),
-            Layer.provide(
-              Layer.mergeAll(
-                NodeServices.layer,
-                NodeCrypto.layer,
-                layerRegistry,
-                layerSettings,
-                providerRegistryLayer([
-                  providerSnapshot({ instanceId: codexInstanceId, driver, model: "gpt-5.4" }),
-                  providerSnapshot({ instanceId: altInstanceId, driver, model: "gpt-5.5" }),
-                ]),
-                Layer.mock(ProjectService.ProjectService)({}),
-                Layer.mock(SecretRequests.SecretRequests)({}),
-                Layer.mock(RemoteDelegation.RemoteDelegation)({}),
-                Layer.mock(ScheduledTaskService.ScheduledTaskService)({}),
-              ),
+          ),
+          Layer.provide(CommandReceiptStore.layer.pipe(Layer.provide(layerDatabase))),
+          Layer.provideMerge(layerSettings),
+        );
+        const layerTest = layerOrchestratorService.pipe(
+          Layer.provideMerge(layerThreads),
+          Layer.provide(
+            Layer.mergeAll(
+              NodeServices.layer,
+              NodeCrypto.layer,
+              layerRegistry,
+              layerSettings,
+              providerRegistryLayer([
+                providerSnapshot({ instanceId: codexInstanceId, driver, model: "gpt-5.4" }),
+                providerSnapshot({ instanceId: altInstanceId, driver, model: "gpt-5.5" }),
+              ]),
+              Layer.mock(ProjectService.ProjectService)({}),
+              Layer.mock(SecretRequests.SecretRequests)({}),
+              Layer.mock(RemoteDelegation.RemoteDelegation)({}),
+              Layer.mock(ScheduledTaskService.ScheduledTaskService)({}),
             ),
-          );
-          yield* Effect.gen(function* () {
-            const orchestrator = yield* Orchestrator.OrchestratorV2;
-            const service = yield* OrchestratorMcpService.OrchestratorMcpService;
-            const settings = yield* ServerSettings.ServerSettingsService;
-            yield* orchestrator.dispatch({
-              type: "thread.create",
-              createdBy: "user",
-              creationSource: "web",
-              commandId: CommandId.make("parent:create"),
-              threadId: parentThreadId,
-              projectId,
-              title: "MCP parent",
-              modelSelection: { instanceId: codexInstanceId, model: "gpt-5.4" },
-              runtimeMode: "full-access",
-              interactionMode: "default",
-              branch: null,
-              worktreePath: cwd,
-            });
-            yield* orchestrator.dispatch({
-              type: "message.dispatch",
-              createdBy: "user",
-              creationSource: "web",
-              commandId: CommandId.make("parent:start"),
-              threadId: parentThreadId,
-              messageId: MessageId.make("parent:message"),
-              text: "Create a thread.",
-              attachments: [],
-              dispatchMode: { type: "start_immediately" },
-            });
-            const request = {
-              threads: [{ target: { driverKind: driver, model } }],
-              clientRequestId: "create-retry",
-            };
-            const first = yield* service.createThreads(scope, request);
-            const child = first.threads[0]!;
-            const selection = parentEnabled
-              ? { instanceId: codexInstanceId, model: "gpt-5.4" }
-              : { instanceId: altInstanceId, model: "gpt-5.5" };
-            assert.equal(first.threads.length, 1);
-            assert.equal(child.providerInstanceId, selection.instanceId);
-            assert.equal(child.model, selection.model);
-            assert.deepEqual(yield* service.createThreads(scope, request), first);
+          ),
+        );
+        yield* Effect.gen(function* () {
+          const orchestrator = yield* Orchestrator.OrchestratorV2;
+          const service = yield* OrchestratorMcpService.OrchestratorMcpService;
+          const settings = yield* ServerSettings.ServerSettingsService;
+          yield* orchestrator.dispatch({
+            type: "thread.create",
+            createdBy: "user",
+            creationSource: "web",
+            commandId: CommandId.make("parent:create"),
+            threadId: parentThreadId,
+            projectId,
+            title: "MCP parent",
+            modelSelection: { instanceId: codexInstanceId, model: "gpt-5.4" },
+            runtimeMode: "full-access",
+            interactionMode: "default",
+            branch: null,
+            worktreePath: cwd,
+          });
+          yield* orchestrator.dispatch({
+            type: "message.dispatch",
+            createdBy: "user",
+            creationSource: "web",
+            commandId: CommandId.make("parent:start"),
+            threadId: parentThreadId,
+            messageId: MessageId.make("parent:message"),
+            text: "Create a thread.",
+            attachments: [],
+            dispatchMode: { type: "start_immediately" },
+          });
+          const request = {
+            threads: [{ target: { driverKind: driver, model } }],
+            clientRequestId: "create-retry",
+          };
+          const first = yield* service.createThreads(scope, request);
+          const child = first.threads[0]!;
+          const selection = parentEnabled
+            ? { instanceId: codexInstanceId, model: "gpt-5.4" }
+            : { instanceId: altInstanceId, model: "gpt-5.5" };
+          assert.equal(first.threads.length, 1);
+          assert.equal(child.providerInstanceId, selection.instanceId);
+          assert.equal(child.model, selection.model);
+          assert.deepEqual(yield* service.createThreads(scope, request), first);
 
-            // The creation receipt exists, but this prompt has not been accepted yet.
-            const withPrompt = {
-              ...request,
-              threads: [{ ...request.threads[0]!, prompt: "Start work." }],
-            };
-            const started = yield* service.createThreads(scope, withPrompt);
-            assert.equal(started.threads[0]?.threadId, child.threadId);
-            const before = yield* orchestrator.getThreadProjection(child.threadId);
-            assert.deepEqual(before.runs[0]?.modelSelection, selection);
-            assert.equal(before.messages.length, 1);
-            const empty = yield* service.createThreads(scope, {
-              ...request,
-              clientRequestId: "empty",
-            });
-            const emojiAtLimit = yield* service.createThreads(scope, {
-              threads: [{ ...request.threads[0]!, prompt: `${"a".repeat(76)}😀 and more work.` }],
-              clientRequestId: "emoji-title",
-            });
-            const titled = yield* orchestrator.getThreadProjection(
-              emojiAtLimit.threads[0]!.threadId,
-            );
-            assert.equal(titled.thread.title, `${"a".repeat(76)}...`);
+          // The creation receipt exists, but this prompt has not been accepted yet.
+          const withPrompt = {
+            ...request,
+            threads: [{ ...request.threads[0]!, prompt: "Start work." }],
+          };
+          const started = yield* service.createThreads(scope, withPrompt);
+          assert.equal(started.threads[0]?.threadId, child.threadId);
+          const before = yield* orchestrator.getThreadProjection(child.threadId);
+          assert.deepEqual(before.runs[0]?.modelSelection, selection);
+          assert.equal(before.messages.length, 1);
+          const empty = yield* service.createThreads(scope, {
+            ...request,
+            clientRequestId: "empty",
+          });
+          const emojiAtLimit = yield* service.createThreads(scope, {
+            threads: [{ ...request.threads[0]!, prompt: `${"a".repeat(76)}😀 and more work.` }],
+            clientRequestId: "emoji-title",
+          });
+          const titled = yield* orchestrator.getThreadProjection(emojiAtLimit.threads[0]!.threadId);
+          assert.equal(titled.thread.title, `${"a".repeat(76)}...`);
 
-            yield* settings.updateSettings({
-              projectSettingsOverrides: {
-                [projectId]: {
-                  providerInstances: {
-                    [codexInstanceId]: { enabled: false },
-                    [altInstanceId]: { enabled: false },
-                  },
+          yield* settings.updateSettings({
+            projectSettingsOverrides: {
+              [projectId]: {
+                providerInstances: {
+                  [codexInstanceId]: { enabled: false },
+                  [altInstanceId]: { enabled: false },
                 },
               },
-            });
-            assert.deepEqual(yield* service.createThreads(scope, withPrompt), started);
-            const after = yield* orchestrator.getThreadProjection(child.threadId);
-            assert.deepEqual(after.thread.modelSelection, selection);
-            assert.deepEqual(after.runs, before.runs);
-            assert.deepEqual(after.messages, before.messages);
+            },
+          });
+          assert.deepEqual(yield* service.createThreads(scope, withPrompt), started);
+          const after = yield* orchestrator.getThreadProjection(child.threadId);
+          assert.deepEqual(after.thread.modelSelection, selection);
+          assert.deepEqual(after.runs, before.runs);
+          assert.deepEqual(after.messages, before.messages);
 
-            const freshError = yield* service
-              .createThreads(scope, {
-                ...request,
-                clientRequestId: "fresh",
-              })
-              .pipe(Effect.flip);
-            assert.equal(freshError.code, "provider_unavailable");
-            const promptError = yield* service
-              .createThreads(scope, {
-                ...withPrompt,
-                clientRequestId: "empty",
-              })
-              .pipe(Effect.flip);
-            assert.equal(promptError.code, "invalid_request");
-            assert.include(promptError.message, "disabled");
-            const untouched = yield* orchestrator.getThreadProjection(empty.threads[0]!.threadId);
-            assert.equal(untouched.messages.length, 0);
-            assert.equal(untouched.runs.length, 0);
-          }).pipe(Effect.provide(layerTest));
-        }).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
-      ),
+          const freshError = yield* service
+            .createThreads(scope, {
+              ...request,
+              clientRequestId: "fresh",
+            })
+            .pipe(Effect.flip);
+          assert.equal(freshError.code, "provider_unavailable");
+          const promptError = yield* service
+            .createThreads(scope, {
+              ...withPrompt,
+              clientRequestId: "empty",
+            })
+            .pipe(Effect.flip);
+          assert.equal(promptError.code, "invalid_request");
+          assert.include(promptError.message, "disabled");
+          const untouched = yield* orchestrator.getThreadProjection(empty.threads[0]!.threadId);
+          assert.equal(untouched.messages.length, 0);
+          assert.equal(untouched.runs.length, 0);
+        }).pipe(Effect.provide(layerTest));
+      }).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
   );
 
   it.effect.each(["local", "remote"] as const)(
@@ -3948,16 +3943,30 @@ describe("OrchestratorMcpService thread list", () => {
     capabilities: new Set(["orchestration"]),
     issuedAt: 1,
   };
-  const shell = (id: string, projectId: string, snoozed: boolean) => ({
+  const shell = (id: string, projectId: string, snoozed: boolean, waiting = false) => ({
     ...liveThreadShell(ThreadId.make(id)),
     projectId: ProjectId.make(projectId),
     status: "completed" as const,
     snoozedUntil: snoozed ? DateTime.makeUnsafe("2099-01-01T00:00:00Z") : null,
+    blockedOnThreadWait: waiting,
+    pendingBackgroundTasks: waiting
+      ? [
+          {
+            taskId: "task-subagent",
+            kind: "subagent" as const,
+            description: "Review the diff",
+            parentTaskId: "task-parent",
+            providerInstanceId: ProviderInstanceId.make("codex"),
+            childThreadId: ThreadId.make("thread:b-child"),
+          },
+          { taskId: "task-tests", kind: "command" as const, awaited: true as const },
+        ]
+      : [],
   });
   const shells = [
     shell("thread:a-snoozed", "project:a", true),
     shell("thread:a-awake", "project:a", false),
-    shell("thread:b-snoozed", "project:b", true),
+    shell("thread:b-snoozed", "project:b", true, true),
     {
       ...shell("thread:a-awaiting-command", "project:a", false),
       activityRunStatus: null,
@@ -4022,6 +4031,24 @@ describe("OrchestratorMcpService thread list", () => {
           ["thread:b-snoozed", "project:b"],
         ],
       );
+      assert.deepStrictEqual(
+        listed.threads.map((thread) => [thread.blockedOnThreadWait, thread.pendingBackgroundTasks]),
+        [
+          [false, []],
+          [
+            true,
+            [
+              {
+                taskId: "task-subagent",
+                kind: "subagent",
+                description: "Review the diff",
+                childThreadId: ThreadId.make("thread:b-child"),
+              },
+              { taskId: "task-tests", kind: "command", awaited: true },
+            ],
+          ],
+        ],
+      );
     }).pipe(Effect.provide(service)),
   );
 
@@ -4161,140 +4188,137 @@ describe("OrchestratorMcpService thread stop", () => {
       stop: { reason: "Make room", message: "Stopped by an agent: Make room" },
     },
   ])("t3_thread_interrupt stop reports the run it interrupted on $name", ({ queued, stop }) =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const cwd = yield* checkpointWorkspace("mcp-thread-stop");
-        const layerAdapters = ProviderAdapterRegistry.layerSingle(liveAdapter(cwd));
-        const layerDatabase = SqlitePersistence.layerMemory;
-        const layerOrchestrator = ProviderReplayHarness.layerWithRegistry(
-          { name: "mcp-thread-stop" },
-          layerAdapters,
-          { databaseLayer: layerDatabase, runEffectWorker: false },
-        );
-        const layerThreads = ThreadManagementService.layer.pipe(
-          Layer.provideMerge(layerOrchestrator),
-          Layer.provide(ServerSettings.layerTest()),
-          Layer.provide(CommandReceiptStore.layer.pipe(Layer.provide(layerDatabase))),
-        );
-        const layerTest = layerOrchestratorService.pipe(
-          Layer.provideMerge(layerThreads),
-          Layer.provide(
-            Layer.mergeAll(
-              NodeServices.layer,
-              NodeCrypto.layer,
-              layerAdapters,
-              ServerSettings.layerTest(),
-              Layer.mock(ProviderRegistry.ProviderRegistry)({ getProviders: Effect.succeed([]) }),
-              Layer.mock(ProjectService.ProjectService)({}),
-              Layer.mock(SecretRequests.SecretRequests)({}),
-              Layer.mock(RemoteDelegation.RemoteDelegation)({}),
-              Layer.mock(ScheduledTaskService.ScheduledTaskService)({}),
-            ),
+    Effect.gen(function* () {
+      const cwd = yield* checkpointWorkspace("mcp-thread-stop");
+      const layerAdapters = ProviderAdapterRegistry.layerSingle(liveAdapter(cwd));
+      const layerDatabase = SqlitePersistence.layerMemory;
+      const layerOrchestrator = ProviderReplayHarness.layerWithRegistry(
+        { name: "mcp-thread-stop" },
+        layerAdapters,
+        { databaseLayer: layerDatabase, runEffectWorker: false },
+      );
+      const layerThreads = ThreadManagementService.layer.pipe(
+        Layer.provideMerge(layerOrchestrator),
+        Layer.provide(ServerSettings.layerTest()),
+        Layer.provide(CommandReceiptStore.layer.pipe(Layer.provide(layerDatabase))),
+      );
+      const layerTest = layerOrchestratorService.pipe(
+        Layer.provideMerge(layerThreads),
+        Layer.provide(
+          Layer.mergeAll(
+            NodeServices.layer,
+            NodeCrypto.layer,
+            layerAdapters,
+            ServerSettings.layerTest(),
+            Layer.mock(ProviderRegistry.ProviderRegistry)({ getProviders: Effect.succeed([]) }),
+            Layer.mock(ProjectService.ProjectService)({}),
+            Layer.mock(SecretRequests.SecretRequests)({}),
+            Layer.mock(RemoteDelegation.RemoteDelegation)({}),
+            Layer.mock(ScheduledTaskService.ScheduledTaskService)({}),
           ),
-        );
-        yield* Effect.gen(function* () {
-          const orchestrator = yield* Orchestrator.OrchestratorV2;
-          const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
-          const service = yield* OrchestratorMcpService.OrchestratorMcpService;
-          const send = (text: string, type: "start_immediately" | "queue_after_active") =>
-            orchestrator.dispatch({
-              type: "message.dispatch",
-              commandId: CommandId.make(`send:${text}`),
-              threadId,
-              messageId: MessageId.make(`message:${text}`),
-              text,
-              attachments: [],
-              dispatchMode: { type },
-              createdBy: "user",
-              creationSource: "web",
-            });
-          yield* orchestrator.dispatch({
-            type: "thread.create",
-            commandId: CommandId.make("create"),
+        ),
+      );
+      yield* Effect.gen(function* () {
+        const orchestrator = yield* Orchestrator.OrchestratorV2;
+        const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
+        const service = yield* OrchestratorMcpService.OrchestratorMcpService;
+        const send = (text: string, type: "start_immediately" | "queue_after_active") =>
+          orchestrator.dispatch({
+            type: "message.dispatch",
+            commandId: CommandId.make(`send:${text}`),
             threadId,
-            projectId: ProjectId.make("project:mcp-stop"),
-            title: "Stop",
-            modelSelection,
-            runtimeMode: "full-access",
-            interactionMode: "default",
-            branch: null,
-            worktreePath: cwd,
+            messageId: MessageId.make(`message:${text}`),
+            text,
+            attachments: [],
+            dispatchMode: { type },
             createdBy: "user",
             creationSource: "web",
           });
-          const running = yield* orchestrator.streamDomainEvents.pipe(
-            Stream.filter(
-              (event) =>
-                event.type === "provider-turn.updated" && event.payload.status === "running",
-            ),
-            Stream.take(1),
-            Stream.runDrain,
-            Effect.forkScoped,
-          );
-          yield* send("work", "start_immediately");
-          yield* worker.drain();
-          yield* Fiber.join(running);
-          if (queued) yield* send("later", "queue_after_active");
-          const before = yield* orchestrator.getThreadProjection(threadId);
-          const runningRun = before.runs.find((run) => run.status === "running")!;
-          assert.equal(before.runs.filter((run) => run.status === "queued").length, queued ? 1 : 0);
-          // A task the thread delegated, running when the thread is stopped.
-          const childRunning = yield* orchestrator.streamDomainEvents.pipe(
-            Stream.filter(
-              (event) =>
-                event.type === "provider-turn.updated" &&
-                event.threadId !== threadId &&
-                event.payload.status === "running",
-            ),
-            Stream.take(1),
-            Stream.runDrain,
-            Effect.forkScoped,
-          );
-          yield* orchestrator.dispatch({
-            type: "delegated_task.request",
-            commandId: CommandId.make("delegate"),
-            parentThreadId: threadId,
-            parentRunId: runningRun.id,
-            parentNodeId: runningRun.rootNodeId!,
-            task: "child work",
-            modelSelection,
-            runtimeMode: "full-access",
-            interactionMode: "default",
-            completionWake: "always",
-            createdBy: "agent",
-            creationSource: "mcp",
-          });
-          yield* worker.drain();
-          yield* Fiber.join(childRunning);
-          const childThreadId = (yield* orchestrator.getThreadProjection(threadId)).subagents[0]!
-            .childThreadId!;
+        yield* orchestrator.dispatch({
+          type: "thread.create",
+          commandId: CommandId.make("create"),
+          threadId,
+          projectId: ProjectId.make("project:mcp-stop"),
+          title: "Stop",
+          modelSelection,
+          runtimeMode: "full-access",
+          interactionMode: "default",
+          branch: null,
+          worktreePath: cwd,
+          createdBy: "user",
+          creationSource: "web",
+        });
+        const running = yield* orchestrator.streamDomainEvents.pipe(
+          Stream.filter(
+            (event) => event.type === "provider-turn.updated" && event.payload.status === "running",
+          ),
+          Stream.take(1),
+          Stream.runDrain,
+          Effect.forkScoped,
+        );
+        yield* send("work", "start_immediately");
+        yield* worker.drain();
+        yield* Fiber.join(running);
+        if (queued) yield* send("later", "queue_after_active");
+        const before = yield* orchestrator.getThreadProjection(threadId);
+        const runningRun = before.runs.find((run) => run.status === "running")!;
+        assert.equal(before.runs.filter((run) => run.status === "queued").length, queued ? 1 : 0);
+        // A task the thread delegated, running when the thread is stopped.
+        const childRunning = yield* orchestrator.streamDomainEvents.pipe(
+          Stream.filter(
+            (event) =>
+              event.type === "provider-turn.updated" &&
+              event.threadId !== threadId &&
+              event.payload.status === "running",
+          ),
+          Stream.take(1),
+          Stream.runDrain,
+          Effect.forkScoped,
+        );
+        yield* orchestrator.dispatch({
+          type: "delegated_task.request",
+          commandId: CommandId.make("delegate"),
+          parentThreadId: threadId,
+          parentRunId: runningRun.id,
+          parentNodeId: runningRun.rootNodeId!,
+          task: "child work",
+          modelSelection,
+          runtimeMode: "full-access",
+          interactionMode: "default",
+          completionWake: "always",
+          createdBy: "agent",
+          creationSource: "mcp",
+        });
+        yield* worker.drain();
+        yield* Fiber.join(childRunning);
+        const childThreadId = (yield* orchestrator.getThreadProjection(threadId)).subagents[0]!
+          .childThreadId!;
 
-          const stopped = yield* service.interruptThread(client, {
-            threadId,
-            stop: true,
-            clientRequestId: "stop",
-            ...(stop.reason === undefined ? {} : { reason: stop.reason }),
-          });
-          assert.deepEqual(stopped, {
-            threadId,
-            runId: runningRun.id,
-            status: "interrupt_requested",
-          });
-          // An agent's Stop must not read as the user's, on its thread or a task it delegated.
-          const interruptMessages = (id: ThreadId) =>
-            orchestrator
-              .getThreadProjection(id)
-              .pipe(
-                Effect.map(({ turnItems }) =>
-                  turnItems.flatMap((item) =>
-                    item.type === "run_interrupt_request" ? [item.message] : [],
-                  ),
+        const stopped = yield* service.interruptThread(client, {
+          threadId,
+          stop: true,
+          clientRequestId: "stop",
+          ...(stop.reason === undefined ? {} : { reason: stop.reason }),
+        });
+        assert.deepEqual(stopped, {
+          threadId,
+          runId: runningRun.id,
+          status: "interrupt_requested",
+        });
+        // An agent's Stop must not read as the user's, on its thread or a task it delegated.
+        const interruptMessages = (id: ThreadId) =>
+          orchestrator
+            .getThreadProjection(id)
+            .pipe(
+              Effect.map(({ turnItems }) =>
+                turnItems.flatMap((item) =>
+                  item.type === "run_interrupt_request" ? [item.message] : [],
                 ),
-              );
-          assert.deepEqual(yield* interruptMessages(threadId), [stop.message]);
-          assert.deepEqual(yield* interruptMessages(childThreadId), [stop.message]);
-        }).pipe(Effect.provide(layerTest));
-      }),
-    ),
+              ),
+            );
+        assert.deepEqual(yield* interruptMessages(threadId), [stop.message]);
+        assert.deepEqual(yield* interruptMessages(childThreadId), [stop.message]);
+      }).pipe(Effect.provide(layerTest));
+    }),
   );
 });
diff --git a/apps/server/src/mcp/OrchestratorMcpService.ts b/apps/server/src/mcp/OrchestratorMcpService.ts
index b74619e7b28f..c52716f2ba2d 100644
--- a/apps/server/src/mcp/OrchestratorMcpService.ts
+++ b/apps/server/src/mcp/OrchestratorMcpService.ts
@@ -70,6 +70,7 @@ import { getProviderOptionCurrentValue, withLegacyUltracodeEffort } from "@t3too
 import { backgroundWorkHoldsCompletion } from "@t3tools/shared/orchestrationV2PendingBackgroundWork";
 import { runRanAfter } from "@t3tools/shared/orchestrationV2ThreadError";
 import { formatThreadLink } from "@t3tools/shared/threadLinks";
+import { threadPullRequestUpdatedAtMs } from "@t3tools/shared/threadPullRequests";
 import {
   normalizeThreadPullRequestKey,
   visibleThreadPullRequests,
@@ -142,10 +143,14 @@ const TASK_WAKE_EVENTS = [
   { thread: "child", eventType: "runtime-request.updated" },
 ] as const;
 const SECRET_REQUEST_POLL_INTERVAL_MS = 500;
-const DEFAULT_THREAD_LIST_LIMIT = 50;
-const DEFAULT_THREAD_READ_LIMIT = 50;
+const DEFAULT_THREAD_LIST_LIMIT = 10;
+const DEFAULT_THREAD_READ_LIMIT = 10;
 const DEFAULT_THREAD_RUN_LIMIT = 10;
-const DEFAULT_THREAD_ITEM_MAX_CHARS = 20_000;
+const DEFAULT_THREAD_ITEM_MAX_CHARS = 500;
+const THREAD_PULL_REQUEST_PREVIEW_LIMIT = 5;
+// Claude Code saves MCP results over ~25k tokens to a file instead of showing them. Bytes, not
+// chars: CJK text runs near one token per char, which a char budget lets through at 30k tokens.
+const THREAD_READ_RESULT_MAX_BYTES = 30_000;
 
 interface ResolvedTarget {
   readonly modelSelection: ModelSelection;
@@ -631,13 +636,12 @@ function taskResultTransfer(
 
 function pageIncludesTerminalTaskResult(input: {
   readonly parentThreadId: ThreadId;
-  readonly page: ReadonlyArray<OrchestrationV2ThreadProjection["visibleTurnItems"][number]>;
+  readonly items: ReadonlyArray<OrchestratorMcpThreadTimelineItem>;
   readonly task: OrchestrationV2Subagent;
   readonly target: Pick<
     OrchestrationV2ThreadProjection,
     "thread" | "runs" | "contextTransfers" | "messages" | "turnItems" | "providerTurns"
   >;
-  readonly maxChars: number;
 }): boolean {
   const transfer = taskResultTransfer(input.parentThreadId, input.target, input.task);
   if (transfer === undefined) return false;
@@ -650,17 +654,14 @@ function pageIncludesTerminalTaskResult(input: {
   const result = subagentResultForRun(input.target, run);
   if (result.messageId === null && result.turnItemId === null) return false;
 
-  return input.page.some((row) => {
-    if (row.sourceThreadId !== input.target.thread.id) return false;
+  return input.items.some((item) => {
+    if (item.sourceThreadId !== input.target.thread.id) return false;
     const matchesResult =
-      (result.turnItemId !== null && row.sourceItemId === result.turnItemId) ||
+      (result.turnItemId !== null && item.itemId === result.turnItemId) ||
       (result.messageId !== null &&
-        row.item.type === "assistant_message" &&
-        row.item.messageId === result.messageId);
-    if (!matchesResult) return false;
-
-    const text = turnItemText(row.item);
-    return text !== null && text.length <= textPageEnd(text, 0, input.maxChars);
+        item.type === "assistant_message" &&
+        item.messageId === result.messageId);
+    return matchesResult && item.text !== null && !item.textTruncated;
   });
 }
 
@@ -803,15 +804,44 @@ function threadSnooze(
   };
 }
 
+// Provider-internal links (parentTaskId, providerInstanceId) stay out of agent results.
+function threadBackgroundWork(
+  thread: Pick<OrchestrationV2ThreadShell, "blockedOnThreadWait" | "pendingBackgroundTasks">,
+): Required<Pick<OrchestratorMcpThreadListItem, "blockedOnThreadWait" | "pendingBackgroundTasks">> {
+  return {
+    blockedOnThreadWait: thread.blockedOnThreadWait === true,
+    pendingBackgroundTasks: (thread.pendingBackgroundTasks ?? []).map((task) => ({
+      taskId: task.taskId,
+      kind: task.kind,
+      ...(task.description === undefined ? {} : { description: task.description }),
+      ...(task.awaited === undefined ? {} : { awaited: task.awaited }),
+      ...(task.kind === "subagent" && task.childThreadId !== undefined
+        ? { childThreadId: task.childThreadId }
+        : {}),
+    })),
+  };
+}
+
 function threadPullRequests(
   links: OrchestrationV2ThreadShell["pullRequests"],
   includeLinks = true,
-): Pick<OrchestratorMcpThreadListItem, "pullRequests" | "pullRequestCount"> {
+): Pick<
+  OrchestratorMcpThreadListItem,
+  "pullRequests" | "pullRequestCount" | "openPullRequestCount"
+> {
   const visible = visibleThreadPullRequests(links ?? []);
   if (!includeLinks) return { pullRequestCount: visible.length };
+  const open = visible.filter(
+    (link) => link.snapshot?.state !== "merged" && link.snapshot?.state !== "closed",
+  );
   return {
-    pullRequests: visible
-      .filter((link) => link.snapshot?.state !== "merged" && link.snapshot?.state !== "closed")
+    pullRequests: open
+      .toSorted(
+        (left, right) =>
+          Number(right.watch !== undefined) - Number(left.watch !== undefined) ||
+          threadPullRequestUpdatedAtMs(right) - threadPullRequestUpdatedAtMs(left),
+      )
+      .slice(0, THREAD_PULL_REQUEST_PREVIEW_LIMIT)
       .map((link) => ({
         host: normalizeThreadPullRequestKey(link).host,
         repository: link.repository,
@@ -823,6 +853,7 @@ function threadPullRequests(
         watchStartedAt: link.watch?.startedAt ?? null,
       })),
     pullRequestCount: visible.length,
+    openPullRequestCount: open.length,
   };
 }
 
@@ -856,6 +887,7 @@ function listItemFromShell(
     ...threadPullRequests(shell.pullRequests),
     ...threadSettlement(shell),
     ...threadSnooze(shell, nowMs),
+    ...threadBackgroundWork(shell),
     parentThreadId: shell.lineage.parentThreadId,
     relationshipToParent: shell.lineage.relationshipToParent,
     itemCount: shell.visibleItemCount,
@@ -898,6 +930,13 @@ function threadDetail(
             requestId: projection.thread.titleRegeneration.requestId,
             startedAt: DateTime.formatIso(projection.thread.titleRegeneration.startedAt),
           },
+    lastTitleRegeneration:
+      projection.thread.lastTitleRegeneration == null
+        ? null
+        : {
+            ...projection.thread.lastTitleRegeneration,
+            completedAt: DateTime.formatIso(projection.thread.lastTitleRegeneration.completedAt),
+          },
     branch: projection.thread.branch,
     worktreePath: projection.thread.worktreePath,
     parentThreadId: projection.thread.lineage.parentThreadId,
@@ -910,6 +949,7 @@ function threadDetail(
     archived: projection.thread.archivedAt !== null,
     ...threadSettlement(projection.thread),
     ...threadSnooze(shell, nowMs),
+    ...threadBackgroundWork(shell),
     createdAt: DateTime.formatIso(projection.thread.createdAt),
     updatedAt: DateTime.formatIso(projection.thread.updatedAt),
   };
@@ -1066,6 +1106,78 @@ function timelineItem(input: {
   };
 }
 
+const jsonBytes = (value: unknown) => Buffer.byteLength(JSON.stringify(value), "utf8");
+
+/** The longest prefix length in [low, high] that `fits`, or `low - 1`. */
+function longestFitting(low: number, high: number, fits: (length: number) => boolean): number {
+  let best = low - 1;
+  while (low <= high) {
+    const mid = Math.floor((low + high) / 2);
+    if (fits(mid)) {
+      best = mid;
+      low = mid + 1;
+    } else {
+      high = mid - 1;
+    }
+  }
+  return best;
+}
+
+/** The item with its text cut, and an oversized title too, until its JSON fits `maxBytes`. */
+function timelineItemWithin(
+  input: Parameters<typeof timelineItem>[0],
+  maxBytes: number,
+): OrchestratorMcpThreadTimelineItem {
+  const longestText = (title: string | null) => {
+    const withText = (maxChars: number) => ({ ...timelineItem({ ...input, maxChars }), title });
+    const chars = longestFitting(2, input.maxChars - 1, (n) => jsonBytes(withText(n)) <= maxBytes);
+    return withText(Math.max(chars, 1));
+  };
+  const item = longestText(input.row.item.title);
+  const title = item.title;
+  if (title === null || jsonBytes(item) <= maxBytes) return item;
+  // Half the budget for the title keeps `textOffset` pages of the text useful.
+  const cutTitle = (chars: number) =>
+    title.slice(0, chars === 0 ? 0 : textPageEnd(title, 0, chars));
+  const titleChars = longestFitting(
+    1,
+    title.length - 1,
+    (n) => jsonBytes({ ...item, title: cutTitle(n) }) <= maxBytes / 2,
+  );
+  return longestText(cutTitle(Math.max(titleChars, 0)));
+}
+
+/**
+ * The items, read from the end the caller pages toward, whose result fits
+ * THREAD_READ_RESULT_MAX_BYTES; `start` is the first kept index. Never empty for a non-empty page.
+ */
+function timelineItemsWithinBudget(
+  envelope: Omit<OrchestratorMcpThreadReadResult, "items">,
+  inputs: ReadonlyArray<Parameters<typeof timelineItem>[0]>,
+  newestFirst: boolean,
+): { readonly items: Array<OrchestratorMcpThreadTimelineItem>; readonly start: number } {
+  // An oversized envelope (say, a huge thread title) must not starve items to one char per read.
+  const budget = Math.max(
+    THREAD_READ_RESULT_MAX_BYTES - jsonBytes({ ...envelope, items: [] }),
+    THREAD_READ_RESULT_MAX_BYTES / 2,
+  );
+  const items: Array<OrchestratorMcpThreadTimelineItem> = [];
+  let bytes = 0;
+  for (const input of newestFirst ? inputs.toReversed() : inputs) {
+    const item = timelineItem(input);
+    bytes += jsonBytes(item) + (items.length === 0 ? 0 : 1);
+    if (bytes <= budget) {
+      items.push(item);
+      continue;
+    }
+    if (items.length === 0) items.push(timelineItemWithin(input, budget));
+    break;
+  }
+  return newestFirst
+    ? { items: items.toReversed(), start: inputs.length - items.length }
+    : { items, start: 0 };
+}
+
 const make = Effect.gen(function* () {
   const random = yield* SecureRandom.SecureRandom;
   const threadManagement = yield* ThreadManagementService.ThreadManagementService;
@@ -3029,20 +3141,25 @@ const make = Effect.gen(function* () {
     readThread: Effect.fn("OrchestratorMcpService.readThread")(function* (scope, input) {
       const { parent, target, shell } = yield* loadReadableThread(scope, input.threadId);
       const view = input.view ?? "messages";
-      const afterPosition = input.afterPosition ?? -1;
       const limit = input.limit ?? DEFAULT_THREAD_READ_LIMIT;
       const maxChars = input.maxCharsPerItem ?? DEFAULT_THREAD_ITEM_MAX_CHARS;
+      // Client callers (the CLI, older linked environments) page forward from a cursorless read.
+      const newestFirst =
+        input.beforePosition !== undefined ||
+        (input.afterPosition === undefined && scope.thread !== undefined);
       const timeline = yield* threadManagement
         .getTimelinePage(input.threadId, {
-          afterPosition,
+          ...(input.afterPosition === undefined ? {} : { afterPosition: input.afterPosition }),
+          ...(newestFirst
+            ? { beforePosition: input.beforePosition ?? Number.POSITIVE_INFINITY }
+            : {}),
           limit,
           view,
           ...(input.itemId === undefined ? {} : { itemId: input.itemId }),
         })
         .pipe(Effect.mapError(threadManagementFailure));
-      const page = timeline.items;
       const messageIdsByThread = new Map<ThreadId, Array<MessageId>>();
-      for (const row of page) {
+      for (const row of timeline.items) {
         if (row.item.type !== "user_message" && row.item.type !== "assistant_message") continue;
         const ids = messageIdsByThread.get(row.sourceThreadId) ?? [];
         ids.push(row.item.messageId);
@@ -3058,6 +3175,31 @@ const make = Effect.gen(function* () {
         { concurrency: 1 },
       );
       const messagesByThreadId = new Map(sourceMessages);
+      const thread = threadDetail(
+        scope,
+        target,
+        timeline.totalItems,
+        shell,
+        yield* Clock.currentTimeMillis,
+        input.afterPosition === undefined &&
+          input.beforePosition === undefined &&
+          input.itemId === undefined,
+      );
+      const recentRuns = target.runs
+        .toSorted((left, right) => right.ordinal - left.ordinal)
+        .slice(0, input.runLimit ?? DEFAULT_THREAD_RUN_LIMIT)
+        .map((run) => threadRun(target, run));
+      const { items, start } = timelineItemsWithinBudget(
+        { thread, recentRuns, nextPosition: null, hasMore: false, earlierPosition: null },
+        timeline.items.map((row) => ({
+          row,
+          maxChars,
+          messagesByThreadId,
+          ...(input.itemId === undefined ? {} : { textOffset: input.textOffset ?? 0 }),
+        })),
+        newestFirst,
+      );
+      const page = timeline.items.slice(start, start + items.length);
       const returnedRunIds = new Set(
         page.filter((row) => row.sourceThreadId === target.thread.id).map((row) => row.item.runId),
       );
@@ -3075,12 +3217,9 @@ const make = Effect.gen(function* () {
               target,
               returnedRunIds,
             );
-      if (
-        parent !== undefined &&
-        scope.thread !== undefined &&
-        tasks.length > 0 &&
-        (input.textOffset ?? 0) === 0
-      ) {
+      // A read past the end of an item's text shows the agent nothing to acknowledge.
+      const readPastEnd = (input.textOffset ?? 0) > 0 && items.every((item) => !item.text);
+      if (parent !== undefined && scope.thread !== undefined && tasks.length > 0 && !readPastEnd) {
         for (const task of tasks) {
           const transfer = taskResultTransfer(parent.thread.id, target, task);
           const resultRunId = transfer?.sourcePoint.runId ?? delegatedTaskRun(target, task)?.id;
@@ -3096,10 +3235,9 @@ const make = Effect.gen(function* () {
           if (
             pageIncludesTerminalTaskResult({
               parentThreadId: parent.thread.id,
-              page,
+              items,
               task,
               target: { ...target, ...resultRecords },
-              maxChars,
             })
           ) {
             yield* readTask(
@@ -3113,28 +3251,12 @@ const make = Effect.gen(function* () {
         }
       }
       return {
-        thread: threadDetail(
-          scope,
-          target,
-          timeline.totalItems,
-          shell,
-          yield* Clock.currentTimeMillis,
-          input.afterPosition === undefined && input.itemId === undefined,
-        ),
-        recentRuns: target.runs
-          .toSorted((left, right) => right.ordinal - left.ordinal)
-          .slice(0, input.runLimit ?? DEFAULT_THREAD_RUN_LIMIT)
-          .map((run) => threadRun(target, run)),
-        items: page.map((row) =>
-          timelineItem({
-            row,
-            maxChars,
-            messagesByThreadId,
-            ...(input.itemId === undefined ? {} : { textOffset: input.textOffset ?? 0 }),
-          }),
-        ),
-        nextPosition: page.at(-1)?.position ?? null,
-        hasMore: timeline.hasMore,
+        thread,
+        recentRuns,
+        items,
+        nextPosition: items.at(-1)?.position ?? null,
+        hasMore: timeline.hasMore || (!newestFirst && items.length < timeline.items.length),
+        earlierPosition: timeline.hasEarlier || start > 0 ? (items[0]?.position ?? null) : null,
       } satisfies OrchestratorMcpThreadReadResult;
     }),
     sendToThread: Effect.fn("OrchestratorMcpService.sendToThread")(function* (scope, input) {
diff --git a/apps/server/src/mcp/OrchestratorMcpToolkit.integration.test.ts b/apps/server/src/mcp/OrchestratorMcpToolkit.integration.test.ts
index bbeac142dfeb..2ec6e939927e 100644
--- a/apps/server/src/mcp/OrchestratorMcpToolkit.integration.test.ts
+++ b/apps/server/src/mcp/OrchestratorMcpToolkit.integration.test.ts
@@ -11,6 +11,7 @@ import {
   OrchestratorMcpDelegateTaskResult,
   OrchestratorMcpThreadInterruptResult,
   OrchestratorMcpThreadSendResult,
+  OrchestratorMcpThreadReadResult,
   ProjectId,
   ProviderDriverKind,
   ProviderInstanceId,
@@ -79,6 +80,8 @@ const delegatedResult = "Delegated API boundary inspected.";
 const cancellationPrompt = "Remain active until the parent cancels this delegated task.";
 const queuedFollowupPrompt = "Complete the queued follow-up and return the final result.";
 const queuedFollowupResult = "Queued delegated follow-up completed.";
+const decodeThreadRead = Schema.decodeUnknownEffect(OrchestratorMcpThreadReadResult);
+const longFollowupResult = "Long delegated follow-up line. ".repeat(1_500);
 
 const decodeDelegateTaskResult = Schema.decodeUnknownEffect(OrchestratorMcpDelegateTaskResult);
 const decodeThreadInterruptResult = Schema.decodeUnknownEffect(
@@ -199,585 +202,605 @@ describe("orchestrator MCP toolkit", () => {
     { label: "distinct", result: queuedFollowupResult, latestSummary: queuedFollowupResult },
     { label: "identical", result: delegatedResult, latestSummary: null },
     { label: "emoji", result: "😀", latestSummary: "😀" },
+    { label: "long", result: longFollowupResult, latestSummary: longFollowupResult },
   ])("reports $label child results", ({ result, latestSummary }) =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const cwd = yield* checkpointWorkspace("delegated-task-status");
-        const rawTranscript = yield* readDelegatedTaskStatusTranscript(result);
-        const transcript = yield* CodexOrchestratorReplayHarness.decodeTranscript(
-          materializeReplayTranscriptWorkspace(rawTranscript, cwd),
-        );
-        const layerOrchestrator = ProviderReplayHarness.layerProviderReplay(
-          {
-            name: "delegated-task-status/codex",
-            transcript,
-            commands: [],
-            runtimePolicyOverride: { cwd },
-          },
-          CodexOrchestratorReplayHarness,
-        );
-        // SQL spans carry no bound parameters, so this records which thread each tool read.
-        const threadRecordReads: Array<{
-          readonly threadId: ThreadId;
-          readonly fields: ReadonlyArray<string>;
-        }> = [];
-        const layerOrchestration = Layer.merge(
-          layerOrchestrator,
-          Layer.effect(
-            ThreadManagementService.ThreadManagementService,
-            Effect.gen(function* () {
-              const service = yield* ThreadManagementService.ThreadManagementService;
-              return ThreadManagementService.ThreadManagementService.of({
-                ...service,
-                getThreadRecords: (threadId, fields, filter) =>
-                  Effect.sync(() => threadRecordReads.push({ threadId, fields })).pipe(
-                    Effect.andThen(service.getThreadRecords(threadId, fields, filter)),
-                  ),
-              });
-            }),
-          ).pipe(
-            Layer.provide(
-              ThreadManagementService.layer.pipe(
-                Layer.provide(layerOrchestrator),
-                Layer.provide(ServerSettings.layerTest()),
-                Layer.provide(
-                  CommandReceiptStore.layer.pipe(Layer.provide(SqlitePersistence.layerMemory)),
+    Effect.gen(function* () {
+      const cwd = yield* checkpointWorkspace("delegated-task-status");
+      const rawTranscript = yield* readDelegatedTaskStatusTranscript(result);
+      const transcript = yield* CodexOrchestratorReplayHarness.decodeTranscript(
+        materializeReplayTranscriptWorkspace(rawTranscript, cwd),
+      );
+      const layerOrchestrator = ProviderReplayHarness.layerProviderReplay(
+        {
+          name: "delegated-task-status/codex",
+          transcript,
+          commands: [],
+          runtimePolicyOverride: { cwd },
+        },
+        CodexOrchestratorReplayHarness,
+      );
+      // SQL spans carry no bound parameters, so this records which thread each tool read.
+      const threadRecordReads: Array<{
+        readonly threadId: ThreadId;
+        readonly fields: ReadonlyArray<string>;
+      }> = [];
+      const layerOrchestration = Layer.merge(
+        layerOrchestrator,
+        Layer.effect(
+          ThreadManagementService.ThreadManagementService,
+          Effect.gen(function* () {
+            const service = yield* ThreadManagementService.ThreadManagementService;
+            return ThreadManagementService.ThreadManagementService.of({
+              ...service,
+              getThreadRecords: (threadId, fields, filter) =>
+                Effect.sync(() => threadRecordReads.push({ threadId, fields })).pipe(
+                  Effect.andThen(service.getThreadRecords(threadId, fields, filter)),
                 ),
-              ),
-            ),
-          ),
-        );
-        const layerProviderRegistry = ProviderRegistryMock.layer([
-          makeProviderSnapshot({
-            instanceId: codexInstanceId,
-            driver: ProviderDriverKind.make("codex"),
-            model: codexModel,
+            });
           }),
-        ]);
-        const layerTest = layerOrchestratorToolkit.pipe(
-          Layer.provideMerge(McpHttpServer.layerInProcessMcpServer),
-          Layer.provideMerge(layerOrchestration),
+        ).pipe(
           Layer.provide(
-            CodexOrchestratorReplayHarness.makeProviderAdapterRegistryLayer(transcript).pipe(
-              Layer.provide(McpProviderSessions.layer),
+            ThreadManagementService.layer.pipe(
+              Layer.provide(layerOrchestrator),
+              Layer.provide(ServerSettings.layerTest()),
+              Layer.provide(
+                CommandReceiptStore.layer.pipe(Layer.provide(SqlitePersistence.layerMemory)),
+              ),
             ),
           ),
-          Layer.provide(layerProviderRegistry),
-          Layer.provide(ServerSettings.layerTest()),
-          Layer.provide(layerUnusedScheduledTaskStub),
-          Layer.provide(Layer.mock(PeerForwarding.PeerForwarding)({})),
-          Layer.provide(Layer.mock(PeerLinkRequests.PeerLinkRequests)({})),
-          Layer.provide(Layer.mock(PeerLinks.PeerLinks)({})),
-          Layer.provide(Layer.mock(ProjectService.ProjectService)({})),
-          Layer.provideMerge(
-            SecretRequests.layer.pipe(
-              Layer.provide(layerMemorySecretStore),
-              Layer.provide(Layer.mock(SecretResolver.SecretResolver)({})),
-              Layer.provide(layerOrchestration),
-            ),
+        ),
+      );
+      const layerProviderRegistry = ProviderRegistryMock.layer([
+        makeProviderSnapshot({
+          instanceId: codexInstanceId,
+          driver: ProviderDriverKind.make("codex"),
+          model: codexModel,
+        }),
+      ]);
+      const layerTest = layerOrchestratorToolkit.pipe(
+        Layer.provideMerge(McpHttpServer.layerInProcessMcpServer),
+        Layer.provideMerge(layerOrchestration),
+        Layer.provide(
+          CodexOrchestratorReplayHarness.makeProviderAdapterRegistryLayer(transcript).pipe(
+            Layer.provide(McpProviderSessions.layer),
           ),
-          Layer.provide(Layer.mock(RemoteDelegation.RemoteDelegation)({})),
-          Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
-        );
+        ),
+        Layer.provide(layerProviderRegistry),
+        Layer.provide(ServerSettings.layerTest()),
+        Layer.provide(layerUnusedScheduledTaskStub),
+        Layer.provide(Layer.mock(PeerForwarding.PeerForwarding)({})),
+        Layer.provide(Layer.mock(PeerLinkRequests.PeerLinkRequests)({})),
+        Layer.provide(Layer.mock(PeerLinks.PeerLinks)({})),
+        Layer.provide(Layer.mock(ProjectService.ProjectService)({})),
+        Layer.provideMerge(
+          SecretRequests.layer.pipe(
+            Layer.provide(layerMemorySecretStore),
+            Layer.provide(Layer.mock(SecretResolver.SecretResolver)({})),
+            Layer.provide(layerOrchestration),
+          ),
+        ),
+        Layer.provide(Layer.mock(RemoteDelegation.RemoteDelegation)({})),
+        Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
+      );
 
-        yield* Effect.gen(function* () {
-          const orchestrator = yield* Orchestrator.OrchestratorV2;
-          const server = yield* McpServer.McpServer;
-          const parentCreate = yield* orchestrator.dispatch({
-            type: "thread.create",
-            createdBy: "user",
-            creationSource: "web",
-            commandId: CommandId.make("command:mcp-replay-parent:create"),
+      yield* Effect.gen(function* () {
+        const orchestrator = yield* Orchestrator.OrchestratorV2;
+        const server = yield* McpServer.McpServer;
+        const parentCreate = yield* orchestrator.dispatch({
+          type: "thread.create",
+          createdBy: "user",
+          creationSource: "web",
+          commandId: CommandId.make("command:mcp-replay-parent:create"),
+          threadId: parentThreadId,
+          projectId,
+          title: "MCP replay parent",
+          modelSelection: codexSelection,
+          runtimeMode: "full-access",
+          interactionMode: "default",
+          branch: null,
+          worktreePath: cwd,
+        });
+        yield* orchestrator.dispatch({
+          type: "message.dispatch",
+          createdBy: "user",
+          creationSource: "web",
+          commandId: CommandId.make("command:mcp-replay-parent:start"),
+          threadId: parentThreadId,
+          messageId: MessageId.make("message:mcp-replay-parent:start"),
+          text: parentPrompt,
+          attachments: [],
+          modelSelection: codexSelection,
+          dispatchMode: { type: "start_immediately" },
+        });
+        yield* orchestrator
+          .streamStoredEventsFrom({
             threadId: parentThreadId,
-            projectId,
-            title: "MCP replay parent",
-            modelSelection: codexSelection,
-            runtimeMode: "full-access",
-            interactionMode: "default",
-            branch: null,
-            worktreePath: cwd,
-          });
-          yield* orchestrator.dispatch({
-            type: "message.dispatch",
-            createdBy: "user",
-            creationSource: "web",
-            commandId: CommandId.make("command:mcp-replay-parent:start"),
+            afterSequence: parentCreate.sequence,
+          })
+          .pipe(
+            Stream.filter(
+              (stored) =>
+                stored.event.type === "provider-turn.updated" &&
+                stored.event.payload.status === "running",
+            ),
+            Stream.runHead,
+            Effect.flatMap(
+              Option.match({
+                onNone: () => Effect.die("Parent provider turn did not start."),
+                onSome: () => Effect.void,
+              }),
+            ),
+          );
+
+        const invocation: McpInvocationContext.McpInvocationScope = {
+          environmentId: EnvironmentId.make("environment:mcp-replay"),
+          requestNamespace: "mcp-provider-session-replay-parent",
+          thread: {
             threadId: parentThreadId,
-            messageId: MessageId.make("message:mcp-replay-parent:start"),
-            text: parentPrompt,
-            attachments: [],
-            modelSelection: codexSelection,
-            dispatchMode: { type: "start_immediately" },
-          });
-          yield* orchestrator
-            .streamStoredEventsFrom({
-              threadId: parentThreadId,
-              afterSequence: parentCreate.sequence,
-            })
+            providerSessionId: "mcp-provider-session-replay-parent",
+            providerInstanceId: codexInstanceId,
+          },
+          client: undefined,
+          capabilities: new Set(["orchestration"]),
+          issuedAt: 1,
+        };
+        const invoke = (name: string, args: Record<string, unknown>, scope = invocation) =>
+          server
+            .callTool({ name, arguments: args })
             .pipe(
-              Stream.filter(
-                (stored) =>
-                  stored.event.type === "provider-turn.updated" &&
-                  stored.event.payload.status === "running",
-              ),
-              Stream.runHead,
-              Effect.flatMap(
-                Option.match({
-                  onNone: () => Effect.die("Parent provider turn did not start."),
-                  onSome: () => Effect.void,
-                }),
-              ),
+              Effect.provideService(McpInvocationContext.McpInvocationContext, scope),
+              Effect.provideService(McpSchema.McpServerClient, client),
             );
 
-          const invocation: McpInvocationContext.McpInvocationScope = {
-            environmentId: EnvironmentId.make("environment:mcp-replay"),
-            requestNamespace: "mcp-provider-session-replay-parent",
-            thread: {
-              threadId: parentThreadId,
-              providerSessionId: "mcp-provider-session-replay-parent",
-              providerInstanceId: codexInstanceId,
-            },
-            client: undefined,
-            capabilities: new Set(["orchestration"]),
-            issuedAt: 1,
-          };
-          const invoke = (name: string, args: Record<string, unknown>, scope = invocation) =>
-            server
-              .callTool({ name, arguments: args })
-              .pipe(
-                Effect.provideService(McpInvocationContext.McpInvocationContext, scope),
-                Effect.provideService(McpSchema.McpServerClient, client),
-              );
-
-          const delegationStartSequence =
-            yield* orchestrator.getThreadEventSequence(parentThreadId);
-          const delegatedCall = yield* invoke("delegate_task", {
-            task: delegatedPrompt,
-            target: {
-              providerInstanceId: codexInstanceId,
-              model: codexModel,
-            },
-            mode: "async",
-            clientRequestId: "delegate-codex-replay-1",
-          });
-          const delegatedStart = yield* decodeDelegateTaskResult(
-            delegatedCall.structuredContent,
-          ).pipe(Effect.orDie);
-          expect(delegatedStart.childRunId).not.toBeNull();
-          yield* orchestrator
-            .streamStoredEventsFrom({
-              threadId: parentThreadId,
-              afterSequence: delegationStartSequence,
-            })
-            .pipe(
-              Stream.filter(
-                (stored) =>
-                  stored.event.type === "context-transfer.created" &&
-                  stored.event.payload.type === "subagent_result" &&
-                  stored.event.payload.sourceThreadId === delegatedStart.childThreadId &&
-                  stored.event.payload.sourcePoint.runId === delegatedStart.childRunId,
-              ),
-              Stream.runHead,
-              Effect.flatMap(
-                Option.match({
-                  onNone: () => Effect.die("Delegated result transfer was not created."),
-                  onSome: () => Effect.void,
-                }),
-              ),
-            );
-          const delegatedStatusCall = yield* invoke("task_status", {
-            taskId: delegatedStart.taskId,
-          });
-          const delegated = yield* decodeDelegateTaskResult(
-            delegatedStatusCall.structuredContent,
-          ).pipe(Effect.orDie);
-          expect(delegated).toMatchObject({
-            status: "completed",
-            summary: delegatedResult,
+        const delegationStartSequence = yield* orchestrator.getThreadEventSequence(parentThreadId);
+        const delegatedCall = yield* invoke("delegate_task", {
+          task: delegatedPrompt,
+          target: {
             providerInstanceId: codexInstanceId,
-            hasPendingChildRuns: false,
-            latestTerminalRunId: delegated.childRunId,
-            latestTerminalStatus: "completed",
-            latestTerminalSummary: null,
-            latestTerminalResultContextTransferId: null,
-          });
-          expect(delegated.resultContextTransferId).not.toBeNull();
-
-          const delegatedChild = yield* orchestrator.getThreadProjection(
-            localChild(delegated.childThreadId),
-          );
-          expect(delegatedChild.thread.lineage.relationshipToParent).toBe("subagent");
-          expect(isProviderNativeSubagentThread(delegatedChild.thread)).toBe(false);
-          const followupStartSequence = yield* orchestrator.getThreadEventSequence(
-            localChild(delegated.childThreadId),
+            model: codexModel,
+          },
+          mode: "async",
+          clientRequestId: "delegate-codex-replay-1",
+        });
+        const delegatedStart = yield* decodeDelegateTaskResult(
+          delegatedCall.structuredContent,
+        ).pipe(Effect.orDie);
+        expect(delegatedStart.childRunId).not.toBeNull();
+        yield* orchestrator
+          .streamStoredEventsFrom({
+            threadId: parentThreadId,
+            afterSequence: delegationStartSequence,
+          })
+          .pipe(
+            Stream.filter(
+              (stored) =>
+                stored.event.type === "context-transfer.created" &&
+                stored.event.payload.type === "subagent_result" &&
+                stored.event.payload.sourceThreadId === delegatedStart.childThreadId &&
+                stored.event.payload.sourcePoint.runId === delegatedStart.childRunId,
+            ),
+            Stream.runHead,
+            Effect.flatMap(
+              Option.match({
+                onNone: () => Effect.die("Delegated result transfer was not created."),
+                onSome: () => Effect.void,
+              }),
+            ),
           );
-          const runningFollowupCall = yield* invoke("t3_thread_send", {
-            threadId: localChild(delegated.childThreadId),
-            message: cancellationPrompt,
-            clientRequestId: "delegated-child-replay-running-1",
-          });
-          const runningFollowup = yield* decodeThreadSendResult(
-            runningFollowupCall.structuredContent,
-          ).pipe(Effect.orDie);
-          yield* orchestrator
-            .streamStoredEventsFrom({
-              threadId: localChild(delegated.childThreadId),
-              afterSequence: followupStartSequence,
-            })
-            .pipe(
-              Stream.filter(
-                (stored) =>
-                  stored.event.type === "provider-turn.updated" &&
-                  stored.event.payload.status === "running",
-              ),
-              Stream.runHead,
-              Effect.flatMap(
-                Option.match({
-                  onNone: () => Effect.die("Follow-up provider turn did not start."),
-                  onSome: () => Effect.void,
-                }),
-              ),
-            );
+        const delegatedStatusCall = yield* invoke("task_status", {
+          taskId: delegatedStart.taskId,
+        });
+        const delegated = yield* decodeDelegateTaskResult(
+          delegatedStatusCall.structuredContent,
+        ).pipe(Effect.orDie);
+        expect(delegated).toMatchObject({
+          status: "completed",
+          summary: delegatedResult,
+          providerInstanceId: codexInstanceId,
+          hasPendingChildRuns: false,
+          latestTerminalRunId: delegated.childRunId,
+          latestTerminalStatus: "completed",
+          latestTerminalSummary: null,
+          latestTerminalResultContextTransferId: null,
+        });
+        expect(delegated.resultContextTransferId).not.toBeNull();
 
-          const queuedFollowupCall = yield* invoke("t3_thread_send", {
+        const delegatedChild = yield* orchestrator.getThreadProjection(
+          localChild(delegated.childThreadId),
+        );
+        expect(delegatedChild.thread.lineage.relationshipToParent).toBe("subagent");
+        expect(isProviderNativeSubagentThread(delegatedChild.thread)).toBe(false);
+        const followupStartSequence = yield* orchestrator.getThreadEventSequence(
+          localChild(delegated.childThreadId),
+        );
+        const runningFollowupCall = yield* invoke("t3_thread_send", {
+          threadId: localChild(delegated.childThreadId),
+          message: cancellationPrompt,
+          clientRequestId: "delegated-child-replay-running-1",
+        });
+        const runningFollowup = yield* decodeThreadSendResult(
+          runningFollowupCall.structuredContent,
+        ).pipe(Effect.orDie);
+        yield* orchestrator
+          .streamStoredEventsFrom({
             threadId: localChild(delegated.childThreadId),
-            message: queuedFollowupPrompt,
-            mode: "queue",
-            clientRequestId: "delegated-child-replay-queued-1",
-          });
-          const queuedFollowup = yield* decodeThreadSendResult(
-            queuedFollowupCall.structuredContent,
-          ).pipe(Effect.orDie);
-          expect(queuedFollowup).toMatchObject({
-            status: "queued",
-            delivery: "queued",
-          });
-
-          const pendingProjection = yield* orchestrator.getThreadProjection(
-            localChild(delegated.childThreadId),
-          );
-          const followupTasks = (yield* orchestrator.getThreadProjection(
-            parentThreadId,
-          )).subagents.filter(
-            (task) =>
-              task.childThreadId === delegated.childThreadId && task.id !== delegated.taskId,
-          );
-          expect(followupTasks).toHaveLength(2);
-          expect(followupTasks.every((task) => task.result === null)).toBe(true);
-          expect(followupTasks.map((task) => task.id)).toEqual([
-            runningFollowup.taskId,
-            queuedFollowup.taskId,
-          ]);
-          expect(
-            pendingProjection.runs.find((run) => run.id === delegated.childRunId)?.status,
-          ).toBe("completed");
-          expect(
-            pendingProjection.runs.find((run) => run.id === runningFollowup.runId)?.status,
-          ).toBe("running");
-          expect(
-            pendingProjection.runs.find((run) => run.id === queuedFollowup.runId)?.status,
-          ).toBe("queued");
-          expect(
-            (yield* orchestrator.getThreadProjection(parentThreadId)).runs.some(
-              (run) => run.status === "running",
+            afterSequence: followupStartSequence,
+          })
+          .pipe(
+            Stream.filter(
+              (stored) =>
+                stored.event.type === "provider-turn.updated" &&
+                stored.event.payload.status === "running",
+            ),
+            Stream.runHead,
+            Effect.flatMap(
+              Option.match({
+                onNone: () => Effect.die("Follow-up provider turn did not start."),
+                onSome: () => Effect.void,
+              }),
             ),
-          ).toBe(true);
+          );
 
-          const pendingStatusCall = yield* invoke("task_status", {
-            taskId: delegated.taskId,
-          });
-          const pendingStatus = yield* decodeDelegateTaskResult(
-            pendingStatusCall.structuredContent,
-          ).pipe(Effect.orDie);
-          expect(pendingStatus).toMatchObject({
-            childRunId: delegated.childRunId,
-            status: "completed",
-            summary: delegatedResult,
-            resultContextTransferId: delegated.resultContextTransferId,
-            hasPendingChildRuns: true,
-            latestTerminalRunId: delegated.childRunId,
-            latestTerminalStatus: "completed",
-            latestTerminalSummary: null,
-            latestTerminalResultContextTransferId: null,
-          });
+        const queuedFollowupCall = yield* invoke("t3_thread_send", {
+          threadId: localChild(delegated.childThreadId),
+          message: queuedFollowupPrompt,
+          mode: "queue",
+          clientRequestId: "delegated-child-replay-queued-1",
+        });
+        const queuedFollowup = yield* decodeThreadSendResult(
+          queuedFollowupCall.structuredContent,
+        ).pipe(Effect.orDie);
+        expect(queuedFollowup).toMatchObject({
+          status: "queued",
+          delivery: "queued",
+        });
 
-          const finalSequence = yield* orchestrator.getThreadEventSequence(
-            localChild(delegated.childThreadId),
-          );
-          const interruptCall = yield* invoke("t3_thread_interrupt", {
-            threadId: localChild(delegated.childThreadId),
-            runId: runningFollowup.runId,
-            reason: "Allow the queued replay follow-up to run.",
-            clientRequestId: "interrupt-delegated-child-replay-1",
-          });
-          const interrupt = yield* decodeThreadInterruptResult(
-            interruptCall.structuredContent,
-          ).pipe(Effect.orDie);
-          expect(interrupt).toMatchObject({
-            runId: runningFollowup.runId,
-            status: "interrupt_requested",
-          });
-          yield* orchestrator
-            .streamStoredEventsFrom({
-              threadId: localChild(delegated.childThreadId),
-              afterSequence: finalSequence,
-            })
-            .pipe(
-              Stream.filter(
-                (stored) =>
-                  stored.event.type === "run.updated" &&
-                  stored.event.payload.id === queuedFollowup.runId &&
-                  stored.event.payload.status === "completed",
-              ),
-              Stream.runHead,
-              Effect.flatMap(
-                Option.match({
-                  onNone: () => Effect.die("Queued follow-up did not complete."),
-                  onSome: () => Effect.void,
-                }),
-              ),
-            );
+        const pendingProjection = yield* orchestrator.getThreadProjection(
+          localChild(delegated.childThreadId),
+        );
+        const followupTasks = (yield* orchestrator.getThreadProjection(
+          parentThreadId,
+        )).subagents.filter(
+          (task) => task.childThreadId === delegated.childThreadId && task.id !== delegated.taskId,
+        );
+        expect(followupTasks).toHaveLength(2);
+        expect(followupTasks.every((task) => task.result === null)).toBe(true);
+        expect(followupTasks.map((task) => task.id)).toEqual([
+          runningFollowup.taskId,
+          queuedFollowup.taskId,
+        ]);
+        expect(pendingProjection.runs.find((run) => run.id === delegated.childRunId)?.status).toBe(
+          "completed",
+        );
+        expect(pendingProjection.runs.find((run) => run.id === runningFollowup.runId)?.status).toBe(
+          "running",
+        );
+        expect(pendingProjection.runs.find((run) => run.id === queuedFollowup.runId)?.status).toBe(
+          "queued",
+        );
+        expect(
+          (yield* orchestrator.getThreadProjection(parentThreadId)).runs.some(
+            (run) => run.status === "running",
+          ),
+        ).toBe(true);
 
-          const finalProjection = yield* orchestrator.getThreadProjection(
-            localChild(delegated.childThreadId),
-          );
-          expect(finalProjection.runs.find((run) => run.id === runningFollowup.runId)?.status).toBe(
-            "interrupted",
-          );
-          expect(finalProjection.runs.find((run) => run.id === queuedFollowup.runId)?.status).toBe(
-            "completed",
+        const pendingStatusCall = yield* invoke("task_status", {
+          taskId: delegated.taskId,
+        });
+        const pendingStatus = yield* decodeDelegateTaskResult(
+          pendingStatusCall.structuredContent,
+        ).pipe(Effect.orDie);
+        expect(pendingStatus).toMatchObject({
+          childRunId: delegated.childRunId,
+          status: "completed",
+          summary: delegatedResult,
+          resultContextTransferId: delegated.resultContextTransferId,
+          hasPendingChildRuns: true,
+          latestTerminalRunId: delegated.childRunId,
+          latestTerminalStatus: "completed",
+          latestTerminalSummary: null,
+          latestTerminalResultContextTransferId: null,
+        });
+
+        const finalSequence = yield* orchestrator.getThreadEventSequence(
+          localChild(delegated.childThreadId),
+        );
+        const interruptCall = yield* invoke("t3_thread_interrupt", {
+          threadId: localChild(delegated.childThreadId),
+          runId: runningFollowup.runId,
+          reason: "Allow the queued replay follow-up to run.",
+          clientRequestId: "interrupt-delegated-child-replay-1",
+        });
+        const interrupt = yield* decodeThreadInterruptResult(interruptCall.structuredContent).pipe(
+          Effect.orDie,
+        );
+        expect(interrupt).toMatchObject({
+          runId: runningFollowup.runId,
+          status: "interrupt_requested",
+        });
+        yield* orchestrator
+          .streamStoredEventsFrom({
+            threadId: localChild(delegated.childThreadId),
+            afterSequence: finalSequence,
+          })
+          .pipe(
+            Stream.filter(
+              (stored) =>
+                stored.event.type === "run.updated" &&
+                stored.event.payload.id === queuedFollowup.runId &&
+                stored.event.payload.status === "completed",
+            ),
+            Stream.runHead,
+            Effect.flatMap(
+              Option.match({
+                onNone: () => Effect.die("Queued follow-up did not complete."),
+                onSome: () => Effect.void,
+              }),
+            ),
           );
-          expect(
-            finalProjection.turnItems.find(
-              (item) =>
-                item.runId === runningFollowup.runId && item.type === "run_interrupt_result",
+
+        const finalProjection = yield* orchestrator.getThreadProjection(
+          localChild(delegated.childThreadId),
+        );
+        expect(finalProjection.runs.find((run) => run.id === runningFollowup.runId)?.status).toBe(
+          "interrupted",
+        );
+        expect(finalProjection.runs.find((run) => run.id === queuedFollowup.runId)?.status).toBe(
+          "completed",
+        );
+        expect(
+          finalProjection.turnItems.find(
+            (item) => item.runId === runningFollowup.runId && item.type === "run_interrupt_result",
+          ),
+        ).toMatchObject({
+          message: "Stopped by an agent: Allow the queued replay follow-up to run.",
+        });
+        yield* orchestrator
+          .streamStoredEventsFrom({
+            threadId: parentThreadId,
+            afterSequence: finalSequence,
+          })
+          .pipe(
+            Stream.filter(
+              (stored) =>
+                stored.event.type === "subagent.updated" &&
+                stored.event.payload.id === followupTasks[1]!.id &&
+                stored.event.payload.status === "completed",
             ),
-          ).toMatchObject({
-            message: "Stopped by an agent: Allow the queued replay follow-up to run.",
-          });
-          yield* orchestrator
-            .streamStoredEventsFrom({
-              threadId: parentThreadId,
-              afterSequence: finalSequence,
-            })
-            .pipe(
-              Stream.filter(
-                (stored) =>
-                  stored.event.type === "subagent.updated" &&
-                  stored.event.payload.id === followupTasks[1]!.id &&
-                  stored.event.payload.status === "completed",
-              ),
-              Stream.runHead,
-              Effect.flatMap(
-                Option.match({
-                  onNone: () => Effect.die("Follow-up task did not settle."),
-                  onSome: () => Effect.void,
-                }),
-              ),
-            );
-          const finishedParent = yield* orchestrator.getThreadProjection(parentThreadId);
-          expect(
-            finishedParent.subagents.find((task) => task.id === followupTasks[0]!.id)?.status,
-          ).toBe("interrupted");
-          expect(
-            finishedParent.subagents.find((task) => task.id === followupTasks[1]!.id),
-          ).toMatchObject({
-            status: "completed",
-            result,
-          });
-          expect(
-            finishedParent.contextTransfers.filter(
-              (transfer) =>
-                transfer.type === "subagent_result" &&
-                transfer.sourceThreadId === delegated.childThreadId,
+            Stream.runHead,
+            Effect.flatMap(
+              Option.match({
+                onNone: () => Effect.die("Follow-up task did not settle."),
+                onSome: () => Effect.void,
+              }),
             ),
-          ).toHaveLength(3);
-          expect(
-            finishedParent.subagents.find((task) => task.id === followupTasks[1]!.id)
-              ?.completionDelivery?.state,
-          ).toBe("claimed");
-          const finalStatusCall = yield* invoke("task_status", {
-            taskId: delegated.taskId,
-          });
-          const finalStatus = yield* decodeDelegateTaskResult(
-            finalStatusCall.structuredContent,
-          ).pipe(Effect.orDie);
-          expect(finalStatus).toMatchObject({
-            childRunId: delegated.childRunId,
-            status: "completed",
-            summary: delegatedResult,
-            resultContextTransferId: delegated.resultContextTransferId,
-            hasPendingChildRuns: false,
-            latestTerminalRunId: queuedFollowup.runId,
-            latestTerminalStatus: "completed",
-            latestTerminalSummary: latestSummary,
-          });
-          const followupTransfer = finishedParent.contextTransfers.find(
+          );
+        const finishedParent = yield* orchestrator.getThreadProjection(parentThreadId);
+        expect(
+          finishedParent.subagents.find((task) => task.id === followupTasks[0]!.id)?.status,
+        ).toBe("interrupted");
+        expect(
+          finishedParent.subagents.find((task) => task.id === followupTasks[1]!.id),
+        ).toMatchObject({
+          status: "completed",
+          result,
+        });
+        expect(
+          finishedParent.contextTransfers.filter(
             (transfer) =>
               transfer.type === "subagent_result" &&
-              transfer.sourcePoint.runId === queuedFollowup.runId,
-          );
-          expect(followupTransfer).toBeDefined();
-          expect(finalStatus.latestTerminalResultContextTransferId).toBe(followupTransfer?.id);
-          expect(finalStatus.latestTerminalResultContextTransferId).not.toBe(
-            delegated.resultContextTransferId,
-          );
-          const transferReads: Array<string> = [];
-          const messageReads: Array<string> = [];
-          const runReads: Array<string> = [];
-          const projectionTableReads: Array<string> = [];
-          const acknowledgementReads: Array<string> = [];
-          const tracer = Tracer.make({
-            span(options) {
-              const span = new Tracer.NativeSpan(options);
-              const end = span.end.bind(span);
-              span.end = (endTime, exit) => {
-                end(endTime, exit);
-                const query = span.attributes.get("db.query.text");
-                if (typeof query !== "string") return;
-                let parent = Option.getOrUndefined(span.parent);
-                while (parent?._tag === "Span") {
-                  if (
-                    parent.name === "Orchestrator.dispatchDelegatedTaskCompletionDeliveryResolution"
-                  ) {
-                    acknowledgementReads.push(query);
-                    break;
-                  }
-                  parent = Option.getOrUndefined(parent.parent);
-                }
-                for (const [, table] of query.matchAll(
-                  /FROM orchestration_v2_projection_(\w+)/gi,
-                )) {
-                  projectionTableReads.push(table!);
-                }
-                if (
-                  /SELECT[\s\S]*FROM orchestration_v2_projection_context_transfers/i.test(query)
-                ) {
-                  transferReads.push(query);
-                }
-                if (/SELECT\s+payload_json\s+FROM orchestration_v2_projection_runs/i.test(query)) {
-                  runReads.push(query);
-                }
+              transfer.sourceThreadId === delegated.childThreadId,
+          ),
+        ).toHaveLength(3);
+        expect(
+          finishedParent.subagents.find((task) => task.id === followupTasks[1]!.id)
+            ?.completionDelivery?.state,
+        ).toBe("claimed");
+        const finalStatusCall = yield* invoke("task_status", {
+          taskId: delegated.taskId,
+        });
+        const finalStatus = yield* decodeDelegateTaskResult(finalStatusCall.structuredContent).pipe(
+          Effect.orDie,
+        );
+        expect(finalStatus).toMatchObject({
+          childRunId: delegated.childRunId,
+          status: "completed",
+          summary: delegatedResult,
+          resultContextTransferId: delegated.resultContextTransferId,
+          hasPendingChildRuns: false,
+          latestTerminalRunId: queuedFollowup.runId,
+          latestTerminalStatus: "completed",
+          latestTerminalSummary: latestSummary,
+        });
+        const followupTransfer = finishedParent.contextTransfers.find(
+          (transfer) =>
+            transfer.type === "subagent_result" &&
+            transfer.sourcePoint.runId === queuedFollowup.runId,
+        );
+        expect(followupTransfer).toBeDefined();
+        expect(finalStatus.latestTerminalResultContextTransferId).toBe(followupTransfer?.id);
+        expect(finalStatus.latestTerminalResultContextTransferId).not.toBe(
+          delegated.resultContextTransferId,
+        );
+        const transferReads: Array<string> = [];
+        const messageReads: Array<string> = [];
+        const runReads: Array<string> = [];
+        const projectionTableReads: Array<string> = [];
+        const acknowledgementReads: Array<string> = [];
+        const tracer = Tracer.make({
+          span(options) {
+            const span = new Tracer.NativeSpan(options);
+            const end = span.end.bind(span);
+            span.end = (endTime, exit) => {
+              end(endTime, exit);
+              const query = span.attributes.get("db.query.text");
+              if (typeof query !== "string") return;
+              let parent = Option.getOrUndefined(span.parent);
+              while (parent?._tag === "Span") {
                 if (
-                  /SELECT\s+payload_json\s+FROM orchestration_v2_projection_messages/i.test(query)
+                  parent.name === "Orchestrator.dispatchDelegatedTaskCompletionDeliveryResolution"
                 ) {
-                  messageReads.push(query);
+                  acknowledgementReads.push(query);
+                  break;
                 }
-              };
-              return span;
-            },
-          });
-          const wait = yield* invoke(
-            "t3_thread_wait",
-            { threadId: delegated.childThreadId, runId: queuedFollowup.runId },
-            { ...invocation, thread: undefined },
-          ).pipe(Effect.withTracer(tracer));
-          expect(wait.isError).not.toBe(true);
-          const expectedWait = {
+                parent = Option.getOrUndefined(parent.parent);
+              }
+              for (const [, table] of query.matchAll(/FROM orchestration_v2_projection_(\w+)/gi)) {
+                projectionTableReads.push(table!);
+              }
+              if (/SELECT[\s\S]*FROM orchestration_v2_projection_context_transfers/i.test(query)) {
+                transferReads.push(query);
+              }
+              if (/SELECT\s+payload_json\s+FROM orchestration_v2_projection_runs/i.test(query)) {
+                runReads.push(query);
+              }
+              if (
+                /SELECT\s+payload_json\s+FROM orchestration_v2_projection_messages/i.test(query)
+              ) {
+                messageReads.push(query);
+              }
+            };
+            return span;
+          },
+        });
+        const wait = yield* invoke(
+          "t3_thread_wait",
+          { threadId: delegated.childThreadId, runId: queuedFollowup.runId },
+          { ...invocation, thread: undefined },
+        ).pipe(Effect.withTracer(tracer));
+        expect(wait.isError).not.toBe(true);
+        const expectedWait = {
+          threadId: delegated.childThreadId,
+          runId: queuedFollowup.runId,
+          status: "completed",
+          timedOut: false,
+        };
+        expect(wait.structuredContent).toEqual(expectedWait);
+        expect(messageReads).toEqual([]);
+        expect(transferReads).toHaveLength(0);
+        const settledWait = yield* invoke(
+          "t3_thread_wait",
+          {
             threadId: delegated.childThreadId,
             runId: queuedFollowup.runId,
-            status: "completed",
-            timedOut: false,
-          };
-          expect(wait.structuredContent).toEqual(expectedWait);
-          expect(messageReads).toEqual([]);
-          expect(transferReads).toHaveLength(0);
-          const settledWait = yield* invoke(
-            "t3_thread_wait",
-            {
-              threadId: delegated.childThreadId,
-              runId: queuedFollowup.runId,
-              untilDelegatedWorkSettled: true,
-            },
-            { ...invocation, thread: undefined },
-          ).pipe(Effect.withTracer(tracer));
-          expect(settledWait.isError).not.toBe(true);
-          expect(settledWait.structuredContent).toMatchObject({
-            ...expectedWait,
-            resultRun: { runId: queuedFollowup.runId, status: "completed" },
+            untilDelegatedWorkSettled: true,
+          },
+          { ...invocation, thread: undefined },
+        ).pipe(Effect.withTracer(tracer));
+        expect(settledWait.isError).not.toBe(true);
+        expect(settledWait.structuredContent).toMatchObject({
+          ...expectedWait,
+          resultRun: { runId: queuedFollowup.runId, status: "completed" },
+        });
+        expect(messageReads.length).toBeGreaterThan(0);
+        expect(
+          messageReads.filter((query) => query.includes("$.notification.source.kind")),
+        ).toHaveLength(1);
+        // The orchestrator's restart-continuation guard still reads its own records.
+        expect(
+          messageReads.filter((query) => !query.includes("$.notification.source.kind")),
+        ).toHaveLength(1);
+        const parentlessRead = yield* invoke(
+          "t3_thread_read",
+          {
+            threadId: delegated.childThreadId,
+            limit: 100,
+            maxCharsPerItem: result === "😀" ? 1 : 50_000,
+          },
+          { ...invocation, thread: undefined },
+        ).pipe(Effect.withTracer(tracer));
+        expect(parentlessRead.isError).not.toBe(true);
+        expect(transferReads).toHaveLength(0);
+        const afterParentlessRead = yield* orchestrator.getThreadProjection(parentThreadId);
+        expect(
+          afterParentlessRead.subagents.find((task) => task.id === queuedFollowup.taskId)
+            ?.completionDelivery?.state,
+        ).toBe("claimed");
+
+        const read = yield* invoke("t3_thread_read", {
+          threadId: delegated.childThreadId,
+          limit: 100,
+          ...(result === "😀" ? { maxCharsPerItem: 1 } : {}),
+        }).pipe(Effect.withTracer(tracer));
+        expect(read.isError).not.toBe(true);
+        expect(transferReads.length).toBeGreaterThan(0);
+        const firstPage = yield* decodeThreadRead(read.structuredContent);
+        const finalItem = firstPage.items.find((item) => item.text === result.slice(0, 500));
+        expect(finalItem).toBeDefined();
+        if (result.length > 500) {
+          yield* invoke("t3_thread_read", {
+            threadId: delegated.childThreadId,
+            itemId: finalItem!.itemId,
+            textOffset: result.length,
           });
-          expect(messageReads.length).toBeGreaterThan(0);
-          expect(
-            messageReads.filter((query) => query.includes("$.notification.source.kind")),
-          ).toHaveLength(1);
-          // The orchestrator's restart-continuation guard still reads its own records.
-          expect(
-            messageReads.filter((query) => !query.includes("$.notification.source.kind")),
-          ).toHaveLength(1);
-          const parentlessRead = yield* invoke(
-            "t3_thread_read",
-            {
-              threadId: delegated.childThreadId,
-              limit: 100,
-              maxCharsPerItem: result === "😀" ? 1 : 20_000,
-            },
-            { ...invocation, thread: undefined },
-          ).pipe(Effect.withTracer(tracer));
-          expect(parentlessRead.isError).not.toBe(true);
-          expect(transferReads).toHaveLength(0);
-          const afterParentlessRead = yield* orchestrator.getThreadProjection(parentThreadId);
+        } else {
+          expect(read.structuredContent).toEqual(parentlessRead.structuredContent);
+        }
+        let text = finalItem!.text ?? "";
+        let nextTextOffset = finalItem?.nextTextOffset ?? null;
+        while (nextTextOffset !== null) {
+          const beforeContinuation = yield* orchestrator.getThreadProjection(parentThreadId);
           expect(
-            afterParentlessRead.subagents.find((task) => task.id === queuedFollowup.taskId)
+            beforeContinuation.subagents.find((task) => task.id === queuedFollowup.taskId)
               ?.completionDelivery?.state,
           ).toBe("claimed");
-
-          const read = yield* invoke("t3_thread_read", {
+          const continuation = yield* invoke("t3_thread_read", {
             threadId: delegated.childThreadId,
-            limit: 100,
-            maxCharsPerItem: result === "😀" ? 1 : 20_000,
+            itemId: finalItem!.itemId,
+            textOffset: nextTextOffset,
+            maxCharsPerItem: 50_000,
           }).pipe(Effect.withTracer(tracer));
-          expect(read.isError).not.toBe(true);
-          expect(transferReads.length).toBeGreaterThan(0);
-          expect(read.structuredContent).toEqual(parentlessRead.structuredContent);
-          // The acknowledgement reads the task and its spawning run by id, not the parent's history.
-          expect(acknowledgementReads.length).toBeGreaterThan(0);
-          expect(
-            acknowledgementReads.filter(
-              (query) =>
-                /FROM orchestration_v2_projection_(nodes|run_attempts)\b/.test(query) ||
-                (/FROM orchestration_v2_projection_runs\b/.test(query) &&
-                  !query.includes("AND run_id IN")) ||
-                (/FROM orchestration_v2_projection_subagents\b/.test(query) &&
-                  !query.includes("AND subagent_id IN")),
-            ),
-          ).toEqual([]);
-          const afterRead = yield* orchestrator.getThreadProjection(parentThreadId);
-          expect(
-            afterRead.subagents.find((task) => task.id === queuedFollowup.taskId)
-              ?.completionDelivery?.state,
-          ).toBe("acknowledged");
+          const nextPage = yield* decodeThreadRead(continuation.structuredContent);
+          text += nextPage.items[0]?.text ?? "";
+          nextTextOffset = nextPage.items[0]?.nextTextOffset ?? null;
+        }
+        expect(text).toBe(result);
+        // The acknowledgement reads the task and its spawning run by id, not the parent's history.
+        expect(acknowledgementReads.length).toBeGreaterThan(0);
+        expect(
+          acknowledgementReads.filter(
+            (query) =>
+              /FROM orchestration_v2_projection_(nodes|run_attempts)\b/.test(query) ||
+              (/FROM orchestration_v2_projection_runs\b/.test(query) &&
+                !query.includes("AND run_id IN")) ||
+              (/FROM orchestration_v2_projection_subagents\b/.test(query) &&
+                !query.includes("AND subagent_id IN")),
+          ),
+        ).toEqual([]);
+        const afterRead = yield* orchestrator.getThreadProjection(parentThreadId);
+        expect(
+          afterRead.subagents.find((task) => task.id === queuedFollowup.taskId)?.completionDelivery
+            ?.state,
+        ).toBe("acknowledged");
 
-          const messageReadsBeforeCapabilities = messageReads.length;
-          const tableReadsBeforeCapabilities = projectionTableReads.length;
-          const capabilities = yield* invoke("orchestrator_capabilities", {}).pipe(
-            Effect.withTracer(tracer),
-          );
-          expect(capabilities.isError).not.toBe(true);
-          expect(messageReads).toHaveLength(messageReadsBeforeCapabilities);
-          // The caller check reads only the thread row, never its history.
-          expect(new Set(projectionTableReads.slice(tableReadsBeforeCapabilities))).toEqual(
-            new Set(["threads"]),
-          );
-          const runReadsBeforeStatus = runReads.length;
-          const transferReadsBeforeStatus = transferReads.length;
-          const threadRecordReadsBeforeStatus = threadRecordReads.length;
-          const statusAgain = yield* invoke("task_status", { taskId: delegated.taskId }).pipe(
-            Effect.withTracer(tracer),
-          );
-          expect(statusAgain.isError).not.toBe(true);
-          // A task wait reads result transfers and runs from the child; the parent's stay unread.
-          expect(runReads).toHaveLength(runReadsBeforeStatus + 1);
-          expect(transferReads).toHaveLength(transferReadsBeforeStatus + 1);
-          expect(
-            threadRecordReads
-              .slice(threadRecordReadsBeforeStatus)
-              .filter(
-                ({ fields }) => fields.includes("runs") || fields.includes("contextTransfers"),
-              )
-              .map(({ threadId }) => threadId),
-          ).toEqual([delegated.childThreadId]);
-        }).pipe(Effect.provide(layerTest));
-      }),
-    ),
+        const messageReadsBeforeCapabilities = messageReads.length;
+        const tableReadsBeforeCapabilities = projectionTableReads.length;
+        const capabilities = yield* invoke("orchestrator_capabilities", {}).pipe(
+          Effect.withTracer(tracer),
+        );
+        expect(capabilities.isError).not.toBe(true);
+        expect(messageReads).toHaveLength(messageReadsBeforeCapabilities);
+        // The caller check reads only the thread row, never its history.
+        expect(new Set(projectionTableReads.slice(tableReadsBeforeCapabilities))).toEqual(
+          new Set(["threads"]),
+        );
+        const runReadsBeforeStatus = runReads.length;
+        const transferReadsBeforeStatus = transferReads.length;
+        const threadRecordReadsBeforeStatus = threadRecordReads.length;
+        const statusAgain = yield* invoke("task_status", { taskId: delegated.taskId }).pipe(
+          Effect.withTracer(tracer),
+        );
+        expect(statusAgain.isError).not.toBe(true);
+        // A task wait reads result transfers and runs from the child; the parent's stay unread.
+        expect(runReads).toHaveLength(runReadsBeforeStatus + 1);
+        expect(transferReads).toHaveLength(transferReadsBeforeStatus + 1);
+        expect(
+          threadRecordReads
+            .slice(threadRecordReadsBeforeStatus)
+            .filter(({ fields }) => fields.includes("runs") || fields.includes("contextTransfers"))
+            .map(({ threadId }) => threadId),
+        ).toEqual([delegated.childThreadId]);
+      }).pipe(Effect.provide(layerTest));
+    }),
   );
 });
diff --git a/apps/server/src/mcp/PreviewAutomationBroker.test.ts b/apps/server/src/mcp/PreviewAutomationBroker.test.ts
index 1c193096db27..e800570b8ba5 100644
--- a/apps/server/src/mcp/PreviewAutomationBroker.test.ts
+++ b/apps/server/src/mcp/PreviewAutomationBroker.test.ts
@@ -66,230 +66,220 @@ const requestsFrom = (
   );
 
 it.effect("atomically registers a connected host and correlates its response", () =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      const broker = yield* makeBroker;
-      const requests = requestsFrom(yield* broker.connect(makeHost()));
-      yield* Stream.runForEach(requests, (request) =>
-        broker.respond({
-          clientId: "client-1",
-          connectionId: request.connectionId,
-          requestId: request.requestId,
-          ok: true,
-          result: { available: true },
-        }),
-      ).pipe(Effect.forkScoped);
-      yield* Effect.yieldNow;
+  Effect.gen(function* () {
+    const broker = yield* makeBroker;
+    const requests = requestsFrom(yield* broker.connect(makeHost()));
+    yield* Stream.runForEach(requests, (request) =>
+      broker.respond({
+        clientId: "client-1",
+        connectionId: request.connectionId,
+        requestId: request.requestId,
+        ok: true,
+        result: { available: true },
+      }),
+    ).pipe(Effect.forkScoped);
+    yield* Effect.yieldNow;
 
-      const result = yield* broker.invoke<{ available: boolean }>({
-        scope,
-        operation: "open",
-        input: {},
-      });
+    const result = yield* broker.invoke<{ available: boolean }>({
+      scope,
+      operation: "open",
+      input: {},
+    });
 
-      expect(result).toEqual({ available: true });
-    }),
-  ),
+    expect(result).toEqual({ available: true });
+  }),
 );
 
 it.effect("targets multiple tabs explicitly while retaining a default tab", () =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      const broker = yield* makeBroker;
-      const appTabId = PreviewTabId.make("tab-web-app");
-      const simulatorTabId = PreviewTabId.make("tab-ios-simulator");
-      const openedTabIds = [appTabId, simulatorTabId];
-      let openIndex = 0;
-      const routedRequests: RoutedRequest[] = [];
-      const requests = requestsFrom(yield* broker.connect(makeHost()));
-      yield* Stream.runForEach(requests, (request) => {
-        routedRequests.push(request);
-        return broker.respond({
-          clientId: "client-1",
-          connectionId: request.connectionId,
-          requestId: request.requestId,
-          ok: true,
-          result:
-            request.operation === "open"
-              ? { available: true, tabId: openedTabIds[openIndex++] }
-              : { url: "http://localhost:3200" },
-        });
-      }).pipe(Effect.forkScoped);
-      yield* Effect.yieldNow;
-
-      yield* broker.invoke({ scope, operation: "open", input: { reuseExistingTab: false } });
-      yield* broker.invoke({ scope, operation: "open", input: { reuseExistingTab: false } });
-      yield* broker.invoke({ scope, operation: "snapshot", input: {} });
-      yield* broker.invoke({ scope, operation: "snapshot", input: {}, tabId: appTabId });
-      yield* broker.invoke({ scope, operation: "snapshot", input: {} });
-
-      expect(routedRequests).toHaveLength(5);
-      expect(routedRequests[0]?.tabId).toBeUndefined();
-      expect(routedRequests[1]?.tabId).toBe(appTabId);
-      expect(routedRequests[2]?.tabId).toBe(simulatorTabId);
-      expect(routedRequests[2]?.tabIdExplicit).toBe(false);
-      expect(routedRequests[3]?.tabId).toBe(appTabId);
-      expect(routedRequests[3]?.tabIdExplicit).toBe(true);
-      expect(routedRequests[4]?.tabId).toBe(appTabId);
-    }),
-  ),
+  Effect.gen(function* () {
+    const broker = yield* makeBroker;
+    const appTabId = PreviewTabId.make("tab-web-app");
+    const simulatorTabId = PreviewTabId.make("tab-ios-simulator");
+    const openedTabIds = [appTabId, simulatorTabId];
+    let openIndex = 0;
+    const routedRequests: RoutedRequest[] = [];
+    const requests = requestsFrom(yield* broker.connect(makeHost()));
+    yield* Stream.runForEach(requests, (request) => {
+      routedRequests.push(request);
+      return broker.respond({
+        clientId: "client-1",
+        connectionId: request.connectionId,
+        requestId: request.requestId,
+        ok: true,
+        result:
+          request.operation === "open"
+            ? { available: true, tabId: openedTabIds[openIndex++] }
+            : { url: "http://localhost:3200" },
+      });
+    }).pipe(Effect.forkScoped);
+    yield* Effect.yieldNow;
+
+    yield* broker.invoke({ scope, operation: "open", input: { reuseExistingTab: false } });
+    yield* broker.invoke({ scope, operation: "open", input: { reuseExistingTab: false } });
+    yield* broker.invoke({ scope, operation: "snapshot", input: {} });
+    yield* broker.invoke({ scope, operation: "snapshot", input: {}, tabId: appTabId });
+    yield* broker.invoke({ scope, operation: "snapshot", input: {} });
+
+    expect(routedRequests).toHaveLength(5);
+    expect(routedRequests[0]?.tabId).toBeUndefined();
+    expect(routedRequests[1]?.tabId).toBe(appTabId);
+    expect(routedRequests[2]?.tabId).toBe(simulatorTabId);
+    expect(routedRequests[2]?.tabIdExplicit).toBe(false);
+    expect(routedRequests[3]?.tabId).toBe(appTabId);
+    expect(routedRequests[3]?.tabIdExplicit).toBe(true);
+    expect(routedRequests[4]?.tabId).toBe(appTabId);
+  }),
 );
 
 it.effect.each([true, false])(
   "keeps an older target stable while a newer explicit tab responds (implicit: %s)",
   (implicit) =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const broker = yield* makeBroker;
-        const olderTabId = PreviewTabId.make("tab-older-request");
-        const newerTabId = PreviewTabId.make("tab-newer-request");
-        const releaseOlderResponse = yield* Deferred.make<void>();
-        const routedRequests: RoutedRequest[] = [];
-        const requests = requestsFrom(yield* broker.connect(makeHost()));
-        yield* Stream.runForEach(requests, (request) => {
-          routedRequests.push(request);
-          const response = Effect.gen(function* () {
-            if (request.tabId === olderTabId && request.operation === "snapshot") {
-              yield* Deferred.await(releaseOlderResponse);
-            }
-            yield* broker.respond({
-              clientId: "client-1",
-              connectionId: request.connectionId,
-              requestId: request.requestId,
-              ok: true,
-              result: { url: "http://localhost:3200" },
-            });
-            if (request.tabId === newerTabId) {
-              yield* Deferred.succeed(releaseOlderResponse, undefined);
-            }
-          });
-          return response.pipe(Effect.forkScoped, Effect.asVoid);
-        }).pipe(Effect.forkScoped);
-        yield* Effect.yieldNow;
-
-        yield* broker.invoke({ scope, operation: "status", input: {}, tabId: olderTabId });
-        let capturedTabId: PreviewTabId | undefined;
-        const older = yield* broker
-          .invoke({
-            scope,
-            operation: "snapshot",
-            input: {},
-            ...(implicit ? {} : { tabId: olderTabId }),
-            onTargetTab: (tabId) => {
-              capturedTabId = tabId;
-            },
-          })
-          .pipe(Effect.forkScoped);
-        yield* Effect.yieldNow;
-        const newer = yield* broker
-          .invoke({ scope, operation: "snapshot", input: {}, tabId: newerTabId })
-          .pipe(Effect.forkScoped);
-        yield* Fiber.join(newer);
-        yield* Fiber.join(older);
-        yield* broker.invoke({
-          scope,
-          operation: "status",
-          input: {},
-          tabId: olderTabId,
-          updateCurrentTab: false,
-        });
-        yield* broker.invoke({ scope, operation: "snapshot", input: {} });
-
-        expect(routedRequests.at(-1)?.tabId).toBe(newerTabId);
-        expect(capturedTabId).toBe(olderTabId);
-      }),
-    ),
-);
-
-it.effect("does not let a no-tab response suppress an earlier tab decision", () =>
-  Effect.scoped(
     Effect.gen(function* () {
       const broker = yield* makeBroker;
-      const initialTabId = PreviewTabId.make("tab-initial");
-      const openedTabId = PreviewTabId.make("tab-opened-late");
-      const releaseOpenResponse = yield* Deferred.make<void>();
+      const olderTabId = PreviewTabId.make("tab-older-request");
+      const newerTabId = PreviewTabId.make("tab-newer-request");
+      const releaseOlderResponse = yield* Deferred.make<void>();
       const routedRequests: RoutedRequest[] = [];
       const requests = requestsFrom(yield* broker.connect(makeHost()));
       yield* Stream.runForEach(requests, (request) => {
         routedRequests.push(request);
-        const marker =
-          typeof request.input === "object" && request.input !== null && "marker" in request.input
-            ? request.input.marker
-            : undefined;
         const response = Effect.gen(function* () {
-          if (marker === "older") {
-            yield* Deferred.await(releaseOpenResponse);
+          if (request.tabId === olderTabId && request.operation === "snapshot") {
+            yield* Deferred.await(releaseOlderResponse);
           }
           yield* broker.respond({
             clientId: "client-1",
             connectionId: request.connectionId,
             requestId: request.requestId,
             ok: true,
-            result:
-              request.operation === "open"
-                ? { available: true, tabId: marker === "older" ? openedTabId : initialTabId }
-                : { url: "http://localhost:3200" },
+            result: { url: "http://localhost:3200" },
           });
-          if (marker === "newer") {
-            yield* Deferred.succeed(releaseOpenResponse, undefined);
+          if (request.tabId === newerTabId) {
+            yield* Deferred.succeed(releaseOlderResponse, undefined);
           }
         });
         return response.pipe(Effect.forkScoped, Effect.asVoid);
       }).pipe(Effect.forkScoped);
       yield* Effect.yieldNow;
 
-      yield* broker.invoke({ scope, operation: "open", input: {} });
+      yield* broker.invoke({ scope, operation: "status", input: {}, tabId: olderTabId });
+      let capturedTabId: PreviewTabId | undefined;
       const older = yield* broker
         .invoke({
           scope,
-          operation: "open",
-          input: { marker: "older", reuseExistingTab: false },
+          operation: "snapshot",
+          input: {},
+          ...(implicit ? {} : { tabId: olderTabId }),
+          onTargetTab: (tabId) => {
+            capturedTabId = tabId;
+          },
         })
         .pipe(Effect.forkScoped);
       yield* Effect.yieldNow;
       const newer = yield* broker
-        .invoke({ scope, operation: "snapshot", input: { marker: "newer" } })
+        .invoke({ scope, operation: "snapshot", input: {}, tabId: newerTabId })
         .pipe(Effect.forkScoped);
       yield* Fiber.join(newer);
       yield* Fiber.join(older);
+      yield* broker.invoke({
+        scope,
+        operation: "status",
+        input: {},
+        tabId: olderTabId,
+        updateCurrentTab: false,
+      });
       yield* broker.invoke({ scope, operation: "snapshot", input: {} });
 
-      expect(routedRequests.at(-1)?.tabId).toBe(openedTabId);
+      expect(routedRequests.at(-1)?.tabId).toBe(newerTabId);
+      expect(capturedTabId).toBe(olderTabId);
     }),
-  ),
+);
+
+it.effect("does not let a no-tab response suppress an earlier tab decision", () =>
+  Effect.gen(function* () {
+    const broker = yield* makeBroker;
+    const initialTabId = PreviewTabId.make("tab-initial");
+    const openedTabId = PreviewTabId.make("tab-opened-late");
+    const releaseOpenResponse = yield* Deferred.make<void>();
+    const routedRequests: RoutedRequest[] = [];
+    const requests = requestsFrom(yield* broker.connect(makeHost()));
+    yield* Stream.runForEach(requests, (request) => {
+      routedRequests.push(request);
+      const marker =
+        typeof request.input === "object" && request.input !== null && "marker" in request.input
+          ? request.input.marker
+          : undefined;
+      const response = Effect.gen(function* () {
+        if (marker === "older") {
+          yield* Deferred.await(releaseOpenResponse);
+        }
+        yield* broker.respond({
+          clientId: "client-1",
+          connectionId: request.connectionId,
+          requestId: request.requestId,
+          ok: true,
+          result:
+            request.operation === "open"
+              ? { available: true, tabId: marker === "older" ? openedTabId : initialTabId }
+              : { url: "http://localhost:3200" },
+        });
+        if (marker === "newer") {
+          yield* Deferred.succeed(releaseOpenResponse, undefined);
+        }
+      });
+      return response.pipe(Effect.forkScoped, Effect.asVoid);
+    }).pipe(Effect.forkScoped);
+    yield* Effect.yieldNow;
+
+    yield* broker.invoke({ scope, operation: "open", input: {} });
+    const older = yield* broker
+      .invoke({
+        scope,
+        operation: "open",
+        input: { marker: "older", reuseExistingTab: false },
+      })
+      .pipe(Effect.forkScoped);
+    yield* Effect.yieldNow;
+    const newer = yield* broker
+      .invoke({ scope, operation: "snapshot", input: { marker: "newer" } })
+      .pipe(Effect.forkScoped);
+    yield* Fiber.join(newer);
+    yield* Fiber.join(older);
+    yield* broker.invoke({ scope, operation: "snapshot", input: {} });
+
+    expect(routedRequests.at(-1)?.tabId).toBe(openedTabId);
+  }),
 );
 
 it.effect("announces a live replacement stream before delivering requests", () =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      const broker = yield* makeBroker;
-      const events = yield* broker.connect(makeHost());
-      const receivedTypes: PreviewAutomationStreamEvent["type"][] = [];
-      const consumer = yield* events.pipe(
-        Stream.take(2),
-        Stream.runForEach((event) => {
-          receivedTypes.push(event.type);
-          return event.type === "connected"
-            ? Effect.void
-            : broker.respond({
-                clientId: "client-1",
-                connectionId: event.connectionId,
-                requestId: event.request.requestId,
-                ok: true,
-                result: "ready",
-              });
-        }),
-        Effect.forkScoped,
-      );
-      yield* Effect.yieldNow;
+  Effect.gen(function* () {
+    const broker = yield* makeBroker;
+    const events = yield* broker.connect(makeHost());
+    const receivedTypes: PreviewAutomationStreamEvent["type"][] = [];
+    const consumer = yield* events.pipe(
+      Stream.take(2),
+      Stream.runForEach((event) => {
+        receivedTypes.push(event.type);
+        return event.type === "connected"
+          ? Effect.void
+          : broker.respond({
+              clientId: "client-1",
+              connectionId: event.connectionId,
+              requestId: event.request.requestId,
+              ok: true,
+              result: "ready",
+            });
+      }),
+      Effect.forkScoped,
+    );
+    yield* Effect.yieldNow;
 
-      const result = yield* broker.invoke<string>({ scope, operation: "status", input: {} });
-      yield* Fiber.join(consumer);
+    const result = yield* broker.invoke<string>({ scope, operation: "status", input: {} });
+    yield* Fiber.join(consumer);
 
-      expect(receivedTypes).toEqual(["connected", "request"]);
-      expect(result).toBe("ready");
-    }),
-  ),
+    expect(receivedTypes).toEqual(["connected", "request"]);
+    expect(result).toBe("ready");
+  }),
 );
 
 it.effect.each([
@@ -309,101 +299,95 @@ it.effect.each([
     message: new PreviewBrowserRootError().message,
   },
 ])("preserves server browser failure guidance ($clientId)", ({ clientId, shown, message }) =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      const broker = yield* makeBroker;
-      const requests = requestsFrom(yield* broker.connect(makeHost({ clientId })));
-      yield* Stream.runForEach(requests, (request) =>
-        broker.respond({
-          clientId,
-          connectionId: request.connectionId,
-          requestId: request.requestId,
-          ok: false,
-          error: {
-            _tag: "PreviewAutomationExecutionError",
-            message,
-          },
-        }),
-      ).pipe(Effect.forkScoped);
-      yield* Effect.yieldNow;
-      const error = yield* broker
-        .invoke<void>({ scope, operation: "open", input: {} })
-        .pipe(Effect.flip);
-      expect(error._tag).toBe("PreviewAutomationExecutionError");
-      expect(error.message.includes(message)).toBe(shown);
-    }),
-  ),
+  Effect.gen(function* () {
+    const broker = yield* makeBroker;
+    const requests = requestsFrom(yield* broker.connect(makeHost({ clientId })));
+    yield* Stream.runForEach(requests, (request) =>
+      broker.respond({
+        clientId,
+        connectionId: request.connectionId,
+        requestId: request.requestId,
+        ok: false,
+        error: {
+          _tag: "PreviewAutomationExecutionError",
+          message,
+        },
+      }),
+    ).pipe(Effect.forkScoped);
+    yield* Effect.yieldNow;
+    const error = yield* broker
+      .invoke<void>({ scope, operation: "open", input: {} })
+      .pipe(Effect.flip);
+    expect(error._tag).toBe("PreviewAutomationExecutionError");
+    expect(error.message.includes(message)).toBe(shown);
+  }),
 );
 
 it.effect("names the click target that matched nothing when the server browser times out", () =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      const broker = yield* makeBroker;
-      const clientId = SERVER_BROWSER_AUTOMATION_CLIENT_ID;
-      const requests = requestsFrom(yield* broker.connect(makeHost({ clientId })));
-      yield* Stream.runForEach(requests, (request) =>
-        broker.respond({
-          clientId,
-          connectionId: request.connectionId,
-          requestId: request.requestId,
-          ok: false,
-          error: {
-            _tag: "PreviewAutomationTimeoutError",
-            message: "No element matches the target.",
-            detail: { reason: 'No element matches ".definitely-no-such-t3-target".' },
-          },
-        }),
-      ).pipe(Effect.forkScoped);
-      yield* Effect.yieldNow;
+  Effect.gen(function* () {
+    const broker = yield* makeBroker;
+    const clientId = SERVER_BROWSER_AUTOMATION_CLIENT_ID;
+    const requests = requestsFrom(yield* broker.connect(makeHost({ clientId })));
+    yield* Stream.runForEach(requests, (request) =>
+      broker.respond({
+        clientId,
+        connectionId: request.connectionId,
+        requestId: request.requestId,
+        ok: false,
+        error: {
+          _tag: "PreviewAutomationTimeoutError",
+          message: "No element matches the target.",
+          detail: { reason: 'No element matches ".definitely-no-such-t3-target".' },
+        },
+      }),
+    ).pipe(Effect.forkScoped);
+    yield* Effect.yieldNow;
 
-      const error = yield* broker
-        .invoke<void>({
-          scope,
-          operation: "click",
-          input: { selector: ".definitely-no-such-t3-target", timeoutMs: 15_000 },
-        })
-        .pipe(Effect.flip);
+    const error = yield* broker
+      .invoke<void>({
+        scope,
+        operation: "click",
+        input: { selector: ".definitely-no-such-t3-target", timeoutMs: 15_000 },
+      })
+      .pipe(Effect.flip);
 
-      expect(error._tag).toBe("PreviewAutomationTimeoutError");
-      expect(error.message).toBe(
-        'Preview automation click timed out after 15000ms. No element matches ".definitely-no-such-t3-target".',
-      );
-    }),
-  ),
+    expect(error._tag).toBe("PreviewAutomationTimeoutError");
+    expect(error.message).toBe(
+      'Preview automation click timed out after 15000ms. No element matches ".definitely-no-such-t3-target".',
+    );
+  }),
 );
 
 it.effect("distinguishes malformed remote failures", () =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      const broker = yield* makeBroker;
-      const requests = requestsFrom(yield* broker.connect(makeHost()));
-      yield* Stream.runForEach(requests, (request) =>
-        broker.respond({
-          clientId: "client-1",
-          connectionId: request.connectionId,
-          requestId: request.requestId,
-          ok: false,
-        }),
-      ).pipe(Effect.forkScoped);
-      yield* Effect.yieldNow;
+  Effect.gen(function* () {
+    const broker = yield* makeBroker;
+    const requests = requestsFrom(yield* broker.connect(makeHost()));
+    yield* Stream.runForEach(requests, (request) =>
+      broker.respond({
+        clientId: "client-1",
+        connectionId: request.connectionId,
+        requestId: request.requestId,
+        ok: false,
+      }),
+    ).pipe(Effect.forkScoped);
+    yield* Effect.yieldNow;
 
-      const error = yield* broker
-        .invoke<void>({ scope, operation: "status", input: {}, timeoutMs: 2_000 })
-        .pipe(Effect.flip);
+    const error = yield* broker
+      .invoke<void>({ scope, operation: "status", input: {}, timeoutMs: 2_000 })
+      .pipe(Effect.flip);
 
-      expect(error).toBeInstanceOf(PreviewAutomationMalformedResponseError);
-      expect(error).toMatchObject({
-        operation: "status",
-        environmentId: scope.environmentId,
-        threadId: scope.thread.threadId,
-        providerSessionId: scope.thread.providerSessionId,
-        providerInstanceId: scope.thread.providerInstanceId,
-        clientId: "client-1",
-        requestId: "preview-0",
-        timeoutMs: 2_000,
-      });
-    }),
-  ),
+    expect(error).toBeInstanceOf(PreviewAutomationMalformedResponseError);
+    expect(error).toMatchObject({
+      operation: "status",
+      environmentId: scope.environmentId,
+      threadId: scope.thread.threadId,
+      providerSessionId: scope.thread.providerSessionId,
+      providerInstanceId: scope.thread.providerInstanceId,
+      clientId: "client-1",
+      requestId: "preview-0",
+      timeoutMs: 2_000,
+    });
+  }),
 );
 
 it.effect("does not create host state from focus updates without a live stream", () =>
@@ -424,665 +408,617 @@ it.effect("does not create host state from focus updates without a live stream",
 );
 
 it.effect("removes host availability when the authoritative request stream disconnects", () =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      const broker = yield* makeBroker;
-      const requests = requestsFrom(yield* broker.connect(makeHost()));
-      const beforeAcquisition = yield* broker
-        .invoke<void>({ scope, operation: "status", input: {} })
-        .pipe(Effect.flip);
-      expect(beforeAcquisition).toBeInstanceOf(PreviewAutomationNoAvailableHostError);
+  Effect.gen(function* () {
+    const broker = yield* makeBroker;
+    const requests = requestsFrom(yield* broker.connect(makeHost()));
+    const beforeAcquisition = yield* broker
+      .invoke<void>({ scope, operation: "status", input: {} })
+      .pipe(Effect.flip);
+    expect(beforeAcquisition).toBeInstanceOf(PreviewAutomationNoAvailableHostError);
 
-      const consumer = yield* Stream.runDrain(requests).pipe(Effect.forkScoped);
-      yield* Effect.yieldNow;
-      yield* Fiber.interrupt(consumer);
+    const consumer = yield* Stream.runDrain(requests).pipe(Effect.forkScoped);
+    yield* Effect.yieldNow;
+    yield* Fiber.interrupt(consumer);
 
-      const error = yield* broker
-        .invoke<void>({ scope, operation: "status", input: {} })
-        .pipe(Effect.flip);
-      expect(error).toBeInstanceOf(PreviewAutomationNoAvailableHostError);
-    }),
-  ),
+    const error = yield* broker
+      .invoke<void>({ scope, operation: "status", input: {} })
+      .pipe(Effect.flip);
+    expect(error).toBeInstanceOf(PreviewAutomationNoAvailableHostError);
+  }),
 );
 
 it.effect("routes requests for background threads through an environment-level host", () =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      const broker = yield* makeBroker;
-      const backgroundThreadId = ThreadId.make("thread-background");
-      const requests = requestsFrom(yield* broker.connect(makeHost()));
-      let routedThreadId: string | undefined;
-      yield* Stream.runForEach(requests, (request) => {
-        routedThreadId = request.threadId;
-        return broker.respond({
-          clientId: "client-1",
-          connectionId: request.connectionId,
-          requestId: request.requestId,
-          ok: true,
-          result: "background",
-        });
-      }).pipe(Effect.forkScoped);
-      yield* Effect.yieldNow;
+  Effect.gen(function* () {
+    const broker = yield* makeBroker;
+    const backgroundThreadId = ThreadId.make("thread-background");
+    const requests = requestsFrom(yield* broker.connect(makeHost()));
+    let routedThreadId: string | undefined;
+    yield* Stream.runForEach(requests, (request) => {
+      routedThreadId = request.threadId;
+      return broker.respond({
+        clientId: "client-1",
+        connectionId: request.connectionId,
+        requestId: request.requestId,
+        ok: true,
+        result: "background",
+      });
+    }).pipe(Effect.forkScoped);
+    yield* Effect.yieldNow;
+
+    const result = yield* broker.invoke<string>({
+      scope: {
+        ...scope,
+        thread: {
+          ...scope.thread,
+          threadId: backgroundThreadId,
+          providerSessionId: "provider-session-background",
+        },
+      },
+      operation: "status",
+      input: {},
+    });
+
+    expect(result).toBe("background");
+    expect(routedThreadId).toBe(backgroundThreadId);
+  }),
+);
+
+it.effect("never routes a provider session to a host from another environment", () =>
+  Effect.gen(function* () {
+    const broker = yield* makeBroker;
+    const matchingRequests = requestsFrom(
+      yield* broker.connect(makeHost({ clientId: "client-matching" })),
+    );
+    const foreignRequests = requestsFrom(
+      yield* broker.connect(
+        makeHost({
+          clientId: "client-foreign",
+          environmentId: EnvironmentId.make("environment-foreign"),
+        }),
+      ),
+    );
+    yield* Stream.runForEach(matchingRequests, (request) =>
+      broker.respond({
+        clientId: "client-matching",
+        connectionId: request.connectionId,
+        requestId: request.requestId,
+        ok: true,
+        result: "matching",
+      }),
+    ).pipe(Effect.forkScoped);
+    yield* Stream.runForEach(foreignRequests, (request) =>
+      broker.respond({
+        clientId: "client-foreign",
+        connectionId: request.connectionId,
+        requestId: request.requestId,
+        ok: true,
+        result: "foreign",
+      }),
+    ).pipe(Effect.forkScoped);
+    yield* Effect.yieldNow;
+
+    expect(yield* broker.invoke<string>({ scope, operation: "status", input: {} })).toBe(
+      "matching",
+    );
+  }),
+);
+
+it.effect("pins a provider session to its initial host despite later focus changes", () =>
+  Effect.gen(function* () {
+    const broker = yield* makeBroker;
+    let firstConnectionId = "";
+    let secondConnectionId = "";
+    const firstRequests = requestsFrom(
+      yield* broker.connect(makeHost({ clientId: "client-first" })),
+      (connectionId) => {
+        firstConnectionId = connectionId;
+      },
+    );
+    const secondRequests = requestsFrom(
+      yield* broker.connect(makeHost({ clientId: "client-second" })),
+      (connectionId) => {
+        secondConnectionId = connectionId;
+      },
+    );
+    yield* Stream.runForEach(firstRequests, (request) =>
+      broker.respond({
+        clientId: "client-first",
+        connectionId: request.connectionId,
+        requestId: request.requestId,
+        ok: true,
+        result: "first",
+      }),
+    ).pipe(Effect.forkScoped);
+    yield* Stream.runForEach(secondRequests, (request) =>
+      broker.respond({
+        clientId: "client-second",
+        connectionId: request.connectionId,
+        requestId: request.requestId,
+        ok: true,
+        result: "second",
+      }),
+    ).pipe(Effect.forkScoped);
+    yield* Effect.yieldNow;
+
+    yield* broker.focusHost({
+      clientId: "client-first",
+      environmentId: scope.environmentId,
+      connectionId: "connection-stale",
+      focused: true,
+      liveTabs: [{ threadId: scope.thread.threadId, tabId: PreviewTabId.make("stale-tab") }],
+    });
+    expect(yield* broker.invoke<string>({ scope, operation: "status", input: {} })).toBe("second");
+    yield* broker.focusHost({
+      clientId: "client-first",
+      environmentId: scope.environmentId,
+      connectionId: firstConnectionId,
+      focused: true,
+    });
 
-      const result = yield* broker.invoke<string>({
+    const firstPinnedScope = {
+      ...scope,
+      thread: { ...scope.thread, providerSessionId: "provider-session-first-pinned" },
+    };
+    expect(
+      yield* broker.invoke<string>({ scope: firstPinnedScope, operation: "status", input: {} }),
+    ).toBe("first");
+
+    yield* broker.focusHost({
+      clientId: "client-second",
+      environmentId: scope.environmentId,
+      connectionId: secondConnectionId,
+      focused: true,
+    });
+
+    expect(
+      yield* broker.invoke<string>({ scope: firstPinnedScope, operation: "status", input: {} }),
+    ).toBe("first");
+    expect(
+      yield* broker.invoke<string>({
         scope: {
           ...scope,
-          thread: {
-            ...scope.thread,
-            threadId: backgroundThreadId,
-            providerSessionId: "provider-session-background",
-          },
+          thread: { ...scope.thread, providerSessionId: "provider-session-second-pinned" },
         },
         operation: "status",
         input: {},
-      });
-
-      expect(result).toBe("background");
-      expect(routedThreadId).toBe(backgroundThreadId);
-    }),
-  ),
+      }),
+    ).toBe("second");
+  }),
 );
 
-it.effect("never routes a provider session to a host from another environment", () =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      const broker = yield* makeBroker;
-      const matchingRequests = requestsFrom(
-        yield* broker.connect(makeHost({ clientId: "client-matching" })),
-      );
-      const foreignRequests = requestsFrom(
-        yield* broker.connect(
-          makeHost({
-            clientId: "client-foreign",
-            environmentId: EnvironmentId.make("environment-foreign"),
-          }),
-        ),
+it.effect("prefers the live tab owner for new sessions without moving existing leases", () =>
+  Effect.gen(function* () {
+    const broker = yield* makeBroker;
+    const connections = new Map<string, string>();
+    for (const clientId of ["owner", "other"]) {
+      const requests = requestsFrom(yield* broker.connect(makeHost({ clientId })), (connectionId) =>
+        connections.set(clientId, connectionId),
       );
-      yield* Stream.runForEach(matchingRequests, (request) =>
+      yield* Stream.runForEach(requests, (request) =>
         broker.respond({
-          clientId: "client-matching",
+          clientId,
           connectionId: request.connectionId,
           requestId: request.requestId,
           ok: true,
-          result: "matching",
+          result: clientId,
         }),
       ).pipe(Effect.forkScoped);
-      yield* Stream.runForEach(foreignRequests, (request) =>
-        broker.respond({
-          clientId: "client-foreign",
-          connectionId: request.connectionId,
-          requestId: request.requestId,
-          ok: true,
-          result: "foreign",
-        }),
-      ).pipe(Effect.forkScoped);
-      yield* Effect.yieldNow;
-
-      expect(yield* broker.invoke<string>({ scope, operation: "status", input: {} })).toBe(
-        "matching",
-      );
-    }),
-  ),
-);
-
-it.effect("pins a provider session to its initial host despite later focus changes", () =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      const broker = yield* makeBroker;
-      let firstConnectionId = "";
-      let secondConnectionId = "";
-      const firstRequests = requestsFrom(
-        yield* broker.connect(makeHost({ clientId: "client-first" })),
-        (connectionId) => {
-          firstConnectionId = connectionId;
+    }
+    yield* Effect.yieldNow;
+    yield* broker.focusHost({
+      clientId: "owner",
+      environmentId: scope.environmentId,
+      connectionId: connections.get("owner")!,
+      focused: false,
+      liveTabs: [
+        { threadId: scope.thread.threadId, tabId: PreviewTabId.make("signed-in"), visible: true },
+      ],
+    });
+    yield* broker.focusHost({
+      clientId: "other",
+      environmentId: scope.environmentId,
+      connectionId: connections.get("other")!,
+      focused: true,
+      liveTabs: [
+        {
+          threadId: scope.thread.threadId,
+          tabId: PreviewTabId.make("signed-in"),
+          visible: false,
         },
-      );
-      const secondRequests = requestsFrom(
-        yield* broker.connect(makeHost({ clientId: "client-second" })),
-        (connectionId) => {
-          secondConnectionId = connectionId;
+        {
+          threadId: ThreadId.make("another-thread"),
+          tabId: PreviewTabId.make("different-tab"),
+          visible: true,
         },
-      );
-      yield* Stream.runForEach(firstRequests, (request) =>
-        broker.respond({
-          clientId: "client-first",
-          connectionId: request.connectionId,
-          requestId: request.requestId,
-          ok: true,
-          result: "first",
-        }),
-      ).pipe(Effect.forkScoped);
-      yield* Stream.runForEach(secondRequests, (request) =>
-        broker.respond({
-          clientId: "client-second",
-          connectionId: request.connectionId,
-          requestId: request.requestId,
-          ok: true,
-          result: "second",
-        }),
-      ).pipe(Effect.forkScoped);
-      yield* Effect.yieldNow;
-
-      yield* broker.focusHost({
-        clientId: "client-first",
-        environmentId: scope.environmentId,
-        connectionId: "connection-stale",
-        focused: true,
-        liveTabs: [{ threadId: scope.thread.threadId, tabId: PreviewTabId.make("stale-tab") }],
-      });
-      expect(yield* broker.invoke<string>({ scope, operation: "status", input: {} })).toBe(
-        "second",
-      );
-      yield* broker.focusHost({
-        clientId: "client-first",
-        environmentId: scope.environmentId,
-        connectionId: firstConnectionId,
-        focused: true,
-      });
-
-      const firstPinnedScope = {
-        ...scope,
-        thread: { ...scope.thread, providerSessionId: "provider-session-first-pinned" },
-      };
-      expect(
-        yield* broker.invoke<string>({ scope: firstPinnedScope, operation: "status", input: {} }),
-      ).toBe("first");
-
-      yield* broker.focusHost({
-        clientId: "client-second",
-        environmentId: scope.environmentId,
-        connectionId: secondConnectionId,
-        focused: true,
-      });
-
-      expect(
-        yield* broker.invoke<string>({ scope: firstPinnedScope, operation: "status", input: {} }),
-      ).toBe("first");
-      expect(
-        yield* broker.invoke<string>({
-          scope: {
-            ...scope,
-            thread: { ...scope.thread, providerSessionId: "provider-session-second-pinned" },
-          },
-          operation: "status",
-          input: {},
-        }),
-      ).toBe("second");
-    }),
-  ),
-);
+      ],
+    });
+    expect(yield* broker.invoke<string>({ scope, operation: "evaluate", input: {} })).toBe("owner");
+    expect(
+      yield* broker.invoke<string>({
+        scope: { ...scope, thread: { ...scope.thread, providerSessionId: "explicit-owner" } },
+        tabId: PreviewTabId.make("signed-in"),
+        operation: "snapshot",
+        input: {},
+      }),
+    ).toBe("owner");
+    expect(
+      yield* broker.invoke<string>({
+        scope: { ...scope, thread: { ...scope.thread, providerSessionId: "other-tab" } },
+        tabId: PreviewTabId.make("different-tab"),
+        operation: "evaluate",
+        input: {},
+      }),
+    ).toBe("other");
 
-it.effect("prefers the live tab owner for new sessions without moving existing leases", () =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      const broker = yield* makeBroker;
-      const connections = new Map<string, string>();
-      for (const clientId of ["owner", "other"]) {
-        const requests = requestsFrom(
-          yield* broker.connect(makeHost({ clientId })),
-          (connectionId) => connections.set(clientId, connectionId),
-        );
-        yield* Stream.runForEach(requests, (request) =>
-          broker.respond({
-            clientId,
-            connectionId: request.connectionId,
-            requestId: request.requestId,
-            ok: true,
-            result: clientId,
-          }),
-        ).pipe(Effect.forkScoped);
-      }
-      yield* Effect.yieldNow;
-      yield* broker.focusHost({
-        clientId: "owner",
-        environmentId: scope.environmentId,
-        connectionId: connections.get("owner")!,
-        focused: false,
-        liveTabs: [
-          { threadId: scope.thread.threadId, tabId: PreviewTabId.make("signed-in"), visible: true },
-        ],
-      });
-      yield* broker.focusHost({
-        clientId: "other",
-        environmentId: scope.environmentId,
-        connectionId: connections.get("other")!,
-        focused: true,
-        liveTabs: [
-          {
-            threadId: scope.thread.threadId,
-            tabId: PreviewTabId.make("signed-in"),
-            visible: false,
-          },
-          {
-            threadId: ThreadId.make("another-thread"),
-            tabId: PreviewTabId.make("different-tab"),
-            visible: true,
-          },
-        ],
-      });
-      expect(yield* broker.invoke<string>({ scope, operation: "evaluate", input: {} })).toBe(
-        "owner",
-      );
-      expect(
-        yield* broker.invoke<string>({
-          scope: { ...scope, thread: { ...scope.thread, providerSessionId: "explicit-owner" } },
-          tabId: PreviewTabId.make("signed-in"),
-          operation: "snapshot",
-          input: {},
-        }),
-      ).toBe("owner");
-      expect(
-        yield* broker.invoke<string>({
-          scope: { ...scope, thread: { ...scope.thread, providerSessionId: "other-tab" } },
-          tabId: PreviewTabId.make("different-tab"),
-          operation: "evaluate",
-          input: {},
-        }),
-      ).toBe("other");
-
-      yield* broker.focusHost({
-        clientId: "owner",
-        environmentId: scope.environmentId,
-        connectionId: connections.get("owner")!,
-        focused: false,
-        liveTabs: [],
-      });
-      expect(yield* broker.invoke<string>({ scope, operation: "evaluate", input: {} })).toBe(
-        "owner",
-      );
-      expect(
-        yield* broker.invoke<string>({
-          scope: { ...scope, thread: { ...scope.thread, providerSessionId: "after-tab-closed" } },
-          operation: "evaluate",
-          input: {},
-        }),
-      ).toBe("other");
-    }),
-  ),
+    yield* broker.focusHost({
+      clientId: "owner",
+      environmentId: scope.environmentId,
+      connectionId: connections.get("owner")!,
+      focused: false,
+      liveTabs: [],
+    });
+    expect(yield* broker.invoke<string>({ scope, operation: "evaluate", input: {} })).toBe("owner");
+    expect(
+      yield* broker.invoke<string>({
+        scope: { ...scope, thread: { ...scope.thread, providerSessionId: "after-tab-closed" } },
+        operation: "evaluate",
+        input: {},
+      }),
+    ).toBe("other");
+  }),
 );
 
 it.effect("routes resize to a capable host instead of a newer legacy connection", () =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      const broker = yield* makeBroker;
-      const capableRequests = requestsFrom(
-        yield* broker.connect(
-          makeHost({ clientId: "client-capable", supportedOperations: ["resize"] }),
-        ),
-      );
-      const legacyRequests = requestsFrom(
-        yield* broker.connect(makeHost({ clientId: "client-legacy" })),
-      );
-      yield* Stream.runForEach(capableRequests, (request) =>
-        broker.respond({
-          clientId: "client-capable",
-          connectionId: request.connectionId,
-          requestId: request.requestId,
-          ok: true,
-          result: "capable",
-        }),
-      ).pipe(Effect.forkScoped);
-      yield* Stream.runForEach(legacyRequests, (request) =>
-        broker.respond({
-          clientId: "client-legacy",
-          connectionId: request.connectionId,
-          requestId: request.requestId,
-          ok: true,
-          result: "legacy",
-        }),
-      ).pipe(Effect.forkScoped);
-      yield* Effect.yieldNow;
+  Effect.gen(function* () {
+    const broker = yield* makeBroker;
+    const capableRequests = requestsFrom(
+      yield* broker.connect(
+        makeHost({ clientId: "client-capable", supportedOperations: ["resize"] }),
+      ),
+    );
+    const legacyRequests = requestsFrom(
+      yield* broker.connect(makeHost({ clientId: "client-legacy" })),
+    );
+    yield* Stream.runForEach(capableRequests, (request) =>
+      broker.respond({
+        clientId: "client-capable",
+        connectionId: request.connectionId,
+        requestId: request.requestId,
+        ok: true,
+        result: "capable",
+      }),
+    ).pipe(Effect.forkScoped);
+    yield* Stream.runForEach(legacyRequests, (request) =>
+      broker.respond({
+        clientId: "client-legacy",
+        connectionId: request.connectionId,
+        requestId: request.requestId,
+        ok: true,
+        result: "legacy",
+      }),
+    ).pipe(Effect.forkScoped);
+    yield* Effect.yieldNow;
 
-      expect(
-        yield* broker.invoke<string>({ scope, operation: "resize", input: { mode: "fill" } }),
-      ).toBe("capable");
-    }),
-  ),
+    expect(
+      yield* broker.invoke<string>({ scope, operation: "resize", input: { mode: "fill" } }),
+    ).toBe("capable");
+  }),
 );
 
 it.effect("does not move a live legacy assignment to another runtime for resize", () =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      const broker = yield* makeBroker;
-      const legacyRequests = requestsFrom(
-        yield* broker.connect(makeHost({ clientId: "client-legacy" })),
-      );
-      yield* Stream.runForEach(legacyRequests, (request) =>
-        broker.respond({
-          clientId: "client-legacy",
-          connectionId: request.connectionId,
-          requestId: request.requestId,
-          ok: true,
-          result: "legacy",
-        }),
-      ).pipe(Effect.forkScoped);
-      yield* Effect.yieldNow;
-
-      expect(yield* broker.invoke<string>({ scope, operation: "status", input: {} })).toBe(
-        "legacy",
-      );
-
-      const capableRequests = requestsFrom(
-        yield* broker.connect(
-          makeHost({ clientId: "client-capable", supportedOperations: ["resize"] }),
-        ),
-      );
-      yield* Stream.runForEach(capableRequests, (request) =>
-        broker.respond({
-          clientId: "client-capable",
-          connectionId: request.connectionId,
-          requestId: request.requestId,
-          ok: true,
-          result: "capable",
-        }),
-      ).pipe(Effect.forkScoped);
-      yield* Effect.yieldNow;
+  Effect.gen(function* () {
+    const broker = yield* makeBroker;
+    const legacyRequests = requestsFrom(
+      yield* broker.connect(makeHost({ clientId: "client-legacy" })),
+    );
+    yield* Stream.runForEach(legacyRequests, (request) =>
+      broker.respond({
+        clientId: "client-legacy",
+        connectionId: request.connectionId,
+        requestId: request.requestId,
+        ok: true,
+        result: "legacy",
+      }),
+    ).pipe(Effect.forkScoped);
+    yield* Effect.yieldNow;
+
+    expect(yield* broker.invoke<string>({ scope, operation: "status", input: {} })).toBe("legacy");
+
+    const capableRequests = requestsFrom(
+      yield* broker.connect(
+        makeHost({ clientId: "client-capable", supportedOperations: ["resize"] }),
+      ),
+    );
+    yield* Stream.runForEach(capableRequests, (request) =>
+      broker.respond({
+        clientId: "client-capable",
+        connectionId: request.connectionId,
+        requestId: request.requestId,
+        ok: true,
+        result: "capable",
+      }),
+    ).pipe(Effect.forkScoped);
+    yield* Effect.yieldNow;
 
-      const error = yield* broker
-        .invoke<void>({ scope, operation: "resize", input: { mode: "fill" } })
-        .pipe(Effect.flip);
-      expect(error).toBeInstanceOf(PreviewAutomationNoAvailableHostError);
-      expect(yield* broker.invoke<string>({ scope, operation: "status", input: {} })).toBe(
-        "legacy",
-      );
-    }),
-  ),
+    const error = yield* broker
+      .invoke<void>({ scope, operation: "resize", input: { mode: "fill" } })
+      .pipe(Effect.flip);
+    expect(error).toBeInstanceOf(PreviewAutomationNoAvailableHostError);
+    expect(yield* broker.invoke<string>({ scope, operation: "status", input: {} })).toBe("legacy");
+  }),
 );
 
 it.effect("ignores stale focus updates for a different environment", () =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      const broker = yield* makeBroker;
-      let firstConnectionId = "";
-      const firstRequests = requestsFrom(
-        yield* broker.connect(makeHost({ clientId: "client-first" })),
-        (connectionId) => {
-          firstConnectionId = connectionId;
-        },
-      );
-      const secondRequests = requestsFrom(
-        yield* broker.connect(makeHost({ clientId: "client-second" })),
-      );
-      yield* Stream.runForEach(firstRequests, (request) =>
-        broker.respond({
-          clientId: "client-first",
-          connectionId: request.connectionId,
-          requestId: request.requestId,
-          ok: true,
-          result: "first",
-        }),
-      ).pipe(Effect.forkScoped);
-      yield* Stream.runForEach(secondRequests, (request) =>
-        broker.respond({
-          clientId: "client-second",
-          connectionId: request.connectionId,
-          requestId: request.requestId,
-          ok: true,
-          result: "second",
-        }),
-      ).pipe(Effect.forkScoped);
-      yield* Effect.yieldNow;
-
-      yield* broker.focusHost({
+  Effect.gen(function* () {
+    const broker = yield* makeBroker;
+    let firstConnectionId = "";
+    const firstRequests = requestsFrom(
+      yield* broker.connect(makeHost({ clientId: "client-first" })),
+      (connectionId) => {
+        firstConnectionId = connectionId;
+      },
+    );
+    const secondRequests = requestsFrom(
+      yield* broker.connect(makeHost({ clientId: "client-second" })),
+    );
+    yield* Stream.runForEach(firstRequests, (request) =>
+      broker.respond({
         clientId: "client-first",
-        environmentId: EnvironmentId.make("environment-stale"),
-        connectionId: firstConnectionId,
-        focused: true,
-      });
+        connectionId: request.connectionId,
+        requestId: request.requestId,
+        ok: true,
+        result: "first",
+      }),
+    ).pipe(Effect.forkScoped);
+    yield* Stream.runForEach(secondRequests, (request) =>
+      broker.respond({
+        clientId: "client-second",
+        connectionId: request.connectionId,
+        requestId: request.requestId,
+        ok: true,
+        result: "second",
+      }),
+    ).pipe(Effect.forkScoped);
+    yield* Effect.yieldNow;
 
-      expect(yield* broker.invoke<string>({ scope, operation: "status", input: {} })).toBe(
-        "second",
-      );
-    }),
-  ),
+    yield* broker.focusHost({
+      clientId: "client-first",
+      environmentId: EnvironmentId.make("environment-stale"),
+      connectionId: firstConnectionId,
+      focused: true,
+    });
+
+    expect(yield* broker.invoke<string>({ scope, operation: "status", input: {} })).toBe("second");
+  }),
 );
 
 it.effect("fails over a pinned provider session only after its host disconnects", () =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      const broker = yield* makeBroker;
-      const firstTabId = PreviewTabId.make("tab-on-first-host");
-      let firstConnectionId = "";
-      let secondRoutedTabId: PreviewTabId | undefined;
-      const firstRequests = requestsFrom(
-        yield* broker.connect(makeHost({ clientId: "client-first" })),
-        (connectionId) => {
-          firstConnectionId = connectionId;
-        },
-      );
-      const secondRequests = requestsFrom(
-        yield* broker.connect(makeHost({ clientId: "client-second" })),
-      );
-      const firstConsumer = yield* Stream.runForEach(firstRequests, (request) =>
-        broker.respond({
-          clientId: "client-first",
-          connectionId: request.connectionId,
-          requestId: request.requestId,
-          ok: true,
-          result: request.operation === "open" ? { host: "first", tabId: firstTabId } : "first",
-        }),
-      ).pipe(Effect.forkScoped);
-      yield* Stream.runForEach(secondRequests, (request) => {
-        secondRoutedTabId = request.tabId;
-        return broker.respond({
-          clientId: "client-second",
-          connectionId: request.connectionId,
-          requestId: request.requestId,
-          ok: true,
-          result: "second",
-        });
-      }).pipe(Effect.forkScoped);
-      yield* Effect.yieldNow;
-
-      yield* broker.focusHost({
+  Effect.gen(function* () {
+    const broker = yield* makeBroker;
+    const firstTabId = PreviewTabId.make("tab-on-first-host");
+    let firstConnectionId = "";
+    let secondRoutedTabId: PreviewTabId | undefined;
+    const firstRequests = requestsFrom(
+      yield* broker.connect(makeHost({ clientId: "client-first" })),
+      (connectionId) => {
+        firstConnectionId = connectionId;
+      },
+    );
+    const secondRequests = requestsFrom(
+      yield* broker.connect(makeHost({ clientId: "client-second" })),
+    );
+    const firstConsumer = yield* Stream.runForEach(firstRequests, (request) =>
+      broker.respond({
         clientId: "client-first",
-        environmentId: scope.environmentId,
-        connectionId: firstConnectionId,
-        focused: true,
-        liveTabs: [{ threadId: scope.thread.threadId, tabId: firstTabId }],
-      });
-      expect(yield* broker.invoke({ scope, operation: "open", input: {} })).toEqual({
-        host: "first",
-        tabId: firstTabId,
+        connectionId: request.connectionId,
+        requestId: request.requestId,
+        ok: true,
+        result: request.operation === "open" ? { host: "first", tabId: firstTabId } : "first",
+      }),
+    ).pipe(Effect.forkScoped);
+    yield* Stream.runForEach(secondRequests, (request) => {
+      secondRoutedTabId = request.tabId;
+      return broker.respond({
+        clientId: "client-second",
+        connectionId: request.connectionId,
+        requestId: request.requestId,
+        ok: true,
+        result: "second",
       });
+    }).pipe(Effect.forkScoped);
+    yield* Effect.yieldNow;
 
-      yield* Fiber.interrupt(firstConsumer);
-      yield* Effect.yieldNow;
+    yield* broker.focusHost({
+      clientId: "client-first",
+      environmentId: scope.environmentId,
+      connectionId: firstConnectionId,
+      focused: true,
+      liveTabs: [{ threadId: scope.thread.threadId, tabId: firstTabId }],
+    });
+    expect(yield* broker.invoke({ scope, operation: "open", input: {} })).toEqual({
+      host: "first",
+      tabId: firstTabId,
+    });
 
-      expect(yield* broker.invoke<string>({ scope, operation: "status", input: {} })).toBe(
-        "second",
-      );
-      expect(secondRoutedTabId).toBeUndefined();
-    }),
-  ),
+    yield* Fiber.interrupt(firstConsumer);
+    yield* Effect.yieldNow;
+
+    expect(yield* broker.invoke<string>({ scope, operation: "status", input: {} })).toBe("second");
+    expect(secondRoutedTabId).toBeUndefined();
+  }),
 );
 
 it.effect("keeps a replacement stream authoritative when the old stream finalizes", () =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      const broker = yield* makeBroker;
-      let firstConnectionId = "";
-      let replacementConnectionId = "";
-      const firstRequests = requestsFrom(yield* broker.connect(makeHost()), (connectionId) => {
-        firstConnectionId = connectionId;
-      });
-      yield* Stream.runDrain(firstRequests).pipe(Effect.forkScoped);
-      yield* Effect.yieldNow;
+  Effect.gen(function* () {
+    const broker = yield* makeBroker;
+    let firstConnectionId = "";
+    let replacementConnectionId = "";
+    const firstRequests = requestsFrom(yield* broker.connect(makeHost()), (connectionId) => {
+      firstConnectionId = connectionId;
+    });
+    yield* Stream.runDrain(firstRequests).pipe(Effect.forkScoped);
+    yield* Effect.yieldNow;
 
-      const replacementRequests = requestsFrom(
-        yield* broker.connect(makeHost()),
-        (connectionId) => {
-          replacementConnectionId = connectionId;
-        },
-      );
-      yield* Stream.runForEach(replacementRequests, (request) =>
-        broker.respond({
-          clientId: "client-1",
-          connectionId: request.connectionId,
-          requestId: request.requestId,
-          ok: true,
-          result: "replacement",
-        }),
-      ).pipe(Effect.forkScoped);
-      yield* Effect.yieldNow;
+    const replacementRequests = requestsFrom(yield* broker.connect(makeHost()), (connectionId) => {
+      replacementConnectionId = connectionId;
+    });
+    yield* Stream.runForEach(replacementRequests, (request) =>
+      broker.respond({
+        clientId: "client-1",
+        connectionId: request.connectionId,
+        requestId: request.requestId,
+        ok: true,
+        result: "replacement",
+      }),
+    ).pipe(Effect.forkScoped);
+    yield* Effect.yieldNow;
 
-      expect(replacementConnectionId).not.toBe(firstConnectionId);
-      const result = yield* broker.invoke<string>({ scope, operation: "status", input: {} });
-      expect(result).toBe("replacement");
-    }),
-  ),
+    expect(replacementConnectionId).not.toBe(firstConnectionId);
+    const result = yield* broker.invoke<string>({ scope, operation: "status", input: {} });
+    expect(result).toBe("replacement");
+  }),
 );
 
 it.effect("does not carry a tab id across a replacement automation stream", () =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      const broker = yield* makeBroker;
-      const openedTabId = PreviewTabId.make("tab-first-webcontents");
-      const firstRequests = requestsFrom(yield* broker.connect(makeHost()));
-      yield* Stream.runForEach(firstRequests, (request) =>
-        broker.respond({
-          clientId: "client-1",
-          connectionId: request.connectionId,
-          requestId: request.requestId,
-          ok: true,
-          result:
-            request.operation === "open"
-              ? { host: "first", tabId: openedTabId }
-              : { host: "first" },
-        }),
-      ).pipe(Effect.forkScoped);
-      yield* Effect.yieldNow;
+  Effect.gen(function* () {
+    const broker = yield* makeBroker;
+    const openedTabId = PreviewTabId.make("tab-first-webcontents");
+    const firstRequests = requestsFrom(yield* broker.connect(makeHost()));
+    yield* Stream.runForEach(firstRequests, (request) =>
+      broker.respond({
+        clientId: "client-1",
+        connectionId: request.connectionId,
+        requestId: request.requestId,
+        ok: true,
+        result:
+          request.operation === "open" ? { host: "first", tabId: openedTabId } : { host: "first" },
+      }),
+    ).pipe(Effect.forkScoped);
+    yield* Effect.yieldNow;
 
-      expect(yield* broker.invoke({ scope, operation: "open", input: {} })).toEqual({
-        host: "first",
-        tabId: openedTabId,
-      });
+    expect(yield* broker.invoke({ scope, operation: "open", input: {} })).toEqual({
+      host: "first",
+      tabId: openedTabId,
+    });
 
-      const routedRequests: RoutedRequest[] = [];
-      const replacementRequests = requestsFrom(yield* broker.connect(makeHost()));
-      yield* Stream.runForEach(replacementRequests, (request) => {
-        routedRequests.push(request);
-        return broker.respond({
-          clientId: "client-1",
-          connectionId: request.connectionId,
-          requestId: request.requestId,
-          ok: true,
-          result: "replacement",
-        });
-      }).pipe(Effect.forkScoped);
-      yield* Effect.yieldNow;
+    const routedRequests: RoutedRequest[] = [];
+    const replacementRequests = requestsFrom(yield* broker.connect(makeHost()));
+    yield* Stream.runForEach(replacementRequests, (request) => {
+      routedRequests.push(request);
+      return broker.respond({
+        clientId: "client-1",
+        connectionId: request.connectionId,
+        requestId: request.requestId,
+        ok: true,
+        result: "replacement",
+      });
+    }).pipe(Effect.forkScoped);
+    yield* Effect.yieldNow;
 
-      expect(yield* broker.invoke<string>({ scope, operation: "status", input: {} })).toBe(
-        "replacement",
-      );
-      expect(routedRequests.at(-1)?.tabId).toBeUndefined();
-    }),
-  ),
+    expect(yield* broker.invoke<string>({ scope, operation: "status", input: {} })).toBe(
+      "replacement",
+    );
+    expect(routedRequests.at(-1)?.tabId).toBeUndefined();
+  }),
 );
 
 it.effect("fails requests assigned to the stream that is replaced", () =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      const broker = yield* makeBroker;
-      const requests = requestsFrom(yield* broker.connect(makeHost()));
-      yield* Stream.runDrain(requests).pipe(Effect.forkScoped);
-      const pending = yield* broker
-        .invoke<void>({ scope, operation: "status", input: {} })
-        .pipe(Effect.flip, Effect.forkScoped);
-      yield* Effect.yieldNow;
+  Effect.gen(function* () {
+    const broker = yield* makeBroker;
+    const requests = requestsFrom(yield* broker.connect(makeHost()));
+    yield* Stream.runDrain(requests).pipe(Effect.forkScoped);
+    const pending = yield* broker
+      .invoke<void>({ scope, operation: "status", input: {} })
+      .pipe(Effect.flip, Effect.forkScoped);
+    yield* Effect.yieldNow;
 
-      const replacementRequests = requestsFrom(yield* broker.connect(makeHost()));
-      yield* Stream.runDrain(replacementRequests).pipe(Effect.forkScoped);
+    const replacementRequests = requestsFrom(yield* broker.connect(makeHost()));
+    yield* Stream.runDrain(replacementRequests).pipe(Effect.forkScoped);
 
-      const error = yield* Fiber.join(pending);
-      expect(error).toBeInstanceOf(PreviewAutomationClientDisconnectedError);
-      expect(error).toMatchObject({
-        operation: "status",
-        environmentId: scope.environmentId,
-        threadId: scope.thread.threadId,
-        providerSessionId: scope.thread.providerSessionId,
-        providerInstanceId: scope.thread.providerInstanceId,
-        clientId: "client-1",
-        requestId: "preview-0",
-        timeoutMs: 15_000,
-      });
-    }),
-  ),
+    const error = yield* Fiber.join(pending);
+    expect(error).toBeInstanceOf(PreviewAutomationClientDisconnectedError);
+    expect(error).toMatchObject({
+      operation: "status",
+      environmentId: scope.environmentId,
+      threadId: scope.thread.threadId,
+      providerSessionId: scope.thread.providerSessionId,
+      providerInstanceId: scope.thread.providerInstanceId,
+      clientId: "client-1",
+      requestId: "preview-0",
+      timeoutMs: 15_000,
+    });
+  }),
 );
 
 it.effect("accepts responses only from the host that received the request", () =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      const broker = yield* makeBroker;
-      const requests = requestsFrom(yield* broker.connect(makeHost()));
-      yield* Stream.runForEach(requests, (request) =>
-        Effect.gen(function* () {
-          yield* broker.respond({
-            clientId: "client-foreign",
-            connectionId: request.connectionId,
-            requestId: request.requestId,
-            ok: true,
-            result: "foreign",
-          });
-          yield* broker.respond({
-            clientId: "client-1",
-            connectionId: "connection-stale",
-            requestId: request.requestId,
-            ok: true,
-            result: "stale",
-          });
-          yield* broker.respond({
-            clientId: "client-1",
-            connectionId: request.connectionId,
-            requestId: request.requestId,
-            ok: true,
-            result: "owner",
-          });
-        }),
-      ).pipe(Effect.forkScoped);
-      yield* Effect.yieldNow;
-
-      const result = yield* broker.invoke<string>({ scope, operation: "status", input: {} });
-      expect(result).toBe("owner");
-    }),
-  ),
-);
-
-it.effect("keeps each thread's current tab when threads share a provider session", () =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      const broker = yield* makeBroker;
-      const routed: Array<RoutedRequest> = [];
-      const requests = requestsFrom(yield* broker.connect(makeHost(), { preferred: true }));
-      yield* Stream.runForEach(requests, (request) => {
-        routed.push(request);
-        return broker.respond({
+  Effect.gen(function* () {
+    const broker = yield* makeBroker;
+    const requests = requestsFrom(yield* broker.connect(makeHost()));
+    yield* Stream.runForEach(requests, (request) =>
+      Effect.gen(function* () {
+        yield* broker.respond({
+          clientId: "client-foreign",
+          connectionId: request.connectionId,
+          requestId: request.requestId,
+          ok: true,
+          result: "foreign",
+        });
+        yield* broker.respond({
+          clientId: "client-1",
+          connectionId: "connection-stale",
+          requestId: request.requestId,
+          ok: true,
+          result: "stale",
+        });
+        yield* broker.respond({
           clientId: "client-1",
           connectionId: request.connectionId,
           requestId: request.requestId,
           ok: true,
-          result: { tabId: request.tabId ?? `tab-${request.threadId}` },
+          result: "owner",
         });
-      }).pipe(Effect.forkScoped);
-      yield* Effect.yieldNow;
-      // Codex runs every thread of an instance in one provider session.
-      const otherThread = {
-        ...scope,
-        thread: { ...scope.thread, threadId: ThreadId.make("thread-2") },
-      };
+      }),
+    ).pipe(Effect.forkScoped);
+    yield* Effect.yieldNow;
 
-      yield* broker.invoke({ scope, operation: "open", input: {} });
-      yield* broker.invoke({ scope: otherThread, operation: "snapshot", input: {} });
-      yield* broker.invoke({ scope, operation: "snapshot", input: {} });
-      yield* broker.invoke({ scope: otherThread, operation: "snapshot", input: {} });
-
-      expect(routed.map(({ threadId, tabId }) => [threadId, tabId])).toEqual([
-        ["thread-1", undefined],
-        ["thread-2", undefined],
-        ["thread-1", "tab-thread-1"],
-        ["thread-2", "tab-thread-2"],
-      ]);
-      expect(routed[0]!.agentSessionId).not.toBe(routed[1]!.agentSessionId);
-    }),
-  ),
+    const result = yield* broker.invoke<string>({ scope, operation: "status", input: {} });
+    expect(result).toBe("owner");
+  }),
+);
+
+it.effect("keeps each thread's current tab when threads share a provider session", () =>
+  Effect.gen(function* () {
+    const broker = yield* makeBroker;
+    const routed: Array<RoutedRequest> = [];
+    const requests = requestsFrom(yield* broker.connect(makeHost(), { preferred: true }));
+    yield* Stream.runForEach(requests, (request) => {
+      routed.push(request);
+      return broker.respond({
+        clientId: "client-1",
+        connectionId: request.connectionId,
+        requestId: request.requestId,
+        ok: true,
+        result: { tabId: request.tabId ?? `tab-${request.threadId}` },
+      });
+    }).pipe(Effect.forkScoped);
+    yield* Effect.yieldNow;
+    // Codex runs every thread of an instance in one provider session.
+    const otherThread = {
+      ...scope,
+      thread: { ...scope.thread, threadId: ThreadId.make("thread-2") },
+    };
+
+    yield* broker.invoke({ scope, operation: "open", input: {} });
+    yield* broker.invoke({ scope: otherThread, operation: "snapshot", input: {} });
+    yield* broker.invoke({ scope, operation: "snapshot", input: {} });
+    yield* broker.invoke({ scope: otherThread, operation: "snapshot", input: {} });
+
+    expect(routed.map(({ threadId, tabId }) => [threadId, tabId])).toEqual([
+      ["thread-1", undefined],
+      ["thread-2", undefined],
+      ["thread-1", "tab-thread-1"],
+      ["thread-2", "tab-thread-2"],
+    ]);
+    expect(routed[0]!.agentSessionId).not.toBe(routed[1]!.agentSessionId);
+  }),
 );
diff --git a/apps/server/src/mcp/TaskCancelUsageLimit.integration.test.ts b/apps/server/src/mcp/TaskCancelUsageLimit.integration.test.ts
index 2812259af337..c3e549d14dd7 100644
--- a/apps/server/src/mcp/TaskCancelUsageLimit.integration.test.ts
+++ b/apps/server/src/mcp/TaskCancelUsageLimit.integration.test.ts
@@ -58,298 +58,293 @@ it.effect.each([
 ] as const)(
   "a delegated child whose task is cancelled $cancel resumes at the reset: $resumed",
   ({ cancel, cancelStatus, resumed }) =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const cwd = yield* checkpointWorkspace("task-cancel-usage-limit");
-        // Set while the provider's usage-limit result is already on its way.
-        let limitInFlight: Effect.Effect<void> = Effect.void;
-        const turns: Array<{
-          readonly turn: ProviderAdapter.ProviderAdapterV2TurnInput;
-          readonly events: Queue.Queue<ProviderAdapter.ProviderAdapterV2Event>;
-        }> = [];
-        const adapter: ProviderAdapter.ProviderAdapterV2["Service"] = {
-          instanceId,
-          driver,
-          getCapabilities: () => Effect.succeed(ClaudeProviderCapabilitiesV2),
-          planSelectionTransition: () => Effect.succeed({ type: "apply_on_next_turn" }),
-          openSession: (input) =>
-            Effect.gen(function* () {
-              const now = yield* DateTime.now;
-              const events = yield* Queue.unbounded<ProviderAdapter.ProviderAdapterV2Event>();
-              return {
-                instanceId,
+    Effect.gen(function* () {
+      const cwd = yield* checkpointWorkspace("task-cancel-usage-limit");
+      // Set while the provider's usage-limit result is already on its way.
+      let limitInFlight: Effect.Effect<void> = Effect.void;
+      const turns: Array<{
+        readonly turn: ProviderAdapter.ProviderAdapterV2TurnInput;
+        readonly events: Queue.Queue<ProviderAdapter.ProviderAdapterV2Event>;
+      }> = [];
+      const adapter: ProviderAdapter.ProviderAdapterV2["Service"] = {
+        instanceId,
+        driver,
+        getCapabilities: () => Effect.succeed(ClaudeProviderCapabilitiesV2),
+        planSelectionTransition: () => Effect.succeed({ type: "apply_on_next_turn" }),
+        openSession: (input) =>
+          Effect.gen(function* () {
+            const now = yield* DateTime.now;
+            const events = yield* Queue.unbounded<ProviderAdapter.ProviderAdapterV2Event>();
+            return {
+              instanceId,
+              driver,
+              providerSessionId: input.providerSessionId,
+              providerSession: {
+                id: input.providerSessionId,
                 driver,
-                providerSessionId: input.providerSessionId,
-                providerSession: {
-                  id: input.providerSessionId,
+                providerInstanceId: instanceId,
+                status: "ready",
+                cwd,
+                model: modelSelection.model,
+                capabilities: ClaudeProviderCapabilitiesV2,
+                createdAt: now,
+                updatedAt: now,
+                lastError: null,
+              },
+              events: Stream.fromQueue(events),
+              ensureThread: ({ threadId }) =>
+                Effect.succeed({
+                  id: ProviderThreadId.make(`provider-thread:${threadId}`),
                   driver,
                   providerInstanceId: instanceId,
-                  status: "ready",
-                  cwd,
-                  model: modelSelection.model,
-                  capabilities: ClaudeProviderCapabilitiesV2,
+                  providerSessionId: input.providerSessionId,
+                  appThreadId: threadId,
+                  ownerNodeId: null,
+                  nativeThreadRef: { driver, nativeId: `native:${threadId}`, strength: "strong" },
+                  nativeConversationHeadRef: null,
+                  status: "idle",
+                  firstRunOrdinal: null,
+                  lastRunOrdinal: null,
+                  handoffIds: [],
+                  forkedFrom: null,
                   createdAt: now,
                   updatedAt: now,
-                  lastError: null,
-                },
-                events: Stream.fromQueue(events),
-                ensureThread: ({ threadId }) =>
-                  Effect.succeed({
-                    id: ProviderThreadId.make(`provider-thread:${threadId}`),
+                }),
+              resumeThread: ({ providerThread }) => Effect.succeed(providerThread),
+              startTurn: (turn) =>
+                Effect.gen(function* () {
+                  turns.push({ turn, events });
+                  yield* Queue.offer(events, {
+                    type: "provider_turn.updated",
                     driver,
-                    providerInstanceId: instanceId,
-                    providerSessionId: input.providerSessionId,
-                    appThreadId: threadId,
-                    ownerNodeId: null,
-                    nativeThreadRef: { driver, nativeId: `native:${threadId}`, strength: "strong" },
-                    nativeConversationHeadRef: null,
-                    status: "idle",
-                    firstRunOrdinal: null,
-                    lastRunOrdinal: null,
-                    handoffIds: [],
-                    forkedFrom: null,
-                    createdAt: now,
-                    updatedAt: now,
-                  }),
-                resumeThread: ({ providerThread }) => Effect.succeed(providerThread),
-                startTurn: (turn) =>
-                  Effect.gen(function* () {
-                    turns.push({ turn, events });
-                    yield* Queue.offer(events, {
-                      type: "provider_turn.updated",
-                      driver,
-                      providerTurn: {
-                        id: ProviderTurnId.make(`provider-turn:${turn.attemptId}`),
-                        providerThreadId: turn.providerThread.id,
-                        nodeId: turn.rootNodeId,
-                        runAttemptId: turn.attemptId,
-                        nativeTurnRef: null,
-                        ordinal: turn.providerTurnOrdinal,
-                        status: "running",
-                        startedAt: now,
-                        completedAt: null,
-                      },
-                    });
-                  }),
-                steerTurn: () => Effect.die("unused"),
-                interruptTurn: () => Effect.suspend(() => limitInFlight),
-                respondToRuntimeRequest: () => Effect.die("unused"),
-                readThreadSnapshot: () => Effect.die("unused"),
-                rollbackThread: () => Effect.die("unused"),
-                forkThread: () => Effect.die("unused"),
-              };
-            }),
-        };
-        const layerAdapters = ProviderAdapterRegistry.layerSingle(adapter);
-        const layerOrchestrator = ProviderReplayHarness.layerWithRegistry(
-          { name: "task-cancel-usage-limit" },
-          layerAdapters,
-          { runEffectWorker: false },
-        );
-        const layerOrchestration = Layer.merge(
-          layerOrchestrator,
-          ThreadManagementService.layer.pipe(
-            Layer.provide(layerOrchestrator),
-            Layer.provide(ServerSettings.layerTest()),
-            Layer.provide(
-              CommandReceiptStore.layer.pipe(Layer.provide(SqlitePersistence.layerMemory)),
-            ),
-          ),
-        );
-        const sweeps = new Map<string, Effect.Effect<void>>();
-        const layerRecovery = UsageLimitRecoveryWorker.layer.pipe(
+                    providerTurn: {
+                      id: ProviderTurnId.make(`provider-turn:${turn.attemptId}`),
+                      providerThreadId: turn.providerThread.id,
+                      nodeId: turn.rootNodeId,
+                      runAttemptId: turn.attemptId,
+                      nativeTurnRef: null,
+                      ordinal: turn.providerTurnOrdinal,
+                      status: "running",
+                      startedAt: now,
+                      completedAt: null,
+                    },
+                  });
+                }),
+              steerTurn: () => Effect.die("unused"),
+              interruptTurn: () => Effect.suspend(() => limitInFlight),
+              respondToRuntimeRequest: () => Effect.die("unused"),
+              readThreadSnapshot: () => Effect.die("unused"),
+              rollbackThread: () => Effect.die("unused"),
+              forkThread: () => Effect.die("unused"),
+            };
+          }),
+      };
+      const layerAdapters = ProviderAdapterRegistry.layerSingle(adapter);
+      const layerOrchestrator = ProviderReplayHarness.layerWithRegistry(
+        { name: "task-cancel-usage-limit" },
+        layerAdapters,
+        { runEffectWorker: false },
+      );
+      const layerOrchestration = Layer.merge(
+        layerOrchestrator,
+        ThreadManagementService.layer.pipe(
+          Layer.provide(layerOrchestrator),
+          Layer.provide(ServerSettings.layerTest()),
           Layer.provide(
-            Layer.mergeAll(
-              Layer.succeed(Scheduler.Scheduler, {
-                register: <E, R>(name: string, work: Effect.Effect<void, E, R>) =>
-                  Effect.gen(function* () {
-                    const context = yield* Effect.context<R>();
-                    sweeps.set(name, work.pipe(Effect.provideContext(context), Effect.orDie));
-                  }),
-              }),
-              ProjectionStore.layer.pipe(Layer.provide(SqlitePersistence.layerMemory)),
-              ServerSettings.layerTest({ autoResumeLimitedThreads: true }),
-            ),
+            CommandReceiptStore.layer.pipe(Layer.provide(SqlitePersistence.layerMemory)),
           ),
-        );
-        const layerTest = Layer.merge(
-          OrchestratorMcpService.layer.pipe(
-            Layer.provide(Layer.mock(ThreadLaunchService.ThreadLaunchService)({})),
-            Layer.provide(Layer.mock(GitVcsDriver.GitVcsDriver)({})),
+        ),
+      );
+      const sweeps = new Map<string, Effect.Effect<void>>();
+      const layerRecovery = UsageLimitRecoveryWorker.layer.pipe(
+        Layer.provide(
+          Layer.mergeAll(
+            Layer.succeed(Scheduler.Scheduler, {
+              register: <E, R>(name: string, work: Effect.Effect<void, E, R>) =>
+                Effect.gen(function* () {
+                  const context = yield* Effect.context<R>();
+                  sweeps.set(name, work.pipe(Effect.provideContext(context), Effect.orDie));
+                }),
+            }),
+            ProjectionStore.layer.pipe(Layer.provide(SqlitePersistence.layerMemory)),
+            ServerSettings.layerTest({ autoResumeLimitedThreads: true }),
           ),
-          layerRecovery,
-        ).pipe(
-          Layer.provideMerge(layerOrchestration),
-          Layer.provide(
-            Layer.mergeAll(
-              layerAdapters,
-              Layer.mock(ProviderRegistry.ProviderRegistry)({ getProviders: Effect.succeed([]) }),
-              Layer.mock(ProjectService.ProjectService)({}),
-              Layer.mock(SecretRequests.SecretRequests)({}),
-              Layer.mock(RemoteDelegation.RemoteDelegation)({}),
-              ServerSettings.layerTest(),
-              Layer.mock(ScheduledTaskService.ScheduledTaskService)({}),
-              NodeServices.layer,
-              NodeCrypto.layer,
-            ),
+        ),
+      );
+      const layerTest = Layer.merge(
+        OrchestratorMcpService.layer.pipe(
+          Layer.provide(Layer.mock(ThreadLaunchService.ThreadLaunchService)({})),
+          Layer.provide(Layer.mock(GitVcsDriver.GitVcsDriver)({})),
+        ),
+        layerRecovery,
+      ).pipe(
+        Layer.provideMerge(layerOrchestration),
+        Layer.provide(
+          Layer.mergeAll(
+            layerAdapters,
+            Layer.mock(ProviderRegistry.ProviderRegistry)({ getProviders: Effect.succeed([]) }),
+            Layer.mock(ProjectService.ProjectService)({}),
+            Layer.mock(SecretRequests.SecretRequests)({}),
+            Layer.mock(RemoteDelegation.RemoteDelegation)({}),
+            ServerSettings.layerTest(),
+            Layer.mock(ScheduledTaskService.ScheduledTaskService)({}),
+            NodeServices.layer,
+            NodeCrypto.layer,
           ),
-        );
+        ),
+      );
 
-        yield* Effect.gen(function* () {
-          const orchestrator = yield* Orchestrator.OrchestratorV2;
-          const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
-          const service = yield* OrchestratorMcpService.OrchestratorMcpService;
-          const sweep = Effect.andThen(
-            Effect.suspend(() => sweeps.get("usage-limit-recovery")!),
-            worker.drain(),
+      yield* Effect.gen(function* () {
+        const orchestrator = yield* Orchestrator.OrchestratorV2;
+        const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
+        const service = yield* OrchestratorMcpService.OrchestratorMcpService;
+        const sweep = Effect.andThen(
+          Effect.suspend(() => sweeps.get("usage-limit-recovery")!),
+          worker.drain(),
+        );
+        const parentThreadId = ThreadId.make("thread:task-cancel-limit-parent");
+        const watch = (predicate: (event: OrchestrationV2DomainEvent) => boolean) =>
+          orchestrator.streamDomainEvents.pipe(
+            Stream.filter(predicate),
+            Stream.take(1),
+            Stream.runDrain,
+            Effect.forkScoped,
           );
-          const parentThreadId = ThreadId.make("thread:task-cancel-limit-parent");
-          const watch = (predicate: (event: OrchestrationV2DomainEvent) => boolean) =>
-            orchestrator.streamDomainEvents.pipe(
-              Stream.filter(predicate),
-              Stream.take(1),
-              Stream.runDrain,
-              Effect.forkScoped,
-            );
-          const turnRunning = () =>
-            watch(
-              (event) =>
-                event.type === "provider-turn.updated" && event.payload.status === "running",
-            );
-          yield* orchestrator.dispatch({
-            type: "thread.create",
-            commandId: CommandId.make("create-parent"),
-            threadId: parentThreadId,
-            projectId: ProjectId.make("project:task-cancel-limit"),
-            title: "Parent",
-            modelSelection,
-            runtimeMode: "full-access",
-            interactionMode: "default",
-            branch: null,
-            worktreePath: cwd,
-            createdBy: "user",
-            creationSource: "web",
-          });
-          const parentRunning = yield* turnRunning();
-          yield* orchestrator.dispatch({
-            type: "message.dispatch",
-            commandId: CommandId.make("start-parent"),
-            threadId: parentThreadId,
-            messageId: MessageId.make("message:start-parent"),
-            text: "Delegate a review",
-            attachments: [],
-            dispatchMode: { type: "start_immediately" },
-            createdBy: "user",
-            creationSource: "web",
-          });
-          yield* worker.drain();
-          yield* Fiber.join(parentRunning);
+        const turnRunning = () =>
+          watch(
+            (event) => event.type === "provider-turn.updated" && event.payload.status === "running",
+          );
+        yield* orchestrator.dispatch({
+          type: "thread.create",
+          commandId: CommandId.make("create-parent"),
+          threadId: parentThreadId,
+          projectId: ProjectId.make("project:task-cancel-limit"),
+          title: "Parent",
+          modelSelection,
+          runtimeMode: "full-access",
+          interactionMode: "default",
+          branch: null,
+          worktreePath: cwd,
+          createdBy: "user",
+          creationSource: "web",
+        });
+        const parentRunning = yield* turnRunning();
+        yield* orchestrator.dispatch({
+          type: "message.dispatch",
+          commandId: CommandId.make("start-parent"),
+          threadId: parentThreadId,
+          messageId: MessageId.make("message:start-parent"),
+          text: "Delegate a review",
+          attachments: [],
+          dispatchMode: { type: "start_immediately" },
+          createdBy: "user",
+          creationSource: "web",
+        });
+        yield* worker.drain();
+        yield* Fiber.join(parentRunning);
 
-          const parentRun = (yield* orchestrator.getThreadProjection(parentThreadId)).runs[0]!;
-          const childRunning = yield* turnRunning();
-          yield* orchestrator.dispatch({
-            type: "delegated_task.request",
-            commandId: CommandId.make("delegate"),
-            parentThreadId,
-            parentRunId: parentRun.id,
-            parentNodeId: parentRun.rootNodeId!,
-            task: "Review the change",
-            modelSelection,
-            runtimeMode: "full-access",
-            interactionMode: "default",
-            completionWake: "always",
-            createdBy: "agent",
-            creationSource: "mcp",
+        const parentRun = (yield* orchestrator.getThreadProjection(parentThreadId)).runs[0]!;
+        const childRunning = yield* turnRunning();
+        yield* orchestrator.dispatch({
+          type: "delegated_task.request",
+          commandId: CommandId.make("delegate"),
+          parentThreadId,
+          parentRunId: parentRun.id,
+          parentNodeId: parentRun.rootNodeId!,
+          task: "Review the change",
+          modelSelection,
+          runtimeMode: "full-access",
+          interactionMode: "default",
+          completionWake: "always",
+          createdBy: "agent",
+          creationSource: "mcp",
+        });
+        yield* worker.drain();
+        yield* Fiber.join(childRunning);
+        const task = (yield* orchestrator.getThreadProjection(parentThreadId)).subagents[0]!;
+        const childThreadId = task.childThreadId!;
+        const child = turns.find((entry) => entry.turn.threadId === childThreadId)!;
+        const childTurn = (yield* orchestrator.getThreadProjection(childThreadId))
+          .providerTurns[0]!;
+
+        const scope: McpInvocationScope = {
+          environmentId: EnvironmentId.make("environment:task-cancel-limit"),
+          requestNamespace: "provider-session:task-cancel-limit",
+          thread: {
+            threadId: parentThreadId,
+            providerSessionId: "provider-session:task-cancel-limit",
+            providerInstanceId: instanceId,
+          },
+          client: undefined,
+          capabilities: new Set(["orchestration"]),
+          issuedAt: 1,
+        };
+        const cancelTask = Effect.gen(function* () {
+          const result = yield* service.cancelTask(scope, {
+            taskId: task.id,
+            clientRequestId: "cancel-task",
           });
           yield* worker.drain();
-          yield* Fiber.join(childRunning);
-          const task = (yield* orchestrator.getThreadProjection(parentThreadId)).subagents[0]!;
-          const childThreadId = task.childThreadId!;
-          const child = turns.find((entry) => entry.turn.threadId === childThreadId)!;
-          const childTurn = (yield* orchestrator.getThreadProjection(childThreadId))
-            .providerTurns[0]!;
+          return result.status;
+        });
 
-          const scope: McpInvocationScope = {
-            environmentId: EnvironmentId.make("environment:task-cancel-limit"),
-            requestNamespace: "provider-session:task-cancel-limit",
-            thread: {
-              threadId: parentThreadId,
-              providerSessionId: "provider-session:task-cancel-limit",
-              providerInstanceId: instanceId,
+        const now = yield* DateTime.now;
+        const childFailed = yield* watch(
+          (event) =>
+            event.type === "run.updated" &&
+            event.payload.id === child.turn.runId &&
+            event.payload.status === "failed",
+        );
+        const hitLimit = Effect.forEach(
+          [
+            {
+              type: "provider_turn.updated",
+              driver,
+              providerTurn: { ...childTurn, status: "failed", completedAt: now },
             },
-            client: undefined,
-            capabilities: new Set(["orchestration"]),
-            issuedAt: 1,
-          };
-          const cancelTask = Effect.gen(function* () {
-            const result = yield* service.cancelTask(scope, {
-              taskId: task.id,
-              clientRequestId: "cancel-task",
-            });
-            yield* worker.drain();
-            return result.status;
-          });
-
-          const now = yield* DateTime.now;
-          const childFailed = yield* watch(
-            (event) =>
-              event.type === "run.updated" &&
-              event.payload.id === child.turn.runId &&
-              event.payload.status === "failed",
-          );
-          const hitLimit = Effect.forEach(
-            [
-              {
-                type: "provider_turn.updated",
-                driver,
-                providerTurn: { ...childTurn, status: "failed", completedAt: now },
+            {
+              type: "turn.terminal",
+              driver,
+              providerThreadId: childTurn.providerThreadId,
+              providerTurnId: childTurn.id,
+              runOrdinal: child.turn.runOrdinal,
+              failureItemOrdinal: 1,
+              status: "failed",
+              failure: {
+                class: "usage_limit",
+                message: "Claude usage limit reached.",
+                code: null,
+                retryable: null,
+                resetAt: DateTime.formatIso(DateTime.add(now, { minutes: 1 })),
               },
-              {
-                type: "turn.terminal",
-                driver,
-                providerThreadId: childTurn.providerThreadId,
-                providerTurnId: childTurn.id,
-                runOrdinal: child.turn.runOrdinal,
-                failureItemOrdinal: 1,
-                status: "failed",
-                failure: {
-                  class: "usage_limit",
-                  message: "Claude usage limit reached.",
-                  code: null,
-                  retryable: null,
-                  resetAt: DateTime.formatIso(DateTime.add(now, { minutes: 1 })),
-                },
-                threadDisposition: "reusable",
-              },
-            ] satisfies ReadonlyArray<ProviderAdapter.ProviderAdapterV2Event>,
-            (event) => Queue.offer(child.events, event),
-            { discard: true },
-          );
-          let cancelled: string | null = null;
-          if (cancel === "as its limit lands") {
-            limitInFlight = hitLimit;
-            cancelled = yield* cancelTask;
-          } else {
-            yield* hitLimit;
-          }
-          yield* Fiber.join(childFailed);
-          yield* worker.drain();
+              threadDisposition: "reusable",
+            },
+          ] satisfies ReadonlyArray<ProviderAdapter.ProviderAdapterV2Event>,
+          (event) => Queue.offer(child.events, event),
+          { discard: true },
+        );
+        let cancelled: string | null = null;
+        if (cancel === "as its limit lands") {
+          limitInFlight = hitLimit;
+          cancelled = yield* cancelTask;
+        } else {
+          yield* hitLimit;
+        }
+        yield* Fiber.join(childFailed);
+        yield* worker.drain();
 
-          // The sweep runs every few seconds, so it arms the child before a parent reacts.
-          yield* sweep;
-          if (cancel === "after its limit") cancelled = yield* cancelTask;
-          assert.equal(cancelled, cancelStatus);
+        // The sweep runs every few seconds, so it arms the child before a parent reacts.
+        yield* sweep;
+        if (cancel === "after its limit") cancelled = yield* cancelTask;
+        assert.equal(cancelled, cancelStatus);
 
-          yield* TestClock.adjust("1 minute");
-          yield* sweep;
-          const childAfter = yield* orchestrator.getThreadProjection(childThreadId);
-          assert.deepEqual(
-            childAfter.messages.flatMap((message) =>
-              message.role === "user" ? [message.text] : [],
-            ),
-            resumed ? ["Review the change", "Continue where you left off."] : ["Review the change"],
-          );
-        }).pipe(Effect.provide(layerTest));
-      }),
-    ),
+        yield* TestClock.adjust("1 minute");
+        yield* sweep;
+        const childAfter = yield* orchestrator.getThreadProjection(childThreadId);
+        assert.deepEqual(
+          childAfter.messages.flatMap((message) => (message.role === "user" ? [message.text] : [])),
+          resumed ? ["Review the change", "Continue where you left off."] : ["Review the change"],
+        );
+      }).pipe(Effect.provide(layerTest));
+    }),
 );
diff --git a/apps/server/src/mcp/threadAccess.ts b/apps/server/src/mcp/threadAccess.ts
index 48d972c5be2f..416592a57fe7 100644
--- a/apps/server/src/mcp/threadAccess.ts
+++ b/apps/server/src/mcp/threadAccess.ts
@@ -1,4 +1,7 @@
-import type { ProjectionRecordField } from "../orchestration-v2/ProjectionStore.ts";
+import type {
+  ProjectionRecordField,
+  ProjectionRecordFilter,
+} from "../orchestration-v2/ProjectionStore.ts";
 import {
   CommandId,
   OrchestratorMcpFailure,
@@ -182,7 +185,7 @@ const resolveThreadId = (context: Caller, threadId: ThreadId | undefined) =>
 
 export const readThread = Effect.fn("mcp.readThread")(function* <
   K extends ProjectionRecordField = never,
->(threadId?: ThreadId, fields: ReadonlyArray<K> = []) {
+>(threadId?: ThreadId, fields: ReadonlyArray<K> = [], filter?: ProjectionRecordFilter) {
   const context = yield* readCaller();
   const targetId = yield* resolveThreadId(context, threadId);
   const shell = yield* context.threads.getThreadShell(targetId).pipe(Effect.mapError(unavailable));
@@ -192,6 +195,7 @@ export const readThread = Effect.fn("mcp.readThread")(function* <
   const projection = yield* context.threads
     .getProjectThreadRecords({ projectId: shell.projectId, threadId: targetId }, fields, {
       turnItemTypes: ["user_input_request"],
+      ...filter,
     })
     .pipe(
       Effect.mapError((error) =>
diff --git a/apps/server/src/mcp/toolkits/core.test.ts b/apps/server/src/mcp/toolkits/core.test.ts
index 9682a45f5e59..b2aaed70322c 100644
--- a/apps/server/src/mcp/toolkits/core.test.ts
+++ b/apps/server/src/mcp/toolkits/core.test.ts
@@ -45,6 +45,7 @@ import * as ProviderAdapterRegistry from "../../orchestration-v2/ProviderAdapter
 import * as ThreadLaunchService from "../../orchestration-v2/ThreadLaunchService.ts";
 import * as GitVcsDriver from "../../vcs/GitVcsDriver.ts";
 import * as ThreadManagement from "../../orchestration-v2/ThreadManagementService.ts";
+import type * as ProjectionStore from "../../orchestration-v2/ProjectionStore.ts";
 import * as ThreadSearch from "../../orchestration-v2/ThreadSearch.ts";
 import * as PreviewBrowser from "../../preview/PreviewBrowser.ts";
 import * as ProjectService from "../../project/ProjectService.ts";
@@ -222,6 +223,80 @@ it.effect("an answered question reports already answered instead of not found",
   );
 });
 
+it.effect("a pending question read keeps option previews", () => {
+  const shell = McpToolAccessTestkit.liveThreadShell(threadId);
+  const requestId = RuntimeRequestId.make("previewed-question");
+  const projection = McpToolAccessTestkit.idleThreadProjection(shell);
+  const questions = [
+    {
+      id: "post",
+      header: "Review",
+      question: "Post it?",
+      options: [{ label: "Post", description: "Publish the draft", preview: "Full proposed text" }],
+    },
+  ];
+  return Effect.gen(function* () {
+    const server = yield* McpServer.McpServer;
+    const result = yield* server
+      .callTool({ name: "t3_pending_request", arguments: { action: "read", requestId } })
+      .pipe(
+        Effect.provideService(McpInvocationContext.McpInvocationContext, scope),
+        Effect.provideService(McpSchema.McpServerClient, client),
+      );
+    expect(result.structuredContent).toEqual({ requestId, questions });
+  }).pipe(
+    Effect.provide(
+      layerThreadToolkit.pipe(
+        Layer.provideMerge(McpHttpServer.layerInProcessMcpServer),
+        Layer.provide(NodeCrypto.layer),
+        Layer.provide(
+          Layer.mock(ThreadManagement.ThreadManagementService)({
+            getThreadShell: () => Effect.succeed(shell),
+            getProjectThreadRecords: () =>
+              Effect.succeed({
+                ...projection,
+                runtimeRequests: [
+                  {
+                    id: requestId,
+                    nodeId: NodeId.make("root"),
+                    providerTurnId: null,
+                    nativeRequestRef: null,
+                    kind: "user_input",
+                    status: "pending",
+                    responseCapability: { type: "message" },
+                    createdAt: shell.createdAt,
+                    resolvedAt: null,
+                  },
+                ],
+                turnItems: [
+                  {
+                    id: TurnItemId.make("previewed-question-item"),
+                    threadId,
+                    runId: null,
+                    nodeId: null,
+                    providerThreadId: null,
+                    providerTurnId: null,
+                    nativeItemRef: null,
+                    parentItemId: null,
+                    ordinal: 0,
+                    status: "running",
+                    title: null,
+                    startedAt: shell.createdAt,
+                    completedAt: null,
+                    updatedAt: shell.updatedAt,
+                    type: "user_input_request",
+                    requestId,
+                    questions,
+                  },
+                ],
+              }),
+          }),
+        ),
+      ),
+    ),
+  );
+});
+
 it("bounds public command rejections and redacts internal dispatch causes", () => {
   const command = { commandId: CommandId.make("mcp-core-command"), commandType: "thread.settle" };
   expect(
@@ -393,6 +468,101 @@ it.effect("records only failed calls of tools that hand off no work", () => {
   );
 });
 
+// A thread read whose runs or messages are bounded by nothing but the thread.
+const historyReads = (reads: Array<string>) => {
+  const record = (
+    fields: ReadonlyArray<string>,
+    filter: ProjectionStore.ProjectionRecordFilter | undefined,
+  ) => {
+    if (
+      fields.includes("runs") &&
+      filter?.runIds === undefined &&
+      filter?.runStatuses === undefined
+    )
+      reads.push("every run");
+    if (
+      fields.includes("messages") &&
+      filter?.messageIds === undefined &&
+      filter?.messageRunIds === undefined
+    )
+      reads.push("every message");
+  };
+  const projection = McpToolAccessTestkit.idleThreadProjection(
+    McpToolAccessTestkit.liveThreadShell(threadId),
+  );
+  return Layer.mock(ThreadManagement.ThreadManagementService)({
+    getThreadShell: (id) => Effect.succeed(McpToolAccessTestkit.liveThreadShell(id)),
+    getProjectThreadRecords: (_target, fields, filter) =>
+      Effect.sync(() => record(fields, filter)).pipe(Effect.as(projection as never)),
+    getThreadRecords: (_id, fields, filter) =>
+      Effect.sync(() => record(fields, filter)).pipe(Effect.as(projection as never)),
+    getMessagesById: () => Effect.succeed(new Map()),
+    dispatch: () => Effect.succeed({ sequence: 1 } as never),
+  });
+};
+
+it.effect("t3_queue list and read load only the queued runs and their messages", () => {
+  const reads: Array<string> = [];
+  return Effect.gen(function* () {
+    const server = yield* McpServer.McpServer;
+    const call = (args: Record<string, unknown>) =>
+      server
+        .callTool({ name: "t3_queue", arguments: args })
+        .pipe(
+          Effect.provideService(McpInvocationContext.McpInvocationContext, scope),
+          Effect.provideService(McpSchema.McpServerClient, client),
+        );
+    yield* call({ action: "list" });
+    yield* call({ action: "read", queuedRunId: "run:queued" });
+    expect(reads).toEqual([]);
+  }).pipe(
+    Effect.provide(
+      layerThreadToolkit.pipe(
+        Layer.provideMerge(McpHttpServer.layerInProcessMcpServer),
+        Layer.provide(NodeCrypto.layer),
+        Layer.provide(historyReads(reads)),
+      ),
+    ),
+  );
+});
+
+it.effect("handoff analytics read only the caller's active run and its message", () => {
+  const reads: Array<string> = [];
+  const recorded = Deferred.makeUnsafe<void>();
+  return Effect.gen(function* () {
+    const server = yield* McpServer.McpServer;
+    yield* server
+      .callTool({
+        name: "t3_queue",
+        arguments: { action: "edit", queuedRunId: "run:queued", text: "Edited" },
+      })
+      .pipe(
+        Effect.provideService(McpInvocationContext.McpInvocationContext, scope),
+        Effect.provideService(McpSchema.McpServerClient, client),
+      );
+    yield* Deferred.await(recorded);
+    expect(reads).toEqual([]);
+  }).pipe(
+    Effect.provide(
+      layerThreadToolkit.pipe(
+        Layer.provideMerge(McpHttpServer.layerInProcessMcpServer),
+        Layer.provide(NodeCrypto.layer),
+        Layer.provide(historyReads(reads)),
+        Layer.provide(
+          Layer.succeed(
+            AnalyticsService.AnalyticsService,
+            AnalyticsService.AnalyticsService.of({
+              record: () => Deferred.succeed(recorded, undefined).pipe(Effect.asVoid),
+              flush: Effect.void,
+              recordOwners: () => Effect.void,
+            }),
+          ),
+        ),
+      ),
+    ),
+  );
+});
+
 it.effect("rejects an unknown organize target instead of archiving the calling thread", () => {
   const dispatched: Array<unknown> = [];
   return Effect.gen(function* () {
@@ -1040,7 +1210,8 @@ it.effect("discovers workflow stop targets and requires orchestration capability
             getThreadShell: (id) => Effect.succeed(McpToolAccessTestkit.liveThreadShell(id)),
             getProjectThreadRecords: () =>
               Effect.succeed(McpToolAccessTestkit.idleThreadProjection(shell)),
-            getTimelinePage: () => Effect.succeed({ items: [row], totalItems: 1, hasMore: false }),
+            getTimelinePage: () =>
+              Effect.succeed({ items: [row], totalItems: 1, hasMore: false, hasEarlier: false }),
             stopWorkflow: (input) =>
               Effect.sync(() => {
                 stopped.push(input);
diff --git a/apps/server/src/mcp/toolkits/orchestrator/handlers.ts b/apps/server/src/mcp/toolkits/orchestrator/handlers.ts
index ff81c9b7b6de..dfa1ad58545e 100644
--- a/apps/server/src/mcp/toolkits/orchestrator/handlers.ts
+++ b/apps/server/src/mcp/toolkits/orchestrator/handlers.ts
@@ -75,7 +75,10 @@ const handlers = {
           Effect.mapError(
             (cause) =>
               new OrchestratorMcpFailure({
-                code: cause.reason === "unsupported" ? "invalid_request" : "orchestration_error",
+                code:
+                  cause.reason === "unsupported" || cause.reason === "unmatched"
+                    ? "invalid_request"
+                    : "orchestration_error",
                 message: cause.message,
               }),
           ),
diff --git a/apps/server/src/mcp/toolkits/orchestrator/tools.test.ts b/apps/server/src/mcp/toolkits/orchestrator/tools.test.ts
index ea0caa4ce166..65b88a120b1a 100644
--- a/apps/server/src/mcp/toolkits/orchestrator/tools.test.ts
+++ b/apps/server/src/mcp/toolkits/orchestrator/tools.test.ts
@@ -11,7 +11,7 @@ it("states t3_thread_read page size limits in the parameter descriptions", () =>
   const schema = Tool.getJsonSchema(OrchestratorToolkit.tools.t3_thread_read) as {
     readonly properties: Readonly<Record<string, { readonly description?: string }>>;
   };
-  const limits = { limit: "100", runLimit: "50", maxCharsPerItem: "50000" };
+  const limits = { limit: "100", runLimit: "50", maxCharsPerItem: "20000" };
   for (const [name, maximum] of Object.entries(limits)) {
     expect(schema.properties[name]?.description, name).toContain(maximum);
   }
diff --git a/apps/server/src/mcp/toolkits/orchestrator/tools.ts b/apps/server/src/mcp/toolkits/orchestrator/tools.ts
index 38d8fb4e0ada..d85786c9f5c1 100644
--- a/apps/server/src/mcp/toolkits/orchestrator/tools.ts
+++ b/apps/server/src/mcp/toolkits/orchestrator/tools.ts
@@ -245,7 +245,7 @@ const ThreadListTool = Tool.make("t3_thread_list", {
 
 const ThreadReadTool = Tool.make("t3_thread_read", {
   description:
-    "Read any thread by id. `messages` (default): user and assistant messages and plans. `activity`: all timeline items. Keep reads small: low `limit` and `maxCharsPerItem`. Page with `afterPosition=nextPosition`. Cut-off text: `itemId` with `textOffset=nextTextOffset`. Reading a child's final result marks it delivered. In your reply, name it as its `link` verbatim.",
+    "Read any thread by id. View `messages` (default) or `activity` (all items). Newest first; older: `beforePosition=earlierPosition`; from the start: `afterPosition=-1`, then `nextPosition`. Cut-off text: `itemId`, `textOffset=nextTextOffset`. Reading a child's final result marks it delivered. In your reply, name it as its `link` verbatim.",
   parameters: OrchestratorMcpThreadReadInput,
   success: OrchestratorMcpThreadReadResult,
   failure: OrchestratorMcpFailure,
diff --git a/apps/server/src/mcp/toolkits/preview/handlers.test.ts b/apps/server/src/mcp/toolkits/preview/handlers.test.ts
index 25eebc0c16f8..496c9bcb1cdc 100644
--- a/apps/server/src/mcp/toolkits/preview/handlers.test.ts
+++ b/apps/server/src/mcp/toolkits/preview/handlers.test.ts
@@ -28,77 +28,75 @@ import { claimPreviewRecording, layerStandard } from "./handlers.ts";
 import { PreviewStandardToolkit } from "./tools.ts";
 
 it.effect("preview_open navigates the opened tab to a dev server in one tool call", () =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      const scope = yield* McpInvocationContext.McpInvocationContext;
-      const broker = yield* PreviewAutomationBroker.PreviewAutomationBroker;
-      const connected = yield* Deferred.make<void>();
-      const tabId = PreviewTabId.make("opened-tab");
-      const target = {
-        kind: "environment-port" as const,
-        port: 3000,
-        path: "/settings?tab=account",
-      };
-      const requests: PreviewAutomationRequest[] = [];
-      const status = {
-        available: true,
-        visible: false,
-        tabId,
-        url: "http://localhost:3000/settings?tab=account",
-        title: "Settings",
-        loading: false,
-      };
-      const events = yield* broker.connect({
+  Effect.gen(function* () {
+    const scope = yield* McpInvocationContext.McpInvocationContext;
+    const broker = yield* PreviewAutomationBroker.PreviewAutomationBroker;
+    const connected = yield* Deferred.make<void>();
+    const tabId = PreviewTabId.make("opened-tab");
+    const target = {
+      kind: "environment-port" as const,
+      port: 3000,
+      path: "/settings?tab=account",
+    };
+    const requests: PreviewAutomationRequest[] = [];
+    const status = {
+      available: true,
+      visible: false,
+      tabId,
+      url: "http://localhost:3000/settings?tab=account",
+      title: "Settings",
+      loading: false,
+    };
+    const events = yield* broker.connect({
+      clientId: "client-1",
+      environmentId: scope.environmentId,
+    });
+    yield* Stream.runForEach(events, (event) => {
+      if (event.type === "connected") return Deferred.succeed(connected, undefined);
+      requests.push(event.request);
+      return broker.respond({
         clientId: "client-1",
-        environmentId: scope.environmentId,
+        connectionId: event.connectionId,
+        requestId: event.request.requestId,
+        ok: true,
+        result: event.request.operation === "open" ? { ...status, url: "about:blank" } : status,
       });
-      yield* Stream.runForEach(events, (event) => {
-        if (event.type === "connected") return Deferred.succeed(connected, undefined);
-        requests.push(event.request);
-        return broker.respond({
-          clientId: "client-1",
-          connectionId: event.connectionId,
-          requestId: event.request.requestId,
-          ok: true,
-          result: event.request.operation === "open" ? { ...status, url: "about:blank" } : status,
-        });
-      }).pipe(Effect.forkScoped);
-      yield* Deferred.await(connected);
-      const toolkit = yield* PreviewStandardToolkit.pipe(
-        Effect.provide(McpToolAccess.HandlersLayer.layer(layerStandard)),
-      );
-      const results = yield* toolkit
-        .handle("preview_open", {
-          url: "http://localhost:3000",
-          target,
-          open: false,
-          reuseExistingTab: false,
-        })
-        .pipe(Stream.unwrap, Stream.runCollect);
-      expect(results.at(-1)?.result).toEqual(status);
-      expect(requests.map(({ operation, input }) => ({ operation, input }))).toEqual([
-        { operation: "open", input: { open: false, show: false, reuseExistingTab: false } },
-        { operation: "navigate", input: { target } },
-      ]);
-      expect(requests[1]?.tabId).toBe(tabId);
-      expect(requests[1]?.tabIdExplicit).toBe(true);
-    }).pipe(
-      Effect.provideService(McpInvocationContext.McpInvocationContext, {
-        environmentId: EnvironmentId.make("environment-1"),
-        requestNamespace: "provider-session-1",
-        thread: {
-          threadId: ThreadId.make("thread-1"),
-          providerSessionId: "provider-session-1",
-          providerInstanceId: ProviderInstanceId.make("codex"),
-        },
-        client: undefined,
-        capabilities: new Set(["preview"] as const),
-        issuedAt: 1,
-      }),
-      Effect.provide(
-        Layer.mergeAll(PreviewAutomationBroker.layer, liveThreadsLayer).pipe(
-          Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
-        ),
+    }).pipe(Effect.forkScoped);
+    yield* Deferred.await(connected);
+    const toolkit = yield* PreviewStandardToolkit.pipe(
+      Effect.provide(McpToolAccess.HandlersLayer.layer(layerStandard)),
+    );
+    const results = yield* toolkit
+      .handle("preview_open", {
+        url: "http://localhost:3000",
+        target,
+        open: false,
+        reuseExistingTab: false,
+      })
+      .pipe(Stream.unwrap, Stream.runCollect);
+    expect(results.at(-1)?.result).toEqual(status);
+    expect(requests.map(({ operation, input }) => ({ operation, input }))).toEqual([
+      { operation: "open", input: { open: false, show: false, reuseExistingTab: false } },
+      { operation: "navigate", input: { target } },
+    ]);
+    expect(requests[1]?.tabId).toBe(tabId);
+    expect(requests[1]?.tabIdExplicit).toBe(true);
+  }).pipe(
+    Effect.provideService(McpInvocationContext.McpInvocationContext, {
+      environmentId: EnvironmentId.make("environment-1"),
+      requestNamespace: "provider-session-1",
+      thread: {
+        threadId: ThreadId.make("thread-1"),
+        providerSessionId: "provider-session-1",
+        providerInstanceId: ProviderInstanceId.make("codex"),
+      },
+      client: undefined,
+      capabilities: new Set(["preview"] as const),
+      issuedAt: 1,
+    }),
+    Effect.provide(
+      Layer.mergeAll(PreviewAutomationBroker.layer, liveThreadsLayer).pipe(
+        Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
       ),
     ),
   ),
diff --git a/apps/server/src/mcp/toolkits/previewControls/handlers.test.ts b/apps/server/src/mcp/toolkits/previewControls/handlers.test.ts
index 435ab1cd8b1b..9aeda8ad1393 100644
--- a/apps/server/src/mcp/toolkits/previewControls/handlers.test.ts
+++ b/apps/server/src/mcp/toolkits/previewControls/handlers.test.ts
@@ -27,79 +27,77 @@ it.effect.each([
   { name: "project opt-in", globalAccess: false, projectAccess: true },
   { name: "project opt-out", globalAccess: true, projectAccess: false },
 ])("list and close respect the credential for a $name", ({ globalAccess, projectAccess }) =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      const projectId = ProjectId.make("preview-controls-project");
-      const threadId = ThreadId.make("preview-controls-thread");
-      const settings = {
-        ...DEFAULT_SERVER_SETTINGS,
-        enableAgentBrowserAccess: globalAccess,
-        projectSettingsOverrides: {
-          [projectId]: { enableAgentBrowserAccess: projectAccess },
-        },
-      };
-      const effective = resolveProjectSettings(settings, projectId).settings;
-      const scope: McpInvocationContext.McpInvocationScope = {
-        environmentId: EnvironmentId.make("preview-controls-environment"),
-        requestNamespace: "preview-controls-provider-session",
-        thread: {
-          threadId,
-          providerSessionId: "preview-controls-provider-session",
-          providerInstanceId: ProviderInstanceId.make("codex"),
-        },
-        client: undefined,
-        capabilities: new Set(effective.enableAgentBrowserAccess ? ["preview"] : []),
-        issuedAt: 0,
-      };
-      const manager = yield* Preview.make.pipe(
-        Effect.provide(
-          Layer.merge(
-            ServerConfig.layerTest(process.cwd(), { prefix: "t3-preview-controls-" }).pipe(
-              Layer.provide(NodeServices.layer),
-            ),
-            NodeCrypto.layer,
+  Effect.gen(function* () {
+    const projectId = ProjectId.make("preview-controls-project");
+    const threadId = ThreadId.make("preview-controls-thread");
+    const settings = {
+      ...DEFAULT_SERVER_SETTINGS,
+      enableAgentBrowserAccess: globalAccess,
+      projectSettingsOverrides: {
+        [projectId]: { enableAgentBrowserAccess: projectAccess },
+      },
+    };
+    const effective = resolveProjectSettings(settings, projectId).settings;
+    const scope: McpInvocationContext.McpInvocationScope = {
+      environmentId: EnvironmentId.make("preview-controls-environment"),
+      requestNamespace: "preview-controls-provider-session",
+      thread: {
+        threadId,
+        providerSessionId: "preview-controls-provider-session",
+        providerInstanceId: ProviderInstanceId.make("codex"),
+      },
+      client: undefined,
+      capabilities: new Set(effective.enableAgentBrowserAccess ? ["preview"] : []),
+      issuedAt: 0,
+    };
+    const manager = yield* Preview.make.pipe(
+      Effect.provide(
+        Layer.merge(
+          ServerConfig.layerTest(process.cwd(), { prefix: "t3-preview-controls-" }).pipe(
+            Layer.provide(NodeServices.layer),
           ),
+          NodeCrypto.layer,
         ),
-      );
-      const tab = yield* manager.open({ threadId, url: "http://localhost:3000" });
-      const layerDependencies = Layer.mergeAll(
-        PreviewAutomationBroker.layer.pipe(
-          Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
-        ),
-        Layer.succeed(Preview.PreviewManager, manager),
-        Layer.succeed(McpInvocationContext.McpInvocationContext, scope),
-        McpToolAccessTestkit.liveThreadsLayer,
-        Layer.mock(ServerSettings.ServerSettingsService)({
-          getSettings: Effect.succeed(settings),
-        }),
-      );
-      const toolkit = yield* PreviewControlsToolkit.pipe(
-        Effect.provide(
-          McpToolAccess.HandlersLayer.layer(PreviewControlsHandlers.layer).pipe(
-            Layer.provide(layerDependencies),
-          ),
+      ),
+    );
+    const tab = yield* manager.open({ threadId, url: "http://localhost:3000" });
+    const layerDependencies = Layer.mergeAll(
+      PreviewAutomationBroker.layer.pipe(
+        Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
+      ),
+      Layer.succeed(Preview.PreviewManager, manager),
+      Layer.succeed(McpInvocationContext.McpInvocationContext, scope),
+      McpToolAccessTestkit.liveThreadsLayer,
+      Layer.mock(ServerSettings.ServerSettingsService)({
+        getSettings: Effect.succeed(settings),
+      }),
+    );
+    const toolkit = yield* PreviewControlsToolkit.pipe(
+      Effect.provide(
+        McpToolAccess.HandlersLayer.layer(PreviewControlsHandlers.layer).pipe(
+          Layer.provide(layerDependencies),
         ),
-      );
-      const listed = yield* toolkit
-        .handle("t3_preview_list", {})
-        .pipe(Stream.unwrap, Stream.runCollect, Effect.provide(layerDependencies));
-      const closed = yield* toolkit
-        .handle("t3_preview_close", { tabId: tab.tabId })
-        .pipe(Stream.unwrap, Stream.runCollect, Effect.provide(layerDependencies));
-      if (projectAccess) {
-        expect(listed.at(-1)?.result).toMatchObject({ sessions: [tab], nextCursor: null });
-        expect(closed.at(-1)?.result).toEqual({});
-        expect((yield* manager.list({ threadId })).sessions).toEqual([]);
-      } else {
-        for (const result of [listed, closed]) {
-          expect(result.at(-1)?.result).toMatchObject({
-            _tag: "PreviewAutomationUnavailableError",
-            capability: "preview",
-            threadId,
-          });
-        }
-        expect((yield* manager.list({ threadId })).sessions).toEqual([tab]);
+      ),
+    );
+    const listed = yield* toolkit
+      .handle("t3_preview_list", {})
+      .pipe(Stream.unwrap, Stream.runCollect, Effect.provide(layerDependencies));
+    const closed = yield* toolkit
+      .handle("t3_preview_close", { tabId: tab.tabId })
+      .pipe(Stream.unwrap, Stream.runCollect, Effect.provide(layerDependencies));
+    if (projectAccess) {
+      expect(listed.at(-1)?.result).toMatchObject({ sessions: [tab], nextCursor: null });
+      expect(closed.at(-1)?.result).toEqual({});
+      expect((yield* manager.list({ threadId })).sessions).toEqual([]);
+    } else {
+      for (const result of [listed, closed]) {
+        expect(result.at(-1)?.result).toMatchObject({
+          _tag: "PreviewAutomationUnavailableError",
+          capability: "preview",
+          threadId,
+        });
       }
-    }),
-  ),
+      expect((yield* manager.list({ threadId })).sessions).toEqual([tab]);
+    }
+  }),
 );
diff --git a/apps/server/src/mcp/toolkits/pullRequests/handlers.test.ts b/apps/server/src/mcp/toolkits/pullRequests/handlers.test.ts
index ceaef41d459f..e797d6bcf5c2 100644
--- a/apps/server/src/mcp/toolkits/pullRequests/handlers.test.ts
+++ b/apps/server/src/mcp/toolkits/pullRequests/handlers.test.ts
@@ -26,6 +26,7 @@ import {
   v2PullRequestThread,
 } from "../../../orchestration-v2/testkit/pullRequestFixtures.ts";
 import * as ProjectService from "../../../project/ProjectService.ts";
+import * as PullRequestWatchService from "../../../pullRequest/PullRequestWatchService.ts";
 import * as PullRequestReviewGuideService from "../../../pullRequest/PullRequestReviewGuideService.ts";
 import * as McpInvocationContext from "../../McpInvocationContext.ts";
 import * as McpToolAccess from "../../McpToolAccess.ts";
@@ -167,6 +168,7 @@ const makeHarness = Effect.fn("makePullRequestsToolkitHarness")(function* (
       return { sequence: 1, storedEvents: [] };
     });
   const layerDependencies = Layer.mergeAll(
+    Layer.mock(PullRequestWatchService.PullRequestWatchService)({}),
     Layer.mock(ProjectService.ProjectService)({
       getShell: () => Effect.succeed(Option.fromNullishOr(project)),
       listShells: () => Effect.succeed(options.projects ?? (project ? [project] : [])),
@@ -278,93 +280,6 @@ describe("pull request toolkit handlers", () => {
     }),
   );
 
-  it.effect("watching an unlinked pull request links it first", () =>
-    Effect.gen(function* () {
-      const harness = yield* makeHarness();
-      const result = yield* harness.call("watch_pull_request", {
-        url: "https://github.com/t3tools/t3code/pull/9",
-      });
-      expect(result).toMatchObject({ number: 9, watching: false, wasWatching: false });
-      expect(yield* Ref.get(harness.commands)).toMatchObject([
-        {
-          type: "thread.pull-request.watch",
-          number: 9,
-          watching: true,
-          link: { url: "https://github.com/t3tools/t3code/pull/9", source: "agent" },
-        },
-      ]);
-    }),
-  );
-
-  it.effect("refuses to watch a merged pull request and stops an existing watch", () =>
-    Effect.gen(function* () {
-      const watch = {
-        startedAt: "2026-08-20T00:00:00.000Z",
-        headSha: null,
-        failedChecks: [],
-        passed: false,
-        passedChecks: [],
-        remarksThrough: "2026-08-20T00:00:00.000Z",
-        remarkIds: [],
-        conflicting: false,
-        wakes: 0,
-      };
-      const merged = makeLink(1, { headBranch: "done" });
-      const harness = yield* makeHarness({
-        thread: makeThread([
-          { ...merged, snapshot: merged.snapshot && { ...merged.snapshot, state: "merged" } },
-          makeLink(2, { headBranch: "idle" }),
-          makeLink(3, { headBranch: "watched", watch }),
-        ]),
-      });
-      const error = yield* harness
-        .call("watch_pull_request", { repository: "t3tools/t3code", number: 1 })
-        .pipe(Effect.flip);
-      expect(error).toMatchObject({ _tag: "PullRequestNotOpenError", state: "merged" });
-      expect(
-        yield* harness.call("unwatch_pull_request", { repository: "t3tools/t3code", number: 3 }),
-      ).toMatchObject({ wasWatching: true });
-      expect(yield* Ref.get(harness.commands)).toMatchObject([
-        { type: "thread.pull-request.watch", number: 3, watching: false },
-      ]);
-    }),
-  );
-
-  it.effect("watches a pull request saved as closed, since it may have reopened", () =>
-    Effect.gen(function* () {
-      const closed = makeLink(1, { headBranch: "closed" });
-      const harness = yield* makeHarness({
-        thread: makeThread([
-          { ...closed, snapshot: closed.snapshot && { ...closed.snapshot, state: "closed" } },
-        ]),
-      });
-      yield* harness.call("watch_pull_request", { repository: "t3tools/t3code", number: 1 });
-      expect(yield* Ref.get(harness.commands)).toMatchObject([
-        { type: "thread.pull-request.watch", number: 1, watching: true },
-      ]);
-    }),
-  );
-
-  it.effect("refuses a watch from a subagent thread, whose parent owns the pull request", () =>
-    Effect.gen(function* () {
-      const harness = yield* makeHarness({
-        thread: {
-          ...makeThread([makeLink(1, { headBranch: "feature" })]),
-          lineage: {
-            rootThreadId: ThreadId.make("parent"),
-            parentThreadId: ThreadId.make("parent"),
-            relationshipToParent: "subagent",
-          },
-        },
-      });
-      const error = yield* harness
-        .call("watch_pull_request", { repository: "t3tools/t3code", number: 1 })
-        .pipe(Effect.flip);
-      expect(error).toMatchObject({ _tag: "PullRequestWatchFromSubagentError" });
-      expect(yield* Ref.get(harness.commands)).toEqual([]);
-    }),
-  );
-
   it.effect("asks a subagent thread to end with its PR report after it links", () =>
     Effect.gen(function* () {
       const harness = yield* makeHarness({
@@ -622,8 +537,8 @@ describe("pull request toolkit handlers", () => {
         ]),
       });
       const result = yield* harness.call("list_thread_pull_requests", {});
-      expect(result.pullRequests.map((entry) => entry.number)).toEqual([3, 1, 2, 10]);
-      expect(result.pullRequests[0]).toEqual({
+      expect(result.pullRequests.map((entry) => entry.number)).toEqual([1, 2, 3, 10]);
+      expect(result.pullRequests[2]).toEqual({
         host: "github.com",
         repository: "t3tools/t3code",
         number: 3,
@@ -672,8 +587,8 @@ describe("listThreadPullRequests", () => {
       ],
     });
     expect(result.pullRequests.map((entry) => [entry.number, entry.stack])).toEqual([
-      [2, { kind: "native", position: 2, size: 2 }],
       [1, { kind: "native", position: 1, size: 2 }],
+      [2, { kind: "native", position: 2, size: 2 }],
     ]);
     expect(result.chains).toEqual([{ kind: "native", numbers: [1, 2] }]);
   });
@@ -693,6 +608,58 @@ describe("listThreadPullRequests", () => {
     ]);
     expect(result.chains).toEqual([{ kind: "derived", numbers: [1, 2, 3] }]);
   });
+
+  it("pages a large list once through, with each page's stacks whole", () => {
+    const thread = {
+      pullRequests: [
+        makeLink(1, { headBranch: "feat-a" }),
+        ...Array.from({ length: 118 }, (_, index) => makeLink(index + 2)),
+        makeLink(120, { headBranch: "feat-z", baseBranch: "feat-a" }),
+      ],
+    };
+    const pages = [listThreadPullRequests(thread)];
+    for (let next = pages[0]!.nextCursor; next !== null; next = pages.at(-1)!.nextCursor) {
+      pages.push(listThreadPullRequests(thread, next));
+    }
+    expect(pages.map((page) => page.pullRequests.length)).toEqual([50, 50, 20]);
+    expect(pages.flatMap((page) => page.pullRequests.map((entry) => entry.number))).toEqual(
+      Array.from({ length: 120 }, (_, index) => index + 1),
+    );
+    const stack = { kind: "derived", numbers: [1, 120] };
+    expect(pages.map((page) => page.chains.length)).toEqual([50, 50, 20]);
+    expect(pages.map((page) => page.chains.filter((chain) => chain.numbers.length > 1))).toEqual([
+      [stack],
+      [],
+      [stack],
+    ]);
+
+    // Unlinking the first page must not shift the cursor past PRs not yet seen.
+    const remaining = { pullRequests: thread.pullRequests.slice(50) };
+    expect(
+      listThreadPullRequests(remaining, pages[0]!.nextCursor!).pullRequests.map(
+        (entry) => entry.number,
+      ),
+    ).toEqual(Array.from({ length: 50 }, (_, index) => index + 51));
+  });
+
+  it("filters by state before paging, counting a PR with no known state as open", () => {
+    const merged = (number: number) => {
+      const link = makeLink(number, { headBranch: `feat-${number}` });
+      return { ...link, snapshot: { ...link.snapshot!, state: "merged" as const } };
+    };
+    const thread = {
+      pullRequests: [
+        ...Array.from({ length: 50 }, (_, index) => merged(index + 1)),
+        ...Array.from({ length: 10 }, (_, index) => makeLink(index + 51)),
+      ],
+    };
+    const open = listThreadPullRequests(thread, undefined, ["open"]);
+    expect(open.pullRequests.map((entry) => entry.number)).toEqual(
+      Array.from({ length: 10 }, (_, index) => index + 51),
+    );
+    expect(open.nextCursor).toBeNull();
+    expect(listThreadPullRequests(thread, undefined, ["merged"]).nextCursor).toBeNull();
+  });
 });
 
 describe("pull request guide tools", () => {
diff --git a/apps/server/src/mcp/toolkits/pullRequests/handlers.ts b/apps/server/src/mcp/toolkits/pullRequests/handlers.ts
index a703a8f5f39f..84e65ce877f6 100644
--- a/apps/server/src/mcp/toolkits/pullRequests/handlers.ts
+++ b/apps/server/src/mcp/toolkits/pullRequests/handlers.ts
@@ -1,12 +1,11 @@
 import {
   CommandId,
   type OrchestrationProjectShell,
+  type PullRequestState,
   type OrchestrationV2ThreadShell,
-  type SourceControlProviderKind,
   type ThreadId,
   type ThreadPullRequestLink,
 } from "@t3tools/contracts";
-import { canonicalizeGitCafePullRequestUrl } from "@t3tools/source-control-definitions/registry";
 import * as Cause from "effect/Cause";
 import * as SecureRandom from "effect/crypto/SecureRandom";
 import * as Effect from "effect/Effect";
@@ -14,6 +13,8 @@ import * as Option from "effect/Option";
 
 import * as Orchestrator from "../../../orchestration-v2/Orchestrator.ts";
 import * as ProjectService from "../../../project/ProjectService.ts";
+import * as PullRequestWatchService from "../../../pullRequest/PullRequestWatchService.ts";
+import { resolveTarget, type ResolvedTarget } from "../../../pullRequest/pullRequestTarget.ts";
 import * as PullRequestReviewGuideService from "../../../pullRequest/PullRequestReviewGuideService.ts";
 import { pullRequestSyncKey } from "../../../pullRequest/pullRequestSyncKey.ts";
 import { sourceControlDefinitions } from "../../../sourceControl/sourceControlDefinitions.ts";
@@ -31,16 +32,9 @@ import { threadNotFound } from "../../threadAccess.ts";
 import {
   type ListThreadPullRequestsResult,
   PullRequestLinkFailedError,
-  PullRequestUrlInvalidError,
-  PullRequestTargetIncompleteError,
-  PullRequestHostRequiredError,
-  PullRequestUrlUnavailableError,
   PullRequestUnlinkFailedError,
   PullRequestListFailedError,
-  PullRequestNotOpenError,
   type PullRequestTargetInput,
-  PullRequestWatchFailedError,
-  PullRequestWatchFromSubagentError,
   PullRequestThreadRequiredError,
   PullRequestGuideFailedError,
   PullRequestProjectNotFoundError,
@@ -49,73 +43,6 @@ import {
   CHILD_PULL_REQUEST_REPORT_NEXT,
 } from "./tools.ts";
 
-interface ResolvedTarget {
-  readonly host: string;
-  readonly repository: string;
-  readonly number: number;
-  readonly url: string;
-}
-
-function projectHostAndProvider(project: OrchestrationProjectShell | undefined): {
-  readonly host: string | null;
-  readonly kind: SourceControlProviderKind | null;
-} {
-  const identity = project?.repositoryIdentity;
-  const kind = identity?.provider ?? null;
-  if (!identity || kind === null) return { host: null, kind: null };
-  return {
-    host: sourceControlDefinitions.changeRequestHost(identity, kind),
-    kind,
-  };
-}
-
-const resolveTarget = Effect.fn("PullRequestsToolkit.resolveTarget")(function* (
-  input: PullRequestTargetInput,
-  project: OrchestrationProjectShell | undefined,
-) {
-  if (input.url !== undefined) {
-    const parsed = sourceControlDefinitions.parseChangeRequestUrl(input.url)?.link;
-    if (parsed === undefined) {
-      return yield* new PullRequestUrlInvalidError({});
-    }
-    return {
-      ...normalizeThreadPullRequestKey(parsed),
-      url: canonicalizeGitCafePullRequestUrl(input.url),
-    } satisfies ResolvedTarget;
-  }
-  if (input.repository === undefined || input.number === undefined) {
-    return yield* new PullRequestTargetIncompleteError({});
-  }
-  const projectHost = projectHostAndProvider(project);
-  const host = (input.host ?? projectHost.host)?.toLowerCase();
-  if (host === undefined) {
-    return yield* new PullRequestHostRequiredError({});
-  }
-  const repository = input.repository.toLowerCase();
-  // Without a URL, a public forge host says what shape its change request URLs take;
-  // any other host is taken to run the project's own forge.
-  const recognizedKind = sourceControlDefinitions.recognizeRemote(`https://${host}`)?.kind;
-  const kind =
-    sourceControlDefinitions.findByPublicHost(host)?.kind ??
-    (recognizedKind === "gitcafe" ? recognizedKind : projectHost.kind);
-  const url =
-    kind === null
-      ? null
-      : sourceControlDefinitions.get(kind).changeRequestUrl({
-          host,
-          repository,
-          number: input.number,
-          remoteUrl: project?.repositoryIdentity?.locator.remoteUrl,
-        });
-  if (url === null) {
-    return yield* new PullRequestUrlUnavailableError({});
-  }
-  return {
-    ...normalizeThreadPullRequestKey({ host, repository, number: input.number, url }),
-    url: canonicalizeGitCafePullRequestUrl(url),
-  } satisfies ResolvedTarget;
-});
-
 function entryOf(
   link: ThreadPullRequestLink,
   chains: ReturnType<typeof resolveThreadPullRequestChains>,
@@ -146,18 +73,39 @@ function entryOf(
   };
 }
 
+const PULL_REQUEST_LIST_PAGE_SIZE = 50;
+
+// A total order that survives unlinking: the cursor names a position, not an index, so removing
+// PRs already returned cannot skip later ones. PRs linked in one call share `linkedAt`.
+function pullRequestListPosition(link: ThreadPullRequestLink): string {
+  return [link.linkedAt, link.host, link.repository, String(link.number).padStart(10, "0")].join(
+    " ",
+  );
+}
+
 export function listThreadPullRequests(
   thread: Pick<OrchestrationV2ThreadShell, "pullRequests">,
+  cursor?: string,
+  states?: ReadonlyArray<PullRequestState>,
 ): ListThreadPullRequestsResult {
   const chains = resolveThreadPullRequestChains(thread.pullRequests ?? []);
+  const after = visibleThreadPullRequests(thread.pullRequests ?? [])
+    .filter((link) => states === undefined || states.includes(link.snapshot?.state ?? "open"))
+    .map((link) => ({ link, position: pullRequestListPosition(link) }))
+    .filter(({ position }) => cursor === undefined || position > cursor)
+    .toSorted((left, right) => (left.position < right.position ? -1 : 1));
+  const page = after.slice(0, PULL_REQUEST_LIST_PAGE_SIZE);
+  const pageKeys = new Set(page.map(({ link }) => threadPullRequestKeyOf(link)));
   return {
-    pullRequests: visibleThreadPullRequests(thread.pullRequests ?? []).map((link) =>
-      entryOf(link, chains),
-    ),
-    chains: chains.map((chain) => ({
-      kind: chain.kind,
-      numbers: chain.layers.map((layer) => layer.number),
-    })),
+    pullRequests: page.map(({ link }) => entryOf(link, chains)),
+    // Stacks with a pull request on this page, whole.
+    chains: chains
+      .filter((chain) => chain.layers.some((layer) => pageKeys.has(threadPullRequestKeyOf(layer))))
+      .map((chain) => ({
+        kind: chain.kind,
+        numbers: chain.layers.map((layer) => layer.number),
+      })),
+    nextCursor: after.length > page.length ? page.at(-1)!.position : null,
   };
 }
 
@@ -198,6 +146,7 @@ function projectForPullRequest(
 const make = Effect.gen(function* () {
   const engine = yield* Orchestrator.OrchestratorV2;
   const reviewGuides = yield* PullRequestReviewGuideService.PullRequestReviewGuideService;
+  const watches = yield* PullRequestWatchService.PullRequestWatchService;
 
   const projects = yield* ProjectService.ProjectService;
   const random = yield* SecureRandom.SecureRandom;
@@ -212,8 +161,7 @@ const make = Effect.gen(function* () {
     Failure:
       | typeof PullRequestLinkFailedError
       | typeof PullRequestUnlinkFailedError
-      | typeof PullRequestListFailedError
-      | typeof PullRequestWatchFailedError,
+      | typeof PullRequestListFailedError,
     requested: ThreadId | undefined,
   ) {
     const scope = yield* McpInvocationContext.requireMcpCapability("pull-requests");
@@ -233,10 +181,7 @@ const make = Effect.gen(function* () {
 
   const projectOf = (
     thread: OrchestrationV2ThreadShell,
-    Failure:
-      | typeof PullRequestLinkFailedError
-      | typeof PullRequestUnlinkFailedError
-      | typeof PullRequestWatchFailedError,
+    Failure: typeof PullRequestLinkFailedError | typeof PullRequestUnlinkFailedError,
   ) =>
     projects.getShell(thread.projectId).pipe(
       Effect.map(Option.getOrUndefined),
@@ -244,61 +189,28 @@ const make = Effect.gen(function* () {
     );
 
   const dispatchFailure =
-    (
-      Failure:
-        | typeof PullRequestLinkFailedError
-        | typeof PullRequestUnlinkFailedError
-        | typeof PullRequestWatchFailedError,
-    ) =>
+    (Failure: typeof PullRequestLinkFailedError | typeof PullRequestUnlinkFailedError) =>
     <E>(
       cause: Cause.Cause<E>,
-    ): Effect.Effect<
-      never,
-      PullRequestLinkFailedError | PullRequestUnlinkFailedError | PullRequestWatchFailedError
-    > =>
+    ): Effect.Effect<never, PullRequestLinkFailedError | PullRequestUnlinkFailedError> =>
       Cause.hasInterruptsOnly(cause)
         ? Effect.failCause(cause as Cause.Cause<never>)
         : Effect.fail(new Failure({ cause }));
 
-  const setWatching = Effect.fn("PullRequestsToolkit.setWatching")(function* (
+  // The domain service owns the registration span.
+  const setWatching = Effect.fnUntraced(function* (
     input: PullRequestTargetInput,
     watching: boolean,
   ) {
-    const thread = yield* requireThread(PullRequestWatchFailedError, input.threadId);
-    const project = yield* projectOf(thread, PullRequestWatchFailedError);
-    const target = yield* resolveTarget(input, project);
-    const watchedLink = (shell: OrchestrationV2ThreadShell) =>
-      threadPullRequestsOf(shell).find(
-        (link) => link.source !== "stack-dismissed" && threadPullRequestKeysEqual(link, target),
-      );
-    if (watching && thread.lineage.relationshipToParent === "subagent") {
-      return yield* new PullRequestWatchFromSubagentError();
-    }
-    const before = watchedLink(thread);
-    if (watching && before?.snapshot?.state === "merged") {
-      return yield* new PullRequestNotOpenError({ state: "merged" });
-    }
-    yield* engine
-      .dispatch({
-        type: "thread.pull-request.watch",
-        commandId: yield* commandId("mcp-pr-watch", thread.id),
-        threadId: thread.id,
-        host: target.host,
-        repository: target.repository,
-        number: target.number,
-        watching,
-        ...(watching ? { link: { url: target.url, source: "agent" as const } } : {}),
-      })
-      .pipe(Effect.catchCause(dispatchFailure(PullRequestWatchFailedError)));
-    const after = yield* requireThread(PullRequestWatchFailedError, thread.id);
-    return {
-      host: target.host,
-      repository: target.repository,
-      number: target.number,
-      url: target.url,
-      watching: watchedLink(after)?.watch !== undefined,
-      wasWatching: before?.watch !== undefined,
-    };
+    const scope = yield* McpInvocationContext.requireMcpCapability("pull-requests");
+    const threadId = input.threadId ?? scope.thread?.threadId;
+    if (threadId === undefined) return yield* new PullRequestThreadRequiredError();
+    return yield* watches.setWatching({ threadId, target: input, watching }).pipe(
+      Effect.catchTags({
+        PullRequestWatchThreadNotFoundError: (error) =>
+          threadNotFound(engine, error.threadId, error.message),
+      }),
+    );
   });
 
   const locateAll = Effect.fn("PullRequestsToolkit.locateAll")(function* (
@@ -517,7 +429,7 @@ const make = Effect.gen(function* () {
     ),
     list_thread_pull_requests: McpToolAccess.reads((input) =>
       requireThread(PullRequestListFailedError, input.threadId).pipe(
-        Effect.map(listThreadPullRequests),
+        Effect.map((thread) => listThreadPullRequests(thread, input.cursor, input.states)),
       ),
     ),
     watch_pull_request: writesThread((input) => setWatching(input, true)),
diff --git a/apps/server/src/mcp/toolkits/pullRequests/tools.ts b/apps/server/src/mcp/toolkits/pullRequests/tools.ts
index e86bf3013bc9..376817db1007 100644
--- a/apps/server/src/mcp/toolkits/pullRequests/tools.ts
+++ b/apps/server/src/mcp/toolkits/pullRequests/tools.ts
@@ -6,6 +6,7 @@ import {
   PullRequestReviewGuide,
   PullRequestReviewGuideRun,
   PullRequestState,
+  PullRequestUnavailableError,
   ThreadPullRequestLinkSource,
   TrimmedNonEmptyString,
   ThreadId,
@@ -19,6 +20,13 @@ import * as McpInvocationContext from "../../McpInvocationContext.ts";
 import * as Orchestrator from "../../../orchestration-v2/Orchestrator.ts";
 import * as ThreadManagementService from "../../../orchestration-v2/ThreadManagementService.ts";
 import * as ProjectService from "../../../project/ProjectService.ts";
+import * as PullRequestWatchService from "../../../pullRequest/PullRequestWatchService.ts";
+import {
+  PullRequestUrlInvalidError,
+  PullRequestTargetIncompleteError,
+  PullRequestHostRequiredError,
+  PullRequestUrlUnavailableError,
+} from "../../../pullRequest/pullRequestTarget.ts";
 import * as PullRequestReviewGuideService from "../../../pullRequest/PullRequestReviewGuideService.ts";
 
 const dependencies = [
@@ -33,6 +41,8 @@ const guideDependencies = [
   PullRequestReviewGuideService.PullRequestReviewGuideService,
 ];
 
+const watchDependencies = [...dependencies, PullRequestWatchService.PullRequestWatchService];
+
 export const PullRequestTargetInput = Schema.Struct({
   environmentId: OrchestratorMcpEnvironmentTarget,
   threadId: Schema.optional(
@@ -59,42 +69,6 @@ export const PullRequestTargetInput = Schema.Struct({
 });
 export type PullRequestTargetInput = typeof PullRequestTargetInput.Type;
 
-export class PullRequestUrlInvalidError extends Schema.TaggedError<PullRequestUrlInvalidError>()(
-  "PullRequestUrlInvalidError",
-  {},
-) {
-  override get message(): string {
-    return "This is not a recognised pull request URL. Pass repository and number instead.";
-  }
-}
-
-export class PullRequestTargetIncompleteError extends Schema.TaggedError<PullRequestTargetIncompleteError>()(
-  "PullRequestTargetIncompleteError",
-  {},
-) {
-  override get message(): string {
-    return "Pass either url, or both repository and number.";
-  }
-}
-
-export class PullRequestHostRequiredError extends Schema.TaggedError<PullRequestHostRequiredError>()(
-  "PullRequestHostRequiredError",
-  {},
-) {
-  override get message(): string {
-    return "This thread's project has no recognised remote. Pass host or url.";
-  }
-}
-
-export class PullRequestUrlUnavailableError extends Schema.TaggedError<PullRequestUrlUnavailableError>()(
-  "PullRequestUrlUnavailableError",
-  {},
-) {
-  override get message(): string {
-    return "This thread's project is on a host with no known pull request URL shape. Pass url.";
-  }
-}
-
 export class PullRequestThreadRequiredError extends Schema.TaggedError<PullRequestThreadRequiredError>()(
   "PullRequestThreadRequiredError",
   {},
@@ -122,33 +96,6 @@ export class PullRequestUnlinkFailedError extends Schema.TaggedError<PullRequest
   }
 }
 
-export class PullRequestWatchFailedError extends Schema.TaggedError<PullRequestWatchFailedError>()(
-  "PullRequestWatchFailedError",
-  { cause: Schema.Defect() },
-) {
-  override get message(): string {
-    return "Could not change whether the pull request is watched.";
-  }
-}
-
-export class PullRequestNotOpenError extends Schema.TaggedError<PullRequestNotOpenError>()(
-  "PullRequestNotOpenError",
-  { state: Schema.String },
-) {
-  override get message(): string {
-    return `The pull request is ${this.state}, so there is nothing to watch.`;
-  }
-}
-
-export class PullRequestWatchFromSubagentError extends Schema.TaggedError<PullRequestWatchFromSubagentError>()(
-  "PullRequestWatchFromSubagentError",
-  {},
-) {
-  override get message(): string {
-    return "This thread is a subagent, so it cannot watch pull requests. Its parent thread owns the pull request: finish your task and report back instead.";
-  }
-}
-
 export class PullRequestListFailedError extends Schema.TaggedError<PullRequestListFailedError>()(
   "PullRequestListFailedError",
   { cause: Schema.Defect() },
@@ -187,9 +134,10 @@ export const PullRequestToolError = Schema.Union([
   PullRequestLinkFailedError,
   PullRequestUnlinkFailedError,
   PullRequestListFailedError,
-  PullRequestWatchFailedError,
-  PullRequestNotOpenError,
-  PullRequestWatchFromSubagentError,
+  PullRequestWatchService.PullRequestWatchFailedError,
+  PullRequestUnavailableError,
+  PullRequestWatchService.PullRequestNotOpenError,
+  PullRequestWatchService.PullRequestWatchFromSubagentError,
   PullRequestProjectNotFoundError,
   PullRequestGuideFailedError,
 ]);
@@ -288,6 +236,8 @@ export const ListThreadPullRequestsResult = Schema.Struct({
       numbers: Schema.Array(Schema.Int),
     }),
   ),
+  /** Pass as `cursor` for the next page; null on the last page. */
+  nextCursor: Schema.NullOr(Schema.String),
 });
 export type ListThreadPullRequestsResult = typeof ListThreadPullRequestsResult.Type;
 
@@ -307,7 +257,7 @@ const LinkPullRequestTool = Tool.make("link_pull_request", {
 
 const LinkPullRequestsTool = Tool.make("link_pull_requests", {
   description:
-    "Link several PRs to a thread in one call. Use it instead of one `link_pull_request` per PR. URLs that are not PRs come back in `invalidUrls`.",
+    "Link several PRs to a thread. Use it instead of one `link_pull_request` per PR. URLs that are not PRs come back in `invalidUrls`.",
   parameters: Schema.Struct({
     environmentId: OrchestratorMcpEnvironmentTarget,
     threadId: Schema.optional(ThreadId.annotate({ description: "Thread. Default: this thread." })),
@@ -339,7 +289,7 @@ const UnlinkPullRequestTool = Tool.make("unlink_pull_request", {
 
 const UnlinkPullRequestsTool = Tool.make("unlink_pull_requests", {
   description:
-    "Unlink every PR on a thread whose last known state (as `list_thread_pull_requests` shows) is in `states`, in one call. Use it instead of one `unlink_pull_request` per PR. PRs with no known state stay linked.",
+    "Unlink a thread's PRs whose last known state is in `states`. Use it instead of one `unlink_pull_request` per PR. PRs with no known state stay linked.",
   parameters: Schema.Struct({
     environmentId: OrchestratorMcpEnvironmentTarget,
     threadId: Schema.optional(ThreadId.annotate({ description: "Thread. Default: this thread." })),
@@ -357,10 +307,12 @@ const UnlinkPullRequestsTool = Tool.make("unlink_pull_requests", {
 
 const ListThreadPullRequestsTool = Tool.make("list_thread_pull_requests", {
   description:
-    "List PRs linked to a thread, with last known state and stack order (bottom to top). Call only when you need that list. Never as an end-of-work check.",
+    "List a thread's PRs, with last known state and stack order (bottom to top). Not an end-of-work check.",
   parameters: Schema.Struct({
     environmentId: OrchestratorMcpEnvironmentTarget,
     threadId: Schema.optional(ThreadId.annotate({ description: "Thread. Default: this thread." })),
+    states: Schema.optional(Schema.Array(PullRequestState)),
+    cursor: Schema.optional(Schema.String),
   }),
   success: ListThreadPullRequestsResult,
   failure: PullRequestToolError,
@@ -378,7 +330,7 @@ const WatchPullRequestTool = Tool.make("watch_pull_request", {
   parameters: PullRequestTargetInput,
   success: WatchPullRequestResult,
   failure: PullRequestToolError,
-  dependencies,
+  dependencies: watchDependencies,
 })
   .annotate(Tool.Title, "Watch pull request")
   .annotate(Tool.Readonly, false)
@@ -392,7 +344,7 @@ const UnwatchPullRequestTool = Tool.make("unwatch_pull_request", {
   parameters: PullRequestTargetInput,
   success: WatchPullRequestResult,
   failure: PullRequestToolError,
-  dependencies,
+  dependencies: watchDependencies,
 })
   .annotate(Tool.Title, "Stop watching pull request")
   .annotate(Tool.Readonly, false)
diff --git a/apps/server/src/mcp/toolkits/thread/handlers.ts b/apps/server/src/mcp/toolkits/thread/handlers.ts
index 62023dd986b5..88bb91bf62b7 100644
--- a/apps/server/src/mcp/toolkits/thread/handlers.ts
+++ b/apps/server/src/mcp/toolkits/thread/handlers.ts
@@ -269,7 +269,16 @@ export const layer = McpToolAccess.toLayer(ThreadToolkit, {
     (input) => input.action === "list" || input.action === "read",
     McpToolAccess.reads((input) =>
       Effect.gen(function* () {
-        const { projection } = yield* readThread(input.threadId, ["runs", "messages"]);
+        const { threads, projection: queued } = yield* readThread(input.threadId, ["runs"], {
+          runStatuses: ["queued"],
+        });
+        const messages = yield* threads
+          .getMessagesById(
+            queued.thread.id,
+            queued.runs.map((run) => run.userMessageId),
+          )
+          .pipe(Effect.mapError(unavailable));
+        const projection = { runs: queued.runs, messages: [...messages.values()] };
         if (input.action === "list") {
           const runs = queuedRunsInDeliveryOrder(projection);
           const cursor = input.cursor ?? 0;
diff --git a/apps/server/src/mcp/toolkits/thread/tools.ts b/apps/server/src/mcp/toolkits/thread/tools.ts
index 750bf15afc01..4c59ea4f2028 100644
--- a/apps/server/src/mcp/toolkits/thread/tools.ts
+++ b/apps/server/src/mcp/toolkits/thread/tools.ts
@@ -117,6 +117,7 @@ const question = Schema.Struct({
       label: Schema.String,
       description: Schema.String,
       value: Schema.optional(Schema.String),
+      preview: Schema.optional(Schema.String),
     }),
   ),
   multiSelect: Schema.optional(Schema.Boolean),
diff --git a/apps/server/src/observability/DefectReporter.test.ts b/apps/server/src/observability/DefectReporter.test.ts
index c749c1a84579..8649c9002f20 100644
--- a/apps/server/src/observability/DefectReporter.test.ts
+++ b/apps/server/src/observability/DefectReporter.test.ts
@@ -78,6 +78,6 @@ describe("DefectReporter", () => {
         assert.equal(next, 2);
         assert.equal(yield* Queue.size(logs), 0);
       }),
-    ).pipe(Effect.scoped),
+    ),
   );
 });
diff --git a/apps/server/src/observability/RpcInstrumentation.ts b/apps/server/src/observability/RpcInstrumentation.ts
index f9a861cca23f..3f120a39f187 100644
--- a/apps/server/src/observability/RpcInstrumentation.ts
+++ b/apps/server/src/observability/RpcInstrumentation.ts
@@ -81,6 +81,7 @@ const RPC_AGGREGATES = {
   [WS_METHODS.serverDisableAcpRegistryProvider]: "server",
   [WS_METHODS.serverLogoutAcpRegistry]: "server",
   [WS_METHODS.serverDiscoverSourceControl]: "server",
+  [WS_METHODS.serverCheckSecretSource]: "server",
   [WS_METHODS.serverGetTraceDiagnostics]: "server",
   [WS_METHODS.serverGetProcessDiagnostics]: "server",
   [WS_METHODS.serverGetHostResources]: "server",
@@ -136,6 +137,7 @@ const RPC_AGGREGATES = {
   [WS_METHODS.pullRequestsInvalidate]: "pull-requests",
   [WS_METHODS.pullRequestsReportState]: "pull-requests",
   [WS_METHODS.pullRequestsSubscribeRefreshes]: "pull-requests",
+  [WS_METHODS.pullRequestsSubscribeLinkedThreadRefreshes]: "pull-requests",
   [WS_METHODS.pullRequestsReviewerCandidates]: "pull-requests",
   [WS_METHODS.pullRequestsRequestReviewers]: "pull-requests",
   [WS_METHODS.pullRequestsLabelCandidates]: "pull-requests",
diff --git a/apps/server/src/orchestration-v2/Adapters/AcpAdapterV2.test.ts b/apps/server/src/orchestration-v2/Adapters/AcpAdapterV2.test.ts
index fb5146562901..02d6f64c0be6 100644
--- a/apps/server/src/orchestration-v2/Adapters/AcpAdapterV2.test.ts
+++ b/apps/server/src/orchestration-v2/Adapters/AcpAdapterV2.test.ts
@@ -16,7 +16,7 @@ import * as NodePath from "node:path";
 import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
 import * as NodeServices from "@effect/platform-node/NodeServices";
 import * as DocumentText from "../../provider/DocumentText.ts";
-import { assert, describe, it } from "@effect/vitest";
+import { assert, beforeAll, describe, it } from "@effect/vitest";
 import {
   CheckpointId,
   EnvironmentId,
@@ -102,6 +102,16 @@ import {
 
 const DEFAULT_GROK_SETTINGS = Schema.decodeSync(GrokSettings)({});
 const DROID_SETTINGS = Schema.decodeSync(AcpRegistrySettings)({ agentId: "factory-droid" });
+const OMP_SETTINGS = Schema.decodeSync(AcpRegistrySettings)({
+  source: "local",
+  commandPath: "/usr/local/bin/omp",
+  commandArgs: ["acp"],
+});
+const OPENCODE_SETTINGS = Schema.decodeSync(AcpRegistrySettings)({
+  source: "local",
+  commandPath: "/usr/local/bin/opencode",
+  commandArgs: ["acp"],
+});
 
 const layerHost = TestProviderHost.layer().pipe(
   Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
@@ -115,6 +125,50 @@ const layerTest = Layer.mergeAll(
   McpProviderSessions.layer,
   layerHost,
 );
+// Node spends ~0.5s loading the agent scripts' TypeScript module graph on every spawn;
+// a bundle built once per file starts in ~0.15s. Tests still talk to a real subprocess.
+const bundledAgents = Deferred.makeUnsafe<{
+  readonly mock: string;
+  readonly replay: string;
+  readonly compileCache: string;
+}>();
+const bundledMockAgentPath = Deferred.await(bundledAgents).pipe(
+  Effect.map((agents) => agents.mock),
+);
+const bundledReplayAgentPath = Deferred.await(bundledAgents).pipe(
+  Effect.map((agents) => agents.replay),
+);
+const bundleAgents = Effect.gen(function* () {
+  const fileSystem = yield* FileSystem.FileSystem;
+  const path = yield* Path.Path;
+  const outDir = yield* fileSystem.makeTempDirectoryScoped({ prefix: "t3-acp-agents-" });
+  const input = {
+    mock: yield* path.fromFileUrl(new URL("../../../scripts/acp-mock-agent.ts", import.meta.url)),
+    replay: yield* path.fromFileUrl(
+      new URL("../../../scripts/acp-replay-agent.ts", import.meta.url),
+    ),
+  };
+  const { build } = yield* Effect.promise(() => import("vite-plus"));
+  yield* Effect.promise(() =>
+    build({
+      configFile: false,
+      logLevel: "silent",
+      root: path.dirname(input.mock),
+      ssr: { noExternal: true },
+      build: {
+        ssr: true,
+        outDir,
+        rollupOptions: { input, output: { format: "es", entryFileNames: "[name].mjs" } },
+      },
+    }),
+  );
+  yield* Deferred.succeed(bundledAgents, {
+    mock: path.join(outDir, "mock.mjs"),
+    replay: path.join(outDir, "replay.mjs"),
+    compileCache: path.join(outDir, "compile-cache"),
+  });
+}).pipe(Effect.provide(NodeServices.layer));
+
 const ACP_TEST_DRIVER = ProviderDriverKind.make("acp-test");
 const decodeUnknownJson = Schema.decodeUnknownOption(Schema.fromJsonString(Schema.Unknown));
 
@@ -487,6 +541,7 @@ function makeMockRuntime(input: {
             cwd: runtimeInput.cwd,
             env: {
               T3_ACP_SESSION_LIFECYCLE: "1",
+              NODE_COMPILE_CACHE: (yield* Deferred.await(bundledAgents)).compileCache,
               ...(typeof input.environment === "function"
                 ? input.environment(runtimeOrdinal)
                 : input.environment),
@@ -521,9 +576,12 @@ const isProviderAdapterProtocolError = Schema.is(ProviderAdapter.ProviderAdapter
 const makePromptInactivityHarness = Effect.fnUntraced(function* (input: {
   readonly environment: (runtimeOrdinal: number) => Readonly<Record<string, string>>;
   readonly runtimeMode?: "full-access" | "approval-required";
+  readonly wrapPrompt?: (
+    prompt: AcpSessionRuntime.AcpSessionRuntime["Service"]["prompt"],
+  ) => AcpSessionRuntime.AcpSessionRuntime["Service"]["prompt"];
+  readonly cancelled?: Deferred.Deferred<void>;
 }) {
   const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
-  const path = yield* Path.Path;
   const natives: Array<AcpSessionRuntime.AcpSessionRuntime["Service"]> = [];
   const instanceId = ProviderInstanceId.make("acp-prompt-inactivity");
   const adapter = yield* makeAcpAdapterV2({
@@ -534,13 +592,18 @@ const makePromptInactivityHarness = Effect.fnUntraced(function* (input: {
       promptInactivityTimeout: "15 minutes",
       makeRuntime: makeMockRuntime({
         childProcessSpawner,
-        mockAgentPath: yield* path.fromFileUrl(
-          new URL("../../../scripts/acp-mock-agent.ts", import.meta.url),
-        ),
+        mockAgentPath: yield* bundledMockAgentPath,
         environment: input.environment,
         wrapRuntime: (runtime) => {
           natives.push(runtime);
-          return runtime;
+          return {
+            ...runtime,
+            prompt: input.wrapPrompt?.(runtime.prompt) ?? runtime.prompt,
+            cancel:
+              input.cancelled === undefined
+                ? runtime.cancel
+                : Deferred.succeed(input.cancelled, undefined).pipe(Effect.andThen(runtime.cancel)),
+          };
         },
       }),
     },
@@ -571,6 +634,7 @@ const makePromptInactivityHarness = Effect.fnUntraced(function* (input: {
   return {
     runtime,
     natives,
+    providerThread,
     startTurn,
     /** A turn still running makes the next start fail, without waiting on time. */
     nextTurnRejected: (ordinal: number) =>
@@ -668,13 +732,11 @@ const pollProtocolMethods = (events: Queue.Queue<EffectAcpProtocol.AcpProtocolLo
 
 const makeInstructionCompactionHarness = Effect.fnUntraced(function* (
   environment: Readonly<Record<string, string>>,
+  prepareAttachments = false,
 ) {
   const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
-  const path = yield* Path.Path;
   const selfInvocation = yield* resolveSelfInvocation();
-  const mockAgentPath = yield* path.fromFileUrl(
-    new URL("../../../scripts/acp-mock-agent.ts", import.meta.url),
-  );
+  const mockAgentPath = yield* bundledMockAgentPath;
   const protocolEvents = yield* Queue.unbounded<EffectAcpProtocol.AcpProtocolLogEvent>();
   const instanceId = ProviderInstanceId.make("acp-test-instruction-compaction");
   const threadId = ThreadId.make("thread-acp-instruction-compaction");
@@ -687,12 +749,34 @@ const makeInstructionCompactionHarness = Effect.fnUntraced(function* (
     authorizationHeader: "Bearer instruction-compaction-token",
     browserToolsAvailable: true,
   });
+  type Runtime = AcpSessionRuntime.AcpSessionRuntime["Service"];
+  let sessionUpdate: Parameters<Runtime["handleSessionUpdate"]>[0] | undefined;
+  let copilotSessionEvent:
+    | ((event: unknown) => Effect.Effect<void, EffectAcpErrors.AcpError>)
+    | undefined;
+  let duringNextPreparation: Effect.Effect<void, EffectAcpErrors.AcpError> = Effect.void;
+  let nextPromptStopReason: "cancelled" | "refusal" | "error" | undefined;
+  const prepare = Effect.suspend(() => {
+    const during = duringNextPreparation;
+    duringNextPreparation = Effect.void;
+    return during.pipe(Effect.orDie);
+  });
   const adapter = yield* makeAcpAdapterV2({
     instanceId,
     flavor: {
       driver: ACP_TEST_DRIVER,
       capabilities: AcpProviderCapabilitiesV2,
       supportsCompaction: true,
+      rewriteUserText: (text) =>
+        prepareAttachments ? Effect.succeed(text) : prepare.pipe(Effect.as(text)),
+      ...(prepareAttachments
+        ? {
+            buildAttachmentPrompt: () => prepare.pipe(Effect.as([])),
+          }
+        : {}),
+      registerExtensions: makeCopilotSubagentRouting().registerExtensions,
+      // Routes updates tagged with a Devin subagent context to that child session.
+      normalizeSessionUpdate: normalizeDevinSessionUpdate,
       makeRuntime: makeMockRuntime({
         childProcessSpawner,
         mockAgentPath,
@@ -700,9 +784,29 @@ const makeInstructionCompactionHarness = Effect.fnUntraced(function* (
         environment,
         wrapRuntime: (runtime) => ({
           ...runtime,
+          // The captured handlers deliver frames between turns, while no prompt is in flight.
+          handleSessionUpdate: (next) =>
+            Effect.sync(() => {
+              sessionUpdate = next;
+            }).pipe(Effect.andThen(runtime.handleSessionUpdate(next))),
+          handleExtNotification: (method, payload, next) =>
+            Effect.sync(() => {
+              if (method === "github.com/copilot/sessionEvent") {
+                copilotSessionEvent = next as typeof copilotSessionEvent;
+              }
+            }).pipe(Effect.andThen(runtime.handleExtNotification(method, payload, next))),
           // Make compaction during prompt completion deterministic at the adapter boundary.
           prompt: (payload, options) =>
-            runtime.prompt(payload, options).pipe(Effect.tap(() => runtime.drainEvents)),
+            runtime.prompt(payload, options).pipe(
+              Effect.tap(() => runtime.drainEvents),
+              // Grok's local cancel reports `cancelled` even when the agent never saw the prompt.
+              Effect.map((result) => {
+                if (nextPromptStopReason === undefined) return result;
+                const stopReason = nextPromptStopReason;
+                nextPromptStopReason = undefined;
+                return { ...result, stopReason };
+              }),
+            ),
         }),
       }),
     },
@@ -723,30 +827,56 @@ const makeInstructionCompactionHarness = Effect.fnUntraced(function* (
   const providerThread = yield* runtime.ensureThread({ threadId, modelSelection, runtimePolicy });
   const now = yield* DateTime.now;
   let ordinal = 0;
-  return Effect.fnUntraced(function* (messageText: string, expectedStatus = "completed") {
-    yield* runtime.startTurn(
-      makeTurnInput({
-        threadId,
-        providerThread,
-        instanceId,
-        runtimePolicy,
-        now,
-        ordinal: ++ordinal,
-        messageText,
-      }),
-    );
-    const terminal = yield* runtime.events.pipe(
-      Stream.filter((event) => event.type === "turn.terminal"),
-      Stream.runHead,
-    );
-    assert.equal(Option.getOrThrow(terminal).status, expectedStatus);
-    while (true) {
-      const event = yield* Queue.take(protocolEvents);
-      if (event.direction === "outgoing" && rawProtocolMethod(event) === "session/prompt") {
-        return rawProtocolPromptTextBlocks(event);
+  const sessionId = "mock-session-1";
+  return {
+    runTurn: Effect.fnUntraced(function* (messageText: string, expectedStatus = "completed") {
+      yield* runtime.startTurn(
+        makeTurnInput({
+          threadId,
+          providerThread,
+          instanceId,
+          runtimePolicy,
+          now,
+          ordinal: ++ordinal,
+          messageText,
+        }),
+      );
+      const terminal = yield* runtime.events.pipe(
+        Stream.filter((event) => event.type === "turn.terminal"),
+        Stream.runHead,
+      );
+      assert.equal(Option.getOrThrow(terminal).status, expectedStatus);
+      while (true) {
+        const event = yield* Queue.take(protocolEvents);
+        if (event.direction === "outgoing" && rawProtocolMethod(event) === "session/prompt") {
+          return rawProtocolPromptTextBlocks(event);
+        }
       }
-    }
-  });
+    }),
+    idleSessionUpdate: Effect.fnUntraced(function* (update: EffectAcpSchema.SessionUpdate) {
+      assert.isDefined(sessionUpdate);
+      yield* sessionUpdate({ sessionId, update });
+    }),
+    reportNextPromptStopped: (stopReason: "cancelled" | "refusal" | "error") =>
+      Effect.sync(() => {
+        nextPromptStopReason = stopReason;
+      }),
+    sessionUpdateDuringNextPreparation: (update: EffectAcpSchema.SessionUpdate) =>
+      Effect.sync(() => {
+        duringNextPreparation = Effect.suspend(() => {
+          assert.isDefined(sessionUpdate);
+          return sessionUpdate({ sessionId, update });
+        });
+      }),
+    idleCopilotSessionEvent: Effect.fnUntraced(function* (event: {
+      readonly type: string;
+      readonly agentId?: string;
+      readonly data: Record<string, unknown>;
+    }) {
+      assert.isDefined(copilotSessionEvent);
+      yield* copilotSessionEvent({ sessionId, ...event });
+    }),
+  };
 });
 
 function assertReinjectedInstructions(
@@ -758,8 +888,97 @@ function assertReinjectedInstructions(
   assert.include(text, "## T3 Code browser");
   assert.include(text, "T3 Code orchestration");
   assert.include(text, `<user_request>\n${request}\n</user_request>`);
+  assert.include(blocks[1]?.text ?? "", "<runtime_info>");
 }
 
+const makeAdvertisedCompactionHarness = Effect.fnUntraced(function* (
+  environment: Readonly<Record<string, string>>,
+) {
+  const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
+  const path = yield* Path.Path;
+  const selfInvocation = yield* resolveSelfInvocation();
+  const mockAgentPath = yield* path.fromFileUrl(
+    new URL("../../../scripts/acp-mock-agent.ts", import.meta.url),
+  );
+  const protocolEvents = yield* Queue.unbounded<EffectAcpProtocol.AcpProtocolLogEvent>();
+  // Resolves after the adapter records what the agent advertised, so the refusal is deterministic.
+  const commandsPublished = yield* Deferred.make<void>();
+  const instanceId = ProviderInstanceId.make("acp-test-advertised-compaction");
+  const threadId = ThreadId.make("thread-acp-advertised-compaction");
+  const adapter = yield* makeAcpAdapterV2({
+    instanceId,
+    flavor: {
+      driver: ACP_TEST_DRIVER,
+      capabilities: AcpProviderCapabilitiesV2,
+      compactViaAdvertisedCommand: true,
+      onAvailableCommandsUpdate: () => Deferred.succeed(commandsPublished, undefined),
+      makeRuntime: makeMockRuntime({
+        childProcessSpawner,
+        mockAgentPath,
+        protocolEvents,
+        environment,
+      }),
+    },
+    selfInvocation,
+  });
+  const runtimePolicy = ProviderAdapter.ProviderAdapterV2RuntimePolicy.make({
+    runtimeMode: "full-access",
+    interactionMode: "default",
+    cwd: process.cwd(),
+  });
+  const modelSelection = { instanceId, model: "default" } as const;
+  const runtime = yield* adapter.openSession({
+    threadId,
+    providerSessionId: ProviderSessionId.make("provider-session-acp-advertised-compaction"),
+    modelSelection,
+    runtimePolicy,
+  });
+  const providerThread = yield* runtime.ensureThread({ threadId, modelSelection, runtimePolicy });
+  yield* Deferred.await(commandsPublished);
+  const now = yield* DateTime.now;
+  let ordinal = 0;
+  const nextPromptTexts = () =>
+    Effect.gen(function* () {
+      while (true) {
+        const event = yield* Queue.take(protocolEvents);
+        if (event.direction === "outgoing" && rawProtocolMethod(event) === "session/prompt") {
+          return rawProtocolPromptTextBlocks(event);
+        }
+      }
+    });
+  return {
+    runtime,
+    compact: (otherSession = false) =>
+      Effect.gen(function* () {
+        const compactThread = runtime.compactThread;
+        assert.isDefined(compactThread, "compactThread must be wired for compactCommand");
+        return yield* Effect.exit(
+          compactThread!(
+            makeTurnInput({
+              threadId,
+              providerThread: otherSession
+                ? {
+                    ...providerThread,
+                    nativeThreadRef: {
+                      driver: ACP_TEST_DRIVER,
+                      nativeId: "other-session",
+                      strength: "strong",
+                    },
+                  }
+                : { ...providerThread, contextUsage: { usedTokens: 1234 } },
+              instanceId,
+              runtimePolicy,
+              now,
+              ordinal: ++ordinal,
+              messageText: "Compact the conversation.",
+            }),
+          ),
+        );
+      }),
+    nextPromptTexts,
+  };
+});
+
 const runFormElicitation = (input: {
   readonly name: string;
   readonly requestedSchema: unknown;
@@ -771,9 +990,7 @@ const runFormElicitation = (input: {
     const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
     const fileSystem = yield* FileSystem.FileSystem;
     const path = yield* Path.Path;
-    const mockAgentPath = yield* path.fromFileUrl(
-      new URL("../../../scripts/acp-mock-agent.ts", import.meta.url),
-    );
+    const mockAgentPath = yield* bundledMockAgentPath;
     const directory = yield* fileSystem.makeTempDirectoryScoped({
       prefix: "t3-acp-form-elicitation-",
     });
@@ -855,9 +1072,113 @@ const optionValues = (question: OrchestrationV2UserInputQuestion | undefined) =>
   question?.options.map((option) => option.value ?? option.label);
 
 describe("AcpAdapterV2", () => {
+  beforeAll(() => bundleAgents);
+
+  it.live("keeps a completed tool's status when its linked ACP terminal streams output", () =>
+    Effect.gen(function* () {
+      const instanceId = ProviderInstanceId.make("acp-test-terminal-linked-tool");
+      const threadId = ThreadId.make("thread-acp-terminal-linked-tool");
+      let notify: Parameters<
+        AcpSessionRuntime.AcpSessionRuntime["Service"]["handleSessionUpdate"]
+      >[0];
+      const adapter = yield* makeAcpAdapterV2({
+        instanceId,
+        selfInvocation: yield* resolveSelfInvocation(),
+        flavor: {
+          driver: ACP_TEST_DRIVER,
+          capabilities: AcpProviderCapabilitiesV2,
+          makeRuntime: makeMockRuntime({
+            childProcessSpawner: yield* ChildProcessSpawner.ChildProcessSpawner,
+            mockAgentPath: yield* bundledMockAgentPath,
+            wrapRuntime: (runtime) => ({
+              ...runtime,
+              handleSessionUpdate: (handler) =>
+                Effect.sync(() => {
+                  notify = handler;
+                }).pipe(Effect.andThen(runtime.handleSessionUpdate(handler))),
+              prompt: () =>
+                Effect.gen(function* () {
+                  const send = (update: EffectAcpSchema.SessionUpdate) =>
+                    notify({ sessionId: "mock-session-1", update });
+                  yield* send({ sessionUpdate: "state_update", state: "running" });
+                  yield* send({
+                    sessionUpdate: "terminal_update",
+                    terminalId: "term",
+                    command: "npm run dev",
+                  });
+                  yield* send({
+                    sessionUpdate: "tool_call_update",
+                    toolCallId: "linked",
+                    kind: "execute",
+                    title: "Start dev server",
+                    status: "completed",
+                    content: [{ type: "terminal", terminalId: "term" }],
+                  });
+                  yield* send({
+                    sessionUpdate: "terminal_output_chunk",
+                    terminalId: "term",
+                    data: Buffer.from("still running").toString("base64"),
+                  });
+                  yield* send({
+                    sessionUpdate: "state_update",
+                    state: "idle",
+                    stopReason: "end_turn",
+                  });
+                  return { stopReason: "end_turn" as const };
+                }),
+            }),
+          }),
+        },
+      });
+      const runtimePolicy = ProviderAdapter.ProviderAdapterV2RuntimePolicy.make({
+        runtimeMode: "full-access",
+        interactionMode: "default",
+        cwd: process.cwd(),
+      });
+      const modelSelection = { instanceId, model: "default" } as const;
+      const runtime = yield* adapter.openSession({
+        threadId,
+        providerSessionId: ProviderSessionId.make("provider-session-acp-terminal-linked-tool"),
+        modelSelection,
+        runtimePolicy,
+      });
+      const providerThread = yield* runtime.ensureThread({
+        threadId,
+        modelSelection,
+        runtimePolicy,
+      });
+      yield* runtime.startTurn(
+        makeTurnInput({
+          threadId,
+          providerThread,
+          instanceId,
+          runtimePolicy,
+          now: yield* DateTime.now,
+          ordinal: 1,
+        }),
+      );
+      const items = Array.from(
+        yield* runtime.events.pipe(
+          Stream.takeUntil((event) => event.type === "turn.terminal"),
+          Stream.runCollect,
+        ),
+      ).flatMap((event) =>
+        event.type === "turn_item.updated" && event.turnItem.nativeItemRef?.nativeId === "linked"
+          ? [event.turnItem]
+          : [],
+      );
+      const last = items.at(-1);
+      assert.equal(last?.type === "command_execution" ? last.output : null, "still running");
+      assert.deepEqual(
+        items.map((item) => item.status),
+        items.map(() => "completed"),
+        "terminal output must not reopen a tool the agent completed",
+      );
+    }).pipe(Effect.provide(layerTest)),
+  );
+
   it.live("reports per-turn usage unavailable on a continuation turn that never prompts", () =>
     Effect.gen(function* () {
-      const path = yield* Path.Path;
       const instanceId = ProviderInstanceId.make("acp-test-usage-continuation");
       const threadId = ThreadId.make("thread-acp-usage-continuation");
       let promptOrdinal = 0;
@@ -876,9 +1197,7 @@ describe("AcpAdapterV2", () => {
           enablePostSettleContinuation: true,
           makeRuntime: makeMockRuntime({
             childProcessSpawner: yield* ChildProcessSpawner.ChildProcessSpawner,
-            mockAgentPath: yield* path.fromFileUrl(
-              new URL("../../../scripts/acp-mock-agent.ts", import.meta.url),
-            ),
+            mockAgentPath: yield* bundledMockAgentPath,
             wrapRuntime: (runtime) => ({
               ...runtime,
               prompt: () => {
@@ -975,11 +1294,10 @@ describe("AcpAdapterV2", () => {
         outputTokens: 30,
       });
       assert.equal(promptOrdinal, 2, "continuation turn must not dispatch session/prompt");
-    }).pipe(Effect.provide(layerTest), Effect.scoped),
+    }).pipe(Effect.provide(layerTest)),
   );
   it.live("fails an end_turn the outcome check rejects and restarts before the next turn", () =>
     Effect.gen(function* () {
-      const path = yield* Path.Path;
       const instanceId = ProviderInstanceId.make("acp-test-prompt-outcome");
       const threadId = ThreadId.make("thread-acp-prompt-outcome");
       const quota = {
@@ -991,6 +1309,7 @@ describe("AcpAdapterV2", () => {
       } as const;
       // The runtime ordinal of each prompt, and the session each check watched.
       const promptRuntimes: Array<number> = [];
+      const promptTexts: Array<string> = [];
       const watchedSessions: Array<string> = [];
       const adapter = yield* makeAcpAdapterV2({
         instanceId,
@@ -1006,14 +1325,17 @@ describe("AcpAdapterV2", () => {
             }),
           makeRuntime: makeMockRuntime({
             childProcessSpawner: yield* ChildProcessSpawner.ChildProcessSpawner,
-            mockAgentPath: yield* path.fromFileUrl(
-              new URL("../../../scripts/acp-mock-agent.ts", import.meta.url),
-            ),
+            mockAgentPath: yield* bundledMockAgentPath,
             wrapRuntime: (runtime, runtimeOrdinal) => ({
               ...runtime,
-              prompt: () =>
+              prompt: (payload) =>
                 Effect.sync(() => {
                   promptRuntimes.push(runtimeOrdinal);
+                  promptTexts.push(
+                    payload.prompt
+                      .flatMap((block) => (block.type === "text" ? [block.text] : []))
+                      .join("\n"),
+                  );
                   return { stopReason: "end_turn" as const };
                 }),
             }),
@@ -1064,13 +1386,15 @@ describe("AcpAdapterV2", () => {
       const completed = yield* runTurn(2);
       assert.equal(completed?.type === "turn.terminal" ? completed.status : null, "completed");
       assert.deepEqual(promptRuntimes, [1, 2], "the next turn runs on a fresh runtime");
+      // The fresh runtime has no record of what reached the agent, so it sends T3's notes again.
+      assert.include(promptTexts[1] ?? "", "<runtime_info>");
+      assert.include(promptTexts[1] ?? "", "T3 Code interaction mode: Default");
       assert.equal(watchedSessions.length, 2);
       assert.equal(watchedSessions[0], watchedSessions[1]);
-    }).pipe(Effect.provide(layerTest), Effect.scoped),
+    }).pipe(Effect.provide(layerTest)),
   );
   it.live("retains returned usage when Stop finalizes before the prompt callback", () =>
     Effect.gen(function* () {
-      const path = yield* Path.Path;
       const instanceId = ProviderInstanceId.make("acp-test-prompt-usage-stop");
       const threadId = ThreadId.make("thread-acp-prompt-usage-stop");
       const wireSettled = yield* Deferred.make<void>();
@@ -1092,9 +1416,7 @@ describe("AcpAdapterV2", () => {
           preserveRuntimeOnSettledInterrupt: true,
           makeRuntime: makeMockRuntime({
             childProcessSpawner: yield* ChildProcessSpawner.ChildProcessSpawner,
-            mockAgentPath: yield* path.fromFileUrl(
-              new URL("../../../scripts/acp-mock-agent.ts", import.meta.url),
-            ),
+            mockAgentPath: yield* bundledMockAgentPath,
             wrapRuntime: (runtime) => ({
               ...runtime,
               prompt: () =>
@@ -1158,12 +1480,11 @@ describe("AcpAdapterV2", () => {
         },
       );
       yield* Deferred.succeed(releaseCompletion, undefined);
-    }).pipe(Effect.provide(layerTest), Effect.scoped),
+    }).pipe(Effect.provide(layerTest)),
   );
 
   it.live("drops a late prompt response that lands after the turn finalized", () =>
     Effect.gen(function* () {
-      const path = yield* Path.Path;
       const instanceId = ProviderInstanceId.make("acp-test-prompt-usage-late");
       const threadId = ThreadId.make("thread-acp-prompt-usage-late");
       const dispatched = yield* Deferred.make<void>();
@@ -1184,9 +1505,7 @@ describe("AcpAdapterV2", () => {
           terminateRuntimeProcessGroupOnInterrupt: true,
           makeRuntime: makeMockRuntime({
             childProcessSpawner: yield* ChildProcessSpawner.ChildProcessSpawner,
-            mockAgentPath: yield* path.fromFileUrl(
-              new URL("../../../scripts/acp-mock-agent.ts", import.meta.url),
-            ),
+            mockAgentPath: yield* bundledMockAgentPath,
             ownDetachedProcessGroup: true,
             processGroupTerminationGrace: 0,
             wrapRuntime: (runtime) => ({
@@ -1287,12 +1606,11 @@ describe("AcpAdapterV2", () => {
       });
       stopCollector = true;
       yield* Fiber.interrupt(collector);
-    }).pipe(Effect.provide(layerTest), Effect.scoped),
+    }).pipe(Effect.provide(layerTest)),
   );
 
   it.live("keeps usage unavailable for undeclared agents even when they report usage", () =>
     Effect.gen(function* () {
-      const path = yield* Path.Path;
       const instanceId = ProviderInstanceId.make("acp-test-usage-undeclared");
       const threadId = ThreadId.make("thread-acp-usage-undeclared");
       const adapter = yield* makeAcpAdapterV2({
@@ -1303,9 +1621,7 @@ describe("AcpAdapterV2", () => {
           capabilities: AcpProviderCapabilitiesV2,
           makeRuntime: makeMockRuntime({
             childProcessSpawner: yield* ChildProcessSpawner.ChildProcessSpawner,
-            mockAgentPath: yield* path.fromFileUrl(
-              new URL("../../../scripts/acp-mock-agent.ts", import.meta.url),
-            ),
+            mockAgentPath: yield* bundledMockAgentPath,
             wrapRuntime: (runtime) => ({
               ...runtime,
               prompt: () =>
@@ -1358,14 +1674,13 @@ describe("AcpAdapterV2", () => {
           { usageScope: "main_agent", usageStatus: "unavailable", hasSubagents: false },
         );
       }
-    }).pipe(Effect.provide(layerTest), Effect.scoped),
+    }).pipe(Effect.provide(layerTest)),
   );
 
   it.live.each(["details", "none"] as const)(
     "fails the turn on an ACP v2 idle error with %s, settles its open tool, and accepts the next prompt",
     (details) =>
       Effect.gen(function* () {
-        const path = yield* Path.Path;
         const instanceId = ProviderInstanceId.make(`idle-error-${details}`);
         const threadId = ThreadId.make(`thread-idle-error-${details}`);
         const childSessionId = "mock-child-session-idle-error";
@@ -1394,9 +1709,7 @@ describe("AcpAdapterV2", () => {
                 : undefined,
             makeRuntime: makeMockRuntime({
               childProcessSpawner: yield* ChildProcessSpawner.ChildProcessSpawner,
-              mockAgentPath: yield* path.fromFileUrl(
-                new URL("../../../scripts/acp-mock-agent.ts", import.meta.url),
-              ),
+              mockAgentPath: yield* bundledMockAgentPath,
               environment: { T3_ACP_IDLE_ERROR: details },
             }),
           },
@@ -1503,10 +1816,10 @@ describe("AcpAdapterV2", () => {
         const nextEvents = yield* runTurn(2);
         const next = nextEvents.at(-1);
         assert.equal(next?.type === "turn.terminal" ? next.status : undefined, "completed");
-      }).pipe(Effect.provide(layerTest), Effect.scoped),
+      }).pipe(Effect.provide(layerTest)),
   );
 
-  // Factory Droid 0.243.0 sends an optional text companion for every AskUser choice.
+  // Droid 0.243.0 and OpenCode 2.1 pair each choice with an optional free-form companion field.
   const droidChoice = {
     type: "string",
     title: "Format",
@@ -1537,8 +1850,90 @@ describe("AcpAdapterV2", () => {
     ],
   }));
 
-  // regression: #20417 Droid AskUser answers were sent as a cancel
+  // OpenCode 2.1 pairs each qN choice with a qN_custom free-form companion.
+  const openCodeSchema = {
+    type: "object",
+    properties: {
+      q0: {
+        type: "string",
+        title: "Color preference",
+        description: "Which color do you prefer?",
+        oneOf: [
+          { const: "red", title: "Red", description: "Choose the color red" },
+          { const: "blue", title: "Blue" },
+        ],
+        default: "red",
+      },
+      q0_custom: {
+        type: "string",
+        title: "Color preference (other)",
+        description: "Type your own answer",
+        minLength: 1,
+      },
+    },
+  };
+  const openCodeQuestions = [
+    {
+      id: "q0",
+      header: "Color preference",
+      question: "Which color do you prefer?",
+      options: [
+        { label: "Red", description: "Choose the color red", value: "red" },
+        { label: "Blue", description: "Blue", value: "blue" },
+      ],
+      allowCustomAnswer: true,
+    },
+  ];
+
+  // regression: #20417 Droid answers were sent as a cancel; #23505 OMP header and question were swapped
   it.live.each([
+    ...[
+      { scenario: "OMP selected option", answers: { q0: "Approve" }, content: { q0: "Approve" } },
+      {
+        scenario: "OMP custom answer",
+        answers: { q0: "Please wait" },
+        content: { q0__other: "Please wait" },
+      },
+    ].map((fixture) => ({
+      ...fixture,
+      settings: OMP_SETTINGS,
+      schema: {
+        type: "object",
+        properties: {
+          q0: {
+            type: "string",
+            title: "Approve this exact code-only commit?",
+            description: "Safety-hook false positive",
+            oneOf: [
+              { const: "Approve", title: "Approve", description: "Commit the verified fix." },
+              { const: "Hold", title: "Hold" },
+            ],
+            default: "Approve",
+          },
+          q0__other: { type: "string", title: "Other (type your own)" },
+        },
+      },
+      questions: [
+        {
+          id: "q0",
+          header: "Safety-hook false positive",
+          question: "Approve this exact code-only commit?",
+          options: [
+            { label: "Approve", value: "Approve", description: "Commit the verified fix." },
+            { label: "Hold", value: "Hold", description: "Hold" },
+          ],
+        },
+      ],
+      result: { action: "accept", content: fixture.content },
+    })),
+    {
+      scenario: "OMP unrelated form uses generic mapping",
+      settings: OMP_SETTINGS,
+      schema: { type: "object", properties: { name: { type: "string" } } },
+      questions: [{ id: "name", header: "Question 1", question: "Your answer?", options: [] }],
+      answers: { name: "Ada" },
+      result: { action: "accept", content: { name: "Ada" } },
+    },
     {
       scenario: "preserves selected IDs and encodes custom answers",
       schema: droidSchema,
@@ -1582,11 +1977,22 @@ describe("AcpAdapterV2", () => {
       answers: { name: "Ada" },
       result: { action: "accept", content: { name: "Ada" } },
     },
-  ])("Droid elicitation $scenario", ({ schema, questions, answers, result, withAttachments }) =>
-    Effect.gen(function* () {
+    {
+      scenario: "OpenCode keeps the selected option and hides the custom companion",
+      settings: OPENCODE_SETTINGS,
+      schema: openCodeSchema,
+      questions: openCodeQuestions,
+      answers: { q0: "blue" },
+      result: { action: "accept", content: { q0: "blue" } },
+    },
+  ])("Registry elicitation $scenario", (fixture) => {
+    const { schema, questions, answers, result } = fixture;
+    const withAttachments = "withAttachments" in fixture && fixture.withAttachments;
+    const settings = "settings" in fixture ? fixture.settings : DROID_SETTINGS;
+    return Effect.gen(function* () {
       const fileSystem = yield* FileSystem.FileSystem;
       const path = yield* Path.Path;
-      const directory = yield* fileSystem.makeTempDirectoryScoped({ prefix: "t3-droid-form-" });
+      const directory = yield* fileSystem.makeTempDirectoryScoped({ prefix: "t3-registry-form-" });
       const statusPath = path.join(directory, "status.json");
       const expectedResult = typeof result === "function" ? result(directory) : result;
       let preparedAnswers: ProviderUserInputAnswers | undefined = answers;
@@ -1690,15 +2096,13 @@ describe("AcpAdapterV2", () => {
       const adapter = yield* makeAcpRegistryAdapterV2({
         instanceId,
         selfInvocation: yield* resolveSelfInvocation(),
-        settings: DROID_SETTINGS,
+        settings,
         environment: {},
         makeRuntime: makeAcpReplayRuntime({
           transcript,
           statusPath,
           fileSystem,
-          scriptPath: yield* path.fromFileUrl(
-            new URL("../../../scripts/acp-replay-agent.ts", import.meta.url),
-          ),
+          scriptPath: yield* bundledReplayAgentPath,
           childProcessSpawner: yield* ChildProcessSpawner.ChildProcessSpawner,
         }),
       }).pipe(
@@ -1706,7 +2110,7 @@ describe("AcpAdapterV2", () => {
           Layer.mock(AcpRegistryCatalog)({ resolve: () => Effect.die("runtime is injected") }),
         ),
       );
-      const threadId = ThreadId.make("droid-form-thread");
+      const threadId = ThreadId.make("registry-form-thread");
       const modelSelection = { instanceId, model: "default" } as const;
       const runtimePolicy = ProviderAdapter.ProviderAdapterV2RuntimePolicy.make({
         runtimeMode: "approval-required",
@@ -1743,7 +2147,7 @@ describe("AcpAdapterV2", () => {
         ),
       );
       if (item.type !== "turn_item.updated" || item.turnItem.type !== "user_input_request")
-        return yield* Effect.die("Expected Droid question");
+        return yield* Effect.die("Expected a user input question");
       assert.deepEqual(item.turnItem.questions, questions);
       yield* runtime.respondToRuntimeRequest({
         requestId: item.turnItem.requestId,
@@ -1754,14 +2158,13 @@ describe("AcpAdapterV2", () => {
         Stream.runHead,
       );
       assert.equal(Option.getOrThrow(terminal).status, "completed");
-    }).pipe(Effect.provide(layerTest), Effect.scoped),
-  );
+    }).pipe(Effect.provide(layerTest));
+  });
 
   it.live.each(["failed", "recovered", "cancelled"] as const)(
     "projects Mistral retry notices and their %s outcome",
     (outcome) =>
       Effect.gen(function* () {
-        const path = yield* Path.Path;
         const instanceId = ProviderInstanceId.make(`vibe-retry-${outcome}`);
         const threadId = ThreadId.make(`thread-vibe-retry-${outcome}`);
         const adapter = yield* makeAcpAdapterV2({
@@ -1774,9 +2177,7 @@ describe("AcpAdapterV2", () => {
             promptFailure: (cause) => acpRegistryPromptFailure("mistral-vibe", cause),
             makeRuntime: makeMockRuntime({
               childProcessSpawner: yield* ChildProcessSpawner.ChildProcessSpawner,
-              mockAgentPath: yield* path.fromFileUrl(
-                new URL("../../../scripts/acp-mock-agent.ts", import.meta.url),
-              ),
+              mockAgentPath: yield* bundledMockAgentPath,
               environment: { T3_ACP_VIBE_RETRY_OUTCOME: outcome },
             }),
           },
@@ -1841,7 +2242,7 @@ describe("AcpAdapterV2", () => {
           assert.equal(retries.at(-1)?.status, "completed");
           assert.equal(retries.at(-1)?.title, "Provider recovered");
         }
-      }).pipe(Effect.provide(layerTest), Effect.scoped),
+      }).pipe(Effect.provide(layerTest)),
   );
 
   it.live.each([
@@ -1864,11 +2265,8 @@ describe("AcpAdapterV2", () => {
     ({ environment, planModeId, buildModeId }) =>
       Effect.gen(function* () {
         const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
-        const path = yield* Path.Path;
         const selfInvocation = yield* resolveSelfInvocation();
-        const mockAgentPath = yield* path.fromFileUrl(
-          new URL("../../../scripts/acp-mock-agent.ts", import.meta.url),
-        );
+        const mockAgentPath = yield* bundledMockAgentPath;
         const protocolEvents = yield* Queue.unbounded<EffectAcpProtocol.AcpProtocolLogEvent>();
         const instanceId = ProviderInstanceId.make("acp-test-instruction-transitions");
         const threadId = ThreadId.make("thread-acp-instruction-transitions");
@@ -1919,6 +2317,7 @@ describe("AcpAdapterV2", () => {
           ordinal: number,
           runtimePolicy: ProviderAdapter.ProviderAdapterV2RuntimePolicy,
           messageText: string,
+          turnModelSelection: ModelSelection = modelSelection,
         ) {
           yield* runtime.startTurn(
             makeTurnInput({
@@ -1929,6 +2328,7 @@ describe("AcpAdapterV2", () => {
               now,
               ordinal,
               messageText,
+              modelSelection: turnModelSelection,
             }),
           );
           yield* runtime.events.pipe(
@@ -1974,15 +2374,15 @@ describe("AcpAdapterV2", () => {
         assert.include(firstDefault.prompt, "T3 Code interaction mode: Default");
         assert.include(firstDefault.prompt, "## T3 Code browser");
         assert.include(firstDefault.prompt, "T3 Code orchestration");
+        assert.include(firstDefault.prompt, "<runtime_info>");
         assert.notInclude(
           firstDefault.methods,
           "session/set_config_option",
           "Build should preserve the agent's advertised mode default",
         );
-        assert.include(
-          (yield* runTurn(3, defaultPolicy, "Second default request.")).prompt,
-          "Second default request.",
-        );
+        const secondDefault = yield* runTurn(3, defaultPolicy, "Second default request.");
+        assert.equal(secondDefault.prompt, "Second default request.");
+        assert.equal(secondDefault.textBlockCount, 1);
 
         const planPolicy = policy("plan");
         const firstPlan = yield* runTurn(4, planPolicy, "Plan this change.");
@@ -1999,20 +2399,46 @@ describe("AcpAdapterV2", () => {
           [buildModeId],
           "Build should restore the native mode that T3 temporarily replaced for Plan",
         );
-      }).pipe(Effect.provide(layerTest), Effect.scoped),
+        const switchedModel = yield* runTurn(7, defaultPolicy, "Switch models.", {
+          instanceId,
+          model: "composer-2",
+        });
+        assert.equal(switchedModel.textBlockCount, 2);
+        assert.include(switchedModel.prompt, "as composer-2");
+      }).pipe(Effect.provide(layerTest)),
   );
 
-  it.live(
-    "reinjects ACP instructions after protocol compaction, including during reinjection",
-    () =>
+  it.live.each(["cancelled", "refusal", "error"] as const)(
+    "reinjects ACP instructions after protocol compaction, during reinjection, prompt preparation, or while idle (%s)",
+    (stopReason) =>
       Effect.gen(function* () {
-        const runTurn = yield* makeInstructionCompactionHarness({
-          T3_ACP_COMPACTION_PROMPT_ORDINALS: "2,4",
-        });
-        yield* runTurn("Start work.");
-        yield* runTurn("Continue until context compacts.");
+        const {
+          runTurn,
+          idleSessionUpdate,
+          idleCopilotSessionEvent,
+          sessionUpdateDuringNextPreparation,
+          reportNextPromptStopped,
+        } = yield* makeInstructionCompactionHarness(
+          {
+            T3_ACP_COMPACTION_PROMPT_ORDINALS: "2,4",
+            T3_ACP_OPEN_COMPACTION_PROMPT_ORDINALS: "13",
+          },
+          stopReason === "error",
+        );
+        const expectedStatus =
+          stopReason === "error"
+            ? "failed"
+            : stopReason === "cancelled"
+              ? "cancelled"
+              : "completed";
+        yield* reportNextPromptStopped(stopReason);
+        assertReinjectedInstructions(yield* runTurn("Start work.", expectedStatus), "Start work.");
+        assertReinjectedInstructions(
+          yield* runTurn("Continue until context compacts."),
+          "Continue until context compacts.",
+        );
         assert.deepEqual(yield* runTurn("  /repro-skill"), [
-          { type: "text", text: "  /repro-skill" },
+          { type: "text", text: stopReason === "error" ? "/repro-skill" : "  /repro-skill" },
         ]);
         assertReinjectedInstructions(
           yield* runTurn("Continue after compaction."),
@@ -2022,39 +2448,209 @@ describe("AcpAdapterV2", () => {
           yield* runTurn("Continue after the second compaction."),
           "Continue after the second compaction.",
         );
-        assert.equal((yield* runTurn("Finish work."))[0]?.text, "Finish work.");
-      }).pipe(Effect.provide(layerTest), Effect.scoped),
+        assert.deepEqual(yield* runTurn("Finish work."), [{ type: "text", text: "Finish work." }]);
+
+        yield* idleSessionUpdate({
+          sessionUpdate: "compaction_update",
+          compactionId: "compact-idle",
+          status: "completed",
+        });
+        assertReinjectedInstructions(
+          yield* runTurn("Continue after idle compaction."),
+          "Continue after idle compaction.",
+        );
+        yield* idleSessionUpdate({
+          sessionUpdate: "compaction_update",
+          compactionId: "compact-idle",
+          status: "completed",
+        });
+        assert.deepEqual(yield* runTurn("Continue after a repeated compaction update."), [
+          { type: "text", text: "Continue after a repeated compaction update." },
+        ]);
+        const copilotCompaction = { success: true, outcome: "applied", trigger: "threshold" };
+        yield* idleCopilotSessionEvent({
+          type: "session.compaction_complete",
+          agentId: "agent-a",
+          data: copilotCompaction,
+        });
+        assert.deepEqual(yield* runTurn("Continue after subagent compaction."), [
+          { type: "text", text: "Continue after subagent compaction." },
+        ]);
+        yield* idleCopilotSessionEvent({
+          type: "session.compaction_complete",
+          data: copilotCompaction,
+        });
+        assertReinjectedInstructions(
+          yield* runTurn("Continue after Copilot compaction."),
+          "Continue after Copilot compaction.",
+        );
+        yield* idleCopilotSessionEvent({
+          type: "session.compaction_complete",
+          data: { success: true, trigger: "threshold" },
+        });
+        assertReinjectedInstructions(
+          yield* runTurn("Continue after legacy Copilot compaction."),
+          "Continue after legacy Copilot compaction.",
+        );
+        yield* idleSessionUpdate({
+          sessionUpdate: "compaction_update",
+          compactionId: "compact-child",
+          status: "completed",
+          _meta: { "cognition.ai/subagent_context": { parentAgentId: "agent-b" } },
+        });
+        assert.deepEqual(yield* runTurn("Continue after child compaction."), [
+          { type: "text", text: "Continue after child compaction." },
+        ]);
+        yield* runTurn("End this turn while compaction is still running.");
+        assertReinjectedInstructions(
+          yield* runTurn("Continue after the turn ended mid-compaction."),
+          "Continue after the turn ended mid-compaction.",
+        );
+        yield* idleSessionUpdate({
+          sessionUpdate: "compaction_update",
+          compactionId: "compact-13",
+          status: "completed",
+        });
+        assertReinjectedInstructions(
+          yield* runTurn("Continue after the compaction really finished."),
+          "Continue after the compaction really finished.",
+        );
+        yield* sessionUpdateDuringNextPreparation({
+          sessionUpdate: "compaction_update",
+          compactionId: "compact-while-preparing",
+          status: "completed",
+        });
+        assertReinjectedInstructions(
+          yield* runTurn("Continue after a compaction during prompt preparation."),
+          "Continue after a compaction during prompt preparation.",
+        );
+        assert.deepEqual(yield* runTurn("Finish after that reinjection."), [
+          { type: "text", text: "Finish after that reinjection." },
+        ]);
+        yield* idleSessionUpdate({
+          sessionUpdate: "compaction_update",
+          compactionId: "compact-before-undelivered-prompt",
+          status: "completed",
+        });
+        yield* reportNextPromptStopped(stopReason);
+        assertReinjectedInstructions(
+          yield* runTurn("Do not retain this prompt.", expectedStatus),
+          "Do not retain this prompt.",
+        );
+        assertReinjectedInstructions(
+          yield* runTurn("Continue after the undelivered prompt."),
+          "Continue after the undelivered prompt.",
+        );
+      }).pipe(Effect.provide(layerTest)),
   );
 
   it.live(
     "reinjects ACP instructions after successful native compact, but not failed compact",
     () =>
       Effect.gen(function* () {
-        const runTurn = yield* makeInstructionCompactionHarness({
+        const { runTurn } = yield* makeInstructionCompactionHarness({
           T3_ACP_FAIL_PROMPT_ORDINAL: "2",
         });
         yield* runTurn("Start work.");
         assert.deepEqual(yield* runTurn("/compact", "failed"), [
           { type: "text", text: "/compact" },
         ]);
-        assert.equal(
-          (yield* runTurn("Continue after failure."))[0]?.text,
-          "Continue after failure.",
-        );
+        assert.deepEqual(yield* runTurn("Continue after failure."), [
+          { type: "text", text: "Continue after failure." },
+        ]);
         assert.deepEqual(yield* runTurn("/compact"), [{ type: "text", text: "/compact" }]);
         assert.deepEqual(yield* runTurn("/repro-skill"), [{ type: "text", text: "/repro-skill" }]);
         assertReinjectedInstructions(yield* runTurn("Continue work."), "Continue work.");
-        assert.equal((yield* runTurn("Finish work."))[0]?.text, "Finish work.");
-      }).pipe(Effect.provide(layerTest), Effect.scoped),
+        assert.deepEqual(yield* runTurn("Finish work."), [{ type: "text", text: "Finish work." }]);
+        // Agents such as Grok accept preservation instructions after the command.
+        assert.deepEqual(yield* runTurn("/compact keep the plan"), [
+          { type: "text", text: "/compact keep the plan" },
+        ]);
+        assertReinjectedInstructions(
+          yield* runTurn("Continue after the focused compact."),
+          "Continue after the focused compact.",
+        );
+      }).pipe(Effect.provide(layerTest)),
+  );
+
+  it.live.each([false, true])(
+    "sends a bare /compact prompt with protocol compaction %s",
+    (structured) =>
+      Effect.gen(function* () {
+        const harness = yield* makeAdvertisedCompactionHarness({
+          T3_ACP_AVAILABLE_COMMANDS: "compact,plan",
+          T3_ACP_COMPACTION_PROMPT_ORDINALS: structured ? "1" : "",
+        });
+        const compacted = yield* harness.compact();
+        assert.isTrue(Exit.isSuccess(compacted));
+        assert.deepEqual(yield* harness.nextPromptTexts(), [{ type: "text", text: "/compact" }]);
+        const events = yield* harness.runtime.events.pipe(
+          Stream.takeUntil((event) => event.type === "turn.terminal"),
+          Stream.runCollect,
+        );
+        assert.isTrue(
+          events.some(
+            (event) =>
+              event.type === "provider_thread.updated" &&
+              event.providerThread.contextUsage === null,
+          ),
+        );
+        assert.isTrue(
+          events.some(
+            (event) =>
+              event.type === "turn_item.updated" &&
+              event.turnItem.type === "compaction" &&
+              event.turnItem.status === "completed" &&
+              event.turnItem.title === (structured ? "Compact context" : "Context compacted"),
+          ),
+        );
+        assert.lengthOf(
+          events.filter(
+            (event) =>
+              event.type === "turn_item.updated" &&
+              event.turnItem.type === "compaction" &&
+              event.turnItem.status === "completed",
+          ),
+          1,
+        );
+      }).pipe(Effect.provide(layerTest)),
+  );
+
+  it.live.each([
+    { active: "plan", target: "compact", allowed: true },
+    { active: "compact", target: "plan", allowed: false },
+    { active: "compact", target: undefined, allowed: false },
+  ])(
+    "validates the target session's compact command ($active -> $target)",
+    ({ active, target, allowed }) =>
+      Effect.gen(function* () {
+        const harness = yield* makeAdvertisedCompactionHarness({
+          T3_ACP_AVAILABLE_COMMANDS: active,
+          ...(target === undefined ? {} : { T3_ACP_LOADED_COMMANDS: target }),
+        });
+        const result = yield* harness.compact(true);
+        assert.equal(Exit.isSuccess(result), allowed);
+        if (allowed) {
+          assert.deepEqual(yield* harness.nextPromptTexts(), [{ type: "text", text: "/compact" }]);
+          yield* harness.runtime.events.pipe(
+            Stream.takeUntil((event) => event.type === "turn.terminal"),
+            Stream.runDrain,
+          );
+        } else {
+          const error = Exit.isFailure(result) ? Cause.squash(result.cause) : undefined;
+          assert.instanceOf(error, ProviderAdapter.ProviderAdapterTurnStartError);
+          assert.instanceOf(
+            (error as ProviderAdapter.ProviderAdapterTurnStartError).cause,
+            ProviderAdapter.ProviderCompactionUnsupportedError,
+          );
+        }
+      }).pipe(Effect.provide(layerTest)),
   );
 
   it.live("reapplies a selection after a switch away from it failed partway", () =>
     Effect.gen(function* () {
       const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
-      const path = yield* Path.Path;
-      const mockAgentPath = yield* path.fromFileUrl(
-        new URL("../../../scripts/acp-mock-agent.ts", import.meta.url),
-      );
+      const mockAgentPath = yield* bundledMockAgentPath;
       const protocolEvents = yield* Queue.unbounded<EffectAcpProtocol.AcpProtocolLogEvent>();
       const instanceId = ProviderInstanceId.make("acp-test-partial-selection-reapply");
       const threadId = ThreadId.make("thread-acp-partial-selection-reapply");
@@ -2133,7 +2729,7 @@ describe("AcpAdapterV2", () => {
         ["composer-2"],
         "the native model was left on B, so the turn on A must set it back first",
       );
-    }).pipe(Effect.provide(layerTest), Effect.scoped),
+    }).pipe(Effect.provide(layerTest)),
   );
 
   // regression: #21499 turns blocked only on T3 thread waits must show as waiting
@@ -2144,7 +2740,6 @@ describe("AcpAdapterV2", () => {
         type RuntimeService = AcpSessionRuntime.AcpSessionRuntime["Service"];
         let handler: Parameters<RuntimeService["handleSessionUpdate"]>[0] | undefined;
         const instanceId = ProviderInstanceId.make("acp-named-stream-wait");
-        const path = yield* Path.Path;
         const adapter = yield* makeAcpAdapterV2({
           instanceId,
           selfInvocation: yield* resolveSelfInvocation(),
@@ -2153,9 +2748,7 @@ describe("AcpAdapterV2", () => {
             capabilities: AcpProviderCapabilitiesV2,
             makeRuntime: makeMockRuntime({
               childProcessSpawner: yield* ChildProcessSpawner.ChildProcessSpawner,
-              mockAgentPath: yield* path.fromFileUrl(
-                new URL("../../../scripts/acp-mock-agent.ts", import.meta.url),
-              ),
+              mockAgentPath: yield* bundledMockAgentPath,
               wrapRuntime: (runtime) => ({
                 ...runtime,
                 handleSessionUpdate: (next) =>
@@ -2267,7 +2860,7 @@ describe("AcpAdapterV2", () => {
           );
         }
         assert.deepEqual(states, [true, false, true, false]);
-      }).pipe(Effect.provide(layerTest), Effect.scoped),
+      }).pipe(Effect.provide(layerTest)),
   );
 
   const textChunk = (
@@ -2294,7 +2887,6 @@ describe("AcpAdapterV2", () => {
     type RuntimeService = AcpSessionRuntime.AcpSessionRuntime["Service"];
     let handler: Parameters<RuntimeService["handleSessionUpdate"]>[0] | undefined;
     const instanceId = ProviderInstanceId.make("acp-named-text-resume");
-    const path = yield* Path.Path;
     const adapter = yield* makeAcpAdapterV2({
       instanceId,
       selfInvocation: yield* resolveSelfInvocation(),
@@ -2303,9 +2895,7 @@ describe("AcpAdapterV2", () => {
         capabilities: AcpProviderCapabilitiesV2,
         makeRuntime: makeMockRuntime({
           childProcessSpawner: yield* ChildProcessSpawner.ChildProcessSpawner,
-          mockAgentPath: yield* path.fromFileUrl(
-            new URL("../../../scripts/acp-mock-agent.ts", import.meta.url),
-          ),
+          mockAgentPath: yield* bundledMockAgentPath,
           wrapRuntime: (runtime) => ({
             ...runtime,
             handleSessionUpdate: (next) =>
@@ -2391,6 +2981,19 @@ describe("AcpAdapterV2", () => {
         ["reasoning", "Thinking more"],
       ],
     },
+    {
+      label: "opaque ids differ only in surrounding whitespace",
+      steps: [answer("answer", "A"), answer(" answer ", "B")],
+      expected: [
+        ["assistant_message", "A"],
+        ["assistant_message", "B"],
+      ],
+    },
+    {
+      label: "a chunk continues a full update with the same whitespace-padded id",
+      steps: [agentMessage(" answer ", "A"), answer(" answer ", "B")],
+      expected: [["assistant_message", "AB"]],
+    },
   ] satisfies ReadonlyArray<{
     readonly label: string;
     readonly steps: ReadonlyArray<ScriptedTextStep>;
@@ -2415,7 +3018,7 @@ describe("AcpAdapterV2", () => {
         assert.equal(new Set(snapshots.map((item) => DateTime.formatIso(item.startedAt!))).size, 1);
         assert.equal(snapshots.at(-1)?.status, "completed");
       }
-    }).pipe(Effect.provide(layerTest), Effect.scoped),
+    }).pipe(Effect.provide(layerTest)),
   );
 
   it.effect("ignores a text flush scheduled before an ACP segment resumed", () =>
@@ -2443,17 +3046,14 @@ describe("AcpAdapterV2", () => {
         ["ABCDE", true],
         ["ABCDE", false],
       ]);
-    }).pipe(Effect.provide(layerTest), Effect.scoped),
+    }).pipe(Effect.provide(layerTest)),
   );
 
   it.effect("starts a new replay message after ACP v2 plan boundaries", () =>
     Effect.gen(function* () {
       const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
-      const path = yield* Path.Path;
       const selfInvocation = yield* resolveSelfInvocation();
-      const mockAgentPath = yield* path.fromFileUrl(
-        new URL("../../../scripts/acp-mock-agent.ts", import.meta.url),
-      );
+      const mockAgentPath = yield* bundledMockAgentPath;
       type RuntimeService = AcpSessionRuntime.AcpSessionRuntime["Service"];
       let sessionUpdateHandler: Parameters<RuntimeService["handleSessionUpdate"]>[0] | undefined;
       const instanceId = ProviderInstanceId.make("acp-test-v2-plan-replay-boundary");
@@ -2546,16 +3146,13 @@ describe("AcpAdapterV2", () => {
         snapshot.reasoningMessageIds,
         snapshot.messages.slice(2).map((message) => message.id),
       );
-    }).pipe(Effect.provide(layerTest), Effect.scoped),
+    }).pipe(Effect.provide(layerTest)),
   );
 
   it.effect("persists a bounded subset of streamed root and child tool updates", () =>
     Effect.gen(function* () {
       const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
-      const path = yield* Path.Path;
-      const mockAgentPath = yield* path.fromFileUrl(
-        new URL("../../../scripts/acp-mock-agent.ts", import.meta.url),
-      );
+      const mockAgentPath = yield* bundledMockAgentPath;
       type Runtime = AcpSessionRuntime.AcpSessionRuntime["Service"];
       let handler: Parameters<Runtime["handleSessionUpdate"]>[0] | undefined;
       // Devin resends the growing file without status on each update.
@@ -2718,16 +3315,13 @@ describe("AcpAdapterV2", () => {
           );
         }
       }
-    }).pipe(Effect.provide(layerTest), Effect.scoped),
+    }).pipe(Effect.provide(layerTest)),
   );
 
   it.effect("keeps Devin parent paragraphs intact while projecting native child work", () =>
     Effect.gen(function* () {
       const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
-      const path = yield* Path.Path;
-      const mockAgentPath = yield* path.fromFileUrl(
-        new URL("../../../scripts/acp-mock-agent.ts", import.meta.url),
-      );
+      const mockAgentPath = yield* bundledMockAgentPath;
       type Runtime = AcpSessionRuntime.AcpSessionRuntime["Service"];
       let handler: Parameters<Runtime["handleSessionUpdate"]>[0] | undefined;
       let createTerminal: Parameters<Runtime["handleCreateTerminal"]>[0] | undefined;
@@ -3042,16 +3636,13 @@ describe("AcpAdapterV2", () => {
       );
       assert.equal(parentTools.length, 2);
       assert.equal(parentTools[0]?.title, "Parent tool finished");
-    }).pipe(Effect.provide(layerTest), Effect.scoped),
+    }).pipe(Effect.provide(layerTest)),
   );
 
   it.effect("routes interleaved Copilot subagent output into subagent threads", () =>
     Effect.gen(function* () {
       const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
-      const path = yield* Path.Path;
-      const mockAgentPath = yield* path.fromFileUrl(
-        new URL("../../../scripts/acp-mock-agent.ts", import.meta.url),
-      );
+      const mockAgentPath = yield* bundledMockAgentPath;
       type Runtime = AcpSessionRuntime.AcpSessionRuntime["Service"];
       let handler: Parameters<Runtime["handleSessionUpdate"]>[0] | undefined;
       let sessionEvent:
@@ -3240,17 +3831,14 @@ describe("AcpAdapterV2", () => {
       assert.isFalse(
         items.some((item) => item.threadId === threadId && item.type === "dynamic_tool"),
       );
-    }).pipe(Effect.provide(layerTest), Effect.scoped),
+    }).pipe(Effect.provide(layerTest)),
   );
 
   it.effect("keeps protocol diagnostics off unless a protocol logger is supplied", () =>
     Effect.gen(function* () {
       const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
-      const path = yield* Path.Path;
       const selfInvocation = yield* resolveSelfInvocation();
-      const mockAgentPath = yield* path.fromFileUrl(
-        new URL("../../../scripts/acp-mock-agent.ts", import.meta.url),
-      );
+      const mockAgentPath = yield* bundledMockAgentPath;
       const runTurn = Effect.fn("AcpAdapterV2.testProtocolLoggingTurn")(function* (
         name: string,
         nativeLogging?: NonNullable<Parameters<typeof makeAcpAdapterV2>[0]["nativeLogging"]>,
@@ -3326,17 +3914,14 @@ describe("AcpAdapterV2", () => {
       }));
       assert.isTrue(explicit.some((e) => e.direction === "incoming" && e.stage === "raw"));
       assert.isTrue(explicit.some((e) => e.direction === "outgoing"));
-    }).pipe(Effect.provide(layerTest), Effect.scoped),
+    }).pipe(Effect.provide(layerTest)),
   );
 
   it.effect("advertises ACP session notices and shows them as system notices", () =>
     Effect.gen(function* () {
       const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
-      const path = yield* Path.Path;
       const selfInvocation = yield* resolveSelfInvocation();
-      const mockAgentPath = yield* path.fromFileUrl(
-        new URL("../../../scripts/acp-mock-agent.ts", import.meta.url),
-      );
+      const mockAgentPath = yield* bundledMockAgentPath;
       const protocolEvents = yield* Queue.unbounded<EffectAcpProtocol.AcpProtocolLogEvent>();
       const instanceId = ProviderInstanceId.make("acp-test-notice");
       const adapter = yield* makeAcpAdapterV2({
@@ -3392,7 +3977,7 @@ describe("AcpAdapterV2", () => {
               Object(rawProtocolRequestParam(initialize, "clientCapabilities")),
               "session",
             ),
-        { notices: {} },
+        { notices: {}, compaction: {} },
       );
       const title =
         "skill discovery warning: candidate was skipped because its metadata is invalid";
@@ -3408,17 +3993,14 @@ describe("AcpAdapterV2", () => {
         ["before the notice, after the notice"],
         "a notice neither joins the reply nor splits it",
       );
-    }).pipe(Effect.provide(layerTest), Effect.scoped),
+    }).pipe(Effect.provide(layerTest)),
   );
 
   it.effect("projects ACP v2 fidelity updates into first-class orchestration items", () =>
     Effect.gen(function* () {
       const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
-      const path = yield* Path.Path;
       const selfInvocation = yield* resolveSelfInvocation();
-      const mockAgentPath = yield* path.fromFileUrl(
-        new URL("../../../scripts/acp-mock-agent.ts", import.meta.url),
-      );
+      const mockAgentPath = yield* bundledMockAgentPath;
       type RuntimeService = AcpSessionRuntime.AcpSessionRuntime["Service"];
       let sessionUpdateHandler: Parameters<RuntimeService["handleSessionUpdate"]>[0] | undefined;
       const instanceId = ProviderInstanceId.make("acp-test-v2-fidelity");
@@ -3606,16 +4188,13 @@ describe("AcpAdapterV2", () => {
         afterOmittedPatch.messages.some((message) => message.text === "late authoritative text"),
         "omitted late message content must preserve the authoritative text",
       );
-    }).pipe(Effect.provide(layerTest), Effect.scoped),
+    }).pipe(Effect.provide(layerTest)),
   );
 
   it.effect("projects only the tail of long ACP terminal output", () =>
     Effect.gen(function* () {
       const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
-      const path = yield* Path.Path;
-      const mockAgentPath = yield* path.fromFileUrl(
-        new URL("../../../scripts/acp-mock-agent.ts", import.meta.url),
-      );
+      const mockAgentPath = yield* bundledMockAgentPath;
       const instanceId = ProviderInstanceId.make("acp-test-long-terminal");
       const adapter = yield* makeAcpAdapterV2({
         instanceId,
@@ -3670,7 +4249,7 @@ describe("AcpAdapterV2", () => {
       assert.isAtLeast(outputs.length, 2);
       assert.isAtMost(Math.max(...outputs.map((output) => output.length)), 320 * 1024);
       assert.equal(outputs.at(-1), fullOutput.slice(-320 * 1024));
-    }).pipe(Effect.provide(layerTest), Effect.scoped),
+    }).pipe(Effect.provide(layerTest)),
   );
 
   it.live(
@@ -3679,11 +4258,8 @@ describe("AcpAdapterV2", () => {
       Effect.gen(function* () {
         const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
         const idAllocator = yield* IdAllocator.IdAllocatorV2;
-        const path = yield* Path.Path;
         const selfInvocation = yield* resolveSelfInvocation();
-        const mockAgentPath = yield* path.fromFileUrl(
-          new URL("../../../scripts/acp-mock-agent.ts", import.meta.url),
-        );
+        const mockAgentPath = yield* bundledMockAgentPath;
         const protocolEvents = yield* Queue.unbounded<EffectAcpProtocol.AcpProtocolLogEvent>();
         const instanceId = ProviderInstanceId.make("acp-test-eager-resume");
         const adapter = yield* makeAcpAdapterV2({
@@ -3751,17 +4327,14 @@ describe("AcpAdapterV2", () => {
             nativeTurnId: "persisted-session:turn:1",
           }),
         );
-      }).pipe(Effect.provide(layerTest), Effect.scoped),
+      }).pipe(Effect.provide(layerTest)),
   );
 
   it.live("creates a fresh ACP identity when recovering an exhausted target", () =>
     Effect.gen(function* () {
       const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
-      const path = yield* Path.Path;
       const selfInvocation = yield* resolveSelfInvocation();
-      const mockAgentPath = yield* path.fromFileUrl(
-        new URL("../../../scripts/acp-mock-agent.ts", import.meta.url),
-      );
+      const mockAgentPath = yield* bundledMockAgentPath;
       const protocolEvents = yield* Queue.unbounded<EffectAcpProtocol.AcpProtocolLogEvent>();
       const instanceId = ProviderInstanceId.make("acp-test-exhausted-target");
       const adapter = yield* makeAcpAdapterV2({
@@ -3844,18 +4417,15 @@ describe("AcpAdapterV2", () => {
       );
       const methods = yield* pollProtocolMethods(protocolEvents);
       assert.equal(methods.filter((method) => method === "session/new").length, 2);
-    }).pipe(Effect.provide(layerTest), Effect.scoped),
+    }).pipe(Effect.provide(layerTest)),
   );
 
   it.live("preserves new-session fallback when an eager ACP session load is stale", () =>
     Effect.gen(function* () {
       const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
       const idAllocator = yield* IdAllocator.IdAllocatorV2;
-      const path = yield* Path.Path;
       const selfInvocation = yield* resolveSelfInvocation();
-      const mockAgentPath = yield* path.fromFileUrl(
-        new URL("../../../scripts/acp-mock-agent.ts", import.meta.url),
-      );
+      const mockAgentPath = yield* bundledMockAgentPath;
       const protocolEvents = yield* Queue.unbounded<EffectAcpProtocol.AcpProtocolLogEvent>();
       const instanceId = ProviderInstanceId.make("acp-test-stale-eager-resume");
       const adapter = yield* makeAcpAdapterV2({
@@ -3945,17 +4515,14 @@ describe("AcpAdapterV2", () => {
           ),
         }),
       );
-    }).pipe(Effect.provide(layerTest), Effect.scoped),
+    }).pipe(Effect.provide(layerTest)),
   );
 
   it.live("replaces an unexpectedly terminated ACP runtime before the next turn", () =>
     Effect.gen(function* () {
       const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
-      const path = yield* Path.Path;
       const selfInvocation = yield* resolveSelfInvocation();
-      const mockAgentPath = yield* path.fromFileUrl(
-        new URL("../../../scripts/acp-mock-agent.ts", import.meta.url),
-      );
+      const mockAgentPath = yield* bundledMockAgentPath;
       const runtimeInputs: AcpAdapterV2RuntimeInput[] = [];
       let runtimeOrdinalSeen = 0;
       const baseMakeRuntime = makeMockRuntime({
@@ -4020,7 +4587,7 @@ describe("AcpAdapterV2", () => {
       );
       assert.equal(runtimeOrdinalSeen, 2);
       assert.lengthOf(runtimeInputs, 2);
-    }).pipe(Effect.provide(layerTest), Effect.scoped),
+    }).pipe(Effect.provide(layerTest)),
   );
 
   it.effect("fails a prompt its agent leaves silent past the inactivity timeout", () =>
@@ -4056,7 +4623,7 @@ describe("AcpAdapterV2", () => {
       assert.include(silent?.failure?.message, "15 minutes");
       assert.equal(next?.status, "completed");
       assert.lengthOf(harness.natives, 2);
-    }).pipe(Effect.provide(layerTest), Effect.scoped),
+    }).pipe(Effect.provide(layerTest)),
   );
 
   it.effect(
@@ -4094,7 +4661,91 @@ describe("AcpAdapterV2", () => {
         const [silent, next] = yield* harness.terminals(2);
         assert.equal(silent?.status, "failed");
         assert.equal(next?.status, "completed");
-      }).pipe(Effect.provide(layerTest), Effect.scoped),
+      }).pipe(Effect.provide(layerTest)),
+  );
+
+  it.effect("delivers a follow-up the agent rejects while it is still processing", () =>
+    Effect.gen(function* () {
+      let promptCalls = 0;
+      const rejected = yield* Deferred.make<void>();
+      const harness = yield* makePromptInactivityHarness({
+        environment: () => ({}),
+        // pi-agent-core based agents (oh-my-pi) end a turn but keep background work running.
+        wrapPrompt: (prompt) => (payload, options) => {
+          promptCalls += 1;
+          return promptCalls === 2
+            ? Deferred.succeed(rejected, undefined).pipe(
+                Effect.andThen(
+                  Effect.fail(
+                    EffectAcpErrors.AcpRequestError.internalError(
+                      "Agent is already processing. Use steer() or followUp() to queue messages, or wait for completion.",
+                    ),
+                  ),
+                ),
+              )
+            : prompt(payload, options);
+        },
+      });
+      yield* harness.startTurn(1);
+      const [first] = yield* harness.terminals(1);
+      assert.equal(first?.status, "completed");
+
+      const followUp = yield* harness.terminals(1).pipe(Effect.forkScoped);
+      yield* harness.startTurn(2);
+      yield* Deferred.await(rejected);
+      yield* TestClock.adjust("1 minute");
+      const [delivered] = yield* Fiber.join(followUp);
+      assert.equal(delivered?.status, "completed");
+      assert.equal(promptCalls, 3);
+    }).pipe(Effect.provide(layerTest)),
+  );
+
+  it.effect("sends no more prompts once a follow-up waiting on a busy agent is stopped", () =>
+    Effect.gen(function* () {
+      let promptCalls = 0;
+      const rejected = yield* Deferred.make<void>();
+      const cancelled = yield* Deferred.make<void>();
+      const harness = yield* makePromptInactivityHarness({
+        environment: () => ({}),
+        cancelled,
+        wrapPrompt: (prompt) => (payload, options) => {
+          promptCalls += 1;
+          return promptCalls === 1
+            ? prompt(payload, options)
+            : Deferred.succeed(rejected, undefined).pipe(
+                Effect.andThen(
+                  Effect.fail(
+                    EffectAcpErrors.AcpRequestError.internalError(
+                      "Agent is already processing. Use steer() or followUp() to queue messages, or wait for completion.",
+                    ),
+                  ),
+                ),
+              );
+        },
+      });
+      yield* harness.startTurn(1);
+      yield* harness.terminals(1);
+
+      const stopped = yield* harness.terminals(1).pipe(Effect.forkScoped);
+      yield* harness.startTurn(2);
+      yield* Deferred.await(rejected);
+      const providerTurnId = (yield* IdAllocator.IdAllocatorV2).derive.providerTurn({
+        driver: ACP_TEST_DRIVER,
+        nativeTurnId: acpScopedNativeId(
+          ProviderInstanceId.make("acp-prompt-inactivity"),
+          "mock-session-1:turn:2",
+        ),
+      });
+      const interrupt = yield* harness.runtime
+        .interruptTurn({ providerThread: harness.providerThread, providerTurnId })
+        .pipe(Effect.forkScoped);
+      yield* Deferred.await(cancelled);
+      yield* TestClock.adjust("1 second");
+      const [terminal] = yield* Fiber.join(stopped);
+      yield* Fiber.join(interrupt);
+      assert.equal(terminal?.status, "interrupted");
+      assert.equal(promptCalls, 2);
+    }).pipe(Effect.provide(layerTest)),
   );
 
   it.effect("holds the inactivity timeout while the agent waits on an approval", () =>
@@ -4135,7 +4786,7 @@ describe("AcpAdapterV2", () => {
       const [approved] = yield* harness.terminals(1);
       assert.equal(approved?.status, "completed");
       assert.lengthOf(harness.natives, 1);
-    }).pipe(Effect.provide(layerTest), Effect.scoped),
+    }).pipe(Effect.provide(layerTest)),
   );
 
   it.effect("fails a running prompt once when its agent process exits", () =>
@@ -4171,7 +4822,7 @@ describe("AcpAdapterV2", () => {
       assert.notEqual(silent?.providerTurnId, exited?.providerTurnId);
       assert.equal(next?.status, "completed");
       assert.lengthOf(harness.natives, 3);
-    }).pipe(Effect.provide(layerTest), Effect.scoped),
+    }).pipe(Effect.provide(layerTest)),
   );
 
   it.live("does not poll the process ledger while a cgroup lease owns teardown", () =>
@@ -4181,9 +4832,7 @@ describe("AcpAdapterV2", () => {
       const fileSystem = yield* FileSystem.FileSystem;
       const path = yield* Path.Path;
       const selfInvocation = yield* resolveSelfInvocation();
-      const mockAgentPath = yield* path.fromFileUrl(
-        new URL("../../../scripts/acp-mock-agent.ts", import.meta.url),
-      );
+      const mockAgentPath = yield* bundledMockAgentPath;
       // A directory stands in for cgroupfs: the join wrapper appends the agent
       // PID to cgroup.procs and stays in this process's cgroup, which is the
       // cgroup the lease reports.
@@ -4270,17 +4919,14 @@ describe("AcpAdapterV2", () => {
       yield* Scope.close(sessionScope, Exit.void);
       assert.isFalse(isLive(agentPid!), "closing the session must still tear the agent down");
       assert.isFalse(leaseExists, "closing the session must remove the lease");
-    }).pipe(Effect.provide(layerTest), Effect.scoped),
+    }).pipe(Effect.provide(layerTest)),
   );
 
   it.effect("negotiates and executes optional native session forks through the ACP runtime", () =>
     Effect.gen(function* () {
       const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
-      const path = yield* Path.Path;
       const selfInvocation = yield* resolveSelfInvocation();
-      const mockAgentPath = yield* path.fromFileUrl(
-        new URL("../../../scripts/acp-mock-agent.ts", import.meta.url),
-      );
+      const mockAgentPath = yield* bundledMockAgentPath;
       const protocolEvents = yield* Queue.bounded<EffectAcpProtocol.AcpProtocolLogEvent>(256);
       type RuntimeService = AcpSessionRuntime.AcpSessionRuntime["Service"];
       let createTerminal: Parameters<RuntimeService["handleCreateTerminal"]>[0] | undefined;
@@ -4471,7 +5117,7 @@ describe("AcpAdapterV2", () => {
         terminalOutput.output,
         "thread-acp-native-fork-target\nBearer target-thread-token",
       );
-    }).pipe(Effect.provide(layerTest), Effect.scoped),
+    }).pipe(Effect.provide(layerTest)),
   );
 
   it.effect(
@@ -4482,9 +5128,7 @@ describe("AcpAdapterV2", () => {
         const fileSystem = yield* FileSystem.FileSystem;
         const path = yield* Path.Path;
         const selfInvocation = yield* resolveSelfInvocation();
-        const mockAgentPath = yield* path.fromFileUrl(
-          new URL("../../../scripts/acp-mock-agent.ts", import.meta.url),
-        );
+        const mockAgentPath = yield* bundledMockAgentPath;
         const workspace = yield* fileSystem.makeTempDirectoryScoped({
           prefix: "t3-acp-no-client-fs-",
         });
@@ -4564,17 +5208,14 @@ describe("AcpAdapterV2", () => {
           { method: "fs/read_text_file", errorCode: -32601 },
         ]);
         assert.isFalse(yield* fileSystem.exists(probePath));
-      }).pipe(Effect.provide(layerTest), Effect.scoped),
+      }).pipe(Effect.provide(layerTest)),
   );
 
   it.effect("does not turn an unknown permission approval into an execute grant", () =>
     Effect.gen(function* () {
       const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
-      const path = yield* Path.Path;
       const selfInvocation = yield* resolveSelfInvocation();
-      const mockAgentPath = yield* path.fromFileUrl(
-        new URL("../../../scripts/acp-mock-agent.ts", import.meta.url),
-      );
+      const mockAgentPath = yield* bundledMockAgentPath;
       type RuntimeService = AcpSessionRuntime.AcpSessionRuntime["Service"];
       let requestPermission: Parameters<RuntimeService["handleRequestPermission"]>[0] | undefined;
       let createTerminal: Parameters<RuntimeService["handleCreateTerminal"]>[0] | undefined;
@@ -4694,7 +5335,7 @@ describe("AcpAdapterV2", () => {
         providerTurnId: pending.runtimeRequest.providerTurnId,
       });
       yield* Fiber.join(turnFiber);
-    }).pipe(Effect.provide(layerTest), Effect.scoped),
+    }).pipe(Effect.provide(layerTest)),
   );
 
   it.effect.each([
@@ -4729,11 +5370,8 @@ describe("AcpAdapterV2", () => {
   ] as const)("$label", ({ kind, granted, ...testCase }) =>
     Effect.gen(function* () {
       const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
-      const path = yield* Path.Path;
       const selfInvocation = yield* resolveSelfInvocation();
-      const mockAgentPath = yield* path.fromFileUrl(
-        new URL("../../../scripts/acp-mock-agent.ts", import.meta.url),
-      );
+      const mockAgentPath = yield* bundledMockAgentPath;
       type RuntimeService = AcpSessionRuntime.AcpSessionRuntime["Service"];
       let requestPermission: Parameters<RuntimeService["handleRequestPermission"]>[0] | undefined;
       let createTerminal: Parameters<RuntimeService["handleCreateTerminal"]>[0] | undefined;
@@ -4868,7 +5506,7 @@ describe("AcpAdapterV2", () => {
 
       yield* runtime.interruptTurn({ providerThread, providerTurnId });
       yield* Fiber.join(turnFiber);
-    }).pipe(Effect.provide(layerTest), Effect.scoped),
+    }).pipe(Effect.provide(layerTest)),
   );
 
   it.effect.each([
@@ -4892,11 +5530,8 @@ describe("AcpAdapterV2", () => {
   ] as const)("$label", ({ options, optionId }) =>
     Effect.gen(function* () {
       const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
-      const path = yield* Path.Path;
       const selfInvocation = yield* resolveSelfInvocation();
-      const mockAgentPath = yield* path.fromFileUrl(
-        new URL("../../../scripts/acp-mock-agent.ts", import.meta.url),
-      );
+      const mockAgentPath = yield* bundledMockAgentPath;
       type RuntimeService = AcpSessionRuntime.AcpSessionRuntime["Service"];
       let requestPermission: Parameters<RuntimeService["handleRequestPermission"]>[0] | undefined;
       let runtimeInput: AcpAdapterV2RuntimeInput | undefined;
@@ -5002,18 +5637,15 @@ describe("AcpAdapterV2", () => {
       });
       yield* Fiber.join(turnFiber);
       assert.deepEqual(outcome, { outcome: "selected", optionId });
-    }).pipe(Effect.provide(layerTest), Effect.scoped),
+    }).pipe(Effect.provide(layerTest)),
   );
 
   it.effect("replaces the ACP session and clears conversation state on rollback", () =>
     Effect.gen(function* () {
       const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
       const idAllocator = yield* IdAllocator.IdAllocatorV2;
-      const path = yield* Path.Path;
       const selfInvocation = yield* resolveSelfInvocation();
-      const mockAgentPath = yield* path.fromFileUrl(
-        new URL("../../../scripts/acp-mock-agent.ts", import.meta.url),
-      );
+      const mockAgentPath = yield* bundledMockAgentPath;
       const instanceId = ProviderInstanceId.make("acp-test-rollback-session");
       const rollbackThreadId = ThreadId.make("thread-acp-rollback-session-target");
       yield* (yield* McpProviderSessions.McpProviderSessions).set({
@@ -5026,11 +5658,13 @@ describe("AcpAdapterV2", () => {
         browserToolsAvailable: false,
       });
       const runtimeInputs: Array<AcpAdapterV2RuntimeInput> = [];
+      const protocolEvents = yield* Queue.unbounded<EffectAcpProtocol.AcpProtocolLogEvent>();
       const nativeRuntimes: Array<AcpSessionRuntime.AcpSessionRuntime["Service"]> = [];
       let sessionEventCount = 0;
       const makeRuntime = makeMockRuntime({
         childProcessSpawner,
         mockAgentPath,
+        protocolEvents,
         environment: { T3_ACP_PROMPT_DELAY_MS: "100" },
         wrapRuntime: (nativeRuntime) => {
           nativeRuntimes.push(nativeRuntime);
@@ -5177,10 +5811,19 @@ describe("AcpAdapterV2", () => {
       assert.equal(secondStatus, "completed");
       yield* nativeRuntimes[1]!.drainEvents;
       assert.isAbove(sessionEventCount, sessionEventsBeforeSecondTurn);
-    }).pipe(Effect.provide(layerTest), Effect.scoped),
+      const prompts = Array.from(yield* Queue.takeAll(protocolEvents))
+        .filter(
+          (event) =>
+            event.direction === "outgoing" && rawProtocolMethod(event) === "session/prompt",
+        )
+        .map(rawProtocolPromptTextBlocks);
+      assert.lengthOf(prompts, 2);
+      // The mock agent reuses its session id, so only the rollback reset resends these notes.
+      assert.include(prompts[1]?.at(-1)?.text ?? "", "<runtime_info>");
+    }).pipe(Effect.provide(layerTest)),
   );
 
-  it.effect("quarantines callbacks from a failed rollback replacement before retrying", () =>
+  it.effect("resends T3 notes after rollback when the replaced runtime's prompt settles late", () =>
     Effect.gen(function* () {
       const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
       const path = yield* Path.Path;
@@ -5189,6 +5832,131 @@ describe("AcpAdapterV2", () => {
         new URL("../../../scripts/acp-mock-agent.ts", import.meta.url),
       );
       type RuntimeService = AcpSessionRuntime.AcpSessionRuntime["Service"];
+      let firstSessionUpdate: Parameters<RuntimeService["handleSessionUpdate"]>[0] | undefined;
+      const firstPromptGate = yield* Deferred.make<EffectAcpSchema.PromptResponse>();
+      const firstPromptCallbackDone = yield* Deferred.make<void>();
+      const replacementPromptText = yield* Deferred.make<string>();
+      const instanceId = ProviderInstanceId.make("acp-test-late-prompt-rollback");
+      const adapter = yield* makeAcpAdapterV2({
+        instanceId,
+        testHooks: {
+          afterPromptCallback: () =>
+            Deferred.succeed(firstPromptCallbackDone, undefined).pipe(Effect.asVoid),
+        },
+        flavor: {
+          driver: ACP_TEST_DRIVER,
+          capabilities: AcpProviderCapabilitiesV2,
+          followAgentWorkState: true,
+          makeRuntime: makeMockRuntime({
+            childProcessSpawner,
+            mockAgentPath,
+            wrapRuntime: (runtime, runtimeOrdinal) =>
+              runtimeOrdinal === 1
+                ? {
+                    ...runtime,
+                    handleSessionUpdate: (handler) =>
+                      Effect.sync(() => {
+                        firstSessionUpdate = handler;
+                      }).pipe(Effect.andThen(runtime.handleSessionUpdate(handler))),
+                    prompt: () => Deferred.await(firstPromptGate),
+                  }
+                : {
+                    ...runtime,
+                    prompt: (payload, options) =>
+                      Deferred.succeed(
+                        replacementPromptText,
+                        payload.prompt
+                          .flatMap((block) => (block.type === "text" ? [block.text] : []))
+                          .join("\n"),
+                      ).pipe(Effect.andThen(runtime.prompt(payload, options))),
+                  },
+          }),
+        },
+        selfInvocation,
+        continuationRequests: { offer: () => Effect.void },
+      });
+      const threadId = ThreadId.make("thread-acp-late-prompt-rollback");
+      const runtimePolicy = ProviderAdapter.ProviderAdapterV2RuntimePolicy.make({
+        runtimeMode: "full-access",
+        interactionMode: "default",
+        cwd: process.cwd(),
+      });
+      const modelSelection = { instanceId, model: "default" } as const;
+      const runtime = yield* adapter.openSession({
+        threadId,
+        providerSessionId: ProviderSessionId.make("provider-session-acp-late-prompt-rollback"),
+        modelSelection,
+        runtimePolicy,
+      });
+      const events = yield* Queue.unbounded<ProviderAdapter.ProviderAdapterV2Event>();
+      yield* runtime.events.pipe(
+        Stream.runForEach((event) => Queue.offer(events, event)),
+        Effect.forkScoped,
+      );
+      const providerThread = yield* runtime.ensureThread({
+        threadId,
+        modelSelection,
+        runtimePolicy,
+      });
+      yield* runtime.startTurn(
+        makeTurnInput({
+          threadId,
+          providerThread,
+          instanceId,
+          runtimePolicy,
+          now: yield* DateTime.now,
+        }),
+      );
+      if (firstSessionUpdate === undefined) {
+        return yield* Effect.die("the first runtime's session handler must be wired");
+      }
+      // The agent goes idle while its prompt RPC is still open, which ends the turn.
+      yield* firstSessionUpdate({
+        sessionId: "mock-session-1",
+        update: { sessionUpdate: "user_message_chunk", content: { type: "text", text: "echo" } },
+      });
+      yield* firstSessionUpdate({
+        sessionId: "mock-session-1",
+        update: { sessionUpdate: "state_update", state: "idle", stopReason: "end_turn" },
+      });
+      while ((yield* Queue.take(events)).type !== "turn.terminal") {}
+
+      const rolledBack = yield* runtime.rollbackThread({
+        providerThread,
+        providerThreadTurns: [],
+        target: {
+          type: "thread_start",
+          checkpointId: CheckpointId.make("checkpoint-acp-late-prompt-rollback"),
+          appRunOrdinal: 0,
+        },
+      });
+      // The replaced runtime's prompt settles late. A successful result would record delivery
+      // without the generation check; a cancelled one never records it, so it proves nothing.
+      // Its completion callback must finish before the next turn reads delivery state.
+      yield* Deferred.succeed(firstPromptGate, { stopReason: "end_turn" });
+      yield* Deferred.await(firstPromptCallbackDone);
+      yield* runtime.startTurn(
+        makeTurnInput({
+          threadId,
+          providerThread: rolledBack.providerThread,
+          instanceId,
+          runtimePolicy,
+          now: yield* DateTime.now,
+          ordinal: 2,
+        }),
+      );
+      const replacementPrompt = yield* Deferred.await(replacementPromptText);
+      assert.include(replacementPrompt, "T3 Code interaction mode: Default");
+      assert.include(replacementPrompt, "<runtime_info>");
+    }).pipe(Effect.provide(layerTest)),
+  );
+
+  it.effect("quarantines callbacks from a failed rollback replacement before retrying", () =>
+    Effect.gen(function* () {
+      const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
+      const selfInvocation = yield* resolveSelfInvocation();
+      const mockAgentPath = yield* bundledMockAgentPath;
+      type RuntimeService = AcpSessionRuntime.AcpSessionRuntime["Service"];
       const sessionUpdateHandlers: Array<
         Parameters<RuntimeService["handleSessionUpdate"]>[0] | undefined
       > = [];
@@ -5329,16 +6097,13 @@ describe("AcpAdapterV2", () => {
         status: "running",
       });
       assert.isFalse(yield* hasPendingBackgroundWork);
-    }).pipe(Effect.provide(layerTest), Effect.scoped),
+    }).pipe(Effect.provide(layerTest)),
   );
 
   it.live("settles a Grok background command that completed before an ACP v2 idle error", () =>
     Effect.gen(function* () {
       const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
-      const path = yield* Path.Path;
-      const mockAgentPath = yield* path.fromFileUrl(
-        new URL("../../../scripts/acp-mock-agent.ts", import.meta.url),
-      );
+      const mockAgentPath = yield* bundledMockAgentPath;
       const instanceId = ProviderInstanceId.make("grok-idle-error-background");
       const adapter = yield* makeGrokAdapterV2({
         instanceId,
@@ -5395,17 +6160,14 @@ describe("AcpAdapterV2", () => {
         command?.type === "turn_item.updated" ? command.turnItem.status : undefined,
         "completed",
       );
-    }).pipe(Effect.provide(layerTest), Effect.scoped),
+    }).pipe(Effect.provide(layerTest)),
   );
 
   it.effect("closes the ACP runtime when the agent never answers session/close", () =>
     Effect.gen(function* () {
       const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
-      const path = yield* Path.Path;
       const selfInvocation = yield* resolveSelfInvocation();
-      const mockAgentPath = yield* path.fromFileUrl(
-        new URL("../../../scripts/acp-mock-agent.ts", import.meta.url),
-      );
+      const mockAgentPath = yield* bundledMockAgentPath;
       const protocolEvents = yield* Queue.bounded<EffectAcpProtocol.AcpProtocolLogEvent>(256);
       const makeRuntime = makeMockRuntime({
         childProcessSpawner,
@@ -5466,10 +6228,7 @@ describe("AcpAdapterV2", () => {
     () =>
       Effect.gen(function* () {
         const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
-        const path = yield* Path.Path;
-        const mockAgentPath = yield* path.fromFileUrl(
-          new URL("../../../scripts/acp-mock-agent.ts", import.meta.url),
-        );
+        const mockAgentPath = yield* bundledMockAgentPath;
         const instanceId = ProviderInstanceId.make("grok-background-completion");
         const adapter = yield* makeGrokAdapterV2({
           instanceId,
@@ -5544,7 +6303,7 @@ describe("AcpAdapterV2", () => {
           items.some((item) => item.nativeItemRef?.nativeId === "call-background-poll"),
           "command TaskOutput must retain its normal tool frame",
         );
-      }).pipe(Effect.provide(layerTest), Effect.scoped),
+      }).pipe(Effect.provide(layerTest)),
   );
 
   // Grok expands only a leading `/name`, so a picked leading `$name`
@@ -5557,10 +6316,7 @@ describe("AcpAdapterV2", () => {
     Effect.gen(function* () {
       const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
       const fileSystem = yield* FileSystem.FileSystem;
-      const path = yield* Path.Path;
-      const mockAgentPath = yield* path.fromFileUrl(
-        new URL("../../../scripts/acp-mock-agent.ts", import.meta.url),
-      );
+      const mockAgentPath = yield* bundledMockAgentPath;
       const hostPlatform = yield* HostProcess.Platform;
       // Stands in for `grok inspect --json`, the catalog behind the `$` picker.
       const catalog = { skills: [{ name: "deploy", source: { path: "/s/deploy/SKILL.md" } }] };
@@ -5627,7 +6383,7 @@ describe("AcpAdapterV2", () => {
         assert.isTrue(blocks.some((block) => block.text.includes(sent)));
         assert.isFalse(blocks.some((block) => block.text.trimStart().startsWith("/")));
       }
-    }).pipe(Effect.provide(layerTest), Effect.scoped),
+    }).pipe(Effect.provide(layerTest)),
   );
 
   // Command completion must release the turn even when the CLI keeps the prompt RPC and process
@@ -5649,10 +6405,7 @@ describe("AcpAdapterV2", () => {
     ({ shape, expectedCommand }) =>
       Effect.gen(function* () {
         const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
-        const path = yield* Path.Path;
-        const mockAgentPath = yield* path.fromFileUrl(
-          new URL("../../../scripts/acp-mock-agent.ts", import.meta.url),
-        );
+        const mockAgentPath = yield* bundledMockAgentPath;
         const instanceId = ProviderInstanceId.make("grok-kill-completion");
         const adapter = yield* makeGrokAdapterV2({
           instanceId,
@@ -5726,17 +6479,14 @@ describe("AcpAdapterV2", () => {
           items.some((item) => item.nativeItemRef?.nativeId === "kill-command"),
           "KillTask must retain its normal tool frame",
         );
-      }).pipe(Effect.provide(layerTest), Effect.scoped),
+      }).pipe(Effect.provide(layerTest)),
   );
 
   it.effect("keeps an agent's empty-valued default choice selectable", () =>
     Effect.gen(function* () {
       const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
-      const path = yield* Path.Path;
       const selfInvocation = yield* resolveSelfInvocation();
-      const mockAgentPath = yield* path.fromFileUrl(
-        new URL("../../../scripts/acp-mock-agent.ts", import.meta.url),
-      );
+      const mockAgentPath = yield* bundledMockAgentPath;
       const protocolEvents = yield* Queue.bounded<EffectAcpProtocol.AcpProtocolLogEvent>(256);
       const instanceId = ProviderInstanceId.make("acp-test");
       let agentDescriptor: ProviderOptionDescriptor | undefined;
@@ -5825,18 +6575,15 @@ describe("AcpAdapterV2", () => {
         )
         .map((event) => rawProtocolRequestParam(event, "value"));
       assert.deepEqual(sentAgentValues, ["example", ""]);
-    }).pipe(Effect.provide(layerTest), Effect.scoped),
+    }).pipe(Effect.provide(layerTest)),
   );
 
   it.live("terminalizes an empty successful foreground Bash tool when the turn completes", () =>
     Effect.gen(function* () {
       const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
       const idAllocator = yield* IdAllocator.IdAllocatorV2;
-      const path = yield* Path.Path;
       const selfInvocation = yield* resolveSelfInvocation();
-      const mockAgentPath = yield* path.fromFileUrl(
-        new URL("../../../scripts/acp-mock-agent.ts", import.meta.url),
-      );
+      const mockAgentPath = yield* bundledMockAgentPath;
       const protocolEvents = yield* Queue.bounded<EffectAcpProtocol.AcpProtocolLogEvent>(256);
       const instanceId = ProviderInstanceId.make("acp-test");
       const adapter = yield* makeAcpAdapterV2({
@@ -5850,6 +6597,7 @@ describe("AcpAdapterV2", () => {
             environment: (runtimeOrdinal) =>
               runtimeOrdinal === 1 ? { T3_ACP_EMIT_EMPTY_SUCCESSFUL_BASH_THEN_HANG: "1" } : {},
             ownDetachedProcessGroup: true,
+            processGroupTerminationGrace: 0,
             protocolEvents,
           }),
           normalizeToolCall: normalizeXAiAcpToolCallState,
@@ -5966,13 +6714,12 @@ describe("AcpAdapterV2", () => {
         Stream.runHead,
       );
       assert.isTrue(Option.isSome(loadAfterRestart));
-    }).pipe(Effect.provide(layerTest), Effect.scoped),
+    }).pipe(Effect.provide(layerTest)),
   );
 
   it.effect("drains native ACP cancellation before admitting the next prompt", () =>
     Effect.gen(function* () {
       const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
-      const path = yield* Path.Path;
       const selfInvocation = yield* resolveSelfInvocation();
       const protocolEvents = yield* Queue.unbounded<EffectAcpProtocol.AcpProtocolLogEvent>();
       const native: { current?: AcpSessionRuntime.AcpSessionRuntime["Service"] } = {};
@@ -5984,9 +6731,7 @@ describe("AcpAdapterV2", () => {
           capabilities: AcpProviderCapabilitiesV2,
           makeRuntime: makeMockRuntime({
             childProcessSpawner,
-            mockAgentPath: yield* path.fromFileUrl(
-              new URL("../../../scripts/acp-mock-agent.ts", import.meta.url),
-            ),
+            mockAgentPath: yield* bundledMockAgentPath,
             environment: { T3_ACP_COMPLETE_FIRST_PROMPT_ON_CANCEL: "1" },
             protocolEvents,
             cancelBehavior: "wait-for-prompt",
@@ -6073,17 +6818,14 @@ describe("AcpAdapterV2", () => {
         ),
       );
       assert.equal(nextTerminal.type === "turn.terminal" && nextTerminal.status, "completed");
-    }).pipe(Effect.provide(layerTest), Effect.scoped),
+    }).pipe(Effect.provide(layerTest)),
   );
 
   it.effect("cancels pending permission requests while interrupting an ACP turn", () =>
     Effect.gen(function* () {
       const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
-      const path = yield* Path.Path;
       const selfInvocation = yield* resolveSelfInvocation();
-      const mockAgentPath = yield* path.fromFileUrl(
-        new URL("../../../scripts/acp-mock-agent.ts", import.meta.url),
-      );
+      const mockAgentPath = yield* bundledMockAgentPath;
       const releaseCancel = yield* Deferred.make<void>();
       const instanceId = ProviderInstanceId.make("acp-test");
       const adapter = yield* makeAcpAdapterV2({
@@ -6167,17 +6909,14 @@ describe("AcpAdapterV2", () => {
         ),
       );
       assert.equal(terminal.type, "turn.terminal");
-    }).pipe(Effect.provide(layerTest), Effect.scoped),
+    }).pipe(Effect.provide(layerTest)),
   );
 
   it.live("keeps hard teardown excluded until a permission response is enqueued", () =>
     Effect.gen(function* () {
       const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
-      const path = yield* Path.Path;
       const selfInvocation = yield* resolveSelfInvocation();
-      const mockAgentPath = yield* path.fromFileUrl(
-        new URL("../../../scripts/acp-mock-agent.ts", import.meta.url),
-      );
+      const mockAgentPath = yield* bundledMockAgentPath;
       const responseEnqueued = yield* Deferred.make<void>();
       const releaseResponseAcknowledgement = yield* Deferred.make<void>();
       const instanceId = ProviderInstanceId.make("acp-test");
@@ -6259,7 +6998,7 @@ describe("AcpAdapterV2", () => {
       yield* Deferred.succeed(releaseResponseAcknowledgement, undefined);
       yield* Fiber.join(responseFiber);
       yield* Fiber.join(interruptFiber);
-    }).pipe(Effect.provide(layerTest), Effect.scoped),
+    }).pipe(Effect.provide(layerTest)),
   );
 
   it.live("asks form fields with their fixed choices and answers in the declared types", () =>
@@ -6378,7 +7117,7 @@ describe("AcpAdapterV2", () => {
           note: "hi",
         },
       });
-    }).pipe(Effect.provide(layerTest), Effect.scoped),
+    }).pipe(Effect.provide(layerTest)),
   );
 
   it.live("keeps explicit empty selections and checks selection counts", () =>
@@ -6428,7 +7167,7 @@ describe("AcpAdapterV2", () => {
         answer: () => ({ all: ["a"], some: ["a"] }),
       });
       assert.deepStrictEqual(requiredOmitted.response, { action: "cancel" });
-    }).pipe(Effect.provide(layerTest), Effect.scoped),
+    }).pipe(Effect.provide(layerTest)),
   );
 
   it.live("answers a field named __proto__ like any other field", () =>
@@ -6453,7 +7192,7 @@ describe("AcpAdapterV2", () => {
         action: "accept",
         content: { ["__proto__"]: "b", name: "hi" },
       });
-    }).pipe(Effect.provide(layerTest), Effect.scoped),
+    }).pipe(Effect.provide(layerTest)),
   );
 
   it.live("declines a form whose selection counts the client cannot answer, without asking", () =>
@@ -6475,7 +7214,7 @@ describe("AcpAdapterV2", () => {
         assert.isUndefined(questions);
         assert.deepStrictEqual(response, { action: "decline" });
       }
-    }).pipe(Effect.provide(layerTest), Effect.scoped),
+    }).pipe(Effect.provide(layerTest)),
   );
 
   it.live("cancels a form whose required answer does not fit, or that is dismissed", () =>
@@ -6497,7 +7236,7 @@ describe("AcpAdapterV2", () => {
         answer: () => undefined,
       });
       assert.deepStrictEqual(dismissed.response, { action: "cancel" });
-    }).pipe(Effect.provide(layerTest), Effect.scoped),
+    }).pipe(Effect.provide(layerTest)),
   );
 
   it.live("declines a form with a field it cannot ask for, without asking", () =>
@@ -6515,17 +7254,14 @@ describe("AcpAdapterV2", () => {
       });
       assert.isUndefined(questions);
       assert.deepStrictEqual(response, { action: "decline" });
-    }).pipe(Effect.provide(layerTest), Effect.scoped),
+    }).pipe(Effect.provide(layerTest)),
   );
 
   it.live("auto-approves tagged MCP elicitations under full-access policy", () =>
     Effect.gen(function* () {
       const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
-      const path = yield* Path.Path;
       const selfInvocation = yield* resolveSelfInvocation();
-      const mockAgentPath = yield* path.fromFileUrl(
-        new URL("../../../scripts/acp-mock-agent.ts", import.meta.url),
-      );
+      const mockAgentPath = yield* bundledMockAgentPath;
       const instanceId = ProviderInstanceId.make("acp-test-mcp-approval-elicitation");
       const adapter = yield* makeAcpAdapterV2({
         instanceId,
@@ -6576,17 +7312,14 @@ describe("AcpAdapterV2", () => {
 
       assert.isFalse(events.some((event) => event.type === "runtime_request.updated"));
       assert.isTrue(events.some((event) => event.type === "turn.terminal"));
-    }).pipe(Effect.provide(layerTest), Effect.scoped),
+    }).pipe(Effect.provide(layerTest)),
   );
 
   it.live("fails a held native response acknowledgement before normal session close", () =>
     Effect.gen(function* () {
       const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
-      const path = yield* Path.Path;
       const selfInvocation = yield* resolveSelfInvocation();
-      const mockAgentPath = yield* path.fromFileUrl(
-        new URL("../../../scripts/acp-mock-agent.ts", import.meta.url),
-      );
+      const mockAgentPath = yield* bundledMockAgentPath;
       const responseWritten = yield* Deferred.make<void>();
       const releaseResponseAcknowledgement = yield* Deferred.make<void>();
       const responseLifecycle: Array<string> = [];
@@ -6677,18 +7410,15 @@ describe("AcpAdapterV2", () => {
       assert.include(responseLifecycle, "failed");
       yield* Deferred.succeed(releaseResponseAcknowledgement, undefined);
       yield* Fiber.join(closeFiber);
-    }).pipe(Effect.provide(layerTest), Effect.scoped),
+    }).pipe(Effect.provide(layerTest)),
   );
 
   it.live("treats a second hard Stop as success when the turn is already gone", () =>
     Effect.gen(function* () {
       const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
       const idAllocator = yield* IdAllocator.IdAllocatorV2;
-      const path = yield* Path.Path;
       const selfInvocation = yield* resolveSelfInvocation();
-      const mockAgentPath = yield* path.fromFileUrl(
-        new URL("../../../scripts/acp-mock-agent.ts", import.meta.url),
-      );
+      const mockAgentPath = yield* bundledMockAgentPath;
       const protocolEvents = yield* Queue.bounded<EffectAcpProtocol.AcpProtocolLogEvent>(256);
       const instanceId = ProviderInstanceId.make("acp-test");
       const adapter = yield* makeAcpAdapterV2({
@@ -6703,6 +7433,7 @@ describe("AcpAdapterV2", () => {
             childProcessSpawner,
             mockAgentPath,
             ownDetachedProcessGroup: true,
+            processGroupTerminationGrace: 0,
             environment: { T3_ACP_HANG_PROMPT_FOREVER: "1" },
             protocolEvents,
           }),
@@ -6768,7 +7499,7 @@ describe("AcpAdapterV2", () => {
         }
       }
       assert.equal(terminal, "interrupted");
-    }).pipe(Effect.provide(layerTest), Effect.scoped),
+    }).pipe(Effect.provide(layerTest)),
   );
 
   it.effect(
@@ -6777,11 +7508,8 @@ describe("AcpAdapterV2", () => {
       Effect.gen(function* () {
         const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
         const idAllocator = yield* IdAllocator.IdAllocatorV2;
-        const path = yield* Path.Path;
         const selfInvocation = yield* resolveSelfInvocation();
-        const mockAgentPath = yield* path.fromFileUrl(
-          new URL("../../../scripts/acp-mock-agent.ts", import.meta.url),
-        );
+        const mockAgentPath = yield* bundledMockAgentPath;
         const instanceId = ProviderInstanceId.make("acp-test");
         let subagentPhase: "spawn" | "complete" = "spawn";
         const promptSettled = yield* Deferred.make<void>();
@@ -6907,7 +7635,7 @@ describe("AcpAdapterV2", () => {
         }
         assert.equal(carriedItemStatus, "completed");
         assert.equal(secondTerminalStatus, "completed");
-      }).pipe(Effect.provide(layerTest), Effect.scoped),
+      }).pipe(Effect.provide(layerTest)),
   );
 
   it.effect(
@@ -6916,11 +7644,8 @@ describe("AcpAdapterV2", () => {
       Effect.gen(function* () {
         const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
         const idAllocator = yield* IdAllocator.IdAllocatorV2;
-        const path = yield* Path.Path;
         const selfInvocation = yield* resolveSelfInvocation();
-        const mockAgentPath = yield* path.fromFileUrl(
-          new URL("../../../scripts/acp-mock-agent.ts", import.meta.url),
-        );
+        const mockAgentPath = yield* bundledMockAgentPath;
         const baseClock = yield* Clock.Clock;
         const finalizationClockRead = yield* Deferred.make<void>();
         const releaseFinalizationClockRead = yield* Deferred.make<void>();
@@ -7120,18 +7845,15 @@ describe("AcpAdapterV2", () => {
             "finalize-window terminal must clear the carryover pin",
           );
         }).pipe(Effect.provideService(Clock.Clock, blockingClock));
-      }).pipe(Effect.provide(layerTest), Effect.scoped),
+      }).pipe(Effect.provide(layerTest)),
   );
 
   it.effect("projects completed-root carryover eagerly and drain cannot resurrect it", () =>
     Effect.gen(function* () {
       const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
       const idAllocator = yield* IdAllocator.IdAllocatorV2;
-      const path = yield* Path.Path;
       const selfInvocation = yield* resolveSelfInvocation();
-      const mockAgentPath = yield* path.fromFileUrl(
-        new URL("../../../scripts/acp-mock-agent.ts", import.meta.url),
-      );
+      const mockAgentPath = yield* bundledMockAgentPath;
       const protocolEvents = yield* Queue.bounded<EffectAcpProtocol.AcpProtocolLogEvent>(256);
       const continuationRequests: Array<ProviderContinuationRequests.ProviderContinuationRequest> =
         [];
@@ -7361,7 +8083,7 @@ describe("AcpAdapterV2", () => {
         "buffered spawn ACK must not create a continuation-owned turn item",
       );
       assert.isFalse(yield* hasPendingBackgroundWork);
-    }).pipe(Effect.provide(layerTest), Effect.scoped),
+    }).pipe(Effect.provide(layerTest)),
   );
 
   it.effect(
@@ -7370,11 +8092,8 @@ describe("AcpAdapterV2", () => {
       Effect.gen(function* () {
         const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
         const idAllocator = yield* IdAllocator.IdAllocatorV2;
-        const path = yield* Path.Path;
         const selfInvocation = yield* resolveSelfInvocation();
-        const mockAgentPath = yield* path.fromFileUrl(
-          new URL("../../../scripts/acp-mock-agent.ts", import.meta.url),
-        );
+        const mockAgentPath = yield* bundledMockAgentPath;
         const continuationRequests: Array<ProviderContinuationRequests.ProviderContinuationRequest> =
           [];
         const bufferedAssistantText = "BUFFERED_WAKE_AFTER_USER_ATTACH";
@@ -7655,7 +8374,7 @@ describe("AcpAdapterV2", () => {
           "queued continuation must drain the wake content after the user run",
         );
         assert.isFalse(yield* hasPendingBackgroundWork);
-      }).pipe(Effect.provide(layerTest), Effect.scoped),
+      }).pipe(Effect.provide(layerTest)),
   );
 
   it.effect(
@@ -7664,11 +8383,8 @@ describe("AcpAdapterV2", () => {
       Effect.gen(function* () {
         const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
         const idAllocator = yield* IdAllocator.IdAllocatorV2;
-        const path = yield* Path.Path;
         const selfInvocation = yield* resolveSelfInvocation();
-        const mockAgentPath = yield* path.fromFileUrl(
-          new URL("../../../scripts/acp-mock-agent.ts", import.meta.url),
-        );
+        const mockAgentPath = yield* bundledMockAgentPath;
         const instanceId = ProviderInstanceId.make("acp-test");
         let subagentPhase: "spawn" | "complete" = "spawn";
         let cancelCalled = false;
@@ -7816,18 +8532,15 @@ describe("AcpAdapterV2", () => {
           1,
           "settled soft steer must not respawn the ACP runtime process",
         );
-      }).pipe(Effect.provide(layerTest), Effect.scoped),
+      }).pipe(Effect.provide(layerTest)),
   );
 
   it.live("preserveRuntimeOnSettledInterrupt does not soften a mid-prompt steering interrupt", () =>
     Effect.gen(function* () {
       const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
       const idAllocator = yield* IdAllocator.IdAllocatorV2;
-      const path = yield* Path.Path;
       const selfInvocation = yield* resolveSelfInvocation();
-      const mockAgentPath = yield* path.fromFileUrl(
-        new URL("../../../scripts/acp-mock-agent.ts", import.meta.url),
-      );
+      const mockAgentPath = yield* bundledMockAgentPath;
       const protocolEvents = yield* Queue.bounded<EffectAcpProtocol.AcpProtocolLogEvent>(256);
       const instanceId = ProviderInstanceId.make("acp-test");
       const adapter = yield* makeAcpAdapterV2({
@@ -7892,18 +8605,15 @@ describe("AcpAdapterV2", () => {
         assert.fail("mid-prompt steering interrupt must still take the hard teardown path");
       }
       assert.include(Cause.pretty(interruptExit.cause), "session is poisoned");
-    }).pipe(Effect.provide(layerTest), Effect.scoped),
+    }).pipe(Effect.provide(layerTest)),
   );
 
   it.live("direct Stop quarantine drops late background task mutations from the stopped run", () =>
     Effect.gen(function* () {
       const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
       const idAllocator = yield* IdAllocator.IdAllocatorV2;
-      const path = yield* Path.Path;
       const selfInvocation = yield* resolveSelfInvocation();
-      const mockAgentPath = yield* path.fromFileUrl(
-        new URL("../../../scripts/acp-mock-agent.ts", import.meta.url),
-      );
+      const mockAgentPath = yield* bundledMockAgentPath;
       const protocolEvents = yield* Queue.bounded<EffectAcpProtocol.AcpProtocolLogEvent>(256);
       const instanceId = ProviderInstanceId.make("acp-test");
       const capturedMutation: {
@@ -7933,6 +8643,7 @@ describe("AcpAdapterV2", () => {
             mockAgentPath,
             environment: { T3_ACP_HANG_PROMPT_FOREVER: "1" },
             ownDetachedProcessGroup: true,
+            processGroupTerminationGrace: 0,
             protocolEvents,
           }),
         },
@@ -8027,7 +8738,7 @@ describe("AcpAdapterV2", () => {
         yield* hasPendingBackgroundWork,
         "direct Stop quarantine must drop residual background task mutations from the stopped run",
       );
-    }).pipe(Effect.provide(layerTest), Effect.scoped),
+    }).pipe(Effect.provide(layerTest)),
   );
 
   it.effect(
@@ -8036,14 +8747,12 @@ describe("AcpAdapterV2", () => {
       Effect.gen(function* () {
         const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
         const idAllocator = yield* IdAllocator.IdAllocatorV2;
-        const path = yield* Path.Path;
         const selfInvocation = yield* resolveSelfInvocation();
-        const mockAgentPath = yield* path.fromFileUrl(
-          new URL("../../../scripts/acp-mock-agent.ts", import.meta.url),
-        );
+        const mockAgentPath = yield* bundledMockAgentPath;
         const protocolEvents = yield* Queue.bounded<EffectAcpProtocol.AcpProtocolLogEvent>(256);
         const continuationRequests: Array<ProviderContinuationRequests.ProviderContinuationRequest> =
           [];
+        const native: { current?: AcpSessionRuntime.AcpSessionRuntime["Service"] } = {};
         const instanceId = ProviderInstanceId.make("acp-test");
         const adapter = yield* makeAcpAdapterV2({
           instanceId,
@@ -8070,6 +8779,10 @@ describe("AcpAdapterV2", () => {
                 T3_ACP_EMIT_IN_TURN_TASKOUTPUT_THEN_LATE_DUPLICATE: "1",
               },
               protocolEvents,
+              wrapRuntime: (runtime) => {
+                native.current = runtime;
+                return runtime;
+              },
             }),
           },
           selfInvocation,
@@ -8129,6 +8842,18 @@ describe("AcpAdapterV2", () => {
         }
         assert.equal(terminalStatus, "completed");
 
+        // The agent re-reports on its own after a 2.5s wall-clock timer; send the same update now.
+        yield* native.current!.request("_test/emit-update", {
+          sessionId: "mock-session-1",
+          update: {
+            sessionUpdate: "tool_call_update",
+            toolCallId: "tool-call-fetch-1",
+            title: "get_command_or_subagent_output",
+            kind: "other",
+            status: "completed",
+            rawOutput: { output: "MONITOR_LISTING_TOKEN_LATE" },
+          },
+        });
         yield* Stream.fromQueue(protocolEvents).pipe(
           Stream.filter(
             (event) =>
@@ -8152,18 +8877,15 @@ describe("AcpAdapterV2", () => {
           yield* hasPendingBackgroundWork,
           "wake buffer must not stay non-empty and pin idle release after an already-handled re-report",
         );
-      }).pipe(Effect.provide(layerTest), Effect.scoped),
+      }).pipe(Effect.provide(layerTest)),
   );
 
   it.effect("keeps a buffered continuation current when a user turn starts before dispatch", () =>
     Effect.gen(function* () {
       const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
       const idAllocator = yield* IdAllocator.IdAllocatorV2;
-      const path = yield* Path.Path;
       const selfInvocation = yield* resolveSelfInvocation();
-      const mockAgentPath = yield* path.fromFileUrl(
-        new URL("../../../scripts/acp-mock-agent.ts", import.meta.url),
-      );
+      const mockAgentPath = yield* bundledMockAgentPath;
       const continuationRequests: Array<ProviderContinuationRequests.ProviderContinuationRequest> =
         [];
       const userPromptStarted = yield* Deferred.make<void>();
@@ -8354,7 +9076,7 @@ describe("AcpAdapterV2", () => {
       assert.equal(continuationTerminalStatus, "completed");
       assert.isTrue(bufferedTextSeen, "continuation must drain the wake buffer after the user run");
       assert.isFalse(yield* hasPendingBackgroundWork);
-    }).pipe(Effect.provide(layerTest), Effect.scoped),
+    }).pipe(Effect.provide(layerTest)),
   );
 
   it.effect(
@@ -8363,11 +9085,8 @@ describe("AcpAdapterV2", () => {
       Effect.gen(function* () {
         const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
         const idAllocator = yield* IdAllocator.IdAllocatorV2;
-        const path = yield* Path.Path;
         const selfInvocation = yield* resolveSelfInvocation();
-        const mockAgentPath = yield* path.fromFileUrl(
-          new URL("../../../scripts/acp-mock-agent.ts", import.meta.url),
-        );
+        const mockAgentPath = yield* bundledMockAgentPath;
         const protocolEvents = yield* Queue.bounded<EffectAcpProtocol.AcpProtocolLogEvent>(256);
         const continuationRequests: Array<ProviderContinuationRequests.ProviderContinuationRequest> =
           [];
@@ -8561,7 +9280,7 @@ describe("AcpAdapterV2", () => {
           1,
           "exactly one continuation when the last running task ends post-finalize with kept midTurn marks",
         );
-      }).pipe(Effect.provide(layerTest), Effect.scoped),
+      }).pipe(Effect.provide(layerTest)),
   );
 
   it.effect(
@@ -8570,11 +9289,8 @@ describe("AcpAdapterV2", () => {
       Effect.gen(function* () {
         const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
         const idAllocator = yield* IdAllocator.IdAllocatorV2;
-        const path = yield* Path.Path;
         const selfInvocation = yield* resolveSelfInvocation();
-        const mockAgentPath = yield* path.fromFileUrl(
-          new URL("../../../scripts/acp-mock-agent.ts", import.meta.url),
-        );
+        const mockAgentPath = yield* bundledMockAgentPath;
         const protocolEvents = yield* Queue.bounded<EffectAcpProtocol.AcpProtocolLogEvent>(256);
         const continuationRequests: Array<ProviderContinuationRequests.ProviderContinuationRequest> =
           [];
@@ -8925,18 +9641,15 @@ describe("AcpAdapterV2", () => {
           yield* hasPendingBackgroundWork,
           "wake buffer must not retain turn-1 or turn-2 in-turn-handled ack residue",
         );
-      }).pipe(Effect.provide(layerTest), Effect.scoped),
+      }).pipe(Effect.provide(layerTest)),
   );
 
   it.effect("a wake names work that ended while the previous wake was queued", () =>
     Effect.gen(function* () {
       const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
       const idAllocator = yield* IdAllocator.IdAllocatorV2;
-      const path = yield* Path.Path;
       const selfInvocation = yield* resolveSelfInvocation();
-      const mockAgentPath = yield* path.fromFileUrl(
-        new URL("../../../scripts/acp-mock-agent.ts", import.meta.url),
-      );
+      const mockAgentPath = yield* bundledMockAgentPath;
       const continuationRequests: Array<ProviderContinuationRequests.ProviderContinuationRequest> =
         [];
       type RuntimeService = AcpSessionRuntime.AcpSessionRuntime["Service"];
@@ -9072,7 +9785,7 @@ describe("AcpAdapterV2", () => {
         outcome: "completed",
         summary: 'Command "sleep b" finished',
       });
-    }).pipe(Effect.provide(layerTest), Effect.scoped),
+    }).pipe(Effect.provide(layerTest)),
   );
 
   it.effect.each([
@@ -9083,11 +9796,8 @@ describe("AcpAdapterV2", () => {
     ({ status, exitCode }) =>
       Effect.gen(function* () {
         const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
-        const path = yield* Path.Path;
         const selfInvocation = yield* resolveSelfInvocation();
-        const mockAgentPath = yield* path.fromFileUrl(
-          new URL("../../../scripts/acp-mock-agent.ts", import.meta.url),
-        );
+        const mockAgentPath = yield* bundledMockAgentPath;
         type RuntimeService = AcpSessionRuntime.AcpSessionRuntime["Service"];
         let sessionUpdateHandler: Parameters<RuntimeService["handleSessionUpdate"]>[0] | undefined;
         let taskCompleted:
@@ -9293,18 +10003,15 @@ describe("AcpAdapterV2", () => {
           1,
           "duplicate completions must not offer another continuation",
         );
-      }).pipe(Effect.provide(layerTest), Effect.scoped),
+      }).pipe(Effect.provide(layerTest)),
   );
 
   it.live("durably poisons start and resume when required hard teardown is unavailable", () =>
     Effect.gen(function* () {
       const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
       const idAllocator = yield* IdAllocator.IdAllocatorV2;
-      const path = yield* Path.Path;
       const selfInvocation = yield* resolveSelfInvocation();
-      const mockAgentPath = yield* path.fromFileUrl(
-        new URL("../../../scripts/acp-mock-agent.ts", import.meta.url),
-      );
+      const mockAgentPath = yield* bundledMockAgentPath;
       const protocolEvents = yield* Queue.bounded<EffectAcpProtocol.AcpProtocolLogEvent>(256);
       const instanceId = ProviderInstanceId.make("acp-test");
       const adapter = yield* makeAcpAdapterV2({
@@ -9376,18 +10083,15 @@ describe("AcpAdapterV2", () => {
         .pipe(Effect.exit);
       if (Exit.isSuccess(resumeExit)) assert.fail("poisoned session must reject resumeThread");
       assert.include(Cause.pretty(resumeExit.cause), "session is poisoned");
-    }).pipe(Effect.provide(layerTest), Effect.scoped),
+    }).pipe(Effect.provide(layerTest)),
   );
 
   it.live("holds concurrent startTurn behind successful hard teardown and reloads once", () =>
     Effect.gen(function* () {
       const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
       const idAllocator = yield* IdAllocator.IdAllocatorV2;
-      const path = yield* Path.Path;
       const selfInvocation = yield* resolveSelfInvocation();
-      const mockAgentPath = yield* path.fromFileUrl(
-        new URL("../../../scripts/acp-mock-agent.ts", import.meta.url),
-      );
+      const mockAgentPath = yield* bundledMockAgentPath;
       const protocolEvents = yield* Queue.bounded<EffectAcpProtocol.AcpProtocolLogEvent>(256);
       const teardownStarted = yield* Deferred.make<void>();
       const releaseTeardown = yield* Deferred.make<void>();
@@ -9483,18 +10187,15 @@ describe("AcpAdapterV2", () => {
           Stream.runHead,
         );
       }
-    }).pipe(Effect.provide(layerTest), Effect.scoped),
+    }).pipe(Effect.provide(layerTest)),
   );
 
   it.live("lets a caller abandon Stop while hard teardown stalls, and finishes the teardown", () =>
     Effect.gen(function* () {
       const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
       const idAllocator = yield* IdAllocator.IdAllocatorV2;
-      const path = yield* Path.Path;
       const selfInvocation = yield* resolveSelfInvocation();
-      const mockAgentPath = yield* path.fromFileUrl(
-        new URL("../../../scripts/acp-mock-agent.ts", import.meta.url),
-      );
+      const mockAgentPath = yield* bundledMockAgentPath;
       const protocolEvents = yield* Queue.bounded<EffectAcpProtocol.AcpProtocolLogEvent>(256);
       const teardownStarted = yield* Deferred.make<void>();
       const releaseTeardown = yield* Deferred.make<void>();
@@ -9573,7 +10274,7 @@ describe("AcpAdapterV2", () => {
       assert.equal(runtimeOrdinalSeen, 2);
       const replacementMethods = yield* pollProtocolMethods(protocolEvents);
       assert.equal(replacementMethods.filter((method) => method === "session/resume").length, 1);
-    }).pipe(Effect.provide(layerTest), Effect.scoped),
+    }).pipe(Effect.provide(layerTest)),
   );
 
   it.effect(
@@ -9582,11 +10283,8 @@ describe("AcpAdapterV2", () => {
       Effect.gen(function* () {
         const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
         const idAllocator = yield* IdAllocator.IdAllocatorV2;
-        const path = yield* Path.Path;
         const selfInvocation = yield* resolveSelfInvocation();
-        const mockAgentPath = yield* path.fromFileUrl(
-          new URL("../../../scripts/acp-mock-agent.ts", import.meta.url),
-        );
+        const mockAgentPath = yield* bundledMockAgentPath;
         const instanceId = ProviderInstanceId.make("acp-test");
         let subagentPhase: "spawn" | "complete" = "spawn";
         const promptSettled = yield* Deferred.make<void>();
@@ -9722,7 +10420,7 @@ describe("AcpAdapterV2", () => {
           carriedCompleted,
           "Direct Stop must not carry a stopped subagent into the follow-up run",
         );
-      }).pipe(Effect.provide(layerTest), Effect.scoped),
+      }).pipe(Effect.provide(layerTest)),
   );
 });
 
diff --git a/apps/server/src/orchestration-v2/Adapters/AcpRegistryAdapterV2.test.ts b/apps/server/src/orchestration-v2/Adapters/AcpRegistryAdapterV2.test.ts
index 635d63d91473..70f45bc8a46c 100644
--- a/apps/server/src/orchestration-v2/Adapters/AcpRegistryAdapterV2.test.ts
+++ b/apps/server/src/orchestration-v2/Adapters/AcpRegistryAdapterV2.test.ts
@@ -656,7 +656,7 @@ describe("AcpRegistryAdapterV2", () => {
           answer("session/set_mode", {}),
         ],
         storedModePick: "autoEdit",
-      }).pipe(Effect.provide(layerTest), Effect.scoped),
+      }).pipe(Effect.provide(layerTest)),
     );
 
     it.effect("switches a mode config option under its own id", () =>
@@ -671,7 +671,7 @@ describe("AcpRegistryAdapterV2", () => {
           answer("session/set_config_option", { configOptions: [permissionModeOption("auto")] }),
         ],
         storedModePick: "auto",
-      }).pipe(Effect.provide(layerTest), Effect.scoped),
+      }).pipe(Effect.provide(layerTest)),
     );
 
     const modelOption = (id: string, currentValue: string, grouped = false) => ({
@@ -801,7 +801,7 @@ describe("AcpRegistryAdapterV2", () => {
               { models: ["hermes", "auto", "default"], current: "hermes" },
             ],
           );
-        }).pipe(Effect.provide(layerTest), Effect.scoped),
+        }).pipe(Effect.provide(layerTest)),
     );
 
     // Copilot's session/new reports its built-in default, not the model it will run
@@ -879,7 +879,7 @@ describe("AcpRegistryAdapterV2", () => {
               configOptions: [copilotModel("claude-sonnet-5.5"), effort("xhigh")],
             }),
           ],
-        }).pipe(Effect.provide(layerTest), Effect.scoped);
+        }).pipe(Effect.provide(layerTest));
       },
     );
 
@@ -941,7 +941,7 @@ describe("AcpRegistryAdapterV2", () => {
                   }),
                 ]
               : [],
-        }).pipe(Effect.provide(layerTest), Effect.scoped);
+        }).pipe(Effect.provide(layerTest));
       },
     );
 
@@ -992,7 +992,7 @@ describe("AcpRegistryAdapterV2", () => {
           configurations.map((configuration) => configuration?.currentModelId),
           ["hermes", "hermes", "hermes", "other", "other", "other", "other", "other"],
         );
-      }).pipe(Effect.provide(layerTest), Effect.scoped),
+      }).pipe(Effect.provide(layerTest)),
     );
     it.effect(
       "fails configuration when an option write errors for a reason other than refusal",
@@ -1040,7 +1040,7 @@ describe("AcpRegistryAdapterV2", () => {
               },
             },
           ],
-        }).pipe(Effect.provide(layerTest), Effect.scoped);
+        }).pipe(Effect.provide(layerTest));
       },
     );
     const modelOptions = [
@@ -1124,7 +1124,7 @@ describe("AcpRegistryAdapterV2", () => {
           storedModel: model,
         });
         assert.equal(opened.configurations.at(-1)?.currentModelId, "codex");
-      }).pipe(Effect.provide(layerTest), Effect.scoped),
+      }).pipe(Effect.provide(layerTest)),
     );
   });
 
@@ -1220,7 +1220,7 @@ describe("AcpRegistryAdapterV2", () => {
       const terminal = completed.at(-1)!;
       if (terminal.type !== "turn.terminal") throw new Error("Missing fallback terminal");
       assert.equal(terminal.status, "completed");
-    }).pipe(Effect.provide(layerTest), Effect.scoped),
+    }).pipe(Effect.provide(layerTest)),
   );
 
   // regression: #26695 cancelling a Copilot prompt kills its background agents
@@ -1256,7 +1256,7 @@ describe("AcpRegistryAdapterV2", () => {
         ...copilot,
         supportsSteeringByInterruptRestart: true,
       });
-    }).pipe(Effect.provide(layerTest), Effect.scoped),
+    }).pipe(Effect.provide(layerTest)),
   );
 
   it.effect("gives Copilot T3's MCP server over HTTP when it advertises HTTP", () =>
@@ -1389,7 +1389,7 @@ describe("AcpRegistryAdapterV2", () => {
         new: stdio("Bearer opened-token"),
         load: stdio("Bearer rotated-token"),
       });
-    }).pipe(Effect.provide(layerTest), Effect.scoped),
+    }).pipe(Effect.provide(layerTest)),
   );
 
   it.effect("the agent process env names the thread it serves", () =>
@@ -1468,7 +1468,7 @@ describe("AcpRegistryAdapterV2", () => {
       assert.equal(agentEnvironment?.T3CODE_THREAD_ID, "thread-acp-registry-thread-env");
       assert.equal(agentEnvironment?.T3_ACP_MCP_ENDPOINT, endpoint);
       assert.equal(agentEnvironment?.T3_ACP_MCP_AUTHORIZATION, "Bearer thread-env-token");
-    }).pipe(Effect.provide(layerTest), Effect.scoped),
+    }).pipe(Effect.provide(layerTest)),
   );
 
   it.effect.each(["before", "after"] as const)(
@@ -1490,7 +1490,7 @@ describe("AcpRegistryAdapterV2", () => {
                   })
                 : "test prompt",
           },
-          runtimeInstructions,
+          ...(ordinal === 1 ? [runtimeInstructions] : []),
         ];
         const echo = (messageId: string, content: ReadonlyArray<unknown>) =>
           claudeFrames.update(CLAUDE_ROOT_SESSION, {
@@ -1511,6 +1511,7 @@ describe("AcpRegistryAdapterV2", () => {
               {
                 type: "text",
                 text: promptText(ordinal),
+                annotations: { audience: ["user"] },
               },
             ]),
             ...(ordering === "before" ? [matching, acknowledgment] : [acknowledgment, matching]),
@@ -1560,7 +1561,7 @@ describe("AcpRegistryAdapterV2", () => {
             );
           }
         }
-      }).pipe(Effect.provide(layerTest), Effect.scoped),
+      }).pipe(Effect.provide(layerTest)),
   );
 
   it.effect("settles Claude's accepted foreground reply while retaining child output", () =>
@@ -1764,7 +1765,96 @@ describe("AcpRegistryAdapterV2", () => {
         ),
         "autonomous root echoes only signal acceptance",
       );
-    }).pipe(Effect.provide(layerTest), Effect.scoped),
+    }).pipe(Effect.provide(layerTest)),
+  );
+
+  // Copilot holds session/prompt while an attached async shell runs (github/copilot-cli#5293);
+  // its documented foreground-done signal is the opt-in assistant.idle session event.
+  it.effect("settles Copilot's reply on assistant.idle while an async shell holds the prompt", () =>
+    Effect.gen(function* () {
+      const sessionId = "copilot-session";
+      const sessionEvent = (type: string) => ({
+        type: "emit_inbound",
+        frame: {
+          kind: "notification",
+          method: "github.com/copilot/sessionEvent",
+          params: { sessionId, type, data: {} },
+        },
+      });
+      const update = (sessionUpdate: Record<string, unknown>) =>
+        claudeFrames.update(sessionId, sessionUpdate);
+      const session = yield* openClaudeReplaySession(
+        [
+          {
+            type: "expect_outbound",
+            frame: { kind: "request", method: "initialize", params: "<any>" },
+          },
+          {
+            type: "emit_inbound",
+            frame: {
+              kind: "response",
+              method: "initialize",
+              result: {
+                protocolVersion: 1,
+                agentInfo: { name: "Copilot", version: "1.0.110" },
+                agentCapabilities: { loadSession: true },
+                authMethods: [],
+              },
+            },
+          },
+          {
+            type: "expect_outbound",
+            frame: { kind: "request", method: "session/new", params: "<any>" },
+          },
+          {
+            type: "emit_inbound",
+            frame: { kind: "response", method: "session/new", result: { sessionId } },
+          },
+          {
+            type: "expect_outbound",
+            frame: { kind: "request", method: "session/prompt", params: "<any>" },
+          },
+          // A previous prompt's idle can land before this prompt's turn starts.
+          sessionEvent("assistant.idle"),
+          update({ sessionUpdate: "session_info_update", title: "after stale idle" }),
+          sessionEvent("assistant.turn_start"),
+          update({
+            sessionUpdate: "tool_call",
+            toolCallId: "shell-1",
+            title: "sleep 120",
+            kind: "execute",
+            status: "completed",
+            rawInput: { command: "sleep 120", mode: "async", detach: false },
+          }),
+          update({ sessionUpdate: "agent_message_chunk", content: { type: "text", text: "ok" } }),
+          sessionEvent("assistant.idle"),
+          update({ sessionUpdate: "session_info_update", title: "after foreground idle" }),
+          // The shell never exits, so the first session/prompt is never answered.
+          {
+            type: "expect_outbound",
+            frame: { kind: "request", method: "session/prompt", params: "<any>" },
+          },
+          sessionEvent("assistant.turn_start"),
+          update({ sessionUpdate: "agent_message_chunk", content: { type: "text", text: "two" } }),
+          sessionEvent("assistant.idle"),
+          update({ sessionUpdate: "session_info_update", title: "after second idle" }),
+        ],
+        undefined,
+        false,
+        "github-copilot-cli",
+      );
+      yield* session.runtime.startTurn(session.turnInput(1));
+      const stale = yield* session.throughMarker("after stale idle");
+      assert.isFalse(stale.some((event) => event.type === "turn.terminal"));
+      const foreground = yield* session.throughMarker("after foreground idle");
+      const terminal = foreground.find((event) => event.type === "turn.terminal");
+      assert.isDefined(terminal, "the run settles once Copilot's foreground work is idle");
+      assert.equal(terminal?.type === "turn.terminal" ? terminal.status : null, "completed");
+      yield* session.runtime.startTurn(session.turnInput(2));
+      const second = yield* session.throughMarker("after second idle");
+      const secondTerminal = second.find((event) => event.type === "turn.terminal");
+      assert.equal(secondTerminal?.type === "turn.terminal" ? secondTerminal.runOrdinal : null, 2);
+    }).pipe(Effect.provide(layerTest)),
   );
 
   it.effect.each([
@@ -1949,7 +2039,7 @@ describe("AcpRegistryAdapterV2", () => {
         ),
         "detached requests are cancelled before turn admission",
       );
-    }).pipe(Effect.provide(layerTest), Effect.scoped),
+    }).pipe(Effect.provide(layerTest)),
   );
 
   it.effect("retains streamed child tool output through the generic Devin route", () =>
@@ -2086,7 +2176,70 @@ describe("AcpRegistryAdapterV2", () => {
           (event) => event.type === "message.updated" && event.message.text.includes("onetwo"),
         ),
       );
-    }).pipe(Effect.provide(layerTest), Effect.scoped),
+    }).pipe(Effect.provide(layerTest)),
+  );
+
+  it.effect("replaces streamed root tool output with a later content list", () =>
+    Effect.gen(function* () {
+      const { update } = claudeFrames;
+      const text = (value: string) => [{ type: "content", content: { type: "text", text: value } }];
+      const session = yield* openClaudeReplaySession([
+        ...claudeFrames.open,
+        ...claudeFrames.prompt(1),
+        update(CLAUDE_ROOT_SESSION, {
+          sessionUpdate: "tool_call_update",
+          toolCallId: "root-tool",
+          title: "Stream",
+          status: "in_progress",
+          content: text("one"),
+        }),
+        update(CLAUDE_ROOT_SESSION, {
+          sessionUpdate: "tool_call_content_chunk",
+          toolCallId: "root-tool",
+          content: { type: "content", content: { type: "text", text: "two" } },
+        }),
+        update(CLAUDE_ROOT_SESSION, {
+          sessionUpdate: "tool_call_update",
+          toolCallId: "root-tool",
+          status: "completed",
+          content: text("replacement"),
+        }),
+        update(CLAUDE_ROOT_SESSION, {
+          sessionUpdate: "tool_call_content_chunk",
+          toolCallId: "root-tool",
+          content: { type: "content", content: { type: "text", text: "-more" } },
+        }),
+        update(CLAUDE_ROOT_SESSION, {
+          sessionUpdate: "tool_call_content_chunk",
+          toolCallId: "root-tool",
+          content: {
+            type: "diff",
+            changes: [{ operation: "add", path: "/a.txt" }],
+            patch: { format: "git_patch", text: "PATCH" },
+          },
+        }),
+        claudeMarker("tools complete"),
+        claudeFrames.idle("end_turn"),
+        claudeFrames.closeRequest,
+        claudeFrames.closed,
+      ]);
+      yield* session.runtime.startTurn(session.turnInput(1));
+      const events = yield* session.throughMarker("tools complete");
+      const outputs = events.flatMap((event) =>
+        event.type === "turn_item.updated" &&
+        event.turnItem.nativeItemRef?.nativeId === "root-tool" &&
+        "output" in event.turnItem
+          ? [event.turnItem.output]
+          : [],
+      );
+      assert.deepEqual(outputs, [
+        text("one"),
+        text("onetwo"),
+        text("replacement"),
+        text("replacement-more"),
+        { type: "Text", text: "replacement-morePATCH" },
+      ]);
+    }).pipe(Effect.provide(layerTest)),
   );
 
   it.effect("keeps stopped child tools interrupted when a late output chunk arrives", () =>
@@ -2193,7 +2346,7 @@ describe("AcpRegistryAdapterV2", () => {
       assert.deepEqual(tools.at(-1)?.output, [
         { type: "content", content: { type: "text", text: "stoppingcancelled" } },
       ]);
-    }).pipe(Effect.provide(layerTest), Effect.scoped),
+    }).pipe(Effect.provide(layerTest)),
   );
 
   it.effect("keeps native child tools interrupted after idle and late output", () =>
@@ -2233,7 +2386,7 @@ describe("AcpRegistryAdapterV2", () => {
       assert.deepEqual(tools.at(-1)?.output, [
         { type: "content", content: { type: "text", text: "late" } },
       ]);
-    }).pipe(Effect.provide(layerTest), Effect.scoped),
+    }).pipe(Effect.provide(layerTest)),
   );
 
   it.effect.each(["error", "end_turn"])(
@@ -2529,7 +2682,7 @@ describe("AcpRegistryAdapterV2", () => {
           "a new execution does not append the previous execution's text",
         );
         assert.isFalse(yield* session.runtime.hasPendingBackgroundWork!);
-      }).pipe(Effect.provide(layerTest), Effect.scoped),
+      }).pipe(Effect.provide(layerTest)),
   );
 
   it.effect("fails active Claude work and releases its children when the process exits", () =>
@@ -2599,7 +2752,7 @@ describe("AcpRegistryAdapterV2", () => {
             event.turnItem.status === "interrupted",
         ),
       );
-    }).pipe(Effect.provide(layerTest), Effect.scoped),
+    }).pipe(Effect.provide(layerTest)),
   );
 
   it.effect("keeps Claude activity after a refused Stop and closes it on retry", () =>
@@ -2717,7 +2870,7 @@ describe("AcpRegistryAdapterV2", () => {
       assert.equal(queuedTerminal.status, "interrupted");
       assert.isNull(queuedTerminal.failure);
       assert.isFalse(yield* queued.runtime.hasPendingBackgroundWork!);
-    }).pipe(Effect.provide(layerTest), Effect.scoped),
+    }).pipe(Effect.provide(layerTest)),
   );
 
   it.effect.each([
@@ -2886,6 +3039,6 @@ describe("AcpRegistryAdapterV2", () => {
       assert.equal(yield* runTurn(1), "failed");
       assert.equal(yield* runTurn(2), "completed");
       assert.equal(spawned, restarts ? 2 : 1);
-    }).pipe(Effect.provide(layerTest), Effect.scoped),
+    }).pipe(Effect.provide(layerTest)),
   );
 });
diff --git a/apps/server/src/orchestration-v2/Adapters/AntigravityAdapterV2.test.ts b/apps/server/src/orchestration-v2/Adapters/AntigravityAdapterV2.test.ts
index 0945a282cee2..b281ecc16ab8 100644
--- a/apps/server/src/orchestration-v2/Adapters/AntigravityAdapterV2.test.ts
+++ b/apps/server/src/orchestration-v2/Adapters/AntigravityAdapterV2.test.ts
@@ -20,8 +20,10 @@ import * as Deferred from "effect/Deferred";
 import * as Effect from "effect/Effect";
 import * as Exit from "effect/Exit";
 import * as FileSystem from "effect/FileSystem";
+import * as Fiber from "effect/Fiber";
 import * as Layer from "effect/Layer";
 import * as Path from "effect/Path";
+import * as Ref from "effect/Ref";
 import * as Stream from "effect/Stream";
 import { ChildProcessSpawner } from "effect/process";
 import type * as EffectAcpSchema from "effect-acp/compat";
@@ -146,44 +148,73 @@ const layerSession = Layer.mergeAll(
 );
 
 describe("AntigravityAdapterV2 compaction", () => {
-  it.effect("does not expose unsupported manual compaction on the provider session", () =>
-    Effect.gen(function* () {
-      const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
-      const path = yield* Path.Path;
-      const crypto = yield* SecureRandom.SecureRandom;
-      const mockAgentPath = yield* path.fromFileUrl(
-        new URL("../../../scripts/acp-mock-agent.ts", import.meta.url),
-      );
-      const instanceId = ProviderInstanceId.make("antigravity-compaction-test");
-      const adapter = yield* makeAntigravityAdapterV2({
-        instanceId,
-        selfInvocation: yield* resolveSelfInvocation(),
-        makeRuntime: (input) =>
-          makeAntigravityAcpRuntime({
-            ...input,
-            childProcessSpawner,
-            spawn: {
-              command: process.execPath,
-              args: [mockAgentPath],
-              cwd: input.cwd,
-              env: { T3_ACP_ANTIGRAVITY: "1" },
-            },
-          }).pipe(Effect.provideService(SecureRandom.SecureRandom, crypto)),
-        withProcess: (_stop, task) => task,
-        defaultModel: Effect.undefined,
-      });
-      const session = yield* adapter.openSession({
-        threadId: ThreadId.make("thread-antigravity-compaction"),
-        providerSessionId: ProviderSessionId.make("provider-session-antigravity-compaction"),
-        modelSelection: { instanceId, model: "gemini-test-low" },
-        runtimePolicy: ProviderAdapter.ProviderAdapterV2RuntimePolicy.make({
-          runtimeMode: "full-access",
-          interactionMode: "default",
-          cwd: process.cwd(),
-        }),
-      });
-      assert.isUndefined(session.compactThread);
-    }).pipe(Effect.provide(layerSession), Effect.scoped),
+  it.live.each([false, true])(
+    "negotiates native goals (%s) without enabling manual compaction",
+    (nativeGoals) =>
+      Effect.gen(function* () {
+        const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
+        const path = yield* Path.Path;
+        const crypto = yield* SecureRandom.SecureRandom;
+        const mockAgentPath = yield* path.fromFileUrl(
+          new URL("../../../scripts/acp-mock-agent.ts", import.meta.url),
+        );
+        const instanceId = ProviderInstanceId.make("antigravity-compaction-test");
+        const goalSupport = yield* Ref.make(false);
+        const startupMilestone = yield* Deferred.make<void>();
+        const consumeStartupCommands = yield* Deferred.make<void>();
+        const adapter = yield* makeAntigravityAdapterV2({
+          instanceId,
+          selfInvocation: yield* resolveSelfInvocation(),
+          makeRuntime: (input) =>
+            makeAntigravityAcpRuntime({
+              ...input,
+              childProcessSpawner,
+              spawn: {
+                command: process.execPath,
+                args: [mockAgentPath],
+                cwd: input.cwd,
+                env: { T3_ACP_ANTIGRAVITY: "1" },
+              },
+            }).pipe(
+              Effect.provideService(SecureRandom.SecureRandom, crypto),
+              Effect.map((runtime) => ({
+                ...runtime,
+                drainEvents: Deferred.succeed(startupMilestone, undefined).pipe(
+                  Effect.andThen(runtime.drainEvents),
+                ),
+              })),
+            ),
+          withProcess: (_stop, task) => task,
+          defaultModel: Effect.undefined,
+          supportsNativeGoals: Ref.get(goalSupport).pipe(
+            Effect.tap(() => Deferred.succeed(startupMilestone, undefined)),
+          ),
+          onSessionEvent: (event) =>
+            event._tag === "AvailableCommandsUpdated"
+              ? Deferred.await(consumeStartupCommands).pipe(
+                  Effect.andThen(Ref.set(goalSupport, nativeGoals)),
+                )
+              : Effect.void,
+        });
+        const opening = yield* adapter
+          .openSession({
+            threadId: ThreadId.make("thread-antigravity-compaction"),
+            providerSessionId: ProviderSessionId.make("provider-session-antigravity-compaction"),
+            modelSelection: { instanceId, model: "gemini-test-low" },
+            runtimePolicy: ProviderAdapter.ProviderAdapterV2RuntimePolicy.make({
+              runtimeMode: "full-access",
+              interactionMode: "default",
+              cwd: process.cwd(),
+            }),
+          })
+          .pipe(Effect.forkScoped);
+        yield* Deferred.await(startupMilestone);
+        yield* Deferred.succeed(consumeStartupCommands, undefined);
+        const session = yield* Fiber.join(opening);
+        assert.isUndefined(session.compactThread);
+        assert.equal(session.providerSession.capabilities.turns.supportsNativeGoals, nativeGoals);
+        assert.equal((yield* adapter.getCapabilities()).turns.supportsNativeGoals, nativeGoals);
+      }).pipe(Effect.provide(layerSession)),
   );
 });
 
@@ -239,7 +270,7 @@ describe("AntigravityAdapterV2 session open", () => {
         error._tag === "ProviderAdapterOpenSessionError" && error.requiresSignIn,
         requiresSignIn,
       );
-    }).pipe(Effect.provide(layerSession), Effect.scoped),
+    }).pipe(Effect.provide(layerSession)),
   );
 });
 
@@ -385,7 +416,7 @@ describe("AntigravityAdapterV2 client file system", () => {
         context("fs/read_text_file"),
       );
       assert.equal(viaInsideLink.content, "inside");
-    }).pipe(Effect.provide(layerSession), Effect.scoped),
+    }).pipe(Effect.provide(layerSession)),
   );
 });
 
@@ -555,7 +586,7 @@ describe("AntigravityAdapterV2 workspace changes", () => {
         context,
       ).pipe(Effect.exit);
       assert.isTrue(Exit.isFailure(fromA), "the previous workspace is no longer readable");
-    }).pipe(Effect.provide(layerSession), Effect.scoped),
+    }).pipe(Effect.provide(layerSession)),
   );
 });
 
@@ -835,7 +866,7 @@ describe("AntigravityAdapterV2 html_render pages", () => {
       assert.strictEqual(yield* mcpSessions.takeHtmlRender(threadId, report), undefined);
       assert.strictEqual(yield* mcpSessions.takeHtmlRender(threadId, failed), undefined);
       assert.strictEqual(yield* mcpSessions.takeHtmlRender(threadId, errored), undefined);
-    }).pipe(Effect.provide(layerSession), Effect.scoped),
+    }).pipe(Effect.provide(layerSession)),
   );
 });
 
@@ -1043,7 +1074,7 @@ describe("AntigravityAdapterV2 subagent reads", () => {
       assert.deepEqual(read("call_missing"), failed);
       assert.deepEqual(read("call_denied"), failed);
       assert.deepEqual(read("call_unseen"), failed);
-    }).pipe(Effect.provide(layerSession), Effect.scoped),
+    }).pipe(Effect.provide(layerSession)),
   );
 });
 
@@ -1240,6 +1271,6 @@ describe("AntigravityAdapterV2 session system prompt", () => {
           assert.notInclude(append, "systemPrompt");
           assert.include(sent, "<pull_request_linking>");
         }
-      }).pipe(Effect.provide(layerSession), Effect.scoped),
+      }).pipe(Effect.provide(layerSession)),
   );
 });
diff --git a/apps/server/src/orchestration-v2/Adapters/AntigravityAdapterV2.ts b/apps/server/src/orchestration-v2/Adapters/AntigravityAdapterV2.ts
index 1490140c1e6e..b6f746269a6f 100644
--- a/apps/server/src/orchestration-v2/Adapters/AntigravityAdapterV2.ts
+++ b/apps/server/src/orchestration-v2/Adapters/AntigravityAdapterV2.ts
@@ -82,6 +82,7 @@ export interface AntigravityAdapterV2Options {
   >;
   readonly withProcess: AntigravityAuth["withProcess"];
   readonly defaultModel: Effect.Effect<string | undefined>;
+  readonly supportsNativeGoals?: Effect.Effect<boolean>;
   readonly onSessionStarted?: (
     started: AcpSessionRuntime.AcpSessionRuntimeStartResult,
     cwd: string,
@@ -208,11 +209,12 @@ export function makeAntigravityAcpAdapterFlavor(
     driver: ANTIGRAVITY_PROVIDER,
     runtimeHarness: "Antigravity",
     capabilities: AntigravityProviderCapabilitiesV2,
+    supportsNativeGoals: options.supportsNativeGoals ?? Effect.succeed(false),
     // Agents that advertise HTTP MCP skip the stdio bridge process; others keep stdio.
     mcpOverHttp: true,
     sessionCarriesPullRequestLinking: antigravityAppendsSystemPrompt,
     makeRuntime,
-    buildPrompt: ({
+    buildAttachmentPrompt: ({
       text,
       attachments,
       resolveAttachmentPath,
@@ -228,6 +230,7 @@ export function makeAntigravityAcpAdapterFlavor(
         agentVersion,
         currentModel,
       }).pipe(
+        Effect.map((blocks) => (text.trim() ? blocks.slice(1) : blocks)),
         Effect.provideService(FileSystem.FileSystem, options.fileSystem),
         Effect.provideService(Path.Path, options.path),
       ),
diff --git a/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts b/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts
index 95432c40e688..155370da1757 100644
--- a/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts
+++ b/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts
@@ -109,6 +109,7 @@ import * as ClaudeAdapterV2 from "./ClaudeAdapterV2.ts";
 import * as IdAllocator from "@t3tools/provider-core/server/IdAllocator";
 import * as ProviderInstallationGate from "../../provider/ProviderInstallationGate.ts";
 import { ClaudeOrchestratorReplayHarness } from "./ClaudeAdapterV2.testkit.ts";
+import { withInlineContext } from "../ContextHandoffDelivery.ts";
 import { provideDeterministicTestRuntime } from "../testkit/DeterministicRuntime.ts";
 import { runOrchestratorV2Scenario } from "../testkit/OrchestratorScenario.ts";
 import { layerProviderReplay } from "../testkit/ProviderReplayHarness.ts";
@@ -395,6 +396,20 @@ describe("ClaudeAdapterV2 runtime query policy", () => {
     });
   });
 
+  it("sends the auto-compact window as the env var Claude Code prefers", () => {
+    const options = ClaudeAdapterV2.makeClaudeQueryOptions({
+      modelSelection: CLAUDE_TEST_MODEL_SELECTION,
+      nativeThreadId: "native-auto-compact",
+      resume: false,
+      cwd: "/workspace",
+      settings: { ...DEFAULT_CLAUDE_SETTINGS, autoCompactWindow: "400000" },
+    });
+    assert.equal(
+      (options.settings as { env?: Record<string, string> }).env?.CLAUDE_CODE_AUTO_COMPACT_WINDOW,
+      "400000",
+    );
+  });
+
   it("sends a custom model named like a Claude Code alias to the API unchanged", () => {
     const options = ClaudeAdapterV2.makeClaudeQueryOptions({
       modelSelection: { instanceId: CLAUDE_TEST_MODEL_SELECTION.instanceId, model: "opus" },
@@ -958,131 +973,125 @@ describe("ClaudeAdapterV2 session permissions", () => {
 
 describe("ClaudeAdapterV2 Auto-accept edits", () => {
   it.effect("asks before a command instead of allowing it", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const fileSystem = yield* FileSystem.FileSystem;
-        const idAllocator = yield* IdAllocator.IdAllocatorV2;
-        const attachmentsDir = yield* fileSystem.makeTempDirectoryScoped({
-          prefix: "t3-claude-accept-edits-",
-        });
-        let openedOptions: ClaudeAdapterV2.ClaudeAgentSdkQueryOptions | undefined;
-        const adapter = yield* ClaudeAdapterV2.makeClaudeAdapterV2({
-          instanceId: ClaudeAdapterV2.CLAUDE_DEFAULT_INSTANCE_ID,
-          settings: DEFAULT_CLAUDE_SETTINGS,
-          environment: {},
-          attachmentsDir,
-          fileSystem,
-          path: yield* Path.Path,
-          random: yield* SecureRandom.SecureRandom,
-          idAllocator,
-          queryRunner: {
-            allocateSessionId: Effect.succeed("native-thread-claude-accept-edits"),
-            open: (input) =>
-              Effect.sync(() => {
-                openedOptions = input.options;
-                return {
-                  messages: Stream.never,
-                  offer: () => Effect.void,
-                  setModel: () => Effect.void,
-                  applyFlagSettings: () => Effect.void,
-                  setPermissionMode: () => Effect.void,
-                  backgroundTasks: () => Effect.succeed(false),
-                  mcpServerStatus: Effect.succeed([]),
-                  readMcpResource: () => Effect.die("unexpected MCP resource read"),
-                  callMcpTool: () => Effect.die("unexpected MCP tool call"),
-                  listPermissionRules: Effect.die("unexpected permission rules read"),
-                  stopTask: () => Effect.void,
-                  interrupt: Effect.void,
-                  close: Effect.void,
-                };
-              }),
-            forkSession: () => Effect.die("unused"),
-            subagentLaunchToolUseId: () => Effect.succeed(null),
-            subagentModel: () => Effect.succeed(null),
-            assertComplete: Effect.void,
-          },
-        });
-        const runtimePolicy = ProviderAdapter.ProviderAdapterV2RuntimePolicy.make({
-          runtimeMode: "auto-accept-edits",
-          interactionMode: "default",
-          cwd: "/workspace",
-        });
-        const threadId = ThreadId.make("thread-claude-accept-edits");
-        const runtime = yield* adapter.openSession({
-          threadId,
-          providerSessionId: ProviderSessionId.make("provider-session-claude-accept-edits"),
-          modelSelection: CLAUDE_TEST_MODEL_SELECTION,
-          runtimePolicy,
-        });
-        const providerThread = yield* runtime.ensureThread({
+    Effect.gen(function* () {
+      const fileSystem = yield* FileSystem.FileSystem;
+      const idAllocator = yield* IdAllocator.IdAllocatorV2;
+      const attachmentsDir = yield* fileSystem.makeTempDirectoryScoped({
+        prefix: "t3-claude-accept-edits-",
+      });
+      let openedOptions: ClaudeAdapterV2.ClaudeAgentSdkQueryOptions | undefined;
+      const adapter = yield* ClaudeAdapterV2.makeClaudeAdapterV2({
+        instanceId: ClaudeAdapterV2.CLAUDE_DEFAULT_INSTANCE_ID,
+        settings: DEFAULT_CLAUDE_SETTINGS,
+        environment: {},
+        attachmentsDir,
+        fileSystem,
+        path: yield* Path.Path,
+        random: yield* SecureRandom.SecureRandom,
+        idAllocator,
+        queryRunner: {
+          allocateSessionId: Effect.succeed("native-thread-claude-accept-edits"),
+          open: (input) =>
+            Effect.sync(() => {
+              openedOptions = input.options;
+              return {
+                messages: Stream.never,
+                offer: () => Effect.void,
+                setModel: () => Effect.void,
+                applyFlagSettings: () => Effect.void,
+                setPermissionMode: () => Effect.void,
+                backgroundTasks: () => Effect.succeed(false),
+                mcpServerStatus: Effect.succeed([]),
+                readMcpResource: () => Effect.die("unexpected MCP resource read"),
+                callMcpTool: () => Effect.die("unexpected MCP tool call"),
+                listPermissionRules: Effect.die("unexpected permission rules read"),
+                stopTask: () => Effect.void,
+                interrupt: Effect.void,
+                close: Effect.void,
+              };
+            }),
+          forkSession: () => Effect.die("unused"),
+          subagentLaunchToolUseId: () => Effect.succeed(null),
+          subagentModel: () => Effect.succeed(null),
+          assertComplete: Effect.void,
+        },
+      });
+      const runtimePolicy = ProviderAdapter.ProviderAdapterV2RuntimePolicy.make({
+        runtimeMode: "auto-accept-edits",
+        interactionMode: "default",
+        cwd: "/workspace",
+      });
+      const threadId = ThreadId.make("thread-claude-accept-edits");
+      const runtime = yield* adapter.openSession({
+        threadId,
+        providerSessionId: ProviderSessionId.make("provider-session-claude-accept-edits"),
+        modelSelection: CLAUDE_TEST_MODEL_SELECTION,
+        runtimePolicy,
+      });
+      const providerThread = yield* runtime.ensureThread({
+        threadId,
+        modelSelection: CLAUDE_TEST_MODEL_SELECTION,
+        runtimePolicy,
+      });
+      const now = yield* DateTime.now;
+      yield* runtime.startTurn(
+        makeClaudeTestTurnInput({
           threadId,
-          modelSelection: CLAUDE_TEST_MODEL_SELECTION,
+          providerThread,
+          now,
+          attemptId: RunAttemptId.make("attempt-claude-accept-edits"),
+          text: "Run node.",
+          attachments: [],
           runtimePolicy,
-        });
-        const now = yield* DateTime.now;
-        yield* runtime.startTurn(
-          makeClaudeTestTurnInput({
-            threadId,
-            providerThread,
-            now,
-            attemptId: RunAttemptId.make("attempt-claude-accept-edits"),
-            text: "Run node.",
-            attachments: [],
-            runtimePolicy,
-          }),
-        );
-        assert.equal(openedOptions?.permissionMode, "acceptEdits");
-        const canUseTool = openedOptions?.canUseTool;
-        assert.isFunction(canUseTool);
+        }),
+      );
+      assert.equal(openedOptions?.permissionMode, "acceptEdits");
+      const canUseTool = openedOptions?.canUseTool;
+      assert.isFunction(canUseTool);
 
-        const requestEvent = yield* runtime.events.pipe(
-          Stream.takeUntil(
-            (event) =>
-              event.type === "turn_item.updated" && event.turnItem.type === "approval_request",
-          ),
-          Stream.runCollect,
-          Effect.forkScoped,
-        );
-        const command = { command: "node -e 'console.log(42)'" };
-        const decision = yield* Effect.promise(() =>
-          canUseTool!("Bash", command, {
-            signal: new AbortController().signal,
-            toolUseID: "tool-bash-accept-edits",
-            requestId: "request-bash-accept-edits",
-            description: "Check the Node runtime",
-          }),
-        ).pipe(Effect.forkScoped);
-        const first = yield* Effect.raceFirst(
-          Fiber.join(requestEvent).pipe(
-            Effect.map((event) => ({ type: "request", event }) as const),
-          ),
-          Fiber.join(decision).pipe(
-            Effect.map((result) => ({ type: "decision", result }) as const),
-          ),
-        );
-        assert.equal(first.type, "request", "the command ran without asking");
-        if (first.type !== "request") return;
-        const event = first.event.find((event) => event.type === "runtime_request.updated");
-        assert.equal(event?.runtimeRequest.kind, "command");
-        const approval = first.event.findLast((event) => event.type === "turn_item.updated");
-        assert.equal(
-          approval?.turnItem.type === "approval_request" ? approval.turnItem.prompt : undefined,
-          command.command,
-        );
+      const requestEvent = yield* runtime.events.pipe(
+        Stream.takeUntil(
+          (event) =>
+            event.type === "turn_item.updated" && event.turnItem.type === "approval_request",
+        ),
+        Stream.runCollect,
+        Effect.forkScoped,
+      );
+      const command = { command: "node -e 'console.log(42)'" };
+      const decision = yield* Effect.promise(() =>
+        canUseTool!("Bash", command, {
+          signal: new AbortController().signal,
+          toolUseID: "tool-bash-accept-edits",
+          requestId: "request-bash-accept-edits",
+          description: "Check the Node runtime",
+        }),
+      ).pipe(Effect.forkScoped);
+      const first = yield* Effect.raceFirst(
+        Fiber.join(requestEvent).pipe(Effect.map((event) => ({ type: "request", event }) as const)),
+        Fiber.join(decision).pipe(Effect.map((result) => ({ type: "decision", result }) as const)),
+      );
+      assert.equal(first.type, "request", "the command ran without asking");
+      if (first.type !== "request") return;
+      const event = first.event.find((event) => event.type === "runtime_request.updated");
+      assert.equal(event?.runtimeRequest.kind, "command");
+      const approval = first.event.findLast((event) => event.type === "turn_item.updated");
+      assert.equal(
+        approval?.turnItem.type === "approval_request" ? approval.turnItem.prompt : undefined,
+        command.command,
+      );
 
-        yield* runtime.respondToRuntimeRequest({
-          requestId: event!.runtimeRequest.id,
-          decision: "accept",
-        });
-        assert.equal((yield* Fiber.join(decision))?.behavior, "allow");
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
-          ),
+      yield* runtime.respondToRuntimeRequest({
+        requestId: event!.runtimeRequest.id,
+        decision: "accept",
+      });
+      assert.equal((yield* Fiber.join(decision))?.behavior, "allow");
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
         ),
       ),
     ),
@@ -1166,33 +1175,31 @@ describe("ClaudeAdapterV2 append-system-prompt-file launch argument", () => {
     (options?.systemPrompt as { readonly append?: string } | undefined)?.append;
 
   it.effect("sends append launch arguments to Claude after the T3 instructions", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const fileSystem = yield* FileSystem.FileSystem;
-        const cwd = yield* fileSystem.makeTempDirectoryScoped({ prefix: "t3-claude-append-cwd-" });
-        yield* fileSystem.writeFileString(NodePath.join(cwd, "rules.md"), "File sentinel\n");
-        const plain = yield* startTurnWithLaunchArgs("", cwd);
-        const { exit, opened } = yield* startTurnWithLaunchArgs(
-          '--append-system-prompt "Inline sentinel" --append-system-prompt-file rules.md --system-prompt Replacement',
-          cwd,
-        );
-        assert.isTrue(Exit.isSuccess(exit));
-        assert.lengthOf(opened, 1);
-        assert.equal(
-          appendSystemPrompt(opened[0]),
-          `${appendSystemPrompt(plain.opened[0])}\n\nFile sentinel\n\nInline sentinel`,
-        );
-        assert.isUndefined(opened[0]!.extraArgs?.["append-system-prompt"]);
-        assert.isUndefined(opened[0]!.extraArgs?.["append-system-prompt-file"]);
-        assert.equal(opened[0]!.extraArgs?.["system-prompt"], "Replacement");
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
-          ),
+    Effect.gen(function* () {
+      const fileSystem = yield* FileSystem.FileSystem;
+      const cwd = yield* fileSystem.makeTempDirectoryScoped({ prefix: "t3-claude-append-cwd-" });
+      yield* fileSystem.writeFileString(NodePath.join(cwd, "rules.md"), "File sentinel\n");
+      const plain = yield* startTurnWithLaunchArgs("", cwd);
+      const { exit, opened } = yield* startTurnWithLaunchArgs(
+        '--append-system-prompt "Inline sentinel" --append-system-prompt-file rules.md --system-prompt Replacement',
+        cwd,
+      );
+      assert.isTrue(Exit.isSuccess(exit));
+      assert.lengthOf(opened, 1);
+      assert.equal(
+        appendSystemPrompt(opened[0]),
+        `${appendSystemPrompt(plain.opened[0])}\n\nFile sentinel\n\nInline sentinel`,
+      );
+      assert.isUndefined(opened[0]!.extraArgs?.["append-system-prompt"]);
+      assert.isUndefined(opened[0]!.extraArgs?.["append-system-prompt-file"]);
+      assert.equal(opened[0]!.extraArgs?.["system-prompt"], "Replacement");
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
         ),
       ),
     ),
@@ -1203,29 +1210,27 @@ describe("ClaudeAdapterV2 append-system-prompt-file launch argument", () => {
     `--settings '{"skillOverrides":{"lint":"off"},"showThinkingSummaries":false}'`,
     "--settings user-settings.json",
   ])("merges %s beneath T3's settings", (launchArgs) =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const fileSystem = yield* FileSystem.FileSystem;
-        const cwd = yield* fileSystem.makeTempDirectoryScoped({ prefix: "t3-claude-settings-" });
-        yield* fileSystem.writeFileString(
-          NodePath.join(cwd, "user-settings.json"),
-          '{"skillOverrides":{"lint":"off"},"showThinkingSummaries":false}',
-        );
-        const { exit, opened } = yield* startTurnWithLaunchArgs(launchArgs, cwd);
-        assert.isTrue(Exit.isSuccess(exit));
-        assert.deepInclude(opened[0]!.settings, {
-          skillOverrides: { lint: "off" },
-          showThinkingSummaries: true,
-        });
-        assert.isUndefined(opened[0]!.extraArgs?.["settings"]);
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
-          ),
+    Effect.gen(function* () {
+      const fileSystem = yield* FileSystem.FileSystem;
+      const cwd = yield* fileSystem.makeTempDirectoryScoped({ prefix: "t3-claude-settings-" });
+      yield* fileSystem.writeFileString(
+        NodePath.join(cwd, "user-settings.json"),
+        '{"skillOverrides":{"lint":"off"},"showThinkingSummaries":false}',
+      );
+      const { exit, opened } = yield* startTurnWithLaunchArgs(launchArgs, cwd);
+      assert.isTrue(Exit.isSuccess(exit));
+      assert.deepInclude(opened[0]!.settings, {
+        skillOverrides: { lint: "off" },
+        showThinkingSummaries: true,
+      });
+      assert.isUndefined(opened[0]!.extraArgs?.["settings"]);
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
         ),
       ),
     ),
@@ -1244,41 +1249,39 @@ describe("ClaudeAdapterV2 append-system-prompt-file launch argument", () => {
         assert.include(appendSystemPrompt(options), '{"skillOverrides":{"lint":"off"}}'),
     ],
   ] as const)("reads %s from the home directory", ([launchArgs, assertOptions]) =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const fileSystem = yield* FileSystem.FileSystem;
-        const home = yield* fileSystem.makeTempDirectoryScoped({ prefix: "t3-claude-home-" });
-        const cwd = yield* fileSystem.makeTempDirectoryScoped({ prefix: "t3-claude-home-cwd-" });
-        yield* fileSystem.makeDirectory(NodePath.join(home, ".claude"));
-        yield* fileSystem.writeFileString(
-          NodePath.join(home, ".claude", "settings.json"),
-          '{"skillOverrides":{"lint":"off"}}',
-        );
-        const { exit, opened } = yield* startTurnWithLaunchArgs(launchArgs, cwd).pipe(
-          Effect.provideService(HostProcess.HomeDirectory, home),
-        );
-        if (Exit.isFailure(exit)) {
-          assert.fail(makeProviderFailure({ cause: exit.cause, class: "provider_error" }).message);
-        }
-        assert.lengthOf(opened, 1);
-        assertOptions(opened[0]!);
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
-          ),
-        ),
-      ),
-    ),
-  );
-
-  // regression: #20413 malformed append-system-prompt launch args fail before a query opens
-  it.effect.each([
-    [
-      "--append-system-prompt-file missing.md",
+    Effect.gen(function* () {
+      const fileSystem = yield* FileSystem.FileSystem;
+      const home = yield* fileSystem.makeTempDirectoryScoped({ prefix: "t3-claude-home-" });
+      const cwd = yield* fileSystem.makeTempDirectoryScoped({ prefix: "t3-claude-home-cwd-" });
+      yield* fileSystem.makeDirectory(NodePath.join(home, ".claude"));
+      yield* fileSystem.writeFileString(
+        NodePath.join(home, ".claude", "settings.json"),
+        '{"skillOverrides":{"lint":"off"}}',
+      );
+      const { exit, opened } = yield* startTurnWithLaunchArgs(launchArgs, cwd).pipe(
+        Effect.provideService(HostProcess.HomeDirectory, home),
+      );
+      if (Exit.isFailure(exit)) {
+        assert.fail(makeProviderFailure({ cause: exit.cause, class: "provider_error" }).message);
+      }
+      assert.lengthOf(opened, 1);
+      assertOptions(opened[0]!);
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
+        ),
+      ),
+    ),
+  );
+
+  // regression: #20413 malformed append-system-prompt launch args fail before a query opens
+  it.effect.each([
+    [
+      "--append-system-prompt-file missing.md",
       (cwd: string) =>
         new ClaudeAdapterV2.ClaudeAppendSystemPromptFileError({
           path: NodePath.join(cwd, "missing.md"),
@@ -1319,26 +1322,24 @@ describe("ClaudeAdapterV2 append-system-prompt-file launch argument", () => {
       () => new ClaudeAdapterV2.ClaudeSettingsLaunchArgError({}).message,
     ],
   ] as const)("fails the turn before opening Claude for %s", ([launchArgs, expectedMessage]) =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const fileSystem = yield* FileSystem.FileSystem;
-        const cwd = yield* fileSystem.makeTempDirectoryScoped({ prefix: "t3-claude-append-cwd-" });
-        const { exit, opened } = yield* startTurnWithLaunchArgs(launchArgs, cwd);
-        assert.lengthOf(opened, 0);
-        assert.isTrue(Exit.isFailure(exit));
-        if (!Exit.isFailure(exit)) return;
-        assert.equal(
-          makeProviderFailure({ cause: exit.cause, class: "provider_error" }).message,
-          expectedMessage(cwd),
-        );
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
-          ),
+    Effect.gen(function* () {
+      const fileSystem = yield* FileSystem.FileSystem;
+      const cwd = yield* fileSystem.makeTempDirectoryScoped({ prefix: "t3-claude-append-cwd-" });
+      const { exit, opened } = yield* startTurnWithLaunchArgs(launchArgs, cwd);
+      assert.lengthOf(opened, 0);
+      assert.isTrue(Exit.isFailure(exit));
+      if (!Exit.isFailure(exit)) return;
+      assert.equal(
+        makeProviderFailure({ cause: exit.cause, class: "provider_error" }).message,
+        expectedMessage(cwd),
+      );
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
         ),
       ),
     ),
@@ -1347,95 +1348,93 @@ describe("ClaudeAdapterV2 append-system-prompt-file launch argument", () => {
 
 describe("ClaudeAdapterV2 provider installation gate", () => {
   it.effect("opens each turn's Claude process inside the installation gate", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const fileSystem = yield* FileSystem.FileSystem;
-        const log: Array<string> = [];
-        const instanceId = ClaudeAdapterV2.CLAUDE_DEFAULT_INSTANCE_ID;
-        const adapter = yield* ClaudeAdapterV2.makeClaudeAdapterV2({
-          instanceId,
-          settings: DEFAULT_CLAUDE_SETTINGS,
-          environment: {},
-          attachmentsDir: yield* fileSystem.makeTempDirectoryScoped({ prefix: "t3-claude-gate-" }),
-          fileSystem,
-          path: yield* Path.Path,
-          random: yield* SecureRandom.SecureRandom,
-          idAllocator: yield* IdAllocator.IdAllocatorV2,
-          installationGate: ProviderInstallationGate.ProviderInstallationGate.of({
-            execute: (gatedInstanceId, effect) =>
-              Effect.sync(() => log.push(`enter ${gatedInstanceId}`)).pipe(
-                Effect.andThen(effect),
-                Effect.ensuring(Effect.sync(() => log.push("exit"))),
-              ),
-            update: () => Effect.die("unused"),
-          }),
-          queryRunner: {
-            allocateSessionId: Effect.succeed("native-thread-claude-gate"),
-            open: () =>
-              Effect.sync(() => {
-                log.push("open query");
-                return {
-                  messages: Stream.never,
-                  offer: () => Effect.void,
-                  setModel: () => Effect.void,
-                  applyFlagSettings: () => Effect.void,
-                  setPermissionMode: () => Effect.void,
-                  backgroundTasks: () => Effect.succeed(false),
-                  mcpServerStatus: Effect.succeed([]),
-                  readMcpResource: () => Effect.die("unexpected MCP resource read"),
-                  callMcpTool: () => Effect.die("unexpected MCP tool call"),
-                  listPermissionRules: Effect.die("unexpected permission rules read"),
-                  stopTask: () => Effect.void,
-                  interrupt: Effect.void,
-                  close: Effect.void,
-                };
-              }),
-            forkSession: () => Effect.die("unused"),
-            subagentLaunchToolUseId: () => Effect.succeed(null),
-            subagentModel: () => Effect.succeed(null),
-            assertComplete: Effect.void,
-          },
-        });
-        const runtimePolicy = ProviderAdapter.ProviderAdapterV2RuntimePolicy.make({
-          runtimeMode: "full-access",
-          interactionMode: "default",
-          cwd: yield* fileSystem.makeTempDirectoryScoped({ prefix: "t3-claude-gate-cwd-" }),
-        });
-        const threadId = ThreadId.make("thread-claude-gate");
-        const runtime = yield* adapter.openSession({
-          threadId,
-          providerSessionId: ProviderSessionId.make("provider-session-claude-gate"),
-          modelSelection: CLAUDE_TEST_MODEL_SELECTION,
-          runtimePolicy,
-        });
-        const providerThread = yield* runtime.ensureThread({
+    Effect.gen(function* () {
+      const fileSystem = yield* FileSystem.FileSystem;
+      const log: Array<string> = [];
+      const instanceId = ClaudeAdapterV2.CLAUDE_DEFAULT_INSTANCE_ID;
+      const adapter = yield* ClaudeAdapterV2.makeClaudeAdapterV2({
+        instanceId,
+        settings: DEFAULT_CLAUDE_SETTINGS,
+        environment: {},
+        attachmentsDir: yield* fileSystem.makeTempDirectoryScoped({ prefix: "t3-claude-gate-" }),
+        fileSystem,
+        path: yield* Path.Path,
+        random: yield* SecureRandom.SecureRandom,
+        idAllocator: yield* IdAllocator.IdAllocatorV2,
+        installationGate: ProviderInstallationGate.ProviderInstallationGate.of({
+          execute: (gatedInstanceId, effect) =>
+            Effect.sync(() => log.push(`enter ${gatedInstanceId}`)).pipe(
+              Effect.andThen(effect),
+              Effect.ensuring(Effect.sync(() => log.push("exit"))),
+            ),
+          update: () => Effect.die("unused"),
+        }),
+        queryRunner: {
+          allocateSessionId: Effect.succeed("native-thread-claude-gate"),
+          open: () =>
+            Effect.sync(() => {
+              log.push("open query");
+              return {
+                messages: Stream.never,
+                offer: () => Effect.void,
+                setModel: () => Effect.void,
+                applyFlagSettings: () => Effect.void,
+                setPermissionMode: () => Effect.void,
+                backgroundTasks: () => Effect.succeed(false),
+                mcpServerStatus: Effect.succeed([]),
+                readMcpResource: () => Effect.die("unexpected MCP resource read"),
+                callMcpTool: () => Effect.die("unexpected MCP tool call"),
+                listPermissionRules: Effect.die("unexpected permission rules read"),
+                stopTask: () => Effect.void,
+                interrupt: Effect.void,
+                close: Effect.void,
+              };
+            }),
+          forkSession: () => Effect.die("unused"),
+          subagentLaunchToolUseId: () => Effect.succeed(null),
+          subagentModel: () => Effect.succeed(null),
+          assertComplete: Effect.void,
+        },
+      });
+      const runtimePolicy = ProviderAdapter.ProviderAdapterV2RuntimePolicy.make({
+        runtimeMode: "full-access",
+        interactionMode: "default",
+        cwd: yield* fileSystem.makeTempDirectoryScoped({ prefix: "t3-claude-gate-cwd-" }),
+      });
+      const threadId = ThreadId.make("thread-claude-gate");
+      const runtime = yield* adapter.openSession({
+        threadId,
+        providerSessionId: ProviderSessionId.make("provider-session-claude-gate"),
+        modelSelection: CLAUDE_TEST_MODEL_SELECTION,
+        runtimePolicy,
+      });
+      const providerThread = yield* runtime.ensureThread({
+        threadId,
+        modelSelection: CLAUDE_TEST_MODEL_SELECTION,
+        runtimePolicy,
+      });
+      assert.deepStrictEqual(log, []);
+
+      yield* runtime.startTurn(
+        makeClaudeTestTurnInput({
           threadId,
-          modelSelection: CLAUDE_TEST_MODEL_SELECTION,
+          providerThread,
+          now: yield* DateTime.now,
+          attemptId: RunAttemptId.make("attempt-claude-gate"),
+          text: "Hello",
+          attachments: [],
           runtimePolicy,
-        });
-        assert.deepStrictEqual(log, []);
-
-        yield* runtime.startTurn(
-          makeClaudeTestTurnInput({
-            threadId,
-            providerThread,
-            now: yield* DateTime.now,
-            attemptId: RunAttemptId.make("attempt-claude-gate"),
-            text: "Hello",
-            attachments: [],
-            runtimePolicy,
-          }),
-        );
+        }),
+      );
 
-        assert.deepStrictEqual(log, [`enter ${instanceId}`, "open query", "exit"]);
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
-          ),
+      assert.deepStrictEqual(log, [`enter ${instanceId}`, "open query", "exit"]);
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
         ),
       ),
     ),
@@ -1734,189 +1733,154 @@ describe("ClaudeAdapterV2 resumeThread", () => {
 
 describe("ClaudeAdapterV2 resume compaction", () => {
   it.effect("resolves and cancels the SDK resume dialog through structured runtime input", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const fileSystem = yield* FileSystem.FileSystem;
-        const idAllocator = yield* IdAllocator.IdAllocatorV2;
-        const attachmentsDir = yield* fileSystem.makeTempDirectoryScoped({
-          prefix: "t3-claude-resume-",
-        });
-        let openedOptions: ClaudeAdapterV2.ClaudeAgentSdkQueryOptions | undefined;
-        const adapter = yield* ClaudeAdapterV2.makeClaudeAdapterV2({
-          instanceId: ClaudeAdapterV2.CLAUDE_DEFAULT_INSTANCE_ID,
-          settings: DEFAULT_CLAUDE_SETTINGS,
-          environment: {},
-          attachmentsDir,
-          fileSystem,
-          path: yield* Path.Path,
-          random: yield* SecureRandom.SecureRandom,
-          idAllocator,
-          queryRunner: {
-            allocateSessionId: Effect.succeed("native-thread-claude-resume"),
-            open: (input) =>
-              Effect.sync(() => {
-                openedOptions = input.options;
-                return {
-                  messages: Stream.never,
-                  offer: () => Effect.void,
-                  setModel: () => Effect.void,
-                  applyFlagSettings: () => Effect.void,
-                  setPermissionMode: () => Effect.void,
-                  backgroundTasks: () => Effect.succeed(false),
-                  mcpServerStatus: Effect.succeed([]),
-                  readMcpResource: () => Effect.die("unexpected MCP resource read"),
-                  callMcpTool: () => Effect.die("unexpected MCP tool call"),
-                  listPermissionRules: Effect.die("unexpected permission rules read"),
-                  stopTask: () => Effect.void,
-                  interrupt: Effect.void,
-                  close: Effect.void,
-                };
-              }),
-            forkSession: () => Effect.die("unused"),
-            subagentLaunchToolUseId: () => Effect.succeed(null),
-            subagentModel: () => Effect.succeed(null),
-            assertComplete: Effect.void,
-          },
-        });
-        const threadId = ThreadId.make("thread-claude-resume");
-        const runtime = yield* adapter.openSession({
-          threadId,
-          providerSessionId: ProviderSessionId.make("provider-session-claude-resume"),
-          modelSelection: CLAUDE_TEST_MODEL_SELECTION,
-          runtimePolicy: CLAUDE_TEST_RUNTIME_POLICY,
-        });
-        const providerThread = yield* runtime.ensureThread({
-          threadId,
-          modelSelection: CLAUDE_TEST_MODEL_SELECTION,
-          runtimePolicy: CLAUDE_TEST_RUNTIME_POLICY,
-        });
-        const now = yield* DateTime.now;
-        yield* runtime.startTurn(
-          makeClaudeTestTurnInput({
-            threadId,
-            providerThread,
-            now,
-            attemptId: RunAttemptId.make("attempt-claude-resume"),
-            text: "continue",
-            attachments: [],
-          }),
-        );
-        const callback = openedOptions?.onUserDialog;
-        assert.isFunction(callback);
-        const canUseTool = openedOptions?.canUseTool;
-        assert.isFunction(canUseTool);
-        const shellSafetyReason =
-          "Dangerous rm operation not ruled out — the shell may read this command differently than it was parsed";
-        for (const [safetyIndex, { askRule, reason }] of [
-          { askRule: false, reason: shellSafetyReason },
-          { askRule: true, reason: shellSafetyReason },
-          {
-            askRule: false,
-            reason:
-              "Dangerous rm operation on possibly-empty variable path: $TARGET\nUse a literal absolute path instead.",
-          },
-          { askRule: false, reason: "This shell -c script runs rm and could not be checked" },
-          { askRule: false, reason: "A permission rule denies a command in this shell -c script" },
-        ].entries()) {
-          const safetyRequest = yield* runtime.events.pipe(
-            Stream.filter((event) => event.type === "runtime_request.updated"),
-            Stream.runHead,
-            Effect.forkScoped,
-          );
-          const safetySignal = yield* Effect.abortSignal;
-          const safetyDecision = yield* Effect.promise(() =>
-            canUseTool!(
-              "Bash",
-              { command: "for pair in a b; do echo $pair; done" },
-              {
-                signal: safetySignal,
-                toolUseID: `tool-shell-safety-${safetyIndex}`,
-                requestId: `request-shell-safety-${safetyIndex}`,
-                decisionReason: `\u001b[33m${reason}\u001b[39m`,
-                suppressAlwaysAllowRule: true,
-                ...(askRule
-                  ? {
-                      matchedAskRule: {
-                        source: "userSettings" as const,
-                        toolName: "Bash",
-                        ruleContent: "*",
-                      },
-                    }
-                  : {}),
-              },
-            ),
-          ).pipe(Effect.forkScoped);
-          const safety = yield* Effect.raceFirst(
-            Fiber.join(safetyDecision).pipe(
-              Effect.map((result) => ({ type: "decision", result }) as const),
-            ),
-            Fiber.join(safetyRequest).pipe(
-              Effect.map((event) => ({ type: "approval", event }) as const),
-            ),
-          );
-          assert.equal(safety.type, askRule ? "approval" : "decision");
-          if (safety.type === "decision") {
-            assert.equal(safety.result?.behavior, "deny");
-            if (safety.result?.behavior === "deny") {
-              assert.include(safety.result.message, reason);
-              assert.notInclude(safety.result.message, "\u001b[");
-            }
-          } else if (
-            Option.isSome(safety.event) &&
-            safety.event.value.type === "runtime_request.updated"
-          ) {
-            yield* runtime.respondToRuntimeRequest({
-              requestId: safety.event.value.runtimeRequest.id,
-              decision: "decline",
-            });
-            assert.equal((yield* Fiber.join(safetyDecision))?.behavior, "deny");
-          }
-          yield* Fiber.interrupt(safetyRequest);
-        }
-        const longQuestion = `Choose a deployment target: ${"region ".repeat(80)}`;
-        const questionRequestEvent = yield* runtime.events.pipe(
+    Effect.gen(function* () {
+      const fileSystem = yield* FileSystem.FileSystem;
+      const idAllocator = yield* IdAllocator.IdAllocatorV2;
+      const attachmentsDir = yield* fileSystem.makeTempDirectoryScoped({
+        prefix: "t3-claude-resume-",
+      });
+      let openedOptions: ClaudeAdapterV2.ClaudeAgentSdkQueryOptions | undefined;
+      const adapter = yield* ClaudeAdapterV2.makeClaudeAdapterV2({
+        instanceId: ClaudeAdapterV2.CLAUDE_DEFAULT_INSTANCE_ID,
+        settings: DEFAULT_CLAUDE_SETTINGS,
+        environment: {},
+        attachmentsDir,
+        fileSystem,
+        path: yield* Path.Path,
+        random: yield* SecureRandom.SecureRandom,
+        idAllocator,
+        queryRunner: {
+          allocateSessionId: Effect.succeed("native-thread-claude-resume"),
+          open: (input) =>
+            Effect.sync(() => {
+              openedOptions = input.options;
+              return {
+                messages: Stream.never,
+                offer: () => Effect.void,
+                setModel: () => Effect.void,
+                applyFlagSettings: () => Effect.void,
+                setPermissionMode: () => Effect.void,
+                backgroundTasks: () => Effect.succeed(false),
+                mcpServerStatus: Effect.succeed([]),
+                readMcpResource: () => Effect.die("unexpected MCP resource read"),
+                callMcpTool: () => Effect.die("unexpected MCP tool call"),
+                listPermissionRules: Effect.die("unexpected permission rules read"),
+                stopTask: () => Effect.void,
+                interrupt: Effect.void,
+                close: Effect.void,
+              };
+            }),
+          forkSession: () => Effect.die("unused"),
+          subagentLaunchToolUseId: () => Effect.succeed(null),
+          subagentModel: () => Effect.succeed(null),
+          assertComplete: Effect.void,
+        },
+      });
+      const threadId = ThreadId.make("thread-claude-resume");
+      const runtime = yield* adapter.openSession({
+        threadId,
+        providerSessionId: ProviderSessionId.make("provider-session-claude-resume"),
+        modelSelection: CLAUDE_TEST_MODEL_SELECTION,
+        runtimePolicy: CLAUDE_TEST_RUNTIME_POLICY,
+      });
+      const providerThread = yield* runtime.ensureThread({
+        threadId,
+        modelSelection: CLAUDE_TEST_MODEL_SELECTION,
+        runtimePolicy: CLAUDE_TEST_RUNTIME_POLICY,
+      });
+      const now = yield* DateTime.now;
+      yield* runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId,
+          providerThread,
+          now,
+          attemptId: RunAttemptId.make("attempt-claude-resume"),
+          text: "continue",
+          attachments: [],
+        }),
+      );
+      const callback = openedOptions?.onUserDialog;
+      assert.isFunction(callback);
+      const canUseTool = openedOptions?.canUseTool;
+      assert.isFunction(canUseTool);
+      const shellSafetyReason =
+        "Dangerous rm operation not ruled out — the shell may read this command differently than it was parsed";
+      for (const [safetyIndex, { askRule, reason }] of [
+        { askRule: false, reason: shellSafetyReason },
+        { askRule: true, reason: shellSafetyReason },
+        {
+          askRule: false,
+          reason:
+            "Dangerous rm operation on possibly-empty variable path: $TARGET\nUse a literal absolute path instead.",
+        },
+        { askRule: false, reason: "This shell -c script runs rm and could not be checked" },
+        { askRule: false, reason: "A permission rule denies a command in this shell -c script" },
+      ].entries()) {
+        const safetyRequest = yield* runtime.events.pipe(
           Stream.filter((event) => event.type === "runtime_request.updated"),
           Stream.runHead,
           Effect.forkScoped,
         );
-        const questionResult = yield* Effect.promise(() =>
+        const safetySignal = yield* Effect.abortSignal;
+        const safetyDecision = yield* Effect.promise(() =>
           canUseTool!(
-            "AskUserQuestion",
-            {
-              questions: [
-                {
-                  header: "Target",
-                  question: longQuestion,
-                  options: [
-                    { label: "Production", description: "Deploy to production." },
-                    { label: "Staging", description: "Deploy to staging." },
-                  ],
-                  multiSelect: true,
-                },
-              ],
-            },
+            "Bash",
+            { command: "for pair in a b; do echo $pair; done" },
             {
-              signal: new AbortController().signal,
-              toolUseID: "tool-question-full-access",
-              requestId: "request-question-full-access",
+              signal: safetySignal,
+              toolUseID: `tool-shell-safety-${safetyIndex}`,
+              requestId: `request-shell-safety-${safetyIndex}`,
+              decisionReason: `\u001b[33m${reason}\u001b[39m`,
+              suppressAlwaysAllowRule: true,
+              ...(askRule
+                ? {
+                    matchedAskRule: {
+                      source: "userSettings" as const,
+                      toolName: "Bash",
+                      ruleContent: "*",
+                    },
+                  }
+                : {}),
             },
           ),
         ).pipe(Effect.forkScoped);
-        const questionEvent = yield* Fiber.join(questionRequestEvent);
-        assert.isTrue(Option.isSome(questionEvent));
-        if (
-          Option.isNone(questionEvent) ||
-          questionEvent.value.type !== "runtime_request.updated"
+        const safety = yield* Effect.raceFirst(
+          Fiber.join(safetyDecision).pipe(
+            Effect.map((result) => ({ type: "decision", result }) as const),
+          ),
+          Fiber.join(safetyRequest).pipe(
+            Effect.map((event) => ({ type: "approval", event }) as const),
+          ),
+        );
+        assert.equal(safety.type, askRule ? "approval" : "decision");
+        if (safety.type === "decision") {
+          assert.equal(safety.result?.behavior, "deny");
+          if (safety.result?.behavior === "deny") {
+            assert.include(safety.result.message, reason);
+            assert.notInclude(safety.result.message, "\u001b[");
+          }
+        } else if (
+          Option.isSome(safety.event) &&
+          safety.event.value.type === "runtime_request.updated"
         ) {
-          return;
+          yield* runtime.respondToRuntimeRequest({
+            requestId: safety.event.value.runtimeRequest.id,
+            decision: "decline",
+          });
+          assert.equal((yield* Fiber.join(safetyDecision))?.behavior, "deny");
         }
-        yield* runtime.respondToRuntimeRequest({
-          requestId: questionEvent.value.runtimeRequest.id,
-          answers: { [longQuestion]: ["Production", "Staging"] },
-        });
-        assert.deepEqual(yield* Fiber.join(questionResult), {
-          behavior: "allow",
-          updatedInput: {
+        yield* Fiber.interrupt(safetyRequest);
+      }
+      const longQuestion = `Choose a deployment target: ${"region ".repeat(80)}`;
+      const questionRequestEvent = yield* runtime.events.pipe(
+        Stream.filter((event) => event.type === "runtime_request.updated"),
+        Stream.runHead,
+        Effect.forkScoped,
+      );
+      const questionResult = yield* Effect.promise(() =>
+        canUseTool!(
+          "AskUserQuestion",
+          {
             questions: [
               {
                 header: "Target",
@@ -1928,90 +1892,120 @@ describe("ClaudeAdapterV2 resume compaction", () => {
                 multiSelect: true,
               },
             ],
-            answers: { [longQuestion]: "Production, Staging" },
           },
-          toolUseID: "tool-question-full-access",
-        });
-        const longPlan = `# Deployment plan\n\n${"Validate every region before promotion.\n".repeat(120)}`;
-        const proposedPlanEvent = yield* runtime.events.pipe(
-          Stream.filter((event) => event.type === "plan.updated"),
-          Stream.runHead,
-          Effect.forkScoped,
-        );
-        const exitPlanResult = yield* Effect.promise(() =>
-          canUseTool!(
-            "ExitPlanMode",
-            { plan: longPlan },
+          {
+            signal: new AbortController().signal,
+            toolUseID: "tool-question-full-access",
+            requestId: "request-question-full-access",
+          },
+        ),
+      ).pipe(Effect.forkScoped);
+      const questionEvent = yield* Fiber.join(questionRequestEvent);
+      assert.isTrue(Option.isSome(questionEvent));
+      if (Option.isNone(questionEvent) || questionEvent.value.type !== "runtime_request.updated") {
+        return;
+      }
+      yield* runtime.respondToRuntimeRequest({
+        requestId: questionEvent.value.runtimeRequest.id,
+        answers: { [longQuestion]: ["Production", "Staging"] },
+      });
+      assert.deepEqual(yield* Fiber.join(questionResult), {
+        behavior: "allow",
+        updatedInput: {
+          questions: [
             {
-              signal: new AbortController().signal,
-              toolUseID: "tool-exit-plan-full-access",
-              requestId: "request-exit-plan-full-access",
+              header: "Target",
+              question: longQuestion,
+              options: [
+                { label: "Production", description: "Deploy to production." },
+                { label: "Staging", description: "Deploy to staging." },
+              ],
+              multiSelect: true,
             },
-          ),
-        );
-        assert.deepEqual(exitPlanResult, {
-          behavior: "deny",
-          message:
-            "The client captured your proposed plan. Stop here and wait for the user's feedback or implementation request in a later turn.",
-          toolUseID: "tool-exit-plan-full-access",
-        });
-        const planEvent = yield* Fiber.join(proposedPlanEvent);
-        assert.isTrue(Option.isSome(planEvent));
-        if (Option.isSome(planEvent) && planEvent.value.type === "plan.updated") {
-          assert.equal(planEvent.value.plan.kind, "proposed_plan");
-          if (planEvent.value.plan.kind === "proposed_plan") {
-            assert.equal(planEvent.value.plan.markdown, longPlan.trim());
-          }
+          ],
+          answers: { [longQuestion]: "Production, Staging" },
+        },
+        toolUseID: "tool-question-full-access",
+      });
+      const longPlan = `# Deployment plan\n\n${"Validate every region before promotion.\n".repeat(120)}`;
+      const proposedPlanEvent = yield* runtime.events.pipe(
+        Stream.filter((event) => event.type === "plan.updated"),
+        Stream.runHead,
+        Effect.forkScoped,
+      );
+      const exitPlanResult = yield* Effect.promise(() =>
+        canUseTool!(
+          "ExitPlanMode",
+          { plan: longPlan },
+          {
+            signal: new AbortController().signal,
+            toolUseID: "tool-exit-plan-full-access",
+            requestId: "request-exit-plan-full-access",
+          },
+        ),
+      );
+      assert.deepEqual(exitPlanResult, {
+        behavior: "deny",
+        message:
+          "The client captured your proposed plan. Stop here and wait for the user's feedback or implementation request in a later turn.",
+        toolUseID: "tool-exit-plan-full-access",
+      });
+      const planEvent = yield* Fiber.join(proposedPlanEvent);
+      assert.isTrue(Option.isSome(planEvent));
+      if (Option.isSome(planEvent) && planEvent.value.type === "plan.updated") {
+        assert.equal(planEvent.value.plan.kind, "proposed_plan");
+        if (planEvent.value.plan.kind === "proposed_plan") {
+          assert.equal(planEvent.value.plan.markdown, longPlan.trim());
         }
-        const requestEvent = yield* runtime.events.pipe(
-          Stream.filter((event) => event.type === "runtime_request.updated"),
-          Stream.runHead,
-          Effect.forkScoped,
-        );
-        const signal = yield* Effect.abortSignal;
-        const dialog = yield* Effect.promise(() =>
+      }
+      const requestEvent = yield* runtime.events.pipe(
+        Stream.filter((event) => event.type === "runtime_request.updated"),
+        Stream.runHead,
+        Effect.forkScoped,
+      );
+      const signal = yield* Effect.abortSignal;
+      const dialog = yield* Effect.promise(() =>
+        callback!(
+          {
+            dialogKind: "resume_return",
+            payload: { sessionAgeMinutes: 90, estimatedTokens: 120000 },
+          },
+          { signal, requestId: "dialog-resume-1" },
+        ),
+      ).pipe(Effect.forkScoped);
+      const event = yield* Fiber.join(requestEvent);
+      assert.isTrue(Option.isSome(event));
+      if (Option.isNone(event) || event.value.type !== "runtime_request.updated") return;
+      const question = formatClaudeResumeCompactionQuestion({
+        ageMinutes: 90,
+        estimatedTokens: 120000,
+      });
+      yield* runtime.respondToRuntimeRequest({
+        requestId: event.value.runtimeRequest.id,
+        answers: { [question]: "Compact and continue" },
+      });
+      assert.deepEqual(yield* Fiber.join(dialog), { behavior: "completed", result: "compact" });
+
+      assert.deepEqual(
+        yield* Effect.promise(() =>
           callback!(
             {
               dialogKind: "resume_return",
               payload: { sessionAgeMinutes: 90, estimatedTokens: 120000 },
             },
-            { signal, requestId: "dialog-resume-1" },
-          ),
-        ).pipe(Effect.forkScoped);
-        const event = yield* Fiber.join(requestEvent);
-        assert.isTrue(Option.isSome(event));
-        if (Option.isNone(event) || event.value.type !== "runtime_request.updated") return;
-        const question = formatClaudeResumeCompactionQuestion({
-          ageMinutes: 90,
-          estimatedTokens: 120000,
-        });
-        yield* runtime.respondToRuntimeRequest({
-          requestId: event.value.runtimeRequest.id,
-          answers: { [question]: "Compact and continue" },
-        });
-        assert.deepEqual(yield* Fiber.join(dialog), { behavior: "completed", result: "compact" });
-
-        assert.deepEqual(
-          yield* Effect.promise(() =>
-            callback!(
-              {
-                dialogKind: "resume_return",
-                payload: { sessionAgeMinutes: 90, estimatedTokens: 120000 },
-              },
-              { signal: AbortSignal.abort(), requestId: "dialog-resume-2" },
-            ),
-          ),
-          { behavior: "cancelled" },
-        );
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
+            { signal: AbortSignal.abort(), requestId: "dialog-resume-2" },
           ),
         ),
+        { behavior: "cancelled" },
+      );
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
+        ),
       ),
     ),
   );
@@ -2076,555 +2070,543 @@ describe("ClaudeAdapterV2 attachments", () => {
   ])(
     "preserves $name with native PDFs, images, and paths on sends and steering",
     ({ prompt, expectedText, command, ultrathink, resumed, budget }) =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const fileSystem = yield* FileSystem.FileSystem;
-          const idAllocator = yield* IdAllocator.IdAllocatorV2;
-          const path = yield* Path.Path;
-          const claudeHome = yield* fileSystem.makeTempDirectoryScoped({
-            prefix: "t3-claude-v2-skills-home-",
-          });
-          yield* fileSystem.makeDirectory(path.join(claudeHome, "skills", "implement"), {
-            recursive: true,
-          });
-          yield* fileSystem.writeFileString(
-            path.join(claudeHome, "skills", "implement", "SKILL.md"),
-            "---\ndescription: Implement the requested change\n---\nImplement it.\n",
-          );
-          const modelSelection = {
-            ...CLAUDE_TEST_MODEL_SELECTION,
-            options: ultrathink ? CLAUDE_TEST_MODEL_SELECTION.options : [],
-          };
-          const attachmentsDir = yield* fileSystem.makeTempDirectoryScoped({
-            prefix: "t3-claude-v2-attachments-",
-          });
-          const offeredMessages: Array<SDKUserMessage> = [];
-          let failOpen = false;
-          let failOffer = false;
-          let cancelAfterQueue = false;
-          const queued = yield* Deferred.make<void>();
-          const adapter = yield* ClaudeAdapterV2.makeClaudeAdapterV2({
-            instanceId: ClaudeAdapterV2.CLAUDE_DEFAULT_INSTANCE_ID,
-            settings: { ...DEFAULT_CLAUDE_SETTINGS, homePath: claudeHome },
-            environment: {},
-            attachmentsDir,
-            fileSystem,
-            path: yield* Path.Path,
-            random: yield* SecureRandom.SecureRandom,
-            idAllocator,
-            queryRunner: {
-              allocateSessionId: Effect.succeed("native-thread-claude-attachments"),
-              open: () =>
-                Effect.gen(function* () {
-                  if (failOpen) {
-                    failOpen = false;
-                    return yield* new ClaudeAdapterV2.ClaudeAgentSdkQueryRunnerError({
-                      method: "open",
-                      cause: "rejected open",
-                    });
-                  }
-                  const messages = yield* Queue.unbounded<SDKMessage>();
-                  return {
-                    messages: Stream.fromQueue(messages),
-                    offer: (message, onQueued) =>
-                      Effect.suspend(() => {
-                        if (failOffer) {
-                          failOffer = false;
-                          return Effect.fail(
-                            new ClaudeAdapterV2.ClaudeAgentSdkQueryRunnerError({
-                              method: "offer",
-                              cause: "rejected offer",
-                            }),
-                          );
-                        }
-                        return Effect.sync(() => {
-                          offeredMessages.push(message);
-                          onQueued?.();
-                        }).pipe(
-                          Effect.andThen(() =>
-                            cancelAfterQueue
-                              ? Deferred.succeed(queued, undefined).pipe(
-                                  Effect.andThen(Effect.never),
-                                )
-                              : Effect.void,
-                          ),
+      Effect.gen(function* () {
+        const fileSystem = yield* FileSystem.FileSystem;
+        const idAllocator = yield* IdAllocator.IdAllocatorV2;
+        const path = yield* Path.Path;
+        const claudeHome = yield* fileSystem.makeTempDirectoryScoped({
+          prefix: "t3-claude-v2-skills-home-",
+        });
+        yield* fileSystem.makeDirectory(path.join(claudeHome, "skills", "implement"), {
+          recursive: true,
+        });
+        yield* fileSystem.writeFileString(
+          path.join(claudeHome, "skills", "implement", "SKILL.md"),
+          "---\ndescription: Implement the requested change\n---\nImplement it.\n",
+        );
+        const modelSelection = {
+          ...CLAUDE_TEST_MODEL_SELECTION,
+          options: ultrathink ? CLAUDE_TEST_MODEL_SELECTION.options : [],
+        };
+        const attachmentsDir = yield* fileSystem.makeTempDirectoryScoped({
+          prefix: "t3-claude-v2-attachments-",
+        });
+        const offeredMessages: Array<SDKUserMessage> = [];
+        let failOpen = false;
+        let failOffer = false;
+        let cancelAfterQueue = false;
+        const queued = yield* Deferred.make<void>();
+        const adapter = yield* ClaudeAdapterV2.makeClaudeAdapterV2({
+          instanceId: ClaudeAdapterV2.CLAUDE_DEFAULT_INSTANCE_ID,
+          settings: { ...DEFAULT_CLAUDE_SETTINGS, homePath: claudeHome },
+          environment: {},
+          attachmentsDir,
+          fileSystem,
+          path: yield* Path.Path,
+          random: yield* SecureRandom.SecureRandom,
+          idAllocator,
+          queryRunner: {
+            allocateSessionId: Effect.succeed("native-thread-claude-attachments"),
+            open: () =>
+              Effect.gen(function* () {
+                if (failOpen) {
+                  failOpen = false;
+                  return yield* new ClaudeAdapterV2.ClaudeAgentSdkQueryRunnerError({
+                    method: "open",
+                    cause: "rejected open",
+                  });
+                }
+                const messages = yield* Queue.unbounded<SDKMessage>();
+                return {
+                  messages: Stream.fromQueue(messages),
+                  offer: (message, onQueued) =>
+                    Effect.suspend(() => {
+                      if (failOffer) {
+                        failOffer = false;
+                        return Effect.fail(
+                          new ClaudeAdapterV2.ClaudeAgentSdkQueryRunnerError({
+                            method: "offer",
+                            cause: "rejected offer",
+                          }),
                         );
-                      }),
-                    setModel: () => Effect.void,
-                    applyFlagSettings: () => Effect.void,
-                    setPermissionMode: () => Effect.void,
-                    backgroundTasks: () => Effect.succeed(false),
-                    mcpServerStatus: Effect.succeed([]),
-                    readMcpResource: () => Effect.die("unexpected MCP resource read"),
-                    callMcpTool: () => Effect.die("unexpected MCP tool call"),
-                    listPermissionRules: Effect.die("unexpected permission rules read"),
-                    stopTask: () => Effect.void,
-                    interrupt: Effect.void,
-                    close: Queue.shutdown(messages),
-                  };
-                }),
-              forkSession: () => Effect.die("unused forkSession"),
-              subagentLaunchToolUseId: () => Effect.succeed(null),
-              subagentModel: () => Effect.succeed(null),
-              assertComplete: Effect.void,
-            },
-          });
-          const threadId = ThreadId.make("thread-claude-attachments");
-          const providerSessionId = ProviderSessionId.make("provider-session-claude-attachments");
-          const runtime = yield* adapter.openSession({
-            threadId,
-            providerSessionId,
-            modelSelection,
-            runtimePolicy: CLAUDE_TEST_RUNTIME_POLICY,
-          });
-          const providerThread = yield* runtime.ensureThread({
-            threadId,
-            modelSelection,
-            runtimePolicy: CLAUDE_TEST_RUNTIME_POLICY,
-          });
-          const attachment = ChatImageAttachment.make({
-            type: "image",
-            id: ChatAttachmentId.make(
-              "thread-claude-attachments-12345678-1234-1234-1234-123456789abc",
-            ),
-            name: "diagram.png",
-            mimeType: "image/png",
-            sizeBytes: 4,
-          });
-          const document = ChatFileAttachment.make({
-            type: "file",
-            id: ChatAttachmentId.make(
-              "thread-claude-attachments-abcdefab-1234-1234-1234-123456789abc",
-            ),
-            name: "requirements.pdf",
-            mimeType: "application/pdf",
-            sizeBytes: 4,
-          });
-          yield* fileSystem.writeFile(
-            path.join(attachmentsDir, attachmentRelativePath(attachment)!),
-            Uint8Array.from([1, 2, 3, 4]),
-          );
-          const pdfBytes = Buffer.from(
-            "%PDF-1.7\n1 0 obj << /Type /Catalog /Pages 2 0 R >> endobj\n2 0 obj << /Type /Pages /Count 1 /Kids [3 0 R] >> endobj\n3 0 obj << /Type /Page /Parent 2 0 R >> endobj\n%%EOF",
-          );
-          yield* fileSystem.writeFile(
-            path.join(attachmentsDir, attachmentRelativePath(document)!),
-            pdfBytes,
-          );
-          const attemptId = RunAttemptId.make("attempt-claude-attachments");
-          const now = yield* DateTime.now;
-
-          const turnInput = {
-            ...makeClaudeTestTurnInput({
-              threadId,
-              providerThread,
-              now,
-              attemptId,
-              modelSelection,
-              text: prompt,
-              attachments: resumed ? [attachment] : [attachment, document],
-            }),
-            nativeThreadHasTurns: resumed,
-          };
-          if (budget === "cancelled-send" || budget === "cancelled-steer") {
-            const documentPath = path.join(attachmentsDir, attachmentRelativePath(document)!);
-            const pages = Buffer.from(
-              `%PDF-1.7\n1 0 obj << /Type /Catalog /Pages 2 0 R >> endobj\n2 0 obj << /Type /Pages /Count 60 >> endobj\n${Array.from({ length: 60 }, (_, i) => `${i + 3} 0 obj << /Type /Page /Parent 2 0 R >> endobj`).join("\n")}\n`,
-            );
-            yield* fileSystem.writeFile(
-              documentPath,
-              Buffer.concat([
-                pages,
-                Buffer.alloc(19 * 1024 * 1024 - pages.length - 5, 32),
-                Buffer.from("%%EOF"),
-              ]),
-            );
-            const message = { ...turnInput.message, attachments: [document] };
-            if (budget === "cancelled-steer") {
-              yield* runtime.startTurn({ ...turnInput, message: { ...message, attachments: [] } });
-            }
-            const deliver =
-              budget === "cancelled-send"
-                ? runtime.startTurn({ ...turnInput, message })
-                : runtime.steerTurn({
-                    threadId,
-                    runId: turnInput.runId,
-                    providerThread,
-                    providerTurnId: idAllocator.derive.providerTurn({
-                      driver: ClaudeAdapterV2.CLAUDE_PROVIDER,
-                      nativeTurnId: `turn:${attemptId}`,
+                      }
+                      return Effect.sync(() => {
+                        offeredMessages.push(message);
+                        onQueued?.();
+                      }).pipe(
+                        Effect.andThen(() =>
+                          cancelAfterQueue
+                            ? Deferred.succeed(queued, undefined).pipe(Effect.andThen(Effect.never))
+                            : Effect.void,
+                        ),
+                      );
                     }),
-                    message,
-                  });
-            cancelAfterQueue = true;
-            const delivering = yield* deliver.pipe(Effect.forkChild);
-            yield* Deferred.await(queued);
-            yield* Fiber.interrupt(delivering);
-            const delivered = offeredMessages.at(-1)!.message.content;
-            assert.include(JSON.stringify(delivered), '"type":"document"');
-            cancelAfterQueue = false;
-            if (budget === "cancelled-send") {
-              yield* runtime.interruptTurn({
-                providerThread,
-                providerTurnId: idAllocator.derive.providerTurn({
-                  driver: ClaudeAdapterV2.CLAUDE_PROVIDER,
-                  nativeTurnId: `turn:${attemptId}`,
-                }),
-              });
-            }
-            yield* deliver;
-            const retried = offeredMessages.at(-1)!.message.content;
-            assert.notInclude(JSON.stringify(retried), '"type":"document"');
-            assert.include(JSON.stringify(retried), JSON.stringify(documentPath).slice(1, -1));
-            assert.isBelow(Buffer.byteLength(JSON.stringify(offeredMessages)), 32_000_000);
-            return;
-          }
-          if (budget !== "none") {
-            const providerTurnId = idAllocator.derive.providerTurn({
-              driver: ClaudeAdapterV2.CLAUDE_PROVIDER,
-              nativeTurnId: `turn:${attemptId}`,
-            });
-            const imagePath = path.join(attachmentsDir, attachmentRelativePath(attachment)!);
-            // The on-disk length deliberately disagrees with sizeBytes.
-            yield* fileSystem.writeFile(imagePath, Buffer.alloc(4 * 1024 * 1024));
-            if (["later-images", "partial-images"].includes(budget)) {
-              const documentPath = path.join(attachmentsDir, attachmentRelativePath(document)!);
-              yield* fileSystem.writeFile(
-                documentPath,
-                Buffer.concat([
-                  pdfBytes.subarray(0, -5),
-                  Buffer.alloc(
-                    (budget === "later-images" ? 19 : 16) * 1024 * 1024 - pdfBytes.length,
-                    32,
-                  ),
-                  Buffer.from("%%EOF"),
-                ]),
-              );
-              yield* runtime.startTurn({
-                ...turnInput,
-                message: { ...turnInput.message, attachments: [document] },
-              });
-              assert.include(
-                JSON.stringify(offeredMessages[0]!.message.content),
-                '"type":"document"',
-              );
-              const message = { ...turnInput.message, attachments: [attachment, attachment] };
-              yield* runtime.interruptTurn({ providerThread, providerTurnId });
-              const laterAttemptId = RunAttemptId.make("attempt-claude-attachments-later");
-              yield* runtime.startTurn({
-                ...turnInput,
-                attemptId: laterAttemptId,
-                providerTurnOrdinal: 2,
-                nativeThreadHasTurns: true,
-                message,
-              });
-              const sent = offeredMessages.at(-1)!.message.content;
-              assert.isArray(sent);
-              assert.lengthOf(
-                typeof sent === "string" ? [] : sent.filter((block) => block.type === "image"),
-                budget === "partial-images" ? 1 : 0,
-              );
-              assert.include(JSON.stringify(sent), JSON.stringify(imagePath).slice(1, -1));
-              yield* runtime.steerTurn({
-                threadId,
-                runId: RunId.make("run-claude-attachments"),
-                providerThread,
-                providerTurnId: idAllocator.derive.providerTurn({
-                  driver: ClaudeAdapterV2.CLAUDE_PROVIDER,
-                  nativeTurnId: `turn:${laterAttemptId}`,
-                }),
-                message,
-              });
-              const steered = offeredMessages.at(-1)!.message.content;
-              assert.isArray(steered);
-              assert.lengthOf(
-                typeof steered === "string"
-                  ? []
-                  : steered.filter((block) => block.type === "image"),
-                0,
-              );
-              assert.include(JSON.stringify(steered), JSON.stringify(imagePath).slice(1, -1));
-              assert.isBelow(
-                Buffer.byteLength(
-                  JSON.stringify(offeredMessages.map((message) => message.message)),
+                  setModel: () => Effect.void,
+                  applyFlagSettings: () => Effect.void,
+                  setPermissionMode: () => Effect.void,
+                  backgroundTasks: () => Effect.succeed(false),
+                  mcpServerStatus: Effect.succeed([]),
+                  readMcpResource: () => Effect.die("unexpected MCP resource read"),
+                  callMcpTool: () => Effect.die("unexpected MCP tool call"),
+                  listPermissionRules: Effect.die("unexpected permission rules read"),
+                  stopTask: () => Effect.void,
+                  interrupt: Effect.void,
+                  close: Queue.shutdown(messages),
+                };
+              }),
+            forkSession: () => Effect.die("unused forkSession"),
+            subagentLaunchToolUseId: () => Effect.succeed(null),
+            subagentModel: () => Effect.succeed(null),
+            assertComplete: Effect.void,
+          },
+        });
+        const threadId = ThreadId.make("thread-claude-attachments");
+        const providerSessionId = ProviderSessionId.make("provider-session-claude-attachments");
+        const runtime = yield* adapter.openSession({
+          threadId,
+          providerSessionId,
+          modelSelection,
+          runtimePolicy: CLAUDE_TEST_RUNTIME_POLICY,
+        });
+        const providerThread = yield* runtime.ensureThread({
+          threadId,
+          modelSelection,
+          runtimePolicy: CLAUDE_TEST_RUNTIME_POLICY,
+        });
+        const attachment = ChatImageAttachment.make({
+          type: "image",
+          id: ChatAttachmentId.make(
+            "thread-claude-attachments-12345678-1234-1234-1234-123456789abc",
+          ),
+          name: "diagram.png",
+          mimeType: "image/png",
+          sizeBytes: 4,
+        });
+        const document = ChatFileAttachment.make({
+          type: "file",
+          id: ChatAttachmentId.make(
+            "thread-claude-attachments-abcdefab-1234-1234-1234-123456789abc",
+          ),
+          name: "requirements.pdf",
+          mimeType: "application/pdf",
+          sizeBytes: 4,
+        });
+        yield* fileSystem.writeFile(
+          path.join(attachmentsDir, attachmentRelativePath(attachment)!),
+          Uint8Array.from([1, 2, 3, 4]),
+        );
+        const pdfBytes = Buffer.from(
+          "%PDF-1.7\n1 0 obj << /Type /Catalog /Pages 2 0 R >> endobj\n2 0 obj << /Type /Pages /Count 1 /Kids [3 0 R] >> endobj\n3 0 obj << /Type /Page /Parent 2 0 R >> endobj\n%%EOF",
+        );
+        yield* fileSystem.writeFile(
+          path.join(attachmentsDir, attachmentRelativePath(document)!),
+          pdfBytes,
+        );
+        const attemptId = RunAttemptId.make("attempt-claude-attachments");
+        const now = yield* DateTime.now;
+
+        const turnInput = {
+          ...makeClaudeTestTurnInput({
+            threadId,
+            providerThread,
+            now,
+            attemptId,
+            modelSelection,
+            text: prompt,
+            attachments: resumed ? [attachment] : [attachment, document],
+          }),
+          nativeThreadHasTurns: resumed,
+        };
+        if (budget === "cancelled-send" || budget === "cancelled-steer") {
+          const documentPath = path.join(attachmentsDir, attachmentRelativePath(document)!);
+          const pages = Buffer.from(
+            `%PDF-1.7\n1 0 obj << /Type /Catalog /Pages 2 0 R >> endobj\n2 0 obj << /Type /Pages /Count 60 >> endobj\n${Array.from({ length: 60 }, (_, i) => `${i + 3} 0 obj << /Type /Page /Parent 2 0 R >> endobj`).join("\n")}\n`,
+          );
+          yield* fileSystem.writeFile(
+            documentPath,
+            Buffer.concat([
+              pages,
+              Buffer.alloc(19 * 1024 * 1024 - pages.length - 5, 32),
+              Buffer.from("%%EOF"),
+            ]),
+          );
+          const message = { ...turnInput.message, attachments: [document] };
+          if (budget === "cancelled-steer") {
+            yield* runtime.startTurn({ ...turnInput, message: { ...message, attachments: [] } });
+          }
+          const deliver =
+            budget === "cancelled-send"
+              ? runtime.startTurn({ ...turnInput, message })
+              : runtime.steerTurn({
+                  threadId,
+                  runId: turnInput.runId,
+                  providerThread,
+                  providerTurnId: idAllocator.derive.providerTurn({
+                    driver: ClaudeAdapterV2.CLAUDE_PROVIDER,
+                    nativeTurnId: `turn:${attemptId}`,
+                  }),
+                  message,
+                });
+          cancelAfterQueue = true;
+          const delivering = yield* deliver.pipe(Effect.forkChild);
+          yield* Deferred.await(queued);
+          yield* Fiber.interrupt(delivering);
+          const delivered = offeredMessages.at(-1)!.message.content;
+          assert.include(JSON.stringify(delivered), '"type":"document"');
+          cancelAfterQueue = false;
+          if (budget === "cancelled-send") {
+            yield* runtime.interruptTurn({
+              providerThread,
+              providerTurnId: idAllocator.derive.providerTurn({
+                driver: ClaudeAdapterV2.CLAUDE_PROVIDER,
+                nativeTurnId: `turn:${attemptId}`,
+              }),
+            });
+          }
+          yield* deliver;
+          const retried = offeredMessages.at(-1)!.message.content;
+          assert.notInclude(JSON.stringify(retried), '"type":"document"');
+          assert.include(JSON.stringify(retried), JSON.stringify(documentPath).slice(1, -1));
+          assert.isBelow(Buffer.byteLength(JSON.stringify(offeredMessages)), 32_000_000);
+          return;
+        }
+        if (budget !== "none") {
+          const providerTurnId = idAllocator.derive.providerTurn({
+            driver: ClaudeAdapterV2.CLAUDE_PROVIDER,
+            nativeTurnId: `turn:${attemptId}`,
+          });
+          const imagePath = path.join(attachmentsDir, attachmentRelativePath(attachment)!);
+          // The on-disk length deliberately disagrees with sizeBytes.
+          yield* fileSystem.writeFile(imagePath, Buffer.alloc(4 * 1024 * 1024));
+          if (["later-images", "partial-images"].includes(budget)) {
+            const documentPath = path.join(attachmentsDir, attachmentRelativePath(document)!);
+            yield* fileSystem.writeFile(
+              documentPath,
+              Buffer.concat([
+                pdfBytes.subarray(0, -5),
+                Buffer.alloc(
+                  (budget === "later-images" ? 19 : 16) * 1024 * 1024 - pdfBytes.length,
+                  32,
                 ),
-                32_000_000,
-              );
-              return;
-            }
-            if (budget === "retained-documents") {
-              yield* fileSystem.writeFile(
-                path.join(attachmentsDir, attachmentRelativePath(document)!),
-                Buffer.concat([
-                  pdfBytes.subarray(0, pdfBytes.length - 5),
-                  Buffer.alloc(10 * 1024 * 1024, 32),
-                  Buffer.from("%%EOF"),
-                ]),
-              );
-            }
+                Buffer.from("%%EOF"),
+              ]),
+            );
             yield* runtime.startTurn({
               ...turnInput,
-              message: {
-                ...turnInput.message,
-                text: budget === "retained-text" ? "x".repeat(10 * 1024 * 1024) : prompt,
-                attachments:
-                  budget === "retained-text"
-                    ? []
-                    : budget === "retained-documents"
-                      ? [document]
-                      : [attachment, attachment],
-              },
+              message: { ...turnInput.message, attachments: [document] },
             });
-            const largePdf = Buffer.concat([
-              pdfBytes.subarray(0, pdfBytes.length - 5),
-              Buffer.alloc(
-                (budget === "retained-documents" ? 20 : 19) * 1024 * 1024 - pdfBytes.length,
-                32,
-              ),
-              Buffer.from("%%EOF"),
-            ]);
-            const documentPath = path.join(attachmentsDir, attachmentRelativePath(document)!);
-            yield* fileSystem.writeFile(documentPath, largePdf);
+            assert.include(
+              JSON.stringify(offeredMessages[0]!.message.content),
+              '"type":"document"',
+            );
+            const message = { ...turnInput.message, attachments: [attachment, attachment] };
+            yield* runtime.interruptTurn({ providerThread, providerTurnId });
+            const laterAttemptId = RunAttemptId.make("attempt-claude-attachments-later");
+            yield* runtime.startTurn({
+              ...turnInput,
+              attemptId: laterAttemptId,
+              providerTurnOrdinal: 2,
+              nativeThreadHasTurns: true,
+              message,
+            });
+            const sent = offeredMessages.at(-1)!.message.content;
+            assert.isArray(sent);
+            assert.lengthOf(
+              typeof sent === "string" ? [] : sent.filter((block) => block.type === "image"),
+              budget === "partial-images" ? 1 : 0,
+            );
+            assert.include(JSON.stringify(sent), JSON.stringify(imagePath).slice(1, -1));
             yield* runtime.steerTurn({
               threadId,
               runId: RunId.make("run-claude-attachments"),
               providerThread,
-              providerTurnId,
-              message: {
-                ...turnInput.message,
-                attachments:
-                  budget === "same-message-images"
-                    ? [document, attachment, attachment]
-                    : [document],
-              },
+              providerTurnId: idAllocator.derive.providerTurn({
+                driver: ClaudeAdapterV2.CLAUDE_PROVIDER,
+                nativeTurnId: `turn:${laterAttemptId}`,
+              }),
+              message,
             });
-            const sent = offeredMessages.at(-1)!.message.content;
-            assert.isArray(sent);
+            const steered = offeredMessages.at(-1)!.message.content;
+            assert.isArray(steered);
             assert.lengthOf(
-              typeof sent === "string" ? [] : sent.filter((block) => block.type === "document"),
+              typeof steered === "string" ? [] : steered.filter((block) => block.type === "image"),
               0,
-              budget,
             );
-            assert.include(JSON.stringify(sent), JSON.stringify(documentPath).slice(1, -1));
+            assert.include(JSON.stringify(steered), JSON.stringify(imagePath).slice(1, -1));
+            assert.isBelow(
+              Buffer.byteLength(JSON.stringify(offeredMessages.map((message) => message.message))),
+              32_000_000,
+            );
             return;
           }
-          if (!resumed) {
-            const undelivered = Buffer.from(
-              `%PDF-1.7\n1 0 obj << /Type /Catalog /Pages 2 0 R >> endobj\n2 0 obj << /Type /Pages /Count 60 >> endobj\n${Array.from({ length: 60 }, (_, i) => `${i + 3} 0 obj << /Type /Page /Parent 2 0 R >> endobj`).join("\n")}\n%%EOF`,
-            );
-            yield* fileSystem.writeFile(
-              path.join(attachmentsDir, attachmentRelativePath(document)!),
-              undelivered,
-            );
-            failOpen = true;
-            assert.isTrue(Exit.isFailure(yield* runtime.startTurn(turnInput).pipe(Effect.exit)));
-            assert.lengthOf(offeredMessages, 0);
+          if (budget === "retained-documents") {
             yield* fileSystem.writeFile(
               path.join(attachmentsDir, attachmentRelativePath(document)!),
-              pdfBytes,
+              Buffer.concat([
+                pdfBytes.subarray(0, pdfBytes.length - 5),
+                Buffer.alloc(10 * 1024 * 1024, 32),
+                Buffer.from("%%EOF"),
+              ]),
             );
           }
-          yield* runtime.startTurn(turnInput);
-
-          const expectedImageBlock = {
-            type: "image",
-            source: {
-              type: "base64",
-              media_type: "image/png",
-              data: "AQIDBA==",
-            },
-          } as const;
-          const expectedDocumentBlock = {
-            type: "document",
-            source: {
-              type: "base64",
-              media_type: "application/pdf",
-              data: Buffer.from(pdfBytes).toString("base64"),
+          yield* runtime.startTurn({
+            ...turnInput,
+            message: {
+              ...turnInput.message,
+              text: budget === "retained-text" ? "x".repeat(10 * 1024 * 1024) : prompt,
+              attachments:
+                budget === "retained-text"
+                  ? []
+                  : budget === "retained-documents"
+                    ? [document]
+                    : [attachment, attachment],
             },
-          } as const;
-          const expectedAttachmentPath = path.join(
-            attachmentsDir,
-            attachmentRelativePath(attachment)!,
-          );
-          const expectedDocumentPath = path.join(attachmentsDir, attachmentRelativePath(document)!);
-          const attachmentNotes = `\n\n[Attached image "diagram.png" is saved at: ${expectedAttachmentPath}]${resumed ? "" : `\n\n[Attached file "requirements.pdf" is saved at: ${expectedDocumentPath}]`}`;
-          const requestBlock = { type: "text" as const, text: expectedText + attachmentNotes };
-          const expectedContent = command
-            ? [
-                requestBlock,
-                expectedImageBlock,
-                ...(!resumed ? [expectedDocumentBlock] : []),
-                { type: "text" as const, text: command + attachmentNotes },
-              ]
-            : [expectedImageBlock, ...(!resumed ? [expectedDocumentBlock] : []), requestBlock];
-          assert.deepEqual(offeredMessages[0]?.message.content, expectedContent);
-
-          const providerTurnId = idAllocator.derive.providerTurn({
-            driver: ClaudeAdapterV2.CLAUDE_PROVIDER,
-            nativeTurnId: `turn:${attemptId}`,
           });
+          const largePdf = Buffer.concat([
+            pdfBytes.subarray(0, pdfBytes.length - 5),
+            Buffer.alloc(
+              (budget === "retained-documents" ? 20 : 19) * 1024 * 1024 - pdfBytes.length,
+              32,
+            ),
+            Buffer.from("%%EOF"),
+          ]);
+          const documentPath = path.join(attachmentsDir, attachmentRelativePath(document)!);
+          yield* fileSystem.writeFile(documentPath, largePdf);
           yield* runtime.steerTurn({
             threadId,
             runId: RunId.make("run-claude-attachments"),
             providerThread,
             providerTurnId,
             message: {
-              createdBy: "user",
-              creationSource: "web",
-              messageId: MessageId.make("message-claude-attachments-steer"),
-              text: prompt,
-              attachments: resumed ? [attachment] : [attachment, document],
+              ...turnInput.message,
+              attachments:
+                budget === "same-message-images" ? [document, attachment, attachment] : [document],
             },
           });
+          const sent = offeredMessages.at(-1)!.message.content;
+          assert.isArray(sent);
+          assert.lengthOf(
+            typeof sent === "string" ? [] : sent.filter((block) => block.type === "document"),
+            0,
+            budget,
+          );
+          assert.include(JSON.stringify(sent), JSON.stringify(documentPath).slice(1, -1));
+          return;
+        }
+        if (!resumed) {
+          const undelivered = Buffer.from(
+            `%PDF-1.7\n1 0 obj << /Type /Catalog /Pages 2 0 R >> endobj\n2 0 obj << /Type /Pages /Count 60 >> endobj\n${Array.from({ length: 60 }, (_, i) => `${i + 3} 0 obj << /Type /Page /Parent 2 0 R >> endobj`).join("\n")}\n%%EOF`,
+          );
+          yield* fileSystem.writeFile(
+            path.join(attachmentsDir, attachmentRelativePath(document)!),
+            undelivered,
+          );
+          failOpen = true;
+          assert.isTrue(Exit.isFailure(yield* runtime.startTurn(turnInput).pipe(Effect.exit)));
+          assert.lengthOf(offeredMessages, 0);
+          yield* fileSystem.writeFile(
+            path.join(attachmentsDir, attachmentRelativePath(document)!),
+            pdfBytes,
+          );
+        }
+        yield* runtime.startTurn(turnInput);
 
-          assert.equal(offeredMessages[1]?.priority, "now");
-          assert.deepEqual(offeredMessages[1]?.message.content, expectedContent);
-          const documentPath = path.join(attachmentsDir, attachmentRelativePath(document)!);
-          for (const scenario of [
-            "pages",
-            "bytes",
-            "invalid",
-            "invalid-page-tree",
-            "object-stream",
-            "encrypted",
-            "cyclic-tree",
-            "unterminated-string",
-            "missing-eof",
-            "escaped-name",
-            "incremental",
-            "indirect-count",
-            "indirect-type",
-            "indirect-kids",
-            "indirect-101-pages",
-            "aggregate-pages",
-            "retained-pages",
-            "delivery-failure",
-            "pasted-text",
-            "text-only",
-          ]) {
-            let attachments: ReadonlyArray<ChatAttachment> = [document];
-            if (
-              ["pages", "aggregate-pages", "retained-pages", "delivery-failure"].includes(scenario)
-            ) {
-              const pages = scenario === "pages" ? 101 : scenario === "delivery-failure" ? 30 : 60;
-              const large = Buffer.from(
-                `%PDF-1.7\n1 0 obj << /Type /Catalog /Pages 2 0 R >> endobj\n2 0 obj << /Type /Pages /Count ${pages} >> endobj\n${Array.from({ length: pages }, (_, i) => `${i + 3} 0 obj << /Type /Page /Parent 2 0 R >> endobj`).join("\n")}\n%%EOF`,
-              );
-              yield* fileSystem.writeFile(documentPath, large);
-              if (scenario === "aggregate-pages") {
-                const second = {
-                  ...document,
-                  id: ChatAttachmentId.make("second-pdf"),
-                  name: "second.pdf",
-                };
-                yield* fileSystem.copyFile(
-                  documentPath,
-                  path.join(attachmentsDir, attachmentRelativePath(second)!),
-                );
-                attachments = [document, second];
-              }
-            } else if (scenario.startsWith("indirect-")) {
-              const raw =
-                scenario === "indirect-count" || scenario === "indirect-101-pages"
-                  ? `%PDF-1.7\n1 0 obj ${scenario === "indirect-count" ? 1 : 101} endobj\n2 0 obj << /Type /Catalog /Pages 3 0 R >> endobj\n3 0 obj << /Type /Pages /Count 1 0 R /Kids [${Array.from({ length: scenario === "indirect-count" ? 1 : 101 }, (_, i) => `${i + 4} 0 R`).join(" ")}] >> endobj\n4 0 obj << /Type /Page /Parent 3 0 R >> endobj\n${scenario === "indirect-count" ? "" : Array.from({ length: 100 }, (_, i) => `${i + 5} 0 obj << /Type 105 0 R /Parent 3 0 R >> endobj`).join("\n")}\n105 0 obj /Page endobj\n%%EOF`
-                  : scenario === "indirect-type"
-                    ? pdfBytes
-                        .toString()
-                        .replace(
-                          "%%EOF",
-                          "4 0 obj << /Type 5 0 R >> endobj\n5 0 obj /Annot endobj\n%%EOF",
-                        )
-                    : pdfBytes
-                        .toString()
-                        .replace("/Kids [3 0 R]", "/Kids 4 0 R")
-                        .replace("%%EOF", "4 0 obj [3 0 R] endobj\n%%EOF");
-              yield* fileSystem.writeFileString(documentPath, raw);
-            } else if (scenario === "bytes") {
-              yield* fileSystem.truncate(documentPath, 20 * 1024 * 1024 + 1);
-            } else if (scenario === "invalid") {
-              yield* fileSystem.writeFileString(documentPath, "This is not a PDF");
-            } else if (scenario === "invalid-page-tree") {
-              const malformedBytes = Buffer.from(
-                "%PDF-1.7\n1 0 obj\n<< /Type /Catalog /Pages 42 >>\nendobj\ntrailer\n<< /Root 1 0 R >>\n%%EOF",
-              );
-              yield* fileSystem.writeFile(documentPath, malformedBytes);
-            } else if (["object-stream", "encrypted", "cyclic-tree"].includes(scenario)) {
-              const suffix =
-                scenario === "encrypted"
-                  ? "/Encrypt 9 0 R"
-                  : scenario === "cyclic-tree"
-                    ? "/Count 0 /Kids [2 0 R]"
-                    : "/Type /ObjStm /Filter /FlateDecode /Length 1000000000";
-              yield* fileSystem.writeFile(
-                documentPath,
-                Buffer.concat([
-                  pdfBytes.subarray(0, pdfBytes.length - 5),
-                  Buffer.from(`\n4 0 obj << ${suffix} >> stream\nx\nendstream endobj\n%%EOF`),
-                ]),
-              );
-            } else if (
-              ["unterminated-string", "missing-eof", "escaped-name", "incremental"].includes(
-                scenario,
-              )
-            ) {
-              const raw = pdfBytes.toString();
-              yield* fileSystem.writeFileString(
+        const expectedImageBlock = {
+          type: "image",
+          source: {
+            type: "base64",
+            media_type: "image/png",
+            data: "AQIDBA==",
+          },
+        } as const;
+        const expectedDocumentBlock = {
+          type: "document",
+          source: {
+            type: "base64",
+            media_type: "application/pdf",
+            data: Buffer.from(pdfBytes).toString("base64"),
+          },
+        } as const;
+        const expectedAttachmentPath = path.join(
+          attachmentsDir,
+          attachmentRelativePath(attachment)!,
+        );
+        const expectedDocumentPath = path.join(attachmentsDir, attachmentRelativePath(document)!);
+        const attachmentNotes = `\n\n[Attached image "diagram.png" is saved at: ${expectedAttachmentPath}]${resumed ? "" : `\n\n[Attached file "requirements.pdf" is saved at: ${expectedDocumentPath}]`}`;
+        const requestBlock = { type: "text" as const, text: expectedText + attachmentNotes };
+        const expectedContent = command
+          ? [
+              requestBlock,
+              expectedImageBlock,
+              ...(!resumed ? [expectedDocumentBlock] : []),
+              { type: "text" as const, text: command + attachmentNotes },
+            ]
+          : [expectedImageBlock, ...(!resumed ? [expectedDocumentBlock] : []), requestBlock];
+        assert.deepEqual(offeredMessages[0]?.message.content, expectedContent);
+
+        const providerTurnId = idAllocator.derive.providerTurn({
+          driver: ClaudeAdapterV2.CLAUDE_PROVIDER,
+          nativeTurnId: `turn:${attemptId}`,
+        });
+        yield* runtime.steerTurn({
+          threadId,
+          runId: RunId.make("run-claude-attachments"),
+          providerThread,
+          providerTurnId,
+          message: {
+            createdBy: "user",
+            creationSource: "web",
+            messageId: MessageId.make("message-claude-attachments-steer"),
+            text: prompt,
+            attachments: resumed ? [attachment] : [attachment, document],
+          },
+        });
+
+        assert.equal(offeredMessages[1]?.priority, "now");
+        assert.deepEqual(offeredMessages[1]?.message.content, expectedContent);
+        const documentPath = path.join(attachmentsDir, attachmentRelativePath(document)!);
+        for (const scenario of [
+          "pages",
+          "bytes",
+          "invalid",
+          "invalid-page-tree",
+          "object-stream",
+          "encrypted",
+          "cyclic-tree",
+          "unterminated-string",
+          "missing-eof",
+          "escaped-name",
+          "incremental",
+          "indirect-count",
+          "indirect-type",
+          "indirect-kids",
+          "indirect-101-pages",
+          "aggregate-pages",
+          "retained-pages",
+          "delivery-failure",
+          "pasted-text",
+          "text-only",
+        ]) {
+          let attachments: ReadonlyArray<ChatAttachment> = [document];
+          if (
+            ["pages", "aggregate-pages", "retained-pages", "delivery-failure"].includes(scenario)
+          ) {
+            const pages = scenario === "pages" ? 101 : scenario === "delivery-failure" ? 30 : 60;
+            const large = Buffer.from(
+              `%PDF-1.7\n1 0 obj << /Type /Catalog /Pages 2 0 R >> endobj\n2 0 obj << /Type /Pages /Count ${pages} >> endobj\n${Array.from({ length: pages }, (_, i) => `${i + 3} 0 obj << /Type /Page /Parent 2 0 R >> endobj`).join("\n")}\n%%EOF`,
+            );
+            yield* fileSystem.writeFile(documentPath, large);
+            if (scenario === "aggregate-pages") {
+              const second = {
+                ...document,
+                id: ChatAttachmentId.make("second-pdf"),
+                name: "second.pdf",
+              };
+              yield* fileSystem.copyFile(
                 documentPath,
-                scenario === "missing-eof"
-                  ? raw.slice(0, -5)
-                  : scenario === "escaped-name"
-                    ? raw.replace("/Type /Page ", "/Type /Pa#67e ")
-                    : raw.replace(
-                        "%%EOF",
-                        scenario === "incremental" ? "/Prev 42\n%%EOF" : "(unfinished\n%%EOF",
-                      ),
+                path.join(attachmentsDir, attachmentRelativePath(second)!),
               );
-            } else if (scenario === "pasted-text") {
-              yield* fileSystem.writeFile(documentPath, pdfBytes);
-              attachments = [{ ...document, source: { _tag: "pasted-text" } }];
-            } else {
-              attachments = [];
-              yield* fileSystem.remove(documentPath);
-            }
-            const steering = {
-              threadId,
-              runId: RunId.make("run-claude-attachments"),
-              providerThread,
-              providerTurnId,
-              message: {
-                createdBy: "user",
-                creationSource: "web",
-                messageId: MessageId.make(`message-${scenario}`),
-                text: "Continue.",
-                attachments,
-              },
-            } satisfies ProviderAdapter.ProviderAdapterV2SteerInput;
-            if (scenario === "delivery-failure") {
-              failOffer = true;
-              assert.isTrue(Exit.isFailure(yield* runtime.steerTurn(steering).pipe(Effect.exit)));
+              attachments = [document, second];
             }
-            yield* runtime.steerTurn(steering);
-
-            const sent = offeredMessages.at(-1)!.message.content;
-            const documents =
-              typeof sent === "string" ? [] : sent.filter((block) => block.type === "document");
-            assert.lengthOf(
-              documents,
-              ["aggregate-pages", "delivery-failure"].includes(scenario) ? 1 : 0,
-              scenario,
+          } else if (scenario.startsWith("indirect-")) {
+            const raw =
+              scenario === "indirect-count" || scenario === "indirect-101-pages"
+                ? `%PDF-1.7\n1 0 obj ${scenario === "indirect-count" ? 1 : 101} endobj\n2 0 obj << /Type /Catalog /Pages 3 0 R >> endobj\n3 0 obj << /Type /Pages /Count 1 0 R /Kids [${Array.from({ length: scenario === "indirect-count" ? 1 : 101 }, (_, i) => `${i + 4} 0 R`).join(" ")}] >> endobj\n4 0 obj << /Type /Page /Parent 3 0 R >> endobj\n${scenario === "indirect-count" ? "" : Array.from({ length: 100 }, (_, i) => `${i + 5} 0 obj << /Type 105 0 R /Parent 3 0 R >> endobj`).join("\n")}\n105 0 obj /Page endobj\n%%EOF`
+                : scenario === "indirect-type"
+                  ? pdfBytes
+                      .toString()
+                      .replace(
+                        "%%EOF",
+                        "4 0 obj << /Type 5 0 R >> endobj\n5 0 obj /Annot endobj\n%%EOF",
+                      )
+                  : pdfBytes
+                      .toString()
+                      .replace("/Kids [3 0 R]", "/Kids 4 0 R")
+                      .replace("%%EOF", "4 0 obj [3 0 R] endobj\n%%EOF");
+            yield* fileSystem.writeFileString(documentPath, raw);
+          } else if (scenario === "bytes") {
+            yield* fileSystem.truncate(documentPath, 20 * 1024 * 1024 + 1);
+          } else if (scenario === "invalid") {
+            yield* fileSystem.writeFileString(documentPath, "This is not a PDF");
+          } else if (scenario === "invalid-page-tree") {
+            const malformedBytes = Buffer.from(
+              "%PDF-1.7\n1 0 obj\n<< /Type /Catalog /Pages 42 >>\nendobj\ntrailer\n<< /Root 1 0 R >>\n%%EOF",
+            );
+            yield* fileSystem.writeFile(documentPath, malformedBytes);
+          } else if (["object-stream", "encrypted", "cyclic-tree"].includes(scenario)) {
+            const suffix =
+              scenario === "encrypted"
+                ? "/Encrypt 9 0 R"
+                : scenario === "cyclic-tree"
+                  ? "/Count 0 /Kids [2 0 R]"
+                  : "/Type /ObjStm /Filter /FlateDecode /Length 1000000000";
+            yield* fileSystem.writeFile(
+              documentPath,
+              Buffer.concat([
+                pdfBytes.subarray(0, pdfBytes.length - 5),
+                Buffer.from(`\n4 0 obj << ${suffix} >> stream\nx\nendstream endobj\n%%EOF`),
+              ]),
+            );
+          } else if (
+            ["unterminated-string", "missing-eof", "escaped-name", "incremental"].includes(scenario)
+          ) {
+            const raw = pdfBytes.toString();
+            yield* fileSystem.writeFileString(
+              documentPath,
+              scenario === "missing-eof"
+                ? raw.slice(0, -5)
+                : scenario === "escaped-name"
+                  ? raw.replace("/Type /Page ", "/Type /Pa#67e ")
+                  : raw.replace(
+                      "%%EOF",
+                      scenario === "incremental" ? "/Prev 42\n%%EOF" : "(unfinished\n%%EOF",
+                    ),
             );
-            if (scenario === "text-only")
-              assert.equal(sent, ultrathink ? "Ultrathink:\nContinue." : "Continue.");
-            else assert.include(JSON.stringify(sent), JSON.stringify(documentPath).slice(1, -1));
+          } else if (scenario === "pasted-text") {
+            yield* fileSystem.writeFile(documentPath, pdfBytes);
+            attachments = [{ ...document, source: { _tag: "pasted-text" } }];
+          } else {
+            attachments = [];
+            yield* fileSystem.remove(documentPath);
           }
-        }).pipe(
-          Effect.provide(
-            Layer.mergeAll(
-              IdAllocator.layer,
-              McpProviderSessions.layer,
-              NodeServices.layer,
-              NodeCrypto.layer,
-            ),
+          const steering = {
+            threadId,
+            runId: RunId.make("run-claude-attachments"),
+            providerThread,
+            providerTurnId,
+            message: {
+              createdBy: "user",
+              creationSource: "web",
+              messageId: MessageId.make(`message-${scenario}`),
+              text: "Continue.",
+              attachments,
+            },
+          } satisfies ProviderAdapter.ProviderAdapterV2SteerInput;
+          if (scenario === "delivery-failure") {
+            failOffer = true;
+            assert.isTrue(Exit.isFailure(yield* runtime.steerTurn(steering).pipe(Effect.exit)));
+          }
+          yield* runtime.steerTurn(steering);
+
+          const sent = offeredMessages.at(-1)!.message.content;
+          const documents =
+            typeof sent === "string" ? [] : sent.filter((block) => block.type === "document");
+          assert.lengthOf(
+            documents,
+            ["aggregate-pages", "delivery-failure"].includes(scenario) ? 1 : 0,
+            scenario,
+          );
+          if (scenario === "text-only")
+            assert.equal(sent, ultrathink ? "Ultrathink:\nContinue." : "Continue.");
+          else assert.include(JSON.stringify(sent), JSON.stringify(documentPath).slice(1, -1));
+        }
+      }).pipe(
+        Effect.provide(
+          Layer.mergeAll(
+            IdAllocator.layer,
+            McpProviderSessions.layer,
+            NodeServices.layer,
+            NodeCrypto.layer,
           ),
         ),
       ),
@@ -2633,238 +2615,236 @@ describe("ClaudeAdapterV2 attachments", () => {
 
 describe("ClaudeAdapterV2 native fork", () => {
   it.effect("forks a session from its original directory after the workspace root changes", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const fileSystem = yield* FileSystem.FileSystem;
-        const idAllocator = yield* IdAllocator.IdAllocatorV2;
-        const attachmentsDir = yield* fileSystem.makeTempDirectoryScoped({
-          prefix: "t3-claude-v2-fork-attachments-",
-        });
-        const configDir = yield* fileSystem.makeTempDirectoryScoped({
-          prefix: "t3-claude-root-change-",
-        });
-        const sourceSessionId = "11111111-1111-4111-8111-111111111111";
-        const sourceCursor = "aaaaaaaa-0000-4000-8000-000000000002";
-        const projectDir = NodePath.join(configDir, "projects", "-old-workspace");
-        yield* fileSystem.makeDirectory(projectDir, { recursive: true });
-        const entry = (uuid: string, parentUuid: string | null, message: unknown) => ({
-          type: parentUuid === null ? "user" : "assistant",
-          uuid,
-          parentUuid,
-          sessionId: sourceSessionId,
-          cwd: "/old-workspace",
-          isSidechain: false,
-          timestamp: "2026-10-01T00:00:00.000Z",
-          message,
-        });
-        yield* fileSystem.writeFileString(
-          NodePath.join(projectDir, `${sourceSessionId}.jsonl`),
-          [
-            entry("aaaaaaaa-0000-4000-8000-000000000001", null, { role: "user", content: "hello" }),
-            entry(sourceCursor, "aaaaaaaa-0000-4000-8000-000000000001", {
-              role: "assistant",
-              content: [{ type: "text", text: "inherited answer" }],
-            }),
-          ]
-            .map((line) => JSON.stringify(line))
-            .join("\n"),
-        );
-        const realRunner = yield* ClaudeAdapterV2.ClaudeAgentSdkQueryRunner.pipe(
-          Effect.provide(
-            ClaudeAdapterV2.layerQueryRunner.pipe(
-              Layer.provide(PortScanner.layerTest),
-              Layer.provide(
-                Layer.succeed(ProviderEventLoggers.ProviderEventLoggers, {
-                  native: undefined,
-                  canonical: undefined,
-                }),
-              ),
+    Effect.gen(function* () {
+      const fileSystem = yield* FileSystem.FileSystem;
+      const idAllocator = yield* IdAllocator.IdAllocatorV2;
+      const attachmentsDir = yield* fileSystem.makeTempDirectoryScoped({
+        prefix: "t3-claude-v2-fork-attachments-",
+      });
+      const configDir = yield* fileSystem.makeTempDirectoryScoped({
+        prefix: "t3-claude-root-change-",
+      });
+      const sourceSessionId = "11111111-1111-4111-8111-111111111111";
+      const sourceCursor = "aaaaaaaa-0000-4000-8000-000000000002";
+      const projectDir = NodePath.join(configDir, "projects", "-old-workspace");
+      yield* fileSystem.makeDirectory(projectDir, { recursive: true });
+      const entry = (uuid: string, parentUuid: string | null, message: unknown) => ({
+        type: parentUuid === null ? "user" : "assistant",
+        uuid,
+        parentUuid,
+        sessionId: sourceSessionId,
+        cwd: "/old-workspace",
+        isSidechain: false,
+        timestamp: "2026-10-01T00:00:00.000Z",
+        message,
+      });
+      yield* fileSystem.writeFileString(
+        NodePath.join(projectDir, `${sourceSessionId}.jsonl`),
+        [
+          entry("aaaaaaaa-0000-4000-8000-000000000001", null, { role: "user", content: "hello" }),
+          entry(sourceCursor, "aaaaaaaa-0000-4000-8000-000000000001", {
+            role: "assistant",
+            content: [{ type: "text", text: "inherited answer" }],
+          }),
+        ]
+          .map((line) => JSON.stringify(line))
+          .join("\n"),
+      );
+      const realRunner = yield* ClaudeAdapterV2.ClaudeAgentSdkQueryRunner.pipe(
+        Effect.provide(
+          ClaudeAdapterV2.layerQueryRunner.pipe(
+            Layer.provide(PortScanner.layerTest),
+            Layer.provide(
+              Layer.succeed(ProviderEventLoggers.ProviderEventLoggers, {
+                native: undefined,
+                canonical: undefined,
+              }),
             ),
           ),
-        );
-        const openedQueries: Array<ClaudeAdapterV2.ClaudeAgentSdkQueryOpenInput> = [];
-        const forkCalls: Array<ClaudeAdapterV2.ClaudeAgentSdkSessionForkInput> = [];
-        const adapter = yield* ClaudeAdapterV2.makeClaudeAdapterV2({
-          instanceId: ClaudeAdapterV2.CLAUDE_DEFAULT_INSTANCE_ID,
-          settings: DEFAULT_CLAUDE_SETTINGS,
-          environment: { CLAUDE_CONFIG_DIR: configDir },
-          attachmentsDir,
-          fileSystem,
-          path: yield* Path.Path,
-          random: yield* SecureRandom.SecureRandom,
-          idAllocator,
-          queryRunner: {
-            allocateSessionId: Effect.succeed(sourceSessionId),
-            open: (input) =>
-              Effect.sync(() => {
-                openedQueries.push(input);
-                return {
-                  messages: Stream.never,
-                  offer: () => Effect.void,
-                  setModel: () => Effect.void,
-                  applyFlagSettings: () => Effect.void,
-                  setPermissionMode: () => Effect.void,
-                  backgroundTasks: () => Effect.succeed(false),
-                  mcpServerStatus: Effect.succeed([]),
-                  readMcpResource: () => Effect.die("unexpected MCP resource read"),
-                  callMcpTool: () => Effect.die("unexpected MCP tool call"),
-                  listPermissionRules: Effect.die("unexpected permission rules read"),
-                  stopTask: () => Effect.void,
-                  interrupt: Effect.void,
-                  close: Effect.void,
-                };
-              }),
-            forkSession: (input) =>
-              Effect.gen(function* () {
-                forkCalls.push(input);
-                return yield* realRunner.forkSession(input);
-              }),
-            subagentLaunchToolUseId: () => Effect.succeed(null),
-            subagentModel: () => Effect.succeed(null),
-            assertComplete: Effect.void,
-          },
-        });
-        const providerSessionId = ProviderSessionId.make("provider-session-claude-fork");
-        const sourceThreadId = ThreadId.make("thread-claude-fork-source");
-        const targetThreadId = ThreadId.make("thread-claude-fork-target");
-        const runtime = yield* adapter.openSession({
-          threadId: sourceThreadId,
-          providerSessionId,
-          modelSelection: {
-            instanceId: ProviderInstanceId.make(ClaudeAdapterV2.CLAUDE_PROVIDER),
-            model: "claude-sonnet-4-6",
-          },
-          runtimePolicy: ProviderAdapter.ProviderAdapterV2RuntimePolicy.make({
-            runtimeMode: "full-access",
-            interactionMode: "default",
-            cwd: "/workspace",
-          }),
-        });
-        const sourceProviderThread = yield* runtime.ensureThread({
-          threadId: sourceThreadId,
-          modelSelection: {
-            instanceId: ProviderInstanceId.make(ClaudeAdapterV2.CLAUDE_PROVIDER),
-            model: "claude-sonnet-4-6",
-          },
-          runtimePolicy: ProviderAdapter.ProviderAdapterV2RuntimePolicy.make({
-            runtimeMode: "full-access",
-            interactionMode: "default",
-            cwd: "/workspace",
-          }),
-        });
-        const now = yield* DateTime.now;
-        const providerTurnId = ProviderTurnId.make("provider-turn-claude-source");
-        const forkedProviderThread = yield* runtime.forkThread({
-          sourceProviderThread,
-          sourceProviderTurns: [
-            {
-              id: providerTurnId,
-              providerThreadId: sourceProviderThread.id,
-              nodeId: NodeId.make("node-claude-source"),
-              runAttemptId: RunAttemptId.make("run-attempt-claude-source"),
-              nativeTurnRef: {
-                driver: ClaudeAdapterV2.CLAUDE_PROVIDER,
-                nativeId: sourceCursor,
-                strength: "weak",
-              },
-              ordinal: 1,
-              status: "completed",
-              startedAt: now,
-              completedAt: now,
-            },
-          ],
-          providerTurnId,
-          targetThreadId,
-        });
-
-        assert.deepEqual(forkCalls, [
+        ),
+      );
+      const openedQueries: Array<ClaudeAdapterV2.ClaudeAgentSdkQueryOpenInput> = [];
+      const forkCalls: Array<ClaudeAdapterV2.ClaudeAgentSdkSessionForkInput> = [];
+      const adapter = yield* ClaudeAdapterV2.makeClaudeAdapterV2({
+        instanceId: ClaudeAdapterV2.CLAUDE_DEFAULT_INSTANCE_ID,
+        settings: DEFAULT_CLAUDE_SETTINGS,
+        environment: { CLAUDE_CONFIG_DIR: configDir },
+        attachmentsDir,
+        fileSystem,
+        path: yield* Path.Path,
+        random: yield* SecureRandom.SecureRandom,
+        idAllocator,
+        queryRunner: {
+          allocateSessionId: Effect.succeed(sourceSessionId),
+          open: (input) =>
+            Effect.sync(() => {
+              openedQueries.push(input);
+              return {
+                messages: Stream.never,
+                offer: () => Effect.void,
+                setModel: () => Effect.void,
+                applyFlagSettings: () => Effect.void,
+                setPermissionMode: () => Effect.void,
+                backgroundTasks: () => Effect.succeed(false),
+                mcpServerStatus: Effect.succeed([]),
+                readMcpResource: () => Effect.die("unexpected MCP resource read"),
+                callMcpTool: () => Effect.die("unexpected MCP tool call"),
+                listPermissionRules: Effect.die("unexpected permission rules read"),
+                stopTask: () => Effect.void,
+                interrupt: Effect.void,
+                close: Effect.void,
+              };
+            }),
+          forkSession: (input) =>
+            Effect.gen(function* () {
+              forkCalls.push(input);
+              return yield* realRunner.forkSession(input);
+            }),
+          subagentLaunchToolUseId: () => Effect.succeed(null),
+          subagentModel: () => Effect.succeed(null),
+          assertComplete: Effect.void,
+        },
+      });
+      const providerSessionId = ProviderSessionId.make("provider-session-claude-fork");
+      const sourceThreadId = ThreadId.make("thread-claude-fork-source");
+      const targetThreadId = ThreadId.make("thread-claude-fork-target");
+      const runtime = yield* adapter.openSession({
+        threadId: sourceThreadId,
+        providerSessionId,
+        modelSelection: {
+          instanceId: ProviderInstanceId.make(ClaudeAdapterV2.CLAUDE_PROVIDER),
+          model: "claude-sonnet-4-6",
+        },
+        runtimePolicy: ProviderAdapter.ProviderAdapterV2RuntimePolicy.make({
+          runtimeMode: "full-access",
+          interactionMode: "default",
+          cwd: "/workspace",
+        }),
+      });
+      const sourceProviderThread = yield* runtime.ensureThread({
+        threadId: sourceThreadId,
+        modelSelection: {
+          instanceId: ProviderInstanceId.make(ClaudeAdapterV2.CLAUDE_PROVIDER),
+          model: "claude-sonnet-4-6",
+        },
+        runtimePolicy: ProviderAdapter.ProviderAdapterV2RuntimePolicy.make({
+          runtimeMode: "full-access",
+          interactionMode: "default",
+          cwd: "/workspace",
+        }),
+      });
+      const now = yield* DateTime.now;
+      const providerTurnId = ProviderTurnId.make("provider-turn-claude-source");
+      const forkedProviderThread = yield* runtime.forkThread({
+        sourceProviderThread,
+        sourceProviderTurns: [
           {
-            sessionId: sourceSessionId,
-            options: {
-              upToMessageId: sourceCursor,
+            id: providerTurnId,
+            providerThreadId: sourceProviderThread.id,
+            nodeId: NodeId.make("node-claude-source"),
+            runAttemptId: RunAttemptId.make("run-attempt-claude-source"),
+            nativeTurnRef: {
+              driver: ClaudeAdapterV2.CLAUDE_PROVIDER,
+              nativeId: sourceCursor,
+              strength: "weak",
             },
-            environment: { CLAUDE_CONFIG_DIR: configDir },
-            threadId: targetThreadId,
-            providerSessionId,
+            ordinal: 1,
+            status: "completed",
+            startedAt: now,
+            completedAt: now,
           },
-        ]);
-        const forkedSessionId = forkedProviderThread.nativeThreadRef?.nativeId;
-        assert.isString(forkedSessionId);
-        assert.notEqual(forkedSessionId, sourceSessionId);
-        const forkedTranscript = yield* fileSystem.readFileString(
-          NodePath.join(projectDir, `${forkedSessionId}.jsonl`),
-        );
-        assert.include(forkedTranscript, "inherited answer");
-        assert.equal(forkedProviderThread.forkedFrom?.providerThreadId, sourceProviderThread.id);
-        assert.equal(forkedProviderThread.forkedFrom?.providerTurnId, providerTurnId);
-
-        yield* runtime.startTurn({
-          appThread: {
-            createdBy: "user",
-            creationSource: "web",
-            id: targetThreadId,
-            projectId: ProjectId.make("project-claude-fork-target"),
-            title: "Claude fork target",
-            providerInstanceId: ProviderInstanceId.make(ClaudeAdapterV2.CLAUDE_PROVIDER),
-            modelSelection: {
-              instanceId: ProviderInstanceId.make(ClaudeAdapterV2.CLAUDE_PROVIDER),
-              model: "claude-sonnet-4-6",
-            },
-            runtimeMode: "full-access",
-            interactionMode: "default",
-            branch: null,
-            worktreePath: null,
-            activeProviderThreadId: forkedProviderThread.id,
-            lineage: {
-              parentThreadId: sourceThreadId,
-              relationshipToParent: "fork",
-              rootThreadId: sourceThreadId,
-            },
-            forkedFrom: null,
-            createdAt: now,
-            updatedAt: now,
-            archivedAt: null,
-            settledOverride: null,
-            settledAt: null,
-            lastVisitedAt: null,
-            deletedAt: null,
+        ],
+        providerTurnId,
+        targetThreadId,
+      });
+
+      assert.deepEqual(forkCalls, [
+        {
+          sessionId: sourceSessionId,
+          options: {
+            upToMessageId: sourceCursor,
           },
+          environment: { CLAUDE_CONFIG_DIR: configDir },
           threadId: targetThreadId,
-          runId: RunId.make("run-claude-fork-target"),
-          runOrdinal: 1,
-          providerTurnOrdinal: 1,
-          attemptId: RunAttemptId.make("run-attempt-claude-fork-target"),
-          rootNodeId: NodeId.make("node-claude-fork-target-root"),
-          providerThread: forkedProviderThread,
-          message: {
-            createdBy: "user",
-            creationSource: "web",
-            messageId: MessageId.make("message-claude-fork-target"),
-            text: "Respond with fork ok",
-            attachments: [],
-          },
+          providerSessionId,
+        },
+      ]);
+      const forkedSessionId = forkedProviderThread.nativeThreadRef?.nativeId;
+      assert.isString(forkedSessionId);
+      assert.notEqual(forkedSessionId, sourceSessionId);
+      const forkedTranscript = yield* fileSystem.readFileString(
+        NodePath.join(projectDir, `${forkedSessionId}.jsonl`),
+      );
+      assert.include(forkedTranscript, "inherited answer");
+      assert.equal(forkedProviderThread.forkedFrom?.providerThreadId, sourceProviderThread.id);
+      assert.equal(forkedProviderThread.forkedFrom?.providerTurnId, providerTurnId);
+
+      yield* runtime.startTurn({
+        appThread: {
+          createdBy: "user",
+          creationSource: "web",
+          id: targetThreadId,
+          projectId: ProjectId.make("project-claude-fork-target"),
+          title: "Claude fork target",
+          providerInstanceId: ProviderInstanceId.make(ClaudeAdapterV2.CLAUDE_PROVIDER),
           modelSelection: {
             instanceId: ProviderInstanceId.make(ClaudeAdapterV2.CLAUDE_PROVIDER),
             model: "claude-sonnet-4-6",
           },
-          runtimePolicy: ProviderAdapter.ProviderAdapterV2RuntimePolicy.make({
-            runtimeMode: "full-access",
-            interactionMode: "default",
-            cwd: "/workspace",
-          }),
-        });
+          runtimeMode: "full-access",
+          interactionMode: "default",
+          branch: null,
+          worktreePath: null,
+          activeProviderThreadId: forkedProviderThread.id,
+          lineage: {
+            parentThreadId: sourceThreadId,
+            relationshipToParent: "fork",
+            rootThreadId: sourceThreadId,
+          },
+          forkedFrom: null,
+          createdAt: now,
+          updatedAt: now,
+          archivedAt: null,
+          settledOverride: null,
+          settledAt: null,
+          lastVisitedAt: null,
+          deletedAt: null,
+        },
+        threadId: targetThreadId,
+        runId: RunId.make("run-claude-fork-target"),
+        runOrdinal: 1,
+        providerTurnOrdinal: 1,
+        attemptId: RunAttemptId.make("run-attempt-claude-fork-target"),
+        rootNodeId: NodeId.make("node-claude-fork-target-root"),
+        providerThread: forkedProviderThread,
+        message: {
+          createdBy: "user",
+          creationSource: "web",
+          messageId: MessageId.make("message-claude-fork-target"),
+          text: "Respond with fork ok",
+          attachments: [],
+        },
+        modelSelection: {
+          instanceId: ProviderInstanceId.make(ClaudeAdapterV2.CLAUDE_PROVIDER),
+          model: "claude-sonnet-4-6",
+        },
+        runtimePolicy: ProviderAdapter.ProviderAdapterV2RuntimePolicy.make({
+          runtimeMode: "full-access",
+          interactionMode: "default",
+          cwd: "/workspace",
+        }),
+      });
 
-        assert.equal(openedQueries[0]?.options.resume, forkedSessionId);
-        assert.equal(openedQueries[0]?.options.sessionId, undefined);
-        assert.equal(openedQueries[0]?.options.cwd, NodePath.resolve("/workspace"));
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
-          ),
+      assert.equal(openedQueries[0]?.options.resume, forkedSessionId);
+      assert.equal(openedQueries[0]?.options.sessionId, undefined);
+      assert.equal(openedQueries[0]?.options.cwd, NodePath.resolve("/workspace"));
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
         ),
       ),
     ),
@@ -5504,6 +5484,55 @@ describe("ClaudeAdapterV2 background wake turns", () => {
     ),
   );
 
+  // regression: #34393 a provider switch replayed a $skill from the handoff history
+  it.effect("dispatches only skills from the user's text, not from inline handoff history", () =>
+    Effect.gen(function* () {
+      const fs = yield* FileSystem.FileSystem;
+      const path = yield* Path.Path;
+      const homePath = yield* fs.makeTempDirectoryScoped({ prefix: "t3-claude-skill-handoff-" });
+      const directory = path.join(homePath, "skills", "review");
+      yield* fs.makeDirectory(directory, { recursive: true });
+      yield* fs.writeFileString(
+        path.join(directory, "SKILL.md"),
+        "---\nname: review\n---\nFollow the review instructions.\n",
+      );
+      const harness = yield* makeWakeHarnessWithOptions({
+        settings: { ...DEFAULT_CLAUDE_SETTINGS, homePath },
+      });
+      const history = "Context handoff:\n[Historical user; user_message]\n$review the diff";
+      const text = withInlineContext(history, "continue");
+      yield* harness.runtime.startTurn({
+        ...makeClaudeTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now: yield* DateTime.now,
+          attemptId: RunAttemptId.make("skill-handoff"),
+          text,
+          attachments: [],
+          runtimePolicy: { ...CLAUDE_TEST_RUNTIME_POLICY, cwd: homePath },
+        }),
+        inlineContextLength: text.length - "continue".length,
+      });
+
+      const content = harness.offeredMessages[0]?.message.content;
+      const blocks =
+        typeof content === "string"
+          ? [content]
+          : (content ?? []).map((block) => (block.type === "text" ? block.text : ""));
+      assert.isFalse(blocks.some((text) => text.startsWith("/review")));
+      assert.include(blocks.join("\n"), "$review the diff");
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
+        ),
+      ),
+    ),
+  );
+
   // regression: #15475 MCP title arriving after the tool starts must survive to completion
   it.effect.each([
     { isError: false, title: "Check weather" },
@@ -6497,89 +6526,87 @@ describe("ClaudeAdapterV2 background wake turns", () => {
   it.effect(
     "applies model, effort and Fast changes to a process running a background shell, but not thinking or a cleared effort",
     () =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const harness = yield* makeWakeHarness;
-          const now = yield* DateTime.now;
-          const normal = {
-            instanceId: ClaudeAdapterV2.CLAUDE_DEFAULT_INSTANCE_ID,
-            model: "claude-opus-5-5",
-          } satisfies ModelSelection;
-          const turn = (ordinal: number, modelSelection: ModelSelection) =>
-            makeClaudeTestTurnInput({
-              threadId: harness.threadId,
-              providerThread: harness.providerThread,
-              now,
-              attemptId: RunAttemptId.make(`attempt-normal-background:${ordinal}`),
-              text: `Request ${ordinal}`,
-              attachments: [],
-              providerTurnOrdinal: ordinal,
-              modelSelection,
-            });
-          const settle = Effect.gen(function* () {
-            yield* harness.offerAndWait(turnOneResult);
-            yield* Queue.take(harness.terminalReceipts);
+      Effect.gen(function* () {
+        const harness = yield* makeWakeHarness;
+        const now = yield* DateTime.now;
+        const normal = {
+          instanceId: ClaudeAdapterV2.CLAUDE_DEFAULT_INSTANCE_ID,
+          model: "claude-opus-5-5",
+        } satisfies ModelSelection;
+        const turn = (ordinal: number, modelSelection: ModelSelection) =>
+          makeClaudeTestTurnInput({
+            threadId: harness.threadId,
+            providerThread: harness.providerThread,
+            now,
+            attemptId: RunAttemptId.make(`attempt-normal-background:${ordinal}`),
+            text: `Request ${ordinal}`,
+            attachments: [],
+            providerTurnOrdinal: ordinal,
+            modelSelection,
           });
-          yield* harness.runtime.startTurn(turn(1, normal));
-          const originalOptions = harness.getOpenedOptions();
-          yield* harness.offerAndWait(wakeTaskStarted);
-          yield* settle;
-          assert.isTrue(yield* harness.hasPendingBackgroundWork);
+        const settle = Effect.gen(function* () {
+          yield* harness.offerAndWait(turnOneResult);
+          yield* Queue.take(harness.terminalReceipts);
+        });
+        yield* harness.runtime.startTurn(turn(1, normal));
+        const originalOptions = harness.getOpenedOptions();
+        yield* harness.offerAndWait(wakeTaskStarted);
+        yield* settle;
+        assert.isTrue(yield* harness.hasPendingBackgroundWork);
 
-          yield* harness.runtime.startTurn(
-            turn(2, { ...normal, options: [{ id: "fastMode", value: false }] }),
-          );
-          yield* settle;
-          assert.deepEqual(harness.liveSelectionChanges, []);
+        yield* harness.runtime.startTurn(
+          turn(2, { ...normal, options: [{ id: "fastMode", value: false }] }),
+        );
+        yield* settle;
+        assert.deepEqual(harness.liveSelectionChanges, []);
 
-          yield* harness.runtime.startTurn(
-            turn(3, {
-              ...normal,
-              options: [
-                { id: "effort", value: "high" },
-                { id: "ultracode", value: true },
-                { id: "fastMode", value: true },
-              ],
-            }),
-          );
-          yield* settle;
-          yield* harness.runtime.startTurn(turn(4, { ...normal, model: "claude-sonnet-4-6" }));
-          yield* settle;
-          assert.deepEqual(harness.liveSelectionChanges, [
-            { effortLevel: "high", fastMode: true, ultracode: true },
-            { model: "claude-sonnet-4-6" },
-            { effortLevel: "high", fastMode: null, ultracode: null },
-          ]);
-          assert.strictEqual(harness.getOpenedOptions(), originalOptions);
-          assert.lengthOf(harness.offeredMessages, 4);
-
-          for (const [ordinal, selection] of [
-            [5, CLAUDE_TEST_RESTART_MODEL_SELECTION],
-            [6, { ...normal, model: "claude-haiku-4-5-20251001" }],
-          ] as const) {
-            const refused = yield* harness.runtime
-              .startTurn(turn(ordinal, selection))
-              .pipe(Effect.result);
-            assert.equal(refused._tag, "Failure");
-            if (refused._tag === "Failure") {
-              assert.instanceOf(
-                refused.failure.cause,
-                ClaudeAdapterV2.ClaudeBackgroundWorkBlocksQueryReplacementError,
-              );
-            }
+        yield* harness.runtime.startTurn(
+          turn(3, {
+            ...normal,
+            options: [
+              { id: "effort", value: "high" },
+              { id: "ultracode", value: true },
+              { id: "fastMode", value: true },
+            ],
+          }),
+        );
+        yield* settle;
+        yield* harness.runtime.startTurn(turn(4, { ...normal, model: "claude-sonnet-4-6" }));
+        yield* settle;
+        assert.deepEqual(harness.liveSelectionChanges, [
+          { effortLevel: "high", fastMode: true, ultracode: true },
+          { model: "claude-sonnet-4-6" },
+          { effortLevel: "high", fastMode: null, ultracode: null },
+        ]);
+        assert.strictEqual(harness.getOpenedOptions(), originalOptions);
+        assert.lengthOf(harness.offeredMessages, 4);
+
+        for (const [ordinal, selection] of [
+          [5, CLAUDE_TEST_RESTART_MODEL_SELECTION],
+          [6, { ...normal, model: "claude-haiku-4-5-20251001" }],
+        ] as const) {
+          const refused = yield* harness.runtime
+            .startTurn(turn(ordinal, selection))
+            .pipe(Effect.result);
+          assert.equal(refused._tag, "Failure");
+          if (refused._tag === "Failure") {
+            assert.instanceOf(
+              refused.failure.cause,
+              ClaudeAdapterV2.ClaudeBackgroundWorkBlocksQueryReplacementError,
+            );
           }
-          assert.strictEqual(harness.getOpenedOptions(), originalOptions);
-          assert.lengthOf(harness.offeredMessages, 4);
-          assert.lengthOf(harness.liveSelectionChanges, 3);
-          assert.isTrue(yield* harness.hasPendingBackgroundWork);
-        }).pipe(
-          Effect.provide(
-            Layer.mergeAll(
-              IdAllocator.layer,
-              McpProviderSessions.layer,
-              NodeServices.layer,
-              NodeCrypto.layer,
-            ),
+        }
+        assert.strictEqual(harness.getOpenedOptions(), originalOptions);
+        assert.lengthOf(harness.offeredMessages, 4);
+        assert.lengthOf(harness.liveSelectionChanges, 3);
+        assert.isTrue(yield* harness.hasPendingBackgroundWork);
+      }).pipe(
+        Effect.provide(
+          Layer.mergeAll(
+            IdAllocator.layer,
+            McpProviderSessions.layer,
+            NodeServices.layer,
+            NodeCrypto.layer,
           ),
         ),
       ),
@@ -6587,25 +6614,83 @@ describe("ClaudeAdapterV2 background wake turns", () => {
 
   // regression: #34549 a model change sent with a steer was shown but never applied to the turn.
   it.effect("applies a model change sent with a steer to the running turn", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const harness = yield* makeWakeHarness;
-        const idAllocator = yield* IdAllocator.IdAllocatorV2;
-        const opus = {
-          instanceId: ClaudeAdapterV2.CLAUDE_DEFAULT_INSTANCE_ID,
-          model: "claude-opus-5-5",
-        } satisfies ModelSelection;
-        const input = makeClaudeTestTurnInput({
-          threadId: harness.threadId,
-          providerThread: harness.providerThread,
-          now: yield* DateTime.now,
-          attemptId: RunAttemptId.make("attempt-steer-model-change"),
-          text: "Run the slow build.",
+    Effect.gen(function* () {
+      const harness = yield* makeWakeHarness;
+      const idAllocator = yield* IdAllocator.IdAllocatorV2;
+      const opus = {
+        instanceId: ClaudeAdapterV2.CLAUDE_DEFAULT_INSTANCE_ID,
+        model: "claude-opus-5-5",
+      } satisfies ModelSelection;
+      const input = makeClaudeTestTurnInput({
+        threadId: harness.threadId,
+        providerThread: harness.providerThread,
+        now: yield* DateTime.now,
+        attemptId: RunAttemptId.make("attempt-steer-model-change"),
+        text: "Run the slow build.",
+        attachments: [],
+        modelSelection: opus,
+      });
+      yield* harness.runtime.startTurn(input);
+      yield* harness.runtime.steerTurn({
+        threadId: harness.threadId,
+        runId: input.runId,
+        providerThread: harness.providerThread,
+        providerTurnId: idAllocator.derive.providerTurn({
+          driver: ClaudeAdapterV2.CLAUDE_PROVIDER,
+          nativeTurnId: `turn:${input.attemptId}`,
+        }),
+        modelSelection: { ...opus, model: "claude-sonnet-4-6" },
+        message: {
+          createdBy: "user",
+          creationSource: "web",
+          messageId: MessageId.make("steer-model-change"),
+          text: "Which model are you?",
           attachments: [],
-          modelSelection: opus,
-        });
-        yield* harness.runtime.startTurn(input);
-        yield* harness.runtime.steerTurn({
+        },
+      });
+      assert.deepEqual(harness.liveSelectionChanges, [
+        { model: "claude-sonnet-4-6" },
+        { effortLevel: "high", fastMode: null, ultracode: null },
+      ]);
+      assert.lengthOf(harness.offeredMessages, 2);
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
+        ),
+      ),
+    ),
+  );
+
+  it.effect("fails a model-changing steer when the turn ends during the selection change", () =>
+    Effect.gen(function* () {
+      let duringFlags: Effect.Effect<void> = Effect.void;
+      const harness = yield* makeWakeHarnessWithOptions({
+        applyFlagSettings: () => Effect.suspend(() => duringFlags),
+      });
+      const idAllocator = yield* IdAllocator.IdAllocatorV2;
+      const opus = {
+        instanceId: ClaudeAdapterV2.CLAUDE_DEFAULT_INSTANCE_ID,
+        model: "claude-opus-5-5",
+      } satisfies ModelSelection;
+      const input = makeClaudeTestTurnInput({
+        threadId: harness.threadId,
+        providerThread: harness.providerThread,
+        now: yield* DateTime.now,
+        attemptId: RunAttemptId.make("attempt-steer-model-change-race"),
+        text: "Run the slow build.",
+        attachments: [],
+        modelSelection: opus,
+      });
+      yield* harness.runtime.startTurn(input);
+      duringFlags = harness
+        .offerAndWait(turnOneResult)
+        .pipe(Effect.andThen(Queue.take(harness.terminalReceipts)), Effect.asVoid);
+      const steer = yield* harness.runtime
+        .steerTurn({
           threadId: harness.threadId,
           runId: input.runId,
           providerThread: harness.providerThread,
@@ -6617,173 +6702,109 @@ describe("ClaudeAdapterV2 background wake turns", () => {
           message: {
             createdBy: "user",
             creationSource: "web",
-            messageId: MessageId.make("steer-model-change"),
+            messageId: MessageId.make("steer-model-change-race"),
             text: "Which model are you?",
             attachments: [],
           },
-        });
-        assert.deepEqual(harness.liveSelectionChanges, [
-          { model: "claude-sonnet-4-6" },
-          { effortLevel: "high", fastMode: null, ultracode: null },
-        ]);
-        assert.lengthOf(harness.offeredMessages, 2);
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
-          ),
+        })
+        .pipe(Effect.result);
+      assert.equal(steer._tag, "Failure");
+      assert.lengthOf(harness.offeredMessages, 1);
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
         ),
       ),
     ),
   );
 
-  it.effect("fails a model-changing steer when the turn ends during the selection change", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        let duringFlags: Effect.Effect<void> = Effect.void;
-        const harness = yield* makeWakeHarnessWithOptions({
-          applyFlagSettings: () => Effect.suspend(() => duringFlags),
-        });
-        const idAllocator = yield* IdAllocator.IdAllocatorV2;
-        const opus = {
-          instanceId: ClaudeAdapterV2.CLAUDE_DEFAULT_INSTANCE_ID,
-          model: "claude-opus-5-5",
-        } satisfies ModelSelection;
-        const input = makeClaudeTestTurnInput({
+  it.effect("re-sends the model on the turn after a live selection change fails", () =>
+    Effect.gen(function* () {
+      let failFlags = true;
+      const harness = yield* makeWakeHarnessWithOptions({
+        applyFlagSettings: () =>
+          Effect.suspend(() => {
+            if (!failFlags) return Effect.void;
+            failFlags = false;
+            return Effect.fail(
+              new ClaudeAdapterV2.ClaudeAgentSdkQueryRunnerError({
+                method: "applyFlagSettings",
+                cause: new Error("control request failed"),
+              }),
+            );
+          }),
+      });
+      const now = yield* DateTime.now;
+      const opus = {
+        instanceId: ClaudeAdapterV2.CLAUDE_DEFAULT_INSTANCE_ID,
+        model: "claude-opus-5-5",
+      } satisfies ModelSelection;
+      const turn = (ordinal: number, modelSelection: ModelSelection) =>
+        makeClaudeTestTurnInput({
           threadId: harness.threadId,
           providerThread: harness.providerThread,
-          now: yield* DateTime.now,
-          attemptId: RunAttemptId.make("attempt-steer-model-change-race"),
-          text: "Run the slow build.",
+          now,
+          attemptId: RunAttemptId.make(`attempt-failed-live-change:${ordinal}`),
+          text: `Request ${ordinal}`,
           attachments: [],
-          modelSelection: opus,
+          providerTurnOrdinal: ordinal,
+          modelSelection,
         });
-        yield* harness.runtime.startTurn(input);
-        duringFlags = harness
-          .offerAndWait(turnOneResult)
-          .pipe(Effect.andThen(Queue.take(harness.terminalReceipts)), Effect.asVoid);
-        const steer = yield* harness.runtime
-          .steerTurn({
-            threadId: harness.threadId,
-            runId: input.runId,
-            providerThread: harness.providerThread,
-            providerTurnId: idAllocator.derive.providerTurn({
-              driver: ClaudeAdapterV2.CLAUDE_PROVIDER,
-              nativeTurnId: `turn:${input.attemptId}`,
-            }),
-            modelSelection: { ...opus, model: "claude-sonnet-4-6" },
-            message: {
-              createdBy: "user",
-              creationSource: "web",
-              messageId: MessageId.make("steer-model-change-race"),
-              text: "Which model are you?",
-              attachments: [],
-            },
-          })
-          .pipe(Effect.result);
-        assert.equal(steer._tag, "Failure");
-        assert.lengthOf(harness.offeredMessages, 1);
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
-          ),
+      yield* harness.runtime.startTurn(turn(1, opus));
+      yield* harness.offerAndWait(turnOneResult);
+      yield* Queue.take(harness.terminalReceipts);
+
+      const failed = yield* harness.runtime
+        .startTurn(turn(2, { ...opus, model: "claude-sonnet-4-6" }))
+        .pipe(Effect.result);
+      assert.equal(failed._tag, "Failure");
+
+      // The process may now run Sonnet, so returning to Opus must send it.
+      yield* harness.runtime.startTurn(turn(3, opus));
+      assert.deepEqual(harness.liveSelectionChanges, [
+        { model: "claude-sonnet-4-6" },
+        { effortLevel: "high", fastMode: null, ultracode: null },
+        { model: "claude-opus-5-5" },
+        { effortLevel: "medium", fastMode: false, ultracode: null },
+      ]);
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
         ),
       ),
     ),
   );
 
-  it.effect("re-sends the model on the turn after a live selection change fails", () =>
-    Effect.scoped(
+  it.effect.each(["completed", "interrupted"] as const)(
+    "projects Claude thinking blocks when %s",
+    (status) =>
       Effect.gen(function* () {
-        let failFlags = true;
-        const harness = yield* makeWakeHarnessWithOptions({
-          applyFlagSettings: () =>
-            Effect.suspend(() => {
-              if (!failFlags) return Effect.void;
-              failFlags = false;
-              return Effect.fail(
-                new ClaudeAdapterV2.ClaudeAgentSdkQueryRunnerError({
-                  method: "applyFlagSettings",
-                  cause: new Error("control request failed"),
-                }),
-              );
-            }),
-        });
-        const now = yield* DateTime.now;
-        const opus = {
-          instanceId: ClaudeAdapterV2.CLAUDE_DEFAULT_INSTANCE_ID,
-          model: "claude-opus-5-5",
-        } satisfies ModelSelection;
-        const turn = (ordinal: number, modelSelection: ModelSelection) =>
+        const harness = yield* makeWakeHarness;
+        yield* harness.runtime.startTurn(
           makeClaudeTestTurnInput({
             threadId: harness.threadId,
             providerThread: harness.providerThread,
-            now,
-            attemptId: RunAttemptId.make(`attempt-failed-live-change:${ordinal}`),
-            text: `Request ${ordinal}`,
+            now: yield* DateTime.now,
+            attemptId: RunAttemptId.make("reasoning-attempt"),
+            text: "Check the plan",
             attachments: [],
-            providerTurnOrdinal: ordinal,
-            modelSelection,
-          });
-        yield* harness.runtime.startTurn(turn(1, opus));
-        yield* harness.offerAndWait(turnOneResult);
-        yield* Queue.take(harness.terminalReceipts);
-
-        const failed = yield* harness.runtime
-          .startTurn(turn(2, { ...opus, model: "claude-sonnet-4-6" }))
-          .pipe(Effect.result);
-        assert.equal(failed._tag, "Failure");
-
-        // The process may now run Sonnet, so returning to Opus must send it.
-        yield* harness.runtime.startTurn(turn(3, opus));
-        assert.deepEqual(harness.liveSelectionChanges, [
-          { model: "claude-sonnet-4-6" },
-          { effortLevel: "high", fastMode: null, ultracode: null },
-          { model: "claude-opus-5-5" },
-          { effortLevel: "medium", fastMode: false, ultracode: null },
-        ]);
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
-          ),
-        ),
-      ),
-    ),
-  );
-
-  it.effect.each(["completed", "interrupted"] as const)(
-    "projects Claude thinking blocks when %s",
-    (status) =>
-      Effect.gen(function* () {
-        const harness = yield* makeWakeHarness;
-        yield* harness.runtime.startTurn(
-          makeClaudeTestTurnInput({
-            threadId: harness.threadId,
-            providerThread: harness.providerThread,
-            now: yield* DateTime.now,
-            attemptId: RunAttemptId.make("reasoning-attempt"),
-            text: "Check the plan",
-            attachments: [],
-          }),
-        );
-        const stream = (event: unknown, parent: string | null = null) =>
-          claudeSdkFrame({
-            type: "stream_event",
-            event,
-            parent_tool_use_id: parent,
-            session_id: WAKE_NATIVE_SESSION,
-            uuid: "stream-frame",
+          }),
+        );
+        const stream = (event: unknown, parent: string | null = null) =>
+          claudeSdkFrame({
+            type: "stream_event",
+            event,
+            parent_tool_use_id: parent,
+            session_id: WAKE_NATIVE_SESSION,
+            uuid: "stream-frame",
           });
         const snapshot = (id: string, uuid: string, thinking: string) =>
           claudeSdkFrame({
@@ -6982,86 +7003,6 @@ describe("ClaudeAdapterV2 background wake turns", () => {
   it.effect.each(["cancelled", "interrupted", "denied", "permission_denied", undefined])(
     "preserves native tool non-execution metadata %s without inferring a denial from text",
     (kind) =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const harness = yield* makeWakeHarness;
-          yield* harness.runtime.startTurn(
-            makeClaudeTestTurnInput({
-              threadId: harness.threadId,
-              providerThread: harness.providerThread,
-              now: yield* DateTime.now,
-              attemptId: RunAttemptId.make("attempt-tool-non-execution"),
-              text: "Run the tool.",
-              attachments: [],
-            }),
-          );
-          yield* harness.offerAndWait(
-            claudeSdkFrame({
-              type: "user",
-              uuid: "tool-non-execution",
-              session_id: WAKE_NATIVE_SESSION,
-              parent_tool_use_id: null,
-              message: {
-                role: "user",
-                content: [
-                  {
-                    type: "tool_result",
-                    tool_use_id: "tool-error",
-                    is_error: true,
-                    content: "STOP and wait for the user.",
-                  },
-                  { type: "tool_result", tool_use_id: "tool-ok", is_error: false, content: "OK" },
-                ],
-              },
-              ...(kind === undefined
-                ? {}
-                : {
-                    tool_result_meta: [
-                      { id: "tool-error", non_execution_kind: kind },
-                      { id: "tool-ok", non_execution_kind: null },
-                    ],
-                  }),
-            }),
-          );
-          yield* Queue.offer(
-            harness.sdkMessages,
-            makeResultFrame({ uuid: "result-non-execution", result: "Done" }),
-          );
-          yield* Queue.take(harness.terminalReceipts);
-          const items = harness.events.flatMap((event) =>
-            event.type === "turn_item.updated" && event.turnItem.type === "dynamic_tool"
-              ? [event.turnItem]
-              : [],
-          );
-          const failed = items.findLast((item) => item.nativeItemRef?.nativeId === "tool-error")!;
-          assert.equal(
-            failed.status,
-            kind === "cancelled" || kind === "interrupted" ? kind : "failed",
-          );
-          assert.equal(failed.toolNonExecutionKind, kind);
-          const ok = items.findLast((item) => item.nativeItemRef?.nativeId === "tool-ok")!;
-          assert.equal(ok.status, "completed");
-          assert.equal(ok.toolNonExecutionKind, undefined);
-          const node = harness.events.findLast(
-            (event) =>
-              event.type === "node.updated" && event.node.nativeItemRef?.nativeId === "tool-error",
-          );
-          assert.equal(node?.type === "node.updated" ? node.node.status : undefined, failed.status);
-        }).pipe(
-          Effect.provide(
-            Layer.mergeAll(
-              IdAllocator.layer,
-              McpProviderSessions.layer,
-              NodeServices.layer,
-              NodeCrypto.layer,
-            ),
-          ),
-        ),
-      ),
-  );
-
-  it.effect("completes a turn after the resume dialog without a failed tool row", () =>
-    Effect.scoped(
       Effect.gen(function* () {
         const harness = yield* makeWakeHarness;
         yield* harness.runtime.startTurn(
@@ -7069,52 +7010,63 @@ describe("ClaudeAdapterV2 background wake turns", () => {
             threadId: harness.threadId,
             providerThread: harness.providerThread,
             now: yield* DateTime.now,
-            attemptId: RunAttemptId.make("attempt-resume-dialog"),
-            text: "continue",
+            attemptId: RunAttemptId.make("attempt-tool-non-execution"),
+            text: "Run the tool.",
             attachments: [],
           }),
         );
-        const dialog = yield* Effect.promise(() =>
-          harness.getOpenedOptions()!.onUserDialog!(
-            {
-              dialogKind: "resume_return",
-              payload: { sessionAgeMinutes: 90, estimatedTokens: 120000 },
+        yield* harness.offerAndWait(
+          claudeSdkFrame({
+            type: "user",
+            uuid: "tool-non-execution",
+            session_id: WAKE_NATIVE_SESSION,
+            parent_tool_use_id: null,
+            message: {
+              role: "user",
+              content: [
+                {
+                  type: "tool_result",
+                  tool_use_id: "tool-error",
+                  is_error: true,
+                  content: "STOP and wait for the user.",
+                },
+                { type: "tool_result", tool_use_id: "tool-ok", is_error: false, content: "OK" },
+              ],
             },
-            { signal: new AbortController().signal, requestId: "dialog-resume" },
-          ),
-        ).pipe(Effect.forkScoped);
-        const request = yield* Queue.take(harness.runtimeRequestReceipts);
-        assert.deepEqual(
-          harness.events.flatMap((event) =>
-            event.type === "node.updated" && event.node.id === request.runtimeRequest.nodeId
-              ? [event.node.parentNodeId]
-              : [],
-          ),
-          [NodeId.make("node-attempt-resume-dialog")],
+            ...(kind === undefined
+              ? {}
+              : {
+                  tool_result_meta: [
+                    { id: "tool-error", non_execution_kind: kind },
+                    { id: "tool-ok", non_execution_kind: null },
+                  ],
+                }),
+          }),
         );
-        yield* harness.runtime.respondToRuntimeRequest({
-          requestId: request.runtimeRequest.id,
-          answers: {
-            [formatClaudeResumeCompactionQuestion({ ageMinutes: 90, estimatedTokens: 120000 })]:
-              "Keep full history",
-          },
-        });
-        assert.deepEqual(yield* Fiber.join(dialog), { behavior: "completed", result: "continue" });
         yield* Queue.offer(
           harness.sdkMessages,
-          makeResultFrame({ uuid: "result-resume-dialog", result: "Done" }),
+          makeResultFrame({ uuid: "result-non-execution", result: "Done" }),
         );
-        assert.equal((yield* Queue.take(harness.terminalReceipts)).status, "completed");
-        assert.deepEqual(
-          harness.events.flatMap((event) =>
-            event.type === "turn_item.updated" &&
-            event.turnItem.type === "dynamic_tool" &&
-            event.turnItem.nativeItemRef?.nativeId === "dialog-resume"
-              ? [event.turnItem.status]
-              : [],
-          ),
-          [],
+        yield* Queue.take(harness.terminalReceipts);
+        const items = harness.events.flatMap((event) =>
+          event.type === "turn_item.updated" && event.turnItem.type === "dynamic_tool"
+            ? [event.turnItem]
+            : [],
         );
+        const failed = items.findLast((item) => item.nativeItemRef?.nativeId === "tool-error")!;
+        assert.equal(
+          failed.status,
+          kind === "cancelled" || kind === "interrupted" ? kind : "failed",
+        );
+        assert.equal(failed.toolNonExecutionKind, kind);
+        const ok = items.findLast((item) => item.nativeItemRef?.nativeId === "tool-ok")!;
+        assert.equal(ok.status, "completed");
+        assert.equal(ok.toolNonExecutionKind, undefined);
+        const node = harness.events.findLast(
+          (event) =>
+            event.type === "node.updated" && event.node.nativeItemRef?.nativeId === "tool-error",
+        );
+        assert.equal(node?.type === "node.updated" ? node.node.status : undefined, failed.status);
       }).pipe(
         Effect.provide(
           Layer.mergeAll(
@@ -7125,6 +7077,71 @@ describe("ClaudeAdapterV2 background wake turns", () => {
           ),
         ),
       ),
+  );
+
+  it.effect("completes a turn after the resume dialog without a failed tool row", () =>
+    Effect.gen(function* () {
+      const harness = yield* makeWakeHarness;
+      yield* harness.runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now: yield* DateTime.now,
+          attemptId: RunAttemptId.make("attempt-resume-dialog"),
+          text: "continue",
+          attachments: [],
+        }),
+      );
+      const dialog = yield* Effect.promise(() =>
+        harness.getOpenedOptions()!.onUserDialog!(
+          {
+            dialogKind: "resume_return",
+            payload: { sessionAgeMinutes: 90, estimatedTokens: 120000 },
+          },
+          { signal: new AbortController().signal, requestId: "dialog-resume" },
+        ),
+      ).pipe(Effect.forkScoped);
+      const request = yield* Queue.take(harness.runtimeRequestReceipts);
+      assert.deepEqual(
+        harness.events.flatMap((event) =>
+          event.type === "node.updated" && event.node.id === request.runtimeRequest.nodeId
+            ? [event.node.parentNodeId]
+            : [],
+        ),
+        [NodeId.make("node-attempt-resume-dialog")],
+      );
+      yield* harness.runtime.respondToRuntimeRequest({
+        requestId: request.runtimeRequest.id,
+        answers: {
+          [formatClaudeResumeCompactionQuestion({ ageMinutes: 90, estimatedTokens: 120000 })]:
+            "Keep full history",
+        },
+      });
+      assert.deepEqual(yield* Fiber.join(dialog), { behavior: "completed", result: "continue" });
+      yield* Queue.offer(
+        harness.sdkMessages,
+        makeResultFrame({ uuid: "result-resume-dialog", result: "Done" }),
+      );
+      assert.equal((yield* Queue.take(harness.terminalReceipts)).status, "completed");
+      assert.deepEqual(
+        harness.events.flatMap((event) =>
+          event.type === "turn_item.updated" &&
+          event.turnItem.type === "dynamic_tool" &&
+          event.turnItem.nativeItemRef?.nativeId === "dialog-resume"
+            ? [event.turnItem.status]
+            : [],
+        ),
+        [],
+      );
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
+        ),
+      ),
     ),
   );
 
@@ -7137,136 +7154,131 @@ describe("ClaudeAdapterV2 background wake turns", () => {
       ].map((scenario) => ({ terminalReason, ...scenario })),
     ),
   )("handles $terminalReason (steered=$steered, exits=$queryExits)", (scenario) =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const { terminalReason, steered, queryExits } = scenario;
-        const harness = yield* makeWakeHarness;
-        const idAllocator = yield* IdAllocator.IdAllocatorV2;
-        const attemptId = RunAttemptId.make("attempt-steering-abort");
-        const input = makeClaudeTestTurnInput({
+    Effect.gen(function* () {
+      const { terminalReason, steered, queryExits } = scenario;
+      const harness = yield* makeWakeHarness;
+      const idAllocator = yield* IdAllocator.IdAllocatorV2;
+      const attemptId = RunAttemptId.make("attempt-steering-abort");
+      const input = makeClaudeTestTurnInput({
+        threadId: harness.threadId,
+        providerThread: harness.providerThread,
+        now: yield* DateTime.now,
+        attemptId,
+        text: "Audit the settings pages.",
+        attachments: [],
+      });
+      yield* harness.runtime.startTurn(input);
+      if (steered) {
+        yield* harness.runtime.steerTurn({
           threadId: harness.threadId,
+          runId: input.runId,
           providerThread: harness.providerThread,
-          now: yield* DateTime.now,
-          attemptId,
-          text: "Audit the settings pages.",
-          attachments: [],
+          providerTurnId: idAllocator.derive.providerTurn({
+            driver: ClaudeAdapterV2.CLAUDE_PROVIDER,
+            nativeTurnId: `turn:${attemptId}`,
+          }),
+          message: {
+            createdBy: "user",
+            creationSource: "web",
+            messageId: MessageId.make("message-steering-abort"),
+            text: "Include the hierarchy mock.",
+            attachments: [],
+          },
         });
-        yield* harness.runtime.startTurn(input);
-        if (steered) {
-          yield* harness.runtime.steerTurn({
-            threadId: harness.threadId,
-            runId: input.runId,
-            providerThread: harness.providerThread,
-            providerTurnId: idAllocator.derive.providerTurn({
-              driver: ClaudeAdapterV2.CLAUDE_PROVIDER,
-              nativeTurnId: `turn:${attemptId}`,
-            }),
-            message: {
-              createdBy: "user",
-              creationSource: "web",
-              messageId: MessageId.make("message-steering-abort"),
-              text: "Include the hierarchy mock.",
-              attachments: [],
-            },
-          });
-          assert.equal(harness.offeredMessages[1]?.priority, "now");
-        }
-        const partialText = "The audit covers the `integ";
-        if (!queryExits)
-          yield* Queue.offer(
-            harness.sdkMessages,
-            makeAssistantTextFrame({
-              uuid: "00000000-0000-4000-8000-000000000900",
-              text: partialText,
-            }),
-          );
-        yield* harness.offerAndWait(
+        assert.equal(harness.offeredMessages[1]?.priority, "now");
+      }
+      const partialText = "The audit covers the `integ";
+      if (!queryExits)
+        yield* Queue.offer(
+          harness.sdkMessages,
+          makeAssistantTextFrame({
+            uuid: "00000000-0000-4000-8000-000000000900",
+            text: partialText,
+          }),
+        );
+      yield* harness.offerAndWait(
+        makeResultFrame({
+          uuid: "00000000-0000-4000-8000-000000000901",
+          result: "",
+          terminalReason,
+          usage: {
+            input_tokens: 600,
+            output_tokens: 40,
+            cache_creation_input_tokens: 500,
+            cache_read_input_tokens: 2000,
+          },
+        }),
+      );
+      if (queryExits) {
+        yield* Queue.shutdown(harness.sdkMessages);
+      } else if (steered) {
+        yield* Queue.offer(harness.sdkMessages, wakeAssistant);
+        yield* Queue.offer(
+          harness.sdkMessages,
           makeResultFrame({
-            uuid: "00000000-0000-4000-8000-000000000901",
-            result: "",
-            terminalReason,
+            uuid: "00000000-0000-4000-8000-000000000902",
+            result: "Audit finished after the steer.",
             usage: {
-              input_tokens: 600,
-              output_tokens: 40,
-              cache_creation_input_tokens: 500,
-              cache_read_input_tokens: 2000,
+              input_tokens: 3,
+              output_tokens: 6,
+              cache_creation_input_tokens: 2347,
+              cache_read_input_tokens: 9455,
             },
           }),
         );
-        if (queryExits) {
-          yield* Queue.shutdown(harness.sdkMessages);
-        } else if (steered) {
-          yield* Queue.offer(harness.sdkMessages, wakeAssistant);
-          yield* Queue.offer(
-            harness.sdkMessages,
-            makeResultFrame({
-              uuid: "00000000-0000-4000-8000-000000000902",
-              result: "Audit finished after the steer.",
-              usage: {
-                input_tokens: 3,
-                output_tokens: 6,
-                cache_creation_input_tokens: 2347,
-                cache_read_input_tokens: 9455,
-              },
-            }),
-          );
-        }
-        const terminal = yield* Queue.take(harness.terminalReceipts);
+      }
+      const terminal = yield* Queue.take(harness.terminalReceipts);
+      assert.equal(terminal.status, queryExits ? "failed" : steered ? "completed" : "interrupted");
+      if (steered && !queryExits && terminalReason === "aborted_streaming") {
+        // The steer cut this reply off mid-stream; it must not read as a finished answer.
+        const partial = harness.events.findLast(
+          (event) =>
+            event.type === "turn_item.updated" &&
+            event.turnItem.type === "assistant_message" &&
+            event.turnItem.text === partialText,
+        );
         assert.equal(
-          terminal.status,
-          queryExits ? "failed" : steered ? "completed" : "interrupted",
+          partial?.type === "turn_item.updated" ? partial.turnItem.status : undefined,
+          "interrupted",
         );
-        if (steered && !queryExits && terminalReason === "aborted_streaming") {
-          // The steer cut this reply off mid-stream; it must not read as a finished answer.
-          const partial = harness.events.findLast(
-            (event) =>
-              event.type === "turn_item.updated" &&
-              event.turnItem.type === "assistant_message" &&
-              event.turnItem.text === partialText,
-          );
-          assert.equal(
-            partial?.type === "turn_item.updated" ? partial.turnItem.status : undefined,
-            "interrupted",
-          );
-        }
-        if (steered) {
-          if (!queryExits)
-            assert.isTrue(
-              harness.events.some(
-                (event) =>
-                  event.type === "turn_item.updated" &&
-                  event.turnItem.type === "assistant_message" &&
-                  event.turnItem.text === WAKE_ASSISTANT_TEXT,
-              ),
-            );
-          const completed = harness.events.findLast(
-            (event) => event.type === "provider_turn.updated",
-          );
-          assert.deepEqual(
-            completed?.type === "provider_turn.updated"
-              ? completed.providerTurn.turnTokenUsage
-              : undefined,
-            {
-              usageScope: "main_agent",
-              usageStatus: queryExits ? "partial" : "complete",
-              hasSubagents: false,
-              inputTokens: queryExits ? 3100 : 603 + 2847 + 11455,
-              outputTokens: queryExits ? 40 : 46,
-              cachedInputTokens: queryExits ? 2000 : 11455,
-              cacheCreationTokens: queryExits ? 500 : 2847,
-              ...(queryExits ? {} : { models: ["claude-sonnet-4-6"] }),
-            },
+      }
+      if (steered) {
+        if (!queryExits)
+          assert.isTrue(
+            harness.events.some(
+              (event) =>
+                event.type === "turn_item.updated" &&
+                event.turnItem.type === "assistant_message" &&
+                event.turnItem.text === WAKE_ASSISTANT_TEXT,
+            ),
           );
-        }
-        assert.lengthOf(harness.terminalEvents(), 1);
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
-          ),
+        const completed = harness.events.findLast(
+          (event) => event.type === "provider_turn.updated",
+        );
+        assert.deepEqual(
+          completed?.type === "provider_turn.updated"
+            ? completed.providerTurn.turnTokenUsage
+            : undefined,
+          {
+            usageScope: "main_agent",
+            usageStatus: queryExits ? "partial" : "complete",
+            hasSubagents: false,
+            inputTokens: queryExits ? 3100 : 603 + 2847 + 11455,
+            outputTokens: queryExits ? 40 : 46,
+            cachedInputTokens: queryExits ? 2000 : 11455,
+            cacheCreationTokens: queryExits ? 500 : 2847,
+            ...(queryExits ? {} : { models: ["claude-sonnet-4-6"] }),
+          },
+        );
+      }
+      assert.lengthOf(harness.terminalEvents(), 1);
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
         ),
       ),
     ),
@@ -9083,9 +9095,29 @@ describe("ClaudeAdapterV2 background wake turns", () => {
         '{"autoCompactWindow":500000,"modelSettings":{"claude-opus-5-5":{"autoCompactWindow":50000}}}',
       threshold: 467_000,
     },
+    {
+      autoCompactWindow: "",
+      model: "claude-opus-5-5",
+      userSettings: '{"env":{"CLAUDE_CODE_AUTO_COMPACT_WINDOW":"300000"}}',
+      threshold: 267_000,
+    },
+    {
+      autoCompactWindow: "",
+      model: "claude-opus-5-5",
+      environment: { CLAUDE_CODE_AUTO_COMPACT_WINDOW: "300000" },
+      threshold: 267_000,
+    },
   ])(
     "ignores stale snapshots after compaction and reports threshold $autoCompactWindow for $model",
-    ({ autoCompactWindow, model, threshold, userSettings, projectSettings, launchArgs }) =>
+    ({
+      autoCompactWindow,
+      model,
+      threshold,
+      userSettings,
+      projectSettings,
+      launchArgs,
+      environment,
+    }) =>
       Effect.gen(function* () {
         const fileSystem = yield* FileSystem.FileSystem;
         const path = yield* Path.Path;
@@ -9108,6 +9140,7 @@ describe("ClaudeAdapterV2 background wake turns", () => {
             homePath: home,
             launchArgs: launchArgs ?? "",
           },
+          ...(environment === undefined ? {} : { environment }),
         });
         yield* harness.runtime.startTurn(
           makeClaudeTestTurnInput({
@@ -10001,248 +10034,243 @@ describe("ClaudeAdapterV2 background wake turns", () => {
   );
 
   it.effect("preserves typed Claude plans and todos through generic tool completion", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const harness = yield* makeWakeHarness;
-        const now = yield* DateTime.now;
-        const assistantTools = (
-          uuid: string,
-          tools: ReadonlyArray<Record<string, unknown>>,
-          parentToolUseId: string | null = null,
-        ) =>
-          claudeSdkFrame({
-            type: "assistant",
-            message: {
-              model: "claude-sonnet-4-6",
-              id: `msg_${uuid}`,
-              type: "message",
-              role: "assistant",
-              content: tools.map((tool) => ({ type: "tool_use", ...tool })),
-              stop_reason: "tool_use",
-              stop_sequence: null,
-              usage: {
-                input_tokens: 1,
-                output_tokens: 1,
-                cache_creation_input_tokens: 0,
-                cache_read_input_tokens: 0,
-              },
-            },
-            parent_tool_use_id: parentToolUseId,
-            uuid,
-            session_id: WAKE_NATIVE_SESSION,
-          });
-        const toolResults = (uuid: string, toolUseIds: ReadonlyArray<string>) =>
-          claudeSdkFrame({
-            type: "user",
-            message: {
-              role: "user",
-              content: toolUseIds.map((toolUseId) => ({
-                type: "tool_result",
-                tool_use_id: toolUseId,
-                content: "ok",
-              })),
+    Effect.gen(function* () {
+      const harness = yield* makeWakeHarness;
+      const now = yield* DateTime.now;
+      const assistantTools = (
+        uuid: string,
+        tools: ReadonlyArray<Record<string, unknown>>,
+        parentToolUseId: string | null = null,
+      ) =>
+        claudeSdkFrame({
+          type: "assistant",
+          message: {
+            model: "claude-sonnet-4-6",
+            id: `msg_${uuid}`,
+            type: "message",
+            role: "assistant",
+            content: tools.map((tool) => ({ type: "tool_use", ...tool })),
+            stop_reason: "tool_use",
+            stop_sequence: null,
+            usage: {
+              input_tokens: 1,
+              output_tokens: 1,
+              cache_creation_input_tokens: 0,
+              cache_read_input_tokens: 0,
             },
-            parent_tool_use_id: null,
-            uuid,
-            session_id: WAKE_NATIVE_SESSION,
-          });
+          },
+          parent_tool_use_id: parentToolUseId,
+          uuid,
+          session_id: WAKE_NATIVE_SESSION,
+        });
+      const toolResults = (uuid: string, toolUseIds: ReadonlyArray<string>) =>
+        claudeSdkFrame({
+          type: "user",
+          message: {
+            role: "user",
+            content: toolUseIds.map((toolUseId) => ({
+              type: "tool_result",
+              tool_use_id: toolUseId,
+              content: "ok",
+            })),
+          },
+          parent_tool_use_id: null,
+          uuid,
+          session_id: WAKE_NATIVE_SESSION,
+        });
 
-        yield* harness.runtime.startTurn(
-          makeClaudeTestTurnInput({
-            threadId: harness.threadId,
-            providerThread: harness.providerThread,
-            now,
-            attemptId: RunAttemptId.make("attempt-claude-plan-lifecycle-1"),
-            text: "Plan the work.",
-            attachments: [],
-          }),
-        );
-        yield* Queue.offer(
-          harness.sdkMessages,
-          assistantTools("00000000-0000-4000-8000-000000000501", [
-            {
-              id: "tool-todo-1",
-              name: "TodoWrite",
-              input: { todos: [{ content: "Inspect", status: "in_progress" }] },
-            },
-          ]),
-        );
-        yield* Queue.offer(
-          harness.sdkMessages,
-          assistantTools("00000000-0000-4000-8000-000000000501", [
+      yield* harness.runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now,
+          attemptId: RunAttemptId.make("attempt-claude-plan-lifecycle-1"),
+          text: "Plan the work.",
+          attachments: [],
+        }),
+      );
+      yield* Queue.offer(
+        harness.sdkMessages,
+        assistantTools("00000000-0000-4000-8000-000000000501", [
+          {
+            id: "tool-todo-1",
+            name: "TodoWrite",
+            input: { todos: [{ content: "Inspect", status: "in_progress" }] },
+          },
+        ]),
+      );
+      yield* Queue.offer(
+        harness.sdkMessages,
+        assistantTools("00000000-0000-4000-8000-000000000501", [
+          {
+            id: "tool-todo-1",
+            name: "TodoWrite",
+            input: { todos: [{ content: "Inspect", status: "in_progress" }] },
+          },
+        ]),
+      );
+      yield* Queue.offer(
+        harness.sdkMessages,
+        toolResults("00000000-0000-4000-8000-000000000502", ["tool-todo-1"]),
+      );
+      yield* harness.offerAndWait(
+        claudeSdkFrame({ ...wakeTurnInit, permissionMode: "bypassPermissions" }),
+      );
+      yield* Queue.offer(
+        harness.sdkMessages,
+        claudeSdkFrame({
+          type: "system",
+          subtype: "status",
+          status: null,
+          permissionMode: "plan",
+          uuid: "00000000-0000-4000-8000-000000000508",
+          session_id: WAKE_NATIVE_SESSION,
+        }),
+      );
+      yield* harness.offerAndWait(
+        claudeSdkFrame({
+          ...wakeTurnInit,
+          uuid: "00000000-0000-4000-8000-000000000509",
+          permissionMode: "plan",
+        }),
+      );
+      yield* Queue.offer(
+        harness.sdkMessages,
+        makeResultFrame({
+          uuid: "00000000-0000-4000-8000-000000000503",
+          result: "Todo recorded.",
+        }),
+      );
+      yield* Queue.take(harness.terminalReceipts);
+
+      yield* harness.runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now,
+          attemptId: RunAttemptId.make("attempt-claude-plan-lifecycle-2"),
+          providerTurnOrdinal: 2,
+          text: "Finish the plan.",
+          attachments: [],
+        }),
+      );
+      const canUseTool = harness.getOpenedOptions()?.canUseTool;
+      assert.isFunction(canUseTool);
+      const planMarkdown = "# Ready to implement\n\n1. Ship it.";
+      yield* Effect.promise(() =>
+        canUseTool!(
+          "ExitPlanMode",
+          { plan: planMarkdown },
+          {
+            signal: new AbortController().signal,
+            toolUseID: "tool-exit-plan-1",
+            requestId: "request-exit-plan-1",
+          },
+        ),
+      );
+      yield* Queue.offer(
+        harness.sdkMessages,
+        assistantTools("00000000-0000-4000-8000-000000000504", [
+          {
+            id: "tool-todo-2",
+            name: "TodoWrite",
+            input: { todos: [{ content: "Inspect", status: "completed" }] },
+          },
+          { id: "tool-exit-plan-1", name: "ExitPlanMode", input: { plan: planMarkdown } },
+        ]),
+      );
+      yield* Queue.offer(
+        harness.sdkMessages,
+        assistantTools(
+          "00000000-0000-4000-8000-000000000507",
+          [
             {
-              id: "tool-todo-1",
+              id: "tool-subagent-todo",
               name: "TodoWrite",
-              input: { todos: [{ content: "Inspect", status: "in_progress" }] },
+              input: { todos: [{ content: "Child-only work", status: "in_progress" }] },
             },
-          ]),
-        );
-        yield* Queue.offer(
-          harness.sdkMessages,
-          toolResults("00000000-0000-4000-8000-000000000502", ["tool-todo-1"]),
-        );
-        yield* harness.offerAndWait(
-          claudeSdkFrame({ ...wakeTurnInit, permissionMode: "bypassPermissions" }),
-        );
-        yield* Queue.offer(
-          harness.sdkMessages,
-          claudeSdkFrame({
-            type: "system",
-            subtype: "status",
-            status: null,
-            permissionMode: "plan",
-            uuid: "00000000-0000-4000-8000-000000000508",
-            session_id: WAKE_NATIVE_SESSION,
-          }),
-        );
-        yield* harness.offerAndWait(
-          claudeSdkFrame({
-            ...wakeTurnInit,
-            uuid: "00000000-0000-4000-8000-000000000509",
-            permissionMode: "plan",
-          }),
-        );
-        yield* Queue.offer(
-          harness.sdkMessages,
-          makeResultFrame({
-            uuid: "00000000-0000-4000-8000-000000000503",
-            result: "Todo recorded.",
-          }),
-        );
-        yield* Queue.take(harness.terminalReceipts);
-
-        yield* harness.runtime.startTurn(
-          makeClaudeTestTurnInput({
-            threadId: harness.threadId,
-            providerThread: harness.providerThread,
-            now,
-            attemptId: RunAttemptId.make("attempt-claude-plan-lifecycle-2"),
-            providerTurnOrdinal: 2,
-            text: "Finish the plan.",
-            attachments: [],
-          }),
-        );
-        const canUseTool = harness.getOpenedOptions()?.canUseTool;
-        assert.isFunction(canUseTool);
-        const planMarkdown = "# Ready to implement\n\n1. Ship it.";
-        yield* Effect.promise(() =>
-          canUseTool!(
-            "ExitPlanMode",
-            { plan: planMarkdown },
-            {
-              signal: new AbortController().signal,
-              toolUseID: "tool-exit-plan-1",
-              requestId: "request-exit-plan-1",
-            },
-          ),
-        );
-        yield* Queue.offer(
-          harness.sdkMessages,
-          assistantTools("00000000-0000-4000-8000-000000000504", [
-            {
-              id: "tool-todo-2",
-              name: "TodoWrite",
-              input: { todos: [{ content: "Inspect", status: "completed" }] },
-            },
-            { id: "tool-exit-plan-1", name: "ExitPlanMode", input: { plan: planMarkdown } },
-          ]),
-        );
-        yield* Queue.offer(
-          harness.sdkMessages,
-          assistantTools(
-            "00000000-0000-4000-8000-000000000507",
-            [
-              {
-                id: "tool-subagent-todo",
-                name: "TodoWrite",
-                input: { todos: [{ content: "Child-only work", status: "in_progress" }] },
-              },
-            ],
-            "tool-parent-agent",
-          ),
-        );
-        yield* Queue.offer(
-          harness.sdkMessages,
-          toolResults("00000000-0000-4000-8000-000000000505", ["tool-todo-2", "tool-exit-plan-1"]),
-        );
-        yield* Queue.offer(
-          harness.sdkMessages,
-          assistantTools("00000000-0000-4000-8000-000000000509", [
-            {
-              id: "tool-todo-3",
-              name: "TodoWrite",
-              input: { todos: [{ content: "Implement", status: "pending" }] },
-            },
-          ]),
-        );
-        yield* Queue.offer(
-          harness.sdkMessages,
-          toolResults("00000000-0000-4000-8000-000000000510", ["tool-todo-3"]),
-        );
-        yield* Queue.offer(
-          harness.sdkMessages,
-          makeResultFrame({
-            uuid: "00000000-0000-4000-8000-000000000506",
-            result: "Plan captured.",
-          }),
-        );
-        yield* Queue.take(harness.terminalReceipts);
+          ],
+          "tool-parent-agent",
+        ),
+      );
+      yield* Queue.offer(
+        harness.sdkMessages,
+        toolResults("00000000-0000-4000-8000-000000000505", ["tool-todo-2", "tool-exit-plan-1"]),
+      );
+      yield* Queue.offer(
+        harness.sdkMessages,
+        assistantTools("00000000-0000-4000-8000-000000000509", [
+          {
+            id: "tool-todo-3",
+            name: "TodoWrite",
+            input: { todos: [{ content: "Implement", status: "pending" }] },
+          },
+        ]),
+      );
+      yield* Queue.offer(
+        harness.sdkMessages,
+        toolResults("00000000-0000-4000-8000-000000000510", ["tool-todo-3"]),
+      );
+      yield* Queue.offer(
+        harness.sdkMessages,
+        makeResultFrame({
+          uuid: "00000000-0000-4000-8000-000000000506",
+          result: "Plan captured.",
+        }),
+      );
+      yield* Queue.take(harness.terminalReceipts);
 
-        const items = new Map(
-          harness.events.flatMap((event) =>
-            event.type === "turn_item.updated" ? [[String(event.turnItem.id), event.turnItem]] : [],
-          ),
-        );
-        const plans = new Map(
-          harness.events.flatMap((event) =>
-            event.type === "plan.updated" ? [[String(event.plan.id), event.plan]] : [],
-          ),
-        );
-        const todoItems = [...items.values()].filter((item) => item.type === "todo_list");
-        const proposedItems = [...items.values()].filter((item) => item.type === "proposed_plan");
-        assert.lengthOf(todoItems, 3);
-        assert.equal(todoItems[1]?.status, "completed");
-        assert.deepEqual(todoItems[1]?.steps, [
-          { id: "todo-0", text: "Inspect", status: "completed" },
-        ]);
-        assert.deepEqual(todoItems[2]?.steps, [
-          { id: "todo-0", text: "Implement", status: "pending" },
-        ]);
-        assert.equal(todoItems[1]?.runId, todoItems[2]?.runId);
-        assert.lengthOf(proposedItems, 1);
-        assert.equal(
-          proposedItems[0]?.type === "proposed_plan" && proposedItems[0].markdown,
-          planMarkdown,
-        );
-        assert.isTrue(
-          [...items.values()].some(
-            (item) =>
-              item.type === "dynamic_tool" && item.nativeItemRef?.nativeId === "tool-todo-2",
-          ),
-        );
-        assert.isTrue(
-          [...items.values()].some(
-            (item) =>
-              item.type === "dynamic_tool" && item.nativeItemRef?.nativeId === "tool-exit-plan-1",
-          ),
-        );
-        const proposedPlan = [...plans.values()].find((plan) => plan.kind === "proposed_plan");
-        assert.equal(proposedPlan?.status, "active");
-        assert.deepEqual(harness.permissionModeChanges, ["bypassPermissions"]);
-        assert.deepEqual(
-          [...plans.values()]
-            .filter((plan) => plan.kind === "todo_list")
-            .map((plan) => plan.status),
-          ["superseded", "superseded", "active"],
-        );
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
-          ),
+      const items = new Map(
+        harness.events.flatMap((event) =>
+          event.type === "turn_item.updated" ? [[String(event.turnItem.id), event.turnItem]] : [],
+        ),
+      );
+      const plans = new Map(
+        harness.events.flatMap((event) =>
+          event.type === "plan.updated" ? [[String(event.plan.id), event.plan]] : [],
+        ),
+      );
+      const todoItems = [...items.values()].filter((item) => item.type === "todo_list");
+      const proposedItems = [...items.values()].filter((item) => item.type === "proposed_plan");
+      assert.lengthOf(todoItems, 3);
+      assert.equal(todoItems[1]?.status, "completed");
+      assert.deepEqual(todoItems[1]?.steps, [
+        { id: "todo-0", text: "Inspect", status: "completed" },
+      ]);
+      assert.deepEqual(todoItems[2]?.steps, [
+        { id: "todo-0", text: "Implement", status: "pending" },
+      ]);
+      assert.equal(todoItems[1]?.runId, todoItems[2]?.runId);
+      assert.lengthOf(proposedItems, 1);
+      assert.equal(
+        proposedItems[0]?.type === "proposed_plan" && proposedItems[0].markdown,
+        planMarkdown,
+      );
+      assert.isTrue(
+        [...items.values()].some(
+          (item) => item.type === "dynamic_tool" && item.nativeItemRef?.nativeId === "tool-todo-2",
+        ),
+      );
+      assert.isTrue(
+        [...items.values()].some(
+          (item) =>
+            item.type === "dynamic_tool" && item.nativeItemRef?.nativeId === "tool-exit-plan-1",
+        ),
+      );
+      const proposedPlan = [...plans.values()].find((plan) => plan.kind === "proposed_plan");
+      assert.equal(proposedPlan?.status, "active");
+      assert.deepEqual(harness.permissionModeChanges, ["bypassPermissions"]);
+      assert.deepEqual(
+        [...plans.values()].filter((plan) => plan.kind === "todo_list").map((plan) => plan.status),
+        ["superseded", "superseded", "active"],
+      );
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
         ),
       ),
     ),
@@ -10808,7 +10836,100 @@ describe("ClaudeAdapterV2 background wake turns", () => {
   );
 
   it.effect("resolves API retries on resumed assistant activity", () =>
-    Effect.scoped(
+    Effect.gen(function* () {
+      const harness = yield* makeWakeHarness;
+      const now = yield* DateTime.now;
+      yield* harness.runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now,
+          attemptId: RunAttemptId.make("attempt-claude-api-retry"),
+          text: "Open github.com.",
+          attachments: [],
+        }),
+      );
+
+      yield* Queue.offer(
+        harness.sdkMessages,
+        claudeSdkFrame({
+          type: "system",
+          subtype: "api_retry",
+          attempt: 2,
+          max_retries: 10,
+          retry_delay_ms: 1_500,
+          error_status: 529,
+          error: "overloaded",
+          uuid: "00000000-0000-4000-8000-000000000201",
+          session_id: WAKE_NATIVE_SESSION,
+        }),
+      );
+      const retryItems = () =>
+        harness.events.flatMap((event) =>
+          event.type === "turn_item.updated" &&
+          event.turnItem.type === "error" &&
+          event.turnItem.retry !== undefined
+            ? [event.turnItem]
+            : [],
+        );
+      yield* harness.until(() => retryItems().length === 1);
+      const runningRetry = retryItems()[0];
+      assert.equal(runningRetry?.status, "running");
+      assert.equal(runningRetry?.failure.code, "api_error_529");
+      assert.deepEqual(runningRetry?.retry, {
+        attempt: 2,
+        maxAttempts: 10,
+        retryDelayMs: 1_500,
+      });
+
+      // The stream starting again settles the retry before any assistant message completes.
+      yield* Queue.offer(
+        harness.sdkMessages,
+        claudeSdkFrame({
+          type: "stream_event",
+          event: { type: "message_start", message: { id: "api-retry-recovered-message" } },
+          parent_tool_use_id: null,
+          session_id: WAKE_NATIVE_SESSION,
+          uuid: "00000000-0000-4000-8000-000000000204",
+        }),
+      );
+      yield* harness.until(() => retryItems().length === 2);
+      assert.lengthOf(harness.terminalEvents(), 0);
+      const recoveredRetry = retryItems()[1];
+      assert.equal(recoveredRetry?.id, runningRetry?.id);
+      assert.equal(recoveredRetry?.status, "completed");
+      assert.equal(recoveredRetry?.title, "Provider recovered");
+      yield* Queue.offer(
+        harness.sdkMessages,
+        makeAssistantTextFrame({
+          uuid: "00000000-0000-4000-8000-000000000202",
+          text: "Opening GitHub.",
+        }),
+      );
+
+      yield* Queue.offer(
+        harness.sdkMessages,
+        makeResultFrame({
+          uuid: "00000000-0000-4000-8000-000000000203",
+          result: "Opened GitHub.",
+        }),
+      );
+      yield* harness.awaitTerminal(1);
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
+        ),
+      ),
+    ),
+  );
+
+  it.effect.each(["api_error", "overloaded_status"] as const)(
+    "fails a success-shaped Claude result with %s",
+    (terminalReason) =>
       Effect.gen(function* () {
         const harness = yield* makeWakeHarness;
         const now = yield* DateTime.now;
@@ -10817,77 +10938,38 @@ describe("ClaudeAdapterV2 background wake turns", () => {
             threadId: harness.threadId,
             providerThread: harness.providerThread,
             now,
-            attemptId: RunAttemptId.make("attempt-claude-api-retry"),
-            text: "Open github.com.",
+            attemptId: RunAttemptId.make("attempt-structured-terminal-failure"),
+            text: "Complete the task.",
             attachments: [],
           }),
         );
-
-        yield* Queue.offer(
-          harness.sdkMessages,
-          claudeSdkFrame({
-            type: "system",
-            subtype: "api_retry",
-            attempt: 2,
-            max_retries: 10,
-            retry_delay_ms: 1_500,
-            error_status: 529,
-            error: "overloaded",
-            uuid: "00000000-0000-4000-8000-000000000201",
-            session_id: WAKE_NATIVE_SESSION,
-          }),
-        );
-        const retryItems = () =>
-          harness.events.flatMap((event) =>
-            event.type === "turn_item.updated" &&
-            event.turnItem.type === "error" &&
-            event.turnItem.retry !== undefined
-              ? [event.turnItem]
-              : [],
-          );
-        yield* harness.until(() => retryItems().length === 1);
-        const runningRetry = retryItems()[0];
-        assert.equal(runningRetry?.status, "running");
-        assert.equal(runningRetry?.failure.code, "api_error_529");
-        assert.deepEqual(runningRetry?.retry, {
-          attempt: 2,
-          maxAttempts: 10,
-          retryDelayMs: 1_500,
-        });
-
-        // The stream starting again settles the retry before any assistant message completes.
         yield* Queue.offer(
           harness.sdkMessages,
-          claudeSdkFrame({
-            type: "stream_event",
-            event: { type: "message_start", message: { id: "api-retry-recovered-message" } },
-            parent_tool_use_id: null,
-            session_id: WAKE_NATIVE_SESSION,
-            uuid: "00000000-0000-4000-8000-000000000204",
+          makeResultFrame({
+            uuid: "00000000-0000-4000-8000-000000000205",
+            result: "Provider failure details.",
+            isError: false,
+            ...(terminalReason === "overloaded_status"
+              ? { apiErrorStatus: 529 }
+              : { terminalReason }),
           }),
         );
-        yield* harness.until(() => retryItems().length === 2);
-        assert.lengthOf(harness.terminalEvents(), 0);
-        const recoveredRetry = retryItems()[1];
-        assert.equal(recoveredRetry?.id, runningRetry?.id);
-        assert.equal(recoveredRetry?.status, "completed");
-        assert.equal(recoveredRetry?.title, "Provider recovered");
-        yield* Queue.offer(
-          harness.sdkMessages,
-          makeAssistantTextFrame({
-            uuid: "00000000-0000-4000-8000-000000000202",
-            text: "Opening GitHub.",
-          }),
+        const terminal = yield* Queue.take(harness.terminalReceipts);
+        assert.equal(terminal.status, "failed");
+        if (terminal.status !== "failed") return;
+        assert.isNotEmpty(terminal.failure.message);
+        assert.equal(terminal.failure.class, "provider_error");
+        assert.isFalse(
+          harness.events.some(
+            (event) =>
+              event.type === "message.updated" &&
+              event.message.text === "Provider failure details.",
+          ),
         );
-
-        yield* Queue.offer(
-          harness.sdkMessages,
-          makeResultFrame({
-            uuid: "00000000-0000-4000-8000-000000000203",
-            result: "Opened GitHub.",
-          }),
+        assert.equal(
+          terminal.failure.code,
+          terminalReason === "overloaded_status" ? "api_error_529" : terminalReason,
         );
-        yield* harness.awaitTerminal(1);
       }).pipe(
         Effect.provide(
           Layer.mergeAll(
@@ -10898,64 +10980,6 @@ describe("ClaudeAdapterV2 background wake turns", () => {
           ),
         ),
       ),
-    ),
-  );
-
-  it.effect.each(["api_error", "overloaded_status"] as const)(
-    "fails a success-shaped Claude result with %s",
-    (terminalReason) =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const harness = yield* makeWakeHarness;
-          const now = yield* DateTime.now;
-          yield* harness.runtime.startTurn(
-            makeClaudeTestTurnInput({
-              threadId: harness.threadId,
-              providerThread: harness.providerThread,
-              now,
-              attemptId: RunAttemptId.make("attempt-structured-terminal-failure"),
-              text: "Complete the task.",
-              attachments: [],
-            }),
-          );
-          yield* Queue.offer(
-            harness.sdkMessages,
-            makeResultFrame({
-              uuid: "00000000-0000-4000-8000-000000000205",
-              result: "Provider failure details.",
-              isError: false,
-              ...(terminalReason === "overloaded_status"
-                ? { apiErrorStatus: 529 }
-                : { terminalReason }),
-            }),
-          );
-          const terminal = yield* Queue.take(harness.terminalReceipts);
-          assert.equal(terminal.status, "failed");
-          if (terminal.status !== "failed") return;
-          assert.isNotEmpty(terminal.failure.message);
-          assert.equal(terminal.failure.class, "provider_error");
-          assert.isFalse(
-            harness.events.some(
-              (event) =>
-                event.type === "message.updated" &&
-                event.message.text === "Provider failure details.",
-            ),
-          );
-          assert.equal(
-            terminal.failure.code,
-            terminalReason === "overloaded_status" ? "api_error_529" : terminalReason,
-          );
-        }).pipe(
-          Effect.provide(
-            Layer.mergeAll(
-              IdAllocator.layer,
-              McpProviderSessions.layer,
-              NodeServices.layer,
-              NodeCrypto.layer,
-            ),
-          ),
-        ),
-      ),
   );
 
   // Context exhaustion reports blocking_limit even when the rate-limit window is allowed.
@@ -11039,263 +11063,155 @@ describe("ClaudeAdapterV2 background wake turns", () => {
     );
 
   it.effect(
-    "uses task_started as an incremental roster fallback and clears internal work on empty snapshot",
+    "uses task_started as an incremental roster fallback, keeps its tool call, and clears internal work on empty snapshot",
     () =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const harness = yield* makeWakeHarness;
-          const now = yield* DateTime.now;
-          const emptyRoster = claudeSdkFrame({
-            type: "system",
-            subtype: "background_tasks_changed",
-            tasks: [],
-            uuid: "00000000-0000-4000-8000-000000000202",
-            session_id: WAKE_NATIVE_SESSION,
-          });
-
-          yield* harness.runtime.startTurn(
-            makeClaudeTestTurnInput({
-              threadId: harness.threadId,
-              providerThread: harness.providerThread,
-              now,
-              attemptId: RunAttemptId.make("attempt-claude-roster-fallback"),
-              text: "Run the build in the background.",
-              attachments: [],
-            }),
-          );
-          yield* Queue.offer(
-            harness.sdkMessages,
-            claudeSdkFrame({
-              type: "assistant",
-              message: {
-                model: "claude-sonnet-4-6",
-                id: "msg_background_command",
-                type: "message",
-                role: "assistant",
-                content: [
-                  {
-                    type: "tool_use",
-                    id: WAKE_TOOL_USE_ID,
-                    name: "Bash",
-                    input: {
-                      command: "python3 audit.py > audit.log 2>&1",
-                      run_in_background: true,
-                    },
-                  },
-                ],
-              },
-              parent_tool_use_id: null,
-              uuid: "background-command-launch",
-              session_id: WAKE_NATIVE_SESSION,
-            }),
-          );
-          yield* Queue.offer(harness.sdkMessages, wakeTaskStarted);
-          yield* Queue.offer(harness.sdkMessages, turnOneResult);
-          yield* harness.awaitTerminal(1);
-
-          const afterStart = providerThreadRosterEvents(harness.events).filter(
-            (event) => (event.providerThread.pendingBackgroundTasks?.length ?? 0) > 0,
-          );
-          assert.isAtLeast(afterStart.length, 1);
-          assert.equal(
-            (afterStart.at(-1)?.providerThread.pendingBackgroundTasks ?? [])[0]?.taskId,
-            WAKE_TASK_ID,
-          );
-
-          const command = harness.events.find(
-            (event) =>
-              event.type === "turn_item.updated" &&
-              event.turnItem.type === "command_execution" &&
-              event.turnItem.nativeItemRef?.nativeId === WAKE_TOOL_USE_ID,
-          );
-          assert.equal(command?.type, "turn_item.updated");
-          if (command?.type !== "turn_item.updated") return;
-          const details = {
-            command: "python3 audit.py > audit.log 2>&1",
-            itemId: command.turnItem.id,
-          };
-          assert.deepInclude(
-            afterStart.at(-1)?.providerThread.pendingBackgroundTasks?.[0],
-            details,
-          );
-          yield* harness.offerAndWait(
-            claudeSdkFrame({
-              type: "system",
-              subtype: "background_tasks_changed",
-              tasks: [{ task_id: WAKE_TASK_ID, task_type: "local_bash", description: "Audit" }],
-              uuid: "background-command-snapshot",
-              session_id: WAKE_NATIVE_SESSION,
-            }),
-          );
-          assert.deepInclude(
-            providerThreadRosterEvents(harness.events).at(-1)?.providerThread
-              .pendingBackgroundTasks?.[0],
-            details,
-          );
-
-          yield* Queue.offer(
-            harness.sdkMessages,
-            claudeSdkFrame({
-              type: "system",
-              subtype: "background_tasks_changed",
-              tasks: [
-                {
-                  task_id: "subagent-shell",
-                  task_type: "local_bash",
-                  description: "sleep 150",
-                  parent_task_id: "agent-1",
-                },
-              ],
-              uuid: "00000000-0000-4000-8000-000000000203",
-              session_id: WAKE_NATIVE_SESSION,
-            }),
-          );
-          yield* harness.until(() =>
-            providerThreadRosterEvents(harness.events).some(
-              (event) =>
-                event.providerThread.pendingBackgroundTasks?.[0]?.parentTaskId === "agent-1",
-            ),
-          );
-
-          yield* harness.offerAndWait(emptyRoster);
-          assert.include(
-            (
-              providerThreadRosterEvents(harness.events).at(-1)?.providerThread
-                .pendingBackgroundTasks ?? []
-            ).map((task) => task.taskId),
-            WAKE_TASK_ID,
-          );
-          assert.isFalse(yield* harness.hasPendingBackgroundWork);
-        }).pipe(
-          Effect.provide(
-            Layer.mergeAll(
-              IdAllocator.layer,
-              McpProviderSessions.layer,
-              NodeServices.layer,
-              NodeCrypto.layer,
-            ),
-          ),
-        ),
-      ),
-  );
-
-  it.effect("holds only the background tasks the agent marks awaited, until they end", () =>
-    Effect.scoped(
       Effect.gen(function* () {
         const harness = yield* makeWakeHarness;
         const now = yield* DateTime.now;
-        const awaitBackgroundTasks = harness.runtime.awaitBackgroundTasks;
-        if (awaitBackgroundTasks === undefined) {
-          throw new Error("Claude adapter runtime must expose awaitBackgroundTasks.");
-        }
-        const roster = (tasks: ReadonlyArray<string>, uuid: string) =>
-          claudeSdkFrame({
-            type: "system",
-            subtype: "background_tasks_changed",
-            tasks: tasks.map((taskId) => ({
-              task_id: taskId,
-              task_type: "local_bash",
-              description: taskId,
-            })),
-            uuid,
-            session_id: WAKE_NATIVE_SESSION,
-          });
-        const nextRoster = Effect.fn("nextRoster")(function* (
-          matches: (tasks: ReadonlyArray<OrchestrationV2PendingBackgroundTask>) => boolean,
-        ) {
-          while (true) {
-            const { providerThread } = yield* Queue.take(harness.providerThreadReceipts);
-            const tasks = providerThread.pendingBackgroundTasks ?? [];
-            if (matches(tasks)) return tasks;
-          }
+        const emptyRoster = claudeSdkFrame({
+          type: "system",
+          subtype: "background_tasks_changed",
+          tasks: [],
+          uuid: "00000000-0000-4000-8000-000000000202",
+          session_id: WAKE_NATIVE_SESSION,
         });
-        const marks = (tasks: ReadonlyArray<OrchestrationV2PendingBackgroundTask>) =>
-          tasks.map((task) => [task.taskId, task.awaited === true]);
 
         yield* harness.runtime.startTurn(
           makeClaudeTestTurnInput({
             threadId: harness.threadId,
             providerThread: harness.providerThread,
             now,
-            attemptId: RunAttemptId.make("attempt-claude-awaited-roster"),
-            text: "Run the tests in the background and the dev server.",
+            attemptId: RunAttemptId.make("attempt-claude-roster-fallback"),
+            text: "Run the build in the background.",
             attachments: [],
           }),
         );
         yield* Queue.offer(
           harness.sdkMessages,
-          roster([WAKE_TASK_ID, "dev-server"], "00000000-0000-4000-8000-000000000301"),
+          claudeSdkFrame({
+            type: "assistant",
+            message: {
+              model: "claude-sonnet-4-6",
+              id: "msg_background_command",
+              type: "message",
+              role: "assistant",
+              content: [
+                {
+                  type: "tool_use",
+                  id: WAKE_TOOL_USE_ID,
+                  name: "Bash",
+                  input: {
+                    command: "python3 audit.py > audit.log 2>&1",
+                    run_in_background: true,
+                  },
+                },
+              ],
+            },
+            parent_tool_use_id: null,
+            uuid: "background-command-launch",
+            session_id: WAKE_NATIVE_SESSION,
+          }),
         );
-        yield* nextRoster((tasks) => tasks.length === 2);
+        yield* Queue.offer(harness.sdkMessages, wakeTaskStarted);
+        yield* Queue.offer(harness.sdkMessages, turnOneResult);
+        yield* harness.awaitTerminal(1);
 
-        const marked = yield* awaitBackgroundTasks({
-          providerThread: harness.providerThread,
-          taskIds: [WAKE_TASK_ID, "already-finished"],
-          awaited: true,
-        });
-        assert.deepStrictEqual(marked.matched, [WAKE_TASK_ID]);
-        assert.deepStrictEqual(
-          marks(yield* nextRoster((tasks) => tasks.some((task) => task.awaited === true))),
-          [
-            [WAKE_TASK_ID, true],
-            ["dev-server", false],
-          ],
+        const afterStart = providerThreadRosterEvents(harness.events).filter(
+          (event) => (event.providerThread.pendingBackgroundTasks?.length ?? 0) > 0,
         );
-        // A replacing level rebuilds every entry; the mark must survive it.
-        yield* Queue.offer(
-          harness.sdkMessages,
-          roster(["dev-server", WAKE_TASK_ID], "00000000-0000-4000-8000-000000000302"),
+        assert.isAtLeast(afterStart.length, 1);
+        const started = (afterStart.at(-1)?.providerThread.pendingBackgroundTasks ?? [])[0];
+        assert.equal(started?.taskId, WAKE_TASK_ID);
+        assert.equal(started?.nativeItemId, WAKE_TOOL_USE_ID);
+
+        const command = harness.events.find(
+          (event) =>
+            event.type === "turn_item.updated" &&
+            event.turnItem.type === "command_execution" &&
+            event.turnItem.nativeItemRef?.nativeId === WAKE_TOOL_USE_ID,
+        );
+        assert.equal(command?.type, "turn_item.updated");
+        if (command?.type !== "turn_item.updated") return;
+        const details = {
+          command: "python3 audit.py > audit.log 2>&1",
+          itemId: command.turnItem.id,
+        };
+        assert.deepInclude(afterStart.at(-1)?.providerThread.pendingBackgroundTasks?.[0], details);
+        yield* harness.offerAndWait(
+          claudeSdkFrame({
+            type: "system",
+            subtype: "background_tasks_changed",
+            tasks: [{ task_id: WAKE_TASK_ID, task_type: "local_bash", description: "Audit" }],
+            uuid: "background-command-snapshot",
+            session_id: WAKE_NATIVE_SESSION,
+          }),
         );
-        assert.deepStrictEqual(
-          marks(yield* nextRoster((tasks) => tasks[0]?.taskId === "dev-server")),
-          [
-            ["dev-server", false],
-            [WAKE_TASK_ID, true],
-          ],
+        assert.deepInclude(
+          providerThreadRosterEvents(harness.events).at(-1)?.providerThread
+            .pendingBackgroundTasks?.[0],
+          details,
         );
 
-        // Once the task ends, a reused id starts unmarked.
+        // A foreground command that later moves to the background keeps its tool call too.
         yield* Queue.offer(
           harness.sdkMessages,
-          claudeSdkFrame({ ...wakeNotification, uuid: "00000000-0000-4000-8000-000000000303" }),
+          claudeSdkFrame({
+            type: "system",
+            subtype: "task_started",
+            task_id: "moved-shell",
+            tool_use_id: "toolu_moved_shell",
+            description: "Foreground build",
+            is_backgrounded: false,
+            task_type: "local_bash",
+            uuid: "00000000-0000-4000-8000-000000000204",
+            session_id: WAKE_NATIVE_SESSION,
+          }),
         );
-        yield* nextRoster((tasks) => tasks.length === 1);
         yield* Queue.offer(
           harness.sdkMessages,
-          roster(["dev-server", WAKE_TASK_ID], "00000000-0000-4000-8000-000000000304"),
+          claudeSdkFrame({
+            type: "system",
+            subtype: "background_tasks_changed",
+            tasks: [
+              {
+                task_id: "subagent-shell",
+                task_type: "local_bash",
+                description: "sleep 150",
+                parent_task_id: "agent-1",
+              },
+              {
+                task_id: WAKE_TASK_ID,
+                task_type: "local_bash",
+                description: WAKE_TASK_DESCRIPTION,
+              },
+              {
+                task_id: "moved-shell",
+                task_type: "local_bash",
+                description: "Foreground build",
+              },
+            ],
+            uuid: "00000000-0000-4000-8000-000000000203",
+            session_id: WAKE_NATIVE_SESSION,
+          }),
         );
-        assert.deepStrictEqual(marks(yield* nextRoster((tasks) => tasks.length === 2)), [
-          ["dev-server", false],
-          [WAKE_TASK_ID, false],
-        ]);
-
-        yield* awaitBackgroundTasks({
-          providerThread: harness.providerThread,
-          taskIds: ["dev-server"],
-          awaited: true,
-        });
-        assert.deepStrictEqual(
-          marks(yield* nextRoster((tasks) => tasks.some((task) => task.awaited === true))),
-          [
-            ["dev-server", true],
-            [WAKE_TASK_ID, false],
-          ],
+        yield* harness.until(() =>
+          providerThreadRosterEvents(harness.events).some(
+            (event) =>
+              event.providerThread.pendingBackgroundTasks?.[0]?.parentTaskId === "agent-1" &&
+              event.providerThread.pendingBackgroundTasks[1]?.nativeItemId === WAKE_TOOL_USE_ID &&
+              event.providerThread.pendingBackgroundTasks[2]?.nativeItemId === "toolu_moved_shell",
+          ),
         );
-        const released = yield* awaitBackgroundTasks({
-          providerThread: harness.providerThread,
-          taskIds: ["dev-server"],
-          awaited: false,
-        });
-        assert.deepStrictEqual(released.matched, ["dev-server"]);
-        assert.deepStrictEqual(
-          marks(yield* nextRoster((tasks) => !tasks.some((task) => task.awaited === true))),
-          [
-            ["dev-server", false],
-            [WAKE_TASK_ID, false],
-          ],
+
+        yield* harness.offerAndWait(emptyRoster);
+        assert.include(
+          (
+            providerThreadRosterEvents(harness.events).at(-1)?.providerThread
+              .pendingBackgroundTasks ?? []
+          ).map((task) => task.taskId),
+          WAKE_TASK_ID,
         );
-        yield* Queue.offer(harness.sdkMessages, turnOneResult);
-        yield* Queue.take(harness.terminalReceipts);
+        assert.isFalse(yield* harness.hasPendingBackgroundWork);
       }).pipe(
         Effect.provide(
           Layer.mergeAll(
@@ -11306,145 +11222,275 @@ describe("ClaudeAdapterV2 background wake turns", () => {
           ),
         ),
       ),
-    ),
   );
 
-  it.effect("keeps a running Claude monitor typed after many newer monitors end", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const harness = yield* makeWakeHarness;
-        const now = yield* DateTime.now;
-        let frameNumber = 0;
-        const nextUuid = () => `00000000-0000-4000-8000-${String(++frameNumber).padStart(12, "0")}`;
-        const monitorFrames = (index: number) => {
-          const taskId = `monitor-task-${index}`;
-          const toolUseId = `toolu_monitor_${index}`;
-          const description = `Monitor ${index}`;
-          return {
-            taskId,
-            start: [
-              claudeSdkFrame({
-                type: "assistant",
-                message: {
-                  model: "claude-sonnet-4-6",
-                  id: `msg_monitor_${index}`,
-                  type: "message",
-                  role: "assistant",
-                  content: [
-                    {
-                      type: "tool_use",
-                      id: toolUseId,
-                      name: "Monitor",
-                      input: { description, command: "sleep 8 && echo MONITOR_DONE" },
-                    },
-                  ],
-                  stop_reason: null,
-                  stop_sequence: null,
-                  usage: { input_tokens: 1, output_tokens: 1 },
-                },
-                parent_tool_use_id: null,
-                uuid: nextUuid(),
-                session_id: WAKE_NATIVE_SESSION,
-              }),
-              claudeSdkFrame({
-                type: "system",
-                subtype: "task_started",
-                task_id: taskId,
-                tool_use_id: toolUseId,
-                description,
-                is_backgrounded: true,
-                task_type: "local_bash",
-                uuid: nextUuid(),
-                session_id: WAKE_NATIVE_SESSION,
-              }),
-              claudeSdkFrame({
-                type: "user",
-                message: {
-                  role: "user",
-                  content: [
-                    {
-                      type: "tool_result",
-                      tool_use_id: toolUseId,
-                      content: `Monitor started (task ${taskId}).`,
-                    },
-                  ],
-                },
-                parent_tool_use_id: null,
-                uuid: nextUuid(),
-                session_id: WAKE_NATIVE_SESSION,
-                tool_use_result: { taskId, persistent: false },
-              }),
-            ],
-            end: claudeSdkFrame({
-              type: "system",
-              subtype: "task_notification",
-              task_id: taskId,
-              tool_use_id: toolUseId,
-              status: "completed",
-              output_file: `/tmp/claude-replay/tasks/${taskId}.output`,
-              summary: `Monitor "${description}" stream ended`,
-              uuid: nextUuid(),
-              session_id: WAKE_NATIVE_SESSION,
-            }),
-          };
-        };
+  it.effect("holds only the background tasks the agent marks awaited, until they end", () =>
+    Effect.gen(function* () {
+      const harness = yield* makeWakeHarness;
+      const now = yield* DateTime.now;
+      const awaitBackgroundTasks = harness.runtime.awaitBackgroundTasks;
+      if (awaitBackgroundTasks === undefined) {
+        throw new Error("Claude adapter runtime must expose awaitBackgroundTasks.");
+      }
+      const roster = (tasks: ReadonlyArray<string>, uuid: string) =>
+        claudeSdkFrame({
+          type: "system",
+          subtype: "background_tasks_changed",
+          tasks: tasks.map((taskId) => ({
+            task_id: taskId,
+            task_type: "local_bash",
+            description: taskId,
+          })),
+          uuid,
+          session_id: WAKE_NATIVE_SESSION,
+        });
+      const nextRoster = Effect.fn("nextRoster")(function* (
+        matches: (tasks: ReadonlyArray<OrchestrationV2PendingBackgroundTask>) => boolean,
+      ) {
+        while (true) {
+          const { providerThread } = yield* Queue.take(harness.providerThreadReceipts);
+          const tasks = providerThread.pendingBackgroundTasks ?? [];
+          if (matches(tasks)) return tasks;
+        }
+      });
+      const marks = (tasks: ReadonlyArray<OrchestrationV2PendingBackgroundTask>) =>
+        tasks.map((task) => [task.taskId, task.awaited === true]);
 
-        yield* harness.runtime.startTurn(
-          makeClaudeTestTurnInput({
-            threadId: harness.threadId,
-            providerThread: harness.providerThread,
-            now,
-            attemptId: RunAttemptId.make("attempt-claude-many-monitors"),
-            text: "Watch the deploy, then re-arm short watches.",
-            attachments: [],
-          }),
-        );
-        const longRunning = monitorFrames(0);
-        for (const frame of longRunning.start) {
-          yield* Queue.offer(harness.sdkMessages, frame);
-        }
-        for (let index = 1; index <= 65; index++) {
-          const monitor = monitorFrames(index);
-          for (const frame of monitor.start) {
-            yield* Queue.offer(harness.sdkMessages, frame);
-          }
-          yield* Queue.offer(harness.sdkMessages, monitor.end);
-        }
-        yield* Queue.offer(
-          harness.sdkMessages,
-          claudeSdkFrame({
-            type: "system",
-            subtype: "background_tasks_changed",
-            tasks: [
-              {
-                task_id: longRunning.taskId,
-                task_type: "local_bash",
-                description: "Monitor 0",
+      yield* harness.runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now,
+          attemptId: RunAttemptId.make("attempt-claude-awaited-roster"),
+          text: "Run the tests in the background and the dev server.",
+          attachments: [],
+        }),
+      );
+      yield* Queue.offer(
+        harness.sdkMessages,
+        roster([WAKE_TASK_ID, "dev-server"], "00000000-0000-4000-8000-000000000301"),
+      );
+      yield* nextRoster((tasks) => tasks.length === 2);
+
+      const marked = yield* awaitBackgroundTasks({
+        providerThread: harness.providerThread,
+        taskIds: [WAKE_TASK_ID, "already-finished"],
+        awaited: true,
+      });
+      assert.deepStrictEqual(marked.matched, [WAKE_TASK_ID]);
+      assert.deepStrictEqual(
+        marks(yield* nextRoster((tasks) => tasks.some((task) => task.awaited === true))),
+        [
+          [WAKE_TASK_ID, true],
+          ["dev-server", false],
+        ],
+      );
+      // A replacing level rebuilds every entry; the mark must survive it.
+      yield* Queue.offer(
+        harness.sdkMessages,
+        roster(["dev-server", WAKE_TASK_ID], "00000000-0000-4000-8000-000000000302"),
+      );
+      assert.deepStrictEqual(
+        marks(yield* nextRoster((tasks) => tasks[0]?.taskId === "dev-server")),
+        [
+          ["dev-server", false],
+          [WAKE_TASK_ID, true],
+        ],
+      );
+
+      // Once the task ends, a reused id starts unmarked.
+      yield* Queue.offer(
+        harness.sdkMessages,
+        claudeSdkFrame({ ...wakeNotification, uuid: "00000000-0000-4000-8000-000000000303" }),
+      );
+      yield* nextRoster((tasks) => tasks.length === 1);
+      yield* Queue.offer(
+        harness.sdkMessages,
+        roster(["dev-server", WAKE_TASK_ID], "00000000-0000-4000-8000-000000000304"),
+      );
+      assert.deepStrictEqual(marks(yield* nextRoster((tasks) => tasks.length === 2)), [
+        ["dev-server", false],
+        [WAKE_TASK_ID, false],
+      ]);
+
+      yield* awaitBackgroundTasks({
+        providerThread: harness.providerThread,
+        taskIds: ["dev-server"],
+        awaited: true,
+      });
+      assert.deepStrictEqual(
+        marks(yield* nextRoster((tasks) => tasks.some((task) => task.awaited === true))),
+        [
+          ["dev-server", true],
+          [WAKE_TASK_ID, false],
+        ],
+      );
+      const released = yield* awaitBackgroundTasks({
+        providerThread: harness.providerThread,
+        taskIds: ["dev-server"],
+        awaited: false,
+      });
+      assert.deepStrictEqual(released.matched, ["dev-server"]);
+      assert.deepStrictEqual(
+        marks(yield* nextRoster((tasks) => !tasks.some((task) => task.awaited === true))),
+        [
+          ["dev-server", false],
+          [WAKE_TASK_ID, false],
+        ],
+      );
+      yield* Queue.offer(harness.sdkMessages, turnOneResult);
+      yield* Queue.take(harness.terminalReceipts);
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
+        ),
+      ),
+    ),
+  );
+
+  it.effect("keeps a running Claude monitor typed after many newer monitors end", () =>
+    Effect.gen(function* () {
+      const harness = yield* makeWakeHarness;
+      const now = yield* DateTime.now;
+      let frameNumber = 0;
+      const nextUuid = () => `00000000-0000-4000-8000-${String(++frameNumber).padStart(12, "0")}`;
+      const monitorFrames = (index: number) => {
+        const taskId = `monitor-task-${index}`;
+        const toolUseId = `toolu_monitor_${index}`;
+        const description = `Monitor ${index}`;
+        return {
+          taskId,
+          start: [
+            claudeSdkFrame({
+              type: "assistant",
+              message: {
+                model: "claude-sonnet-4-6",
+                id: `msg_monitor_${index}`,
+                type: "message",
+                role: "assistant",
+                content: [
+                  {
+                    type: "tool_use",
+                    id: toolUseId,
+                    name: "Monitor",
+                    input: { description, command: "sleep 8 && echo MONITOR_DONE" },
+                  },
+                ],
+                stop_reason: null,
+                stop_sequence: null,
+                usage: { input_tokens: 1, output_tokens: 1 },
               },
-            ],
+              parent_tool_use_id: null,
+              uuid: nextUuid(),
+              session_id: WAKE_NATIVE_SESSION,
+            }),
+            claudeSdkFrame({
+              type: "system",
+              subtype: "task_started",
+              task_id: taskId,
+              tool_use_id: toolUseId,
+              description,
+              is_backgrounded: true,
+              task_type: "local_bash",
+              uuid: nextUuid(),
+              session_id: WAKE_NATIVE_SESSION,
+            }),
+            claudeSdkFrame({
+              type: "user",
+              message: {
+                role: "user",
+                content: [
+                  {
+                    type: "tool_result",
+                    tool_use_id: toolUseId,
+                    content: `Monitor started (task ${taskId}).`,
+                  },
+                ],
+              },
+              parent_tool_use_id: null,
+              uuid: nextUuid(),
+              session_id: WAKE_NATIVE_SESSION,
+              tool_use_result: { taskId, persistent: false },
+            }),
+          ],
+          end: claudeSdkFrame({
+            type: "system",
+            subtype: "task_notification",
+            task_id: taskId,
+            tool_use_id: toolUseId,
+            status: "completed",
+            output_file: `/tmp/claude-replay/tasks/${taskId}.output`,
+            summary: `Monitor "${description}" stream ended`,
             uuid: nextUuid(),
             session_id: WAKE_NATIVE_SESSION,
           }),
-        );
-        yield* Queue.offer(
-          harness.sdkMessages,
-          makeResultFrame({ uuid: nextUuid(), result: "Watching." }),
-        );
-        yield* harness.awaitTerminal(1);
+        };
+      };
 
-        const roster = providerThreadRosterEvents(harness.events).at(-1)?.providerThread
-          .pendingBackgroundTasks;
-        assert.deepEqual(roster, [
-          { taskId: longRunning.taskId, kind: "monitor", description: "Monitor 0" },
-        ]);
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
-          ),
+      yield* harness.runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now,
+          attemptId: RunAttemptId.make("attempt-claude-many-monitors"),
+          text: "Watch the deploy, then re-arm short watches.",
+          attachments: [],
+        }),
+      );
+      const longRunning = monitorFrames(0);
+      for (const frame of longRunning.start) {
+        yield* Queue.offer(harness.sdkMessages, frame);
+      }
+      for (let index = 1; index <= 65; index++) {
+        const monitor = monitorFrames(index);
+        for (const frame of monitor.start) {
+          yield* Queue.offer(harness.sdkMessages, frame);
+        }
+        yield* Queue.offer(harness.sdkMessages, monitor.end);
+      }
+      yield* Queue.offer(
+        harness.sdkMessages,
+        claudeSdkFrame({
+          type: "system",
+          subtype: "background_tasks_changed",
+          tasks: [
+            {
+              task_id: longRunning.taskId,
+              task_type: "local_bash",
+              description: "Monitor 0",
+            },
+          ],
+          uuid: nextUuid(),
+          session_id: WAKE_NATIVE_SESSION,
+        }),
+      );
+      yield* Queue.offer(
+        harness.sdkMessages,
+        makeResultFrame({ uuid: nextUuid(), result: "Watching." }),
+      );
+      yield* harness.awaitTerminal(1);
+
+      const roster = providerThreadRosterEvents(harness.events).at(-1)?.providerThread
+        .pendingBackgroundTasks;
+      assert.deepEqual(roster, [
+        {
+          taskId: longRunning.taskId,
+          kind: "monitor",
+          description: "Monitor 0",
+          nativeItemId: "toolu_monitor_0",
+        },
+      ]);
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
         ),
       ),
     ),
@@ -11532,97 +11578,52 @@ describe("ClaudeAdapterV2 background wake turns", () => {
   ] as const)(
     "a fired ScheduleWakeup holds completion only while its wake turn reschedules (rescheduled=$rescheduled, fired after $firedAfter)",
     ({ rescheduled, firedAfter }) =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const harness = yield* makeWakeHarness;
-          yield* startScheduleWakeupTurn(harness);
-          assert.isTrue(backgroundWorkHoldsCompletion(publishedRoster(harness)));
-          assert.isTrue(
-            yield* harness.hasPendingBackgroundWork,
-            "a wakeup past the idle timeout must keep the session from being released",
-          );
-
-          yield* TestClock.adjust(firedAfter);
-          yield* harness.offerAndWait(wakeTurnInit);
-          yield* harness.awaitContinuation(1);
-          const now = yield* DateTime.now;
-          yield* harness.runtime.startTurn(
-            makeClaudeTestTurnInput({
-              threadId: harness.threadId,
-              providerThread: harness.providerThread,
-              now,
-              attemptId: RunAttemptId.make("attempt-claude-schedule-wakeup-2"),
-              text: "say WOKE",
-              attachments: [],
-              providerTurnOrdinal: 2,
-              messageCreatedBy: "agent",
-              messageCreationSource: "provider",
-            }),
-          );
-          if (rescheduled) {
-            for (const frame of scheduleWakeupFrames({
-              toolUseId: "toolu_schedule_wakeup_2",
-              uuids: [
-                "00000000-0000-4000-8000-000000002201",
-                "00000000-0000-4000-8000-000000002202",
-              ],
-              toolInput: { delaySeconds: 60, prompt: "say WOKE", reason: "loop", noop: false },
-              scheduledFor: DateTime.toEpochMillis(now) + 60_000,
-            })) {
-              yield* harness.offerAndWait(frame);
-            }
-          }
-          yield* harness.offerAndWait(
-            makeAssistantTextFrame({ uuid: "00000000-0000-4000-8000-000000002203", text: "WOKE" }),
-          );
-          yield* harness.offerAndWait(
-            makeResultFrame({ uuid: "00000000-0000-4000-8000-000000002204", result: "WOKE" }),
-          );
-          yield* harness.awaitTerminal(2);
-          assert.equal(harness.terminalEvents()[1]?.status, "completed");
-          assert.equal(backgroundWorkHoldsCompletion(publishedRoster(harness)), rescheduled);
-          assert.equal(yield* harness.hasPendingBackgroundWork, rescheduled);
-        }).pipe(
-          Effect.provide(
-            Layer.mergeAll(
-              IdAllocator.layer,
-              McpProviderSessions.layer,
-              NodeServices.layer,
-              NodeCrypto.layer,
-            ),
-          ),
-        ),
-      ),
-  );
-
-  it.effect("a user turn before the wakeup fires keeps the pending wakeup's hold", () =>
-    Effect.scoped(
       Effect.gen(function* () {
         const harness = yield* makeWakeHarness;
         yield* startScheduleWakeupTurn(harness);
-        yield* TestClock.adjust("10 seconds");
+        assert.isTrue(backgroundWorkHoldsCompletion(publishedRoster(harness)));
+        assert.isTrue(
+          yield* harness.hasPendingBackgroundWork,
+          "a wakeup past the idle timeout must keep the session from being released",
+        );
+
+        yield* TestClock.adjust(firedAfter);
+        yield* harness.offerAndWait(wakeTurnInit);
+        yield* harness.awaitContinuation(1);
+        const now = yield* DateTime.now;
         yield* harness.runtime.startTurn(
           makeClaudeTestTurnInput({
             threadId: harness.threadId,
             providerThread: harness.providerThread,
-            now: yield* DateTime.now,
-            attemptId: RunAttemptId.make("attempt-claude-schedule-wakeup-user"),
-            text: "What time is it?",
+            now,
+            attemptId: RunAttemptId.make("attempt-claude-schedule-wakeup-2"),
+            text: "say WOKE",
             attachments: [],
             providerTurnOrdinal: 2,
+            messageCreatedBy: "agent",
+            messageCreationSource: "provider",
           }),
         );
-        yield* harness.offerAndWait(wakeTurnInit);
+        if (rescheduled) {
+          for (const frame of scheduleWakeupFrames({
+            toolUseId: "toolu_schedule_wakeup_2",
+            uuids: ["00000000-0000-4000-8000-000000002201", "00000000-0000-4000-8000-000000002202"],
+            toolInput: { delaySeconds: 60, prompt: "say WOKE", reason: "loop", noop: false },
+            scheduledFor: DateTime.toEpochMillis(now) + 60_000,
+          })) {
+            yield* harness.offerAndWait(frame);
+          }
+        }
         yield* harness.offerAndWait(
-          makeAssistantTextFrame({ uuid: "00000000-0000-4000-8000-000000002401", text: "Noon." }),
+          makeAssistantTextFrame({ uuid: "00000000-0000-4000-8000-000000002203", text: "WOKE" }),
         );
         yield* harness.offerAndWait(
-          makeResultFrame({ uuid: "00000000-0000-4000-8000-000000002402", result: "Noon." }),
+          makeResultFrame({ uuid: "00000000-0000-4000-8000-000000002204", result: "WOKE" }),
         );
         yield* harness.awaitTerminal(2);
         assert.equal(harness.terminalEvents()[1]?.status, "completed");
-        assert.isTrue(backgroundWorkHoldsCompletion(publishedRoster(harness)));
-        assert.isTrue(yield* harness.hasPendingBackgroundWork);
+        assert.equal(backgroundWorkHoldsCompletion(publishedRoster(harness)), rescheduled);
+        assert.equal(yield* harness.hasPendingBackgroundWork, rescheduled);
       }).pipe(
         Effect.provide(
           Layer.mergeAll(
@@ -11633,28 +11634,146 @@ describe("ClaudeAdapterV2 background wake turns", () => {
           ),
         ),
       ),
-    ),
   );
 
-  it.effect("a task notification waking Claude just before the wakeup keeps its hold", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const harness = yield* makeWakeHarness;
-        const now = yield* DateTime.now;
-        yield* harness.runtime.startTurn(
-          makeClaudeTestTurnInput({
+  it.effect("a user turn before the wakeup fires keeps the pending wakeup's hold", () =>
+    Effect.gen(function* () {
+      const harness = yield* makeWakeHarness;
+      yield* startScheduleWakeupTurn(harness);
+      yield* TestClock.adjust("10 seconds");
+      yield* harness.runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now: yield* DateTime.now,
+          attemptId: RunAttemptId.make("attempt-claude-schedule-wakeup-user"),
+          text: "What time is it?",
+          attachments: [],
+          providerTurnOrdinal: 2,
+        }),
+      );
+      yield* harness.offerAndWait(wakeTurnInit);
+      yield* harness.offerAndWait(
+        makeAssistantTextFrame({ uuid: "00000000-0000-4000-8000-000000002401", text: "Noon." }),
+      );
+      yield* harness.offerAndWait(
+        makeResultFrame({ uuid: "00000000-0000-4000-8000-000000002402", result: "Noon." }),
+      );
+      yield* harness.awaitTerminal(2);
+      assert.equal(harness.terminalEvents()[1]?.status, "completed");
+      assert.isTrue(backgroundWorkHoldsCompletion(publishedRoster(harness)));
+      assert.isTrue(yield* harness.hasPendingBackgroundWork);
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
+        ),
+      ),
+    ),
+  );
+
+  it.effect("a task notification waking Claude just before the wakeup keeps its hold", () =>
+    Effect.gen(function* () {
+      const harness = yield* makeWakeHarness;
+      const now = yield* DateTime.now;
+      yield* harness.runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now,
+          attemptId: RunAttemptId.make("attempt-claude-schedule-wakeup-task"),
+          text: "Run the build in the background and check back in two minutes.",
+          attachments: [],
+        }),
+      );
+      yield* Queue.offer(harness.sdkMessages, wakeTaskStarted);
+      for (const frame of scheduleWakeupFrames({
+        toolUseId: "toolu_schedule_wakeup_fallback",
+        uuids: ["00000000-0000-4000-8000-000000002501", "00000000-0000-4000-8000-000000002502"],
+        toolInput: { delaySeconds: 120, prompt: "check the build", reason: "fallback" },
+        scheduledFor: DateTime.toEpochMillis(now) + 120_000,
+      })) {
+        yield* Queue.offer(harness.sdkMessages, frame);
+      }
+      yield* Queue.offer(harness.sdkMessages, turnOneResult);
+      yield* harness.awaitTerminal(1);
+
+      yield* TestClock.adjust("60 seconds");
+      // Claude runs an empty turn for the notification and opens the real one right after,
+      // both before the wake run attaches.
+      yield* harness.offerAndWait(wakeNotification);
+      yield* Queue.offer(harness.sdkMessages, wakeTurnInit);
+      yield* Queue.offer(
+        harness.sdkMessages,
+        makeResultFrame({
+          uuid: "00000000-0000-4000-8000-000000002503",
+          result: "",
+          numTurns: 0,
+          origin: { kind: "task-notification" },
+          terminalReason: null,
+        }),
+      );
+      yield* harness.offerAndWait(
+        claudeSdkFrame({ ...wakeTurnInit, uuid: "00000000-0000-4000-8000-000000002504" }),
+      );
+      yield* harness.awaitContinuation(1);
+      yield* harness.runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now: yield* DateTime.now,
+          attemptId: RunAttemptId.make("attempt-claude-schedule-wakeup-task-2"),
+          text: "Background task completed.",
+          attachments: [],
+          providerTurnOrdinal: 2,
+          messageCreatedBy: "agent",
+          messageCreationSource: "provider",
+        }),
+      );
+      yield* harness.offerAndWait(wakeAssistant);
+      yield* harness.offerAndWait(wakeResult);
+      yield* harness.awaitTerminal(2);
+      assert.equal(harness.terminalEvents()[1]?.status, "completed");
+      assert.isTrue(
+        backgroundWorkHoldsCompletion(publishedRoster(harness)),
+        "the wakeup is still pending after the task notification's wake turn",
+      );
+      assert.isTrue(yield* harness.hasPendingBackgroundWork);
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
+        ),
+      ),
+    ),
+  );
+
+  it.effect.each([{ emptyResult: true }, { emptyResult: false }])(
+    "an early wakeup after an idle task notification releases its hold (empty result: $emptyResult)",
+    ({ emptyResult }) =>
+      Effect.gen(function* () {
+        const harness = yield* makeWakeHarness;
+        const now = yield* DateTime.now;
+        yield* harness.runtime.startTurn(
+          makeClaudeTestTurnInput({
             threadId: harness.threadId,
             providerThread: harness.providerThread,
             now,
-            attemptId: RunAttemptId.make("attempt-claude-schedule-wakeup-task"),
+            attemptId: RunAttemptId.make("attempt-claude-schedule-wakeup-notified"),
             text: "Run the build in the background and check back in two minutes.",
             attachments: [],
           }),
         );
         yield* Queue.offer(harness.sdkMessages, wakeTaskStarted);
         for (const frame of scheduleWakeupFrames({
-          toolUseId: "toolu_schedule_wakeup_fallback",
-          uuids: ["00000000-0000-4000-8000-000000002501", "00000000-0000-4000-8000-000000002502"],
+          toolUseId: "toolu_schedule_wakeup_notified",
+          uuids: ["00000000-0000-4000-8000-000000002601", "00000000-0000-4000-8000-000000002602"],
           toolInput: { delaySeconds: 120, prompt: "check the build", reason: "fallback" },
           scheduledFor: DateTime.toEpochMillis(now) + 120_000,
         })) {
@@ -11663,47 +11782,49 @@ describe("ClaudeAdapterV2 background wake turns", () => {
         yield* Queue.offer(harness.sdkMessages, turnOneResult);
         yield* harness.awaitTerminal(1);
 
-        yield* TestClock.adjust("60 seconds");
-        // Claude runs an empty turn for the notification and opens the real one right after,
-        // both before the wake run attaches.
+        yield* TestClock.adjust("10 seconds");
         yield* harness.offerAndWait(wakeNotification);
-        yield* Queue.offer(harness.sdkMessages, wakeTurnInit);
-        yield* Queue.offer(
-          harness.sdkMessages,
-          makeResultFrame({
-            uuid: "00000000-0000-4000-8000-000000002503",
-            result: "",
-            numTurns: 0,
-            origin: { kind: "task-notification" },
-            terminalReason: null,
-          }),
-        );
-        yield* harness.offerAndWait(
-          claudeSdkFrame({ ...wakeTurnInit, uuid: "00000000-0000-4000-8000-000000002504" }),
-        );
+        if (emptyResult) {
+          yield* harness.offerAndWait(
+            makeResultFrame({
+              uuid: "00000000-0000-4000-8000-000000002603",
+              result: "",
+              numTurns: 0,
+              origin: { kind: "task-notification" },
+              terminalReason: null,
+            }),
+          );
+        }
+
+        yield* TestClock.adjust("80 seconds");
+        yield* harness.offerAndWait(wakeTurnInit);
         yield* harness.awaitContinuation(1);
         yield* harness.runtime.startTurn(
           makeClaudeTestTurnInput({
             threadId: harness.threadId,
             providerThread: harness.providerThread,
             now: yield* DateTime.now,
-            attemptId: RunAttemptId.make("attempt-claude-schedule-wakeup-task-2"),
-            text: "Background task completed.",
+            attemptId: RunAttemptId.make("attempt-claude-schedule-wakeup-notified-2"),
+            text: "check the build",
             attachments: [],
             providerTurnOrdinal: 2,
             messageCreatedBy: "agent",
             messageCreationSource: "provider",
           }),
         );
-        yield* harness.offerAndWait(wakeAssistant);
-        yield* harness.offerAndWait(wakeResult);
+        yield* harness.offerAndWait(
+          makeAssistantTextFrame({
+            uuid: "00000000-0000-4000-8000-000000002604",
+            text: "Built.",
+          }),
+        );
+        yield* harness.offerAndWait(
+          makeResultFrame({ uuid: "00000000-0000-4000-8000-000000002605", result: "Built." }),
+        );
         yield* harness.awaitTerminal(2);
         assert.equal(harness.terminalEvents()[1]?.status, "completed");
-        assert.isTrue(
-          backgroundWorkHoldsCompletion(publishedRoster(harness)),
-          "the wakeup is still pending after the task notification's wake turn",
-        );
-        assert.isTrue(yield* harness.hasPendingBackgroundWork);
+        assert.isFalse(backgroundWorkHoldsCompletion(publishedRoster(harness)));
+        assert.isFalse(yield* harness.hasPendingBackgroundWork);
       }).pipe(
         Effect.provide(
           Layer.mergeAll(
@@ -11714,205 +11835,113 @@ describe("ClaudeAdapterV2 background wake turns", () => {
           ),
         ),
       ),
-    ),
   );
 
-  it.effect.each([{ emptyResult: true }, { emptyResult: false }])(
-    "an early wakeup after an idle task notification releases its hold (empty result: $emptyResult)",
-    ({ emptyResult }) =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const harness = yield* makeWakeHarness;
-          const now = yield* DateTime.now;
-          yield* harness.runtime.startTurn(
-            makeClaudeTestTurnInput({
-              threadId: harness.threadId,
-              providerThread: harness.providerThread,
-              now,
-              attemptId: RunAttemptId.make("attempt-claude-schedule-wakeup-notified"),
-              text: "Run the build in the background and check back in two minutes.",
-              attachments: [],
-            }),
-          );
-          yield* Queue.offer(harness.sdkMessages, wakeTaskStarted);
-          for (const frame of scheduleWakeupFrames({
-            toolUseId: "toolu_schedule_wakeup_notified",
-            uuids: ["00000000-0000-4000-8000-000000002601", "00000000-0000-4000-8000-000000002602"],
-            toolInput: { delaySeconds: 120, prompt: "check the build", reason: "fallback" },
-            scheduledFor: DateTime.toEpochMillis(now) + 120_000,
-          })) {
-            yield* Queue.offer(harness.sdkMessages, frame);
-          }
-          yield* Queue.offer(harness.sdkMessages, turnOneResult);
-          yield* harness.awaitTerminal(1);
-
-          yield* TestClock.adjust("10 seconds");
-          yield* harness.offerAndWait(wakeNotification);
-          if (emptyResult) {
-            yield* harness.offerAndWait(
-              makeResultFrame({
-                uuid: "00000000-0000-4000-8000-000000002603",
-                result: "",
-                numTurns: 0,
-                origin: { kind: "task-notification" },
-                terminalReason: null,
-              }),
-            );
-          }
-
-          yield* TestClock.adjust("80 seconds");
-          yield* harness.offerAndWait(wakeTurnInit);
-          yield* harness.awaitContinuation(1);
-          yield* harness.runtime.startTurn(
-            makeClaudeTestTurnInput({
-              threadId: harness.threadId,
-              providerThread: harness.providerThread,
-              now: yield* DateTime.now,
-              attemptId: RunAttemptId.make("attempt-claude-schedule-wakeup-notified-2"),
-              text: "check the build",
-              attachments: [],
-              providerTurnOrdinal: 2,
-              messageCreatedBy: "agent",
-              messageCreationSource: "provider",
-            }),
-          );
-          yield* harness.offerAndWait(
-            makeAssistantTextFrame({
-              uuid: "00000000-0000-4000-8000-000000002604",
-              text: "Built.",
-            }),
-          );
-          yield* harness.offerAndWait(
-            makeResultFrame({ uuid: "00000000-0000-4000-8000-000000002605", result: "Built." }),
-          );
-          yield* harness.awaitTerminal(2);
-          assert.equal(harness.terminalEvents()[1]?.status, "completed");
-          assert.isFalse(backgroundWorkHoldsCompletion(publishedRoster(harness)));
-          assert.isFalse(yield* harness.hasPendingBackgroundWork);
-        }).pipe(
-          Effect.provide(
-            Layer.mergeAll(
-              IdAllocator.layer,
-              McpProviderSessions.layer,
-              NodeServices.layer,
-              NodeCrypto.layer,
-            ),
-          ),
+  it.effect("a failed turn on a live Claude process keeps the pending wakeup's hold", () =>
+    Effect.gen(function* () {
+      const harness = yield* makeWakeHarness;
+      yield* startScheduleWakeupTurn(
+        harness,
+        makeResultFrame({
+          uuid: "00000000-0000-4000-8000-000000002103",
+          result: "API Error: 529 overloaded",
+          subtype: "error_during_execution",
+          isError: true,
+          errors: ["API Error: 529 overloaded"],
+          terminalReason: "model_error",
+        }),
+      );
+      assert.equal(harness.terminalEvents()[0]?.status, "failed");
+      assert.isTrue(backgroundWorkHoldsCompletion(publishedRoster(harness)));
+      assert.isTrue(yield* harness.hasPendingBackgroundWork);
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
         ),
       ),
+    ),
   );
 
-  it.effect("a failed turn on a live Claude process keeps the pending wakeup's hold", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const harness = yield* makeWakeHarness;
-        yield* startScheduleWakeupTurn(
-          harness,
-          makeResultFrame({
-            uuid: "00000000-0000-4000-8000-000000002103",
-            result: "API Error: 529 overloaded",
-            subtype: "error_during_execution",
-            isError: true,
-            errors: ["API Error: 529 overloaded"],
-            terminalReason: "model_error",
-          }),
-        );
-        assert.equal(harness.terminalEvents()[0]?.status, "failed");
-        assert.isTrue(backgroundWorkHoldsCompletion(publishedRoster(harness)));
-        assert.isTrue(yield* harness.hasPendingBackgroundWork);
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
-          ),
-        ),
-      ),
-    ),
-  );
-
-  it.effect("ScheduleWakeup stop:true releases the pending wakeup's hold", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const harness = yield* makeWakeHarness;
-        const now = yield* DateTime.now;
-        yield* harness.runtime.startTurn(
-          makeClaudeTestTurnInput({
-            threadId: harness.threadId,
-            providerThread: harness.providerThread,
-            now,
-            attemptId: RunAttemptId.make("attempt-claude-schedule-wakeup-stop"),
-            text: "Schedule a wakeup, then cancel it.",
-            attachments: [],
-          }),
-        );
-        const frames = [
-          ...scheduleWakeupFrames({
-            toolUseId: "toolu_schedule_wakeup_set",
-            uuids: ["00000000-0000-4000-8000-000000002301", "00000000-0000-4000-8000-000000002302"],
-            toolInput: { delaySeconds: 60, prompt: "say WOKE", reason: "wake", noop: false },
-            scheduledFor: DateTime.toEpochMillis(now) + 60_000,
-          }),
-          ...scheduleWakeupFrames({
-            toolUseId: "toolu_schedule_wakeup_stop",
-            uuids: ["00000000-0000-4000-8000-000000002303", "00000000-0000-4000-8000-000000002304"],
-            toolInput: { stop: true },
-            scheduledFor: 0,
-          }),
-          makeResultFrame({ uuid: "00000000-0000-4000-8000-000000002305", result: "Cancelled." }),
-        ];
-        for (const frame of frames) yield* Queue.offer(harness.sdkMessages, frame);
-        yield* harness.awaitTerminal(1);
-        assert.isFalse(backgroundWorkHoldsCompletion(publishedRoster(harness)));
-        assert.isFalse(yield* harness.hasPendingBackgroundWork);
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
-          ),
+  it.effect("ScheduleWakeup stop:true releases the pending wakeup's hold", () =>
+    Effect.gen(function* () {
+      const harness = yield* makeWakeHarness;
+      const now = yield* DateTime.now;
+      yield* harness.runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now,
+          attemptId: RunAttemptId.make("attempt-claude-schedule-wakeup-stop"),
+          text: "Schedule a wakeup, then cancel it.",
+          attachments: [],
+        }),
+      );
+      const frames = [
+        ...scheduleWakeupFrames({
+          toolUseId: "toolu_schedule_wakeup_set",
+          uuids: ["00000000-0000-4000-8000-000000002301", "00000000-0000-4000-8000-000000002302"],
+          toolInput: { delaySeconds: 60, prompt: "say WOKE", reason: "wake", noop: false },
+          scheduledFor: DateTime.toEpochMillis(now) + 60_000,
+        }),
+        ...scheduleWakeupFrames({
+          toolUseId: "toolu_schedule_wakeup_stop",
+          uuids: ["00000000-0000-4000-8000-000000002303", "00000000-0000-4000-8000-000000002304"],
+          toolInput: { stop: true },
+          scheduledFor: 0,
+        }),
+        makeResultFrame({ uuid: "00000000-0000-4000-8000-000000002305", result: "Cancelled." }),
+      ];
+      for (const frame of frames) yield* Queue.offer(harness.sdkMessages, frame);
+      yield* harness.awaitTerminal(1);
+      assert.isFalse(backgroundWorkHoldsCompletion(publishedRoster(harness)));
+      assert.isFalse(yield* harness.hasPendingBackgroundWork);
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
         ),
       ),
     ),
   );
 
   it.effect("Stop on a thread waiting for a ScheduleWakeup closes Claude and drops the hold", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        let closes = 0;
-        const harness = yield* makeWakeHarnessWithOptions({
-          close: (sdkMessages) =>
-            Effect.sync(() => {
-              closes++;
-            }).pipe(Effect.andThen(Queue.shutdown(sdkMessages))),
-        });
-        yield* startScheduleWakeupTurn(harness);
-        const settledThread = providerThreadRosterEvents(harness.events).at(-1)?.providerThread;
-        assert.isTrue(backgroundWorkHoldsCompletion(settledThread?.pendingBackgroundTasks ?? []));
-        // The wakeup alone must not refuse a model or mode change.
-        assert.isFalse(yield* harness.runtime.hasPendingBackgroundWorkForThread!(settledThread!));
+    Effect.gen(function* () {
+      let closes = 0;
+      const harness = yield* makeWakeHarnessWithOptions({
+        close: (sdkMessages) =>
+          Effect.sync(() => {
+            closes++;
+          }).pipe(Effect.andThen(Queue.shutdown(sdkMessages))),
+      });
+      yield* startScheduleWakeupTurn(harness);
+      const settledThread = providerThreadRosterEvents(harness.events).at(-1)?.providerThread;
+      assert.isTrue(backgroundWorkHoldsCompletion(settledThread?.pendingBackgroundTasks ?? []));
+      // The wakeup alone must not refuse a model or mode change.
+      assert.isFalse(yield* harness.runtime.hasPendingBackgroundWorkForThread!(settledThread!));
 
-        yield* harness.runtime.interruptTurn({
-          providerThread: settledThread ?? harness.providerThread,
-          providerTurnId: harness.terminalEvents()[0]!.providerTurnId,
-          requestRuntimeRestart: true,
-        });
+      yield* harness.runtime.interruptTurn({
+        providerThread: settledThread ?? harness.providerThread,
+        providerTurnId: harness.terminalEvents()[0]!.providerTurnId,
+        requestRuntimeRestart: true,
+      });
 
-        assert.equal(closes, 1, "the wakeup lives in the CLI process, so Stop must close it");
-        yield* harness.until(() => publishedRoster(harness).length === 0);
-        assert.isFalse(yield* harness.hasPendingBackgroundWork);
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
-          ),
+      assert.equal(closes, 1, "the wakeup lives in the CLI process, so Stop must close it");
+      yield* harness.until(() => publishedRoster(harness).length === 0);
+      assert.isFalse(yield* harness.hasPendingBackgroundWork);
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
         ),
       ),
     ),
@@ -11921,173 +11950,105 @@ describe("ClaudeAdapterV2 background wake turns", () => {
   it.effect.skipIf(process.getuid === undefined)(
     "tails foreground Bash output under the physical cwd the query launched in",
     () =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const fileSystem = yield* FileSystem.FileSystem;
-          const path = yield* Path.Path;
-          const root = yield* fileSystem.makeTempDirectoryScoped({
-            prefix: "t3-claude-task-output-cwd-",
-          });
-          const physicalCwd = path.join(root, "real", "project");
-          const launchCwd = path.join(root, "link");
-          yield* fileSystem.makeDirectory(physicalCwd, { recursive: true });
-          yield* fileSystem.symlink(physicalCwd, launchCwd);
-          // The session opens in /workspace; a relative TMPDIR puts Claude's
-          // task files under whichever cwd the CLI was launched in. Linux,
-          // because Claude Code's macOS build ignores TMPDIR.
-          const harness = yield* makeWakeHarnessWithOptions({ environment: { TMPDIR: "../tmp" } });
-          const now = yield* DateTime.now;
-          const toolUseId = "toolu_foreground_bash";
-          const taskId = "foreground-bash-task";
-          const tasks = path.join(
-            root,
-            "real",
-            "tmp",
-            `claude-${process.getuid?.()}`,
-            "project",
-            WAKE_NATIVE_SESSION,
-            "tasks",
-          );
-          yield* fileSystem.makeDirectory(tasks, { recursive: true });
-          yield* fileSystem.writeFileString(path.join(tasks, `${taskId}.output`), "line 1\n");
-
-          yield* harness.runtime.startTurn(
-            makeClaudeTestTurnInput({
-              threadId: harness.threadId,
-              providerThread: harness.providerThread,
-              now,
-              attemptId: RunAttemptId.make("attempt-claude-task-output-cwd"),
-              text: "Run the build.",
-              attachments: [],
-              runtimePolicy: { ...CLAUDE_TEST_RUNTIME_POLICY, cwd: launchCwd },
-            }),
-          );
-          assert.equal(harness.getOpenedOptions()?.cwd, launchCwd);
-          for (const frame of [
-            claudeSdkFrame({
-              type: "assistant",
-              message: {
-                model: "claude-sonnet-4-6",
-                id: "msg_foreground_bash",
-                type: "message",
-                role: "assistant",
-                content: [
-                  {
-                    type: "tool_use",
-                    id: toolUseId,
-                    name: "Bash",
-                    input: { command: "vp run build", description: "Build" },
-                  },
-                ],
-                stop_reason: null,
-                stop_sequence: null,
-                usage: { input_tokens: 1, output_tokens: 1 },
-              },
-              parent_tool_use_id: null,
-              uuid: "00000000-0000-4000-8000-000000000a01",
-              session_id: WAKE_NATIVE_SESSION,
-            }),
-            claudeSdkFrame({
-              type: "system",
-              subtype: "task_started",
-              task_id: taskId,
-              tool_use_id: toolUseId,
-              description: "vp run build",
-              is_backgrounded: false,
-              task_type: "local_bash",
-              uuid: "00000000-0000-4000-8000-000000000a02",
-              session_id: WAKE_NATIVE_SESSION,
-            }),
-            claudeSdkFrame({
-              type: "user",
-              message: {
-                role: "user",
-                content: [{ type: "tool_result", tool_use_id: toolUseId, content: "line 1" }],
-              },
-              parent_tool_use_id: null,
-              uuid: "00000000-0000-4000-8000-000000000a03",
-              session_id: WAKE_NATIVE_SESSION,
-              tool_use_result: { stdout: "line 1\n", stderr: "", interrupted: false },
-            }),
-            makeResultFrame({ uuid: "00000000-0000-4000-8000-000000000a04", result: "Built." }),
-          ]) {
-            yield* Queue.offer(harness.sdkMessages, frame);
-          }
-          yield* harness.awaitTerminal(1);
-
-          const chunks = harness.events.flatMap((event) =>
-            event.type === "command_output.delta" ? [event.chunk] : [],
-          );
-          assert.deepEqual(chunks, ["line 1\n"]);
-        }).pipe(
-          Effect.provideService(HostProcess.Platform, "linux"),
-          Effect.provide(
-            Layer.mergeAll(
-              IdAllocator.layer,
-              McpProviderSessions.layer,
-              NodeServices.layer,
-              NodeCrypto.layer,
-            ),
-          ),
-        ),
-      ),
-  );
-
-  it.effect("lets the native SDK acknowledge Stop before closing its own query", () =>
-    Effect.scoped(
       Effect.gen(function* () {
-        let closes = 0;
-        let acknowledge = Effect.void;
-        const harness = yield* makeWakeHarnessWithOptions({
-          interrupt: Effect.suspend(() => {
-            assert.equal(closes, 0);
-            return acknowledge;
-          }),
-          close: (messages) =>
-            Effect.sync(() => {
-              closes++;
-            }).pipe(Effect.andThen(Queue.shutdown(messages))),
+        const fileSystem = yield* FileSystem.FileSystem;
+        const path = yield* Path.Path;
+        const root = yield* fileSystem.makeTempDirectoryScoped({
+          prefix: "t3-claude-task-output-cwd-",
         });
+        const physicalCwd = path.join(root, "real", "project");
+        const launchCwd = path.join(root, "link");
+        yield* fileSystem.makeDirectory(physicalCwd, { recursive: true });
+        yield* fileSystem.symlink(physicalCwd, launchCwd);
+        // The session opens in /workspace; a relative TMPDIR puts Claude's
+        // task files under whichever cwd the CLI was launched in. Linux,
+        // because Claude Code's macOS build ignores TMPDIR.
+        const harness = yield* makeWakeHarnessWithOptions({ environment: { TMPDIR: "../tmp" } });
+        const now = yield* DateTime.now;
+        const toolUseId = "toolu_foreground_bash";
+        const taskId = "foreground-bash-task";
+        const tasks = path.join(
+          root,
+          "real",
+          "tmp",
+          `claude-${process.getuid?.()}`,
+          "project",
+          WAKE_NATIVE_SESSION,
+          "tasks",
+        );
+        yield* fileSystem.makeDirectory(tasks, { recursive: true });
+        yield* fileSystem.writeFileString(path.join(tasks, `${taskId}.output`), "line 1\n");
+
         yield* harness.runtime.startTurn(
           makeClaudeTestTurnInput({
             threadId: harness.threadId,
             providerThread: harness.providerThread,
-            now: yield* DateTime.now,
-            attemptId: RunAttemptId.make("graceful-stop"),
-            text: "Work until stopped",
+            now,
+            attemptId: RunAttemptId.make("attempt-claude-task-output-cwd"),
+            text: "Run the build.",
             attachments: [],
+            runtimePolicy: { ...CLAUDE_TEST_RUNTIME_POLICY, cwd: launchCwd },
           }),
         );
-        acknowledge = harness.offerAndWait(
-          makeResultFrame({
-            uuid: "00000000-0000-4000-8000-000000000620",
-            result: "",
-            subtype: "error_during_execution",
-            errors: ["Error: Request was aborted."],
-            terminalReason: "aborted_streaming",
+        assert.equal(harness.getOpenedOptions()?.cwd, launchCwd);
+        for (const frame of [
+          claudeSdkFrame({
+            type: "assistant",
+            message: {
+              model: "claude-sonnet-4-6",
+              id: "msg_foreground_bash",
+              type: "message",
+              role: "assistant",
+              content: [
+                {
+                  type: "tool_use",
+                  id: toolUseId,
+                  name: "Bash",
+                  input: { command: "vp run build", description: "Build" },
+                },
+              ],
+              stop_reason: null,
+              stop_sequence: null,
+              usage: { input_tokens: 1, output_tokens: 1 },
+            },
+            parent_tool_use_id: null,
+            uuid: "00000000-0000-4000-8000-000000000a01",
+            session_id: WAKE_NATIVE_SESSION,
           }),
+          claudeSdkFrame({
+            type: "system",
+            subtype: "task_started",
+            task_id: taskId,
+            tool_use_id: toolUseId,
+            description: "vp run build",
+            is_backgrounded: false,
+            task_type: "local_bash",
+            uuid: "00000000-0000-4000-8000-000000000a02",
+            session_id: WAKE_NATIVE_SESSION,
+          }),
+          claudeSdkFrame({
+            type: "user",
+            message: {
+              role: "user",
+              content: [{ type: "tool_result", tool_use_id: toolUseId, content: "line 1" }],
+            },
+            parent_tool_use_id: null,
+            uuid: "00000000-0000-4000-8000-000000000a03",
+            session_id: WAKE_NATIVE_SESSION,
+            tool_use_result: { stdout: "line 1\n", stderr: "", interrupted: false },
+          }),
+          makeResultFrame({ uuid: "00000000-0000-4000-8000-000000000a04", result: "Built." }),
+        ]) {
+          yield* Queue.offer(harness.sdkMessages, frame);
+        }
+        yield* harness.awaitTerminal(1);
+
+        const chunks = harness.events.flatMap((event) =>
+          event.type === "command_output.delta" ? [event.chunk] : [],
         );
-        yield* harness.until(() =>
-          harness.events.some(
-            (event) =>
-              event.type === "provider_turn.updated" && event.providerTurn.status === "running",
-          ),
-        );
-        const active = harness.events.find(
-          (event) =>
-            event.type === "provider_turn.updated" && event.providerTurn.status === "running",
-        );
-        if (active?.type !== "provider_turn.updated")
-          return yield* Effect.die("Missing running native turn");
-        yield* harness.runtime.interruptTurn({
-          providerThread: harness.providerThread,
-          providerTurnId: active.providerTurn.id,
-          requestRuntimeRestart: true,
-        });
-        assert.equal((yield* Queue.take(harness.terminalReceipts)).status, "interrupted");
-        assert.equal(closes, 1);
-        assert.lengthOf(harness.terminalEvents(), 1);
+        assert.deepEqual(chunks, ["line 1\n"]);
       }).pipe(
+        Effect.provideService(HostProcess.Platform, "linux"),
         Effect.provide(
           Layer.mergeAll(
             IdAllocator.layer,
@@ -12097,146 +12058,204 @@ describe("ClaudeAdapterV2 background wake turns", () => {
           ),
         ),
       ),
-    ),
   );
 
-  it.effect("bounds an unacknowledged native Stop and settles its turn once", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        let closes = 0;
-        const interruptStarted = yield* Deferred.make<void>();
-        const harness = yield* makeWakeHarnessWithOptions({
-          interrupt: Deferred.succeed(interruptStarted, undefined).pipe(
-            Effect.andThen(Effect.never),
-          ),
-          close: (messages) =>
-            Effect.sync(() => {
-              closes++;
-            }).pipe(Effect.andThen(Queue.shutdown(messages))),
-        });
-        yield* harness.runtime.startTurn(
-          makeClaudeTestTurnInput({
-            threadId: harness.threadId,
-            providerThread: harness.providerThread,
-            now: yield* DateTime.now,
-            attemptId: RunAttemptId.make("unacknowledged-stop"),
-            text: "Work until stopped",
-            attachments: [],
-          }),
-        );
-        yield* harness.until(() =>
-          harness.events.some(
-            (event) =>
-              event.type === "provider_turn.updated" && event.providerTurn.status === "running",
-          ),
-        );
-        const active = harness.events.find(
+  it.effect("lets the native SDK acknowledge Stop before closing its own query", () =>
+    Effect.gen(function* () {
+      let closes = 0;
+      let acknowledge = Effect.void;
+      const harness = yield* makeWakeHarnessWithOptions({
+        interrupt: Effect.suspend(() => {
+          assert.equal(closes, 0);
+          return acknowledge;
+        }),
+        close: (messages) =>
+          Effect.sync(() => {
+            closes++;
+          }).pipe(Effect.andThen(Queue.shutdown(messages))),
+      });
+      yield* harness.runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now: yield* DateTime.now,
+          attemptId: RunAttemptId.make("graceful-stop"),
+          text: "Work until stopped",
+          attachments: [],
+        }),
+      );
+      acknowledge = harness.offerAndWait(
+        makeResultFrame({
+          uuid: "00000000-0000-4000-8000-000000000620",
+          result: "",
+          subtype: "error_during_execution",
+          errors: ["Error: Request was aborted."],
+          terminalReason: "aborted_streaming",
+        }),
+      );
+      yield* harness.until(() =>
+        harness.events.some(
           (event) =>
             event.type === "provider_turn.updated" && event.providerTurn.status === "running",
-        );
-        if (active?.type !== "provider_turn.updated")
-          return yield* Effect.die("Missing running native turn");
-        const stop = yield* harness.runtime
-          .interruptTurn({
-            providerThread: harness.providerThread,
-            providerTurnId: active.providerTurn.id,
-            requestRuntimeRestart: true,
-          })
-          .pipe(Effect.forkChild);
-        yield* Deferred.await(interruptStarted);
-        assert.equal(closes, 0);
-        yield* TestClock.adjust("11 seconds");
-        yield* Fiber.join(stop);
-        assert.equal((yield* Queue.take(harness.terminalReceipts)).status, "interrupted");
-        assert.equal(closes, 1);
-        assert.lengthOf(harness.terminalEvents(), 1);
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
-          ),
         ),
-      ),
-    ),
+      );
+      const active = harness.events.find(
+        (event) =>
+          event.type === "provider_turn.updated" && event.providerTurn.status === "running",
+      );
+      if (active?.type !== "provider_turn.updated")
+        return yield* Effect.die("Missing running native turn");
+      yield* harness.runtime.interruptTurn({
+        providerThread: harness.providerThread,
+        providerTurnId: active.providerTurn.id,
+        requestRuntimeRestart: true,
+      });
+      assert.equal((yield* Queue.take(harness.terminalReceipts)).status, "interrupted");
+      assert.equal(closes, 1);
+      assert.lengthOf(harness.terminalEvents(), 1);
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
+        ),
+      ),
+    ),
+  );
+
+  it.effect("bounds an unacknowledged native Stop and settles its turn once", () =>
+    Effect.gen(function* () {
+      let closes = 0;
+      const interruptStarted = yield* Deferred.make<void>();
+      const harness = yield* makeWakeHarnessWithOptions({
+        interrupt: Deferred.succeed(interruptStarted, undefined).pipe(Effect.andThen(Effect.never)),
+        close: (messages) =>
+          Effect.sync(() => {
+            closes++;
+          }).pipe(Effect.andThen(Queue.shutdown(messages))),
+      });
+      yield* harness.runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now: yield* DateTime.now,
+          attemptId: RunAttemptId.make("unacknowledged-stop"),
+          text: "Work until stopped",
+          attachments: [],
+        }),
+      );
+      yield* harness.until(() =>
+        harness.events.some(
+          (event) =>
+            event.type === "provider_turn.updated" && event.providerTurn.status === "running",
+        ),
+      );
+      const active = harness.events.find(
+        (event) =>
+          event.type === "provider_turn.updated" && event.providerTurn.status === "running",
+      );
+      if (active?.type !== "provider_turn.updated")
+        return yield* Effect.die("Missing running native turn");
+      const stop = yield* harness.runtime
+        .interruptTurn({
+          providerThread: harness.providerThread,
+          providerTurnId: active.providerTurn.id,
+          requestRuntimeRestart: true,
+        })
+        .pipe(Effect.forkChild);
+      yield* Deferred.await(interruptStarted);
+      assert.equal(closes, 0);
+      yield* TestClock.adjust("11 seconds");
+      yield* Fiber.join(stop);
+      assert.equal((yield* Queue.take(harness.terminalReceipts)).status, "interrupted");
+      assert.equal(closes, 1);
+      assert.lengthOf(harness.terminalEvents(), 1);
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
+        ),
+      ),
+    ),
   );
 
   it.effect("preserves settled background work until an explicit stop", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        let closes = 0;
-        const harness = yield* makeWakeHarnessWithOptions({
-          close: (sdkMessages) =>
-            Effect.sync(() => {
-              closes++;
-            }).pipe(Effect.andThen(Queue.shutdown(sdkMessages))),
-        });
-        const now = yield* DateTime.now;
-        const attemptId = RunAttemptId.make("attempt-claude-settled-stop");
-        yield* harness.runtime.startTurn(
+    Effect.gen(function* () {
+      let closes = 0;
+      const harness = yield* makeWakeHarnessWithOptions({
+        close: (sdkMessages) =>
+          Effect.sync(() => {
+            closes++;
+          }).pipe(Effect.andThen(Queue.shutdown(sdkMessages))),
+      });
+      const now = yield* DateTime.now;
+      const attemptId = RunAttemptId.make("attempt-claude-settled-stop");
+      yield* harness.runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now,
+          attemptId,
+          text: "Run the build in the background.",
+          attachments: [],
+        }),
+      );
+      yield* Queue.offer(harness.sdkMessages, wakeTaskStarted);
+      yield* Queue.offer(harness.sdkMessages, turnOneResult);
+      yield* harness.awaitTerminal(1);
+      const settledThread = providerThreadRosterEvents(harness.events).at(-1)?.providerThread;
+      assert.equal(settledThread?.pendingBackgroundTasks?.[0]?.taskId, WAKE_TASK_ID);
+      assert.isTrue(yield* harness.hasPendingBackgroundWork);
+
+      const replacementAttempt = yield* harness.runtime
+        .startTurn(
           makeClaudeTestTurnInput({
             threadId: harness.threadId,
-            providerThread: harness.providerThread,
+            providerThread: {
+              ...harness.providerThread,
+              nativeThreadRef: {
+                ...harness.providerThread.nativeThreadRef!,
+                nativeId: "replacement-session",
+              },
+            },
             now,
-            attemptId,
-            text: "Run the build in the background.",
+            attemptId: RunAttemptId.make("attempt-claude-background-replacement"),
+            text: "Continue in a fresh session.",
             attachments: [],
+            providerTurnOrdinal: 2,
           }),
-        );
-        yield* Queue.offer(harness.sdkMessages, wakeTaskStarted);
-        yield* Queue.offer(harness.sdkMessages, turnOneResult);
-        yield* harness.awaitTerminal(1);
-        const settledThread = providerThreadRosterEvents(harness.events).at(-1)?.providerThread;
-        assert.equal(settledThread?.pendingBackgroundTasks?.[0]?.taskId, WAKE_TASK_ID);
-        assert.isTrue(yield* harness.hasPendingBackgroundWork);
-
-        const replacementAttempt = yield* harness.runtime
-          .startTurn(
-            makeClaudeTestTurnInput({
-              threadId: harness.threadId,
-              providerThread: {
-                ...harness.providerThread,
-                nativeThreadRef: {
-                  ...harness.providerThread.nativeThreadRef!,
-                  nativeId: "replacement-session",
-                },
-              },
-              now,
-              attemptId: RunAttemptId.make("attempt-claude-background-replacement"),
-              text: "Continue in a fresh session.",
-              attachments: [],
-              providerTurnOrdinal: 2,
-            }),
-          )
-          .pipe(Effect.result);
-        assert.equal(replacementAttempt._tag, "Failure");
-        assert.equal(closes, 0);
-        assert.isTrue(yield* harness.hasPendingBackgroundWork);
+        )
+        .pipe(Effect.result);
+      assert.equal(replacementAttempt._tag, "Failure");
+      assert.equal(closes, 0);
+      assert.isTrue(yield* harness.hasPendingBackgroundWork);
 
-        yield* harness.runtime.interruptTurn({
-          providerThread: settledThread ?? harness.providerThread,
-          providerTurnId: harness.terminalEvents()[0]!.providerTurnId,
-          requestRuntimeRestart: true,
-        });
+      yield* harness.runtime.interruptTurn({
+        providerThread: settledThread ?? harness.providerThread,
+        providerTurnId: harness.terminalEvents()[0]!.providerTurnId,
+        requestRuntimeRestart: true,
+      });
 
-        assert.equal(closes, 1, "Stop must close the CLI process that owns the task");
-        yield* harness.until(
-          () =>
-            (providerThreadRosterEvents(harness.events).at(-1)?.providerThread
-              .pendingBackgroundTasks?.length ?? 0) === 0,
-        );
-        assert.isFalse(yield* harness.hasPendingBackgroundWork);
-        assert.lengthOf(harness.continuationRequests, 0);
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
-          ),
+      assert.equal(closes, 1, "Stop must close the CLI process that owns the task");
+      yield* harness.until(
+        () =>
+          (providerThreadRosterEvents(harness.events).at(-1)?.providerThread.pendingBackgroundTasks
+            ?.length ?? 0) === 0,
+      );
+      assert.isFalse(yield* harness.hasPendingBackgroundWork);
+      assert.lengthOf(harness.continuationRequests, 0);
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
         ),
       ),
     ),
@@ -12316,192 +12335,190 @@ describe("ClaudeAdapterV2 background wake turns", () => {
   );
 
   it.effect("a settled Stop leaves a turn that replaced the closing process alone", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const changes = yield* makeChangeSignal;
-        const fileSystem = yield* FileSystem.FileSystem;
-        const idAllocator = yield* IdAllocator.IdAllocatorV2;
-        const attachmentsDir = yield* fileSystem.makeTempDirectoryScoped({
-          prefix: "t3-claude-v2-settled-stop-replaced-",
-        });
-        const processQueues: Array<Queue.Queue<SDKMessage>> = [];
-        const firstCloseRequested = yield* Deferred.make<void>();
-        const events: Array<ProviderAdapter.ProviderAdapterV2Event> = [];
-        const continuationRequests: Array<ProviderContinuationRequests.ProviderContinuationRequest> =
-          [];
-        const adapter = yield* ClaudeAdapterV2.makeClaudeAdapterV2({
-          instanceId: ClaudeAdapterV2.CLAUDE_DEFAULT_INSTANCE_ID,
-          settings: DEFAULT_CLAUDE_SETTINGS,
-          environment: {},
-          attachmentsDir,
-          fileSystem,
-          path: yield* Path.Path,
-          random: yield* SecureRandom.SecureRandom,
-          idAllocator,
-          continuationRequests: {
-            offer: (request) =>
-              Effect.sync(() => {
-                continuationRequests.push(request);
-              }).pipe(Effect.andThen(changes.notify)),
-          },
-          queryRunner: {
-            allocateSessionId: Effect.succeed(WAKE_NATIVE_SESSION),
-            open: () =>
-              Effect.gen(function* () {
-                const sdkMessages = yield* Queue.unbounded<SDKMessage>();
-                const isFirstProcess = processQueues.length === 0;
-                processQueues.push(sdkMessages);
-                return {
-                  messages: Stream.fromQueue(sdkMessages),
-                  offer: () => Effect.void,
-                  setModel: () => Effect.void,
-                  applyFlagSettings: () => Effect.void,
-                  setPermissionMode: () => Effect.void,
-                  backgroundTasks: () => Effect.succeed(false),
-                  mcpServerStatus: Effect.succeed([]),
-                  readMcpResource: () => Effect.die("unexpected MCP resource read"),
-                  callMcpTool: () => Effect.die("unexpected MCP tool call"),
-                  listPermissionRules: Effect.die("unexpected permission rules read"),
-                  stopTask: () => Effect.void,
-                  interrupt: Effect.void,
-                  close: isFirstProcess
-                    ? Deferred.succeed(firstCloseRequested, undefined).pipe(Effect.asVoid)
-                    : Queue.shutdown(sdkMessages),
-                };
-              }),
-            forkSession: () => Effect.die("unused forkSession"),
-            subagentLaunchToolUseId: () => Effect.succeed(null),
-            subagentModel: () => Effect.succeed(null),
-            assertComplete: Effect.void,
-          },
-        });
-        const threadId = ThreadId.make("thread-claude-settled-stop-replaced");
-        const runtime = yield* adapter.openSession({
-          threadId,
-          providerSessionId: ProviderSessionId.make("provider-session-claude-settled-stop"),
-          modelSelection: CLAUDE_TEST_MODEL_SELECTION,
-          runtimePolicy: CLAUDE_TEST_RUNTIME_POLICY,
-        });
-        const providerThread = yield* runtime.ensureThread({
-          threadId,
-          modelSelection: CLAUDE_TEST_MODEL_SELECTION,
-          runtimePolicy: CLAUDE_TEST_RUNTIME_POLICY,
-        });
-        yield* runtime.events.pipe(
-          Stream.runForEach((event) =>
+    Effect.gen(function* () {
+      const changes = yield* makeChangeSignal;
+      const fileSystem = yield* FileSystem.FileSystem;
+      const idAllocator = yield* IdAllocator.IdAllocatorV2;
+      const attachmentsDir = yield* fileSystem.makeTempDirectoryScoped({
+        prefix: "t3-claude-v2-settled-stop-replaced-",
+      });
+      const processQueues: Array<Queue.Queue<SDKMessage>> = [];
+      const firstCloseRequested = yield* Deferred.make<void>();
+      const events: Array<ProviderAdapter.ProviderAdapterV2Event> = [];
+      const continuationRequests: Array<ProviderContinuationRequests.ProviderContinuationRequest> =
+        [];
+      const adapter = yield* ClaudeAdapterV2.makeClaudeAdapterV2({
+        instanceId: ClaudeAdapterV2.CLAUDE_DEFAULT_INSTANCE_ID,
+        settings: DEFAULT_CLAUDE_SETTINGS,
+        environment: {},
+        attachmentsDir,
+        fileSystem,
+        path: yield* Path.Path,
+        random: yield* SecureRandom.SecureRandom,
+        idAllocator,
+        continuationRequests: {
+          offer: (request) =>
             Effect.sync(() => {
-              events.push(event);
+              continuationRequests.push(request);
             }).pipe(Effect.andThen(changes.notify)),
-          ),
-          Effect.forkScoped,
-        );
-        if (runtime.hasPendingBackgroundWork === undefined) {
-          return yield* Effect.die("Claude adapter runtime must expose hasPendingBackgroundWork.");
-        }
-        const hasPendingBackgroundWork = runtime.hasPendingBackgroundWork;
-        const terminals = () => events.filter((event) => event.type === "turn.terminal");
-        const now = yield* DateTime.now;
-
-        yield* runtime.startTurn(
-          makeClaudeTestTurnInput({
-            threadId,
-            providerThread,
-            now,
-            attemptId: RunAttemptId.make("attempt-claude-settled-stop-replaced-a"),
-            text: "Run the build in the background.",
-            attachments: [],
-          }),
-        );
-        yield* Queue.offer(processQueues[0]!, wakeTaskStarted);
-        yield* Queue.offer(processQueues[0]!, turnOneResult);
-        yield* changes.until(() => terminals().length === 1);
-        const settledThread = providerThreadRosterEvents(events).at(-1)?.providerThread;
-        const settledTurn = terminals()[0];
-        assert.equal(settledThread?.pendingBackgroundTasks?.[0]?.taskId, WAKE_TASK_ID);
-
-        const stop = yield* runtime
-          .interruptTurn({
-            providerThread: settledThread ?? providerThread,
-            providerTurnId: settledTurn!.providerTurnId,
-            requestRuntimeRestart: true,
-          })
-          .pipe(Effect.forkScoped);
-        yield* Deferred.await(firstCloseRequested);
-
-        yield* runtime.startTurn(
-          makeClaudeTestTurnInput({
-            threadId,
-            providerThread: { ...providerThread, status: "active" },
-            now,
-            attemptId: RunAttemptId.make("attempt-claude-settled-stop-replaced-b"),
-            text: "Start another background build.",
-            attachments: [],
-            providerTurnOrdinal: 2,
-            modelSelection: {
-              ...CLAUDE_TEST_MODEL_SELECTION,
-              model: "claude-haiku-4-5-20251001",
-            },
-          }),
-        );
-        assert.lengthOf(processQueues, 2);
-        const replacementTaskId = "replacement-task";
-        yield* Queue.offer(
-          processQueues[1]!,
-          claudeSdkFrame({
-            ...wakeTaskStarted,
-            task_id: replacementTaskId,
-            uuid: "00000000-0000-4000-8000-000000000905",
-          }),
-        );
-        yield* changes.until(
-          () =>
-            providerThreadRosterEvents(events).at(-1)?.providerThread.pendingBackgroundTasks?.[0]
-              ?.taskId === replacementTaskId,
-        );
+        },
+        queryRunner: {
+          allocateSessionId: Effect.succeed(WAKE_NATIVE_SESSION),
+          open: () =>
+            Effect.gen(function* () {
+              const sdkMessages = yield* Queue.unbounded<SDKMessage>();
+              const isFirstProcess = processQueues.length === 0;
+              processQueues.push(sdkMessages);
+              return {
+                messages: Stream.fromQueue(sdkMessages),
+                offer: () => Effect.void,
+                setModel: () => Effect.void,
+                applyFlagSettings: () => Effect.void,
+                setPermissionMode: () => Effect.void,
+                backgroundTasks: () => Effect.succeed(false),
+                mcpServerStatus: Effect.succeed([]),
+                readMcpResource: () => Effect.die("unexpected MCP resource read"),
+                callMcpTool: () => Effect.die("unexpected MCP tool call"),
+                listPermissionRules: Effect.die("unexpected permission rules read"),
+                stopTask: () => Effect.void,
+                interrupt: Effect.void,
+                close: isFirstProcess
+                  ? Deferred.succeed(firstCloseRequested, undefined).pipe(Effect.asVoid)
+                  : Queue.shutdown(sdkMessages),
+              };
+            }),
+          forkSession: () => Effect.die("unused forkSession"),
+          subagentLaunchToolUseId: () => Effect.succeed(null),
+          subagentModel: () => Effect.succeed(null),
+          assertComplete: Effect.void,
+        },
+      });
+      const threadId = ThreadId.make("thread-claude-settled-stop-replaced");
+      const runtime = yield* adapter.openSession({
+        threadId,
+        providerSessionId: ProviderSessionId.make("provider-session-claude-settled-stop"),
+        modelSelection: CLAUDE_TEST_MODEL_SELECTION,
+        runtimePolicy: CLAUDE_TEST_RUNTIME_POLICY,
+      });
+      const providerThread = yield* runtime.ensureThread({
+        threadId,
+        modelSelection: CLAUDE_TEST_MODEL_SELECTION,
+        runtimePolicy: CLAUDE_TEST_RUNTIME_POLICY,
+      });
+      yield* runtime.events.pipe(
+        Stream.runForEach((event) =>
+          Effect.sync(() => {
+            events.push(event);
+          }).pipe(Effect.andThen(changes.notify)),
+        ),
+        Effect.forkScoped,
+      );
+      if (runtime.hasPendingBackgroundWork === undefined) {
+        return yield* Effect.die("Claude adapter runtime must expose hasPendingBackgroundWork.");
+      }
+      const hasPendingBackgroundWork = runtime.hasPendingBackgroundWork;
+      const terminals = () => events.filter((event) => event.type === "turn.terminal");
+      const now = yield* DateTime.now;
 
-        yield* Queue.shutdown(processQueues[0]!);
-        yield* Fiber.join(stop);
-        assert.isTrue(yield* hasPendingBackgroundWork);
-        yield* yieldTicks(50);
-        const latestThread = providerThreadRosterEvents(events).at(-1)?.providerThread;
-        assert.equal(latestThread?.status, "active");
-        assert.deepEqual(
-          latestThread?.pendingBackgroundTasks?.map((task) => task.taskId),
-          [replacementTaskId],
-        );
+      yield* runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId,
+          providerThread,
+          now,
+          attemptId: RunAttemptId.make("attempt-claude-settled-stop-replaced-a"),
+          text: "Run the build in the background.",
+          attachments: [],
+        }),
+      );
+      yield* Queue.offer(processQueues[0]!, wakeTaskStarted);
+      yield* Queue.offer(processQueues[0]!, turnOneResult);
+      yield* changes.until(() => terminals().length === 1);
+      const settledThread = providerThreadRosterEvents(events).at(-1)?.providerThread;
+      const settledTurn = terminals()[0];
+      assert.equal(settledThread?.pendingBackgroundTasks?.[0]?.taskId, WAKE_TASK_ID);
 
-        yield* Queue.offer(
-          processQueues[1]!,
-          makeResultFrame({
-            uuid: "00000000-0000-4000-8000-000000000906",
-            result: "Started another build.",
-          }),
-        );
-        yield* changes.until(() => terminals().length === 2);
-        yield* Queue.offer(
-          processQueues[1]!,
-          claudeSdkFrame({
-            ...wakeNotification,
-            task_id: replacementTaskId,
-            uuid: "00000000-0000-4000-8000-000000000907",
-          }),
-        );
-        yield* Queue.offer(
-          processQueues[1]!,
-          makeAssistantTextFrame({
-            uuid: "00000000-0000-4000-8000-000000000908",
-            text: WAKE_ASSISTANT_TEXT,
-          }),
-        );
-        yield* changes.until(() => continuationRequests.length === 1);
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
-          ),
+      const stop = yield* runtime
+        .interruptTurn({
+          providerThread: settledThread ?? providerThread,
+          providerTurnId: settledTurn!.providerTurnId,
+          requestRuntimeRestart: true,
+        })
+        .pipe(Effect.forkScoped);
+      yield* Deferred.await(firstCloseRequested);
+
+      yield* runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId,
+          providerThread: { ...providerThread, status: "active" },
+          now,
+          attemptId: RunAttemptId.make("attempt-claude-settled-stop-replaced-b"),
+          text: "Start another background build.",
+          attachments: [],
+          providerTurnOrdinal: 2,
+          modelSelection: {
+            ...CLAUDE_TEST_MODEL_SELECTION,
+            model: "claude-haiku-4-5-20251001",
+          },
+        }),
+      );
+      assert.lengthOf(processQueues, 2);
+      const replacementTaskId = "replacement-task";
+      yield* Queue.offer(
+        processQueues[1]!,
+        claudeSdkFrame({
+          ...wakeTaskStarted,
+          task_id: replacementTaskId,
+          uuid: "00000000-0000-4000-8000-000000000905",
+        }),
+      );
+      yield* changes.until(
+        () =>
+          providerThreadRosterEvents(events).at(-1)?.providerThread.pendingBackgroundTasks?.[0]
+            ?.taskId === replacementTaskId,
+      );
+
+      yield* Queue.shutdown(processQueues[0]!);
+      yield* Fiber.join(stop);
+      assert.isTrue(yield* hasPendingBackgroundWork);
+      yield* yieldTicks(50);
+      const latestThread = providerThreadRosterEvents(events).at(-1)?.providerThread;
+      assert.equal(latestThread?.status, "active");
+      assert.deepEqual(
+        latestThread?.pendingBackgroundTasks?.map((task) => task.taskId),
+        [replacementTaskId],
+      );
+
+      yield* Queue.offer(
+        processQueues[1]!,
+        makeResultFrame({
+          uuid: "00000000-0000-4000-8000-000000000906",
+          result: "Started another build.",
+        }),
+      );
+      yield* changes.until(() => terminals().length === 2);
+      yield* Queue.offer(
+        processQueues[1]!,
+        claudeSdkFrame({
+          ...wakeNotification,
+          task_id: replacementTaskId,
+          uuid: "00000000-0000-4000-8000-000000000907",
+        }),
+      );
+      yield* Queue.offer(
+        processQueues[1]!,
+        makeAssistantTextFrame({
+          uuid: "00000000-0000-4000-8000-000000000908",
+          text: WAKE_ASSISTANT_TEXT,
+        }),
+      );
+      yield* changes.until(() => continuationRequests.length === 1);
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
         ),
       ),
     ),
@@ -12596,41 +12613,37 @@ describe("ClaudeAdapterV2 background wake turns", () => {
   });
 
   it.effect("fails a turn whose Claude query ends before its first frame", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const harness = yield* openAdapterWhoseFirstQueryEndsBeforeItsFirstFrame(
-          "claude-query-dies-before-frame",
-        );
-        const started = yield* harness.runtime
-          .startTurn(harness.turnInput("a", 1))
-          .pipe(Effect.exit);
-        assert.isTrue(
-          Exit.isFailure(started),
-          "a turn whose Claude query ended before its first frame started running on the dead query",
-        );
-        if (Exit.isFailure(started)) {
-          assert.include(
-            Cause.pretty(started.cause),
-            "Claude provider query ended before the turn could start.",
-          );
-        }
-        const followUp = yield* harness.runtime
-          .startTurn(harness.turnInput("b", 2))
-          .pipe(Effect.exit);
-        assert.isTrue(
-          Exit.isSuccess(followUp),
-          `the turn whose query ended before its first frame is still active: ${
-            Exit.isFailure(followUp) ? Cause.pretty(followUp.cause) : ""
-          }`,
+    Effect.gen(function* () {
+      const harness = yield* openAdapterWhoseFirstQueryEndsBeforeItsFirstFrame(
+        "claude-query-dies-before-frame",
+      );
+      const started = yield* harness.runtime.startTurn(harness.turnInput("a", 1)).pipe(Effect.exit);
+      assert.isTrue(
+        Exit.isFailure(started),
+        "a turn whose Claude query ended before its first frame started running on the dead query",
+      );
+      if (Exit.isFailure(started)) {
+        assert.include(
+          Cause.pretty(started.cause),
+          "Claude provider query ended before the turn could start.",
         );
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
-          ),
+      }
+      const followUp = yield* harness.runtime
+        .startTurn(harness.turnInput("b", 2))
+        .pipe(Effect.exit);
+      assert.isTrue(
+        Exit.isSuccess(followUp),
+        `the turn whose query ended before its first frame is still active: ${
+          Exit.isFailure(followUp) ? Cause.pretty(followUp.cause) : ""
+        }`,
+      );
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
         ),
       ),
     ),
@@ -12639,711 +12652,259 @@ describe("ClaudeAdapterV2 background wake turns", () => {
   it.effect(
     "clears the replaced sibling native thread roster when openQuery switches processes",
     () =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const changes = yield* makeChangeSignal;
-          const fileSystem = yield* FileSystem.FileSystem;
-          const idAllocator = yield* IdAllocator.IdAllocatorV2;
-          const attachmentsDir = yield* fileSystem.makeTempDirectoryScoped({
-            prefix: "t3-claude-v2-sibling-replace-",
-          });
-          const nativeIds = ["native-thread-roster-a", "native-thread-roster-b"] as const;
-          let allocateIndex = 0;
-          // A shared queue would hide sibling process death on replacement.
-          const processQueues: Array<{
-            readonly nativeThreadId: string;
-            readonly queue: Queue.Queue<SDKMessage>;
-          }> = [];
-          const events: Array<ProviderAdapter.ProviderAdapterV2Event> = [];
-          const adapter = yield* ClaudeAdapterV2.makeClaudeAdapterV2({
-            instanceId: ClaudeAdapterV2.CLAUDE_DEFAULT_INSTANCE_ID,
-            settings: DEFAULT_CLAUDE_SETTINGS,
-            environment: {},
-            attachmentsDir,
-            fileSystem,
-            path: yield* Path.Path,
-            random: yield* SecureRandom.SecureRandom,
-            idAllocator,
-            continuationRequests: {
-              offer: () => Effect.void,
-            },
-            queryRunner: {
-              allocateSessionId: Effect.sync(() => {
-                const next =
-                  nativeIds[allocateIndex] ?? `native-thread-roster-extra-${allocateIndex}`;
-                allocateIndex += 1;
-                return next;
-              }),
-              open: (openInput) =>
-                Effect.gen(function* () {
-                  const nativeThreadId = openInput.options.sessionId ?? openInput.options.resume;
-                  if (typeof nativeThreadId !== "string" || nativeThreadId.length === 0) {
-                    return yield* Effect.die("openQuery must supply a native session id");
-                  }
-                  const queue = yield* Queue.unbounded<SDKMessage>();
-                  processQueues.push({ nativeThreadId, queue });
-                  return {
-                    messages: Stream.fromQueue(queue),
-                    offer: () => Effect.void,
-                    setModel: () => Effect.void,
-                    applyFlagSettings: () => Effect.void,
-                    setPermissionMode: () => Effect.void,
-                    backgroundTasks: () => Effect.succeed(false),
-                    mcpServerStatus: Effect.succeed([]),
-                    readMcpResource: () => Effect.die("unexpected MCP resource read"),
-                    callMcpTool: () => Effect.die("unexpected MCP tool call"),
-                    listPermissionRules: Effect.die("unexpected permission rules read"),
-                    stopTask: () => Effect.void,
-                    interrupt: Effect.void,
-                    close: Queue.shutdown(queue),
-                  };
-                }),
-              forkSession: () => Effect.die("unused forkSession"),
-              subagentLaunchToolUseId: () => Effect.succeed(null),
-              subagentModel: () => Effect.succeed(null),
-              assertComplete: Effect.void,
-            },
-          });
-          const appThreadA = ThreadId.make("thread-claude-roster-a");
-          const appThreadB = ThreadId.make("thread-claude-roster-b");
-          const runtime = yield* adapter.openSession({
-            threadId: appThreadA,
-            providerSessionId: ProviderSessionId.make("provider-session-claude-sibling-replace"),
-            modelSelection: CLAUDE_TEST_MODEL_SELECTION,
-            runtimePolicy: CLAUDE_TEST_RUNTIME_POLICY,
-          });
-          const providerThreadA = yield* runtime.ensureThread({
-            threadId: appThreadA,
-            modelSelection: CLAUDE_TEST_MODEL_SELECTION,
-            runtimePolicy: CLAUDE_TEST_RUNTIME_POLICY,
-          });
-          const providerThreadB = yield* runtime.ensureThread({
-            threadId: appThreadB,
-            modelSelection: CLAUDE_TEST_MODEL_SELECTION,
-            runtimePolicy: CLAUDE_TEST_RUNTIME_POLICY,
-          });
-          assert.notEqual(
-            providerThreadA.nativeThreadRef?.nativeId,
-            providerThreadB.nativeThreadRef?.nativeId,
-          );
-          yield* runtime.events.pipe(
-            Stream.runForEach((event) =>
-              Effect.sync(() => {
-                events.push(event);
-              }).pipe(Effect.andThen(changes.notify)),
-            ),
-            Effect.forkScoped,
-          );
-          if (runtime.hasPendingBackgroundWork === undefined) {
-            return yield* Effect.die(
-              "Claude adapter runtime must expose hasPendingBackgroundWork.",
-            );
-          }
-          if (runtime.hasPendingBackgroundWorkForThread === undefined) {
-            return yield* Effect.die(
-              "Claude adapter runtime must expose hasPendingBackgroundWorkForThread.",
-            );
-          }
-          const hasPendingBackgroundWork = runtime.hasPendingBackgroundWork;
-          const hasPendingBackgroundWorkForThread = runtime.hasPendingBackgroundWorkForThread;
-          const now = yield* DateTime.now;
-          const taskA = "task-roster-a";
-          const taskB = "task-roster-b";
-
-          yield* runtime.startTurn(
-            makeClaudeTestTurnInput({
-              threadId: appThreadA,
-              providerThread: providerThreadA,
-              now,
-              attemptId: RunAttemptId.make("attempt-roster-iso-a"),
-              text: "Background work on A.",
-              attachments: [],
-            }),
-          );
-          assert.equal(processQueues.length, 1);
-          const processA = processQueues[0]!;
-          yield* Queue.offer(
-            processA.queue,
-            claudeSdkFrame({
-              type: "system",
-              subtype: "task_started",
-              task_id: taskA,
-              tool_use_id: "toolu-roster-a",
-              description: "work on A",
-              is_backgrounded: true,
-              task_type: "local_bash",
-              uuid: "00000000-0000-4000-8000-000000000301",
-              session_id: nativeIds[0],
-            }),
-          );
-          yield* Queue.offer(
-            processA.queue,
-            makeResultFrame({
-              uuid: "00000000-0000-4000-8000-000000000302",
-              result: "A settled with background work.",
+      Effect.gen(function* () {
+        const changes = yield* makeChangeSignal;
+        const fileSystem = yield* FileSystem.FileSystem;
+        const idAllocator = yield* IdAllocator.IdAllocatorV2;
+        const attachmentsDir = yield* fileSystem.makeTempDirectoryScoped({
+          prefix: "t3-claude-v2-sibling-replace-",
+        });
+        const nativeIds = ["native-thread-roster-a", "native-thread-roster-b"] as const;
+        let allocateIndex = 0;
+        // A shared queue would hide sibling process death on replacement.
+        const processQueues: Array<{
+          readonly nativeThreadId: string;
+          readonly queue: Queue.Queue<SDKMessage>;
+        }> = [];
+        const events: Array<ProviderAdapter.ProviderAdapterV2Event> = [];
+        const adapter = yield* ClaudeAdapterV2.makeClaudeAdapterV2({
+          instanceId: ClaudeAdapterV2.CLAUDE_DEFAULT_INSTANCE_ID,
+          settings: DEFAULT_CLAUDE_SETTINGS,
+          environment: {},
+          attachmentsDir,
+          fileSystem,
+          path: yield* Path.Path,
+          random: yield* SecureRandom.SecureRandom,
+          idAllocator,
+          continuationRequests: {
+            offer: () => Effect.void,
+          },
+          queryRunner: {
+            allocateSessionId: Effect.sync(() => {
+              const next =
+                nativeIds[allocateIndex] ?? `native-thread-roster-extra-${allocateIndex}`;
+              allocateIndex += 1;
+              return next;
             }),
-          );
-          yield* changes.until(() =>
-            events.some(
-              (event) =>
-                event.type === "turn.terminal" &&
-                event.providerThreadId === providerThreadA.id &&
-                event.status === "completed",
-            ),
-          );
-          const rosterAAfterSettle = providerThreadRosterEvents(events).findLast(
-            (event) => event.providerThread.id === providerThreadA.id,
-          )?.providerThread.pendingBackgroundTasks;
-          assert.deepEqual(rosterAAfterSettle ?? [], [
-            { taskId: taskA, description: "work on A", kind: "command" },
-          ]);
-          assert.isTrue(yield* hasPendingBackgroundWork);
-          assert.isTrue(yield* hasPendingBackgroundWorkForThread(providerThreadA));
-          assert.isFalse(yield* hasPendingBackgroundWorkForThread(providerThreadB));
-
-          yield* runtime.startTurn(
-            makeClaudeTestTurnInput({
-              threadId: appThreadB,
-              providerThread: { ...providerThreadB, status: "active" },
-              now,
-              attemptId: RunAttemptId.make("attempt-roster-iso-b"),
-              text: "Background work on B.",
-              attachments: [],
-            }),
-          );
-          assert.equal(processQueues.length, 2);
-          yield* changes.until(() =>
-            providerThreadRosterEvents(events).some(
-              (event) =>
-                event.providerThread.id === providerThreadA.id &&
-                event.providerThread.status === "idle" &&
-                (event.providerThread.pendingBackgroundTasks?.length ?? 0) === 0,
-            ),
-          );
-          assert.isFalse(yield* hasPendingBackgroundWorkForThread(providerThreadA));
-
-          const processB = processQueues[1]!;
-          yield* Queue.offer(
-            processB.queue,
-            claudeSdkFrame({
-              type: "system",
-              subtype: "task_started",
-              task_id: taskB,
-              tool_use_id: "toolu-roster-b",
-              description: "work on B",
-              is_backgrounded: true,
-              task_type: "local_bash",
-              uuid: "00000000-0000-4000-8000-000000000303",
-              session_id: nativeIds[1],
-            }),
-          );
-          yield* changes.until(() =>
-            providerThreadRosterEvents(events).some(
-              (event) =>
-                event.providerThread.id === providerThreadB.id &&
-                (event.providerThread.pendingBackgroundTasks?.length ?? 0) > 0,
-            ),
-          );
-          assert.isTrue(yield* hasPendingBackgroundWorkForThread(providerThreadB));
-          assert.isTrue(yield* hasPendingBackgroundWork);
-          assert.isFalse(yield* hasPendingBackgroundWorkForThread(providerThreadA));
-
-          yield* Queue.offer(
-            processB.queue,
-            claudeSdkFrame({
-              type: "result",
-              subtype: "error_during_execution",
-              duration_ms: 10,
-              duration_api_ms: 10,
-              is_error: true,
-              num_turns: 1,
-              result: "B failed",
-              stop_reason: "end_turn",
-              total_cost_usd: 0,
-              usage: {
-                input_tokens: 1,
-                output_tokens: 1,
-                cache_creation_input_tokens: 0,
-                cache_read_input_tokens: 0,
-              },
-              modelUsage: {},
-              permission_denials: [],
-              errors: ["B failed"],
-              terminal_reason: "model_error",
-              uuid: "00000000-0000-4000-8000-000000000304",
-              session_id: nativeIds[1],
-            }),
-          );
-          yield* changes.until(() =>
-            events.some(
-              (event) =>
-                event.type === "turn.terminal" &&
-                event.providerThreadId === providerThreadB.id &&
-                event.status === "failed",
-            ),
-          );
-
-          const rosterBAfterFail = providerThreadRosterEvents(events).findLast(
-            (event) => event.providerThread.id === providerThreadB.id,
-          )?.providerThread.pendingBackgroundTasks;
-          assert.deepEqual(rosterBAfterFail ?? [], []);
-          assert.isFalse(yield* hasPendingBackgroundWorkForThread(providerThreadA));
-          assert.isFalse(yield* hasPendingBackgroundWorkForThread(providerThreadB));
-          assert.isFalse(yield* hasPendingBackgroundWork);
-        }).pipe(
-          Effect.provide(
-            Layer.mergeAll(
-              IdAllocator.layer,
-              McpProviderSessions.layer,
-              NodeServices.layer,
-              NodeCrypto.layer,
-            ),
-          ),
-        ),
-      ),
-  );
-
-  it.effect.each(["full-access", "approval-required"] as const)(
-    "keeps a queued wake turn's tool callback with its continuation in %s mode",
-    (runtimeMode) =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const harness = yield* makeWakeHarness;
-          const now = yield* DateTime.now;
-          const runtimePolicy = ProviderAdapter.ProviderAdapterV2RuntimePolicy.make({
-            runtimeMode,
-            interactionMode: "default",
-            cwd: "/workspace",
-          });
-          const firstAttempt = RunAttemptId.make("attempt-claude-wake-callback-1");
-          const userAttempt = RunAttemptId.make("attempt-claude-wake-callback-2");
-          const continuationAttempt = RunAttemptId.make("attempt-claude-wake-callback-3");
-          const planToolUseId = "toolu_01WakePlanExitPlanMode";
-          const planMarkdown = "# Wake plan\n\n1. Report the background result.";
-          const stamp = (frame: SDKMessage, promptIndex: number) =>
-            claudeSdkFrame({
-              ...frame,
-              user_message_uuid: harness.promptUuid(promptIndex),
-            });
-          const runOf = (attemptId: RunAttemptId) => RunId.make(`run-${attemptId}`);
-          const planToolUse = claudeSdkFrame({
-            type: "assistant",
-            message: {
-              model: "claude-sonnet-4-6",
-              id: "msg_wake_plan",
-              type: "message",
-              role: "assistant",
-              content: [
-                {
-                  type: "tool_use",
-                  id: planToolUseId,
-                  name: "ExitPlanMode",
-                  input: { plan: planMarkdown },
-                },
-              ],
-            },
-            parent_tool_use_id: null,
-            uuid: "00000000-0000-4000-8000-000000000741",
-            session_id: WAKE_NATIVE_SESSION,
-          });
-          const planToolResult = claudeSdkFrame({
-            type: "user",
-            message: {
-              role: "user",
-              content: [
-                {
-                  type: "tool_result",
-                  tool_use_id: planToolUseId,
-                  content:
-                    "The client captured your proposed plan. Stop here and wait for the user's feedback or implementation request in a later turn.",
-                  is_error: true,
-                },
-              ],
-            },
-            parent_tool_use_id: null,
-            uuid: "00000000-0000-4000-8000-000000000742",
-            session_id: WAKE_NATIVE_SESSION,
-          });
-
-          yield* harness.runtime.startTurn(
-            makeClaudeTestTurnInput({
-              threadId: harness.threadId,
-              providerThread: harness.providerThread,
-              now,
-              attemptId: firstAttempt,
-              text: "Run the build in the background.",
-              attachments: [],
-              runtimePolicy,
-            }),
-          );
-          yield* Queue.offer(harness.sdkMessages, stamp(wakeTaskStarted, 0));
-          yield* Queue.offer(
-            harness.sdkMessages,
-            stamp(
-              makeResultFrame({ uuid: "00000000-0000-4000-8000-000000000740", result: "STARTED" }),
-              0,
-            ),
-          );
-          yield* harness.awaitTerminal(1);
-
-          yield* harness.runtime.startTurn(
-            makeClaudeTestTurnInput({
-              threadId: harness.threadId,
-              providerThread: harness.providerThread,
-              now,
-              attemptId: userAttempt,
-              text: "Reply with exactly: USER_REPLY",
-              attachments: [],
-              runtimePolicy,
-              providerTurnOrdinal: 2,
-            }),
-          );
-          yield* Queue.offer(harness.sdkMessages, wakeNotification);
-          // The SDK asks for permission only after streaming the tool_use.
-          yield* harness.offerAndWait(planToolUse);
-          const canUseTool = harness.getOpenedOptions()?.canUseTool;
-          assert.isFunction(canUseTool);
-          const callback = yield* Effect.promise(() =>
-            canUseTool!(
-              "ExitPlanMode",
-              { plan: planMarkdown },
-              {
-                signal: new AbortController().signal,
-                toolUseID: planToolUseId,
-                requestId: "request-wake-plan",
-              },
-            ),
-          );
-          assert.equal(callback?.behavior, "deny");
-          assert.include(
-            callback?.behavior === "deny" ? callback.message : "",
-            "The client captured your proposed plan",
-          );
-          yield* Queue.offer(harness.sdkMessages, planToolResult);
-          yield* Queue.offer(harness.sdkMessages, wakeResult);
-          yield* harness.awaitContinuation(1);
-
-          yield* Queue.offer(
-            harness.sdkMessages,
-            stamp(
-              makeAssistantTextFrame({
-                uuid: "00000000-0000-4000-8000-000000000743",
-                text: "USER_REPLY",
-              }),
-              1,
-            ),
-          );
-          yield* Queue.offer(
-            harness.sdkMessages,
-            stamp(
-              makeResultFrame({
-                uuid: "00000000-0000-4000-8000-000000000744",
-                result: "USER_REPLY",
+            open: (openInput) =>
+              Effect.gen(function* () {
+                const nativeThreadId = openInput.options.sessionId ?? openInput.options.resume;
+                if (typeof nativeThreadId !== "string" || nativeThreadId.length === 0) {
+                  return yield* Effect.die("openQuery must supply a native session id");
+                }
+                const queue = yield* Queue.unbounded<SDKMessage>();
+                processQueues.push({ nativeThreadId, queue });
+                return {
+                  messages: Stream.fromQueue(queue),
+                  offer: () => Effect.void,
+                  setModel: () => Effect.void,
+                  applyFlagSettings: () => Effect.void,
+                  setPermissionMode: () => Effect.void,
+                  backgroundTasks: () => Effect.succeed(false),
+                  mcpServerStatus: Effect.succeed([]),
+                  readMcpResource: () => Effect.die("unexpected MCP resource read"),
+                  callMcpTool: () => Effect.die("unexpected MCP tool call"),
+                  listPermissionRules: Effect.die("unexpected permission rules read"),
+                  stopTask: () => Effect.void,
+                  interrupt: Effect.void,
+                  close: Queue.shutdown(queue),
+                };
               }),
-              1,
-            ),
-          );
-          yield* harness.awaitTerminal(2);
-
-          yield* harness.runtime.startTurn(
-            makeClaudeTestTurnInput({
-              threadId: harness.threadId,
-              providerThread: harness.providerThread,
-              now,
-              attemptId: continuationAttempt,
-              text: "Background task completed.",
-              attachments: [],
-              runtimePolicy,
-              providerTurnOrdinal: 3,
-              messageCreatedBy: "agent",
-              messageCreationSource: "provider",
-            }),
-          );
-          yield* harness.awaitTerminal(3);
-
-          const latestItems = new Map(
-            harness.events.flatMap((event) =>
-              event.type === "turn_item.updated"
-                ? [[String(event.turnItem.id), event.turnItem]]
-                : [],
-            ),
-          );
-          const planTool = [...latestItems.values()].find(
-            (item) =>
-              item.type === "dynamic_tool" && item.nativeItemRef?.nativeId === planToolUseId,
-          );
-          const proposedPlans = [...latestItems.values()].filter(
-            (item) => item.type === "proposed_plan",
-          );
-          const plans = harness.events.flatMap((event) =>
-            event.type === "plan.updated" && event.plan.kind === "proposed_plan"
-              ? [event.plan]
-              : [],
-          );
-          const planToolRuns = harness.events.flatMap((event) =>
-            event.type === "turn_item.updated" &&
-            event.turnItem.nativeItemRef?.nativeId === planToolUseId &&
-            event.turnItem.type === "dynamic_tool"
-              ? [event.turnItem.runId]
-              : [],
-          );
-          assert.isNotEmpty(planToolRuns);
-          assert.isTrue(planToolRuns.every((runId) => runId === runOf(continuationAttempt)));
-          assert.equal(planTool?.runId, runOf(continuationAttempt));
-          assert.lengthOf(proposedPlans, 1);
-          assert.equal(proposedPlans[0]?.runId, runOf(continuationAttempt));
-          assert.isTrue(plans.length > 0);
-          assert.isTrue(plans.every((plan) => plan.runId === runOf(continuationAttempt)));
-          const userRunItems = [...latestItems.values()].filter(
-            (item) => item.runId === runOf(userAttempt),
-          );
-          assert.deepEqual(
-            userRunItems.map((item) => item.type),
-            ["assistant_message"],
-          );
-        }).pipe(
-          Effect.provide(
-            Layer.mergeAll(
-              IdAllocator.layer,
-              McpProviderSessions.layer,
-              NodeServices.layer,
-              NodeCrypto.layer,
-            ),
+            forkSession: () => Effect.die("unused forkSession"),
+            subagentLaunchToolUseId: () => Effect.succeed(null),
+            subagentModel: () => Effect.succeed(null),
+            assertComplete: Effect.void,
+          },
+        });
+        const appThreadA = ThreadId.make("thread-claude-roster-a");
+        const appThreadB = ThreadId.make("thread-claude-roster-b");
+        const runtime = yield* adapter.openSession({
+          threadId: appThreadA,
+          providerSessionId: ProviderSessionId.make("provider-session-claude-sibling-replace"),
+          modelSelection: CLAUDE_TEST_MODEL_SELECTION,
+          runtimePolicy: CLAUDE_TEST_RUNTIME_POLICY,
+        });
+        const providerThreadA = yield* runtime.ensureThread({
+          threadId: appThreadA,
+          modelSelection: CLAUDE_TEST_MODEL_SELECTION,
+          runtimePolicy: CLAUDE_TEST_RUNTIME_POLICY,
+        });
+        const providerThreadB = yield* runtime.ensureThread({
+          threadId: appThreadB,
+          modelSelection: CLAUDE_TEST_MODEL_SELECTION,
+          runtimePolicy: CLAUDE_TEST_RUNTIME_POLICY,
+        });
+        assert.notEqual(
+          providerThreadA.nativeThreadRef?.nativeId,
+          providerThreadB.nativeThreadRef?.nativeId,
+        );
+        yield* runtime.events.pipe(
+          Stream.runForEach((event) =>
+            Effect.sync(() => {
+              events.push(event);
+            }).pipe(Effect.andThen(changes.notify)),
           ),
-        ),
-      ),
-  );
-
-  it.effect("stores a Bash result's stdout and stderr as command output", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const harness = yield* makeWakeHarness;
+          Effect.forkScoped,
+        );
+        if (runtime.hasPendingBackgroundWork === undefined) {
+          return yield* Effect.die("Claude adapter runtime must expose hasPendingBackgroundWork.");
+        }
+        if (runtime.hasPendingBackgroundWorkForThread === undefined) {
+          return yield* Effect.die(
+            "Claude adapter runtime must expose hasPendingBackgroundWorkForThread.",
+          );
+        }
+        const hasPendingBackgroundWork = runtime.hasPendingBackgroundWork;
+        const hasPendingBackgroundWorkForThread = runtime.hasPendingBackgroundWorkForThread;
         const now = yield* DateTime.now;
-        const attemptId = RunAttemptId.make("attempt-claude-bash-output");
-        const bashToolUseId = "toolu_01BashOutput";
+        const taskA = "task-roster-a";
+        const taskB = "task-roster-b";
 
-        yield* harness.runtime.startTurn(
+        yield* runtime.startTurn(
           makeClaudeTestTurnInput({
-            threadId: harness.threadId,
-            providerThread: harness.providerThread,
+            threadId: appThreadA,
+            providerThread: providerThreadA,
             now,
-            attemptId,
-            text: "Run it.",
+            attemptId: RunAttemptId.make("attempt-roster-iso-a"),
+            text: "Background work on A.",
             attachments: [],
           }),
         );
+        assert.equal(processQueues.length, 1);
+        const processA = processQueues[0]!;
         yield* Queue.offer(
-          harness.sdkMessages,
+          processA.queue,
           claudeSdkFrame({
-            type: "assistant",
-            message: {
-              model: "claude-sonnet-4-6",
-              id: "msg_bash_output",
-              type: "message",
-              role: "assistant",
-              content: [
-                {
-                  type: "tool_use",
-                  id: bashToolUseId,
-                  name: "Bash",
-                  input: { command: "git status" },
-                },
-              ],
-            },
-            parent_tool_use_id: null,
-            uuid: "00000000-0000-4000-8000-000000000790",
-            session_id: WAKE_NATIVE_SESSION,
+            type: "system",
+            subtype: "task_started",
+            task_id: taskA,
+            tool_use_id: "toolu-roster-a",
+            description: "work on A",
+            is_backgrounded: true,
+            task_type: "local_bash",
+            uuid: "00000000-0000-4000-8000-000000000301",
+            session_id: nativeIds[0],
           }),
         );
         yield* Queue.offer(
-          harness.sdkMessages,
-          claudeSdkFrame({
-            type: "user",
-            message: {
-              role: "user",
-              content: [
-                { type: "tool_result", tool_use_id: bashToolUseId, content: "On branch main" },
-              ],
-            },
-            parent_tool_use_id: null,
-            uuid: "00000000-0000-4000-8000-000000000791",
-            session_id: WAKE_NATIVE_SESSION,
-            tool_use_result: {
-              stdout: "On branch main",
-              stderr: "warning: dirty",
-              interrupted: false,
-              isImage: false,
-            },
+          processA.queue,
+          makeResultFrame({
+            uuid: "00000000-0000-4000-8000-000000000302",
+            result: "A settled with background work.",
           }),
         );
-        yield* Queue.offer(
-          harness.sdkMessages,
-          makeResultFrame({ uuid: "00000000-0000-4000-8000-000000000792", result: "Done." }),
+        yield* changes.until(() =>
+          events.some(
+            (event) =>
+              event.type === "turn.terminal" &&
+              event.providerThreadId === providerThreadA.id &&
+              event.status === "completed",
+          ),
         );
-        yield* harness.awaitTerminal(1);
-
-        const bash = harness.events.findLast(
-          (event) =>
-            event.type === "turn_item.updated" &&
-            event.turnItem.nativeItemRef?.nativeId === bashToolUseId,
-        );
-        assert.equal(
-          bash?.type === "turn_item.updated" && bash.turnItem.type === "command_execution"
-            ? bash.turnItem.output
-            : undefined,
-          "On branch main\nwarning: dirty",
-        );
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
-          ),
-        ),
-      ),
-    ),
-  );
-
-  it.effect.each([
-    {
-      case: "an Edit",
-      toolName: "Edit",
-      toolInput: {
-        file_path: "/workspace/src/math.ts",
-        old_string: "  return a - b;",
-        new_string: "  return a + b;",
-      },
-      toolUseResult: {
-        filePath: "/workspace/src/math.ts",
-        oldString: "  return a - b;",
-        newString: "  return a + b;",
-        originalFile: "export function add(a: number, b: number) {\n  return a - b;\n}\n",
-        structuredPatch: [
+        const rosterAAfterSettle = providerThreadRosterEvents(events).findLast(
+          (event) => event.providerThread.id === providerThreadA.id,
+        )?.providerThread.pendingBackgroundTasks;
+        assert.deepEqual(rosterAAfterSettle ?? [], [
           {
-            oldStart: 1,
-            oldLines: 3,
-            newStart: 1,
-            newLines: 3,
-            lines: [
-              " export function add(a: number, b: number) {",
-              "-  return a - b;",
-              "+  return a + b;",
-              " }",
-            ],
+            taskId: taskA,
+            description: "work on A",
+            kind: "command",
+            nativeItemId: "toolu-roster-a",
           },
-        ],
-        userModified: false,
-        replaceAll: false,
-      },
-      diffStr:
-        "--- /workspace/src/math.ts\n+++ /workspace/src/math.ts\n@@ -1,3 +1,3 @@\n export function add(a: number, b: number) {\n-  return a - b;\n+  return a + b;\n }\n",
-    },
-    {
-      case: "a Write that creates a file",
-      toolName: "Write",
-      toolInput: { file_path: "/workspace/notes.md", content: "# Notes\n\nShip it.\n" },
-      toolUseResult: {
-        type: "create",
-        filePath: "/workspace/notes.md",
-        content: "# Notes\n\nShip it.\n",
-        structuredPatch: [],
-        originalFile: null,
-        userModified: false,
-      },
-      diffStr: "--- /dev/null\n+++ /workspace/notes.md\n@@ -0,0 +1,3 @@\n+# Notes\n+\n+Ship it.\n",
-    },
-    {
-      case: "a Write that creates an empty file",
-      toolName: "Write",
-      toolInput: { file_path: "/workspace/.keep", content: "" },
-      toolUseResult: {
-        type: "create",
-        filePath: "/workspace/.keep",
-        content: "",
-        structuredPatch: [],
-        originalFile: null,
-        userModified: false,
-      },
-      diffStr: undefined,
-    },
-  ])("stores the diff panel patch for $case", (testCase) =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const harness = yield* makeWakeHarness;
-        const toolUseId = `toolu_01${testCase.toolName}Patch`;
+        ]);
+        assert.isTrue(yield* hasPendingBackgroundWork);
+        assert.isTrue(yield* hasPendingBackgroundWorkForThread(providerThreadA));
+        assert.isFalse(yield* hasPendingBackgroundWorkForThread(providerThreadB));
 
-        yield* harness.runtime.startTurn(
+        yield* runtime.startTurn(
           makeClaudeTestTurnInput({
-            threadId: harness.threadId,
-            providerThread: harness.providerThread,
-            now: yield* DateTime.now,
-            attemptId: RunAttemptId.make(`attempt-claude-${testCase.toolName}-patch`),
-            text: "Change it.",
+            threadId: appThreadB,
+            providerThread: { ...providerThreadB, status: "active" },
+            now,
+            attemptId: RunAttemptId.make("attempt-roster-iso-b"),
+            text: "Background work on B.",
             attachments: [],
           }),
         );
+        assert.equal(processQueues.length, 2);
+        yield* changes.until(() =>
+          providerThreadRosterEvents(events).some(
+            (event) =>
+              event.providerThread.id === providerThreadA.id &&
+              event.providerThread.status === "idle" &&
+              (event.providerThread.pendingBackgroundTasks?.length ?? 0) === 0,
+          ),
+        );
+        assert.isFalse(yield* hasPendingBackgroundWorkForThread(providerThreadA));
+
+        const processB = processQueues[1]!;
         yield* Queue.offer(
-          harness.sdkMessages,
+          processB.queue,
           claudeSdkFrame({
-            type: "assistant",
-            message: {
-              model: "claude-sonnet-4-6",
-              id: `msg_${testCase.toolName}_patch`,
-              type: "message",
-              role: "assistant",
-              content: [
-                {
-                  type: "tool_use",
-                  id: toolUseId,
-                  name: testCase.toolName,
-                  input: testCase.toolInput,
-                },
-              ],
-            },
-            parent_tool_use_id: null,
-            uuid: "00000000-0000-4000-8000-000000000793",
-            session_id: WAKE_NATIVE_SESSION,
+            type: "system",
+            subtype: "task_started",
+            task_id: taskB,
+            tool_use_id: "toolu-roster-b",
+            description: "work on B",
+            is_backgrounded: true,
+            task_type: "local_bash",
+            uuid: "00000000-0000-4000-8000-000000000303",
+            session_id: nativeIds[1],
           }),
         );
+        yield* changes.until(() =>
+          providerThreadRosterEvents(events).some(
+            (event) =>
+              event.providerThread.id === providerThreadB.id &&
+              (event.providerThread.pendingBackgroundTasks?.length ?? 0) > 0,
+          ),
+        );
+        assert.isTrue(yield* hasPendingBackgroundWorkForThread(providerThreadB));
+        assert.isTrue(yield* hasPendingBackgroundWork);
+        assert.isFalse(yield* hasPendingBackgroundWorkForThread(providerThreadA));
+
         yield* Queue.offer(
-          harness.sdkMessages,
+          processB.queue,
           claudeSdkFrame({
-            type: "user",
-            message: {
-              role: "user",
-              content: [
-                {
-                  type: "tool_result",
-                  tool_use_id: toolUseId,
-                  content: `The file ${testCase.toolInput.file_path} has been updated successfully.`,
-                },
-              ],
+            type: "result",
+            subtype: "error_during_execution",
+            duration_ms: 10,
+            duration_api_ms: 10,
+            is_error: true,
+            num_turns: 1,
+            result: "B failed",
+            stop_reason: "end_turn",
+            total_cost_usd: 0,
+            usage: {
+              input_tokens: 1,
+              output_tokens: 1,
+              cache_creation_input_tokens: 0,
+              cache_read_input_tokens: 0,
             },
-            parent_tool_use_id: null,
-            uuid: "00000000-0000-4000-8000-000000000794",
-            session_id: WAKE_NATIVE_SESSION,
-            tool_use_result: testCase.toolUseResult,
+            modelUsage: {},
+            permission_denials: [],
+            errors: ["B failed"],
+            terminal_reason: "model_error",
+            uuid: "00000000-0000-4000-8000-000000000304",
+            session_id: nativeIds[1],
           }),
         );
-        yield* Queue.offer(
-          harness.sdkMessages,
-          makeResultFrame({ uuid: "00000000-0000-4000-8000-000000000795", result: "Done." }),
+        yield* changes.until(() =>
+          events.some(
+            (event) =>
+              event.type === "turn.terminal" &&
+              event.providerThreadId === providerThreadB.id &&
+              event.status === "failed",
+          ),
         );
-        yield* harness.awaitTerminal(1);
 
-        const fileChange = harness.events.findLast(
-          (event) =>
-            event.type === "turn_item.updated" &&
-            event.turnItem.nativeItemRef?.nativeId === toolUseId,
-        );
-        assert.deepEqual(
-          fileChange?.type === "turn_item.updated" && fileChange.turnItem.type === "file_change"
-            ? { diffStr: fileChange.turnItem.diffStr }
-            : undefined,
-          { diffStr: testCase.diffStr },
-        );
+        const rosterBAfterFail = providerThreadRosterEvents(events).findLast(
+          (event) => event.providerThread.id === providerThreadB.id,
+        )?.providerThread.pendingBackgroundTasks;
+        assert.deepEqual(rosterBAfterFail ?? [], []);
+        assert.isFalse(yield* hasPendingBackgroundWorkForThread(providerThreadA));
+        assert.isFalse(yield* hasPendingBackgroundWorkForThread(providerThreadB));
+        assert.isFalse(yield* hasPendingBackgroundWork);
       }).pipe(
         Effect.provide(
           Layer.mergeAll(
@@ -13354,27 +12915,68 @@ describe("ClaudeAdapterV2 background wake turns", () => {
           ),
         ),
       ),
-    ),
   );
 
-  it.effect("answers an approval a held wake turn raises without waiting for the echo", () =>
-    Effect.scoped(
+  it.effect.each(["full-access", "approval-required"] as const)(
+    "keeps a queued wake turn's tool callback with its continuation in %s mode",
+    (runtimeMode) =>
       Effect.gen(function* () {
         const harness = yield* makeWakeHarness;
         const now = yield* DateTime.now;
-        const approvalPolicy = ProviderAdapter.ProviderAdapterV2RuntimePolicy.make({
-          runtimeMode: "approval-required",
+        const runtimePolicy = ProviderAdapter.ProviderAdapterV2RuntimePolicy.make({
+          runtimeMode,
           interactionMode: "default",
           cwd: "/workspace",
         });
-        const firstAttempt = RunAttemptId.make("attempt-claude-wake-approval-1");
-        const userAttempt = RunAttemptId.make("attempt-claude-wake-approval-2");
-        const bashToolUseId = "toolu_01WakeApprovalBash";
+        const firstAttempt = RunAttemptId.make("attempt-claude-wake-callback-1");
+        const userAttempt = RunAttemptId.make("attempt-claude-wake-callback-2");
+        const continuationAttempt = RunAttemptId.make("attempt-claude-wake-callback-3");
+        const planToolUseId = "toolu_01WakePlanExitPlanMode";
+        const planMarkdown = "# Wake plan\n\n1. Report the background result.";
         const stamp = (frame: SDKMessage, promptIndex: number) =>
           claudeSdkFrame({
             ...frame,
             user_message_uuid: harness.promptUuid(promptIndex),
           });
+        const runOf = (attemptId: RunAttemptId) => RunId.make(`run-${attemptId}`);
+        const planToolUse = claudeSdkFrame({
+          type: "assistant",
+          message: {
+            model: "claude-sonnet-4-6",
+            id: "msg_wake_plan",
+            type: "message",
+            role: "assistant",
+            content: [
+              {
+                type: "tool_use",
+                id: planToolUseId,
+                name: "ExitPlanMode",
+                input: { plan: planMarkdown },
+              },
+            ],
+          },
+          parent_tool_use_id: null,
+          uuid: "00000000-0000-4000-8000-000000000741",
+          session_id: WAKE_NATIVE_SESSION,
+        });
+        const planToolResult = claudeSdkFrame({
+          type: "user",
+          message: {
+            role: "user",
+            content: [
+              {
+                type: "tool_result",
+                tool_use_id: planToolUseId,
+                content:
+                  "The client captured your proposed plan. Stop here and wait for the user's feedback or implementation request in a later turn.",
+                is_error: true,
+              },
+            ],
+          },
+          parent_tool_use_id: null,
+          uuid: "00000000-0000-4000-8000-000000000742",
+          session_id: WAKE_NATIVE_SESSION,
+        });
 
         yield* harness.runtime.startTurn(
           makeClaudeTestTurnInput({
@@ -13382,22 +12984,16 @@ describe("ClaudeAdapterV2 background wake turns", () => {
             providerThread: harness.providerThread,
             now,
             attemptId: firstAttempt,
-            text: "First.",
+            text: "Run the build in the background.",
             attachments: [],
-            runtimePolicy: approvalPolicy,
+            runtimePolicy,
           }),
         );
+        yield* Queue.offer(harness.sdkMessages, stamp(wakeTaskStarted, 0));
         yield* Queue.offer(
           harness.sdkMessages,
           stamp(
-            makeAssistantTextFrame({ uuid: "00000000-0000-4000-8000-000000000780", text: "One." }),
-            0,
-          ),
-        );
-        yield* Queue.offer(
-          harness.sdkMessages,
-          stamp(
-            makeResultFrame({ uuid: "00000000-0000-4000-8000-000000000781", result: "One." }),
+            makeResultFrame({ uuid: "00000000-0000-4000-8000-000000000740", result: "STARTED" }),
             0,
           ),
         );
@@ -13409,381 +13005,110 @@ describe("ClaudeAdapterV2 background wake turns", () => {
             providerThread: harness.providerThread,
             now,
             attemptId: userAttempt,
-            text: "Second.",
+            text: "Reply with exactly: USER_REPLY",
             attachments: [],
+            runtimePolicy,
             providerTurnOrdinal: 2,
-            runtimePolicy: approvalPolicy,
-          }),
-        );
-        yield* harness.offerAndWait(
-          claudeSdkFrame({
-            type: "assistant",
-            message: {
-              model: "claude-sonnet-4-6",
-              id: "msg_wake_bash",
-              type: "message",
-              role: "assistant",
-              content: [
-                {
-                  type: "tool_use",
-                  id: bashToolUseId,
-                  name: "Bash",
-                  input: { command: "git status" },
-                },
-              ],
-            },
-            parent_tool_use_id: null,
-            uuid: "00000000-0000-4000-8000-000000000782",
-            session_id: WAKE_NATIVE_SESSION,
           }),
         );
-        const permission = yield* Effect.promise(() =>
-          harness.getOpenedOptions()!.canUseTool!(
-            "Bash",
-            { command: "git status" },
+        yield* Queue.offer(harness.sdkMessages, wakeNotification);
+        // The SDK asks for permission only after streaming the tool_use.
+        yield* harness.offerAndWait(planToolUse);
+        const canUseTool = harness.getOpenedOptions()?.canUseTool;
+        assert.isFunction(canUseTool);
+        const callback = yield* Effect.promise(() =>
+          canUseTool!(
+            "ExitPlanMode",
+            { plan: planMarkdown },
             {
               signal: new AbortController().signal,
-              toolUseID: bashToolUseId,
-              requestId: "request-wake-bash",
+              toolUseID: planToolUseId,
+              requestId: "request-wake-plan",
             },
           ),
-        ).pipe(Effect.forkScoped);
-
-        yield* harness.until(() =>
-          harness.events.some((event) => event.type === "runtime_request.updated"),
         );
-        const request = harness.events.findLast(
-          (event) => event.type === "runtime_request.updated",
-        );
-        const bashItems = harness.events.flatMap((event) =>
-          event.type === "turn_item.updated" &&
-          event.turnItem.nativeItemRef?.nativeId === bashToolUseId
-            ? [event.turnItem.runId]
-            : [],
+        assert.equal(callback?.behavior, "deny");
+        assert.include(
+          callback?.behavior === "deny" ? callback.message : "",
+          "The client captured your proposed plan",
         );
-        assert.isNotEmpty(bashItems);
-        assert.isTrue(bashItems.every((runId) => runId === RunId.make(`run-${userAttempt}`)));
-        if (request?.type !== "runtime_request.updated") return;
-        yield* harness.runtime.respondToRuntimeRequest({
-          requestId: request.runtimeRequest.id,
-          decision: "accept",
-        });
-        const result = yield* Fiber.join(permission);
-        assert.equal(result?.behavior, "allow");
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
-          ),
-        ),
-      ),
-    ),
-  );
+        yield* Queue.offer(harness.sdkMessages, planToolResult);
+        yield* Queue.offer(harness.sdkMessages, wakeResult);
+        yield* harness.awaitContinuation(1);
 
-  it.effect.each([
-    { card: "an approval", toolName: "Bash", toolInput: { command: "echo probe" } },
-    {
-      card: "a question",
-      toolName: "AskUserQuestion",
-      toolInput: {
-        questions: [
-          {
-            header: "Target",
-            question: "Where should this deploy?",
-            options: [
-              { label: "Production", description: "Deploy to production." },
-              { label: "Staging", description: "Deploy to staging." },
-            ],
-            multiSelect: false,
-          },
-        ],
-      },
-    },
-  ])("closes $card card when Claude withdraws its request", ({ toolName, toolInput }) =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const harness = yield* makeWakeHarness;
-        yield* harness.runtime.startTurn(
-          makeClaudeTestTurnInput({
-            threadId: harness.threadId,
-            providerThread: harness.providerThread,
-            now: yield* DateTime.now,
-            attemptId: RunAttemptId.make("attempt-claude-withdrawn-approval"),
-            text: "Run the probe.",
-            attachments: [],
-            runtimePolicy: ProviderAdapter.ProviderAdapterV2RuntimePolicy.make({
-              runtimeMode: "approval-required",
-              interactionMode: "default",
-              cwd: "/workspace",
-            }),
-          }),
-        );
-        // The CLI cancels a request once a PermissionRequest hook has answered it.
-        // @effect-diagnostics-next-line abortControllerInEffect:off - Claude, not the test fiber, withdraws the request.
-        const withdrawal = new AbortController();
-        const permission = yield* Effect.promise(() =>
-          harness.getOpenedOptions()!.canUseTool!(toolName, toolInput, {
-            signal: withdrawal.signal,
-            toolUseID: "toolu_01WithdrawnApproval",
-            requestId: "request-withdrawn-approval",
-          }),
-        ).pipe(Effect.forkScoped);
-        const pending = (yield* Queue.take(harness.runtimeRequestReceipts)).runtimeRequest;
-        assert.equal(pending.status, "pending");
-
-        // The turn can end right after the withdrawal, before the callback returns.
-        withdrawal.abort();
-        yield* Queue.offer(
-          harness.sdkMessages,
-          claudeSdkFrame({
-            ...makeResultFrame({ uuid: "00000000-0000-4000-8000-000000000790", result: "Done." }),
-            user_message_uuid: harness.promptUuid(0),
-          }),
-        );
-        yield* harness.awaitTerminal(1);
-        assert.equal((yield* Fiber.join(permission))?.behavior, "deny");
-        // The cancellation has to land before the turn's end finalizes the run.
-        const beforeTerminal = harness.events.slice(
-          0,
-          harness.events.findIndex((event) => event.type === "turn.terminal"),
-        );
-        const statusOf = (type: "runtime_request.updated" | "node.updated" | "turn_item.updated") =>
-          beforeTerminal
-            .flatMap((event): Array<{ readonly type: string; readonly status: string }> =>
-              event.type === "runtime_request.updated" && event.runtimeRequest.id === pending.id
-                ? [{ type: event.type, status: event.runtimeRequest.status }]
-                : event.type === "node.updated" && event.node.id === pending.nodeId
-                  ? [{ type: event.type, status: event.node.status }]
-                  : event.type === "turn_item.updated" && event.turnItem.nodeId === pending.nodeId
-                    ? [{ type: event.type, status: event.turnItem.status }]
-                    : [],
-            )
-            .findLast((entry) => entry.type === type)?.status;
-        assert.equal(statusOf("runtime_request.updated"), "cancelled");
-        assert.equal(statusOf("node.updated"), "cancelled");
-        assert.equal(statusOf("turn_item.updated"), "cancelled");
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
-          ),
-        ),
-      ),
-    ),
-  );
-
-  it.effect("releases output held for a prompt echo when the stream ends", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const harness = yield* makeWakeHarnessWithOptions({
-          close: (sdkMessages) => Queue.shutdown(sdkMessages),
-        });
-        const now = yield* DateTime.now;
-        const firstAttempt = RunAttemptId.make("attempt-claude-echo-1");
-        const secondAttempt = RunAttemptId.make("attempt-claude-echo-2");
-        const stamp = (frame: SDKMessage, promptIndex: number) =>
-          claudeSdkFrame({
-            ...frame,
-            user_message_uuid: harness.promptUuid(promptIndex),
-          });
-        const assistantTexts = () =>
-          harness.events.flatMap((event) =>
-            event.type === "message.updated" && event.message.role === "assistant"
-              ? [event.message.text]
-              : [],
-          );
-
-        yield* harness.runtime.startTurn(
-          makeClaudeTestTurnInput({
-            threadId: harness.threadId,
-            providerThread: harness.providerThread,
-            now,
-            attemptId: firstAttempt,
-            text: "First.",
-            attachments: [],
-          }),
-        );
         yield* Queue.offer(
           harness.sdkMessages,
           stamp(
-            makeAssistantTextFrame({ uuid: "00000000-0000-4000-8000-000000000701", text: "One." }),
-            0,
+            makeAssistantTextFrame({
+              uuid: "00000000-0000-4000-8000-000000000743",
+              text: "USER_REPLY",
+            }),
+            1,
           ),
         );
         yield* Queue.offer(
           harness.sdkMessages,
           stamp(
-            makeResultFrame({ uuid: "00000000-0000-4000-8000-000000000702", result: "One." }),
-            0,
+            makeResultFrame({
+              uuid: "00000000-0000-4000-8000-000000000744",
+              result: "USER_REPLY",
+            }),
+            1,
           ),
         );
-        yield* harness.awaitTerminal(1);
+        yield* harness.awaitTerminal(2);
 
         yield* harness.runtime.startTurn(
           makeClaudeTestTurnInput({
             threadId: harness.threadId,
             providerThread: harness.providerThread,
             now,
-            attemptId: secondAttempt,
-            text: "Second.",
+            attemptId: continuationAttempt,
+            text: "Background task completed.",
             attachments: [],
-            providerTurnOrdinal: 2,
+            runtimePolicy,
+            providerTurnOrdinal: 3,
+            messageCreatedBy: "agent",
+            messageCreationSource: "provider",
           }),
         );
-        yield* harness.offerAndWait(
-          makeAssistantTextFrame({ uuid: "00000000-0000-4000-8000-000000000703", text: "Two." }),
-        );
-        assert.deepEqual(assistantTexts(), ["One."]);
+        yield* harness.awaitTerminal(3);
 
-        yield* Queue.shutdown(harness.sdkMessages);
-        yield* harness.awaitTerminal(2);
-        assert.deepEqual(assistantTexts(), ["One.", "Two."]);
-        assert.equal(harness.terminalEvents()[1]?.status, "failed");
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
+        const latestItems = new Map(
+          harness.events.flatMap((event) =>
+            event.type === "turn_item.updated" ? [[String(event.turnItem.id), event.turnItem]] : [],
           ),
-        ),
-      ),
-    ),
-  );
-
-  it.effect("fails a prompt Claude completes without starting a turn for it", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        // Claude answers previously recorded prompt uuids with only a completed lifecycle frame.
-        const harness = yield* makeWakeHarness;
-        const now = yield* DateTime.now;
-        yield* harness.runtime.startTurn(
-          makeClaudeTestTurnInput({
-            threadId: harness.threadId,
-            providerThread: harness.providerThread,
-            now,
-            attemptId: RunAttemptId.make("attempt-claude-duplicate-prompt"),
-            text: "Bump this PR to the latest main.",
-            attachments: [],
-          }),
         );
-        yield* Queue.offer(
-          harness.sdkMessages,
-          claudeSdkFrame({
-            type: "command_lifecycle",
-            command_uuid: harness.promptUuid(0),
-            state: "completed",
-            uuid: "00000000-0000-4000-8000-000000000790",
-            session_id: WAKE_NATIVE_SESSION,
-          }),
+        const planTool = [...latestItems.values()].find(
+          (item) => item.type === "dynamic_tool" && item.nativeItemRef?.nativeId === planToolUseId,
         );
-        yield* harness.awaitTerminal(1);
-        const [terminal] = harness.terminalEvents();
-        assert.equal(terminal?.status, "failed");
-        if (terminal?.status !== "failed") return;
-        assert.equal(terminal.threadDisposition, "reusable");
-        assert.include(terminal.failure.message, "never started a turn");
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
-          ),
-        ),
-      ),
-    ),
-  );
-
-  // regression: #17531 a mod that holds a tool behind a focused pane must fail the turn, not hang it
-  it.effect.each([
-    { case: "fails a turn whose mod requests focus for a pane T3 cannot show", focus: true },
-    { case: "keeps a turn running beside a passive mod pane", focus: false },
-  ] as const)("$case", ({ focus }) =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const closed = yield* Deferred.make<void>();
-        const harness = yield* makeWakeHarnessWithOptions({
-          close: () => Deferred.succeed(closed, undefined),
-        });
-        const now = yield* DateTime.now;
-        yield* harness.runtime.startTurn(
-          makeClaudeTestTurnInput({
-            threadId: harness.threadId,
-            providerThread: harness.providerThread,
-            now,
-            attemptId: RunAttemptId.make("attempt-claude-mod-pane-focus"),
-            text: "Run rm -r build",
-            attachments: [],
-          }),
+        const proposedPlans = [...latestItems.values()].filter(
+          (item) => item.type === "proposed_plan",
         );
-        // Captured from Claude 2.1.303 with the blast-radius mod holding a Bash
-        // call: the mod waits for keyboard input in its pane and nothing else
-        // arrives until it gives up.
-        yield* Queue.offer(
-          harness.sdkMessages,
-          claudeSdkFrame({
-            type: "system",
-            subtype: "ui_panes",
-            panes: [
-              { id: "blast-radius", title: "Blast Radius", plugin: "blast-radius", rows: 10 },
-            ],
-            shown_id: "blast-radius",
-            focused_id: null,
-            focus_requested_id: focus ? "blast-radius" : null,
-            uuid: "00000000-0000-4000-8000-000000000795",
-            session_id: WAKE_NATIVE_SESSION,
-          }),
+        const plans = harness.events.flatMap((event) =>
+          event.type === "plan.updated" && event.plan.kind === "proposed_plan" ? [event.plan] : [],
         );
-        yield* Queue.offer(
-          harness.sdkMessages,
-          claudeSdkFrame({
-            type: "system",
-            subtype: "ui_invalidate",
-            event: "ui.render",
-            uuid: "00000000-0000-4000-8000-000000000796",
-            session_id: WAKE_NATIVE_SESSION,
-          }),
+        const planToolRuns = harness.events.flatMap((event) =>
+          event.type === "turn_item.updated" &&
+          event.turnItem.nativeItemRef?.nativeId === planToolUseId &&
+          event.turnItem.type === "dynamic_tool"
+            ? [event.turnItem.runId]
+            : [],
         );
-        // Frames are handled in order, so a later notice proves the pane frame
-        // was handled without the turn ending.
-        yield* Queue.offer(
-          harness.sdkMessages,
-          claudeSdkFrame({
-            type: "system",
-            subtype: "informational",
-            content: "Processing barrier.",
-            level: "warning",
-            uuid: "00000000-0000-4000-8000-000000000797",
-            session_id: WAKE_NATIVE_SESSION,
-          }),
+        assert.isNotEmpty(planToolRuns);
+        assert.isTrue(planToolRuns.every((runId) => runId === runOf(continuationAttempt)));
+        assert.equal(planTool?.runId, runOf(continuationAttempt));
+        assert.lengthOf(proposedPlans, 1);
+        assert.equal(proposedPlans[0]?.runId, runOf(continuationAttempt));
+        assert.isTrue(plans.length > 0);
+        assert.isTrue(plans.every((plan) => plan.runId === runOf(continuationAttempt)));
+        const userRunItems = [...latestItems.values()].filter(
+          (item) => item.runId === runOf(userAttempt),
         );
-        yield* harness.until(
-          () =>
-            harness.terminalEvents().length > 0 ||
-            harness.events.some(
-              (event) =>
-                event.type === "turn_item.updated" && event.turnItem.type === "system_notice",
-            ),
+        assert.deepEqual(
+          userRunItems.map((item) => item.type),
+          ["assistant_message"],
         );
-        const [terminal] = harness.terminalEvents();
-        if (!focus) {
-          assert.equal(terminal, undefined);
-          return;
-        }
-        assert.equal(terminal?.status, "failed");
-        if (terminal?.status !== "failed") return;
-        assert.include(terminal.failure.message, "blast-radius");
-        // The held tool call is abandoned by closing the query, never answered.
-        yield* Deferred.await(closed);
       }).pipe(
         Effect.provide(
           Layer.mergeAll(
@@ -13794,1406 +13119,1302 @@ describe("ClaudeAdapterV2 background wake turns", () => {
           ),
         ),
       ),
-    ),
   );
 
-  // regression: #17531 a follow-up sent while the failed mod turn's process closes gets a new process
-  it.effect("runs a follow-up in a fresh query while the mod-blocked query is closing", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const releaseClose = yield* Deferred.make<void>();
-        const replacementClosedOld = yield* Deferred.make<void>();
-        let oldCloses = 0;
-        const harness = yield* makeWakeHarnessWithOptions({
-          // The held CLI never answers an interrupt; closure must not need one.
-          interrupt: Effect.never,
-          close: (sdkMessages) =>
-            Effect.suspend(() =>
-              ++oldCloses === 2 ? Deferred.succeed(replacementClosedOld, undefined) : Effect.void,
-            ).pipe(
-              Effect.andThen(Deferred.await(releaseClose)),
-              Effect.andThen(Queue.shutdown(sdkMessages)),
-            ),
-          freshQueueOnReopen: true,
-        });
-        // Added after the harness so it runs first: a failed assertion must not
-        // leave teardown waiting on the held close.
-        yield* Effect.addFinalizer(() => Deferred.succeed(releaseClose, undefined));
-        const now = yield* DateTime.now;
-        const turnInput = makeClaudeTestTurnInput({
+  it.effect("stores a Bash result's stdout and stderr as command output", () =>
+    Effect.gen(function* () {
+      const harness = yield* makeWakeHarness;
+      const now = yield* DateTime.now;
+      const attemptId = RunAttemptId.make("attempt-claude-bash-output");
+      const bashToolUseId = "toolu_01BashOutput";
+
+      yield* harness.runtime.startTurn(
+        makeClaudeTestTurnInput({
           threadId: harness.threadId,
           providerThread: harness.providerThread,
           now,
-          attemptId: RunAttemptId.make("attempt-claude-mod-pane-blocked"),
-          text: "Run rm -r build",
+          attemptId,
+          text: "Run it.",
           attachments: [],
-        });
-        yield* harness.runtime.startTurn(turnInput);
-        yield* Queue.offer(
-          harness.sdkMessages,
-          claudeSdkFrame({
-            type: "system",
-            subtype: "ui_panes",
-            panes: [
-              { id: "blast-radius", title: "Blast Radius", plugin: "blast-radius", rows: 10 },
+        }),
+      );
+      yield* Queue.offer(
+        harness.sdkMessages,
+        claudeSdkFrame({
+          type: "assistant",
+          message: {
+            model: "claude-sonnet-4-6",
+            id: "msg_bash_output",
+            type: "message",
+            role: "assistant",
+            content: [
+              {
+                type: "tool_use",
+                id: bashToolUseId,
+                name: "Bash",
+                input: { command: "git status" },
+              },
             ],
-            shown_id: "blast-radius",
-            focused_id: null,
-            focus_requested_id: "blast-radius",
-            uuid: "00000000-0000-4000-8000-000000000798",
-            session_id: WAKE_NATIVE_SESSION,
-          }),
-        );
-        assert.equal((yield* Queue.take(harness.terminalReceipts)).status, "failed");
-
-        const followUp = yield* harness.runtime
-          .startTurn({
-            ...turnInput,
-            attemptId: RunAttemptId.make("attempt-claude-after-mod-pane"),
-            providerTurnOrdinal: 2,
-          })
-          .pipe(Effect.forkScoped);
-        // Reusing the closing process would offer the prompt to it instead.
-        yield* Effect.raceFirst(
-          Deferred.await(replacementClosedOld),
-          harness.until(() => harness.offeredMessages.length >= 2),
-        );
-        assert.isTrue(yield* Deferred.isDone(replacementClosedOld));
-        yield* Deferred.succeed(releaseClose, undefined);
-        yield* Fiber.join(followUp);
-        assert.equal(harness.processQueues.length, 2);
-        yield* harness.offerAndWait(
-          makeResultFrame({ uuid: "after-mod-pane-result", result: "Done." }),
-        );
-        assert.equal((yield* Queue.take(harness.terminalReceipts)).status, "completed");
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
-          ),
-        ),
-      ),
-    ),
-  );
+          },
+          parent_tool_use_id: null,
+          uuid: "00000000-0000-4000-8000-000000000790",
+          session_id: WAKE_NATIVE_SESSION,
+        }),
+      );
+      yield* Queue.offer(
+        harness.sdkMessages,
+        claudeSdkFrame({
+          type: "user",
+          message: {
+            role: "user",
+            content: [
+              { type: "tool_result", tool_use_id: bashToolUseId, content: "On branch main" },
+            ],
+          },
+          parent_tool_use_id: null,
+          uuid: "00000000-0000-4000-8000-000000000791",
+          session_id: WAKE_NATIVE_SESSION,
+          tool_use_result: {
+            stdout: "On branch main",
+            stderr: "warning: dirty",
+            interrupted: false,
+            isImage: false,
+          },
+        }),
+      );
+      yield* Queue.offer(
+        harness.sdkMessages,
+        makeResultFrame({ uuid: "00000000-0000-4000-8000-000000000792", result: "Done." }),
+      );
+      yield* harness.awaitTerminal(1);
 
-  // regression: #16897 a prompt whose uuid the session already holds must not hang or end early
-  it.effect("keeps a started prompt running until its result", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const harness = yield* makeWakeHarness;
-        const now = yield* DateTime.now;
-        yield* harness.runtime.startTurn(
-          makeClaudeTestTurnInput({
-            threadId: harness.threadId,
-            providerThread: harness.providerThread,
-            now,
-            attemptId: RunAttemptId.make("attempt-claude-started-prompt"),
-            text: "Bump this PR to the latest main.",
-            attachments: [],
-          }),
-        );
-        const lifecycle = (state: string, uuid: string) =>
-          claudeSdkFrame({
-            type: "command_lifecycle",
-            command_uuid: harness.promptUuid(0),
-            state,
-            uuid,
-            session_id: WAKE_NATIVE_SESSION,
-          });
-        yield* Queue.offer(
-          harness.sdkMessages,
-          lifecycle("queued", "00000000-0000-4000-8000-000000000791"),
-        );
-        yield* Queue.offer(
-          harness.sdkMessages,
-          lifecycle("started", "00000000-0000-4000-8000-000000000792"),
-        );
-        // The CLI can report the prompt completed before its turn's result.
-        yield* Queue.offer(
-          harness.sdkMessages,
-          lifecycle("completed", "00000000-0000-4000-8000-000000000793"),
-        );
-        yield* Queue.offer(
-          harness.sdkMessages,
-          claudeSdkFrame({
-            ...makeResultFrame({ uuid: "00000000-0000-4000-8000-000000000794", result: "Done." }),
-            user_message_uuid: harness.promptUuid(0),
-          }),
-        );
-        yield* harness.awaitTerminal(1);
-        assert.equal(harness.terminalEvents()[0]?.status, "completed");
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
-          ),
+      const bash = harness.events.findLast(
+        (event) =>
+          event.type === "turn_item.updated" &&
+          event.turnItem.nativeItemRef?.nativeId === bashToolUseId,
+      );
+      assert.equal(
+        bash?.type === "turn_item.updated" && bash.turnItem.type === "command_execution"
+          ? bash.turnItem.output
+          : undefined,
+        "On branch main\nwarning: dirty",
+      );
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
         ),
       ),
     ),
   );
 
-  it.effect("buffers wake output and requests a single continuation run", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const harness = yield* makeWakeHarness;
-        const now = yield* DateTime.now;
-
-        yield* harness.runtime.startTurn(
-          makeClaudeTestTurnInput({
-            threadId: harness.threadId,
-            providerThread: harness.providerThread,
-            now,
-            attemptId: RunAttemptId.make("attempt-claude-wake-1"),
-            text: "Run the build in the background.",
-            attachments: [],
-          }),
-        );
-        yield* Queue.offer(harness.sdkMessages, wakeTaskStarted);
-        yield* Queue.offer(harness.sdkMessages, turnOneResult);
-        yield* harness.awaitTerminal(1);
-        assert.equal(harness.terminalEvents()[0]?.status, "completed");
-        assert.isTrue(yield* harness.hasPendingBackgroundWork);
-        assert.lengthOf(harness.continuationRequests, 0);
-
-        yield* harness.offerAndWait(wakeNotification);
-        assert.lengthOf(harness.continuationRequests, 0);
-        assert.isFalse(yield* harness.hasPendingBackgroundWork);
+  it.effect.each([
+    {
+      case: "an Edit",
+      toolName: "Edit",
+      toolInput: {
+        file_path: "/workspace/src/math.ts",
+        old_string: "  return a - b;",
+        new_string: "  return a + b;",
+      },
+      toolUseResult: {
+        filePath: "/workspace/src/math.ts",
+        oldString: "  return a - b;",
+        newString: "  return a + b;",
+        originalFile: "export function add(a: number, b: number) {\n  return a - b;\n}\n",
+        structuredPatch: [
+          {
+            oldStart: 1,
+            oldLines: 3,
+            newStart: 1,
+            newLines: 3,
+            lines: [
+              " export function add(a: number, b: number) {",
+              "-  return a - b;",
+              "+  return a + b;",
+              " }",
+            ],
+          },
+        ],
+        userModified: false,
+        replaceAll: false,
+      },
+      diffStr:
+        "--- /workspace/src/math.ts\n+++ /workspace/src/math.ts\n@@ -1,3 +1,3 @@\n export function add(a: number, b: number) {\n-  return a - b;\n+  return a + b;\n }\n",
+    },
+    {
+      case: "a Write that creates a file",
+      toolName: "Write",
+      toolInput: { file_path: "/workspace/notes.md", content: "# Notes\n\nShip it.\n" },
+      toolUseResult: {
+        type: "create",
+        filePath: "/workspace/notes.md",
+        content: "# Notes\n\nShip it.\n",
+        structuredPatch: [],
+        originalFile: null,
+        userModified: false,
+      },
+      diffStr: "--- /dev/null\n+++ /workspace/notes.md\n@@ -0,0 +1,3 @@\n+# Notes\n+\n+Ship it.\n",
+    },
+    {
+      case: "a Write that creates an empty file",
+      toolName: "Write",
+      toolInput: { file_path: "/workspace/.keep", content: "" },
+      toolUseResult: {
+        type: "create",
+        filePath: "/workspace/.keep",
+        content: "",
+        structuredPatch: [],
+        originalFile: null,
+        userModified: false,
+      },
+      diffStr: undefined,
+    },
+  ])("stores the diff panel patch for $case", (testCase) =>
+    Effect.gen(function* () {
+      const harness = yield* makeWakeHarness;
+      const toolUseId = `toolu_01${testCase.toolName}Patch`;
 
-        yield* Queue.offer(harness.sdkMessages, wakeAssistant);
-        yield* harness.awaitContinuation(1);
-        assert.equal(harness.continuationRequests[0]?.threadId, harness.threadId);
-        assert.equal(harness.continuationRequests[0]?.providerThreadId, harness.providerThread.id);
-        assert.equal(harness.continuationRequests[0]?.driver, ClaudeAdapterV2.CLAUDE_PROVIDER);
-        assert.equal(harness.continuationRequests[0]?.detail, WAKE_SUMMARY);
+      yield* harness.runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now: yield* DateTime.now,
+          attemptId: RunAttemptId.make(`attempt-claude-${testCase.toolName}-patch`),
+          text: "Change it.",
+          attachments: [],
+        }),
+      );
+      yield* Queue.offer(
+        harness.sdkMessages,
+        claudeSdkFrame({
+          type: "assistant",
+          message: {
+            model: "claude-sonnet-4-6",
+            id: `msg_${testCase.toolName}_patch`,
+            type: "message",
+            role: "assistant",
+            content: [
+              {
+                type: "tool_use",
+                id: toolUseId,
+                name: testCase.toolName,
+                input: testCase.toolInput,
+              },
+            ],
+          },
+          parent_tool_use_id: null,
+          uuid: "00000000-0000-4000-8000-000000000793",
+          session_id: WAKE_NATIVE_SESSION,
+        }),
+      );
+      yield* Queue.offer(
+        harness.sdkMessages,
+        claudeSdkFrame({
+          type: "user",
+          message: {
+            role: "user",
+            content: [
+              {
+                type: "tool_result",
+                tool_use_id: toolUseId,
+                content: `The file ${testCase.toolInput.file_path} has been updated successfully.`,
+              },
+            ],
+          },
+          parent_tool_use_id: null,
+          uuid: "00000000-0000-4000-8000-000000000794",
+          session_id: WAKE_NATIVE_SESSION,
+          tool_use_result: testCase.toolUseResult,
+        }),
+      );
+      yield* Queue.offer(
+        harness.sdkMessages,
+        makeResultFrame({ uuid: "00000000-0000-4000-8000-000000000795", result: "Done." }),
+      );
+      yield* harness.awaitTerminal(1);
 
-        yield* harness.offerAndWait(wakeResult);
-        assert.lengthOf(harness.continuationRequests, 1);
-        assert.lengthOf(harness.terminalEvents(), 1);
-        assert.isTrue(yield* harness.hasPendingBackgroundWork);
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
-          ),
+      const fileChange = harness.events.findLast(
+        (event) =>
+          event.type === "turn_item.updated" &&
+          event.turnItem.nativeItemRef?.nativeId === toolUseId,
+      );
+      assert.deepEqual(
+        fileChange?.type === "turn_item.updated" && fileChange.turnItem.type === "file_change"
+          ? { diffStr: fileChange.turnItem.diffStr }
+          : undefined,
+        { diffStr: testCase.diffStr },
+      );
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
         ),
       ),
     ),
   );
 
-  it.effect("starts the wake run when Claude opens the wake turn, before its output", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const harness = yield* makeWakeHarness;
-        const now = yield* DateTime.now;
-
-        yield* harness.runtime.startTurn(
-          makeClaudeTestTurnInput({
-            threadId: harness.threadId,
-            providerThread: harness.providerThread,
-            now,
-            attemptId: RunAttemptId.make("attempt-claude-wake-init-1"),
-            text: "Run the build in the background.",
-            attachments: [],
-          }),
-        );
-        yield* Queue.offer(harness.sdkMessages, wakeTaskStarted);
-        yield* Queue.offer(harness.sdkMessages, turnOneResult);
-        yield* harness.awaitTerminal(1);
+  it.effect("answers an approval a held wake turn raises without waiting for the echo", () =>
+    Effect.gen(function* () {
+      const harness = yield* makeWakeHarness;
+      const now = yield* DateTime.now;
+      const approvalPolicy = ProviderAdapter.ProviderAdapterV2RuntimePolicy.make({
+        runtimeMode: "approval-required",
+        interactionMode: "default",
+        cwd: "/workspace",
+      });
+      const firstAttempt = RunAttemptId.make("attempt-claude-wake-approval-1");
+      const userAttempt = RunAttemptId.make("attempt-claude-wake-approval-2");
+      const bashToolUseId = "toolu_01WakeApprovalBash";
+      const stamp = (frame: SDKMessage, promptIndex: number) =>
+        claudeSdkFrame({
+          ...frame,
+          user_message_uuid: harness.promptUuid(promptIndex),
+        });
 
-        yield* harness.offerAndWait(wakeNotification);
-        assert.lengthOf(harness.continuationRequests, 0);
-        yield* harness.offerAndWait(wakeTurnInit);
-        assert.lengthOf(harness.continuationRequests, 1);
-        assert.equal(harness.continuationRequests[0]?.detail, WAKE_SUMMARY);
+      yield* harness.runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now,
+          attemptId: firstAttempt,
+          text: "First.",
+          attachments: [],
+          runtimePolicy: approvalPolicy,
+        }),
+      );
+      yield* Queue.offer(
+        harness.sdkMessages,
+        stamp(
+          makeAssistantTextFrame({ uuid: "00000000-0000-4000-8000-000000000780", text: "One." }),
+          0,
+        ),
+      );
+      yield* Queue.offer(
+        harness.sdkMessages,
+        stamp(makeResultFrame({ uuid: "00000000-0000-4000-8000-000000000781", result: "One." }), 0),
+      );
+      yield* harness.awaitTerminal(1);
 
-        yield* harness.runtime.startTurn(
-          makeClaudeTestTurnInput({
-            threadId: harness.threadId,
-            providerThread: harness.providerThread,
-            now,
-            attemptId: RunAttemptId.make("attempt-claude-wake-init-2"),
-            text: "Background task completed.",
-            attachments: [],
-            providerTurnOrdinal: 2,
-            messageCreatedBy: "agent",
-            messageCreationSource: "provider",
-          }),
-        );
-        assert.lengthOf(harness.terminalEvents(), 1);
+      yield* harness.runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now,
+          attemptId: userAttempt,
+          text: "Second.",
+          attachments: [],
+          providerTurnOrdinal: 2,
+          runtimePolicy: approvalPolicy,
+        }),
+      );
+      yield* harness.offerAndWait(
+        claudeSdkFrame({
+          type: "assistant",
+          message: {
+            model: "claude-sonnet-4-6",
+            id: "msg_wake_bash",
+            type: "message",
+            role: "assistant",
+            content: [
+              {
+                type: "tool_use",
+                id: bashToolUseId,
+                name: "Bash",
+                input: { command: "git status" },
+              },
+            ],
+          },
+          parent_tool_use_id: null,
+          uuid: "00000000-0000-4000-8000-000000000782",
+          session_id: WAKE_NATIVE_SESSION,
+        }),
+      );
+      const permission = yield* Effect.promise(() =>
+        harness.getOpenedOptions()!.canUseTool!(
+          "Bash",
+          { command: "git status" },
+          {
+            signal: new AbortController().signal,
+            toolUseID: bashToolUseId,
+            requestId: "request-wake-bash",
+          },
+        ),
+      ).pipe(Effect.forkScoped);
 
-        yield* harness.offerAndWait(wakeAssistant);
-        yield* harness.offerAndWait(wakeResult);
-        yield* harness.awaitTerminal(2);
-        assert.equal(harness.terminalEvents()[1]?.status, "completed");
-        assert.lengthOf(harness.continuationRequests, 1);
-        assert.isTrue(
-          harness.events.some(
-            (event) => event.type === "message.updated" && event.message.text === WAKE_RESULT_TEXT,
-          ),
-        );
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
-          ),
+      yield* harness.until(() =>
+        harness.events.some((event) => event.type === "runtime_request.updated"),
+      );
+      const request = harness.events.findLast((event) => event.type === "runtime_request.updated");
+      const bashItems = harness.events.flatMap((event) =>
+        event.type === "turn_item.updated" &&
+        event.turnItem.nativeItemRef?.nativeId === bashToolUseId
+          ? [event.turnItem.runId]
+          : [],
+      );
+      assert.isNotEmpty(bashItems);
+      assert.isTrue(bashItems.every((runId) => runId === RunId.make(`run-${userAttempt}`)));
+      if (request?.type !== "runtime_request.updated") return;
+      yield* harness.runtime.respondToRuntimeRequest({
+        requestId: request.runtimeRequest.id,
+        decision: "accept",
+      });
+      const result = yield* Fiber.join(permission);
+      assert.equal(result?.behavior, "allow");
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
         ),
       ),
     ),
   );
 
-  it.effect("offers a later wake after an earlier wake's continuation dispatch failed", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const SECOND_TASK_ID = "b2ndwake";
-        const SECOND_TOOL_USE_ID = "toolu_second_wake";
-        const SECOND_SUMMARY = 'Background command "Second sleep" completed (exit code 0)';
-        const harness = yield* makeWakeHarness;
-        const now = yield* DateTime.now;
-
-        yield* harness.runtime.startTurn(
-          makeClaudeTestTurnInput({
-            threadId: harness.threadId,
-            providerThread: harness.providerThread,
-            now,
-            attemptId: RunAttemptId.make("attempt-claude-wake-dispatch-failed-1"),
-            text: "Run two builds in the background.",
-            attachments: [],
-          }),
-        );
-        yield* Queue.offer(harness.sdkMessages, wakeTaskStarted);
-        yield* Queue.offer(
-          harness.sdkMessages,
-          claudeSdkFrame({
-            ...wakeTaskStarted,
-            task_id: SECOND_TASK_ID,
-            tool_use_id: SECOND_TOOL_USE_ID,
-            description: "Second sleep",
-            uuid: "00000000-0000-4000-8000-000000000121",
+  it.effect.each([
+    { card: "an approval", toolName: "Bash", toolInput: { command: "echo probe" } },
+    {
+      card: "a question",
+      toolName: "AskUserQuestion",
+      toolInput: {
+        questions: [
+          {
+            header: "Target",
+            question: "Where should this deploy?",
+            options: [
+              { label: "Production", description: "Deploy to production." },
+              { label: "Staging", description: "Deploy to staging." },
+            ],
+            multiSelect: false,
+          },
+        ],
+      },
+    },
+  ])("closes $card card when Claude withdraws its request", ({ toolName, toolInput }) =>
+    Effect.gen(function* () {
+      const harness = yield* makeWakeHarness;
+      yield* harness.runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now: yield* DateTime.now,
+          attemptId: RunAttemptId.make("attempt-claude-withdrawn-approval"),
+          text: "Run the probe.",
+          attachments: [],
+          runtimePolicy: ProviderAdapter.ProviderAdapterV2RuntimePolicy.make({
+            runtimeMode: "approval-required",
+            interactionMode: "default",
+            cwd: "/workspace",
           }),
-        );
-        yield* Queue.offer(harness.sdkMessages, turnOneResult);
-        yield* harness.awaitTerminal(1);
-
-        yield* harness.offerAndWait(wakeNotification);
-        yield* harness.offerAndWait(wakeTurnInit);
-        assert.lengthOf(harness.continuationRequests, 1);
-        yield* harness.offerAndWait(wakeAssistant);
-        yield* harness.offerAndWait(wakeResult);
-
-        // A failed dispatch never attaches the wake turn; clearIfCurrent is the only release.
-        const failed = harness.continuationRequests[0]!;
-        assert.isDefined(failed.clearIfCurrent);
-        yield* failed.clearIfCurrent!();
-        yield* harness.until(
-          () =>
-            !(
-              providerThreadRosterEvents(harness.events).at(-1)?.providerThread
-                .pendingBackgroundTasks ?? []
-            ).some((task) => task.taskId === WAKE_TASK_ID),
-        );
+        }),
+      );
+      // The CLI cancels a request once a PermissionRequest hook has answered it.
+      // @effect-diagnostics-next-line abortControllerInEffect:off - Claude, not the test fiber, withdraws the request.
+      const withdrawal = new AbortController();
+      const permission = yield* Effect.promise(() =>
+        harness.getOpenedOptions()!.canUseTool!(toolName, toolInput, {
+          signal: withdrawal.signal,
+          toolUseID: "toolu_01WithdrawnApproval",
+          requestId: "request-withdrawn-approval",
+        }),
+      ).pipe(Effect.forkScoped);
+      const pending = (yield* Queue.take(harness.runtimeRequestReceipts)).runtimeRequest;
+      assert.equal(pending.status, "pending");
 
-        yield* harness.offerAndWait(
-          claudeSdkFrame({
-            ...wakeNotification,
-            task_id: SECOND_TASK_ID,
-            tool_use_id: SECOND_TOOL_USE_ID,
-            output_file: `/tmp/claude-replay/tasks/${SECOND_TASK_ID}.output`,
-            summary: SECOND_SUMMARY,
-            uuid: "00000000-0000-4000-8000-000000000123",
-          }),
-        );
-        yield* harness.offerAndWait(
-          claudeSdkFrame({ ...wakeTurnInit, uuid: "00000000-0000-4000-8000-000000000124" }),
-        );
-        assert.lengthOf(harness.continuationRequests, 2);
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
-          ),
+      // The turn can end right after the withdrawal, before the callback returns.
+      withdrawal.abort();
+      yield* Queue.offer(
+        harness.sdkMessages,
+        claudeSdkFrame({
+          ...makeResultFrame({ uuid: "00000000-0000-4000-8000-000000000790", result: "Done." }),
+          user_message_uuid: harness.promptUuid(0),
+        }),
+      );
+      yield* harness.awaitTerminal(1);
+      assert.equal((yield* Fiber.join(permission))?.behavior, "deny");
+      // The cancellation has to land before the turn's end finalizes the run.
+      const beforeTerminal = harness.events.slice(
+        0,
+        harness.events.findIndex((event) => event.type === "turn.terminal"),
+      );
+      const statusOf = (type: "runtime_request.updated" | "node.updated" | "turn_item.updated") =>
+        beforeTerminal
+          .flatMap((event): Array<{ readonly type: string; readonly status: string }> =>
+            event.type === "runtime_request.updated" && event.runtimeRequest.id === pending.id
+              ? [{ type: event.type, status: event.runtimeRequest.status }]
+              : event.type === "node.updated" && event.node.id === pending.nodeId
+                ? [{ type: event.type, status: event.node.status }]
+                : event.type === "turn_item.updated" && event.turnItem.nodeId === pending.nodeId
+                  ? [{ type: event.type, status: event.turnItem.status }]
+                  : [],
+          )
+          .findLast((entry) => entry.type === type)?.status;
+      assert.equal(statusOf("runtime_request.updated"), "cancelled");
+      assert.equal(statusOf("node.updated"), "cancelled");
+      assert.equal(statusOf("turn_item.updated"), "cancelled");
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
         ),
       ),
     ),
   );
 
-  it.effect("keeps a newer wake's output when a stale continuation request is cleared", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const SECOND_TASK_ID = "b2ndwake";
-        const SECOND_TOOL_USE_ID = "toolu_second_wake";
-        const harness = yield* makeWakeHarness;
-        const now = yield* DateTime.now;
-
-        yield* harness.runtime.startTurn(
-          makeClaudeTestTurnInput({
-            threadId: harness.threadId,
-            providerThread: harness.providerThread,
-            now,
-            attemptId: RunAttemptId.make("attempt-claude-wake-stale-clear-1"),
-            text: "Run two builds in the background.",
-            attachments: [],
-          }),
+  it.effect("releases output held for a prompt echo when the stream ends", () =>
+    Effect.gen(function* () {
+      const harness = yield* makeWakeHarnessWithOptions({
+        close: (sdkMessages) => Queue.shutdown(sdkMessages),
+      });
+      const now = yield* DateTime.now;
+      const firstAttempt = RunAttemptId.make("attempt-claude-echo-1");
+      const secondAttempt = RunAttemptId.make("attempt-claude-echo-2");
+      const stamp = (frame: SDKMessage, promptIndex: number) =>
+        claudeSdkFrame({
+          ...frame,
+          user_message_uuid: harness.promptUuid(promptIndex),
+        });
+      const assistantTexts = () =>
+        harness.events.flatMap((event) =>
+          event.type === "message.updated" && event.message.role === "assistant"
+            ? [event.message.text]
+            : [],
         );
-        yield* Queue.offer(harness.sdkMessages, wakeTaskStarted);
-        yield* Queue.offer(
-          harness.sdkMessages,
-          claudeSdkFrame({
-            ...wakeTaskStarted,
-            task_id: SECOND_TASK_ID,
-            tool_use_id: SECOND_TOOL_USE_ID,
-            description: "Second sleep",
-            uuid: "00000000-0000-4000-8000-000000000131",
-          }),
-        );
-        yield* Queue.offer(harness.sdkMessages, turnOneResult);
-        yield* harness.awaitTerminal(1);
 
-        yield* harness.offerAndWait(wakeNotification);
-        yield* harness.offerAndWait(wakeTurnInit);
-        assert.lengthOf(harness.continuationRequests, 1);
-        yield* harness.runtime.startTurn(
-          makeClaudeTestTurnInput({
-            threadId: harness.threadId,
-            providerThread: harness.providerThread,
-            now,
-            attemptId: RunAttemptId.make("attempt-claude-wake-stale-clear-2"),
-            text: "Background task completed.",
-            attachments: [],
-            providerTurnOrdinal: 2,
-            messageCreatedBy: "agent",
-            messageCreationSource: "provider",
-          }),
-        );
-        yield* harness.offerAndWait(wakeAssistant);
-        yield* harness.offerAndWait(wakeResult);
-        yield* harness.awaitTerminal(2);
+      yield* harness.runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now,
+          attemptId: firstAttempt,
+          text: "First.",
+          attachments: [],
+        }),
+      );
+      yield* Queue.offer(
+        harness.sdkMessages,
+        stamp(
+          makeAssistantTextFrame({ uuid: "00000000-0000-4000-8000-000000000701", text: "One." }),
+          0,
+        ),
+      );
+      yield* Queue.offer(
+        harness.sdkMessages,
+        stamp(makeResultFrame({ uuid: "00000000-0000-4000-8000-000000000702", result: "One." }), 0),
+      );
+      yield* harness.awaitTerminal(1);
 
-        yield* harness.offerAndWait(
-          claudeSdkFrame({
-            ...wakeNotification,
-            task_id: SECOND_TASK_ID,
-            tool_use_id: SECOND_TOOL_USE_ID,
-            output_file: `/tmp/claude-replay/tasks/${SECOND_TASK_ID}.output`,
-            uuid: "00000000-0000-4000-8000-000000000133",
-          }),
-        );
-        yield* harness.offerAndWait(
-          claudeSdkFrame({ ...wakeTurnInit, uuid: "00000000-0000-4000-8000-000000000134" }),
-        );
-        assert.lengthOf(harness.continuationRequests, 2);
+      yield* harness.runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now,
+          attemptId: secondAttempt,
+          text: "Second.",
+          attachments: [],
+          providerTurnOrdinal: 2,
+        }),
+      );
+      yield* harness.offerAndWait(
+        makeAssistantTextFrame({ uuid: "00000000-0000-4000-8000-000000000703", text: "Two." }),
+      );
+      assert.deepEqual(assistantTexts(), ["One."]);
 
-        yield* harness.continuationRequests[0]!.onRunEndedWithoutStarting!();
-        yield* harness.offerAndWait(
-          makeAssistantTextFrame({
-            uuid: "00000000-0000-4000-8000-000000000135",
-            text: "Second build done.",
-          }),
-        );
-        yield* harness.offerAndWait(
-          makeResultFrame({
-            uuid: "00000000-0000-4000-8000-000000000136",
-            result: "Second build done.",
-            origin: { kind: "task-notification" },
-          }),
-        );
-        assert.lengthOf(harness.continuationRequests, 2);
-        yield* harness.runtime.startTurn(
-          makeClaudeTestTurnInput({
-            threadId: harness.threadId,
-            providerThread: harness.providerThread,
-            now,
-            attemptId: RunAttemptId.make("attempt-claude-wake-stale-clear-3"),
-            text: "Background task completed.",
-            attachments: [],
-            providerTurnOrdinal: 3,
-            messageCreatedBy: "agent",
-            messageCreationSource: "provider",
-          }),
-        );
-        yield* harness.awaitTerminal(3);
-        assert.isTrue(
-          harness.events.some(
-            (event) =>
-              event.type === "turn_item.updated" &&
-              event.turnItem.type === "assistant_message" &&
-              event.turnItem.text === "Second build done.",
-          ),
-          "clearing the first wake's request must not discard the second wake's output",
-        );
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
-          ),
+      yield* Queue.shutdown(harness.sdkMessages);
+      yield* harness.awaitTerminal(2);
+      assert.deepEqual(assistantTexts(), ["One.", "Two."]);
+      assert.equal(harness.terminalEvents()[1]?.status, "failed");
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
         ),
       ),
     ),
   );
 
-  it.effect("offers the next wake when a cancelled wake's release arrives after it opened", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const SECOND_TASK_ID = "b2ndwake";
-        const SECOND_TOOL_USE_ID = "toolu_second_wake";
-        const harness = yield* makeWakeHarness;
-        const now = yield* DateTime.now;
-
-        yield* harness.runtime.startTurn(
-          makeClaudeTestTurnInput({
-            threadId: harness.threadId,
-            providerThread: harness.providerThread,
-            now,
-            attemptId: RunAttemptId.make("attempt-claude-wake-late-release"),
-            text: "Run two builds in the background.",
-            attachments: [],
-          }),
-        );
-        yield* harness.offerAndWait(wakeTaskStarted);
-        yield* harness.offerAndWait(
-          claudeSdkFrame({
-            ...wakeTaskStarted,
-            task_id: SECOND_TASK_ID,
-            tool_use_id: SECOND_TOOL_USE_ID,
-            uuid: "00000000-0000-4000-8000-000000000141",
-          }),
-        );
-        yield* harness.offerAndWait(turnOneResult);
-        yield* harness.awaitTerminal(1);
-
-        yield* harness.offerAndWait(wakeNotification);
-        yield* harness.offerAndWait(wakeTurnInit);
-        yield* harness.offerAndWait(wakeAssistant);
-        yield* harness.offerAndWait(wakeResult);
-        yield* harness.offerAndWait(
-          claudeSdkFrame({
-            ...wakeNotification,
-            task_id: SECOND_TASK_ID,
-            tool_use_id: SECOND_TOOL_USE_ID,
-            uuid: "00000000-0000-4000-8000-000000000142",
-          }),
-        );
-        yield* harness.offerAndWait(
-          claudeSdkFrame({ ...wakeTurnInit, uuid: "00000000-0000-4000-8000-000000000143" }),
-        );
-        assert.lengthOf(harness.continuationRequests, 1);
+  it.effect("fails a prompt Claude completes without starting a turn for it", () =>
+    Effect.gen(function* () {
+      // Claude answers previously recorded prompt uuids with only a completed lifecycle frame.
+      const harness = yield* makeWakeHarness;
+      const now = yield* DateTime.now;
+      yield* harness.runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now,
+          attemptId: RunAttemptId.make("attempt-claude-duplicate-prompt"),
+          text: "Bump this PR to the latest main.",
+          attachments: [],
+        }),
+      );
+      yield* Queue.offer(
+        harness.sdkMessages,
+        claudeSdkFrame({
+          type: "command_lifecycle",
+          command_uuid: harness.promptUuid(0),
+          state: "completed",
+          uuid: "00000000-0000-4000-8000-000000000790",
+          session_id: WAKE_NATIVE_SESSION,
+        }),
+      );
+      yield* harness.awaitTerminal(1);
+      const [terminal] = harness.terminalEvents();
+      assert.equal(terminal?.status, "failed");
+      if (terminal?.status !== "failed") return;
+      assert.equal(terminal.threadDisposition, "reusable");
+      assert.include(terminal.failure.message, "never started a turn");
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
+        ),
+      ),
+    ),
+  );
 
-        yield* harness.continuationRequests[0]!.onRunEndedWithoutStarting!();
-        yield* harness.offerAndWait(
-          claudeSdkFrame({ ...wakeAssistant, uuid: "00000000-0000-4000-8000-000000000144" }),
-        );
-        yield* harness.offerAndWait(
-          makeResultFrame({ uuid: "00000000-0000-4000-8000-000000000145", result: "Done." }),
-        );
-        assert.lengthOf(
-          harness.continuationRequests,
-          2,
-          "the wake that opened before the cancelled wake's release must get its own continuation",
-        );
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
+  // regression: #17531 a mod that holds a tool behind a focused pane must fail the turn, not hang it
+  it.effect.each([
+    { case: "fails a turn whose mod requests focus for a pane T3 cannot show", focus: true },
+    { case: "keeps a turn running beside a passive mod pane", focus: false },
+  ] as const)("$case", ({ focus }) =>
+    Effect.gen(function* () {
+      const closed = yield* Deferred.make<void>();
+      const harness = yield* makeWakeHarnessWithOptions({
+        close: () => Deferred.succeed(closed, undefined),
+      });
+      const now = yield* DateTime.now;
+      yield* harness.runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now,
+          attemptId: RunAttemptId.make("attempt-claude-mod-pane-focus"),
+          text: "Run rm -r build",
+          attachments: [],
+        }),
+      );
+      // Captured from Claude 2.1.303 with the blast-radius mod holding a Bash
+      // call: the mod waits for keyboard input in its pane and nothing else
+      // arrives until it gives up.
+      yield* Queue.offer(
+        harness.sdkMessages,
+        claudeSdkFrame({
+          type: "system",
+          subtype: "ui_panes",
+          panes: [{ id: "blast-radius", title: "Blast Radius", plugin: "blast-radius", rows: 10 }],
+          shown_id: "blast-radius",
+          focused_id: null,
+          focus_requested_id: focus ? "blast-radius" : null,
+          uuid: "00000000-0000-4000-8000-000000000795",
+          session_id: WAKE_NATIVE_SESSION,
+        }),
+      );
+      yield* Queue.offer(
+        harness.sdkMessages,
+        claudeSdkFrame({
+          type: "system",
+          subtype: "ui_invalidate",
+          event: "ui.render",
+          uuid: "00000000-0000-4000-8000-000000000796",
+          session_id: WAKE_NATIVE_SESSION,
+        }),
+      );
+      // Frames are handled in order, so a later notice proves the pane frame
+      // was handled without the turn ending.
+      yield* Queue.offer(
+        harness.sdkMessages,
+        claudeSdkFrame({
+          type: "system",
+          subtype: "informational",
+          content: "Processing barrier.",
+          level: "warning",
+          uuid: "00000000-0000-4000-8000-000000000797",
+          session_id: WAKE_NATIVE_SESSION,
+        }),
+      );
+      yield* harness.until(
+        () =>
+          harness.terminalEvents().length > 0 ||
+          harness.events.some(
+            (event) =>
+              event.type === "turn_item.updated" && event.turnItem.type === "system_notice",
           ),
+      );
+      const [terminal] = harness.terminalEvents();
+      if (!focus) {
+        assert.equal(terminal, undefined);
+        return;
+      }
+      assert.equal(terminal?.status, "failed");
+      if (terminal?.status !== "failed") return;
+      assert.include(terminal.failure.message, "blast-radius");
+      // The held tool call is abandoned by closing the query, never answered.
+      yield* Deferred.await(closed);
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
         ),
       ),
     ),
   );
 
-  it.effect("does not offer a wake again when it is cancelled before its first root frame", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const harness = yield* makeWakeHarness;
-        const now = yield* DateTime.now;
-
-        yield* harness.runtime.startTurn(
-          makeClaudeTestTurnInput({
-            threadId: harness.threadId,
-            providerThread: harness.providerThread,
-            now,
-            attemptId: RunAttemptId.make("attempt-claude-wake-early-cancel"),
-            text: "Start an agent in the background.",
-            attachments: [],
-          }),
-        );
-        yield* harness.offerAndWait(
-          claudeSdkFrame({ ...wakeTaskStarted, task_type: "local_agent" }),
-        );
-        yield* harness.offerAndWait(turnOneResult);
-        yield* harness.awaitTerminal(1);
-
-        yield* harness.offerAndWait(wakeNotification);
-        assert.lengthOf(harness.continuationRequests, 1);
-        yield* harness.continuationRequests[0]!.onRunEndedWithoutStarting!();
-        yield* harness.offerAndWait(wakeTurnInit);
-        yield* harness.offerAndWait(wakeAssistant);
-        yield* harness.offerAndWait(wakeResult);
-        assert.lengthOf(
-          harness.continuationRequests,
-          1,
-          "the cancelled wake must not be offered again",
-        );
-
-        yield* harness.offerAndWait(
-          claudeSdkFrame({ ...wakeTurnInit, uuid: "00000000-0000-4000-8000-000000000146" }),
-        );
-        assert.lengthOf(harness.continuationRequests, 2, "the next wake must be offered");
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
+  // regression: #17531 a follow-up sent while the failed mod turn's process closes gets a new process
+  it.effect("runs a follow-up in a fresh query while the mod-blocked query is closing", () =>
+    Effect.gen(function* () {
+      const releaseClose = yield* Deferred.make<void>();
+      const replacementClosedOld = yield* Deferred.make<void>();
+      let oldCloses = 0;
+      const harness = yield* makeWakeHarnessWithOptions({
+        // The held CLI never answers an interrupt; closure must not need one.
+        interrupt: Effect.never,
+        close: (sdkMessages) =>
+          Effect.suspend(() =>
+            ++oldCloses === 2 ? Deferred.succeed(replacementClosedOld, undefined) : Effect.void,
+          ).pipe(
+            Effect.andThen(Deferred.await(releaseClose)),
+            Effect.andThen(Queue.shutdown(sdkMessages)),
           ),
+        freshQueueOnReopen: true,
+      });
+      // Added after the harness so it runs first: a failed assertion must not
+      // leave teardown waiting on the held close.
+      yield* Effect.addFinalizer(() => Deferred.succeed(releaseClose, undefined));
+      const now = yield* DateTime.now;
+      const turnInput = makeClaudeTestTurnInput({
+        threadId: harness.threadId,
+        providerThread: harness.providerThread,
+        now,
+        attemptId: RunAttemptId.make("attempt-claude-mod-pane-blocked"),
+        text: "Run rm -r build",
+        attachments: [],
+      });
+      yield* harness.runtime.startTurn(turnInput);
+      yield* Queue.offer(
+        harness.sdkMessages,
+        claudeSdkFrame({
+          type: "system",
+          subtype: "ui_panes",
+          panes: [{ id: "blast-radius", title: "Blast Radius", plugin: "blast-radius", rows: 10 }],
+          shown_id: "blast-radius",
+          focused_id: null,
+          focus_requested_id: "blast-radius",
+          uuid: "00000000-0000-4000-8000-000000000798",
+          session_id: WAKE_NATIVE_SESSION,
+        }),
+      );
+      assert.equal((yield* Queue.take(harness.terminalReceipts)).status, "failed");
+
+      const followUp = yield* harness.runtime
+        .startTurn({
+          ...turnInput,
+          attemptId: RunAttemptId.make("attempt-claude-after-mod-pane"),
+          providerTurnOrdinal: 2,
+        })
+        .pipe(Effect.forkScoped);
+      // Reusing the closing process would offer the prompt to it instead.
+      yield* Effect.raceFirst(
+        Deferred.await(replacementClosedOld),
+        harness.until(() => harness.offeredMessages.length >= 2),
+      );
+      assert.isTrue(yield* Deferred.isDone(replacementClosedOld));
+      yield* Deferred.succeed(releaseClose, undefined);
+      yield* Fiber.join(followUp);
+      assert.equal(harness.processQueues.length, 2);
+      yield* harness.offerAndWait(
+        makeResultFrame({ uuid: "after-mod-pane-result", result: "Done." }),
+      );
+      assert.equal((yield* Queue.take(harness.terminalReceipts)).status, "completed");
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
         ),
       ),
     ),
   );
 
-  it.effect("offers a later task's wake when a cancelled wake never opens", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const SECOND_TASK_ID = "b2ndwake";
-        const SECOND_TOOL_USE_ID = "toolu_second_wake";
-        const harness = yield* makeWakeHarness;
-        const now = yield* DateTime.now;
-
-        yield* harness.runtime.startTurn(
-          makeClaudeTestTurnInput({
-            threadId: harness.threadId,
-            providerThread: harness.providerThread,
-            now,
-            attemptId: RunAttemptId.make("attempt-claude-wake-never-opens"),
-            text: "Start an agent and a build in the background.",
-            attachments: [],
-          }),
-        );
-        yield* harness.offerAndWait(
-          claudeSdkFrame({ ...wakeTaskStarted, task_type: "local_agent" }),
-        );
-        yield* harness.offerAndWait(
-          claudeSdkFrame({
-            ...wakeTaskStarted,
-            task_id: SECOND_TASK_ID,
-            tool_use_id: SECOND_TOOL_USE_ID,
-            uuid: "00000000-0000-4000-8000-000000000151",
-          }),
-        );
-        yield* harness.offerAndWait(turnOneResult);
-        yield* harness.awaitTerminal(1);
+  // regression: #16897 a prompt whose uuid the session already holds must not hang or end early
+  it.effect("keeps a started prompt running until its result", () =>
+    Effect.gen(function* () {
+      const harness = yield* makeWakeHarness;
+      const now = yield* DateTime.now;
+      yield* harness.runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now,
+          attemptId: RunAttemptId.make("attempt-claude-started-prompt"),
+          text: "Bump this PR to the latest main.",
+          attachments: [],
+        }),
+      );
+      const lifecycle = (state: string, uuid: string) =>
+        claudeSdkFrame({
+          type: "command_lifecycle",
+          command_uuid: harness.promptUuid(0),
+          state,
+          uuid,
+          session_id: WAKE_NATIVE_SESSION,
+        });
+      yield* Queue.offer(
+        harness.sdkMessages,
+        lifecycle("queued", "00000000-0000-4000-8000-000000000791"),
+      );
+      yield* Queue.offer(
+        harness.sdkMessages,
+        lifecycle("started", "00000000-0000-4000-8000-000000000792"),
+      );
+      // The CLI can report the prompt completed before its turn's result.
+      yield* Queue.offer(
+        harness.sdkMessages,
+        lifecycle("completed", "00000000-0000-4000-8000-000000000793"),
+      );
+      yield* Queue.offer(
+        harness.sdkMessages,
+        claudeSdkFrame({
+          ...makeResultFrame({ uuid: "00000000-0000-4000-8000-000000000794", result: "Done." }),
+          user_message_uuid: harness.promptUuid(0),
+        }),
+      );
+      yield* harness.awaitTerminal(1);
+      assert.equal(harness.terminalEvents()[0]?.status, "completed");
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
+        ),
+      ),
+    ),
+  );
 
-        // Claude never opens a wake for the agent's notification.
-        yield* harness.offerAndWait(wakeNotification);
-        assert.lengthOf(harness.continuationRequests, 1);
-        yield* harness.continuationRequests[0]!.onRunEndedWithoutStarting!();
+  it.effect("buffers wake output and requests a single continuation run", () =>
+    Effect.gen(function* () {
+      const harness = yield* makeWakeHarness;
+      const now = yield* DateTime.now;
 
-        yield* harness.offerAndWait(
-          claudeSdkFrame({
-            ...wakeNotification,
-            task_id: SECOND_TASK_ID,
-            tool_use_id: SECOND_TOOL_USE_ID,
-            output_file: `/tmp/claude-replay/tasks/${SECOND_TASK_ID}.output`,
-            uuid: "00000000-0000-4000-8000-000000000152",
-          }),
-        );
-        yield* harness.offerAndWait(
-          claudeSdkFrame({ ...wakeTurnInit, uuid: "00000000-0000-4000-8000-000000000153" }),
-        );
-        yield* harness.offerAndWait(
-          makeAssistantTextFrame({ uuid: "00000000-0000-4000-8000-000000000154", text: "Built." }),
-        );
-        yield* harness.offerAndWait(
-          makeResultFrame({ uuid: "00000000-0000-4000-8000-000000000155", result: "Built." }),
-        );
-        assert.lengthOf(
-          harness.continuationRequests,
-          2,
-          "the build's wake must get its own continuation",
-        );
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
-          ),
+      yield* harness.runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now,
+          attemptId: RunAttemptId.make("attempt-claude-wake-1"),
+          text: "Run the build in the background.",
+          attachments: [],
+        }),
+      );
+      yield* Queue.offer(harness.sdkMessages, wakeTaskStarted);
+      yield* Queue.offer(harness.sdkMessages, turnOneResult);
+      yield* harness.awaitTerminal(1);
+      assert.equal(harness.terminalEvents()[0]?.status, "completed");
+      assert.isTrue(yield* harness.hasPendingBackgroundWork);
+      assert.lengthOf(harness.continuationRequests, 0);
+
+      yield* harness.offerAndWait(wakeNotification);
+      assert.lengthOf(harness.continuationRequests, 0);
+      assert.isFalse(yield* harness.hasPendingBackgroundWork);
+
+      yield* Queue.offer(harness.sdkMessages, wakeAssistant);
+      yield* harness.awaitContinuation(1);
+      assert.equal(harness.continuationRequests[0]?.threadId, harness.threadId);
+      assert.equal(harness.continuationRequests[0]?.providerThreadId, harness.providerThread.id);
+      assert.equal(harness.continuationRequests[0]?.driver, ClaudeAdapterV2.CLAUDE_PROVIDER);
+      assert.equal(harness.continuationRequests[0]?.detail, WAKE_SUMMARY);
+
+      yield* harness.offerAndWait(wakeResult);
+      assert.lengthOf(harness.continuationRequests, 1);
+      assert.lengthOf(harness.terminalEvents(), 1);
+      assert.isTrue(yield* harness.hasPendingBackgroundWork);
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
         ),
       ),
     ),
   );
 
-  it.effect.each([
-    { ending: "notification", cancelled: "after its result" },
-    { ending: "tool result", cancelled: "after its result" },
-    { ending: "tool result", cancelled: "while the subagent ran" },
-  ] as const)(
-    "does not replay a subagent that finished inside a cancelled wake (ended by $ending, cancelled $cancelled)",
-    ({ ending, cancelled }) =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const SECOND_TASK_ID = "b2ndwake";
-          const SECOND_TOOL_USE_ID = "toolu_second_wake";
-          const SUBAGENT_TASK_ID = "fg-agent";
-          const SUBAGENT_TOOL_USE_ID = "toolu-fg-agent";
-          const harness = yield* makeWakeHarness;
-          const now = yield* DateTime.now;
+  it.effect("starts the wake run when Claude opens the wake turn, before its output", () =>
+    Effect.gen(function* () {
+      const harness = yield* makeWakeHarness;
+      const now = yield* DateTime.now;
 
-          yield* harness.runtime.startTurn(
-            makeClaudeTestTurnInput({
-              threadId: harness.threadId,
-              providerThread: harness.providerThread,
-              now,
-              attemptId: RunAttemptId.make("attempt-claude-wake-finished-subagent"),
-              text: "Run two builds in the background.",
-              attachments: [],
-            }),
-          );
-          yield* harness.offerAndWait(wakeTaskStarted);
-          yield* harness.offerAndWait(
-            claudeSdkFrame({
-              ...wakeTaskStarted,
-              task_id: SECOND_TASK_ID,
-              tool_use_id: SECOND_TOOL_USE_ID,
-              uuid: "00000000-0000-4000-8000-000000000161",
-            }),
-          );
-          yield* harness.offerAndWait(turnOneResult);
-          yield* harness.awaitTerminal(1);
+      yield* harness.runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now,
+          attemptId: RunAttemptId.make("attempt-claude-wake-init-1"),
+          text: "Run the build in the background.",
+          attachments: [],
+        }),
+      );
+      yield* Queue.offer(harness.sdkMessages, wakeTaskStarted);
+      yield* Queue.offer(harness.sdkMessages, turnOneResult);
+      yield* harness.awaitTerminal(1);
 
-          // The first wake runs a subagent to completion before its result.
-          yield* harness.offerAndWait(wakeNotification);
-          yield* harness.offerAndWait(wakeTurnInit);
-          assert.lengthOf(harness.continuationRequests, 1);
-          yield* harness.offerAndWait(wakeAssistant);
-          yield* harness.offerAndWait(
-            claudeSdkFrame({
-              type: "system",
-              subtype: "task_started",
-              task_id: SUBAGENT_TASK_ID,
-              tool_use_id: SUBAGENT_TOOL_USE_ID,
-              description: "Inspect build output",
-              subagent_type: "general-purpose",
-              task_type: "local_agent",
-              prompt: "Inspect the build output.",
-              uuid: "00000000-0000-4000-8000-000000000162",
-              session_id: WAKE_NATIVE_SESSION,
-            }),
-          );
-          yield* harness.offerAndWait(
-            claudeSdkFrame({
-              ...makeAssistantTextFrame({
-                uuid: "00000000-0000-4000-8000-000000000168",
-                text: "Reading the build log.",
-              }),
-              parent_tool_use_id: SUBAGENT_TOOL_USE_ID,
-            }),
-          );
-          if (cancelled === "while the subagent ran") {
-            yield* harness.continuationRequests[0]!.onRunEndedWithoutStarting!();
-          }
-          yield* harness.offerAndWait(
-            ending === "notification"
-              ? claudeSdkFrame({
-                  type: "system",
-                  subtype: "task_notification",
-                  task_id: SUBAGENT_TASK_ID,
-                  tool_use_id: SUBAGENT_TOOL_USE_ID,
-                  status: "completed",
-                  output_file: "/tmp/fg-agent.output",
-                  summary: "Inspected",
-                  uuid: "00000000-0000-4000-8000-000000000163",
-                  session_id: WAKE_NATIVE_SESSION,
-                })
-              : claudeSdkFrame({
-                  type: "user",
-                  uuid: "00000000-0000-4000-8000-000000000163",
-                  session_id: WAKE_NATIVE_SESSION,
-                  parent_tool_use_id: null,
-                  message: {
-                    role: "user",
-                    content: [
-                      {
-                        type: "tool_result",
-                        tool_use_id: SUBAGENT_TOOL_USE_ID,
-                        content: "Inspected",
-                      },
-                    ],
-                  },
-                }),
-          );
-          yield* harness.offerAndWait(wakeResult);
-          if (cancelled === "after its result") {
-            yield* harness.continuationRequests[0]!.onRunEndedWithoutStarting!();
-          }
+      yield* harness.offerAndWait(wakeNotification);
+      assert.lengthOf(harness.continuationRequests, 0);
+      yield* harness.offerAndWait(wakeTurnInit);
+      assert.lengthOf(harness.continuationRequests, 1);
+      assert.equal(harness.continuationRequests[0]?.detail, WAKE_SUMMARY);
 
-          yield* harness.offerAndWait(
-            claudeSdkFrame({
-              ...wakeNotification,
-              task_id: SECOND_TASK_ID,
-              tool_use_id: SECOND_TOOL_USE_ID,
-              output_file: `/tmp/claude-replay/tasks/${SECOND_TASK_ID}.output`,
-              uuid: "00000000-0000-4000-8000-000000000164",
-            }),
-          );
-          yield* harness.offerAndWait(
-            claudeSdkFrame({ ...wakeTurnInit, uuid: "00000000-0000-4000-8000-000000000165" }),
-          );
-          assert.lengthOf(harness.continuationRequests, 2);
-          yield* harness.runtime.startTurn(
-            makeClaudeTestTurnInput({
-              threadId: harness.threadId,
-              providerThread: harness.providerThread,
-              now,
-              attemptId: RunAttemptId.make("attempt-claude-wake-finished-subagent-2"),
-              text: "Background task completed.",
-              attachments: [],
-              providerTurnOrdinal: 2,
-              messageCreatedBy: "agent",
-              messageCreationSource: "provider",
-            }),
-          );
-          yield* harness.offerAndWait(
-            makeAssistantTextFrame({
-              uuid: "00000000-0000-4000-8000-000000000166",
-              text: "Second build done.",
-            }),
-          );
-          yield* harness.offerAndWait(
-            makeResultFrame({
-              uuid: "00000000-0000-4000-8000-000000000167",
-              result: "Second build done.",
-              origin: { kind: "task-notification" },
-            }),
-          );
-          yield* harness.awaitTerminal(2);
-
-          const subagentStatuses = harness.events.flatMap((event) =>
-            event.type === "subagent.updated" &&
-            event.subagent.nativeTaskRef?.nativeId === SUBAGENT_TASK_ID
-              ? [event.subagent.status]
-              : [],
-          );
-          assert.notInclude(
-            subagentStatuses,
-            "running",
-            "a subagent that finished in the cancelled wake must not be replayed as running",
-          );
-          assert.isFalse(yield* harness.hasPendingBackgroundWork);
-        }).pipe(
-          Effect.provide(
-            Layer.mergeAll(
-              IdAllocator.layer,
-              McpProviderSessions.layer,
-              NodeServices.layer,
-              NodeCrypto.layer,
-            ),
-          ),
+      yield* harness.runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now,
+          attemptId: RunAttemptId.make("attempt-claude-wake-init-2"),
+          text: "Background task completed.",
+          attachments: [],
+          providerTurnOrdinal: 2,
+          messageCreatedBy: "agent",
+          messageCreationSource: "provider",
+        }),
+      );
+      assert.lengthOf(harness.terminalEvents(), 1);
+
+      yield* harness.offerAndWait(wakeAssistant);
+      yield* harness.offerAndWait(wakeResult);
+      yield* harness.awaitTerminal(2);
+      assert.equal(harness.terminalEvents()[1]?.status, "completed");
+      assert.lengthOf(harness.continuationRequests, 1);
+      assert.isTrue(
+        harness.events.some(
+          (event) => event.type === "message.updated" && event.message.text === WAKE_RESULT_TEXT,
+        ),
+      );
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
         ),
       ),
+    ),
   );
 
-  it.effect("offers a cancelled wake once when an empty lifecycle result precedes its turn", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const SECOND_TASK_ID = "b2ndwake";
-        const SECOND_TOOL_USE_ID = "toolu_second_wake";
-        const harness = yield* makeWakeHarness;
-        const now = yield* DateTime.now;
+  it.effect("offers a later wake after an earlier wake's continuation dispatch failed", () =>
+    Effect.gen(function* () {
+      const SECOND_TASK_ID = "b2ndwake";
+      const SECOND_TOOL_USE_ID = "toolu_second_wake";
+      const SECOND_SUMMARY = 'Background command "Second sleep" completed (exit code 0)';
+      const harness = yield* makeWakeHarness;
+      const now = yield* DateTime.now;
 
-        yield* harness.runtime.startTurn(
-          makeClaudeTestTurnInput({
-            threadId: harness.threadId,
-            providerThread: harness.providerThread,
-            now,
-            attemptId: RunAttemptId.make("attempt-claude-wake-empty-lifecycle"),
-            text: "Run two builds in the background.",
-            attachments: [],
-          }),
-        );
-        yield* harness.offerAndWait(wakeTaskStarted);
-        yield* harness.offerAndWait(
-          claudeSdkFrame({
-            ...wakeTaskStarted,
-            task_id: SECOND_TASK_ID,
-            tool_use_id: SECOND_TOOL_USE_ID,
-            uuid: "00000000-0000-4000-8000-000000000171",
-          }),
-        );
-        yield* harness.offerAndWait(turnOneResult);
-        yield* harness.awaitTerminal(1);
+      yield* harness.runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now,
+          attemptId: RunAttemptId.make("attempt-claude-wake-dispatch-failed-1"),
+          text: "Run two builds in the background.",
+          attachments: [],
+        }),
+      );
+      yield* Queue.offer(harness.sdkMessages, wakeTaskStarted);
+      yield* Queue.offer(
+        harness.sdkMessages,
+        claudeSdkFrame({
+          ...wakeTaskStarted,
+          task_id: SECOND_TASK_ID,
+          tool_use_id: SECOND_TOOL_USE_ID,
+          description: "Second sleep",
+          uuid: "00000000-0000-4000-8000-000000000121",
+        }),
+      );
+      yield* Queue.offer(harness.sdkMessages, turnOneResult);
+      yield* harness.awaitTerminal(1);
 
-        yield* harness.offerAndWait(wakeNotification);
-        yield* harness.offerAndWait(wakeTurnInit);
-        assert.lengthOf(harness.continuationRequests, 1);
-        yield* harness.offerAndWait(
-          makeResultFrame({
-            uuid: "00000000-0000-4000-8000-000000000172",
-            result: "",
-            numTurns: 0,
-            origin: { kind: "task-notification" },
-            terminalReason: null,
-          }),
-        );
-        yield* harness.continuationRequests[0]!.onRunEndedWithoutStarting!();
-        yield* harness.offerAndWait(
-          claudeSdkFrame({ ...wakeTurnInit, uuid: "00000000-0000-4000-8000-000000000173" }),
-        );
-        yield* harness.offerAndWait(wakeAssistant);
-        yield* harness.offerAndWait(wakeResult);
-        assert.lengthOf(
-          harness.continuationRequests,
-          1,
-          "the cancelled wake must not be offered again",
-        );
+      yield* harness.offerAndWait(wakeNotification);
+      yield* harness.offerAndWait(wakeTurnInit);
+      assert.lengthOf(harness.continuationRequests, 1);
+      yield* harness.offerAndWait(wakeAssistant);
+      yield* harness.offerAndWait(wakeResult);
+
+      // A failed dispatch never attaches the wake turn; clearIfCurrent is the only release.
+      const failed = harness.continuationRequests[0]!;
+      assert.isDefined(failed.clearIfCurrent);
+      yield* failed.clearIfCurrent!();
+      yield* harness.until(
+        () =>
+          !(
+            providerThreadRosterEvents(harness.events).at(-1)?.providerThread
+              .pendingBackgroundTasks ?? []
+          ).some((task) => task.taskId === WAKE_TASK_ID),
+      );
 
-        yield* harness.offerAndWait(
-          claudeSdkFrame({
-            ...wakeNotification,
-            task_id: SECOND_TASK_ID,
-            tool_use_id: SECOND_TOOL_USE_ID,
-            output_file: `/tmp/claude-replay/tasks/${SECOND_TASK_ID}.output`,
-            uuid: "00000000-0000-4000-8000-000000000174",
-          }),
-        );
-        yield* harness.offerAndWait(
-          claudeSdkFrame({ ...wakeTurnInit, uuid: "00000000-0000-4000-8000-000000000175" }),
-        );
-        assert.lengthOf(harness.continuationRequests, 2, "the next wake must be offered");
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
-          ),
+      yield* harness.offerAndWait(
+        claudeSdkFrame({
+          ...wakeNotification,
+          task_id: SECOND_TASK_ID,
+          tool_use_id: SECOND_TOOL_USE_ID,
+          output_file: `/tmp/claude-replay/tasks/${SECOND_TASK_ID}.output`,
+          summary: SECOND_SUMMARY,
+          uuid: "00000000-0000-4000-8000-000000000123",
+        }),
+      );
+      yield* harness.offerAndWait(
+        claudeSdkFrame({ ...wakeTurnInit, uuid: "00000000-0000-4000-8000-000000000124" }),
+      );
+      assert.lengthOf(harness.continuationRequests, 2);
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
         ),
       ),
     ),
   );
 
-  it.effect("does not offer a cancelled wake again for its trailing empty lifecycle result", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const harness = yield* makeWakeHarness;
-        const now = yield* DateTime.now;
+  it.effect("keeps a newer wake's output when a stale continuation request is cleared", () =>
+    Effect.gen(function* () {
+      const SECOND_TASK_ID = "b2ndwake";
+      const SECOND_TOOL_USE_ID = "toolu_second_wake";
+      const harness = yield* makeWakeHarness;
+      const now = yield* DateTime.now;
 
-        yield* harness.runtime.startTurn(
-          makeClaudeTestTurnInput({
-            threadId: harness.threadId,
-            providerThread: harness.providerThread,
-            now,
-            attemptId: RunAttemptId.make("attempt-claude-wake-trailing-lifecycle"),
-            text: "Run a build in the background.",
-            attachments: [],
-          }),
-        );
-        yield* harness.offerAndWait(wakeTaskStarted);
-        yield* harness.offerAndWait(turnOneResult);
-        yield* harness.awaitTerminal(1);
+      yield* harness.runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now,
+          attemptId: RunAttemptId.make("attempt-claude-wake-stale-clear-1"),
+          text: "Run two builds in the background.",
+          attachments: [],
+        }),
+      );
+      yield* Queue.offer(harness.sdkMessages, wakeTaskStarted);
+      yield* Queue.offer(
+        harness.sdkMessages,
+        claudeSdkFrame({
+          ...wakeTaskStarted,
+          task_id: SECOND_TASK_ID,
+          tool_use_id: SECOND_TOOL_USE_ID,
+          description: "Second sleep",
+          uuid: "00000000-0000-4000-8000-000000000131",
+        }),
+      );
+      yield* Queue.offer(harness.sdkMessages, turnOneResult);
+      yield* harness.awaitTerminal(1);
 
-        yield* harness.offerAndWait(wakeNotification);
-        yield* harness.offerAndWait(wakeTurnInit);
-        yield* harness.offerAndWait(wakeAssistant);
-        yield* harness.offerAndWait(wakeResult);
-        yield* harness.offerAndWait(
-          claudeSdkFrame({ ...wakeTurnInit, uuid: "00000000-0000-4000-8000-000000000176" }),
-        );
-        yield* harness.offerAndWait(
-          makeResultFrame({
-            uuid: "00000000-0000-4000-8000-000000000177",
-            result: "",
-            numTurns: 0,
-            origin: { kind: "task-notification" },
-            terminalReason: null,
-          }),
-        );
-        assert.lengthOf(harness.continuationRequests, 1);
-        yield* harness.continuationRequests[0]!.onRunEndedWithoutStarting!();
-        assert.lengthOf(
-          harness.continuationRequests,
-          1,
-          "a lifecycle result after the cancelled wake must not open another continuation",
-        );
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
-          ),
-        ),
-      ),
-    ),
-  );
+      yield* harness.offerAndWait(wakeNotification);
+      yield* harness.offerAndWait(wakeTurnInit);
+      assert.lengthOf(harness.continuationRequests, 1);
+      yield* harness.runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now,
+          attemptId: RunAttemptId.make("attempt-claude-wake-stale-clear-2"),
+          text: "Background task completed.",
+          attachments: [],
+          providerTurnOrdinal: 2,
+          messageCreatedBy: "agent",
+          messageCreationSource: "provider",
+        }),
+      );
+      yield* harness.offerAndWait(wakeAssistant);
+      yield* harness.offerAndWait(wakeResult);
+      yield* harness.awaitTerminal(2);
 
-  it.effect.each([
-    "before the cancelled wake's result",
-    "after the cancelled wake's result",
-  ] as const)(
-    "offers a subagent's wake that arrives behind a cancelled wake (notified %s)",
-    (notified) =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const SUBAGENT_TASK_ID = "bg-agent";
-          const SUBAGENT_TOOL_USE_ID = "toolu-bg-agent";
-          const harness = yield* makeWakeHarness;
-          const now = yield* DateTime.now;
+      yield* harness.offerAndWait(
+        claudeSdkFrame({
+          ...wakeNotification,
+          task_id: SECOND_TASK_ID,
+          tool_use_id: SECOND_TOOL_USE_ID,
+          output_file: `/tmp/claude-replay/tasks/${SECOND_TASK_ID}.output`,
+          uuid: "00000000-0000-4000-8000-000000000133",
+        }),
+      );
+      yield* harness.offerAndWait(
+        claudeSdkFrame({ ...wakeTurnInit, uuid: "00000000-0000-4000-8000-000000000134" }),
+      );
+      assert.lengthOf(harness.continuationRequests, 2);
 
-          yield* harness.runtime.startTurn(
-            makeClaudeTestTurnInput({
-              threadId: harness.threadId,
-              providerThread: harness.providerThread,
-              now,
-              attemptId: RunAttemptId.make("attempt-claude-wake-later-subagent"),
-              text: "Run a build and an agent in the background.",
-              attachments: [],
-            }),
-          );
-          yield* harness.offerAndWait(wakeTaskStarted);
-          yield* harness.offerAndWait(
-            claudeSdkFrame({
-              ...wakeTaskStarted,
-              task_id: SUBAGENT_TASK_ID,
-              tool_use_id: SUBAGENT_TOOL_USE_ID,
-              task_type: "local_agent",
-              uuid: "00000000-0000-4000-8000-000000000181",
-            }),
-          );
-          yield* harness.offerAndWait(turnOneResult);
-          yield* harness.awaitTerminal(1);
-
-          const subagentNotification = claudeSdkFrame({
-            ...wakeNotification,
-            task_id: SUBAGENT_TASK_ID,
-            tool_use_id: SUBAGENT_TOOL_USE_ID,
-            output_file: `/tmp/claude-replay/tasks/${SUBAGENT_TASK_ID}.output`,
-            summary: "Agent finished",
-            uuid: "00000000-0000-4000-8000-000000000182",
-          });
-          yield* harness.offerAndWait(wakeNotification);
-          yield* harness.offerAndWait(wakeTurnInit);
-          yield* harness.offerAndWait(wakeAssistant);
-          assert.lengthOf(harness.continuationRequests, 1);
-          if (notified === "before the cancelled wake's result") {
-            yield* harness.continuationRequests[0]!.onRunEndedWithoutStarting!();
-            yield* harness.offerAndWait(subagentNotification);
-            yield* harness.offerAndWait(wakeResult);
-          } else {
-            yield* harness.offerAndWait(wakeResult);
-            yield* harness.offerAndWait(subagentNotification);
-            yield* harness.continuationRequests[0]!.onRunEndedWithoutStarting!();
-          }
-          assert.lengthOf(
-            harness.continuationRequests,
-            2,
-            "the subagent's wake must get its own continuation",
-          );
-          assert.equal(harness.continuationRequests[1]?.detail, "Agent finished");
-        }).pipe(
-          Effect.provide(
-            Layer.mergeAll(
-              IdAllocator.layer,
-              McpProviderSessions.layer,
-              NodeServices.layer,
-              NodeCrypto.layer,
-            ),
-          ),
+      yield* harness.continuationRequests[0]!.onRunEndedWithoutStarting!();
+      yield* harness.offerAndWait(
+        makeAssistantTextFrame({
+          uuid: "00000000-0000-4000-8000-000000000135",
+          text: "Second build done.",
+        }),
+      );
+      yield* harness.offerAndWait(
+        makeResultFrame({
+          uuid: "00000000-0000-4000-8000-000000000136",
+          result: "Second build done.",
+          origin: { kind: "task-notification" },
+        }),
+      );
+      assert.lengthOf(harness.continuationRequests, 2);
+      yield* harness.runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now,
+          attemptId: RunAttemptId.make("attempt-claude-wake-stale-clear-3"),
+          text: "Background task completed.",
+          attachments: [],
+          providerTurnOrdinal: 3,
+          messageCreatedBy: "agent",
+          messageCreationSource: "provider",
+        }),
+      );
+      yield* harness.awaitTerminal(3);
+      assert.isTrue(
+        harness.events.some(
+          (event) =>
+            event.type === "turn_item.updated" &&
+            event.turnItem.type === "assistant_message" &&
+            event.turnItem.text === "Second build done.",
+        ),
+        "clearing the first wake's request must not discard the second wake's output",
+      );
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
         ),
       ),
+    ),
   );
 
-  it.effect.each(["none", "before", "after", "sibling"] as const)(
-    "keeps an exited background command on the roster until its wake run starts (empty level %s notification)",
-    (emptyLevel) =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const harness = yield* makeWakeHarness;
-          const now = yield* DateTime.now;
-          const secondTaskId = "second-owed-wake";
-          const taskIds = emptyLevel === "sibling" ? [WAKE_TASK_ID, secondTaskId] : [WAKE_TASK_ID];
-          const wakeAttemptId = RunAttemptId.make("attempt-claude-wake-roster-2");
-          const emptyRoster = claudeSdkFrame({
-            type: "system",
-            subtype: "background_tasks_changed",
-            tasks: [],
-            uuid: "00000000-0000-4000-8000-000000000204",
-            session_id: WAKE_NATIVE_SESSION,
-          });
+  it.effect("offers the next wake when a cancelled wake's release arrives after it opened", () =>
+    Effect.gen(function* () {
+      const SECOND_TASK_ID = "b2ndwake";
+      const SECOND_TOOL_USE_ID = "toolu_second_wake";
+      const harness = yield* makeWakeHarness;
+      const now = yield* DateTime.now;
 
-          yield* harness.runtime.startTurn(
-            makeClaudeTestTurnInput({
-              threadId: harness.threadId,
-              providerThread: harness.providerThread,
-              now,
-              attemptId: RunAttemptId.make("attempt-claude-wake-roster-1"),
-              text: "Run the build in the background.",
-              attachments: [],
-            }),
-          );
-          yield* harness.offerAndWait(wakeTaskStarted);
-          if (emptyLevel === "sibling")
-            yield* harness.offerAndWait(
-              claudeSdkFrame({
-                ...wakeTaskStarted,
-                task_id: secondTaskId,
-                tool_use_id: "toolu_second_owed_wake",
-                uuid: "00000000-0000-4000-8000-000000000205",
-              }),
-            );
-          const awaitBackgroundTasks = harness.runtime.awaitBackgroundTasks;
-          assert.isDefined(awaitBackgroundTasks);
-          yield* awaitBackgroundTasks!({
-            providerThread: harness.providerThread,
-            taskIds,
-            awaited: true,
-          });
-          yield* Queue.offer(harness.sdkMessages, turnOneResult);
-          yield* harness.awaitTerminal(1);
-          const afterFirstTurn = harness.events.length;
-          if (emptyLevel === "before" || emptyLevel === "sibling")
-            yield* harness.offerAndWait(emptyRoster);
-          yield* harness.offerAndWait(wakeNotification);
-          if (emptyLevel === "after") yield* harness.offerAndWait(emptyRoster);
-          // Query replacement reads the internal roster, which the exit already cleared.
-          assert.isFalse(yield* harness.hasPendingBackgroundWork);
-          yield* harness.offerAndWait(wakeTurnInit);
-          yield* harness.runtime.startTurn(
-            makeClaudeTestTurnInput({
-              threadId: harness.threadId,
-              providerThread: harness.providerThread,
-              now,
-              attemptId: wakeAttemptId,
-              text: "Background task completed.",
-              attachments: [],
-              providerTurnOrdinal: 2,
-              messageCreatedBy: "agent",
-              messageCreationSource: "provider",
-            }),
-          );
-          yield* harness.offerAndWait(wakeAssistant);
-          yield* harness.offerAndWait(wakeResult);
-          yield* harness.awaitTerminal(2);
+      yield* harness.runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now,
+          attemptId: RunAttemptId.make("attempt-claude-wake-late-release"),
+          text: "Run two builds in the background.",
+          attachments: [],
+        }),
+      );
+      yield* harness.offerAndWait(wakeTaskStarted);
+      yield* harness.offerAndWait(
+        claudeSdkFrame({
+          ...wakeTaskStarted,
+          task_id: SECOND_TASK_ID,
+          tool_use_id: SECOND_TOOL_USE_ID,
+          uuid: "00000000-0000-4000-8000-000000000141",
+        }),
+      );
+      yield* harness.offerAndWait(turnOneResult);
+      yield* harness.awaitTerminal(1);
 
-          const wakeStart = harness.events.findIndex(
-            (event) =>
-              event.type === "provider_turn.updated" &&
-              event.providerTurn.runAttemptId === wakeAttemptId,
-          );
-          assert.isAbove(wakeStart, -1);
-          const rosters = harness.events.flatMap((event, index) =>
-            event.type === "provider_thread.updated" &&
-            event.providerThread.id === harness.providerThread.id &&
-            index >= afterFirstTurn
-              ? [
-                  {
-                    beforeWake: index < wakeStart,
-                    pendingWork: event.pendingBackgroundWork === true,
-                    taskIds: (event.providerThread.pendingBackgroundTasks ?? []).map((task) => [
-                      task.taskId,
-                      task.awaited === true,
-                    ]),
-                  },
-                ]
-              : [],
-          );
-          assert.deepEqual(
-            rosters.filter((roster) => roster.beforeWake).map((roster) => roster.taskIds),
-            rosters
-              .filter((roster) => roster.beforeWake)
-              .map(() => taskIds.map((id) => [id, true])),
-          );
-          assert.isTrue(
-            rosters.filter((roster) => roster.beforeWake).every((roster) => roster.pendingWork),
-          );
-          assert.deepEqual(
-            rosters.at(-1)?.taskIds,
-            emptyLevel === "sibling" ? [[secondTaskId, true]] : [],
-          );
-          if (emptyLevel === "sibling") {
-            assert.isTrue(rosters.at(-1)?.pendingWork);
-            yield* harness.offerAndWait(
-              claudeSdkFrame({
-                ...wakeNotification,
-                task_id: secondTaskId,
-                tool_use_id: "toolu_second_owed_wake",
-                uuid: "00000000-0000-4000-8000-000000000206",
-              }),
-            );
-            yield* harness.offerAndWait(
-              claudeSdkFrame({ ...wakeTurnInit, uuid: "00000000-0000-4000-8000-000000000207" }),
-            );
-            yield* harness.runtime.startTurn(
-              makeClaudeTestTurnInput({
-                threadId: harness.threadId,
-                providerThread: harness.providerThread,
-                now,
-                attemptId: RunAttemptId.make("attempt-claude-owed-sibling-3"),
-                text: "Second command completed.",
-                attachments: [],
-                providerTurnOrdinal: 3,
-                messageCreatedBy: "agent",
-                messageCreationSource: "provider",
-              }),
-            );
-            yield* harness.offerAndWait(
-              makeAssistantTextFrame({
-                uuid: "00000000-0000-4000-8000-000000000208",
-                text: "Second command finished.",
-              }),
-            );
-            yield* harness.offerAndWait(
-              makeResultFrame({
-                uuid: "00000000-0000-4000-8000-000000000209",
-                result: "Second command finished.",
-                origin: { kind: "task-notification" },
-              }),
-            );
-            yield* harness.awaitTerminal(3);
-            assert.deepEqual(
-              providerThreadRosterEvents(harness.events).at(-1)?.providerThread
-                .pendingBackgroundTasks,
-              [],
-            );
-          }
-        }).pipe(
-          Effect.provide(
-            Layer.mergeAll(
-              IdAllocator.layer,
-              McpProviderSessions.layer,
-              NodeServices.layer,
-              NodeCrypto.layer,
-            ),
-          ),
+      yield* harness.offerAndWait(wakeNotification);
+      yield* harness.offerAndWait(wakeTurnInit);
+      yield* harness.offerAndWait(wakeAssistant);
+      yield* harness.offerAndWait(wakeResult);
+      yield* harness.offerAndWait(
+        claudeSdkFrame({
+          ...wakeNotification,
+          task_id: SECOND_TASK_ID,
+          tool_use_id: SECOND_TOOL_USE_ID,
+          uuid: "00000000-0000-4000-8000-000000000142",
+        }),
+      );
+      yield* harness.offerAndWait(
+        claudeSdkFrame({ ...wakeTurnInit, uuid: "00000000-0000-4000-8000-000000000143" }),
+      );
+      assert.lengthOf(harness.continuationRequests, 1);
+
+      yield* harness.continuationRequests[0]!.onRunEndedWithoutStarting!();
+      yield* harness.offerAndWait(
+        claudeSdkFrame({ ...wakeAssistant, uuid: "00000000-0000-4000-8000-000000000144" }),
+      );
+      yield* harness.offerAndWait(
+        makeResultFrame({ uuid: "00000000-0000-4000-8000-000000000145", result: "Done." }),
+      );
+      assert.lengthOf(
+        harness.continuationRequests,
+        2,
+        "the wake that opened before the cancelled wake's release must get its own continuation",
+      );
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
         ),
       ),
+    ),
   );
 
-  it.effect.each([true, false])(
-    "carries a rejected wake rate limit into the continuation failure (event=%s)",
-    (standaloneEvent) =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const harness = yield* makeWakeHarness;
-          const now = yield* DateTime.now;
-          const resetsAt = 1790298600;
-
-          yield* harness.runtime.startTurn(
-            makeClaudeTestTurnInput({
-              threadId: harness.threadId,
-              providerThread: harness.providerThread,
-              now,
-              attemptId: RunAttemptId.make("attempt-claude-wake-limit-1"),
-              text: "Run the build in the background.",
-              attachments: [],
-            }),
-          );
-          yield* Queue.offer(harness.sdkMessages, wakeTaskStarted);
-          yield* Queue.offer(harness.sdkMessages, turnOneResult);
-          yield* Queue.take(harness.terminalReceipts);
+  it.effect("does not offer a wake again when it is cancelled before its first root frame", () =>
+    Effect.gen(function* () {
+      const harness = yield* makeWakeHarness;
+      const now = yield* DateTime.now;
 
-          yield* Queue.offer(harness.sdkMessages, wakeNotification);
-          if (standaloneEvent) {
-            yield* harness.offerAndWait(
-              claudeSdkFrame({
-                type: "rate_limit_event",
-                rate_limit_info: {
-                  status: "rejected",
-                  rateLimitType: "five_hour",
-                  resetsAt,
-                  overageStatus: "rejected",
-                },
-                uuid: "00000000-0000-4000-8000-000000000630",
-                session_id: WAKE_NATIVE_SESSION,
-              }),
-            );
-          }
-          assert.lengthOf(harness.continuationRequests, 0);
-          yield* harness.offerAndWait(
-            makeAssistantErrorFrame({
-              uuid: "00000000-0000-4000-8000-000000000631",
-              error: "rate_limit",
-              apiErrorParams: {
-                rate_limit_info: {
-                  status: "rejected",
-                  rateLimitType: "five_hour",
-                  // A conflicting embedded time must not replace the event for this window.
-                  resetsAt: standaloneEvent ? resetsAt + 3_600 : resetsAt,
-                },
-              },
-            }),
-          );
-          assert.lengthOf(harness.continuationRequests, 1);
-          yield* harness.offerAndWait(
-            makeResultFrame({
-              uuid: "00000000-0000-4000-8000-000000000632",
-              result: "You've hit your session limit · resets 11:10am (Australia/Sydney)",
-              isError: true,
-              apiErrorStatus: 429,
-              terminalReason: "api_error",
-              origin: { kind: "task-notification" },
-            }),
-          );
-          assert.lengthOf(harness.continuationRequests, 1);
+      yield* harness.runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now,
+          attemptId: RunAttemptId.make("attempt-claude-wake-early-cancel"),
+          text: "Start an agent in the background.",
+          attachments: [],
+        }),
+      );
+      yield* harness.offerAndWait(claudeSdkFrame({ ...wakeTaskStarted, task_type: "local_agent" }));
+      yield* harness.offerAndWait(turnOneResult);
+      yield* harness.awaitTerminal(1);
 
-          // An empty session-task lifecycle result arriving before T3 opens the
-          // wake run must not replace the root's terminal usage-limit result.
-          yield* harness.offerAndWait(wakeTurnInit);
-          yield* harness.offerAndWait(
-            makeResultFrame({
-              uuid: "00000000-0000-4000-8000-000000000633",
-              result: "",
-              numTurns: 0,
-              origin: { kind: "task-notification" },
-              terminalReason: null,
-            }),
-          );
+      yield* harness.offerAndWait(wakeNotification);
+      assert.lengthOf(harness.continuationRequests, 1);
+      yield* harness.continuationRequests[0]!.onRunEndedWithoutStarting!();
+      yield* harness.offerAndWait(wakeTurnInit);
+      yield* harness.offerAndWait(wakeAssistant);
+      yield* harness.offerAndWait(wakeResult);
+      assert.lengthOf(
+        harness.continuationRequests,
+        1,
+        "the cancelled wake must not be offered again",
+      );
 
-          yield* harness.runtime.startTurn(
-            makeClaudeTestTurnInput({
-              threadId: harness.threadId,
-              providerThread: harness.providerThread,
-              now,
-              attemptId: RunAttemptId.make("attempt-claude-wake-limit-2"),
-              text: "Background task completed.",
-              attachments: [],
-              providerTurnOrdinal: 2,
-              messageCreatedBy: "agent",
-              messageCreationSource: "provider",
-            }),
-          );
-          const terminal = yield* Queue.take(harness.terminalReceipts);
-          assert.equal(terminal?.status, "failed");
-          if (terminal === undefined || terminal.status !== "failed") return;
-          assert.equal(terminal.failure.class, "usage_limit");
-          assert.equal(terminal.failure.resetAt, "2026-09-25T01:10:00.000Z");
-          if (standaloneEvent) {
-            const pause = yield* Queue.take(harness.systemNoticeReceipts);
-            assert.equal(pause.turnItem.type, "system_notice");
-            if (pause.turnItem.type !== "system_notice") return;
-            assert.include(pause.turnItem.message, "This turn is paused until the 5-hour limit");
-          }
-        }).pipe(
-          Effect.provide(
-            Layer.mergeAll(
-              IdAllocator.layer,
-              McpProviderSessions.layer,
-              NodeServices.layer,
-              NodeCrypto.layer,
-            ),
-          ),
+      yield* harness.offerAndWait(
+        claudeSdkFrame({ ...wakeTurnInit, uuid: "00000000-0000-4000-8000-000000000146" }),
+      );
+      assert.lengthOf(harness.continuationRequests, 2, "the next wake must be offered");
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
         ),
       ),
+    ),
   );
 
-  it.effect(
-    "dates a buffered wake gateway limit from its arrival, not the continuation replay",
-    () =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const harness = yield* makeWakeHarness;
-          const now = yield* DateTime.now;
+  it.effect("offers a later task's wake when a cancelled wake never opens", () =>
+    Effect.gen(function* () {
+      const SECOND_TASK_ID = "b2ndwake";
+      const SECOND_TOOL_USE_ID = "toolu_second_wake";
+      const harness = yield* makeWakeHarness;
+      const now = yield* DateTime.now;
 
-          yield* harness.runtime.startTurn(
-            makeClaudeTestTurnInput({
-              threadId: harness.threadId,
-              providerThread: harness.providerThread,
-              now,
-              attemptId: RunAttemptId.make("attempt-claude-wake-gateway-1"),
-              text: "Run the build in the background.",
-              attachments: [],
-            }),
-          );
-          yield* Queue.offer(harness.sdkMessages, wakeTaskStarted);
-          yield* Queue.offer(harness.sdkMessages, turnOneResult);
-          yield* Queue.take(harness.terminalReceipts);
+      yield* harness.runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now,
+          attemptId: RunAttemptId.make("attempt-claude-wake-never-opens"),
+          text: "Start an agent and a build in the background.",
+          attachments: [],
+        }),
+      );
+      yield* harness.offerAndWait(claudeSdkFrame({ ...wakeTaskStarted, task_type: "local_agent" }));
+      yield* harness.offerAndWait(
+        claudeSdkFrame({
+          ...wakeTaskStarted,
+          task_id: SECOND_TASK_ID,
+          tool_use_id: SECOND_TOOL_USE_ID,
+          uuid: "00000000-0000-4000-8000-000000000151",
+        }),
+      );
+      yield* harness.offerAndWait(turnOneResult);
+      yield* harness.awaitTerminal(1);
 
-          yield* Queue.offer(harness.sdkMessages, wakeNotification);
-          yield* harness.offerAndWait(
-            makeAssistantErrorFrame({
-              uuid: "00000000-0000-4000-8000-000000000634",
-              error: "server_error",
-            }),
-          );
-          assert.lengthOf(harness.continuationRequests, 1);
-          const arrivedAt = yield* DateTime.now;
-          yield* harness.offerAndWait(
-            makeResultFrame({
-              uuid: "00000000-0000-4000-8000-000000000635",
-              result:
-                'API Error: 503 [cpa/claude-opus-5-5] [429]: {"type":"error","error":{"type":"rate_limit_error","message":"All credentials are cooling down"}} (reset after 2h54m21s)',
-              isError: true,
-              apiErrorStatus: 503,
-              terminalReason: "api_error",
-              origin: { kind: "task-notification" },
-            }),
-          );
+      // Claude never opens a wake for the agent's notification.
+      yield* harness.offerAndWait(wakeNotification);
+      assert.lengthOf(harness.continuationRequests, 1);
+      yield* harness.continuationRequests[0]!.onRunEndedWithoutStarting!();
 
-          yield* TestClock.adjust("1 hour");
-          yield* harness.runtime.startTurn(
-            makeClaudeTestTurnInput({
-              threadId: harness.threadId,
-              providerThread: harness.providerThread,
-              now: yield* DateTime.now,
-              attemptId: RunAttemptId.make("attempt-claude-wake-gateway-2"),
-              text: "Background task completed.",
-              attachments: [],
-              providerTurnOrdinal: 2,
-              messageCreatedBy: "agent",
-              messageCreationSource: "provider",
-            }),
-          );
-          const terminal = yield* Queue.take(harness.terminalReceipts);
-          assert.equal(terminal.status, "failed");
-          if (terminal.status !== "failed") return;
-          assert.equal(terminal.failure.class, "usage_limit");
-          assert.equal(
-            terminal.failure.resetAt,
-            DateTime.formatIso(
-              DateTime.makeUnsafe(
-                DateTime.toEpochMillis(arrivedAt) + (2 * 3_600 + 54 * 60 + 21) * 1_000,
-              ),
-            ),
-          );
-        }).pipe(
-          Effect.provide(
-            Layer.mergeAll(
-              IdAllocator.layer,
-              McpProviderSessions.layer,
-              NodeServices.layer,
-              NodeCrypto.layer,
-            ),
-          ),
+      yield* harness.offerAndWait(
+        claudeSdkFrame({
+          ...wakeNotification,
+          task_id: SECOND_TASK_ID,
+          tool_use_id: SECOND_TOOL_USE_ID,
+          output_file: `/tmp/claude-replay/tasks/${SECOND_TASK_ID}.output`,
+          uuid: "00000000-0000-4000-8000-000000000152",
+        }),
+      );
+      yield* harness.offerAndWait(
+        claudeSdkFrame({ ...wakeTurnInit, uuid: "00000000-0000-4000-8000-000000000153" }),
+      );
+      yield* harness.offerAndWait(
+        makeAssistantTextFrame({ uuid: "00000000-0000-4000-8000-000000000154", text: "Built." }),
+      );
+      yield* harness.offerAndWait(
+        makeResultFrame({ uuid: "00000000-0000-4000-8000-000000000155", result: "Built." }),
+      );
+      assert.lengthOf(
+        harness.continuationRequests,
+        2,
+        "the build's wake must get its own continuation",
+      );
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
         ),
       ),
+    ),
   );
 
-  it.effect("leaves buffered wake messages for the continuation queued behind a user turn", () =>
-    Effect.scoped(
+  it.effect.each([
+    { ending: "notification", cancelled: "after its result" },
+    { ending: "tool result", cancelled: "after its result" },
+    { ending: "tool result", cancelled: "while the subagent ran" },
+  ] as const)(
+    "does not replay a subagent that finished inside a cancelled wake (ended by $ending, cancelled $cancelled)",
+    ({ ending, cancelled }) =>
       Effect.gen(function* () {
+        const SECOND_TASK_ID = "b2ndwake";
+        const SECOND_TOOL_USE_ID = "toolu_second_wake";
+        const SUBAGENT_TASK_ID = "fg-agent";
+        const SUBAGENT_TOOL_USE_ID = "toolu-fg-agent";
         const harness = yield* makeWakeHarness;
         const now = yield* DateTime.now;
 
@@ -15202,121 +14423,142 @@ describe("ClaudeAdapterV2 background wake turns", () => {
             threadId: harness.threadId,
             providerThread: harness.providerThread,
             now,
-            attemptId: RunAttemptId.make("attempt-claude-wake-4a"),
-            text: "Run the build in the background.",
+            attemptId: RunAttemptId.make("attempt-claude-wake-finished-subagent"),
+            text: "Run two builds in the background.",
             attachments: [],
           }),
         );
-        yield* Queue.offer(harness.sdkMessages, wakeTaskStarted);
-        yield* Queue.offer(harness.sdkMessages, turnOneResult);
+        yield* harness.offerAndWait(wakeTaskStarted);
+        yield* harness.offerAndWait(
+          claudeSdkFrame({
+            ...wakeTaskStarted,
+            task_id: SECOND_TASK_ID,
+            tool_use_id: SECOND_TOOL_USE_ID,
+            uuid: "00000000-0000-4000-8000-000000000161",
+          }),
+        );
+        yield* harness.offerAndWait(turnOneResult);
         yield* harness.awaitTerminal(1);
-        yield* Queue.offer(harness.sdkMessages, wakeNotification);
-        yield* Queue.offer(harness.sdkMessages, wakeResult);
-        yield* harness.awaitContinuation(1);
 
-        yield* harness.runtime.startTurn(
-          makeClaudeTestTurnInput({
-            threadId: harness.threadId,
-            providerThread: harness.providerThread,
-            now,
-            attemptId: RunAttemptId.make("attempt-claude-wake-4b"),
-            text: "How is the build going?",
-            attachments: [],
-            providerTurnOrdinal: 2,
+        // The first wake runs a subagent to completion before its result.
+        yield* harness.offerAndWait(wakeNotification);
+        yield* harness.offerAndWait(wakeTurnInit);
+        assert.lengthOf(harness.continuationRequests, 1);
+        yield* harness.offerAndWait(wakeAssistant);
+        yield* harness.offerAndWait(
+          claudeSdkFrame({
+            type: "system",
+            subtype: "task_started",
+            task_id: SUBAGENT_TASK_ID,
+            tool_use_id: SUBAGENT_TOOL_USE_ID,
+            description: "Inspect build output",
+            subagent_type: "general-purpose",
+            task_type: "local_agent",
+            prompt: "Inspect the build output.",
+            uuid: "00000000-0000-4000-8000-000000000162",
+            session_id: WAKE_NATIVE_SESSION,
           }),
         );
-
-        yield* harness.until(() => harness.offeredMessages.length === 2);
-        assert.lengthOf(harness.terminalEvents(), 1);
-        assert.isTrue(yield* harness.hasPendingBackgroundWork);
-
-        yield* Queue.offer(
-          harness.sdkMessages,
-          makeResultFrame({
-            uuid: "00000000-0000-4000-8000-000000000105",
-            result: "The build passed; nothing else pending.",
+        yield* harness.offerAndWait(
+          claudeSdkFrame({
+            ...makeAssistantTextFrame({
+              uuid: "00000000-0000-4000-8000-000000000168",
+              text: "Reading the build log.",
+            }),
+            parent_tool_use_id: SUBAGENT_TOOL_USE_ID,
           }),
         );
-        yield* harness.awaitTerminal(2);
-        assert.equal(harness.terminalEvents()[1]?.status, "completed");
-        assert.isFalse(
-          harness.events.some(
-            (event) => event.type === "message.updated" && event.message.text === WAKE_RESULT_TEXT,
-          ),
+        if (cancelled === "while the subagent ran") {
+          yield* harness.continuationRequests[0]!.onRunEndedWithoutStarting!();
+        }
+        yield* harness.offerAndWait(
+          ending === "notification"
+            ? claudeSdkFrame({
+                type: "system",
+                subtype: "task_notification",
+                task_id: SUBAGENT_TASK_ID,
+                tool_use_id: SUBAGENT_TOOL_USE_ID,
+                status: "completed",
+                output_file: "/tmp/fg-agent.output",
+                summary: "Inspected",
+                uuid: "00000000-0000-4000-8000-000000000163",
+                session_id: WAKE_NATIVE_SESSION,
+              })
+            : claudeSdkFrame({
+                type: "user",
+                uuid: "00000000-0000-4000-8000-000000000163",
+                session_id: WAKE_NATIVE_SESSION,
+                parent_tool_use_id: null,
+                message: {
+                  role: "user",
+                  content: [
+                    {
+                      type: "tool_result",
+                      tool_use_id: SUBAGENT_TOOL_USE_ID,
+                      content: "Inspected",
+                    },
+                  ],
+                },
+              }),
         );
+        yield* harness.offerAndWait(wakeResult);
+        if (cancelled === "after its result") {
+          yield* harness.continuationRequests[0]!.onRunEndedWithoutStarting!();
+        }
 
+        yield* harness.offerAndWait(
+          claudeSdkFrame({
+            ...wakeNotification,
+            task_id: SECOND_TASK_ID,
+            tool_use_id: SECOND_TOOL_USE_ID,
+            output_file: `/tmp/claude-replay/tasks/${SECOND_TASK_ID}.output`,
+            uuid: "00000000-0000-4000-8000-000000000164",
+          }),
+        );
+        yield* harness.offerAndWait(
+          claudeSdkFrame({ ...wakeTurnInit, uuid: "00000000-0000-4000-8000-000000000165" }),
+        );
+        assert.lengthOf(harness.continuationRequests, 2);
         yield* harness.runtime.startTurn(
           makeClaudeTestTurnInput({
             threadId: harness.threadId,
             providerThread: harness.providerThread,
             now,
-            attemptId: RunAttemptId.make("attempt-claude-wake-4c"),
+            attemptId: RunAttemptId.make("attempt-claude-wake-finished-subagent-2"),
             text: "Background task completed.",
             attachments: [],
-            providerTurnOrdinal: 3,
+            providerTurnOrdinal: 2,
             messageCreatedBy: "agent",
             messageCreationSource: "provider",
           }),
         );
-        yield* harness.awaitTerminal(3);
-        assert.equal(harness.terminalEvents()[2]?.status, "completed");
-        assert.lengthOf(harness.offeredMessages, 2);
-        assert.isTrue(
-          harness.events.some(
-            (event) => event.type === "message.updated" && event.message.text === WAKE_RESULT_TEXT,
-          ),
-        );
-        assert.isFalse(
-          harness.events.some(
-            (event) =>
-              event.type !== "provider_thread.updated" &&
-              JSON.stringify(event).includes(WAKE_TASK_ID),
-          ),
-        );
-        assert.isFalse(yield* harness.hasPendingBackgroundWork);
-
-        // The continuation settled with no result of its own, so a late suggestion belongs to B.
         yield* harness.offerAndWait(
-          claudeSdkFrame({
-            type: "prompt_suggestion",
-            suggestion: "Check the build logs",
-            uuid: "00000000-0000-4000-8000-000000000692",
-            session_id: WAKE_NATIVE_SESSION,
+          makeAssistantTextFrame({
+            uuid: "00000000-0000-4000-8000-000000000166",
+            text: "Second build done.",
           }),
         );
-        const userTurn = makeClaudeTestTurnInput({
-          threadId: harness.threadId,
-          providerThread: harness.providerThread,
-          now,
-          attemptId: RunAttemptId.make("attempt-claude-wake-4d"),
-          text: "Ship it.",
-          attachments: [],
-          providerTurnOrdinal: 4,
-        });
-        yield* harness.runtime.startTurn(userTurn);
-        yield* Queue.offer(
-          harness.sdkMessages,
-          makeResultFrame({ uuid: "00000000-0000-4000-8000-000000000693", result: "Shipped." }),
-        );
-        yield* harness.awaitTerminal(4);
-        yield* Queue.offer(
-          harness.sdkMessages,
-          claudeSdkFrame({
-            type: "prompt_suggestion",
-            suggestion: "Open the release notes",
-            uuid: "00000000-0000-4000-8000-000000000694",
-            session_id: WAKE_NATIVE_SESSION,
+        yield* harness.offerAndWait(
+          makeResultFrame({
+            uuid: "00000000-0000-4000-8000-000000000167",
+            result: "Second build done.",
+            origin: { kind: "task-notification" },
           }),
         );
-        yield* harness.until(() =>
-          harness.events.some((event) => event.type === "prompt_suggestion.updated"),
+        yield* harness.awaitTerminal(2);
+
+        const subagentStatuses = harness.events.flatMap((event) =>
+          event.type === "subagent.updated" &&
+          event.subagent.nativeTaskRef?.nativeId === SUBAGENT_TASK_ID
+            ? [event.subagent.status]
+            : [],
         );
-        assert.deepEqual(
-          harness.events.flatMap((event) =>
-            event.type === "prompt_suggestion.updated" ? [[event.runId, event.text]] : [],
-          ),
-          [[userTurn.runId, "Open the release notes"]],
+        assert.notInclude(
+          subagentStatuses,
+          "running",
+          "a subagent that finished in the cancelled wake must not be replayed as running",
         );
+        assert.isFalse(yield* harness.hasPendingBackgroundWork);
       }).pipe(
         Effect.provide(
           Layer.mergeAll(
@@ -15327,12 +14569,149 @@ describe("ClaudeAdapterV2 background wake turns", () => {
           ),
         ),
       ),
+  );
+
+  it.effect("offers a cancelled wake once when an empty lifecycle result precedes its turn", () =>
+    Effect.gen(function* () {
+      const SECOND_TASK_ID = "b2ndwake";
+      const SECOND_TOOL_USE_ID = "toolu_second_wake";
+      const harness = yield* makeWakeHarness;
+      const now = yield* DateTime.now;
+
+      yield* harness.runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now,
+          attemptId: RunAttemptId.make("attempt-claude-wake-empty-lifecycle"),
+          text: "Run two builds in the background.",
+          attachments: [],
+        }),
+      );
+      yield* harness.offerAndWait(wakeTaskStarted);
+      yield* harness.offerAndWait(
+        claudeSdkFrame({
+          ...wakeTaskStarted,
+          task_id: SECOND_TASK_ID,
+          tool_use_id: SECOND_TOOL_USE_ID,
+          uuid: "00000000-0000-4000-8000-000000000171",
+        }),
+      );
+      yield* harness.offerAndWait(turnOneResult);
+      yield* harness.awaitTerminal(1);
+
+      yield* harness.offerAndWait(wakeNotification);
+      yield* harness.offerAndWait(wakeTurnInit);
+      assert.lengthOf(harness.continuationRequests, 1);
+      yield* harness.offerAndWait(
+        makeResultFrame({
+          uuid: "00000000-0000-4000-8000-000000000172",
+          result: "",
+          numTurns: 0,
+          origin: { kind: "task-notification" },
+          terminalReason: null,
+        }),
+      );
+      yield* harness.continuationRequests[0]!.onRunEndedWithoutStarting!();
+      yield* harness.offerAndWait(
+        claudeSdkFrame({ ...wakeTurnInit, uuid: "00000000-0000-4000-8000-000000000173" }),
+      );
+      yield* harness.offerAndWait(wakeAssistant);
+      yield* harness.offerAndWait(wakeResult);
+      assert.lengthOf(
+        harness.continuationRequests,
+        1,
+        "the cancelled wake must not be offered again",
+      );
+
+      yield* harness.offerAndWait(
+        claudeSdkFrame({
+          ...wakeNotification,
+          task_id: SECOND_TASK_ID,
+          tool_use_id: SECOND_TOOL_USE_ID,
+          output_file: `/tmp/claude-replay/tasks/${SECOND_TASK_ID}.output`,
+          uuid: "00000000-0000-4000-8000-000000000174",
+        }),
+      );
+      yield* harness.offerAndWait(
+        claudeSdkFrame({ ...wakeTurnInit, uuid: "00000000-0000-4000-8000-000000000175" }),
+      );
+      assert.lengthOf(harness.continuationRequests, 2, "the next wake must be offered");
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
+        ),
+      ),
     ),
   );
 
-  it.effect("settles a continuation whose wake turn a user turn absorbed", () =>
-    Effect.scoped(
+  it.effect("does not offer a cancelled wake again for its trailing empty lifecycle result", () =>
+    Effect.gen(function* () {
+      const harness = yield* makeWakeHarness;
+      const now = yield* DateTime.now;
+
+      yield* harness.runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now,
+          attemptId: RunAttemptId.make("attempt-claude-wake-trailing-lifecycle"),
+          text: "Run a build in the background.",
+          attachments: [],
+        }),
+      );
+      yield* harness.offerAndWait(wakeTaskStarted);
+      yield* harness.offerAndWait(turnOneResult);
+      yield* harness.awaitTerminal(1);
+
+      yield* harness.offerAndWait(wakeNotification);
+      yield* harness.offerAndWait(wakeTurnInit);
+      yield* harness.offerAndWait(wakeAssistant);
+      yield* harness.offerAndWait(wakeResult);
+      yield* harness.offerAndWait(
+        claudeSdkFrame({ ...wakeTurnInit, uuid: "00000000-0000-4000-8000-000000000176" }),
+      );
+      yield* harness.offerAndWait(
+        makeResultFrame({
+          uuid: "00000000-0000-4000-8000-000000000177",
+          result: "",
+          numTurns: 0,
+          origin: { kind: "task-notification" },
+          terminalReason: null,
+        }),
+      );
+      assert.lengthOf(harness.continuationRequests, 1);
+      yield* harness.continuationRequests[0]!.onRunEndedWithoutStarting!();
+      assert.lengthOf(
+        harness.continuationRequests,
+        1,
+        "a lifecycle result after the cancelled wake must not open another continuation",
+      );
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
+        ),
+      ),
+    ),
+  );
+
+  it.effect.each([
+    "before the cancelled wake's result",
+    "after the cancelled wake's result",
+  ] as const)(
+    "offers a subagent's wake that arrives behind a cancelled wake (notified %s)",
+    (notified) =>
       Effect.gen(function* () {
+        const SUBAGENT_TASK_ID = "bg-agent";
+        const SUBAGENT_TOOL_USE_ID = "toolu-bg-agent";
         const harness = yield* makeWakeHarness;
         const now = yield* DateTime.now;
 
@@ -15341,237 +14720,328 @@ describe("ClaudeAdapterV2 background wake turns", () => {
             threadId: harness.threadId,
             providerThread: harness.providerThread,
             now,
-            attemptId: RunAttemptId.make("attempt-claude-wake-absorbed-1"),
-            text: "Run the build in the background.",
+            attemptId: RunAttemptId.make("attempt-claude-wake-later-subagent"),
+            text: "Run a build and an agent in the background.",
             attachments: [],
           }),
         );
-        yield* Queue.offer(harness.sdkMessages, wakeTaskStarted);
-        yield* Queue.offer(harness.sdkMessages, wakeNotification);
-        yield* Queue.offer(harness.sdkMessages, turnOneResult);
+        yield* harness.offerAndWait(wakeTaskStarted);
+        yield* harness.offerAndWait(
+          claudeSdkFrame({
+            ...wakeTaskStarted,
+            task_id: SUBAGENT_TASK_ID,
+            tool_use_id: SUBAGENT_TOOL_USE_ID,
+            task_type: "local_agent",
+            uuid: "00000000-0000-4000-8000-000000000181",
+          }),
+        );
+        yield* harness.offerAndWait(turnOneResult);
         yield* harness.awaitTerminal(1);
+
+        const subagentNotification = claudeSdkFrame({
+          ...wakeNotification,
+          task_id: SUBAGENT_TASK_ID,
+          tool_use_id: SUBAGENT_TOOL_USE_ID,
+          output_file: `/tmp/claude-replay/tasks/${SUBAGENT_TASK_ID}.output`,
+          summary: "Agent finished",
+          uuid: "00000000-0000-4000-8000-000000000182",
+        });
+        yield* harness.offerAndWait(wakeNotification);
         yield* harness.offerAndWait(wakeTurnInit);
         yield* harness.offerAndWait(wakeAssistant);
-        yield* harness.awaitContinuation(1);
+        assert.lengthOf(harness.continuationRequests, 1);
+        if (notified === "before the cancelled wake's result") {
+          yield* harness.continuationRequests[0]!.onRunEndedWithoutStarting!();
+          yield* harness.offerAndWait(subagentNotification);
+          yield* harness.offerAndWait(wakeResult);
+        } else {
+          yield* harness.offerAndWait(wakeResult);
+          yield* harness.offerAndWait(subagentNotification);
+          yield* harness.continuationRequests[0]!.onRunEndedWithoutStarting!();
+        }
+        assert.lengthOf(
+          harness.continuationRequests,
+          2,
+          "the subagent's wake must get its own continuation",
+        );
+        assert.equal(harness.continuationRequests[1]?.detail, "Agent finished");
+      }).pipe(
+        Effect.provide(
+          Layer.mergeAll(
+            IdAllocator.layer,
+            McpProviderSessions.layer,
+            NodeServices.layer,
+            NodeCrypto.layer,
+          ),
+        ),
+      ),
+  );
+
+  it.effect.each(["none", "before", "after", "sibling"] as const)(
+    "keeps an exited background command on the roster until its wake run starts (empty level %s notification)",
+    (emptyLevel) =>
+      Effect.gen(function* () {
+        const harness = yield* makeWakeHarness;
+        const now = yield* DateTime.now;
+        const secondTaskId = "second-owed-wake";
+        const taskIds = emptyLevel === "sibling" ? [WAKE_TASK_ID, secondTaskId] : [WAKE_TASK_ID];
+        const wakeAttemptId = RunAttemptId.make("attempt-claude-wake-roster-2");
+        const emptyRoster = claudeSdkFrame({
+          type: "system",
+          subtype: "background_tasks_changed",
+          tasks: [],
+          uuid: "00000000-0000-4000-8000-000000000204",
+          session_id: WAKE_NATIVE_SESSION,
+        });
 
-        // Claude folds this prompt into the wake turn it already opened, so one result ends both.
         yield* harness.runtime.startTurn(
           makeClaudeTestTurnInput({
             threadId: harness.threadId,
             providerThread: harness.providerThread,
             now,
-            attemptId: RunAttemptId.make("attempt-claude-wake-absorbed-2"),
-            text: "Any update on the pull request?",
+            attemptId: RunAttemptId.make("attempt-claude-wake-roster-1"),
+            text: "Run the build in the background.",
             attachments: [],
-            providerTurnOrdinal: 2,
-          }),
-        );
-        yield* harness.until(() => harness.offeredMessages.length === 2);
-        yield* Queue.offer(
-          harness.sdkMessages,
-          makeResultFrame({
-            uuid: "00000000-0000-4000-8000-000000000140",
-            result: "Checks passed and the pull request is up to date.",
           }),
         );
-        yield* harness.awaitTerminal(2);
-
+        yield* harness.offerAndWait(wakeTaskStarted);
+        if (emptyLevel === "sibling")
+          yield* harness.offerAndWait(
+            claudeSdkFrame({
+              ...wakeTaskStarted,
+              task_id: secondTaskId,
+              tool_use_id: "toolu_second_owed_wake",
+              uuid: "00000000-0000-4000-8000-000000000205",
+            }),
+          );
+        const awaitBackgroundTasks = harness.runtime.awaitBackgroundTasks;
+        assert.isDefined(awaitBackgroundTasks);
+        yield* awaitBackgroundTasks!({
+          providerThread: harness.providerThread,
+          taskIds,
+          awaited: true,
+        });
+        yield* Queue.offer(harness.sdkMessages, turnOneResult);
+        yield* harness.awaitTerminal(1);
+        const afterFirstTurn = harness.events.length;
+        if (emptyLevel === "before" || emptyLevel === "sibling")
+          yield* harness.offerAndWait(emptyRoster);
+        yield* harness.offerAndWait(wakeNotification);
+        if (emptyLevel === "after") yield* harness.offerAndWait(emptyRoster);
+        // Query replacement reads the internal roster, which the exit already cleared.
+        assert.isFalse(yield* harness.hasPendingBackgroundWork);
+        yield* harness.offerAndWait(wakeTurnInit);
         yield* harness.runtime.startTurn(
           makeClaudeTestTurnInput({
             threadId: harness.threadId,
             providerThread: harness.providerThread,
             now,
-            attemptId: RunAttemptId.make("attempt-claude-wake-absorbed-3"),
+            attemptId: wakeAttemptId,
             text: "Background task completed.",
             attachments: [],
-            providerTurnOrdinal: 3,
+            providerTurnOrdinal: 2,
             messageCreatedBy: "agent",
             messageCreationSource: "provider",
           }),
         );
-        yield* harness.awaitTerminal(3);
-        assert.equal(harness.terminalEvents()[2]?.status, "completed");
+        yield* harness.offerAndWait(wakeAssistant);
+        yield* harness.offerAndWait(wakeResult);
+        yield* harness.awaitTerminal(2);
+
+        const wakeStart = harness.events.findIndex(
+          (event) =>
+            event.type === "provider_turn.updated" &&
+            event.providerTurn.runAttemptId === wakeAttemptId,
+        );
+        assert.isAbove(wakeStart, -1);
+        const rosters = harness.events.flatMap((event, index) =>
+          event.type === "provider_thread.updated" &&
+          event.providerThread.id === harness.providerThread.id &&
+          index >= afterFirstTurn
+            ? [
+                {
+                  beforeWake: index < wakeStart,
+                  pendingWork: event.pendingBackgroundWork === true,
+                  taskIds: (event.providerThread.pendingBackgroundTasks ?? []).map((task) => [
+                    task.taskId,
+                    task.awaited === true,
+                  ]),
+                },
+              ]
+            : [],
+        );
+        assert.deepEqual(
+          rosters.filter((roster) => roster.beforeWake).map((roster) => roster.taskIds),
+          rosters.filter((roster) => roster.beforeWake).map(() => taskIds.map((id) => [id, true])),
+        );
         assert.isTrue(
-          harness.events.some(
-            (event) =>
-              event.type === "message.updated" && event.message.text === WAKE_ASSISTANT_TEXT,
-          ),
+          rosters.filter((roster) => roster.beforeWake).every((roster) => roster.pendingWork),
         );
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
-          ),
-        ),
-      ),
-    ),
-  );
-
-  it.effect.each(["before", "after"] as const)(
-    "offers a later wake when a wake a user turn absorbed is cancelled %s that turn ends",
-    (cancelled) =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const SECOND_TASK_ID = "b2ndwake";
-          const SECOND_TOOL_USE_ID = "toolu_second_wake";
-          const harness = yield* makeWakeHarness;
-          const now = yield* DateTime.now;
-
-          yield* harness.runtime.startTurn(
-            makeClaudeTestTurnInput({
-              threadId: harness.threadId,
-              providerThread: harness.providerThread,
-              now,
-              attemptId: RunAttemptId.make("attempt-claude-wake-absorbed-cancel-1"),
-              text: "Run two builds in the background.",
-              attachments: [],
-            }),
-          );
-          yield* Queue.offer(harness.sdkMessages, wakeTaskStarted);
-          yield* Queue.offer(
-            harness.sdkMessages,
+        assert.deepEqual(
+          rosters.at(-1)?.taskIds,
+          emptyLevel === "sibling" ? [[secondTaskId, true]] : [],
+        );
+        if (emptyLevel === "sibling") {
+          assert.isTrue(rosters.at(-1)?.pendingWork);
+          yield* harness.offerAndWait(
             claudeSdkFrame({
-              ...wakeTaskStarted,
-              task_id: SECOND_TASK_ID,
-              tool_use_id: SECOND_TOOL_USE_ID,
-              uuid: "00000000-0000-4000-8000-000000000191",
+              ...wakeNotification,
+              task_id: secondTaskId,
+              tool_use_id: "toolu_second_owed_wake",
+              uuid: "00000000-0000-4000-8000-000000000206",
             }),
           );
-          yield* Queue.offer(harness.sdkMessages, wakeNotification);
-          yield* Queue.offer(harness.sdkMessages, turnOneResult);
-          yield* harness.awaitTerminal(1);
-          yield* harness.offerAndWait(wakeTurnInit);
-          yield* harness.offerAndWait(wakeAssistant);
-          yield* harness.awaitContinuation(1);
-
+          yield* harness.offerAndWait(
+            claudeSdkFrame({ ...wakeTurnInit, uuid: "00000000-0000-4000-8000-000000000207" }),
+          );
           yield* harness.runtime.startTurn(
             makeClaudeTestTurnInput({
               threadId: harness.threadId,
               providerThread: harness.providerThread,
               now,
-              attemptId: RunAttemptId.make("attempt-claude-wake-absorbed-cancel-2"),
-              text: "Any update on the pull request?",
+              attemptId: RunAttemptId.make("attempt-claude-owed-sibling-3"),
+              text: "Second command completed.",
               attachments: [],
-              providerTurnOrdinal: 2,
+              providerTurnOrdinal: 3,
+              messageCreatedBy: "agent",
+              messageCreationSource: "provider",
             }),
           );
-          yield* harness.until(() => harness.offeredMessages.length === 2);
-          if (cancelled === "before") {
-            yield* harness.continuationRequests[0]!.onRunEndedWithoutStarting!();
-          }
-          yield* Queue.offer(
-            harness.sdkMessages,
-            makeResultFrame({
-              uuid: "00000000-0000-4000-8000-000000000192",
-              result: "Checks passed and the pull request is up to date.",
+          yield* harness.offerAndWait(
+            makeAssistantTextFrame({
+              uuid: "00000000-0000-4000-8000-000000000208",
+              text: "Second command finished.",
             }),
           );
-          yield* harness.awaitTerminal(2);
-          if (cancelled === "after") {
-            yield* harness.continuationRequests[0]!.onRunEndedWithoutStarting!();
-          }
-
           yield* harness.offerAndWait(
-            claudeSdkFrame({
-              ...wakeNotification,
-              task_id: SECOND_TASK_ID,
-              tool_use_id: SECOND_TOOL_USE_ID,
-              output_file: `/tmp/claude-replay/tasks/${SECOND_TASK_ID}.output`,
-              uuid: "00000000-0000-4000-8000-000000000193",
+            makeResultFrame({
+              uuid: "00000000-0000-4000-8000-000000000209",
+              result: "Second command finished.",
+              origin: { kind: "task-notification" },
             }),
           );
-          yield* harness.offerAndWait(
-            claudeSdkFrame({ ...wakeTurnInit, uuid: "00000000-0000-4000-8000-000000000194" }),
+          yield* harness.awaitTerminal(3);
+          assert.deepEqual(
+            providerThreadRosterEvents(harness.events).at(-1)?.providerThread
+              .pendingBackgroundTasks,
+            [],
           );
-          assert.lengthOf(harness.continuationRequests, 2, "the later wake must be offered");
-        }).pipe(
-          Effect.provide(
-            Layer.mergeAll(
-              IdAllocator.layer,
-              McpProviderSessions.layer,
-              NodeServices.layer,
-              NodeCrypto.layer,
-            ),
+        }
+      }).pipe(
+        Effect.provide(
+          Layer.mergeAll(
+            IdAllocator.layer,
+            McpProviderSessions.layer,
+            NodeServices.layer,
+            NodeCrypto.layer,
           ),
         ),
       ),
   );
 
-  it.effect("ignores a zero-turn task-notification origin result during a normal user turn", () =>
-    Effect.scoped(
+  it.effect.each([true, false])(
+    "carries a rejected wake rate limit into the continuation failure (event=%s)",
+    (standaloneEvent) =>
       Effect.gen(function* () {
         const harness = yield* makeWakeHarness;
         const now = yield* DateTime.now;
-        const probeAssistantText = "Probe after stale task-notification result.";
-        const recoveryAssistantText = "Recovered after the interrupt; continuing.";
-        const staleResultText = STALE_TASK_NOTIFICATION_RESULT_TEXT;
-        const hasMessageText = (text: string) =>
-          harness.events.some(
-            (event) => event.type === "message.updated" && event.message.text === text,
-          );
+        const resetsAt = 1790298600;
 
         yield* harness.runtime.startTurn(
           makeClaudeTestTurnInput({
             threadId: harness.threadId,
             providerThread: harness.providerThread,
             now,
-            attemptId: RunAttemptId.make("attempt-claude-stale-notif-1"),
-            text: "Continue after interrupt.",
+            attemptId: RunAttemptId.make("attempt-claude-wake-limit-1"),
+            text: "Run the build in the background.",
             attachments: [],
           }),
         );
-        yield* harness.until(() => harness.offeredMessages.length === 1);
+        yield* Queue.offer(harness.sdkMessages, wakeTaskStarted);
+        yield* Queue.offer(harness.sdkMessages, turnOneResult);
+        yield* Queue.take(harness.terminalReceipts);
 
-        // After interrupt recovery, stale task notifications and their results can precede the root stream.
-        yield* Queue.offer(
-          harness.sdkMessages,
-          claudeSdkFrame({
-            type: "system",
-            subtype: "task_notification",
-            task_id: "task-stale-stopped",
-            tool_use_id: "toolu-stale-stopped",
-            status: "stopped",
-            output_file: "/tmp/task-stale-stopped.log",
-            summary: "",
-            uuid: "00000000-0000-4000-8000-000000000107",
-            session_id: WAKE_NATIVE_SESSION,
+        yield* Queue.offer(harness.sdkMessages, wakeNotification);
+        if (standaloneEvent) {
+          yield* harness.offerAndWait(
+            claudeSdkFrame({
+              type: "rate_limit_event",
+              rate_limit_info: {
+                status: "rejected",
+                rateLimitType: "five_hour",
+                resetsAt,
+                overageStatus: "rejected",
+              },
+              uuid: "00000000-0000-4000-8000-000000000630",
+              session_id: WAKE_NATIVE_SESSION,
+            }),
+          );
+        }
+        assert.lengthOf(harness.continuationRequests, 0);
+        yield* harness.offerAndWait(
+          makeAssistantErrorFrame({
+            uuid: "00000000-0000-4000-8000-000000000631",
+            error: "rate_limit",
+            apiErrorParams: {
+              rate_limit_info: {
+                status: "rejected",
+                rateLimitType: "five_hour",
+                // A conflicting embedded time must not replace the event for this window.
+                resetsAt: standaloneEvent ? resetsAt + 3_600 : resetsAt,
+              },
+            },
           }),
         );
-        yield* Queue.offer(harness.sdkMessages, staleTaskNotificationResult);
-        yield* Queue.offer(
-          harness.sdkMessages,
-          makeAssistantTextFrame({
-            uuid: "00000000-0000-4000-8000-00000000010a",
-            text: probeAssistantText,
+        assert.lengthOf(harness.continuationRequests, 1);
+        yield* harness.offerAndWait(
+          makeResultFrame({
+            uuid: "00000000-0000-4000-8000-000000000632",
+            result: "You've hit your session limit · resets 11:10am (Australia/Sydney)",
+            isError: true,
+            apiErrorStatus: 429,
+            terminalReason: "api_error",
+            origin: { kind: "task-notification" },
           }),
         );
+        assert.lengthOf(harness.continuationRequests, 1);
 
-        yield* harness.until(() => hasMessageText(probeAssistantText));
-        assert.lengthOf(harness.terminalEvents(), 0);
-        assert.isFalse(hasMessageText(staleResultText));
-
-        yield* Queue.offer(
-          harness.sdkMessages,
-          makeAssistantTextFrame({
-            uuid: "00000000-0000-4000-8000-000000000108",
-            text: recoveryAssistantText,
-          }),
-        );
-        yield* Queue.offer(
-          harness.sdkMessages,
+        // An empty session-task lifecycle result arriving before T3 opens the
+        // wake run must not replace the root's terminal usage-limit result.
+        yield* harness.offerAndWait(wakeTurnInit);
+        yield* harness.offerAndWait(
           makeResultFrame({
-            uuid: "00000000-0000-4000-8000-000000000109",
-            result: recoveryAssistantText,
+            uuid: "00000000-0000-4000-8000-000000000633",
+            result: "",
+            numTurns: 0,
+            origin: { kind: "task-notification" },
+            terminalReason: null,
           }),
         );
 
-        yield* harness.awaitTerminal(1);
-        assert.equal(harness.terminalEvents()[0]?.status, "completed");
-        assert.isTrue(hasMessageText(recoveryAssistantText));
-        assert.isFalse(hasMessageText(staleResultText));
+        yield* harness.runtime.startTurn(
+          makeClaudeTestTurnInput({
+            threadId: harness.threadId,
+            providerThread: harness.providerThread,
+            now,
+            attemptId: RunAttemptId.make("attempt-claude-wake-limit-2"),
+            text: "Background task completed.",
+            attachments: [],
+            providerTurnOrdinal: 2,
+            messageCreatedBy: "agent",
+            messageCreationSource: "provider",
+          }),
+        );
+        const terminal = yield* Queue.take(harness.terminalReceipts);
+        assert.equal(terminal?.status, "failed");
+        if (terminal === undefined || terminal.status !== "failed") return;
+        assert.equal(terminal.failure.class, "usage_limit");
+        assert.equal(terminal.failure.resetAt, "2026-09-25T01:10:00.000Z");
+        if (standaloneEvent) {
+          const pause = yield* Queue.take(harness.systemNoticeReceipts);
+          assert.equal(pause.turnItem.type, "system_notice");
+          if (pause.turnItem.type !== "system_notice") return;
+          assert.include(pause.turnItem.message, "This turn is paused until the 5-hour limit");
+        }
       }).pipe(
         Effect.provide(
           Layer.mergeAll(
@@ -15582,75 +15052,11 @@ describe("ClaudeAdapterV2 background wake turns", () => {
           ),
         ),
       ),
-    ),
   );
 
   it.effect(
-    "emits one interrupted terminal for a positive task-notification result racing interrupt",
+    "dates a buffered wake gateway limit from its arrival, not the continuation replay",
     () =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const closeGate = yield* Deferred.make<void>();
-          const testScope = yield* Scope.Scope;
-          yield* Scope.addFinalizer(testScope, Deferred.succeed(closeGate, undefined));
-          const interruptStarted = yield* Deferred.make<void>();
-          const harness = yield* makeWakeHarnessWithOptions({
-            close: (sdkMessages) =>
-              Deferred.await(closeGate).pipe(Effect.andThen(Queue.shutdown(sdkMessages))),
-            stopTask: () => Effect.void,
-            interrupt: Deferred.succeed(interruptStarted, undefined),
-          });
-          const idAllocator = yield* IdAllocator.IdAllocatorV2;
-          const now = yield* DateTime.now;
-          const attemptId = RunAttemptId.make("attempt-claude-interrupt-positive-notif");
-          const providerTurnId = idAllocator.derive.providerTurn({
-            driver: ClaudeAdapterV2.CLAUDE_PROVIDER,
-            nativeTurnId: `turn:${attemptId}`,
-          });
-
-          yield* harness.runtime.startTurn(
-            makeClaudeTestTurnInput({
-              threadId: harness.threadId,
-              providerThread: harness.providerThread,
-              now,
-              attemptId,
-              text: "Stop this task.",
-              attachments: [],
-            }),
-          );
-          yield* harness.runtime
-            .interruptTurn({ providerThread: harness.providerThread, providerTurnId })
-            .pipe(Effect.forkScoped);
-          yield* Deferred.await(interruptStarted);
-          yield* Queue.offer(
-            harness.sdkMessages,
-            makeResultFrame({
-              uuid: "00000000-0000-4000-8000-000000000115",
-              result: "Late result after interrupt.",
-              numTurns: 7,
-              origin: { kind: "task-notification" },
-            }),
-          );
-          const terminalized = Exit.isSuccess(yield* harness.awaitTerminal(1).pipe(Effect.exit));
-          yield* Deferred.succeed(closeGate, undefined);
-          assert.isTrue(terminalized);
-          assert.equal(harness.terminalEvents()[0]?.status, "interrupted");
-          assert.lengthOf(harness.terminalEvents(), 1);
-        }).pipe(
-          Effect.provide(
-            Layer.mergeAll(
-              IdAllocator.layer,
-              McpProviderSessions.layer,
-              NodeServices.layer,
-              NodeCrypto.layer,
-            ),
-          ),
-        ),
-      ),
-  );
-
-  it.effect("settles a continuation turn immediately when no wake output is buffered", () =>
-    Effect.scoped(
       Effect.gen(function* () {
         const harness = yield* makeWakeHarness;
         const now = yield* DateTime.now;
@@ -15660,17 +15066,62 @@ describe("ClaudeAdapterV2 background wake turns", () => {
             threadId: harness.threadId,
             providerThread: harness.providerThread,
             now,
-            attemptId: RunAttemptId.make("attempt-claude-wake-3"),
+            attemptId: RunAttemptId.make("attempt-claude-wake-gateway-1"),
+            text: "Run the build in the background.",
+            attachments: [],
+          }),
+        );
+        yield* Queue.offer(harness.sdkMessages, wakeTaskStarted);
+        yield* Queue.offer(harness.sdkMessages, turnOneResult);
+        yield* Queue.take(harness.terminalReceipts);
+
+        yield* Queue.offer(harness.sdkMessages, wakeNotification);
+        yield* harness.offerAndWait(
+          makeAssistantErrorFrame({
+            uuid: "00000000-0000-4000-8000-000000000634",
+            error: "server_error",
+          }),
+        );
+        assert.lengthOf(harness.continuationRequests, 1);
+        const arrivedAt = yield* DateTime.now;
+        yield* harness.offerAndWait(
+          makeResultFrame({
+            uuid: "00000000-0000-4000-8000-000000000635",
+            result:
+              'API Error: 503 [cpa/claude-opus-5-5] [429]: {"type":"error","error":{"type":"rate_limit_error","message":"All credentials are cooling down"}} (reset after 2h54m21s)',
+            isError: true,
+            apiErrorStatus: 503,
+            terminalReason: "api_error",
+            origin: { kind: "task-notification" },
+          }),
+        );
+
+        yield* TestClock.adjust("1 hour");
+        yield* harness.runtime.startTurn(
+          makeClaudeTestTurnInput({
+            threadId: harness.threadId,
+            providerThread: harness.providerThread,
+            now: yield* DateTime.now,
+            attemptId: RunAttemptId.make("attempt-claude-wake-gateway-2"),
             text: "Background task completed.",
             attachments: [],
+            providerTurnOrdinal: 2,
             messageCreatedBy: "agent",
             messageCreationSource: "provider",
           }),
         );
-
-        yield* harness.awaitTerminal(1);
-        assert.equal(harness.terminalEvents()[0]?.status, "completed");
-        assert.lengthOf(harness.offeredMessages, 0);
+        const terminal = yield* Queue.take(harness.terminalReceipts);
+        assert.equal(terminal.status, "failed");
+        if (terminal.status !== "failed") return;
+        assert.equal(terminal.failure.class, "usage_limit");
+        assert.equal(
+          terminal.failure.resetAt,
+          DateTime.formatIso(
+            DateTime.makeUnsafe(
+              DateTime.toEpochMillis(arrivedAt) + (2 * 3_600 + 54 * 60 + 21) * 1_000,
+            ),
+          ),
+        );
       }).pipe(
         Effect.provide(
           Layer.mergeAll(
@@ -15681,718 +15132,298 @@ describe("ClaudeAdapterV2 background wake turns", () => {
           ),
         ),
       ),
-    ),
   );
 
-  const makeSubagentAssistantFrames = (input: {
-    readonly parentToolUseId: string;
-    readonly uuid: string;
-    readonly messageId?: string;
-    readonly text?: string;
-    readonly bashToolUseId?: string;
-  }): ReadonlyArray<SDKMessage> =>
-    [
-      ...(input.text === undefined ? [] : [{ type: "text", text: input.text }]),
-      ...(input.bashToolUseId === undefined
-        ? []
-        : [
-            {
-              type: "tool_use",
-              id: input.bashToolUseId,
-              name: "Bash",
-              input: { command: "git log -5" },
-            },
-          ]),
-    ].map((block, index) =>
-      claudeSdkFrame({
-        type: "assistant",
-        message: {
-          model: "claude-sonnet-4-6",
-          id: input.messageId ?? `msg_${input.uuid}`,
-          type: "message",
-          role: "assistant",
-          content: [block],
-        },
-        parent_tool_use_id: input.parentToolUseId,
-        uuid: index === 0 ? input.uuid : `${input.uuid}:${index}`,
-        session_id: WAKE_NATIVE_SESSION,
-      }),
-    );
-  const makeSubagentToolResultFrame = (input: {
-    readonly parentToolUseId: string;
-    readonly uuid: string;
-    readonly toolUseId: string;
-  }) =>
-    claudeSdkFrame({
-      type: "user",
-      message: {
-        role: "user",
-        content: [{ type: "tool_result", tool_use_id: input.toolUseId, content: "ok" }],
-      },
-      parent_tool_use_id: input.parentToolUseId,
-      uuid: input.uuid,
-      session_id: WAKE_NATIVE_SESSION,
-    });
-  const makeSubagentTaskStartedFrame = (input: {
-    readonly taskId: string;
-    readonly toolUseId: string;
-    readonly uuid: string;
-  }) =>
-    claudeSdkFrame({
-      type: "system",
-      subtype: "task_started",
-      task_id: input.taskId,
-      tool_use_id: input.toolUseId,
-      description: "Audit recent commits",
-      subagent_type: "general-purpose",
-      is_backgrounded: true,
-      task_type: "local_agent",
-      prompt: "Audit the last five commits.",
-      uuid: input.uuid,
-      session_id: WAKE_NATIVE_SESSION,
-    });
-  const makeSubagentNotificationFrame = (input: {
-    readonly taskId: string;
-    readonly toolUseId: string;
-    readonly summary: string;
-    readonly uuid: string;
-  }) =>
-    claudeSdkFrame({
-      type: "system",
-      subtype: "task_notification",
-      task_id: input.taskId,
-      tool_use_id: input.toolUseId,
-      status: "completed",
-      output_file: `/tmp/${input.taskId}.output`,
-      summary: input.summary,
-      uuid: input.uuid,
-      session_id: WAKE_NATIVE_SESSION,
-    });
-  const subagentRouting = (
-    events: ReadonlyArray<ProviderAdapter.ProviderAdapterV2Event>,
-    nativeToolIds: ReadonlyArray<string>,
-  ) => {
-    const childThreadId =
-      events.find((event) => event.type === "subagent.updated")?.subagent.childThreadId ??
-      undefined;
-    const toolThreadIds = new Map<string, Set<string>>();
-    for (const event of events) {
-      const nativeId =
-        event.type === "turn_item.updated" ? event.turnItem.nativeItemRef?.nativeId : undefined;
-      if (event.type === "turn_item.updated" && nativeId && nativeToolIds.includes(nativeId)) {
-        toolThreadIds.set(
-          nativeId,
-          (toolThreadIds.get(nativeId) ?? new Set()).add(event.turnItem.threadId),
-        );
-      }
-    }
-    const assistantTexts = (threadId: string | undefined) =>
-      events.flatMap((event) =>
-        event.type === "message.updated" &&
-        event.message.role === "assistant" &&
-        event.message.threadId === threadId
-          ? [event.message.text]
-          : [],
-      );
-    return { childThreadId, toolThreadIds, assistantTexts };
-  };
-
-  it.effect.each([
-    { label: "an empty one", quotaFailureFirst: false },
-    { label: "a quota failure and an empty one", quotaFailureFirst: true },
-  ])(
-    "keeps the wake run open for the turn Claude opens right after $label",
-    ({ quotaFailureFirst }) =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const harness = yield* makeWakeHarness;
-          const now = yield* DateTime.now;
-          const subagents = [
-            { taskId: "task-wake-pair-a", toolUseId: "toolu_wake_pair_a" },
-            { taskId: "task-wake-pair-b", toolUseId: "toolu_wake_pair_b" },
-          ];
-          const wakeAttempt = RunAttemptId.make("attempt-claude-wake-pair-2");
-
-          yield* harness.runtime.startTurn(
-            makeClaudeTestTurnInput({
-              threadId: harness.threadId,
-              providerThread: harness.providerThread,
-              now,
-              attemptId: RunAttemptId.make("attempt-claude-wake-pair-1"),
-              text: "Audit both in the background.",
-              attachments: [],
-            }),
-          );
-          for (const [index, subagent] of subagents.entries()) {
-            yield* Queue.offer(
-              harness.sdkMessages,
-              makeSubagentTaskStartedFrame({
-                ...subagent,
-                uuid: `00000000-0000-4000-8000-00000000095${index}`,
-              }),
-            );
-          }
-          yield* Queue.offer(
-            harness.sdkMessages,
-            makeResultFrame({ uuid: "00000000-0000-4000-8000-000000000952", result: "Started." }),
-          );
-          yield* harness.awaitTerminal(1);
-
-          // Both subagents end together. Claude runs an empty turn for the first
-          // notification and opens the real one a millisecond later, all before
-          // the wake run attaches.
-          for (const [index, subagent] of subagents.entries()) {
-            yield* Queue.offer(
-              harness.sdkMessages,
-              makeSubagentNotificationFrame({
-                ...subagent,
-                summary: "AUDITED",
-                uuid: `00000000-0000-4000-8000-00000000096${index}`,
-              }),
-            );
-          }
-          // A rejected wake that precedes the empty turn still must not settle
-          // the run the live turn owns.
-          if (quotaFailureFirst) {
-            yield* harness.offerAndWait(
-              makeAssistantErrorFrame({
-                uuid: "00000000-0000-4000-8000-000000000964",
-                error: "rate_limit",
-              }),
-            );
-            yield* harness.offerAndWait(
-              makeResultFrame({
-                uuid: "00000000-0000-4000-8000-000000000965",
-                result: "You've hit your session limit · resets 11:10am (Australia/Sydney)",
-                isError: true,
-                apiErrorStatus: 429,
-                terminalReason: "api_error",
-                origin: { kind: "task-notification" },
-              }),
-            );
-          }
-          yield* Queue.offer(harness.sdkMessages, wakeTurnInit);
-          yield* Queue.offer(
-            harness.sdkMessages,
-            makeResultFrame({
-              uuid: "00000000-0000-4000-8000-000000000962",
-              result: "",
-              numTurns: 0,
-              origin: { kind: "task-notification" },
-              terminalReason: null,
-            }),
-          );
-          yield* harness.offerAndWait(
-            claudeSdkFrame({ ...wakeTurnInit, uuid: "00000000-0000-4000-8000-000000000963" }),
-          );
-          assert.lengthOf(harness.continuationRequests, 1);
-
-          yield* harness.runtime.startTurn(
-            makeClaudeTestTurnInput({
-              threadId: harness.threadId,
-              providerThread: harness.providerThread,
-              now,
-              attemptId: wakeAttempt,
-              text: "Background task completed.",
-              attachments: [],
-              providerTurnOrdinal: 2,
-              messageCreatedBy: "agent",
-              messageCreationSource: "provider",
-            }),
-          );
-          // Claude is still thinking, so the run stays working rather than
-          // settling with nothing to show.
-          assert.lengthOf(harness.terminalEvents(), 1);
-
-          yield* harness.offerAndWait(wakeAssistant);
-          yield* harness.offerAndWait(wakeResult);
-          yield* harness.awaitTerminal(2);
-          assert.equal(harness.terminalEvents()[1]?.status, "completed");
-          assert.lengthOf(harness.continuationRequests, 1);
-          assert.isTrue(
-            harness.events.some(
-              (event) =>
-                event.type === "message.updated" &&
-                event.message.runId === RunId.make(`run-${wakeAttempt}`) &&
-                event.message.text === WAKE_RESULT_TEXT,
-            ),
-          );
-        }).pipe(
-          Effect.provide(
-            Layer.mergeAll(
-              IdAllocator.layer,
-              McpProviderSessions.layer,
-              NodeServices.layer,
-              NodeCrypto.layer,
-            ),
-          ),
-        ),
-      ),
-  );
-
-  // A Stop closes the first process, and a turn replaces it before its stream ends.
-  const stopRacedByReplacementTurn = (label: string) =>
+  it.effect("leaves buffered wake messages for the continuation queued behind a user turn", () =>
     Effect.gen(function* () {
-      const changes = yield* makeChangeSignal;
-      const fileSystem = yield* FileSystem.FileSystem;
-      const attachmentsDir = yield* fileSystem.makeTempDirectoryScoped({
-        prefix: `t3-claude-v2-${label}-`,
-      });
-      const processQueues: Array<Queue.Queue<SDKMessage>> = [];
-      // The first two processes exit only when the test ends their streams.
-      const closeRequested = [yield* Deferred.make<void>(), yield* Deferred.make<void>()];
-      const events: Array<ProviderAdapter.ProviderAdapterV2Event> = [];
-      const adapter = yield* ClaudeAdapterV2.makeClaudeAdapterV2({
-        instanceId: ClaudeAdapterV2.CLAUDE_DEFAULT_INSTANCE_ID,
-        settings: DEFAULT_CLAUDE_SETTINGS,
-        environment: {},
-        attachmentsDir,
-        fileSystem,
-        path: yield* Path.Path,
-        random: yield* SecureRandom.SecureRandom,
-        idAllocator: yield* IdAllocator.IdAllocatorV2,
-        continuationRequests: { offer: () => Effect.void },
-        queryRunner: {
-          allocateSessionId: Effect.succeed(WAKE_NATIVE_SESSION),
-          open: () =>
-            Effect.gen(function* () {
-              const sdkMessages = yield* Queue.unbounded<SDKMessage>();
-              const closeSignal = closeRequested[processQueues.length];
-              processQueues.push(sdkMessages);
-              return {
-                messages: Stream.fromQueue(sdkMessages),
-                offer: () => Effect.void,
-                setModel: () => Effect.void,
-                applyFlagSettings: () => Effect.void,
-                setPermissionMode: () => Effect.void,
-                backgroundTasks: () => Effect.succeed(false),
-                stopTask: () => Effect.void,
-                mcpServerStatus: Effect.die("unexpected MCP server status"),
-                readMcpResource: () => Effect.die("unexpected MCP resource read"),
-                callMcpTool: () => Effect.die("unexpected MCP tool call"),
-                listPermissionRules: Effect.die("unexpected permission rules read"),
-                interrupt: Effect.void,
-                close:
-                  closeSignal === undefined
-                    ? Queue.shutdown(sdkMessages)
-                    : Deferred.succeed(closeSignal, undefined).pipe(Effect.asVoid),
-              };
-            }),
-          forkSession: () => Effect.die("unused forkSession"),
-          subagentLaunchToolUseId: () => Effect.succeed(null),
-          subagentModel: () => Effect.succeed(null),
-          assertComplete: Effect.void,
-        },
-      });
-      const threadId = ThreadId.make(`thread-claude-${label}`);
-      const runtime = yield* adapter.openSession({
-        threadId,
-        providerSessionId: ProviderSessionId.make(`provider-session-claude-${label}`),
-        modelSelection: CLAUDE_TEST_MODEL_SELECTION,
-        runtimePolicy: CLAUDE_TEST_RUNTIME_POLICY,
-      });
-      const providerThread = yield* runtime.ensureThread({
-        threadId,
-        modelSelection: CLAUDE_TEST_MODEL_SELECTION,
-        runtimePolicy: CLAUDE_TEST_RUNTIME_POLICY,
-      });
-      yield* runtime.events.pipe(
-        Stream.runForEach((event) =>
-          Effect.sync(() => {
-            events.push(event);
-          }).pipe(Effect.andThen(changes.notify)),
-        ),
-        Effect.forkScoped,
-      );
-      const terminals = () => events.filter((event) => event.type === "turn.terminal");
-      const subagentStatus = (taskId: string) => {
-        const latest = events.findLast(
-          (event) =>
-            event.type === "subagent.updated" && event.subagent.nativeTaskRef?.nativeId === taskId,
-        );
-        return latest?.type === "subagent.updated" ? latest.subagent.status : undefined;
-      };
+      const harness = yield* makeWakeHarness;
       const now = yield* DateTime.now;
 
-      yield* runtime.startTurn(
+      yield* harness.runtime.startTurn(
         makeClaudeTestTurnInput({
-          threadId,
-          providerThread,
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
           now,
-          attemptId: RunAttemptId.make(`attempt-claude-${label}-a`),
-          text: "Audit the last commits in the background.",
+          attemptId: RunAttemptId.make("attempt-claude-wake-4a"),
+          text: "Run the build in the background.",
           attachments: [],
         }),
       );
-      yield* Queue.offer(
-        processQueues[0]!,
-        makeSubagentTaskStartedFrame({
-          taskId: "raced-agent",
-          toolUseId: "toolu-raced-agent",
-          uuid: "00000000-0000-4000-8000-000000002801",
+      yield* Queue.offer(harness.sdkMessages, wakeTaskStarted);
+      yield* Queue.offer(harness.sdkMessages, turnOneResult);
+      yield* harness.awaitTerminal(1);
+      yield* Queue.offer(harness.sdkMessages, wakeNotification);
+      yield* Queue.offer(harness.sdkMessages, wakeResult);
+      yield* harness.awaitContinuation(1);
+
+      yield* harness.runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now,
+          attemptId: RunAttemptId.make("attempt-claude-wake-4b"),
+          text: "How is the build going?",
+          attachments: [],
+          providerTurnOrdinal: 2,
         }),
       );
+
+      yield* harness.until(() => harness.offeredMessages.length === 2);
+      assert.lengthOf(harness.terminalEvents(), 1);
+      assert.isTrue(yield* harness.hasPendingBackgroundWork);
+
       yield* Queue.offer(
-        processQueues[0]!,
+        harness.sdkMessages,
         makeResultFrame({
-          uuid: "00000000-0000-4000-8000-000000002802",
-          result: "Launched the audit.",
+          uuid: "00000000-0000-4000-8000-000000000105",
+          result: "The build passed; nothing else pending.",
         }),
       );
-      yield* changes.until(
-        () => terminals().length === 1 && subagentStatus("raced-agent") === "running",
+      yield* harness.awaitTerminal(2);
+      assert.equal(harness.terminalEvents()[1]?.status, "completed");
+      assert.isFalse(
+        harness.events.some(
+          (event) => event.type === "message.updated" && event.message.text === WAKE_RESULT_TEXT,
+        ),
       );
 
-      const stop = yield* runtime
-        .interruptTurn({
-          providerThread,
-          providerTurnId: terminals()[0]!.providerTurnId,
-          requestRuntimeRestart: true,
-        })
-        .pipe(Effect.forkScoped);
-      yield* Deferred.await(closeRequested[0]!);
-      yield* runtime.startTurn(
+      yield* harness.runtime.startTurn(
         makeClaudeTestTurnInput({
-          threadId,
-          providerThread: { ...providerThread, status: "active" },
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
           now,
-          attemptId: RunAttemptId.make(`attempt-claude-${label}-b`),
-          text: "Resume after the limit reset.",
+          attemptId: RunAttemptId.make("attempt-claude-wake-4c"),
+          text: "Background task completed.",
           attachments: [],
-          providerTurnOrdinal: 2,
+          providerTurnOrdinal: 3,
+          messageCreatedBy: "agent",
+          messageCreationSource: "provider",
         }),
       );
-      assert.lengthOf(processQueues, 2);
-      yield* Queue.offer(
-        processQueues[1]!,
-        makeSubagentTaskStartedFrame({
-          taskId: "own-agent",
-          toolUseId: "toolu-own-agent",
-          uuid: "00000000-0000-4000-8000-000000002804",
+      yield* harness.awaitTerminal(3);
+      assert.equal(harness.terminalEvents()[2]?.status, "completed");
+      assert.lengthOf(harness.offeredMessages, 2);
+      assert.isTrue(
+        harness.events.some(
+          (event) => event.type === "message.updated" && event.message.text === WAKE_RESULT_TEXT,
+        ),
+      );
+      assert.isFalse(
+        harness.events.some(
+          (event) =>
+            event.type !== "provider_thread.updated" &&
+            JSON.stringify(event).includes(WAKE_TASK_ID),
+        ),
+      );
+      assert.isFalse(yield* harness.hasPendingBackgroundWork);
+
+      // The continuation settled with no result of its own, so a late suggestion belongs to B.
+      yield* harness.offerAndWait(
+        claudeSdkFrame({
+          type: "prompt_suggestion",
+          suggestion: "Check the build logs",
+          uuid: "00000000-0000-4000-8000-000000000692",
+          session_id: WAKE_NATIVE_SESSION,
         }),
       );
-      yield* changes.until(() => subagentStatus("own-agent") === "running");
-      const exitProcess = <E>(index: number, stopping: Fiber.Fiber<void, E>) =>
-        Queue.shutdown(processQueues[index]!).pipe(Effect.andThen(Fiber.join(stopping)));
-      return {
-        runtime,
-        threadId,
-        providerThread,
-        processQueues,
-        closeRequested,
-        changes,
-        terminals,
-        subagentStatus,
-        exitFirstProcess: exitProcess(0, stop),
-        exitProcess,
+      const userTurn = makeClaudeTestTurnInput({
+        threadId: harness.threadId,
+        providerThread: harness.providerThread,
         now,
-      };
-    });
-
-  // regression: #28331 a subagent whose process is gone must not stay running forever
-  it.effect("ends a subagent whose process a Stop closed while a new turn replaced it", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const { processQueues, changes, terminals, subagentStatus, exitFirstProcess } =
-          yield* stopRacedByReplacementTurn("raced-stop-replacement-close");
-        yield* exitFirstProcess;
-        // The replacement's result follows the stopped process's exit on the event stream.
-        yield* Queue.offer(
-          processQueues[1]!,
-          makeResultFrame({
-            uuid: "00000000-0000-4000-8000-000000002803",
-            result: "Resumed.",
-          }),
-        );
-        yield* changes.until(() => terminals().length === 2);
-
-        assert.strictEqual(
-          subagentStatus("raced-agent"),
-          "cancelled",
-          "the Stop ended the subagent's process, but the subagent is not cancelled",
-        );
-        assert.strictEqual(
-          subagentStatus("own-agent"),
-          "running",
-          "the replacement process still runs its own subagent",
-        );
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
-          ),
+        attemptId: RunAttemptId.make("attempt-claude-wake-4d"),
+        text: "Ship it.",
+        attachments: [],
+        providerTurnOrdinal: 4,
+      });
+      yield* harness.runtime.startTurn(userTurn);
+      yield* Queue.offer(
+        harness.sdkMessages,
+        makeResultFrame({ uuid: "00000000-0000-4000-8000-000000000693", result: "Shipped." }),
+      );
+      yield* harness.awaitTerminal(4);
+      yield* Queue.offer(
+        harness.sdkMessages,
+        claudeSdkFrame({
+          type: "prompt_suggestion",
+          suggestion: "Open the release notes",
+          uuid: "00000000-0000-4000-8000-000000000694",
+          session_id: WAKE_NATIVE_SESSION,
+        }),
+      );
+      yield* harness.until(() =>
+        harness.events.some((event) => event.type === "prompt_suggestion.updated"),
+      );
+      assert.deepEqual(
+        harness.events.flatMap((event) =>
+          event.type === "prompt_suggestion.updated" ? [[event.runId, event.text]] : [],
         ),
-      ),
-    ),
-  );
-
-  // regression: #28331 Stop must clear a subagent whose process is gone
-  it.effect("stops a subagent whose process a Stop closed while a new turn replaced it", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const { runtime, providerThread, exitFirstProcess } = yield* stopRacedByReplacementTurn(
-          "raced-stop-replacement-stop-subagent",
-        );
-        yield* exitFirstProcess;
-        const stopped = yield* runtime.stopSubagent!({
-          providerThread: { ...providerThread, status: "active" },
-          nativeTaskId: "raced-agent",
-        }).pipe(
-          Effect.map((outcome) => outcome?.status ?? "no outcome"),
-          Effect.catch((error) =>
-            Effect.succeed(`refused: ${"detail" in error ? error.detail : error.message}`),
-          ),
-        );
-
-        assert.strictEqual(stopped, "cancelled", "Stop of a subagent whose process is gone");
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
-          ),
+        [[userTurn.runId, "Open the release notes"]],
+      );
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
         ),
       ),
     ),
   );
 
-  // regression: #28331 a process that exits late ends only the subagents it ran
-  it.effect("leaves a stopping replacement's subagent to that replacement's exit", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const {
-          runtime,
-          threadId,
-          providerThread,
-          processQueues,
-          closeRequested,
-          changes,
-          terminals,
-          subagentStatus,
-          exitFirstProcess,
-          exitProcess,
+  it.effect("settles a continuation whose wake turn a user turn absorbed", () =>
+    Effect.gen(function* () {
+      const harness = yield* makeWakeHarness;
+      const now = yield* DateTime.now;
+
+      yield* harness.runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
           now,
-        } = yield* stopRacedByReplacementTurn("raced-stop-replacement-chain");
-        const activeThread = { ...providerThread, status: "active" as const };
-        const finishTurn = (index: number, turns: number, uuid: string) =>
-          Queue.offer(processQueues[index]!, makeResultFrame({ uuid, result: "Done." })).pipe(
-            Effect.andThen(changes.until(() => terminals().length === turns)),
-          );
-        const startTurn = (label: string, providerTurnOrdinal: number) =>
-          runtime.startTurn(
-            makeClaudeTestTurnInput({
-              threadId,
-              providerThread: activeThread,
-              now,
-              attemptId: RunAttemptId.make(`attempt-claude-raced-stop-replacement-chain-${label}`),
-              text: "Carry on.",
-              attachments: [],
-              providerTurnOrdinal,
-            }),
-          );
+          attemptId: RunAttemptId.make("attempt-claude-wake-absorbed-1"),
+          text: "Run the build in the background.",
+          attachments: [],
+        }),
+      );
+      yield* Queue.offer(harness.sdkMessages, wakeTaskStarted);
+      yield* Queue.offer(harness.sdkMessages, wakeNotification);
+      yield* Queue.offer(harness.sdkMessages, turnOneResult);
+      yield* harness.awaitTerminal(1);
+      yield* harness.offerAndWait(wakeTurnInit);
+      yield* harness.offerAndWait(wakeAssistant);
+      yield* harness.awaitContinuation(1);
 
-        yield* finishTurn(1, 2, "00000000-0000-4000-8000-000000002805");
-        const stopSecond = yield* runtime
-          .interruptTurn({
-            providerThread: activeThread,
-            providerTurnId: terminals()[1]!.providerTurnId,
-            requestRuntimeRestart: true,
-          })
-          .pipe(Effect.forkScoped);
-        yield* Deferred.await(closeRequested[1]!);
-        yield* startTurn("c", 3);
-        assert.lengthOf(processQueues, 3);
-
-        yield* exitFirstProcess;
-        yield* finishTurn(2, 3, "00000000-0000-4000-8000-000000002806");
-        assert.strictEqual(
-          subagentStatus("raced-agent"),
-          "cancelled",
-          "the first process exited after a Stop, but its subagent is not cancelled",
-        );
-        assert.strictEqual(
-          subagentStatus("own-agent"),
-          "running",
-          "the first process ended a subagent the second process still ran",
-        );
+      // Claude folds this prompt into the wake turn it already opened, so one result ends both.
+      yield* harness.runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now,
+          attemptId: RunAttemptId.make("attempt-claude-wake-absorbed-2"),
+          text: "Any update on the pull request?",
+          attachments: [],
+          providerTurnOrdinal: 2,
+        }),
+      );
+      yield* harness.until(() => harness.offeredMessages.length === 2);
+      yield* Queue.offer(
+        harness.sdkMessages,
+        makeResultFrame({
+          uuid: "00000000-0000-4000-8000-000000000140",
+          result: "Checks passed and the pull request is up to date.",
+        }),
+      );
+      yield* harness.awaitTerminal(2);
 
-        yield* exitProcess(1, stopSecond);
-        yield* startTurn("d", 4);
-        yield* finishTurn(2, 4, "00000000-0000-4000-8000-000000002807");
-        assert.strictEqual(
-          subagentStatus("own-agent"),
-          "cancelled",
-          "the second process exited after a Stop, but its subagent is not cancelled",
-        );
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
-          ),
+      yield* harness.runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now,
+          attemptId: RunAttemptId.make("attempt-claude-wake-absorbed-3"),
+          text: "Background task completed.",
+          attachments: [],
+          providerTurnOrdinal: 3,
+          messageCreatedBy: "agent",
+          messageCreationSource: "provider",
+        }),
+      );
+      yield* harness.awaitTerminal(3);
+      assert.equal(harness.terminalEvents()[2]?.status, "completed");
+      assert.isTrue(
+        harness.events.some(
+          (event) => event.type === "message.updated" && event.message.text === WAKE_ASSISTANT_TEXT,
+        ),
+      );
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
         ),
       ),
     ),
   );
 
-  it.effect("streams a background subagent's work while the root turn is idle", () =>
-    Effect.scoped(
+  it.effect.each(["before", "after"] as const)(
+    "offers a later wake when a wake a user turn absorbed is cancelled %s that turn ends",
+    (cancelled) =>
       Effect.gen(function* () {
-        const TASK_ID = "task-live-idle";
-        const TOOL_USE_ID = "toolu-live-idle";
-        const STRADDLING_BASH = "toolu-live-straddling-bash";
-        const IDLE_BASH = "toolu-live-idle-bash";
+        const SECOND_TASK_ID = "b2ndwake";
+        const SECOND_TOOL_USE_ID = "toolu_second_wake";
         const harness = yield* makeWakeHarness;
         const now = yield* DateTime.now;
-        const latestToolItem = (nativeId: string) =>
-          harness.events.findLast(
-            (event) =>
-              event.type === "turn_item.updated" &&
-              event.turnItem.nativeItemRef?.nativeId === nativeId,
-          );
+
         yield* harness.runtime.startTurn(
           makeClaudeTestTurnInput({
             threadId: harness.threadId,
             providerThread: harness.providerThread,
             now,
-            attemptId: RunAttemptId.make("attempt-claude-live-idle-1"),
-            text: "Audit in the background.",
+            attemptId: RunAttemptId.make("attempt-claude-wake-absorbed-cancel-1"),
+            text: "Run two builds in the background.",
             attachments: [],
           }),
         );
-        for (const frame of [
-          makeSubagentTaskStartedFrame({
-            taskId: TASK_ID,
-            toolUseId: TOOL_USE_ID,
-            uuid: "00000000-0000-4000-8000-000000000951",
+        yield* Queue.offer(harness.sdkMessages, wakeTaskStarted);
+        yield* Queue.offer(
+          harness.sdkMessages,
+          claudeSdkFrame({
+            ...wakeTaskStarted,
+            task_id: SECOND_TASK_ID,
+            tool_use_id: SECOND_TOOL_USE_ID,
+            uuid: "00000000-0000-4000-8000-000000000191",
           }),
-          ...makeSubagentAssistantFrames({
-            parentToolUseId: TOOL_USE_ID,
-            uuid: "00000000-0000-4000-8000-000000000952",
-            bashToolUseId: STRADDLING_BASH,
+        );
+        yield* Queue.offer(harness.sdkMessages, wakeNotification);
+        yield* Queue.offer(harness.sdkMessages, turnOneResult);
+        yield* harness.awaitTerminal(1);
+        yield* harness.offerAndWait(wakeTurnInit);
+        yield* harness.offerAndWait(wakeAssistant);
+        yield* harness.awaitContinuation(1);
+
+        yield* harness.runtime.startTurn(
+          makeClaudeTestTurnInput({
+            threadId: harness.threadId,
+            providerThread: harness.providerThread,
+            now,
+            attemptId: RunAttemptId.make("attempt-claude-wake-absorbed-cancel-2"),
+            text: "Any update on the pull request?",
+            attachments: [],
+            providerTurnOrdinal: 2,
           }),
+        );
+        yield* harness.until(() => harness.offeredMessages.length === 2);
+        if (cancelled === "before") {
+          yield* harness.continuationRequests[0]!.onRunEndedWithoutStarting!();
+        }
+        yield* Queue.offer(
+          harness.sdkMessages,
           makeResultFrame({
-            uuid: "00000000-0000-4000-8000-000000000953",
-            result: "Auditing in the background.",
+            uuid: "00000000-0000-4000-8000-000000000192",
+            result: "Checks passed and the pull request is up to date.",
           }),
-        ]) {
-          yield* Queue.offer(harness.sdkMessages, frame);
+        );
+        yield* harness.awaitTerminal(2);
+        if (cancelled === "after") {
+          yield* harness.continuationRequests[0]!.onRunEndedWithoutStarting!();
         }
-        yield* harness.awaitTerminal(1);
 
-        for (const frame of [
-          makeSubagentToolResultFrame({
-            parentToolUseId: TOOL_USE_ID,
-            uuid: "00000000-0000-4000-8000-000000000954",
-            toolUseId: STRADDLING_BASH,
-          }),
-          ...makeSubagentAssistantFrames({
-            parentToolUseId: TOOL_USE_ID,
-            uuid: "00000000-0000-4000-8000-000000000955",
-            text: "Still auditing.",
-            bashToolUseId: IDLE_BASH,
-          }),
+        yield* harness.offerAndWait(
           claudeSdkFrame({
-            type: "system",
-            subtype: "task_progress",
-            task_id: TASK_ID,
-            description: "Reading the last commits",
-            uuid: "00000000-0000-4000-8000-000000000956",
-            session_id: WAKE_NATIVE_SESSION,
+            ...wakeNotification,
+            task_id: SECOND_TASK_ID,
+            tool_use_id: SECOND_TOOL_USE_ID,
+            output_file: `/tmp/claude-replay/tasks/${SECOND_TASK_ID}.output`,
+            uuid: "00000000-0000-4000-8000-000000000193",
           }),
-        ]) {
-          yield* Queue.offer(harness.sdkMessages, frame);
-        }
-        yield* harness.until(() => {
-          const event = latestToolItem(IDLE_BASH);
-          return event?.type === "turn_item.updated" && event.turnItem.status === "running";
-        });
-        yield* harness.until(() =>
-          harness.events.some(
-            (event) =>
-              event.type === "subagent.updated" &&
-              event.subagent.progress === "Reading the last commits",
-          ),
         );
-        const routing = subagentRouting(harness.events, [STRADDLING_BASH, IDLE_BASH]);
-        assert.deepEqual(routing.assistantTexts(routing.childThreadId), ["Still auditing."]);
-        const straddling = latestToolItem(STRADDLING_BASH);
-        const straddlingItem =
-          straddling?.type === "turn_item.updated" ? straddling.turnItem : undefined;
-        assert.equal(straddlingItem?.status, "completed");
-        assert.equal(
-          straddlingItem?.type === "command_execution" ? straddlingItem.input : undefined,
-          "git log -5",
-        );
-        assert.equal(harness.continuationRequests.length, 0);
-
-        for (const frame of [
-          makeSubagentToolResultFrame({
-            parentToolUseId: TOOL_USE_ID,
-            uuid: "00000000-0000-4000-8000-000000000957",
-            toolUseId: IDLE_BASH,
-          }),
-          makeSubagentNotificationFrame({
-            taskId: TASK_ID,
-            toolUseId: TOOL_USE_ID,
-            summary: "Still auditing.",
-            uuid: "00000000-0000-4000-8000-000000000958",
-          }),
-        ]) {
-          yield* Queue.offer(harness.sdkMessages, frame);
-        }
-        yield* harness.awaitContinuation(1);
-        yield* Queue.offer(
-          harness.sdkMessages,
-          makeResultFrame({
-            uuid: "00000000-0000-4000-8000-000000000959",
-            result: "The auditor finished.",
-          }),
-        );
-        yield* harness.runtime.startTurn(
-          makeClaudeTestTurnInput({
-            threadId: harness.threadId,
-            providerThread: harness.providerThread,
-            now,
-            attemptId: RunAttemptId.make("attempt-claude-live-idle-2"),
-            text: "Background task completed.",
-            attachments: [],
-            providerTurnOrdinal: 2,
-            messageCreatedBy: "agent",
-            messageCreationSource: "provider",
-          }),
-        );
-        yield* harness.awaitTerminal(2);
-
-        const finalRouting = subagentRouting(harness.events, [STRADDLING_BASH, IDLE_BASH]);
-        assert.deepEqual(finalRouting.assistantTexts(finalRouting.childThreadId), [
-          "Still auditing.",
-        ]);
-        for (const nativeId of [STRADDLING_BASH, IDLE_BASH]) {
-          assert.deepEqual(
-            [...(finalRouting.toolThreadIds.get(nativeId) ?? [])],
-            [finalRouting.childThreadId],
-          );
-          const statuses = harness.events.flatMap((event) =>
-            event.type === "turn_item.updated" &&
-            event.turnItem.nativeItemRef?.nativeId === nativeId
-              ? [`${event.turnItem.type}:${event.turnItem.status}`]
-              : [],
-          );
-          assert.deepEqual(statuses, ["command_execution:running", "command_execution:completed"]);
-        }
-        const finalSubagent = harness.events.findLast((event) => event.type === "subagent.updated");
-        assert.equal(
-          finalSubagent?.type === "subagent.updated" && finalSubagent.subagent.status,
-          "completed",
+        yield* harness.offerAndWait(
+          claudeSdkFrame({ ...wakeTurnInit, uuid: "00000000-0000-4000-8000-000000000194" }),
         );
+        assert.lengthOf(harness.continuationRequests, 2, "the later wake must be offered");
       }).pipe(
         Effect.provide(
           Layer.mergeAll(
@@ -16403,185 +15434,141 @@ describe("ClaudeAdapterV2 background wake turns", () => {
           ),
         ),
       ),
+  );
+
+  it.effect("ignores a zero-turn task-notification origin result during a normal user turn", () =>
+    Effect.gen(function* () {
+      const harness = yield* makeWakeHarness;
+      const now = yield* DateTime.now;
+      const probeAssistantText = "Probe after stale task-notification result.";
+      const recoveryAssistantText = "Recovered after the interrupt; continuing.";
+      const staleResultText = STALE_TASK_NOTIFICATION_RESULT_TEXT;
+      const hasMessageText = (text: string) =>
+        harness.events.some(
+          (event) => event.type === "message.updated" && event.message.text === text,
+        );
+
+      yield* harness.runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now,
+          attemptId: RunAttemptId.make("attempt-claude-stale-notif-1"),
+          text: "Continue after interrupt.",
+          attachments: [],
+        }),
+      );
+      yield* harness.until(() => harness.offeredMessages.length === 1);
+
+      // After interrupt recovery, stale task notifications and their results can precede the root stream.
+      yield* Queue.offer(
+        harness.sdkMessages,
+        claudeSdkFrame({
+          type: "system",
+          subtype: "task_notification",
+          task_id: "task-stale-stopped",
+          tool_use_id: "toolu-stale-stopped",
+          status: "stopped",
+          output_file: "/tmp/task-stale-stopped.log",
+          summary: "",
+          uuid: "00000000-0000-4000-8000-000000000107",
+          session_id: WAKE_NATIVE_SESSION,
+        }),
+      );
+      yield* Queue.offer(harness.sdkMessages, staleTaskNotificationResult);
+      yield* Queue.offer(
+        harness.sdkMessages,
+        makeAssistantTextFrame({
+          uuid: "00000000-0000-4000-8000-00000000010a",
+          text: probeAssistantText,
+        }),
+      );
+
+      yield* harness.until(() => hasMessageText(probeAssistantText));
+      assert.lengthOf(harness.terminalEvents(), 0);
+      assert.isFalse(hasMessageText(staleResultText));
+
+      yield* Queue.offer(
+        harness.sdkMessages,
+        makeAssistantTextFrame({
+          uuid: "00000000-0000-4000-8000-000000000108",
+          text: recoveryAssistantText,
+        }),
+      );
+      yield* Queue.offer(
+        harness.sdkMessages,
+        makeResultFrame({
+          uuid: "00000000-0000-4000-8000-000000000109",
+          result: recoveryAssistantText,
+        }),
+      );
+
+      yield* harness.awaitTerminal(1);
+      assert.equal(harness.terminalEvents()[0]?.status, "completed");
+      assert.isTrue(hasMessageText(recoveryAssistantText));
+      assert.isFalse(hasMessageText(staleResultText));
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
+        ),
+      ),
     ),
   );
 
-  it.effect("keeps a nested subagent's launch in order while the root turn is idle", () =>
-    Effect.scoped(
+  it.effect(
+    "emits one interrupted terminal for a positive task-notification result racing interrupt",
+    () =>
       Effect.gen(function* () {
-        const OUTER_TASK_ID = "task-idle-outer";
-        const OUTER_TOOL_USE_ID = "toolu-idle-outer";
-        const NESTED_TASK_ID = "task-idle-nested";
-        const NESTED_TOOL_USE_ID = "toolu-idle-nested";
-        const harness = yield* makeWakeHarness;
+        const closeGate = yield* Deferred.make<void>();
+        const testScope = yield* Scope.Scope;
+        yield* Scope.addFinalizer(testScope, Deferred.succeed(closeGate, undefined));
+        const interruptStarted = yield* Deferred.make<void>();
+        const harness = yield* makeWakeHarnessWithOptions({
+          close: (sdkMessages) =>
+            Deferred.await(closeGate).pipe(Effect.andThen(Queue.shutdown(sdkMessages))),
+          stopTask: () => Effect.void,
+          interrupt: Deferred.succeed(interruptStarted, undefined),
+        });
+        const idAllocator = yield* IdAllocator.IdAllocatorV2;
         const now = yield* DateTime.now;
+        const attemptId = RunAttemptId.make("attempt-claude-interrupt-positive-notif");
+        const providerTurnId = idAllocator.derive.providerTurn({
+          driver: ClaudeAdapterV2.CLAUDE_PROVIDER,
+          nativeTurnId: `turn:${attemptId}`,
+        });
+
         yield* harness.runtime.startTurn(
           makeClaudeTestTurnInput({
             threadId: harness.threadId,
             providerThread: harness.providerThread,
             now,
-            attemptId: RunAttemptId.make("attempt-claude-idle-nested-1"),
-            text: "Audit in the background.",
+            attemptId,
+            text: "Stop this task.",
             attachments: [],
           }),
         );
-        for (const frame of [
-          makeSubagentTaskStartedFrame({
-            taskId: OUTER_TASK_ID,
-            toolUseId: OUTER_TOOL_USE_ID,
-            uuid: "00000000-0000-4000-8000-000000000971",
-          }),
-          makeResultFrame({
-            uuid: "00000000-0000-4000-8000-000000000972",
-            result: "Auditing in the background.",
-          }),
-        ]) {
-          yield* Queue.offer(harness.sdkMessages, frame);
-        }
-        yield* harness.awaitTerminal(1);
-
-        for (const frame of [
-          claudeSdkFrame({
-            type: "assistant",
-            message: {
-              model: "claude-sonnet-4-6",
-              id: "msg_idle_nested_launch",
-              type: "message",
-              role: "assistant",
-              content: [
-                {
-                  type: "tool_use",
-                  id: NESTED_TOOL_USE_ID,
-                  name: "Agent",
-                  input: { description: "Nested check", prompt: "Reply with NESTED_OK" },
-                },
-              ],
-            },
-            parent_tool_use_id: OUTER_TOOL_USE_ID,
-            uuid: "00000000-0000-4000-8000-000000000973",
-            session_id: WAKE_NATIVE_SESSION,
-          }),
-          claudeSdkFrame({
-            type: "system",
-            subtype: "task_started",
-            task_id: NESTED_TASK_ID,
-            tool_use_id: NESTED_TOOL_USE_ID,
-            description: "Nested check",
-            subagent_type: "general-purpose",
-            is_backgrounded: false,
-            spawn_depth: 2,
-            task_type: "local_agent",
-            prompt: "Reply with NESTED_OK",
-            uuid: "00000000-0000-4000-8000-000000000974",
-            session_id: WAKE_NATIVE_SESSION,
-          }),
-          claudeSdkFrame({
-            type: "system",
-            subtype: "task_progress",
-            task_id: OUTER_TASK_ID,
-            description: "Waiting on the nested check",
-            uuid: "00000000-0000-4000-8000-000000000984",
-            session_id: WAKE_NATIVE_SESSION,
-          }),
-          ...makeSubagentAssistantFrames({
-            parentToolUseId: OUTER_TOOL_USE_ID,
-            uuid: "00000000-0000-4000-8000-000000000988",
-            messageId: "msg_idle_outer_working",
-            text: "OUTER_WORKING",
-          }),
-        ]) {
-          yield* Queue.offer(harness.sdkMessages, frame);
-        }
-        yield* harness.until(() =>
-          harness.events.some(
-            (event) => event.type === "message.updated" && event.message.text === "OUTER_WORKING",
-          ),
-        );
-        assert.lengthOf(harness.continuationRequests, 0);
-        for (const frame of [
-          ...makeSubagentAssistantFrames({
-            parentToolUseId: NESTED_TOOL_USE_ID,
-            uuid: "00000000-0000-4000-8000-000000000975",
-            text: "NESTED_OK",
-          }),
-          makeSubagentNotificationFrame({
-            taskId: NESTED_TASK_ID,
-            toolUseId: NESTED_TOOL_USE_ID,
-            summary: "NESTED_OK",
-            uuid: "00000000-0000-4000-8000-000000000976",
-          }),
-          makeSubagentToolResultFrame({
-            parentToolUseId: OUTER_TOOL_USE_ID,
-            uuid: "00000000-0000-4000-8000-000000000977",
-            toolUseId: NESTED_TOOL_USE_ID,
-          }),
-          ...makeSubagentAssistantFrames({
-            parentToolUseId: OUTER_TOOL_USE_ID,
-            uuid: "00000000-0000-4000-8000-000000000978",
-            text: "OUTER_DONE",
-          }),
-          makeSubagentNotificationFrame({
-            taskId: OUTER_TASK_ID,
-            toolUseId: OUTER_TOOL_USE_ID,
-            summary: "OUTER_DONE",
-            uuid: "00000000-0000-4000-8000-000000000979",
-          }),
-        ]) {
-          yield* Queue.offer(harness.sdkMessages, frame);
-        }
-        yield* harness.awaitContinuation(1);
-        yield* harness.until(() =>
-          harness.events.some(
-            (event) =>
-              event.type === "subagent.updated" &&
-              event.subagent.progress === "Waiting on the nested check",
-          ),
-        );
+        yield* harness.runtime
+          .interruptTurn({ providerThread: harness.providerThread, providerTurnId })
+          .pipe(Effect.forkScoped);
+        yield* Deferred.await(interruptStarted);
         yield* Queue.offer(
           harness.sdkMessages,
           makeResultFrame({
-            uuid: "00000000-0000-4000-8000-000000000980",
-            result: "The audit finished.",
-          }),
-        );
-        yield* harness.runtime.startTurn(
-          makeClaudeTestTurnInput({
-            threadId: harness.threadId,
-            providerThread: harness.providerThread,
-            now,
-            attemptId: RunAttemptId.make("attempt-claude-idle-nested-2"),
-            text: "Background task completed.",
-            attachments: [],
-            providerTurnOrdinal: 2,
-            messageCreatedBy: "agent",
-            messageCreationSource: "provider",
+            uuid: "00000000-0000-4000-8000-000000000115",
+            result: "Late result after interrupt.",
+            numTurns: 7,
+            origin: { kind: "task-notification" },
           }),
         );
-        yield* harness.awaitTerminal(2);
-
-        assert.isFalse(
-          harness.events.some(
-            (event) =>
-              event.type === "turn_item.updated" &&
-              event.turnItem.nativeItemRef?.nativeId === NESTED_TOOL_USE_ID,
-          ),
-        );
-        const finalSubagents = new Map(
-          harness.events.flatMap((event) =>
-            event.type === "subagent.updated"
-              ? [[event.subagent.nativeTaskRef?.nativeId, event.subagent] as const]
-              : [],
-          ),
-        );
-        const outer = finalSubagents.get(OUTER_TASK_ID);
-        const nested = finalSubagents.get(NESTED_TASK_ID);
-        assert.equal(outer?.status, "completed");
-        assert.equal(nested?.status, "completed");
-        assert.equal(nested?.parentNodeId, outer?.id);
-        assert.deepEqual(
-          subagentRouting(harness.events, []).assistantTexts(outer?.childThreadId ?? undefined),
-          ["OUTER_WORKING", "OUTER_DONE"],
-        );
+        const terminalized = Exit.isSuccess(yield* harness.awaitTerminal(1).pipe(Effect.exit));
+        yield* Deferred.succeed(closeGate, undefined);
+        assert.isTrue(terminalized);
+        assert.equal(harness.terminalEvents()[0]?.status, "interrupted");
+        assert.lengthOf(harness.terminalEvents(), 1);
       }).pipe(
         Effect.provide(
           Layer.mergeAll(
@@ -16592,319 +15579,273 @@ describe("ClaudeAdapterV2 background wake turns", () => {
           ),
         ),
       ),
-    ),
   );
 
-  it.effect("ends an earlier turn's nested subagent while the root turn is idle", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const OUTER_TASK_ID = "task-earlier-outer";
-        const OUTER_TOOL_USE_ID = "toolu-earlier-outer";
-        const NESTED_TASK_ID = "task-earlier-nested";
-        const NESTED_TOOL_USE_ID = "toolu-earlier-nested";
-        const harness = yield* makeWakeHarness;
-        const now = yield* DateTime.now;
-        const userTurn = (attemptId: string, providerTurnOrdinal: number) =>
-          harness.runtime.startTurn(
-            makeClaudeTestTurnInput({
-              threadId: harness.threadId,
-              providerThread: harness.providerThread,
-              now,
-              attemptId: RunAttemptId.make(attemptId),
-              text: "Keep auditing.",
-              attachments: [],
-              providerTurnOrdinal,
-            }),
-          );
-        yield* userTurn("attempt-claude-earlier-nested-1", 1);
-        for (const frame of [
-          makeSubagentTaskStartedFrame({
-            taskId: OUTER_TASK_ID,
-            toolUseId: OUTER_TOOL_USE_ID,
-            uuid: "00000000-0000-4000-8000-000000000a01",
-          }),
-          claudeSdkFrame({
-            type: "assistant",
-            message: {
-              model: "claude-sonnet-4-6",
-              id: "msg_earlier_nested_launch",
-              type: "message",
-              role: "assistant",
-              content: [
-                {
-                  type: "tool_use",
-                  id: NESTED_TOOL_USE_ID,
-                  name: "Agent",
-                  input: { description: "Nested check", prompt: "Reply with NESTED_OK" },
-                },
-              ],
-            },
-            parent_tool_use_id: OUTER_TOOL_USE_ID,
-            uuid: "00000000-0000-4000-8000-000000000a02",
-            session_id: WAKE_NATIVE_SESSION,
-          }),
-          claudeSdkFrame({
-            type: "system",
-            subtype: "task_started",
-            task_id: NESTED_TASK_ID,
-            tool_use_id: NESTED_TOOL_USE_ID,
-            description: "Nested check",
-            subagent_type: "general-purpose",
-            is_backgrounded: false,
-            spawn_depth: 2,
-            task_type: "local_agent",
-            prompt: "Reply with NESTED_OK",
-            uuid: "00000000-0000-4000-8000-000000000a03",
-            session_id: WAKE_NATIVE_SESSION,
-          }),
-          makeResultFrame({
-            uuid: "00000000-0000-4000-8000-000000000a04",
-            result: "Auditing in the background.",
-          }),
-        ]) {
-          yield* Queue.offer(harness.sdkMessages, frame);
-        }
-        yield* harness.awaitTerminal(1);
-        yield* userTurn("attempt-claude-earlier-nested-2", 2);
-        yield* Queue.offer(
-          harness.sdkMessages,
-          makeResultFrame({ uuid: "00000000-0000-4000-8000-000000000a05", result: "Still on it." }),
-        );
-        yield* harness.awaitTerminal(2);
+  it.effect("settles a continuation turn immediately when no wake output is buffered", () =>
+    Effect.gen(function* () {
+      const harness = yield* makeWakeHarness;
+      const now = yield* DateTime.now;
 
-        for (const frame of [
-          makeSubagentNotificationFrame({
-            taskId: NESTED_TASK_ID,
-            toolUseId: NESTED_TOOL_USE_ID,
-            summary: "NESTED_OK",
-            uuid: "00000000-0000-4000-8000-000000000a06",
-          }),
-          makeSubagentToolResultFrame({
-            parentToolUseId: OUTER_TOOL_USE_ID,
-            uuid: "00000000-0000-4000-8000-000000000a07",
-            toolUseId: NESTED_TOOL_USE_ID,
-          }),
-          ...makeSubagentAssistantFrames({
-            parentToolUseId: OUTER_TOOL_USE_ID,
-            uuid: "00000000-0000-4000-8000-000000000a08",
-            text: "OUTER_AFTER_NESTED",
-          }),
-        ]) {
-          yield* Queue.offer(harness.sdkMessages, frame);
-        }
-        yield* harness.until(() =>
-          harness.events.some(
-            (event) =>
-              event.type === "message.updated" && event.message.text === "OUTER_AFTER_NESTED",
-          ),
-        );
+      yield* harness.runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now,
+          attemptId: RunAttemptId.make("attempt-claude-wake-3"),
+          text: "Background task completed.",
+          attachments: [],
+          messageCreatedBy: "agent",
+          messageCreationSource: "provider",
+        }),
+      );
 
-        assert.isFalse(
-          harness.events.some(
-            (event) =>
-              event.type === "turn_item.updated" &&
-              event.turnItem.nativeItemRef?.nativeId === NESTED_TOOL_USE_ID,
-          ),
-        );
-        const nested = harness.events.findLast(
-          (event) =>
-            event.type === "subagent.updated" &&
-            event.subagent.nativeTaskRef?.nativeId === NESTED_TASK_ID,
-        );
-        assert.equal(nested?.type === "subagent.updated" && nested.subagent.status, "completed");
-        assert.lengthOf(harness.continuationRequests, 0);
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
-          ),
+      yield* harness.awaitTerminal(1);
+      assert.equal(harness.terminalEvents()[0]?.status, "completed");
+      assert.lengthOf(harness.offeredMessages, 0);
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
         ),
       ),
     ),
   );
 
-  it.effect("keeps an idle-launched nested subagent completed through a sibling's wake", () =>
-    Effect.scoped(
+  const makeSubagentAssistantFrames = (input: {
+    readonly parentToolUseId: string;
+    readonly uuid: string;
+    readonly messageId?: string;
+    readonly text?: string;
+    readonly bashToolUseId?: string;
+  }): ReadonlyArray<SDKMessage> =>
+    [
+      ...(input.text === undefined ? [] : [{ type: "text", text: input.text }]),
+      ...(input.bashToolUseId === undefined
+        ? []
+        : [
+            {
+              type: "tool_use",
+              id: input.bashToolUseId,
+              name: "Bash",
+              input: { command: "git log -5" },
+            },
+          ]),
+    ].map((block, index) =>
+      claudeSdkFrame({
+        type: "assistant",
+        message: {
+          model: "claude-sonnet-4-6",
+          id: input.messageId ?? `msg_${input.uuid}`,
+          type: "message",
+          role: "assistant",
+          content: [block],
+        },
+        parent_tool_use_id: input.parentToolUseId,
+        uuid: index === 0 ? input.uuid : `${input.uuid}:${index}`,
+        session_id: WAKE_NATIVE_SESSION,
+      }),
+    );
+  const makeSubagentToolResultFrame = (input: {
+    readonly parentToolUseId: string;
+    readonly uuid: string;
+    readonly toolUseId: string;
+  }) =>
+    claudeSdkFrame({
+      type: "user",
+      message: {
+        role: "user",
+        content: [{ type: "tool_result", tool_use_id: input.toolUseId, content: "ok" }],
+      },
+      parent_tool_use_id: input.parentToolUseId,
+      uuid: input.uuid,
+      session_id: WAKE_NATIVE_SESSION,
+    });
+  const makeSubagentTaskStartedFrame = (input: {
+    readonly taskId: string;
+    readonly toolUseId: string;
+    readonly uuid: string;
+  }) =>
+    claudeSdkFrame({
+      type: "system",
+      subtype: "task_started",
+      task_id: input.taskId,
+      tool_use_id: input.toolUseId,
+      description: "Audit recent commits",
+      subagent_type: "general-purpose",
+      is_backgrounded: true,
+      task_type: "local_agent",
+      prompt: "Audit the last five commits.",
+      uuid: input.uuid,
+      session_id: WAKE_NATIVE_SESSION,
+    });
+  const makeSubagentNotificationFrame = (input: {
+    readonly taskId: string;
+    readonly toolUseId: string;
+    readonly summary: string;
+    readonly uuid: string;
+  }) =>
+    claudeSdkFrame({
+      type: "system",
+      subtype: "task_notification",
+      task_id: input.taskId,
+      tool_use_id: input.toolUseId,
+      status: "completed",
+      output_file: `/tmp/${input.taskId}.output`,
+      summary: input.summary,
+      uuid: input.uuid,
+      session_id: WAKE_NATIVE_SESSION,
+    });
+  const subagentRouting = (
+    events: ReadonlyArray<ProviderAdapter.ProviderAdapterV2Event>,
+    nativeToolIds: ReadonlyArray<string>,
+  ) => {
+    const childThreadId =
+      events.find((event) => event.type === "subagent.updated")?.subagent.childThreadId ??
+      undefined;
+    const toolThreadIds = new Map<string, Set<string>>();
+    for (const event of events) {
+      const nativeId =
+        event.type === "turn_item.updated" ? event.turnItem.nativeItemRef?.nativeId : undefined;
+      if (event.type === "turn_item.updated" && nativeId && nativeToolIds.includes(nativeId)) {
+        toolThreadIds.set(
+          nativeId,
+          (toolThreadIds.get(nativeId) ?? new Set()).add(event.turnItem.threadId),
+        );
+      }
+    }
+    const assistantTexts = (threadId: string | undefined) =>
+      events.flatMap((event) =>
+        event.type === "message.updated" &&
+        event.message.role === "assistant" &&
+        event.message.threadId === threadId
+          ? [event.message.text]
+          : [],
+      );
+    return { childThreadId, toolThreadIds, assistantTexts };
+  };
+
+  it.effect.each([
+    { label: "an empty one", quotaFailureFirst: false },
+    { label: "a quota failure and an empty one", quotaFailureFirst: true },
+  ])(
+    "keeps the wake run open for the turn Claude opens right after $label",
+    ({ quotaFailureFirst }) =>
       Effect.gen(function* () {
-        const OUTER_TASK_ID = "task-16355-outer";
-        const OUTER_TOOL_USE_ID = "toolu-16355-outer";
-        const NESTED_TASK_ID = "task-16355-nested";
-        const NESTED_TOOL_USE_ID = "toolu-16355-nested";
-        const SIBLING_TASK_ID = "task-16355-sibling";
-        const SIBLING_TOOL_USE_ID = "toolu-16355-sibling";
         const harness = yield* makeWakeHarness;
         const now = yield* DateTime.now;
-        const nestedStatuses = () =>
-          harness.events.flatMap((event) =>
-            event.type === "subagent.updated" &&
-            event.subagent.nativeTaskRef?.nativeId === NESTED_TASK_ID
-              ? [event.subagent.status]
-              : [],
-          );
+        const subagents = [
+          { taskId: "task-wake-pair-a", toolUseId: "toolu_wake_pair_a" },
+          { taskId: "task-wake-pair-b", toolUseId: "toolu_wake_pair_b" },
+        ];
+        const wakeAttempt = RunAttemptId.make("attempt-claude-wake-pair-2");
+
         yield* harness.runtime.startTurn(
           makeClaudeTestTurnInput({
             threadId: harness.threadId,
             providerThread: harness.providerThread,
             now,
-            attemptId: RunAttemptId.make("attempt-claude-16355-1"),
-            text: "Run two audits in the background.",
+            attemptId: RunAttemptId.make("attempt-claude-wake-pair-1"),
+            text: "Audit both in the background.",
             attachments: [],
           }),
         );
-        for (const frame of [
-          makeSubagentTaskStartedFrame({
-            taskId: OUTER_TASK_ID,
-            toolUseId: OUTER_TOOL_USE_ID,
-            uuid: "00000000-0000-4000-8000-000000016301",
-          }),
-          makeSubagentTaskStartedFrame({
-            taskId: SIBLING_TASK_ID,
-            toolUseId: SIBLING_TOOL_USE_ID,
-            uuid: "00000000-0000-4000-8000-000000016302",
-          }),
-          makeResultFrame({
-            uuid: "00000000-0000-4000-8000-000000016303",
-            result: "Both audits run in the background.",
-          }),
-        ]) {
-          yield* Queue.offer(harness.sdkMessages, frame);
+        for (const [index, subagent] of subagents.entries()) {
+          yield* Queue.offer(
+            harness.sdkMessages,
+            makeSubagentTaskStartedFrame({
+              ...subagent,
+              uuid: `00000000-0000-4000-8000-00000000095${index}`,
+            }),
+          );
         }
+        yield* Queue.offer(
+          harness.sdkMessages,
+          makeResultFrame({ uuid: "00000000-0000-4000-8000-000000000952", result: "Started." }),
+        );
         yield* harness.awaitTerminal(1);
 
-        // The background subagent launches a foreground nested one while the root is idle.
-        for (const frame of [
-          claudeSdkFrame({
-            type: "assistant",
-            message: {
-              model: "claude-sonnet-4-6",
-              id: "msg_16355_nested_launch",
-              type: "message",
-              role: "assistant",
-              content: [
-                {
-                  type: "tool_use",
-                  id: NESTED_TOOL_USE_ID,
-                  name: "Agent",
-                  input: { description: "Nested check", prompt: "Sleep, then reply NESTED_OK" },
-                },
-              ],
-            },
-            parent_tool_use_id: OUTER_TOOL_USE_ID,
-            uuid: "00000000-0000-4000-8000-000000016304",
-            session_id: WAKE_NATIVE_SESSION,
-          }),
-          claudeSdkFrame({
-            type: "system",
-            subtype: "task_started",
-            task_id: NESTED_TASK_ID,
-            tool_use_id: NESTED_TOOL_USE_ID,
-            description: "Nested check",
-            subagent_type: "general-purpose",
-            is_backgrounded: false,
-            spawn_depth: 2,
-            task_type: "local_agent",
-            prompt: "Sleep, then reply NESTED_OK",
-            uuid: "00000000-0000-4000-8000-000000016305",
-            session_id: WAKE_NATIVE_SESSION,
-          }),
-          claudeSdkFrame({
-            type: "system",
-            subtype: "task_progress",
-            task_id: NESTED_TASK_ID,
-            description: "Sleeping",
-            uuid: "00000000-0000-4000-8000-000000016306",
-            session_id: WAKE_NATIVE_SESSION,
-          }),
-        ]) {
-          yield* harness.offerAndWait(frame);
+        // Both subagents end together. Claude runs an empty turn for the first
+        // notification and opens the real one a millisecond later, all before
+        // the wake run attaches.
+        for (const [index, subagent] of subagents.entries()) {
+          yield* Queue.offer(
+            harness.sdkMessages,
+            makeSubagentNotificationFrame({
+              ...subagent,
+              summary: "AUDITED",
+              uuid: `00000000-0000-4000-8000-00000000096${index}`,
+            }),
+          );
         }
-
-        // A user turn runs while the nested and then the outer subagent finish.
-        yield* harness.runtime.startTurn(
-          makeClaudeTestTurnInput({
-            threadId: harness.threadId,
-            providerThread: harness.providerThread,
-            now,
-            attemptId: RunAttemptId.make("attempt-claude-16355-2"),
-            text: "Sleep for a while.",
-            attachments: [],
-            providerTurnOrdinal: 2,
-          }),
-        );
-        yield* harness.until(() => harness.offeredMessages.length === 2);
-        for (const frame of [
-          makeSubagentNotificationFrame({
-            taskId: NESTED_TASK_ID,
-            toolUseId: NESTED_TOOL_USE_ID,
-            summary: "NESTED_OK",
-            uuid: "00000000-0000-4000-8000-000000016307",
-          }),
-          makeSubagentToolResultFrame({
-            parentToolUseId: OUTER_TOOL_USE_ID,
-            uuid: "00000000-0000-4000-8000-000000016308",
-            toolUseId: NESTED_TOOL_USE_ID,
-          }),
-          ...makeSubagentAssistantFrames({
-            parentToolUseId: OUTER_TOOL_USE_ID,
-            uuid: "00000000-0000-4000-8000-000000016309",
-            text: "OUTER_DONE",
-          }),
-          makeSubagentNotificationFrame({
-            taskId: OUTER_TASK_ID,
-            toolUseId: OUTER_TOOL_USE_ID,
-            summary: "OUTER_DONE",
-            uuid: "00000000-0000-4000-8000-000000016310",
-          }),
-          makeResultFrame({
-            uuid: "00000000-0000-4000-8000-000000016311",
-            result: "Slept.",
-          }),
-        ]) {
-          yield* Queue.offer(harness.sdkMessages, frame);
+        // A rejected wake that precedes the empty turn still must not settle
+        // the run the live turn owns.
+        if (quotaFailureFirst) {
+          yield* harness.offerAndWait(
+            makeAssistantErrorFrame({
+              uuid: "00000000-0000-4000-8000-000000000964",
+              error: "rate_limit",
+            }),
+          );
+          yield* harness.offerAndWait(
+            makeResultFrame({
+              uuid: "00000000-0000-4000-8000-000000000965",
+              result: "You've hit your session limit · resets 11:10am (Australia/Sydney)",
+              isError: true,
+              apiErrorStatus: 429,
+              terminalReason: "api_error",
+              origin: { kind: "task-notification" },
+            }),
+          );
         }
-        yield* harness.awaitTerminal(2);
-
-        // The sibling's completion wakes a continuation while the root is idle.
-        for (const frame of [
-          makeSubagentNotificationFrame({
-            taskId: SIBLING_TASK_ID,
-            toolUseId: SIBLING_TOOL_USE_ID,
-            summary: "SIBLING_DONE",
-            uuid: "00000000-0000-4000-8000-000000016312",
-          }),
-          makeAssistantTextFrame({
-            uuid: "00000000-0000-4000-8000-000000016313",
-            text: "Both audits finished.",
-          }),
+        yield* Queue.offer(harness.sdkMessages, wakeTurnInit);
+        yield* Queue.offer(
+          harness.sdkMessages,
           makeResultFrame({
-            uuid: "00000000-0000-4000-8000-000000016314",
-            result: "Both audits finished.",
+            uuid: "00000000-0000-4000-8000-000000000962",
+            result: "",
+            numTurns: 0,
             origin: { kind: "task-notification" },
+            terminalReason: null,
           }),
-        ]) {
-          yield* Queue.offer(harness.sdkMessages, frame);
-        }
-        yield* harness.awaitContinuation(1);
+        );
+        yield* harness.offerAndWait(
+          claudeSdkFrame({ ...wakeTurnInit, uuid: "00000000-0000-4000-8000-000000000963" }),
+        );
+        assert.lengthOf(harness.continuationRequests, 1);
+
         yield* harness.runtime.startTurn(
           makeClaudeTestTurnInput({
             threadId: harness.threadId,
             providerThread: harness.providerThread,
             now,
-            attemptId: RunAttemptId.make("attempt-claude-16355-3"),
+            attemptId: wakeAttempt,
             text: "Background task completed.",
             attachments: [],
-            providerTurnOrdinal: 3,
+            providerTurnOrdinal: 2,
             messageCreatedBy: "agent",
             messageCreationSource: "provider",
           }),
         );
-        yield* harness.awaitTerminal(3);
+        // Claude is still thinking, so the run stays working rather than
+        // settling with nothing to show.
+        assert.lengthOf(harness.terminalEvents(), 1);
 
-        assert.equal(nestedStatuses().at(-1), "completed");
-        assert.isFalse(yield* harness.hasPendingBackgroundWork);
+        yield* harness.offerAndWait(wakeAssistant);
+        yield* harness.offerAndWait(wakeResult);
+        yield* harness.awaitTerminal(2);
+        assert.equal(harness.terminalEvents()[1]?.status, "completed");
+        assert.lengthOf(harness.continuationRequests, 1);
+        assert.isTrue(
+          harness.events.some(
+            (event) =>
+              event.type === "message.updated" &&
+              event.message.runId === RunId.make(`run-${wakeAttempt}`) &&
+              event.message.text === WAKE_RESULT_TEXT,
+          ),
+        );
       }).pipe(
         Effect.provide(
           Layer.mergeAll(
@@ -16915,672 +15856,1416 @@ describe("ClaudeAdapterV2 background wake turns", () => {
           ),
         ),
       ),
-    ),
   );
 
-  it.effect.each(["exit", "Stop"] as const)(
-    "settles a plain background subagent and its open call on %s after the root turn completes",
-    (reason) =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const TOOL_USE_ID = "toolu-idle-exit";
-          const BASH = "toolu-idle-exit-bash";
-          const harness = yield* makeWakeHarnessWithOptions({ close: Queue.shutdown });
-          const now = yield* DateTime.now;
-          const bashStatuses = () =>
-            harness.events.flatMap((event) =>
-              event.type === "turn_item.updated" && event.turnItem.nativeItemRef?.nativeId === BASH
-                ? [`${event.turnItem.type}:${event.turnItem.status}`]
-                : [],
-            );
-          yield* harness.runtime.startTurn(
-            makeClaudeTestTurnInput({
-              threadId: harness.threadId,
-              providerThread: harness.providerThread,
-              now,
-              attemptId: RunAttemptId.make("attempt-claude-idle-exit"),
-              text: "Audit in the background.",
-              attachments: [],
-            }),
-          );
-          yield* harness.offerAndWait(
-            makeSubagentTaskStartedFrame({
-              taskId: "task-idle-exit",
-              toolUseId: TOOL_USE_ID,
-              uuid: "00000000-0000-4000-8000-000000000981",
-            }),
-          );
-          const started = yield* Queue.take(harness.subagentReceipts);
-          assert.equal(started.subagent.status, "running");
-          for (const frame of makeSubagentAssistantFrames({
-            parentToolUseId: TOOL_USE_ID,
-            uuid: "00000000-0000-4000-8000-000000000982",
-            bashToolUseId: BASH,
-          })) {
-            yield* harness.offerAndWait(frame);
-          }
-          yield* harness.offerAndWait(
-            makeResultFrame({
-              uuid: "00000000-0000-4000-8000-000000000983",
-              result: "Auditing in the background.",
+  // A Stop closes the first process, and a turn replaces it before its stream ends.
+  const stopRacedByReplacementTurn = (label: string) =>
+    Effect.gen(function* () {
+      const changes = yield* makeChangeSignal;
+      const fileSystem = yield* FileSystem.FileSystem;
+      const attachmentsDir = yield* fileSystem.makeTempDirectoryScoped({
+        prefix: `t3-claude-v2-${label}-`,
+      });
+      const processQueues: Array<Queue.Queue<SDKMessage>> = [];
+      // The first two processes exit only when the test ends their streams.
+      const closeRequested = [yield* Deferred.make<void>(), yield* Deferred.make<void>()];
+      const events: Array<ProviderAdapter.ProviderAdapterV2Event> = [];
+      const adapter = yield* ClaudeAdapterV2.makeClaudeAdapterV2({
+        instanceId: ClaudeAdapterV2.CLAUDE_DEFAULT_INSTANCE_ID,
+        settings: DEFAULT_CLAUDE_SETTINGS,
+        environment: {},
+        attachmentsDir,
+        fileSystem,
+        path: yield* Path.Path,
+        random: yield* SecureRandom.SecureRandom,
+        idAllocator: yield* IdAllocator.IdAllocatorV2,
+        continuationRequests: { offer: () => Effect.void },
+        queryRunner: {
+          allocateSessionId: Effect.succeed(WAKE_NATIVE_SESSION),
+          open: () =>
+            Effect.gen(function* () {
+              const sdkMessages = yield* Queue.unbounded<SDKMessage>();
+              const closeSignal = closeRequested[processQueues.length];
+              processQueues.push(sdkMessages);
+              return {
+                messages: Stream.fromQueue(sdkMessages),
+                offer: () => Effect.void,
+                setModel: () => Effect.void,
+                applyFlagSettings: () => Effect.void,
+                setPermissionMode: () => Effect.void,
+                backgroundTasks: () => Effect.succeed(false),
+                stopTask: () => Effect.void,
+                mcpServerStatus: Effect.die("unexpected MCP server status"),
+                readMcpResource: () => Effect.die("unexpected MCP resource read"),
+                callMcpTool: () => Effect.die("unexpected MCP tool call"),
+                listPermissionRules: Effect.die("unexpected permission rules read"),
+                interrupt: Effect.void,
+                close:
+                  closeSignal === undefined
+                    ? Queue.shutdown(sdkMessages)
+                    : Deferred.succeed(closeSignal, undefined).pipe(Effect.asVoid),
+              };
             }),
-          );
-          const terminal = yield* Queue.take(harness.terminalReceipts);
-          assert.equal(terminal.status, "completed");
-          assert.isTrue(yield* harness.hasPendingBackgroundWork);
-          assert.deepEqual(bashStatuses(), ["command_execution:running"]);
-
-          if (reason === "Stop") {
-            yield* harness.runtime.interruptTurn({
-              providerThread: harness.providerThread,
-              providerTurnId: terminal.providerTurnId,
-              requestRuntimeRestart: true,
-            });
-          } else {
-            yield* Queue.shutdown(harness.sdkMessages);
-          }
-          let ended = yield* Queue.take(harness.subagentReceipts);
-          while (ended.subagent.status === "running") {
-            ended = yield* Queue.take(harness.subagentReceipts);
-          }
-          assert.equal(ended.subagent.nativeTaskRef?.nativeId, "task-idle-exit");
-          assert.equal(ended.subagent.status, reason === "Stop" ? "cancelled" : "failed");
-          assert.isFalse(yield* harness.hasPendingBackgroundWork);
-          assert.deepEqual(bashStatuses(), [
-            "command_execution:running",
-            reason === "Stop" ? "command_execution:interrupted" : "command_execution:failed",
-          ]);
-        }).pipe(
-          Effect.provide(
-            Layer.mergeAll(
-              IdAllocator.layer,
-              McpProviderSessions.layer,
-              NodeServices.layer,
-              NodeCrypto.layer,
-            ),
-          ),
+          forkSession: () => Effect.die("unused forkSession"),
+          subagentLaunchToolUseId: () => Effect.succeed(null),
+          subagentModel: () => Effect.succeed(null),
+          assertComplete: Effect.void,
+        },
+      });
+      const threadId = ThreadId.make(`thread-claude-${label}`);
+      const runtime = yield* adapter.openSession({
+        threadId,
+        providerSessionId: ProviderSessionId.make(`provider-session-claude-${label}`),
+        modelSelection: CLAUDE_TEST_MODEL_SELECTION,
+        runtimePolicy: CLAUDE_TEST_RUNTIME_POLICY,
+      });
+      const providerThread = yield* runtime.ensureThread({
+        threadId,
+        modelSelection: CLAUDE_TEST_MODEL_SELECTION,
+        runtimePolicy: CLAUDE_TEST_RUNTIME_POLICY,
+      });
+      yield* runtime.events.pipe(
+        Stream.runForEach((event) =>
+          Effect.sync(() => {
+            events.push(event);
+          }).pipe(Effect.andThen(changes.notify)),
         ),
-      ),
-  );
+        Effect.forkScoped,
+      );
+      const terminals = () => events.filter((event) => event.type === "turn.terminal");
+      const subagentStatus = (taskId: string) => {
+        const latest = events.findLast(
+          (event) =>
+            event.type === "subagent.updated" && event.subagent.nativeTaskRef?.nativeId === taskId,
+        );
+        return latest?.type === "subagent.updated" ? latest.subagent.status : undefined;
+      };
+      const now = yield* DateTime.now;
 
-  it.effect.each(["before", "after"] as const)(
-    "keeps a subagent call's result when the CLI exits before the drain (result %s the nested launch's)",
-    (bashResultOrder) =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const OUTER_TASK_ID = "task-exit-buffered-outer";
-          const OUTER_TOOL_USE_ID = "toolu-exit-buffered-outer";
-          const NESTED_TASK_ID = "task-exit-buffered-nested";
-          const NESTED_TOOL_USE_ID = "toolu-exit-buffered-nested";
-          const BASH = "toolu-exit-buffered-bash";
-          const harness = yield* makeWakeHarnessWithOptions({ freshQueueOnReopen: true });
-          const now = yield* DateTime.now;
-          const bashItems = () =>
-            harness.events.flatMap((event) =>
-              event.type === "turn_item.updated" && event.turnItem.nativeItemRef?.nativeId === BASH
-                ? [
-                    `${event.turnItem.type}:${event.turnItem.status}:${JSON.stringify("input" in event.turnItem ? event.turnItem.input : null)}`,
-                  ]
-                : [],
-            );
-          yield* harness.runtime.startTurn(
-            makeClaudeTestTurnInput({
-              threadId: harness.threadId,
-              providerThread: harness.providerThread,
-              now,
-              attemptId: RunAttemptId.make("attempt-claude-exit-buffered-1"),
-              text: "Audit in the background.",
-              attachments: [],
-            }),
-          );
-          for (const frame of [
-            makeSubagentTaskStartedFrame({
-              taskId: OUTER_TASK_ID,
-              toolUseId: OUTER_TOOL_USE_ID,
-              uuid: "00000000-0000-4000-8000-000000001001",
-            }),
-            makeResultFrame({
-              uuid: "00000000-0000-4000-8000-000000001002",
-              result: "Auditing in the background.",
-            }),
-          ]) {
-            yield* Queue.offer(harness.sdkMessages, frame);
-          }
-          yield* harness.awaitTerminal(1);
+      yield* runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId,
+          providerThread,
+          now,
+          attemptId: RunAttemptId.make(`attempt-claude-${label}-a`),
+          text: "Audit the last commits in the background.",
+          attachments: [],
+        }),
+      );
+      yield* Queue.offer(
+        processQueues[0]!,
+        makeSubagentTaskStartedFrame({
+          taskId: "raced-agent",
+          toolUseId: "toolu-raced-agent",
+          uuid: "00000000-0000-4000-8000-000000002801",
+        }),
+      );
+      yield* Queue.offer(
+        processQueues[0]!,
+        makeResultFrame({
+          uuid: "00000000-0000-4000-8000-000000002802",
+          result: "Launched the audit.",
+        }),
+      );
+      yield* changes.until(
+        () => terminals().length === 1 && subagentStatus("raced-agent") === "running",
+      );
+
+      const stop = yield* runtime
+        .interruptTurn({
+          providerThread,
+          providerTurnId: terminals()[0]!.providerTurnId,
+          requestRuntimeRestart: true,
+        })
+        .pipe(Effect.forkScoped);
+      yield* Deferred.await(closeRequested[0]!);
+      yield* runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId,
+          providerThread: { ...providerThread, status: "active" },
+          now,
+          attemptId: RunAttemptId.make(`attempt-claude-${label}-b`),
+          text: "Resume after the limit reset.",
+          attachments: [],
+          providerTurnOrdinal: 2,
+        }),
+      );
+      assert.lengthOf(processQueues, 2);
+      yield* Queue.offer(
+        processQueues[1]!,
+        makeSubagentTaskStartedFrame({
+          taskId: "own-agent",
+          toolUseId: "toolu-own-agent",
+          uuid: "00000000-0000-4000-8000-000000002804",
+        }),
+      );
+      yield* changes.until(() => subagentStatus("own-agent") === "running");
+      const exitProcess = <E>(index: number, stopping: Fiber.Fiber<void, E>) =>
+        Queue.shutdown(processQueues[index]!).pipe(Effect.andThen(Fiber.join(stopping)));
+      return {
+        runtime,
+        threadId,
+        providerThread,
+        processQueues,
+        closeRequested,
+        changes,
+        terminals,
+        subagentStatus,
+        exitFirstProcess: exitProcess(0, stop),
+        exitProcess,
+        now,
+      };
+    });
+
+  // regression: #28331 a subagent whose process is gone must not stay running forever
+  it.effect("ends a subagent whose process a Stop closed while a new turn replaced it", () =>
+    Effect.gen(function* () {
+      const { processQueues, changes, terminals, subagentStatus, exitFirstProcess } =
+        yield* stopRacedByReplacementTurn("raced-stop-replacement-close");
+      yield* exitFirstProcess;
+      // The replacement's result follows the stopped process's exit on the event stream.
+      yield* Queue.offer(
+        processQueues[1]!,
+        makeResultFrame({
+          uuid: "00000000-0000-4000-8000-000000002803",
+          result: "Resumed.",
+        }),
+      );
+      yield* changes.until(() => terminals().length === 2);
+
+      assert.strictEqual(
+        subagentStatus("raced-agent"),
+        "cancelled",
+        "the Stop ended the subagent's process, but the subagent is not cancelled",
+      );
+      assert.strictEqual(
+        subagentStatus("own-agent"),
+        "running",
+        "the replacement process still runs its own subagent",
+      );
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
+        ),
+      ),
+    ),
+  );
+
+  // regression: #28331 Stop must clear a subagent whose process is gone
+  it.effect("stops a subagent whose process a Stop closed while a new turn replaced it", () =>
+    Effect.gen(function* () {
+      const { runtime, providerThread, exitFirstProcess } = yield* stopRacedByReplacementTurn(
+        "raced-stop-replacement-stop-subagent",
+      );
+      yield* exitFirstProcess;
+      const stopped = yield* runtime.stopSubagent!({
+        providerThread: { ...providerThread, status: "active" },
+        nativeTaskId: "raced-agent",
+      }).pipe(
+        Effect.map((outcome) => outcome?.status ?? "no outcome"),
+        Effect.catch((error) =>
+          Effect.succeed(`refused: ${"detail" in error ? error.detail : error.message}`),
+        ),
+      );
+
+      assert.strictEqual(stopped, "cancelled", "Stop of a subagent whose process is gone");
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
+        ),
+      ),
+    ),
+  );
+
+  // regression: #28331 a process that exits late ends only the subagents it ran
+  it.effect("leaves a stopping replacement's subagent to that replacement's exit", () =>
+    Effect.gen(function* () {
+      const {
+        runtime,
+        threadId,
+        providerThread,
+        processQueues,
+        closeRequested,
+        changes,
+        terminals,
+        subagentStatus,
+        exitFirstProcess,
+        exitProcess,
+        now,
+      } = yield* stopRacedByReplacementTurn("raced-stop-replacement-chain");
+      const activeThread = { ...providerThread, status: "active" as const };
+      const finishTurn = (index: number, turns: number, uuid: string) =>
+        Queue.offer(processQueues[index]!, makeResultFrame({ uuid, result: "Done." })).pipe(
+          Effect.andThen(changes.until(() => terminals().length === turns)),
+        );
+      const startTurn = (label: string, providerTurnOrdinal: number) =>
+        runtime.startTurn(
+          makeClaudeTestTurnInput({
+            threadId,
+            providerThread: activeThread,
+            now,
+            attemptId: RunAttemptId.make(`attempt-claude-raced-stop-replacement-chain-${label}`),
+            text: "Carry on.",
+            attachments: [],
+            providerTurnOrdinal,
+          }),
+        );
+
+      yield* finishTurn(1, 2, "00000000-0000-4000-8000-000000002805");
+      const stopSecond = yield* runtime
+        .interruptTurn({
+          providerThread: activeThread,
+          providerTurnId: terminals()[1]!.providerTurnId,
+          requestRuntimeRestart: true,
+        })
+        .pipe(Effect.forkScoped);
+      yield* Deferred.await(closeRequested[1]!);
+      yield* startTurn("c", 3);
+      assert.lengthOf(processQueues, 3);
+
+      yield* exitFirstProcess;
+      yield* finishTurn(2, 3, "00000000-0000-4000-8000-000000002806");
+      assert.strictEqual(
+        subagentStatus("raced-agent"),
+        "cancelled",
+        "the first process exited after a Stop, but its subagent is not cancelled",
+      );
+      assert.strictEqual(
+        subagentStatus("own-agent"),
+        "running",
+        "the first process ended a subagent the second process still ran",
+      );
+
+      yield* exitProcess(1, stopSecond);
+      yield* startTurn("d", 4);
+      yield* finishTurn(2, 4, "00000000-0000-4000-8000-000000002807");
+      assert.strictEqual(
+        subagentStatus("own-agent"),
+        "cancelled",
+        "the second process exited after a Stop, but its subagent is not cancelled",
+      );
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
+        ),
+      ),
+    ),
+  );
+
+  it.effect("streams a background subagent's work while the root turn is idle", () =>
+    Effect.gen(function* () {
+      const TASK_ID = "task-live-idle";
+      const TOOL_USE_ID = "toolu-live-idle";
+      const STRADDLING_BASH = "toolu-live-straddling-bash";
+      const IDLE_BASH = "toolu-live-idle-bash";
+      const harness = yield* makeWakeHarness;
+      const now = yield* DateTime.now;
+      const latestToolItem = (nativeId: string) =>
+        harness.events.findLast(
+          (event) =>
+            event.type === "turn_item.updated" &&
+            event.turnItem.nativeItemRef?.nativeId === nativeId,
+        );
+      yield* harness.runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now,
+          attemptId: RunAttemptId.make("attempt-claude-live-idle-1"),
+          text: "Audit in the background.",
+          attachments: [],
+        }),
+      );
+      for (const frame of [
+        makeSubagentTaskStartedFrame({
+          taskId: TASK_ID,
+          toolUseId: TOOL_USE_ID,
+          uuid: "00000000-0000-4000-8000-000000000951",
+        }),
+        ...makeSubagentAssistantFrames({
+          parentToolUseId: TOOL_USE_ID,
+          uuid: "00000000-0000-4000-8000-000000000952",
+          bashToolUseId: STRADDLING_BASH,
+        }),
+        makeResultFrame({
+          uuid: "00000000-0000-4000-8000-000000000953",
+          result: "Auditing in the background.",
+        }),
+      ]) {
+        yield* Queue.offer(harness.sdkMessages, frame);
+      }
+      yield* harness.awaitTerminal(1);
+
+      for (const frame of [
+        makeSubagentToolResultFrame({
+          parentToolUseId: TOOL_USE_ID,
+          uuid: "00000000-0000-4000-8000-000000000954",
+          toolUseId: STRADDLING_BASH,
+        }),
+        ...makeSubagentAssistantFrames({
+          parentToolUseId: TOOL_USE_ID,
+          uuid: "00000000-0000-4000-8000-000000000955",
+          text: "Still auditing.",
+          bashToolUseId: IDLE_BASH,
+        }),
+        claudeSdkFrame({
+          type: "system",
+          subtype: "task_progress",
+          task_id: TASK_ID,
+          description: "Reading the last commits",
+          uuid: "00000000-0000-4000-8000-000000000956",
+          session_id: WAKE_NATIVE_SESSION,
+        }),
+      ]) {
+        yield* Queue.offer(harness.sdkMessages, frame);
+      }
+      yield* harness.until(() => {
+        const event = latestToolItem(IDLE_BASH);
+        return event?.type === "turn_item.updated" && event.turnItem.status === "running";
+      });
+      yield* harness.until(() =>
+        harness.events.some(
+          (event) =>
+            event.type === "subagent.updated" &&
+            event.subagent.progress === "Reading the last commits",
+        ),
+      );
+      const routing = subagentRouting(harness.events, [STRADDLING_BASH, IDLE_BASH]);
+      assert.deepEqual(routing.assistantTexts(routing.childThreadId), ["Still auditing."]);
+      const straddling = latestToolItem(STRADDLING_BASH);
+      const straddlingItem =
+        straddling?.type === "turn_item.updated" ? straddling.turnItem : undefined;
+      assert.equal(straddlingItem?.status, "completed");
+      assert.equal(
+        straddlingItem?.type === "command_execution" ? straddlingItem.input : undefined,
+        "git log -5",
+      );
+      assert.equal(harness.continuationRequests.length, 0);
+
+      for (const frame of [
+        makeSubagentToolResultFrame({
+          parentToolUseId: TOOL_USE_ID,
+          uuid: "00000000-0000-4000-8000-000000000957",
+          toolUseId: IDLE_BASH,
+        }),
+        makeSubagentNotificationFrame({
+          taskId: TASK_ID,
+          toolUseId: TOOL_USE_ID,
+          summary: "Still auditing.",
+          uuid: "00000000-0000-4000-8000-000000000958",
+        }),
+      ]) {
+        yield* Queue.offer(harness.sdkMessages, frame);
+      }
+      yield* harness.awaitContinuation(1);
+      yield* Queue.offer(
+        harness.sdkMessages,
+        makeResultFrame({
+          uuid: "00000000-0000-4000-8000-000000000959",
+          result: "The auditor finished.",
+        }),
+      );
+      yield* harness.runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now,
+          attemptId: RunAttemptId.make("attempt-claude-live-idle-2"),
+          text: "Background task completed.",
+          attachments: [],
+          providerTurnOrdinal: 2,
+          messageCreatedBy: "agent",
+          messageCreationSource: "provider",
+        }),
+      );
+      yield* harness.awaitTerminal(2);
+
+      const finalRouting = subagentRouting(harness.events, [STRADDLING_BASH, IDLE_BASH]);
+      assert.deepEqual(finalRouting.assistantTexts(finalRouting.childThreadId), [
+        "Still auditing.",
+      ]);
+      for (const nativeId of [STRADDLING_BASH, IDLE_BASH]) {
+        assert.deepEqual(
+          [...(finalRouting.toolThreadIds.get(nativeId) ?? [])],
+          [finalRouting.childThreadId],
+        );
+        const statuses = harness.events.flatMap((event) =>
+          event.type === "turn_item.updated" && event.turnItem.nativeItemRef?.nativeId === nativeId
+            ? [`${event.turnItem.type}:${event.turnItem.status}`]
+            : [],
+        );
+        assert.deepEqual(statuses, ["command_execution:running", "command_execution:completed"]);
+      }
+      const finalSubagent = harness.events.findLast((event) => event.type === "subagent.updated");
+      assert.equal(
+        finalSubagent?.type === "subagent.updated" && finalSubagent.subagent.status,
+        "completed",
+      );
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
+        ),
+      ),
+    ),
+  );
+
+  // Claude reports a background subagent `completed` when its turn ends while
+  // its own background shell still runs. When that shell finishes, Claude
+  // resumes the subagent with a new task_started for the same task and launch
+  // tool_use_id while the root is idle. Frame order mirrors a live capture.
+  it.effect("reopens a completed background subagent that resumes while the root is idle", () =>
+    Effect.gen(function* () {
+      const TASK_ID = "ae3f32459af762a5f";
+      const LAUNCH = "toolu_01LcidmwEK1Y6GC6LpX3kvxX";
+      const OWN_SHELL = "toolu_01QAahgijM2KRBBSkWxnui4g";
+      const RESUMED_BASH = "toolu_01CkA1juicPNCtQrqKL8h6Rz";
+      const harness = yield* makeWakeHarness;
+      const now = yield* DateTime.now;
+      let sequence = 0;
+      const system = (frame: object) =>
+        claudeSdkFrame({
+          type: "system",
+          ...frame,
+          uuid: `00000000-0000-4000-8000-0000000162${String(++sequence).padStart(2, "0")}`,
+          session_id: WAKE_NATIVE_SESSION,
+        });
+      const agentEntry = (runId: string) => ({
+        task_id: TASK_ID,
+        run_id: runId,
+        task_type: "local_agent",
+        subagent_type: "general-purpose",
+        description: "Audit recent commits",
+      });
+      const shellEntry = (taskId: string) => ({
+        task_id: taskId,
+        run_id: `run-${taskId}`,
+        task_type: "local_bash",
+        description: "Sleep",
+        parent_task_id: TASK_ID,
+      });
+      const roster = (tasks: ReadonlyArray<object>) =>
+        system({ subtype: "background_tasks_changed", tasks });
+      const shellStarted = (taskId: string, toolUseId: string) =>
+        system({
+          subtype: "task_started",
+          task_id: taskId,
+          tool_use_id: toolUseId,
+          task_type: "local_bash",
+          description: "Sleep",
+        });
+      const startTurn = (ordinal: number, continuation: boolean) =>
+        harness.runtime.startTurn(
+          makeClaudeTestTurnInput({
+            threadId: harness.threadId,
+            providerThread: harness.providerThread,
+            now,
+            attemptId: RunAttemptId.make(`attempt-claude-self-resume-${ordinal}`),
+            text: continuation ? "Background task completed." : "Launch a background agent.",
+            attachments: [],
+            providerTurnOrdinal: ordinal,
+            ...(continuation
+              ? {
+                  messageCreatedBy: "agent" as const,
+                  messageCreationSource: "provider" as const,
+                }
+              : {}),
+          }),
+        );
+      const subagentUpdates = () =>
+        harness.events.flatMap((event) =>
+          event.type === "subagent.updated" ? [event.subagent] : [],
+        );
+
+      yield* startTurn(1, false);
+      for (const frame of [
+        roster([agentEntry("run-1")]),
+        makeSubagentTaskStartedFrame({
+          taskId: TASK_ID,
+          toolUseId: LAUNCH,
+          uuid: "00000000-0000-4000-8000-000000016101",
+        }),
+        makeResultFrame({ uuid: "00000000-0000-4000-8000-000000016102", result: "LAUNCHED" }),
+      ]) {
+        yield* harness.offerAndWait(frame);
+      }
+      yield* Queue.take(harness.terminalReceipts);
+
+      // The subagent starts its own background shell, ends its turn, and
+      // Claude reports it completed; the parent wakes, answers, goes idle.
+      for (const frame of [
+        ...makeSubagentAssistantFrames({
+          parentToolUseId: LAUNCH,
+          uuid: "00000000-0000-4000-8000-000000016103",
+          bashToolUseId: OWN_SHELL,
+        }),
+        roster([agentEntry("run-1"), shellEntry("b455x9pq5")]),
+        shellStarted("b455x9pq5", OWN_SHELL),
+        makeSubagentToolResultFrame({
+          parentToolUseId: LAUNCH,
+          uuid: "00000000-0000-4000-8000-000000016104",
+          toolUseId: OWN_SHELL,
+        }),
+        makeSubagentNotificationFrame({
+          taskId: TASK_ID,
+          toolUseId: LAUNCH,
+          summary: "WAITING",
+          uuid: "00000000-0000-4000-8000-000000016105",
+        }),
+        roster([shellEntry("b455x9pq5")]),
+        wakeTurnInit,
+      ]) {
+        yield* harness.offerAndWait(frame);
+      }
+      yield* Queue.take(harness.continuationReceipts);
+      yield* startTurn(2, true);
+      yield* harness.offerAndWait(
+        makeResultFrame({ uuid: "00000000-0000-4000-8000-000000016106", result: "Noted." }),
+      );
+      yield* Queue.take(harness.terminalReceipts);
+
+      // Its shell finishes and Claude resumes it under a new native run.
+      for (const frame of [
+        system({
+          subtype: "task_notification",
+          task_id: "b455x9pq5",
+          tool_use_id: OWN_SHELL,
+          status: "completed",
+          summary: "Background command completed (exit code 0)",
+          output_file: "/tmp/b455x9pq5.output",
+        }),
+        roster([]),
+        roster([agentEntry("run-2")]),
+        makeSubagentTaskStartedFrame({
+          taskId: TASK_ID,
+          toolUseId: LAUNCH,
+          uuid: "00000000-0000-4000-8000-000000016107",
+        }),
+      ]) {
+        yield* harness.offerAndWait(frame);
+      }
+      // Events reach the app only through a run, and the launching run ended
+      // with the interim completion.
+      assert.equal(harness.continuationRequests.length, 2);
+
+      yield* Queue.take(harness.continuationReceipts);
+      yield* startTurn(3, true);
+      // Claude does not wake the root for this, so the root must not stay busy.
+      assert.equal((yield* Queue.take(harness.terminalReceipts)).status, "completed");
+      yield* startTurn(4, false);
+      yield* harness.offerAndWait(
+        makeResultFrame({ uuid: "00000000-0000-4000-8000-000000016110", result: "PONG" }),
+      );
+      assert.equal((yield* Queue.take(harness.terminalReceipts)).status, "completed");
+      for (const frame of [
+        ...makeSubagentAssistantFrames({
+          parentToolUseId: LAUNCH,
+          uuid: "00000000-0000-4000-8000-000000016108",
+          bashToolUseId: RESUMED_BASH,
+        }),
+        shellStarted("beyhxkdpc", RESUMED_BASH),
+        roster([agentEntry("run-2"), shellEntry("beyhxkdpc")]),
+      ]) {
+        yield* harness.offerAndWait(frame);
+      }
+      // Events are ordered: once this roster is recorded, so is every earlier event.
+      yield* harness.until(() =>
+        harness.events.some(
+          (event) =>
+            event.type === "provider_thread.updated" &&
+            event.providerThread.pendingBackgroundTasks?.some(
+              (task) => task.taskId === "beyhxkdpc",
+            ) === true,
+        ),
+      );
+      const resumed = subagentUpdates().at(-1);
+      assert.equal(resumed?.status, "running");
+      assert.isNull(resumed?.completedAt);
+      assert.equal(resumed?.runId, "run-attempt-claude-self-resume-3");
+      const routing = subagentRouting(harness.events, [RESUMED_BASH]);
+      assert.deepEqual(
+        [...(routing.toolThreadIds.get(RESUMED_BASH) ?? [])],
+        [routing.childThreadId],
+      );
+
+      yield* harness.offerAndWait(
+        makeSubagentNotificationFrame({
+          taskId: TASK_ID,
+          toolUseId: LAUNCH,
+          summary: "DONE",
+          uuid: "00000000-0000-4000-8000-000000016109",
+        }),
+      );
+      yield* harness.until(() => subagentUpdates().at(-1)?.result === "DONE");
+      assert.equal(subagentUpdates().at(-1)?.status, "completed");
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
+        ),
+      ),
+    ),
+  );
+
+  it.effect("keeps a nested subagent's launch in order while the root turn is idle", () =>
+    Effect.gen(function* () {
+      const OUTER_TASK_ID = "task-idle-outer";
+      const OUTER_TOOL_USE_ID = "toolu-idle-outer";
+      const NESTED_TASK_ID = "task-idle-nested";
+      const NESTED_TOOL_USE_ID = "toolu-idle-nested";
+      const harness = yield* makeWakeHarness;
+      const now = yield* DateTime.now;
+      yield* harness.runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now,
+          attemptId: RunAttemptId.make("attempt-claude-idle-nested-1"),
+          text: "Audit in the background.",
+          attachments: [],
+        }),
+      );
+      for (const frame of [
+        makeSubagentTaskStartedFrame({
+          taskId: OUTER_TASK_ID,
+          toolUseId: OUTER_TOOL_USE_ID,
+          uuid: "00000000-0000-4000-8000-000000000971",
+        }),
+        makeResultFrame({
+          uuid: "00000000-0000-4000-8000-000000000972",
+          result: "Auditing in the background.",
+        }),
+      ]) {
+        yield* Queue.offer(harness.sdkMessages, frame);
+      }
+      yield* harness.awaitTerminal(1);
+
+      for (const frame of [
+        claudeSdkFrame({
+          type: "assistant",
+          message: {
+            model: "claude-sonnet-4-6",
+            id: "msg_idle_nested_launch",
+            type: "message",
+            role: "assistant",
+            content: [
+              {
+                type: "tool_use",
+                id: NESTED_TOOL_USE_ID,
+                name: "Agent",
+                input: { description: "Nested check", prompt: "Reply with NESTED_OK" },
+              },
+            ],
+          },
+          parent_tool_use_id: OUTER_TOOL_USE_ID,
+          uuid: "00000000-0000-4000-8000-000000000973",
+          session_id: WAKE_NATIVE_SESSION,
+        }),
+        claudeSdkFrame({
+          type: "system",
+          subtype: "task_started",
+          task_id: NESTED_TASK_ID,
+          tool_use_id: NESTED_TOOL_USE_ID,
+          description: "Nested check",
+          subagent_type: "general-purpose",
+          is_backgrounded: false,
+          spawn_depth: 2,
+          task_type: "local_agent",
+          prompt: "Reply with NESTED_OK",
+          uuid: "00000000-0000-4000-8000-000000000974",
+          session_id: WAKE_NATIVE_SESSION,
+        }),
+        claudeSdkFrame({
+          type: "system",
+          subtype: "task_progress",
+          task_id: OUTER_TASK_ID,
+          description: "Waiting on the nested check",
+          uuid: "00000000-0000-4000-8000-000000000984",
+          session_id: WAKE_NATIVE_SESSION,
+        }),
+        ...makeSubagentAssistantFrames({
+          parentToolUseId: OUTER_TOOL_USE_ID,
+          uuid: "00000000-0000-4000-8000-000000000988",
+          messageId: "msg_idle_outer_working",
+          text: "OUTER_WORKING",
+        }),
+      ]) {
+        yield* Queue.offer(harness.sdkMessages, frame);
+      }
+      yield* harness.until(() =>
+        harness.events.some(
+          (event) => event.type === "message.updated" && event.message.text === "OUTER_WORKING",
+        ),
+      );
+      assert.lengthOf(harness.continuationRequests, 0);
+      for (const frame of [
+        ...makeSubagentAssistantFrames({
+          parentToolUseId: NESTED_TOOL_USE_ID,
+          uuid: "00000000-0000-4000-8000-000000000975",
+          text: "NESTED_OK",
+        }),
+        makeSubagentNotificationFrame({
+          taskId: NESTED_TASK_ID,
+          toolUseId: NESTED_TOOL_USE_ID,
+          summary: "NESTED_OK",
+          uuid: "00000000-0000-4000-8000-000000000976",
+        }),
+        makeSubagentToolResultFrame({
+          parentToolUseId: OUTER_TOOL_USE_ID,
+          uuid: "00000000-0000-4000-8000-000000000977",
+          toolUseId: NESTED_TOOL_USE_ID,
+        }),
+        ...makeSubagentAssistantFrames({
+          parentToolUseId: OUTER_TOOL_USE_ID,
+          uuid: "00000000-0000-4000-8000-000000000978",
+          text: "OUTER_DONE",
+        }),
+        makeSubagentNotificationFrame({
+          taskId: OUTER_TASK_ID,
+          toolUseId: OUTER_TOOL_USE_ID,
+          summary: "OUTER_DONE",
+          uuid: "00000000-0000-4000-8000-000000000979",
+        }),
+      ]) {
+        yield* Queue.offer(harness.sdkMessages, frame);
+      }
+      yield* harness.awaitContinuation(1);
+      yield* harness.until(() =>
+        harness.events.some(
+          (event) =>
+            event.type === "subagent.updated" &&
+            event.subagent.progress === "Waiting on the nested check",
+        ),
+      );
+      yield* Queue.offer(
+        harness.sdkMessages,
+        makeResultFrame({
+          uuid: "00000000-0000-4000-8000-000000000980",
+          result: "The audit finished.",
+        }),
+      );
+      yield* harness.runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now,
+          attemptId: RunAttemptId.make("attempt-claude-idle-nested-2"),
+          text: "Background task completed.",
+          attachments: [],
+          providerTurnOrdinal: 2,
+          messageCreatedBy: "agent",
+          messageCreationSource: "provider",
+        }),
+      );
+      yield* harness.awaitTerminal(2);
 
-          for (const frame of makeSubagentAssistantFrames({
-            parentToolUseId: OUTER_TOOL_USE_ID,
-            uuid: "00000000-0000-4000-8000-000000001003",
-            bashToolUseId: BASH,
-          })) {
-            yield* Queue.offer(harness.sdkMessages, frame);
-          }
-          yield* harness.until(() => bashItems().length === 1);
+      assert.isFalse(
+        harness.events.some(
+          (event) =>
+            event.type === "turn_item.updated" &&
+            event.turnItem.nativeItemRef?.nativeId === NESTED_TOOL_USE_ID,
+        ),
+      );
+      const finalSubagents = new Map(
+        harness.events.flatMap((event) =>
+          event.type === "subagent.updated"
+            ? [[event.subagent.nativeTaskRef?.nativeId, event.subagent] as const]
+            : [],
+        ),
+      );
+      const outer = finalSubagents.get(OUTER_TASK_ID);
+      const nested = finalSubagents.get(NESTED_TASK_ID);
+      assert.equal(outer?.status, "completed");
+      assert.equal(nested?.status, "completed");
+      assert.equal(nested?.parentNodeId, outer?.id);
+      assert.deepEqual(
+        subagentRouting(harness.events, []).assistantTexts(outer?.childThreadId ?? undefined),
+        ["OUTER_WORKING", "OUTER_DONE"],
+      );
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
+        ),
+      ),
+    ),
+  );
 
-          const bashResultFrame = makeSubagentToolResultFrame({
-            parentToolUseId: OUTER_TOOL_USE_ID,
-            uuid: "00000000-0000-4000-8000-000000001006",
-            toolUseId: BASH,
-          });
-          for (const frame of [
-            claudeSdkFrame({
-              type: "assistant",
-              message: {
-                model: "claude-sonnet-4-6",
-                id: "msg_exit_buffered_nested_launch",
-                type: "message",
-                role: "assistant",
-                content: [
-                  {
-                    type: "tool_use",
-                    id: NESTED_TOOL_USE_ID,
-                    name: "Agent",
-                    input: { description: "Nested check", prompt: "Reply with NESTED_OK" },
-                  },
-                ],
+  it.effect("ends an earlier turn's nested subagent while the root turn is idle", () =>
+    Effect.gen(function* () {
+      const OUTER_TASK_ID = "task-earlier-outer";
+      const OUTER_TOOL_USE_ID = "toolu-earlier-outer";
+      const NESTED_TASK_ID = "task-earlier-nested";
+      const NESTED_TOOL_USE_ID = "toolu-earlier-nested";
+      const harness = yield* makeWakeHarness;
+      const now = yield* DateTime.now;
+      const userTurn = (attemptId: string, providerTurnOrdinal: number) =>
+        harness.runtime.startTurn(
+          makeClaudeTestTurnInput({
+            threadId: harness.threadId,
+            providerThread: harness.providerThread,
+            now,
+            attemptId: RunAttemptId.make(attemptId),
+            text: "Keep auditing.",
+            attachments: [],
+            providerTurnOrdinal,
+          }),
+        );
+      yield* userTurn("attempt-claude-earlier-nested-1", 1);
+      for (const frame of [
+        makeSubagentTaskStartedFrame({
+          taskId: OUTER_TASK_ID,
+          toolUseId: OUTER_TOOL_USE_ID,
+          uuid: "00000000-0000-4000-8000-000000000a01",
+        }),
+        claudeSdkFrame({
+          type: "assistant",
+          message: {
+            model: "claude-sonnet-4-6",
+            id: "msg_earlier_nested_launch",
+            type: "message",
+            role: "assistant",
+            content: [
+              {
+                type: "tool_use",
+                id: NESTED_TOOL_USE_ID,
+                name: "Agent",
+                input: { description: "Nested check", prompt: "Reply with NESTED_OK" },
               },
-              parent_tool_use_id: OUTER_TOOL_USE_ID,
-              uuid: "00000000-0000-4000-8000-000000001004",
-              session_id: WAKE_NATIVE_SESSION,
-            }),
-            claudeSdkFrame({
-              type: "system",
-              subtype: "task_started",
-              task_id: NESTED_TASK_ID,
-              tool_use_id: NESTED_TOOL_USE_ID,
-              description: "Nested check",
-              subagent_type: "general-purpose",
-              is_backgrounded: false,
-              spawn_depth: 2,
-              task_type: "local_agent",
-              prompt: "Reply with NESTED_OK",
-              uuid: "00000000-0000-4000-8000-000000001005",
-              session_id: WAKE_NATIVE_SESSION,
-            }),
-            ...(bashResultOrder === "before" ? [bashResultFrame] : []),
-            ...makeSubagentAssistantFrames({
-              parentToolUseId: NESTED_TOOL_USE_ID,
-              uuid: "00000000-0000-4000-8000-000000001007",
-              text: "NESTED_OK",
-            }),
-            makeSubagentNotificationFrame({
-              taskId: NESTED_TASK_ID,
-              toolUseId: NESTED_TOOL_USE_ID,
-              summary: "NESTED_OK",
-              uuid: "00000000-0000-4000-8000-000000001008",
-            }),
-            makeSubagentToolResultFrame({
-              parentToolUseId: OUTER_TOOL_USE_ID,
-              uuid: "00000000-0000-4000-8000-000000001009",
-              toolUseId: NESTED_TOOL_USE_ID,
-            }),
-            ...(bashResultOrder === "after" ? [bashResultFrame] : []),
-            makeSubagentNotificationFrame({
-              taskId: OUTER_TASK_ID,
-              toolUseId: OUTER_TOOL_USE_ID,
-              summary: "OUTER_DONE",
-              uuid: "00000000-0000-4000-8000-000000001010",
-            }),
-          ]) {
-            yield* Queue.offer(harness.sdkMessages, frame);
-          }
-          yield* harness.awaitContinuation(1);
-
-          yield* Queue.shutdown(harness.sdkMessages);
-          yield* yieldTicks(50);
-          yield* harness.runtime.startTurn(
-            makeClaudeTestTurnInput({
-              threadId: harness.threadId,
-              providerThread: harness.providerThread,
-              now,
-              attemptId: RunAttemptId.make("attempt-claude-exit-buffered-2"),
-              text: "Background task completed.",
-              attachments: [],
-              providerTurnOrdinal: 2,
-              messageCreatedBy: "agent",
-              messageCreationSource: "provider",
-            }),
-          );
-          assert.equal(harness.processQueues.length, 2);
-          yield* Queue.offer(
-            harness.processQueues[1]!,
-            makeResultFrame({
-              uuid: "00000000-0000-4000-8000-000000001011",
-              result: "The audit finished.",
-            }),
-          );
-          yield* harness.awaitTerminal(2);
+            ],
+          },
+          parent_tool_use_id: OUTER_TOOL_USE_ID,
+          uuid: "00000000-0000-4000-8000-000000000a02",
+          session_id: WAKE_NATIVE_SESSION,
+        }),
+        claudeSdkFrame({
+          type: "system",
+          subtype: "task_started",
+          task_id: NESTED_TASK_ID,
+          tool_use_id: NESTED_TOOL_USE_ID,
+          description: "Nested check",
+          subagent_type: "general-purpose",
+          is_backgrounded: false,
+          spawn_depth: 2,
+          task_type: "local_agent",
+          prompt: "Reply with NESTED_OK",
+          uuid: "00000000-0000-4000-8000-000000000a03",
+          session_id: WAKE_NATIVE_SESSION,
+        }),
+        makeResultFrame({
+          uuid: "00000000-0000-4000-8000-000000000a04",
+          result: "Auditing in the background.",
+        }),
+      ]) {
+        yield* Queue.offer(harness.sdkMessages, frame);
+      }
+      yield* harness.awaitTerminal(1);
+      yield* userTurn("attempt-claude-earlier-nested-2", 2);
+      yield* Queue.offer(
+        harness.sdkMessages,
+        makeResultFrame({ uuid: "00000000-0000-4000-8000-000000000a05", result: "Still on it." }),
+      );
+      yield* harness.awaitTerminal(2);
+
+      for (const frame of [
+        makeSubagentNotificationFrame({
+          taskId: NESTED_TASK_ID,
+          toolUseId: NESTED_TOOL_USE_ID,
+          summary: "NESTED_OK",
+          uuid: "00000000-0000-4000-8000-000000000a06",
+        }),
+        makeSubagentToolResultFrame({
+          parentToolUseId: OUTER_TOOL_USE_ID,
+          uuid: "00000000-0000-4000-8000-000000000a07",
+          toolUseId: NESTED_TOOL_USE_ID,
+        }),
+        ...makeSubagentAssistantFrames({
+          parentToolUseId: OUTER_TOOL_USE_ID,
+          uuid: "00000000-0000-4000-8000-000000000a08",
+          text: "OUTER_AFTER_NESTED",
+        }),
+      ]) {
+        yield* Queue.offer(harness.sdkMessages, frame);
+      }
+      yield* harness.until(() =>
+        harness.events.some(
+          (event) =>
+            event.type === "message.updated" && event.message.text === "OUTER_AFTER_NESTED",
+        ),
+      );
 
-          const input = JSON.stringify("git log -5");
-          assert.deepEqual(bashItems(), [
-            `command_execution:running:${input}`,
-            `command_execution:completed:${input}`,
-          ]);
-        }).pipe(
-          Effect.provide(
-            Layer.mergeAll(
-              IdAllocator.layer,
-              McpProviderSessions.layer,
-              NodeServices.layer,
-              NodeCrypto.layer,
-            ),
-          ),
+      assert.isFalse(
+        harness.events.some(
+          (event) =>
+            event.type === "turn_item.updated" &&
+            event.turnItem.nativeItemRef?.nativeId === NESTED_TOOL_USE_ID,
+        ),
+      );
+      const nested = harness.events.findLast(
+        (event) =>
+          event.type === "subagent.updated" &&
+          event.subagent.nativeTaskRef?.nativeId === NESTED_TASK_ID,
+      );
+      assert.equal(nested?.type === "subagent.updated" && nested.subagent.status, "completed");
+      assert.lengthOf(harness.continuationRequests, 0);
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
         ),
       ),
+    ),
   );
 
-  it.effect(
-    "ends a subagent's SendMessage with its result when the CLI exits while the resume waits",
-    () =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const SENDER_TASK_ID = "task-exit-resume-sender";
-          const SENDER_TOOL_USE_ID = "toolu-exit-resume-sender";
-          const RESUMED_TASK_ID = "task-exit-resume-target";
-          const RESUMED_TOOL_USE_ID = "toolu-exit-resume-target";
-          const SEND = "toolu-exit-resume-sendmessage";
-          const SEND_INPUT = { to: RESUMED_TASK_ID, message: "Check the last commit again." };
-          const harness = yield* makeWakeHarnessWithOptions({ freshQueueOnReopen: true });
-          const now = yield* DateTime.now;
-          const sendItems = () =>
-            harness.events.flatMap((event) =>
-              event.type === "turn_item.updated" && event.turnItem.nativeItemRef?.nativeId === SEND
-                ? [
-                    `${event.turnItem.type}:${event.turnItem.status}:${JSON.stringify("input" in event.turnItem ? event.turnItem.input : null)}`,
-                  ]
-                : [],
-            );
-          yield* harness.runtime.startTurn(
-            makeClaudeTestTurnInput({
-              threadId: harness.threadId,
-              providerThread: harness.providerThread,
-              now,
-              attemptId: RunAttemptId.make("attempt-claude-exit-resume-1"),
-              text: "Run two auditors in the background.",
-              attachments: [],
-            }),
-          );
-          for (const frame of [
-            makeSubagentTaskStartedFrame({
-              taskId: SENDER_TASK_ID,
-              toolUseId: SENDER_TOOL_USE_ID,
-              uuid: "00000000-0000-4000-8000-000000001101",
-            }),
-            makeSubagentTaskStartedFrame({
-              taskId: RESUMED_TASK_ID,
-              toolUseId: RESUMED_TOOL_USE_ID,
-              uuid: "00000000-0000-4000-8000-000000001102",
-            }),
-            makeSubagentNotificationFrame({
-              taskId: RESUMED_TASK_ID,
-              toolUseId: RESUMED_TOOL_USE_ID,
-              summary: "First answer.",
-              uuid: "00000000-0000-4000-8000-000000001103",
-            }),
-            makeResultFrame({
-              uuid: "00000000-0000-4000-8000-000000001104",
-              result: "Auditing in the background.",
-            }),
-          ]) {
-            yield* Queue.offer(harness.sdkMessages, frame);
-          }
-          yield* harness.awaitTerminal(1);
-
-          yield* Queue.offer(
-            harness.sdkMessages,
-            claudeSdkFrame({
-              type: "assistant",
-              message: {
-                model: "claude-sonnet-4-6",
-                id: "msg_exit_resume_sendmessage",
-                type: "message",
-                role: "assistant",
-                content: [{ type: "tool_use", id: SEND, name: "SendMessage", input: SEND_INPUT }],
-              },
-              parent_tool_use_id: SENDER_TOOL_USE_ID,
-              uuid: "00000000-0000-4000-8000-000000001105",
-              session_id: WAKE_NATIVE_SESSION,
-            }),
-          );
-          yield* harness.until(() => sendItems().length >= 1);
+  it.effect("keeps an idle-launched nested subagent completed through a sibling's wake", () =>
+    Effect.gen(function* () {
+      const OUTER_TASK_ID = "task-16355-outer";
+      const OUTER_TOOL_USE_ID = "toolu-16355-outer";
+      const NESTED_TASK_ID = "task-16355-nested";
+      const NESTED_TOOL_USE_ID = "toolu-16355-nested";
+      const SIBLING_TASK_ID = "task-16355-sibling";
+      const SIBLING_TOOL_USE_ID = "toolu-16355-sibling";
+      const harness = yield* makeWakeHarness;
+      const now = yield* DateTime.now;
+      const nestedStatuses = () =>
+        harness.events.flatMap((event) =>
+          event.type === "subagent.updated" &&
+          event.subagent.nativeTaskRef?.nativeId === NESTED_TASK_ID
+            ? [event.subagent.status]
+            : [],
+        );
+      yield* harness.runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now,
+          attemptId: RunAttemptId.make("attempt-claude-16355-1"),
+          text: "Run two audits in the background.",
+          attachments: [],
+        }),
+      );
+      for (const frame of [
+        makeSubagentTaskStartedFrame({
+          taskId: OUTER_TASK_ID,
+          toolUseId: OUTER_TOOL_USE_ID,
+          uuid: "00000000-0000-4000-8000-000000016301",
+        }),
+        makeSubagentTaskStartedFrame({
+          taskId: SIBLING_TASK_ID,
+          toolUseId: SIBLING_TOOL_USE_ID,
+          uuid: "00000000-0000-4000-8000-000000016302",
+        }),
+        makeResultFrame({
+          uuid: "00000000-0000-4000-8000-000000016303",
+          result: "Both audits run in the background.",
+        }),
+      ]) {
+        yield* Queue.offer(harness.sdkMessages, frame);
+      }
+      yield* harness.awaitTerminal(1);
 
-          for (const frame of [
-            claudeSdkFrame({
-              type: "system",
-              subtype: "task_started",
-              task_id: RESUMED_TASK_ID,
-              tool_use_id: SEND,
-              description: "Audit recent commits",
-              is_backgrounded: true,
-              task_type: "local_agent",
-              prompt: SEND_INPUT.message,
-              uuid: "00000000-0000-4000-8000-000000001106",
-              session_id: WAKE_NATIVE_SESSION,
-            }),
-            claudeSdkFrame({
-              type: "user",
-              message: {
-                role: "user",
-                content: [{ type: "tool_result", tool_use_id: SEND, content: "Message sent." }],
+      // The background subagent launches a foreground nested one while the root is idle.
+      for (const frame of [
+        claudeSdkFrame({
+          type: "assistant",
+          message: {
+            model: "claude-sonnet-4-6",
+            id: "msg_16355_nested_launch",
+            type: "message",
+            role: "assistant",
+            content: [
+              {
+                type: "tool_use",
+                id: NESTED_TOOL_USE_ID,
+                name: "Agent",
+                input: { description: "Nested check", prompt: "Sleep, then reply NESTED_OK" },
               },
-              parent_tool_use_id: SENDER_TOOL_USE_ID,
-              uuid: "00000000-0000-4000-8000-000000001107",
-              session_id: WAKE_NATIVE_SESSION,
-            }),
-            makeSubagentNotificationFrame({
-              taskId: RESUMED_TASK_ID,
-              toolUseId: SEND,
-              summary: "Second answer.",
-              uuid: "00000000-0000-4000-8000-000000001108",
-            }),
-          ]) {
-            yield* Queue.offer(harness.sdkMessages, frame);
-          }
-          yield* harness.awaitContinuation(1);
-          const beforeExit = sendItems();
+            ],
+          },
+          parent_tool_use_id: OUTER_TOOL_USE_ID,
+          uuid: "00000000-0000-4000-8000-000000016304",
+          session_id: WAKE_NATIVE_SESSION,
+        }),
+        claudeSdkFrame({
+          type: "system",
+          subtype: "task_started",
+          task_id: NESTED_TASK_ID,
+          tool_use_id: NESTED_TOOL_USE_ID,
+          description: "Nested check",
+          subagent_type: "general-purpose",
+          is_backgrounded: false,
+          spawn_depth: 2,
+          task_type: "local_agent",
+          prompt: "Sleep, then reply NESTED_OK",
+          uuid: "00000000-0000-4000-8000-000000016305",
+          session_id: WAKE_NATIVE_SESSION,
+        }),
+        claudeSdkFrame({
+          type: "system",
+          subtype: "task_progress",
+          task_id: NESTED_TASK_ID,
+          description: "Sleeping",
+          uuid: "00000000-0000-4000-8000-000000016306",
+          session_id: WAKE_NATIVE_SESSION,
+        }),
+      ]) {
+        yield* harness.offerAndWait(frame);
+      }
 
-          yield* Queue.shutdown(harness.sdkMessages);
-          yield* yieldTicks(50);
-          yield* harness.runtime.startTurn(
-            makeClaudeTestTurnInput({
-              threadId: harness.threadId,
-              providerThread: harness.providerThread,
-              now,
-              attemptId: RunAttemptId.make("attempt-claude-exit-resume-2"),
-              text: "Background task completed.",
-              attachments: [],
-              providerTurnOrdinal: 2,
-              messageCreatedBy: "agent",
-              messageCreationSource: "provider",
-            }),
-          );
-          assert.equal(harness.processQueues.length, 2);
-          yield* Queue.offer(
-            harness.processQueues[1]!,
-            makeResultFrame({
-              uuid: "00000000-0000-4000-8000-000000001109",
-              result: "The audit finished.",
-            }),
-          );
-          yield* harness.awaitTerminal(2);
+      // A user turn runs while the nested and then the outer subagent finish.
+      yield* harness.runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now,
+          attemptId: RunAttemptId.make("attempt-claude-16355-2"),
+          text: "Sleep for a while.",
+          attachments: [],
+          providerTurnOrdinal: 2,
+        }),
+      );
+      yield* harness.until(() => harness.offeredMessages.length === 2);
+      for (const frame of [
+        makeSubagentNotificationFrame({
+          taskId: NESTED_TASK_ID,
+          toolUseId: NESTED_TOOL_USE_ID,
+          summary: "NESTED_OK",
+          uuid: "00000000-0000-4000-8000-000000016307",
+        }),
+        makeSubagentToolResultFrame({
+          parentToolUseId: OUTER_TOOL_USE_ID,
+          uuid: "00000000-0000-4000-8000-000000016308",
+          toolUseId: NESTED_TOOL_USE_ID,
+        }),
+        ...makeSubagentAssistantFrames({
+          parentToolUseId: OUTER_TOOL_USE_ID,
+          uuid: "00000000-0000-4000-8000-000000016309",
+          text: "OUTER_DONE",
+        }),
+        makeSubagentNotificationFrame({
+          taskId: OUTER_TASK_ID,
+          toolUseId: OUTER_TOOL_USE_ID,
+          summary: "OUTER_DONE",
+          uuid: "00000000-0000-4000-8000-000000016310",
+        }),
+        makeResultFrame({
+          uuid: "00000000-0000-4000-8000-000000016311",
+          result: "Slept.",
+        }),
+      ]) {
+        yield* Queue.offer(harness.sdkMessages, frame);
+      }
+      yield* harness.awaitTerminal(2);
+
+      // The sibling's completion wakes a continuation while the root is idle.
+      for (const frame of [
+        makeSubagentNotificationFrame({
+          taskId: SIBLING_TASK_ID,
+          toolUseId: SIBLING_TOOL_USE_ID,
+          summary: "SIBLING_DONE",
+          uuid: "00000000-0000-4000-8000-000000016312",
+        }),
+        makeAssistantTextFrame({
+          uuid: "00000000-0000-4000-8000-000000016313",
+          text: "Both audits finished.",
+        }),
+        makeResultFrame({
+          uuid: "00000000-0000-4000-8000-000000016314",
+          result: "Both audits finished.",
+          origin: { kind: "task-notification" },
+        }),
+      ]) {
+        yield* Queue.offer(harness.sdkMessages, frame);
+      }
+      yield* harness.awaitContinuation(1);
+      yield* harness.runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now,
+          attemptId: RunAttemptId.make("attempt-claude-16355-3"),
+          text: "Background task completed.",
+          attachments: [],
+          providerTurnOrdinal: 3,
+          messageCreatedBy: "agent",
+          messageCreationSource: "provider",
+        }),
+      );
+      yield* harness.awaitTerminal(3);
 
-          const input = JSON.stringify(SEND_INPUT);
-          assert.deepEqual(beforeExit, [`dynamic_tool:running:${input}`]);
-          assert.deepEqual(sendItems(), [
-            `dynamic_tool:running:${input}`,
-            `dynamic_tool:completed:${input}`,
-          ]);
-        }).pipe(
-          Effect.provide(
-            Layer.mergeAll(
-              IdAllocator.layer,
-              McpProviderSessions.layer,
-              NodeServices.layer,
-              NodeCrypto.layer,
-            ),
-          ),
+      assert.equal(nestedStatuses().at(-1), "completed");
+      assert.isFalse(yield* harness.hasPendingBackgroundWork);
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
         ),
       ),
+    ),
   );
 
-  it.effect.each([
-    ["", "none"],
-    [" behind another subagent's start without one", "before"],
-    [" when another subagent's start without one arrives between its frames", "between"],
-  ] as const)(
-    "keeps a subagent's frames in order when a late progress names its tool use while the root is idle%s",
-    ([, otherStart]) =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const TASK_ID = "task-late-owner-idle";
-          const TOOL_USE_ID = "toolu-late-owner-idle";
-          const BASH = "toolu-late-owner-idle-bash";
-          const harness = yield* makeWakeHarness;
-          const now = yield* DateTime.now;
-          const bashStatuses = () =>
-            harness.events.flatMap((event) =>
-              event.type === "turn_item.updated" && event.turnItem.nativeItemRef?.nativeId === BASH
-                ? [`${event.turnItem.type}:${event.turnItem.status}`]
-                : [],
-            );
-          yield* harness.runtime.startTurn(
-            makeClaudeTestTurnInput({
-              threadId: harness.threadId,
-              providerThread: harness.providerThread,
-              now,
-              attemptId: RunAttemptId.make("attempt-claude-late-owner-idle-1"),
-              text: "Audit in the background.",
-              attachments: [],
-            }),
+  it.effect.each(["exit", "Stop"] as const)(
+    "settles a plain background subagent and its open call on %s after the root turn completes",
+    (reason) =>
+      Effect.gen(function* () {
+        const TOOL_USE_ID = "toolu-idle-exit";
+        const BASH = "toolu-idle-exit-bash";
+        const harness = yield* makeWakeHarnessWithOptions({ close: Queue.shutdown });
+        const now = yield* DateTime.now;
+        const bashStatuses = () =>
+          harness.events.flatMap((event) =>
+            event.type === "turn_item.updated" && event.turnItem.nativeItemRef?.nativeId === BASH
+              ? [`${event.turnItem.type}:${event.turnItem.status}`]
+              : [],
           );
-          for (const frame of [
-            claudeSdkFrame({
-              type: "system",
-              subtype: "task_started",
-              task_id: TASK_ID,
-              description: "Audit recent commits",
-              subagent_type: "general-purpose",
-              is_backgrounded: true,
-              task_type: "local_agent",
-              prompt: "Audit the last five commits.",
-              uuid: "00000000-0000-4000-8000-000000000a01",
-              session_id: WAKE_NATIVE_SESSION,
-            }),
-            makeResultFrame({
-              uuid: "00000000-0000-4000-8000-000000000a02",
-              result: "Auditing in the background.",
-            }),
-          ]) {
-            yield* Queue.offer(harness.sdkMessages, frame);
-          }
-          yield* harness.awaitTerminal(1);
+        yield* harness.runtime.startTurn(
+          makeClaudeTestTurnInput({
+            threadId: harness.threadId,
+            providerThread: harness.providerThread,
+            now,
+            attemptId: RunAttemptId.make("attempt-claude-idle-exit"),
+            text: "Audit in the background.",
+            attachments: [],
+          }),
+        );
+        yield* harness.offerAndWait(
+          makeSubagentTaskStartedFrame({
+            taskId: "task-idle-exit",
+            toolUseId: TOOL_USE_ID,
+            uuid: "00000000-0000-4000-8000-000000000981",
+          }),
+        );
+        const started = yield* Queue.take(harness.subagentReceipts);
+        assert.equal(started.subagent.status, "running");
+        for (const frame of makeSubagentAssistantFrames({
+          parentToolUseId: TOOL_USE_ID,
+          uuid: "00000000-0000-4000-8000-000000000982",
+          bashToolUseId: BASH,
+        })) {
+          yield* harness.offerAndWait(frame);
+        }
+        yield* harness.offerAndWait(
+          makeResultFrame({
+            uuid: "00000000-0000-4000-8000-000000000983",
+            result: "Auditing in the background.",
+          }),
+        );
+        const terminal = yield* Queue.take(harness.terminalReceipts);
+        assert.equal(terminal.status, "completed");
+        assert.isTrue(yield* harness.hasPendingBackgroundWork);
+        assert.deepEqual(bashStatuses(), ["command_execution:running"]);
 
-          const otherStartFrame = claudeSdkFrame({
-            type: "system",
-            subtype: "task_started",
-            task_id: "task-late-owner-other",
-            description: "Check the changelog",
-            subagent_type: "general-purpose",
-            is_backgrounded: true,
-            task_type: "local_agent",
-            prompt: "Check the changelog.",
-            uuid: "00000000-0000-4000-8000-000000000a09",
-            session_id: WAKE_NATIVE_SESSION,
-          });
-          const progressFrame = claudeSdkFrame({
-            type: "system",
-            subtype: "task_progress",
-            task_id: TASK_ID,
-            tool_use_id: TOOL_USE_ID,
-            description: "Reading the last commits",
-            usage: { total_tokens: 1, tool_uses: 1, duration_ms: 1 },
-            uuid: "00000000-0000-4000-8000-000000000a04",
-            session_id: WAKE_NATIVE_SESSION,
-          });
-          const bashResultFrame = makeSubagentToolResultFrame({
-            parentToolUseId: TOOL_USE_ID,
-            uuid: "00000000-0000-4000-8000-000000000a05",
-            toolUseId: BASH,
+        if (reason === "Stop") {
+          yield* harness.runtime.interruptTurn({
+            providerThread: harness.providerThread,
+            providerTurnId: terminal.providerTurnId,
+            requestRuntimeRestart: true,
           });
-          for (const frame of [
-            ...(otherStart === "before" ? [otherStartFrame] : []),
-            ...makeSubagentAssistantFrames({
-              parentToolUseId: TOOL_USE_ID,
-              uuid: "00000000-0000-4000-8000-000000000a03",
-              text: "First.",
-              bashToolUseId: BASH,
-            }),
-            ...(otherStart === "between"
-              ? [otherStartFrame, bashResultFrame, progressFrame]
-              : [progressFrame, bashResultFrame]),
-            ...makeSubagentAssistantFrames({
-              parentToolUseId: TOOL_USE_ID,
-              uuid: "00000000-0000-4000-8000-000000000a06",
-              text: "Second.",
-            }),
-            makeSubagentNotificationFrame({
-              taskId: TASK_ID,
-              toolUseId: TOOL_USE_ID,
-              summary: "Second.",
-              uuid: "00000000-0000-4000-8000-000000000a07",
-            }),
-          ]) {
-            yield* Queue.offer(harness.sdkMessages, frame);
-          }
-          yield* harness.awaitContinuation(1);
-          yield* Queue.offer(
-            harness.sdkMessages,
-            makeResultFrame({
-              uuid: "00000000-0000-4000-8000-000000000a08",
-              result: "The auditor finished.",
-            }),
-          );
-          yield* harness.runtime.startTurn(
-            makeClaudeTestTurnInput({
-              threadId: harness.threadId,
-              providerThread: harness.providerThread,
-              now,
-              attemptId: RunAttemptId.make("attempt-claude-late-owner-idle-2"),
-              text: "Background task completed.",
-              attachments: [],
-              providerTurnOrdinal: 2,
-              messageCreatedBy: "agent",
-              messageCreationSource: "provider",
-            }),
-          );
-          yield* harness.awaitTerminal(2);
-
-          const routing = subagentRouting(harness.events, [BASH]);
-          const childTexts = routing.assistantTexts(routing.childThreadId);
-          const statuses = bashStatuses();
-          const trace = harness.events.flatMap((event) =>
-            event.type === "message.updated" &&
-            event.message.role === "assistant" &&
-            event.message.threadId === routing.childThreadId
-              ? [`text:${event.message.text}#${event.message.id}`]
-              : event.type === "turn_item.updated" &&
-                  event.turnItem.nativeItemRef?.nativeId === BASH
-                ? [`bash:${event.turnItem.status}`]
-                : [],
-          );
-          assert.deepEqual(childTexts, ["First.", "Second."], `trace: ${JSON.stringify(trace)}`);
-          assert.deepEqual(
-            [...(routing.toolThreadIds.get(BASH) ?? [])],
-            [routing.childThreadId],
-            `trace: ${JSON.stringify(trace)}`,
-          );
-          assert.deepEqual(
-            statuses,
-            ["command_execution:running", "command_execution:completed"],
-            `trace: ${JSON.stringify(trace)}`,
-          );
-          assert.isTrue(
-            harness.events.some(
-              (event) =>
-                event.type === "subagent.updated" &&
-                event.subagent.progress === "Reading the last commits",
-            ),
-          );
-          assert.lengthOf(harness.continuationRequests, 1);
-        }).pipe(
-          Effect.provide(
-            Layer.mergeAll(
-              IdAllocator.layer,
-              McpProviderSessions.layer,
-              NodeServices.layer,
-              NodeCrypto.layer,
-            ),
+        } else {
+          yield* Queue.shutdown(harness.sdkMessages);
+        }
+        let ended = yield* Queue.take(harness.subagentReceipts);
+        while (ended.subagent.status === "running") {
+          ended = yield* Queue.take(harness.subagentReceipts);
+        }
+        assert.equal(ended.subagent.nativeTaskRef?.nativeId, "task-idle-exit");
+        assert.equal(ended.subagent.status, reason === "Stop" ? "cancelled" : "failed");
+        assert.isFalse(yield* harness.hasPendingBackgroundWork);
+        assert.deepEqual(bashStatuses(), [
+          "command_execution:running",
+          reason === "Stop" ? "command_execution:interrupted" : "command_execution:failed",
+        ]);
+      }).pipe(
+        Effect.provide(
+          Layer.mergeAll(
+            IdAllocator.layer,
+            McpProviderSessions.layer,
+            NodeServices.layer,
+            NodeCrypto.layer,
           ),
         ),
       ),
   );
 
-  it.effect("holds subagent frames that precede task_started and shows its result once", () =>
-    Effect.scoped(
+  it.effect.each(["before", "after"] as const)(
+    "keeps a subagent call's result when the CLI exits before the drain (result %s the nested launch's)",
+    (bashResultOrder) =>
       Effect.gen(function* () {
-        const TASK_ID = "task-early-subagent";
-        const TOOL_USE_ID = "toolu-early-subagent";
-        const FINAL_REPORT = "Early auditor done.";
-        const harness = yield* makeWakeHarness;
+        const OUTER_TASK_ID = "task-exit-buffered-outer";
+        const OUTER_TOOL_USE_ID = "toolu-exit-buffered-outer";
+        const NESTED_TASK_ID = "task-exit-buffered-nested";
+        const NESTED_TOOL_USE_ID = "toolu-exit-buffered-nested";
+        const BASH = "toolu-exit-buffered-bash";
+        const harness = yield* makeWakeHarnessWithOptions({ freshQueueOnReopen: true });
         const now = yield* DateTime.now;
+        const bashItems = () =>
+          harness.events.flatMap((event) =>
+            event.type === "turn_item.updated" && event.turnItem.nativeItemRef?.nativeId === BASH
+              ? [
+                  `${event.turnItem.type}:${event.turnItem.status}:${JSON.stringify("input" in event.turnItem ? event.turnItem.input : null)}`,
+                ]
+              : [],
+          );
         yield* harness.runtime.startTurn(
           makeClaudeTestTurnInput({
             threadId: harness.threadId,
             providerThread: harness.providerThread,
             now,
-            attemptId: RunAttemptId.make("attempt-claude-early-subagent"),
-            text: "Run an auditor.",
+            attemptId: RunAttemptId.make("attempt-claude-exit-buffered-1"),
+            text: "Audit in the background.",
             attachments: [],
           }),
         );
-        const frames = [
-          // Child frames can precede the task_started that registers their subagent.
-          ...makeSubagentAssistantFrames({
-            parentToolUseId: TOOL_USE_ID,
-            uuid: "00000000-0000-4000-8000-000000000321",
-            text: "Starting early.",
-            bashToolUseId: "toolu-early-bash",
-          }),
-          makeSubagentToolResultFrame({
-            parentToolUseId: TOOL_USE_ID,
-            uuid: "00000000-0000-4000-8000-000000000322",
-            toolUseId: "toolu-early-bash",
-          }),
+        for (const frame of [
           makeSubagentTaskStartedFrame({
-            taskId: TASK_ID,
-            toolUseId: TOOL_USE_ID,
-            uuid: "00000000-0000-4000-8000-000000000323",
+            taskId: OUTER_TASK_ID,
+            toolUseId: OUTER_TOOL_USE_ID,
+            uuid: "00000000-0000-4000-8000-000000001001",
           }),
-          ...makeSubagentAssistantFrames({
-            parentToolUseId: TOOL_USE_ID,
-            uuid: "00000000-0000-4000-8000-000000000324",
-            text: "Still working.",
+          makeResultFrame({
+            uuid: "00000000-0000-4000-8000-000000001002",
+            result: "Auditing in the background.",
+          }),
+        ]) {
+          yield* Queue.offer(harness.sdkMessages, frame);
+        }
+        yield* harness.awaitTerminal(1);
+
+        for (const frame of makeSubagentAssistantFrames({
+          parentToolUseId: OUTER_TOOL_USE_ID,
+          uuid: "00000000-0000-4000-8000-000000001003",
+          bashToolUseId: BASH,
+        })) {
+          yield* Queue.offer(harness.sdkMessages, frame);
+        }
+        yield* harness.until(() => bashItems().length === 1);
+
+        const bashResultFrame = makeSubagentToolResultFrame({
+          parentToolUseId: OUTER_TOOL_USE_ID,
+          uuid: "00000000-0000-4000-8000-000000001006",
+          toolUseId: BASH,
+        });
+        for (const frame of [
+          claudeSdkFrame({
+            type: "assistant",
+            message: {
+              model: "claude-sonnet-4-6",
+              id: "msg_exit_buffered_nested_launch",
+              type: "message",
+              role: "assistant",
+              content: [
+                {
+                  type: "tool_use",
+                  id: NESTED_TOOL_USE_ID,
+                  name: "Agent",
+                  input: { description: "Nested check", prompt: "Reply with NESTED_OK" },
+                },
+              ],
+            },
+            parent_tool_use_id: OUTER_TOOL_USE_ID,
+            uuid: "00000000-0000-4000-8000-000000001004",
+            session_id: WAKE_NATIVE_SESSION,
           }),
           claudeSdkFrame({
             type: "system",
-            subtype: "task_progress",
-            task_id: TASK_ID,
-            description: "Checking the diffs",
-            uuid: "00000000-0000-4000-8000-000000000325",
+            subtype: "task_started",
+            task_id: NESTED_TASK_ID,
+            tool_use_id: NESTED_TOOL_USE_ID,
+            description: "Nested check",
+            subagent_type: "general-purpose",
+            is_backgrounded: false,
+            spawn_depth: 2,
+            task_type: "local_agent",
+            prompt: "Reply with NESTED_OK",
+            uuid: "00000000-0000-4000-8000-000000001005",
             session_id: WAKE_NATIVE_SESSION,
           }),
+          ...(bashResultOrder === "before" ? [bashResultFrame] : []),
           ...makeSubagentAssistantFrames({
-            parentToolUseId: TOOL_USE_ID,
-            uuid: "00000000-0000-4000-8000-000000000326",
-            text: FINAL_REPORT,
+            parentToolUseId: NESTED_TOOL_USE_ID,
+            uuid: "00000000-0000-4000-8000-000000001007",
+            text: "NESTED_OK",
           }),
           makeSubagentNotificationFrame({
-            taskId: TASK_ID,
-            toolUseId: TOOL_USE_ID,
-            summary: FINAL_REPORT,
-            uuid: "00000000-0000-4000-8000-000000000327",
+            taskId: NESTED_TASK_ID,
+            toolUseId: NESTED_TOOL_USE_ID,
+            summary: "NESTED_OK",
+            uuid: "00000000-0000-4000-8000-000000001008",
           }),
-          makeResultFrame({
-            uuid: "00000000-0000-4000-8000-000000000328",
-            result: "The auditor finished.",
+          makeSubagentToolResultFrame({
+            parentToolUseId: OUTER_TOOL_USE_ID,
+            uuid: "00000000-0000-4000-8000-000000001009",
+            toolUseId: NESTED_TOOL_USE_ID,
           }),
-        ];
-        for (const frame of frames) {
+          ...(bashResultOrder === "after" ? [bashResultFrame] : []),
+          makeSubagentNotificationFrame({
+            taskId: OUTER_TASK_ID,
+            toolUseId: OUTER_TOOL_USE_ID,
+            summary: "OUTER_DONE",
+            uuid: "00000000-0000-4000-8000-000000001010",
+          }),
+        ]) {
           yield* Queue.offer(harness.sdkMessages, frame);
         }
-        yield* harness.awaitTerminal(1);
+        yield* harness.awaitContinuation(1);
 
-        const routing = subagentRouting(harness.events, ["toolu-early-bash"]);
-        assert.isDefined(routing.childThreadId);
-        // Agents quote this id back to t3_thread_send/t3_thread_read.
-        const childThreadId = routing.childThreadId ?? "";
-        assert.notInclude(childThreadId, "%");
-        assert.isAtMost(childThreadId.length, 64);
-        assert.deepEqual(
-          [...(routing.toolThreadIds.get("toolu-early-bash") ?? [])],
-          [routing.childThreadId],
+        yield* Queue.shutdown(harness.sdkMessages);
+        yield* yieldTicks(50);
+        yield* harness.runtime.startTurn(
+          makeClaudeTestTurnInput({
+            threadId: harness.threadId,
+            providerThread: harness.providerThread,
+            now,
+            attemptId: RunAttemptId.make("attempt-claude-exit-buffered-2"),
+            text: "Background task completed.",
+            attachments: [],
+            providerTurnOrdinal: 2,
+            messageCreatedBy: "agent",
+            messageCreationSource: "provider",
+          }),
+        );
+        assert.equal(harness.processQueues.length, 2);
+        yield* Queue.offer(
+          harness.processQueues[1]!,
+          makeResultFrame({
+            uuid: "00000000-0000-4000-8000-000000001011",
+            result: "The audit finished.",
+          }),
         );
-        assert.deepEqual(routing.assistantTexts(routing.childThreadId), [
-          "Starting early.",
-          "Still working.",
-          FINAL_REPORT,
+        yield* harness.awaitTerminal(2);
+
+        const input = JSON.stringify("git log -5");
+        assert.deepEqual(bashItems(), [
+          `command_execution:running:${input}`,
+          `command_execution:completed:${input}`,
         ]);
-        assert.deepEqual(routing.assistantTexts(harness.threadId), ["The auditor finished."]);
       }).pipe(
         Effect.provide(
           Layer.mergeAll(
@@ -17591,204 +17276,148 @@ describe("ClaudeAdapterV2 background wake turns", () => {
           ),
         ),
       ),
-    ),
   );
 
-  it.effect.each([false, true])(
-    "drops an idle start superseded by live completion, later resume %s",
-    (resume) =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const harness = yield* makeWakeHarness;
-          const startTurn = (ordinal: number, continuation = false) =>
-            harness.runtime.startTurn(
-              makeClaudeTestTurnInput({
-                threadId: harness.threadId,
-                providerThread: harness.providerThread,
-                now: DateTime.makeUnsafe(0),
-                attemptId: RunAttemptId.make(`attempt-stale-start-${ordinal}`),
-                providerTurnOrdinal: ordinal,
-                text: "Continue work.",
-                attachments: [],
-                ...(continuation
-                  ? {
-                      messageCreatedBy: "agent" as const,
-                      messageCreationSource: "provider" as const,
-                    }
-                  : {}),
-              }),
-            );
-          const started = (taskId: string, suffix: string) =>
-            makeSubagentTaskStartedFrame({
-              taskId,
-              toolUseId: `toolu-${taskId}`,
-              uuid: `00000000-0000-4000-8000-${suffix}`,
-            });
-          const finished = (taskId: string, suffix: string) =>
-            makeSubagentNotificationFrame({
-              taskId,
-              toolUseId: `toolu-${taskId}`,
-              summary: "Finished audit.",
-              uuid: `00000000-0000-4000-8000-${suffix}`,
-            });
-          yield* startTurn(1);
-          yield* harness.offerAndWait(started("stale-agent", "000000004001"));
-          yield* harness.offerAndWait(started("wake-agent", "000000004002"));
-          yield* harness.offerAndWait(
-            makeResultFrame({
-              uuid: "00000000-0000-4000-8000-000000004003",
-              result: "Agents launched.",
-            }),
-          );
-          yield* Queue.take(harness.terminalReceipts);
-          yield* harness.offerAndWait(started("stale-agent", "000000004004"));
-          yield* startTurn(2);
-          yield* harness.offerAndWait(finished("stale-agent", "000000004005"));
-          yield* harness.offerAndWait(
-            makeResultFrame({
-              uuid: "00000000-0000-4000-8000-000000004006",
-              result: "User turn finished.",
-            }),
-          );
-          yield* Queue.take(harness.terminalReceipts);
-          if (resume) yield* harness.offerAndWait(started("stale-agent", "000000004007"));
-          yield* harness.offerAndWait(finished("wake-agent", "000000004008"));
-          yield* Queue.take(harness.continuationReceipts);
-          yield* startTurn(3, true);
-          yield* harness.offerAndWait(
-            makeResultFrame({
-              uuid: "00000000-0000-4000-8000-000000004009",
-              result: "Wake finished.",
-            }),
-          );
-          yield* Queue.take(harness.terminalReceipts);
-          const latest = harness.events.findLast(
-            (event) =>
-              event.type === "subagent.updated" &&
-              event.subagent.nativeTaskRef?.nativeId === "stale-agent",
+  it.effect(
+    "ends a subagent's SendMessage with its result when the CLI exits while the resume waits",
+    () =>
+      Effect.gen(function* () {
+        const SENDER_TASK_ID = "task-exit-resume-sender";
+        const SENDER_TOOL_USE_ID = "toolu-exit-resume-sender";
+        const RESUMED_TASK_ID = "task-exit-resume-target";
+        const RESUMED_TOOL_USE_ID = "toolu-exit-resume-target";
+        const SEND = "toolu-exit-resume-sendmessage";
+        const SEND_INPUT = { to: RESUMED_TASK_ID, message: "Check the last commit again." };
+        const harness = yield* makeWakeHarnessWithOptions({ freshQueueOnReopen: true });
+        const now = yield* DateTime.now;
+        const sendItems = () =>
+          harness.events.flatMap((event) =>
+            event.type === "turn_item.updated" && event.turnItem.nativeItemRef?.nativeId === SEND
+              ? [
+                  `${event.turnItem.type}:${event.turnItem.status}:${JSON.stringify("input" in event.turnItem ? event.turnItem.input : null)}`,
+                ]
+              : [],
           );
-          assert.equal(latest?.type, "subagent.updated");
-          if (latest?.type !== "subagent.updated") return;
-          assert.equal(latest.subagent.status, resume ? "running" : "completed");
-          assert.equal(latest.subagent.result, resume ? null : "Finished audit.");
-          assert.equal(latest.subagent.completedAt === null, resume);
-        }).pipe(
-          Effect.provide(
-            Layer.mergeAll(
-              IdAllocator.layer,
-              McpProviderSessions.layer,
-              NodeServices.layer,
-              NodeCrypto.layer,
-            ),
-          ),
-        ),
-      ),
-  );
-
-  const makeStopFixture = (options?: Parameters<typeof makeWakeHarnessWithOptions>[0]) =>
-    Effect.gen(function* () {
-      const requests = yield* Queue.unbounded<void>();
-      const harness = yield* makeWakeHarnessWithOptions({
-        ...options,
-        stopTask: (id) =>
-          Queue.offer(requests, undefined).pipe(
-            Effect.andThen(options?.stopTask?.(id) ?? Effect.void),
-          ),
-      });
-      let sequence = 4500;
-      const uuid = () => `00000000-0000-4000-8000-${String(++sequence).padStart(12, "0")}`;
-      const startTurn = (continuation = false) =>
-        harness.runtime.startTurn(
+        yield* harness.runtime.startTurn(
           makeClaudeTestTurnInput({
             threadId: harness.threadId,
             providerThread: harness.providerThread,
-            now: DateTime.makeUnsafe(0),
-            attemptId: RunAttemptId.make(`attempt-stop-${continuation ? 2 : 1}`),
-            providerTurnOrdinal: continuation ? 2 : 1,
-            text: "Run an audit.",
+            now,
+            attemptId: RunAttemptId.make("attempt-claude-exit-resume-1"),
+            text: "Run two auditors in the background.",
             attachments: [],
-            ...(continuation
-              ? { messageCreatedBy: "agent" as const, messageCreationSource: "provider" as const }
-              : {}),
           }),
         );
-      const start = (toolUseId = "toolu-stop-agent") =>
-        harness.offerAndWait(
+        for (const frame of [
           makeSubagentTaskStartedFrame({
-            taskId: "stop-agent",
-            toolUseId,
-            uuid: uuid(),
+            taskId: SENDER_TASK_ID,
+            toolUseId: SENDER_TOOL_USE_ID,
+            uuid: "00000000-0000-4000-8000-000000001101",
           }),
-        );
-      const notify = (
-        status: "completed" | "failed" | "stopped",
-        summary = "Native outcome.",
-        toolUseId = "toolu-stop-agent",
-      ) =>
-        harness.offerAndWait(
+          makeSubagentTaskStartedFrame({
+            taskId: RESUMED_TASK_ID,
+            toolUseId: RESUMED_TOOL_USE_ID,
+            uuid: "00000000-0000-4000-8000-000000001102",
+          }),
+          makeSubagentNotificationFrame({
+            taskId: RESUMED_TASK_ID,
+            toolUseId: RESUMED_TOOL_USE_ID,
+            summary: "First answer.",
+            uuid: "00000000-0000-4000-8000-000000001103",
+          }),
+          makeResultFrame({
+            uuid: "00000000-0000-4000-8000-000000001104",
+            result: "Auditing in the background.",
+          }),
+        ]) {
+          yield* Queue.offer(harness.sdkMessages, frame);
+        }
+        yield* harness.awaitTerminal(1);
+
+        yield* Queue.offer(
+          harness.sdkMessages,
           claudeSdkFrame({
-            ...makeSubagentNotificationFrame({
-              taskId: "stop-agent",
-              toolUseId,
-              summary,
-              uuid: uuid(),
-            }),
-            status,
+            type: "assistant",
+            message: {
+              model: "claude-sonnet-4-6",
+              id: "msg_exit_resume_sendmessage",
+              type: "message",
+              role: "assistant",
+              content: [{ type: "tool_use", id: SEND, name: "SendMessage", input: SEND_INPUT }],
+            },
+            parent_tool_use_id: SENDER_TOOL_USE_ID,
+            uuid: "00000000-0000-4000-8000-000000001105",
+            session_id: WAKE_NATIVE_SESSION,
           }),
         );
-      const stop = (requestedAt?: DateTime.Utc) =>
-        harness.runtime.stopSubagent!({
-          providerThread: harness.providerThread,
-          nativeTaskId: "stop-agent",
-          ...(requestedAt === undefined ? {} : { requestedAt }),
-        });
-      const finishParent = () =>
-        harness
-          .offerAndWait(makeResultFrame({ uuid: uuid(), result: "Launched." }))
-          .pipe(Effect.andThen(Queue.take(harness.terminalReceipts)));
-      yield* startTurn();
-      yield* start();
-      yield* Queue.take(harness.subagentReceipts);
-      return {
-        ...harness,
-        start,
-        notify,
-        stop,
-        finishParent,
-        replay: () => startTurn(true),
-        uuid,
-        requests,
-      };
-    });
+        yield* harness.until(() => sendItems().length >= 1);
 
-  it.effect("retains native confirmation after the synchronous Agent tool result", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const fixture = yield* makeStopFixture({
-          stopTask: () => Effect.die("Task already completed"),
-        });
-        yield* fixture.notify("completed");
-        const completed = yield* Queue.take(fixture.subagentReceipts);
-        yield* fixture.offerAndWait(
+        for (const frame of [
+          claudeSdkFrame({
+            type: "system",
+            subtype: "task_started",
+            task_id: RESUMED_TASK_ID,
+            tool_use_id: SEND,
+            description: "Audit recent commits",
+            is_backgrounded: true,
+            task_type: "local_agent",
+            prompt: SEND_INPUT.message,
+            uuid: "00000000-0000-4000-8000-000000001106",
+            session_id: WAKE_NATIVE_SESSION,
+          }),
           claudeSdkFrame({
             type: "user",
             message: {
               role: "user",
-              content: [
-                { type: "tool_result", tool_use_id: "toolu-stop-agent", content: "Tool result." },
-              ],
+              content: [{ type: "tool_result", tool_use_id: SEND, content: "Message sent." }],
             },
-            parent_tool_use_id: null,
-            uuid: fixture.uuid(),
+            parent_tool_use_id: SENDER_TOOL_USE_ID,
+            uuid: "00000000-0000-4000-8000-000000001107",
             session_id: WAKE_NATIVE_SESSION,
           }),
+          makeSubagentNotificationFrame({
+            taskId: RESUMED_TASK_ID,
+            toolUseId: SEND,
+            summary: "Second answer.",
+            uuid: "00000000-0000-4000-8000-000000001108",
+          }),
+        ]) {
+          yield* Queue.offer(harness.sdkMessages, frame);
+        }
+        yield* harness.awaitContinuation(1);
+        const beforeExit = sendItems();
+
+        yield* Queue.shutdown(harness.sdkMessages);
+        yield* yieldTicks(50);
+        yield* harness.runtime.startTurn(
+          makeClaudeTestTurnInput({
+            threadId: harness.threadId,
+            providerThread: harness.providerThread,
+            now,
+            attemptId: RunAttemptId.make("attempt-claude-exit-resume-2"),
+            text: "Background task completed.",
+            attachments: [],
+            providerTurnOrdinal: 2,
+            messageCreatedBy: "agent",
+            messageCreationSource: "provider",
+          }),
         );
-        assert.equal((yield* Queue.take(fixture.subagentReceipts)).subagent.result, "Tool result.");
-        assert.deepEqual(yield* fixture.stop(), {
-          status: "completed",
-          completedAt: completed.subagent.completedAt!,
-          result: "Native outcome.",
-        });
+        assert.equal(harness.processQueues.length, 2);
+        yield* Queue.offer(
+          harness.processQueues[1]!,
+          makeResultFrame({
+            uuid: "00000000-0000-4000-8000-000000001109",
+            result: "The audit finished.",
+          }),
+        );
+        yield* harness.awaitTerminal(2);
+
+        const input = JSON.stringify(SEND_INPUT);
+        assert.deepEqual(beforeExit, [`dynamic_tool:running:${input}`]);
+        assert.deepEqual(sendItems(), [
+          `dynamic_tool:running:${input}`,
+          `dynamic_tool:completed:${input}`,
+        ]);
       }).pipe(
         Effect.provide(
           Layer.mergeAll(
@@ -17799,320 +17428,165 @@ describe("ClaudeAdapterV2 background wake turns", () => {
           ),
         ),
       ),
-    ),
-  );
-
-  it.effect.each([
-    [false, "stopped"],
-    [true, "stopped"],
-    [false, "completed"],
-  ] as const)(
-    "stops one native subagent while its sibling keeps running, owner settled %s, outcome %s",
-    ([ownerSettled, outcome]) =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const stopped: string[] = [];
-          const stopRequested = yield* Deferred.make<void>();
-          let closes = 0;
-          const harness = yield* makeWakeHarnessWithOptions({
-            stopTask: (taskId) =>
-              Effect.sync(() => {
-                stopped.push(taskId);
-              }).pipe(Effect.andThen(Deferred.succeed(stopRequested, undefined))),
-            interrupt: Effect.die("A child stop must not interrupt its owner"),
-            close: () =>
-              Effect.sync(() => {
-                closes++;
-              }),
-          });
-          yield* harness.runtime.startTurn(
-            makeClaudeTestTurnInput({
-              threadId: harness.threadId,
-              providerThread: harness.providerThread,
-              now: yield* DateTime.now,
-              attemptId: RunAttemptId.make("attempt-native-child-stop"),
-              text: "Start two agents.",
-              attachments: [],
-            }),
-          );
-          for (const [taskId, toolUseId, uuid] of [
-            ["agent-stop", "toolu-stop", "00000000-0000-4000-8000-000000000801"],
-            ["agent-keep", "toolu-keep", "00000000-0000-4000-8000-000000000802"],
-          ]) {
-            yield* harness.offerAndWait(
-              makeSubagentTaskStartedFrame({ taskId: taskId!, toolUseId: toolUseId!, uuid: uuid! }),
-            );
-            yield* Queue.take(harness.subagentReceipts);
-          }
-          if (ownerSettled) {
-            yield* harness.offerAndWait(
-              makeResultFrame({
-                uuid: "00000000-0000-4000-8000-000000000803",
-                result: "Agents are working.",
-              }),
-            );
-            yield* Queue.take(harness.terminalReceipts);
-          }
-          const stop = harness.runtime.stopSubagent;
-          assert.isDefined(stop);
-          const stopping = yield* stop!({
-            providerThread: harness.providerThread,
-            nativeTaskId: "agent-stop",
-          }).pipe(Effect.forkScoped);
-          yield* Deferred.await(stopRequested);
-          assert.deepEqual(stopped, ["agent-stop"]);
-          yield* harness.offerAndWait(
-            claudeSdkFrame({
-              ...makeSubagentNotificationFrame({
-                taskId: "agent-stop",
-                toolUseId: "toolu-stop",
-                summary: "Stopped by user",
-                uuid: "00000000-0000-4000-8000-000000000804",
-              }),
-              status: outcome,
-            }),
-          );
-          if (ownerSettled) {
-            yield* harness.runtime.startTurn(
-              makeClaudeTestTurnInput({
-                threadId: harness.threadId,
-                providerThread: harness.providerThread,
-                now: yield* DateTime.now,
-                attemptId: RunAttemptId.make("attempt-native-child-stop-wake"),
-                text: "Background task stopped.",
-                attachments: [],
-                providerTurnOrdinal: 2,
-                messageCreatedBy: "agent",
-                messageCreationSource: "provider",
-              }),
-            );
-          }
-          yield* Fiber.join(stopping);
-          const stoppedEvent = yield* Queue.take(harness.subagentReceipts);
-          assert.equal(
-            stoppedEvent.subagent.status,
-            outcome === "stopped" ? "cancelled" : "completed",
-          );
-          const tasks = harness.events.filter((event) => event.type === "subagent.updated");
-          assert.equal(
-            tasks.findLast((event) => event.subagent.nativeTaskRef?.nativeId === "agent-stop")
-              ?.subagent.status,
-            outcome === "stopped" ? "cancelled" : "completed",
-          );
-          assert.equal(
-            tasks.findLast((event) => event.subagent.nativeTaskRef?.nativeId === "agent-keep")
-              ?.subagent.status,
-            "running",
-          );
-          assert.lengthOf(harness.terminalEvents(), ownerSettled ? 1 : 0);
-          yield* stop!({ providerThread: harness.providerThread, nativeTaskId: "agent-stop" });
-          assert.deepEqual(stopped, ["agent-stop"]);
-          assert.equal(closes, 0);
-        }).pipe(
-          Effect.provide(
-            Layer.mergeAll(
-              IdAllocator.layer,
-              McpProviderSessions.layer,
-              NodeServices.layer,
-              NodeCrypto.layer,
-            ),
-          ),
-        ),
-      ),
   );
 
   it.effect.each([
-    "requested",
-    "observed-before",
-    "observed-after",
-    "synthetic-after",
-    "inherit",
-    "unknown",
+    ["", "none"],
+    [" behind another subagent's start without one", "before"],
+    [" when another subagent's start without one arrives between its frames", "between"],
   ] as const)(
-    "records the subagent model from %s without inheriting the parent override",
-    (source) =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const harness = yield* makeWakeHarness;
-          const now = yield* DateTime.now;
-          const toolUseId = "toolu-subagent-model";
-          const parentModel = "claude-opus-4-6";
-          // Claude stamps its error frames as "<synthetic>", regardless of the subagent model.
-          const observedModel =
-            source === "synthetic-after" ? "<synthetic>" : "claude-haiku-4-5-20251001";
-          yield* harness.runtime.startTurn(
-            makeClaudeTestTurnInput({
-              threadId: harness.threadId,
-              providerThread: harness.providerThread,
-              now,
-              attemptId: RunAttemptId.make("attempt-subagent-model"),
-              text: "Spawn a Haiku subagent.",
-              attachments: [],
-              modelSelection: { ...CLAUDE_TEST_MODEL_SELECTION, model: parentModel },
-            }),
-          );
-          const observed = claudeSdkFrame({
-            type: "assistant",
-            parent_tool_use_id: toolUseId,
-            message: {
-              model: observedModel,
-              id: "msg_subagent_model_observed",
-              type: "message",
-              role: "assistant",
-              content: [{ type: "text", text: "Solving." }],
-            },
-            uuid: "00000000-0000-4000-8000-000000000206",
-            session_id: WAKE_NATIVE_SESSION,
-          });
-          if (source === "observed-before") yield* Queue.offer(harness.sdkMessages, observed);
-          yield* Queue.offer(
-            harness.sdkMessages,
-            claudeSdkFrame({
-              type: "assistant",
-              parent_tool_use_id: null,
-              message: {
-                model: parentModel,
-                id: "msg_subagent_model_launch",
-                type: "message",
-                role: "assistant",
-                content: [
-                  {
-                    type: "tool_use",
-                    id: toolUseId,
-                    name: "Agent",
-                    input: {
-                      description: "Haiku puzzle",
-                      subagent_type: "general-purpose",
-                      ...(source === "unknown"
-                        ? {}
-                        : { model: source === "inherit" ? "inherit" : "haiku" }),
-                      prompt: "Solve the puzzle.",
-                    },
-                  },
-                ],
-              },
-              uuid: "00000000-0000-4000-8000-000000000209",
-              session_id: WAKE_NATIVE_SESSION,
-            }),
-          );
-          yield* Queue.offer(
-            harness.sdkMessages,
-            claudeSdkFrame({
-              type: "system",
-              subtype: "task_started",
-              task_id: "task-subagent-model",
-              tool_use_id: toolUseId,
-              description: "Haiku puzzle",
-              task_type: "local_agent",
-              uuid: "00000000-0000-4000-8000-000000000207",
-              session_id: WAKE_NATIVE_SESSION,
-            }),
-          );
-          if (source === "observed-after" || source === "synthetic-after") {
-            yield* Queue.offer(harness.sdkMessages, observed);
-          }
-          yield* Queue.offer(
-            harness.sdkMessages,
-            makeResultFrame({
-              uuid: "00000000-0000-4000-8000-000000000208",
-              result: "Spawned the subagent.",
-            }),
-          );
-          yield* Queue.take(harness.terminalReceipts);
-          const subagents = harness.events.filter((event) => event.type === "subagent.updated");
-          const observedSlug = "claude-haiku-4-5";
-          const initialModel =
-            source === "observed-before"
-              ? observedSlug
-              : source === "inherit"
-                ? parentModel
-                : source === "unknown"
-                  ? null
-                  : "claude-haiku-5-5";
-          assert.equal(subagents[0]?.subagent.model, initialModel);
-          assert.equal(
-            subagents.at(-1)?.subagent.model,
-            source.startsWith("observed") ? observedSlug : initialModel,
-          );
-          const child = harness.events.find((event) => event.type === "app_thread.created");
-          assert.equal(child?.appThread.modelSelection?.model, initialModel ?? parentModel);
-        }).pipe(
-          Effect.provide(
-            Layer.mergeAll(
-              IdAllocator.layer,
-              McpProviderSessions.layer,
-              NodeServices.layer,
-              NodeCrypto.layer,
-            ),
-          ),
-        ),
-      ),
-  );
-
-  it.effect("records a forked skill's model from its transcript instead of the parent's", () =>
-    Effect.scoped(
+    "keeps a subagent's frames in order when a late progress names its tool use while the root is idle%s",
+    ([, otherStart]) =>
       Effect.gen(function* () {
-        const harness = yield* makeWakeHarnessWithOptions({
-          subagentModel: "claude-haiku-4-5-20251001",
-        });
+        const TASK_ID = "task-late-owner-idle";
+        const TOOL_USE_ID = "toolu-late-owner-idle";
+        const BASH = "toolu-late-owner-idle-bash";
+        const harness = yield* makeWakeHarness;
         const now = yield* DateTime.now;
-        const parentModel = "claude-opus-4-6";
+        const bashStatuses = () =>
+          harness.events.flatMap((event) =>
+            event.type === "turn_item.updated" && event.turnItem.nativeItemRef?.nativeId === BASH
+              ? [`${event.turnItem.type}:${event.turnItem.status}`]
+              : [],
+          );
         yield* harness.runtime.startTurn(
           makeClaudeTestTurnInput({
             threadId: harness.threadId,
             providerThread: harness.providerThread,
             now,
-            attemptId: RunAttemptId.make("attempt-forked-skill-model"),
-            text: "/fork-probe go",
+            attemptId: RunAttemptId.make("attempt-claude-late-owner-idle-1"),
+            text: "Audit in the background.",
             attachments: [],
-            modelSelection: { ...CLAUDE_TEST_MODEL_SELECTION, model: parentModel },
           }),
         );
-        // A `context: fork` skill has no Agent call and streams none of its own replies:
-        // task_started carries no tool_use_id, and only its prompt echo names the fork.
         for (const frame of [
           claudeSdkFrame({
             type: "system",
             subtype: "task_started",
-            task_id: "task-forked-skill",
-            description: "/fork-probe",
-            prompt: "go",
+            task_id: TASK_ID,
+            description: "Audit recent commits",
             subagent_type: "general-purpose",
+            is_backgrounded: true,
             task_type: "local_agent",
-            skip_transcript: true,
-            ambient: true,
-            uuid: "00000000-0000-4000-8000-000000000231",
+            prompt: "Audit the last five commits.",
+            uuid: "00000000-0000-4000-8000-000000000a01",
             session_id: WAKE_NATIVE_SESSION,
           }),
-          claudeSdkFrame({
-            type: "system",
-            subtype: "task_notification",
-            task_id: "task-forked-skill",
-            status: "completed",
-            summary: "/fork-probe",
-            output_file: "",
-            uuid: "00000000-0000-4000-8000-000000000232",
-            session_id: WAKE_NATIVE_SESSION,
+          makeResultFrame({
+            uuid: "00000000-0000-4000-8000-000000000a02",
+            result: "Auditing in the background.",
           }),
-          claudeSdkFrame({
-            type: "user",
-            parent_tool_use_id: "forked-command-fork-probe",
-            message: { role: "user", content: [{ type: "text", text: "go" }] },
-            uuid: "00000000-0000-4000-8000-000000000233",
-            session_id: WAKE_NATIVE_SESSION,
+        ]) {
+          yield* Queue.offer(harness.sdkMessages, frame);
+        }
+        yield* harness.awaitTerminal(1);
+
+        const otherStartFrame = claudeSdkFrame({
+          type: "system",
+          subtype: "task_started",
+          task_id: "task-late-owner-other",
+          description: "Check the changelog",
+          subagent_type: "general-purpose",
+          is_backgrounded: true,
+          task_type: "local_agent",
+          prompt: "Check the changelog.",
+          uuid: "00000000-0000-4000-8000-000000000a09",
+          session_id: WAKE_NATIVE_SESSION,
+        });
+        const progressFrame = claudeSdkFrame({
+          type: "system",
+          subtype: "task_progress",
+          task_id: TASK_ID,
+          tool_use_id: TOOL_USE_ID,
+          description: "Reading the last commits",
+          usage: { total_tokens: 1, tool_uses: 1, duration_ms: 1 },
+          uuid: "00000000-0000-4000-8000-000000000a04",
+          session_id: WAKE_NATIVE_SESSION,
+        });
+        const bashResultFrame = makeSubagentToolResultFrame({
+          parentToolUseId: TOOL_USE_ID,
+          uuid: "00000000-0000-4000-8000-000000000a05",
+          toolUseId: BASH,
+        });
+        for (const frame of [
+          ...(otherStart === "before" ? [otherStartFrame] : []),
+          ...makeSubagentAssistantFrames({
+            parentToolUseId: TOOL_USE_ID,
+            uuid: "00000000-0000-4000-8000-000000000a03",
+            text: "First.",
+            bashToolUseId: BASH,
+          }),
+          ...(otherStart === "between"
+            ? [otherStartFrame, bashResultFrame, progressFrame]
+            : [progressFrame, bashResultFrame]),
+          ...makeSubagentAssistantFrames({
+            parentToolUseId: TOOL_USE_ID,
+            uuid: "00000000-0000-4000-8000-000000000a06",
+            text: "Second.",
+          }),
+          makeSubagentNotificationFrame({
+            taskId: TASK_ID,
+            toolUseId: TOOL_USE_ID,
+            summary: "Second.",
+            uuid: "00000000-0000-4000-8000-000000000a07",
           }),
-          makeResultFrame({ uuid: "00000000-0000-4000-8000-000000000234", result: "OK" }),
         ]) {
           yield* Queue.offer(harness.sdkMessages, frame);
         }
-        yield* Queue.take(harness.terminalReceipts);
+        yield* harness.awaitContinuation(1);
+        yield* Queue.offer(
+          harness.sdkMessages,
+          makeResultFrame({
+            uuid: "00000000-0000-4000-8000-000000000a08",
+            result: "The auditor finished.",
+          }),
+        );
+        yield* harness.runtime.startTurn(
+          makeClaudeTestTurnInput({
+            threadId: harness.threadId,
+            providerThread: harness.providerThread,
+            now,
+            attemptId: RunAttemptId.make("attempt-claude-late-owner-idle-2"),
+            text: "Background task completed.",
+            attachments: [],
+            providerTurnOrdinal: 2,
+            messageCreatedBy: "agent",
+            messageCreationSource: "provider",
+          }),
+        );
+        yield* harness.awaitTerminal(2);
 
-        const fork = harness.events
-          .filter((event) => event.type === "subagent.updated")
-          .at(-1)?.subagent;
-        assert.equal(fork?.status, "completed");
-        assert.equal(fork?.model, "claude-haiku-4-5");
-        assert.equal(fork?.modelSelection?.model, "claude-haiku-4-5");
+        const routing = subagentRouting(harness.events, [BASH]);
+        const childTexts = routing.assistantTexts(routing.childThreadId);
+        const statuses = bashStatuses();
+        const trace = harness.events.flatMap((event) =>
+          event.type === "message.updated" &&
+          event.message.role === "assistant" &&
+          event.message.threadId === routing.childThreadId
+            ? [`text:${event.message.text}#${event.message.id}`]
+            : event.type === "turn_item.updated" && event.turnItem.nativeItemRef?.nativeId === BASH
+              ? [`bash:${event.turnItem.status}`]
+              : [],
+        );
+        assert.deepEqual(childTexts, ["First.", "Second."], `trace: ${JSON.stringify(trace)}`);
+        assert.deepEqual(
+          [...(routing.toolThreadIds.get(BASH) ?? [])],
+          [routing.childThreadId],
+          `trace: ${JSON.stringify(trace)}`,
+        );
+        assert.deepEqual(
+          statuses,
+          ["command_execution:running", "command_execution:completed"],
+          `trace: ${JSON.stringify(trace)}`,
+        );
+        assert.isTrue(
+          harness.events.some(
+            (event) =>
+              event.type === "subagent.updated" &&
+              event.subagent.progress === "Reading the last commits",
+          ),
+        );
+        assert.lengthOf(harness.continuationRequests, 1);
       }).pipe(
         Effect.provide(
           Layer.mergeAll(
@@ -18123,297 +17597,414 @@ describe("ClaudeAdapterV2 background wake turns", () => {
           ),
         ),
       ),
-    ),
   );
 
-  it.effect.each([
-    {
-      source: "custom model",
-      model: "claude-custom-tuned",
-      harness: { settings: ULTRACODE_CUSTOM_MODEL_CLAUDE_SETTINGS },
-    },
-    {
-      source: "downloaded catalog",
-      model: "claude-sonnet-5",
-      harness: {
-        modelCatalog: Effect.succeed({
-          models: BUNDLED_CLAUDE_MODEL_CATALOG.models.map((entry) =>
-            entry.model.slug === "claude-sonnet-5"
-              ? {
-                  ...entry,
-                  model: {
-                    ...entry.model,
-                    capabilities: {
-                      optionDescriptors: [
-                        ...(entry.model.capabilities?.optionDescriptors ?? []),
-                        { id: "ultracode", label: "Ultracode", type: "boolean" as const },
-                      ],
-                    },
-                  },
-                }
-              : entry,
-          ),
+  it.effect("holds subagent frames that precede task_started and shows its result once", () =>
+    Effect.gen(function* () {
+      const TASK_ID = "task-early-subagent";
+      const TOOL_USE_ID = "toolu-early-subagent";
+      const FINAL_REPORT = "Early auditor done.";
+      const harness = yield* makeWakeHarness;
+      const now = yield* DateTime.now;
+      yield* harness.runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now,
+          attemptId: RunAttemptId.make("attempt-claude-early-subagent"),
+          text: "Run an auditor.",
+          attachments: [],
         }),
-      },
-    },
-  ])(
-    "sends Ultracode with any effort on a model from the $source",
-    ({ harness: harnessOptions, model }) =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const harness = yield* makeWakeHarnessWithOptions(harnessOptions);
-          yield* harness.runtime.startTurn(
+      );
+      const frames = [
+        // Child frames can precede the task_started that registers their subagent.
+        ...makeSubagentAssistantFrames({
+          parentToolUseId: TOOL_USE_ID,
+          uuid: "00000000-0000-4000-8000-000000000321",
+          text: "Starting early.",
+          bashToolUseId: "toolu-early-bash",
+        }),
+        makeSubagentToolResultFrame({
+          parentToolUseId: TOOL_USE_ID,
+          uuid: "00000000-0000-4000-8000-000000000322",
+          toolUseId: "toolu-early-bash",
+        }),
+        makeSubagentTaskStartedFrame({
+          taskId: TASK_ID,
+          toolUseId: TOOL_USE_ID,
+          uuid: "00000000-0000-4000-8000-000000000323",
+        }),
+        ...makeSubagentAssistantFrames({
+          parentToolUseId: TOOL_USE_ID,
+          uuid: "00000000-0000-4000-8000-000000000324",
+          text: "Still working.",
+        }),
+        claudeSdkFrame({
+          type: "system",
+          subtype: "task_progress",
+          task_id: TASK_ID,
+          description: "Checking the diffs",
+          uuid: "00000000-0000-4000-8000-000000000325",
+          session_id: WAKE_NATIVE_SESSION,
+        }),
+        ...makeSubagentAssistantFrames({
+          parentToolUseId: TOOL_USE_ID,
+          uuid: "00000000-0000-4000-8000-000000000326",
+          text: FINAL_REPORT,
+        }),
+        makeSubagentNotificationFrame({
+          taskId: TASK_ID,
+          toolUseId: TOOL_USE_ID,
+          summary: FINAL_REPORT,
+          uuid: "00000000-0000-4000-8000-000000000327",
+        }),
+        makeResultFrame({
+          uuid: "00000000-0000-4000-8000-000000000328",
+          result: "The auditor finished.",
+        }),
+      ];
+      for (const frame of frames) {
+        yield* Queue.offer(harness.sdkMessages, frame);
+      }
+      yield* harness.awaitTerminal(1);
+
+      const routing = subagentRouting(harness.events, ["toolu-early-bash"]);
+      assert.isDefined(routing.childThreadId);
+      // Agents quote this id back to t3_thread_send/t3_thread_read.
+      const childThreadId = routing.childThreadId ?? "";
+      assert.notInclude(childThreadId, "%");
+      assert.isAtMost(childThreadId.length, 64);
+      assert.deepEqual(
+        [...(routing.toolThreadIds.get("toolu-early-bash") ?? [])],
+        [routing.childThreadId],
+      );
+      assert.deepEqual(routing.assistantTexts(routing.childThreadId), [
+        "Starting early.",
+        "Still working.",
+        FINAL_REPORT,
+      ]);
+      assert.deepEqual(routing.assistantTexts(harness.threadId), ["The auditor finished."]);
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
+        ),
+      ),
+    ),
+  );
+
+  it.effect.each([false, true])(
+    "drops an idle start superseded by live completion, later resume %s",
+    (resume) =>
+      Effect.gen(function* () {
+        const harness = yield* makeWakeHarness;
+        const startTurn = (ordinal: number, continuation = false) =>
+          harness.runtime.startTurn(
             makeClaudeTestTurnInput({
               threadId: harness.threadId,
               providerThread: harness.providerThread,
-              now: yield* DateTime.now,
-              attemptId: RunAttemptId.make("attempt-custom-ultracode"),
-              text: "Plan the work.",
+              now: DateTime.makeUnsafe(0),
+              attemptId: RunAttemptId.make(`attempt-stale-start-${ordinal}`),
+              providerTurnOrdinal: ordinal,
+              text: "Continue work.",
               attachments: [],
-              modelSelection: {
-                instanceId: ClaudeAdapterV2.CLAUDE_DEFAULT_INSTANCE_ID,
-                model,
-                options: [
-                  { id: "effort", value: "high" },
-                  { id: "ultracode", value: true },
-                ],
-              },
+              ...(continuation
+                ? {
+                    messageCreatedBy: "agent" as const,
+                    messageCreationSource: "provider" as const,
+                  }
+                : {}),
             }),
           );
-          const options = harness.getOpenedOptions()!;
-          assert.equal(options.effort, "high");
-          assert.equal((options.settings as { ultracode?: boolean }).ultracode, true);
-        }).pipe(
-          Effect.provide(
-            Layer.mergeAll(
-              IdAllocator.layer,
-              McpProviderSessions.layer,
-              NodeServices.layer,
-              NodeCrypto.layer,
-            ),
+        const started = (taskId: string, suffix: string) =>
+          makeSubagentTaskStartedFrame({
+            taskId,
+            toolUseId: `toolu-${taskId}`,
+            uuid: `00000000-0000-4000-8000-${suffix}`,
+          });
+        const finished = (taskId: string, suffix: string) =>
+          makeSubagentNotificationFrame({
+            taskId,
+            toolUseId: `toolu-${taskId}`,
+            summary: "Finished audit.",
+            uuid: `00000000-0000-4000-8000-${suffix}`,
+          });
+        yield* startTurn(1);
+        yield* harness.offerAndWait(started("stale-agent", "000000004001"));
+        yield* harness.offerAndWait(started("wake-agent", "000000004002"));
+        yield* harness.offerAndWait(
+          makeResultFrame({
+            uuid: "00000000-0000-4000-8000-000000004003",
+            result: "Agents launched.",
+          }),
+        );
+        yield* Queue.take(harness.terminalReceipts);
+        yield* harness.offerAndWait(started("stale-agent", "000000004004"));
+        yield* startTurn(2);
+        yield* harness.offerAndWait(finished("stale-agent", "000000004005"));
+        yield* harness.offerAndWait(
+          makeResultFrame({
+            uuid: "00000000-0000-4000-8000-000000004006",
+            result: "User turn finished.",
+          }),
+        );
+        yield* Queue.take(harness.terminalReceipts);
+        if (resume) yield* harness.offerAndWait(started("stale-agent", "000000004007"));
+        yield* harness.offerAndWait(finished("wake-agent", "000000004008"));
+        yield* Queue.take(harness.continuationReceipts);
+        yield* startTurn(3, true);
+        yield* harness.offerAndWait(
+          makeResultFrame({
+            uuid: "00000000-0000-4000-8000-000000004009",
+            result: "Wake finished.",
+          }),
+        );
+        yield* Queue.take(harness.terminalReceipts);
+        const latest = harness.events.findLast(
+          (event) =>
+            event.type === "subagent.updated" &&
+            event.subagent.nativeTaskRef?.nativeId === "stale-agent",
+        );
+        assert.equal(latest?.type, "subagent.updated");
+        if (latest?.type !== "subagent.updated") return;
+        assert.equal(latest.subagent.status, resume ? "running" : "completed");
+        assert.equal(latest.subagent.result, resume ? null : "Finished audit.");
+        assert.equal(latest.subagent.completedAt === null, resume);
+      }).pipe(
+        Effect.provide(
+          Layer.mergeAll(
+            IdAllocator.layer,
+            McpProviderSessions.layer,
+            NodeServices.layer,
+            NodeCrypto.layer,
           ),
         ),
       ),
   );
 
-  it.effect("resolves a subagent's model and effort against the instance's custom models", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const TUNED_TOOL_USE_ID = "toolu-effort-custom-tuned";
-        const SHADOW_TOOL_USE_ID = "toolu-effort-custom-shadow";
-        const harness = yield* makeWakeHarnessWithOptions({
-          settings: CUSTOM_MODEL_CLAUDE_SETTINGS,
-        });
-        const now = yield* DateTime.now;
-        yield* harness.runtime.startTurn(
+  const makeStopFixture = (options?: Parameters<typeof makeWakeHarnessWithOptions>[0]) =>
+    Effect.gen(function* () {
+      const requests = yield* Queue.unbounded<void>();
+      const harness = yield* makeWakeHarnessWithOptions({
+        ...options,
+        stopTask: (id) =>
+          Queue.offer(requests, undefined).pipe(
+            Effect.andThen(options?.stopTask?.(id) ?? Effect.void),
+          ),
+      });
+      let sequence = 4500;
+      const uuid = () => `00000000-0000-4000-8000-${String(++sequence).padStart(12, "0")}`;
+      const startTurn = (continuation = false) =>
+        harness.runtime.startTurn(
           makeClaudeTestTurnInput({
             threadId: harness.threadId,
             providerThread: harness.providerThread,
-            now,
-            attemptId: RunAttemptId.make("attempt-subagent-custom-effort"),
-            text: "Spawn subagents on custom models.",
+            now: DateTime.makeUnsafe(0),
+            attemptId: RunAttemptId.make(`attempt-stop-${continuation ? 2 : 1}`),
+            providerTurnOrdinal: continuation ? 2 : 1,
+            text: "Run an audit.",
             attachments: [],
+            ...(continuation
+              ? { messageCreatedBy: "agent" as const, messageCreationSource: "provider" as const }
+              : {}),
           }),
         );
-        for (const frame of [
-          claudeSdkFrame({
-            type: "assistant",
-            parent_tool_use_id: null,
-            message: {
-              model: CLAUDE_TEST_MODEL_SELECTION.model,
-              id: "msg_custom_effort_launch",
-              type: "message",
-              role: "assistant",
-              content: [
-                {
-                  type: "tool_use",
-                  id: TUNED_TOOL_USE_ID,
-                  name: "Agent",
-                  input: {
-                    description: "Tuned",
-                    subagent_type: "general-purpose",
-                    model: "claude-custom-tuned",
-                    effort: "brutal",
-                    prompt: "Check one thing.",
-                  },
-                },
-                {
-                  type: "tool_use",
-                  id: SHADOW_TOOL_USE_ID,
-                  name: "Agent",
-                  input: {
-                    description: "Shadow",
-                    subagent_type: "general-purpose",
-                    model: "opus",
-                    prompt: "Check another thing.",
-                  },
-                },
-              ],
-            },
-            uuid: "00000000-0000-4000-8000-000000000231",
-            session_id: WAKE_NATIVE_SESSION,
+      const start = (toolUseId = "toolu-stop-agent") =>
+        harness.offerAndWait(
+          makeSubagentTaskStartedFrame({
+            taskId: "stop-agent",
+            toolUseId,
+            uuid: uuid(),
           }),
-          ...[TUNED_TOOL_USE_ID, SHADOW_TOOL_USE_ID].map((id, index) =>
-            claudeSdkFrame({
-              type: "system",
-              subtype: "task_started",
-              task_id: `task-${id}`,
-              tool_use_id: id,
-              description: id,
-              task_type: "local_agent",
-              uuid: `00000000-0000-4000-8000-00000000023${index + 2}`,
-              session_id: WAKE_NATIVE_SESSION,
+        );
+      const notify = (
+        status: "completed" | "failed" | "stopped",
+        summary = "Native outcome.",
+        toolUseId = "toolu-stop-agent",
+      ) =>
+        harness.offerAndWait(
+          claudeSdkFrame({
+            ...makeSubagentNotificationFrame({
+              taskId: "stop-agent",
+              toolUseId,
+              summary,
+              uuid: uuid(),
             }),
-          ),
-          makeResultFrame({
-            uuid: "00000000-0000-4000-8000-000000000234",
-            result: "Spawned the subagents.",
+            status,
           }),
-        ]) {
-          yield* Queue.offer(harness.sdkMessages, frame);
-        }
-        yield* Queue.take(harness.terminalReceipts);
-
-        const selections = Object.fromEntries(
-          harness.events.flatMap((event) =>
-            event.type === "subagent.updated"
-              ? [[event.subagent.nativeTaskRef?.nativeId, event.subagent.modelSelection] as const]
-              : [],
-          ),
         );
-        const instanceId = CLAUDE_TEST_MODEL_SELECTION.instanceId;
-        assert.deepEqual(selections, {
-          [`task-${TUNED_TOOL_USE_ID}`]: {
-            instanceId,
-            model: "claude-custom-tuned",
-            options: [{ id: "effort", value: "brutal" }],
+      const stop = (requestedAt?: DateTime.Utc) =>
+        harness.runtime.stopSubagent!({
+          providerThread: harness.providerThread,
+          nativeTaskId: "stop-agent",
+          ...(requestedAt === undefined ? {} : { requestedAt }),
+        });
+      const finishParent = () =>
+        harness
+          .offerAndWait(makeResultFrame({ uuid: uuid(), result: "Launched." }))
+          .pipe(Effect.andThen(Queue.take(harness.terminalReceipts)));
+      yield* startTurn();
+      yield* start();
+      yield* Queue.take(harness.subagentReceipts);
+      return {
+        ...harness,
+        start,
+        notify,
+        stop,
+        finishParent,
+        replay: () => startTurn(true),
+        uuid,
+        requests,
+      };
+    });
+
+  it.effect("retains native confirmation after the synchronous Agent tool result", () =>
+    Effect.gen(function* () {
+      const fixture = yield* makeStopFixture({
+        stopTask: () => Effect.die("Task already completed"),
+      });
+      yield* fixture.notify("completed");
+      const completed = yield* Queue.take(fixture.subagentReceipts);
+      yield* fixture.offerAndWait(
+        claudeSdkFrame({
+          type: "user",
+          message: {
+            role: "user",
+            content: [
+              { type: "tool_result", tool_use_id: "toolu-stop-agent", content: "Tool result." },
+            ],
           },
-          [`task-${SHADOW_TOOL_USE_ID}`]: { instanceId, model: "opus" },
-        });
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
-          ),
+          parent_tool_use_id: null,
+          uuid: fixture.uuid(),
+          session_id: WAKE_NATIVE_SESSION,
+        }),
+      );
+      assert.equal((yield* Queue.take(fixture.subagentReceipts)).subagent.result, "Tool result.");
+      assert.deepEqual(yield* fixture.stop(), {
+        status: "completed",
+        completedAt: completed.subagent.completedAt!,
+        result: "Native outcome.",
+      });
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
         ),
       ),
     ),
   );
 
-  it.effect("records only explicit effort for nested subagents", () =>
-    Effect.scoped(
+  it.effect.each([
+    [false, "stopped"],
+    [true, "stopped"],
+    [false, "completed"],
+  ] as const)(
+    "stops one native subagent while its sibling keeps running, owner settled %s, outcome %s",
+    ([ownerSettled, outcome]) =>
       Effect.gen(function* () {
-        const OUTER_TOOL_USE_ID = "toolu-effort-outer";
-        const UNSPECIFIED_TOOL_USE_ID = "toolu-effort-nested-unspecified";
-        const OVERRIDING_TOOL_USE_ID = "toolu-effort-nested-overriding";
-        const harness = yield* makeWakeHarness;
-        const now = yield* DateTime.now;
-        const parentSelection = {
-          instanceId: CLAUDE_TEST_MODEL_SELECTION.instanceId,
-          model: "claude-opus-4-6",
-          options: [{ id: "effort", value: "high" }],
-        } satisfies ModelSelection;
+        const stopped: string[] = [];
+        const stopRequested = yield* Deferred.make<void>();
+        let closes = 0;
+        const harness = yield* makeWakeHarnessWithOptions({
+          stopTask: (taskId) =>
+            Effect.sync(() => {
+              stopped.push(taskId);
+            }).pipe(Effect.andThen(Deferred.succeed(stopRequested, undefined))),
+          interrupt: Effect.die("A child stop must not interrupt its owner"),
+          close: () =>
+            Effect.sync(() => {
+              closes++;
+            }),
+        });
         yield* harness.runtime.startTurn(
           makeClaudeTestTurnInput({
             threadId: harness.threadId,
             providerThread: harness.providerThread,
-            now,
-            attemptId: RunAttemptId.make("attempt-subagent-nested-effort"),
-            text: "Spawn a subagent that spawns two more.",
+            now: yield* DateTime.now,
+            attemptId: RunAttemptId.make("attempt-native-child-stop"),
+            text: "Start two agents.",
             attachments: [],
-            modelSelection: parentSelection,
           }),
         );
-        const agentCall = (id: string, effort?: string) => ({
-          type: "tool_use" as const,
-          id,
-          name: "Agent",
-          input: {
-            description: id,
-            subagent_type: "general-purpose",
-            ...(effort === undefined ? {} : { effort }),
-            prompt: "Check one thing.",
-          },
-        });
-        const taskStarted = (id: string, uuid: string) =>
-          claudeSdkFrame({
-            type: "system",
-            subtype: "task_started",
-            task_id: `task-${id}`,
-            tool_use_id: id,
-            description: id,
-            task_type: "local_agent",
-            uuid,
-            session_id: WAKE_NATIVE_SESSION,
-          });
-        for (const frame of [
-          claudeSdkFrame({
-            type: "assistant",
-            parent_tool_use_id: null,
-            message: {
-              model: parentSelection.model,
-              id: "msg_nested_effort_outer_launch",
-              type: "message",
-              role: "assistant",
-              content: [agentCall(OUTER_TOOL_USE_ID, "low")],
-            },
-            uuid: "00000000-0000-4000-8000-000000000221",
-            session_id: WAKE_NATIVE_SESSION,
-          }),
-          taskStarted(OUTER_TOOL_USE_ID, "00000000-0000-4000-8000-000000000222"),
+        for (const [taskId, toolUseId, uuid] of [
+          ["agent-stop", "toolu-stop", "00000000-0000-4000-8000-000000000801"],
+          ["agent-keep", "toolu-keep", "00000000-0000-4000-8000-000000000802"],
+        ]) {
+          yield* harness.offerAndWait(
+            makeSubagentTaskStartedFrame({ taskId: taskId!, toolUseId: toolUseId!, uuid: uuid! }),
+          );
+          yield* Queue.take(harness.subagentReceipts);
+        }
+        if (ownerSettled) {
+          yield* harness.offerAndWait(
+            makeResultFrame({
+              uuid: "00000000-0000-4000-8000-000000000803",
+              result: "Agents are working.",
+            }),
+          );
+          yield* Queue.take(harness.terminalReceipts);
+        }
+        const stop = harness.runtime.stopSubagent;
+        assert.isDefined(stop);
+        const stopping = yield* stop!({
+          providerThread: harness.providerThread,
+          nativeTaskId: "agent-stop",
+        }).pipe(Effect.forkScoped);
+        yield* Deferred.await(stopRequested);
+        assert.deepEqual(stopped, ["agent-stop"]);
+        yield* harness.offerAndWait(
           claudeSdkFrame({
-            type: "assistant",
-            parent_tool_use_id: OUTER_TOOL_USE_ID,
-            message: {
-              model: parentSelection.model,
-              id: "msg_nested_effort_inner_launch",
-              type: "message",
-              role: "assistant",
-              content: [
-                agentCall(UNSPECIFIED_TOOL_USE_ID),
-                agentCall(OVERRIDING_TOOL_USE_ID, "max"),
-              ],
-            },
-            uuid: "00000000-0000-4000-8000-000000000223",
-            session_id: WAKE_NATIVE_SESSION,
-          }),
-          taskStarted(UNSPECIFIED_TOOL_USE_ID, "00000000-0000-4000-8000-000000000224"),
-          taskStarted(OVERRIDING_TOOL_USE_ID, "00000000-0000-4000-8000-000000000225"),
-          makeResultFrame({
-            uuid: "00000000-0000-4000-8000-000000000226",
-            result: "Spawned the subagents.",
+            ...makeSubagentNotificationFrame({
+              taskId: "agent-stop",
+              toolUseId: "toolu-stop",
+              summary: "Stopped by user",
+              uuid: "00000000-0000-4000-8000-000000000804",
+            }),
+            status: outcome,
           }),
-        ]) {
-          yield* Queue.offer(harness.sdkMessages, frame);
+        );
+        if (ownerSettled) {
+          yield* harness.runtime.startTurn(
+            makeClaudeTestTurnInput({
+              threadId: harness.threadId,
+              providerThread: harness.providerThread,
+              now: yield* DateTime.now,
+              attemptId: RunAttemptId.make("attempt-native-child-stop-wake"),
+              text: "Background task stopped.",
+              attachments: [],
+              providerTurnOrdinal: 2,
+              messageCreatedBy: "agent",
+              messageCreationSource: "provider",
+            }),
+          );
         }
-        yield* Queue.take(harness.terminalReceipts);
-
-        const efforts = new Map(
-          harness.events.flatMap((event) =>
-            event.type === "subagent.updated"
-              ? [
-                  [
-                    event.subagent.nativeTaskRef?.nativeId,
-                    getModelSelectionStringOptionValue(event.subagent.modelSelection, "effort"),
-                  ] as const,
-                ]
-              : [],
-          ),
+        yield* Fiber.join(stopping);
+        const stoppedEvent = yield* Queue.take(harness.subagentReceipts);
+        assert.equal(
+          stoppedEvent.subagent.status,
+          outcome === "stopped" ? "cancelled" : "completed",
         );
-        assert.deepEqual(Object.fromEntries(efforts), {
-          [`task-${OUTER_TOOL_USE_ID}`]: "low",
-          [`task-${UNSPECIFIED_TOOL_USE_ID}`]: undefined,
-          [`task-${OVERRIDING_TOOL_USE_ID}`]: "max",
-        });
-        const childEfforts = harness.events.flatMap((event) =>
-          event.type === "app_thread.created" && event.appThread.id !== harness.threadId
-            ? [getModelSelectionStringOptionValue(event.appThread.modelSelection, "effort")]
-            : [],
+        const tasks = harness.events.filter((event) => event.type === "subagent.updated");
+        assert.equal(
+          tasks.findLast((event) => event.subagent.nativeTaskRef?.nativeId === "agent-stop")
+            ?.subagent.status,
+          outcome === "stopped" ? "cancelled" : "completed",
+        );
+        assert.equal(
+          tasks.findLast((event) => event.subagent.nativeTaskRef?.nativeId === "agent-keep")
+            ?.subagent.status,
+          "running",
         );
-        assert.deepEqual(childEfforts, ["low", undefined, "max"]);
+        assert.lengthOf(harness.terminalEvents(), ownerSettled ? 1 : 0);
+        yield* stop!({ providerThread: harness.providerThread, nativeTaskId: "agent-stop" });
+        assert.deepEqual(stopped, ["agent-stop"]);
+        assert.equal(closes, 0);
       }).pipe(
         Effect.provide(
           Layer.mergeAll(
@@ -18424,169 +18015,122 @@ describe("ClaudeAdapterV2 background wake turns", () => {
           ),
         ),
       ),
-    ),
   );
 
   it.effect.each([
-    {
-      label: "extracts text from direct content-block subagent results",
-      content: [
-        { type: "text", text: "First line." },
-        { type: "text", text: "Second line." },
-      ],
-      expected: "First line.\nSecond line.",
-    },
-    {
-      label: "drops Claude Code's tools-used note from a subagent result",
-      content: [
-        {
-          type: "text",
-          text: "<tools-used-before-summary>Read</tools-used-before-summary>\n\nadd (line 1)\nmean (line 6)",
-        },
-      ],
-      expected: "add (line 1)\nmean (line 6)",
-    },
-  ])("$label", ({ content, expected }) =>
-    Effect.scoped(
+    "requested",
+    "observed-before",
+    "observed-after",
+    "synthetic-after",
+    "inherit",
+    "unknown",
+  ] as const)(
+    "records the subagent model from %s without inheriting the parent override",
+    (source) =>
       Effect.gen(function* () {
-        const SUBAGENT_TASK_ID = "task-direct-content-blocks";
-        const SUBAGENT_TOOL_USE_ID = "toolu-direct-content-blocks";
         const harness = yield* makeWakeHarness;
         const now = yield* DateTime.now;
-        const subagentEvents = () =>
-          harness.events.filter(
-            (
-              event,
-            ): event is Extract<
-              ProviderAdapter.ProviderAdapterV2Event,
-              { type: "subagent.updated" }
-            > => event.type === "subagent.updated",
-          );
-
+        const toolUseId = "toolu-subagent-model";
+        const parentModel = "claude-opus-4-6";
+        // Claude stamps its error frames as "<synthetic>", regardless of the subagent model.
+        const observedModel =
+          source === "synthetic-after" ? "<synthetic>" : "claude-haiku-4-5-20251001";
         yield* harness.runtime.startTurn(
           makeClaudeTestTurnInput({
             threadId: harness.threadId,
             providerThread: harness.providerThread,
             now,
-            attemptId: RunAttemptId.make("attempt-claude-direct-content-blocks"),
-            text: "Delegate this task.",
+            attemptId: RunAttemptId.make("attempt-subagent-model"),
+            text: "Spawn a Haiku subagent.",
             attachments: [],
+            modelSelection: { ...CLAUDE_TEST_MODEL_SELECTION, model: parentModel },
           }),
         );
+        const observed = claudeSdkFrame({
+          type: "assistant",
+          parent_tool_use_id: toolUseId,
+          message: {
+            model: observedModel,
+            id: "msg_subagent_model_observed",
+            type: "message",
+            role: "assistant",
+            content: [{ type: "text", text: "Solving." }],
+          },
+          uuid: "00000000-0000-4000-8000-000000000206",
+          session_id: WAKE_NATIVE_SESSION,
+        });
+        if (source === "observed-before") yield* Queue.offer(harness.sdkMessages, observed);
         yield* Queue.offer(
           harness.sdkMessages,
           claudeSdkFrame({
-            type: "system",
-            subtype: "task_started",
-            task_id: SUBAGENT_TASK_ID,
-            tool_use_id: SUBAGENT_TOOL_USE_ID,
-            description: "Delegated task",
-            subagent_type: "general-purpose",
-            task_type: "local_agent",
-            prompt: "Return the result.",
-            uuid: "00000000-0000-4000-8000-000000000206",
-            session_id: WAKE_NATIVE_SESSION,
-          }),
-        );
-        yield* harness.until(() => subagentEvents().length === 1);
-
-        yield* Queue.offer(
-          harness.sdkMessages,
-          claudeSdkFrame({
-            type: "user",
+            type: "assistant",
+            parent_tool_use_id: null,
             message: {
-              role: "user",
+              model: parentModel,
+              id: "msg_subagent_model_launch",
+              type: "message",
+              role: "assistant",
               content: [
                 {
-                  type: "tool_result",
-                  tool_use_id: SUBAGENT_TOOL_USE_ID,
-                  content,
+                  type: "tool_use",
+                  id: toolUseId,
+                  name: "Agent",
+                  input: {
+                    description: "Haiku puzzle",
+                    subagent_type: "general-purpose",
+                    ...(source === "unknown"
+                      ? {}
+                      : { model: source === "inherit" ? "inherit" : "haiku" }),
+                    prompt: "Solve the puzzle.",
+                  },
                 },
               ],
             },
-            parent_tool_use_id: null,
-            uuid: "00000000-0000-4000-8000-000000000207",
+            uuid: "00000000-0000-4000-8000-000000000209",
             session_id: WAKE_NATIVE_SESSION,
           }),
         );
-        yield* harness.until(() => subagentEvents().at(-1)?.subagent.status === "completed");
-
-        assert.equal(subagentEvents().at(-1)?.subagent.result, expected);
-
         yield* Queue.offer(
           harness.sdkMessages,
-          makeResultFrame({
-            uuid: "00000000-0000-4000-8000-000000000208",
-            result: "Delegation completed.",
-          }),
-        );
-        yield* harness.awaitTerminal(1);
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
-          ),
-        ),
-      ),
-    ),
-  );
-
-  it.effect("keeps a foreground fork running past the placeholder result for its own launch", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const harness = yield* makeWakeHarness;
-        yield* harness.runtime.startTurn(
-          makeClaudeTestTurnInput({
-            threadId: harness.threadId,
-            providerThread: harness.providerThread,
-            now: yield* DateTime.now,
-            attemptId: RunAttemptId.make("attempt-claude-foreground-fork"),
-            text: "Fork this.",
-            attachments: [],
-          }),
-        );
-        yield* harness.offerAndWait(
-          makeSubagentTaskStartedFrame({
-            taskId: "agent-fork",
-            toolUseId: "toolu-fork",
-            uuid: "00000000-0000-4000-8000-000000000901",
-          }),
-        );
-        // Claude Code opens a foreground fork's own stream with a placeholder result for its launch.
-        yield* harness.offerAndWait(
           claudeSdkFrame({
-            type: "user",
-            message: {
-              role: "user",
-              content: [
-                {
-                  type: "tool_result",
-                  tool_use_id: "toolu-fork",
-                  content: "Fork started — that fork is you.",
-                },
-              ],
-            },
-            parent_tool_use_id: "toolu-fork",
-            uuid: "00000000-0000-4000-8000-000000000902",
+            type: "system",
+            subtype: "task_started",
+            task_id: "task-subagent-model",
+            tool_use_id: toolUseId,
+            description: "Haiku puzzle",
+            task_type: "local_agent",
+            uuid: "00000000-0000-4000-8000-000000000207",
             session_id: WAKE_NATIVE_SESSION,
           }),
         );
-        yield* harness.offerAndWait(
-          makeSubagentNotificationFrame({
-            taskId: "agent-fork",
-            toolUseId: "toolu-fork",
-            summary: "FORK-DONE",
-            uuid: "00000000-0000-4000-8000-000000000903",
+        if (source === "observed-after" || source === "synthetic-after") {
+          yield* Queue.offer(harness.sdkMessages, observed);
+        }
+        yield* Queue.offer(
+          harness.sdkMessages,
+          makeResultFrame({
+            uuid: "00000000-0000-4000-8000-000000000208",
+            result: "Spawned the subagent.",
           }),
         );
-        let settled = yield* Queue.take(harness.subagentReceipts);
-        while (settled.subagent.status === "running") {
-          settled = yield* Queue.take(harness.subagentReceipts);
-        }
-        assert.equal(settled.subagent.result, "FORK-DONE");
+        yield* Queue.take(harness.terminalReceipts);
+        const subagents = harness.events.filter((event) => event.type === "subagent.updated");
+        const observedSlug = "claude-haiku-4-5";
+        const initialModel =
+          source === "observed-before"
+            ? observedSlug
+            : source === "inherit"
+              ? parentModel
+              : source === "unknown"
+                ? null
+                : "claude-haiku-5-5";
+        assert.equal(subagents[0]?.subagent.model, initialModel);
+        assert.equal(
+          subagents.at(-1)?.subagent.model,
+          source.startsWith("observed") ? observedSlug : initialModel,
+        );
+        const child = harness.events.find((event) => event.type === "app_thread.created");
+        assert.equal(child?.appThread.modelSelection?.model, initialModel ?? parentModel);
       }).pipe(
         Effect.provide(
           Layer.mergeAll(
@@ -18597,98 +18141,139 @@ describe("ClaudeAdapterV2 background wake turns", () => {
           ),
         ),
       ),
-    ),
   );
 
-  it.effect("releases the idle pin when a post-settle subagent stops without completing", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const SUBAGENT_TASK_ID = "task-wake-subagent-stopped";
-        const subagentTaskStarted = claudeSdkFrame({
+  it.effect("records a forked skill's model from its transcript instead of the parent's", () =>
+    Effect.gen(function* () {
+      const harness = yield* makeWakeHarnessWithOptions({
+        subagentModel: "claude-haiku-4-5-20251001",
+      });
+      const now = yield* DateTime.now;
+      const parentModel = "claude-opus-4-6";
+      yield* harness.runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now,
+          attemptId: RunAttemptId.make("attempt-forked-skill-model"),
+          text: "/fork-probe go",
+          attachments: [],
+          modelSelection: { ...CLAUDE_TEST_MODEL_SELECTION, model: parentModel },
+        }),
+      );
+      // A `context: fork` skill has no Agent call and streams none of its own replies:
+      // task_started carries no tool_use_id, and only its prompt echo names the fork.
+      for (const frame of [
+        claudeSdkFrame({
           type: "system",
           subtype: "task_started",
-          task_id: SUBAGENT_TASK_ID,
-          tool_use_id: "toolu-wake-subagent-stopped",
-          description: "Long-running research task",
+          task_id: "task-forked-skill",
+          description: "/fork-probe",
+          prompt: "go",
           subagent_type: "general-purpose",
           task_type: "local_agent",
-          prompt: "Investigate the flaky test.",
-          uuid: "00000000-0000-4000-8000-000000000301",
+          skip_transcript: true,
+          ambient: true,
+          uuid: "00000000-0000-4000-8000-000000000231",
           session_id: WAKE_NATIVE_SESSION,
-        });
-        const subagentStoppedNotification = claudeSdkFrame({
+        }),
+        claudeSdkFrame({
           type: "system",
           subtype: "task_notification",
-          task_id: SUBAGENT_TASK_ID,
-          tool_use_id: "toolu-wake-subagent-stopped",
-          status: "stopped",
-          output_file: "/tmp/task-wake-subagent-stopped.output",
-          summary: "Agent was stopped before finishing.",
-          uuid: "00000000-0000-4000-8000-000000000302",
+          task_id: "task-forked-skill",
+          status: "completed",
+          summary: "/fork-probe",
+          output_file: "",
+          uuid: "00000000-0000-4000-8000-000000000232",
           session_id: WAKE_NATIVE_SESSION,
-        });
-
-        const harness = yield* makeWakeHarness;
-        const now = yield* DateTime.now;
-        const subagentEvents = () =>
-          harness.events.filter(
-            (
-              event,
-            ): event is Extract<
-              ProviderAdapter.ProviderAdapterV2Event,
-              { type: "subagent.updated" }
-            > => event.type === "subagent.updated",
-          );
-
-        yield* harness.runtime.startTurn(
-          makeClaudeTestTurnInput({
-            threadId: harness.threadId,
-            providerThread: harness.providerThread,
-            now,
-            attemptId: RunAttemptId.make("attempt-claude-wake-7a"),
-            text: "Spawn a background subagent and stop.",
-            attachments: [],
-          }),
-        );
-        yield* Queue.offer(harness.sdkMessages, subagentTaskStarted);
-        yield* harness.until(() => subagentEvents().length >= 1);
-        yield* Queue.offer(
-          harness.sdkMessages,
-          makeResultFrame({
-            uuid: "00000000-0000-4000-8000-000000000303",
-            result: "Spawned the subagent in the background.",
-          }),
-        );
-        yield* harness.awaitTerminal(1);
-        assert.isTrue(yield* harness.hasPendingBackgroundWork);
+        }),
+        claudeSdkFrame({
+          type: "user",
+          parent_tool_use_id: "forked-command-fork-probe",
+          message: { role: "user", content: [{ type: "text", text: "go" }] },
+          uuid: "00000000-0000-4000-8000-000000000233",
+          session_id: WAKE_NATIVE_SESSION,
+        }),
+        makeResultFrame({ uuid: "00000000-0000-4000-8000-000000000234", result: "OK" }),
+      ]) {
+        yield* Queue.offer(harness.sdkMessages, frame);
+      }
+      yield* Queue.take(harness.terminalReceipts);
 
-        yield* Queue.offer(harness.sdkMessages, subagentStoppedNotification);
-        yield* harness.awaitContinuation(1);
+      const fork = harness.events
+        .filter((event) => event.type === "subagent.updated")
+        .at(-1)?.subagent;
+      assert.equal(fork?.status, "completed");
+      assert.equal(fork?.model, "claude-haiku-4-5");
+      assert.equal(fork?.modelSelection?.model, "claude-haiku-4-5");
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
+        ),
+      ),
+    ),
+  );
 
-        yield* Queue.offer(
-          harness.sdkMessages,
-          makeResultFrame({
-            uuid: "00000000-0000-4000-8000-000000000304",
-            result: "The subagent was stopped.",
-          }),
-        );
+  it.effect.each([
+    {
+      source: "custom model",
+      model: "claude-custom-tuned",
+      harness: { settings: ULTRACODE_CUSTOM_MODEL_CLAUDE_SETTINGS },
+    },
+    {
+      source: "downloaded catalog",
+      model: "claude-sonnet-5",
+      harness: {
+        modelCatalog: Effect.succeed({
+          models: BUNDLED_CLAUDE_MODEL_CATALOG.models.map((entry) =>
+            entry.model.slug === "claude-sonnet-5"
+              ? {
+                  ...entry,
+                  model: {
+                    ...entry.model,
+                    capabilities: {
+                      optionDescriptors: [
+                        ...(entry.model.capabilities?.optionDescriptors ?? []),
+                        { id: "ultracode", label: "Ultracode", type: "boolean" as const },
+                      ],
+                    },
+                  },
+                }
+              : entry,
+          ),
+        }),
+      },
+    },
+  ])(
+    "sends Ultracode with any effort on a model from the $source",
+    ({ harness: harnessOptions, model }) =>
+      Effect.gen(function* () {
+        const harness = yield* makeWakeHarnessWithOptions(harnessOptions);
         yield* harness.runtime.startTurn(
           makeClaudeTestTurnInput({
             threadId: harness.threadId,
             providerThread: harness.providerThread,
-            now,
-            attemptId: RunAttemptId.make("attempt-claude-wake-7b"),
-            text: "Background task completed.",
+            now: yield* DateTime.now,
+            attemptId: RunAttemptId.make("attempt-custom-ultracode"),
+            text: "Plan the work.",
             attachments: [],
-            providerTurnOrdinal: 2,
-            messageCreatedBy: "agent",
-            messageCreationSource: "provider",
+            modelSelection: {
+              instanceId: ClaudeAdapterV2.CLAUDE_DEFAULT_INSTANCE_ID,
+              model,
+              options: [
+                { id: "effort", value: "high" },
+                { id: "ultracode", value: true },
+              ],
+            },
           }),
         );
-        yield* harness.awaitTerminal(2);
-
-        assert.equal(subagentEvents().at(-1)?.subagent.status, "cancelled");
-        assert.isFalse(yield* harness.hasPendingBackgroundWork);
+        const options = harness.getOpenedOptions()!;
+        assert.equal(options.effort, "high");
+        assert.equal((options.settings as { ultracode?: boolean }).ultracode, true);
       }).pipe(
         Effect.provide(
           Layer.mergeAll(
@@ -18699,650 +18284,950 @@ describe("ClaudeAdapterV2 background wake turns", () => {
           ),
         ),
       ),
+  );
+
+  it.effect("resolves a subagent's model and effort against the instance's custom models", () =>
+    Effect.gen(function* () {
+      const TUNED_TOOL_USE_ID = "toolu-effort-custom-tuned";
+      const SHADOW_TOOL_USE_ID = "toolu-effort-custom-shadow";
+      const harness = yield* makeWakeHarnessWithOptions({
+        settings: CUSTOM_MODEL_CLAUDE_SETTINGS,
+      });
+      const now = yield* DateTime.now;
+      yield* harness.runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now,
+          attemptId: RunAttemptId.make("attempt-subagent-custom-effort"),
+          text: "Spawn subagents on custom models.",
+          attachments: [],
+        }),
+      );
+      for (const frame of [
+        claudeSdkFrame({
+          type: "assistant",
+          parent_tool_use_id: null,
+          message: {
+            model: CLAUDE_TEST_MODEL_SELECTION.model,
+            id: "msg_custom_effort_launch",
+            type: "message",
+            role: "assistant",
+            content: [
+              {
+                type: "tool_use",
+                id: TUNED_TOOL_USE_ID,
+                name: "Agent",
+                input: {
+                  description: "Tuned",
+                  subagent_type: "general-purpose",
+                  model: "claude-custom-tuned",
+                  effort: "brutal",
+                  prompt: "Check one thing.",
+                },
+              },
+              {
+                type: "tool_use",
+                id: SHADOW_TOOL_USE_ID,
+                name: "Agent",
+                input: {
+                  description: "Shadow",
+                  subagent_type: "general-purpose",
+                  model: "opus",
+                  prompt: "Check another thing.",
+                },
+              },
+            ],
+          },
+          uuid: "00000000-0000-4000-8000-000000000231",
+          session_id: WAKE_NATIVE_SESSION,
+        }),
+        ...[TUNED_TOOL_USE_ID, SHADOW_TOOL_USE_ID].map((id, index) =>
+          claudeSdkFrame({
+            type: "system",
+            subtype: "task_started",
+            task_id: `task-${id}`,
+            tool_use_id: id,
+            description: id,
+            task_type: "local_agent",
+            uuid: `00000000-0000-4000-8000-00000000023${index + 2}`,
+            session_id: WAKE_NATIVE_SESSION,
+          }),
+        ),
+        makeResultFrame({
+          uuid: "00000000-0000-4000-8000-000000000234",
+          result: "Spawned the subagents.",
+        }),
+      ]) {
+        yield* Queue.offer(harness.sdkMessages, frame);
+      }
+      yield* Queue.take(harness.terminalReceipts);
+
+      const selections = Object.fromEntries(
+        harness.events.flatMap((event) =>
+          event.type === "subagent.updated"
+            ? [[event.subagent.nativeTaskRef?.nativeId, event.subagent.modelSelection] as const]
+            : [],
+        ),
+      );
+      const instanceId = CLAUDE_TEST_MODEL_SELECTION.instanceId;
+      assert.deepEqual(selections, {
+        [`task-${TUNED_TOOL_USE_ID}`]: {
+          instanceId,
+          model: "claude-custom-tuned",
+          options: [{ id: "effort", value: "brutal" }],
+        },
+        [`task-${SHADOW_TOOL_USE_ID}`]: { instanceId, model: "opus" },
+      });
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
+        ),
+      ),
+    ),
+  );
+
+  it.effect("records only explicit effort for nested subagents", () =>
+    Effect.gen(function* () {
+      const OUTER_TOOL_USE_ID = "toolu-effort-outer";
+      const UNSPECIFIED_TOOL_USE_ID = "toolu-effort-nested-unspecified";
+      const OVERRIDING_TOOL_USE_ID = "toolu-effort-nested-overriding";
+      const harness = yield* makeWakeHarness;
+      const now = yield* DateTime.now;
+      const parentSelection = {
+        instanceId: CLAUDE_TEST_MODEL_SELECTION.instanceId,
+        model: "claude-opus-4-6",
+        options: [{ id: "effort", value: "high" }],
+      } satisfies ModelSelection;
+      yield* harness.runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now,
+          attemptId: RunAttemptId.make("attempt-subagent-nested-effort"),
+          text: "Spawn a subagent that spawns two more.",
+          attachments: [],
+          modelSelection: parentSelection,
+        }),
+      );
+      const agentCall = (id: string, effort?: string) => ({
+        type: "tool_use" as const,
+        id,
+        name: "Agent",
+        input: {
+          description: id,
+          subagent_type: "general-purpose",
+          ...(effort === undefined ? {} : { effort }),
+          prompt: "Check one thing.",
+        },
+      });
+      const taskStarted = (id: string, uuid: string) =>
+        claudeSdkFrame({
+          type: "system",
+          subtype: "task_started",
+          task_id: `task-${id}`,
+          tool_use_id: id,
+          description: id,
+          task_type: "local_agent",
+          uuid,
+          session_id: WAKE_NATIVE_SESSION,
+        });
+      for (const frame of [
+        claudeSdkFrame({
+          type: "assistant",
+          parent_tool_use_id: null,
+          message: {
+            model: parentSelection.model,
+            id: "msg_nested_effort_outer_launch",
+            type: "message",
+            role: "assistant",
+            content: [agentCall(OUTER_TOOL_USE_ID, "low")],
+          },
+          uuid: "00000000-0000-4000-8000-000000000221",
+          session_id: WAKE_NATIVE_SESSION,
+        }),
+        taskStarted(OUTER_TOOL_USE_ID, "00000000-0000-4000-8000-000000000222"),
+        claudeSdkFrame({
+          type: "assistant",
+          parent_tool_use_id: OUTER_TOOL_USE_ID,
+          message: {
+            model: parentSelection.model,
+            id: "msg_nested_effort_inner_launch",
+            type: "message",
+            role: "assistant",
+            content: [agentCall(UNSPECIFIED_TOOL_USE_ID), agentCall(OVERRIDING_TOOL_USE_ID, "max")],
+          },
+          uuid: "00000000-0000-4000-8000-000000000223",
+          session_id: WAKE_NATIVE_SESSION,
+        }),
+        taskStarted(UNSPECIFIED_TOOL_USE_ID, "00000000-0000-4000-8000-000000000224"),
+        taskStarted(OVERRIDING_TOOL_USE_ID, "00000000-0000-4000-8000-000000000225"),
+        makeResultFrame({
+          uuid: "00000000-0000-4000-8000-000000000226",
+          result: "Spawned the subagents.",
+        }),
+      ]) {
+        yield* Queue.offer(harness.sdkMessages, frame);
+      }
+      yield* Queue.take(harness.terminalReceipts);
+
+      const efforts = new Map(
+        harness.events.flatMap((event) =>
+          event.type === "subagent.updated"
+            ? [
+                [
+                  event.subagent.nativeTaskRef?.nativeId,
+                  getModelSelectionStringOptionValue(event.subagent.modelSelection, "effort"),
+                ] as const,
+              ]
+            : [],
+        ),
+      );
+      assert.deepEqual(Object.fromEntries(efforts), {
+        [`task-${OUTER_TOOL_USE_ID}`]: "low",
+        [`task-${UNSPECIFIED_TOOL_USE_ID}`]: undefined,
+        [`task-${OVERRIDING_TOOL_USE_ID}`]: "max",
+      });
+      const childEfforts = harness.events.flatMap((event) =>
+        event.type === "app_thread.created" && event.appThread.id !== harness.threadId
+          ? [getModelSelectionStringOptionValue(event.appThread.modelSelection, "effort")]
+          : [],
+      );
+      assert.deepEqual(childEfforts, ["low", undefined, "max"]);
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
+        ),
+      ),
     ),
   );
 
-  it.effect("re-opens a resumed subagent whose task_started races past settle", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const SUBAGENT_TASK_ID = "task-resume-postsettle";
-        const SUBAGENT_TOOL_USE_ID = "toolu-resume-postsettle";
-        const RESUME_TOOL_USE_ID = "toolu-resume-postsettle-sendmessage";
-        const FIRST_SUMMARY = "Answered early.";
-        const SECOND_SUMMARY = "RESUME_SETTLE_DONE";
-        const subagentTaskStarted = claudeSdkFrame({
+  it.effect.each([
+    {
+      label: "extracts text from direct content-block subagent results",
+      content: [
+        { type: "text", text: "First line." },
+        { type: "text", text: "Second line." },
+      ],
+      expected: "First line.\nSecond line.",
+    },
+    {
+      label: "drops Claude Code's tools-used note from a subagent result",
+      content: [
+        {
+          type: "text",
+          text: "<tools-used-before-summary>Read</tools-used-before-summary>\n\nadd (line 1)\nmean (line 6)",
+        },
+      ],
+      expected: "add (line 1)\nmean (line 6)",
+    },
+  ])("$label", ({ content, expected }) =>
+    Effect.gen(function* () {
+      const SUBAGENT_TASK_ID = "task-direct-content-blocks";
+      const SUBAGENT_TOOL_USE_ID = "toolu-direct-content-blocks";
+      const harness = yield* makeWakeHarness;
+      const now = yield* DateTime.now;
+      const subagentEvents = () =>
+        harness.events.filter(
+          (
+            event,
+          ): event is Extract<
+            ProviderAdapter.ProviderAdapterV2Event,
+            { type: "subagent.updated" }
+          > => event.type === "subagent.updated",
+        );
+
+      yield* harness.runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now,
+          attemptId: RunAttemptId.make("attempt-claude-direct-content-blocks"),
+          text: "Delegate this task.",
+          attachments: [],
+        }),
+      );
+      yield* Queue.offer(
+        harness.sdkMessages,
+        claudeSdkFrame({
           type: "system",
           subtype: "task_started",
           task_id: SUBAGENT_TASK_ID,
           tool_use_id: SUBAGENT_TOOL_USE_ID,
-          description: "Sleep then echo done token",
+          description: "Delegated task",
           subagent_type: "general-purpose",
           task_type: "local_agent",
-          prompt: "Run the shell command, then return exactly RESUME_SETTLE_DONE.",
-          uuid: "00000000-0000-4000-8000-000000000501",
-          session_id: WAKE_NATIVE_SESSION,
-        });
-        const firstNotification = claudeSdkFrame({
-          type: "system",
-          subtype: "task_notification",
-          task_id: SUBAGENT_TASK_ID,
-          tool_use_id: SUBAGENT_TOOL_USE_ID,
-          status: "completed",
-          output_file: "/tmp/task-resume-postsettle.output",
-          summary: FIRST_SUMMARY,
-          uuid: "00000000-0000-4000-8000-000000000502",
+          prompt: "Return the result.",
+          uuid: "00000000-0000-4000-8000-000000000206",
           session_id: WAKE_NATIVE_SESSION,
-        });
-        const resumeTaskStarted = claudeSdkFrame({
-          type: "system",
-          subtype: "task_started",
-          task_id: SUBAGENT_TASK_ID,
-          tool_use_id: RESUME_TOOL_USE_ID,
-          description: "Sleep then echo done token",
-          is_backgrounded: true,
-          task_type: "local_agent",
-          uuid: "00000000-0000-4000-8000-000000000505",
+        }),
+      );
+      yield* harness.until(() => subagentEvents().length === 1);
+
+      yield* Queue.offer(
+        harness.sdkMessages,
+        claudeSdkFrame({
+          type: "user",
+          message: {
+            role: "user",
+            content: [
+              {
+                type: "tool_result",
+                tool_use_id: SUBAGENT_TOOL_USE_ID,
+                content,
+              },
+            ],
+          },
+          parent_tool_use_id: null,
+          uuid: "00000000-0000-4000-8000-000000000207",
           session_id: WAKE_NATIVE_SESSION,
-        });
-        const secondNotification = claudeSdkFrame({
-          type: "system",
-          subtype: "task_notification",
-          task_id: SUBAGENT_TASK_ID,
-          tool_use_id: RESUME_TOOL_USE_ID,
-          status: "completed",
-          output_file: "/tmp/task-resume-postsettle.output",
-          summary: SECOND_SUMMARY,
-          uuid: "00000000-0000-4000-8000-000000000506",
+        }),
+      );
+      yield* harness.until(() => subagentEvents().at(-1)?.subagent.status === "completed");
+
+      assert.equal(subagentEvents().at(-1)?.subagent.result, expected);
+
+      yield* Queue.offer(
+        harness.sdkMessages,
+        makeResultFrame({
+          uuid: "00000000-0000-4000-8000-000000000208",
+          result: "Delegation completed.",
+        }),
+      );
+      yield* harness.awaitTerminal(1);
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
+        ),
+      ),
+    ),
+  );
+
+  it.effect("keeps a foreground fork running past the placeholder result for its own launch", () =>
+    Effect.gen(function* () {
+      const harness = yield* makeWakeHarness;
+      yield* harness.runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now: yield* DateTime.now,
+          attemptId: RunAttemptId.make("attempt-claude-foreground-fork"),
+          text: "Fork this.",
+          attachments: [],
+        }),
+      );
+      yield* harness.offerAndWait(
+        makeSubagentTaskStartedFrame({
+          taskId: "agent-fork",
+          toolUseId: "toolu-fork",
+          uuid: "00000000-0000-4000-8000-000000000901",
+        }),
+      );
+      // Claude Code opens a foreground fork's own stream with a placeholder result for its launch.
+      yield* harness.offerAndWait(
+        claudeSdkFrame({
+          type: "user",
+          message: {
+            role: "user",
+            content: [
+              {
+                type: "tool_result",
+                tool_use_id: "toolu-fork",
+                content: "Fork started — that fork is you.",
+              },
+            ],
+          },
+          parent_tool_use_id: "toolu-fork",
+          uuid: "00000000-0000-4000-8000-000000000902",
           session_id: WAKE_NATIVE_SESSION,
-        });
+        }),
+      );
+      yield* harness.offerAndWait(
+        makeSubagentNotificationFrame({
+          taskId: "agent-fork",
+          toolUseId: "toolu-fork",
+          summary: "FORK-DONE",
+          uuid: "00000000-0000-4000-8000-000000000903",
+        }),
+      );
+      let settled = yield* Queue.take(harness.subagentReceipts);
+      while (settled.subagent.status === "running") {
+        settled = yield* Queue.take(harness.subagentReceipts);
+      }
+      assert.equal(settled.subagent.result, "FORK-DONE");
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
+        ),
+      ),
+    ),
+  );
 
-        const harness = yield* makeWakeHarness;
-        const now = yield* DateTime.now;
-        const subagentEvents = () =>
-          harness.events.filter(
-            (
-              event,
-            ): event is Extract<
-              ProviderAdapter.ProviderAdapterV2Event,
-              { type: "subagent.updated" }
-            > => event.type === "subagent.updated",
-          );
+  it.effect("releases the idle pin when a post-settle subagent stops without completing", () =>
+    Effect.gen(function* () {
+      const SUBAGENT_TASK_ID = "task-wake-subagent-stopped";
+      const subagentTaskStarted = claudeSdkFrame({
+        type: "system",
+        subtype: "task_started",
+        task_id: SUBAGENT_TASK_ID,
+        tool_use_id: "toolu-wake-subagent-stopped",
+        description: "Long-running research task",
+        subagent_type: "general-purpose",
+        task_type: "local_agent",
+        prompt: "Investigate the flaky test.",
+        uuid: "00000000-0000-4000-8000-000000000301",
+        session_id: WAKE_NATIVE_SESSION,
+      });
+      const subagentStoppedNotification = claudeSdkFrame({
+        type: "system",
+        subtype: "task_notification",
+        task_id: SUBAGENT_TASK_ID,
+        tool_use_id: "toolu-wake-subagent-stopped",
+        status: "stopped",
+        output_file: "/tmp/task-wake-subagent-stopped.output",
+        summary: "Agent was stopped before finishing.",
+        uuid: "00000000-0000-4000-8000-000000000302",
+        session_id: WAKE_NATIVE_SESSION,
+      });
 
-        yield* harness.runtime.startTurn(
-          makeClaudeTestTurnInput({
-            threadId: harness.threadId,
-            providerThread: harness.providerThread,
-            now,
-            attemptId: RunAttemptId.make("attempt-claude-wake-9a"),
-            text: "Spawn a background subagent and stop.",
-            attachments: [],
-          }),
-        );
-        yield* Queue.offer(harness.sdkMessages, subagentTaskStarted);
-        yield* harness.until(() => subagentEvents().length >= 1);
-        yield* Queue.offer(
-          harness.sdkMessages,
-          makeResultFrame({
-            uuid: "00000000-0000-4000-8000-000000000503",
-            result: "Spawned the subagent in the background.",
-          }),
+      const harness = yield* makeWakeHarness;
+      const now = yield* DateTime.now;
+      const subagentEvents = () =>
+        harness.events.filter(
+          (
+            event,
+          ): event is Extract<
+            ProviderAdapter.ProviderAdapterV2Event,
+            { type: "subagent.updated" }
+          > => event.type === "subagent.updated",
         );
-        yield* harness.awaitTerminal(1);
 
-        yield* Queue.offer(harness.sdkMessages, firstNotification);
-        yield* harness.awaitContinuation(1);
-        yield* Queue.offer(
-          harness.sdkMessages,
-          makeResultFrame({
-            uuid: "00000000-0000-4000-8000-000000000504",
-            result: "The subagent answered early.",
-          }),
-        );
-        yield* harness.runtime.startTurn(
-          makeClaudeTestTurnInput({
-            threadId: harness.threadId,
-            providerThread: harness.providerThread,
-            now,
-            attemptId: RunAttemptId.make("attempt-claude-wake-9b"),
-            text: "Background task completed.",
-            attachments: [],
-            providerTurnOrdinal: 2,
-            messageCreatedBy: "agent",
-            messageCreationSource: "provider",
-          }),
-        );
-        yield* harness.awaitTerminal(2);
-        assert.equal(subagentEvents().at(-1)?.subagent.status, "completed");
-        assert.equal(subagentEvents().at(-1)?.subagent.result, FIRST_SUMMARY);
-        assert.isFalse(yield* harness.hasPendingBackgroundWork);
+      yield* harness.runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now,
+          attemptId: RunAttemptId.make("attempt-claude-wake-7a"),
+          text: "Spawn a background subagent and stop.",
+          attachments: [],
+        }),
+      );
+      yield* Queue.offer(harness.sdkMessages, subagentTaskStarted);
+      yield* harness.until(() => subagentEvents().length >= 1);
+      yield* Queue.offer(
+        harness.sdkMessages,
+        makeResultFrame({
+          uuid: "00000000-0000-4000-8000-000000000303",
+          result: "Spawned the subagent in the background.",
+        }),
+      );
+      yield* harness.awaitTerminal(1);
+      assert.isTrue(yield* harness.hasPendingBackgroundWork);
+
+      yield* Queue.offer(harness.sdkMessages, subagentStoppedNotification);
+      yield* harness.awaitContinuation(1);
+
+      yield* Queue.offer(
+        harness.sdkMessages,
+        makeResultFrame({
+          uuid: "00000000-0000-4000-8000-000000000304",
+          result: "The subagent was stopped.",
+        }),
+      );
+      yield* harness.runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now,
+          attemptId: RunAttemptId.make("attempt-claude-wake-7b"),
+          text: "Background task completed.",
+          attachments: [],
+          providerTurnOrdinal: 2,
+          messageCreatedBy: "agent",
+          messageCreationSource: "provider",
+        }),
+      );
+      yield* harness.awaitTerminal(2);
+
+      assert.equal(subagentEvents().at(-1)?.subagent.status, "cancelled");
+      assert.isFalse(yield* harness.hasPendingBackgroundWork);
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
+        ),
+      ),
+    ),
+  );
+
+  it.effect("re-opens a resumed subagent whose task_started races past settle", () =>
+    Effect.gen(function* () {
+      const SUBAGENT_TASK_ID = "task-resume-postsettle";
+      const SUBAGENT_TOOL_USE_ID = "toolu-resume-postsettle";
+      const RESUME_TOOL_USE_ID = "toolu-resume-postsettle-sendmessage";
+      const FIRST_SUMMARY = "Answered early.";
+      const SECOND_SUMMARY = "RESUME_SETTLE_DONE";
+      const subagentTaskStarted = claudeSdkFrame({
+        type: "system",
+        subtype: "task_started",
+        task_id: SUBAGENT_TASK_ID,
+        tool_use_id: SUBAGENT_TOOL_USE_ID,
+        description: "Sleep then echo done token",
+        subagent_type: "general-purpose",
+        task_type: "local_agent",
+        prompt: "Run the shell command, then return exactly RESUME_SETTLE_DONE.",
+        uuid: "00000000-0000-4000-8000-000000000501",
+        session_id: WAKE_NATIVE_SESSION,
+      });
+      const firstNotification = claudeSdkFrame({
+        type: "system",
+        subtype: "task_notification",
+        task_id: SUBAGENT_TASK_ID,
+        tool_use_id: SUBAGENT_TOOL_USE_ID,
+        status: "completed",
+        output_file: "/tmp/task-resume-postsettle.output",
+        summary: FIRST_SUMMARY,
+        uuid: "00000000-0000-4000-8000-000000000502",
+        session_id: WAKE_NATIVE_SESSION,
+      });
+      const resumeTaskStarted = claudeSdkFrame({
+        type: "system",
+        subtype: "task_started",
+        task_id: SUBAGENT_TASK_ID,
+        tool_use_id: RESUME_TOOL_USE_ID,
+        description: "Sleep then echo done token",
+        is_backgrounded: true,
+        task_type: "local_agent",
+        uuid: "00000000-0000-4000-8000-000000000505",
+        session_id: WAKE_NATIVE_SESSION,
+      });
+      const secondNotification = claudeSdkFrame({
+        type: "system",
+        subtype: "task_notification",
+        task_id: SUBAGENT_TASK_ID,
+        tool_use_id: RESUME_TOOL_USE_ID,
+        status: "completed",
+        output_file: "/tmp/task-resume-postsettle.output",
+        summary: SECOND_SUMMARY,
+        uuid: "00000000-0000-4000-8000-000000000506",
+        session_id: WAKE_NATIVE_SESSION,
+      });
 
-        yield* Queue.offer(
-          harness.sdkMessages,
-          claudeSdkFrame({
-            type: "assistant",
-            message: {
-              model: "claude-sonnet-4-6",
-              id: "msg_resume_postsettle_sendmessage",
-              type: "message",
-              role: "assistant",
-              content: [
-                {
-                  type: "tool_use",
-                  id: RESUME_TOOL_USE_ID,
-                  name: "SendMessage",
-                  input: {
-                    to: SUBAGENT_TASK_ID,
-                    summary: "Resume the subagent",
-                    message: "Continue and return the token.",
-                  },
-                },
-              ],
-            },
-            parent_tool_use_id: null,
-            uuid: "00000000-0000-4000-8000-000000000508",
-            session_id: WAKE_NATIVE_SESSION,
-          }),
-        );
-        yield* Queue.offer(harness.sdkMessages, resumeTaskStarted);
-        const resumeAck = {
-          success: true,
-          message: `Resuming agent ${SUBAGENT_TASK_ID.slice(0, 7)}`,
-          resumedAgentId: SUBAGENT_TASK_ID,
-          pin: { id: SUBAGENT_TASK_ID, name: SUBAGENT_TASK_ID, ref: "42ab31" },
-        };
-        yield* Queue.offer(
-          harness.sdkMessages,
-          claudeSdkFrame({
-            type: "user",
-            message: {
-              role: "user",
-              content: [
-                {
-                  tool_use_id: RESUME_TOOL_USE_ID,
-                  type: "tool_result",
-                  content: [
-                    {
-                      type: "text",
-                      text: encodeJsonString(resumeAck),
-                    },
-                  ],
-                },
-              ],
-            },
-            parent_tool_use_id: null,
-            uuid: "00000000-0000-4000-8000-000000000509",
-            session_id: WAKE_NATIVE_SESSION,
-            tool_use_result: resumeAck,
-          }),
+      const harness = yield* makeWakeHarness;
+      const now = yield* DateTime.now;
+      const subagentEvents = () =>
+        harness.events.filter(
+          (
+            event,
+          ): event is Extract<
+            ProviderAdapter.ProviderAdapterV2Event,
+            { type: "subagent.updated" }
+          > => event.type === "subagent.updated",
         );
-        for (const frame of [
-          ...makeSubagentAssistantFrames({
-            parentToolUseId: SUBAGENT_TOOL_USE_ID,
-            uuid: "00000000-0000-4000-8000-000000000961",
-            text: "RESUMED_WORK",
-            bashToolUseId: "toolu-resume-postsettle-bash",
-          }),
-          makeSubagentToolResultFrame({
-            parentToolUseId: SUBAGENT_TOOL_USE_ID,
-            uuid: "00000000-0000-4000-8000-000000000962",
-            toolUseId: "toolu-resume-postsettle-bash",
-          }),
-        ]) {
-          yield* Queue.offer(harness.sdkMessages, frame);
-        }
-        yield* Queue.offer(harness.sdkMessages, secondNotification);
-        yield* harness.awaitContinuation(2);
-        assert.equal(harness.continuationRequests[1]?.detail, SECOND_SUMMARY);
-        assert.isTrue(yield* harness.hasPendingBackgroundWork);
 
-        yield* Queue.offer(
-          harness.sdkMessages,
-          makeResultFrame({
-            uuid: "00000000-0000-4000-8000-000000000507",
-            result: "The subagent finished with RESUME_SETTLE_DONE.",
-          }),
-        );
-        yield* harness.runtime.startTurn(
-          makeClaudeTestTurnInput({
-            threadId: harness.threadId,
-            providerThread: harness.providerThread,
-            now,
-            attemptId: RunAttemptId.make("attempt-claude-wake-9c"),
-            text: "Background task completed.",
-            attachments: [],
-            providerTurnOrdinal: 3,
-            messageCreatedBy: "agent",
-            messageCreationSource: "provider",
-          }),
-        );
-        yield* harness.awaitTerminal(3);
+      yield* harness.runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now,
+          attemptId: RunAttemptId.make("attempt-claude-wake-9a"),
+          text: "Spawn a background subagent and stop.",
+          attachments: [],
+        }),
+      );
+      yield* Queue.offer(harness.sdkMessages, subagentTaskStarted);
+      yield* harness.until(() => subagentEvents().length >= 1);
+      yield* Queue.offer(
+        harness.sdkMessages,
+        makeResultFrame({
+          uuid: "00000000-0000-4000-8000-000000000503",
+          result: "Spawned the subagent in the background.",
+        }),
+      );
+      yield* harness.awaitTerminal(1);
 
-        const statuses = subagentEvents().map((event) => event.subagent.status);
-        const firstCompleted = statuses.indexOf("completed");
-        const reopenedIndex = statuses.lastIndexOf("running");
-        assert.isAbove(reopenedIndex, firstCompleted);
-        assert.isNull(subagentEvents()[reopenedIndex]?.subagent.result);
-        assert.equal(subagentEvents()[reopenedIndex]?.subagent.runId, "run-attempt-claude-wake-9c");
-        const nodeStatuses = harness.events
-          .filter(
-            (
-              event,
-            ): event is Extract<ProviderAdapter.ProviderAdapterV2Event, { type: "node.updated" }> =>
-              event.type === "node.updated" &&
-              event.node.kind === "subagent" &&
-              event.node.nativeItemRef?.nativeId === SUBAGENT_TASK_ID,
-          )
-          .map((event) => event.node.status);
-        assert.isAbove(nodeStatuses.lastIndexOf("running"), nodeStatuses.indexOf("completed"));
-        const finalSubagent = subagentEvents().at(-1)?.subagent;
-        assert.equal(finalSubagent?.status, "completed");
-        assert.equal(finalSubagent?.result, SECOND_SUMMARY);
-        assert.equal(finalSubagent?.runId, "run-attempt-claude-wake-9c");
-        const reopenIndex = harness.events.findIndex(
-          (event) =>
-            event.type === "subagent.updated" &&
-            event.subagent.status === "running" &&
-            event.subagent.runId === "run-attempt-claude-wake-9c",
-        );
-        assert.isAtLeast(reopenIndex, 0);
-        const resumedWorkIndexes = harness.events.flatMap((event, index) =>
-          event.type === "message.updated" && event.message.text === "RESUMED_WORK" ? [index] : [],
-        );
-        assert.lengthOf(resumedWorkIndexes, 1);
-        assert.isAbove(resumedWorkIndexes[0] ?? -1, reopenIndex);
-        assert.isFalse(yield* harness.hasPendingBackgroundWork);
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
-          ),
+      yield* Queue.offer(harness.sdkMessages, firstNotification);
+      yield* harness.awaitContinuation(1);
+      yield* Queue.offer(
+        harness.sdkMessages,
+        makeResultFrame({
+          uuid: "00000000-0000-4000-8000-000000000504",
+          result: "The subagent answered early.",
+        }),
+      );
+      yield* harness.runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now,
+          attemptId: RunAttemptId.make("attempt-claude-wake-9b"),
+          text: "Background task completed.",
+          attachments: [],
+          providerTurnOrdinal: 2,
+          messageCreatedBy: "agent",
+          messageCreationSource: "provider",
+        }),
+      );
+      yield* harness.awaitTerminal(2);
+      assert.equal(subagentEvents().at(-1)?.subagent.status, "completed");
+      assert.equal(subagentEvents().at(-1)?.subagent.result, FIRST_SUMMARY);
+      assert.isFalse(yield* harness.hasPendingBackgroundWork);
+
+      yield* Queue.offer(
+        harness.sdkMessages,
+        claudeSdkFrame({
+          type: "assistant",
+          message: {
+            model: "claude-sonnet-4-6",
+            id: "msg_resume_postsettle_sendmessage",
+            type: "message",
+            role: "assistant",
+            content: [
+              {
+                type: "tool_use",
+                id: RESUME_TOOL_USE_ID,
+                name: "SendMessage",
+                input: {
+                  to: SUBAGENT_TASK_ID,
+                  summary: "Resume the subagent",
+                  message: "Continue and return the token.",
+                },
+              },
+            ],
+          },
+          parent_tool_use_id: null,
+          uuid: "00000000-0000-4000-8000-000000000508",
+          session_id: WAKE_NATIVE_SESSION,
+        }),
+      );
+      yield* Queue.offer(harness.sdkMessages, resumeTaskStarted);
+      const resumeAck = {
+        success: true,
+        message: `Resuming agent ${SUBAGENT_TASK_ID.slice(0, 7)}`,
+        resumedAgentId: SUBAGENT_TASK_ID,
+        pin: { id: SUBAGENT_TASK_ID, name: SUBAGENT_TASK_ID, ref: "42ab31" },
+      };
+      yield* Queue.offer(
+        harness.sdkMessages,
+        claudeSdkFrame({
+          type: "user",
+          message: {
+            role: "user",
+            content: [
+              {
+                tool_use_id: RESUME_TOOL_USE_ID,
+                type: "tool_result",
+                content: [
+                  {
+                    type: "text",
+                    text: encodeJsonString(resumeAck),
+                  },
+                ],
+              },
+            ],
+          },
+          parent_tool_use_id: null,
+          uuid: "00000000-0000-4000-8000-000000000509",
+          session_id: WAKE_NATIVE_SESSION,
+          tool_use_result: resumeAck,
+        }),
+      );
+      for (const frame of [
+        ...makeSubagentAssistantFrames({
+          parentToolUseId: SUBAGENT_TOOL_USE_ID,
+          uuid: "00000000-0000-4000-8000-000000000961",
+          text: "RESUMED_WORK",
+          bashToolUseId: "toolu-resume-postsettle-bash",
+        }),
+        makeSubagentToolResultFrame({
+          parentToolUseId: SUBAGENT_TOOL_USE_ID,
+          uuid: "00000000-0000-4000-8000-000000000962",
+          toolUseId: "toolu-resume-postsettle-bash",
+        }),
+      ]) {
+        yield* Queue.offer(harness.sdkMessages, frame);
+      }
+      yield* Queue.offer(harness.sdkMessages, secondNotification);
+      yield* harness.awaitContinuation(2);
+      assert.equal(harness.continuationRequests[1]?.detail, SECOND_SUMMARY);
+      assert.isTrue(yield* harness.hasPendingBackgroundWork);
+
+      yield* Queue.offer(
+        harness.sdkMessages,
+        makeResultFrame({
+          uuid: "00000000-0000-4000-8000-000000000507",
+          result: "The subagent finished with RESUME_SETTLE_DONE.",
+        }),
+      );
+      yield* harness.runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now,
+          attemptId: RunAttemptId.make("attempt-claude-wake-9c"),
+          text: "Background task completed.",
+          attachments: [],
+          providerTurnOrdinal: 3,
+          messageCreatedBy: "agent",
+          messageCreationSource: "provider",
+        }),
+      );
+      yield* harness.awaitTerminal(3);
+
+      const statuses = subagentEvents().map((event) => event.subagent.status);
+      const firstCompleted = statuses.indexOf("completed");
+      const reopenedIndex = statuses.lastIndexOf("running");
+      assert.isAbove(reopenedIndex, firstCompleted);
+      assert.isNull(subagentEvents()[reopenedIndex]?.subagent.result);
+      assert.equal(subagentEvents()[reopenedIndex]?.subagent.runId, "run-attempt-claude-wake-9c");
+      const nodeStatuses = harness.events
+        .filter(
+          (
+            event,
+          ): event is Extract<ProviderAdapter.ProviderAdapterV2Event, { type: "node.updated" }> =>
+            event.type === "node.updated" &&
+            event.node.kind === "subagent" &&
+            event.node.nativeItemRef?.nativeId === SUBAGENT_TASK_ID,
+        )
+        .map((event) => event.node.status);
+      assert.isAbove(nodeStatuses.lastIndexOf("running"), nodeStatuses.indexOf("completed"));
+      const finalSubagent = subagentEvents().at(-1)?.subagent;
+      assert.equal(finalSubagent?.status, "completed");
+      assert.equal(finalSubagent?.result, SECOND_SUMMARY);
+      assert.equal(finalSubagent?.runId, "run-attempt-claude-wake-9c");
+      const reopenIndex = harness.events.findIndex(
+        (event) =>
+          event.type === "subagent.updated" &&
+          event.subagent.status === "running" &&
+          event.subagent.runId === "run-attempt-claude-wake-9c",
+      );
+      assert.isAtLeast(reopenIndex, 0);
+      const resumedWorkIndexes = harness.events.flatMap((event, index) =>
+        event.type === "message.updated" && event.message.text === "RESUMED_WORK" ? [index] : [],
+      );
+      assert.lengthOf(resumedWorkIndexes, 1);
+      assert.isAbove(resumedWorkIndexes[0] ?? -1, reopenIndex);
+      assert.isFalse(yield* harness.hasPendingBackgroundWork);
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
         ),
       ),
     ),
   );
 
   it.effect("resets Waiting roster and wake eligibility when the CLI process is replaced", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const changes = yield* makeChangeSignal;
-        const fileSystem = yield* FileSystem.FileSystem;
-        const idAllocator = yield* IdAllocator.IdAllocatorV2;
-        const attachmentsDir = yield* fileSystem.makeTempDirectoryScoped({
-          prefix: "t3-claude-v2-process-reset-",
-        });
-        const processQueues: Array<Queue.Queue<SDKMessage>> = [];
-        const events: Array<ProviderAdapter.ProviderAdapterV2Event> = [];
-        const continuationRequests: Array<ProviderContinuationRequests.ProviderContinuationRequest> =
-          [];
-        const adapter = yield* ClaudeAdapterV2.makeClaudeAdapterV2({
-          instanceId: ClaudeAdapterV2.CLAUDE_DEFAULT_INSTANCE_ID,
-          settings: DEFAULT_CLAUDE_SETTINGS,
-          environment: {},
-          attachmentsDir,
-          fileSystem,
-          path: yield* Path.Path,
-          random: yield* SecureRandom.SecureRandom,
-          idAllocator,
-          continuationRequests: {
-            offer: (request) =>
-              Effect.sync(() => {
-                continuationRequests.push(request);
-              }).pipe(Effect.andThen(changes.notify)),
-          },
-          queryRunner: {
-            allocateSessionId: Effect.succeed(WAKE_NATIVE_SESSION),
-            open: () =>
-              Effect.gen(function* () {
-                const sdkMessages = yield* Queue.unbounded<SDKMessage>();
-                processQueues.push(sdkMessages);
-                return {
-                  messages: Stream.fromQueue(sdkMessages),
-                  offer: () => Effect.void,
-                  setModel: () => Effect.void,
-                  applyFlagSettings: () => Effect.void,
-                  setPermissionMode: () => Effect.void,
-                  backgroundTasks: () => Effect.succeed(false),
-                  mcpServerStatus: Effect.succeed([]),
-                  readMcpResource: () => Effect.die("unexpected MCP resource read"),
-                  callMcpTool: () => Effect.die("unexpected MCP tool call"),
-                  listPermissionRules: Effect.die("unexpected permission rules read"),
-                  stopTask: () => Effect.void,
-                  interrupt: Effect.void,
-                  close: Queue.shutdown(sdkMessages),
-                };
-              }),
-            forkSession: () => Effect.die("unused forkSession"),
-            subagentLaunchToolUseId: () => Effect.succeed(null),
-            subagentModel: () => Effect.succeed(null),
-            assertComplete: Effect.void,
-          },
-        });
-        const threadId = ThreadId.make("thread-claude-process-reset");
-        const runtime = yield* adapter.openSession({
-          threadId,
-          providerSessionId: ProviderSessionId.make("provider-session-claude-process-reset"),
-          modelSelection: CLAUDE_TEST_MODEL_SELECTION,
-          runtimePolicy: CLAUDE_TEST_RUNTIME_POLICY,
-        });
-        const providerThread = yield* runtime.ensureThread({
-          threadId,
-          modelSelection: CLAUDE_TEST_MODEL_SELECTION,
-          runtimePolicy: CLAUDE_TEST_RUNTIME_POLICY,
-        });
-        yield* runtime.events.pipe(
-          Stream.runForEach((event) =>
+    Effect.gen(function* () {
+      const changes = yield* makeChangeSignal;
+      const fileSystem = yield* FileSystem.FileSystem;
+      const idAllocator = yield* IdAllocator.IdAllocatorV2;
+      const attachmentsDir = yield* fileSystem.makeTempDirectoryScoped({
+        prefix: "t3-claude-v2-process-reset-",
+      });
+      const processQueues: Array<Queue.Queue<SDKMessage>> = [];
+      const events: Array<ProviderAdapter.ProviderAdapterV2Event> = [];
+      const continuationRequests: Array<ProviderContinuationRequests.ProviderContinuationRequest> =
+        [];
+      const adapter = yield* ClaudeAdapterV2.makeClaudeAdapterV2({
+        instanceId: ClaudeAdapterV2.CLAUDE_DEFAULT_INSTANCE_ID,
+        settings: DEFAULT_CLAUDE_SETTINGS,
+        environment: {},
+        attachmentsDir,
+        fileSystem,
+        path: yield* Path.Path,
+        random: yield* SecureRandom.SecureRandom,
+        idAllocator,
+        continuationRequests: {
+          offer: (request) =>
             Effect.sync(() => {
-              events.push(event);
+              continuationRequests.push(request);
             }).pipe(Effect.andThen(changes.notify)),
-          ),
-          Effect.forkScoped,
-        );
-        if (runtime.hasPendingBackgroundWork === undefined) {
-          return yield* Effect.die("Claude adapter runtime must expose hasPendingBackgroundWork.");
-        }
-        const hasPendingBackgroundWork = runtime.hasPendingBackgroundWork;
-        const now = yield* DateTime.now;
-
-        yield* runtime.startTurn(
-          makeClaudeTestTurnInput({
-            threadId,
-            providerThread,
-            now,
-            attemptId: RunAttemptId.make("attempt-claude-process-reset-a"),
-            text: "Run the build in the background.",
-            attachments: [],
-          }),
-        );
-        assert.equal(processQueues.length, 1);
-        const firstProcess = processQueues[0]!;
-        yield* Queue.offer(firstProcess, wakeTaskStarted);
-        yield* Queue.offer(
-          firstProcess,
-          claudeSdkFrame({
-            type: "system",
-            subtype: "background_tasks_changed",
-            tasks: [],
-            uuid: "00000000-0000-4000-8000-000000000603",
-            session_id: WAKE_NATIVE_SESSION,
-          }),
-        );
-        yield* Queue.offer(firstProcess, turnOneResult);
-        yield* changes.until(() => events.some((event) => event.type === "turn.terminal"));
-        assert.isFalse(yield* hasPendingBackgroundWork);
+        },
+        queryRunner: {
+          allocateSessionId: Effect.succeed(WAKE_NATIVE_SESSION),
+          open: () =>
+            Effect.gen(function* () {
+              const sdkMessages = yield* Queue.unbounded<SDKMessage>();
+              processQueues.push(sdkMessages);
+              return {
+                messages: Stream.fromQueue(sdkMessages),
+                offer: () => Effect.void,
+                setModel: () => Effect.void,
+                applyFlagSettings: () => Effect.void,
+                setPermissionMode: () => Effect.void,
+                backgroundTasks: () => Effect.succeed(false),
+                mcpServerStatus: Effect.succeed([]),
+                readMcpResource: () => Effect.die("unexpected MCP resource read"),
+                callMcpTool: () => Effect.die("unexpected MCP tool call"),
+                listPermissionRules: Effect.die("unexpected permission rules read"),
+                stopTask: () => Effect.void,
+                interrupt: Effect.void,
+                close: Queue.shutdown(sdkMessages),
+              };
+            }),
+          forkSession: () => Effect.die("unused forkSession"),
+          subagentLaunchToolUseId: () => Effect.succeed(null),
+          subagentModel: () => Effect.succeed(null),
+          assertComplete: Effect.void,
+        },
+      });
+      const threadId = ThreadId.make("thread-claude-process-reset");
+      const runtime = yield* adapter.openSession({
+        threadId,
+        providerSessionId: ProviderSessionId.make("provider-session-claude-process-reset"),
+        modelSelection: CLAUDE_TEST_MODEL_SELECTION,
+        runtimePolicy: CLAUDE_TEST_RUNTIME_POLICY,
+      });
+      const providerThread = yield* runtime.ensureThread({
+        threadId,
+        modelSelection: CLAUDE_TEST_MODEL_SELECTION,
+        runtimePolicy: CLAUDE_TEST_RUNTIME_POLICY,
+      });
+      yield* runtime.events.pipe(
+        Stream.runForEach((event) =>
+          Effect.sync(() => {
+            events.push(event);
+          }).pipe(Effect.andThen(changes.notify)),
+        ),
+        Effect.forkScoped,
+      );
+      if (runtime.hasPendingBackgroundWork === undefined) {
+        return yield* Effect.die("Claude adapter runtime must expose hasPendingBackgroundWork.");
+      }
+      const hasPendingBackgroundWork = runtime.hasPendingBackgroundWork;
+      const now = yield* DateTime.now;
 
-        const alternateModel = CLAUDE_TEST_RESTART_MODEL_SELECTION;
-        const activeProviderThread = {
-          ...providerThread,
-          status: "active" as const,
-        } satisfies OrchestrationV2ProviderThread;
-        yield* runtime.startTurn(
-          makeClaudeTestTurnInput({
-            threadId,
-            providerThread: activeProviderThread,
-            now,
-            attemptId: RunAttemptId.make("attempt-claude-process-reset-b"),
-            text: "Continue after process restart.",
-            attachments: [],
-            providerTurnOrdinal: 2,
-            modelSelection: alternateModel,
-          }),
-        );
-        assert.equal(processQueues.length, 2);
+      yield* runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId,
+          providerThread,
+          now,
+          attemptId: RunAttemptId.make("attempt-claude-process-reset-a"),
+          text: "Run the build in the background.",
+          attachments: [],
+        }),
+      );
+      assert.equal(processQueues.length, 1);
+      const firstProcess = processQueues[0]!;
+      yield* Queue.offer(firstProcess, wakeTaskStarted);
+      yield* Queue.offer(
+        firstProcess,
+        claudeSdkFrame({
+          type: "system",
+          subtype: "background_tasks_changed",
+          tasks: [],
+          uuid: "00000000-0000-4000-8000-000000000603",
+          session_id: WAKE_NATIVE_SESSION,
+        }),
+      );
+      yield* Queue.offer(firstProcess, turnOneResult);
+      yield* changes.until(() => events.some((event) => event.type === "turn.terminal"));
+      assert.isFalse(yield* hasPendingBackgroundWork);
+
+      const alternateModel = CLAUDE_TEST_RESTART_MODEL_SELECTION;
+      const activeProviderThread = {
+        ...providerThread,
+        status: "active" as const,
+      } satisfies OrchestrationV2ProviderThread;
+      yield* runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId,
+          providerThread: activeProviderThread,
+          now,
+          attemptId: RunAttemptId.make("attempt-claude-process-reset-b"),
+          text: "Continue after process restart.",
+          attachments: [],
+          providerTurnOrdinal: 2,
+          modelSelection: alternateModel,
+        }),
+      );
+      assert.equal(processQueues.length, 2);
 
-        yield* changes.until(() =>
-          providerThreadRosterEvents(events).some(
-            (event) =>
-              event.providerThread.status === "active" &&
-              (event.providerThread.pendingBackgroundTasks?.length ?? 0) === 0 &&
-              event.providerThread.updatedAt !== undefined,
-          ),
-        );
-        assert.isFalse(yield* hasPendingBackgroundWork);
-        const emptyActiveRosterEvents = providerThreadRosterEvents(events).filter(
+      yield* changes.until(() =>
+        providerThreadRosterEvents(events).some(
           (event) =>
             event.providerThread.status === "active" &&
-            (event.providerThread.pendingBackgroundTasks?.length ?? 0) === 0,
-        );
-        assert.isAtLeast(emptyActiveRosterEvents.length, 1);
-        assert.deepEqual(
-          emptyActiveRosterEvents.at(-1)?.providerThread.pendingBackgroundTasks ?? [],
-          [],
-        );
-        assert.equal(emptyActiveRosterEvents.at(-1)?.providerThread.status, "active");
-
-        const secondProcess = processQueues[1]!;
-        yield* Queue.offer(secondProcess, wakeNotification);
-        yield* yieldTicks(50);
-        assert.lengthOf(continuationRequests, 0);
-
-        yield* Queue.offer(
-          secondProcess,
-          makeResultFrame({
-            uuid: "00000000-0000-4000-8000-000000000602",
-            result: "Process restart turn finished.",
-          }),
-        );
-        yield* changes.until(
-          () => events.filter((event) => event.type === "turn.terminal").length === 2,
-        );
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
-          ),
+            (event.providerThread.pendingBackgroundTasks?.length ?? 0) === 0 &&
+            event.providerThread.updatedAt !== undefined,
         ),
-      ),
-    ),
-  );
-
-  it.effect(
-    "preserves buffered local_bash notification classification across model/policy query replacement",
-    () =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const changes = yield* makeChangeSignal;
-          const fileSystem = yield* FileSystem.FileSystem;
-          const idAllocator = yield* IdAllocator.IdAllocatorV2;
-          const attachmentsDir = yield* fileSystem.makeTempDirectoryScoped({
-            prefix: "t3-claude-v2-buffer-replace-",
-          });
-          const processQueues: Array<Queue.Queue<SDKMessage>> = [];
-          const events: Array<ProviderAdapter.ProviderAdapterV2Event> = [];
-          const continuationRequests: Array<ProviderContinuationRequests.ProviderContinuationRequest> =
-            [];
-          const adapter = yield* ClaudeAdapterV2.makeClaudeAdapterV2({
-            instanceId: ClaudeAdapterV2.CLAUDE_DEFAULT_INSTANCE_ID,
-            settings: DEFAULT_CLAUDE_SETTINGS,
-            environment: {},
-            attachmentsDir,
-            fileSystem,
-            path: yield* Path.Path,
-            random: yield* SecureRandom.SecureRandom,
-            idAllocator,
-            continuationRequests: {
-              offer: (request) =>
-                Effect.sync(() => {
-                  continuationRequests.push(request);
-                }).pipe(Effect.andThen(changes.notify)),
-            },
-            queryRunner: {
-              allocateSessionId: Effect.succeed(WAKE_NATIVE_SESSION),
-              open: () =>
-                Effect.gen(function* () {
-                  const sdkMessages = yield* Queue.unbounded<SDKMessage>();
-                  processQueues.push(sdkMessages);
-                  return {
-                    messages: Stream.fromQueue(sdkMessages),
-                    offer: () => Effect.void,
-                    setModel: () => Effect.void,
-                    applyFlagSettings: () => Effect.void,
-                    setPermissionMode: () => Effect.void,
-                    backgroundTasks: () => Effect.succeed(false),
-                    mcpServerStatus: Effect.succeed([]),
-                    readMcpResource: () => Effect.die("unexpected MCP resource read"),
-                    callMcpTool: () => Effect.die("unexpected MCP tool call"),
-                    listPermissionRules: Effect.die("unexpected permission rules read"),
-                    stopTask: () => Effect.void,
-                    interrupt: Effect.void,
-                    close: Queue.shutdown(sdkMessages),
-                  };
-                }),
-              forkSession: () => Effect.die("unused forkSession"),
-              subagentLaunchToolUseId: () => Effect.succeed(null),
-              subagentModel: () => Effect.succeed(null),
-              assertComplete: Effect.void,
-            },
-          });
-          const threadId = ThreadId.make("thread-claude-buffer-replace");
-          const runtime = yield* adapter.openSession({
-            threadId,
-            providerSessionId: ProviderSessionId.make("provider-session-claude-buffer-replace"),
-            modelSelection: CLAUDE_TEST_MODEL_SELECTION,
-            runtimePolicy: CLAUDE_TEST_RUNTIME_POLICY,
-          });
-          const providerThread = yield* runtime.ensureThread({
-            threadId,
-            modelSelection: CLAUDE_TEST_MODEL_SELECTION,
-            runtimePolicy: CLAUDE_TEST_RUNTIME_POLICY,
-          });
-          yield* runtime.events.pipe(
-            Stream.runForEach((event) =>
-              Effect.sync(() => {
-                events.push(event);
-              }).pipe(Effect.andThen(changes.notify)),
-            ),
-            Effect.forkScoped,
-          );
-          if (runtime.hasPendingBackgroundWork === undefined) {
-            return yield* Effect.die(
-              "Claude adapter runtime must expose hasPendingBackgroundWork.",
-            );
-          }
-          const hasPendingBackgroundWork = runtime.hasPendingBackgroundWork;
-          const now = yield* DateTime.now;
+      );
+      assert.isFalse(yield* hasPendingBackgroundWork);
+      const emptyActiveRosterEvents = providerThreadRosterEvents(events).filter(
+        (event) =>
+          event.providerThread.status === "active" &&
+          (event.providerThread.pendingBackgroundTasks?.length ?? 0) === 0,
+      );
+      assert.isAtLeast(emptyActiveRosterEvents.length, 1);
+      assert.deepEqual(
+        emptyActiveRosterEvents.at(-1)?.providerThread.pendingBackgroundTasks ?? [],
+        [],
+      );
+      assert.equal(emptyActiveRosterEvents.at(-1)?.providerThread.status, "active");
 
-          yield* runtime.startTurn(
-            makeClaudeTestTurnInput({
-              threadId,
-              providerThread,
-              now,
-              attemptId: RunAttemptId.make("attempt-claude-buffer-replace-a"),
-              text: "Run the build in the background.",
-              attachments: [],
-            }),
-          );
-          assert.equal(processQueues.length, 1);
-          const firstProcess = processQueues[0]!;
-          yield* Queue.offer(firstProcess, wakeTaskStarted);
-          yield* Queue.offer(firstProcess, turnOneResult);
-          yield* changes.until(() => events.some((event) => event.type === "turn.terminal"));
-          assert.isTrue(yield* hasPendingBackgroundWork);
-
-          yield* Queue.offer(firstProcess, wakeNotification);
-          yield* yieldTicks(50);
-          assert.lengthOf(continuationRequests, 0);
-
-          const alternateModel = CLAUDE_TEST_RESTART_MODEL_SELECTION;
-          yield* runtime.startTurn(
-            makeClaudeTestTurnInput({
-              threadId,
-              providerThread: { ...providerThread, status: "active" },
-              now,
-              attemptId: RunAttemptId.make("attempt-claude-buffer-replace-user"),
-              text: "Switch model while background work completes.",
-              attachments: [],
-              providerTurnOrdinal: 2,
-              modelSelection: alternateModel,
-            }),
-          );
-          assert.equal(processQueues.length, 2);
-          const secondProcess = processQueues[1]!;
-          yield* Queue.offer(
-            secondProcess,
-            makeResultFrame({
-              uuid: "00000000-0000-4000-8000-000000000701",
-              result: "User turn finished after model switch.",
-            }),
-          );
-          yield* changes.until(
-            () => events.filter((event) => event.type === "turn.terminal").length === 2,
-          );
-          assert.isFalse(yield* hasPendingBackgroundWork);
-          assert.lengthOf(continuationRequests, 0);
+      const secondProcess = processQueues[1]!;
+      yield* Queue.offer(secondProcess, wakeNotification);
+      yield* yieldTicks(50);
+      assert.lengthOf(continuationRequests, 0);
 
-          yield* Queue.offer(secondProcess, wakeResult);
-          yield* changes.until(() => continuationRequests.length === 1);
-          assert.equal(continuationRequests[0]?.detail, WAKE_SUMMARY);
-          yield* runtime.startTurn(
-            makeClaudeTestTurnInput({
-              threadId,
-              providerThread: { ...providerThread, status: "active" },
-              now,
-              attemptId: RunAttemptId.make("attempt-claude-buffer-replace-cont"),
-              text: "Background task completed.",
-              attachments: [],
-              providerTurnOrdinal: 3,
-              modelSelection: alternateModel,
-              messageCreatedBy: "agent",
-              messageCreationSource: "provider",
-            }),
-          );
-          yield* changes.until(
-            () => events.filter((event) => event.type === "turn.terminal").length === 3,
-          );
-          assert.isTrue(
-            events.some(
-              (event) =>
-                event.type === "message.updated" && event.message.text === WAKE_RESULT_TEXT,
-            ),
-          );
-          assert.isFalse(
-            events.some(
-              (event) =>
-                event.type === "subagent.updated" ||
-                (event.type === "node.updated" && event.node.kind === "subagent"),
-            ),
-          );
-          assert.isFalse(
-            events.some(
-              (event) =>
-                event.type !== "provider_thread.updated" &&
-                JSON.stringify(event).includes(WAKE_TASK_ID),
-            ),
-          );
-          assert.isFalse(yield* hasPendingBackgroundWork);
-        }).pipe(
-          Effect.provide(
-            Layer.mergeAll(
-              IdAllocator.layer,
-              McpProviderSessions.layer,
-              NodeServices.layer,
-              NodeCrypto.layer,
-            ),
-          ),
+      yield* Queue.offer(
+        secondProcess,
+        makeResultFrame({
+          uuid: "00000000-0000-4000-8000-000000000602",
+          result: "Process restart turn finished.",
+        }),
+      );
+      yield* changes.until(
+        () => events.filter((event) => event.type === "turn.terminal").length === 2,
+      );
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
         ),
       ),
+    ),
   );
 
-  it.effect("refuses a thinking change that would kill a running background subagent", () =>
-    Effect.scoped(
+  it.effect(
+    "preserves buffered local_bash notification classification across model/policy query replacement",
+    () =>
       Effect.gen(function* () {
         const changes = yield* makeChangeSignal;
-        const SUBAGENT_TASK_ID = "task-model-change-running-subagent";
-        const SUBAGENT_TOOL_USE_ID = "toolu-model-change-running-subagent";
         const fileSystem = yield* FileSystem.FileSystem;
         const idAllocator = yield* IdAllocator.IdAllocatorV2;
         const attachmentsDir = yield* fileSystem.makeTempDirectoryScoped({
-          prefix: "t3-claude-v2-model-change-running-subagent-",
+          prefix: "t3-claude-v2-buffer-replace-",
         });
         const processQueues: Array<Queue.Queue<SDKMessage>> = [];
         const events: Array<ProviderAdapter.ProviderAdapterV2Event> = [];
+        const continuationRequests: Array<ProviderContinuationRequests.ProviderContinuationRequest> =
+          [];
         const adapter = yield* ClaudeAdapterV2.makeClaudeAdapterV2({
           instanceId: ClaudeAdapterV2.CLAUDE_DEFAULT_INSTANCE_ID,
           settings: DEFAULT_CLAUDE_SETTINGS,
@@ -19352,7 +19237,12 @@ describe("ClaudeAdapterV2 background wake turns", () => {
           path: yield* Path.Path,
           random: yield* SecureRandom.SecureRandom,
           idAllocator,
-          continuationRequests: { offer: () => Effect.void },
+          continuationRequests: {
+            offer: (request) =>
+              Effect.sync(() => {
+                continuationRequests.push(request);
+              }).pipe(Effect.andThen(changes.notify)),
+          },
           queryRunner: {
             allocateSessionId: Effect.succeed(WAKE_NATIVE_SESSION),
             open: () =>
@@ -19381,12 +19271,10 @@ describe("ClaudeAdapterV2 background wake turns", () => {
             assertComplete: Effect.void,
           },
         });
-        const threadId = ThreadId.make("thread-claude-model-change-running-subagent");
+        const threadId = ThreadId.make("thread-claude-buffer-replace");
         const runtime = yield* adapter.openSession({
           threadId,
-          providerSessionId: ProviderSessionId.make(
-            "provider-session-claude-model-change-running-subagent",
-          ),
+          providerSessionId: ProviderSessionId.make("provider-session-claude-buffer-replace"),
           modelSelection: CLAUDE_TEST_MODEL_SELECTION,
           runtimePolicy: CLAUDE_TEST_RUNTIME_POLICY,
         });
@@ -19403,7 +19291,10 @@ describe("ClaudeAdapterV2 background wake turns", () => {
           ),
           Effect.forkScoped,
         );
-        const terminals = () => events.filter((event) => event.type === "turn.terminal");
+        if (runtime.hasPendingBackgroundWork === undefined) {
+          return yield* Effect.die("Claude adapter runtime must expose hasPendingBackgroundWork.");
+        }
+        const hasPendingBackgroundWork = runtime.hasPendingBackgroundWork;
         const now = yield* DateTime.now;
 
         yield* runtime.startTurn(
@@ -19411,107 +19302,90 @@ describe("ClaudeAdapterV2 background wake turns", () => {
             threadId,
             providerThread,
             now,
-            attemptId: RunAttemptId.make("attempt-claude-model-change-running-subagent-a"),
-            text: "Spawn a background subagent and stop.",
+            attemptId: RunAttemptId.make("attempt-claude-buffer-replace-a"),
+            text: "Run the build in the background.",
             attachments: [],
           }),
         );
+        assert.equal(processQueues.length, 1);
         const firstProcess = processQueues[0]!;
-        yield* Queue.offer(
-          firstProcess,
-          claudeSdkFrame({
-            type: "system",
-            subtype: "task_started",
-            task_id: SUBAGENT_TASK_ID,
-            tool_use_id: SUBAGENT_TOOL_USE_ID,
-            description: "Background research",
-            subagent_type: "general-purpose",
-            task_type: "local_agent",
-            prompt: "Research, then report.",
-            uuid: "00000000-0000-4000-8000-000000000901",
-            session_id: WAKE_NATIVE_SESSION,
-          }),
-        );
-        yield* Queue.offer(
-          firstProcess,
-          makeResultFrame({
-            uuid: "00000000-0000-4000-8000-000000000902",
-            result: "Spawned the subagent in the background.",
-          }),
-        );
-        yield* changes.until(() => terminals().length === 1);
-        const settledTurn = terminals()[0]!;
+        yield* Queue.offer(firstProcess, wakeTaskStarted);
+        yield* Queue.offer(firstProcess, turnOneResult);
+        yield* changes.until(() => events.some((event) => event.type === "turn.terminal"));
+        assert.isTrue(yield* hasPendingBackgroundWork);
 
-        assert.isFalse(yield* runtime.hasPendingBackgroundWorkForThread!(providerThread));
-        assert.isTrue(
-          yield* runtime.hasPendingBackgroundWorkForThread!(providerThread, {
-            includeSubagents: true,
-          }),
-        );
-        assert.isFalse(
-          yield* runtime.hasPendingBackgroundWorkForThread!(
-            {
-              ...providerThread,
-              nativeThreadRef: {
-                ...providerThread.nativeThreadRef!,
-                nativeId: "sibling-native-session",
-              },
-            },
-            { includeSubagents: true },
-          ),
-        );
+        yield* Queue.offer(firstProcess, wakeNotification);
+        yield* yieldTicks(50);
+        assert.lengthOf(continuationRequests, 0);
 
         const alternateModel = CLAUDE_TEST_RESTART_MODEL_SELECTION;
-        const switchTurn = (attempt: string) =>
-          runtime.startTurn(
-            makeClaudeTestTurnInput({
-              threadId,
-              providerThread: { ...providerThread, status: "active" },
-              now,
-              attemptId: RunAttemptId.make(attempt),
-              text: "Switch model while the subagent runs.",
-              attachments: [],
-              providerTurnOrdinal: 2,
-              modelSelection: alternateModel,
-            }),
-          );
-        const refused = yield* switchTurn("attempt-claude-model-change-running-subagent-b").pipe(
-          Effect.flip,
-        );
-        assert.equal(
-          makeProviderFailure({ cause: refused, class: "provider_error" }).message,
-          new ClaudeAdapterV2.ClaudeBackgroundWorkBlocksQueryReplacementError().message,
+        yield* runtime.startTurn(
+          makeClaudeTestTurnInput({
+            threadId,
+            providerThread: { ...providerThread, status: "active" },
+            now,
+            attemptId: RunAttemptId.make("attempt-claude-buffer-replace-user"),
+            text: "Switch model while background work completes.",
+            attachments: [],
+            providerTurnOrdinal: 2,
+            modelSelection: alternateModel,
+          }),
         );
-        assert.lengthOf(processQueues, 1);
-
-        yield* runtime.interruptTurn({
-          providerThread,
-          providerTurnId: settledTurn.providerTurnId,
-          requestRuntimeRestart: true,
-        });
-        yield* switchTurn("attempt-claude-model-change-running-subagent-c");
-        assert.lengthOf(processQueues, 2);
-
+        assert.equal(processQueues.length, 2);
+        const secondProcess = processQueues[1]!;
         yield* Queue.offer(
-          processQueues[1]!,
+          secondProcess,
           makeResultFrame({
-            uuid: "00000000-0000-4000-8000-000000000903",
-            result: "Switched model.",
+            uuid: "00000000-0000-4000-8000-000000000701",
+            result: "User turn finished after model switch.",
           }),
         );
-        yield* changes.until(() => terminals().length === 2);
+        yield* changes.until(
+          () => events.filter((event) => event.type === "turn.terminal").length === 2,
+        );
+        assert.isFalse(yield* hasPendingBackgroundWork);
+        assert.lengthOf(continuationRequests, 0);
+
+        yield* Queue.offer(secondProcess, wakeResult);
+        yield* changes.until(() => continuationRequests.length === 1);
+        assert.equal(continuationRequests[0]?.detail, WAKE_SUMMARY);
         yield* runtime.startTurn(
           makeClaudeTestTurnInput({
             threadId,
             providerThread: { ...providerThread, status: "active" },
             now,
-            attemptId: RunAttemptId.make("attempt-claude-model-change-running-subagent-d"),
-            text: "Switch back.",
+            attemptId: RunAttemptId.make("attempt-claude-buffer-replace-cont"),
+            text: "Background task completed.",
             attachments: [],
             providerTurnOrdinal: 3,
+            modelSelection: alternateModel,
+            messageCreatedBy: "agent",
+            messageCreationSource: "provider",
           }),
         );
-        assert.lengthOf(processQueues, 3);
+        yield* changes.until(
+          () => events.filter((event) => event.type === "turn.terminal").length === 3,
+        );
+        assert.isTrue(
+          events.some(
+            (event) => event.type === "message.updated" && event.message.text === WAKE_RESULT_TEXT,
+          ),
+        );
+        assert.isFalse(
+          events.some(
+            (event) =>
+              event.type === "subagent.updated" ||
+              (event.type === "node.updated" && event.node.kind === "subagent"),
+          ),
+        );
+        assert.isFalse(
+          events.some(
+            (event) =>
+              event.type !== "provider_thread.updated" &&
+              JSON.stringify(event).includes(WAKE_TASK_ID),
+          ),
+        );
+        assert.isFalse(yield* hasPendingBackgroundWork);
       }).pipe(
         Effect.provide(
           Layer.mergeAll(
@@ -19522,303 +19396,352 @@ describe("ClaudeAdapterV2 background wake turns", () => {
           ),
         ),
       ),
+  );
+
+  it.effect("refuses a thinking change that would kill a running background subagent", () =>
+    Effect.gen(function* () {
+      const changes = yield* makeChangeSignal;
+      const SUBAGENT_TASK_ID = "task-model-change-running-subagent";
+      const SUBAGENT_TOOL_USE_ID = "toolu-model-change-running-subagent";
+      const fileSystem = yield* FileSystem.FileSystem;
+      const idAllocator = yield* IdAllocator.IdAllocatorV2;
+      const attachmentsDir = yield* fileSystem.makeTempDirectoryScoped({
+        prefix: "t3-claude-v2-model-change-running-subagent-",
+      });
+      const processQueues: Array<Queue.Queue<SDKMessage>> = [];
+      const events: Array<ProviderAdapter.ProviderAdapterV2Event> = [];
+      const adapter = yield* ClaudeAdapterV2.makeClaudeAdapterV2({
+        instanceId: ClaudeAdapterV2.CLAUDE_DEFAULT_INSTANCE_ID,
+        settings: DEFAULT_CLAUDE_SETTINGS,
+        environment: {},
+        attachmentsDir,
+        fileSystem,
+        path: yield* Path.Path,
+        random: yield* SecureRandom.SecureRandom,
+        idAllocator,
+        continuationRequests: { offer: () => Effect.void },
+        queryRunner: {
+          allocateSessionId: Effect.succeed(WAKE_NATIVE_SESSION),
+          open: () =>
+            Effect.gen(function* () {
+              const sdkMessages = yield* Queue.unbounded<SDKMessage>();
+              processQueues.push(sdkMessages);
+              return {
+                messages: Stream.fromQueue(sdkMessages),
+                offer: () => Effect.void,
+                setModel: () => Effect.void,
+                applyFlagSettings: () => Effect.void,
+                setPermissionMode: () => Effect.void,
+                backgroundTasks: () => Effect.succeed(false),
+                mcpServerStatus: Effect.succeed([]),
+                readMcpResource: () => Effect.die("unexpected MCP resource read"),
+                callMcpTool: () => Effect.die("unexpected MCP tool call"),
+                listPermissionRules: Effect.die("unexpected permission rules read"),
+                stopTask: () => Effect.void,
+                interrupt: Effect.void,
+                close: Queue.shutdown(sdkMessages),
+              };
+            }),
+          forkSession: () => Effect.die("unused forkSession"),
+          subagentLaunchToolUseId: () => Effect.succeed(null),
+          subagentModel: () => Effect.succeed(null),
+          assertComplete: Effect.void,
+        },
+      });
+      const threadId = ThreadId.make("thread-claude-model-change-running-subagent");
+      const runtime = yield* adapter.openSession({
+        threadId,
+        providerSessionId: ProviderSessionId.make(
+          "provider-session-claude-model-change-running-subagent",
+        ),
+        modelSelection: CLAUDE_TEST_MODEL_SELECTION,
+        runtimePolicy: CLAUDE_TEST_RUNTIME_POLICY,
+      });
+      const providerThread = yield* runtime.ensureThread({
+        threadId,
+        modelSelection: CLAUDE_TEST_MODEL_SELECTION,
+        runtimePolicy: CLAUDE_TEST_RUNTIME_POLICY,
+      });
+      yield* runtime.events.pipe(
+        Stream.runForEach((event) =>
+          Effect.sync(() => {
+            events.push(event);
+          }).pipe(Effect.andThen(changes.notify)),
+        ),
+        Effect.forkScoped,
+      );
+      const terminals = () => events.filter((event) => event.type === "turn.terminal");
+      const now = yield* DateTime.now;
+
+      yield* runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId,
+          providerThread,
+          now,
+          attemptId: RunAttemptId.make("attempt-claude-model-change-running-subagent-a"),
+          text: "Spawn a background subagent and stop.",
+          attachments: [],
+        }),
+      );
+      const firstProcess = processQueues[0]!;
+      yield* Queue.offer(
+        firstProcess,
+        claudeSdkFrame({
+          type: "system",
+          subtype: "task_started",
+          task_id: SUBAGENT_TASK_ID,
+          tool_use_id: SUBAGENT_TOOL_USE_ID,
+          description: "Background research",
+          subagent_type: "general-purpose",
+          task_type: "local_agent",
+          prompt: "Research, then report.",
+          uuid: "00000000-0000-4000-8000-000000000901",
+          session_id: WAKE_NATIVE_SESSION,
+        }),
+      );
+      yield* Queue.offer(
+        firstProcess,
+        makeResultFrame({
+          uuid: "00000000-0000-4000-8000-000000000902",
+          result: "Spawned the subagent in the background.",
+        }),
+      );
+      yield* changes.until(() => terminals().length === 1);
+      const settledTurn = terminals()[0]!;
+
+      assert.isFalse(yield* runtime.hasPendingBackgroundWorkForThread!(providerThread));
+      assert.isTrue(
+        yield* runtime.hasPendingBackgroundWorkForThread!(providerThread, {
+          includeSubagents: true,
+        }),
+      );
+      assert.isFalse(
+        yield* runtime.hasPendingBackgroundWorkForThread!(
+          {
+            ...providerThread,
+            nativeThreadRef: {
+              ...providerThread.nativeThreadRef!,
+              nativeId: "sibling-native-session",
+            },
+          },
+          { includeSubagents: true },
+        ),
+      );
+
+      const alternateModel = CLAUDE_TEST_RESTART_MODEL_SELECTION;
+      const switchTurn = (attempt: string) =>
+        runtime.startTurn(
+          makeClaudeTestTurnInput({
+            threadId,
+            providerThread: { ...providerThread, status: "active" },
+            now,
+            attemptId: RunAttemptId.make(attempt),
+            text: "Switch model while the subagent runs.",
+            attachments: [],
+            providerTurnOrdinal: 2,
+            modelSelection: alternateModel,
+          }),
+        );
+      const refused = yield* switchTurn("attempt-claude-model-change-running-subagent-b").pipe(
+        Effect.flip,
+      );
+      assert.equal(
+        makeProviderFailure({ cause: refused, class: "provider_error" }).message,
+        new ClaudeAdapterV2.ClaudeBackgroundWorkBlocksQueryReplacementError().message,
+      );
+      assert.lengthOf(processQueues, 1);
+
+      yield* runtime.interruptTurn({
+        providerThread,
+        providerTurnId: settledTurn.providerTurnId,
+        requestRuntimeRestart: true,
+      });
+      yield* switchTurn("attempt-claude-model-change-running-subagent-c");
+      assert.lengthOf(processQueues, 2);
+
+      yield* Queue.offer(
+        processQueues[1]!,
+        makeResultFrame({
+          uuid: "00000000-0000-4000-8000-000000000903",
+          result: "Switched model.",
+        }),
+      );
+      yield* changes.until(() => terminals().length === 2);
+      yield* runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId,
+          providerThread: { ...providerThread, status: "active" },
+          now,
+          attemptId: RunAttemptId.make("attempt-claude-model-change-running-subagent-d"),
+          text: "Switch back.",
+          attachments: [],
+          providerTurnOrdinal: 3,
+        }),
+      );
+      assert.lengthOf(processQueues, 3);
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
+        ),
+      ),
     ),
   );
 
   // regression: #20413 an unreadable append file must not tear down the running process
   it.effect("keeps the live process when its replacement cannot read the append file", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const fileSystem = yield* FileSystem.FileSystem;
-        const cwd = yield* fileSystem.makeTempDirectoryScoped({
-          prefix: "t3-claude-append-replacement-",
-        });
-        const appendFile = NodePath.join(cwd, "rules.md");
-        yield* fileSystem.writeFileString(appendFile, "File sentinel\n");
-        const processQueues: Array<Queue.Queue<SDKMessage>> = [];
-        let closes = 0;
-        const firstTurnTerminal = yield* Deferred.make<void>();
-        const adapter = yield* ClaudeAdapterV2.makeClaudeAdapterV2({
-          instanceId: ClaudeAdapterV2.CLAUDE_DEFAULT_INSTANCE_ID,
-          settings: {
-            ...DEFAULT_CLAUDE_SETTINGS,
-            launchArgs: "--append-system-prompt-file rules.md",
-          },
-          environment: {},
-          attachmentsDir: yield* fileSystem.makeTempDirectoryScoped({
-            prefix: "t3-claude-append-replacement-attachments-",
-          }),
-          fileSystem,
-          path: yield* Path.Path,
-          random: yield* SecureRandom.SecureRandom,
-          idAllocator: yield* IdAllocator.IdAllocatorV2,
-          continuationRequests: { offer: () => Effect.void },
-          queryRunner: {
-            allocateSessionId: Effect.succeed(WAKE_NATIVE_SESSION),
-            open: () =>
-              Effect.gen(function* () {
-                const sdkMessages = yield* Queue.unbounded<SDKMessage>();
-                processQueues.push(sdkMessages);
-                return {
-                  messages: Stream.fromQueue(sdkMessages),
-                  offer: () => Effect.void,
-                  setModel: () => Effect.void,
-                  applyFlagSettings: () => Effect.void,
-                  setPermissionMode: () => Effect.void,
-                  backgroundTasks: () => Effect.succeed(false),
-                  mcpServerStatus: Effect.succeed([]),
-                  readMcpResource: () => Effect.die("unexpected MCP resource read"),
-                  callMcpTool: () => Effect.die("unexpected MCP tool call"),
-                  listPermissionRules: Effect.die("unexpected permission rules read"),
-                  stopTask: () => Effect.void,
-                  interrupt: Effect.void,
-                  close: Effect.sync(() => {
-                    closes += 1;
-                  }).pipe(Effect.andThen(Queue.shutdown(sdkMessages))),
-                };
-              }),
-            forkSession: () => Effect.die("unused forkSession"),
-            subagentLaunchToolUseId: () => Effect.succeed(null),
-            subagentModel: () => Effect.succeed(null),
-            assertComplete: Effect.void,
-          },
-        });
-        const runtimePolicy = ProviderAdapter.ProviderAdapterV2RuntimePolicy.make({
-          runtimeMode: "full-access",
-          interactionMode: "default",
-          cwd,
-        });
-        const threadId = ThreadId.make("thread-claude-append-replacement");
-        const runtime = yield* adapter.openSession({
-          threadId,
-          providerSessionId: ProviderSessionId.make("provider-session-claude-append-replacement"),
-          modelSelection: CLAUDE_TEST_MODEL_SELECTION,
-          runtimePolicy,
-        });
-        const providerThread = yield* runtime.ensureThread({
+    Effect.gen(function* () {
+      const fileSystem = yield* FileSystem.FileSystem;
+      const cwd = yield* fileSystem.makeTempDirectoryScoped({
+        prefix: "t3-claude-append-replacement-",
+      });
+      const appendFile = NodePath.join(cwd, "rules.md");
+      yield* fileSystem.writeFileString(appendFile, "File sentinel\n");
+      const processQueues: Array<Queue.Queue<SDKMessage>> = [];
+      let closes = 0;
+      const firstTurnTerminal = yield* Deferred.make<void>();
+      const adapter = yield* ClaudeAdapterV2.makeClaudeAdapterV2({
+        instanceId: ClaudeAdapterV2.CLAUDE_DEFAULT_INSTANCE_ID,
+        settings: {
+          ...DEFAULT_CLAUDE_SETTINGS,
+          launchArgs: "--append-system-prompt-file rules.md",
+        },
+        environment: {},
+        attachmentsDir: yield* fileSystem.makeTempDirectoryScoped({
+          prefix: "t3-claude-append-replacement-attachments-",
+        }),
+        fileSystem,
+        path: yield* Path.Path,
+        random: yield* SecureRandom.SecureRandom,
+        idAllocator: yield* IdAllocator.IdAllocatorV2,
+        continuationRequests: { offer: () => Effect.void },
+        queryRunner: {
+          allocateSessionId: Effect.succeed(WAKE_NATIVE_SESSION),
+          open: () =>
+            Effect.gen(function* () {
+              const sdkMessages = yield* Queue.unbounded<SDKMessage>();
+              processQueues.push(sdkMessages);
+              return {
+                messages: Stream.fromQueue(sdkMessages),
+                offer: () => Effect.void,
+                setModel: () => Effect.void,
+                applyFlagSettings: () => Effect.void,
+                setPermissionMode: () => Effect.void,
+                backgroundTasks: () => Effect.succeed(false),
+                mcpServerStatus: Effect.succeed([]),
+                readMcpResource: () => Effect.die("unexpected MCP resource read"),
+                callMcpTool: () => Effect.die("unexpected MCP tool call"),
+                listPermissionRules: Effect.die("unexpected permission rules read"),
+                stopTask: () => Effect.void,
+                interrupt: Effect.void,
+                close: Effect.sync(() => {
+                  closes += 1;
+                }).pipe(Effect.andThen(Queue.shutdown(sdkMessages))),
+              };
+            }),
+          forkSession: () => Effect.die("unused forkSession"),
+          subagentLaunchToolUseId: () => Effect.succeed(null),
+          subagentModel: () => Effect.succeed(null),
+          assertComplete: Effect.void,
+        },
+      });
+      const runtimePolicy = ProviderAdapter.ProviderAdapterV2RuntimePolicy.make({
+        runtimeMode: "full-access",
+        interactionMode: "default",
+        cwd,
+      });
+      const threadId = ThreadId.make("thread-claude-append-replacement");
+      const runtime = yield* adapter.openSession({
+        threadId,
+        providerSessionId: ProviderSessionId.make("provider-session-claude-append-replacement"),
+        modelSelection: CLAUDE_TEST_MODEL_SELECTION,
+        runtimePolicy,
+      });
+      const providerThread = yield* runtime.ensureThread({
+        threadId,
+        modelSelection: CLAUDE_TEST_MODEL_SELECTION,
+        runtimePolicy,
+      });
+      yield* runtime.events.pipe(
+        Stream.runForEach((event) =>
+          event.type === "turn.terminal"
+            ? Deferred.succeed(firstTurnTerminal, undefined)
+            : Effect.void,
+        ),
+        Effect.forkScoped,
+      );
+      const now = yield* DateTime.now;
+
+      yield* runtime.startTurn(
+        makeClaudeTestTurnInput({
           threadId,
-          modelSelection: CLAUDE_TEST_MODEL_SELECTION,
+          providerThread,
+          now,
+          attemptId: RunAttemptId.make("attempt-claude-append-replacement-a"),
+          text: "What is the sentinel?",
+          attachments: [],
           runtimePolicy,
-        });
-        yield* runtime.events.pipe(
-          Stream.runForEach((event) =>
-            event.type === "turn.terminal"
-              ? Deferred.succeed(firstTurnTerminal, undefined)
-              : Effect.void,
-          ),
-          Effect.forkScoped,
-        );
-        const now = yield* DateTime.now;
+        }),
+      );
+      yield* Queue.offer(
+        processQueues[0]!,
+        makeResultFrame({
+          uuid: "00000000-0000-4000-8000-000000000a01",
+          result: "File sentinel",
+        }),
+      );
+      yield* Deferred.await(firstTurnTerminal);
 
-        yield* runtime.startTurn(
+      yield* fileSystem.remove(appendFile);
+      // A thinking change cannot apply live, so this turn must replace the process.
+      const refused = yield* runtime
+        .startTurn(
           makeClaudeTestTurnInput({
             threadId,
-            providerThread,
+            providerThread: { ...providerThread, status: "active" },
             now,
-            attemptId: RunAttemptId.make("attempt-claude-append-replacement-a"),
-            text: "What is the sentinel?",
+            attemptId: RunAttemptId.make("attempt-claude-append-replacement-b"),
+            text: "Switch model.",
             attachments: [],
+            providerTurnOrdinal: 2,
+            modelSelection: CLAUDE_TEST_RESTART_MODEL_SELECTION,
             runtimePolicy,
           }),
-        );
-        yield* Queue.offer(
-          processQueues[0]!,
-          makeResultFrame({
-            uuid: "00000000-0000-4000-8000-000000000a01",
-            result: "File sentinel",
-          }),
-        );
-        yield* Deferred.await(firstTurnTerminal);
-
-        yield* fileSystem.remove(appendFile);
-        // A thinking change cannot apply live, so this turn must replace the process.
-        const refused = yield* runtime
-          .startTurn(
-            makeClaudeTestTurnInput({
-              threadId,
-              providerThread: { ...providerThread, status: "active" },
-              now,
-              attemptId: RunAttemptId.make("attempt-claude-append-replacement-b"),
-              text: "Switch model.",
-              attachments: [],
-              providerTurnOrdinal: 2,
-              modelSelection: CLAUDE_TEST_RESTART_MODEL_SELECTION,
-              runtimePolicy,
-            }),
-          )
-          .pipe(Effect.flip);
-        assert.equal(
-          makeProviderFailure({ cause: refused, class: "provider_error" }).message,
-          new ClaudeAdapterV2.ClaudeAppendSystemPromptFileError({ path: appendFile }).message,
-        );
-        assert.lengthOf(processQueues, 1);
-        assert.equal(closes, 0);
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
-          ),
+        )
+        .pipe(Effect.flip);
+      assert.equal(
+        makeProviderFailure({ cause: refused, class: "provider_error" }).message,
+        new ClaudeAdapterV2.ClaudeAppendSystemPromptFileError({ path: appendFile }).message,
+      );
+      assert.lengthOf(processQueues, 1);
+      assert.equal(closes, 0);
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
         ),
       ),
     ),
-  );
-
-  it.effect(
-    "keeps the process and its roster when a model change meets a running background shell",
-    () =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const changes = yield* makeChangeSignal;
-          const fileSystem = yield* FileSystem.FileSystem;
-          const idAllocator = yield* IdAllocator.IdAllocatorV2;
-          const attachmentsDir = yield* fileSystem.makeTempDirectoryScoped({
-            prefix: "t3-claude-v2-replace-open-fail-",
-          });
-          let openCount = 0;
-          const processQueues: Array<Queue.Queue<SDKMessage>> = [];
-          const events: Array<ProviderAdapter.ProviderAdapterV2Event> = [];
-          const adapter = yield* ClaudeAdapterV2.makeClaudeAdapterV2({
-            instanceId: ClaudeAdapterV2.CLAUDE_DEFAULT_INSTANCE_ID,
-            settings: DEFAULT_CLAUDE_SETTINGS,
-            environment: {},
-            attachmentsDir,
-            fileSystem,
-            path: yield* Path.Path,
-            random: yield* SecureRandom.SecureRandom,
-            idAllocator,
-            continuationRequests: {
-              offer: () => Effect.void,
-            },
-            queryRunner: {
-              allocateSessionId: Effect.succeed(WAKE_NATIVE_SESSION),
-              open: () => {
-                openCount += 1;
-                if (openCount === 2) {
-                  return Effect.fail(
-                    new ClaudeAdapterV2.ClaudeAgentSdkQueryRunnerError({
-                      method: "open",
-                      cause: "forced replacement open failure",
-                    }),
-                  );
-                }
-                return Effect.gen(function* () {
-                  const sdkMessages = yield* Queue.unbounded<SDKMessage>();
-                  processQueues.push(sdkMessages);
-                  return {
-                    messages: Stream.fromQueue(sdkMessages),
-                    offer: () => Effect.void,
-                    setModel: () => Effect.void,
-                    applyFlagSettings: () => Effect.void,
-                    setPermissionMode: () => Effect.void,
-                    backgroundTasks: () => Effect.succeed(false),
-                    mcpServerStatus: Effect.succeed([]),
-                    readMcpResource: () => Effect.die("unexpected MCP resource read"),
-                    callMcpTool: () => Effect.die("unexpected MCP tool call"),
-                    listPermissionRules: Effect.die("unexpected permission rules read"),
-                    stopTask: () => Effect.void,
-                    interrupt: Effect.void,
-                    close: Queue.shutdown(sdkMessages),
-                  };
-                });
-              },
-              forkSession: () => Effect.die("unused forkSession"),
-              subagentLaunchToolUseId: () => Effect.succeed(null),
-              subagentModel: () => Effect.succeed(null),
-              assertComplete: Effect.void,
-            },
-          });
-          const threadId = ThreadId.make("thread-claude-replace-open-fail");
-          const runtime = yield* adapter.openSession({
-            threadId,
-            providerSessionId: ProviderSessionId.make("provider-session-claude-replace-open-fail"),
-            modelSelection: CLAUDE_TEST_MODEL_SELECTION,
-            runtimePolicy: CLAUDE_TEST_RUNTIME_POLICY,
-          });
-          const providerThread = yield* runtime.ensureThread({
-            threadId,
-            modelSelection: CLAUDE_TEST_MODEL_SELECTION,
-            runtimePolicy: CLAUDE_TEST_RUNTIME_POLICY,
-          });
-          yield* runtime.events.pipe(
-            Stream.runForEach((event) =>
-              Effect.sync(() => {
-                events.push(event);
-              }).pipe(Effect.andThen(changes.notify)),
-            ),
-            Effect.forkScoped,
-          );
-          if (runtime.hasPendingBackgroundWork === undefined) {
-            return yield* Effect.die(
-              "Claude adapter runtime must expose hasPendingBackgroundWork.",
-            );
-          }
-          const hasPendingBackgroundWork = runtime.hasPendingBackgroundWork;
-          const now = yield* DateTime.now;
-
-          yield* runtime.startTurn(
-            makeClaudeTestTurnInput({
-              threadId,
-              providerThread,
-              now,
-              attemptId: RunAttemptId.make("attempt-claude-replace-open-fail-a"),
-              text: "Run the build in the background.",
-              attachments: [],
-            }),
-          );
-          assert.equal(processQueues.length, 1);
-          yield* Queue.offer(processQueues[0]!, wakeTaskStarted);
-          yield* Queue.offer(processQueues[0]!, turnOneResult);
-          yield* changes.until(() => events.some((event) => event.type === "turn.terminal"));
-          assert.isTrue(yield* hasPendingBackgroundWork);
-
-          const alternateModel = CLAUDE_TEST_RESTART_MODEL_SELECTION;
-          const failedStart = yield* runtime
-            .startTurn(
-              makeClaudeTestTurnInput({
-                threadId,
-                providerThread: { ...providerThread, status: "active" },
-                now,
-                attemptId: RunAttemptId.make("attempt-claude-replace-open-fail-b"),
-                text: "Replace process but fail open.",
-                attachments: [],
-                providerTurnOrdinal: 2,
-                modelSelection: alternateModel,
-              }),
-            )
-            .pipe(Effect.exit);
-          assert.isTrue(Exit.isFailure(failedStart));
-          assert.equal(openCount, 1);
-          assert.isTrue(yield* hasPendingBackgroundWork);
-        }).pipe(
-          Effect.provide(
-            Layer.mergeAll(
-              IdAllocator.layer,
-              McpProviderSessions.layer,
-              NodeServices.layer,
-              NodeCrypto.layer,
-            ),
-          ),
-        ),
-      ),
-  );
-
-  // regression: #26082 a killed Claude process names its signal on the failed turn
-  it.effect("names the signal that killed the Claude process on the failed turn", () =>
-    Effect.scoped(
+  );
+
+  it.effect(
+    "keeps the process and its roster when a model change meets a running background shell",
+    () =>
       Effect.gen(function* () {
         const changes = yield* makeChangeSignal;
         const fileSystem = yield* FileSystem.FileSystem;
         const idAllocator = yield* IdAllocator.IdAllocatorV2;
         const attachmentsDir = yield* fileSystem.makeTempDirectoryScoped({
-          prefix: "t3-claude-v2-process-signal-",
+          prefix: "t3-claude-v2-replace-open-fail-",
         });
-        const sdkMessages = yield* Queue.unbounded<
-          SDKMessage,
-          ClaudeAdapterV2.ClaudeAgentSdkQueryRunnerError
-        >();
+        let openCount = 0;
+        const processQueues: Array<Queue.Queue<SDKMessage>> = [];
         const events: Array<ProviderAdapter.ProviderAdapterV2Event> = [];
         const adapter = yield* ClaudeAdapterV2.makeClaudeAdapterV2({
           instanceId: ClaudeAdapterV2.CLAUDE_DEFAULT_INSTANCE_ID,
@@ -19829,34 +19752,51 @@ describe("ClaudeAdapterV2 background wake turns", () => {
           path: yield* Path.Path,
           random: yield* SecureRandom.SecureRandom,
           idAllocator,
+          continuationRequests: {
+            offer: () => Effect.void,
+          },
           queryRunner: {
             allocateSessionId: Effect.succeed(WAKE_NATIVE_SESSION),
-            open: () =>
-              Effect.succeed({
-                messages: Stream.fromQueue(sdkMessages),
-                offer: () => Effect.void,
-                setModel: () => Effect.void,
-                applyFlagSettings: () => Effect.void,
-                setPermissionMode: () => Effect.void,
-                backgroundTasks: () => Effect.succeed(false),
-                mcpServerStatus: Effect.succeed([]),
-                readMcpResource: () => Effect.die("unexpected MCP resource read"),
-                callMcpTool: () => Effect.die("unexpected MCP tool call"),
-                listPermissionRules: Effect.die("unexpected permission rules read"),
-                stopTask: () => Effect.void,
-                interrupt: Effect.void,
-                close: Queue.shutdown(sdkMessages),
-              }),
+            open: () => {
+              openCount += 1;
+              if (openCount === 2) {
+                return Effect.fail(
+                  new ClaudeAdapterV2.ClaudeAgentSdkQueryRunnerError({
+                    method: "open",
+                    cause: "forced replacement open failure",
+                  }),
+                );
+              }
+              return Effect.gen(function* () {
+                const sdkMessages = yield* Queue.unbounded<SDKMessage>();
+                processQueues.push(sdkMessages);
+                return {
+                  messages: Stream.fromQueue(sdkMessages),
+                  offer: () => Effect.void,
+                  setModel: () => Effect.void,
+                  applyFlagSettings: () => Effect.void,
+                  setPermissionMode: () => Effect.void,
+                  backgroundTasks: () => Effect.succeed(false),
+                  mcpServerStatus: Effect.succeed([]),
+                  readMcpResource: () => Effect.die("unexpected MCP resource read"),
+                  callMcpTool: () => Effect.die("unexpected MCP tool call"),
+                  listPermissionRules: Effect.die("unexpected permission rules read"),
+                  stopTask: () => Effect.void,
+                  interrupt: Effect.void,
+                  close: Queue.shutdown(sdkMessages),
+                };
+              });
+            },
             forkSession: () => Effect.die("unused forkSession"),
             subagentLaunchToolUseId: () => Effect.succeed(null),
             subagentModel: () => Effect.succeed(null),
             assertComplete: Effect.void,
           },
         });
-        const threadId = ThreadId.make("thread-claude-process-signal");
+        const threadId = ThreadId.make("thread-claude-replace-open-fail");
         const runtime = yield* adapter.openSession({
           threadId,
-          providerSessionId: ProviderSessionId.make("provider-session-claude-process-signal"),
+          providerSessionId: ProviderSessionId.make("provider-session-claude-replace-open-fail"),
           modelSelection: CLAUDE_TEST_MODEL_SELECTION,
           runtimePolicy: CLAUDE_TEST_RUNTIME_POLICY,
         });
@@ -19873,52 +19813,46 @@ describe("ClaudeAdapterV2 background wake turns", () => {
           ),
           Effect.forkScoped,
         );
+        if (runtime.hasPendingBackgroundWork === undefined) {
+          return yield* Effect.die("Claude adapter runtime must expose hasPendingBackgroundWork.");
+        }
+        const hasPendingBackgroundWork = runtime.hasPendingBackgroundWork;
+        const now = yield* DateTime.now;
+
         yield* runtime.startTurn(
           makeClaudeTestTurnInput({
             threadId,
             providerThread,
-            now: yield* DateTime.now,
-            attemptId: RunAttemptId.make("attempt-claude-process-signal"),
-            text: "Write a long reply.",
+            now,
+            attemptId: RunAttemptId.make("attempt-claude-replace-open-fail-a"),
+            text: "Run the build in the background.",
             attachments: [],
           }),
         );
-        yield* Queue.offer(
-          sdkMessages,
-          makeAssistantTextFrame({
-            uuid: "00000000-0000-4000-8000-000000026082",
-            text: "Here is the first part",
-          }),
-        );
-        // Mirrors ProcessTransport.getProcessExitError in @anthropic-ai/claude-agent-sdk.
-        const processExit = Object.assign(
-          new Error(
-            "Claude Code process terminated by signal SIGABRT. stderr: fork failed: Resource temporarily unavailable",
-          ),
-          {
-            telemetryMessage: "Claude Code process terminated by signal SIGABRT",
-            errorClass: "process_killed_by_signal",
-            signal: "SIGABRT",
-          },
-        );
-        yield* Queue.fail(
-          sdkMessages,
-          new ClaudeAdapterV2.ClaudeAgentSdkQueryRunnerError({
-            method: "messages",
-            cause: processExit,
-          }),
-        );
-
+        assert.equal(processQueues.length, 1);
+        yield* Queue.offer(processQueues[0]!, wakeTaskStarted);
+        yield* Queue.offer(processQueues[0]!, turnOneResult);
         yield* changes.until(() => events.some((event) => event.type === "turn.terminal"));
-        const terminal = events.find((event) => event.type === "turn.terminal");
-        assert.equal(terminal?.status, "failed");
-        if (terminal?.status !== "failed") return;
-        assert.include(
-          terminal.failure.message,
-          "Claude Code process terminated by signal SIGABRT",
-        );
-        assert.notInclude(terminal.failure.message, "stderr");
-        assert.equal(terminal.failure.code, "process_killed_by_signal");
+        assert.isTrue(yield* hasPendingBackgroundWork);
+
+        const alternateModel = CLAUDE_TEST_RESTART_MODEL_SELECTION;
+        const failedStart = yield* runtime
+          .startTurn(
+            makeClaudeTestTurnInput({
+              threadId,
+              providerThread: { ...providerThread, status: "active" },
+              now,
+              attemptId: RunAttemptId.make("attempt-claude-replace-open-fail-b"),
+              text: "Replace process but fail open.",
+              attachments: [],
+              providerTurnOrdinal: 2,
+              modelSelection: alternateModel,
+            }),
+          )
+          .pipe(Effect.exit);
+        assert.isTrue(Exit.isFailure(failedStart));
+        assert.equal(openCount, 1);
+        assert.isTrue(yield* hasPendingBackgroundWork);
       }).pipe(
         Effect.provide(
           Layer.mergeAll(
@@ -19929,6 +19863,127 @@ describe("ClaudeAdapterV2 background wake turns", () => {
           ),
         ),
       ),
+  );
+
+  // regression: #26082 a killed Claude process names its signal on the failed turn
+  it.effect("names the signal that killed the Claude process on the failed turn", () =>
+    Effect.gen(function* () {
+      const changes = yield* makeChangeSignal;
+      const fileSystem = yield* FileSystem.FileSystem;
+      const idAllocator = yield* IdAllocator.IdAllocatorV2;
+      const attachmentsDir = yield* fileSystem.makeTempDirectoryScoped({
+        prefix: "t3-claude-v2-process-signal-",
+      });
+      const sdkMessages = yield* Queue.unbounded<
+        SDKMessage,
+        ClaudeAdapterV2.ClaudeAgentSdkQueryRunnerError
+      >();
+      const events: Array<ProviderAdapter.ProviderAdapterV2Event> = [];
+      const adapter = yield* ClaudeAdapterV2.makeClaudeAdapterV2({
+        instanceId: ClaudeAdapterV2.CLAUDE_DEFAULT_INSTANCE_ID,
+        settings: DEFAULT_CLAUDE_SETTINGS,
+        environment: {},
+        attachmentsDir,
+        fileSystem,
+        path: yield* Path.Path,
+        random: yield* SecureRandom.SecureRandom,
+        idAllocator,
+        queryRunner: {
+          allocateSessionId: Effect.succeed(WAKE_NATIVE_SESSION),
+          open: () =>
+            Effect.succeed({
+              messages: Stream.fromQueue(sdkMessages),
+              offer: () => Effect.void,
+              setModel: () => Effect.void,
+              applyFlagSettings: () => Effect.void,
+              setPermissionMode: () => Effect.void,
+              backgroundTasks: () => Effect.succeed(false),
+              mcpServerStatus: Effect.succeed([]),
+              readMcpResource: () => Effect.die("unexpected MCP resource read"),
+              callMcpTool: () => Effect.die("unexpected MCP tool call"),
+              listPermissionRules: Effect.die("unexpected permission rules read"),
+              stopTask: () => Effect.void,
+              interrupt: Effect.void,
+              close: Queue.shutdown(sdkMessages),
+            }),
+          forkSession: () => Effect.die("unused forkSession"),
+          subagentLaunchToolUseId: () => Effect.succeed(null),
+          subagentModel: () => Effect.succeed(null),
+          assertComplete: Effect.void,
+        },
+      });
+      const threadId = ThreadId.make("thread-claude-process-signal");
+      const runtime = yield* adapter.openSession({
+        threadId,
+        providerSessionId: ProviderSessionId.make("provider-session-claude-process-signal"),
+        modelSelection: CLAUDE_TEST_MODEL_SELECTION,
+        runtimePolicy: CLAUDE_TEST_RUNTIME_POLICY,
+      });
+      const providerThread = yield* runtime.ensureThread({
+        threadId,
+        modelSelection: CLAUDE_TEST_MODEL_SELECTION,
+        runtimePolicy: CLAUDE_TEST_RUNTIME_POLICY,
+      });
+      yield* runtime.events.pipe(
+        Stream.runForEach((event) =>
+          Effect.sync(() => {
+            events.push(event);
+          }).pipe(Effect.andThen(changes.notify)),
+        ),
+        Effect.forkScoped,
+      );
+      yield* runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId,
+          providerThread,
+          now: yield* DateTime.now,
+          attemptId: RunAttemptId.make("attempt-claude-process-signal"),
+          text: "Write a long reply.",
+          attachments: [],
+        }),
+      );
+      yield* Queue.offer(
+        sdkMessages,
+        makeAssistantTextFrame({
+          uuid: "00000000-0000-4000-8000-000000026082",
+          text: "Here is the first part",
+        }),
+      );
+      // Mirrors ProcessTransport.getProcessExitError in @anthropic-ai/claude-agent-sdk.
+      const processExit = Object.assign(
+        new Error(
+          "Claude Code process terminated by signal SIGABRT. stderr: fork failed: Resource temporarily unavailable",
+        ),
+        {
+          telemetryMessage: "Claude Code process terminated by signal SIGABRT",
+          errorClass: "process_killed_by_signal",
+          signal: "SIGABRT",
+        },
+      );
+      yield* Queue.fail(
+        sdkMessages,
+        new ClaudeAdapterV2.ClaudeAgentSdkQueryRunnerError({
+          method: "messages",
+          cause: processExit,
+        }),
+      );
+
+      yield* changes.until(() => events.some((event) => event.type === "turn.terminal"));
+      const terminal = events.find((event) => event.type === "turn.terminal");
+      assert.equal(terminal?.status, "failed");
+      if (terminal?.status !== "failed") return;
+      assert.include(terminal.failure.message, "Claude Code process terminated by signal SIGABRT");
+      assert.notInclude(terminal.failure.message, "stderr");
+      assert.equal(terminal.failure.code, "process_killed_by_signal");
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
+        ),
+      ),
     ),
   );
 
@@ -20117,656 +20172,88 @@ describe("ClaudeAdapterV2 background wake turns", () => {
     yield* input.harness.offerAndWait(workflowToolUse);
     yield* input.harness.offerAndWait(workflowTaskStarted);
     yield* input.harness.offerAndWait(workflowLaunchAck(input.harness.transcriptDir));
-    yield* input.harness.offerAndWait(
-      workflowSnapshot({ uuid: input.snapshotUuid, state: input.state ?? "start" }),
-    );
-    yield* input.harness.until(() => workflowMemberEvents(input.harness.events, 2).length === 1);
-  });
-
-  it.effect.each(["Agent", "Workflow"] as const)(
-    "keeps a workflow running after its %s launch reply without an async flag",
-    (toolName) =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const harness = yield* makeWorkflowHarness;
-          yield* harness.runtime.startTurn(
-            makeClaudeTestTurnInput({
-              threadId: harness.threadId,
-              providerThread: harness.providerThread,
-              now: yield* DateTime.now,
-              attemptId: RunAttemptId.make(`attempt-workflow-launch-${toolName}`),
-              text: "Run the workflow.",
-              attachments: [],
-            }),
-          );
-          yield* harness.offerAndWait(
-            claudeSdkFrame({
-              ...workflowToolUse,
-              message: {
-                model: "claude-sonnet-4-6",
-                content: [
-                  { type: "tool_use", id: WORKFLOW_TOOL_USE_ID, name: toolName, input: {} },
-                ],
-              },
-            }),
-          );
-          yield* harness.offerAndWait(workflowTaskStarted);
-          yield* harness.offerAndWait(workflowLaunchAck(harness.transcriptDir));
-          yield* harness.offerAndWait(
-            workflowSnapshot({ uuid: "00000000-0000-4000-8000-000000001200", state: "start" }),
-          );
-          yield* Queue.offer(
-            harness.sdkMessages,
-            makeResultFrame({ uuid: "00000000-0000-4000-8000-000000001201", result: "Launched." }),
-          );
-          yield* Queue.take(harness.terminalReceipts);
-          assert.equal(
-            workflowCoordinatorEvents(harness.events).at(-1)?.subagent.status,
-            "running",
-          );
-          assert.equal(workflowMemberEvents(harness.events, 1).at(-1)?.subagent.status, "running");
-          assert.isTrue(yield* harness.hasPendingBackgroundWork);
-          const toolItems = harness.events.flatMap((event) =>
-            event.type === "turn_item.updated" &&
-            event.turnItem.type === "dynamic_tool" &&
-            event.turnItem.nativeItemRef?.nativeId === WORKFLOW_TOOL_USE_ID
-              ? [event.turnItem.status]
-              : [],
-          );
-          assert.deepEqual(toolItems, toolName === "Workflow" ? ["running", "completed"] : []);
-          yield* harness.offerAndWait(
-            workflowNotification({
-              uuid: "00000000-0000-4000-8000-000000001202",
-              status: "completed",
-            }),
-          );
-          yield* Queue.take(harness.continuationReceipts);
-          yield* harness.runtime.startTurn(
-            makeClaudeTestTurnInput({
-              threadId: harness.threadId,
-              providerThread: harness.providerThread,
-              now: yield* DateTime.now,
-              attemptId: RunAttemptId.make(`attempt-workflow-complete-${toolName}`),
-              text: "Workflow finished.",
-              attachments: [],
-              providerTurnOrdinal: 2,
-              messageCreatedBy: "agent",
-              messageCreationSource: "provider",
-            }),
-          );
-          yield* Queue.offer(
-            harness.sdkMessages,
-            makeResultFrame({ uuid: "00000000-0000-4000-8000-000000001205", result: "Finished." }),
-          );
-          yield* Queue.take(harness.terminalReceipts);
-          assert.equal(
-            workflowCoordinatorEvents(harness.events).at(-1)?.subagent.status,
-            "completed",
-          );
-          assert.equal(
-            workflowMemberEvents(harness.events, 1).at(-1)?.subagent.status,
-            "completed",
-          );
-          assert.isFalse(yield* harness.hasPendingBackgroundWork);
-        }).pipe(
-          Effect.provide(
-            Layer.mergeAll(
-              IdAllocator.layer,
-              McpProviderSessions.layer,
-              NodeServices.layer,
-              NodeCrypto.layer,
-            ),
-          ),
-        ),
-      ),
-  );
+    yield* input.harness.offerAndWait(
+      workflowSnapshot({ uuid: input.snapshotUuid, state: input.state ?? "start" }),
+    );
+    yield* input.harness.until(() => workflowMemberEvents(input.harness.events, 2).length === 1);
+  });
 
-  it.effect("marks a workflow coordinator's script prompt and leaves a subagent brief plain", () =>
-    Effect.scoped(
+  it.effect.each(["Agent", "Workflow"] as const)(
+    "keeps a workflow running after its %s launch reply without an async flag",
+    (toolName) =>
       Effect.gen(function* () {
         const harness = yield* makeWorkflowHarness;
-        const script =
-          'export const meta = { name: "probe-wf", description: "Run the alpha workflow" };';
         yield* harness.runtime.startTurn(
           makeClaudeTestTurnInput({
             threadId: harness.threadId,
             providerThread: harness.providerThread,
             now: yield* DateTime.now,
-            attemptId: RunAttemptId.make("attempt-workflow-script-prompt"),
-            text: "Run the workflow and an auditor.",
+            attemptId: RunAttemptId.make(`attempt-workflow-launch-${toolName}`),
+            text: "Run the workflow.",
             attachments: [],
           }),
         );
-        yield* harness.offerAndWait(workflowToolUse);
-        yield* harness.offerAndWait(claudeSdkFrame({ ...workflowTaskStarted, prompt: script }));
-        yield* harness.offerAndWait(workflowLaunchAck(harness.transcriptDir));
-        yield* harness.offerAndWait(
-          workflowSnapshot({ uuid: "00000000-0000-4000-8000-000000001289", state: "start" }),
-        );
         yield* harness.offerAndWait(
           claudeSdkFrame({
-            type: "system",
-            subtype: "task_started",
-            task_id: "task-plain-auditor",
-            description: "Audit recent commits",
-            task_type: "local_agent",
-            prompt: "Audit the last five commits.",
-            uuid: "00000000-0000-4000-8000-000000001290",
-            session_id: WAKE_NATIVE_SESSION,
-          }),
-        );
-        const subagentPrompt = (nativeTaskId: string) => {
-          const subagent = harness.events.flatMap((event) =>
-            event.type === "subagent.updated" &&
-            event.subagent.nativeTaskRef?.nativeId === nativeTaskId
-              ? [event.subagent]
-              : [],
-          )[0];
-          const message = threadMessages(harness.events, subagent?.childThreadId).find(
-            (event) => event.message.role === "user",
-          )?.message;
-          const turnItem = harness.events.findLast(
-            (event) =>
-              event.type === "turn_item.updated" &&
-              event.turnItem.type === "user_message" &&
-              event.turnItem.messageId === message?.id,
-          );
-          return {
-            text: message?.text,
-            messageMark: message?.workflowScript,
-            itemMark:
-              turnItem?.type === "turn_item.updated" && turnItem.turnItem.type === "user_message"
-                ? turnItem.turnItem.workflowScript
-                : undefined,
-          };
-        };
-        // The user message item lands after the subagent node, so wait on the item itself.
-        yield* harness.until(
-          () =>
-            workflowCoordinatorEvents(harness.events).length > 0 &&
-            subagentPrompt(WORKFLOW_TASK_ID).itemMark !== undefined &&
-            subagentPrompt("task-plain-auditor").itemMark !== undefined,
-        );
-        assert.deepEqual(subagentPrompt(WORKFLOW_TASK_ID), {
-          text: script,
-          messageMark: true,
-          itemMark: true,
-        });
-        assert.deepEqual(subagentPrompt("task-plain-auditor"), {
-          text: "Audit the last five commits.",
-          messageMark: false,
-          itemMark: false,
-        });
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
-          ),
-        ),
-      ),
-    ),
-  );
-
-  it.effect("stops only a live workflow task and waits for its stopped notification", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const stoppedTasks: Array<string> = [];
-        let interrupted = false;
-        let closed = false;
-        const harness = yield* makeWorkflowHarnessWithOptions({
-          stopTask: (taskId) =>
-            Effect.sync(() => {
-              stoppedTasks.push(taskId);
-            }),
-          interrupt: Effect.sync(() => {
-            interrupted = true;
-          }),
-          close: () =>
-            Effect.sync(() => {
-              closed = true;
-            }),
-        });
-        yield* harness.runtime.startTurn(
-          makeClaudeTestTurnInput({
-            threadId: harness.threadId,
-            providerThread: harness.providerThread,
-            now: yield* DateTime.now,
-            attemptId: RunAttemptId.make("attempt-workflow-stop"),
-            text: "Run the workflow.",
-            attachments: [],
+            ...workflowToolUse,
+            message: {
+              model: "claude-sonnet-4-6",
+              content: [{ type: "tool_use", id: WORKFLOW_TOOL_USE_ID, name: toolName, input: {} }],
+            },
           }),
         );
-        yield* harness.offerAndWait(workflowToolUse);
         yield* harness.offerAndWait(workflowTaskStarted);
         yield* harness.offerAndWait(workflowLaunchAck(harness.transcriptDir));
         yield* harness.offerAndWait(
-          workflowSnapshot({
-            uuid: "00000000-0000-4000-8000-000000001100",
-            state: "start",
-          }),
-        );
-        let member = yield* Queue.take(harness.subagentReceipts);
-        while (!member.subagent.nativeTaskRef?.nativeId?.endsWith(":agent:2")) {
-          member = yield* Queue.take(harness.subagentReceipts);
-        }
-        const stopTask = harness.runtime.stopTask!;
-        for (const taskId of ["missing-task", `${WORKFLOW_TASK_ID}:agent:1`]) {
-          const exit = yield* stopTask({ providerThread: harness.providerThread, taskId }).pipe(
-            Effect.exit,
-          );
-          assert.isTrue(Exit.isFailure(exit));
-        }
-        const wrongThread = {
-          ...harness.providerThread,
-          nativeThreadRef: {
-            driver: harness.providerThread.driver,
-            nativeId: "wrong-session",
-            strength: "strong" as const,
-          },
-        };
-        assert.isTrue(
-          Exit.isFailure(
-            yield* stopTask({
-              providerThread: wrongThread,
-              taskId: WORKFLOW_TASK_ID,
-            }).pipe(Effect.exit),
-          ),
-        );
-        assert.deepEqual(stoppedTasks, []);
-        yield* stopTask({ providerThread: harness.providerThread, taskId: WORKFLOW_TASK_ID });
-        assert.deepEqual(stoppedTasks, [WORKFLOW_TASK_ID]);
-        assert.isFalse(interrupted);
-        assert.isFalse(closed);
-        assert.equal(workflowCoordinatorEvents(harness.events).at(-1)?.subagent.status, "running");
-        yield* harness.offerAndWait(
-          workflowNotification({
-            uuid: "00000000-0000-4000-8000-000000001101",
-            status: "stopped",
-          }),
-        );
-        member = yield* Queue.take(harness.subagentReceipts);
-        while (!member.subagent.nativeTaskRef?.nativeId?.endsWith(":agent:2")) {
-          member = yield* Queue.take(harness.subagentReceipts);
-        }
-        assert.equal(
-          workflowCoordinatorEvents(harness.events).at(-1)?.subagent.status,
-          "cancelled",
-        );
-        for (const index of [1, 2]) {
-          assert.equal(
-            workflowMemberEvents(harness.events, index).at(-1)?.subagent.status,
-            "cancelled",
-          );
-        }
-        assert.isTrue(
-          Exit.isFailure(
-            yield* stopTask({
-              providerThread: harness.providerThread,
-              taskId: WORKFLOW_TASK_ID,
-            }).pipe(Effect.exit),
-          ),
-        );
-        assert.deepEqual(stoppedTasks, [WORKFLOW_TASK_ID]);
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
-          ),
-        ),
-      ),
-    ),
-  );
-
-  it.effect("projects each workflow member as its own subagent thread", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const harness = yield* makeWorkflowHarness;
-        const now = yield* DateTime.now;
-        const coordinatorTurnItems = () =>
-          harness.events.filter(
-            (event) =>
-              event.type === "turn_item.updated" &&
-              event.turnItem.type === "subagent" &&
-              event.turnItem.nativeItemRef?.nativeId === WORKFLOW_TASK_ID,
-          );
-
-        yield* harness.runtime.startTurn(
-          makeClaudeTestTurnInput({
-            threadId: harness.threadId,
-            providerThread: harness.providerThread,
-            now,
-            attemptId: RunAttemptId.make("attempt-claude-workflow-members"),
-            text: "Run the alpha workflow.",
-            attachments: [],
-          }),
-        );
-        yield* launchWorkflow({
-          harness,
-          snapshotUuid: "00000000-0000-4000-8000-000000001004",
-          state: "queued",
-        });
-
-        const coordinator = workflowCoordinatorEvents(harness.events).at(-1)?.subagent;
-        const first = workflowMemberEvents(harness.events, 1).at(-1)?.subagent;
-        const second = workflowMemberEvents(harness.events, 2).at(-1)?.subagent;
-        assert.equal(first?.status, "pending");
-        assert.isNull(first?.startedAt);
-        assert.equal(second?.status, "pending");
-        assert.isNull(second?.startedAt);
-        const coordinatorThread = harness.events.find(
-          (event) =>
-            event.type === "app_thread.created" &&
-            event.appThread.id === coordinator?.childThreadId,
-        );
-        assert.equal(
-          coordinatorThread?.type === "app_thread.created"
-            ? coordinatorThread.appThread.title
-            : null,
-          "Workflow · probe-wf",
-        );
-        assert.equal(first?.title, "alpha:one");
-        assert.equal(first?.prompt, "Reply with exactly: A1");
-        assert.equal(first?.model, "claude-opus-5[1m]");
-        assert.equal(first?.threadId, coordinator?.childThreadId);
-        assert.equal(second?.threadId, coordinator?.childThreadId);
-        assert.notEqual(first?.childThreadId, second?.childThreadId);
-
-        assert.equal(
-          harness.events.find(
-            (
-              event,
-            ): event is Extract<
-              ProviderAdapter.ProviderAdapterV2Event,
-              { type: "app_thread.created" }
-            > => event.type === "app_thread.created" && event.appThread.id === first?.childThreadId,
-          )?.appThread.title,
-          "alpha:one",
-        );
-        const memberNodes = harness.events.filter(
-          (
-            event,
-          ): event is Extract<ProviderAdapter.ProviderAdapterV2Event, { type: "node.updated" }> =>
-            event.type === "node.updated" &&
-            event.node.nativeItemRef?.nativeId === first?.nativeTaskRef?.nativeId,
-        );
-        assert.deepEqual(
-          memberNodes.map((event) => event.node.kind),
-          ["subagent", "root_turn"],
-        );
-        assert.deepEqual(
-          memberNodes.map((event) => [event.node.status, event.node.startedAt]),
-          [
-            ["pending", null],
-            ["pending", null],
-          ],
-        );
-        assert.deepEqual(
-          threadMessages(harness.events, first?.childThreadId).map((event) => event.message.text),
-          ["Reply with exactly: A1"],
-        );
-        assert.deepEqual(
-          threadMessages(harness.events, second?.childThreadId).map((event) => event.message.text),
-          ["Reply with exactly: A2"],
-        );
-
-        yield* TestClock.adjust("60 seconds");
-        const memberStartedAt = DateTime.add(now, { seconds: 30 });
-        yield* harness.offerAndWait(
-          workflowSnapshot({
-            uuid: "00000000-0000-4000-8000-000000001007",
-            state: "start",
-            secondState: "queued",
-            startedAt: DateTime.toEpochMillis(memberStartedAt),
-          }),
-        );
-        let started = yield* Queue.take(harness.subagentReceipts);
-        while (started.subagent.id !== first?.id || started.subagent.status !== "running") {
-          started = yield* Queue.take(harness.subagentReceipts);
-        }
-        assert.deepEqual(started.subagent.startedAt, memberStartedAt);
-        const startedRoot = harness.events.findLast(
-          (event) => event.type === "node.updated" && event.node.threadId === first?.childThreadId,
-        );
-        assert.equal(
-          startedRoot?.type === "node.updated" ? startedRoot.node.status : null,
-          "running",
-        );
-        assert.deepEqual(
-          startedRoot?.type === "node.updated" ? startedRoot.node.startedAt : null,
-          memberStartedAt,
-        );
-
-        const turnItemsBeforeRepeat = coordinatorTurnItems().length;
-        yield* Queue.offer(
-          harness.sdkMessages,
-          workflowSnapshot({
-            uuid: "00000000-0000-4000-8000-000000001005",
-            state: "start",
-            secondState: "queued",
-            startedAt: DateTime.toEpochMillis(memberStartedAt),
-          }),
-        );
-        yield* harness.until(() => coordinatorTurnItems().length > turnItemsBeforeRepeat);
-        assert.lengthOf(workflowMemberEvents(harness.events, 1), 2);
-        assert.lengthOf(workflowMemberEvents(harness.events, 2), 1);
-
-        const firstThreadId = first?.childThreadId;
-        const firstThreadEvents = () =>
-          harness.events.filter(
-            (
-              event,
-            ): event is Extract<
-              ProviderAdapter.ProviderAdapterV2Event,
-              { type: "app_thread.created" }
-            > => event.type === "app_thread.created" && event.appThread.id === firstThreadId,
-          );
-        const turnItemsBeforeMetadata = coordinatorTurnItems().length;
-        yield* Queue.offer(
-          harness.sdkMessages,
-          workflowSnapshot({
-            uuid: "00000000-0000-4000-8000-000000001017",
-            state: "start",
-            secondState: "queued",
-            startedAt: DateTime.toEpochMillis(memberStartedAt),
-            label: "alpha:review",
-            prompt: "Review the change",
-            model: "claude-sonnet-4-6",
-          }),
-        );
-        // The member's node and app thread pick up the metadata after the coordinator item.
-        yield* harness.until(
-          () =>
-            coordinatorTurnItems().length > turnItemsBeforeMetadata &&
-            workflowMemberEvents(harness.events, 1).at(-1)?.subagent.title === "alpha:review" &&
-            firstThreadEvents().at(-1)?.appThread.title === "alpha:review",
-        );
-        assert.equal(
-          workflowMemberEvents(harness.events, 1).at(-1)?.subagent.title,
-          "alpha:review",
-        );
-        assert.equal(
-          workflowMemberEvents(harness.events, 1).at(-1)?.subagent.prompt,
-          "Review the change",
-        );
-        assert.equal(
-          workflowMemberEvents(harness.events, 1).at(-1)?.subagent.model,
-          "claude-sonnet-4-6",
-        );
-        assert.equal(firstThreadEvents().at(-1)?.appThread.title, "alpha:review");
-        assert.equal(
-          firstThreadEvents().at(-1)?.appThread.modelSelection.model,
-          "claude-sonnet-4-6",
-        );
-        assert.deepEqual(
-          firstThreadEvents().at(-1)?.appThread.createdAt,
-          firstThreadEvents()[0]?.appThread.createdAt,
-        );
-        assert.equal(
-          threadMessages(harness.events, firstThreadId).at(-1)?.message.text,
-          "Review the change",
-        );
-
-        yield* TestClock.adjust("10 seconds");
-        yield* harness.offerAndWait(
-          workflowSnapshot({
-            uuid: "00000000-0000-4000-8000-000000001018",
-            state: "done",
-            secondState: "queued",
-            omitResult: true,
-          }),
-        );
-        let finished = yield* Queue.take(harness.subagentReceipts);
-        while (finished.subagent.id !== first?.id || finished.subagent.status !== "completed") {
-          finished = yield* Queue.take(harness.subagentReceipts);
-        }
-        const completedAt = finished.subagent.completedAt;
-        assert.deepEqual(completedAt, DateTime.add(now, { seconds: 70 }));
-        yield* TestClock.adjust("60 seconds");
-        yield* harness.offerAndWait(
-          workflowSnapshot({
-            uuid: "00000000-0000-4000-8000-000000001019",
-            state: "done",
-            secondState: "queued",
-          }),
-        );
-        let excerpt = yield* Queue.take(harness.subagentReceipts);
-        while (excerpt.subagent.id !== first?.id || excerpt.subagent.result !== "A1 excerpt") {
-          excerpt = yield* Queue.take(harness.subagentReceipts);
-        }
-        assert.deepEqual(excerpt.subagent.completedAt, completedAt);
-        const finishedRoot = harness.events.findLast(
-          (event) => event.type === "node.updated" && event.node.threadId === firstThreadId,
-        );
-        assert.deepEqual(
-          finishedRoot?.type === "node.updated" ? finishedRoot.node.completedAt : undefined,
-          completedAt,
-        );
-
-        yield* harness.offerAndWait(
-          workflowNotification({ uuid: "00000000-0000-4000-8000-000000001008", status: "stopped" }),
+          workflowSnapshot({ uuid: "00000000-0000-4000-8000-000000001200", state: "start" }),
         );
         yield* Queue.offer(
           harness.sdkMessages,
-          makeResultFrame({
-            uuid: "00000000-0000-4000-8000-000000001006",
-            result: "Launched the workflow.",
-          }),
+          makeResultFrame({ uuid: "00000000-0000-4000-8000-000000001201", result: "Launched." }),
         );
         yield* Queue.take(harness.terminalReceipts);
-        const stopped = workflowMemberEvents(harness.events, 2).at(-1)?.subagent;
-        assert.equal(stopped?.status, "cancelled");
-        assert.isNull(stopped?.startedAt);
-        const stoppedRoot = harness.events.findLast(
-          (event) => event.type === "node.updated" && event.node.threadId === second?.childThreadId,
-        );
-        assert.equal(
-          stoppedRoot?.type === "node.updated" ? stoppedRoot.node.status : null,
-          "cancelled",
-        );
-        assert.isNull(
-          stoppedRoot?.type === "node.updated" ? stoppedRoot.node.startedAt : undefined,
-        );
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
-          ),
-        ),
-      ),
-    ),
-  );
-
-  it.effect("projects workflow member threads after resuming a restarted session", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const harness = yield* makeWorkflowHarnessWithOptions({
-          subagentLaunchToolUseId: WORKFLOW_TOOL_USE_ID,
-        });
-        yield* harness.runtime.startTurn(
-          makeClaudeTestTurnInput({
-            threadId: harness.threadId,
-            providerThread: harness.providerThread,
-            now: yield* DateTime.now,
-            attemptId: RunAttemptId.make("attempt-claude-workflow-resume"),
-            text: "Continue the workflow.",
-            attachments: [],
-          }),
-        );
-        yield* harness.offerAndWait(
-          claudeSdkFrame({
-            ...workflowToolUse,
-            message: {
-              model: "claude-sonnet-4-6",
-              content: [
-                { type: "tool_use", id: "toolu-resume-workflow", name: "SendMessage", input: {} },
-              ],
-            },
-          }),
+        assert.equal(workflowCoordinatorEvents(harness.events).at(-1)?.subagent.status, "running");
+        assert.equal(workflowMemberEvents(harness.events, 1).at(-1)?.subagent.status, "running");
+        assert.isTrue(yield* harness.hasPendingBackgroundWork);
+        const toolItems = harness.events.flatMap((event) =>
+          event.type === "turn_item.updated" &&
+          event.turnItem.type === "dynamic_tool" &&
+          event.turnItem.nativeItemRef?.nativeId === WORKFLOW_TOOL_USE_ID
+            ? [event.turnItem.status]
+            : [],
         );
+        assert.deepEqual(toolItems, toolName === "Workflow" ? ["running", "completed"] : []);
         yield* harness.offerAndWait(
-          claudeSdkFrame({
-            ...workflowTaskStarted,
-            tool_use_id: "toolu-resume-workflow",
-            prompt: "Continue the workflow.",
+          workflowNotification({
+            uuid: "00000000-0000-4000-8000-000000001202",
+            status: "completed",
           }),
         );
-        yield* harness.offerAndWait(workflowLaunchAck(harness.transcriptDir));
-        yield* harness.offerAndWait(
-          workflowSnapshot({ uuid: "00000000-0000-4000-8000-000000001040", state: "start" }),
+        yield* Queue.take(harness.continuationReceipts);
+        yield* harness.runtime.startTurn(
+          makeClaudeTestTurnInput({
+            threadId: harness.threadId,
+            providerThread: harness.providerThread,
+            now: yield* DateTime.now,
+            attemptId: RunAttemptId.make(`attempt-workflow-complete-${toolName}`),
+            text: "Workflow finished.",
+            attachments: [],
+            providerTurnOrdinal: 2,
+            messageCreatedBy: "agent",
+            messageCreationSource: "provider",
+          }),
         );
-        yield* harness.offerAndWait(
-          makeResultFrame({ uuid: "00000000-0000-4000-8000-000000001041", result: "Resumed." }),
+        yield* Queue.offer(
+          harness.sdkMessages,
+          makeResultFrame({ uuid: "00000000-0000-4000-8000-000000001205", result: "Finished." }),
         );
         yield* Queue.take(harness.terminalReceipts);
-        const member = workflowMemberEvents(harness.events, 1).at(-1)?.subagent;
-        const coordinator = workflowCoordinatorEvents(harness.events).at(-1)?.subagent;
-        assert.isDefined(member);
-        assert.equal(member?.status, "running");
-        assert.isTrue(
-          harness.events.some(
-            (event) =>
-              event.type === "app_thread.created" && event.appThread.id === member?.childThreadId,
-          ),
-        );
-        assert.deepEqual(
-          threadMessages(harness.events, member?.childThreadId).map((event) => event.message.text),
-          ["Reply with exactly: A1", "A1 from the transcript"],
-        );
-        assert.isDefined(coordinator?.childThreadId);
-        const recoveredThreads = harness.events.filter(
-          (event) =>
-            event.type === "app_thread.created" &&
-            event.appThread.id === coordinator?.childThreadId,
-        );
-        assert.lengthOf(recoveredThreads, 1);
-        const recovered = recoveredThreads[0];
-        assert.equal(recovered?.type, "app_thread.created");
-        if (recovered?.type !== "app_thread.created") throw new Error("Expected recovered thread");
-        assert.isTrue(recovered.createOnly);
-        assert.deepEqual(recovered.appThread.lineage, {
-          parentThreadId: harness.threadId,
-          relationshipToParent: "subagent",
-          rootThreadId: harness.threadId,
-        });
-        assert.equal(recovered.appThread.createdBy, "agent");
-        assert.equal(recovered.appThread.creationSource, "provider");
-        assert.isBelow(
-          harness.events.indexOf(recovered),
-          harness.events.findIndex(
-            (event) =>
-              event.type === "subagent.updated" &&
-              event.subagent.childThreadId === coordinator?.childThreadId,
-          ),
+        assert.equal(
+          workflowCoordinatorEvents(harness.events).at(-1)?.subagent.status,
+          "completed",
         );
+        assert.equal(workflowMemberEvents(harness.events, 1).at(-1)?.subagent.status, "completed");
+        assert.isFalse(yield* harness.hasPendingBackgroundWork);
       }).pipe(
         Effect.provide(
           Layer.mergeAll(
@@ -20777,490 +20264,584 @@ describe("ClaudeAdapterV2 background wake turns", () => {
           ),
         ),
       ),
+  );
+
+  it.effect("marks a workflow coordinator's script prompt and leaves a subagent brief plain", () =>
+    Effect.gen(function* () {
+      const harness = yield* makeWorkflowHarness;
+      const script =
+        'export const meta = { name: "probe-wf", description: "Run the alpha workflow" };';
+      yield* harness.runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now: yield* DateTime.now,
+          attemptId: RunAttemptId.make("attempt-workflow-script-prompt"),
+          text: "Run the workflow and an auditor.",
+          attachments: [],
+        }),
+      );
+      yield* harness.offerAndWait(workflowToolUse);
+      yield* harness.offerAndWait(claudeSdkFrame({ ...workflowTaskStarted, prompt: script }));
+      yield* harness.offerAndWait(workflowLaunchAck(harness.transcriptDir));
+      yield* harness.offerAndWait(
+        workflowSnapshot({ uuid: "00000000-0000-4000-8000-000000001289", state: "start" }),
+      );
+      yield* harness.offerAndWait(
+        claudeSdkFrame({
+          type: "system",
+          subtype: "task_started",
+          task_id: "task-plain-auditor",
+          description: "Audit recent commits",
+          task_type: "local_agent",
+          prompt: "Audit the last five commits.",
+          uuid: "00000000-0000-4000-8000-000000001290",
+          session_id: WAKE_NATIVE_SESSION,
+        }),
+      );
+      const subagentPrompt = (nativeTaskId: string) => {
+        const subagent = harness.events.flatMap((event) =>
+          event.type === "subagent.updated" &&
+          event.subagent.nativeTaskRef?.nativeId === nativeTaskId
+            ? [event.subagent]
+            : [],
+        )[0];
+        const message = threadMessages(harness.events, subagent?.childThreadId).find(
+          (event) => event.message.role === "user",
+        )?.message;
+        const turnItem = harness.events.findLast(
+          (event) =>
+            event.type === "turn_item.updated" &&
+            event.turnItem.type === "user_message" &&
+            event.turnItem.messageId === message?.id,
+        );
+        return {
+          text: message?.text,
+          messageMark: message?.workflowScript,
+          itemMark:
+            turnItem?.type === "turn_item.updated" && turnItem.turnItem.type === "user_message"
+              ? turnItem.turnItem.workflowScript
+              : undefined,
+        };
+      };
+      // The user message item lands after the subagent node, so wait on the item itself.
+      yield* harness.until(
+        () =>
+          workflowCoordinatorEvents(harness.events).length > 0 &&
+          subagentPrompt(WORKFLOW_TASK_ID).itemMark !== undefined &&
+          subagentPrompt("task-plain-auditor").itemMark !== undefined,
+      );
+      assert.deepEqual(subagentPrompt(WORKFLOW_TASK_ID), {
+        text: script,
+        messageMark: true,
+        itemMark: true,
+      });
+      assert.deepEqual(subagentPrompt("task-plain-auditor"), {
+        text: "Audit the last five commits.",
+        messageMark: false,
+        itemMark: false,
+      });
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
+        ),
+      ),
     ),
   );
 
-  it.effect.each([
-    "root result",
-    "resume after root result",
-    "completion before buffered start",
-  ] as const)("orders %s arriving during workflow transcript replay", (arrival) =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const digestStarted = yield* Deferred.make<void>();
-        const releaseDigest = yield* Deferred.make<void>();
-        const liveFrameOffered = yield* Deferred.make<void>();
-        let pauseDigest = false;
-        yield* Effect.gen(function* () {
-          const harness = yield* makeWorkflowHarnessWithOptions({ close: Queue.shutdown });
-          const taskId = "task-resumed-during-workflow-replay";
-          const taskStart = (toolUseId: string, prompt: string, uuid: string) =>
-            claudeSdkFrame({
-              ...workflowTaskStarted,
-              task_id: taskId,
-              task_type: "local_agent",
-              is_backgrounded: true,
-              subagent_type: "general-purpose",
-              spawn_depth: 1,
-              workflow_name: undefined,
-              tool_use_id: toolUseId,
-              prompt,
-              uuid,
-            });
-          const taskFinished = (toolUseId: string, summary: string, uuid: string) =>
-            claudeSdkFrame({
-              ...workflowNotification({ uuid, status: "completed" }),
-              task_id: taskId,
-              tool_use_id: toolUseId,
-              summary,
-            });
-          yield* harness.runtime.startTurn(
-            makeClaudeTestTurnInput({
-              threadId: harness.threadId,
-              providerThread: harness.providerThread,
-              now: yield* DateTime.now,
-              attemptId: RunAttemptId.make("attempt-workflow-replay-launch"),
-              text: "Run the workflow and a background subagent.",
-              attachments: [],
-            }),
-          );
-          yield* harness.offerAndWait(workflowToolUse);
-          yield* harness.offerAndWait(workflowTaskStarted);
-          yield* harness.offerAndWait(workflowLaunchAck(harness.transcriptDir));
-          yield* harness.offerAndWait(
-            workflowSnapshot({ uuid: "00000000-0000-4000-8000-000000003001", state: "start" }),
-          );
-          if (arrival !== "completion before buffered start") {
-            yield* harness.offerAndWait(
-              taskStart("toolu-initial", "Initial work.", "00000000-0000-4000-8000-000000003002"),
-            );
-          }
-          yield* harness.offerAndWait(
-            makeResultFrame({
-              uuid: "00000000-0000-4000-8000-000000003003",
-              result: "Launched both tasks.",
-            }),
-          );
-          yield* Queue.take(harness.terminalReceipts);
-          yield* harness.offerAndWait(
-            workflowNotification({
-              uuid: "00000000-0000-4000-8000-000000003004",
-              status: "completed",
-            }),
-          );
-          yield* Queue.take(harness.continuationReceipts);
-          if (arrival === "completion before buffered start") {
-            yield* harness.offerAndWait(
-              taskStart("toolu-initial", "Initial work.", "00000000-0000-4000-8000-000000003005"),
-            );
-          } else {
-            yield* harness.offerAndWait(
-              taskFinished(
-                "toolu-initial",
-                "Initial result.",
-                "00000000-0000-4000-8000-000000003005",
-              ),
-            );
-          }
-          if (arrival === "root result") {
-            yield* harness.offerAndWait(
-              claudeSdkFrame({
-                type: "system",
-                subtype: "init",
-                session_id: WAKE_NATIVE_SESSION,
-                uuid: "00000000-0000-4000-8000-000000003006",
-              }),
-            );
-          }
-          pauseDigest = true;
-          const replay = yield* harness.runtime
-            .startTurn(
-              makeClaudeTestTurnInput({
-                threadId: harness.threadId,
-                providerThread: harness.providerThread,
-                now: yield* DateTime.now,
-                attemptId: RunAttemptId.make("attempt-workflow-replay-continuation"),
-                providerTurnOrdinal: 2,
-                text: "Continue.",
-                attachments: [],
-                messageCreatedBy: "agent",
-                messageCreationSource: "provider",
-              }),
-            )
-            .pipe(Effect.forkScoped);
-          yield* Deferred.await(digestStarted);
-          const liveFrames = yield* Effect.gen(function* () {
-            if (arrival === "completion before buffered start") {
-              yield* harness.offerAndWait(
-                taskFinished(
-                  "toolu-initial",
-                  "Initial result.",
-                  "00000000-0000-4000-8000-000000003007",
-                ),
-                liveFrameOffered,
-              );
-              return;
-            }
-            yield* harness.offerAndWait(
-              claudeSdkFrame({
-                ...makeResultFrame({
-                  uuid: "00000000-0000-4000-8000-000000003008",
-                  result: "Native wake turn finished.",
-                }),
-                origin: { kind: "task-notification" },
-                num_turns: 1,
-              }),
-              liveFrameOffered,
-            );
-            if (arrival === "resume after root result") {
-              yield* harness.offerAndWait(
-                claudeSdkFrame({
-                  type: "system",
-                  subtype: "init",
-                  session_id: WAKE_NATIVE_SESSION,
-                  uuid: "00000000-0000-4000-8000-000000003009",
-                }),
-              );
-              yield* harness.offerAndWait(
-                taskStart(
-                  "toolu-latest",
-                  "Latest live resume.",
-                  "00000000-0000-4000-8000-000000003010",
-                ),
-              );
-            }
-          }).pipe(Effect.forkScoped);
-          yield* Deferred.await(liveFrameOffered);
-          yield* Deferred.succeed(releaseDigest, undefined);
-          yield* Fiber.join(replay);
-          yield* Fiber.join(liveFrames);
-          if (arrival === "resume after root result") {
-            yield* Queue.take(harness.terminalReceipts);
-            yield* Queue.take(harness.continuationReceipts);
-            yield* harness.runtime.startTurn(
-              makeClaudeTestTurnInput({
-                threadId: harness.threadId,
-                providerThread: harness.providerThread,
-                now: yield* DateTime.now,
-                attemptId: RunAttemptId.make("attempt-workflow-replay-resume-continuation"),
-                providerTurnOrdinal: 3,
-                text: "Continue.",
-                attachments: [],
-                messageCreatedBy: "agent",
-                messageCreationSource: "provider",
-              }),
-            );
-          }
-          if (arrival !== "root result") {
-            yield* harness.offerAndWait(
-              makeResultFrame({
-                uuid: "00000000-0000-4000-8000-000000003011",
-                result: "Workflow answer delivered.",
-              }),
-            );
-          }
-          yield* Queue.take(harness.terminalReceipts);
-          const latest = harness.events
-            .flatMap((event) =>
-              event.type === "subagent.updated" && event.subagent.nativeTaskRef?.nativeId === taskId
-                ? [event.subagent]
-                : [],
-            )
-            .at(-1);
-          if (arrival === "resume after root result") {
-            assert.equal(latest?.status, "running");
-            assert.equal(latest?.prompt, "Latest live resume.");
-            assert.isNull(latest?.result);
-            assert.isTrue(yield* harness.hasPendingBackgroundWork);
-          } else {
-            assert.equal(latest?.status, "completed");
-            assert.equal(latest?.result, "Initial result.");
-            assert.isFalse(yield* harness.hasPendingBackgroundWork);
-            assert.lengthOf(harness.continuationRequests, 1);
-            yield* harness.runtime.startTurn(
-              makeClaudeTestTurnInput({
-                threadId: harness.threadId,
-                providerThread: harness.providerThread,
-                now: yield* DateTime.now,
-                attemptId: RunAttemptId.make("attempt-workflow-replay-next-user"),
-                providerTurnOrdinal: 3,
-                text: "Next task.",
-                attachments: [],
-              }),
-            );
-          }
-        }).pipe(
-          Effect.provideService(WorkflowAgentTranscriptReadObserver, () =>
-            Effect.gen(function* () {
-              if (pauseDigest) {
-                pauseDigest = false;
-                yield* Deferred.succeed(digestStarted, undefined);
-                yield* Deferred.await(releaseDigest);
-              }
-            }),
-          ),
+  it.effect("stops only a live workflow task and waits for its stopped notification", () =>
+    Effect.gen(function* () {
+      const stoppedTasks: Array<string> = [];
+      let interrupted = false;
+      let closed = false;
+      const harness = yield* makeWorkflowHarnessWithOptions({
+        stopTask: (taskId) =>
+          Effect.sync(() => {
+            stoppedTasks.push(taskId);
+          }),
+        interrupt: Effect.sync(() => {
+          interrupted = true;
+        }),
+        close: () =>
+          Effect.sync(() => {
+            closed = true;
+          }),
+      });
+      yield* harness.runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now: yield* DateTime.now,
+          attemptId: RunAttemptId.make("attempt-workflow-stop"),
+          text: "Run the workflow.",
+          attachments: [],
+        }),
+      );
+      yield* harness.offerAndWait(workflowToolUse);
+      yield* harness.offerAndWait(workflowTaskStarted);
+      yield* harness.offerAndWait(workflowLaunchAck(harness.transcriptDir));
+      yield* harness.offerAndWait(
+        workflowSnapshot({
+          uuid: "00000000-0000-4000-8000-000000001100",
+          state: "start",
+        }),
+      );
+      let member = yield* Queue.take(harness.subagentReceipts);
+      while (!member.subagent.nativeTaskRef?.nativeId?.endsWith(":agent:2")) {
+        member = yield* Queue.take(harness.subagentReceipts);
+      }
+      const stopTask = harness.runtime.stopTask!;
+      for (const taskId of ["missing-task", `${WORKFLOW_TASK_ID}:agent:1`]) {
+        const exit = yield* stopTask({ providerThread: harness.providerThread, taskId }).pipe(
+          Effect.exit,
         );
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
-          ),
+        assert.isTrue(Exit.isFailure(exit));
+      }
+      const wrongThread = {
+        ...harness.providerThread,
+        nativeThreadRef: {
+          driver: harness.providerThread.driver,
+          nativeId: "wrong-session",
+          strength: "strong" as const,
+        },
+      };
+      assert.isTrue(
+        Exit.isFailure(
+          yield* stopTask({
+            providerThread: wrongThread,
+            taskId: WORKFLOW_TASK_ID,
+          }).pipe(Effect.exit),
+        ),
+      );
+      assert.deepEqual(stoppedTasks, []);
+      yield* stopTask({ providerThread: harness.providerThread, taskId: WORKFLOW_TASK_ID });
+      assert.deepEqual(stoppedTasks, [WORKFLOW_TASK_ID]);
+      assert.isFalse(interrupted);
+      assert.isFalse(closed);
+      assert.equal(workflowCoordinatorEvents(harness.events).at(-1)?.subagent.status, "running");
+      yield* harness.offerAndWait(
+        workflowNotification({
+          uuid: "00000000-0000-4000-8000-000000001101",
+          status: "stopped",
+        }),
+      );
+      member = yield* Queue.take(harness.subagentReceipts);
+      while (!member.subagent.nativeTaskRef?.nativeId?.endsWith(":agent:2")) {
+        member = yield* Queue.take(harness.subagentReceipts);
+      }
+      assert.equal(workflowCoordinatorEvents(harness.events).at(-1)?.subagent.status, "cancelled");
+      for (const index of [1, 2]) {
+        assert.equal(
+          workflowMemberEvents(harness.events, index).at(-1)?.subagent.status,
+          "cancelled",
+        );
+      }
+      assert.isTrue(
+        Exit.isFailure(
+          yield* stopTask({
+            providerThread: harness.providerThread,
+            taskId: WORKFLOW_TASK_ID,
+          }).pipe(Effect.exit),
+        ),
+      );
+      assert.deepEqual(stoppedTasks, [WORKFLOW_TASK_ID]);
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
         ),
       ),
     ),
   );
 
-  it.effect("preserves buffered workflow outcomes when interrupted during replay", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const digestStarted = yield* Deferred.make<void>();
-        const releaseDigest = yield* Deferred.make<void>();
-        let pauseDigest = false;
-        yield* Effect.gen(function* () {
-          const harness = yield* makeWorkflowHarnessWithOptions({ close: Queue.shutdown });
-          const secondTaskId = "task-workflow-buffered-completion";
-          const secondToolUseId = "toolu-workflow-buffered-completion";
-          yield* harness.runtime.startTurn(
-            makeClaudeTestTurnInput({
-              threadId: harness.threadId,
-              providerThread: harness.providerThread,
-              now: yield* DateTime.now,
-              attemptId: RunAttemptId.make("attempt-workflow-buffered-launch"),
-              text: "Run both workflows.",
-              attachments: [],
-            }),
-          );
-          yield* launchWorkflow({
-            harness,
-            snapshotUuid: "00000000-0000-4000-8000-000000003100",
-          });
-          yield* harness.offerAndWait(
-            claudeSdkFrame({
-              ...workflowTaskStarted,
-              task_id: secondTaskId,
-              tool_use_id: secondToolUseId,
-              uuid: "00000000-0000-4000-8000-000000003101",
-            }),
-          );
-          yield* harness.offerAndWait(
-            claudeSdkFrame({
-              ...workflowSnapshot({
-                uuid: "00000000-0000-4000-8000-000000003102",
-                state: "start",
-              }),
-              task_id: secondTaskId,
-              tool_use_id: secondToolUseId,
-            }),
-          );
-          yield* harness.offerAndWait(
-            makeResultFrame({
-              uuid: "00000000-0000-4000-8000-000000003103",
-              result: "Launched both workflows.",
-            }),
-          );
-          yield* Queue.take(harness.terminalReceipts);
-          yield* harness.offerAndWait(
-            workflowNotification({
-              uuid: "00000000-0000-4000-8000-000000003104",
-              status: "completed",
-            }),
-          );
-          yield* Queue.take(harness.continuationReceipts);
-          yield* harness.offerAndWait(
-            claudeSdkFrame({
-              ...workflowNotification({
-                uuid: "00000000-0000-4000-8000-000000003105",
-                status: "completed",
-              }),
-              task_id: secondTaskId,
-              tool_use_id: secondToolUseId,
-            }),
-          );
-          const continuationInput = makeClaudeTestTurnInput({
-            threadId: harness.threadId,
-            providerThread: harness.providerThread,
-            now: yield* DateTime.now,
-            attemptId: RunAttemptId.make("attempt-workflow-buffered-replay"),
-            providerTurnOrdinal: 2,
-            text: "Continue.",
-            attachments: [],
-            messageCreatedBy: "agent",
-            messageCreationSource: "provider",
-          });
-          pauseDigest = true;
-          const replay = yield* harness.runtime
-            .startTurn(continuationInput)
-            .pipe(Effect.forkScoped);
-          yield* Deferred.await(digestStarted);
-          yield* harness.runtime.interruptTurn({
-            providerThread: harness.providerThread,
-            providerTurnId: (yield* IdAllocator.IdAllocatorV2).derive.providerTurn({
-              driver: ClaudeAdapterV2.CLAUDE_PROVIDER,
-              nativeTurnId: `turn:${continuationInput.attemptId}`,
-            }),
-          });
-          yield* Deferred.succeed(releaseDigest, undefined);
-          yield* Fiber.join(replay);
-          const second = harness.events
-            .flatMap((event) =>
-              event.type === "subagent.updated" &&
-              event.subagent.nativeTaskRef?.nativeId === secondTaskId
-                ? [event.subagent]
-                : [],
-            )
-            .at(-1);
-          assert.equal(second?.status, "completed");
-          assert.equal(second?.result, "Workflow finished.");
-        }).pipe(
-          Effect.provideService(WorkflowAgentTranscriptReadObserver, () =>
-            Effect.gen(function* () {
-              if (pauseDigest) {
-                pauseDigest = false;
-                yield* Deferred.succeed(digestStarted, undefined);
-                yield* Deferred.await(releaseDigest);
-              }
-            }),
-          ),
+  it.effect("projects each workflow member as its own subagent thread", () =>
+    Effect.gen(function* () {
+      const harness = yield* makeWorkflowHarness;
+      const now = yield* DateTime.now;
+      const coordinatorTurnItems = () =>
+        harness.events.filter(
+          (event) =>
+            event.type === "turn_item.updated" &&
+            event.turnItem.type === "subagent" &&
+            event.turnItem.nativeItemRef?.nativeId === WORKFLOW_TASK_ID,
         );
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
-          ),
+
+      yield* harness.runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now,
+          attemptId: RunAttemptId.make("attempt-claude-workflow-members"),
+          text: "Run the alpha workflow.",
+          attachments: [],
+        }),
+      );
+      yield* launchWorkflow({
+        harness,
+        snapshotUuid: "00000000-0000-4000-8000-000000001004",
+        state: "queued",
+      });
+
+      const coordinator = workflowCoordinatorEvents(harness.events).at(-1)?.subagent;
+      const first = workflowMemberEvents(harness.events, 1).at(-1)?.subagent;
+      const second = workflowMemberEvents(harness.events, 2).at(-1)?.subagent;
+      assert.equal(first?.status, "pending");
+      assert.isNull(first?.startedAt);
+      assert.equal(second?.status, "pending");
+      assert.isNull(second?.startedAt);
+      const coordinatorThread = harness.events.find(
+        (event) =>
+          event.type === "app_thread.created" && event.appThread.id === coordinator?.childThreadId,
+      );
+      assert.equal(
+        coordinatorThread?.type === "app_thread.created" ? coordinatorThread.appThread.title : null,
+        "Workflow · probe-wf",
+      );
+      assert.equal(first?.title, "alpha:one");
+      assert.equal(first?.prompt, "Reply with exactly: A1");
+      assert.equal(first?.model, "claude-opus-5[1m]");
+      assert.equal(first?.threadId, coordinator?.childThreadId);
+      assert.equal(second?.threadId, coordinator?.childThreadId);
+      assert.notEqual(first?.childThreadId, second?.childThreadId);
+
+      assert.equal(
+        harness.events.find(
+          (
+            event,
+          ): event is Extract<
+            ProviderAdapter.ProviderAdapterV2Event,
+            { type: "app_thread.created" }
+          > => event.type === "app_thread.created" && event.appThread.id === first?.childThreadId,
+        )?.appThread.title,
+        "alpha:one",
+      );
+      const memberNodes = harness.events.filter(
+        (
+          event,
+        ): event is Extract<ProviderAdapter.ProviderAdapterV2Event, { type: "node.updated" }> =>
+          event.type === "node.updated" &&
+          event.node.nativeItemRef?.nativeId === first?.nativeTaskRef?.nativeId,
+      );
+      assert.deepEqual(
+        memberNodes.map((event) => event.node.kind),
+        ["subagent", "root_turn"],
+      );
+      assert.deepEqual(
+        memberNodes.map((event) => [event.node.status, event.node.startedAt]),
+        [
+          ["pending", null],
+          ["pending", null],
+        ],
+      );
+      assert.deepEqual(
+        threadMessages(harness.events, first?.childThreadId).map((event) => event.message.text),
+        ["Reply with exactly: A1"],
+      );
+      assert.deepEqual(
+        threadMessages(harness.events, second?.childThreadId).map((event) => event.message.text),
+        ["Reply with exactly: A2"],
+      );
+
+      yield* TestClock.adjust("60 seconds");
+      const memberStartedAt = DateTime.add(now, { seconds: 30 });
+      yield* harness.offerAndWait(
+        workflowSnapshot({
+          uuid: "00000000-0000-4000-8000-000000001007",
+          state: "start",
+          secondState: "queued",
+          startedAt: DateTime.toEpochMillis(memberStartedAt),
+        }),
+      );
+      let started = yield* Queue.take(harness.subagentReceipts);
+      while (started.subagent.id !== first?.id || started.subagent.status !== "running") {
+        started = yield* Queue.take(harness.subagentReceipts);
+      }
+      assert.deepEqual(started.subagent.startedAt, memberStartedAt);
+      const startedRoot = harness.events.findLast(
+        (event) => event.type === "node.updated" && event.node.threadId === first?.childThreadId,
+      );
+      assert.equal(
+        startedRoot?.type === "node.updated" ? startedRoot.node.status : null,
+        "running",
+      );
+      assert.deepEqual(
+        startedRoot?.type === "node.updated" ? startedRoot.node.startedAt : null,
+        memberStartedAt,
+      );
+
+      const turnItemsBeforeRepeat = coordinatorTurnItems().length;
+      yield* Queue.offer(
+        harness.sdkMessages,
+        workflowSnapshot({
+          uuid: "00000000-0000-4000-8000-000000001005",
+          state: "start",
+          secondState: "queued",
+          startedAt: DateTime.toEpochMillis(memberStartedAt),
+        }),
+      );
+      yield* harness.until(() => coordinatorTurnItems().length > turnItemsBeforeRepeat);
+      assert.lengthOf(workflowMemberEvents(harness.events, 1), 2);
+      assert.lengthOf(workflowMemberEvents(harness.events, 2), 1);
+
+      const firstThreadId = first?.childThreadId;
+      const firstThreadEvents = () =>
+        harness.events.filter(
+          (
+            event,
+          ): event is Extract<
+            ProviderAdapter.ProviderAdapterV2Event,
+            { type: "app_thread.created" }
+          > => event.type === "app_thread.created" && event.appThread.id === firstThreadId,
+        );
+      const turnItemsBeforeMetadata = coordinatorTurnItems().length;
+      yield* Queue.offer(
+        harness.sdkMessages,
+        workflowSnapshot({
+          uuid: "00000000-0000-4000-8000-000000001017",
+          state: "start",
+          secondState: "queued",
+          startedAt: DateTime.toEpochMillis(memberStartedAt),
+          label: "alpha:review",
+          prompt: "Review the change",
+          model: "claude-sonnet-4-6",
+        }),
+      );
+      // The member's node and app thread pick up the metadata after the coordinator item.
+      yield* harness.until(
+        () =>
+          coordinatorTurnItems().length > turnItemsBeforeMetadata &&
+          workflowMemberEvents(harness.events, 1).at(-1)?.subagent.title === "alpha:review" &&
+          firstThreadEvents().at(-1)?.appThread.title === "alpha:review",
+      );
+      assert.equal(workflowMemberEvents(harness.events, 1).at(-1)?.subagent.title, "alpha:review");
+      assert.equal(
+        workflowMemberEvents(harness.events, 1).at(-1)?.subagent.prompt,
+        "Review the change",
+      );
+      assert.equal(
+        workflowMemberEvents(harness.events, 1).at(-1)?.subagent.model,
+        "claude-sonnet-4-6",
+      );
+      assert.equal(firstThreadEvents().at(-1)?.appThread.title, "alpha:review");
+      assert.equal(firstThreadEvents().at(-1)?.appThread.modelSelection.model, "claude-sonnet-4-6");
+      assert.deepEqual(
+        firstThreadEvents().at(-1)?.appThread.createdAt,
+        firstThreadEvents()[0]?.appThread.createdAt,
+      );
+      assert.equal(
+        threadMessages(harness.events, firstThreadId).at(-1)?.message.text,
+        "Review the change",
+      );
+
+      yield* TestClock.adjust("10 seconds");
+      yield* harness.offerAndWait(
+        workflowSnapshot({
+          uuid: "00000000-0000-4000-8000-000000001018",
+          state: "done",
+          secondState: "queued",
+          omitResult: true,
+        }),
+      );
+      let finished = yield* Queue.take(harness.subagentReceipts);
+      while (finished.subagent.id !== first?.id || finished.subagent.status !== "completed") {
+        finished = yield* Queue.take(harness.subagentReceipts);
+      }
+      const completedAt = finished.subagent.completedAt;
+      assert.deepEqual(completedAt, DateTime.add(now, { seconds: 70 }));
+      yield* TestClock.adjust("60 seconds");
+      yield* harness.offerAndWait(
+        workflowSnapshot({
+          uuid: "00000000-0000-4000-8000-000000001019",
+          state: "done",
+          secondState: "queued",
+        }),
+      );
+      let excerpt = yield* Queue.take(harness.subagentReceipts);
+      while (excerpt.subagent.id !== first?.id || excerpt.subagent.result !== "A1 excerpt") {
+        excerpt = yield* Queue.take(harness.subagentReceipts);
+      }
+      assert.deepEqual(excerpt.subagent.completedAt, completedAt);
+      const finishedRoot = harness.events.findLast(
+        (event) => event.type === "node.updated" && event.node.threadId === firstThreadId,
+      );
+      assert.deepEqual(
+        finishedRoot?.type === "node.updated" ? finishedRoot.node.completedAt : undefined,
+        completedAt,
+      );
+
+      yield* harness.offerAndWait(
+        workflowNotification({ uuid: "00000000-0000-4000-8000-000000001008", status: "stopped" }),
+      );
+      yield* Queue.offer(
+        harness.sdkMessages,
+        makeResultFrame({
+          uuid: "00000000-0000-4000-8000-000000001006",
+          result: "Launched the workflow.",
+        }),
+      );
+      yield* Queue.take(harness.terminalReceipts);
+      const stopped = workflowMemberEvents(harness.events, 2).at(-1)?.subagent;
+      assert.equal(stopped?.status, "cancelled");
+      assert.isNull(stopped?.startedAt);
+      const stoppedRoot = harness.events.findLast(
+        (event) => event.type === "node.updated" && event.node.threadId === second?.childThreadId,
+      );
+      assert.equal(
+        stoppedRoot?.type === "node.updated" ? stoppedRoot.node.status : null,
+        "cancelled",
+      );
+      assert.isNull(stoppedRoot?.type === "node.updated" ? stoppedRoot.node.startedAt : undefined);
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
         ),
       ),
     ),
   );
 
-  it.effect.each([
-    ["api_error", false, false],
-    ["aborted_streaming", false, false],
-    ["api_error", true, false],
-    ["api_error", false, true],
-    ["aborted_streaming", false, true],
-  ] as const)(
-    "stops the run's live workflow after root result %s, continuation=%s, pending Stop=%s",
-    ([terminalReason, continuation, pendingStop]) =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const stoppedTasks: Array<string> = [];
-          const stopRequested = yield* Deferred.make<void>();
-          const harness = yield* makeWorkflowHarnessWithOptions({
-            stopTask: (taskId) =>
-              Effect.sync(() => void stoppedTasks.push(taskId)).pipe(
-                Effect.andThen(Deferred.succeed(stopRequested, undefined)),
-                Effect.asVoid,
-              ),
-          });
-          const now = yield* DateTime.now;
-          const turnInput = {
-            threadId: harness.threadId,
-            providerThread: harness.providerThread,
-            now,
-            attemptId: RunAttemptId.make("attempt-claude-workflow-root-failure"),
-            text: "Run the workflow.",
-            attachments: [],
-          };
-          yield* harness.runtime.startTurn(makeClaudeTestTurnInput(turnInput));
-          yield* launchWorkflow({ harness, snapshotUuid: "00000000-0000-4000-8000-000000001050" });
-          const stopping = pendingStop
-            ? yield* harness.runtime.stopSubagent!({
-                providerThread: harness.providerThread,
-                nativeTaskId: WORKFLOW_TASK_ID,
-              }).pipe(Effect.exit, Effect.forkScoped)
-            : undefined;
-          if (pendingStop) yield* Deferred.await(stopRequested);
-          if (continuation) {
-            yield* harness.offerAndWait(
-              makeResultFrame({
-                uuid: "00000000-0000-4000-8000-000000001051",
-                result: "Launched.",
-              }),
-            );
-            yield* Queue.take(harness.terminalReceipts);
-            yield* harness.offerAndWait(
-              claudeSdkFrame({
-                ...workflowTaskStarted,
-                uuid: "00000000-0000-4000-8000-000000001052",
-              }),
-            );
-          }
-          yield* harness.offerAndWait(
-            makeResultFrame({
-              uuid: "00000000-0000-4000-8000-000000001053",
-              result: "Root turn ended.",
-              terminalReason,
-              isError: terminalReason === "api_error",
-            }),
-          );
-          if (continuation) {
-            yield* harness.runtime.startTurn(
-              makeClaudeTestTurnInput({
-                ...turnInput,
-                attemptId: RunAttemptId.make("attempt-claude-workflow-root-failure-wake"),
-                providerTurnOrdinal: 2,
-                messageCreatedBy: "agent",
-                messageCreationSource: "provider",
-              }),
-            );
-          }
-          const terminal = yield* Queue.take(harness.terminalReceipts);
-          assert.equal(terminal.status, terminalReason === "api_error" ? "failed" : "interrupted");
-          assert.equal(terminal.threadDisposition, "reusable");
-          const settled = terminalReason === "api_error" ? "failed" : "cancelled";
-          assert.deepEqual(
-            stoppedTasks,
-            pendingStop ? [WORKFLOW_TASK_ID, WORKFLOW_TASK_ID] : [WORKFLOW_TASK_ID],
-          );
-          if (stopping !== undefined) {
-            yield* TestClock.adjust("2 seconds");
-            assert.isTrue(Exit.isFailure(yield* Fiber.join(stopping)));
-            const retry = yield* harness.runtime.stopSubagent!({
-              providerThread: harness.providerThread,
-              nativeTaskId: WORKFLOW_TASK_ID,
-            }).pipe(Effect.exit, Effect.forkScoped);
-            yield* TestClock.adjust("2 seconds");
-            assert.isTrue(Exit.isFailure(yield* Fiber.join(retry)));
-          }
-          assert.isFalse(yield* harness.hasPendingBackgroundWork);
-          assert.equal(workflowCoordinatorEvents(harness.events).at(-1)?.subagent.status, settled);
-          for (const index of [1, 2]) {
-            assert.equal(
-              workflowMemberEvents(harness.events, index).at(-1)?.subagent.status,
-              settled,
-            );
-          }
-        }).pipe(
-          Effect.provide(
-            Layer.mergeAll(
-              IdAllocator.layer,
-              McpProviderSessions.layer,
-              NodeServices.layer,
-              NodeCrypto.layer,
-            ),
-          ),
+  it.effect("projects workflow member threads after resuming a restarted session", () =>
+    Effect.gen(function* () {
+      const harness = yield* makeWorkflowHarnessWithOptions({
+        subagentLaunchToolUseId: WORKFLOW_TOOL_USE_ID,
+      });
+      yield* harness.runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now: yield* DateTime.now,
+          attemptId: RunAttemptId.make("attempt-claude-workflow-resume"),
+          text: "Continue the workflow.",
+          attachments: [],
+        }),
+      );
+      yield* harness.offerAndWait(
+        claudeSdkFrame({
+          ...workflowToolUse,
+          message: {
+            model: "claude-sonnet-4-6",
+            content: [
+              { type: "tool_use", id: "toolu-resume-workflow", name: "SendMessage", input: {} },
+            ],
+          },
+        }),
+      );
+      yield* harness.offerAndWait(
+        claudeSdkFrame({
+          ...workflowTaskStarted,
+          tool_use_id: "toolu-resume-workflow",
+          prompt: "Continue the workflow.",
+        }),
+      );
+      yield* harness.offerAndWait(workflowLaunchAck(harness.transcriptDir));
+      yield* harness.offerAndWait(
+        workflowSnapshot({ uuid: "00000000-0000-4000-8000-000000001040", state: "start" }),
+      );
+      yield* harness.offerAndWait(
+        makeResultFrame({ uuid: "00000000-0000-4000-8000-000000001041", result: "Resumed." }),
+      );
+      yield* Queue.take(harness.terminalReceipts);
+      const member = workflowMemberEvents(harness.events, 1).at(-1)?.subagent;
+      const coordinator = workflowCoordinatorEvents(harness.events).at(-1)?.subagent;
+      assert.isDefined(member);
+      assert.equal(member?.status, "running");
+      assert.isTrue(
+        harness.events.some(
+          (event) =>
+            event.type === "app_thread.created" && event.appThread.id === member?.childThreadId,
+        ),
+      );
+      assert.deepEqual(
+        threadMessages(harness.events, member?.childThreadId).map((event) => event.message.text),
+        ["Reply with exactly: A1", "A1 from the transcript"],
+      );
+      assert.isDefined(coordinator?.childThreadId);
+      const recoveredThreads = harness.events.filter(
+        (event) =>
+          event.type === "app_thread.created" && event.appThread.id === coordinator?.childThreadId,
+      );
+      assert.lengthOf(recoveredThreads, 1);
+      const recovered = recoveredThreads[0];
+      assert.equal(recovered?.type, "app_thread.created");
+      if (recovered?.type !== "app_thread.created") throw new Error("Expected recovered thread");
+      assert.isTrue(recovered.createOnly);
+      assert.deepEqual(recovered.appThread.lineage, {
+        parentThreadId: harness.threadId,
+        relationshipToParent: "subagent",
+        rootThreadId: harness.threadId,
+      });
+      assert.equal(recovered.appThread.createdBy, "agent");
+      assert.equal(recovered.appThread.creationSource, "provider");
+      assert.isBelow(
+        harness.events.indexOf(recovered),
+        harness.events.findIndex(
+          (event) =>
+            event.type === "subagent.updated" &&
+            event.subagent.childThreadId === coordinator?.childThreadId,
+        ),
+      );
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
         ),
       ),
+    ),
   );
 
-  it.effect("clears workflow member metadata only after a successful transcript read", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const harness = yield* makeWorkflowHarness;
-        const now = yield* DateTime.now;
+  it.effect.each([
+    "root result",
+    "resume after root result",
+    "completion before buffered start",
+  ] as const)("orders %s arriving during workflow transcript replay", (arrival) =>
+    Effect.gen(function* () {
+      const digestStarted = yield* Deferred.make<void>();
+      const releaseDigest = yield* Deferred.make<void>();
+      const liveFrameOffered = yield* Deferred.make<void>();
+      let pauseDigest = false;
+      yield* Effect.gen(function* () {
+        const harness = yield* makeWorkflowHarnessWithOptions({ close: Queue.shutdown });
+        const taskId = "task-resumed-during-workflow-replay";
+        const taskStart = (toolUseId: string, prompt: string, uuid: string) =>
+          claudeSdkFrame({
+            ...workflowTaskStarted,
+            task_id: taskId,
+            task_type: "local_agent",
+            is_backgrounded: true,
+            subagent_type: "general-purpose",
+            spawn_depth: 1,
+            workflow_name: undefined,
+            tool_use_id: toolUseId,
+            prompt,
+            uuid,
+          });
+        const taskFinished = (toolUseId: string, summary: string, uuid: string) =>
+          claudeSdkFrame({
+            ...workflowNotification({ uuid, status: "completed" }),
+            task_id: taskId,
+            tool_use_id: toolUseId,
+            summary,
+          });
         yield* harness.runtime.startTurn(
           makeClaudeTestTurnInput({
             threadId: harness.threadId,
             providerThread: harness.providerThread,
-            now,
-            attemptId: RunAttemptId.make("attempt-claude-workflow-metadata"),
-            text: "Run the alpha workflow in the background.",
+            now: yield* DateTime.now,
+            attemptId: RunAttemptId.make("attempt-workflow-replay-launch"),
+            text: "Run the workflow and a background subagent.",
             attachments: [],
           }),
         );
@@ -21268,309 +20849,408 @@ describe("ClaudeAdapterV2 background wake turns", () => {
         yield* harness.offerAndWait(workflowTaskStarted);
         yield* harness.offerAndWait(workflowLaunchAck(harness.transcriptDir));
         yield* harness.offerAndWait(
-          workflowSnapshot({ uuid: "00000000-0000-4000-8000-000000001040", state: "done" }),
+          workflowSnapshot({ uuid: "00000000-0000-4000-8000-000000003001", state: "start" }),
         );
-        yield* harness.until(
-          () =>
-            workflowCoordinatorEvents(harness.events).at(-1)?.subagent.workflow?.agents[0]
-              ?.effort === "xhigh",
-        );
-        let coordinator = workflowCoordinatorEvents(harness.events).at(-1)!.subagent;
-        assert.equal(coordinator.workflow?.agents[0]?.speed, "standard");
-
-        const transcriptPath = NodePath.join(harness.transcriptDir, "agent-a1.jsonl");
-        NodeFS.renameSync(transcriptPath, `${transcriptPath}.saved`);
+        if (arrival !== "completion before buffered start") {
+          yield* harness.offerAndWait(
+            taskStart("toolu-initial", "Initial work.", "00000000-0000-4000-8000-000000003002"),
+          );
+        }
         yield* harness.offerAndWait(
-          workflowSnapshot({
-            uuid: "00000000-0000-4000-8000-000000001041",
-            state: "done",
-            label: "alpha:unreadable",
+          makeResultFrame({
+            uuid: "00000000-0000-4000-8000-000000003003",
+            result: "Launched both tasks.",
           }),
         );
-        yield* harness.until(
-          () =>
-            workflowCoordinatorEvents(harness.events).at(-1)?.subagent.workflow?.agents[0]
-              ?.label === "alpha:unreadable",
-        );
-        coordinator = workflowCoordinatorEvents(harness.events).at(-1)!.subagent;
-        assert.equal(coordinator.workflow?.agents[0]?.effort, "xhigh");
-        assert.equal(coordinator.workflow?.agents[0]?.speed, "standard");
-
-        NodeFS.renameSync(`${transcriptPath}.saved`, transcriptPath);
-        NodeFS.appendFileSync(
-          transcriptPath,
-          '{"type":"assistant","uuid":"wf-metadata-cleared","message":{"role":"assistant","stop_reason":"end_turn","id":"msg_new","content":[{"type":"text","text":"New answer without metadata"}]}}\n',
-        );
+        yield* Queue.take(harness.terminalReceipts);
         yield* harness.offerAndWait(
-          workflowSnapshot({
-            uuid: "00000000-0000-4000-8000-000000001042",
-            state: "done",
-            label: "alpha:new-response",
+          workflowNotification({
+            uuid: "00000000-0000-4000-8000-000000003004",
+            status: "completed",
           }),
         );
-        yield* harness.until(() => {
-          const member = workflowCoordinatorEvents(harness.events).at(-1)?.subagent.workflow
-            ?.agents[0];
-          return (
-            member?.label === "alpha:new-response" &&
-            member.effort === undefined &&
-            member.speed === undefined
+        yield* Queue.take(harness.continuationReceipts);
+        if (arrival === "completion before buffered start") {
+          yield* harness.offerAndWait(
+            taskStart("toolu-initial", "Initial work.", "00000000-0000-4000-8000-000000003005"),
           );
-        });
-        yield* harness.offerAndWait(
-          makeResultFrame({ uuid: "00000000-0000-4000-8000-000000001043", result: "Done." }),
-        );
+        } else {
+          yield* harness.offerAndWait(
+            taskFinished(
+              "toolu-initial",
+              "Initial result.",
+              "00000000-0000-4000-8000-000000003005",
+            ),
+          );
+        }
+        if (arrival === "root result") {
+          yield* harness.offerAndWait(
+            claudeSdkFrame({
+              type: "system",
+              subtype: "init",
+              session_id: WAKE_NATIVE_SESSION,
+              uuid: "00000000-0000-4000-8000-000000003006",
+            }),
+          );
+        }
+        pauseDigest = true;
+        const replay = yield* harness.runtime
+          .startTurn(
+            makeClaudeTestTurnInput({
+              threadId: harness.threadId,
+              providerThread: harness.providerThread,
+              now: yield* DateTime.now,
+              attemptId: RunAttemptId.make("attempt-workflow-replay-continuation"),
+              providerTurnOrdinal: 2,
+              text: "Continue.",
+              attachments: [],
+              messageCreatedBy: "agent",
+              messageCreationSource: "provider",
+            }),
+          )
+          .pipe(Effect.forkScoped);
+        yield* Deferred.await(digestStarted);
+        const liveFrames = yield* Effect.gen(function* () {
+          if (arrival === "completion before buffered start") {
+            yield* harness.offerAndWait(
+              taskFinished(
+                "toolu-initial",
+                "Initial result.",
+                "00000000-0000-4000-8000-000000003007",
+              ),
+              liveFrameOffered,
+            );
+            return;
+          }
+          yield* harness.offerAndWait(
+            claudeSdkFrame({
+              ...makeResultFrame({
+                uuid: "00000000-0000-4000-8000-000000003008",
+                result: "Native wake turn finished.",
+              }),
+              origin: { kind: "task-notification" },
+              num_turns: 1,
+            }),
+            liveFrameOffered,
+          );
+          if (arrival === "resume after root result") {
+            yield* harness.offerAndWait(
+              claudeSdkFrame({
+                type: "system",
+                subtype: "init",
+                session_id: WAKE_NATIVE_SESSION,
+                uuid: "00000000-0000-4000-8000-000000003009",
+              }),
+            );
+            yield* harness.offerAndWait(
+              taskStart(
+                "toolu-latest",
+                "Latest live resume.",
+                "00000000-0000-4000-8000-000000003010",
+              ),
+            );
+          }
+        }).pipe(Effect.forkScoped);
+        yield* Deferred.await(liveFrameOffered);
+        yield* Deferred.succeed(releaseDigest, undefined);
+        yield* Fiber.join(replay);
+        yield* Fiber.join(liveFrames);
+        if (arrival === "resume after root result") {
+          yield* Queue.take(harness.terminalReceipts);
+          yield* Queue.take(harness.continuationReceipts);
+          yield* harness.runtime.startTurn(
+            makeClaudeTestTurnInput({
+              threadId: harness.threadId,
+              providerThread: harness.providerThread,
+              now: yield* DateTime.now,
+              attemptId: RunAttemptId.make("attempt-workflow-replay-resume-continuation"),
+              providerTurnOrdinal: 3,
+              text: "Continue.",
+              attachments: [],
+              messageCreatedBy: "agent",
+              messageCreationSource: "provider",
+            }),
+          );
+        }
+        if (arrival !== "root result") {
+          yield* harness.offerAndWait(
+            makeResultFrame({
+              uuid: "00000000-0000-4000-8000-000000003011",
+              result: "Workflow answer delivered.",
+            }),
+          );
+        }
         yield* Queue.take(harness.terminalReceipts);
-        const member = workflowCoordinatorEvents(harness.events).at(-1)?.subagent.workflow
-          ?.agents[0];
-        assert.isUndefined(member?.effort);
-        assert.isUndefined(member?.speed);
-        const childThreadId = member?.childThreadId;
-        assert.deepEqual(
-          threadMessages(harness.events, childThreadId)
-            .filter((event) => event.message.role === "assistant")
-            .map((event) => event.message.text),
-          ["A1 from the transcript", "New answer without metadata"],
-        );
+        const latest = harness.events
+          .flatMap((event) =>
+            event.type === "subagent.updated" && event.subagent.nativeTaskRef?.nativeId === taskId
+              ? [event.subagent]
+              : [],
+          )
+          .at(-1);
+        if (arrival === "resume after root result") {
+          assert.equal(latest?.status, "running");
+          assert.equal(latest?.prompt, "Latest live resume.");
+          assert.isNull(latest?.result);
+          assert.isTrue(yield* harness.hasPendingBackgroundWork);
+        } else {
+          assert.equal(latest?.status, "completed");
+          assert.equal(latest?.result, "Initial result.");
+          assert.isFalse(yield* harness.hasPendingBackgroundWork);
+          assert.lengthOf(harness.continuationRequests, 1);
+          yield* harness.runtime.startTurn(
+            makeClaudeTestTurnInput({
+              threadId: harness.threadId,
+              providerThread: harness.providerThread,
+              now: yield* DateTime.now,
+              attemptId: RunAttemptId.make("attempt-workflow-replay-next-user"),
+              providerTurnOrdinal: 3,
+              text: "Next task.",
+              attachments: [],
+            }),
+          );
+        }
       }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
-          ),
+        Effect.provideService(WorkflowAgentTranscriptReadObserver, () =>
+          Effect.gen(function* () {
+            if (pauseDigest) {
+              pauseDigest = false;
+              yield* Deferred.succeed(digestStarted, undefined);
+              yield* Deferred.await(releaseDigest);
+            }
+          }),
+        ),
+      );
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
         ),
       ),
     ),
   );
 
-  it.effect("answers settled workflow members from a transcript, or the snapshot excerpt", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const harness = yield* makeWorkflowHarness;
-        const now = yield* DateTime.now;
-
-        yield* harness.runtime.startTurn(
-          makeClaudeTestTurnInput({
-            threadId: harness.threadId,
-            providerThread: harness.providerThread,
-            now,
-            attemptId: RunAttemptId.make("attempt-claude-workflow-settled"),
-            text: "Run the alpha workflow in the background.",
-            attachments: [],
-          }),
-        );
-        yield* launchWorkflow({ harness, snapshotUuid: "00000000-0000-4000-8000-000000001007" });
-        const firstThreadId = workflowMemberEvents(harness.events, 1)[0]?.subagent.childThreadId;
-        const secondThreadId = workflowMemberEvents(harness.events, 2)[0]?.subagent.childThreadId;
-        const currentAssistantAnswers = () => [
-          ...new Map(
-            threadMessages(harness.events, firstThreadId)
-              .filter((event) => event.message.role === "assistant")
-              .map((event) => [event.message.id, event.message.text]),
-          ).values(),
-        ];
-        yield* Queue.offer(
-          harness.sdkMessages,
-          makeResultFrame({
-            uuid: "00000000-0000-4000-8000-000000001008",
-            result: "Launched the workflow.",
-          }),
-        );
-        yield* Queue.take(harness.terminalReceipts);
+  it.effect("preserves buffered workflow outcomes when interrupted during replay", () =>
+    Effect.gen(function* () {
+      const digestStarted = yield* Deferred.make<void>();
+      const releaseDigest = yield* Deferred.make<void>();
+      let pauseDigest = false;
+      yield* Effect.gen(function* () {
+        const harness = yield* makeWorkflowHarnessWithOptions({ close: Queue.shutdown });
+        const secondTaskId = "task-workflow-buffered-completion";
+        const secondToolUseId = "toolu-workflow-buffered-completion";
         yield* harness.runtime.startTurn(
           makeClaudeTestTurnInput({
             threadId: harness.threadId,
             providerThread: harness.providerThread,
-            now,
-            attemptId: RunAttemptId.make("attempt-unrelated-failure"),
-            text: "Do another task.",
+            now: yield* DateTime.now,
+            attemptId: RunAttemptId.make("attempt-workflow-buffered-launch"),
+            text: "Run both workflows.",
             attachments: [],
-            providerTurnOrdinal: 2,
-          }),
-        );
-        yield* Queue.offer(
-          harness.sdkMessages,
-          makeResultFrame({
-            uuid: "00000000-0000-4000-8000-000000001014",
-            result: "Another task failed.",
-            terminalReason: "api_error",
-            isError: true,
           }),
         );
-        yield* Queue.take(harness.terminalReceipts);
-        assert.equal(workflowCoordinatorEvents(harness.events).at(-1)?.subagent.status, "running");
-        assert.equal(workflowMemberEvents(harness.events, 1).at(-1)?.subagent.status, "running");
-
-        yield* Queue.offer(
-          harness.sdkMessages,
-          workflowSnapshot({ uuid: "00000000-0000-4000-8000-000000001009", state: "done" }),
-        );
-        yield* harness.until(() => threadMessages(harness.events, secondThreadId).length === 2);
-
-        yield* harness.until(
-          () =>
-            workflowCoordinatorEvents(harness.events).at(-1)?.subagent.workflow?.agents[0]
-              ?.effort === "xhigh",
-        );
-        const coordinator = workflowCoordinatorEvents(harness.events).at(-1)!.subagent;
-        assert.deepEqual(
-          coordinator.workflow?.agents.map((member) => member.state),
-          ["completed", "completed"],
-        );
-        assert.equal(coordinator.workflow?.agents[0]?.speed, "standard");
-        assert.isUndefined(coordinator.workflow?.agents[1]?.effort);
-        assert.isUndefined(coordinator.workflow?.agents[1]?.speed);
-        assert.equal(workflowMemberEvents(harness.events, 1).at(-1)?.subagent.status, "completed");
-        assert.equal(workflowMemberEvents(harness.events, 2).at(-1)?.subagent.status, "completed");
-        assert.deepEqual(
-          workflowMemberEvents(harness.events, 1).at(-1)?.subagent.completedAt,
-          yield* DateTime.now,
-        );
-        assert.deepEqual(
-          threadMessages(harness.events, firstThreadId).map((event) => event.message.text),
-          ["Reply with exactly: A1", "A1 from the transcript"],
-        );
-        assert.deepEqual(
-          threadMessages(harness.events, secondThreadId).map((event) => event.message.text),
-          ["Reply with exactly: A2", "Partial answer from workflow progress:\n\nA2 excerpt"],
-        );
-        const coordinatorEventsBeforeRepeat = workflowCoordinatorEvents(harness.events).length;
-        const memberEventsBeforeRepeat = workflowMemberEvents(harness.events, 2).length;
-        NodeFS.appendFileSync(
-          NodePath.join(harness.transcriptDir, "agent-a1.jsonl"),
-          '{"type":"assistant","uuid":"wf-line-4","message":{"role":"assistant","stop_reason":"end_turn","id":"msg_a1","content":[{"type":"text","text":"A1 continued"}]}}\n',
-        );
+        yield* launchWorkflow({
+          harness,
+          snapshotUuid: "00000000-0000-4000-8000-000000003100",
+        });
         yield* harness.offerAndWait(
-          workflowSnapshot({ uuid: "00000000-0000-4000-8000-000000001015", state: "done" }),
-        );
-        yield* harness.until(
-          () => workflowCoordinatorEvents(harness.events).length > coordinatorEventsBeforeRepeat,
-        );
-        yield* harness.until(
-          () =>
-            threadMessages(harness.events, firstThreadId).at(-1)?.message.text === "A1 continued",
-        );
-        assert.lengthOf(workflowMemberEvents(harness.events, 2), memberEventsBeforeRepeat);
-        assert.lengthOf(threadMessages(harness.events, secondThreadId), 2);
-        assert.deepEqual(currentAssistantAnswers(), ["A1 from the transcript", "A1 continued"]);
-        NodeFS.writeFileSync(
-          NodePath.join(harness.transcriptDir, "agent-a2.jsonl"),
-          '{"type":"assistant","uuid":"wf-line-5","message":{"role":"assistant","stop_reason":"end_turn","id":"msg_a2","content":[{"type":"text","text":"A2 from the transcript"}]}}\n',
+          claudeSdkFrame({
+            ...workflowTaskStarted,
+            task_id: secondTaskId,
+            tool_use_id: secondToolUseId,
+            uuid: "00000000-0000-4000-8000-000000003101",
+          }),
         );
         yield* harness.offerAndWait(
-          workflowSnapshot({ uuid: "00000000-0000-4000-8000-000000001016", state: "done" }),
-        );
-        yield* harness.until(() => threadMessages(harness.events, secondThreadId).length === 3);
-        assert.lengthOf(workflowMemberEvents(harness.events, 2), memberEventsBeforeRepeat);
-        assert.equal(
-          threadMessages(harness.events, secondThreadId).at(-1)?.message.text,
-          "A2 from the transcript",
-        );
-        const previousStartedAt = workflowMemberEvents(harness.events, 1).at(-1)?.subagent
-          .startedAt;
-        yield* TestClock.adjust(1_000);
-        NodeFS.writeFileSync(
-          NodePath.join(harness.transcriptDir, "agent-a1.jsonl"),
-          [
-            '{"type":"assistant","uuid":"wf-line-6","message":{"role":"assistant","stop_reason":"end_turn","id":"msg_first","content":[{"type":"text","text":"First answer"}]}}',
-            '{"type":"assistant","uuid":"wf-line-7","message":{"role":"assistant","stop_reason":"end_turn","id":"msg_second","content":[{"type":"text","text":"Second answer"}]}}',
-          ].join("\n") + "\n",
+          claudeSdkFrame({
+            ...workflowSnapshot({
+              uuid: "00000000-0000-4000-8000-000000003102",
+              state: "start",
+            }),
+            task_id: secondTaskId,
+            tool_use_id: secondToolUseId,
+          }),
         );
         yield* harness.offerAndWait(
-          workflowSnapshot({
-            uuid: "00000000-0000-4000-8000-000000001018",
-            state: "done",
-            attempt: 2,
-            startedAt: 1000,
-            durationMs: 500,
-            lastProgressAt: 4432,
+          makeResultFrame({
+            uuid: "00000000-0000-4000-8000-000000003103",
+            result: "Launched both workflows.",
           }),
         );
-        yield* harness.until(() =>
-          currentAssistantAnswers().join("\n\n").includes("Second answer"),
-        );
-        assert.deepEqual(currentAssistantAnswers().slice(-2), ["First answer", "Second answer"]);
-        const completedMember = workflowMemberEvents(harness.events, 1).at(-1)?.subagent;
-        assert.equal(
-          completedMember?.completedAt && DateTime.toEpochMillis(completedMember.completedAt),
-          4432,
-        );
-        assert.isUndefined(
-          workflowCoordinatorEvents(harness.events).at(-1)?.subagent.workflow?.agents[0]?.effort,
-        );
-        assert.isUndefined(
-          workflowCoordinatorEvents(harness.events).at(-1)?.subagent.workflow?.agents[0]?.speed,
-        );
-        assert.notDeepEqual(
-          workflowMemberEvents(harness.events, 1).at(-1)?.subagent.startedAt,
-          previousStartedAt,
-        );
+        yield* Queue.take(harness.terminalReceipts);
         yield* harness.offerAndWait(
-          workflowSnapshot({
-            uuid: "00000000-0000-4000-8000-000000001019",
-            state: "start",
-            attempt: 3,
+          workflowNotification({
+            uuid: "00000000-0000-4000-8000-000000003104",
+            status: "completed",
           }),
         );
-        assert.equal(workflowMemberEvents(harness.events, 1).at(-1)?.subagent.status, "running");
-        assert.isNull(workflowMemberEvents(harness.events, 1).at(-1)?.subagent.completedAt);
-        yield* Queue.offer(
-          harness.sdkMessages,
-          workflowSnapshot({
-            uuid: "00000000-0000-4000-8000-000000001020",
-            state: "start",
-            attempt: 3,
+        yield* Queue.take(harness.continuationReceipts);
+        yield* harness.offerAndWait(
+          claudeSdkFrame({
+            ...workflowNotification({
+              uuid: "00000000-0000-4000-8000-000000003105",
+              status: "completed",
+            }),
+            task_id: secondTaskId,
+            tool_use_id: secondToolUseId,
           }),
         );
-        NodeFS.writeFileSync(
-          NodePath.join(harness.transcriptDir, "agent-a1.jsonl"),
-          '{"type":"assistant","uuid":"wf-line-8","message":{"role":"assistant","stop_reason":"end_turn","id":"msg_retry","content":[{"type":"text","text":"A1 retry answer"}]}}\n',
-        );
-        yield* Queue.offer(
-          harness.sdkMessages,
-          workflowSnapshot({
-            uuid: "00000000-0000-4000-8000-000000001021",
-            state: "done",
-            attempt: 3,
+        const continuationInput = makeClaudeTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now: yield* DateTime.now,
+          attemptId: RunAttemptId.make("attempt-workflow-buffered-replay"),
+          providerTurnOrdinal: 2,
+          text: "Continue.",
+          attachments: [],
+          messageCreatedBy: "agent",
+          messageCreationSource: "provider",
+        });
+        pauseDigest = true;
+        const replay = yield* harness.runtime.startTurn(continuationInput).pipe(Effect.forkScoped);
+        yield* Deferred.await(digestStarted);
+        yield* harness.runtime.interruptTurn({
+          providerThread: harness.providerThread,
+          providerTurnId: (yield* IdAllocator.IdAllocatorV2).derive.providerTurn({
+            driver: ClaudeAdapterV2.CLAUDE_PROVIDER,
+            nativeTurnId: `turn:${continuationInput.attemptId}`,
           }),
-        );
-        yield* harness.until(
-          () =>
-            threadMessages(harness.events, firstThreadId).at(-1)?.message.text ===
-            "A1 retry answer",
-        );
-        assert.equal(currentAssistantAnswers().at(-1), "A1 retry answer");
-        NodeFS.rmSync(NodePath.join(harness.transcriptDir, "agent-a1.jsonl"));
-        yield* Queue.offer(
-          harness.sdkMessages,
-          workflowSnapshot({
-            uuid: "00000000-0000-4000-8000-000000001022",
-            state: "start",
-            attempt: 4,
+        });
+        yield* Deferred.succeed(releaseDigest, undefined);
+        yield* Fiber.join(replay);
+        const second = harness.events
+          .flatMap((event) =>
+            event.type === "subagent.updated" &&
+            event.subagent.nativeTaskRef?.nativeId === secondTaskId
+              ? [event.subagent]
+              : [],
+          )
+          .at(-1);
+        assert.equal(second?.status, "completed");
+        assert.equal(second?.result, "Workflow finished.");
+      }).pipe(
+        Effect.provideService(WorkflowAgentTranscriptReadObserver, () =>
+          Effect.gen(function* () {
+            if (pauseDigest) {
+              pauseDigest = false;
+              yield* Deferred.succeed(digestStarted, undefined);
+              yield* Deferred.await(releaseDigest);
+            }
           }),
-        );
-        yield* harness.until(
-          () =>
-            workflowCoordinatorEvents(harness.events).at(-1)?.subagent.workflow?.agents[0]
-              ?.attempt === 4,
-        );
-        const answersBeforeEmptyAttempt = currentAssistantAnswers();
+        ),
+      );
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
+        ),
+      ),
+    ),
+  );
+
+  it.effect.each([
+    ["api_error", false, false],
+    ["aborted_streaming", false, false],
+    ["api_error", true, false],
+    ["api_error", false, true],
+    ["aborted_streaming", false, true],
+  ] as const)(
+    "stops the run's live workflow after root result %s, continuation=%s, pending Stop=%s",
+    ([terminalReason, continuation, pendingStop]) =>
+      Effect.gen(function* () {
+        const stoppedTasks: Array<string> = [];
+        const stopRequested = yield* Deferred.make<void>();
+        const harness = yield* makeWorkflowHarnessWithOptions({
+          stopTask: (taskId) =>
+            Effect.sync(() => void stoppedTasks.push(taskId)).pipe(
+              Effect.andThen(Deferred.succeed(stopRequested, undefined)),
+              Effect.asVoid,
+            ),
+        });
+        const now = yield* DateTime.now;
+        const turnInput = {
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now,
+          attemptId: RunAttemptId.make("attempt-claude-workflow-root-failure"),
+          text: "Run the workflow.",
+          attachments: [],
+        };
+        yield* harness.runtime.startTurn(makeClaudeTestTurnInput(turnInput));
+        yield* launchWorkflow({ harness, snapshotUuid: "00000000-0000-4000-8000-000000001050" });
+        const stopping = pendingStop
+          ? yield* harness.runtime.stopSubagent!({
+              providerThread: harness.providerThread,
+              nativeTaskId: WORKFLOW_TASK_ID,
+            }).pipe(Effect.exit, Effect.forkScoped)
+          : undefined;
+        if (pendingStop) yield* Deferred.await(stopRequested);
+        if (continuation) {
+          yield* harness.offerAndWait(
+            makeResultFrame({
+              uuid: "00000000-0000-4000-8000-000000001051",
+              result: "Launched.",
+            }),
+          );
+          yield* Queue.take(harness.terminalReceipts);
+          yield* harness.offerAndWait(
+            claudeSdkFrame({
+              ...workflowTaskStarted,
+              uuid: "00000000-0000-4000-8000-000000001052",
+            }),
+          );
+        }
         yield* harness.offerAndWait(
-          workflowSnapshot({
-            uuid: "00000000-0000-4000-8000-000000001023",
-            state: "done",
-            attempt: 4,
-            omitResult: true,
+          makeResultFrame({
+            uuid: "00000000-0000-4000-8000-000000001053",
+            result: "Root turn ended.",
+            terminalReason,
+            isError: terminalReason === "api_error",
           }),
         );
-        assert.equal(workflowMemberEvents(harness.events, 1).at(-1)?.subagent.status, "completed");
+        if (continuation) {
+          yield* harness.runtime.startTurn(
+            makeClaudeTestTurnInput({
+              ...turnInput,
+              attemptId: RunAttemptId.make("attempt-claude-workflow-root-failure-wake"),
+              providerTurnOrdinal: 2,
+              messageCreatedBy: "agent",
+              messageCreationSource: "provider",
+            }),
+          );
+        }
+        const terminal = yield* Queue.take(harness.terminalReceipts);
+        assert.equal(terminal.status, terminalReason === "api_error" ? "failed" : "interrupted");
+        assert.equal(terminal.threadDisposition, "reusable");
+        const settled = terminalReason === "api_error" ? "failed" : "cancelled";
         assert.deepEqual(
-          currentAssistantAnswers(),
-          answersBeforeEmptyAttempt,
-          "an attempt with no transcript and no excerpt adds nothing",
+          stoppedTasks,
+          pendingStop ? [WORKFLOW_TASK_ID, WORKFLOW_TASK_ID] : [WORKFLOW_TASK_ID],
         );
+        if (stopping !== undefined) {
+          yield* TestClock.adjust("2 seconds");
+          assert.isTrue(Exit.isFailure(yield* Fiber.join(stopping)));
+          const retry = yield* harness.runtime.stopSubagent!({
+            providerThread: harness.providerThread,
+            nativeTaskId: WORKFLOW_TASK_ID,
+          }).pipe(Effect.exit, Effect.forkScoped);
+          yield* TestClock.adjust("2 seconds");
+          assert.isTrue(Exit.isFailure(yield* Fiber.join(retry)));
+        }
+        assert.isFalse(yield* harness.hasPendingBackgroundWork);
+        assert.equal(workflowCoordinatorEvents(harness.events).at(-1)?.subagent.status, settled);
+        for (const index of [1, 2]) {
+          assert.equal(
+            workflowMemberEvents(harness.events, index).at(-1)?.subagent.status,
+            settled,
+          );
+        }
       }).pipe(
         Effect.provide(
           Layer.mergeAll(
@@ -21581,6 +21261,330 @@ describe("ClaudeAdapterV2 background wake turns", () => {
           ),
         ),
       ),
+  );
+
+  it.effect("clears workflow member metadata only after a successful transcript read", () =>
+    Effect.gen(function* () {
+      const harness = yield* makeWorkflowHarness;
+      const now = yield* DateTime.now;
+      yield* harness.runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now,
+          attemptId: RunAttemptId.make("attempt-claude-workflow-metadata"),
+          text: "Run the alpha workflow in the background.",
+          attachments: [],
+        }),
+      );
+      yield* harness.offerAndWait(workflowToolUse);
+      yield* harness.offerAndWait(workflowTaskStarted);
+      yield* harness.offerAndWait(workflowLaunchAck(harness.transcriptDir));
+      yield* harness.offerAndWait(
+        workflowSnapshot({ uuid: "00000000-0000-4000-8000-000000001040", state: "done" }),
+      );
+      yield* harness.until(
+        () =>
+          workflowCoordinatorEvents(harness.events).at(-1)?.subagent.workflow?.agents[0]?.effort ===
+          "xhigh",
+      );
+      let coordinator = workflowCoordinatorEvents(harness.events).at(-1)!.subagent;
+      assert.equal(coordinator.workflow?.agents[0]?.speed, "standard");
+
+      const transcriptPath = NodePath.join(harness.transcriptDir, "agent-a1.jsonl");
+      NodeFS.renameSync(transcriptPath, `${transcriptPath}.saved`);
+      yield* harness.offerAndWait(
+        workflowSnapshot({
+          uuid: "00000000-0000-4000-8000-000000001041",
+          state: "done",
+          label: "alpha:unreadable",
+        }),
+      );
+      yield* harness.until(
+        () =>
+          workflowCoordinatorEvents(harness.events).at(-1)?.subagent.workflow?.agents[0]?.label ===
+          "alpha:unreadable",
+      );
+      coordinator = workflowCoordinatorEvents(harness.events).at(-1)!.subagent;
+      assert.equal(coordinator.workflow?.agents[0]?.effort, "xhigh");
+      assert.equal(coordinator.workflow?.agents[0]?.speed, "standard");
+
+      NodeFS.renameSync(`${transcriptPath}.saved`, transcriptPath);
+      NodeFS.appendFileSync(
+        transcriptPath,
+        '{"type":"assistant","uuid":"wf-metadata-cleared","message":{"role":"assistant","stop_reason":"end_turn","id":"msg_new","content":[{"type":"text","text":"New answer without metadata"}]}}\n',
+      );
+      yield* harness.offerAndWait(
+        workflowSnapshot({
+          uuid: "00000000-0000-4000-8000-000000001042",
+          state: "done",
+          label: "alpha:new-response",
+        }),
+      );
+      yield* harness.until(() => {
+        const member = workflowCoordinatorEvents(harness.events).at(-1)?.subagent.workflow
+          ?.agents[0];
+        return (
+          member?.label === "alpha:new-response" &&
+          member.effort === undefined &&
+          member.speed === undefined
+        );
+      });
+      yield* harness.offerAndWait(
+        makeResultFrame({ uuid: "00000000-0000-4000-8000-000000001043", result: "Done." }),
+      );
+      yield* Queue.take(harness.terminalReceipts);
+      const member = workflowCoordinatorEvents(harness.events).at(-1)?.subagent.workflow?.agents[0];
+      assert.isUndefined(member?.effort);
+      assert.isUndefined(member?.speed);
+      const childThreadId = member?.childThreadId;
+      assert.deepEqual(
+        threadMessages(harness.events, childThreadId)
+          .filter((event) => event.message.role === "assistant")
+          .map((event) => event.message.text),
+        ["A1 from the transcript", "New answer without metadata"],
+      );
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
+        ),
+      ),
+    ),
+  );
+
+  it.effect("answers settled workflow members from a transcript, or the snapshot excerpt", () =>
+    Effect.gen(function* () {
+      const harness = yield* makeWorkflowHarness;
+      const now = yield* DateTime.now;
+
+      yield* harness.runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now,
+          attemptId: RunAttemptId.make("attempt-claude-workflow-settled"),
+          text: "Run the alpha workflow in the background.",
+          attachments: [],
+        }),
+      );
+      yield* launchWorkflow({ harness, snapshotUuid: "00000000-0000-4000-8000-000000001007" });
+      const firstThreadId = workflowMemberEvents(harness.events, 1)[0]?.subagent.childThreadId;
+      const secondThreadId = workflowMemberEvents(harness.events, 2)[0]?.subagent.childThreadId;
+      const currentAssistantAnswers = () => [
+        ...new Map(
+          threadMessages(harness.events, firstThreadId)
+            .filter((event) => event.message.role === "assistant")
+            .map((event) => [event.message.id, event.message.text]),
+        ).values(),
+      ];
+      yield* Queue.offer(
+        harness.sdkMessages,
+        makeResultFrame({
+          uuid: "00000000-0000-4000-8000-000000001008",
+          result: "Launched the workflow.",
+        }),
+      );
+      yield* Queue.take(harness.terminalReceipts);
+      yield* harness.runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now,
+          attemptId: RunAttemptId.make("attempt-unrelated-failure"),
+          text: "Do another task.",
+          attachments: [],
+          providerTurnOrdinal: 2,
+        }),
+      );
+      yield* Queue.offer(
+        harness.sdkMessages,
+        makeResultFrame({
+          uuid: "00000000-0000-4000-8000-000000001014",
+          result: "Another task failed.",
+          terminalReason: "api_error",
+          isError: true,
+        }),
+      );
+      yield* Queue.take(harness.terminalReceipts);
+      assert.equal(workflowCoordinatorEvents(harness.events).at(-1)?.subagent.status, "running");
+      assert.equal(workflowMemberEvents(harness.events, 1).at(-1)?.subagent.status, "running");
+
+      yield* Queue.offer(
+        harness.sdkMessages,
+        workflowSnapshot({ uuid: "00000000-0000-4000-8000-000000001009", state: "done" }),
+      );
+      yield* harness.until(() => threadMessages(harness.events, secondThreadId).length === 2);
+
+      yield* harness.until(
+        () =>
+          workflowCoordinatorEvents(harness.events).at(-1)?.subagent.workflow?.agents[0]?.effort ===
+          "xhigh",
+      );
+      const coordinator = workflowCoordinatorEvents(harness.events).at(-1)!.subagent;
+      assert.deepEqual(
+        coordinator.workflow?.agents.map((member) => member.state),
+        ["completed", "completed"],
+      );
+      assert.equal(coordinator.workflow?.agents[0]?.speed, "standard");
+      assert.isUndefined(coordinator.workflow?.agents[1]?.effort);
+      assert.isUndefined(coordinator.workflow?.agents[1]?.speed);
+      assert.equal(workflowMemberEvents(harness.events, 1).at(-1)?.subagent.status, "completed");
+      assert.equal(workflowMemberEvents(harness.events, 2).at(-1)?.subagent.status, "completed");
+      assert.deepEqual(
+        workflowMemberEvents(harness.events, 1).at(-1)?.subagent.completedAt,
+        yield* DateTime.now,
+      );
+      assert.deepEqual(
+        threadMessages(harness.events, firstThreadId).map((event) => event.message.text),
+        ["Reply with exactly: A1", "A1 from the transcript"],
+      );
+      assert.deepEqual(
+        threadMessages(harness.events, secondThreadId).map((event) => event.message.text),
+        ["Reply with exactly: A2", "Partial answer from workflow progress:\n\nA2 excerpt"],
+      );
+      const coordinatorEventsBeforeRepeat = workflowCoordinatorEvents(harness.events).length;
+      const memberEventsBeforeRepeat = workflowMemberEvents(harness.events, 2).length;
+      NodeFS.appendFileSync(
+        NodePath.join(harness.transcriptDir, "agent-a1.jsonl"),
+        '{"type":"assistant","uuid":"wf-line-4","message":{"role":"assistant","stop_reason":"end_turn","id":"msg_a1","content":[{"type":"text","text":"A1 continued"}]}}\n',
+      );
+      yield* harness.offerAndWait(
+        workflowSnapshot({ uuid: "00000000-0000-4000-8000-000000001015", state: "done" }),
+      );
+      yield* harness.until(
+        () => workflowCoordinatorEvents(harness.events).length > coordinatorEventsBeforeRepeat,
+      );
+      yield* harness.until(
+        () => threadMessages(harness.events, firstThreadId).at(-1)?.message.text === "A1 continued",
+      );
+      assert.lengthOf(workflowMemberEvents(harness.events, 2), memberEventsBeforeRepeat);
+      assert.lengthOf(threadMessages(harness.events, secondThreadId), 2);
+      assert.deepEqual(currentAssistantAnswers(), ["A1 from the transcript", "A1 continued"]);
+      NodeFS.writeFileSync(
+        NodePath.join(harness.transcriptDir, "agent-a2.jsonl"),
+        '{"type":"assistant","uuid":"wf-line-5","message":{"role":"assistant","stop_reason":"end_turn","id":"msg_a2","content":[{"type":"text","text":"A2 from the transcript"}]}}\n',
+      );
+      yield* harness.offerAndWait(
+        workflowSnapshot({ uuid: "00000000-0000-4000-8000-000000001016", state: "done" }),
+      );
+      yield* harness.until(() => threadMessages(harness.events, secondThreadId).length === 3);
+      assert.lengthOf(workflowMemberEvents(harness.events, 2), memberEventsBeforeRepeat);
+      assert.equal(
+        threadMessages(harness.events, secondThreadId).at(-1)?.message.text,
+        "A2 from the transcript",
+      );
+      const previousStartedAt = workflowMemberEvents(harness.events, 1).at(-1)?.subagent.startedAt;
+      yield* TestClock.adjust(1_000);
+      NodeFS.writeFileSync(
+        NodePath.join(harness.transcriptDir, "agent-a1.jsonl"),
+        [
+          '{"type":"assistant","uuid":"wf-line-6","message":{"role":"assistant","stop_reason":"end_turn","id":"msg_first","content":[{"type":"text","text":"First answer"}]}}',
+          '{"type":"assistant","uuid":"wf-line-7","message":{"role":"assistant","stop_reason":"end_turn","id":"msg_second","content":[{"type":"text","text":"Second answer"}]}}',
+        ].join("\n") + "\n",
+      );
+      yield* harness.offerAndWait(
+        workflowSnapshot({
+          uuid: "00000000-0000-4000-8000-000000001018",
+          state: "done",
+          attempt: 2,
+          startedAt: 1000,
+          durationMs: 500,
+          lastProgressAt: 4432,
+        }),
+      );
+      yield* harness.until(() => currentAssistantAnswers().join("\n\n").includes("Second answer"));
+      assert.deepEqual(currentAssistantAnswers().slice(-2), ["First answer", "Second answer"]);
+      const completedMember = workflowMemberEvents(harness.events, 1).at(-1)?.subagent;
+      assert.equal(
+        completedMember?.completedAt && DateTime.toEpochMillis(completedMember.completedAt),
+        4432,
+      );
+      assert.isUndefined(
+        workflowCoordinatorEvents(harness.events).at(-1)?.subagent.workflow?.agents[0]?.effort,
+      );
+      assert.isUndefined(
+        workflowCoordinatorEvents(harness.events).at(-1)?.subagent.workflow?.agents[0]?.speed,
+      );
+      assert.notDeepEqual(
+        workflowMemberEvents(harness.events, 1).at(-1)?.subagent.startedAt,
+        previousStartedAt,
+      );
+      yield* harness.offerAndWait(
+        workflowSnapshot({
+          uuid: "00000000-0000-4000-8000-000000001019",
+          state: "start",
+          attempt: 3,
+        }),
+      );
+      assert.equal(workflowMemberEvents(harness.events, 1).at(-1)?.subagent.status, "running");
+      assert.isNull(workflowMemberEvents(harness.events, 1).at(-1)?.subagent.completedAt);
+      yield* Queue.offer(
+        harness.sdkMessages,
+        workflowSnapshot({
+          uuid: "00000000-0000-4000-8000-000000001020",
+          state: "start",
+          attempt: 3,
+        }),
+      );
+      NodeFS.writeFileSync(
+        NodePath.join(harness.transcriptDir, "agent-a1.jsonl"),
+        '{"type":"assistant","uuid":"wf-line-8","message":{"role":"assistant","stop_reason":"end_turn","id":"msg_retry","content":[{"type":"text","text":"A1 retry answer"}]}}\n',
+      );
+      yield* Queue.offer(
+        harness.sdkMessages,
+        workflowSnapshot({
+          uuid: "00000000-0000-4000-8000-000000001021",
+          state: "done",
+          attempt: 3,
+        }),
+      );
+      yield* harness.until(
+        () =>
+          threadMessages(harness.events, firstThreadId).at(-1)?.message.text === "A1 retry answer",
+      );
+      assert.equal(currentAssistantAnswers().at(-1), "A1 retry answer");
+      NodeFS.rmSync(NodePath.join(harness.transcriptDir, "agent-a1.jsonl"));
+      yield* Queue.offer(
+        harness.sdkMessages,
+        workflowSnapshot({
+          uuid: "00000000-0000-4000-8000-000000001022",
+          state: "start",
+          attempt: 4,
+        }),
+      );
+      yield* harness.until(
+        () =>
+          workflowCoordinatorEvents(harness.events).at(-1)?.subagent.workflow?.agents[0]
+            ?.attempt === 4,
+      );
+      const answersBeforeEmptyAttempt = currentAssistantAnswers();
+      yield* harness.offerAndWait(
+        workflowSnapshot({
+          uuid: "00000000-0000-4000-8000-000000001023",
+          state: "done",
+          attempt: 4,
+          omitResult: true,
+        }),
+      );
+      assert.equal(workflowMemberEvents(harness.events, 1).at(-1)?.subagent.status, "completed");
+      assert.deepEqual(
+        currentAssistantAnswers(),
+        answersBeforeEmptyAttempt,
+        "an attempt with no transcript and no excerpt adds nothing",
+      );
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
+        ),
+      ),
     ),
   );
 
@@ -21667,289 +21671,276 @@ describe("ClaudeAdapterV2 background wake turns", () => {
           : `${item.type} ${item.status}`;
 
   it.effect("streams a running workflow member's conversation from its transcript", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const reads: Array<{
-          readonly startOffset: number;
-          readonly endOffset: number;
-          readonly lineCount: number;
-        }> = [];
-        yield* Effect.gen(function* () {
-          const harness = yield* makeWorkflowHarness;
-          const transcriptPath = NodePath.join(harness.transcriptDir, "agent-a1.jsonl");
-          NodeFS.writeFileSync(transcriptPath, memberTranscript);
-          yield* harness.runtime.startTurn(
-            makeClaudeTestTurnInput({
-              threadId: harness.threadId,
-              providerThread: harness.providerThread,
-              now: yield* DateTime.now,
-              attemptId: RunAttemptId.make("attempt-claude-workflow-live-stream"),
-              text: "Run the alpha workflow.",
-              attachments: [],
-            }),
-          );
-          yield* launchWorkflow({ harness, snapshotUuid: "00000000-0000-4000-8000-000000001360" });
-          const threadId = workflowMemberEvents(harness.events, 1)[0]?.subagent.childThreadId;
-          const running = (uuid: string) => workflowSnapshot({ uuid, state: "start" });
-
-          assert.deepEqual(latestMemberThreadItems(harness.events, threadId).map(describeItem), [
-            "user_message",
-            "reasoning: List the files first.",
-            "command completed: README.md",
-            "assistant_message",
-          ]);
-          assert.deepEqual(
-            threadMessages(harness.events, threadId).map((event) => event.message.text),
-            ["Reply with exactly: A1", "A1 found README.md"],
-          );
-          assert.deepEqual(reads.at(-1), {
-            startOffset: 0,
-            endOffset: Buffer.byteLength(memberTranscript),
-            lineCount: 5,
-          });
-
-          const itemsBefore = memberThreadItems(harness.events, threadId).length;
-          const more = memberAssistantLine("line-more", "msg_a1_more", [
-            {
-              type: "tool_use",
-              id: "toolu_a1_cat",
-              name: "Bash",
-              input: { command: "cat README.md" },
-            },
-          ]);
-          const half = memberToolResultLine("line-cat-result", "toolu_a1_cat", "hello");
-          NodeFS.appendFileSync(transcriptPath, more + half.slice(0, 40));
-          yield* harness.offerAndWait(running("00000000-0000-4000-8000-000000001361"));
-          assert.deepEqual(reads.at(-1), {
-            startOffset: Buffer.byteLength(memberTranscript),
-            endOffset: Buffer.byteLength(memberTranscript + more),
-            lineCount: 1,
-          });
-          assert.deepEqual(
-            memberThreadItems(harness.events, threadId).slice(itemsBefore).map(describeItem),
-            ["command running: "],
-            "only the new line is projected; the half-written one waits",
-          );
-
-          NodeFS.appendFileSync(transcriptPath, half.slice(40));
-          yield* harness.offerAndWait(running("00000000-0000-4000-8000-000000001362"));
-          assert.deepEqual(reads.at(-1), {
-            startOffset: Buffer.byteLength(memberTranscript + more),
-            endOffset: Buffer.byteLength(memberTranscript + more + half),
-            lineCount: 1,
-          });
-          assert.deepEqual(
-            memberThreadItems(harness.events, threadId).slice(itemsBefore).map(describeItem),
-            ["command running: ", "command completed: hello"],
-          );
-
-          const itemsBeforeIdle = memberThreadItems(harness.events, threadId).length;
-          yield* harness.offerAndWait(running("00000000-0000-4000-8000-000000001363"));
-          assert.equal(reads.at(-1)?.lineCount, 0);
-          assert.lengthOf(memberThreadItems(harness.events, threadId), itemsBeforeIdle);
-
-          yield* harness.offerAndWait(
-            workflowSnapshot({ uuid: "00000000-0000-4000-8000-000000001364", state: "done" }),
-          );
-          assert.equal(
-            workflowMemberEvents(harness.events, 1).at(-1)?.subagent.status,
-            "completed",
-          );
-          assert.deepEqual(
-            threadMessages(harness.events, threadId).map((event) => event.message.text),
-            ["Reply with exactly: A1", "A1 found README.md"],
-            "the settled member adds no second copy of its answer",
-          );
-          yield* Queue.offer(
-            harness.sdkMessages,
-            makeResultFrame({ uuid: "00000000-0000-4000-8000-000000001365", result: "Done." }),
-          );
-          yield* Queue.take(harness.terminalReceipts);
-        }).pipe(
-          Effect.provideService(WorkflowAgentTranscriptReadObserver, (read) =>
-            Effect.sync(() => {
-              if (read.agentId === "a1") {
-                reads.push({
-                  startOffset: read.startOffset,
-                  endOffset: read.endOffset,
-                  lineCount: read.lineCount,
-                });
-              }
-            }),
-          ),
-        );
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
-          ),
-        ),
-      ),
-    ),
-  );
-
-  it.effect("interrupts the open tool calls of a workflow member that failed", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
+    Effect.gen(function* () {
+      const reads: Array<{
+        readonly startOffset: number;
+        readonly endOffset: number;
+        readonly lineCount: number;
+      }> = [];
+      yield* Effect.gen(function* () {
         const harness = yield* makeWorkflowHarness;
-        NodeFS.writeFileSync(
-          NodePath.join(harness.transcriptDir, "agent-a1.jsonl"),
-          memberAssistantLine("line-bash", "msg_a1", [
-            { type: "tool_use", id: "toolu_a1_ls", name: "Bash", input: { command: "ls" } },
-          ]),
-        );
+        const transcriptPath = NodePath.join(harness.transcriptDir, "agent-a1.jsonl");
+        NodeFS.writeFileSync(transcriptPath, memberTranscript);
         yield* harness.runtime.startTurn(
           makeClaudeTestTurnInput({
             threadId: harness.threadId,
             providerThread: harness.providerThread,
             now: yield* DateTime.now,
-            attemptId: RunAttemptId.make("attempt-claude-workflow-member-fails"),
+            attemptId: RunAttemptId.make("attempt-claude-workflow-live-stream"),
             text: "Run the alpha workflow.",
             attachments: [],
           }),
         );
-        yield* launchWorkflow({ harness, snapshotUuid: "00000000-0000-4000-8000-000000001370" });
+        yield* launchWorkflow({ harness, snapshotUuid: "00000000-0000-4000-8000-000000001360" });
         const threadId = workflowMemberEvents(harness.events, 1)[0]?.subagent.childThreadId;
+        const running = (uuid: string) => workflowSnapshot({ uuid, state: "start" });
+
         assert.deepEqual(latestMemberThreadItems(harness.events, threadId).map(describeItem), [
           "user_message",
-          "command running: ",
+          "reasoning: List the files first.",
+          "command completed: README.md",
+          "assistant_message",
         ]);
-        yield* harness.offerAndWait(
-          workflowNotification({ uuid: "00000000-0000-4000-8000-000000001371", status: "failed" }),
+        assert.deepEqual(
+          threadMessages(harness.events, threadId).map((event) => event.message.text),
+          ["Reply with exactly: A1", "A1 found README.md"],
         );
-        assert.equal(workflowMemberEvents(harness.events, 1).at(-1)?.subagent.status, "failed");
-        assert.deepEqual(latestMemberThreadItems(harness.events, threadId).map(describeItem), [
-          "user_message",
-          "command interrupted: ",
+        assert.deepEqual(reads.at(-1), {
+          startOffset: 0,
+          endOffset: Buffer.byteLength(memberTranscript),
+          lineCount: 5,
+        });
+
+        const itemsBefore = memberThreadItems(harness.events, threadId).length;
+        const more = memberAssistantLine("line-more", "msg_a1_more", [
+          {
+            type: "tool_use",
+            id: "toolu_a1_cat",
+            name: "Bash",
+            input: { command: "cat README.md" },
+          },
         ]);
+        const half = memberToolResultLine("line-cat-result", "toolu_a1_cat", "hello");
+        NodeFS.appendFileSync(transcriptPath, more + half.slice(0, 40));
+        yield* harness.offerAndWait(running("00000000-0000-4000-8000-000000001361"));
+        assert.deepEqual(reads.at(-1), {
+          startOffset: Buffer.byteLength(memberTranscript),
+          endOffset: Buffer.byteLength(memberTranscript + more),
+          lineCount: 1,
+        });
+        assert.deepEqual(
+          memberThreadItems(harness.events, threadId).slice(itemsBefore).map(describeItem),
+          ["command running: "],
+          "only the new line is projected; the half-written one waits",
+        );
+
+        NodeFS.appendFileSync(transcriptPath, half.slice(40));
+        yield* harness.offerAndWait(running("00000000-0000-4000-8000-000000001362"));
+        assert.deepEqual(reads.at(-1), {
+          startOffset: Buffer.byteLength(memberTranscript + more),
+          endOffset: Buffer.byteLength(memberTranscript + more + half),
+          lineCount: 1,
+        });
+        assert.deepEqual(
+          memberThreadItems(harness.events, threadId).slice(itemsBefore).map(describeItem),
+          ["command running: ", "command completed: hello"],
+        );
+
+        const itemsBeforeIdle = memberThreadItems(harness.events, threadId).length;
+        yield* harness.offerAndWait(running("00000000-0000-4000-8000-000000001363"));
+        assert.equal(reads.at(-1)?.lineCount, 0);
+        assert.lengthOf(memberThreadItems(harness.events, threadId), itemsBeforeIdle);
+
+        yield* harness.offerAndWait(
+          workflowSnapshot({ uuid: "00000000-0000-4000-8000-000000001364", state: "done" }),
+        );
+        assert.equal(workflowMemberEvents(harness.events, 1).at(-1)?.subagent.status, "completed");
+        assert.deepEqual(
+          threadMessages(harness.events, threadId).map((event) => event.message.text),
+          ["Reply with exactly: A1", "A1 found README.md"],
+          "the settled member adds no second copy of its answer",
+        );
         yield* Queue.offer(
           harness.sdkMessages,
-          makeResultFrame({ uuid: "00000000-0000-4000-8000-000000001372", result: "Done." }),
+          makeResultFrame({ uuid: "00000000-0000-4000-8000-000000001365", result: "Done." }),
         );
         yield* Queue.take(harness.terminalReceipts);
       }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
-          ),
+        Effect.provideService(WorkflowAgentTranscriptReadObserver, (read) =>
+          Effect.sync(() => {
+            if (read.agentId === "a1") {
+              reads.push({
+                startOffset: read.startOffset,
+                endOffset: read.endOffset,
+                lineCount: read.lineCount,
+              });
+            }
+          }),
+        ),
+      );
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
+        ),
+      ),
+    ),
+  );
+
+  it.effect("interrupts the open tool calls of a workflow member that failed", () =>
+    Effect.gen(function* () {
+      const harness = yield* makeWorkflowHarness;
+      NodeFS.writeFileSync(
+        NodePath.join(harness.transcriptDir, "agent-a1.jsonl"),
+        memberAssistantLine("line-bash", "msg_a1", [
+          { type: "tool_use", id: "toolu_a1_ls", name: "Bash", input: { command: "ls" } },
+        ]),
+      );
+      yield* harness.runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now: yield* DateTime.now,
+          attemptId: RunAttemptId.make("attempt-claude-workflow-member-fails"),
+          text: "Run the alpha workflow.",
+          attachments: [],
+        }),
+      );
+      yield* launchWorkflow({ harness, snapshotUuid: "00000000-0000-4000-8000-000000001370" });
+      const threadId = workflowMemberEvents(harness.events, 1)[0]?.subagent.childThreadId;
+      assert.deepEqual(latestMemberThreadItems(harness.events, threadId).map(describeItem), [
+        "user_message",
+        "command running: ",
+      ]);
+      yield* harness.offerAndWait(
+        workflowNotification({ uuid: "00000000-0000-4000-8000-000000001371", status: "failed" }),
+      );
+      assert.equal(workflowMemberEvents(harness.events, 1).at(-1)?.subagent.status, "failed");
+      assert.deepEqual(latestMemberThreadItems(harness.events, threadId).map(describeItem), [
+        "user_message",
+        "command interrupted: ",
+      ]);
+      yield* Queue.offer(
+        harness.sdkMessages,
+        makeResultFrame({ uuid: "00000000-0000-4000-8000-000000001372", result: "Done." }),
+      );
+      yield* Queue.take(harness.terminalReceipts);
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
         ),
       ),
     ),
   );
 
   it.effect("reads a settled workflow member's transcript to its end past the read cap", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
+    Effect.gen(function* () {
+      const harness = yield* makeWorkflowHarness;
+      // Exceeds the launch and settle reads combined, at 512 KB each.
+      const filler = "x".repeat(16 * 1024);
+      NodeFS.writeFileSync(
+        NodePath.join(harness.transcriptDir, "agent-a1.jsonl"),
+        Array.from({ length: 80 }, (_, index) =>
+          memberAssistantLine(`line-early-${index}`, `msg_early_${index}`, [
+            { type: "text", text: `${index} ${filler}` },
+          ]),
+        ).join("") +
+          memberAssistantLine("line-final", "msg_final", [{ type: "text", text: "FINAL ANSWER" }]),
+      );
+      yield* harness.runtime.startTurn(
+        makeClaudeTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now: yield* DateTime.now,
+          attemptId: RunAttemptId.make("attempt-claude-workflow-member-long-transcript"),
+          text: "Run the alpha workflow.",
+          attachments: [],
+        }),
+      );
+      yield* launchWorkflow({ harness, snapshotUuid: "00000000-0000-4000-8000-000000001390" });
+      const threadId = workflowMemberEvents(harness.events, 1)[0]?.subagent.childThreadId;
+      yield* harness.offerAndWait(
+        workflowNotification({
+          uuid: "00000000-0000-4000-8000-000000001391",
+          status: "completed",
+        }),
+      );
+      const texts = threadMessages(harness.events, threadId)
+        .filter((event) => event.message.role === "assistant")
+        .map((event) => event.message.text);
+      assert.lengthOf(texts, 81);
+      assert.equal(texts.at(-1), "FINAL ANSWER", "the answer past the first read is shown");
+      yield* Queue.offer(
+        harness.sdkMessages,
+        makeResultFrame({ uuid: "00000000-0000-4000-8000-000000001392", result: "Done." }),
+      );
+      yield* Queue.take(harness.terminalReceipts);
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
+        ),
+      ),
+    ),
+  );
+
+  it.effect("re-reads a workflow member's transcript after a restart without new items", () =>
+    Effect.gen(function* () {
+      const runOnce = Effect.fnUntraced(function* (attemptId: string) {
         const harness = yield* makeWorkflowHarness;
-        // Exceeds the launch and settle reads combined, at 512 KB each.
-        const filler = "x".repeat(16 * 1024);
         NodeFS.writeFileSync(
           NodePath.join(harness.transcriptDir, "agent-a1.jsonl"),
-          Array.from({ length: 80 }, (_, index) =>
-            memberAssistantLine(`line-early-${index}`, `msg_early_${index}`, [
-              { type: "text", text: `${index} ${filler}` },
-            ]),
-          ).join("") +
-            memberAssistantLine("line-final", "msg_final", [
-              { type: "text", text: "FINAL ANSWER" },
-            ]),
+          memberTranscript,
         );
         yield* harness.runtime.startTurn(
           makeClaudeTestTurnInput({
             threadId: harness.threadId,
             providerThread: harness.providerThread,
             now: yield* DateTime.now,
-            attemptId: RunAttemptId.make("attempt-claude-workflow-member-long-transcript"),
+            attemptId: RunAttemptId.make(attemptId),
             text: "Run the alpha workflow.",
             attachments: [],
           }),
         );
-        yield* launchWorkflow({ harness, snapshotUuid: "00000000-0000-4000-8000-000000001390" });
+        yield* launchWorkflow({ harness, snapshotUuid: "00000000-0000-4000-8000-000000001380" });
         const threadId = workflowMemberEvents(harness.events, 1)[0]?.subagent.childThreadId;
-        yield* harness.offerAndWait(
-          workflowNotification({
-            uuid: "00000000-0000-4000-8000-000000001391",
-            status: "completed",
-          }),
-        );
-        const texts = threadMessages(harness.events, threadId)
-          .filter((event) => event.message.role === "assistant")
-          .map((event) => event.message.text);
-        assert.lengthOf(texts, 81);
-        assert.equal(texts.at(-1), "FINAL ANSWER", "the answer past the first read is shown");
         yield* Queue.offer(
           harness.sdkMessages,
-          makeResultFrame({ uuid: "00000000-0000-4000-8000-000000001392", result: "Done." }),
+          makeResultFrame({ uuid: "00000000-0000-4000-8000-000000001381", result: "Done." }),
         );
         yield* Queue.take(harness.terminalReceipts);
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
-          ),
-        ),
-      ),
-    ),
-  );
-
-  it.effect("re-reads a workflow member's transcript after a restart without new items", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const runOnce = Effect.fnUntraced(function* (attemptId: string) {
-          const harness = yield* makeWorkflowHarness;
-          NodeFS.writeFileSync(
-            NodePath.join(harness.transcriptDir, "agent-a1.jsonl"),
-            memberTranscript,
-          );
-          yield* harness.runtime.startTurn(
-            makeClaudeTestTurnInput({
-              threadId: harness.threadId,
-              providerThread: harness.providerThread,
-              now: yield* DateTime.now,
-              attemptId: RunAttemptId.make(attemptId),
-              text: "Run the alpha workflow.",
-              attachments: [],
-            }),
-          );
-          yield* launchWorkflow({ harness, snapshotUuid: "00000000-0000-4000-8000-000000001380" });
-          const threadId = workflowMemberEvents(harness.events, 1)[0]?.subagent.childThreadId;
-          yield* Queue.offer(
-            harness.sdkMessages,
-            makeResultFrame({ uuid: "00000000-0000-4000-8000-000000001381", result: "Done." }),
-          );
-          yield* Queue.take(harness.terminalReceipts);
-          assert.deepEqual(latestMemberThreadItems(harness.events, threadId).map(describeItem), [
-            "user_message",
-            "reasoning: List the files first.",
-            "command completed: README.md",
-            "assistant_message",
-          ]);
-          return new Set(memberThreadItems(harness.events, threadId).map((item) => item.id));
-        });
-        const before = yield* runOnce("attempt-claude-workflow-before-restart");
-        const after = yield* runOnce("attempt-claude-workflow-after-restart");
-        assert.isAtLeast(before.size, 4);
-        assert.deepEqual(
-          [...after].filter((id) => !before.has(id)),
-          [],
-        );
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
-          ),
+        assert.deepEqual(latestMemberThreadItems(harness.events, threadId).map(describeItem), [
+          "user_message",
+          "reasoning: List the files first.",
+          "command completed: README.md",
+          "assistant_message",
+        ]);
+        return new Set(memberThreadItems(harness.events, threadId).map((item) => item.id));
+      });
+      const before = yield* runOnce("attempt-claude-workflow-before-restart");
+      const after = yield* runOnce("attempt-claude-workflow-after-restart");
+      assert.isAtLeast(before.size, 4);
+      assert.deepEqual(
+        [...after].filter((id) => !before.has(id)),
+        [],
+      );
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
         ),
       ),
     ),
diff --git a/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts b/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts
index 3e10e0990679..b3c1fd1c1fed 100644
--- a/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts
+++ b/apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts
@@ -82,6 +82,7 @@ import {
   mcpAppToolResourceUri,
 } from "@t3tools/shared/mcpApp";
 import { AgentScope } from "@t3tools/shared/AgentScope";
+import * as ProviderProcesses from "../../process/providerProcesses.ts";
 import * as HostProcess from "@t3tools/shared/HostProcess";
 import { applyClaudePromptEffortPrefix } from "@t3tools/shared/model";
 import { compareSemverVersions } from "@t3tools/shared/semver";
@@ -372,7 +373,10 @@ const CLAUDE_DESCENDANT_POLL = "1 second";
 const CLAUDE_ROOT_REFUSAL =
   "--dangerously-skip-permissions cannot be used with root/sudo privileges for security reasons";
 
+// fd 4 gates the launch until the server has recorded the process it is about to become.
 const CLAUDE_GROUP_WATCH_SCRIPT = [
+  "read -r _ <&4 || exit 1",
+  "exec 4<&-",
   "{ trap '' TERM; read -r _ <&3; kill -TERM 0; sleep 5; kill -KILL 0; } </dev/null >/dev/null 2>&1 &",
   'exec "$@" 3<&-',
 ].join("\n");
@@ -380,13 +384,15 @@ const CLAUDE_GROUP_WATCH_SCRIPT = [
 /**
  * Kill the CLI's group on exit to stop MCP grandchildren; `onExit` stops its agent scope for
  * setsid daemons. The CLI keeps working after its pipes close, so a watcher stops the group on
- * EOF from a pipe only this server holds, including when the server crashes.
+ * EOF from a pipe only this server holds, including when the server crashes. `register` records
+ * the CLI before it may run, so a restarted server can reap it if the watcher did not.
  */
 export function spawnClaudeProcessGroup(
   options: ClaudeSpawnOptions,
   onExit?: () => void,
   onStderr: (text: string) => void = () => {},
   onStderrClose: () => void = () => {},
+  register?: (pid: number) => () => void,
 ): ClaudeSpawnedProcess & Pick<NodeChildProcess.ChildProcess, "pid"> {
   const child = NodeChildProcess.spawn(
     "/bin/sh",
@@ -395,18 +401,34 @@ export function spawnClaudeProcessGroup(
       cwd: options.cwd,
       env: options.env,
       signal: options.signal,
-      stdio: ["pipe", "pipe", "pipe", "pipe"],
+      stdio: ["pipe", "pipe", "pipe", "pipe", "pipe"],
       detached: true,
     },
   );
+  let forget: (() => void) | undefined;
   // Always drained, so a chatty CLI never blocks on a full stderr pipe.
   child.stderr?.setEncoding("utf8").on("data", onStderr).once("close", onStderrClose);
   child.once("exit", () => {
     try {
       signalProcessGroup(child.pid ?? 0, "SIGKILL");
     } catch {}
+    try {
+      forget?.();
+    } catch {}
     onExit?.();
   });
+  const gate = child.stdio[4];
+  if (child.pid !== undefined && gate !== null && gate !== undefined && "end" in gate) {
+    try {
+      forget = register?.(child.pid);
+      gate.on("error", () => child.kill("SIGKILL"));
+      gate.end("ready\n");
+    } catch (cause) {
+      child.kill("SIGKILL");
+      gate.destroy();
+      throw cause;
+    }
+  }
   // Node's typings make stdin and stdout nullable once stdio has a fourth entry; both are pipes.
   return child as ClaudeSpawnedProcess & Pick<NodeChildProcess.ChildProcess, "pid">;
 }
@@ -1256,6 +1278,7 @@ export const layerQueryRunner: Layer.Layer<
     const path = yield* Path.Path;
     const { native: nativeEventLogger } = yield* ProviderEventLoggers.ProviderEventLoggers;
     const agentScope = yield* AgentScope;
+    const providerProcesses = yield* ProviderProcesses.ProviderProcesses;
     const platform = yield* HostProcess.Platform;
     const runFork = Effect.runForkWith(yield* Effect.context<never>());
     const hostEnvironment = yield* HostProcess.Environment;
@@ -1372,6 +1395,7 @@ export const layerQueryRunner: Layer.Layer<
                   stopScope,
                   appendStderr,
                   stderrDone,
+                  providerProcesses.register,
                 );
                 if (unit === undefined && child.pid !== undefined) {
                   const tracker = trackDescendants(child.pid);
@@ -2009,12 +2033,16 @@ export function makeClaudeQueryOptions(input: {
       : typeof input.sdkSettings === "object" && input.sdkSettings !== null
         ? ({ ...input.sdkSettings, ...selectionSettings } as ClaudeSdkSettings)
         : selectionSettings;
-  const compactQuerySettings =
+  const autoCompactWindow =
     input.settings?.autoCompactWindow === undefined || input.settings.autoCompactWindow.length === 0
+      ? undefined
+      : input.settings.autoCompactWindow;
+  const compactQuerySettings =
+    autoCompactWindow === undefined
       ? querySettings
       : ({
           ...(typeof querySettings === "object" && querySettings !== null ? querySettings : {}),
-          autoCompactWindow: Number(input.settings.autoCompactWindow),
+          autoCompactWindow: Number(autoCompactWindow),
         } as ClaudeSdkSettings);
   // Claude Code expands a bare alias to its own model, so a custom model with an alias's name
   // pins the alias to itself.
@@ -2026,7 +2054,9 @@ export function makeClaudeQueryOptions(input: {
     : undefined;
   // A settings file path cannot take extra keys, so it goes through unchanged.
   const effectiveQuerySettings =
-    (input.toolSearchOverride === undefined && aliasOverrideEnv === undefined) ||
+    (input.toolSearchOverride === undefined &&
+      aliasOverrideEnv === undefined &&
+      autoCompactWindow === undefined) ||
     typeof compactQuerySettings === "string"
       ? compactQuerySettings
       : ({
@@ -2034,6 +2064,10 @@ export function makeClaudeQueryOptions(input: {
           env: {
             ...compactQuerySettings?.env,
             ...aliasOverrideEnv,
+            // Claude Code ranks this env var above the autoCompactWindow setting.
+            ...(autoCompactWindow === undefined
+              ? {}
+              : { CLAUDE_CODE_AUTO_COMPACT_WINDOW: autoCompactWindow }),
             ...(input.toolSearchOverride === undefined
               ? {}
               : { ENABLE_TOOL_SEARCH: input.toolSearchOverride }),
@@ -2597,12 +2631,15 @@ export function makeClaudeUserMessage(input: {
   readonly text: string;
   readonly priority?: SDKUserMessage["priority"];
   readonly skills?: ReadonlyMap<string, ClaudeSkillTarget>;
+  readonly skillMentionsFrom?: number;
   readonly uuid?: SDKUserMessage["uuid"];
 }): SDKUserMessage {
   // Claude expands a skill only when `/name` starts the last text block.
   // Keep the whole request before that block; see ClaudeSkillDispatch.
   const dispatch =
-    input.skills === undefined ? undefined : planClaudeSkillDispatch(input.text, input.skills);
+    input.skills === undefined
+      ? undefined
+      : planClaudeSkillDispatch(input.text, input.skills, input.skillMentionsFrom);
   // Claude runs `/goal` only when it opens the prompt, so a goal stays one block.
   const isGoalCommand = parseGoalCommand({ text: input.text }) !== null;
   return {
@@ -2767,11 +2804,15 @@ const makeClaudeUserMessageWithAttachments = Effect.fnUntraced(function* (input:
   readonly fileSystem: FileSystem.FileSystem;
   readonly pdfReservation: Effect.Success<ReturnType<typeof reserveClaudePdfBudget>>;
   readonly skills?: ReadonlyMap<string, ClaudeSkillTarget>;
+  readonly skillMentionsFrom?: number;
 }) {
   if (input.attachments.length === 0) {
     const message = makeClaudeUserMessage({
       text: input.text,
       ...(input.skills === undefined ? {} : { skills: input.skills }),
+      ...(input.skillMentionsFrom === undefined
+        ? {}
+        : { skillMentionsFrom: input.skillMentionsFrom }),
       ...(input.priority === undefined ? {} : { priority: input.priority }),
       ...(input.uuid === undefined ? {} : { uuid: input.uuid }),
     });
@@ -2795,7 +2836,7 @@ const makeClaudeUserMessageWithAttachments = Effect.fnUntraced(function* (input:
   const dispatch =
     input.skills === undefined
       ? undefined
-      : planClaudeSkillDispatch(textWithAttachmentPaths, input.skills);
+      : planClaudeSkillDispatch(textWithAttachmentPaths, input.skills, input.skillMentionsFrom);
   const content: Array<ClaudeUserContentBlock> = [];
   // Base64 adds a third to the payload. Leave room below Anthropic's 32 MB
   // request limit for text, instructions, and SDK framing. The SDK does not
@@ -3421,6 +3462,7 @@ function claudePendingBackgroundTask(input: {
   readonly description: string | undefined;
   // Undeclared SDK field: the subagent whose own background work this is.
   readonly parentTaskId: unknown;
+  readonly toolUseId: string | undefined;
 }): OrchestrationV2PendingBackgroundTask {
   return {
     taskId: input.taskId,
@@ -3435,6 +3477,7 @@ function claudePendingBackgroundTask(input: {
     ...(typeof input.parentTaskId === "string" && input.parentTaskId.trim().length > 0
       ? { parentTaskId: input.parentTaskId }
       : {}),
+    ...(input.toolUseId === undefined ? {} : { nativeItemId: input.toolUseId }),
   };
 }
 
@@ -3489,6 +3532,7 @@ function claudePendingBackgroundTasksFromRoster(
 function parseClaudeBackgroundTaskEntry(
   entry: unknown,
   monitorTasks: ReadonlyMap<string, unknown>,
+  toolUseIds: ReadonlyMap<string, string>,
 ): OrchestrationV2PendingBackgroundTask | null {
   if (entry === null || typeof entry !== "object") {
     return null;
@@ -3509,6 +3553,7 @@ function parseClaudeBackgroundTaskEntry(
     startedByMonitor: monitorTasks.has(taskId),
     description: typeof description === "string" ? description : undefined,
     parentTaskId: Reflect.get(entry, "parent_task_id"),
+    toolUseId: toolUseIds.get(taskId),
   });
 }
 
@@ -5319,11 +5364,11 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
     },
   );
 
-  const readToolSearchSetting = (filePath: string) =>
+  const readSettingsEnv = (filePath: string, name: string) =>
     fileSystem.readFileString(filePath).pipe(
       Effect.flatMap(decodeClaudeEnvSettings),
       Effect.map((settings) => {
-        const value = settings.env?.ENABLE_TOOL_SEARCH;
+        const value = settings.env?.[name];
         return typeof value === "string" ? value : undefined;
       }),
       Effect.orElseSucceed(() => undefined),
@@ -5381,17 +5426,26 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
   // Settings env beats the process env, --settings over local over project over user, and a local
   // file an older Claude Code left in cwd applies under the root one. resolveSettings reads local
   // from cwd only.
-  const resolveToolSearchOverride = Effect.fn("ClaudeAdapterV2.resolveToolSearchOverride")(
-    function* (cwd: string | null, launchArgSettings: ClaudeSdkSettings | undefined) {
-      const launchValue = launchArgSettings?.env?.ENABLE_TOOL_SEARCH;
-      if (typeof launchValue === "string") return claudeToolSearchOverride(launchValue);
-      for (const settingsFile of yield* settingsFilesByPrecedence(cwd)) {
-        const value = yield* readToolSearchSetting(settingsFile);
-        if (value !== undefined) return claudeToolSearchOverride(value);
-      }
-      return claudeToolSearchOverride(adapterOptions.environment.ENABLE_TOOL_SEARCH);
-    },
-  );
+  const resolveClaudeEnv = Effect.fn("ClaudeAdapterV2.resolveClaudeEnv")(function* (
+    cwd: string | null,
+    launchArgSettings: ClaudeSdkSettings | undefined,
+    name: string,
+  ) {
+    const launchValue = launchArgSettings?.env?.[name];
+    if (typeof launchValue === "string") return launchValue;
+    for (const settingsFile of yield* settingsFilesByPrecedence(cwd)) {
+      const value = yield* readSettingsEnv(settingsFile, name);
+      if (value !== undefined) return value;
+    }
+    return adapterOptions.environment[name];
+  });
+  const resolveToolSearchOverride = (
+    cwd: string | null,
+    launchArgSettings: ClaudeSdkSettings | undefined,
+  ) =>
+    resolveClaudeEnv(cwd, launchArgSettings, "ENABLE_TOOL_SEARCH").pipe(
+      Effect.map(claudeToolSearchOverride),
+    );
 
   const resolveAutoCompactWindow = Effect.fn("ClaudeAdapterV2.resolveAutoCompactWindow")(function* (
     cwd: string | null,
@@ -5400,6 +5454,20 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
   ) {
     if (adapterOptions.settings.autoCompactWindow !== "")
       return adapterOptions.settings.autoCompactWindow;
+    const validWindow = (value: unknown) => {
+      const selected = Option.getOrUndefined(decodeClaudeCompactWindow(value));
+      return typeof selected === "number" && selected >= 100_000 && selected <= 1_000_000
+        ? String(selected)
+        : undefined;
+    };
+    // Claude gives CLAUDE_CODE_AUTO_COMPACT_WINDOW precedence over the autoCompactWindow keys.
+    const envValue = yield* resolveClaudeEnv(
+      cwd,
+      launchArgSettings,
+      "CLAUDE_CODE_AUTO_COMPACT_WINDOW",
+    );
+    const envWindow = envValue === undefined ? undefined : validWindow(Number(envValue));
+    if (envWindow !== undefined) return envWindow;
     const model = compileClaudeModelSelection(modelSelection).apiModelId.replace(/\[1m\]$/i, "");
     const windowFrom = (settings: unknown) => {
       if (typeof settings !== "object" || settings === null) return undefined;
@@ -5410,12 +5478,6 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
         typeof modelSetting === "object" && modelSetting !== null
           ? Reflect.get(modelSetting, "autoCompactWindow")
           : undefined;
-      const validWindow = (value: unknown) => {
-        const selected = Option.getOrUndefined(decodeClaudeCompactWindow(value));
-        return typeof selected === "number" && selected >= 100_000 && selected <= 1_000_000
-          ? String(selected)
-          : undefined;
-      };
       return modelWindow === "auto"
         ? ""
         : (validWindow(modelWindow) ?? validWindow(Reflect.get(settings, "autoCompactWindow")));
@@ -5677,6 +5739,8 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
         const lastKnownOpaqueTasks = yield* Ref.make(
           new Map<string, OrchestrationV2PendingBackgroundTask>(),
         );
+        // Roster entries carry only Claude's task id; the timeline item is keyed by the tool call.
+        const toolUseIdsByTaskId = yield* Ref.make(new Map<string, string>());
         const claudeMonitors = yield* Ref.make<{
           readonly calls: ReadonlySet<string>;
           readonly tasks: ReadonlyMap<
@@ -9201,31 +9265,41 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
             message.type === "system" &&
             message.subtype === "task_started" &&
             (yield* Ref.get(sessionSubagentsByTaskId)).has(message.task_id);
+          // A completed subagent that Claude resumes on its own (under its launch
+          // call, unlike SendMessage) has no live run left to show it while the
+          // root is idle; only a continuation does.
+          let isResumedSubagentTaskStarted = false;
           if (
             isKnownSubagentTaskStarted &&
             message.type === "system" &&
             message.subtype === "task_started"
           ) {
             const now = yield* DateTime.now;
-            yield* Ref.update(sessionSubagentsByTaskId, (current) => {
-              const registered = current.get(message.task_id);
-              if (registered === undefined || registered.task.status === "running") {
-                return current;
-              }
-              const { progress: _staleProgress, ...priorTask } = registered.task;
-              return new Map(current).set(message.task_id, {
-                ...registered,
-                confirmedOutcome: undefined,
-                task: {
-                  ...priorTask,
-                  status: "running",
-                  result: null,
-                  startedAt: now,
-                  completedAt: null,
-                  updatedAt: now,
-                },
-              });
-            });
+            isResumedSubagentTaskStarted = yield* Ref.modify(
+              sessionSubagentsByTaskId,
+              (current) => {
+                const registered = current.get(message.task_id);
+                if (registered === undefined || registered.task.status === "running") {
+                  return [false, current] as const;
+                }
+                const { progress: _staleProgress, ...priorTask } = registered.task;
+                return [
+                  registered.runToolUseId === message.tool_use_id,
+                  new Map(current).set(message.task_id, {
+                    ...registered,
+                    confirmedOutcome: undefined,
+                    task: {
+                      ...priorTask,
+                      status: "running",
+                      result: null,
+                      startedAt: now,
+                      completedAt: null,
+                      updatedAt: now,
+                    },
+                  }),
+                ] as const;
+              },
+            );
           }
           const isWakeTurnStart = isClaudeTurnStartMessage(message);
           const isWakeEvidence =
@@ -9340,6 +9414,7 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
             parentToolUseIdFromSdkMessage(message) === null;
           if (
             !isPendingSubagentNotification &&
+            !isResumedSubagentTaskStarted &&
             !isNativeOpaqueWakeFrame &&
             !isWakeTurnStart &&
             message.type !== "result"
@@ -9602,8 +9677,19 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
               (taskId, task) =>
                 task.nativeThreadId === input.nativeThreadId && !listedTaskIds.has(taskId),
             );
+            const toolUseIds = new Map(yield* Ref.get(toolUseIdsByTaskId));
+            // A live task keeps its tool call after the bounded map evicts it.
+            const current = rosterForNativeThread(
+              yield* Ref.get(pendingBackgroundTasksByNativeThread),
+              input.nativeThreadId,
+            );
+            for (const [taskId, task] of current) {
+              if (task.nativeItemId !== undefined && !toolUseIds.has(taskId)) {
+                toolUseIds.set(taskId, task.nativeItemId);
+              }
+            }
             for (const entry of roster) {
-              const task = parseClaudeBackgroundTaskEntry(entry, monitorTasks);
+              const task = parseClaudeBackgroundTaskEntry(entry, monitorTasks, toolUseIds);
               if (task !== null) {
                 nextTasks.push(task);
               }
@@ -9611,7 +9697,22 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
             yield* replacePendingBackgroundTasks(input.nativeThreadId, nextTasks);
             rosterChanged = true;
           } else if (message.type === "system" && message.subtype === "task_started") {
-            if (!isClaudeNonSubagentTask(message) || message.is_backgrounded === false) {
+            if (!isClaudeNonSubagentTask(message)) {
+              return false;
+            }
+            const toolUseId = message.tool_use_id?.trim() || undefined;
+            if (toolUseId !== undefined) {
+              // A foreground command can move to the background later, so remember every one.
+              yield* Ref.update(toolUseIdsByTaskId, (current) => {
+                const updated = new Map(current).set(message.task_id, toolUseId);
+                for (const oldest of updated.keys()) {
+                  if (updated.size <= 64) break;
+                  updated.delete(oldest);
+                }
+                return updated;
+              });
+            }
+            if (message.is_backgrounded === false) {
               return false;
             }
             const launch =
@@ -9644,11 +9745,18 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
                 description:
                   typeof message.description === "string" ? message.description : undefined,
                 parentTaskId: Reflect.get(message, "parent_task_id"),
+                toolUseId,
               }),
             });
             rosterChanged = true;
           } else if (message.type === "system" && message.subtype === "task_notification") {
             yield* endClaudeMonitorTasks((taskId) => taskId === message.task_id);
+            yield* Ref.update(toolUseIdsByTaskId, (current) => {
+              if (!current.has(message.task_id)) return current;
+              const updated = new Map(current);
+              updated.delete(message.task_id);
+              return updated;
+            });
             const removed = yield* clearPendingBackgroundTask(
               input.nativeThreadId,
               message.task_id,
@@ -12321,15 +12429,24 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
               pdfBudgets.get(nativeThreadId)!,
               persistAttachmentBudget(nativeThreadId),
             );
+            const promptText = applyClaudePromptEffortPrefix(
+              turnInput.message.text,
+              compileClaudeModelSelection(turnInput.modelSelection, modelCatalog).promptEffort,
+            );
             const userMessage =
               promptUuid === null
                 ? null
                 : yield* makeClaudeUserMessageWithAttachments({
-                    text: applyClaudePromptEffortPrefix(
-                      turnInput.message.text,
-                      compileClaudeModelSelection(turnInput.modelSelection, modelCatalog)
-                        .promptEffort,
-                    ),
+                    text: promptText,
+                    // Mentions in inline handoff history are history, not this turn's skill.
+                    ...(turnInput.inlineContextLength === undefined
+                      ? {}
+                      : {
+                          skillMentionsFrom:
+                            promptText.length -
+                            turnInput.message.text.slice(turnInput.inlineContextLength).trimEnd()
+                              .length,
+                        }),
                     attachments: turnInput.message.attachments,
                     attachmentsDir,
                     fileSystem,
diff --git a/apps/server/src/orchestration-v2/Adapters/ClaudeAgentSdkQueryRunner.test.ts b/apps/server/src/orchestration-v2/Adapters/ClaudeAgentSdkQueryRunner.test.ts
index 4716ec06175a..3aca32bf41f9 100644
--- a/apps/server/src/orchestration-v2/Adapters/ClaudeAgentSdkQueryRunner.test.ts
+++ b/apps/server/src/orchestration-v2/Adapters/ClaudeAgentSdkQueryRunner.test.ts
@@ -232,70 +232,68 @@ const resumedMcpQueryInput = {
 } satisfies ClaudeAgentSdkQueryOpenInput;
 
 it.effect("reopens a stalled MCP registration before delivering the resumed prompt", () =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      const registrationStarted = Promise.withResolvers<void>();
-      const disposalStarted = Promise.withResolvers<void>();
-      const finishDisposal = Promise.withResolvers<void>();
-      const prompts: AsyncIterable<ClaudeSdk.SDKUserMessage>[] = [];
-      const firstClose = vi.fn();
-      const secondClose = vi.fn();
-      const firstRegistration = vi.fn(() => {
-        registrationStarted.resolve();
-        return new Promise<ClaudeSdk.McpSetServersResult>(() => {});
-      });
-      const secondRegistration = vi.fn(async () => ({
-        added: ["t3-code"],
-        removed: [],
-        errors: {},
-      }));
-      const querySpy = vi.spyOn(ClaudeSdk, "query").mockImplementation(({ prompt }) => {
-        assert.notTypeOf(prompt, "string");
-        if (typeof prompt === "string") throw new Error("Expected streaming input");
-        prompts.push(prompt);
-        return {
-          initializationResult: async () => ({}),
-          setMcpServers: prompts.length === 1 ? firstRegistration : secondRegistration,
-          close: prompts.length === 1 ? firstClose : secondClose,
-          [Symbol.asyncDispose]: async () => {
-            firstClose();
-            disposalStarted.resolve();
-            await finishDisposal.promise;
-          },
-        } as unknown as ClaudeSdk.Query;
-      });
-      yield* Effect.addFinalizer(() => Effect.sync(() => querySpy.mockRestore()));
-      const runner = yield* ClaudeAgentSdkQueryRunner;
-      const opening = yield* runner.open(resumedMcpQueryInput).pipe(Effect.forkChild);
-      yield* Effect.promise(() => registrationStarted.promise);
-      yield* TestClock.adjust("90 seconds");
-      yield* Effect.promise(() => disposalStarted.promise);
-      assert.equal(querySpy.mock.calls.length, 1);
-      finishDisposal.resolve();
-      const session = yield* Fiber.join(opening);
-      yield* Effect.addFinalizer(() => session.close.pipe(Effect.orDie));
-
-      assert.equal(firstClose.mock.calls.length, 1);
-      assert.equal(secondClose.mock.calls.length, 0);
-      assert.equal(querySpy.mock.calls.length, 2);
-      for (const [call] of querySpy.mock.calls) {
-        assert.equal(call.options?.resume, FORK_SESSION_ID);
-        assert.isUndefined(call.options?.mcpServers);
-      }
-      assert.deepEqual(secondRegistration.mock.calls, [[resumedMcpQueryInput.options.mcpServers]]);
-      const message = {
-        type: "user",
-        message: { role: "user", content: "Continue where you left off." },
-        parent_tool_use_id: null,
-        session_id: FORK_SESSION_ID,
-      } satisfies ClaudeSdk.SDKUserMessage;
-      yield* session.offer(message);
-      assert.isTrue((yield* Effect.promise(() => prompts[0]![Symbol.asyncIterator]().next())).done);
-      const delivered = yield* Effect.promise(() => prompts[1]![Symbol.asyncIterator]().next());
-      assert.deepEqual(delivered.value, message);
-      assert.isFalse(delivered.done);
-    }).pipe(Effect.provide(realQueryRunner)),
-  ),
+  Effect.gen(function* () {
+    const registrationStarted = Promise.withResolvers<void>();
+    const disposalStarted = Promise.withResolvers<void>();
+    const finishDisposal = Promise.withResolvers<void>();
+    const prompts: AsyncIterable<ClaudeSdk.SDKUserMessage>[] = [];
+    const firstClose = vi.fn();
+    const secondClose = vi.fn();
+    const firstRegistration = vi.fn(() => {
+      registrationStarted.resolve();
+      return new Promise<ClaudeSdk.McpSetServersResult>(() => {});
+    });
+    const secondRegistration = vi.fn(async () => ({
+      added: ["t3-code"],
+      removed: [],
+      errors: {},
+    }));
+    const querySpy = vi.spyOn(ClaudeSdk, "query").mockImplementation(({ prompt }) => {
+      assert.notTypeOf(prompt, "string");
+      if (typeof prompt === "string") throw new Error("Expected streaming input");
+      prompts.push(prompt);
+      return {
+        initializationResult: async () => ({}),
+        setMcpServers: prompts.length === 1 ? firstRegistration : secondRegistration,
+        close: prompts.length === 1 ? firstClose : secondClose,
+        [Symbol.asyncDispose]: async () => {
+          firstClose();
+          disposalStarted.resolve();
+          await finishDisposal.promise;
+        },
+      } as unknown as ClaudeSdk.Query;
+    });
+    yield* Effect.addFinalizer(() => Effect.sync(() => querySpy.mockRestore()));
+    const runner = yield* ClaudeAgentSdkQueryRunner;
+    const opening = yield* runner.open(resumedMcpQueryInput).pipe(Effect.forkChild);
+    yield* Effect.promise(() => registrationStarted.promise);
+    yield* TestClock.adjust("90 seconds");
+    yield* Effect.promise(() => disposalStarted.promise);
+    assert.equal(querySpy.mock.calls.length, 1);
+    finishDisposal.resolve();
+    const session = yield* Fiber.join(opening);
+    yield* Effect.addFinalizer(() => session.close.pipe(Effect.orDie));
+
+    assert.equal(firstClose.mock.calls.length, 1);
+    assert.equal(secondClose.mock.calls.length, 0);
+    assert.equal(querySpy.mock.calls.length, 2);
+    for (const [call] of querySpy.mock.calls) {
+      assert.equal(call.options?.resume, FORK_SESSION_ID);
+      assert.isUndefined(call.options?.mcpServers);
+    }
+    assert.deepEqual(secondRegistration.mock.calls, [[resumedMcpQueryInput.options.mcpServers]]);
+    const message = {
+      type: "user",
+      message: { role: "user", content: "Continue where you left off." },
+      parent_tool_use_id: null,
+      session_id: FORK_SESSION_ID,
+    } satisfies ClaudeSdk.SDKUserMessage;
+    yield* session.offer(message);
+    assert.isTrue((yield* Effect.promise(() => prompts[0]![Symbol.asyncIterator]().next())).done);
+    const delivered = yield* Effect.promise(() => prompts[1]![Symbol.asyncIterator]().next());
+    assert.deepEqual(delivered.value, message);
+    assert.isFalse(delivered.done);
+  }).pipe(Effect.provide(realQueryRunner)),
 );
 
 it.effect.each([
@@ -303,262 +301,248 @@ it.effect.each([
   { case: "a settings file Claude skipped", errors: [{ file: "settings.json" }], readable: false },
   { case: "a reply without a rule list", response: {}, readable: false },
 ])("reads Claude's permission rules only when no settings file was skipped: $case", (testCase) =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      const rules = [{ behavior: "deny" as const, rule: "mcp__probe__redeploy" }];
-      const querySpy = vi.spyOn(ClaudeSdk, "query").mockImplementation(
-        () =>
-          ({
-            close: vi.fn(),
-            request: async () => ({
-              response:
-                "response" in testCase
-                  ? testCase.response
-                  : { state: { rules, errors: testCase.errors } },
-            }),
-          }) as unknown as ClaudeSdk.Query,
-      );
-      yield* Effect.addFinalizer(() => Effect.sync(() => querySpy.mockRestore()));
-      const runner = yield* ClaudeAgentSdkQueryRunner;
-      const { mcpServers: _mcpServers, ...options } = resumedMcpQueryInput.options;
-      const session = yield* runner.open({ ...resumedMcpQueryInput, options });
-      yield* Effect.addFinalizer(() => session.close.pipe(Effect.orDie));
-      const exit = yield* Effect.exit(session.listPermissionRules);
-      if (testCase.readable) assert.deepEqual(exit, Exit.succeed(rules));
-      else assert.isTrue(Exit.isFailure(exit));
-    }).pipe(Effect.provide(realQueryRunner)),
-  ),
+  Effect.gen(function* () {
+    const rules = [{ behavior: "deny" as const, rule: "mcp__probe__redeploy" }];
+    const querySpy = vi.spyOn(ClaudeSdk, "query").mockImplementation(
+      () =>
+        ({
+          close: vi.fn(),
+          request: async () => ({
+            response:
+              "response" in testCase
+                ? testCase.response
+                : { state: { rules, errors: testCase.errors } },
+          }),
+        }) as unknown as ClaudeSdk.Query,
+    );
+    yield* Effect.addFinalizer(() => Effect.sync(() => querySpy.mockRestore()));
+    const runner = yield* ClaudeAgentSdkQueryRunner;
+    const { mcpServers: _mcpServers, ...options } = resumedMcpQueryInput.options;
+    const session = yield* runner.open({ ...resumedMcpQueryInput, options });
+    yield* Effect.addFinalizer(() => session.close.pipe(Effect.orDie));
+    const exit = yield* Effect.exit(session.listPermissionRules);
+    if (testCase.readable) assert.deepEqual(exit, Exit.succeed(rules));
+    else assert.isTrue(Exit.isFailure(exit));
+  }).pipe(Effect.provide(realQueryRunner)),
 );
 
 it.effect.each([true, false])("only retries after confirmed process exit: %s", (exits) =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      const registrationStarted = Promise.withResolvers<void>();
-      const cleanupProgress = Promise.withResolvers<"kill" | "retry">();
-      const events = new NodeEvents.EventEmitter();
-      const stdin = new NodeStream.PassThrough();
-      const stdout = new NodeStream.PassThrough();
-      const child = {
-        stdin,
-        stdout,
-        killed: false,
-        exitCode: null,
-        kill: vi.fn(() => {
-          cleanupProgress.resolve("kill");
-          return true;
-        }),
-        on: events.on.bind(events),
-        once: events.once.bind(events),
-        off: events.off.bind(events),
-      } satisfies ClaudeSdk.SpawnedProcess;
-      const signal = yield* Effect.abortSignal;
-      const disposed = vi.fn(async () => {});
-      const querySpy = vi.spyOn(ClaudeSdk, "query").mockImplementation(({ options }) => {
-        const first = querySpy.mock.calls.length === 1;
-        if (first) {
-          options?.spawnClaudeCodeProcess?.({ command: "claude", args: [], env: {}, signal });
-        } else {
-          cleanupProgress.resolve("retry");
-        }
-        return {
+  Effect.gen(function* () {
+    const registrationStarted = Promise.withResolvers<void>();
+    const cleanupProgress = Promise.withResolvers<"kill" | "retry">();
+    const events = new NodeEvents.EventEmitter();
+    const stdin = new NodeStream.PassThrough();
+    const stdout = new NodeStream.PassThrough();
+    const child = {
+      stdin,
+      stdout,
+      killed: false,
+      exitCode: null,
+      kill: vi.fn(() => {
+        cleanupProgress.resolve("kill");
+        return true;
+      }),
+      on: events.on.bind(events),
+      once: events.once.bind(events),
+      off: events.off.bind(events),
+    } satisfies ClaudeSdk.SpawnedProcess;
+    const signal = yield* Effect.abortSignal;
+    const disposed = vi.fn(async () => {});
+    const querySpy = vi.spyOn(ClaudeSdk, "query").mockImplementation(({ options }) => {
+      const first = querySpy.mock.calls.length === 1;
+      if (first) {
+        options?.spawnClaudeCodeProcess?.({ command: "claude", args: [], env: {}, signal });
+      } else {
+        cleanupProgress.resolve("retry");
+      }
+      return {
+        initializationResult: async () => ({}),
+        setMcpServers: () => {
+          registrationStarted.resolve();
+          return first
+            ? new Promise<ClaudeSdk.McpSetServersResult>(() => {})
+            : Promise.resolve({ added: ["t3-code"], removed: [], errors: {} });
+        },
+        close: vi.fn(),
+        [Symbol.asyncDispose]: disposed,
+      } as unknown as ClaudeSdk.Query;
+    });
+    yield* Effect.addFinalizer(() =>
+      Effect.sync(() => {
+        querySpy.mockRestore();
+        stdin.destroy();
+        stdout.destroy();
+      }),
+    );
+    const runner = yield* ClaudeAgentSdkQueryRunner;
+    const opening = yield* runner
+      .open({
+        ...resumedMcpQueryInput,
+        options: { ...resumedMcpQueryInput.options, spawnClaudeCodeProcess: () => child },
+      })
+      .pipe(Effect.exit, Effect.forkChild);
+    yield* Effect.promise(() => registrationStarted.promise);
+    yield* TestClock.adjust("90 seconds");
+
+    assert.equal(yield* Effect.promise(() => cleanupProgress.promise), "kill");
+    assert.equal(querySpy.mock.calls.length, 1);
+    assert.deepEqual(child.kill.mock.calls, [["SIGKILL"]]);
+    if (exits) events.emit("exit", null, "SIGKILL");
+    else yield* TestClock.adjust("10 seconds");
+    const result = yield* Fiber.join(opening);
+    assert.equal(Exit.isSuccess(result), exits);
+    if (Exit.isSuccess(result)) yield* result.value.close;
+    assert.equal(querySpy.mock.calls.length, exits ? 2 : 1);
+    assert.equal(disposed.mock.calls.length, 1);
+  }).pipe(Effect.provide(realQueryRunner)),
+);
+
+it.effect("stops retrying MCP registration after two timeouts and reports the cause", () =>
+  Effect.gen(function* () {
+    const firstRegistration = Promise.withResolvers<void>();
+    const secondRegistration = Promise.withResolvers<void>();
+    const disposed = vi.fn(async () => {});
+    const querySpy = vi.spyOn(ClaudeSdk, "query").mockImplementation(() => {
+      const started = querySpy.mock.calls.length === 1 ? firstRegistration : secondRegistration;
+      return {
+        initializationResult: async () => ({}),
+        setMcpServers: () => {
+          started.resolve();
+          return new Promise<ClaudeSdk.McpSetServersResult>(() => {});
+        },
+        [Symbol.asyncDispose]: disposed,
+      } as unknown as ClaudeSdk.Query;
+    });
+    yield* Effect.addFinalizer(() => Effect.sync(() => querySpy.mockRestore()));
+    const runner = yield* ClaudeAgentSdkQueryRunner;
+    const opening = yield* runner.open(resumedMcpQueryInput).pipe(Effect.result, Effect.forkChild);
+    yield* Effect.promise(() => firstRegistration.promise);
+    yield* TestClock.adjust("90 seconds");
+    yield* Effect.promise(() => secondRegistration.promise);
+    yield* TestClock.adjust("90 seconds");
+    const result = yield* Fiber.join(opening);
+
+    assert.equal(result._tag, "Failure");
+    if (result._tag !== "Failure") return;
+    assert.equal(querySpy.mock.calls.length, 2);
+    assert.equal(disposed.mock.calls.length, 2);
+    assert.equal(
+      makeProviderFailure({
+        cause: { _tag: "ProviderAdapterTurnStartError", cause: result.failure },
+      }).message,
+      "Claude timed out while registering its MCP tools. Retry the turn; if it keeps failing, check Claude and the server logs.",
+    );
+  }).pipe(Effect.provide(realQueryRunner)),
+);
+
+it.effect("cancels a stalled registration without retrying or retaining its prompt queue", () =>
+  Effect.gen(function* () {
+    const registrationStarted = Promise.withResolvers<void>();
+    const disposed = vi.fn(async () => {});
+    const querySpy = vi.spyOn(ClaudeSdk, "query").mockImplementation(
+      () =>
+        ({
           initializationResult: async () => ({}),
           setMcpServers: () => {
             registrationStarted.resolve();
-            return first
-              ? new Promise<ClaudeSdk.McpSetServersResult>(() => {})
-              : Promise.resolve({ added: ["t3-code"], removed: [], errors: {} });
+            return new Promise<ClaudeSdk.McpSetServersResult>(() => {});
           },
-          close: vi.fn(),
           [Symbol.asyncDispose]: disposed,
-        } as unknown as ClaudeSdk.Query;
-      });
-      yield* Effect.addFinalizer(() =>
-        Effect.sync(() => {
-          querySpy.mockRestore();
-          stdin.destroy();
-          stdout.destroy();
-        }),
-      );
-      const runner = yield* ClaudeAgentSdkQueryRunner;
-      const opening = yield* runner
-        .open({
-          ...resumedMcpQueryInput,
-          options: { ...resumedMcpQueryInput.options, spawnClaudeCodeProcess: () => child },
-        })
-        .pipe(Effect.exit, Effect.forkChild);
-      yield* Effect.promise(() => registrationStarted.promise);
-      yield* TestClock.adjust("90 seconds");
-
-      assert.equal(yield* Effect.promise(() => cleanupProgress.promise), "kill");
-      assert.equal(querySpy.mock.calls.length, 1);
-      assert.deepEqual(child.kill.mock.calls, [["SIGKILL"]]);
-      if (exits) events.emit("exit", null, "SIGKILL");
-      else yield* TestClock.adjust("10 seconds");
-      const result = yield* Fiber.join(opening);
-      assert.equal(Exit.isSuccess(result), exits);
-      if (Exit.isSuccess(result)) yield* result.value.close;
-      assert.equal(querySpy.mock.calls.length, exits ? 2 : 1);
-      assert.equal(disposed.mock.calls.length, 1);
-    }).pipe(Effect.provide(realQueryRunner)),
-  ),
+        }) as unknown as ClaudeSdk.Query,
+    );
+    yield* Effect.addFinalizer(() => Effect.sync(() => querySpy.mockRestore()));
+    const runner = yield* ClaudeAgentSdkQueryRunner;
+    const opening = yield* runner.open(resumedMcpQueryInput).pipe(Effect.forkChild);
+    yield* Effect.promise(() => registrationStarted.promise);
+    yield* Fiber.interrupt(opening);
+
+    assert.equal(querySpy.mock.calls.length, 1);
+    assert.equal(disposed.mock.calls.length, 1);
+    const prompt = querySpy.mock.calls[0]![0].prompt;
+    if (typeof prompt === "string") throw new Error("Expected streaming input");
+    assert.isTrue((yield* Effect.promise(() => prompt[Symbol.asyncIterator]().next())).done);
+  }).pipe(Effect.provide(realQueryRunner)),
 );
 
-it.effect("stops retrying MCP registration after two timeouts and reports the cause", () =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      const firstRegistration = Promise.withResolvers<void>();
-      const secondRegistration = Promise.withResolvers<void>();
-      const disposed = vi.fn(async () => {});
-      const querySpy = vi.spyOn(ClaudeSdk, "query").mockImplementation(() => {
-        const started = querySpy.mock.calls.length === 1 ? firstRegistration : secondRegistration;
-        return {
+it.effect("does not reuse a fresh session ID after MCP registration times out", () =>
+  Effect.gen(function* () {
+    const registrationStarted = Promise.withResolvers<void>();
+    const disposed = vi.fn(async () => {});
+    const querySpy = vi.spyOn(ClaudeSdk, "query").mockImplementation(
+      () =>
+        ({
           initializationResult: async () => ({}),
           setMcpServers: () => {
-            started.resolve();
+            registrationStarted.resolve();
             return new Promise<ClaudeSdk.McpSetServersResult>(() => {});
           },
           [Symbol.asyncDispose]: disposed,
-        } as unknown as ClaudeSdk.Query;
-      });
-      yield* Effect.addFinalizer(() => Effect.sync(() => querySpy.mockRestore()));
-      const runner = yield* ClaudeAgentSdkQueryRunner;
-      const opening = yield* runner
-        .open(resumedMcpQueryInput)
-        .pipe(Effect.result, Effect.forkChild);
-      yield* Effect.promise(() => firstRegistration.promise);
-      yield* TestClock.adjust("90 seconds");
-      yield* Effect.promise(() => secondRegistration.promise);
-      yield* TestClock.adjust("90 seconds");
-      const result = yield* Fiber.join(opening);
-
-      assert.equal(result._tag, "Failure");
-      if (result._tag !== "Failure") return;
-      assert.equal(querySpy.mock.calls.length, 2);
-      assert.equal(disposed.mock.calls.length, 2);
-      assert.equal(
-        makeProviderFailure({
-          cause: { _tag: "ProviderAdapterTurnStartError", cause: result.failure },
-        }).message,
-        "Claude timed out while registering its MCP tools. Retry the turn; if it keeps failing, check Claude and the server logs.",
-      );
-    }).pipe(Effect.provide(realQueryRunner)),
-  ),
-);
-
-it.effect("cancels a stalled registration without retrying or retaining its prompt queue", () =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      const registrationStarted = Promise.withResolvers<void>();
-      const disposed = vi.fn(async () => {});
-      const querySpy = vi.spyOn(ClaudeSdk, "query").mockImplementation(
-        () =>
-          ({
-            initializationResult: async () => ({}),
-            setMcpServers: () => {
-              registrationStarted.resolve();
-              return new Promise<ClaudeSdk.McpSetServersResult>(() => {});
-            },
-            [Symbol.asyncDispose]: disposed,
-          }) as unknown as ClaudeSdk.Query,
-      );
-      yield* Effect.addFinalizer(() => Effect.sync(() => querySpy.mockRestore()));
-      const runner = yield* ClaudeAgentSdkQueryRunner;
-      const opening = yield* runner.open(resumedMcpQueryInput).pipe(Effect.forkChild);
-      yield* Effect.promise(() => registrationStarted.promise);
-      yield* Fiber.interrupt(opening);
-
-      assert.equal(querySpy.mock.calls.length, 1);
-      assert.equal(disposed.mock.calls.length, 1);
-      const prompt = querySpy.mock.calls[0]![0].prompt;
-      if (typeof prompt === "string") throw new Error("Expected streaming input");
-      assert.isTrue((yield* Effect.promise(() => prompt[Symbol.asyncIterator]().next())).done);
-    }).pipe(Effect.provide(realQueryRunner)),
-  ),
-);
-
-it.effect("does not reuse a fresh session ID after MCP registration times out", () =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      const registrationStarted = Promise.withResolvers<void>();
-      const disposed = vi.fn(async () => {});
-      const querySpy = vi.spyOn(ClaudeSdk, "query").mockImplementation(
-        () =>
-          ({
-            initializationResult: async () => ({}),
-            setMcpServers: () => {
-              registrationStarted.resolve();
-              return new Promise<ClaudeSdk.McpSetServersResult>(() => {});
-            },
-            [Symbol.asyncDispose]: disposed,
-          }) as unknown as ClaudeSdk.Query,
-      );
-      yield* Effect.addFinalizer(() => Effect.sync(() => querySpy.mockRestore()));
-      const runner = yield* ClaudeAgentSdkQueryRunner;
-      const { resume, ...options } = resumedMcpQueryInput.options;
-      const opening = yield* runner
-        .open({
-          ...resumedMcpQueryInput,
-          options: { ...options, sessionId: resume },
-        })
-        .pipe(Effect.result, Effect.forkChild);
-      yield* Effect.promise(() => registrationStarted.promise);
-      yield* TestClock.adjust("90 seconds");
-      const result = yield* Fiber.join(opening);
-
-      assert.equal(result._tag, "Failure");
-      assert.equal(querySpy.mock.calls.length, 1);
-      assert.equal(disposed.mock.calls.length, 1);
-    }).pipe(Effect.provide(realQueryRunner)),
-  ),
+        }) as unknown as ClaudeSdk.Query,
+    );
+    yield* Effect.addFinalizer(() => Effect.sync(() => querySpy.mockRestore()));
+    const runner = yield* ClaudeAgentSdkQueryRunner;
+    const { resume, ...options } = resumedMcpQueryInput.options;
+    const opening = yield* runner
+      .open({
+        ...resumedMcpQueryInput,
+        options: { ...options, sessionId: resume },
+      })
+      .pipe(Effect.result, Effect.forkChild);
+    yield* Effect.promise(() => registrationStarted.promise);
+    yield* TestClock.adjust("90 seconds");
+    const result = yield* Fiber.join(opening);
+
+    assert.equal(result._tag, "Failure");
+    assert.equal(querySpy.mock.calls.length, 1);
+    assert.equal(disposed.mock.calls.length, 1);
+  }).pipe(Effect.provide(realQueryRunner)),
 );
 
 it.effect.each([
   ["opens after a slow CLI boot", "120 seconds", true],
   ["times out a CLI that never boots", "5 minutes", false],
 ] as const)("%s", ([, bootWait, boots]) =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      const waiting = Promise.withResolvers<void>();
-      const booted = Promise.withResolvers<void>();
-      const querySpy = vi.spyOn(ClaudeSdk, "query").mockImplementation(
-        () =>
-          ({
-            initializationResult: () => {
-              waiting.resolve();
-              return booted.promise;
-            },
-            // The CLI answers control requests only after it has booted.
-            setMcpServers: async () => {
-              waiting.resolve();
-              await booted.promise;
-              return { added: ["t3-code"], removed: [], errors: {} };
-            },
-            close: vi.fn(),
-            [Symbol.asyncDispose]: async () => {},
-          }) as unknown as ClaudeSdk.Query,
+  Effect.gen(function* () {
+    const waiting = Promise.withResolvers<void>();
+    const booted = Promise.withResolvers<void>();
+    const querySpy = vi.spyOn(ClaudeSdk, "query").mockImplementation(
+      () =>
+        ({
+          initializationResult: () => {
+            waiting.resolve();
+            return booted.promise;
+          },
+          // The CLI answers control requests only after it has booted.
+          setMcpServers: async () => {
+            waiting.resolve();
+            await booted.promise;
+            return { added: ["t3-code"], removed: [], errors: {} };
+          },
+          close: vi.fn(),
+          [Symbol.asyncDispose]: async () => {},
+        }) as unknown as ClaudeSdk.Query,
+    );
+    yield* Effect.addFinalizer(() => Effect.sync(() => querySpy.mockRestore()));
+    const runner = yield* ClaudeAgentSdkQueryRunner;
+    const { resume, ...options } = resumedMcpQueryInput.options;
+    const opening = yield* runner
+      .open({ ...resumedMcpQueryInput, options: { ...options, sessionId: resume } })
+      .pipe(Effect.result, Effect.forkChild);
+    yield* Effect.promise(() => waiting.promise);
+    yield* TestClock.adjust(bootWait);
+    if (boots) booted.resolve();
+    const result = yield* Fiber.join(opening);
+
+    assert.equal(result._tag, boots ? "Success" : "Failure");
+    if (result._tag === "Success") yield* result.success.close;
+    else
+      assert.equal(
+        makeProviderFailure({
+          cause: { _tag: "ProviderAdapterTurnStartError", cause: result.failure },
+        }).message,
+        "Claude timed out while starting up. Retry the turn; if it keeps failing, check Claude and the server logs.",
       );
-      yield* Effect.addFinalizer(() => Effect.sync(() => querySpy.mockRestore()));
-      const runner = yield* ClaudeAgentSdkQueryRunner;
-      const { resume, ...options } = resumedMcpQueryInput.options;
-      const opening = yield* runner
-        .open({ ...resumedMcpQueryInput, options: { ...options, sessionId: resume } })
-        .pipe(Effect.result, Effect.forkChild);
-      yield* Effect.promise(() => waiting.promise);
-      yield* TestClock.adjust(bootWait);
-      if (boots) booted.resolve();
-      const result = yield* Fiber.join(opening);
-
-      assert.equal(result._tag, boots ? "Success" : "Failure");
-      if (result._tag === "Success") yield* result.success.close;
-      else
-        assert.equal(
-          makeProviderFailure({
-            cause: { _tag: "ProviderAdapterTurnStartError", cause: result.failure },
-          }).message,
-          "Claude timed out while starting up. Retry the turn; if it keeps failing, check Claude and the server logs.",
-        );
-    }).pipe(Effect.provide(realQueryRunner)),
-  ),
+  }).pipe(Effect.provide(realQueryRunner)),
 );
 
 function fakeClaudeCli(script: string): string {
@@ -764,6 +748,47 @@ describe.skipIf(HostProcess.Platform.defaultValue() === "win32")("Claude CLI pro
     }),
   );
 
+  // A restarted server reaps recorded CLIs, so a CLI must never run before its record exists.
+  it.effect("records the CLI before it runs and forgets it once it exits", () =>
+    Effect.gen(function* () {
+      const cli = fakeClaudeCli(
+        ['dir=$(dirname "$0")', 'printf \'%s %s\' "$$" "$(cat "$dir/record")" > "$dir/seen"'].join(
+          "\n",
+        ),
+      );
+      const dir = NodePath.dirname(cli);
+      NodeChildProcess.execFileSync("mkfifo", [NodePath.join(dir, "seen")]);
+      yield* Effect.addFinalizer(() =>
+        Effect.sync(() => NodeFS.rmSync(dir, { recursive: true, force: true })),
+      );
+      const forgotten = yield* Deferred.make<void>();
+      let registered = 0;
+      spawnClaudeProcessGroup(
+        {
+          command: cli,
+          args: [],
+          cwd: dir,
+          env: process.env,
+          // @effect-diagnostics-next-line abortControllerInEffect:off - The CLI exits on its own.
+          signal: new AbortController().signal,
+        },
+        undefined,
+        undefined,
+        undefined,
+        (pid) => {
+          registered = pid;
+          NodeFS.writeFileSync(NodePath.join(dir, "record"), String(pid));
+          return () => Deferred.doneUnsafe(forgotten, Effect.void);
+        },
+      );
+      const seen = yield* Effect.promise(() =>
+        NodeFS.promises.readFile(NodePath.join(dir, "seen"), "utf8"),
+      );
+      assert.equal(seen, `${registered} ${registered}`);
+      yield* Deferred.await(forgotten);
+    }),
+  );
+
   it.effect("marks the CLI's jobs with its thread and counts it as an agent until it exits", () => {
     let runningAgents = 0;
     let releaseAgent!: () => void;
diff --git a/apps/server/src/orchestration-v2/Adapters/ClaudeTaskOutputTail.test.ts b/apps/server/src/orchestration-v2/Adapters/ClaudeTaskOutputTail.test.ts
index a1a421232686..51c9a7848f10 100644
--- a/apps/server/src/orchestration-v2/Adapters/ClaudeTaskOutputTail.test.ts
+++ b/apps/server/src/orchestration-v2/Adapters/ClaudeTaskOutputTail.test.ts
@@ -101,33 +101,31 @@ describe("tailClaudeTaskOutput", () => {
     ).pipe(Effect.provide(NodeServices.layer)),
   );
 
-  it.live("reads what was written last when the tool result stops it", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const fileSystem = yield* FileSystem.FileSystem;
-        const { root, tasks, file } = yield* makeTaskFile;
-        yield* fileSystem.makeDirectory(tasks, { recursive: true });
-        yield* fileSystem.writeFileString(file, "one\n");
-        const chunks: Array<string> = [];
-        const stop = yield* Deferred.make<void>();
-        const first = yield* Deferred.make<void>();
-        const fiber = yield* tailClaudeTaskOutput({
-          root,
-          sessionId: SESSION_ID,
-          taskId: TASK_ID,
-          stop,
-          onChunk: (chunk) =>
-            Effect.sync(() => chunks.push(chunk)).pipe(
-              Effect.andThen(Deferred.succeed(first, undefined)),
-            ),
-        }).pipe(Effect.forkScoped);
-        yield* Deferred.await(first);
-        yield* fileSystem.writeFileString(file, "one\ntwo\n");
-        yield* Deferred.succeed(stop, undefined);
-        yield* Fiber.join(fiber);
-        assert.deepEqual(chunks, ["one\n", "two\n"]);
-      }).pipe(Effect.provide(NodeServices.layer)),
-    ),
+  it.effect("reads what was written last when the tool result stops it", () =>
+    Effect.gen(function* () {
+      const fileSystem = yield* FileSystem.FileSystem;
+      const { root, tasks, file } = yield* makeTaskFile;
+      yield* fileSystem.makeDirectory(tasks, { recursive: true });
+      yield* fileSystem.writeFileString(file, "one\n");
+      const chunks: Array<string> = [];
+      const stop = yield* Deferred.make<void>();
+      const first = yield* Deferred.make<void>();
+      const fiber = yield* tailClaudeTaskOutput({
+        root,
+        sessionId: SESSION_ID,
+        taskId: TASK_ID,
+        stop,
+        onChunk: (chunk) =>
+          Effect.sync(() => chunks.push(chunk)).pipe(
+            Effect.andThen(Deferred.succeed(first, undefined)),
+          ),
+      }).pipe(Effect.forkScoped);
+      yield* Deferred.await(first);
+      yield* fileSystem.writeFileString(file, "one\ntwo\n");
+      yield* Deferred.succeed(stop, undefined);
+      yield* Fiber.join(fiber);
+      assert.deepEqual(chunks, ["one\n", "two\n"]);
+    }).pipe(Effect.provide(NodeServices.layer)),
   );
 });
 
diff --git a/apps/server/src/orchestration-v2/Adapters/CodexAdapterV2.test.ts b/apps/server/src/orchestration-v2/Adapters/CodexAdapterV2.test.ts
index 6e5fd3516e0b..09ec3034a9bc 100644
--- a/apps/server/src/orchestration-v2/Adapters/CodexAdapterV2.test.ts
+++ b/apps/server/src/orchestration-v2/Adapters/CodexAdapterV2.test.ts
@@ -31,6 +31,7 @@ import {
   RunId,
   ThreadId,
   TurnItemId,
+  type ServerProviderModel,
 } from "@t3tools/contracts";
 import { assert, describe, it } from "@effect/vitest";
 import * as CodexClient from "effect-codex-app-server/client";
@@ -230,6 +231,34 @@ describe("CodexAdapterV2 runtime policy", () => {
     }),
   );
 
+  it.effect("sends the chosen cyber access program, else the model's default", () =>
+    Effect.gen(function* () {
+      const build = (value?: string, cyberAccess?: { defaultProgram: string | undefined }) =>
+        CodexAdapterV2.buildCodexTurnStartParams({
+          nativeThreadId: "native-cyber",
+          codexInput: [{ type: "text", text: "test" }],
+          runtimePolicy: { runtimeMode: "full-access", interactionMode: "default", cwd: null },
+          modelSelection: {
+            instanceId: ProviderInstanceId.make("codex"),
+            model: "gpt-5.4",
+            ...(value === undefined ? {} : { options: [{ id: "cyberAccessProgram", value }] }),
+          },
+          cyberAccess,
+        });
+
+      // Custom models offer no Cyber Access, so even an explicit choice is dropped.
+      assert.notProperty(yield* build(), "cyberAccessProgram");
+      assert.notProperty(yield* build("daybreakBlue"), "cyberAccessProgram");
+      const daybreak = { defaultProgram: "daybreakBlue" };
+      assert.equal((yield* build(undefined, daybreak)).cyberAccessProgram, "daybreakBlue");
+      assert.equal((yield* build("standard", daybreak)).cyberAccessProgram, "standard");
+      // An unread config leaves no default, but an explicit Standard still goes.
+      const unknown = { defaultProgram: undefined };
+      assert.notProperty(yield* build(undefined, unknown), "cyberAccessProgram");
+      assert.equal((yield* build("standard", unknown)).cyberAccessProgram, "standard");
+    }),
+  );
+
   it.effect("sends MCP app model context as untrusted Codex context", () =>
     Effect.gen(function* () {
       const policy = { runtimeMode: "full-access", interactionMode: "default", cwd: null } as const;
@@ -281,7 +310,6 @@ describe("CodexAdapterV2 native protocol logging", () => {
       const providerSessionId = ProviderSessionId.make("provider-session-1");
       const protocolLogger = CodexAdapterV2.makeCodexAppServerProtocolLogger({
         nativeEventLogger: logger,
-        threadId,
         providerSessionId,
       });
 
@@ -290,12 +318,52 @@ describe("CodexAdapterV2 native protocol logging", () => {
         return;
       }
 
+      const startThread = (requestId: number, appThreadId: string, nativeThreadId: string) =>
+        Effect.gen(function* () {
+          yield* protocolLogger({
+            direction: "outgoing",
+            stage: "decoded",
+            payload: {
+              id: requestId,
+              method: "thread/start",
+              params: { config: { "shell_environment_policy.set.T3CODE_THREAD_ID": appThreadId } },
+            },
+          });
+          yield* protocolLogger({
+            direction: "incoming",
+            stage: "decoded",
+            payload: { id: requestId, result: { thread: { id: nativeThreadId } } },
+          });
+        });
+      yield* startThread(1, "thread-1", "native-1");
+      yield* startThread(2, "thread-2", "native-2");
+      yield* protocolLogger({
+        direction: "outgoing",
+        stage: "decoded",
+        payload: { id: 3, method: "turn/start", params: { threadId: "native-2" } },
+      });
+      yield* protocolLogger({
+        direction: "incoming",
+        stage: "decoded",
+        payload: { id: 3, result: { turn: { id: "turn-2" } } },
+      });
+      yield* protocolLogger({
+        direction: "incoming",
+        stage: "decoded",
+        payload: { id: 4, result: { userAgent: "codex/1.0.0" } },
+      });
+      assert.deepEqual(
+        writes.splice(0).map((write) => write.threadId),
+        ["thread-1", "thread-1", "thread-2", "thread-2", "thread-2", "thread-2", null],
+      );
+
       yield* protocolLogger({
         direction: "incoming",
         stage: "decoded",
         payload: {
           method: "thread/event",
           params: {
+            threadId: "native-1",
             id: "evt-1",
             http_headers: { Authorization: "Bearer secret-codex-token" },
             usage: { inputTokens: 12, outputTokens: 8, totalTokens: 20 },
@@ -322,6 +390,7 @@ describe("CodexAdapterV2 native protocol logging", () => {
           payload: {
             method: "thread/event",
             params: {
+              threadId: "native-1",
               id: "evt-1",
               http_headers: { Authorization: "[REDACTED]" },
               usage: { inputTokens: 12, outputTokens: 8, totalTokens: 20 },
@@ -1302,6 +1371,7 @@ describe("CodexAdapterV2 post-settle continuation", () => {
     onUsageLimits?: CodexAdapterV2.CodexAdapterV2Options["onUsageLimits"],
     promptSuggestions: Effect.Effect<boolean> = Effect.succeed(false),
     onNotification: (method: string) => Effect.Effect<void> = () => Effect.void,
+    models?: CodexAdapterV2.CodexAdapterV2Options["models"],
   ) =>
     Effect.gen(function* () {
       const fileSystem = yield* FileSystem.FileSystem;
@@ -1364,6 +1434,7 @@ describe("CodexAdapterV2 post-settle continuation", () => {
         environment: {},
         clientFactory,
         ...(onUsageLimits ? { onUsageLimits } : {}),
+        ...(models ? { models } : {}),
         digest: yield* Digest.Digest,
         fileSystem,
         idAllocator,
@@ -1859,7 +1930,7 @@ describe("CodexAdapterV2 post-settle continuation", () => {
           );
         }).pipe(Effect.provide(CodexReplay.layerReplayWithDriver(driver)));
       }
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("waits for native start before interrupting an acknowledged queued turn", () =>
@@ -2180,568 +2251,354 @@ describe("CodexAdapterV2 post-settle continuation", () => {
     );
 
   it.effect("keeps an asynchronous Codex question actionable after the turn completes", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const nativeThreadId = "async-question-thread";
-        const nativeTurnId = "async-question-turn";
-        const usage = {
-          totalTokens: 15,
-          inputTokens: 10,
-          cachedInputTokens: 2,
-          outputTokens: 5,
-          reasoningOutputTokens: 1,
-        };
-        const transcript = makeCodexReplayTranscript({
-          scenario: "async-question-and-billed-usage",
-          entries: [
-            ...codexReplayPreamble({
-              nativeThreadId,
-              nativeTurnId,
-              prompt: "Continue while I decide.",
-            }),
-            {
-              type: "emit_inbound",
-              label: "question",
-              frame: {
-                method: "item/completed",
-                params: {
-                  threadId: nativeThreadId,
-                  turnId: nativeTurnId,
-                  item: {
-                    type: "agentMessage",
-                    id: "async-question-item",
-                    text: "Which branch?",
-                    delivery: "async",
-                    questions: [{ title: "Which branch?", options: ["main", "dev"] }],
-                  },
-                },
-              },
-            },
-            {
-              type: "emit_inbound",
-              label: "usage",
-              frame: {
-                method: "thread/tokenUsage/updated",
-                params: {
-                  threadId: nativeThreadId,
-                  turnId: nativeTurnId,
-                  tokenUsage: { total: usage, last: usage, modelContextWindow: 200_000 },
-                },
-              },
-            },
-            {
-              type: "emit_inbound",
-              label: "complete",
-              frame: {
-                method: "turn/completed",
-                params: {
-                  threadId: nativeThreadId,
-                  turn: makeCodexReplayTurn({ id: nativeTurnId, status: "completed" }),
-                },
-              },
-            },
-          ],
-        });
-        const harness = yield* makeCodexReplayHarness(transcript);
-        yield* harness.runtime.startTurn(
-          makeCodexTestTurnInput({
-            threadId: harness.threadId,
-            providerThread: harness.providerThread,
-            now: yield* DateTime.now,
-            attemptId: RunAttemptId.make("async-question-attempt"),
-            text: "Continue while I decide.",
-          }),
-        );
-        yield* harness.firstTerminal;
-        const requests = harness.events.flatMap((event) =>
-          event.type === "runtime_request.updated" ? [event.runtimeRequest] : [],
-        );
-        assert.lengthOf(requests, 1);
-        assert.equal(requests[0]?.status, "pending");
-        assert.deepEqual(requests[0]?.responseCapability, { type: "message" });
-        const questionItem = harness.events.find(
-          (event) =>
-            event.type === "turn_item.updated" && event.turnItem.type === "user_input_request",
-        );
-        assert.equal(questionItem?.type, "turn_item.updated");
-        if (
-          questionItem?.type === "turn_item.updated" &&
-          questionItem.turnItem.type === "user_input_request"
-        ) {
-          assert.deepEqual(
-            questionItem.turnItem.questions[0]?.options.map((option) => option.label),
-            ["main", "dev"],
-          );
-          assert.equal(questionItem.turnItem.responseMode, "message");
-        }
-        const questionNode = harness.events.find(
-          (event) => event.type === "node.updated" && event.node.id === requests[0]?.nodeId,
-        );
-        assert.equal(
-          questionNode?.type === "node.updated" && questionNode.node.countsForRun,
-          false,
-        );
-        const contextReport = harness.events.find(
-          (event) =>
-            event.type === "provider_turn.updated" && event.providerTurn.tokenUsage !== undefined,
-        );
-        assert.equal(contextReport?.type, "provider_turn.updated");
-        if (contextReport?.type === "provider_turn.updated") {
-          assert.equal(
-            contextReport.providerTurn.runAttemptId,
-            RunAttemptId.make("async-question-attempt"),
-          );
-          assert.equal(contextReport.providerTurn.providerThreadId, harness.providerThread.id);
-          assert.equal(contextReport.providerTurn.tokenUsage?.usedTokens, 15);
-          assert.equal(contextReport.providerTurn.tokenUsage?.maxTokens, 200_000);
-        }
-        const completed = harness.events.find(
-          (event) =>
-            event.type === "provider_turn.updated" && event.providerTurn.status === "completed",
-        );
-        assert.equal(completed?.type, "provider_turn.updated");
-        if (completed?.type === "provider_turn.updated") {
-          assert.deepEqual(completed.providerTurn.turnTokenUsage, {
-            usageStatus: "complete",
-            usageScope: "main_agent",
-            hasSubagents: false,
-            inputTokens: 10,
-            cachedInputTokens: 2,
-            outputTokens: 5,
-            reasoningTokens: 1,
-          });
-        }
-        assert.isEmpty(assistantMessages(harness.events));
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
-          ),
-        ),
-      ),
-    ),
-  );
-
-  it.effect("records the model Codex reports on the root provider turn", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const nativeThreadId = "reported-model-thread";
-        const nativeTurnId = "reported-model-turn";
-        const transcript = makeCodexReplayTranscript({
-          scenario: "codex-reported-model",
-          entries: [
-            ...codexReplayPreamble({ nativeThreadId, nativeTurnId, prompt: "say hi" }),
-            {
-              type: "emit_inbound",
-              label: "rerouted",
-              frame: {
-                method: "model/rerouted",
-                params: {
-                  threadId: nativeThreadId,
-                  turnId: nativeTurnId,
-                  fromModel: "gpt-6-astra",
-                  toModel: "gpt-5.6-sol",
-                  reason: "highRiskCyberActivity",
-                },
-              },
-            },
-            {
-              type: "emit_inbound",
-              label: "complete",
-              frame: {
-                method: "turn/completed",
-                params: {
-                  threadId: nativeThreadId,
-                  turn: makeCodexReplayTurn({ id: nativeTurnId, status: "completed" }),
-                },
-              },
-            },
-          ],
-        });
-        const harness = yield* makeCodexReplayHarness(transcript);
-        yield* harness.runtime.startTurn(
-          makeCodexTestTurnInput({
-            threadId: harness.threadId,
-            providerThread: harness.providerThread,
-            now: yield* DateTime.now,
-            attemptId: RunAttemptId.make("reported-model-attempt"),
-            text: "say hi",
-          }),
-        );
-        yield* harness.firstTerminal;
-        const completed = harness.events.find(
-          (event) =>
-            event.type === "provider_turn.updated" && event.providerTurn.status === "completed",
-        );
-        assert.equal(completed?.type, "provider_turn.updated");
-        if (completed?.type !== "provider_turn.updated") return;
-        assert.deepEqual(completed.providerTurn.turnTokenUsage?.models, ["gpt-5.6-sol"]);
-        assert.equal(completed.providerTurn.model, "gpt-5.6-sol");
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
-          ),
-        ),
-      ),
-    ),
-  );
-
-  it.effect.each(["before", "during"] as const)(
-    "surfaces a user MCP server that fails to start %s the turn",
-    (timing) =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const nativeThreadId = "mcp-startup-failed-thread";
-          const nativeTurnId = "mcp-startup-failed-turn";
-          const startupError =
-            "MCP client for `example_mcp` failed to start: MCP startup failed: handshaking with MCP server failed";
-          const startup: Array<CodexReplay.CodexAppServerReplayEntry> = [
-            {
-              type: "emit_inbound",
-              label: "mcp-starting",
-              frame: {
-                method: "mcpServer/startupStatus/updated",
-                params: {
-                  threadId: nativeThreadId,
-                  name: "example_mcp",
-                  status: "starting",
-                  error: null,
-                  failureReason: null,
-                },
-              },
-            },
-            {
-              type: "emit_inbound",
-              label: "mcp-failed",
-              frame: {
-                method: "mcpServer/startupStatus/updated",
-                params: {
-                  threadId: nativeThreadId,
-                  name: "example_mcp",
-                  status: "failed",
-                  error: startupError,
-                  failureReason: null,
-                },
-              },
-            },
-          ];
-          const preamble = codexReplayPreamble({
+    Effect.gen(function* () {
+      const nativeThreadId = "async-question-thread";
+      const nativeTurnId = "async-question-turn";
+      const usage = {
+        totalTokens: 15,
+        inputTokens: 10,
+        cachedInputTokens: 2,
+        outputTokens: 5,
+        reasoningOutputTokens: 1,
+      };
+      const transcript = makeCodexReplayTranscript({
+        scenario: "async-question-and-billed-usage",
+        entries: [
+          ...codexReplayPreamble({
             nativeThreadId,
             nativeTurnId,
-            prompt: "use example_mcp",
-          });
-          const turnStart = preamble.findIndex(
-            (entry) => entry.type === "expect_outbound" && entry.label === "turn/start",
-          );
-          const transcript = makeCodexReplayTranscript({
-            scenario: "codex-mcp-startup-failed",
-            entries: [
-              ...(timing === "before"
-                ? [...preamble.slice(0, turnStart), ...startup, ...preamble.slice(turnStart)]
-                : [...preamble, ...startup]),
-              {
-                type: "emit_inbound",
-                label: "complete",
-                frame: {
-                  method: "turn/completed",
-                  params: {
-                    threadId: nativeThreadId,
-                    turn: makeCodexReplayTurn({ id: nativeTurnId, status: "completed" }),
-                  },
-                },
-              },
-            ],
-          });
-          const harness = yield* makeCodexReplayHarness(transcript);
-          yield* harness.runtime.startTurn(
-            makeCodexTestTurnInput({
-              threadId: harness.threadId,
-              providerThread: harness.providerThread,
-              now: yield* DateTime.now,
-              attemptId: RunAttemptId.make("mcp-startup-failed-attempt"),
-              text: "use example_mcp",
-            }),
-          );
-          yield* harness.firstTerminal;
-          const surfaced = harness.events.filter((event) => {
-            const serialized = JSON.stringify(event);
-            return serialized.includes("example_mcp") && serialized.includes("failed to start");
-          });
-          assert.isNotEmpty(surfaced);
-        }).pipe(
-          Effect.provide(
-            Layer.mergeAll(
-              IdAllocator.layer,
-              McpProviderSessions.layer,
-              NodeServices.layer,
-              NodeCrypto.layer,
-            ),
-          ),
-        ),
-      ),
-  );
-
-  it.effect("stops asking for commands the user allowed for the session", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const nativeThreadId = "session-approval-thread";
-        const turnIds = [
-          "session-approval-turn-1",
-          "session-approval-turn-2",
-          "session-approval-turn-3",
-        ];
-        const turnPolicies = {
-          "approval-required": {
-            approvalPolicy: "untrusted",
-            approvalsReviewer: "user",
-            sandboxPolicy: { type: "readOnly" },
-          },
-          "full-access": {
-            approvalPolicy: "never",
-            approvalsReviewer: "user",
-            sandboxPolicy: { type: "dangerFullAccess" },
-          },
-        } as const;
-        const turnModes = ["approval-required", "full-access", "approval-required"] as const;
-        const turnText = (index: number) => `Review round ${index + 1}.`;
-        const startTurn = (index: number): ReadonlyArray<CodexReplay.CodexAppServerReplayEntry> => [
+            prompt: "Continue while I decide.",
+          }),
           {
-            type: "expect_outbound",
-            label: `turn ${index + 1} turn/start`,
+            type: "emit_inbound",
+            label: "question",
             frame: {
-              id: 3 + index,
-              method: "turn/start",
+              method: "item/completed",
               params: {
                 threadId: nativeThreadId,
-                input: [{ type: "text", text: turnText(index) }],
-                cwd: "/workspace",
-                model: "gpt-5.4",
-                ...turnPolicies[turnModes[index]!],
-                summary: "auto",
-                collaborationMode: { mode: "default", settings: { model: "gpt-5.4" } },
+                turnId: nativeTurnId,
+                item: {
+                  type: "agentMessage",
+                  id: "async-question-item",
+                  text: "Which branch?",
+                  delivery: "async",
+                  questions: [{ title: "Which branch?", options: ["main", "dev"] }],
+                },
               },
             },
           },
           {
             type: "emit_inbound",
-            label: `turn ${index + 1} turn/start`,
+            label: "usage",
             frame: {
-              id: 3 + index,
-              result: { turn: makeCodexReplayTurn({ id: turnIds[index]!, status: "inProgress" }) },
+              method: "thread/tokenUsage/updated",
+              params: {
+                threadId: nativeThreadId,
+                turnId: nativeTurnId,
+                tokenUsage: { total: usage, last: usage, modelContextWindow: 200_000 },
+              },
             },
           },
-          turnEvent("turn/started", turnIds[index]!),
-        ];
-        const approval = (input: {
-          readonly id: number;
-          readonly turnId: string;
-          readonly kind: "commandExecution" | "fileChange";
-          readonly itemId: string;
-          readonly decision: string;
-        }): ReadonlyArray<CodexReplay.CodexAppServerReplayEntry> => [
           {
             type: "emit_inbound",
-            label: `${input.itemId} approval`,
+            label: "complete",
             frame: {
-              id: input.id,
-              method: `item/${input.kind}/requestApproval`,
+              method: "turn/completed",
               params: {
                 threadId: nativeThreadId,
-                turnId: input.turnId,
-                itemId: input.itemId,
-                startedAtMs: 1782622441000,
-                ...(input.kind === "commandExecution" ? { command: `cat ${input.itemId}` } : {}),
+                turn: makeCodexReplayTurn({ id: nativeTurnId, status: "completed" }),
               },
             },
           },
-          {
-            type: "expect_outbound",
-            label: `${input.itemId} decision`,
-            frame: { id: input.id, result: { decision: input.decision } },
-          },
-        ];
-        const turnEvent = (
-          method: "turn/started" | "turn/completed",
-          turnId: string,
-        ): CodexReplay.CodexAppServerReplayEntry => ({
-          type: "emit_inbound",
-          label: `${turnId} ${method}`,
-          frame: {
-            method,
-            params: {
-              threadId: nativeThreadId,
-              turn: makeCodexReplayTurn({
-                id: turnId,
-                status: method === "turn/started" ? "inProgress" : "completed",
-              }),
-            },
-          },
-        });
-        const [patchRequest, patchDecision] = approval({
-          id: 102,
-          turnId: turnIds[0]!,
-          kind: "fileChange",
-          itemId: "first-patch",
-          decision: "acceptForSession",
-        });
-        const transcript = makeCodexReplayTranscript({
-          scenario: "codex-session-approvals",
-          entries: [
-            ...codexReplayPreamble({
-              nativeThreadId,
-              nativeTurnId: turnIds[0]!,
-              prompt: turnText(0),
-            }).slice(0, -3),
-            ...startTurn(0),
-            ...approval({
-              id: 100,
-              turnId: turnIds[0]!,
-              kind: "commandExecution",
-              itemId: "first-command",
-              decision: "acceptForSession",
-            }),
-            patchRequest!,
-            ...approval({
-              id: 101,
-              turnId: turnIds[0]!,
-              kind: "commandExecution",
-              itemId: "second-command",
-              decision: "acceptForSession",
-            }),
-            turnEvent("turn/completed", turnIds[0]!),
-            ...startTurn(1),
-            patchDecision!,
-            turnEvent("turn/completed", turnIds[1]!),
-            ...startTurn(2),
-            ...approval({
-              id: 103,
-              turnId: turnIds[2]!,
-              kind: "commandExecution",
-              itemId: "third-command",
-              decision: "accept",
-            }),
-            ...approval({
-              id: 104,
-              turnId: turnIds[2]!,
-              kind: "fileChange",
-              itemId: "second-patch",
-              decision: "accept",
-            }),
-            turnEvent("turn/completed", turnIds[2]!),
-          ],
+        ],
+      });
+      const harness = yield* makeCodexReplayHarness(transcript);
+      yield* harness.runtime.startTurn(
+        makeCodexTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now: yield* DateTime.now,
+          attemptId: RunAttemptId.make("async-question-attempt"),
+          text: "Continue while I decide.",
+        }),
+      );
+      yield* harness.firstTerminal;
+      const requests = harness.events.flatMap((event) =>
+        event.type === "runtime_request.updated" ? [event.runtimeRequest] : [],
+      );
+      assert.lengthOf(requests, 1);
+      assert.equal(requests[0]?.status, "pending");
+      assert.deepEqual(requests[0]?.responseCapability, { type: "message" });
+      const questionItem = harness.events.find(
+        (event) =>
+          event.type === "turn_item.updated" && event.turnItem.type === "user_input_request",
+      );
+      assert.equal(questionItem?.type, "turn_item.updated");
+      if (
+        questionItem?.type === "turn_item.updated" &&
+        questionItem.turnItem.type === "user_input_request"
+      ) {
+        assert.deepEqual(
+          questionItem.turnItem.questions[0]?.options.map((option) => option.label),
+          ["main", "dev"],
+        );
+        assert.equal(questionItem.turnItem.responseMode, "message");
+      }
+      const questionNode = harness.events.find(
+        (event) => event.type === "node.updated" && event.node.id === requests[0]?.nodeId,
+      );
+      assert.equal(questionNode?.type === "node.updated" && questionNode.node.countsForRun, false);
+      const contextReport = harness.events.find(
+        (event) =>
+          event.type === "provider_turn.updated" && event.providerTurn.tokenUsage !== undefined,
+      );
+      assert.equal(contextReport?.type, "provider_turn.updated");
+      if (contextReport?.type === "provider_turn.updated") {
+        assert.equal(
+          contextReport.providerTurn.runAttemptId,
+          RunAttemptId.make("async-question-attempt"),
+        );
+        assert.equal(contextReport.providerTurn.providerThreadId, harness.providerThread.id);
+        assert.equal(contextReport.providerTurn.tokenUsage?.usedTokens, 15);
+        assert.equal(contextReport.providerTurn.tokenUsage?.maxTokens, 200_000);
+      }
+      const completed = harness.events.find(
+        (event) =>
+          event.type === "provider_turn.updated" && event.providerTurn.status === "completed",
+      );
+      assert.equal(completed?.type, "provider_turn.updated");
+      if (completed?.type === "provider_turn.updated") {
+        assert.deepEqual(completed.providerTurn.turnTokenUsage, {
+          usageStatus: "complete",
+          usageScope: "main_agent",
+          hasSubagents: false,
+          inputTokens: 10,
+          cachedInputTokens: 2,
+          outputTokens: 5,
+          reasoningTokens: 1,
         });
-        const harness = yield* makeCodexReplayHarness(transcript);
-        const requests = () => [
-          ...new Map(
-            harness.events.flatMap((event) =>
-              event.type === "runtime_request.updated"
-                ? [[event.runtimeRequest.id, event.runtimeRequest] as const]
-                : [],
-            ),
-          ).values(),
-        ];
-        const answer = (
-          count: number,
-          kind: "command" | "file-change",
-          decision: ProviderApprovalDecision,
-        ) =>
-          Effect.gen(function* () {
-            yield* harness.until(() => requests().length === count);
-            const request = requests()[count - 1]!;
-            assert.equal(request.kind, kind);
-            yield* harness.runtime.respondToRuntimeRequest({ requestId: request.id, decision });
-          });
+      }
+      assert.isEmpty(assistantMessages(harness.events));
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
+        ),
+      ),
+    ),
+  );
 
-        const runTurn = (index: number) =>
-          Effect.gen(function* () {
-            yield* harness.runtime.startTurn({
-              ...makeCodexTestTurnInput({
-                threadId: harness.threadId,
-                providerThread: harness.providerThread,
-                now: yield* DateTime.now,
-                attemptId: RunAttemptId.make(`session-approvals-${index + 1}`),
-                text: turnText(index),
-              }),
-              runOrdinal: index + 1,
-              providerTurnOrdinal: index + 1,
-              runtimePolicy: { ...CODEX_TEST_RUNTIME_POLICY, runtimeMode: turnModes[index]! },
-            });
-          });
+  it.effect("returns a Codex question's answer under its native question id", () =>
+    Effect.gen(function* () {
+      const nativeThreadId = "question-id-thread";
+      const nativeTurnId = "question-id-turn";
+      const transcript = makeCodexReplayTranscript({
+        scenario: "codex-question-native-id",
+        entries: [
+          ...codexReplayPreamble({ nativeThreadId, nativeTurnId, prompt: "Pick one." }),
+          {
+            type: "emit_inbound",
+            label: "question",
+            frame: {
+              id: 100,
+              method: "item/tool/requestUserInput",
+              params: {
+                threadId: nativeThreadId,
+                turnId: nativeTurnId,
+                itemId: "question-id-item",
+                isBlocking: true,
+                questions: [
+                  {
+                    id: " choice ",
+                    header: "Choice",
+                    question: "Which option?",
+                    options: [{ label: "A", description: "Option A" }],
+                  },
+                ],
+              },
+            },
+          },
+          {
+            type: "expect_outbound",
+            label: "answer",
+            frame: { id: 100, result: { answers: { " choice ": { answers: ["A"] } } } },
+          },
+          {
+            type: "emit_inbound",
+            label: "complete",
+            frame: {
+              method: "turn/completed",
+              params: {
+                threadId: nativeThreadId,
+                turn: makeCodexReplayTurn({ id: nativeTurnId, status: "completed" }),
+              },
+            },
+          },
+        ],
+      });
+      const harness = yield* makeCodexReplayHarness(transcript);
+      yield* harness.runtime.startTurn(
+        makeCodexTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now: yield* DateTime.now,
+          attemptId: RunAttemptId.make("question-id-attempt"),
+          text: "Pick one.",
+        }),
+      );
+      const questionItem = () =>
+        harness.events.flatMap((event) =>
+          event.type === "turn_item.updated" && event.turnItem.type === "user_input_request"
+            ? [event.turnItem]
+            : [],
+        )[0];
+      const request = () =>
+        harness.events.flatMap((event) =>
+          event.type === "runtime_request.updated" ? [event.runtimeRequest] : [],
+        )[0];
+      yield* harness.until(() => questionItem() !== undefined && request() !== undefined);
+      const publishedId = questionItem()!.questions[0]!.id;
+      yield* harness.runtime.respondToRuntimeRequest({
+        requestId: request()!.id,
+        answers: { [publishedId]: ["A"] },
+      });
+      yield* harness.firstTerminal;
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
+        ),
+      ),
+    ),
+  );
 
-        yield* runTurn(0);
-        yield* answer(1, "command", "acceptForSession");
-        yield* harness.until(() => requests().length === 2);
-        yield* harness.awaitTerminal(1);
-        yield* runTurn(1);
-        yield* answer(2, "file-change", "acceptForSession");
-        yield* harness.awaitTerminal(2);
-        yield* runTurn(2);
-        yield* answer(3, "command", "accept");
-        yield* answer(4, "file-change", "accept");
-        yield* harness.awaitTerminal(3);
-        assert.lengthOf(requests(), 4);
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
-          ),
+  it.effect("records the model Codex reports on the root provider turn", () =>
+    Effect.gen(function* () {
+      const nativeThreadId = "reported-model-thread";
+      const nativeTurnId = "reported-model-turn";
+      const transcript = makeCodexReplayTranscript({
+        scenario: "codex-reported-model",
+        entries: [
+          ...codexReplayPreamble({ nativeThreadId, nativeTurnId, prompt: "say hi" }),
+          {
+            type: "emit_inbound",
+            label: "rerouted",
+            frame: {
+              method: "model/rerouted",
+              params: {
+                threadId: nativeThreadId,
+                turnId: nativeTurnId,
+                fromModel: "gpt-6-astra",
+                toModel: "gpt-5.6-sol",
+                reason: "highRiskCyberActivity",
+              },
+            },
+          },
+          {
+            type: "emit_inbound",
+            label: "complete",
+            frame: {
+              method: "turn/completed",
+              params: {
+                threadId: nativeThreadId,
+                turn: makeCodexReplayTurn({ id: nativeTurnId, status: "completed" }),
+              },
+            },
+          },
+        ],
+      });
+      const harness = yield* makeCodexReplayHarness(transcript);
+      yield* harness.runtime.startTurn(
+        makeCodexTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now: yield* DateTime.now,
+          attemptId: RunAttemptId.make("reported-model-attempt"),
+          text: "say hi",
+        }),
+      );
+      yield* harness.firstTerminal;
+      const completed = harness.events.find(
+        (event) =>
+          event.type === "provider_turn.updated" && event.providerTurn.status === "completed",
+      );
+      assert.equal(completed?.type, "provider_turn.updated");
+      if (completed?.type !== "provider_turn.updated") return;
+      assert.deepEqual(completed.providerTurn.turnTokenUsage?.models, ["gpt-5.6-sol"]);
+      assert.equal(completed.providerTurn.model, "gpt-5.6-sol");
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
         ),
       ),
     ),
   );
 
-  it.effect("preserves T3 context on the wire and restores it after compaction", () =>
-    Effect.scoped(
+  it.effect.each(["before", "during"] as const)(
+    "surfaces a user MCP server that fails to start %s the turn",
+    (timing) =>
       Effect.gen(function* () {
-        const nativeThreadId = "context-thread";
-        const nativeTurnId = "context-turn";
-        const params = yield* CodexAdapterV2.buildCodexTurnStartParams({
+        const nativeThreadId = "mcp-startup-failed-thread";
+        const nativeTurnId = "mcp-startup-failed-turn";
+        const startupError =
+          "MCP client for `example_mcp` failed to start: MCP startup failed: handshaking with MCP server failed";
+        const startup: Array<CodexReplay.CodexAppServerReplayEntry> = [
+          {
+            type: "emit_inbound",
+            label: "mcp-starting",
+            frame: {
+              method: "mcpServer/startupStatus/updated",
+              params: {
+                threadId: nativeThreadId,
+                name: "example_mcp",
+                status: "starting",
+                error: null,
+                failureReason: null,
+              },
+            },
+          },
+          {
+            type: "emit_inbound",
+            label: "mcp-failed",
+            frame: {
+              method: "mcpServer/startupStatus/updated",
+              params: {
+                threadId: nativeThreadId,
+                name: "example_mcp",
+                status: "failed",
+                error: startupError,
+                failureReason: null,
+              },
+            },
+          },
+        ];
+        const preamble = codexReplayPreamble({
           nativeThreadId,
-          codexInput: [{ type: "text", text: "work" }],
-          runtimePolicy: CODEX_TEST_RUNTIME_POLICY,
-          modelSelection: CODEX_TEST_MODEL_SELECTION,
-          hasT3Mcp: true,
+          nativeTurnId,
+          prompt: "use example_mcp",
         });
-        assert.include(
-          params.additionalContext?.t3_code_orchestration_01?.value ?? "",
-          "delegate_task",
+        const turnStart = preamble.findIndex(
+          (entry) => entry.type === "expect_outbound" && entry.label === "turn/start",
         );
-        const entries = codexReplayPreamble({ nativeThreadId, nativeTurnId, prompt: "work" });
         const transcript = makeCodexReplayTranscript({
-          scenario: "restore-context",
+          scenario: "codex-mcp-startup-failed",
           entries: [
-            ...entries.slice(0, 5),
-            {
-              type: "expect_outbound",
-              label: "context turn",
-              frame: { id: 3, method: "turn/start", params },
-            },
-            ...entries.slice(6),
-            {
-              type: "emit_inbound",
-              label: "compacted",
-              frame: {
-                method: "item/completed",
-                params: {
-                  threadId: nativeThreadId,
-                  turnId: nativeTurnId,
-                  item: { type: "contextCompaction", id: "compact-context" },
-                },
-              },
-            },
+            ...(timing === "before"
+              ? [...preamble.slice(0, turnStart), ...startup, ...preamble.slice(turnStart)]
+              : [...preamble, ...startup]),
             {
               type: "emit_inbound",
-              label: "done",
+              label: "complete",
               frame: {
                 method: "turn/completed",
                 params: {
@@ -2750,73 +2607,24 @@ describe("CodexAdapterV2 post-settle continuation", () => {
                 },
               },
             },
-            {
-              type: "expect_outbound",
-              label: "restore context",
-              frame: {
-                id: 4,
-                method: "thread/inject_items",
-                params: {
-                  threadId: nativeThreadId,
-                  items: Object.entries(params.additionalContext ?? {}).map(([key, entry]) => ({
-                    type: "message",
-                    role: "developer",
-                    content: [{ type: "input_text", text: `<${key}>${entry.value}</${key}>` }],
-                  })),
-                },
-              },
-            },
-            { type: "emit_inbound", label: "restored", frame: { id: 4, result: {} } },
           ],
         });
-        // Codex queues items injected mid-turn as pending input and samples again.
-        const wireOrder: Array<string> = [];
-        const restoreRequested = yield* Deferred.make<void>();
-        const harness = yield* makeCodexReplayHarness(
-          transcript,
-          undefined,
-          (method) =>
-            method === "thread/inject_items"
-              ? Effect.sync(() => wireOrder.push(method)).pipe(
-                  Effect.andThen(Deferred.succeed(restoreRequested, undefined)),
-                )
-              : Effect.void,
-          undefined,
-          undefined,
-          undefined,
-          undefined,
-          (method) =>
-            Effect.sync(() => {
-              if (method === "item/completed" || method === "turn/completed")
-                wireOrder.push(method);
-            }),
-        );
-        yield* (yield* McpProviderSessions.McpProviderSessions).set({
-          environmentId: EnvironmentId.make("test"),
-          threadId: harness.threadId,
-          providerSessionId: "context-session",
-          providerInstanceId: ProviderInstanceId.make("codex"),
-          endpoint: "http://127.0.0.1:43123/mcp",
-          authorizationHeader: "Bearer test",
-          browserToolsAvailable: true,
-        });
+        const harness = yield* makeCodexReplayHarness(transcript);
         yield* harness.runtime.startTurn(
           makeCodexTestTurnInput({
             threadId: harness.threadId,
             providerThread: harness.providerThread,
             now: yield* DateTime.now,
-            attemptId: RunAttemptId.make("context-attempt"),
-            text: "work",
+            attemptId: RunAttemptId.make("mcp-startup-failed-attempt"),
+            text: "use example_mcp",
           }),
         );
         yield* harness.firstTerminal;
-        yield* Deferred.await(restoreRequested);
-        assert.equal(harness.terminalEvents()[0]?.status, "completed");
-        assert.deepEqual(
-          wireOrder,
-          ["item/completed", "turn/completed", "thread/inject_items"],
-          "restored T3 context while the compacting native turn was still running",
-        );
+        const surfaced = harness.events.filter((event) => {
+          const serialized = JSON.stringify(event);
+          return serialized.includes("example_mcp") && serialized.includes("failed to start");
+        });
+        assert.isNotEmpty(surfaced);
       }).pipe(
         Effect.provide(
           Layer.mergeAll(
@@ -2827,81 +2635,582 @@ describe("CodexAdapterV2 post-settle continuation", () => {
           ),
         ),
       ),
-    ),
   );
 
-  it.effect("compacts Codex with the native RPC and completes the compaction turn", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const nativeThreadId = "compact-thread";
-        const nativeTurnId = "compact-turn";
-        const item = { type: "contextCompaction", id: "compact-item" };
-        const transcript = makeCodexReplayTranscript({
-          scenario: "native-compaction",
-          entries: [
-            ...codexReplayPreamble({ nativeThreadId, nativeTurnId, prompt: "unused" }).slice(0, 5),
-            {
-              type: "expect_outbound",
-              label: "compact",
-              frame: {
-                id: 3,
-                method: "thread/compact/start",
-                params: { threadId: nativeThreadId },
+  it.effect("stops asking for commands the user allowed for the session", () =>
+    Effect.gen(function* () {
+      const nativeThreadId = "session-approval-thread";
+      const turnIds = [
+        "session-approval-turn-1",
+        "session-approval-turn-2",
+        "session-approval-turn-3",
+      ];
+      const turnPolicies = {
+        "approval-required": {
+          approvalPolicy: "untrusted",
+          approvalsReviewer: "user",
+          sandboxPolicy: { type: "readOnly" },
+        },
+        "full-access": {
+          approvalPolicy: "never",
+          approvalsReviewer: "user",
+          sandboxPolicy: { type: "dangerFullAccess" },
+        },
+      } as const;
+      const turnModes = ["approval-required", "full-access", "approval-required"] as const;
+      const turnText = (index: number) => `Review round ${index + 1}.`;
+      const startTurn = (index: number): ReadonlyArray<CodexReplay.CodexAppServerReplayEntry> => [
+        {
+          type: "expect_outbound",
+          label: `turn ${index + 1} turn/start`,
+          frame: {
+            id: 3 + index,
+            method: "turn/start",
+            params: {
+              threadId: nativeThreadId,
+              input: [{ type: "text", text: turnText(index) }],
+              cwd: "/workspace",
+              model: "gpt-5.4",
+              ...turnPolicies[turnModes[index]!],
+              summary: "auto",
+              collaborationMode: { mode: "default", settings: { model: "gpt-5.4" } },
+            },
+          },
+        },
+        {
+          type: "emit_inbound",
+          label: `turn ${index + 1} turn/start`,
+          frame: {
+            id: 3 + index,
+            result: { turn: makeCodexReplayTurn({ id: turnIds[index]!, status: "inProgress" }) },
+          },
+        },
+        turnEvent("turn/started", turnIds[index]!),
+      ];
+      const approval = (input: {
+        readonly id: number;
+        readonly turnId: string;
+        readonly kind: "commandExecution" | "fileChange";
+        readonly itemId: string;
+        readonly decision: string;
+      }): ReadonlyArray<CodexReplay.CodexAppServerReplayEntry> => [
+        {
+          type: "emit_inbound",
+          label: `${input.itemId} approval`,
+          frame: {
+            id: input.id,
+            method: `item/${input.kind}/requestApproval`,
+            params: {
+              threadId: nativeThreadId,
+              turnId: input.turnId,
+              itemId: input.itemId,
+              startedAtMs: 1782622441000,
+              ...(input.kind === "commandExecution" ? { command: `cat ${input.itemId}` } : {}),
+            },
+          },
+        },
+        {
+          type: "expect_outbound",
+          label: `${input.itemId} decision`,
+          frame: { id: input.id, result: { decision: input.decision } },
+        },
+      ];
+      const turnEvent = (
+        method: "turn/started" | "turn/completed",
+        turnId: string,
+      ): CodexReplay.CodexAppServerReplayEntry => ({
+        type: "emit_inbound",
+        label: `${turnId} ${method}`,
+        frame: {
+          method,
+          params: {
+            threadId: nativeThreadId,
+            turn: makeCodexReplayTurn({
+              id: turnId,
+              status: method === "turn/started" ? "inProgress" : "completed",
+            }),
+          },
+        },
+      });
+      const [patchRequest, patchDecision] = approval({
+        id: 102,
+        turnId: turnIds[0]!,
+        kind: "fileChange",
+        itemId: "first-patch",
+        decision: "acceptForSession",
+      });
+      const transcript = makeCodexReplayTranscript({
+        scenario: "codex-session-approvals",
+        entries: [
+          ...codexReplayPreamble({
+            nativeThreadId,
+            nativeTurnId: turnIds[0]!,
+            prompt: turnText(0),
+          }).slice(0, -3),
+          ...startTurn(0),
+          ...approval({
+            id: 100,
+            turnId: turnIds[0]!,
+            kind: "commandExecution",
+            itemId: "first-command",
+            decision: "acceptForSession",
+          }),
+          patchRequest!,
+          ...approval({
+            id: 101,
+            turnId: turnIds[0]!,
+            kind: "commandExecution",
+            itemId: "second-command",
+            decision: "acceptForSession",
+          }),
+          turnEvent("turn/completed", turnIds[0]!),
+          ...startTurn(1),
+          patchDecision!,
+          turnEvent("turn/completed", turnIds[1]!),
+          ...startTurn(2),
+          ...approval({
+            id: 103,
+            turnId: turnIds[2]!,
+            kind: "commandExecution",
+            itemId: "third-command",
+            decision: "accept",
+          }),
+          ...approval({
+            id: 104,
+            turnId: turnIds[2]!,
+            kind: "fileChange",
+            itemId: "second-patch",
+            decision: "accept",
+          }),
+          turnEvent("turn/completed", turnIds[2]!),
+        ],
+      });
+      const harness = yield* makeCodexReplayHarness(transcript);
+      const requests = () => [
+        ...new Map(
+          harness.events.flatMap((event) =>
+            event.type === "runtime_request.updated"
+              ? [[event.runtimeRequest.id, event.runtimeRequest] as const]
+              : [],
+          ),
+        ).values(),
+      ];
+      const answer = (
+        count: number,
+        kind: "command" | "file-change",
+        decision: ProviderApprovalDecision,
+      ) =>
+        Effect.gen(function* () {
+          yield* harness.until(() => requests().length === count);
+          const request = requests()[count - 1]!;
+          assert.equal(request.kind, kind);
+          yield* harness.runtime.respondToRuntimeRequest({ requestId: request.id, decision });
+        });
+
+      const runTurn = (index: number) =>
+        Effect.gen(function* () {
+          yield* harness.runtime.startTurn({
+            ...makeCodexTestTurnInput({
+              threadId: harness.threadId,
+              providerThread: harness.providerThread,
+              now: yield* DateTime.now,
+              attemptId: RunAttemptId.make(`session-approvals-${index + 1}`),
+              text: turnText(index),
+            }),
+            runOrdinal: index + 1,
+            providerTurnOrdinal: index + 1,
+            runtimePolicy: { ...CODEX_TEST_RUNTIME_POLICY, runtimeMode: turnModes[index]! },
+          });
+        });
+
+      yield* runTurn(0);
+      yield* answer(1, "command", "acceptForSession");
+      yield* harness.until(() => requests().length === 2);
+      yield* harness.awaitTerminal(1);
+      yield* runTurn(1);
+      yield* answer(2, "file-change", "acceptForSession");
+      yield* harness.awaitTerminal(2);
+      yield* runTurn(2);
+      yield* answer(3, "command", "accept");
+      yield* answer(4, "file-change", "accept");
+      yield* harness.awaitTerminal(3);
+      assert.lengthOf(requests(), 4);
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
+        ),
+      ),
+    ),
+  );
+
+  it.effect("preserves T3 context on the wire and restores it after compaction", () =>
+    Effect.gen(function* () {
+      const nativeThreadId = "context-thread";
+      const nativeTurnId = "context-turn";
+      // An explicit Standard must reach Codex, or Codex falls back to Daybreak.
+      const modelSelection = {
+        ...CODEX_TEST_MODEL_SELECTION,
+        options: [{ id: "cyberAccessProgram", value: "standard" }],
+      };
+      const params = yield* CodexAdapterV2.buildCodexTurnStartParams({
+        nativeThreadId,
+        codexInput: [{ type: "text", text: "work" }],
+        runtimePolicy: CODEX_TEST_RUNTIME_POLICY,
+        modelSelection,
+        hasT3Mcp: true,
+        cyberAccess: { defaultProgram: "daybreakBlue" },
+      });
+      assert.include(
+        params.additionalContext?.t3_code_orchestration_01?.value ?? "",
+        "delegate_task",
+      );
+      const entries = codexReplayPreamble({ nativeThreadId, nativeTurnId, prompt: "work" });
+      const transcript = makeCodexReplayTranscript({
+        scenario: "restore-context",
+        entries: [
+          ...entries.slice(0, 5),
+          {
+            type: "expect_outbound",
+            label: "context turn",
+            frame: { id: 3, method: "turn/start", params },
+          },
+          ...entries.slice(6),
+          {
+            type: "emit_inbound",
+            label: "compacted",
+            frame: {
+              method: "item/completed",
+              params: {
+                threadId: nativeThreadId,
+                turnId: nativeTurnId,
+                item: { type: "contextCompaction", id: "compact-context" },
               },
             },
-            { type: "emit_inbound", label: "compact", frame: { id: 3, result: {} } },
-            {
-              type: "emit_inbound",
-              label: "start",
-              frame: {
-                method: "turn/started",
-                params: {
-                  threadId: nativeThreadId,
-                  turn: makeCodexReplayTurn({ id: nativeTurnId, status: "inProgress" }),
+          },
+          {
+            type: "emit_inbound",
+            label: "done",
+            frame: {
+              method: "turn/completed",
+              params: {
+                threadId: nativeThreadId,
+                turn: makeCodexReplayTurn({ id: nativeTurnId, status: "completed" }),
+              },
+            },
+          },
+          {
+            type: "expect_outbound",
+            label: "restore context",
+            frame: {
+              id: 4,
+              method: "thread/inject_items",
+              params: {
+                threadId: nativeThreadId,
+                items: Object.entries(params.additionalContext ?? {}).map(([key, entry]) => ({
+                  type: "message",
+                  role: "developer",
+                  content: [{ type: "input_text", text: `<${key}>${entry.value}</${key}>` }],
+                })),
+              },
+            },
+          },
+          { type: "emit_inbound", label: "restored", frame: { id: 4, result: {} } },
+        ],
+      });
+      // Codex queues items injected mid-turn as pending input and samples again.
+      const wireOrder: Array<string> = [];
+      const restoreRequested = yield* Deferred.make<void>();
+      const harness = yield* makeCodexReplayHarness(
+        transcript,
+        undefined,
+        (method) =>
+          method === "thread/inject_items"
+            ? Effect.sync(() => wireOrder.push(method)).pipe(
+                Effect.andThen(Deferred.succeed(restoreRequested, undefined)),
+              )
+            : Effect.void,
+        undefined,
+        undefined,
+        undefined,
+        undefined,
+        (method) =>
+          Effect.sync(() => {
+            if (method === "item/completed" || method === "turn/completed") wireOrder.push(method);
+          }),
+        Effect.succeed<ReadonlyArray<ServerProviderModel>>([
+          {
+            slug: modelSelection.model,
+            name: modelSelection.model,
+            isCustom: false,
+            capabilities: {
+              optionDescriptors: [
+                {
+                  id: "cyberAccessProgram",
+                  label: "Cyber Access",
+                  type: "select",
+                  options: [
+                    { id: "standard", label: "Standard" },
+                    { id: "daybreakBlue", label: "Daybreak Blue", isDefault: true },
+                  ],
+                  currentValue: "daybreakBlue",
                 },
+              ],
+            },
+          },
+        ]),
+      );
+      yield* (yield* McpProviderSessions.McpProviderSessions).set({
+        environmentId: EnvironmentId.make("test"),
+        threadId: harness.threadId,
+        providerSessionId: "context-session",
+        providerInstanceId: ProviderInstanceId.make("codex"),
+        endpoint: "http://127.0.0.1:43123/mcp",
+        authorizationHeader: "Bearer test",
+        browserToolsAvailable: true,
+      });
+      yield* harness.runtime.startTurn({
+        ...makeCodexTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now: yield* DateTime.now,
+          attemptId: RunAttemptId.make("context-attempt"),
+          text: "work",
+        }),
+        modelSelection,
+      });
+      yield* harness.firstTerminal;
+      yield* Deferred.await(restoreRequested);
+      assert.equal(harness.terminalEvents()[0]?.status, "completed");
+      assert.deepEqual(
+        wireOrder,
+        ["item/completed", "turn/completed", "thread/inject_items"],
+        "restored T3 context while the compacting native turn was still running",
+      );
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
+        ),
+      ),
+    ),
+  );
+
+  it.effect("compacts Codex with the native RPC and completes the compaction turn", () =>
+    Effect.gen(function* () {
+      const nativeThreadId = "compact-thread";
+      const nativeTurnId = "compact-turn";
+      const item = { type: "contextCompaction", id: "compact-item" };
+      const transcript = makeCodexReplayTranscript({
+        scenario: "native-compaction",
+        entries: [
+          ...codexReplayPreamble({ nativeThreadId, nativeTurnId, prompt: "unused" }).slice(0, 5),
+          {
+            type: "expect_outbound",
+            label: "compact",
+            frame: {
+              id: 3,
+              method: "thread/compact/start",
+              params: { threadId: nativeThreadId },
+            },
+          },
+          { type: "emit_inbound", label: "compact", frame: { id: 3, result: {} } },
+          {
+            type: "emit_inbound",
+            label: "start",
+            frame: {
+              method: "turn/started",
+              params: {
+                threadId: nativeThreadId,
+                turn: makeCodexReplayTurn({ id: nativeTurnId, status: "inProgress" }),
+              },
+            },
+          },
+          ...(["item/started", "item/completed"] as const).map((method) => ({
+            type: "emit_inbound" as const,
+            label: method,
+            frame: { method, params: { threadId: nativeThreadId, turnId: nativeTurnId, item } },
+          })),
+          {
+            type: "emit_inbound",
+            label: "complete",
+            frame: {
+              method: "turn/completed",
+              params: {
+                threadId: nativeThreadId,
+                turn: makeCodexReplayTurn({ id: nativeTurnId, status: "completed" }),
               },
             },
-            ...(["item/started", "item/completed"] as const).map((method) => ({
+          },
+        ],
+      });
+      const harness = yield* makeCodexReplayHarness(transcript);
+      assert.isDefined(harness.runtime.compactThread);
+      yield* harness.runtime.compactThread!(
+        makeCodexTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now: yield* DateTime.now,
+          attemptId: RunAttemptId.make("compact-attempt"),
+          text: "/compact",
+        }),
+      );
+      yield* harness.firstTerminal;
+      const items = harness.events.flatMap((event) =>
+        event.type === "turn_item.updated" && event.turnItem.type === "compaction"
+          ? [event.turnItem]
+          : [],
+      );
+      assert.deepEqual(
+        items.map((entry) => entry.status),
+        ["running", "completed"],
+      );
+      assert.equal(items[0]?.id, items[1]?.id);
+      assert.equal(harness.terminalEvents()[0]?.status, "completed");
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
+        ),
+      ),
+    ),
+  );
+
+  it.effect.each(["failed", "interrupted", "Stop"] as const)(
+    "settles unfinished compaction on %s without changing completed compaction",
+    (outcome) =>
+      Effect.gen(function* () {
+        const nativeThreadId = "compact-thread";
+        const nativeTurnId = "compact-turn";
+        const error = {
+          message: "Remote compaction stream disconnected",
+          codexErrorInfo: "other",
+          additionalDetails: null,
+        };
+        const transcript = makeCodexReplayTranscript({
+          scenario: `automatic-compaction-${outcome}`,
+          entries: [
+            ...codexReplayPreamble({ nativeThreadId, nativeTurnId, prompt: "Continue." }),
+            ...(
+              [
+                { method: "item/started", id: "completed-item", startedAtMs: 1782622441000 },
+                { method: "item/completed", id: "completed-item", completedAtMs: 1782622442000 },
+                { method: "item/started", id: "unfinished-item", startedAtMs: 1782622443000 },
+              ] as const
+            ).map(({ method, id, ...timestamps }) => ({
               type: "emit_inbound" as const,
-              label: method,
-              frame: { method, params: { threadId: nativeThreadId, turnId: nativeTurnId, item } },
-            })),
-            {
-              type: "emit_inbound",
-              label: "complete",
+              label: `${method}/${id}`,
               frame: {
-                method: "turn/completed",
+                method,
                 params: {
                   threadId: nativeThreadId,
-                  turn: makeCodexReplayTurn({ id: nativeTurnId, status: "completed" }),
+                  turnId: nativeTurnId,
+                  item: { type: "contextCompaction", id },
+                  ...timestamps,
                 },
               },
-            },
+            })),
+            ...(outcome === "Stop"
+              ? [
+                  {
+                    type: "expect_outbound" as const,
+                    label: "turn/interrupt",
+                    frame: {
+                      id: 4,
+                      method: "turn/interrupt",
+                      params: { threadId: nativeThreadId, turnId: nativeTurnId },
+                    },
+                  },
+                  {
+                    type: "emit_inbound" as const,
+                    label: "turn/interrupt/failed",
+                    frame: { id: 4, error: { code: -32_000, message: "Interrupt failed" } },
+                  },
+                ]
+              : [
+                  {
+                    type: "emit_inbound" as const,
+                    label: "turn/completed",
+                    frame: {
+                      method: "turn/completed",
+                      params: {
+                        threadId: nativeThreadId,
+                        turn: {
+                          ...makeCodexReplayTurn({ id: nativeTurnId, status: outcome }),
+                          error: outcome === "failed" ? error : null,
+                        },
+                      },
+                    },
+                  },
+                ]),
           ],
         });
-        const harness = yield* makeCodexReplayHarness(transcript);
-        assert.isDefined(harness.runtime.compactThread);
-        yield* harness.runtime.compactThread!(
+        const compactionStarted = yield* Deferred.make<ProviderTurnId>();
+        const harness = yield* makeCodexReplayHarness(transcript, (event) =>
+          event.type === "turn_item.updated" &&
+          event.turnItem.nativeItemRef?.nativeId === "unfinished-item" &&
+          event.turnItem.status === "running" &&
+          event.turnItem.providerTurnId !== null
+            ? Deferred.succeed(compactionStarted, event.turnItem.providerTurnId)
+            : Effect.void,
+        );
+        yield* TestClock.setTime(1782622445000);
+        yield* harness.runtime.startTurn(
           makeCodexTestTurnInput({
             threadId: harness.threadId,
             providerThread: harness.providerThread,
             now: yield* DateTime.now,
-            attemptId: RunAttemptId.make("compact-attempt"),
-            text: "/compact",
+            attemptId: RunAttemptId.make(`compact-${outcome}-attempt`),
+            text: "Continue.",
           }),
         );
+        if (outcome === "Stop") {
+          const providerTurnId = yield* Deferred.await(compactionStarted);
+          const interrupt = yield* harness.runtime
+            .interruptTurn({ providerThread: harness.providerThread, providerTurnId })
+            .pipe(Effect.exit);
+          assert.equal(interrupt._tag, "Failure");
+        }
         yield* harness.firstTerminal;
         const items = harness.events.flatMap((event) =>
           event.type === "turn_item.updated" && event.turnItem.type === "compaction"
             ? [event.turnItem]
             : [],
         );
+        const completed = items.filter((item) => item.nativeItemRef?.nativeId === "completed-item");
+        const unfinished = items.filter(
+          (item) => item.nativeItemRef?.nativeId === "unfinished-item",
+        );
+        const status = outcome === "failed" ? "failed" : "interrupted";
         assert.deepEqual(
-          items.map((entry) => entry.status),
+          unfinished.map((item) => item.status),
+          ["running", status],
+        );
+        assert.equal(unfinished[0]?.id, unfinished[1]?.id);
+        assert.deepEqual(unfinished[1]?.startedAt, DateTime.makeUnsafe(1782622443000));
+        assert.deepEqual(
+          unfinished[1]?.completedAt,
+          DateTime.makeUnsafe(outcome === "Stop" ? 1782622445000 : 1782622450000),
+        );
+        assert.deepEqual(
+          completed.map((item) => item.status),
           ["running", "completed"],
         );
-        assert.equal(items[0]?.id, items[1]?.id);
-        assert.equal(harness.terminalEvents()[0]?.status, "completed");
+        assert.deepEqual(completed[1]?.startedAt, DateTime.makeUnsafe(1782622441000));
+        assert.deepEqual(completed[1]?.completedAt, DateTime.makeUnsafe(1782622442000));
+        assert.equal(harness.terminalEvents()[0]?.status, status);
+        if (outcome === "failed") {
+          assert.equal(harness.terminalEvents()[0]?.failure?.message, error.message);
+        }
       }).pipe(
         Effect.provide(
           Layer.mergeAll(
@@ -2912,149 +3221,6 @@ describe("CodexAdapterV2 post-settle continuation", () => {
           ),
         ),
       ),
-    ),
-  );
-
-  it.effect.each(["failed", "interrupted", "Stop"] as const)(
-    "settles unfinished compaction on %s without changing completed compaction",
-    (outcome) =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const nativeThreadId = "compact-thread";
-          const nativeTurnId = "compact-turn";
-          const error = {
-            message: "Remote compaction stream disconnected",
-            codexErrorInfo: "other",
-            additionalDetails: null,
-          };
-          const transcript = makeCodexReplayTranscript({
-            scenario: `automatic-compaction-${outcome}`,
-            entries: [
-              ...codexReplayPreamble({ nativeThreadId, nativeTurnId, prompt: "Continue." }),
-              ...(
-                [
-                  { method: "item/started", id: "completed-item", startedAtMs: 1782622441000 },
-                  { method: "item/completed", id: "completed-item", completedAtMs: 1782622442000 },
-                  { method: "item/started", id: "unfinished-item", startedAtMs: 1782622443000 },
-                ] as const
-              ).map(({ method, id, ...timestamps }) => ({
-                type: "emit_inbound" as const,
-                label: `${method}/${id}`,
-                frame: {
-                  method,
-                  params: {
-                    threadId: nativeThreadId,
-                    turnId: nativeTurnId,
-                    item: { type: "contextCompaction", id },
-                    ...timestamps,
-                  },
-                },
-              })),
-              ...(outcome === "Stop"
-                ? [
-                    {
-                      type: "expect_outbound" as const,
-                      label: "turn/interrupt",
-                      frame: {
-                        id: 4,
-                        method: "turn/interrupt",
-                        params: { threadId: nativeThreadId, turnId: nativeTurnId },
-                      },
-                    },
-                    {
-                      type: "emit_inbound" as const,
-                      label: "turn/interrupt/failed",
-                      frame: { id: 4, error: { code: -32_000, message: "Interrupt failed" } },
-                    },
-                  ]
-                : [
-                    {
-                      type: "emit_inbound" as const,
-                      label: "turn/completed",
-                      frame: {
-                        method: "turn/completed",
-                        params: {
-                          threadId: nativeThreadId,
-                          turn: {
-                            ...makeCodexReplayTurn({ id: nativeTurnId, status: outcome }),
-                            error: outcome === "failed" ? error : null,
-                          },
-                        },
-                      },
-                    },
-                  ]),
-            ],
-          });
-          const compactionStarted = yield* Deferred.make<ProviderTurnId>();
-          const harness = yield* makeCodexReplayHarness(transcript, (event) =>
-            event.type === "turn_item.updated" &&
-            event.turnItem.nativeItemRef?.nativeId === "unfinished-item" &&
-            event.turnItem.status === "running" &&
-            event.turnItem.providerTurnId !== null
-              ? Deferred.succeed(compactionStarted, event.turnItem.providerTurnId)
-              : Effect.void,
-          );
-          yield* TestClock.setTime(1782622445000);
-          yield* harness.runtime.startTurn(
-            makeCodexTestTurnInput({
-              threadId: harness.threadId,
-              providerThread: harness.providerThread,
-              now: yield* DateTime.now,
-              attemptId: RunAttemptId.make(`compact-${outcome}-attempt`),
-              text: "Continue.",
-            }),
-          );
-          if (outcome === "Stop") {
-            const providerTurnId = yield* Deferred.await(compactionStarted);
-            const interrupt = yield* harness.runtime
-              .interruptTurn({ providerThread: harness.providerThread, providerTurnId })
-              .pipe(Effect.exit);
-            assert.equal(interrupt._tag, "Failure");
-          }
-          yield* harness.firstTerminal;
-          const items = harness.events.flatMap((event) =>
-            event.type === "turn_item.updated" && event.turnItem.type === "compaction"
-              ? [event.turnItem]
-              : [],
-          );
-          const completed = items.filter(
-            (item) => item.nativeItemRef?.nativeId === "completed-item",
-          );
-          const unfinished = items.filter(
-            (item) => item.nativeItemRef?.nativeId === "unfinished-item",
-          );
-          const status = outcome === "failed" ? "failed" : "interrupted";
-          assert.deepEqual(
-            unfinished.map((item) => item.status),
-            ["running", status],
-          );
-          assert.equal(unfinished[0]?.id, unfinished[1]?.id);
-          assert.deepEqual(unfinished[1]?.startedAt, DateTime.makeUnsafe(1782622443000));
-          assert.deepEqual(
-            unfinished[1]?.completedAt,
-            DateTime.makeUnsafe(outcome === "Stop" ? 1782622445000 : 1782622450000),
-          );
-          assert.deepEqual(
-            completed.map((item) => item.status),
-            ["running", "completed"],
-          );
-          assert.deepEqual(completed[1]?.startedAt, DateTime.makeUnsafe(1782622441000));
-          assert.deepEqual(completed[1]?.completedAt, DateTime.makeUnsafe(1782622442000));
-          assert.equal(harness.terminalEvents()[0]?.status, status);
-          if (outcome === "failed") {
-            assert.equal(harness.terminalEvents()[0]?.failure?.message, error.message);
-          }
-        }).pipe(
-          Effect.provide(
-            Layer.mergeAll(
-              IdAllocator.layer,
-              McpProviderSessions.layer,
-              NodeServices.layer,
-              NodeCrypto.layer,
-            ),
-          ),
-        ),
-      ),
   );
 
   it.effect.each([
@@ -3110,170 +3276,57 @@ describe("CodexAdapterV2 post-settle continuation", () => {
             hookCompleted("hook-turn"),
             {
               type: "emit_inbound",
-              label: "turn/completed",
-              frame: {
-                method: "turn/completed",
-                params: {
-                  threadId: nativeThreadId,
-                  turn: makeCodexReplayTurn({ id: "hook-turn", status }),
-                },
-              },
-            },
-            ...codexReplayPreamble({ nativeThreadId, nativeTurnId: "next-turn", prompt: "work" })
-              .slice(-3)
-              .map((entry, index) => (index < 2 ? withReplayRequestId(entry, 4) : entry)),
-            hookCompleted("hook-turn"),
-            {
-              type: "emit_inbound",
-              label: "turn/completed/next",
-              frame: {
-                method: "turn/completed",
-                params: {
-                  threadId: nativeThreadId,
-                  turn: makeCodexReplayTurn({ id: "next-turn", status: "interrupted" }),
-                },
-              },
-            },
-          ],
-        });
-        const harness = yield* makeCodexReplayHarness(transcript);
-        for (const turn of ["hook-turn", "next-turn"]) {
-          yield* harness.runtime.startTurn(
-            makeCodexTestTurnInput({
-              threadId: harness.threadId,
-              providerThread: harness.providerThread,
-              now: yield* DateTime.now,
-              attemptId: RunAttemptId.make(turn),
-              text: "work",
-            }),
-          );
-          yield* harness.awaitTerminal(turn === "hook-turn" ? 1 : 2);
-        }
-        assert.deepEqual(
-          harness.terminalEvents().map((event) => ({
-            status: event.status,
-            reason: event.status === "failed" ? undefined : event.reason,
-          })),
-          [
-            { status, reason: expected ? `preCompact hook (project): ${stopReason}` : undefined },
-            { status: "interrupted", reason: undefined },
-          ],
-        );
-      }).pipe(
-        Effect.scoped,
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
-          ),
-        ),
-      ),
-  );
-
-  it.effect("resumes a provider thread without requesting or decoding its history", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const scenario = "codex-resume-metadata";
-        const nativeThreadId = `native-${scenario}-thread`;
-        const preamble = codexReplayPreamble({
-          nativeThreadId,
-          nativeTurnId: "unused-turn",
-          prompt: "unused-prompt",
-        }).slice(0, 5);
-        const transcript = makeCodexReplayTranscript({
-          scenario,
-          entries: [
-            ...preamble,
-            {
-              type: "expect_outbound",
-              label: "thread/resume",
-              frame: {
-                id: 3,
-                method: "thread/resume",
-                params: {
-                  threadId: nativeThreadId,
-                  excludeTurns: true,
-                  config: CodexAdapterV2.CODEX_THREAD_CONFIG,
-                },
-              },
-            },
-            {
-              type: "emit_inbound",
-              label: "thread/resume",
-              frame: { id: 3, result: { thread: { id: nativeThreadId, updatedAt: 1782622450 } } },
-            },
-            {
-              type: "expect_outbound",
-              label: "thread/resume without an app thread",
+              label: "turn/completed",
               frame: {
-                id: 4,
-                method: "thread/resume",
+                method: "turn/completed",
                 params: {
                   threadId: nativeThreadId,
-                  excludeTurns: true,
-                  config: CodexAdapterV2.CODEX_THREAD_CONFIG,
+                  turn: makeCodexReplayTurn({ id: "hook-turn", status }),
                 },
               },
             },
+            ...codexReplayPreamble({ nativeThreadId, nativeTurnId: "next-turn", prompt: "work" })
+              .slice(-3)
+              .map((entry, index) => (index < 2 ? withReplayRequestId(entry, 4) : entry)),
+            hookCompleted("hook-turn"),
             {
               type: "emit_inbound",
-              label: "thread/resume without an app thread",
-              frame: { id: 4, result: { thread: { id: nativeThreadId, updatedAt: 1782622450 } } },
-            },
-            {
-              type: "expect_outbound",
-              label: "thread/resume with an explicit app thread",
+              label: "turn/completed/next",
               frame: {
-                id: 5,
-                method: "thread/resume",
+                method: "turn/completed",
                 params: {
                   threadId: nativeThreadId,
-                  excludeTurns: true,
-                  config: CodexAdapterV2.CODEX_THREAD_CONFIG,
+                  turn: makeCodexReplayTurn({ id: "next-turn", status: "interrupted" }),
                 },
               },
             },
-            {
-              type: "emit_inbound",
-              label: "thread/resume with an explicit app thread",
-              frame: { id: 5, result: { thread: { id: nativeThreadId, updatedAt: 1782622450 } } },
-            },
           ],
         });
-        const resumeThreadEnvs: Array<unknown> = [];
-        const harness = yield* makeCodexReplayHarness(
-          transcript,
-          () => Effect.void,
-          (method, params) =>
-            Effect.sync(() => {
-              if (method === "thread/resume") resumeThreadEnvs.push(threadEnvOf(params));
+        const harness = yield* makeCodexReplayHarness(transcript);
+        for (const turn of ["hook-turn", "next-turn"]) {
+          yield* harness.runtime.startTurn(
+            makeCodexTestTurnInput({
+              threadId: harness.threadId,
+              providerThread: harness.providerThread,
+              now: yield* DateTime.now,
+              attemptId: RunAttemptId.make(turn),
+              text: "work",
             }),
+          );
+          yield* harness.awaitTerminal(turn === "hook-turn" ? 1 : 2);
+        }
+        assert.deepEqual(
+          harness.terminalEvents().map((event) => ({
+            status: event.status,
+            reason: event.status === "failed" ? undefined : event.reason,
+          })),
+          [
+            { status, reason: expected ? `preCompact hook (project): ${stopReason}` : undefined },
+            { status: "interrupted", reason: undefined },
+          ],
         );
-        const resumed = yield* harness.runtime.resumeThread({
-          providerThread: harness.providerThread,
-          modelSelection: CODEX_TEST_MODEL_SELECTION,
-          runtimePolicy: CODEX_TEST_RUNTIME_POLICY,
-        });
-        yield* harness.runtime.resumeThread({
-          providerThread: { ...harness.providerThread, appThreadId: null },
-          modelSelection: CODEX_TEST_MODEL_SELECTION,
-          runtimePolicy: CODEX_TEST_RUNTIME_POLICY,
-        });
-        const explicitThreadId = ThreadId.make(`thread-${scenario}-explicit`);
-        yield* harness.runtime.resumeThread({
-          threadId: explicitThreadId,
-          providerThread: harness.providerThread,
-          modelSelection: CODEX_TEST_MODEL_SELECTION,
-          runtimePolicy: CODEX_TEST_RUNTIME_POLICY,
-        });
-
-        assert.equal(resumed.nativeThreadRef?.nativeId, nativeThreadId);
-        assert.equal(resumed.status, "idle");
-        assert.equal(DateTime.toEpochMillis(resumed.updatedAt), 1782622450000);
-        assert.deepEqual(resumeThreadEnvs, [harness.threadId, undefined, explicitThreadId]);
       }).pipe(
+        Effect.scoped,
         Effect.provide(
           Layer.mergeAll(
             IdAllocator.layer,
@@ -3283,6 +3336,117 @@ describe("CodexAdapterV2 post-settle continuation", () => {
           ),
         ),
       ),
+  );
+
+  it.effect("resumes a provider thread without requesting or decoding its history", () =>
+    Effect.gen(function* () {
+      const scenario = "codex-resume-metadata";
+      const nativeThreadId = `native-${scenario}-thread`;
+      const preamble = codexReplayPreamble({
+        nativeThreadId,
+        nativeTurnId: "unused-turn",
+        prompt: "unused-prompt",
+      }).slice(0, 5);
+      const transcript = makeCodexReplayTranscript({
+        scenario,
+        entries: [
+          ...preamble,
+          {
+            type: "expect_outbound",
+            label: "thread/resume",
+            frame: {
+              id: 3,
+              method: "thread/resume",
+              params: {
+                threadId: nativeThreadId,
+                excludeTurns: true,
+                config: CodexAdapterV2.CODEX_THREAD_CONFIG,
+              },
+            },
+          },
+          {
+            type: "emit_inbound",
+            label: "thread/resume",
+            frame: { id: 3, result: { thread: { id: nativeThreadId, updatedAt: 1782622450 } } },
+          },
+          {
+            type: "expect_outbound",
+            label: "thread/resume without an app thread",
+            frame: {
+              id: 4,
+              method: "thread/resume",
+              params: {
+                threadId: nativeThreadId,
+                excludeTurns: true,
+                config: CodexAdapterV2.CODEX_THREAD_CONFIG,
+              },
+            },
+          },
+          {
+            type: "emit_inbound",
+            label: "thread/resume without an app thread",
+            frame: { id: 4, result: { thread: { id: nativeThreadId, updatedAt: 1782622450 } } },
+          },
+          {
+            type: "expect_outbound",
+            label: "thread/resume with an explicit app thread",
+            frame: {
+              id: 5,
+              method: "thread/resume",
+              params: {
+                threadId: nativeThreadId,
+                excludeTurns: true,
+                config: CodexAdapterV2.CODEX_THREAD_CONFIG,
+              },
+            },
+          },
+          {
+            type: "emit_inbound",
+            label: "thread/resume with an explicit app thread",
+            frame: { id: 5, result: { thread: { id: nativeThreadId, updatedAt: 1782622450 } } },
+          },
+        ],
+      });
+      const resumeThreadEnvs: Array<unknown> = [];
+      const harness = yield* makeCodexReplayHarness(
+        transcript,
+        () => Effect.void,
+        (method, params) =>
+          Effect.sync(() => {
+            if (method === "thread/resume") resumeThreadEnvs.push(threadEnvOf(params));
+          }),
+      );
+      const resumed = yield* harness.runtime.resumeThread({
+        providerThread: harness.providerThread,
+        modelSelection: CODEX_TEST_MODEL_SELECTION,
+        runtimePolicy: CODEX_TEST_RUNTIME_POLICY,
+      });
+      yield* harness.runtime.resumeThread({
+        providerThread: { ...harness.providerThread, appThreadId: null },
+        modelSelection: CODEX_TEST_MODEL_SELECTION,
+        runtimePolicy: CODEX_TEST_RUNTIME_POLICY,
+      });
+      const explicitThreadId = ThreadId.make(`thread-${scenario}-explicit`);
+      yield* harness.runtime.resumeThread({
+        threadId: explicitThreadId,
+        providerThread: harness.providerThread,
+        modelSelection: CODEX_TEST_MODEL_SELECTION,
+        runtimePolicy: CODEX_TEST_RUNTIME_POLICY,
+      });
+
+      assert.equal(resumed.nativeThreadRef?.nativeId, nativeThreadId);
+      assert.equal(resumed.status, "idle");
+      assert.equal(DateTime.toEpochMillis(resumed.updatedAt), 1782622450000);
+      assert.deepEqual(resumeThreadEnvs, [harness.threadId, undefined, explicitThreadId]);
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
+        ),
+      ),
     ),
   );
 
@@ -3307,216 +3471,212 @@ describe("CodexAdapterV2 post-settle continuation", () => {
       ] as const
     ).map(([name, resumeError, failAt, finalError]) => ({ name, resumeError, failAt, finalError })),
   )("$name", ({ name, resumeError, failAt, finalError }) =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const nativeThreadId = "saved-thread";
-        const params = {
-          threadId: nativeThreadId,
-          excludeTurns: true,
-          cwd: CODEX_TEST_RUNTIME_POLICY.cwd,
-          model: CODEX_TEST_MODEL_SELECTION.model,
-          config: CodexAdapterV2.CODEX_THREAD_CONFIG,
-        };
-        const entries: Array<CodexReplay.CodexAppServerReplayEntry> = [
-          ...codexReplayPreamble({
-            nativeThreadId,
-            nativeTurnId: "unused-turn",
-            prompt: "unused-prompt",
-          }).slice(0, 5),
+    Effect.gen(function* () {
+      const nativeThreadId = "saved-thread";
+      const params = {
+        threadId: nativeThreadId,
+        excludeTurns: true,
+        cwd: CODEX_TEST_RUNTIME_POLICY.cwd,
+        model: CODEX_TEST_MODEL_SELECTION.model,
+        config: CodexAdapterV2.CODEX_THREAD_CONFIG,
+      };
+      const entries: Array<CodexReplay.CodexAppServerReplayEntry> = [
+        ...codexReplayPreamble({
+          nativeThreadId,
+          nativeTurnId: "unused-turn",
+          prompt: "unused-prompt",
+        }).slice(0, 5),
+        {
+          type: "expect_outbound",
+          label: "resume archived thread",
+          frame: { id: 3, method: "thread/resume", params },
+        },
+        {
+          type: "emit_inbound",
+          label: "resume error",
+          frame: { id: 3, error: { code: -32600, message: resumeError } },
+        },
+      ];
+      if (failAt !== 3) {
+        entries.push(
           {
             type: "expect_outbound",
-            label: "resume archived thread",
-            frame: { id: 3, method: "thread/resume", params },
+            label: "unarchive same thread",
+            frame: { id: 4, method: "thread/unarchive", params: { threadId: nativeThreadId } },
           },
           {
             type: "emit_inbound",
-            label: "resume error",
-            frame: { id: 3, error: { code: -32600, message: resumeError } },
+            label: "unarchive result",
+            frame:
+              failAt === 4
+                ? { id: 4, error: { code: -32600, message: finalError } }
+                : { id: 4, result: { thread: { turns: [{ type: "unknown-history-item" }] } } },
           },
-        ];
-        if (failAt !== 3) {
-          entries.push(
-            {
-              type: "expect_outbound",
-              label: "unarchive same thread",
-              frame: { id: 4, method: "thread/unarchive", params: { threadId: nativeThreadId } },
-            },
-            {
-              type: "emit_inbound",
-              label: "unarchive result",
-              frame:
-                failAt === 4
-                  ? { id: 4, error: { code: -32600, message: finalError } }
-                  : { id: 4, result: { thread: { turns: [{ type: "unknown-history-item" }] } } },
-            },
-          );
-        }
-        if (failAt === 0 || failAt === 5) {
-          entries.push(
-            {
-              type: "expect_outbound",
-              label: "retry identical resume",
-              frame: { id: 5, method: "thread/resume", params },
-            },
-            {
-              type: "emit_inbound",
-              label: "retry result",
-              frame:
-                failAt === 5
-                  ? { id: 5, error: { code: -32600, message: finalError } }
-                  : {
-                      id: 5,
-                      result: {
-                        thread: {
-                          id: nativeThreadId,
-                          updatedAt: 1782622450,
-                          turns: [{ type: "unknown-history-item" }],
-                        },
+        );
+      }
+      if (failAt === 0 || failAt === 5) {
+        entries.push(
+          {
+            type: "expect_outbound",
+            label: "retry identical resume",
+            frame: { id: 5, method: "thread/resume", params },
+          },
+          {
+            type: "emit_inbound",
+            label: "retry result",
+            frame:
+              failAt === 5
+                ? { id: 5, error: { code: -32600, message: finalError } }
+                : {
+                    id: 5,
+                    result: {
+                      thread: {
+                        id: nativeThreadId,
+                        updatedAt: 1782622450,
+                        turns: [{ type: "unknown-history-item" }],
                       },
                     },
-            },
-          );
-        }
-        const harness = yield* makeCodexReplayHarness(
-          makeCodexReplayTranscript({ scenario: name, entries }),
+                  },
+          },
         );
-        const resume = harness.runtime.resumeThread({
-          providerThread: harness.providerThread,
-          modelSelection: CODEX_TEST_MODEL_SELECTION,
-          runtimePolicy: CODEX_TEST_RUNTIME_POLICY,
-        });
-        if (failAt !== 0) {
-          const error = yield* Effect.flip(resume);
-          assert.equal(error._tag, "ProviderAdapterResumeThreadError");
-          assert.nestedPropertyVal(error, "cause.errorMessage", finalError);
-          assert.nestedPropertyVal(
-            error,
-            "cause.method",
-            failAt === 4 ? "thread/unarchive" : "thread/resume",
-          );
-          assert.nestedPropertyVal(error, "cause.requestId", String(failAt));
-          return;
-        }
-        const resumed = yield* resume;
-        assert.equal(resumed.id, harness.providerThread.id);
-        assert.equal(resumed.nativeThreadRef?.nativeId, nativeThreadId);
-        assert.deepEqual(
-          resumed.nativeConversationHeadRef,
-          harness.providerThread.nativeConversationHeadRef,
+      }
+      const harness = yield* makeCodexReplayHarness(
+        makeCodexReplayTranscript({ scenario: name, entries }),
+      );
+      const resume = harness.runtime.resumeThread({
+        providerThread: harness.providerThread,
+        modelSelection: CODEX_TEST_MODEL_SELECTION,
+        runtimePolicy: CODEX_TEST_RUNTIME_POLICY,
+      });
+      if (failAt !== 0) {
+        const error = yield* Effect.flip(resume);
+        assert.equal(error._tag, "ProviderAdapterResumeThreadError");
+        assert.nestedPropertyVal(error, "cause.errorMessage", finalError);
+        assert.nestedPropertyVal(
+          error,
+          "cause.method",
+          failAt === 4 ? "thread/unarchive" : "thread/resume",
         );
-        assert.equal(resumed.status, "idle");
-        assert.equal(DateTime.toEpochMillis(resumed.updatedAt), 1782622450000);
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
-          ),
+        assert.nestedPropertyVal(error, "cause.requestId", String(failAt));
+        return;
+      }
+      const resumed = yield* resume;
+      assert.equal(resumed.id, harness.providerThread.id);
+      assert.equal(resumed.nativeThreadRef?.nativeId, nativeThreadId);
+      assert.deepEqual(
+        resumed.nativeConversationHeadRef,
+        harness.providerThread.nativeConversationHeadRef,
+      );
+      assert.equal(resumed.status, "idle");
+      assert.equal(DateTime.toEpochMillis(resumed.updatedAt), 1782622450000);
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
         ),
       ),
-    ),
-  );
-
-  // regression: #33747 Codex refuses thread/resume until an unsubscribed thread finishes closing
-  it.effect.each([
-    { name: "waits for thread/closed after a closing error", closedFirst: false },
-    { name: "retries at once when the thread already closed", closedFirst: true },
-  ])("$name", ({ name, closedFirst }) =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const nativeThreadId = "closing-thread";
-        const params = {
-          threadId: nativeThreadId,
-          excludeTurns: true,
-          cwd: CODEX_TEST_RUNTIME_POLICY.cwd,
-          model: CODEX_TEST_MODEL_SELECTION.model,
-          config: CodexAdapterV2.CODEX_THREAD_CONFIG,
-        };
-        const closed: CodexReplay.CodexAppServerReplayEntry = {
-          type: "emit_inbound",
-          label: "thread closed",
-          frame: { method: "thread/closed", params: { threadId: nativeThreadId } },
-        };
-        const closingError: CodexReplay.CodexAppServerReplayEntry = {
-          type: "emit_inbound",
-          label: "resume closing error",
-          frame: {
-            id: 4,
-            error: {
-              code: -32600,
-              message: `thread ${nativeThreadId} is closing; retry thread/resume after the thread is closed`,
-            },
+    ),
+  );
+
+  // regression: #33747 Codex refuses thread/resume until an unsubscribed thread finishes closing
+  it.effect.each([
+    { name: "waits for thread/closed after a closing error", closedFirst: false },
+    { name: "retries at once when the thread already closed", closedFirst: true },
+  ])("$name", ({ name, closedFirst }) =>
+    Effect.gen(function* () {
+      const nativeThreadId = "closing-thread";
+      const params = {
+        threadId: nativeThreadId,
+        excludeTurns: true,
+        cwd: CODEX_TEST_RUNTIME_POLICY.cwd,
+        model: CODEX_TEST_MODEL_SELECTION.model,
+        config: CodexAdapterV2.CODEX_THREAD_CONFIG,
+      };
+      const closed: CodexReplay.CodexAppServerReplayEntry = {
+        type: "emit_inbound",
+        label: "thread closed",
+        frame: { method: "thread/closed", params: { threadId: nativeThreadId } },
+      };
+      const closingError: CodexReplay.CodexAppServerReplayEntry = {
+        type: "emit_inbound",
+        label: "resume closing error",
+        frame: {
+          id: 4,
+          error: {
+            code: -32600,
+            message: `thread ${nativeThreadId} is closing; retry thread/resume after the thread is closed`,
           },
-        };
-        const harness = yield* makeCodexReplayHarness(
-          makeCodexReplayTranscript({
-            scenario: name,
-            entries: [
-              ...codexReplayPreamble({
-                nativeThreadId,
-                nativeTurnId: "unused-turn",
-                prompt: "unused-prompt",
-              }).slice(0, 5),
-              {
-                type: "expect_outbound",
-                label: "unsubscribe",
-                frame: {
-                  id: 3,
-                  method: "thread/unsubscribe",
-                  params: { threadId: nativeThreadId },
-                },
-              },
-              {
-                type: "emit_inbound",
-                label: "unsubscribe result",
-                frame: { id: 3, result: { status: "unsubscribed" } },
-              },
-              {
-                type: "expect_outbound",
-                label: "resume closing thread",
-                frame: { id: 4, method: "thread/resume", params },
-              },
-              ...(closedFirst ? [closed, closingError] : [closingError, closed]),
-              {
-                type: "expect_outbound",
-                label: "retry identical resume",
-                frame: { id: 5, method: "thread/resume", params },
+        },
+      };
+      const harness = yield* makeCodexReplayHarness(
+        makeCodexReplayTranscript({
+          scenario: name,
+          entries: [
+            ...codexReplayPreamble({
+              nativeThreadId,
+              nativeTurnId: "unused-turn",
+              prompt: "unused-prompt",
+            }).slice(0, 5),
+            {
+              type: "expect_outbound",
+              label: "unsubscribe",
+              frame: {
+                id: 3,
+                method: "thread/unsubscribe",
+                params: { threadId: nativeThreadId },
               },
-              {
-                type: "emit_inbound",
-                label: "retry result",
-                frame: {
-                  id: 5,
-                  result: {
-                    thread: {
-                      id: nativeThreadId,
-                      updatedAt: 1782622450,
-                      turns: [{ type: "unknown-history-item" }],
-                    },
+            },
+            {
+              type: "emit_inbound",
+              label: "unsubscribe result",
+              frame: { id: 3, result: { status: "unsubscribed" } },
+            },
+            {
+              type: "expect_outbound",
+              label: "resume closing thread",
+              frame: { id: 4, method: "thread/resume", params },
+            },
+            ...(closedFirst ? [closed, closingError] : [closingError, closed]),
+            {
+              type: "expect_outbound",
+              label: "retry identical resume",
+              frame: { id: 5, method: "thread/resume", params },
+            },
+            {
+              type: "emit_inbound",
+              label: "retry result",
+              frame: {
+                id: 5,
+                result: {
+                  thread: {
+                    id: nativeThreadId,
+                    updatedAt: 1782622450,
+                    turns: [{ type: "unknown-history-item" }],
                   },
                 },
               },
-            ],
-          }),
-        );
-        yield* harness.runtime.unloadThread!({ providerThread: harness.providerThread });
-        const resumed = yield* harness.runtime.resumeThread({
-          providerThread: harness.providerThread,
-          modelSelection: CODEX_TEST_MODEL_SELECTION,
-          runtimePolicy: CODEX_TEST_RUNTIME_POLICY,
-        });
-        assert.equal(resumed.nativeThreadRef?.nativeId, nativeThreadId);
-        assert.equal(resumed.status, "idle");
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
-          ),
+            },
+          ],
+        }),
+      );
+      yield* harness.runtime.unloadThread!({ providerThread: harness.providerThread });
+      const resumed = yield* harness.runtime.resumeThread({
+        providerThread: harness.providerThread,
+        modelSelection: CODEX_TEST_MODEL_SELECTION,
+        runtimePolicy: CODEX_TEST_RUNTIME_POLICY,
+      });
+      assert.equal(resumed.nativeThreadRef?.nativeId, nativeThreadId);
+      assert.equal(resumed.status, "idle");
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
         ),
       ),
     ),
@@ -3535,718 +3695,868 @@ describe("CodexAdapterV2 post-settle continuation", () => {
     "steer",
     "start-fails",
   ] as const)("handles terminal Codex capacity failures when retries %s", (outcome) =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const scenario = `capacity-${outcome}`;
-        const nativeThreadId = `native-${scenario}`;
-        const nativeTurnId = (attempt: number) => `${nativeThreadId}-${attempt}`;
-        const prompt = "Continue the task.";
-        const capacityError = {
-          message: "Selected model is at capacity. Please try a different model.",
-          codexErrorInfo: "serverOverloaded",
-        };
-        const failureEntries = (attempt: number): Array<CodexReplay.CodexAppServerReplayEntry> => [
-          {
-            type: "emit_inbound",
-            frame: {
-              method: "error",
-              params: {
-                threadId: nativeThreadId,
-                turnId: nativeTurnId(attempt),
-                willRetry: false,
-                error: capacityError,
-              },
+    Effect.gen(function* () {
+      const scenario = `capacity-${outcome}`;
+      const nativeThreadId = `native-${scenario}`;
+      const nativeTurnId = (attempt: number) => `${nativeThreadId}-${attempt}`;
+      const prompt = "Continue the task.";
+      const capacityError = {
+        message: "Selected model is at capacity. Please try a different model.",
+        codexErrorInfo: "serverOverloaded",
+      };
+      const failureEntries = (attempt: number): Array<CodexReplay.CodexAppServerReplayEntry> => [
+        {
+          type: "emit_inbound",
+          frame: {
+            method: "error",
+            params: {
+              threadId: nativeThreadId,
+              turnId: nativeTurnId(attempt),
+              willRetry: false,
+              error: capacityError,
             },
           },
-          {
-            type: "emit_inbound",
-            frame: {
-              method: "turn/completed",
-              params: {
-                threadId: nativeThreadId,
-                turn: {
-                  ...makeCodexReplayTurn({ id: nativeTurnId(attempt), status: "failed" }),
-                  error: capacityError,
-                },
+        },
+        {
+          type: "emit_inbound",
+          frame: {
+            method: "turn/completed",
+            params: {
+              threadId: nativeThreadId,
+              turn: {
+                ...makeCodexReplayTurn({ id: nativeTurnId(attempt), status: "failed" }),
+                error: capacityError,
               },
             },
           },
-        ];
-        const entries = codexReplayPreamble({
+        },
+      ];
+      const entries = codexReplayPreamble({
+        nativeThreadId,
+        nativeTurnId: nativeTurnId(0),
+        prompt,
+      });
+      entries.push(
+        ...(outcome === "completion-only" ? failureEntries(0).slice(1) : failureEntries(0)),
+      );
+      if (outcome === "completion-only") entries.push(...failureEntries(0).slice(1));
+      const retries = outcome === "exhaust" ? 5 : outcome === "stop" ? 0 : 1;
+      const steeredText = "Use the smaller change.";
+      for (let attempt = 1; attempt <= retries; attempt++) {
+        const start = codexReplayPreamble({
           nativeThreadId,
-          nativeTurnId: nativeTurnId(0),
+          nativeTurnId: nativeTurnId(attempt),
           prompt,
-        });
-        entries.push(
-          ...(outcome === "completion-only" ? failureEntries(0).slice(1) : failureEntries(0)),
-        );
-        if (outcome === "completion-only") entries.push(...failureEntries(0).slice(1));
-        const retries = outcome === "exhaust" ? 5 : outcome === "stop" ? 0 : 1;
-        const steeredText = "Use the smaller change.";
-        for (let attempt = 1; attempt <= retries; attempt++) {
-          const start = codexReplayPreamble({
-            nativeThreadId,
-            nativeTurnId: nativeTurnId(attempt),
-            prompt,
-          }).slice(-3);
-          if (
-            outcome === "started-first" ||
-            outcome === "stop-starting" ||
-            outcome === "completed-first" ||
-            outcome === "new-run"
-          ) {
-            start.splice(1, 0, ...start.splice(2, 1));
-          }
-          for (const entry of start) {
-            if (entry.type === "expect_outbound") {
+        }).slice(-3);
+        if (
+          outcome === "started-first" ||
+          outcome === "stop-starting" ||
+          outcome === "completed-first" ||
+          outcome === "new-run"
+        ) {
+          start.splice(1, 0, ...start.splice(2, 1));
+        }
+        for (const entry of start) {
+          if (entry.type === "expect_outbound") {
+            entries.push({
+              ...entry,
+              frame: {
+                id: 3 + attempt,
+                method: "turn/start",
+                params: {
+                  threadId: nativeThreadId,
+                  input: [],
+                  cwd: "/workspace",
+                  model: "gpt-5.4",
+                  approvalPolicy: "never",
+                  approvalsReviewer: "user",
+                  sandboxPolicy: { type: "dangerFullAccess" },
+                  summary: "auto",
+                  collaborationMode: { mode: "default", settings: { model: "gpt-5.4" } },
+                },
+              },
+            });
+          } else if (entry.type === "emit_inbound" && entry.label === "turn/start") {
+            if (outcome === "completed-first" || outcome === "new-run")
               entries.push({
-                ...entry,
+                type: "emit_inbound",
                 frame: {
-                  id: 3 + attempt,
-                  method: "turn/start",
+                  method: "turn/completed",
                   params: {
                     threadId: nativeThreadId,
-                    input: [],
-                    cwd: "/workspace",
-                    model: "gpt-5.4",
-                    approvalPolicy: "never",
-                    approvalsReviewer: "user",
-                    sandboxPolicy: { type: "dangerFullAccess" },
-                    summary: "auto",
-                    collaborationMode: { mode: "default", settings: { model: "gpt-5.4" } },
+                    turn: makeCodexReplayTurn({ id: nativeTurnId(attempt), status: "completed" }),
                   },
                 },
               });
-            } else if (entry.type === "emit_inbound" && entry.label === "turn/start") {
-              if (outcome === "completed-first" || outcome === "new-run")
-                entries.push({
-                  type: "emit_inbound",
-                  frame: {
-                    method: "turn/completed",
-                    params: {
-                      threadId: nativeThreadId,
-                      turn: makeCodexReplayTurn({ id: nativeTurnId(attempt), status: "completed" }),
-                    },
-                  },
-                });
-              if (outcome === "new-run") {
-                entries.push(
-                  ...codexReplayPreamble({
-                    nativeThreadId,
-                    nativeTurnId: nativeTurnId(2),
-                    prompt: "Next task.",
-                  })
-                    .slice(-3)
-                    .map((next, index) => (index < 2 ? withReplayRequestId(next, 5) : next)),
-                  ...failureEntries(2),
-                );
-              }
-              entries.push(
-                outcome === "start-fails"
-                  ? {
-                      type: "emit_inbound",
-                      frame: {
-                        id: 3 + attempt,
-                        error: { code: -32603, message: "Start failed" },
-                      },
-                    }
-                  : withReplayRequestId(entry, 3 + attempt),
-              );
-            } else if (outcome !== "start-fails") {
+            if (outcome === "new-run") {
               entries.push(
-                outcome === "stop-starting" && entry.type === "emit_inbound"
-                  ? { ...entry, afterMs: 1_000 }
-                  : entry,
+                ...codexReplayPreamble({
+                  nativeThreadId,
+                  nativeTurnId: nativeTurnId(2),
+                  prompt: "Next task.",
+                })
+                  .slice(-3)
+                  .map((next, index) => (index < 2 ? withReplayRequestId(next, 5) : next)),
+                ...failureEntries(2),
               );
-              if (outcome === "stop-starting") {
-                entries.push(
-                  {
-                    type: "expect_outbound",
+            }
+            entries.push(
+              outcome === "start-fails"
+                ? {
+                    type: "emit_inbound",
                     frame: {
-                      id: 5,
-                      method: "turn/interrupt",
-                      params: { threadId: nativeThreadId, turnId: nativeTurnId(attempt) },
+                      id: 3 + attempt,
+                      error: { code: -32603, message: "Start failed" },
                     },
+                  }
+                : withReplayRequestId(entry, 3 + attempt),
+            );
+          } else if (outcome !== "start-fails") {
+            entries.push(
+              outcome === "stop-starting" && entry.type === "emit_inbound"
+                ? { ...entry, afterMs: 1_000 }
+                : entry,
+            );
+            if (outcome === "stop-starting") {
+              entries.push(
+                {
+                  type: "expect_outbound",
+                  frame: {
+                    id: 5,
+                    method: "turn/interrupt",
+                    params: { threadId: nativeThreadId, turnId: nativeTurnId(attempt) },
                   },
-                  { type: "emit_inbound", frame: { id: 5, result: {} } },
-                );
-              }
-            }
-          }
-          if (outcome === "exhaust") entries.push(...failureEntries(attempt));
-          if (
-            outcome === "recover" ||
-            outcome === "completion-only" ||
-            outcome === "started-first" ||
-            outcome === "stop-starting"
-          ) {
-            entries.push({
-              type: "emit_inbound",
-              frame: {
-                method: "turn/completed",
-                params: {
-                  threadId: nativeThreadId,
-                  turn: makeCodexReplayTurn({
-                    id: nativeTurnId(attempt),
-                    status: outcome === "stop-starting" ? "interrupted" : "completed",
-                  }),
                 },
-              },
-            });
+                { type: "emit_inbound", frame: { id: 5, result: {} } },
+              );
+            }
           }
-          if (outcome === "stop-continued" || outcome === "steer") {
-            const steering = outcome === "steer";
-            entries.push(
-              {
-                type: "expect_outbound",
-                frame: {
-                  id: 5,
-                  method: steering ? "turn/steer" : "turn/interrupt",
-                  params: steering
-                    ? {
-                        threadId: nativeThreadId,
-                        expectedTurnId: nativeTurnId(attempt),
-                        input: [{ type: "text", text: steeredText }],
-                      }
-                    : { threadId: nativeThreadId, turnId: nativeTurnId(attempt) },
-                },
+        }
+        if (outcome === "exhaust") entries.push(...failureEntries(attempt));
+        if (
+          outcome === "recover" ||
+          outcome === "completion-only" ||
+          outcome === "started-first" ||
+          outcome === "stop-starting"
+        ) {
+          entries.push({
+            type: "emit_inbound",
+            frame: {
+              method: "turn/completed",
+              params: {
+                threadId: nativeThreadId,
+                turn: makeCodexReplayTurn({
+                  id: nativeTurnId(attempt),
+                  status: outcome === "stop-starting" ? "interrupted" : "completed",
+                }),
               },
-              {
-                type: "emit_inbound",
-                frame: { id: 5, result: steering ? { turnId: nativeTurnId(attempt) } : {} },
+            },
+          });
+        }
+        if (outcome === "stop-continued" || outcome === "steer") {
+          const steering = outcome === "steer";
+          entries.push(
+            {
+              type: "expect_outbound",
+              frame: {
+                id: 5,
+                method: steering ? "turn/steer" : "turn/interrupt",
+                params: steering
+                  ? {
+                      threadId: nativeThreadId,
+                      expectedTurnId: nativeTurnId(attempt),
+                      input: [{ type: "text", text: steeredText }],
+                    }
+                  : { threadId: nativeThreadId, turnId: nativeTurnId(attempt) },
               },
-              {
-                type: "emit_inbound",
-                frame: {
-                  method: "turn/completed",
-                  params: {
-                    threadId: nativeThreadId,
-                    turn: makeCodexReplayTurn({
-                      id: nativeTurnId(attempt),
-                      status: steering ? "completed" : "interrupted",
-                    }),
-                  },
+            },
+            {
+              type: "emit_inbound",
+              frame: { id: 5, result: steering ? { turnId: nativeTurnId(attempt) } : {} },
+            },
+            {
+              type: "emit_inbound",
+              frame: {
+                method: "turn/completed",
+                params: {
+                  threadId: nativeThreadId,
+                  turn: makeCodexReplayTurn({
+                    id: nativeTurnId(attempt),
+                    status: steering ? "completed" : "interrupted",
+                  }),
                 },
               },
-            );
-          }
+            },
+          );
         }
-        const milestones = yield* Queue.unbounded<ProviderAdapter.ProviderAdapterV2Event>();
-        const starts: Array<unknown> = [];
-        const retryStarted = yield* Deferred.make<void>();
-        const harness = yield* makeCodexReplayHarness(
-          makeCodexReplayTranscript({ scenario, entries }),
-          (event) =>
-            event.type === "turn.terminal" ||
-            (event.type === "turn_item.updated" &&
-              event.turnItem.type === "error" &&
-              event.turnItem.status === "running")
-              ? Queue.offer(milestones, event)
-              : Effect.void,
-          (method, params) =>
-            Effect.gen(function* () {
-              if (method === "turn/start") {
-                starts.push(params);
-                if (starts.length === 2) yield* Deferred.succeed(retryStarted, undefined);
-              }
-            }),
-        );
-        const turnInput = makeCodexTestTurnInput({
-          threadId: harness.threadId,
-          providerThread: harness.providerThread,
-          now: yield* DateTime.now,
-          attemptId: RunAttemptId.make(scenario),
-          text: prompt,
+      }
+      const milestones = yield* Queue.unbounded<ProviderAdapter.ProviderAdapterV2Event>();
+      const starts: Array<unknown> = [];
+      const retryStarted = yield* Deferred.make<void>();
+      const harness = yield* makeCodexReplayHarness(
+        makeCodexReplayTranscript({ scenario, entries }),
+        (event) =>
+          event.type === "turn.terminal" ||
+          (event.type === "turn_item.updated" &&
+            event.turnItem.type === "error" &&
+            event.turnItem.status === "running")
+            ? Queue.offer(milestones, event)
+            : Effect.void,
+        (method, params) =>
+          Effect.gen(function* () {
+            if (method === "turn/start") {
+              starts.push(params);
+              if (starts.length === 2) yield* Deferred.succeed(retryStarted, undefined);
+            }
+          }),
+      );
+      const turnInput = makeCodexTestTurnInput({
+        threadId: harness.threadId,
+        providerThread: harness.providerThread,
+        now: yield* DateTime.now,
+        attemptId: RunAttemptId.make(scenario),
+        text: prompt,
+      });
+      yield* harness.runtime.startTurn(turnInput);
+      for (let attempt = 1; attempt <= Math.max(retries, 1); attempt++) {
+        const milestone = yield* Queue.take(milestones);
+        assert.equal(milestone.type, "turn_item.updated");
+        if (milestone.type !== "turn_item.updated" || milestone.turnItem.type !== "error") return;
+        const providerTurnId = milestone.turnItem.providerTurnId;
+        assert.isNotNull(providerTurnId);
+        if (providerTurnId === null) return;
+        assert.deepEqual(milestone.turnItem.retry, {
+          attempt,
+          maxAttempts: 5,
+          retryDelayMs: Math.min(2_000 * 2 ** (attempt - 1), 30_000),
         });
-        yield* harness.runtime.startTurn(turnInput);
-        for (let attempt = 1; attempt <= Math.max(retries, 1); attempt++) {
-          const milestone = yield* Queue.take(milestones);
-          assert.equal(milestone.type, "turn_item.updated");
-          if (milestone.type !== "turn_item.updated" || milestone.turnItem.type !== "error") return;
-          const providerTurnId = milestone.turnItem.providerTurnId;
-          assert.isNotNull(providerTurnId);
-          if (providerTurnId === null) return;
-          assert.deepEqual(milestone.turnItem.retry, {
-            attempt,
-            maxAttempts: 5,
-            retryDelayMs: Math.min(2_000 * 2 ** (attempt - 1), 30_000),
+        assert.isEmpty(harness.terminalEvents());
+        if (outcome === "stop") {
+          yield* harness.runtime.interruptTurn({
+            providerThread: harness.providerThread,
+            providerTurnId,
           });
-          assert.isEmpty(harness.terminalEvents());
-          if (outcome === "stop") {
-            yield* harness.runtime.interruptTurn({
-              providerThread: harness.providerThread,
-              providerTurnId,
-            });
-          }
-          const steering =
-            outcome === "steer"
-              ? yield* harness.runtime
-                  .steerTurn({
-                    ...turnInput,
-                    providerTurnId,
-                    message: { ...turnInput.message, text: steeredText },
-                  })
-                  .pipe(Effect.forkScoped)
-              : undefined;
-          yield* TestClock.adjust(Math.min(2_000 * 2 ** (attempt - 1), 30_000));
-          if (outcome === "stop-starting") {
-            yield* Deferred.await(retryStarted);
-            const stopping = yield* harness.runtime
-              .interruptTurn({ providerThread: harness.providerThread, providerTurnId })
-              .pipe(Effect.forkScoped);
-            yield* TestClock.adjust("1 second");
-            yield* Fiber.join(stopping);
-          }
-          if (steering !== undefined) yield* Fiber.join(steering);
-          if (outcome === "stop-continued") {
-            yield* harness.until(() =>
-              harness.events.some(
-                (event) =>
-                  event.type === "provider_turn.updated" &&
-                  event.providerTurn.nativeTurnRef?.nativeId === nativeTurnId(1),
-              ),
-            );
-            yield* harness.runtime.interruptTurn({
-              providerThread: harness.providerThread,
-              providerTurnId,
-            });
-          }
         }
-        yield* harness.awaitTerminal(1);
-        if (outcome === "new-run") {
-          assert.equal((yield* Queue.take(milestones)).type, "turn.terminal");
-          yield* harness.runtime.startTurn({
-            ...turnInput,
-            attemptId: RunAttemptId.make("capacity-next-task"),
-            message: { ...turnInput.message, text: "Next task." },
+        const steering =
+          outcome === "steer"
+            ? yield* harness.runtime
+                .steerTurn({
+                  ...turnInput,
+                  providerTurnId,
+                  message: { ...turnInput.message, text: steeredText },
+                })
+                .pipe(Effect.forkScoped)
+            : undefined;
+        yield* TestClock.adjust(Math.min(2_000 * 2 ** (attempt - 1), 30_000));
+        if (outcome === "stop-starting") {
+          yield* Deferred.await(retryStarted);
+          const stopping = yield* harness.runtime
+            .interruptTurn({ providerThread: harness.providerThread, providerTurnId })
+            .pipe(Effect.forkScoped);
+          yield* TestClock.adjust("1 second");
+          yield* Fiber.join(stopping);
+        }
+        if (steering !== undefined) yield* Fiber.join(steering);
+        if (outcome === "stop-continued") {
+          yield* harness.until(() =>
+            harness.events.some(
+              (event) =>
+                event.type === "provider_turn.updated" &&
+                event.providerTurn.nativeTurnRef?.nativeId === nativeTurnId(1),
+            ),
+          );
+          yield* harness.runtime.interruptTurn({
+            providerThread: harness.providerThread,
+            providerTurnId,
           });
-          const nextRetry = yield* Queue.take(milestones);
-          assert.equal(nextRetry.type, "turn_item.updated");
-          if (nextRetry.type !== "turn_item.updated" || nextRetry.turnItem.type !== "error") return;
-          assert.equal(nextRetry.turnItem.retry?.attempt, 1);
-          return;
         }
-        const terminal = harness.terminalEvents()[0];
-        assert.equal(
-          terminal?.status,
-          outcome === "recover" ||
-            outcome === "completion-only" ||
-            outcome === "steer" ||
-            outcome === "started-first" ||
-            outcome === "completed-first"
-            ? "completed"
-            : outcome === "stop" || outcome === "stop-continued" || outcome === "stop-starting"
-              ? "interrupted"
-              : "failed",
-        );
-        assert.lengthOf(starts, 1 + retries);
-        assert.lengthOf(harness.terminalEvents(), 1);
-        assert.lengthOf(
-          harness.events.filter(
-            (event) =>
-              event.type === "provider_turn.updated" && event.providerTurn.status === "running",
-          ),
-          outcome === "start-fails" ? 1 : 1 + retries,
-        );
-        const retryItems = harness.events.flatMap((event) =>
-          event.type === "turn_item.updated" && event.turnItem.type === "error"
-            ? [event.turnItem]
-            : [],
-        );
-        assert.isTrue(
-          ["completed", "failed", "interrupted"].includes(retryItems.at(-1)?.status ?? ""),
-        );
-        assert.lengthOf(new Set(retryItems.map((item) => item.id)), 1);
+      }
+      yield* harness.awaitTerminal(1);
+      if (outcome === "new-run") {
+        assert.equal((yield* Queue.take(milestones)).type, "turn.terminal");
+        yield* harness.runtime.startTurn({
+          ...turnInput,
+          attemptId: RunAttemptId.make("capacity-next-task"),
+          message: { ...turnInput.message, text: "Next task." },
+        });
+        const nextRetry = yield* Queue.take(milestones);
+        assert.equal(nextRetry.type, "turn_item.updated");
+        if (nextRetry.type !== "turn_item.updated" || nextRetry.turnItem.type !== "error") return;
+        assert.equal(nextRetry.turnItem.retry?.attempt, 1);
+        return;
+      }
+      const terminal = harness.terminalEvents()[0];
+      assert.equal(
+        terminal?.status,
+        outcome === "recover" ||
+          outcome === "completion-only" ||
+          outcome === "steer" ||
+          outcome === "started-first" ||
+          outcome === "completed-first"
+          ? "completed"
+          : outcome === "stop" || outcome === "stop-continued" || outcome === "stop-starting"
+            ? "interrupted"
+            : "failed",
+      );
+      assert.lengthOf(starts, 1 + retries);
+      assert.lengthOf(harness.terminalEvents(), 1);
+      assert.lengthOf(
+        harness.events.filter(
+          (event) =>
+            event.type === "provider_turn.updated" && event.providerTurn.status === "running",
+        ),
+        outcome === "start-fails" ? 1 : 1 + retries,
+      );
+      const retryItems = harness.events.flatMap((event) =>
+        event.type === "turn_item.updated" && event.turnItem.type === "error"
+          ? [event.turnItem]
+          : [],
+      );
+      assert.isTrue(
+        ["completed", "failed", "interrupted"].includes(retryItems.at(-1)?.status ?? ""),
+      );
+      assert.lengthOf(new Set(retryItems.map((item) => item.id)), 1);
 
-        if (outcome === "recover") {
-          const fs = yield* FileSystem.FileSystem;
-          const cwd = yield* fs.makeTempDirectoryScoped({ prefix: "t3-capacity-retry-" });
-          const localTranscript = yield* decodeReplayTranscriptJson(
-            (yield* encodeReplayTranscriptJson(
-              makeCodexReplayTranscript({ scenario, entries }),
-            )).replaceAll(yield* encodeStringJson("/workspace"), yield* encodeStringJson(cwd)),
+      if (outcome === "recover") {
+        const fs = yield* FileSystem.FileSystem;
+        const cwd = yield* fs.makeTempDirectoryScoped({ prefix: "t3-capacity-retry-" });
+        const localTranscript = yield* decodeReplayTranscriptJson(
+          (yield* encodeReplayTranscriptJson(
+            makeCodexReplayTranscript({ scenario, entries }),
+          )).replaceAll(yield* encodeStringJson("/workspace"), yield* encodeStringJson(cwd)),
+        );
+        const driver = yield* CodexReplay.makeReplayDriver(withConfigReads(localTranscript));
+        yield* Effect.gen(function* () {
+          const orchestrator = yield* Orchestrator.OrchestratorV2;
+          const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
+          const threadId = ThreadId.make("thread:capacity-retry");
+          yield* orchestrator.dispatch({
+            type: "thread.create",
+            commandId: CommandId.make("create-capacity-retry"),
+            threadId,
+            projectId: ProjectId.make("project:capacity-retry"),
+            title: "Capacity retry",
+            modelSelection: CODEX_TEST_MODEL_SELECTION,
+            runtimeMode: "full-access",
+            interactionMode: "default",
+            branch: null,
+            worktreePath: cwd,
+            createdBy: "user",
+            creationSource: "web",
+          });
+          const retrying = yield* orchestrator.streamDomainEvents.pipe(
+            Stream.filter(
+              (event) =>
+                event.type === "turn-item.updated" &&
+                event.payload.type === "error" &&
+                event.payload.retry != null &&
+                event.payload.status === "running",
+            ),
+            Stream.runHead,
+            Effect.forkChild({ startImmediately: true }),
           );
-          const driver = yield* CodexReplay.makeReplayDriver(withConfigReads(localTranscript));
-          yield* Effect.gen(function* () {
-            const orchestrator = yield* Orchestrator.OrchestratorV2;
-            const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
-            const threadId = ThreadId.make("thread:capacity-retry");
-            yield* orchestrator.dispatch({
-              type: "thread.create",
-              commandId: CommandId.make("create-capacity-retry"),
-              threadId,
-              projectId: ProjectId.make("project:capacity-retry"),
-              title: "Capacity retry",
-              modelSelection: CODEX_TEST_MODEL_SELECTION,
-              runtimeMode: "full-access",
-              interactionMode: "default",
-              branch: null,
-              worktreePath: cwd,
-              createdBy: "user",
-              creationSource: "web",
-            });
-            const retrying = yield* orchestrator.streamDomainEvents.pipe(
-              Stream.filter(
-                (event) =>
-                  event.type === "turn-item.updated" &&
-                  event.payload.type === "error" &&
-                  event.payload.retry != null &&
-                  event.payload.status === "running",
-              ),
-              Stream.runHead,
-              Effect.forkChild({ startImmediately: true }),
-            );
-            yield* orchestrator.dispatch({
-              type: "message.dispatch",
-              commandId: CommandId.make("start-capacity-retry"),
-              threadId,
-              messageId: MessageId.make("message:capacity-retry"),
-              text: prompt,
-              attachments: [],
-              createdBy: "user",
-              creationSource: "web",
-              dispatchMode: { type: "start_immediately" },
-            });
-            yield* worker.drain();
-            yield* Fiber.join(retrying);
-            assert.equal(
-              (yield* orchestrator.getThreadProjection(threadId)).runs.at(-1)?.status,
-              "running",
-            );
-            const completed = yield* orchestrator.streamDomainEvents.pipe(
-              Stream.filter(
-                (event) => event.type === "run.updated" && event.payload.status === "waiting",
-              ),
-              Stream.runHead,
-              Effect.forkChild({ startImmediately: true }),
-            );
-            yield* TestClock.adjust("2 seconds");
-            yield* Fiber.join(completed);
-            yield* worker.drain();
-            const projection = yield* orchestrator.getThreadProjection(threadId);
-            assert.equal(projection.runs.at(-1)?.status, "completed");
-            assert.deepEqual(
-              projection.providerTurns.map((turn) => turn.status),
-              ["failed", "completed"],
-            );
-            assert.lengthOf(
-              projection.messages.filter((message) => message.role === "user"),
-              1,
-            );
-            assert.isNull((yield* Ref.get(driver.state)).failure);
-          }).pipe(
-            Effect.provide(
-              ProviderReplayHarness.layerWithRegistry(
-                { name: "codex-capacity-retry", runtimePolicyOverride: { cwd } },
-                CodexAdapterV2Testkit.layer({ transcript: localTranscript, driver }),
-                { runEffectWorker: false },
-              ),
+          yield* orchestrator.dispatch({
+            type: "message.dispatch",
+            commandId: CommandId.make("start-capacity-retry"),
+            threadId,
+            messageId: MessageId.make("message:capacity-retry"),
+            text: prompt,
+            attachments: [],
+            createdBy: "user",
+            creationSource: "web",
+            dispatchMode: { type: "start_immediately" },
+          });
+          yield* worker.drain();
+          yield* Fiber.join(retrying);
+          assert.equal(
+            (yield* orchestrator.getThreadProjection(threadId)).runs.at(-1)?.status,
+            "running",
+          );
+          const completed = yield* orchestrator.streamDomainEvents.pipe(
+            Stream.filter(
+              (event) => event.type === "run.updated" && event.payload.status === "waiting",
             ),
+            Stream.runHead,
+            Effect.forkChild({ startImmediately: true }),
           );
-        }
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
+          yield* TestClock.adjust("2 seconds");
+          yield* Fiber.join(completed);
+          yield* worker.drain();
+          const projection = yield* orchestrator.getThreadProjection(threadId);
+          assert.equal(projection.runs.at(-1)?.status, "completed");
+          assert.deepEqual(
+            projection.providerTurns.map((turn) => turn.status),
+            ["failed", "completed"],
+          );
+          assert.lengthOf(
+            projection.messages.filter((message) => message.role === "user"),
+            1,
+          );
+          assert.isNull((yield* Ref.get(driver.state)).failure);
+        }).pipe(
+          Effect.provide(
+            ProviderReplayHarness.layerWithRegistry(
+              { name: "codex-capacity-retry", runtimePolicyOverride: { cwd } },
+              CodexAdapterV2Testkit.layer({ transcript: localTranscript, driver }),
+              { runEffectWorker: false },
+            ),
           ),
+        );
+      }
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
         ),
       ),
     ),
   );
 
   it.effect("reports a thread another Codex client is writing to as in use", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const nativeThreadId = "thread-open-elsewhere";
-        const harness = yield* makeCodexReplayHarness(
-          makeCodexReplayTranscript({
-            scenario: "codex-resume-active-writer",
-            entries: [
-              ...codexReplayPreamble({
-                nativeThreadId,
-                nativeTurnId: "unused-turn",
-                prompt: "unused-prompt",
-              }).slice(0, 5),
-              {
-                type: "expect_outbound",
-                label: "thread/resume",
-                frame: {
-                  id: 3,
-                  method: "thread/resume",
-                  params: {
-                    threadId: nativeThreadId,
-                    excludeTurns: true,
-                    cwd: CODEX_TEST_RUNTIME_POLICY.cwd,
-                    model: CODEX_TEST_MODEL_SELECTION.model,
-                    config: CodexAdapterV2.CODEX_THREAD_CONFIG,
-                  },
+    Effect.gen(function* () {
+      const nativeThreadId = "thread-open-elsewhere";
+      const harness = yield* makeCodexReplayHarness(
+        makeCodexReplayTranscript({
+          scenario: "codex-resume-active-writer",
+          entries: [
+            ...codexReplayPreamble({
+              nativeThreadId,
+              nativeTurnId: "unused-turn",
+              prompt: "unused-prompt",
+            }).slice(0, 5),
+            {
+              type: "expect_outbound",
+              label: "thread/resume",
+              frame: {
+                id: 3,
+                method: "thread/resume",
+                params: {
+                  threadId: nativeThreadId,
+                  excludeTurns: true,
+                  cwd: CODEX_TEST_RUNTIME_POLICY.cwd,
+                  model: CODEX_TEST_MODEL_SELECTION.model,
+                  config: CodexAdapterV2.CODEX_THREAD_CONFIG,
                 },
               },
-              {
-                type: "emit_inbound",
-                label: "active writer",
-                frame: {
-                  id: 3,
-                  error: {
-                    code: -32600,
-                    message: `thread ${nativeThreadId} already has an active writer`,
-                  },
+            },
+            {
+              type: "emit_inbound",
+              label: "active writer",
+              frame: {
+                id: 3,
+                error: {
+                  code: -32600,
+                  message: `thread ${nativeThreadId} already has an active writer`,
                 },
               },
-            ],
-          }),
-        );
-
-        const error = yield* Effect.flip(
-          harness.runtime.resumeThread({
-            providerThread: harness.providerThread,
-            modelSelection: CODEX_TEST_MODEL_SELECTION,
-            runtimePolicy: CODEX_TEST_RUNTIME_POLICY,
-          }),
-        );
+            },
+          ],
+        }),
+      );
 
-        assert.equal(error._tag, "ProviderAdapterThreadInUseError");
-        assert.nestedPropertyVal(error, "providerThreadId", harness.providerThread.id);
-        assert.include(error.message, "open in another Codex client");
-        assert.nestedPropertyVal(
-          error,
-          "cause.errorMessage",
-          `thread ${nativeThreadId} already has an active writer`,
-        );
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
-          ),
+      const error = yield* Effect.flip(
+        harness.runtime.resumeThread({
+          providerThread: harness.providerThread,
+          modelSelection: CODEX_TEST_MODEL_SELECTION,
+          runtimePolicy: CODEX_TEST_RUNTIME_POLICY,
+        }),
+      );
+
+      assert.equal(error._tag, "ProviderAdapterThreadInUseError");
+      assert.nestedPropertyVal(error, "providerThreadId", harness.providerThread.id);
+      assert.include(error.message, "open in another Codex client");
+      assert.nestedPropertyVal(
+        error,
+        "cause.errorMessage",
+        `thread ${nativeThreadId} already has an active writer`,
+      );
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
         ),
       ),
     ),
   );
 
   it.effect("resolves retryable app-server errors on resumed provider activity", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const scenario = "codex-provider-api-retry";
-        const nativeThreadId = `native-${scenario}-thread`;
-        const nativeTurnId = `native-${scenario}-turn`;
-        const transcript = makeCodexReplayTranscript({
-          scenario,
-          entries: [
-            ...codexReplayPreamble({
-              nativeThreadId,
-              nativeTurnId,
-              prompt: "Open github.com.",
-            }),
-            {
-              type: "emit_inbound",
-              label: "error/retry",
-              frame: {
-                method: "error",
-                params: {
-                  threadId: nativeThreadId,
-                  turnId: nativeTurnId,
-                  willRetry: true,
-                  error: {
-                    message: "Reconnecting... 2/5",
-                    additionalDetails: "The response stream disconnected.",
-                    codexErrorInfo: {
-                      responseStreamDisconnected: { httpStatusCode: 529 },
-                    },
+    Effect.gen(function* () {
+      const scenario = "codex-provider-api-retry";
+      const nativeThreadId = `native-${scenario}-thread`;
+      const nativeTurnId = `native-${scenario}-turn`;
+      const transcript = makeCodexReplayTranscript({
+        scenario,
+        entries: [
+          ...codexReplayPreamble({
+            nativeThreadId,
+            nativeTurnId,
+            prompt: "Open github.com.",
+          }),
+          {
+            type: "emit_inbound",
+            label: "error/retry",
+            frame: {
+              method: "error",
+              params: {
+                threadId: nativeThreadId,
+                turnId: nativeTurnId,
+                willRetry: true,
+                error: {
+                  message: "Reconnecting... 2/5",
+                  additionalDetails: "The response stream disconnected.",
+                  codexErrorInfo: {
+                    responseStreamDisconnected: { httpStatusCode: 529 },
                   },
                 },
               },
             },
-            {
-              type: "emit_inbound",
-              label: "error/retry/waiting-for-network",
-              frame: {
-                method: "error",
-                params: {
-                  threadId: nativeThreadId,
-                  turnId: nativeTurnId,
-                  willRetry: true,
-                  error: {
-                    message: "Reconnecting... waiting for network",
-                    additionalDetails: "Connection failed: error sending request",
-                    codexErrorInfo: {
-                      responseStreamDisconnected: { httpStatusCode: null },
-                    },
+          },
+          {
+            type: "emit_inbound",
+            label: "error/retry/waiting-for-network",
+            frame: {
+              method: "error",
+              params: {
+                threadId: nativeThreadId,
+                turnId: nativeTurnId,
+                willRetry: true,
+                error: {
+                  message: "Reconnecting... waiting for network",
+                  additionalDetails: "Connection failed: error sending request",
+                  codexErrorInfo: {
+                    responseStreamDisconnected: { httpStatusCode: null },
                   },
                 },
               },
             },
-            {
-              type: "emit_inbound",
-              label: "item/started/after-retry",
-              frame: {
-                method: "item/started",
-                params: {
-                  threadId: nativeThreadId,
-                  turnId: nativeTurnId,
-                  startedAtMs: 1782622445000,
-                  item: {
-                    type: "commandExecution",
-                    id: "command-after-provider-retry",
-                    command: "pwd",
-                    cwd: "/workspace",
-                    processId: "42",
-                    source: "unifiedExecStartup",
-                    status: "inProgress",
-                    commandActions: [{ type: "unknown", command: "pwd" }],
-                    aggregatedOutput: null,
-                    exitCode: null,
-                    durationMs: null,
-                  },
+          },
+          {
+            type: "emit_inbound",
+            label: "item/started/after-retry",
+            frame: {
+              method: "item/started",
+              params: {
+                threadId: nativeThreadId,
+                turnId: nativeTurnId,
+                startedAtMs: 1782622445000,
+                item: {
+                  type: "commandExecution",
+                  id: "command-after-provider-retry",
+                  command: "pwd",
+                  cwd: "/workspace",
+                  processId: "42",
+                  source: "unifiedExecStartup",
+                  status: "inProgress",
+                  commandActions: [{ type: "unknown", command: "pwd" }],
+                  aggregatedOutput: null,
+                  exitCode: null,
+                  durationMs: null,
                 },
               },
             },
-            {
-              type: "emit_inbound",
-              label: "item/completed/after-retry",
-              frame: {
-                method: "item/completed",
-                params: {
-                  threadId: nativeThreadId,
-                  turnId: nativeTurnId,
-                  completedAtMs: 1782622445010,
-                  item: {
-                    type: "commandExecution",
-                    id: "command-after-provider-retry",
-                    command: "pwd",
-                    cwd: "/workspace",
-                    processId: "42",
-                    source: "unifiedExecStartup",
-                    status: "completed",
-                    commandActions: [{ type: "unknown", command: "pwd" }],
-                    aggregatedOutput: "/workspace\n",
-                    exitCode: 0,
-                    durationMs: 10,
-                  },
+          },
+          {
+            type: "emit_inbound",
+            label: "item/completed/after-retry",
+            frame: {
+              method: "item/completed",
+              params: {
+                threadId: nativeThreadId,
+                turnId: nativeTurnId,
+                completedAtMs: 1782622445010,
+                item: {
+                  type: "commandExecution",
+                  id: "command-after-provider-retry",
+                  command: "pwd",
+                  cwd: "/workspace",
+                  processId: "42",
+                  source: "unifiedExecStartup",
+                  status: "completed",
+                  commandActions: [{ type: "unknown", command: "pwd" }],
+                  aggregatedOutput: "/workspace\n",
+                  exitCode: 0,
+                  durationMs: 10,
                 },
               },
             },
-            {
-              type: "emit_inbound",
-              label: "turn/completed",
-              frame: {
-                method: "turn/completed",
-                params: {
-                  threadId: nativeThreadId,
-                  turn: makeCodexReplayTurn({ id: nativeTurnId, status: "completed" }),
-                },
+          },
+          {
+            type: "emit_inbound",
+            label: "turn/completed",
+            frame: {
+              method: "turn/completed",
+              params: {
+                threadId: nativeThreadId,
+                turn: makeCodexReplayTurn({ id: nativeTurnId, status: "completed" }),
               },
             },
-          ],
-        });
-        const harness = yield* makeCodexReplayHarness(transcript);
-        const now = yield* DateTime.now;
-        yield* harness.runtime.startTurn(
-          makeCodexTestTurnInput({
-            threadId: harness.threadId,
-            providerThread: harness.providerThread,
-            now,
-            attemptId: RunAttemptId.make("attempt-codex-provider-api-retry"),
-            text: "Open github.com.",
-          }),
-        );
-        yield* harness.awaitTerminal(1);
+          },
+        ],
+      });
+      const harness = yield* makeCodexReplayHarness(transcript);
+      const now = yield* DateTime.now;
+      yield* harness.runtime.startTurn(
+        makeCodexTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now,
+          attemptId: RunAttemptId.make("attempt-codex-provider-api-retry"),
+          text: "Open github.com.",
+        }),
+      );
+      yield* harness.awaitTerminal(1);
+
+      const retryItems = harness.events.flatMap((event) =>
+        event.type === "turn_item.updated" &&
+        event.turnItem.type === "error" &&
+        event.turnItem.retry !== undefined
+          ? [event.turnItem]
+          : [],
+      );
+      assert.lengthOf(retryItems, 3);
+      assert.equal(retryItems[0]?.status, "running");
+      assert.equal(retryItems[0]?.failure.code, "responseStreamDisconnected");
+      assert.deepEqual(retryItems[0]?.retry, {
+        attempt: 2,
+        maxAttempts: 5,
+        retryDelayMs: null,
+      });
+      assert.deepEqual(retryItems[1]?.retry, {
+        attempt: 3,
+        maxAttempts: null,
+        retryDelayMs: null,
+      });
+      assert.equal(retryItems[2]?.id, retryItems[0]?.id);
+      assert.equal(retryItems[2]?.status, "completed");
+      assert.equal(retryItems[2]?.title, "Provider recovered");
 
-        const retryItems = harness.events.flatMap((event) =>
+      const recoveredIndex = harness.events.findIndex(
+        (event) =>
           event.type === "turn_item.updated" &&
           event.turnItem.type === "error" &&
-          event.turnItem.retry !== undefined
-            ? [event.turnItem]
-            : [],
-        );
-        assert.lengthOf(retryItems, 3);
-        assert.equal(retryItems[0]?.status, "running");
-        assert.equal(retryItems[0]?.failure.code, "responseStreamDisconnected");
-        assert.deepEqual(retryItems[0]?.retry, {
-          attempt: 2,
-          maxAttempts: 5,
-          retryDelayMs: null,
-        });
-        assert.deepEqual(retryItems[1]?.retry, {
-          attempt: 3,
-          maxAttempts: null,
-          retryDelayMs: null,
-        });
-        assert.equal(retryItems[2]?.id, retryItems[0]?.id);
-        assert.equal(retryItems[2]?.status, "completed");
-        assert.equal(retryItems[2]?.title, "Provider recovered");
+          event.turnItem.status === "completed",
+      );
+      const resumedCommandIndex = harness.events.findIndex(
+        (event) =>
+          event.type === "turn_item.updated" &&
+          event.turnItem.type === "command_execution" &&
+          event.turnItem.input === "pwd",
+      );
+      const terminalIndex = harness.events.findIndex((event) => event.type === "turn.terminal");
+      assert.isAtLeast(recoveredIndex, 0);
+      assert.isAbove(resumedCommandIndex, recoveredIndex);
+      assert.isAbove(terminalIndex, resumedCommandIndex);
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
+        ),
+      ),
+    ),
+  );
 
-        const recoveredIndex = harness.events.findIndex(
-          (event) =>
-            event.type === "turn_item.updated" &&
-            event.turnItem.type === "error" &&
-            event.turnItem.status === "completed",
-        );
-        const resumedCommandIndex = harness.events.findIndex(
-          (event) =>
-            event.type === "turn_item.updated" &&
-            event.turnItem.type === "command_execution" &&
-            event.turnItem.input === "pwd",
-        );
-        const terminalIndex = harness.events.findIndex((event) => event.type === "turn.terminal");
-        assert.isAtLeast(recoveredIndex, 0);
-        assert.isAbove(resumedCommandIndex, recoveredIndex);
-        assert.isAbove(terminalIndex, resumedCommandIndex);
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
-          ),
+  it.effect("fails a stalled 429 provider retry as a usage limit and stops the Codex turn", () =>
+    Effect.gen(function* () {
+      const scenario = "codex-provider-retry-stall";
+      const nativeThreadId = `native-${scenario}-thread`;
+      const nativeTurnId = `native-${scenario}-turn`;
+      const transcript = makeCodexReplayTranscript({
+        scenario,
+        entries: [
+          ...codexReplayPreamble({ nativeThreadId, nativeTurnId, prompt: "Continue." }),
+          {
+            type: "emit_inbound",
+            label: "error/retry",
+            frame: {
+              method: "error",
+              params: {
+                threadId: nativeThreadId,
+                turnId: nativeTurnId,
+                willRetry: true,
+                error: {
+                  message: "Reconnecting... 1/5",
+                  additionalDetails: "exceeded retry limit, last status: 429 Too Many Requests",
+                  codexErrorInfo: { responseStreamDisconnected: { httpStatusCode: 429 } },
+                },
+              },
+            },
+          },
+          {
+            type: "expect_outbound",
+            label: "turn/interrupt",
+            frame: {
+              id: 4,
+              method: "turn/interrupt",
+              params: { threadId: nativeThreadId, turnId: nativeTurnId },
+            },
+          },
+          { type: "emit_inbound", label: "turn/interrupt", frame: { id: 4, result: {} } },
+          {
+            type: "emit_inbound",
+            label: "turn/completed",
+            frame: {
+              method: "turn/completed",
+              params: {
+                threadId: nativeThreadId,
+                turn: makeCodexReplayTurn({ id: nativeTurnId, status: "interrupted" }),
+              },
+            },
+          },
+        ],
+      });
+      const retryShown = yield* Deferred.make<void>();
+      const interruptSent = yield* Deferred.make<void>();
+      const harness = yield* makeCodexReplayHarness(
+        transcript,
+        (event) =>
+          event.type === "turn_item.updated" && event.turnItem.type === "error"
+            ? Deferred.succeed(retryShown, undefined)
+            : Effect.void,
+        (method) =>
+          method === "turn/interrupt" ? Deferred.succeed(interruptSent, undefined) : Effect.void,
+      );
+      yield* harness.runtime.startTurn(
+        makeCodexTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now: yield* DateTime.now,
+          text: "Continue.",
+          attemptId: RunAttemptId.make(`attempt-${scenario}`),
+        }),
+      );
+      yield* Deferred.await(retryShown);
+      yield* TestClock.adjust("9 minutes");
+      assert.isEmpty(harness.terminalEvents());
+      yield* TestClock.adjust("1 minute");
+      yield* harness.firstTerminal;
+      yield* Deferred.await(interruptSent);
+      const terminal = harness.terminalEvents()[0];
+      assert.equal(terminal?.status, "failed");
+      if (terminal?.status !== "failed") return;
+      assert.equal(terminal.failure.class, "usage_limit");
+      assert.equal(terminal.failure.code, "responseStreamDisconnected");
+      assert.equal(
+        terminal.failure.message,
+        "exceeded retry limit, last status: 429 Too Many Requests",
+      );
+      assert.equal(terminal.retry?.attempt, 1);
+      assert.equal(terminal.threadDisposition, "reusable");
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
         ),
       ),
     ),
   );
 
-  it.effect("fails a stalled 429 provider retry as a usage limit and stops the Codex turn", () =>
-    Effect.scoped(
+  it.effect.each(["completed", "interrupted"] as const)(
+    "retains Codex reasoning parts when the turn is %s",
+    (terminalStatus) =>
       Effect.gen(function* () {
-        const scenario = "codex-provider-retry-stall";
+        const scenario = `codex-reasoning-${terminalStatus}`;
         const nativeThreadId = `native-${scenario}-thread`;
         const nativeTurnId = `native-${scenario}-turn`;
+        const prompt = "Explain the check.";
         const transcript = makeCodexReplayTranscript({
           scenario,
           entries: [
-            ...codexReplayPreamble({ nativeThreadId, nativeTurnId, prompt: "Continue." }),
-            {
-              type: "emit_inbound",
-              label: "error/retry",
-              frame: {
-                method: "error",
+            ...codexReplayPreamble({ nativeThreadId, nativeTurnId, prompt }),
+            ...[
+              {
+                method: "item/reasoning/summaryTextDelta",
+                params: { itemId: "thought", summaryIndex: 0, delta: "Summary " },
+              },
+              {
+                method: "item/reasoning/summaryTextDelta",
+                params: { itemId: "thought", summaryIndex: 0, delta: "one" },
+              },
+              {
+                method: "item/reasoning/summaryTextDelta",
+                params: { itemId: "thought", summaryIndex: 1, delta: "Summary two" },
+              },
+              {
+                method: "item/reasoning/textDelta",
+                params: { itemId: "thought", contentIndex: 0, delta: "Raw trace" },
+              },
+              {
+                method: "item/completed",
                 params: {
-                  threadId: nativeThreadId,
-                  turnId: nativeTurnId,
-                  willRetry: true,
-                  error: {
-                    message: "Reconnecting... 1/5",
-                    additionalDetails: "exceeded retry limit, last status: 429 Too Many Requests",
-                    codexErrorInfo: { responseStreamDisconnected: { httpStatusCode: 429 } },
+                  item: {
+                    type: "commandExecution",
+                    id: "after-thought",
+                    command: "pwd",
+                    cwd: "/workspace",
+                    processId: "42",
+                    source: "unifiedExecStartup",
+                    status: "completed",
+                    commandActions: [{ type: "unknown", command: "pwd" }],
+                    aggregatedOutput: "/workspace",
+                    exitCode: 0,
+                    durationMs: 1,
                   },
                 },
               },
-            },
-            {
-              type: "expect_outbound",
-              label: "turn/interrupt",
+              ...(terminalStatus === "completed"
+                ? [
+                    {
+                      method: "item/completed",
+                      params: {
+                        item: {
+                          type: "reasoning",
+                          id: "thought",
+                          summary: ["Final summary one", "Summary two"],
+                          content: ["Raw trace"],
+                        },
+                      },
+                    },
+                    {
+                      method: "item/completed",
+                      params: {
+                        item: {
+                          type: "reasoning",
+                          id: "completion-only",
+                          summary: ["Completion without deltas"],
+                          content: [],
+                        },
+                      },
+                    },
+                    {
+                      method: "item/reasoning/textDelta",
+                      params: {
+                        itemId: "delta-only",
+                        contentIndex: 0,
+                        delta: "Retained when completion omits content",
+                      },
+                    },
+                    {
+                      method: "item/completed",
+                      params: {
+                        item: { type: "reasoning", id: "delta-only", summary: [], content: [] },
+                      },
+                    },
+                  ]
+                : []),
+            ].map((event, index) => ({
+              type: "emit_inbound" as const,
+              label: `reasoning-${index}`,
               frame: {
-                id: 4,
-                method: "turn/interrupt",
-                params: { threadId: nativeThreadId, turnId: nativeTurnId },
+                method: event.method,
+                params: { threadId: nativeThreadId, turnId: nativeTurnId, ...event.params },
               },
-            },
-            { type: "emit_inbound", label: "turn/interrupt", frame: { id: 4, result: {} } },
+            })),
             {
               type: "emit_inbound",
               label: "turn/completed",
@@ -4254,49 +4564,61 @@ describe("CodexAdapterV2 post-settle continuation", () => {
                 method: "turn/completed",
                 params: {
                   threadId: nativeThreadId,
-                  turn: makeCodexReplayTurn({ id: nativeTurnId, status: "interrupted" }),
+                  turn: makeCodexReplayTurn({ id: nativeTurnId, status: terminalStatus }),
                 },
               },
             },
           ],
         });
-        const retryShown = yield* Deferred.make<void>();
-        const interruptSent = yield* Deferred.make<void>();
-        const harness = yield* makeCodexReplayHarness(
-          transcript,
-          (event) =>
-            event.type === "turn_item.updated" && event.turnItem.type === "error"
-              ? Deferred.succeed(retryShown, undefined)
-              : Effect.void,
-          (method) =>
-            method === "turn/interrupt" ? Deferred.succeed(interruptSent, undefined) : Effect.void,
-        );
+        const harness = yield* makeCodexReplayHarness(transcript);
         yield* harness.runtime.startTurn(
           makeCodexTestTurnInput({
             threadId: harness.threadId,
             providerThread: harness.providerThread,
             now: yield* DateTime.now,
-            text: "Continue.",
             attemptId: RunAttemptId.make(`attempt-${scenario}`),
+            text: prompt,
           }),
         );
-        yield* Deferred.await(retryShown);
-        yield* TestClock.adjust("9 minutes");
-        assert.isEmpty(harness.terminalEvents());
-        yield* TestClock.adjust("1 minute");
         yield* harness.firstTerminal;
-        yield* Deferred.await(interruptSent);
-        const terminal = harness.terminalEvents()[0];
-        assert.equal(terminal?.status, "failed");
-        if (terminal?.status !== "failed") return;
-        assert.equal(terminal.failure.class, "usage_limit");
-        assert.equal(terminal.failure.code, "responseStreamDisconnected");
-        assert.equal(
-          terminal.failure.message,
-          "exceeded retry limit, last status: 429 Too Many Requests",
+        const latest = new Map(
+          harness.events.flatMap((event) =>
+            event.type === "turn_item.updated" && event.turnItem.type === "reasoning"
+              ? [[event.turnItem.id, event.turnItem] as const]
+              : [],
+          ),
         );
-        assert.equal(terminal.retry?.attempt, 1);
-        assert.equal(terminal.threadDisposition, "reusable");
+        assert.deepEqual(
+          [...latest.values()].map((item) => item.text),
+          terminalStatus === "completed"
+            ? [
+                "Final summary one",
+                "Summary two",
+                "Raw trace",
+                "Completion without deltas",
+                "Retained when completion omits content",
+              ]
+            : ["Summary one", "Summary two", "Raw trace"],
+        );
+        assert.isTrue([...latest.values()].every((item) => item.status === terminalStatus));
+        assert.isTrue([...latest.values()].every((item) => item.streaming === false));
+        assert.isTrue(
+          [...latest.values()].every((item) => item.runId !== null && item.providerTurnId !== null),
+        );
+        assert.equal(new Set([...latest.values()].map((item) => item.ordinal)).size, latest.size);
+        const command = harness.events.find(
+          (event) =>
+            event.type === "turn_item.updated" && event.turnItem.type === "command_execution",
+        );
+        assert.isDefined(command);
+        if (command?.type === "turn_item.updated") {
+          assert.isTrue(
+            [...latest.values()]
+              .slice(0, 3)
+              .every((item) => item.ordinal < command.turnItem.ordinal),
+          );
+        }
+        assert.deepEqual(assistantMessages(harness.events), []);
       }).pipe(
         Effect.provide(
           Layer.mergeAll(
@@ -4307,180 +4629,6 @@ describe("CodexAdapterV2 post-settle continuation", () => {
           ),
         ),
       ),
-    ),
-  );
-
-  it.effect.each(["completed", "interrupted"] as const)(
-    "retains Codex reasoning parts when the turn is %s",
-    (terminalStatus) =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const scenario = `codex-reasoning-${terminalStatus}`;
-          const nativeThreadId = `native-${scenario}-thread`;
-          const nativeTurnId = `native-${scenario}-turn`;
-          const prompt = "Explain the check.";
-          const transcript = makeCodexReplayTranscript({
-            scenario,
-            entries: [
-              ...codexReplayPreamble({ nativeThreadId, nativeTurnId, prompt }),
-              ...[
-                {
-                  method: "item/reasoning/summaryTextDelta",
-                  params: { itemId: "thought", summaryIndex: 0, delta: "Summary " },
-                },
-                {
-                  method: "item/reasoning/summaryTextDelta",
-                  params: { itemId: "thought", summaryIndex: 0, delta: "one" },
-                },
-                {
-                  method: "item/reasoning/summaryTextDelta",
-                  params: { itemId: "thought", summaryIndex: 1, delta: "Summary two" },
-                },
-                {
-                  method: "item/reasoning/textDelta",
-                  params: { itemId: "thought", contentIndex: 0, delta: "Raw trace" },
-                },
-                {
-                  method: "item/completed",
-                  params: {
-                    item: {
-                      type: "commandExecution",
-                      id: "after-thought",
-                      command: "pwd",
-                      cwd: "/workspace",
-                      processId: "42",
-                      source: "unifiedExecStartup",
-                      status: "completed",
-                      commandActions: [{ type: "unknown", command: "pwd" }],
-                      aggregatedOutput: "/workspace",
-                      exitCode: 0,
-                      durationMs: 1,
-                    },
-                  },
-                },
-                ...(terminalStatus === "completed"
-                  ? [
-                      {
-                        method: "item/completed",
-                        params: {
-                          item: {
-                            type: "reasoning",
-                            id: "thought",
-                            summary: ["Final summary one", "Summary two"],
-                            content: ["Raw trace"],
-                          },
-                        },
-                      },
-                      {
-                        method: "item/completed",
-                        params: {
-                          item: {
-                            type: "reasoning",
-                            id: "completion-only",
-                            summary: ["Completion without deltas"],
-                            content: [],
-                          },
-                        },
-                      },
-                      {
-                        method: "item/reasoning/textDelta",
-                        params: {
-                          itemId: "delta-only",
-                          contentIndex: 0,
-                          delta: "Retained when completion omits content",
-                        },
-                      },
-                      {
-                        method: "item/completed",
-                        params: {
-                          item: { type: "reasoning", id: "delta-only", summary: [], content: [] },
-                        },
-                      },
-                    ]
-                  : []),
-              ].map((event, index) => ({
-                type: "emit_inbound" as const,
-                label: `reasoning-${index}`,
-                frame: {
-                  method: event.method,
-                  params: { threadId: nativeThreadId, turnId: nativeTurnId, ...event.params },
-                },
-              })),
-              {
-                type: "emit_inbound",
-                label: "turn/completed",
-                frame: {
-                  method: "turn/completed",
-                  params: {
-                    threadId: nativeThreadId,
-                    turn: makeCodexReplayTurn({ id: nativeTurnId, status: terminalStatus }),
-                  },
-                },
-              },
-            ],
-          });
-          const harness = yield* makeCodexReplayHarness(transcript);
-          yield* harness.runtime.startTurn(
-            makeCodexTestTurnInput({
-              threadId: harness.threadId,
-              providerThread: harness.providerThread,
-              now: yield* DateTime.now,
-              attemptId: RunAttemptId.make(`attempt-${scenario}`),
-              text: prompt,
-            }),
-          );
-          yield* harness.firstTerminal;
-          const latest = new Map(
-            harness.events.flatMap((event) =>
-              event.type === "turn_item.updated" && event.turnItem.type === "reasoning"
-                ? [[event.turnItem.id, event.turnItem] as const]
-                : [],
-            ),
-          );
-          assert.deepEqual(
-            [...latest.values()].map((item) => item.text),
-            terminalStatus === "completed"
-              ? [
-                  "Final summary one",
-                  "Summary two",
-                  "Raw trace",
-                  "Completion without deltas",
-                  "Retained when completion omits content",
-                ]
-              : ["Summary one", "Summary two", "Raw trace"],
-          );
-          assert.isTrue([...latest.values()].every((item) => item.status === terminalStatus));
-          assert.isTrue([...latest.values()].every((item) => item.streaming === false));
-          assert.isTrue(
-            [...latest.values()].every(
-              (item) => item.runId !== null && item.providerTurnId !== null,
-            ),
-          );
-          assert.equal(new Set([...latest.values()].map((item) => item.ordinal)).size, latest.size);
-          const command = harness.events.find(
-            (event) =>
-              event.type === "turn_item.updated" && event.turnItem.type === "command_execution",
-          );
-          assert.isDefined(command);
-          if (command?.type === "turn_item.updated") {
-            assert.isTrue(
-              [...latest.values()]
-                .slice(0, 3)
-                .every((item) => item.ordinal < command.turnItem.ordinal),
-            );
-          }
-          assert.deepEqual(assistantMessages(harness.events), []);
-        }).pipe(
-          Effect.provide(
-            Layer.mergeAll(
-              IdAllocator.layer,
-              McpProviderSessions.layer,
-              NodeServices.layer,
-              NodeCrypto.layer,
-            ),
-          ),
-        ),
-      ),
   );
 
   const finalAnswerTranscript = (
@@ -4586,106 +4734,104 @@ describe("CodexAdapterV2 post-settle continuation", () => {
   it.effect.each([false, true])(
     "preserves a final answer that repeats a preceding partial answer (streamed: %s)",
     (streamed) =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const transcript = finalAnswerTranscript("codex-partial-then-final", [
-            {
-              id: "status",
-              text: "Checking the files",
-              phase: "commentary",
-              streamed,
-            },
-            {
-              id: "partial",
-              text: "CODEX_RECOVERY_OK",
-              phase: "partial_answer",
-              streamed,
-            },
-            {
-              id: "final",
-              text: "CODEX_RECOVERY_OK",
-              phase: "final_answer",
-              streamed,
-            },
-          ]);
-          const gates = yield* Effect.forEach(["status", "partial", "final"], (id) =>
-            Effect.gen(function* () {
-              return {
-                id,
-                ready: yield* Deferred.make<void>(),
-                release: yield* Deferred.make<void>(),
-              };
-            }),
-          );
-          const harness = yield* makeCodexReplayHarness(
-            transcript,
-            undefined,
-            undefined,
-            undefined,
-            (entry) => {
-              const gate = streamed
-                ? gates.find((gate) => entry.label === `item/completed/${gate.id}`)
-                : undefined;
-              return gate === undefined
-                ? Effect.void
-                : Deferred.succeed(gate.ready, undefined).pipe(
-                    Effect.andThen(Deferred.await(gate.release)),
-                  );
-            },
-          );
-          const now = yield* DateTime.now;
-          yield* harness.runtime.startTurn(
-            makeCodexTestTurnInput({
-              threadId: harness.threadId,
-              providerThread: harness.providerThread,
-              now,
-              attemptId: RunAttemptId.make("attempt-codex-partial-then-final"),
-              text: "Reply with the requested recovery marker.",
-            }),
-          );
-          if (streamed) {
-            for (const gate of gates) {
-              yield* Deferred.await(gate.ready);
-              yield* TestClock.adjust("50 millis");
-              yield* harness.until(() =>
-                harness.events.some(
-                  (event) =>
-                    event.type === "turn_item.updated" &&
-                    event.turnItem.type === "assistant_message" &&
-                    event.turnItem.nativeItemRef?.nativeId === gate.id &&
-                    event.turnItem.streaming,
-                ),
-              );
-              yield* Deferred.succeed(gate.release, undefined);
-            }
-          }
-          yield* harness.awaitTerminal(1);
-          assert.deepEqual(
-            assistantMessages(harness.events).map((event) => event.message.text),
-            ["Checking the files", "CODEX_RECOVERY_OK", "CODEX_RECOVERY_OK"],
-          );
-          const updates = harness.events.flatMap((event) =>
-            event.type === "turn_item.updated" && event.turnItem.type === "assistant_message"
-              ? [event.turnItem]
-              : [],
-          );
-          for (const [text, phase] of [
-            ["Checking the files", "commentary"],
-            ["CODEX_RECOVERY_OK", "partial_answer"],
-            ["CODEX_RECOVERY_OK", "final_answer"],
-          ]) {
-            const matching = updates.filter((item) => item.text === text && item.phase === phase);
-            assert.isTrue(matching.some((item) => !item.streaming));
-            if (streamed) assert.isTrue(matching.some((item) => item.streaming));
+      Effect.gen(function* () {
+        const transcript = finalAnswerTranscript("codex-partial-then-final", [
+          {
+            id: "status",
+            text: "Checking the files",
+            phase: "commentary",
+            streamed,
+          },
+          {
+            id: "partial",
+            text: "CODEX_RECOVERY_OK",
+            phase: "partial_answer",
+            streamed,
+          },
+          {
+            id: "final",
+            text: "CODEX_RECOVERY_OK",
+            phase: "final_answer",
+            streamed,
+          },
+        ]);
+        const gates = yield* Effect.forEach(["status", "partial", "final"], (id) =>
+          Effect.gen(function* () {
+            return {
+              id,
+              ready: yield* Deferred.make<void>(),
+              release: yield* Deferred.make<void>(),
+            };
+          }),
+        );
+        const harness = yield* makeCodexReplayHarness(
+          transcript,
+          undefined,
+          undefined,
+          undefined,
+          (entry) => {
+            const gate = streamed
+              ? gates.find((gate) => entry.label === `item/completed/${gate.id}`)
+              : undefined;
+            return gate === undefined
+              ? Effect.void
+              : Deferred.succeed(gate.ready, undefined).pipe(
+                  Effect.andThen(Deferred.await(gate.release)),
+                );
+          },
+        );
+        const now = yield* DateTime.now;
+        yield* harness.runtime.startTurn(
+          makeCodexTestTurnInput({
+            threadId: harness.threadId,
+            providerThread: harness.providerThread,
+            now,
+            attemptId: RunAttemptId.make("attempt-codex-partial-then-final"),
+            text: "Reply with the requested recovery marker.",
+          }),
+        );
+        if (streamed) {
+          for (const gate of gates) {
+            yield* Deferred.await(gate.ready);
+            yield* TestClock.adjust("50 millis");
+            yield* harness.until(() =>
+              harness.events.some(
+                (event) =>
+                  event.type === "turn_item.updated" &&
+                  event.turnItem.type === "assistant_message" &&
+                  event.turnItem.nativeItemRef?.nativeId === gate.id &&
+                  event.turnItem.streaming,
+              ),
+            );
+            yield* Deferred.succeed(gate.release, undefined);
           }
-        }).pipe(
-          Effect.provide(
-            Layer.mergeAll(
-              IdAllocator.layer,
-              McpProviderSessions.layer,
-              NodeServices.layer,
-              NodeCrypto.layer,
-            ),
+        }
+        yield* harness.awaitTerminal(1);
+        assert.deepEqual(
+          assistantMessages(harness.events).map((event) => event.message.text),
+          ["Checking the files", "CODEX_RECOVERY_OK", "CODEX_RECOVERY_OK"],
+        );
+        const updates = harness.events.flatMap((event) =>
+          event.type === "turn_item.updated" && event.turnItem.type === "assistant_message"
+            ? [event.turnItem]
+            : [],
+        );
+        for (const [text, phase] of [
+          ["Checking the files", "commentary"],
+          ["CODEX_RECOVERY_OK", "partial_answer"],
+          ["CODEX_RECOVERY_OK", "final_answer"],
+        ]) {
+          const matching = updates.filter((item) => item.text === text && item.phase === phase);
+          assert.isTrue(matching.some((item) => !item.streaming));
+          if (streamed) assert.isTrue(matching.some((item) => item.streaming));
+        }
+      }).pipe(
+        Effect.provide(
+          Layer.mergeAll(
+            IdAllocator.layer,
+            McpProviderSessions.layer,
+            NodeServices.layer,
+            NodeCrypto.layer,
           ),
         ),
       ),
@@ -4971,38 +5117,36 @@ describe("CodexAdapterV2 post-settle continuation", () => {
   );
 
   it.effect("suppresses a trailing empty final answer after a non-empty final answer", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const transcript = finalAnswerTranscript("codex-redundant-empty-final", [
-          { id: "answer-non-empty", text: "CODEX_RECOVERY_OK" },
-          { id: "answer-empty", text: "" },
-        ]);
-        const harness = yield* makeCodexReplayHarness(transcript);
-        const now = yield* DateTime.now;
+    Effect.gen(function* () {
+      const transcript = finalAnswerTranscript("codex-redundant-empty-final", [
+        { id: "answer-non-empty", text: "CODEX_RECOVERY_OK" },
+        { id: "answer-empty", text: "" },
+      ]);
+      const harness = yield* makeCodexReplayHarness(transcript);
+      const now = yield* DateTime.now;
 
-        yield* harness.runtime.startTurn(
-          makeCodexTestTurnInput({
-            threadId: harness.threadId,
-            providerThread: harness.providerThread,
-            now,
-            attemptId: RunAttemptId.make("attempt-codex-redundant-empty-final"),
-            text: "Reply with the requested recovery marker.",
-          }),
-        );
-        yield* harness.awaitTerminal(1);
+      yield* harness.runtime.startTurn(
+        makeCodexTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now,
+          attemptId: RunAttemptId.make("attempt-codex-redundant-empty-final"),
+          text: "Reply with the requested recovery marker.",
+        }),
+      );
+      yield* harness.awaitTerminal(1);
 
-        assert.deepEqual(
-          assistantMessages(harness.events).map((event) => event.message.text),
-          ["CODEX_RECOVERY_OK"],
-        );
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
-          ),
+      assert.deepEqual(
+        assistantMessages(harness.events).map((event) => event.message.text),
+        ["CODEX_RECOVERY_OK"],
+      );
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
         ),
       ),
     ),
@@ -5144,52 +5288,50 @@ describe("CodexAdapterV2 post-settle continuation", () => {
   );
 
   it.effect("wakes with well-formed text when the cuts split an emoji", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const harness = yield* makeCodexReplayHarness(
-          makeCodexReplayTranscript({
-            scenario: "codex-bg-wake-surrogate",
-            entries: [
-              ...backgroundExecTranscript.entries.slice(0, -1),
-              {
-                type: "emit_inbound",
-                label: "item/completed/command-late",
-                frame: {
-                  method: "item/completed",
-                  params: {
-                    item: {
-                      ...backgroundCommandItem("completed"),
-                      command: `${"c".repeat(199)}🚀`,
-                      aggregatedOutput: `🚀${"x".repeat(999)}\n`,
-                    },
-                    threadId: BG_NATIVE_THREAD,
-                    turnId: BG_NATIVE_TURN,
-                    completedAtMs: 1782622465500,
+    Effect.gen(function* () {
+      const harness = yield* makeCodexReplayHarness(
+        makeCodexReplayTranscript({
+          scenario: "codex-bg-wake-surrogate",
+          entries: [
+            ...backgroundExecTranscript.entries.slice(0, -1),
+            {
+              type: "emit_inbound",
+              label: "item/completed/command-late",
+              frame: {
+                method: "item/completed",
+                params: {
+                  item: {
+                    ...backgroundCommandItem("completed"),
+                    command: `${"c".repeat(199)}🚀`,
+                    aggregatedOutput: `🚀${"x".repeat(999)}\n`,
                   },
+                  threadId: BG_NATIVE_THREAD,
+                  turnId: BG_NATIVE_TURN,
+                  completedAtMs: 1782622465500,
                 },
               },
-            ],
-          }),
-        );
-        yield* harness.runtime.startTurn(
-          makeCodexTestTurnInput({
-            threadId: harness.threadId,
-            providerThread: harness.providerThread,
-            now: yield* DateTime.now,
-            attemptId: RunAttemptId.make("attempt-codex-bg-wake-surrogate"),
-            text: BG_PROMPT,
-          }),
-        );
-        yield* harness.until(() => harness.continuationRequests.length > 0);
-        assert.isTrue(harness.continuationRequests[0]?.detail?.isWellFormed());
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
-          ),
+            },
+          ],
+        }),
+      );
+      yield* harness.runtime.startTurn(
+        makeCodexTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now: yield* DateTime.now,
+          attemptId: RunAttemptId.make("attempt-codex-bg-wake-surrogate"),
+          text: BG_PROMPT,
+        }),
+      );
+      yield* harness.until(() => harness.continuationRequests.length > 0);
+      assert.isTrue(harness.continuationRequests[0]?.detail?.isWellFormed());
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
         ),
       ),
     ),
@@ -5424,67 +5566,65 @@ describe("CodexAdapterV2 post-settle continuation", () => {
     (terminated) => {
       const stillRunning = terminated === "still_running";
       const transcript = makeBackgroundStopTranscript(terminated);
-      return Effect.scoped(
-        Effect.gen(function* () {
-          const stopped = yield* Deferred.make<void>();
-          const harness = yield* makeCodexReplayHarness(transcript, (event) =>
-            event.type === "turn_item.updated" &&
-            event.turnItem.type === "command_execution" &&
-            event.turnItem.status === "interrupted"
-              ? Deferred.succeed(stopped, undefined)
-              : Effect.void,
-          );
-          const now = yield* DateTime.now;
-          yield* harness.runtime.startTurn(
-            makeCodexTestTurnInput({
-              threadId: harness.threadId,
+      return Effect.gen(function* () {
+        const stopped = yield* Deferred.make<void>();
+        const harness = yield* makeCodexReplayHarness(transcript, (event) =>
+          event.type === "turn_item.updated" &&
+          event.turnItem.type === "command_execution" &&
+          event.turnItem.status === "interrupted"
+            ? Deferred.succeed(stopped, undefined)
+            : Effect.void,
+        );
+        const now = yield* DateTime.now;
+        yield* harness.runtime.startTurn(
+          makeCodexTestTurnInput({
+            threadId: harness.threadId,
+            providerThread: harness.providerThread,
+            now,
+            attemptId: RunAttemptId.make("attempt-codex-bg-stop"),
+            text: BG_PROMPT,
+          }),
+        );
+        yield* harness.firstTerminal;
+        const terminal = harness.terminalEvents()[0]!;
+        assert.equal(terminal.status, "completed");
+        assert.isTrue(yield* harness.hasPendingBackgroundWork);
+        assert.isFalse(
+          yield* harness.runtime.hasPendingBackgroundWorkForThread!({
+            ...harness.providerThread,
+            id: ProviderThreadId.make("unrelated-provider-thread"),
+          }),
+        );
+        if (stillRunning) {
+          const failed = yield* harness.runtime
+            .interruptTurn({
               providerThread: harness.providerThread,
-              now,
-              attemptId: RunAttemptId.make("attempt-codex-bg-stop"),
-              text: BG_PROMPT,
-            }),
-          );
-          yield* harness.firstTerminal;
-          const terminal = harness.terminalEvents()[0]!;
-          assert.equal(terminal.status, "completed");
+              providerTurnId: terminal.providerTurnId,
+              requestRuntimeRestart: true,
+            })
+            .pipe(Effect.exit);
+          assert.equal(failed._tag, "Failure");
           assert.isTrue(yield* harness.hasPendingBackgroundWork);
-          assert.isFalse(
-            yield* harness.runtime.hasPendingBackgroundWorkForThread!({
-              ...harness.providerThread,
-              id: ProviderThreadId.make("unrelated-provider-thread"),
-            }),
-          );
-          if (stillRunning) {
-            const failed = yield* harness.runtime
-              .interruptTurn({
-                providerThread: harness.providerThread,
-                providerTurnId: terminal.providerTurnId,
-                requestRuntimeRestart: true,
-              })
-              .pipe(Effect.exit);
-            assert.equal(failed._tag, "Failure");
-            assert.isTrue(yield* harness.hasPendingBackgroundWork);
-          }
-          yield* harness.runtime.interruptTurn({
-            providerThread: harness.providerThread,
-            providerTurnId: stillRunning
-              ? ProviderTurnId.make("later-completed-turn")
-              : terminal.providerTurnId,
-            requestRuntimeRestart: true,
-          });
-          yield* Deferred.await(stopped);
-          assert.isFalse(yield* harness.hasPendingBackgroundWork);
-          assert.lengthOf(harness.terminalEvents(), 1);
-          assert.equal(harness.terminalEvents()[0]?.status, "completed");
-          assert.lengthOf(harness.continuationRequests, 0);
-        }).pipe(
-          Effect.provide(
-            Layer.mergeAll(
-              IdAllocator.layer,
-              McpProviderSessions.layer,
-              NodeServices.layer,
-              NodeCrypto.layer,
-            ),
+        }
+        yield* harness.runtime.interruptTurn({
+          providerThread: harness.providerThread,
+          providerTurnId: stillRunning
+            ? ProviderTurnId.make("later-completed-turn")
+            : terminal.providerTurnId,
+          requestRuntimeRestart: true,
+        });
+        yield* Deferred.await(stopped);
+        assert.isFalse(yield* harness.hasPendingBackgroundWork);
+        assert.lengthOf(harness.terminalEvents(), 1);
+        assert.equal(harness.terminalEvents()[0]?.status, "completed");
+        assert.lengthOf(harness.continuationRequests, 0);
+      }).pipe(
+        Effect.provide(
+          Layer.mergeAll(
+            IdAllocator.layer,
+            McpProviderSessions.layer,
+            NodeServices.layer,
+            NodeCrypto.layer,
           ),
         ),
       );
@@ -5492,246 +5632,242 @@ describe("CodexAdapterV2 post-settle continuation", () => {
   );
   it.effect("stops a completed run's background command without a client-supplied run", () => {
     const transcript = makeBackgroundStopTranscript(true);
-    return Effect.scoped(
-      Effect.gen(function* () {
-        const fs = yield* FileSystem.FileSystem;
-        const cwd = yield* fs.makeTempDirectoryScoped({ prefix: "t3-bg-stop-workspace-" });
-        const localTranscript = yield* decodeReplayTranscriptJson(
-          (yield* encodeReplayTranscriptJson(transcript)).replaceAll(
-            yield* encodeStringJson("/workspace"),
-            yield* encodeStringJson(cwd),
+    return Effect.gen(function* () {
+      const fs = yield* FileSystem.FileSystem;
+      const cwd = yield* fs.makeTempDirectoryScoped({ prefix: "t3-bg-stop-workspace-" });
+      const localTranscript = yield* decodeReplayTranscriptJson(
+        (yield* encodeReplayTranscriptJson(transcript)).replaceAll(
+          yield* encodeStringJson("/workspace"),
+          yield* encodeStringJson(cwd),
+        ),
+      );
+      const replayDriver = yield* CodexReplay.makeReplayDriver(withConfigReads(localTranscript));
+      const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
+      assert.equal(
+        Number(yield* spawner.exitCode(ChildProcess.make("git", ["init", "--quiet"], { cwd }))),
+        0,
+      );
+      assert.equal(
+        Number(
+          yield* spawner.exitCode(
+            ChildProcess.make(
+              "git",
+              [
+                "-c",
+                "user.name=Test",
+                "-c",
+                "user.email=test@example.com",
+                "commit",
+                "--allow-empty",
+                "--quiet",
+                "-m",
+                "Initial commit",
+              ],
+              { cwd },
+            ),
+          ),
+        ),
+        0,
+      );
+      yield* Effect.gen(function* () {
+        const orchestrator = yield* Orchestrator.OrchestratorV2;
+        const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
+        const threadId = ThreadId.make("thread:background-stop");
+        yield* orchestrator.dispatch({
+          type: "thread.create",
+          commandId: CommandId.make("create-background-stop"),
+          threadId,
+          projectId: ProjectId.make("project:background-stop"),
+          title: "Background stop",
+          modelSelection: CODEX_TEST_MODEL_SELECTION,
+          runtimeMode: "full-access",
+          interactionMode: "default",
+          branch: null,
+          worktreePath: cwd,
+          createdBy: "user",
+          creationSource: "web",
+        });
+        const waiting = yield* orchestrator.streamDomainEvents.pipe(
+          Stream.filter(
+            (event) => event.type === "run.updated" && event.payload.status === "waiting",
           ),
+          Stream.runHead,
+          Effect.forkChild({ startImmediately: true }),
         );
-        const replayDriver = yield* CodexReplay.makeReplayDriver(withConfigReads(localTranscript));
-        const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
+        yield* orchestrator.dispatch({
+          type: "message.dispatch",
+          commandId: CommandId.make("start-background-stop"),
+          threadId,
+          messageId: MessageId.make("message:background-stop"),
+          text: BG_PROMPT,
+          attachments: [],
+          createdBy: "user",
+          creationSource: "web",
+          dispatchMode: { type: "start_immediately" },
+        });
+        yield* worker.drain();
+        assert.isNull((yield* Ref.get(replayDriver.state)).failure);
+        yield* Fiber.join(waiting);
+        yield* worker.drain();
+        const projection = yield* orchestrator.getThreadProjection(threadId);
+        const run = projection.runs.at(-1)!;
+        assert.equal(run.status, "completed");
         assert.equal(
-          Number(yield* spawner.exitCode(ChildProcess.make("git", ["init", "--quiet"], { cwd }))),
-          0,
+          (yield* orchestrator.getThreadShell(threadId))?.pendingBackgroundTasks?.length,
+          1,
         );
-        assert.equal(
-          Number(
-            yield* spawner.exitCode(
-              ChildProcess.make(
-                "git",
-                [
-                  "-c",
-                  "user.name=Test",
-                  "-c",
-                  "user.email=test@example.com",
-                  "commit",
-                  "--allow-empty",
-                  "--quiet",
-                  "-m",
-                  "Initial commit",
-                ],
-                { cwd },
-              ),
-            ),
+        const stopped = yield* orchestrator.streamDomainEvents.pipe(
+          Stream.filter(
+            (event) =>
+              event.type === "turn-item.updated" &&
+              event.payload.type === "command_execution" &&
+              event.payload.status === "interrupted",
           ),
-          0,
+          Stream.runHead,
+          Effect.forkChild({ startImmediately: true }),
         );
-        yield* Effect.gen(function* () {
-          const orchestrator = yield* Orchestrator.OrchestratorV2;
-          const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
-          const threadId = ThreadId.make("thread:background-stop");
-          yield* orchestrator.dispatch({
-            type: "thread.create",
-            commandId: CommandId.make("create-background-stop"),
-            threadId,
-            projectId: ProjectId.make("project:background-stop"),
-            title: "Background stop",
-            modelSelection: CODEX_TEST_MODEL_SELECTION,
-            runtimeMode: "full-access",
-            interactionMode: "default",
-            branch: null,
-            worktreePath: cwd,
-            createdBy: "user",
-            creationSource: "web",
-          });
-          const waiting = yield* orchestrator.streamDomainEvents.pipe(
-            Stream.filter(
-              (event) => event.type === "run.updated" && event.payload.status === "waiting",
-            ),
-            Stream.runHead,
-            Effect.forkChild({ startImmediately: true }),
-          );
-          yield* orchestrator.dispatch({
-            type: "message.dispatch",
-            commandId: CommandId.make("start-background-stop"),
-            threadId,
-            messageId: MessageId.make("message:background-stop"),
-            text: BG_PROMPT,
-            attachments: [],
-            createdBy: "user",
-            creationSource: "web",
-            dispatchMode: { type: "start_immediately" },
-          });
-          yield* worker.drain();
-          assert.isNull((yield* Ref.get(replayDriver.state)).failure);
-          yield* Fiber.join(waiting);
-          yield* worker.drain();
-          const projection = yield* orchestrator.getThreadProjection(threadId);
-          const run = projection.runs.at(-1)!;
-          assert.equal(run.status, "completed");
-          assert.equal(
-            (yield* orchestrator.getThreadShell(threadId))?.pendingBackgroundTasks?.length,
-            1,
-          );
-          const stopped = yield* orchestrator.streamDomainEvents.pipe(
-            Stream.filter(
-              (event) =>
-                event.type === "turn-item.updated" &&
-                event.payload.type === "command_execution" &&
-                event.payload.status === "interrupted",
-            ),
-            Stream.runHead,
-            Effect.forkChild({ startImmediately: true }),
-          );
-          yield* orchestrator.dispatch({
-            type: "thread.stop",
-            commandId: CommandId.make("stop-background-command"),
-            threadId,
-          });
-          yield* worker.drain();
-          yield* Fiber.join(stopped);
-          assert.equal(
-            (yield* orchestrator.getThreadProjection(threadId)).runs.at(-1)?.status,
-            "completed",
-          );
-          assert.deepEqual(
-            (yield* orchestrator.getThreadShell(threadId))?.pendingBackgroundTasks,
-            [],
-          );
-        }).pipe(
-          Effect.provide(
-            ProviderReplayHarness.layerWithRegistry(
-              { name: "codex-background-stop", runtimePolicyOverride: { cwd } },
-              CodexAdapterV2Testkit.layer({
-                transcript: localTranscript,
-                driver: replayDriver,
-              }),
-              { runEffectWorker: false },
-            ),
-          ),
+        yield* orchestrator.dispatch({
+          type: "thread.stop",
+          commandId: CommandId.make("stop-background-command"),
+          threadId,
+        });
+        yield* worker.drain();
+        yield* Fiber.join(stopped);
+        assert.equal(
+          (yield* orchestrator.getThreadProjection(threadId)).runs.at(-1)?.status,
+          "completed",
         );
-      }).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
-    );
+        assert.deepEqual(
+          (yield* orchestrator.getThreadShell(threadId))?.pendingBackgroundTasks,
+          [],
+        );
+      }).pipe(
+        Effect.provide(
+          ProviderReplayHarness.layerWithRegistry(
+            { name: "codex-background-stop", runtimePolicyOverride: { cwd } },
+            CodexAdapterV2Testkit.layer({
+              transcript: localTranscript,
+              driver: replayDriver,
+            }),
+            { runEffectWorker: false },
+          ),
+        ),
+      );
+    }).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)));
   });
 
   it.effect("Stop ends a background command no Codex process tracks any more", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const fs = yield* FileSystem.FileSystem;
-        const cwd = yield* fs.makeTempDirectoryScoped({ prefix: "t3-bg-stale-workspace-" });
-        const staleTranscript = makeCodexReplayTranscript({
-          scenario: "codex-bg-stop-untracked",
-          entries: [
-            ...backgroundExecTranscript.entries.slice(0, -1),
-            { type: "runtime_exit", status: "success" },
-          ],
+    Effect.gen(function* () {
+      const fs = yield* FileSystem.FileSystem;
+      const cwd = yield* fs.makeTempDirectoryScoped({ prefix: "t3-bg-stale-workspace-" });
+      const staleTranscript = makeCodexReplayTranscript({
+        scenario: "codex-bg-stop-untracked",
+        entries: [
+          ...backgroundExecTranscript.entries.slice(0, -1),
+          { type: "runtime_exit", status: "success" },
+        ],
+      });
+      const localTranscript = yield* decodeReplayTranscriptJson(
+        (yield* encodeReplayTranscriptJson(staleTranscript)).replaceAll(
+          yield* encodeStringJson("/workspace"),
+          yield* encodeStringJson(cwd),
+        ),
+      );
+      const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
+      for (const args of [
+        ["init", "--quiet"],
+        [
+          "-c",
+          "user.name=Test",
+          "-c",
+          "user.email=test@example.com",
+          "commit",
+          "--allow-empty",
+          "--quiet",
+          "-m",
+          "Initial commit",
+        ],
+      ]) {
+        assert.equal(Number(yield* spawner.exitCode(ChildProcess.make("git", args, { cwd }))), 0);
+      }
+      yield* Effect.gen(function* () {
+        const orchestrator = yield* Orchestrator.OrchestratorV2;
+        const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
+        const threadId = ThreadId.make("thread:background-stop-untracked");
+        yield* orchestrator.dispatch({
+          type: "thread.create",
+          commandId: CommandId.make("create-background-stop-untracked"),
+          threadId,
+          projectId: ProjectId.make("project:background-stop-untracked"),
+          title: "Background stop untracked",
+          modelSelection: CODEX_TEST_MODEL_SELECTION,
+          runtimeMode: "full-access",
+          interactionMode: "default",
+          branch: null,
+          worktreePath: cwd,
+          createdBy: "user",
+          creationSource: "web",
         });
-        const localTranscript = yield* decodeReplayTranscriptJson(
-          (yield* encodeReplayTranscriptJson(staleTranscript)).replaceAll(
-            yield* encodeStringJson("/workspace"),
-            yield* encodeStringJson(cwd),
+        const settled = yield* orchestrator.streamDomainEvents.pipe(
+          Stream.filter(
+            (event) =>
+              event.type === "run.updated" &&
+              (event.payload.status === "waiting" || event.payload.status === "completed"),
           ),
+          Stream.runHead,
+          Effect.forkChild({ startImmediately: true }),
         );
-        const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
-        for (const args of [
-          ["init", "--quiet"],
-          [
-            "-c",
-            "user.name=Test",
-            "-c",
-            "user.email=test@example.com",
-            "commit",
-            "--allow-empty",
-            "--quiet",
-            "-m",
-            "Initial commit",
-          ],
-        ]) {
-          assert.equal(Number(yield* spawner.exitCode(ChildProcess.make("git", args, { cwd }))), 0);
-        }
-        yield* Effect.gen(function* () {
-          const orchestrator = yield* Orchestrator.OrchestratorV2;
-          const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
-          const threadId = ThreadId.make("thread:background-stop-untracked");
-          yield* orchestrator.dispatch({
-            type: "thread.create",
-            commandId: CommandId.make("create-background-stop-untracked"),
-            threadId,
-            projectId: ProjectId.make("project:background-stop-untracked"),
-            title: "Background stop untracked",
-            modelSelection: CODEX_TEST_MODEL_SELECTION,
-            runtimeMode: "full-access",
-            interactionMode: "default",
-            branch: null,
-            worktreePath: cwd,
-            createdBy: "user",
-            creationSource: "web",
-          });
-          const settled = yield* orchestrator.streamDomainEvents.pipe(
-            Stream.filter(
-              (event) =>
-                event.type === "run.updated" &&
-                (event.payload.status === "waiting" || event.payload.status === "completed"),
-            ),
-            Stream.runHead,
-            Effect.forkChild({ startImmediately: true }),
-          );
-          yield* orchestrator.dispatch({
-            type: "message.dispatch",
-            commandId: CommandId.make("start-background-stop-untracked"),
-            threadId,
-            messageId: MessageId.make("message:background-stop-untracked"),
-            text: BG_PROMPT,
-            attachments: [],
-            createdBy: "user",
-            creationSource: "web",
-            dispatchMode: { type: "start_immediately" },
-          });
-          yield* worker.drain();
-          yield* Fiber.join(settled);
-          yield* worker.drain();
-          const before = yield* orchestrator.getThreadShell(threadId);
-          assert.deepEqual(
-            before?.pendingBackgroundTasks?.map((task) => task.kind),
-            ["command"],
-            "the thread still shows the command the gone process never finished",
-          );
-          const run = (yield* orchestrator.getThreadProjection(threadId)).runs.at(-1)!;
-          yield* orchestrator.dispatch({
-            type: "run.interrupt",
-            commandId: CommandId.make("stop-background-untracked"),
-            threadId,
-            runId: run.id,
-            holdQueue: true,
-          });
-          yield* worker.drain();
-          const projection = yield* orchestrator.getThreadProjection(threadId);
-          assert.deepEqual(
-            projection.turnItems.flatMap((item) =>
-              item.type === "command_execution" ? [item.status] : [],
-            ),
-            ["interrupted"],
-          );
-          assert.equal(projection.runs.at(-1)?.status, "completed");
-          assert.deepEqual(
-            (yield* orchestrator.getThreadShell(threadId))?.pendingBackgroundTasks,
-            [],
-          );
-        }).pipe(
-          Effect.provide(
-            ProviderReplayHarness.layerWithRegistry(
-              { name: "codex-background-stop-untracked", runtimePolicyOverride: { cwd } },
-              CodexAdapterV2Testkit.layer({ transcript: withConfigReads(localTranscript) }),
-              { runEffectWorker: false },
-            ),
+        yield* orchestrator.dispatch({
+          type: "message.dispatch",
+          commandId: CommandId.make("start-background-stop-untracked"),
+          threadId,
+          messageId: MessageId.make("message:background-stop-untracked"),
+          text: BG_PROMPT,
+          attachments: [],
+          createdBy: "user",
+          creationSource: "web",
+          dispatchMode: { type: "start_immediately" },
+        });
+        yield* worker.drain();
+        yield* Fiber.join(settled);
+        yield* worker.drain();
+        const before = yield* orchestrator.getThreadShell(threadId);
+        assert.deepEqual(
+          before?.pendingBackgroundTasks?.map((task) => task.kind),
+          ["command"],
+          "the thread still shows the command the gone process never finished",
+        );
+        const run = (yield* orchestrator.getThreadProjection(threadId)).runs.at(-1)!;
+        yield* orchestrator.dispatch({
+          type: "run.interrupt",
+          commandId: CommandId.make("stop-background-untracked"),
+          threadId,
+          runId: run.id,
+          holdQueue: true,
+        });
+        yield* worker.drain();
+        const projection = yield* orchestrator.getThreadProjection(threadId);
+        assert.deepEqual(
+          projection.turnItems.flatMap((item) =>
+            item.type === "command_execution" ? [item.status] : [],
           ),
+          ["interrupted"],
         );
-      }).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
-    ),
+        assert.equal(projection.runs.at(-1)?.status, "completed");
+        assert.deepEqual(
+          (yield* orchestrator.getThreadShell(threadId))?.pendingBackgroundTasks,
+          [],
+        );
+      }).pipe(
+        Effect.provide(
+          ProviderReplayHarness.layerWithRegistry(
+            { name: "codex-background-stop-untracked", runtimePolicyOverride: { cwd } },
+            CodexAdapterV2Testkit.layer({ transcript: withConfigReads(localTranscript) }),
+            { runEffectWorker: false },
+          ),
+        ),
+      );
+    }).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
   );
 
   const INTERRUPT_SCENARIO = "codex-interrupt-mid-command";
@@ -5892,133 +6028,131 @@ describe("CodexAdapterV2 post-settle continuation", () => {
   });
 
   it.effect("contains commands that start before and after the interrupt response", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const harness = yield* makeCodexReplayHarness(interruptMidCommandTranscript);
-        const now = yield* DateTime.now;
+    Effect.gen(function* () {
+      const harness = yield* makeCodexReplayHarness(interruptMidCommandTranscript);
+      const now = yield* DateTime.now;
 
-        yield* harness.runtime.startTurn(
-          makeCodexTestTurnInput({
-            threadId: harness.threadId,
-            providerThread: harness.providerThread,
-            now,
-            attemptId: RunAttemptId.make("attempt-codex-interrupt-mid-command"),
-            text: INTERRUPT_PROMPT,
-          }),
-        );
+      yield* harness.runtime.startTurn(
+        makeCodexTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now,
+          attemptId: RunAttemptId.make("attempt-codex-interrupt-mid-command"),
+          text: INTERRUPT_PROMPT,
+        }),
+      );
 
-        yield* harness.until(() =>
-          harness.events.some(
-            (event) =>
-              event.type === "turn_item.updated" &&
-              event.turnItem.type === "command_execution" &&
-              event.turnItem.status === "running",
-          ),
-        );
+      yield* harness.until(() =>
+        harness.events.some(
+          (event) =>
+            event.type === "turn_item.updated" &&
+            event.turnItem.type === "command_execution" &&
+            event.turnItem.status === "running",
+        ),
+      );
 
-        const providerTurnId = harness.events.find(
-          (
-            event,
-          ): event is Extract<
-            ProviderAdapter.ProviderAdapterV2Event,
-            { type: "provider_turn.updated" }
-          > => event.type === "provider_turn.updated",
-        )?.providerTurn.id;
-        assert.isDefined(providerTurnId);
+      const providerTurnId = harness.events.find(
+        (
+          event,
+        ): event is Extract<
+          ProviderAdapter.ProviderAdapterV2Event,
+          { type: "provider_turn.updated" }
+        > => event.type === "provider_turn.updated",
+      )?.providerTurn.id;
+      assert.isDefined(providerTurnId);
+
+      yield* harness.runtime.interruptTurn({
+        providerThread: harness.providerThread,
+        providerTurnId,
+      });
 
-        yield* harness.runtime.interruptTurn({
-          providerThread: harness.providerThread,
-          providerTurnId,
-        });
+      yield* harness.awaitTerminal(1);
+      assert.equal(harness.terminalEvents()[0]?.status, "interrupted");
 
-        yield* harness.awaitTerminal(1);
-        assert.equal(harness.terminalEvents()[0]?.status, "interrupted");
+      const terminalIndex = harness.events.findIndex((event) => event.type === "turn.terminal");
+      assert.isAtLeast(terminalIndex, 0);
 
-        const terminalIndex = harness.events.findIndex((event) => event.type === "turn.terminal");
-        assert.isAtLeast(terminalIndex, 0);
-
-        let lastCommandBeforeTerminal:
-          | Extract<ProviderAdapter.ProviderAdapterV2Event, { type: "turn_item.updated" }>
-          | undefined;
-        for (let index = 0; index < terminalIndex; index++) {
-          const event = harness.events[index];
-          if (event?.type === "turn_item.updated" && event.turnItem.type === "command_execution") {
-            lastCommandBeforeTerminal = event;
-          }
+      let lastCommandBeforeTerminal:
+        | Extract<ProviderAdapter.ProviderAdapterV2Event, { type: "turn_item.updated" }>
+        | undefined;
+      for (let index = 0; index < terminalIndex; index++) {
+        const event = harness.events[index];
+        if (event?.type === "turn_item.updated" && event.turnItem.type === "command_execution") {
+          lastCommandBeforeTerminal = event;
         }
-        assert.isDefined(lastCommandBeforeTerminal);
-        assert.equal(lastCommandBeforeTerminal.turnItem.status, "interrupted");
-        assert.isNotNull(lastCommandBeforeTerminal.turnItem.completedAt);
+      }
+      assert.isDefined(lastCommandBeforeTerminal);
+      assert.equal(lastCommandBeforeTerminal.turnItem.status, "interrupted");
+      assert.isNotNull(lastCommandBeforeTerminal.turnItem.completedAt);
 
-        const interruptedCommandsBeforeTerminal = harness.events
-          .slice(0, terminalIndex)
-          .flatMap((event) =>
-            event.type === "turn_item.updated" &&
-            event.turnItem.type === "command_execution" &&
-            event.turnItem.status === "interrupted"
-              ? [event.turnItem.input]
-              : [],
-          )
-          .sort();
-        assert.deepEqual(
-          interruptedCommandsBeforeTerminal,
-          [INTERRUPT_COMMAND, INTERRUPT_COMMAND_TWO].sort(),
-        );
+      const interruptedCommandsBeforeTerminal = harness.events
+        .slice(0, terminalIndex)
+        .flatMap((event) =>
+          event.type === "turn_item.updated" &&
+          event.turnItem.type === "command_execution" &&
+          event.turnItem.status === "interrupted"
+            ? [event.turnItem.input]
+            : [],
+        )
+        .sort();
+      assert.deepEqual(
+        interruptedCommandsBeforeTerminal,
+        [INTERRUPT_COMMAND, INTERRUPT_COMMAND_TWO].sort(),
+      );
 
-        const interruptedCommandIndex = harness.events.findIndex(
-          (event, index) =>
-            index < terminalIndex &&
-            event.type === "turn_item.updated" &&
-            event.turnItem.type === "command_execution" &&
-            event.turnItem.status === "interrupted",
-        );
-        assert.isAbove(
-          terminalIndex,
-          interruptedCommandIndex,
-          "command terminalization must precede turn.terminal",
-        );
+      const interruptedCommandIndex = harness.events.findIndex(
+        (event, index) =>
+          index < terminalIndex &&
+          event.type === "turn_item.updated" &&
+          event.turnItem.type === "command_execution" &&
+          event.turnItem.status === "interrupted",
+      );
+      assert.isAbove(
+        terminalIndex,
+        interruptedCommandIndex,
+        "command terminalization must precede turn.terminal",
+      );
 
-        assert.isFalse(yield* harness.hasPendingBackgroundWork);
-        assert.lengthOf(harness.continuationRequests, 0);
+      assert.isFalse(yield* harness.hasPendingBackgroundWork);
+      assert.lengthOf(harness.continuationRequests, 0);
 
-        yield* TestClock.adjust("30 seconds");
-        for (let attempt = 0; attempt < 100; attempt++) {
-          yield* Effect.yieldNow;
-        }
-        assert.lengthOf(harness.continuationRequests, 0);
-        assert.isFalse(yield* harness.hasPendingBackgroundWork);
-        assert.lengthOf(harness.terminalEvents(), 1);
+      yield* TestClock.adjust("30 seconds");
+      for (let attempt = 0; attempt < 100; attempt++) {
+        yield* Effect.yieldNow;
+      }
+      assert.lengthOf(harness.continuationRequests, 0);
+      assert.isFalse(yield* harness.hasPendingBackgroundWork);
+      assert.lengthOf(harness.terminalEvents(), 1);
 
-        const postTerminalCommandUpdates = harness.events.filter(
-          (event, index) =>
-            index > terminalIndex &&
-            event.type === "turn_item.updated" &&
-            event.turnItem.type === "command_execution",
-        );
-        assert.lengthOf(
-          postTerminalCommandUpdates,
-          0,
-          "late item/completed after interrupt must not project",
-        );
+      const postTerminalCommandUpdates = harness.events.filter(
+        (event, index) =>
+          index > terminalIndex &&
+          event.type === "turn_item.updated" &&
+          event.turnItem.type === "command_execution",
+      );
+      assert.lengthOf(
+        postTerminalCommandUpdates,
+        0,
+        "late item/completed after interrupt must not project",
+      );
 
-        const commandUpdates = harness.events.filter(
-          (
-            event,
-          ): event is Extract<
-            ProviderAdapter.ProviderAdapterV2Event,
-            { type: "turn_item.updated" }
-          > => event.type === "turn_item.updated" && event.turnItem.type === "command_execution",
-        );
-        assert.isAtLeast(commandUpdates.length, 2, "start + interrupt terminalization");
-        assert.equal(commandUpdates[commandUpdates.length - 1]?.turnItem.status, "interrupted");
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
-          ),
+      const commandUpdates = harness.events.filter(
+        (
+          event,
+        ): event is Extract<
+          ProviderAdapter.ProviderAdapterV2Event,
+          { type: "turn_item.updated" }
+        > => event.type === "turn_item.updated" && event.turnItem.type === "command_execution",
+      );
+      assert.isAtLeast(commandUpdates.length, 2, "start + interrupt terminalization");
+      assert.equal(commandUpdates[commandUpdates.length - 1]?.turnItem.status, "interrupted");
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
         ),
       ),
     ),
@@ -6183,83 +6317,81 @@ describe("CodexAdapterV2 post-settle continuation", () => {
       childProviderTurnIndex,
       "child provider turn must terminalize before the root run",
     );
-    assert.isAbove(
-      terminalIndex,
-      childProviderThreadIndex,
-      "child provider thread must become idle before the root run",
-    );
-  };
-
-  it.effect("contains descendant commands and keeps Stop authoritative", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const harness = yield* makeCodexReplayHarness(interruptSubagentCommandTranscript);
-        const now = yield* DateTime.now;
-
-        yield* harness.runtime.startTurn(
-          makeCodexTestTurnInput({
-            threadId: harness.threadId,
-            providerThread: harness.providerThread,
-            now,
-            attemptId: RunAttemptId.make("attempt-codex-interrupt-subagent-command"),
-            text: INTERRUPT_PROMPT,
-          }),
-        );
-        yield* harness.until(() =>
-          harness.events.some(
-            (event) =>
-              event.type === "turn_item.updated" &&
-              event.turnItem.type === "command_execution" &&
-              event.turnItem.nativeItemRef?.nativeId === INTERRUPT_CHILD_COMMAND_ITEM &&
-              event.turnItem.status === "running",
-          ),
-        );
-        const providerTurnId = harness.events.find(
-          (
-            event,
-          ): event is Extract<
-            ProviderAdapter.ProviderAdapterV2Event,
-            { type: "provider_turn.updated" }
-          > => event.type === "provider_turn.updated" && event.threadId === harness.threadId,
-        )?.providerTurn.id;
-        assert.isDefined(providerTurnId);
+    assert.isAbove(
+      terminalIndex,
+      childProviderThreadIndex,
+      "child provider thread must become idle before the root run",
+    );
+  };
 
-        yield* harness.runtime.interruptTurn({
-          providerThread: harness.providerThread,
-          providerTurnId,
-        });
+  it.effect("contains descendant commands and keeps Stop authoritative", () =>
+    Effect.gen(function* () {
+      const harness = yield* makeCodexReplayHarness(interruptSubagentCommandTranscript);
+      const now = yield* DateTime.now;
 
-        yield* harness.awaitTerminal(1);
-        assert.equal(harness.terminalEvents()[0]?.status, "interrupted");
-        const childCommandUpdates = harness.events.filter(
-          (
-            event,
-          ): event is Extract<
-            ProviderAdapter.ProviderAdapterV2Event,
-            { type: "turn_item.updated" }
-          > =>
+      yield* harness.runtime.startTurn(
+        makeCodexTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now,
+          attemptId: RunAttemptId.make("attempt-codex-interrupt-subagent-command"),
+          text: INTERRUPT_PROMPT,
+        }),
+      );
+      yield* harness.until(() =>
+        harness.events.some(
+          (event) =>
             event.type === "turn_item.updated" &&
             event.turnItem.type === "command_execution" &&
-            event.turnItem.nativeItemRef?.nativeId === INTERRUPT_CHILD_COMMAND_ITEM,
-        );
-        assert.equal(childCommandUpdates.at(-1)?.turnItem.status, "interrupted");
-        assert.equal(harness.subagentUpdates().at(-1)?.subagent.status, "interrupted");
-        assert.isDefined(
-          harness
-            .subagentUpdates()
-            .find((event) => event.subagent.status === "running" && event.subagent.progress),
-          "a running native subagent reports its child's current command as progress",
-        );
-        assertChildProviderTerminalBeforeRoot(harness.events, harness.threadId);
-        assert.isFalse(yield* harness.hasPendingBackgroundWork);
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
-          ),
+            event.turnItem.nativeItemRef?.nativeId === INTERRUPT_CHILD_COMMAND_ITEM &&
+            event.turnItem.status === "running",
+        ),
+      );
+      const providerTurnId = harness.events.find(
+        (
+          event,
+        ): event is Extract<
+          ProviderAdapter.ProviderAdapterV2Event,
+          { type: "provider_turn.updated" }
+        > => event.type === "provider_turn.updated" && event.threadId === harness.threadId,
+      )?.providerTurn.id;
+      assert.isDefined(providerTurnId);
+
+      yield* harness.runtime.interruptTurn({
+        providerThread: harness.providerThread,
+        providerTurnId,
+      });
+
+      yield* harness.awaitTerminal(1);
+      assert.equal(harness.terminalEvents()[0]?.status, "interrupted");
+      const childCommandUpdates = harness.events.filter(
+        (
+          event,
+        ): event is Extract<
+          ProviderAdapter.ProviderAdapterV2Event,
+          { type: "turn_item.updated" }
+        > =>
+          event.type === "turn_item.updated" &&
+          event.turnItem.type === "command_execution" &&
+          event.turnItem.nativeItemRef?.nativeId === INTERRUPT_CHILD_COMMAND_ITEM,
+      );
+      assert.equal(childCommandUpdates.at(-1)?.turnItem.status, "interrupted");
+      assert.equal(harness.subagentUpdates().at(-1)?.subagent.status, "interrupted");
+      assert.isDefined(
+        harness
+          .subagentUpdates()
+          .find((event) => event.subagent.status === "running" && event.subagent.progress),
+        "a running native subagent reports its child's current command as progress",
+      );
+      assertChildProviderTerminalBeforeRoot(harness.events, harness.threadId);
+      assert.isFalse(yield* harness.hasPendingBackgroundWork);
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
         ),
       ),
     ),
@@ -6309,73 +6441,71 @@ describe("CodexAdapterV2 post-settle continuation", () => {
   });
 
   it.effect("interrupts descendants that start after the initial Stop snapshot", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const harness = yield* makeCodexReplayHarness(interruptLateSubagentTurnTranscript);
-        const now = yield* DateTime.now;
-
-        yield* harness.runtime.startTurn(
-          makeCodexTestTurnInput({
-            threadId: harness.threadId,
-            providerThread: harness.providerThread,
-            now,
-            attemptId: RunAttemptId.make("attempt-codex-interrupt-late-subagent-turn"),
-            text: INTERRUPT_PROMPT,
-          }),
-        );
-        yield* harness.until(() =>
-          harness.events.some(
-            (event) =>
-              event.type === "turn_item.updated" &&
-              event.turnItem.type === "command_execution" &&
-              event.turnItem.nativeItemRef?.nativeId === INTERRUPT_CHILD_COMMAND_ITEM &&
-              event.turnItem.status === "running",
-          ),
-        );
-        const providerTurnId = harness.events.find(
-          (
-            event,
-          ): event is Extract<
-            ProviderAdapter.ProviderAdapterV2Event,
-            { type: "provider_turn.updated" }
-          > => event.type === "provider_turn.updated" && event.threadId === harness.threadId,
-        )?.providerTurn.id;
-        assert.isDefined(providerTurnId);
-
-        const interruptFiber = yield* harness.runtime
-          .interruptTurn({ providerThread: harness.providerThread, providerTurnId })
-          .pipe(Effect.forkScoped);
-        yield* harness.until(() =>
-          harness.events.some(
-            (event) =>
-              event.type === "provider_turn.updated" &&
-              event.providerTurn.nativeTurnRef?.nativeId === INTERRUPT_LATE_CHILD_NATIVE_TURN,
-          ),
-        );
-        yield* Fiber.join(interruptFiber);
+    Effect.gen(function* () {
+      const harness = yield* makeCodexReplayHarness(interruptLateSubagentTurnTranscript);
+      const now = yield* DateTime.now;
 
-        yield* harness.awaitTerminal(1);
-        const lateChildUpdates = harness.events.filter(
-          (
-            event,
-          ): event is Extract<
-            ProviderAdapter.ProviderAdapterV2Event,
-            { type: "provider_turn.updated" }
-          > =>
+      yield* harness.runtime.startTurn(
+        makeCodexTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now,
+          attemptId: RunAttemptId.make("attempt-codex-interrupt-late-subagent-turn"),
+          text: INTERRUPT_PROMPT,
+        }),
+      );
+      yield* harness.until(() =>
+        harness.events.some(
+          (event) =>
+            event.type === "turn_item.updated" &&
+            event.turnItem.type === "command_execution" &&
+            event.turnItem.nativeItemRef?.nativeId === INTERRUPT_CHILD_COMMAND_ITEM &&
+            event.turnItem.status === "running",
+        ),
+      );
+      const providerTurnId = harness.events.find(
+        (
+          event,
+        ): event is Extract<
+          ProviderAdapter.ProviderAdapterV2Event,
+          { type: "provider_turn.updated" }
+        > => event.type === "provider_turn.updated" && event.threadId === harness.threadId,
+      )?.providerTurn.id;
+      assert.isDefined(providerTurnId);
+
+      const interruptFiber = yield* harness.runtime
+        .interruptTurn({ providerThread: harness.providerThread, providerTurnId })
+        .pipe(Effect.forkScoped);
+      yield* harness.until(() =>
+        harness.events.some(
+          (event) =>
             event.type === "provider_turn.updated" &&
             event.providerTurn.nativeTurnRef?.nativeId === INTERRUPT_LATE_CHILD_NATIVE_TURN,
-        );
-        assert.equal(lateChildUpdates.at(-1)?.providerTurn.status, "interrupted");
-        assertChildProviderTerminalBeforeRoot(harness.events, harness.threadId);
-        assert.isFalse(yield* harness.hasPendingBackgroundWork);
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
-          ),
+        ),
+      );
+      yield* Fiber.join(interruptFiber);
+
+      yield* harness.awaitTerminal(1);
+      const lateChildUpdates = harness.events.filter(
+        (
+          event,
+        ): event is Extract<
+          ProviderAdapter.ProviderAdapterV2Event,
+          { type: "provider_turn.updated" }
+        > =>
+          event.type === "provider_turn.updated" &&
+          event.providerTurn.nativeTurnRef?.nativeId === INTERRUPT_LATE_CHILD_NATIVE_TURN,
+      );
+      assert.equal(lateChildUpdates.at(-1)?.providerTurn.status, "interrupted");
+      assertChildProviderTerminalBeforeRoot(harness.events, harness.threadId);
+      assert.isFalse(yield* harness.hasPendingBackgroundWork);
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
         ),
       ),
     ),
@@ -6444,69 +6574,67 @@ describe("CodexAdapterV2 post-settle continuation", () => {
   it.effect(
     "keeps reading notifications while interrupting a child turn that starts after Stop",
     () =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const harness = yield* makeCodexReplayHarness(interruptSubagentTurnAfterStopTranscript);
-          const now = yield* DateTime.now;
-
-          yield* harness.runtime.startTurn(
-            makeCodexTestTurnInput({
-              threadId: harness.threadId,
-              providerThread: harness.providerThread,
-              now,
-              attemptId: RunAttemptId.make("attempt-codex-interrupt-subagent-turn-after-stop"),
-              text: INTERRUPT_PROMPT,
-            }),
-          );
-          yield* harness.until(() =>
-            harness.events.some(
-              (event) =>
-                event.type === "turn_item.updated" &&
-                event.turnItem.type === "command_execution" &&
-                event.turnItem.nativeItemRef?.nativeId === INTERRUPT_CHILD_COMMAND_ITEM &&
-                event.turnItem.status === "running",
-            ),
-          );
-          const providerTurnId = harness.events.find(
-            (
-              event,
-            ): event is Extract<
-              ProviderAdapter.ProviderAdapterV2Event,
-              { type: "provider_turn.updated" }
-            > => event.type === "provider_turn.updated" && event.threadId === harness.threadId,
-          )?.providerTurn.id;
-          assert.isDefined(providerTurnId);
+      Effect.gen(function* () {
+        const harness = yield* makeCodexReplayHarness(interruptSubagentTurnAfterStopTranscript);
+        const now = yield* DateTime.now;
 
-          yield* harness.runtime.interruptTurn({
+        yield* harness.runtime.startTurn(
+          makeCodexTestTurnInput({
+            threadId: harness.threadId,
             providerThread: harness.providerThread,
-            providerTurnId,
-          });
-          yield* harness.awaitTerminal(1);
+            now,
+            attemptId: RunAttemptId.make("attempt-codex-interrupt-subagent-turn-after-stop"),
+            text: INTERRUPT_PROMPT,
+          }),
+        );
+        yield* harness.until(() =>
+          harness.events.some(
+            (event) =>
+              event.type === "turn_item.updated" &&
+              event.turnItem.type === "command_execution" &&
+              event.turnItem.nativeItemRef?.nativeId === INTERRUPT_CHILD_COMMAND_ITEM &&
+              event.turnItem.status === "running",
+          ),
+        );
+        const providerTurnId = harness.events.find(
+          (
+            event,
+          ): event is Extract<
+            ProviderAdapter.ProviderAdapterV2Event,
+            { type: "provider_turn.updated" }
+          > => event.type === "provider_turn.updated" && event.threadId === harness.threadId,
+        )?.providerTurn.id;
+        assert.isDefined(providerTurnId);
 
-          // The TestClock never reaches the interrupt's timeout, so this arrives only
-          // if the reader is free to read the interrupt response and the frame after it.
-          yield* harness.until(() =>
-            harness.events.some(
-              (event) =>
-                event.type === "provider_thread.updated" &&
-                event.providerThread.goal?.status === "paused",
-            ),
-          );
-          assert.isFalse(
-            harness.events.some(
-              (event) =>
-                event.type === "provider_turn.updated" &&
-                event.providerTurn.nativeTurnRef?.nativeId === INTERRUPT_LATE_CHILD_NATIVE_TURN,
-            ),
-          );
-        }).pipe(
-          Effect.provide(
-            Layer.mergeAll(
-              IdAllocator.layer,
-              McpProviderSessions.layer,
-              NodeServices.layer,
-              NodeCrypto.layer,
-            ),
+        yield* harness.runtime.interruptTurn({
+          providerThread: harness.providerThread,
+          providerTurnId,
+        });
+        yield* harness.awaitTerminal(1);
+
+        // The TestClock never reaches the interrupt's timeout, so this arrives only
+        // if the reader is free to read the interrupt response and the frame after it.
+        yield* harness.until(() =>
+          harness.events.some(
+            (event) =>
+              event.type === "provider_thread.updated" &&
+              event.providerThread.goal?.status === "paused",
+          ),
+        );
+        assert.isFalse(
+          harness.events.some(
+            (event) =>
+              event.type === "provider_turn.updated" &&
+              event.providerTurn.nativeTurnRef?.nativeId === INTERRUPT_LATE_CHILD_NATIVE_TURN,
+          ),
+        );
+      }).pipe(
+        Effect.provide(
+          Layer.mergeAll(
+            IdAllocator.layer,
+            McpProviderSessions.layer,
+            NodeServices.layer,
+            NodeCrypto.layer,
           ),
         ),
       ),
@@ -6609,311 +6737,309 @@ describe("CodexAdapterV2 post-settle continuation", () => {
       expectedClass: "transport_error",
     },
   ] as const)("classifies Codex terminal failures from $name evidence", (scenario) =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const nativeThreadId = `native-limit-${scenario.name}`;
-        const nativeTurnId = `turn-limit-${scenario.name}`;
-        const message = "message" in scenario ? scenario.message : "Provider stopped this request.";
-        const errorInfo = "errorInfo" in scenario ? scenario.errorInfo : scenario.code;
-        const resetAt = "2033-05-19T07:20:00.000Z";
-        const snapshot = {
-          type: "emit_inbound" as const,
-          label: "account/rateLimits/updated",
-          frame: {
-            method: "account/rateLimits/updated",
-            params: {
-              rateLimits: {
-                limitId: "codex",
-                primary: { usedPercent: 100, resetsAt: 2000100000, windowDurationMins: 300 },
-              },
-            },
-          },
-        };
-        const readsReset =
-          scenario.name === "first-request-reset" || scenario.name === "newer-reset-during-read";
-        // Usage limits with no known reset read the account before publishing their terminal.
-        const readsAccount =
-          scenario.expectedClass === "usage_limit" &&
-          !("expectedCode" in scenario) &&
-          scenario.name !== "deferred-reset";
-        const premium = {
-          ...snapshot,
-          frame: {
-            method: "account/rateLimits/updated",
-            params: { rateLimits: { limitId: "premium", primary: null, secondary: null } },
-          },
-        };
-        const newerSnapshot = {
-          ...snapshot,
-          frame: {
-            method: "account/rateLimits/updated",
-            params: {
-              rateLimits: {
-                limitId: "codex",
-                primary: { usedPercent: 100, resetsAt: 2000200000, windowDurationMins: 300 },
-              },
+    Effect.gen(function* () {
+      const nativeThreadId = `native-limit-${scenario.name}`;
+      const nativeTurnId = `turn-limit-${scenario.name}`;
+      const message = "message" in scenario ? scenario.message : "Provider stopped this request.";
+      const errorInfo = "errorInfo" in scenario ? scenario.errorInfo : scenario.code;
+      const resetAt = "2033-05-19T07:20:00.000Z";
+      const snapshot = {
+        type: "emit_inbound" as const,
+        label: "account/rateLimits/updated",
+        frame: {
+          method: "account/rateLimits/updated",
+          params: {
+            rateLimits: {
+              limitId: "codex",
+              primary: { usedPercent: 100, resetsAt: 2000100000, windowDurationMins: 300 },
             },
           },
-        };
-        const readRequest = {
-          type: "expect_outbound" as const,
-          label: "account/rateLimits/read",
-          frame: { id: 4, method: "account/rateLimits/read", params: null },
-        };
-        const transcript = makeCodexReplayTranscript({
-          scenario: `codex-limit-${scenario.name}`,
-          entries: [
-            ...codexReplayPreamble({ nativeThreadId, nativeTurnId, prompt: "Continue." }),
-            ...("usedBefore" in scenario
-              ? [
-                  {
-                    ...snapshot,
-                    frame: {
-                      method: "account/rateLimits/updated",
-                      params: {
-                        rateLimits: {
-                          limitId: "codex",
-                          primary: {
-                            usedPercent: scenario.usedBefore,
-                            resetsAt: 2000100000,
-                            windowDurationMins: 300,
-                          },
+        },
+      };
+      const readsReset =
+        scenario.name === "first-request-reset" || scenario.name === "newer-reset-during-read";
+      // Usage limits with no known reset read the account before publishing their terminal.
+      const readsAccount =
+        scenario.expectedClass === "usage_limit" &&
+        !("expectedCode" in scenario) &&
+        scenario.name !== "deferred-reset";
+      const premium = {
+        ...snapshot,
+        frame: {
+          method: "account/rateLimits/updated",
+          params: { rateLimits: { limitId: "premium", primary: null, secondary: null } },
+        },
+      };
+      const newerSnapshot = {
+        ...snapshot,
+        frame: {
+          method: "account/rateLimits/updated",
+          params: {
+            rateLimits: {
+              limitId: "codex",
+              primary: { usedPercent: 100, resetsAt: 2000200000, windowDurationMins: 300 },
+            },
+          },
+        },
+      };
+      const readRequest = {
+        type: "expect_outbound" as const,
+        label: "account/rateLimits/read",
+        frame: { id: 4, method: "account/rateLimits/read", params: null },
+      };
+      const transcript = makeCodexReplayTranscript({
+        scenario: `codex-limit-${scenario.name}`,
+        entries: [
+          ...codexReplayPreamble({ nativeThreadId, nativeTurnId, prompt: "Continue." }),
+          ...("usedBefore" in scenario
+            ? [
+                {
+                  ...snapshot,
+                  frame: {
+                    method: "account/rateLimits/updated",
+                    params: {
+                      rateLimits: {
+                        limitId: "codex",
+                        primary: {
+                          usedPercent: scenario.usedBefore,
+                          resetsAt: 2000100000,
+                          windowDurationMins: 300,
                         },
                       },
                     },
                   },
-                ]
-              : []),
-            ...(readsReset ? [premium] : []),
-            ...(scenario.name === "deferred-reset" ? [snapshot] : []),
-            ...(scenario.name === "deferred-reset"
-              ? [
-                  {
-                    type: "emit_inbound" as const,
-                    label: "item/completed/subAgentActivity-started",
-                    frame: {
-                      method: "item/completed",
-                      params: {
-                        threadId: nativeThreadId,
-                        turnId: nativeTurnId,
-                        item: {
-                          type: "subAgentActivity",
-                          id: "limit-child-spawn",
-                          kind: "started",
-                          agentThreadId: "native-limit-child",
-                          agentPath: "/root/limit_child",
-                        },
+                },
+              ]
+            : []),
+          ...(readsReset ? [premium] : []),
+          ...(scenario.name === "deferred-reset" ? [snapshot] : []),
+          ...(scenario.name === "deferred-reset"
+            ? [
+                {
+                  type: "emit_inbound" as const,
+                  label: "item/completed/subAgentActivity-started",
+                  frame: {
+                    method: "item/completed",
+                    params: {
+                      threadId: nativeThreadId,
+                      turnId: nativeTurnId,
+                      item: {
+                        type: "subAgentActivity",
+                        id: "limit-child-spawn",
+                        kind: "started",
+                        agentThreadId: "native-limit-child",
+                        agentPath: "/root/limit_child",
                       },
                     },
                   },
-                  {
-                    type: "emit_inbound" as const,
-                    label: "turn/started/child",
-                    frame: {
-                      method: "turn/started",
-                      params: {
-                        threadId: "native-limit-child",
-                        turn: makeCodexReplayTurn({
-                          id: "limit-child-turn",
-                          status: "inProgress",
-                        }),
-                      },
+                },
+                {
+                  type: "emit_inbound" as const,
+                  label: "turn/started/child",
+                  frame: {
+                    method: "turn/started",
+                    params: {
+                      threadId: "native-limit-child",
+                      turn: makeCodexReplayTurn({
+                        id: "limit-child-turn",
+                        status: "inProgress",
+                      }),
                     },
                   },
-                ]
-              : []),
-            ...(scenario.notification
-              ? [
-                  {
-                    type: "emit_inbound" as const,
-                    label: "error",
-                    frame: {
-                      method: "error",
-                      params: {
-                        threadId: nativeThreadId,
-                        turnId: nativeTurnId,
-                        willRetry: scenario.name === "retry" || "willRetry" in scenario,
-                        error: {
-                          message,
-                          codexErrorInfo: errorInfo,
-                          additionalDetails:
-                            "details" in scenario
-                              ? scenario.details
-                              : scenario.name === "matching-details"
-                                ? "Detailed provider allowance explanation."
-                                : null,
-                        },
+                },
+              ]
+            : []),
+          ...(scenario.notification
+            ? [
+                {
+                  type: "emit_inbound" as const,
+                  label: "error",
+                  frame: {
+                    method: "error",
+                    params: {
+                      threadId: nativeThreadId,
+                      turnId: nativeTurnId,
+                      willRetry: scenario.name === "retry" || "willRetry" in scenario,
+                      error: {
+                        message,
+                        codexErrorInfo: errorInfo,
+                        additionalDetails:
+                          "details" in scenario
+                            ? scenario.details
+                            : scenario.name === "matching-details"
+                              ? "Detailed provider allowance explanation."
+                              : null,
                       },
                     },
                   },
-                ]
-              : []),
-            {
-              type: "emit_inbound",
-              label: "turn/completed",
-              frame: {
-                method: "turn/completed",
-                params: {
-                  threadId: nativeThreadId,
-                  turn: {
-                    ...makeCodexReplayTurn({ id: nativeTurnId, status: "failed" }),
-                    error: {
-                      message: scenario.name === "replacement" ? "A different failure." : message,
-                      ...(scenario.notification &&
-                      scenario.name !== "matching-details" &&
-                      !("details" in scenario)
-                        ? {}
-                        : { codexErrorInfo: errorInfo }),
-                    },
+                },
+              ]
+            : []),
+          {
+            type: "emit_inbound",
+            label: "turn/completed",
+            frame: {
+              method: "turn/completed",
+              params: {
+                threadId: nativeThreadId,
+                turn: {
+                  ...makeCodexReplayTurn({ id: nativeTurnId, status: "failed" }),
+                  error: {
+                    message: scenario.name === "replacement" ? "A different failure." : message,
+                    ...(scenario.notification &&
+                    scenario.name !== "matching-details" &&
+                    !("details" in scenario)
+                      ? {}
+                      : { codexErrorInfo: errorInfo }),
                   },
                 },
               },
             },
-            ...(readsAccount ? [readRequest] : []),
-            ...(scenario.name === "newer-reset-during-read" ? [newerSnapshot] : []),
-            ...(readsReset
-              ? [
-                  {
-                    type: "emit_inbound" as const,
-                    label: "account/rateLimits/read",
-                    frame: {
-                      id: 4,
-                      result: {
-                        ...premium.frame.params,
-                        rateLimitsByLimitId: { codex: snapshot.frame.params.rateLimits },
-                      },
+          },
+          ...(readsAccount ? [readRequest] : []),
+          ...(scenario.name === "newer-reset-during-read" ? [newerSnapshot] : []),
+          ...(readsReset
+            ? [
+                {
+                  type: "emit_inbound" as const,
+                  label: "account/rateLimits/read",
+                  frame: {
+                    id: 4,
+                    result: {
+                      ...premium.frame.params,
+                      rateLimitsByLimitId: { codex: snapshot.frame.params.rateLimits },
                     },
                   },
-                ]
-              : []),
-            ...(readsAccount && !readsReset
-              ? [
-                  {
-                    type: "emit_inbound" as const,
-                    label: "account/rateLimits/read",
-                    frame: { id: 4, error: { code: -32600, message: "Not signed in." } },
-                  },
-                ]
-              : []),
-            ...(scenario.name === "late-reset"
-              ? [{ ...snapshot, label: "account/rateLimits/updated/late" }]
-              : []),
-            ...("resetAfter" in scenario ? [snapshot] : []),
-            ...(scenario.name === "deferred-reset"
-              ? [
-                  {
-                    ...snapshot,
-                    frame: {
-                      method: "account/rateLimits/updated",
-                      params: {
-                        rateLimits: {
-                          limitId: "codex",
-                          primary: {
-                            usedPercent: 100,
-                            resetsAt: 2000200000,
-                            windowDurationMins: 300,
-                          },
+                },
+              ]
+            : []),
+          ...(readsAccount && !readsReset
+            ? [
+                {
+                  type: "emit_inbound" as const,
+                  label: "account/rateLimits/read",
+                  frame: { id: 4, error: { code: -32600, message: "Not signed in." } },
+                },
+              ]
+            : []),
+          ...(scenario.name === "late-reset"
+            ? [{ ...snapshot, label: "account/rateLimits/updated/late" }]
+            : []),
+          ...("resetAfter" in scenario ? [snapshot] : []),
+          ...(scenario.name === "deferred-reset"
+            ? [
+                {
+                  ...snapshot,
+                  frame: {
+                    method: "account/rateLimits/updated",
+                    params: {
+                      rateLimits: {
+                        limitId: "codex",
+                        primary: {
+                          usedPercent: 100,
+                          resetsAt: 2000200000,
+                          windowDurationMins: 300,
                         },
                       },
                     },
                   },
-                  {
-                    type: "emit_inbound" as const,
-                    label: "turn/completed/child",
-                    frame: {
-                      method: "turn/completed",
-                      params: {
-                        threadId: "native-limit-child",
-                        turn: makeCodexReplayTurn({
-                          id: "limit-child-turn",
-                          status: "completed",
-                        }),
-                      },
+                },
+                {
+                  type: "emit_inbound" as const,
+                  label: "turn/completed/child",
+                  frame: {
+                    method: "turn/completed",
+                    params: {
+                      threadId: "native-limit-child",
+                      turn: makeCodexReplayTurn({
+                        id: "limit-child-turn",
+                        status: "completed",
+                      }),
                     },
                   },
-                ]
-              : []),
-          ],
-        });
-        const resetReceipt = yield* Deferred.make<void>();
-        const snapshotReceipt = yield* Deferred.make<void>();
-        const terminalReceipt = yield* Deferred.make<void>();
-        const harness = yield* makeCodexReplayHarness(
-          transcript,
-          (event) =>
-            event.type === "turn.terminal"
-              ? Deferred.succeed(terminalReceipt, undefined)
-              : event.type === "turn_item.updated" &&
-                  event.turnItem.type === "error" &&
-                  event.turnItem.failure.resetAt === resetAt
-                ? Deferred.succeed(resetReceipt, undefined)
-                : Effect.void,
-          undefined,
-          undefined,
-          // The late reset must land after the terminal its failed read released.
-          (entry) =>
-            entry.label === "account/rateLimits/updated/late"
-              ? Deferred.await(terminalReceipt)
-              : Effect.void,
-          () => Deferred.succeed(snapshotReceipt, undefined),
-        );
-        yield* harness.runtime.startTurn(
-          makeCodexTestTurnInput({
-            threadId: harness.threadId,
-            providerThread: harness.providerThread,
-            now: yield* DateTime.now,
-            text: "Continue.",
-            attemptId: RunAttemptId.make(`attempt-limit-${scenario.name}`),
-          }),
-        );
-        yield* harness.firstTerminal;
-        const terminal = harness.terminalEvents()[0];
-        assert.equal(terminal?.status, "failed");
-        if (terminal?.status !== "failed") return;
-        assert.equal(terminal.failure.class, scenario.expectedClass);
-        assert.equal(terminal.threadDisposition, "reusable");
-        if (scenario.name === "deferred-reset" || scenario.name === "first-request-reset")
-          assert.equal(terminal.failure.resetAt, resetAt);
-        if (scenario.name === "newer-reset-during-read")
-          assert.equal(terminal.failure.resetAt, "2033-05-20T11:06:40.000Z");
-        if (scenario.name === "matching-details")
-          assert.equal(terminal.failure.message, "Detailed provider allowance explanation.");
-        if ("resetAfter" in scenario) {
-          yield* Deferred.await(snapshotReceipt);
-          assert.isFalse(
-            harness.events.some(
-              (event) =>
-                event.type === "turn_item.updated" &&
+                },
+              ]
+            : []),
+        ],
+      });
+      const resetReceipt = yield* Deferred.make<void>();
+      const snapshotReceipt = yield* Deferred.make<void>();
+      const terminalReceipt = yield* Deferred.make<void>();
+      const harness = yield* makeCodexReplayHarness(
+        transcript,
+        (event) =>
+          event.type === "turn.terminal"
+            ? Deferred.succeed(terminalReceipt, undefined)
+            : event.type === "turn_item.updated" &&
                 event.turnItem.type === "error" &&
-                event.turnItem.failure.resetAt != null,
-            ),
-          );
-        }
-        if (scenario.name === "late-reset") {
-          yield* Deferred.await(resetReceipt);
-          const item = harness.events.find(
+                event.turnItem.failure.resetAt === resetAt
+              ? Deferred.succeed(resetReceipt, undefined)
+              : Effect.void,
+        undefined,
+        undefined,
+        // The late reset must land after the terminal its failed read released.
+        (entry) =>
+          entry.label === "account/rateLimits/updated/late"
+            ? Deferred.await(terminalReceipt)
+            : Effect.void,
+        () => Deferred.succeed(snapshotReceipt, undefined),
+      );
+      yield* harness.runtime.startTurn(
+        makeCodexTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now: yield* DateTime.now,
+          text: "Continue.",
+          attemptId: RunAttemptId.make(`attempt-limit-${scenario.name}`),
+        }),
+      );
+      yield* harness.firstTerminal;
+      const terminal = harness.terminalEvents()[0];
+      assert.equal(terminal?.status, "failed");
+      if (terminal?.status !== "failed") return;
+      assert.equal(terminal.failure.class, scenario.expectedClass);
+      assert.equal(terminal.threadDisposition, "reusable");
+      if (scenario.name === "deferred-reset" || scenario.name === "first-request-reset")
+        assert.equal(terminal.failure.resetAt, resetAt);
+      if (scenario.name === "newer-reset-during-read")
+        assert.equal(terminal.failure.resetAt, "2033-05-20T11:06:40.000Z");
+      if (scenario.name === "matching-details")
+        assert.equal(terminal.failure.message, "Detailed provider allowance explanation.");
+      if ("resetAfter" in scenario) {
+        yield* Deferred.await(snapshotReceipt);
+        assert.isFalse(
+          harness.events.some(
             (event) =>
               event.type === "turn_item.updated" &&
               event.turnItem.type === "error" &&
-              event.turnItem.failure.resetAt === resetAt,
-          );
-          assert.isDefined(item);
-        }
-        if (scenario.name === "retry" || "willRetry" in scenario)
-          assert.equal(terminal.retry?.attempt, 1);
-        if ("expectedCode" in scenario && "expectedMessage" in scenario) {
-          assert.equal(terminal.failure.code, scenario.expectedCode);
-          assert.include(terminal.failure.message, scenario.expectedMessage);
-          assert.equal(terminal.failure.resetAt, null);
-        }
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
+              event.turnItem.failure.resetAt != null,
           ),
+        );
+      }
+      if (scenario.name === "late-reset") {
+        yield* Deferred.await(resetReceipt);
+        const item = harness.events.find(
+          (event) =>
+            event.type === "turn_item.updated" &&
+            event.turnItem.type === "error" &&
+            event.turnItem.failure.resetAt === resetAt,
+        );
+        assert.isDefined(item);
+      }
+      if (scenario.name === "retry" || "willRetry" in scenario)
+        assert.equal(terminal.retry?.attempt, 1);
+      if ("expectedCode" in scenario && "expectedMessage" in scenario) {
+        assert.equal(terminal.failure.code, scenario.expectedCode);
+        assert.include(terminal.failure.message, scenario.expectedMessage);
+        assert.equal(terminal.failure.resetAt, null);
+      }
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
         ),
       ),
     ),
@@ -6948,142 +7074,51 @@ describe("CodexAdapterV2 post-settle continuation", () => {
   ] as const)(
     "honors completion HTTP status from $notificationStatus to $completionStatus (retry: $willRetry)",
     ({ notificationStatus, completionStatus, expectedClass, willRetry }) =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const name = `${notificationStatus}-${completionStatus}-${willRetry}`;
-          const nativeThreadId = `native-exhaustion-status-${name}`;
-          const nativeTurnId = `turn-exhaustion-status-${name}`;
-          const message = "Provider stopped this request.";
-          const additionalDetails = "Detailed notification evidence.";
-          const transcript = makeCodexReplayTranscript({
-            scenario: `codex-exhaustion-status-${name}`,
-            entries: [
-              ...codexReplayPreamble({ nativeThreadId, nativeTurnId, prompt: "Continue." }),
-              {
-                type: "emit_inbound",
-                label: "error",
-                frame: {
-                  method: "error",
-                  params: {
-                    threadId: nativeThreadId,
-                    turnId: nativeTurnId,
-                    willRetry,
-                    error: {
-                      message,
-                      codexErrorInfo: {
-                        responseTooManyFailedAttempts: { httpStatusCode: notificationStatus },
-                      },
-                      additionalDetails,
-                    },
-                  },
-                },
-              },
-              {
-                type: "emit_inbound",
-                label: "turn/completed",
-                frame: {
-                  method: "turn/completed",
-                  params: {
-                    threadId: nativeThreadId,
-                    turn: {
-                      ...makeCodexReplayTurn({ id: nativeTurnId, status: "failed" }),
-                      error: {
-                        message,
-                        codexErrorInfo: {
-                          responseTooManyFailedAttempts: { httpStatusCode: completionStatus },
-                        },
-                      },
-                    },
-                  },
-                },
-              },
-            ],
-          });
-          const harness = yield* makeCodexReplayHarness(transcript);
-          yield* harness.runtime.startTurn(
-            makeCodexTestTurnInput({
-              threadId: harness.threadId,
-              providerThread: harness.providerThread,
-              now: yield* DateTime.now,
-              text: "Continue.",
-              attemptId: RunAttemptId.make(`attempt-exhaustion-status-${name}`),
-            }),
-          );
-          yield* harness.firstTerminal;
-          const terminal = harness.terminalEvents()[0];
-          assert.equal(terminal?.status, "failed");
-          if (terminal?.status !== "failed") return;
-          assert.equal(terminal.failure.class, expectedClass);
-          assert.equal(terminal.failure.code, "responseTooManyFailedAttempts");
-          assert.equal(terminal.threadDisposition, "reusable");
-          const notificationClass = notificationStatus === 429 ? "usage_limit" : "provider_error";
-          assert.equal(
-            terminal.failure.message,
-            expectedClass === notificationClass ? additionalDetails : message,
-          );
-          if (willRetry) assert.equal(terminal.retry?.attempt, 1);
-        }).pipe(
-          Effect.provide(
-            Layer.mergeAll(
-              IdAllocator.layer,
-              McpProviderSessions.layer,
-              NodeServices.layer,
-              NodeCrypto.layer,
-            ),
-          ),
-        ),
-      ),
-  );
-
-  // regression: #28032 an unlisted codexErrorInfo dropped the failed turn/completed
-  it.effect("fails the turn when Codex reports an error info the schema does not list", () =>
-    Effect.scoped(
       Effect.gen(function* () {
-        const nativeThreadId = "native-unlisted-error-info";
-        const nativeTurnId = "turn-unlisted-error-info";
-        const message =
-          "The 'gpt-5-codex' model is not supported when using Codex with a ChatGPT account.";
-        const error = { message, codexErrorInfo: "modelNotFound", additionalDetails: null };
-        const usage = {
-          totalTokens: 1,
-          inputTokens: 1,
-          cachedInputTokens: 0,
-          outputTokens: 0,
-          reasoningOutputTokens: 0,
-        };
+        const name = `${notificationStatus}-${completionStatus}-${willRetry}`;
+        const nativeThreadId = `native-exhaustion-status-${name}`;
+        const nativeTurnId = `turn-exhaustion-status-${name}`;
+        const message = "Provider stopped this request.";
+        const additionalDetails = "Detailed notification evidence.";
         const transcript = makeCodexReplayTranscript({
-          scenario: "codex-unlisted-error-info",
+          scenario: `codex-exhaustion-status-${name}`,
           entries: [
-            ...codexReplayPreamble({ nativeThreadId, nativeTurnId, prompt: "say hi" }),
-            {
-              type: "emit_inbound",
-              label: "error",
-              frame: {
-                method: "error",
-                params: { threadId: nativeThreadId, turnId: nativeTurnId, willRetry: false, error },
-              },
-            },
+            ...codexReplayPreamble({ nativeThreadId, nativeTurnId, prompt: "Continue." }),
             {
               type: "emit_inbound",
-              label: "turn/completed",
+              label: "error",
               frame: {
-                method: "turn/completed",
+                method: "error",
                 params: {
                   threadId: nativeThreadId,
-                  turn: { ...makeCodexReplayTurn({ id: nativeTurnId, status: "failed" }), error },
+                  turnId: nativeTurnId,
+                  willRetry,
+                  error: {
+                    message,
+                    codexErrorInfo: {
+                      responseTooManyFailedAttempts: { httpStatusCode: notificationStatus },
+                    },
+                    additionalDetails,
+                  },
                 },
               },
             },
-            // Notifications dispatch in order, so this marks turn/completed as handled.
             {
               type: "emit_inbound",
-              label: "usage",
+              label: "turn/completed",
               frame: {
-                method: "thread/tokenUsage/updated",
+                method: "turn/completed",
                 params: {
                   threadId: nativeThreadId,
-                  turnId: nativeTurnId,
-                  tokenUsage: { total: usage, last: usage, modelContextWindow: 200_000 },
+                  turn: {
+                    ...makeCodexReplayTurn({ id: nativeTurnId, status: "failed" }),
+                    error: {
+                      message,
+                      codexErrorInfo: {
+                        responseTooManyFailedAttempts: { httpStatusCode: completionStatus },
+                      },
+                    },
+                  },
                 },
               },
             },
@@ -7095,22 +7130,23 @@ describe("CodexAdapterV2 post-settle continuation", () => {
             threadId: harness.threadId,
             providerThread: harness.providerThread,
             now: yield* DateTime.now,
-            text: "say hi",
-            attemptId: RunAttemptId.make("attempt-unlisted-error-info"),
+            text: "Continue.",
+            attemptId: RunAttemptId.make(`attempt-exhaustion-status-${name}`),
           }),
         );
-        yield* harness.until(
-          () =>
-            harness.terminalEvents().length > 0 ||
-            harness.events.some(
-              (event) =>
-                event.type === "provider_turn.updated" && event.providerTurn.tokenUsage != null,
-            ),
-        );
+        yield* harness.firstTerminal;
         const terminal = harness.terminalEvents()[0];
         assert.equal(terminal?.status, "failed");
         if (terminal?.status !== "failed") return;
-        assert.equal(terminal.failure.message, message);
+        assert.equal(terminal.failure.class, expectedClass);
+        assert.equal(terminal.failure.code, "responseTooManyFailedAttempts");
+        assert.equal(terminal.threadDisposition, "reusable");
+        const notificationClass = notificationStatus === 429 ? "usage_limit" : "provider_error";
+        assert.equal(
+          terminal.failure.message,
+          expectedClass === notificationClass ? additionalDetails : message,
+        );
+        if (willRetry) assert.equal(terminal.retry?.attempt, 1);
       }).pipe(
         Effect.provide(
           Layer.mergeAll(
@@ -7121,6 +7157,92 @@ describe("CodexAdapterV2 post-settle continuation", () => {
           ),
         ),
       ),
+  );
+
+  // regression: #28032 an unlisted codexErrorInfo dropped the failed turn/completed
+  it.effect("fails the turn when Codex reports an error info the schema does not list", () =>
+    Effect.gen(function* () {
+      const nativeThreadId = "native-unlisted-error-info";
+      const nativeTurnId = "turn-unlisted-error-info";
+      const message =
+        "The 'gpt-5-codex' model is not supported when using Codex with a ChatGPT account.";
+      const error = { message, codexErrorInfo: "modelNotFound", additionalDetails: null };
+      const usage = {
+        totalTokens: 1,
+        inputTokens: 1,
+        cachedInputTokens: 0,
+        outputTokens: 0,
+        reasoningOutputTokens: 0,
+      };
+      const transcript = makeCodexReplayTranscript({
+        scenario: "codex-unlisted-error-info",
+        entries: [
+          ...codexReplayPreamble({ nativeThreadId, nativeTurnId, prompt: "say hi" }),
+          {
+            type: "emit_inbound",
+            label: "error",
+            frame: {
+              method: "error",
+              params: { threadId: nativeThreadId, turnId: nativeTurnId, willRetry: false, error },
+            },
+          },
+          {
+            type: "emit_inbound",
+            label: "turn/completed",
+            frame: {
+              method: "turn/completed",
+              params: {
+                threadId: nativeThreadId,
+                turn: { ...makeCodexReplayTurn({ id: nativeTurnId, status: "failed" }), error },
+              },
+            },
+          },
+          // Notifications dispatch in order, so this marks turn/completed as handled.
+          {
+            type: "emit_inbound",
+            label: "usage",
+            frame: {
+              method: "thread/tokenUsage/updated",
+              params: {
+                threadId: nativeThreadId,
+                turnId: nativeTurnId,
+                tokenUsage: { total: usage, last: usage, modelContextWindow: 200_000 },
+              },
+            },
+          },
+        ],
+      });
+      const harness = yield* makeCodexReplayHarness(transcript);
+      yield* harness.runtime.startTurn(
+        makeCodexTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now: yield* DateTime.now,
+          text: "say hi",
+          attemptId: RunAttemptId.make("attempt-unlisted-error-info"),
+        }),
+      );
+      yield* harness.until(
+        () =>
+          harness.terminalEvents().length > 0 ||
+          harness.events.some(
+            (event) =>
+              event.type === "provider_turn.updated" && event.providerTurn.tokenUsage != null,
+          ),
+      );
+      const terminal = harness.terminalEvents()[0];
+      assert.equal(terminal?.status, "failed");
+      if (terminal?.status !== "failed") return;
+      assert.equal(terminal.failure.message, message);
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
+        ),
+      ),
     ),
   );
 
@@ -7185,47 +7307,45 @@ describe("CodexAdapterV2 post-settle continuation", () => {
   });
 
   it.effect("terminalizes running command items before turn.terminal on failed turns", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const harness = yield* makeCodexReplayHarness(failedMidCommandTranscript);
-        const now = yield* DateTime.now;
+    Effect.gen(function* () {
+      const harness = yield* makeCodexReplayHarness(failedMidCommandTranscript);
+      const now = yield* DateTime.now;
 
-        yield* harness.runtime.startTurn(
-          makeCodexTestTurnInput({
-            threadId: harness.threadId,
-            providerThread: harness.providerThread,
-            now,
-            attemptId: RunAttemptId.make("attempt-codex-failed-mid-command"),
-            text: FAILED_PROMPT,
-          }),
-        );
-        yield* harness.awaitTerminal(1);
-        assert.equal(harness.terminalEvents()[0]?.status, "failed");
+      yield* harness.runtime.startTurn(
+        makeCodexTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now,
+          attemptId: RunAttemptId.make("attempt-codex-failed-mid-command"),
+          text: FAILED_PROMPT,
+        }),
+      );
+      yield* harness.awaitTerminal(1);
+      assert.equal(harness.terminalEvents()[0]?.status, "failed");
 
-        const terminalIndex = harness.events.findIndex((event) => event.type === "turn.terminal");
-        const failedCommandIndex = harness.events.findIndex(
-          (event, index) =>
-            index < terminalIndex &&
-            event.type === "turn_item.updated" &&
-            event.turnItem.type === "command_execution" &&
-            event.turnItem.status === "failed",
-        );
-        assert.isAtLeast(failedCommandIndex, 0);
-        assert.isAbove(
-          terminalIndex,
-          failedCommandIndex,
-          "failed-turn command terminalization must precede turn.terminal",
-        );
-        assert.isFalse(yield* harness.hasPendingBackgroundWork);
-        assert.lengthOf(harness.continuationRequests, 0);
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
-          ),
+      const terminalIndex = harness.events.findIndex((event) => event.type === "turn.terminal");
+      const failedCommandIndex = harness.events.findIndex(
+        (event, index) =>
+          index < terminalIndex &&
+          event.type === "turn_item.updated" &&
+          event.turnItem.type === "command_execution" &&
+          event.turnItem.status === "failed",
+      );
+      assert.isAtLeast(failedCommandIndex, 0);
+      assert.isAbove(
+        terminalIndex,
+        failedCommandIndex,
+        "failed-turn command terminalization must precede turn.terminal",
+      );
+      assert.isFalse(yield* harness.hasPendingBackgroundWork);
+      assert.lengthOf(harness.continuationRequests, 0);
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
         ),
       ),
     ),
@@ -7326,74 +7446,72 @@ describe("CodexAdapterV2 post-settle continuation", () => {
   });
 
   it.effect("captures an MCP app's resource and holds the turn open until it lands", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const appCaptured = yield* Deferred.make<OrchestrationV2TurnItem>();
-        const harness = yield* makeCodexReplayHarness(mcpAppTranscript, (event) =>
-          event.type === "turn_item.updated" &&
-          event.turnItem.type === "dynamic_tool" &&
-          event.turnItem.status === "completed"
-            ? Deferred.succeed(appCaptured, event.turnItem)
-            : Effect.void,
-        );
-        const now = yield* DateTime.now;
+    Effect.gen(function* () {
+      const appCaptured = yield* Deferred.make<OrchestrationV2TurnItem>();
+      const harness = yield* makeCodexReplayHarness(mcpAppTranscript, (event) =>
+        event.type === "turn_item.updated" &&
+        event.turnItem.type === "dynamic_tool" &&
+        event.turnItem.status === "completed"
+          ? Deferred.succeed(appCaptured, event.turnItem)
+          : Effect.void,
+      );
+      const now = yield* DateTime.now;
 
-        yield* harness.runtime.startTurn(
-          makeCodexTestTurnInput({
-            threadId: harness.threadId,
-            providerThread: harness.providerThread,
-            now,
-            attemptId: RunAttemptId.make("attempt-codex-mcp-app"),
-            text: MCP_APP_PROMPT,
-          }),
-        );
-        const item = yield* Deferred.await(appCaptured);
-        assert.equal(harness.terminalEvents()[0]?.status, "completed");
+      yield* harness.runtime.startTurn(
+        makeCodexTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now,
+          attemptId: RunAttemptId.make("attempt-codex-mcp-app"),
+          text: MCP_APP_PROMPT,
+        }),
+      );
+      const item = yield* Deferred.await(appCaptured);
+      assert.equal(harness.terminalEvents()[0]?.status, "completed");
 
-        const completedRows = harness.events.filter(
-          (event) =>
-            event.type === "turn_item.updated" &&
-            event.turnItem.type === "dynamic_tool" &&
-            event.turnItem.status === "completed",
-        );
-        assert.lengthOf(completedRows, 1);
+      const completedRows = harness.events.filter(
+        (event) =>
+          event.type === "turn_item.updated" &&
+          event.turnItem.type === "dynamic_tool" &&
+          event.turnItem.status === "completed",
+      );
+      assert.lengthOf(completedRows, 1);
 
-        assert.equal(item.type, "dynamic_tool");
-        const output = item.type === "dynamic_tool" ? (item.output as Record<string, unknown>) : {};
-        const reference = readMcpAppReference(output[MCP_APP_OUTPUT_KEY]);
-        assert.deepEqual(
-          { ...reference, attachmentId: undefined },
-          {
-            attachmentId: undefined,
-            server: "weather",
-            tool: "get_weather",
-            resourceUri: MCP_APP_RESOURCE,
-            csp: { connectDomains: ["https://api.weather.test"] },
-          },
-        );
-        assert.deepEqual(output.result, {
-          content: [{ type: "text", text: "Sunny" }],
-          structuredContent: { temp: 21 },
-        });
+      assert.equal(item.type, "dynamic_tool");
+      const output = item.type === "dynamic_tool" ? (item.output as Record<string, unknown>) : {};
+      const reference = readMcpAppReference(output[MCP_APP_OUTPUT_KEY]);
+      assert.deepEqual(
+        { ...reference, attachmentId: undefined },
+        {
+          attachmentId: undefined,
+          server: "weather",
+          tool: "get_weather",
+          resourceUri: MCP_APP_RESOURCE,
+          csp: { connectDomains: ["https://api.weather.test"] },
+        },
+      );
+      assert.deepEqual(output.result, {
+        content: [{ type: "text", text: "Sunny" }],
+        structuredContent: { temp: 21 },
+      });
 
-        const fileSystem = yield* FileSystem.FileSystem;
-        const stored = yield* fileSystem.readFileString(
-          resolveAttachmentPathById({
-            attachmentsDir: harness.serverConfig.attachmentsDir,
-            attachmentId: reference!.attachmentId,
-          })!,
-        );
-        assert.include(stored, "connect-src https://api.weather.test");
-        assert.isBelow(stored.indexOf("Content-Security-Policy"), stored.indexOf("<script>"));
-        assert.isFalse(yield* harness.hasPendingBackgroundWork);
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
-          ),
+      const fileSystem = yield* FileSystem.FileSystem;
+      const stored = yield* fileSystem.readFileString(
+        resolveAttachmentPathById({
+          attachmentsDir: harness.serverConfig.attachmentsDir,
+          attachmentId: reference!.attachmentId,
+        })!,
+      );
+      assert.include(stored, "connect-src https://api.weather.test");
+      assert.isBelow(stored.indexOf("Content-Security-Policy"), stored.indexOf("<script>"));
+      assert.isFalse(yield* harness.hasPendingBackgroundWork);
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
         ),
       ),
     ),
@@ -7428,44 +7546,39 @@ describe("CodexAdapterV2 post-settle continuation", () => {
   });
 
   it.effect("captures the app of a tool call that defers to its form", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const appCaptured = yield* Deferred.make<OrchestrationV2TurnItem>();
-        const harness = yield* makeCodexReplayHarness(mcpAppDeferredTranscript, (event) =>
-          event.type === "turn_item.updated" &&
-          event.turnItem.type === "dynamic_tool" &&
-          event.turnItem.status === "failed"
-            ? Deferred.succeed(appCaptured, event.turnItem)
-            : Effect.void,
-        );
-        const now = yield* DateTime.now;
+    Effect.gen(function* () {
+      const appCaptured = yield* Deferred.make<OrchestrationV2TurnItem>();
+      const harness = yield* makeCodexReplayHarness(mcpAppDeferredTranscript, (event) =>
+        event.type === "turn_item.updated" &&
+        event.turnItem.type === "dynamic_tool" &&
+        event.turnItem.status === "failed"
+          ? Deferred.succeed(appCaptured, event.turnItem)
+          : Effect.void,
+      );
+      const now = yield* DateTime.now;
 
-        yield* harness.runtime.startTurn(
-          makeCodexTestTurnInput({
-            threadId: harness.threadId,
-            providerThread: harness.providerThread,
-            now,
-            attemptId: RunAttemptId.make("attempt-codex-mcp-app-deferred"),
-            text: MCP_APP_PROMPT,
-          }),
-        );
-        const item = yield* Deferred.await(appCaptured);
+      yield* harness.runtime.startTurn(
+        makeCodexTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now,
+          attemptId: RunAttemptId.make("attempt-codex-mcp-app-deferred"),
+          text: MCP_APP_PROMPT,
+        }),
+      );
+      const item = yield* Deferred.await(appCaptured);
 
-        const output = item.type === "dynamic_tool" ? (item.output as Record<string, unknown>) : {};
-        assert.equal(
-          readMcpAppReference(output[MCP_APP_OUTPUT_KEY])?.resourceUri,
-          MCP_APP_RESOURCE,
-        );
-        assert.deepEqual(output.result, { ...MCP_APP_DEFERRED_RESULT, isError: true });
-        assert.isFalse(yield* harness.hasPendingBackgroundWork);
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
-          ),
+      const output = item.type === "dynamic_tool" ? (item.output as Record<string, unknown>) : {};
+      assert.equal(readMcpAppReference(output[MCP_APP_OUTPUT_KEY])?.resourceUri, MCP_APP_RESOURCE);
+      assert.deepEqual(output.result, { ...MCP_APP_DEFERRED_RESULT, isError: true });
+      assert.isFalse(yield* harness.hasPendingBackgroundWork);
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
         ),
       ),
     ),
@@ -7611,112 +7724,110 @@ describe("CodexAdapterV2 post-settle continuation", () => {
     ],
   });
 
-  it.effect(
-    "terminalizes leftover nonpersistent dynamic tools when a completed turn never closes them",
-    () =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const monitorCompleted = yield* Deferred.make<void>();
-          const harness = yield* makeCodexReplayHarness(orphanedDynamicToolTranscript, (event) =>
+  it.effect(
+    "terminalizes leftover nonpersistent dynamic tools when a completed turn never closes them",
+    () =>
+      Effect.gen(function* () {
+        const monitorCompleted = yield* Deferred.make<void>();
+        const harness = yield* makeCodexReplayHarness(orphanedDynamicToolTranscript, (event) =>
+          event.type === "turn_item.updated" &&
+          event.turnItem.type === "dynamic_tool" &&
+          event.turnItem.nativeItemRef?.nativeId === PERSISTENT_MONITOR_ITEM &&
+          event.turnItem.status === "completed"
+            ? Deferred.succeed(monitorCompleted, undefined)
+            : Effect.void,
+        );
+        const now = yield* DateTime.now;
+
+        yield* harness.runtime.startTurn(
+          makeCodexTestTurnInput({
+            threadId: harness.threadId,
+            providerThread: harness.providerThread,
+            now,
+            attemptId: RunAttemptId.make("attempt-codex-orphan-wait"),
+            text: ORPHAN_WAIT_PROMPT,
+          }),
+        );
+        yield* harness.firstTerminal;
+        assert.equal(harness.terminalEvents()[0]?.status, "completed");
+
+        const terminalIndex = harness.events.findIndex((event) => event.type === "turn.terminal");
+        const cancelledWait = harness.events.find(
+          (event, index) =>
+            index < terminalIndex &&
             event.type === "turn_item.updated" &&
             event.turnItem.type === "dynamic_tool" &&
-            event.turnItem.nativeItemRef?.nativeId === PERSISTENT_MONITOR_ITEM &&
-            event.turnItem.status === "completed"
-              ? Deferred.succeed(monitorCompleted, undefined)
-              : Effect.void,
-          );
-          const now = yield* DateTime.now;
-
-          yield* harness.runtime.startTurn(
-            makeCodexTestTurnInput({
-              threadId: harness.threadId,
-              providerThread: harness.providerThread,
-              now,
-              attemptId: RunAttemptId.make("attempt-codex-orphan-wait"),
-              text: ORPHAN_WAIT_PROMPT,
-            }),
-          );
-          yield* harness.firstTerminal;
-          assert.equal(harness.terminalEvents()[0]?.status, "completed");
-
-          const terminalIndex = harness.events.findIndex((event) => event.type === "turn.terminal");
-          const cancelledWait = harness.events.find(
-            (event, index) =>
-              index < terminalIndex &&
-              event.type === "turn_item.updated" &&
-              event.turnItem.type === "dynamic_tool" &&
-              event.turnItem.nativeItemRef?.nativeId === ORPHAN_WAIT_ITEM &&
-              event.turnItem.status === "cancelled",
-          );
-          assert.isDefined(cancelledWait);
-          assert.isAbove(
-            terminalIndex,
-            harness.events.indexOf(cancelledWait!),
-            "orphaned wait terminalization must precede turn.terminal",
-          );
+            event.turnItem.nativeItemRef?.nativeId === ORPHAN_WAIT_ITEM &&
+            event.turnItem.status === "cancelled",
+        );
+        assert.isDefined(cancelledWait);
+        assert.isAbove(
+          terminalIndex,
+          harness.events.indexOf(cancelledWait!),
+          "orphaned wait terminalization must precede turn.terminal",
+        );
 
-          const completedWaitStatuses = new Set(
-            harness.events.flatMap((event) =>
-              event.type === "turn_item.updated" &&
-              event.turnItem.type === "dynamic_tool" &&
-              event.turnItem.nativeItemRef?.nativeId === COMPLETED_WAIT_ITEM
-                ? [event.turnItem.status]
-                : [],
-            ),
-          );
-          assert.isTrue(
-            completedWaitStatuses.has("completed"),
-            "the wait that received item/completed must stay completed",
-          );
-          assert.isFalse(
-            completedWaitStatuses.has("cancelled"),
-            "a completed wait must not be rewritten as cancelled",
-          );
+        const completedWaitStatuses = new Set(
+          harness.events.flatMap((event) =>
+            event.type === "turn_item.updated" &&
+            event.turnItem.type === "dynamic_tool" &&
+            event.turnItem.nativeItemRef?.nativeId === COMPLETED_WAIT_ITEM
+              ? [event.turnItem.status]
+              : [],
+          ),
+        );
+        assert.isTrue(
+          completedWaitStatuses.has("completed"),
+          "the wait that received item/completed must stay completed",
+        );
+        assert.isFalse(
+          completedWaitStatuses.has("cancelled"),
+          "a completed wait must not be rewritten as cancelled",
+        );
 
-          const persistentMonitorStatuses = new Set(
-            harness.events.flatMap((event) =>
-              event.type === "turn_item.updated" &&
-              event.turnItem.type === "dynamic_tool" &&
-              event.turnItem.nativeItemRef?.nativeId === PERSISTENT_MONITOR_ITEM
-                ? [event.turnItem.status]
-                : [],
-            ),
-          );
-          assert.isTrue(persistentMonitorStatuses.has("running"));
-          assert.isFalse(
-            persistentMonitorStatuses.has("cancelled"),
-            "persistent monitors must remain running after the root turn completes",
-          );
-          assert.isTrue(
-            yield* harness.hasPendingBackgroundWork,
-            "persistent dynamic tools must keep the session residency pin until they complete",
-          );
+        const persistentMonitorStatuses = new Set(
+          harness.events.flatMap((event) =>
+            event.type === "turn_item.updated" &&
+            event.turnItem.type === "dynamic_tool" &&
+            event.turnItem.nativeItemRef?.nativeId === PERSISTENT_MONITOR_ITEM
+              ? [event.turnItem.status]
+              : [],
+          ),
+        );
+        assert.isTrue(persistentMonitorStatuses.has("running"));
+        assert.isFalse(
+          persistentMonitorStatuses.has("cancelled"),
+          "persistent monitors must remain running after the root turn completes",
+        );
+        assert.isTrue(
+          yield* harness.hasPendingBackgroundWork,
+          "persistent dynamic tools must keep the session residency pin until they complete",
+        );
 
-          yield* TestClock.adjust("30 seconds");
-          yield* Deferred.await(monitorCompleted);
-          const lateMonitorUpdateIndex = harness.events.findIndex(
-            (event, index) =>
-              index > terminalIndex &&
-              event.type === "turn_item.updated" &&
-              event.turnItem.type === "dynamic_tool" &&
-              event.turnItem.nativeItemRef?.nativeId === PERSISTENT_MONITOR_ITEM &&
-              event.turnItem.status === "completed",
-          );
-          assert.isAbove(
-            lateMonitorUpdateIndex,
-            terminalIndex,
-            "persistent tool completion must follow turn.terminal",
-          );
-          assert.lengthOf(harness.terminalEvents(), 1);
-          assert.isFalse(yield* harness.hasPendingBackgroundWork);
-        }).pipe(
-          Effect.provide(
-            Layer.mergeAll(
-              IdAllocator.layer,
-              McpProviderSessions.layer,
-              NodeServices.layer,
-              NodeCrypto.layer,
-            ),
+        yield* TestClock.adjust("30 seconds");
+        yield* Deferred.await(monitorCompleted);
+        const lateMonitorUpdateIndex = harness.events.findIndex(
+          (event, index) =>
+            index > terminalIndex &&
+            event.type === "turn_item.updated" &&
+            event.turnItem.type === "dynamic_tool" &&
+            event.turnItem.nativeItemRef?.nativeId === PERSISTENT_MONITOR_ITEM &&
+            event.turnItem.status === "completed",
+        );
+        assert.isAbove(
+          lateMonitorUpdateIndex,
+          terminalIndex,
+          "persistent tool completion must follow turn.terminal",
+        );
+        assert.lengthOf(harness.terminalEvents(), 1);
+        assert.isFalse(yield* harness.hasPendingBackgroundWork);
+      }).pipe(
+        Effect.provide(
+          Layer.mergeAll(
+            IdAllocator.layer,
+            McpProviderSessions.layer,
+            NodeServices.layer,
+            NodeCrypto.layer,
           ),
         ),
       ),
@@ -7884,83 +7995,229 @@ describe("CodexAdapterV2 post-settle continuation", () => {
   });
 
   it.effect("wakes the parent when a native child finishes after the parent's turn", () =>
-    Effect.scoped(
+    Effect.gen(function* () {
+      const entries = resumeSubagentTranscript.entries;
+      const labelIndex = (label: string) =>
+        entries.findIndex((entry) => entry.type === "emit_inbound" && entry.label === label);
+      const rootCompleted = labelIndex("turn/completed/root");
+      const harness = yield* makeCodexReplayHarness(
+        makeCodexReplayTranscript({
+          scenario: RESUME_SCENARIO,
+          entries: [
+            ...entries.slice(0, labelIndex(`turn/started/${RESUME_CHILD_TURN_1}`) + 1),
+            ...entries.slice(rootCompleted - 1, rootCompleted + 1),
+            childAgentMessage({
+              id: "child-late-answer",
+              text: "NATIVE_CHILD_16900_DONE",
+              turnId: RESUME_CHILD_TURN_1,
+              completedAtMs: 1782622480000,
+              afterMs: 60_000,
+            }),
+            childTurnCompleted(RESUME_CHILD_TURN_1),
+          ],
+        }),
+      );
+
+      yield* harness.runtime.startTurn(
+        makeCodexTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now: yield* DateTime.now,
+          attemptId: RunAttemptId.make("attempt-codex-late-child"),
+          text: RESUME_PROMPT,
+        }),
+      );
+      yield* harness.awaitTerminal(1);
+      assert.equal(harness.terminalEvents()[0]?.status, "completed");
+      assert.lengthOf(harness.continuationRequests, 0);
+
+      yield* TestClock.adjust("60 seconds");
+      yield* harness.until(
+        () => harness.subagentUpdates().at(-1)?.subagent.result === "NATIVE_CHILD_16900_DONE",
+      );
+      assert.equal(harness.subagentUpdates().at(-1)?.subagent.status, "completed");
+      assert.lengthOf(harness.continuationRequests, 1);
+      assert.include(harness.continuationRequests[0]?.detail, "NATIVE_CHILD_16900_DONE");
+      assert.equal(harness.continuationRequests[0]?.delivery, "message_text");
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
+        ),
+      ),
+    ),
+  );
+
+  const lateChildPrefix = () => {
+    const entries = resumeSubagentTranscript.entries;
+    const labelIndex = (label: string) =>
+      entries.findIndex((entry) => entry.type === "emit_inbound" && entry.label === label);
+    const rootCompleted = labelIndex("turn/completed/root");
+    return {
+      spawned: entries.slice(0, labelIndex(`turn/started/${RESUME_CHILD_TURN_1}`) + 1),
+      rootFinished: entries.slice(rootCompleted - 1, rootCompleted + 1),
+    };
+  };
+
+  it.effect.each(["completed", "failed", "interrupted", "starting", "replied-last"] as const)(
+    "handles a late native child after the capacity retry %s",
+    (parentStatus) =>
       Effect.gen(function* () {
-        const entries = resumeSubagentTranscript.entries;
-        const labelIndex = (label: string) =>
-          entries.findIndex((entry) => entry.type === "emit_inbound" && entry.label === label);
-        const rootCompleted = labelIndex("turn/completed/root");
-        const harness = yield* makeCodexReplayHarness(
-          makeCodexReplayTranscript({
-            scenario: RESUME_SCENARIO,
-            entries: [
-              ...entries.slice(0, labelIndex(`turn/started/${RESUME_CHILD_TURN_1}`) + 1),
-              ...entries.slice(rootCompleted - 1, rootCompleted + 1),
-              childAgentMessage({
-                id: "child-late-answer",
-                text: "NATIVE_CHILD_16900_DONE",
-                turnId: RESUME_CHILD_TURN_1,
-                completedAtMs: 1782622480000,
-                afterMs: 60_000,
-              }),
-              childTurnCompleted(RESUME_CHILD_TURN_1),
-            ],
+        const retriedTurnId = "native-capacity-recovered-parent";
+        const retrying = yield* Deferred.make<void>();
+        const entries: Array<CodexReplay.CodexAppServerReplayEntry> = [
+          ...lateChildPrefix().spawned,
+          {
+            type: "emit_inbound",
+            frame: {
+              method: "turn/completed",
+              params: {
+                threadId: RESUME_NATIVE_THREAD,
+                turn: {
+                  ...makeCodexReplayTurn({ id: RESUME_NATIVE_TURN, status: "failed" }),
+                  error: {
+                    message: "Selected model is at capacity.",
+                    codexErrorInfo: "serverOverloaded",
+                  },
+                },
+              },
+            },
+          },
+          {
+            type: "expect_outbound",
+            frame: {
+              id: 4,
+              method: "turn/start",
+              params: {
+                threadId: RESUME_NATIVE_THREAD,
+                input: [],
+                cwd: "/workspace",
+                model: "gpt-5.4",
+                approvalPolicy: "never",
+                approvalsReviewer: "user",
+                sandboxPolicy: { type: "dangerFullAccess" },
+                summary: "auto",
+                collaborationMode: { mode: "default", settings: { model: "gpt-5.4" } },
+              },
+            },
+          },
+          ...(parentStatus === "starting" ? [childTurnCompleted(RESUME_CHILD_TURN_1)] : []),
+          {
+            type: "emit_inbound",
+            frame: {
+              id: 4,
+              result: {
+                turn: makeCodexReplayTurn({ id: retriedTurnId, status: "inProgress" }),
+              },
+            },
+          },
+          {
+            type: "emit_inbound",
+            frame: {
+              method: "turn/started",
+              params: {
+                threadId: RESUME_NATIVE_THREAD,
+                turn: makeCodexReplayTurn({ id: retriedTurnId, status: "inProgress" }),
+              },
+            },
+          },
+          {
+            type: "emit_inbound",
+            frame: {
+              method: "turn/completed",
+              params: {
+                threadId: RESUME_NATIVE_THREAD,
+                turn: {
+                  ...makeCodexReplayTurn({
+                    id: retriedTurnId,
+                    status:
+                      parentStatus === "starting" || parentStatus === "replied-last"
+                        ? "completed"
+                        : parentStatus,
+                  }),
+                  error:
+                    parentStatus === "failed"
+                      ? { message: "Recovery failed.", codexErrorInfo: "internalServerError" }
+                      : null,
+                },
+              },
+            },
+          },
+          childAgentMessage({
+            id: "child-after-capacity",
+            text: "CAPACITY_CHILD_DONE",
+            turnId: RESUME_CHILD_TURN_1,
+            completedAtMs: 1782622480000,
+            afterMs: 60_000,
           }),
+          childTurnCompleted(RESUME_CHILD_TURN_1),
+        ];
+        if (parentStatus === "replied-last") {
+          entries.push(...entries.splice(lateChildPrefix().spawned.length + 2, 1));
+        }
+        const harness = yield* makeCodexReplayHarness(
+          makeCodexReplayTranscript({ scenario: "capacity-late-child", entries }),
+          (event) =>
+            event.type === "turn_item.updated" &&
+            event.turnItem.type === "error" &&
+            event.turnItem.status === "running"
+              ? Deferred.succeed(retrying, undefined)
+              : Effect.void,
         );
-
         yield* harness.runtime.startTurn(
           makeCodexTestTurnInput({
             threadId: harness.threadId,
             providerThread: harness.providerThread,
             now: yield* DateTime.now,
-            attemptId: RunAttemptId.make("attempt-codex-late-child"),
+            attemptId: RunAttemptId.make("capacity-late-child"),
             text: RESUME_PROMPT,
           }),
         );
-        yield* harness.awaitTerminal(1);
-        assert.equal(harness.terminalEvents()[0]?.status, "completed");
-        assert.lengthOf(harness.continuationRequests, 0);
-
+        yield* Deferred.await(retrying);
+        yield* TestClock.adjust("2 seconds");
+        if (parentStatus === "interrupted") assert.isEmpty(harness.terminalEvents());
+        else {
+          yield* harness.awaitTerminal(1);
+          const terminal = harness.terminalEvents()[0];
+          if (terminal?.status === "failed") assert.isTrue(terminal.childTurnsContinue);
+        }
         yield* TestClock.adjust("60 seconds");
         yield* harness.until(
-          () => harness.subagentUpdates().at(-1)?.subagent.result === "NATIVE_CHILD_16900_DONE",
+          () => harness.subagentUpdates().at(-1)?.subagent.status === "completed",
         );
-        assert.equal(harness.subagentUpdates().at(-1)?.subagent.status, "completed");
-        assert.lengthOf(harness.continuationRequests, 1);
-        assert.include(harness.continuationRequests[0]?.detail, "NATIVE_CHILD_16900_DONE");
-        assert.equal(harness.continuationRequests[0]?.delivery, "message_text");
+        yield* harness.awaitTerminal(1);
+        assert.lengthOf(
+          harness.continuationRequests,
+          parentStatus === "completed" || parentStatus === "replied-last" ? 1 : 0,
+        );
+        if (parentStatus === "completed" || parentStatus === "replied-last")
+          assert.include(harness.continuationRequests[0]?.detail, "CAPACITY_CHILD_DONE");
       }).pipe(
         Effect.provide(
           Layer.mergeAll(
             IdAllocator.layer,
             McpProviderSessions.layer,
             NodeServices.layer,
-            NodeCrypto.layer,
-          ),
-        ),
-      ),
-    ),
-  );
-
-  const lateChildPrefix = () => {
-    const entries = resumeSubagentTranscript.entries;
-    const labelIndex = (label: string) =>
-      entries.findIndex((entry) => entry.type === "emit_inbound" && entry.label === label);
-    const rootCompleted = labelIndex("turn/completed/root");
-    return {
-      spawned: entries.slice(0, labelIndex(`turn/started/${RESUME_CHILD_TURN_1}`) + 1),
-      rootFinished: entries.slice(rootCompleted - 1, rootCompleted + 1),
-    };
-  };
+            NodeCrypto.layer,
+          ),
+        ),
+      ),
+  );
 
-  it.effect.each(["completed", "failed", "interrupted", "starting", "replied-last"] as const)(
-    "handles a late native child after the capacity retry %s",
-    (parentStatus) =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const retriedTurnId = "native-capacity-recovered-parent";
-          const retrying = yield* Deferred.make<void>();
-          const entries: Array<CodexReplay.CodexAppServerReplayEntry> = [
+  it.effect("stops native children when capacity retry startup fails", () =>
+    Effect.gen(function* () {
+      const retrying = yield* Deferred.make<void>();
+      const starting = yield* Deferred.make<void>();
+      const release = yield* Deferred.make<void>();
+      const interrupts: unknown[] = [];
+      let starts = 0;
+      const harness = yield* makeCodexReplayHarness(
+        makeCodexReplayTranscript({
+          scenario: "capacity-start-fails-stop-child",
+          entries: [
             ...lateChildPrefix().spawned,
             {
               type: "emit_inbound",
@@ -7970,10 +8227,7 @@ describe("CodexAdapterV2 post-settle continuation", () => {
                   threadId: RESUME_NATIVE_THREAD,
                   turn: {
                     ...makeCodexReplayTurn({ id: RESUME_NATIVE_TURN, status: "failed" }),
-                    error: {
-                      message: "Selected model is at capacity.",
-                      codexErrorInfo: "serverOverloaded",
-                    },
+                    error: { message: "At capacity", codexErrorInfo: "serverOverloaded" },
                   },
                 },
               },
@@ -7996,506 +8250,351 @@ describe("CodexAdapterV2 post-settle continuation", () => {
                 },
               },
             },
-            ...(parentStatus === "starting" ? [childTurnCompleted(RESUME_CHILD_TURN_1)] : []),
             {
               type: "emit_inbound",
-              frame: {
-                id: 4,
-                result: {
-                  turn: makeCodexReplayTurn({ id: retriedTurnId, status: "inProgress" }),
-                },
-              },
+              frame: { id: 4, error: { code: -32603, message: "Start failed" } },
             },
             {
-              type: "emit_inbound",
+              type: "expect_outbound",
               frame: {
-                method: "turn/started",
-                params: {
-                  threadId: RESUME_NATIVE_THREAD,
-                  turn: makeCodexReplayTurn({ id: retriedTurnId, status: "inProgress" }),
-                },
+                id: 5,
+                method: "turn/interrupt",
+                params: { threadId: RESUME_CHILD_THREAD, turnId: RESUME_CHILD_TURN_1 },
               },
             },
+            { type: "emit_inbound", frame: { id: 5, result: {} } },
             {
               type: "emit_inbound",
               frame: {
                 method: "turn/completed",
                 params: {
-                  threadId: RESUME_NATIVE_THREAD,
-                  turn: {
-                    ...makeCodexReplayTurn({
-                      id: retriedTurnId,
-                      status:
-                        parentStatus === "starting" || parentStatus === "replied-last"
-                          ? "completed"
-                          : parentStatus,
-                    }),
-                    error:
-                      parentStatus === "failed"
-                        ? { message: "Recovery failed.", codexErrorInfo: "internalServerError" }
-                        : null,
-                  },
+                  threadId: RESUME_CHILD_THREAD,
+                  turn: makeCodexReplayTurn({ id: RESUME_CHILD_TURN_1, status: "interrupted" }),
                 },
               },
             },
-            childAgentMessage({
-              id: "child-after-capacity",
-              text: "CAPACITY_CHILD_DONE",
-              turnId: RESUME_CHILD_TURN_1,
-              completedAtMs: 1782622480000,
-              afterMs: 60_000,
-            }),
-            childTurnCompleted(RESUME_CHILD_TURN_1),
-          ];
-          if (parentStatus === "replied-last") {
-            entries.push(...entries.splice(lateChildPrefix().spawned.length + 2, 1));
-          }
-          const harness = yield* makeCodexReplayHarness(
-            makeCodexReplayTranscript({ scenario: "capacity-late-child", entries }),
-            (event) =>
-              event.type === "turn_item.updated" &&
-              event.turnItem.type === "error" &&
-              event.turnItem.status === "running"
-                ? Deferred.succeed(retrying, undefined)
-                : Effect.void,
-          );
-          yield* harness.runtime.startTurn(
-            makeCodexTestTurnInput({
-              threadId: harness.threadId,
-              providerThread: harness.providerThread,
-              now: yield* DateTime.now,
-              attemptId: RunAttemptId.make("capacity-late-child"),
-              text: RESUME_PROMPT,
-            }),
-          );
-          yield* Deferred.await(retrying);
-          yield* TestClock.adjust("2 seconds");
-          if (parentStatus === "interrupted") assert.isEmpty(harness.terminalEvents());
-          else {
-            yield* harness.awaitTerminal(1);
-            const terminal = harness.terminalEvents()[0];
-            if (terminal?.status === "failed") assert.isTrue(terminal.childTurnsContinue);
-          }
-          yield* TestClock.adjust("60 seconds");
-          yield* harness.until(
-            () => harness.subagentUpdates().at(-1)?.subagent.status === "completed",
-          );
-          yield* harness.awaitTerminal(1);
-          assert.lengthOf(
-            harness.continuationRequests,
-            parentStatus === "completed" || parentStatus === "replied-last" ? 1 : 0,
-          );
-          if (parentStatus === "completed" || parentStatus === "replied-last")
-            assert.include(harness.continuationRequests[0]?.detail, "CAPACITY_CHILD_DONE");
-        }).pipe(
-          Effect.provide(
-            Layer.mergeAll(
-              IdAllocator.layer,
-              McpProviderSessions.layer,
-              NodeServices.layer,
-              NodeCrypto.layer,
-            ),
-          ),
-        ),
-      ),
-  );
-
-  it.effect("stops native children when capacity retry startup fails", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const retrying = yield* Deferred.make<void>();
-        const starting = yield* Deferred.make<void>();
-        const release = yield* Deferred.make<void>();
-        const interrupts: unknown[] = [];
-        let starts = 0;
-        const harness = yield* makeCodexReplayHarness(
-          makeCodexReplayTranscript({
-            scenario: "capacity-start-fails-stop-child",
-            entries: [
-              ...lateChildPrefix().spawned,
-              {
-                type: "emit_inbound",
-                frame: {
-                  method: "turn/completed",
-                  params: {
-                    threadId: RESUME_NATIVE_THREAD,
-                    turn: {
-                      ...makeCodexReplayTurn({ id: RESUME_NATIVE_TURN, status: "failed" }),
-                      error: { message: "At capacity", codexErrorInfo: "serverOverloaded" },
-                    },
-                  },
-                },
-              },
-              {
-                type: "expect_outbound",
-                frame: {
-                  id: 4,
-                  method: "turn/start",
-                  params: {
-                    threadId: RESUME_NATIVE_THREAD,
-                    input: [],
-                    cwd: "/workspace",
-                    model: "gpt-5.4",
-                    approvalPolicy: "never",
-                    approvalsReviewer: "user",
-                    sandboxPolicy: { type: "dangerFullAccess" },
-                    summary: "auto",
-                    collaborationMode: { mode: "default", settings: { model: "gpt-5.4" } },
-                  },
-                },
-              },
-              {
-                type: "emit_inbound",
-                frame: { id: 4, error: { code: -32603, message: "Start failed" } },
-              },
-              {
-                type: "expect_outbound",
-                frame: {
-                  id: 5,
-                  method: "turn/interrupt",
-                  params: { threadId: RESUME_CHILD_THREAD, turnId: RESUME_CHILD_TURN_1 },
-                },
-              },
-              { type: "emit_inbound", frame: { id: 5, result: {} } },
-              {
-                type: "emit_inbound",
-                frame: {
-                  method: "turn/completed",
-                  params: {
-                    threadId: RESUME_CHILD_THREAD,
-                    turn: makeCodexReplayTurn({ id: RESUME_CHILD_TURN_1, status: "interrupted" }),
-                  },
-                },
-              },
-            ],
-          }),
-          (event) =>
-            event.type === "turn_item.updated" &&
-            event.turnItem.type === "error" &&
-            event.turnItem.status === "running"
-              ? Deferred.succeed(retrying, undefined)
-              : Effect.void,
-          (method, params) =>
-            Effect.gen(function* () {
-              if (method === "turn/interrupt") interrupts.push(params);
-              if (method === "turn/start" && ++starts === 2) {
-                yield* Deferred.succeed(starting, undefined);
-                yield* Deferred.await(release);
-              }
-            }),
-        );
-        yield* harness.runtime.startTurn(
-          makeCodexTestTurnInput({
-            threadId: harness.threadId,
-            providerThread: harness.providerThread,
-            now: yield* DateTime.now,
-            attemptId: RunAttemptId.make("capacity-start-fails-stop-child"),
-            text: RESUME_PROMPT,
+          ],
+        }),
+        (event) =>
+          event.type === "turn_item.updated" &&
+          event.turnItem.type === "error" &&
+          event.turnItem.status === "running"
+            ? Deferred.succeed(retrying, undefined)
+            : Effect.void,
+        (method, params) =>
+          Effect.gen(function* () {
+            if (method === "turn/interrupt") interrupts.push(params);
+            if (method === "turn/start" && ++starts === 2) {
+              yield* Deferred.succeed(starting, undefined);
+              yield* Deferred.await(release);
+            }
           }),
-        );
-        yield* Deferred.await(retrying);
-        const root = harness.events.find((event) => event.type === "provider_turn.updated");
-        assert.equal(root?.type, "provider_turn.updated");
-        if (root?.type !== "provider_turn.updated") return;
-        yield* TestClock.adjust("2 seconds");
-        yield* Deferred.await(starting);
-        const stopping = yield* harness.runtime
-          .interruptTurn({
-            providerThread: harness.providerThread,
-            providerTurnId: root.providerTurn.id,
-          })
-          .pipe(Effect.forkChild({ startImmediately: true }));
-        yield* Deferred.succeed(release, undefined);
-        yield* Fiber.join(stopping);
-        assert.lengthOf(interrupts, 1);
-        assert.equal(harness.subagentUpdates().at(-1)?.subagent.status, "interrupted");
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
-          ),
+      );
+      yield* harness.runtime.startTurn(
+        makeCodexTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now: yield* DateTime.now,
+          attemptId: RunAttemptId.make("capacity-start-fails-stop-child"),
+          text: RESUME_PROMPT,
+        }),
+      );
+      yield* Deferred.await(retrying);
+      const root = harness.events.find((event) => event.type === "provider_turn.updated");
+      assert.equal(root?.type, "provider_turn.updated");
+      if (root?.type !== "provider_turn.updated") return;
+      yield* TestClock.adjust("2 seconds");
+      yield* Deferred.await(starting);
+      const stopping = yield* harness.runtime
+        .interruptTurn({
+          providerThread: harness.providerThread,
+          providerTurnId: root.providerTurn.id,
+        })
+        .pipe(Effect.forkChild({ startImmediately: true }));
+      yield* Deferred.succeed(release, undefined);
+      yield* Fiber.join(stopping);
+      assert.lengthOf(interrupts, 1);
+      assert.equal(harness.subagentUpdates().at(-1)?.subagent.status, "interrupted");
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
         ),
       ),
     ),
   );
 
   it.effect("names a late child spawned without a prompt in its wake", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const { spawned, rootFinished } = lateChildPrefix();
-        const harness = yield* makeCodexReplayHarness(
-          makeCodexReplayTranscript({
-            scenario: RESUME_SCENARIO,
-            entries: [
-              ...spawned.map((entry) =>
-                entry.type === "emit_inbound" &&
-                entry.label === "item/completed/subAgentActivity-started"
-                  ? {
-                      ...entry,
-                      frame: {
-                        method: "item/completed",
-                        params: {
-                          item: {
-                            type: "collabAgentToolCall",
-                            id: "call-codex-resume-spawn",
-                            tool: "spawnAgent",
-                            status: "completed",
-                            senderThreadId: RESUME_NATIVE_THREAD,
-                            receiverThreadIds: [RESUME_CHILD_THREAD],
-                            agentsStates: {},
-                          },
-                          threadId: RESUME_NATIVE_THREAD,
-                          turnId: RESUME_NATIVE_TURN,
-                          completedAtMs: 1782622441000,
+    Effect.gen(function* () {
+      const { spawned, rootFinished } = lateChildPrefix();
+      const harness = yield* makeCodexReplayHarness(
+        makeCodexReplayTranscript({
+          scenario: RESUME_SCENARIO,
+          entries: [
+            ...spawned.map((entry) =>
+              entry.type === "emit_inbound" &&
+              entry.label === "item/completed/subAgentActivity-started"
+                ? {
+                    ...entry,
+                    frame: {
+                      method: "item/completed",
+                      params: {
+                        item: {
+                          type: "collabAgentToolCall",
+                          id: "call-codex-resume-spawn",
+                          tool: "spawnAgent",
+                          status: "completed",
+                          senderThreadId: RESUME_NATIVE_THREAD,
+                          receiverThreadIds: [RESUME_CHILD_THREAD],
+                          agentsStates: {},
                         },
+                        threadId: RESUME_NATIVE_THREAD,
+                        turnId: RESUME_NATIVE_TURN,
+                        completedAtMs: 1782622441000,
                       },
-                    }
-                  : entry,
-              ),
-              ...rootFinished,
-              childAgentMessage({
-                id: "child-late-answer",
-                text: "UNPROMPTED_CHILD_DONE",
-                turnId: RESUME_CHILD_TURN_1,
-                completedAtMs: 1782622480000,
-                afterMs: 60_000,
-              }),
-              childTurnCompleted(RESUME_CHILD_TURN_1),
-            ],
-          }),
-        );
+                    },
+                  }
+                : entry,
+            ),
+            ...rootFinished,
+            childAgentMessage({
+              id: "child-late-answer",
+              text: "UNPROMPTED_CHILD_DONE",
+              turnId: RESUME_CHILD_TURN_1,
+              completedAtMs: 1782622480000,
+              afterMs: 60_000,
+            }),
+            childTurnCompleted(RESUME_CHILD_TURN_1),
+          ],
+        }),
+      );
 
-        yield* harness.runtime.startTurn(
-          makeCodexTestTurnInput({
-            threadId: harness.threadId,
-            providerThread: harness.providerThread,
-            now: yield* DateTime.now,
-            attemptId: RunAttemptId.make("attempt-codex-unprompted-child"),
-            text: RESUME_PROMPT,
-          }),
-        );
-        yield* harness.awaitTerminal(1);
-        yield* TestClock.adjust("60 seconds");
-        yield* harness.until(() => harness.continuationRequests.length > 0);
-        const subagent = harness.subagentUpdates().at(-1)?.subagent;
-        assert.equal(subagent?.prompt, "");
-        assert.equal(
-          harness.continuationRequests[0]?.detail,
-          `Subagent completed: ${subagent?.id}\n\nResult:\nUNPROMPTED_CHILD_DONE`,
-        );
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
-          ),
+      yield* harness.runtime.startTurn(
+        makeCodexTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now: yield* DateTime.now,
+          attemptId: RunAttemptId.make("attempt-codex-unprompted-child"),
+          text: RESUME_PROMPT,
+        }),
+      );
+      yield* harness.awaitTerminal(1);
+      yield* TestClock.adjust("60 seconds");
+      yield* harness.until(() => harness.continuationRequests.length > 0);
+      const subagent = harness.subagentUpdates().at(-1)?.subagent;
+      assert.equal(subagent?.prompt, "");
+      assert.equal(
+        harness.continuationRequests[0]?.detail,
+        `Subagent completed: ${subagent?.id}\n\nResult:\nUNPROMPTED_CHILD_DONE`,
+      );
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
         ),
       ),
-    ),
-  );
-
-  it.effect("wakes the root only when its direct child finishes, not a grandchild", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const grandchildThread = "native-codex-resume-grandchild-thread";
-        const grandchildTurn = "native-codex-resume-grandchild-turn";
-        const { spawned, rootFinished } = lateChildPrefix();
-        const harness = yield* makeCodexReplayHarness(
-          makeCodexReplayTranscript({
-            scenario: RESUME_SCENARIO,
-            entries: [
-              ...spawned,
-              {
-                type: "emit_inbound",
-                label: "item/completed/grandchild-spawn",
-                frame: {
-                  method: "item/completed",
-                  params: {
-                    item: {
-                      type: "subAgentActivity",
-                      id: "call-codex-grandchild-spawn",
-                      kind: "started",
-                      agentThreadId: grandchildThread,
-                      agentPath: "/root/resume_agent/grandchild",
-                    },
-                    threadId: RESUME_CHILD_THREAD,
-                    turnId: RESUME_CHILD_TURN_1,
-                    completedAtMs: 1782622441500,
+    ),
+  );
+
+  it.effect("wakes the root only when its direct child finishes, not a grandchild", () =>
+    Effect.gen(function* () {
+      const grandchildThread = "native-codex-resume-grandchild-thread";
+      const grandchildTurn = "native-codex-resume-grandchild-turn";
+      const { spawned, rootFinished } = lateChildPrefix();
+      const harness = yield* makeCodexReplayHarness(
+        makeCodexReplayTranscript({
+          scenario: RESUME_SCENARIO,
+          entries: [
+            ...spawned,
+            {
+              type: "emit_inbound",
+              label: "item/completed/grandchild-spawn",
+              frame: {
+                method: "item/completed",
+                params: {
+                  item: {
+                    type: "subAgentActivity",
+                    id: "call-codex-grandchild-spawn",
+                    kind: "started",
+                    agentThreadId: grandchildThread,
+                    agentPath: "/root/resume_agent/grandchild",
                   },
+                  threadId: RESUME_CHILD_THREAD,
+                  turnId: RESUME_CHILD_TURN_1,
+                  completedAtMs: 1782622441500,
                 },
               },
-              {
-                type: "emit_inbound",
-                label: "turn/started/grandchild",
-                frame: {
-                  method: "turn/started",
-                  params: {
-                    threadId: grandchildThread,
-                    turn: makeCodexReplayTurn({ id: grandchildTurn, status: "inProgress" }),
-                  },
+            },
+            {
+              type: "emit_inbound",
+              label: "turn/started/grandchild",
+              frame: {
+                method: "turn/started",
+                params: {
+                  threadId: grandchildThread,
+                  turn: makeCodexReplayTurn({ id: grandchildTurn, status: "inProgress" }),
                 },
               },
-              ...rootFinished,
-              {
-                type: "emit_inbound",
-                label: "item/completed/grandchild-answer",
-                afterMs: 30_000,
-                frame: {
-                  method: "item/completed",
-                  params: {
-                    item: {
-                      type: "agentMessage",
-                      id: "grandchild-answer",
-                      text: "GRANDCHILD_DONE",
-                      phase: "final_answer",
-                      memoryCitation: null,
-                    },
-                    threadId: grandchildThread,
-                    turnId: grandchildTurn,
-                    completedAtMs: 1782622470000,
+            },
+            ...rootFinished,
+            {
+              type: "emit_inbound",
+              label: "item/completed/grandchild-answer",
+              afterMs: 30_000,
+              frame: {
+                method: "item/completed",
+                params: {
+                  item: {
+                    type: "agentMessage",
+                    id: "grandchild-answer",
+                    text: "GRANDCHILD_DONE",
+                    phase: "final_answer",
+                    memoryCitation: null,
                   },
+                  threadId: grandchildThread,
+                  turnId: grandchildTurn,
+                  completedAtMs: 1782622470000,
                 },
               },
-              {
-                type: "emit_inbound",
-                label: "turn/completed/grandchild",
-                frame: {
-                  method: "turn/completed",
-                  params: {
-                    threadId: grandchildThread,
-                    turn: makeCodexReplayTurn({ id: grandchildTurn, status: "completed" }),
-                  },
+            },
+            {
+              type: "emit_inbound",
+              label: "turn/completed/grandchild",
+              frame: {
+                method: "turn/completed",
+                params: {
+                  threadId: grandchildThread,
+                  turn: makeCodexReplayTurn({ id: grandchildTurn, status: "completed" }),
                 },
               },
-              childAgentMessage({
-                id: "child-late-answer",
-                text: "CHILD_AFTER_GRANDCHILD",
-                turnId: RESUME_CHILD_TURN_1,
-                completedAtMs: 1782622500000,
-                afterMs: 30_000,
-              }),
-              childTurnCompleted(RESUME_CHILD_TURN_1),
-            ],
-          }),
-        );
+            },
+            childAgentMessage({
+              id: "child-late-answer",
+              text: "CHILD_AFTER_GRANDCHILD",
+              turnId: RESUME_CHILD_TURN_1,
+              completedAtMs: 1782622500000,
+              afterMs: 30_000,
+            }),
+            childTurnCompleted(RESUME_CHILD_TURN_1),
+          ],
+        }),
+      );
 
-        yield* harness.runtime.startTurn(
-          makeCodexTestTurnInput({
-            threadId: harness.threadId,
-            providerThread: harness.providerThread,
-            now: yield* DateTime.now,
-            attemptId: RunAttemptId.make("attempt-codex-late-grandchild"),
-            text: RESUME_PROMPT,
-          }),
-        );
-        yield* harness.awaitTerminal(1);
+      yield* harness.runtime.startTurn(
+        makeCodexTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now: yield* DateTime.now,
+          attemptId: RunAttemptId.make("attempt-codex-late-grandchild"),
+          text: RESUME_PROMPT,
+        }),
+      );
+      yield* harness.awaitTerminal(1);
 
-        yield* TestClock.adjust("30 seconds");
-        yield* harness.until(() =>
-          harness.subagentUpdates().some((event) => event.subagent.result === "GRANDCHILD_DONE"),
-        );
-        assert.lengthOf(harness.continuationRequests, 0);
+      yield* TestClock.adjust("30 seconds");
+      yield* harness.until(() =>
+        harness.subagentUpdates().some((event) => event.subagent.result === "GRANDCHILD_DONE"),
+      );
+      assert.lengthOf(harness.continuationRequests, 0);
 
-        yield* TestClock.adjust("30 seconds");
-        yield* harness.until(() => harness.continuationRequests.length > 0);
-        assert.lengthOf(harness.continuationRequests, 1);
-        assert.include(harness.continuationRequests[0]?.detail, "CHILD_AFTER_GRANDCHILD");
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
-          ),
+      yield* TestClock.adjust("30 seconds");
+      yield* harness.until(() => harness.continuationRequests.length > 0);
+      assert.lengthOf(harness.continuationRequests, 1);
+      assert.include(harness.continuationRequests[0]?.detail, "CHILD_AFTER_GRANDCHILD");
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
         ),
       ),
     ),
   );
 
   it.effect("leaves a late child's result to the root's next turn when one is running", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const secondPrompt = "Wait for the sub-agent.";
-        const secondTurn = "native-codex-resume-root-turn-2";
-        const { spawned, rootFinished } = lateChildPrefix();
-        // Reuse the preamble's turn/start exchange under the session's next request id.
-        const secondTurnStart = codexReplayPreamble({
-          nativeThreadId: RESUME_NATIVE_THREAD,
-          nativeTurnId: secondTurn,
-          prompt: secondPrompt,
-        })
-          .slice(-3)
-          .map((entry) =>
-            entry.type !== "runtime_exit" &&
-            typeof entry.frame === "object" &&
-            entry.frame !== null &&
-            "id" in entry.frame
-              ? { ...entry, frame: { ...entry.frame, id: 4 } }
-              : entry,
-          );
-        const harness = yield* makeCodexReplayHarness(
-          makeCodexReplayTranscript({
-            scenario: RESUME_SCENARIO,
-            entries: [
-              ...spawned,
-              ...rootFinished,
-              ...secondTurnStart,
-              childAgentMessage({
-                id: "child-late-answer",
-                text: "CHILD_DURING_SECOND_TURN",
-                turnId: RESUME_CHILD_TURN_1,
-                completedAtMs: 1782622480000,
-              }),
-              childTurnCompleted(RESUME_CHILD_TURN_1),
-              {
-                type: "emit_inbound",
-                label: "turn/completed/root-2",
-                frame: {
-                  method: "turn/completed",
-                  params: {
-                    threadId: RESUME_NATIVE_THREAD,
-                    turn: makeCodexReplayTurn({ id: secondTurn, status: "completed" }),
-                  },
+    Effect.gen(function* () {
+      const secondPrompt = "Wait for the sub-agent.";
+      const secondTurn = "native-codex-resume-root-turn-2";
+      const { spawned, rootFinished } = lateChildPrefix();
+      // Reuse the preamble's turn/start exchange under the session's next request id.
+      const secondTurnStart = codexReplayPreamble({
+        nativeThreadId: RESUME_NATIVE_THREAD,
+        nativeTurnId: secondTurn,
+        prompt: secondPrompt,
+      })
+        .slice(-3)
+        .map((entry) =>
+          entry.type !== "runtime_exit" &&
+          typeof entry.frame === "object" &&
+          entry.frame !== null &&
+          "id" in entry.frame
+            ? { ...entry, frame: { ...entry.frame, id: 4 } }
+            : entry,
+        );
+      const harness = yield* makeCodexReplayHarness(
+        makeCodexReplayTranscript({
+          scenario: RESUME_SCENARIO,
+          entries: [
+            ...spawned,
+            ...rootFinished,
+            ...secondTurnStart,
+            childAgentMessage({
+              id: "child-late-answer",
+              text: "CHILD_DURING_SECOND_TURN",
+              turnId: RESUME_CHILD_TURN_1,
+              completedAtMs: 1782622480000,
+            }),
+            childTurnCompleted(RESUME_CHILD_TURN_1),
+            {
+              type: "emit_inbound",
+              label: "turn/completed/root-2",
+              frame: {
+                method: "turn/completed",
+                params: {
+                  threadId: RESUME_NATIVE_THREAD,
+                  turn: makeCodexReplayTurn({ id: secondTurn, status: "completed" }),
                 },
               },
-            ],
-          }),
-        );
+            },
+          ],
+        }),
+      );
 
-        const turnInput = (index: number, text: string) =>
-          Effect.gen(function* () {
-            return {
-              ...makeCodexTestTurnInput({
-                threadId: harness.threadId,
-                providerThread: harness.providerThread,
-                now: yield* DateTime.now,
-                attemptId: RunAttemptId.make(`attempt-codex-active-root-${index}`),
-                text,
-              }),
-              runOrdinal: index,
-              providerTurnOrdinal: index,
-            };
-          });
-        yield* harness.runtime.startTurn(yield* turnInput(1, RESUME_PROMPT));
-        yield* harness.awaitTerminal(1);
-        yield* harness.runtime.startTurn(yield* turnInput(2, secondPrompt));
-        yield* harness.awaitTerminal(2);
-        assert.equal(harness.subagentUpdates().at(-1)?.subagent.result, "CHILD_DURING_SECOND_TURN");
-        assert.lengthOf(harness.continuationRequests, 0);
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
-          ),
+      const turnInput = (index: number, text: string) =>
+        Effect.gen(function* () {
+          return {
+            ...makeCodexTestTurnInput({
+              threadId: harness.threadId,
+              providerThread: harness.providerThread,
+              now: yield* DateTime.now,
+              attemptId: RunAttemptId.make(`attempt-codex-active-root-${index}`),
+              text,
+            }),
+            runOrdinal: index,
+            providerTurnOrdinal: index,
+          };
+        });
+      yield* harness.runtime.startTurn(yield* turnInput(1, RESUME_PROMPT));
+      yield* harness.awaitTerminal(1);
+      yield* harness.runtime.startTurn(yield* turnInput(2, secondPrompt));
+      yield* harness.awaitTerminal(2);
+      assert.equal(harness.subagentUpdates().at(-1)?.subagent.result, "CHILD_DURING_SECOND_TURN");
+      assert.lengthOf(harness.continuationRequests, 0);
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
         ),
       ),
     ),
@@ -8504,90 +8603,88 @@ describe("CodexAdapterV2 post-settle continuation", () => {
   it.effect.each(["model/rerouted"] as const)(
     "keeps %s child metadata when an older lookup finishes later",
     (method) =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const releaseMetadata = yield* Deferred.make<void>();
-          const observed = yield* Deferred.make<void>();
-          const model = "gpt-5.6-sol";
-          const notification: CodexReplay.CodexAppServerReplayEntry = {
-            type: "emit_inbound",
-            frame: {
-              method,
-              params: {
-                threadId: RESUME_CHILD_THREAD,
-                turnId: RESUME_CHILD_TURN_1,
-                fromModel: "gpt-6-astra",
-                toModel: model,
-                reason: "highRiskCyberActivity",
-              },
+      Effect.gen(function* () {
+        const releaseMetadata = yield* Deferred.make<void>();
+        const observed = yield* Deferred.make<void>();
+        const model = "gpt-5.6-sol";
+        const notification: CodexReplay.CodexAppServerReplayEntry = {
+          type: "emit_inbound",
+          frame: {
+            method,
+            params: {
+              threadId: RESUME_CHILD_THREAD,
+              turnId: RESUME_CHILD_TURN_1,
+              fromModel: "gpt-6-astra",
+              toModel: model,
+              reason: "highRiskCyberActivity",
             },
-          };
-          const initialSettings: CodexReplay.CodexAppServerReplayEntry = {
-            type: "emit_inbound",
-            frame: {
-              method: "thread/settings/updated",
-              params: {
-                threadId: RESUME_CHILD_THREAD,
-                threadSettings: {
-                  model: "gpt-6-astra",
-                  effort: "low",
-                  serviceTier: "ultrafast",
-                  modelProvider: "openai",
-                  cwd: "/workspace",
-                  approvalPolicy: "never",
-                  approvalsReviewer: "auto_review",
-                  collaborationMode: { mode: "default", settings: { model: "gpt-6-astra" } },
-                  sandboxPolicy: { type: "dangerFullAccess" },
-                },
+          },
+        };
+        const initialSettings: CodexReplay.CodexAppServerReplayEntry = {
+          type: "emit_inbound",
+          frame: {
+            method: "thread/settings/updated",
+            params: {
+              threadId: RESUME_CHILD_THREAD,
+              threadSettings: {
+                model: "gpt-6-astra",
+                effort: "low",
+                serviceTier: "ultrafast",
+                modelProvider: "openai",
+                cwd: "/workspace",
+                approvalPolicy: "never",
+                approvalsReviewer: "auto_review",
+                collaborationMode: { mode: "default", settings: { model: "gpt-6-astra" } },
+                sandboxPolicy: { type: "dangerFullAccess" },
               },
             },
-          };
-          const harness = yield* makeCodexReplayHarness(
-            {
-              ...resumeSubagentTranscript,
-              entries: resumeSubagentTranscript.entries.flatMap((entry) =>
-                entry.type === "emit_inbound" && entry.label === "turn/completed/root"
-                  ? [entry, initialSettings, notification]
-                  : [entry],
-              ),
-            },
-            (event) =>
-              event.type === "subagent.updated" && event.subagent.model === model
-                ? Deferred.succeed(observed, undefined)
-                : Effect.void,
-            undefined,
-            (threadId) =>
-              Deferred.await(releaseMetadata).pipe(
-                Effect.as({ thread: { id: threadId }, model: "gpt-6-astra" }),
-              ),
-          );
-          yield* harness.runtime.startTurn(
-            makeCodexTestTurnInput({
-              threadId: harness.threadId,
-              providerThread: harness.providerThread,
-              now: yield* DateTime.now,
-              attemptId: RunAttemptId.make("attempt-child-model-update"),
-              text: RESUME_PROMPT,
-            }),
-          );
-          yield* TestClock.adjust("100 millis");
-          yield* Deferred.await(observed);
-          assert.equal(harness.subagentUpdates().at(-1)?.subagent.status, "completed");
-          yield* Deferred.succeed(releaseMetadata, undefined);
-          yield* TestClock.adjust("30 seconds");
-          assert.equal(harness.subagentUpdates().at(-1)?.subagent.model, model);
-          assert.deepEqual(harness.subagentUpdates().at(-1)?.subagent.modelSelection?.options, [
-            { id: "reasoningEffort", value: "low" },
-            { id: "serviceTier", value: "ultrafast" },
-          ]);
-        }).pipe(
-          Effect.provide(
-            Layer.mergeAll(
-              IdAllocator.layer,
-              McpProviderSessions.layer,
-              NodeServices.layer,
-              NodeCrypto.layer,
+          },
+        };
+        const harness = yield* makeCodexReplayHarness(
+          {
+            ...resumeSubagentTranscript,
+            entries: resumeSubagentTranscript.entries.flatMap((entry) =>
+              entry.type === "emit_inbound" && entry.label === "turn/completed/root"
+                ? [entry, initialSettings, notification]
+                : [entry],
             ),
+          },
+          (event) =>
+            event.type === "subagent.updated" && event.subagent.model === model
+              ? Deferred.succeed(observed, undefined)
+              : Effect.void,
+          undefined,
+          (threadId) =>
+            Deferred.await(releaseMetadata).pipe(
+              Effect.as({ thread: { id: threadId }, model: "gpt-6-astra" }),
+            ),
+        );
+        yield* harness.runtime.startTurn(
+          makeCodexTestTurnInput({
+            threadId: harness.threadId,
+            providerThread: harness.providerThread,
+            now: yield* DateTime.now,
+            attemptId: RunAttemptId.make("attempt-child-model-update"),
+            text: RESUME_PROMPT,
+          }),
+        );
+        yield* TestClock.adjust("100 millis");
+        yield* Deferred.await(observed);
+        assert.equal(harness.subagentUpdates().at(-1)?.subagent.status, "completed");
+        yield* Deferred.succeed(releaseMetadata, undefined);
+        yield* TestClock.adjust("30 seconds");
+        assert.equal(harness.subagentUpdates().at(-1)?.subagent.model, model);
+        assert.deepEqual(harness.subagentUpdates().at(-1)?.subagent.modelSelection?.options, [
+          { id: "reasoningEffort", value: "low" },
+          { id: "serviceTier", value: "ultrafast" },
+        ]);
+      }).pipe(
+        Effect.provide(
+          Layer.mergeAll(
+            IdAllocator.layer,
+            McpProviderSessions.layer,
+            NodeServices.layer,
+            NodeCrypto.layer,
           ),
         ),
       ),
@@ -8596,158 +8693,89 @@ describe("CodexAdapterV2 post-settle continuation", () => {
   it.effect.each(["activity", "spawn", "activity then spawn"] as const)(
     "creates a child from %s without the parent's effort",
     (source) =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const created = yield* Deferred.make<OrchestrationV2AppThread>();
-          const completed = yield* Deferred.make<OrchestrationV2Subagent>();
-          const activity = {
-            type: "subAgentActivity",
-            id: "call-codex-resume-spawn",
-            kind: "started",
-            agentThreadId: RESUME_CHILD_THREAD,
-            agentPath: "/root/resume_agent",
-          };
-          const spawn = {
-            type: "collabAgentToolCall",
-            id: "call-codex-resume-spawn",
-            tool: "spawnAgent",
-            status: "completed",
-            senderThreadId: RESUME_NATIVE_THREAD,
-            receiverThreadIds: [RESUME_CHILD_THREAD],
-            model: "gpt-5.4",
-            reasoningEffort: "high",
-            agentsStates: { [RESUME_CHILD_THREAD]: { status: "completed", message: "finished" } },
-          };
-          const items =
-            source === "activity" ? [activity] : source === "spawn" ? [spawn] : [activity, spawn];
-          const harness = yield* makeCodexReplayHarness(
-            makeCodexReplayTranscript({
-              scenario: RESUME_SCENARIO,
-              entries: [
-                ...codexReplayPreamble({
-                  nativeThreadId: RESUME_NATIVE_THREAD,
-                  nativeTurnId: RESUME_NATIVE_TURN,
-                  prompt: RESUME_PROMPT,
-                  effort: "low",
-                }),
-                ...items.map((item) => ({
-                  type: "emit_inbound" as const,
-                  frame: {
-                    method: "item/completed",
-                    params: {
-                      item,
-                      threadId: RESUME_NATIVE_THREAD,
-                      turnId: RESUME_NATIVE_TURN,
-                      completedAtMs: 1782622441000,
-                    },
-                  },
-                })),
-              ],
-            }),
-            (event) =>
-              event.type === "app_thread.created"
-                ? Deferred.succeed(created, event.appThread)
-                : event.type === "subagent.updated" && event.subagent.status === "completed"
-                  ? Deferred.succeed(completed, event.subagent)
-                  : Effect.void,
-          );
-          yield* harness.runtime.startTurn({
-            ...makeCodexTestTurnInput({
-              threadId: harness.threadId,
-              providerThread: harness.providerThread,
-              now: yield* DateTime.now,
-              attemptId: RunAttemptId.make("attempt-child-effort"),
-              text: RESUME_PROMPT,
-            }),
-            modelSelection: {
-              ...CODEX_TEST_MODEL_SELECTION,
-              options: [{ id: "reasoningEffort", value: "low" }],
-            },
-          });
-          const child = yield* Deferred.await(created);
-          assert.equal(
-            child.modelSelection.options?.find(({ id }) => id === "reasoningEffort")?.value,
-            source === "spawn" ? "high" : undefined,
-          );
-          if (source !== "activity") {
-            const task = yield* Deferred.await(completed);
-            assert.equal(
-              task.modelSelection?.options?.find(({ id }) => id === "reasoningEffort")?.value,
-              "high",
-            );
-            assert.lengthOf(
-              harness.events.filter((event) => event.type === "app_thread.created"),
-              1,
-            );
-          }
-        }).pipe(
-          Effect.provide(
-            Layer.mergeAll(
-              IdAllocator.layer,
-              McpProviderSessions.layer,
-              NodeServices.layer,
-              NodeCrypto.layer,
-            ),
-          ),
-        ),
-      ),
-  );
-
-  it.effect("preserves a subagent result across a trailing empty final and resume", () =>
-    Effect.scoped(
       Effect.gen(function* () {
-        const harness = yield* makeCodexReplayHarness(resumeSubagentTranscript);
-        const now = yield* DateTime.now;
-
-        yield* harness.runtime.startTurn(
-          makeCodexTestTurnInput({
+        const created = yield* Deferred.make<OrchestrationV2AppThread>();
+        const completed = yield* Deferred.make<OrchestrationV2Subagent>();
+        const activity = {
+          type: "subAgentActivity",
+          id: "call-codex-resume-spawn",
+          kind: "started",
+          agentThreadId: RESUME_CHILD_THREAD,
+          agentPath: "/root/resume_agent",
+        };
+        const spawn = {
+          type: "collabAgentToolCall",
+          id: "call-codex-resume-spawn",
+          tool: "spawnAgent",
+          status: "completed",
+          senderThreadId: RESUME_NATIVE_THREAD,
+          receiverThreadIds: [RESUME_CHILD_THREAD],
+          model: "gpt-5.4",
+          reasoningEffort: "high",
+          agentsStates: { [RESUME_CHILD_THREAD]: { status: "completed", message: "finished" } },
+        };
+        const items =
+          source === "activity" ? [activity] : source === "spawn" ? [spawn] : [activity, spawn];
+        const harness = yield* makeCodexReplayHarness(
+          makeCodexReplayTranscript({
+            scenario: RESUME_SCENARIO,
+            entries: [
+              ...codexReplayPreamble({
+                nativeThreadId: RESUME_NATIVE_THREAD,
+                nativeTurnId: RESUME_NATIVE_TURN,
+                prompt: RESUME_PROMPT,
+                effort: "low",
+              }),
+              ...items.map((item) => ({
+                type: "emit_inbound" as const,
+                frame: {
+                  method: "item/completed",
+                  params: {
+                    item,
+                    threadId: RESUME_NATIVE_THREAD,
+                    turnId: RESUME_NATIVE_TURN,
+                    completedAtMs: 1782622441000,
+                  },
+                },
+              })),
+            ],
+          }),
+          (event) =>
+            event.type === "app_thread.created"
+              ? Deferred.succeed(created, event.appThread)
+              : event.type === "subagent.updated" && event.subagent.status === "completed"
+                ? Deferred.succeed(completed, event.subagent)
+                : Effect.void,
+        );
+        yield* harness.runtime.startTurn({
+          ...makeCodexTestTurnInput({
             threadId: harness.threadId,
             providerThread: harness.providerThread,
-            now,
-            attemptId: RunAttemptId.make("attempt-codex-resume"),
+            now: yield* DateTime.now,
+            attemptId: RunAttemptId.make("attempt-child-effort"),
             text: RESUME_PROMPT,
           }),
+          modelSelection: {
+            ...CODEX_TEST_MODEL_SELECTION,
+            options: [{ id: "reasoningEffort", value: "low" }],
+          },
+        });
+        const child = yield* Deferred.await(created);
+        assert.equal(
+          child.modelSelection.options?.find(({ id }) => id === "reasoningEffort")?.value,
+          source === "spawn" ? "high" : undefined,
         );
-        yield* harness.until(() =>
-          harness.subagentUpdates().some((event) => event.subagent.result === "CODEX_FIRST_DONE"),
-        );
-        assert.lengthOf(
-          harness.subagentUpdates().filter((event) => event.subagent.result === "CODEX_FIRST_DONE"),
-          1,
-        );
-        yield* TestClock.adjust("100 millis");
-        yield* harness.awaitTerminal(1);
-        assert.equal(harness.terminalEvents()[0]?.status, "completed");
-        const settledUpdates = harness.subagentUpdates();
-        const firstCompletion = settledUpdates[settledUpdates.length - 1];
-        assert.equal(firstCompletion?.subagent.status, "completed");
-        assert.equal(firstCompletion?.subagent.result, "CODEX_FIRST_DONE");
-        assert.isFalse(yield* harness.hasPendingBackgroundWork);
-        const settledUpdateCount = settledUpdates.length;
-
-        yield* TestClock.adjust("30 seconds");
-        yield* harness.until(() => harness.subagentUpdates().length > settledUpdateCount);
-        const reopened = harness.subagentUpdates()[settledUpdateCount];
-        assert.equal(reopened?.subagent.status, "running");
-        assert.equal(DateTime.toEpochMillis(reopened!.subagent.startedAt!), 1782622470000);
-        assert.isNull(reopened!.subagent.completedAt);
-        assert.isTrue(yield* harness.hasPendingBackgroundWork);
-
-        yield* TestClock.adjust("30 seconds");
-        yield* harness.until(() => {
-          const updates = harness.subagentUpdates();
-          const latest = updates[updates.length - 1];
-          return (
-            latest !== undefined &&
-            latest.subagent.status === "completed" &&
-            latest.subagent.result === "CODEX_RESUME_DONE"
+        if (source !== "activity") {
+          const task = yield* Deferred.await(completed);
+          assert.equal(
+            task.modelSelection?.options?.find(({ id }) => id === "reasoningEffort")?.value,
+            "high",
           );
-        });
-        assert.isFalse(yield* harness.hasPendingBackgroundWork);
-        assert.lengthOf(harness.terminalEvents(), 1);
-        // The first child turn finished inside the root turn; only the resume wakes it.
-        assert.lengthOf(harness.continuationRequests, 1);
-        assert.include(harness.continuationRequests[0]?.detail, "CODEX_RESUME_DONE");
+          assert.lengthOf(
+            harness.events.filter((event) => event.type === "app_thread.created"),
+            1,
+          );
+        }
       }).pipe(
         Effect.provide(
           Layer.mergeAll(
@@ -8758,6 +8786,71 @@ describe("CodexAdapterV2 post-settle continuation", () => {
           ),
         ),
       ),
+  );
+
+  it.effect("preserves a subagent result across a trailing empty final and resume", () =>
+    Effect.gen(function* () {
+      const harness = yield* makeCodexReplayHarness(resumeSubagentTranscript);
+      const now = yield* DateTime.now;
+
+      yield* harness.runtime.startTurn(
+        makeCodexTestTurnInput({
+          threadId: harness.threadId,
+          providerThread: harness.providerThread,
+          now,
+          attemptId: RunAttemptId.make("attempt-codex-resume"),
+          text: RESUME_PROMPT,
+        }),
+      );
+      yield* harness.until(() =>
+        harness.subagentUpdates().some((event) => event.subagent.result === "CODEX_FIRST_DONE"),
+      );
+      assert.lengthOf(
+        harness.subagentUpdates().filter((event) => event.subagent.result === "CODEX_FIRST_DONE"),
+        1,
+      );
+      yield* TestClock.adjust("100 millis");
+      yield* harness.awaitTerminal(1);
+      assert.equal(harness.terminalEvents()[0]?.status, "completed");
+      const settledUpdates = harness.subagentUpdates();
+      const firstCompletion = settledUpdates[settledUpdates.length - 1];
+      assert.equal(firstCompletion?.subagent.status, "completed");
+      assert.equal(firstCompletion?.subagent.result, "CODEX_FIRST_DONE");
+      assert.isFalse(yield* harness.hasPendingBackgroundWork);
+      const settledUpdateCount = settledUpdates.length;
+
+      yield* TestClock.adjust("30 seconds");
+      yield* harness.until(() => harness.subagentUpdates().length > settledUpdateCount);
+      const reopened = harness.subagentUpdates()[settledUpdateCount];
+      assert.equal(reopened?.subagent.status, "running");
+      assert.equal(DateTime.toEpochMillis(reopened!.subagent.startedAt!), 1782622470000);
+      assert.isNull(reopened!.subagent.completedAt);
+      assert.isTrue(yield* harness.hasPendingBackgroundWork);
+
+      yield* TestClock.adjust("30 seconds");
+      yield* harness.until(() => {
+        const updates = harness.subagentUpdates();
+        const latest = updates[updates.length - 1];
+        return (
+          latest !== undefined &&
+          latest.subagent.status === "completed" &&
+          latest.subagent.result === "CODEX_RESUME_DONE"
+        );
+      });
+      assert.isFalse(yield* harness.hasPendingBackgroundWork);
+      assert.lengthOf(harness.terminalEvents(), 1);
+      // The first child turn finished inside the root turn; only the resume wakes it.
+      assert.lengthOf(harness.continuationRequests, 1);
+      assert.include(harness.continuationRequests[0]?.detail, "CODEX_RESUME_DONE");
+    }).pipe(
+      Effect.provide(
+        Layer.mergeAll(
+          IdAllocator.layer,
+          McpProviderSessions.layer,
+          NodeServices.layer,
+          NodeCrypto.layer,
+        ),
+      ),
     ),
   );
 
@@ -8770,156 +8863,154 @@ describe("CodexAdapterV2 post-settle continuation", () => {
   ] as const)(
     "normalizes subagent %s without losing its lifecycle",
     ([nativeStatus, expectedStatus]) =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const marker = yield* Deferred.make<void>();
-          const firstCompletion = yield* Deferred.make<void>();
-          const stateEntry = (
-            status: string,
-            id: string,
-          ): Extract<CodexReplay.CodexAppServerReplayEntry, { type: "emit_inbound" }> => ({
+      Effect.gen(function* () {
+        const marker = yield* Deferred.make<void>();
+        const firstCompletion = yield* Deferred.make<void>();
+        const stateEntry = (
+          status: string,
+          id: string,
+        ): Extract<CodexReplay.CodexAppServerReplayEntry, { type: "emit_inbound" }> => ({
+          type: "emit_inbound",
+          label: id,
+          frame: {
+            method: "item/completed",
+            params: {
+              threadId: RESUME_NATIVE_THREAD,
+              turnId: RESUME_NATIVE_TURN,
+              item: {
+                type: "collabAgentToolCall",
+                id,
+                tool: "listAgents",
+                status: "completed",
+                senderThreadId: RESUME_NATIVE_THREAD,
+                receiverThreadIds: [RESUME_CHILD_THREAD],
+                agentsStates: { [RESUME_CHILD_THREAD]: { status, message: null } },
+              },
+            },
+          },
+        });
+        const entries: Array<CodexReplay.CodexAppServerReplayEntry> = [
+          ...codexReplayPreamble({
+            nativeThreadId: RESUME_NATIVE_THREAD,
+            nativeTurnId: RESUME_NATIVE_TURN,
+            prompt: RESUME_PROMPT,
+          }),
+          resumeSubagentTranscript.entries.find(
+            (e) =>
+              e.type === "emit_inbound" && e.label === "item/completed/subAgentActivity-started",
+          )!,
+        ];
+        if (nativeStatus === "late-activity-completed") {
+          entries.push(
+            resumeSubagentTranscript.entries.find(
+              (e) => e.type === "emit_inbound" && e.label === "turn/completed/root",
+            )!,
+          );
+        }
+        if (nativeStatus === "activity-completed" || nativeStatus === "late-activity-completed") {
+          entries.push({
             type: "emit_inbound",
-            label: id,
+            label: "activity-done",
             frame: {
               method: "item/completed",
               params: {
                 threadId: RESUME_NATIVE_THREAD,
                 turnId: RESUME_NATIVE_TURN,
                 item: {
-                  type: "collabAgentToolCall",
-                  id,
-                  tool: "listAgents",
-                  status: "completed",
-                  senderThreadId: RESUME_NATIVE_THREAD,
-                  receiverThreadIds: [RESUME_CHILD_THREAD],
-                  agentsStates: { [RESUME_CHILD_THREAD]: { status, message: null } },
+                  type: "subAgentActivity",
+                  id: "activity-done",
+                  kind: "completed",
+                  agentThreadId: RESUME_CHILD_THREAD,
+                  agentPath: "/root/resume_agent",
                 },
               },
             },
           });
-          const entries: Array<CodexReplay.CodexAppServerReplayEntry> = [
-            ...codexReplayPreamble({
-              nativeThreadId: RESUME_NATIVE_THREAD,
-              nativeTurnId: RESUME_NATIVE_TURN,
-              prompt: RESUME_PROMPT,
-            }),
-            resumeSubagentTranscript.entries.find(
-              (e) =>
-                e.type === "emit_inbound" && e.label === "item/completed/subAgentActivity-started",
-            )!,
-          ];
-          if (nativeStatus === "late-activity-completed") {
-            entries.push(
-              resumeSubagentTranscript.entries.find(
-                (e) => e.type === "emit_inbound" && e.label === "turn/completed/root",
-              )!,
-            );
-          }
-          if (nativeStatus === "activity-completed" || nativeStatus === "late-activity-completed") {
-            entries.push({
-              type: "emit_inbound",
-              label: "activity-done",
-              frame: {
-                method: "item/completed",
-                params: {
-                  threadId: RESUME_NATIVE_THREAD,
-                  turnId: RESUME_NATIVE_TURN,
-                  item: {
-                    type: "subAgentActivity",
-                    id: "activity-done",
-                    kind: "completed",
-                    agentThreadId: RESUME_CHILD_THREAD,
-                    agentPath: "/root/resume_agent",
-                  },
-                },
-              },
-            });
-          } else if (nativeStatus === "stale-running" || nativeStatus === "duplicate-completed") {
-            entries.push(stateEntry("completed", "child-completed"), {
-              ...stateEntry(
-                nativeStatus === "stale-running" ? "running" : "completed",
-                "trailing-snapshot",
-              ),
-              afterMs: 100,
-            });
-          } else {
-            entries.push(stateEntry(nativeStatus, "status-update"));
-          }
-          if (nativeStatus === "late-activity-completed") {
-            entries.push({
-              type: "emit_inbound",
-              label: "late-marker",
-              frame: {
-                method: "turn/started",
-                params: {
-                  threadId: RESUME_CHILD_THREAD,
-                  turn: makeCodexReplayTurn({ id: RESUME_CHILD_TURN_1, status: "inProgress" }),
-                },
+        } else if (nativeStatus === "stale-running" || nativeStatus === "duplicate-completed") {
+          entries.push(stateEntry("completed", "child-completed"), {
+            ...stateEntry(
+              nativeStatus === "stale-running" ? "running" : "completed",
+              "trailing-snapshot",
+            ),
+            afterMs: 100,
+          });
+        } else {
+          entries.push(stateEntry(nativeStatus, "status-update"));
+        }
+        if (nativeStatus === "late-activity-completed") {
+          entries.push({
+            type: "emit_inbound",
+            label: "late-marker",
+            frame: {
+              method: "turn/started",
+              params: {
+                threadId: RESUME_CHILD_THREAD,
+                turn: makeCodexReplayTurn({ id: RESUME_CHILD_TURN_1, status: "inProgress" }),
               },
-            });
-          } else {
-            entries.push({
-              type: "emit_inbound",
-              label: "marker",
-              frame: {
-                method: "item/completed",
-                params: {
-                  threadId: RESUME_NATIVE_THREAD,
-                  turnId: RESUME_NATIVE_TURN,
-                  item: {
-                    type: "agentMessage",
-                    id: "marker",
-                    text: "LIFECYCLE_MARKER",
-                    phase: "final_answer",
-                    memoryCitation: null,
-                  },
+            },
+          });
+        } else {
+          entries.push({
+            type: "emit_inbound",
+            label: "marker",
+            frame: {
+              method: "item/completed",
+              params: {
+                threadId: RESUME_NATIVE_THREAD,
+                turnId: RESUME_NATIVE_TURN,
+                item: {
+                  type: "agentMessage",
+                  id: "marker",
+                  text: "LIFECYCLE_MARKER",
+                  phase: "final_answer",
+                  memoryCitation: null,
                 },
               },
-            });
-          }
-          const harness = yield* makeCodexReplayHarness(
-            makeCodexReplayTranscript({ scenario: `subagent-${nativeStatus}`, entries }),
-            (event) =>
-              (event.type === "message.updated" && event.message.text === "LIFECYCLE_MARKER") ||
-              (nativeStatus === "late-activity-completed" &&
-                event.type === "provider_turn.updated" &&
-                event.providerTurn.nativeTurnRef?.nativeId === RESUME_CHILD_TURN_1)
-                ? Deferred.succeed(marker, undefined)
-                : event.type === "subagent.updated" && event.subagent.status === "completed"
-                  ? Deferred.succeed(firstCompletion, undefined)
-                  : Effect.void,
-          );
-          yield* harness.runtime.startTurn(
-            makeCodexTestTurnInput({
-              threadId: harness.threadId,
-              providerThread: harness.providerThread,
-              now: yield* DateTime.now,
-              attemptId: RunAttemptId.make(`subagent-${nativeStatus}`),
-              text: RESUME_PROMPT,
-            }),
+            },
+          });
+        }
+        const harness = yield* makeCodexReplayHarness(
+          makeCodexReplayTranscript({ scenario: `subagent-${nativeStatus}`, entries }),
+          (event) =>
+            (event.type === "message.updated" && event.message.text === "LIFECYCLE_MARKER") ||
+            (nativeStatus === "late-activity-completed" &&
+              event.type === "provider_turn.updated" &&
+              event.providerTurn.nativeTurnRef?.nativeId === RESUME_CHILD_TURN_1)
+              ? Deferred.succeed(marker, undefined)
+              : event.type === "subagent.updated" && event.subagent.status === "completed"
+                ? Deferred.succeed(firstCompletion, undefined)
+                : Effect.void,
+        );
+        yield* harness.runtime.startTurn(
+          makeCodexTestTurnInput({
+            threadId: harness.threadId,
+            providerThread: harness.providerThread,
+            now: yield* DateTime.now,
+            attemptId: RunAttemptId.make(`subagent-${nativeStatus}`),
+            text: RESUME_PROMPT,
+          }),
+        );
+        if (nativeStatus === "stale-running" || nativeStatus === "duplicate-completed") {
+          yield* Deferred.await(firstCompletion);
+          yield* TestClock.adjust("100 millis");
+        }
+        yield* Deferred.await(marker);
+        const latest = harness.subagentUpdates().at(-1)!.subagent;
+        assert.equal(latest.status, expectedStatus);
+        if (nativeStatus === "duplicate-completed") {
+          const first = harness.subagentUpdates().find((e) => e.subagent.status === "completed")!;
+          assert.equal(
+            DateTime.toEpochMillis(latest.completedAt!),
+            DateTime.toEpochMillis(first.subagent.completedAt!),
           );
-          if (nativeStatus === "stale-running" || nativeStatus === "duplicate-completed") {
-            yield* Deferred.await(firstCompletion);
-            yield* TestClock.adjust("100 millis");
-          }
-          yield* Deferred.await(marker);
-          const latest = harness.subagentUpdates().at(-1)!.subagent;
-          assert.equal(latest.status, expectedStatus);
-          if (nativeStatus === "duplicate-completed") {
-            const first = harness.subagentUpdates().find((e) => e.subagent.status === "completed")!;
-            assert.equal(
-              DateTime.toEpochMillis(latest.completedAt!),
-              DateTime.toEpochMillis(first.subagent.completedAt!),
-            );
-          }
-        }).pipe(
-          Effect.provide(
-            Layer.mergeAll(
-              IdAllocator.layer,
-              McpProviderSessions.layer,
-              NodeServices.layer,
-              NodeCrypto.layer,
-            ),
+        }
+      }).pipe(
+        Effect.provide(
+          Layer.mergeAll(
+            IdAllocator.layer,
+            McpProviderSessions.layer,
+            NodeServices.layer,
+            NodeCrypto.layer,
           ),
         ),
       ),
diff --git a/apps/server/src/orchestration-v2/Adapters/CodexAdapterV2.ts b/apps/server/src/orchestration-v2/Adapters/CodexAdapterV2.ts
index 4e8fd1ac5f30..efa5d0a9c28f 100644
--- a/apps/server/src/orchestration-v2/Adapters/CodexAdapterV2.ts
+++ b/apps/server/src/orchestration-v2/Adapters/CodexAdapterV2.ts
@@ -38,7 +38,9 @@ import {
   ProviderDriverKind,
   ProviderSetupError,
   type ServerProviderCompatibilityAdvisory,
+  type ServerProviderModel,
   isDelegatedAppThread,
+  ThreadId,
 } from "@t3tools/contracts";
 import { SKILL_MENTION_PATTERN } from "@t3tools/shared/composerInlineTokens";
 import { AgentScope } from "@t3tools/shared/AgentScope";
@@ -77,7 +79,6 @@ import type {
   ProviderTurnId,
   ProviderInstanceId,
   RuntimeMode,
-  ThreadId,
 } from "@t3tools/contracts";
 import * as CodexClient from "effect-codex-app-server/client";
 import * as CodexErrors from "effect-codex-app-server/errors";
@@ -667,14 +668,15 @@ function answerValueToStrings(value: unknown): ReadonlyArray<string> {
 
 function toCodexUserInputAnswers(
   answers: ProviderUserInputAnswers,
-  allowedQuestionIds: ReadonlySet<string>,
+  nativeQuestionIds: ReadonlyMap<string, string>,
 ): CodexSchema.ToolRequestUserInputResponse["answers"] {
   return Object.fromEntries(
-    Object.entries(answers).flatMap(([questionId, value]) =>
-      allowedQuestionIds.has(questionId)
-        ? [[questionId, { answers: [...answerValueToStrings(value)] }]]
-        : [],
-    ),
+    Object.entries(answers).flatMap(([questionId, value]) => {
+      const nativeId = nativeQuestionIds.get(questionId);
+      return nativeId === undefined
+        ? []
+        : [[nativeId, { answers: [...answerValueToStrings(value)] }]];
+    }),
   );
 }
 
@@ -712,19 +714,8 @@ const decodeTurnReasoningEffort = Schema.decodeUnknownEffect(
   Schema.Union([CodexSchema.V2TurnStartParams__ReasoningEffort, Schema.Null]),
 );
 
-const CodexTurnStartParamsWithCollaborationMode = CodexSchema.V2TurnStartParams.pipe(
-  Schema.fieldsAssign({
-    collaborationMode: Schema.optionalKey(CodexSchema.ClientRequest__CollaborationMode),
-    additionalContext: Schema.optionalKey(
-      Schema.Record(Schema.String, CodexSchema.V2TurnStartParams__AdditionalContextEntry),
-    ),
-  }),
-);
-type CodexTurnStartParamsWithCollaborationMode =
-  typeof CodexTurnStartParamsWithCollaborationMode.Type;
-const decodeCodexTurnStartParamsWithCollaborationMode = Schema.decodeUnknownEffect(
-  CodexTurnStartParamsWithCollaborationMode,
-);
+type CodexTurnStartParams = typeof CodexClient.V2TurnStartParams.Type;
+const decodeCodexTurnStartParams = Schema.decodeUnknownEffect(CodexClient.V2TurnStartParams);
 const isProviderAdapterRuntimeRequestResponseError = Schema.is(
   ProviderAdapter.ProviderAdapterRuntimeRequestResponseError,
 );
@@ -770,6 +761,18 @@ function codexRuntimeModeTurnDefaults(runtimeMode: RuntimeMode): {
   }
 }
 
+const isCodexCyberAccessProgram = Schema.is(CodexSchema.V2TurnStartParams__CyberAccessProgram);
+
+function codexCyberAccess(
+  models: ReadonlyArray<ServerProviderModel>,
+  model: string,
+): { readonly defaultProgram: string | undefined } | undefined {
+  const descriptor = models
+    .find((candidate) => candidate.slug === model)
+    ?.capabilities?.optionDescriptors?.find((candidate) => candidate.id === "cyberAccessProgram");
+  return descriptor?.type === "select" ? { defaultProgram: descriptor.currentValue } : undefined;
+}
+
 export const buildCodexTurnStartParams = Effect.fn("CodexAdapterV2.buildCodexTurnStartParams")(
   function* (input: {
     readonly nativeThreadId: string;
@@ -782,6 +785,8 @@ export const buildCodexTurnStartParams = Effect.fn("CodexAdapterV2.buildCodexTur
     /** ChatGPT token sharing does not accept service tiers. */
     readonly omitServiceTier?: boolean;
     readonly appContext?: ProviderAdapter.ProviderAdapterV2TurnInput["appContext"];
+    /** Set only for a model that offers Cyber Access; custom models never do. */
+    readonly cyberAccess?: { readonly defaultProgram: string | undefined } | undefined;
     /** The user's `model_reasoning_summary` from the Codex config, when set. */
     readonly configuredReasoningSummary?: CodexSchema.V2TurnStartParams__ReasoningSummary;
   }) {
@@ -803,6 +808,14 @@ export const buildCodexTurnStartParams = Effect.fn("CodexAdapterV2.buildCodexTur
       input.omitServiceTier === true
         ? undefined
         : getCodexServiceTierOptionValue(input.modelSelection);
+    // A chosen program goes as is, even one the model lacks, so Codex rejects it visibly.
+    const cyberAccessProgram =
+      input.cyberAccess === undefined
+        ? undefined
+        : [
+            getModelSelectionStringOptionValue(input.modelSelection, "cyberAccessProgram"),
+            input.cyberAccess.defaultProgram,
+          ].find(isCodexCyberAccessProgram);
     // MCP-written app context must be quoted user input, not developer instructions.
     const appContext = Object.fromEntries(
       (input.appContext ?? []).map((entry) => [
@@ -824,7 +837,7 @@ export const buildCodexTurnStartParams = Effect.fn("CodexAdapterV2.buildCodexTur
       t3Context === undefined && Object.keys(appContext).length === 0
         ? undefined
         : { ...t3Context, ...appContext };
-    return yield* decodeCodexTurnStartParamsWithCollaborationMode({
+    return yield* decodeCodexTurnStartParams({
       threadId: input.nativeThreadId,
       input: input.codexInput,
       ...(additionalContext ? { additionalContext } : {}),
@@ -839,6 +852,8 @@ export const buildCodexTurnStartParams = Effect.fn("CodexAdapterV2.buildCodexTur
       ...(sandboxPolicy === undefined ? {} : { sandboxPolicy }),
       ...(effort === undefined ? {} : { effort }),
       ...(serviceTier === undefined ? {} : { serviceTier }),
+      // Codex keeps no per-thread choice for this, so every turn must carry it.
+      ...(cyberAccessProgram === undefined ? {} : { cyberAccessProgram }),
       // Codex supplies its own mode instructions; send both modes to clear Plan on exit.
       collaborationMode: {
         mode: input.runtimePolicy.interactionMode,
@@ -1529,9 +1544,77 @@ export const makeCodexAppServerSpawnCommand = Effect.fn(
   });
 });
 
+function readCodexProtocolPath(value: unknown, ...path: ReadonlyArray<string>): unknown {
+  let current = value;
+  for (const key of path) {
+    if (current === null || typeof current !== "object") return undefined;
+    current = Reflect.get(current, key);
+  }
+  return current;
+}
+
+const CODEX_THREAD_ENV_CONFIG_KEY = `shell_environment_policy.set.${PortScanner.AGENT_THREAD_ENV}`;
+
+/**
+ * One app-server serves every Codex thread on an instance, so each frame is routed to the
+ * T3 thread it belongs to. Frames tied to no thread, such as `initialize`, go to the global log.
+ */
+function makeCodexProtocolThreadRouter() {
+  const threadIdsByNativeId = new Map<string, ThreadId>();
+  const threadIdsByRequest = new Map<string, ThreadId>();
+  return (direction: "incoming" | "outgoing", frame: unknown): ThreadId | null => {
+    const id = readCodexProtocolPath(frame, "id");
+    const method = readCodexProtocolPath(frame, "method");
+    const isRequest = typeof method === "string";
+    const requestKey =
+      typeof id === "string" || typeof id === "number"
+        ? `${isRequest === (direction === "outgoing") ? "client" : "server"}:${id}`
+        : undefined;
+    if (!isRequest) {
+      if (requestKey === undefined) return null;
+      const threadId = threadIdsByRequest.get(requestKey);
+      threadIdsByRequest.delete(requestKey);
+      const nativeThreadId = readCodexProtocolPath(frame, "result", "thread", "id");
+      if (threadId !== undefined && typeof nativeThreadId === "string") {
+        threadIdsByNativeId.set(nativeThreadId, threadId);
+      }
+      return threadId ?? null;
+    }
+
+    const params = readCodexProtocolPath(frame, "params");
+    const configuredThreadId = readCodexProtocolPath(params, "config", CODEX_THREAD_ENV_CONFIG_KEY);
+    const nativeThreadId =
+      readCodexProtocolPath(params, "threadId") ?? readCodexProtocolPath(params, "thread", "id");
+    let threadId =
+      typeof configuredThreadId === "string"
+        ? ThreadId.make(configuredThreadId)
+        : typeof nativeThreadId === "string"
+          ? threadIdsByNativeId.get(nativeThreadId)
+          : undefined;
+    if (threadId === undefined && typeof nativeThreadId === "string") {
+      const parentNativeThreadId = readCodexProtocolPath(
+        params,
+        "thread",
+        "source",
+        "subAgent",
+        "thread_spawn",
+        "parent_thread_id",
+      );
+      threadId =
+        typeof parentNativeThreadId === "string"
+          ? threadIdsByNativeId.get(parentNativeThreadId)
+          : undefined;
+      if (threadId !== undefined) threadIdsByNativeId.set(nativeThreadId, threadId);
+    }
+    if (threadId !== undefined && requestKey !== undefined) {
+      threadIdsByRequest.set(requestKey, threadId);
+    }
+    return threadId ?? null;
+  };
+}
+
 export function makeCodexAppServerProtocolLogger(input: {
   readonly nativeEventLogger: ProviderEventLoggers.EventNdjsonLogger | undefined;
-  readonly threadId: ThreadId;
   readonly providerSessionId: OrchestrationV2ProviderSession["id"];
 }): CodexClient.CodexAppServerClientOptions["logger"] | undefined {
   const { nativeEventLogger } = input;
@@ -1539,8 +1622,10 @@ export function makeCodexAppServerProtocolLogger(input: {
     return undefined;
   }
 
+  const routeThread = makeCodexProtocolThreadRouter();
   return (event) => {
     if (!shouldPersistProviderEvent("native", event)) return Effect.void;
+    const threadId = event.stage === "decoded" ? routeThread(event.direction, event.payload) : null;
     return nativeEventLogger
       .write(
         {
@@ -1550,7 +1635,7 @@ export function makeCodexAppServerProtocolLogger(input: {
           providerSessionId: input.providerSessionId,
           event: redactCodexProtocolValue(boundProviderEventForLogging(event)),
         },
-        input.threadId,
+        threadId,
       )
       .pipe(Effect.ignore);
   };
@@ -1652,7 +1737,6 @@ export const layerAppServerClientFactory: Layer.Layer<
         );
         const protocolLogger = makeCodexAppServerProtocolLogger({
           nativeEventLogger,
-          threadId: input.threadId,
           providerSessionId: input.providerSessionId,
         });
         const clientOptions: CodexClient.CodexAppServerClientOptions =
@@ -1683,7 +1767,10 @@ export type CodexAdapterV2DriverEnv =
 
 export const createCodexAdapterV2 = Effect.fn("CodexAdapterV2.createCodexAdapterV2")(function* (
   { instanceId, environment, enabled, config }: ProviderAdapterDriverCreateInput<CodexSettings>,
-  hooks: Pick<CodexAdapterV2Options, "onUsageLimits" | "resolveRuntime" | "compatibility"> = {},
+  hooks: Pick<
+    CodexAdapterV2Options,
+    "onUsageLimits" | "resolveRuntime" | "compatibility" | "models"
+  > = {},
 ) {
   const clientFactory = yield* CodexAppServerClientFactory;
   const continuationRequests = yield* ProviderContinuationRequests.ProviderContinuationRequests;
@@ -1733,6 +1820,8 @@ export interface CodexAdapterV2Options {
   readonly environment: NodeJS.ProcessEnv;
   readonly clientFactory: CodexAppServerClientFactoryShape;
   readonly onUsageLimits?: ManagedServerProvider["applyUsageLimits"];
+  /** The provider's published models, read per turn for catalog defaults. */
+  readonly models?: Effect.Effect<ReadonlyArray<ServerProviderModel>>;
   readonly resolveRuntime?: Effect.Effect<CodexEffectiveRuntime, ProviderSetupError, Scope.Scope>;
   readonly compatibility?: (
     version: string,
@@ -1792,10 +1881,7 @@ export const makeCodexAdapterV2 = Effect.fn("makeCodexAdapterV2")(function* (
           environment: resolvedRuntime?.environment ?? adapterOptions.environment,
         });
         const additionalContextByThread = yield* Ref.make(
-          new Map<
-            string,
-            NonNullable<CodexTurnStartParamsWithCollaborationMode["additionalContext"]>
-          >(),
+          new Map<string, NonNullable<CodexTurnStartParams["additionalContext"]>>(),
         );
         const threadsAwaitingContextRestore = yield* Ref.make(new Set<string>());
         // Codex drops client developer messages during compaction but only resends additionalContext
@@ -4540,6 +4626,12 @@ export const makeCodexAdapterV2 = Effect.fn("makeCodexAdapterV2")(function* (
               `Provider thread ${input.context.providerThread.id} is missing a provider session id.`,
             );
           }
+          const nativeQuestionIds = new Map(
+            input.questions.map((question, index) => [
+              nonEmptyText(question.id, `question-${index + 1}`),
+              question.id,
+            ]),
+          );
           const questions = input.questions.map((question, index) => ({
             id: nonEmptyText(question.id, `question-${index + 1}`),
             header: nonEmptyText(question.header, "Question"),
@@ -4614,7 +4706,7 @@ export const makeCodexAdapterV2 = Effect.fn("makeCodexAdapterV2")(function* (
             questions,
             ...(input.responseMode === undefined ? {} : { responseMode: input.responseMode }),
           };
-          return { node, request, turnItem };
+          return { node, request, turnItem, nativeQuestionIds };
         });
 
         yield* client.handleServerNotification("item/agentMessage/delta", (payload) =>
@@ -6087,10 +6179,7 @@ export const makeCodexAdapterV2 = Effect.fn("makeCodexAdapterV2")(function* (
               ),
             );
             return {
-              answers: toCodexUserInputAnswers(
-                resolved,
-                new Set(payload.questions.map((question) => question.id)),
-              ),
+              answers: toCodexUserInputAnswers(resolved, artifacts.nativeQuestionIds),
             } satisfies CodexSchema.ToolRequestUserInputResponse;
           }).pipe(Effect.orDie),
         );
@@ -7240,6 +7329,7 @@ export const makeCodexAdapterV2 = Effect.fn("makeCodexAdapterV2")(function* (
           ) {
             const threadId = yield* getNativeThreadId(turnInput.providerThread);
             const mcpSession = yield* mcpSessions.read(turnInput.threadId);
+            const models = adapterOptions.models === undefined ? [] : yield* adapterOptions.models;
             const configuredReasoningSummary = yield* client
               .request("config/read", { cwd: turnInput.runtimePolicy.cwd, includeLayers: false })
               .pipe(
@@ -7249,6 +7339,7 @@ export const makeCodexAdapterV2 = Effect.fn("makeCodexAdapterV2")(function* (
                 ),
               );
             const turnStartParams = yield* buildCodexTurnStartParams({
+              cyberAccess: codexCyberAccess(models, turnInput.modelSelection.model),
               nativeThreadId: threadId,
               codexInput,
               runtimePolicy: turnInput.runtimePolicy,
diff --git a/apps/server/src/orchestration-v2/Adapters/FxAdapterV2.test.ts b/apps/server/src/orchestration-v2/Adapters/FxAdapterV2.test.ts
index a4732c6efe21..7a39e5468cfb 100644
--- a/apps/server/src/orchestration-v2/Adapters/FxAdapterV2.test.ts
+++ b/apps/server/src/orchestration-v2/Adapters/FxAdapterV2.test.ts
@@ -287,7 +287,7 @@ describe("FxAdapterV2", () => {
           ],
         }),
       { discard: true },
-    ).pipe(Effect.provide(testLayer), Effect.scoped),
+    ).pipe(Effect.provide(testLayer)),
   );
 
   it.effect("puts a loaded session that ran a named model back on fx's default for Default", () =>
@@ -309,7 +309,7 @@ describe("FxAdapterV2", () => {
         // Written on load even though fx reports ask.
         ...setConfig("mode", "ask", fxConfig({ model: FX_DEFAULT_MODEL, modes: FX_0_0_13_MODES })),
       ],
-    }).pipe(Effect.provide(testLayer), Effect.scoped),
+    }).pipe(Effect.provide(testLayer)),
   );
 
   // `fx status` names the gateway default, but this loaded session runs on
@@ -334,7 +334,7 @@ describe("FxAdapterV2", () => {
           fxConfig({ model: CODEX_MODEL, models: [CODEX_MODEL], modes: FX_0_0_13_MODES }),
         ),
       ],
-    }).pipe(Effect.provide(testLayer), Effect.scoped),
+    }).pipe(Effect.provide(testLayer)),
   );
 
   // fx 0.0.13's gateway takes any model id (src/acp/server.zig
@@ -367,6 +367,6 @@ describe("FxAdapterV2", () => {
         outbound("session/prompt"),
         answer("session/prompt", { stopReason: "end_turn" }),
       ],
-    }).pipe(Effect.provide(testLayer), Effect.scoped),
+    }).pipe(Effect.provide(testLayer)),
   );
 });
diff --git a/apps/server/src/orchestration-v2/Adapters/KiroAdapterV2.test.ts b/apps/server/src/orchestration-v2/Adapters/KiroAdapterV2.test.ts
index 30304449c0f0..fb2f20bddd2e 100644
--- a/apps/server/src/orchestration-v2/Adapters/KiroAdapterV2.test.ts
+++ b/apps/server/src/orchestration-v2/Adapters/KiroAdapterV2.test.ts
@@ -18,6 +18,7 @@ import {
 } from "@t3tools/contracts";
 import { resolveSelfInvocation } from "@t3tools/shared/nodeRuntime";
 import { htmlRenderFromToolItem } from "@t3tools/shared/toolOutput";
+import * as Cause from "effect/Cause";
 import * as DateTime from "effect/DateTime";
 import * as Deferred from "effect/Deferred";
 import * as Effect from "effect/Effect";
@@ -38,8 +39,11 @@ import type * as AcpSessionRuntime from "@t3tools/provider-acp/server/AcpSession
 import * as IdAllocator from "@t3tools/provider-core/server/IdAllocator";
 import * as McpProviderSessions from "@t3tools/provider-core/server/McpProviderSessions";
 import {
+  ProviderAdapterTurnStartError,
   type ProviderAdapterV2Error,
   type ProviderAdapterV2Event,
+  type ProviderAdapterV2TurnInput,
+  ProviderCompactionUnsupportedError,
   ProviderAdapterV2RuntimePolicy,
 } from "@t3tools/provider-core/server/ProviderAdapter";
 import {
@@ -316,6 +320,8 @@ const runKiroScript = Effect.fn("runKiroScript")(function* (input: {
       model: string,
       options?: ModelSelection["options"],
     ) => Effect.Effect<void, ProviderAdapterV2Error>;
+    /** Runs T3's compact action as turn `ordinal`. */
+    readonly compact: (ordinal: number) => Effect.Effect<void, ProviderAdapterV2Error>;
     readonly interrupt: (
       providerTurnId: ProviderTurnId,
     ) => Effect.Effect<void, ProviderAdapterV2Error>;
@@ -390,10 +396,15 @@ const runKiroScript = Effect.fn("runKiroScript")(function* (input: {
     });
     const providerThread = yield* session.ensureThread({ threadId, modelSelection, runtimePolicy });
     const now = yield* DateTime.now;
-    const startTurnOn = (ordinal: number, model: string, options?: ModelSelection["options"]) => {
+    const turnInput = (
+      ordinal: number,
+      model: string,
+      options?: ModelSelection["options"],
+      text = "Say hello",
+    ): ProviderAdapterV2TurnInput => {
       const suffix = `${threadId}:${ordinal}`;
       const turnSelection = { instanceId, model, ...(options === undefined ? {} : { options }) };
-      return session.startTurn({
+      return {
         appThread: {
           createdBy: "user",
           creationSource: "web",
@@ -428,17 +439,26 @@ const runKiroScript = Effect.fn("runKiroScript")(function* (input: {
           createdBy: "user",
           creationSource: "web",
           messageId: MessageId.make(`message:${suffix}`),
-          text: "Say hello",
+          text,
           attachments: [],
         },
         modelSelection: turnSelection,
         runtimePolicy,
-      });
+      };
     };
+    const startTurnOn = (ordinal: number, model: string, options?: ModelSelection["options"]) =>
+      session.startTurn(turnInput(ordinal, model, options));
+    const compact = (ordinal: number) =>
+      session.compactThread === undefined
+        ? Effect.die("Kiro adapter does not offer compactThread")
+        : session.compactThread(
+            turnInput(ordinal, modelSelection.model, input.options, "/compact"),
+          );
     yield* input.drive({
       events: session.events,
       startTurn: startTurnOn(1, modelSelection.model, input.options),
       startTurnOn,
+      compact,
       interrupt: (providerTurnId) => session.interruptTurn({ providerThread, providerTurnId }),
       respond: (requestId, decision) => session.respondToRuntimeRequest({ requestId, decision }),
     });
@@ -460,7 +480,7 @@ const terminalStatus = (events: ReadonlyArray<ProviderAdapterV2Event>) => {
 };
 
 describe("KiroAdapterV2", () => {
-  it.effect("opens a session on a deployment that advertises no Kiro extensions", () =>
+  it.effect("opens a session and refuses compaction on a deployment with no Kiro extensions", () =>
     runKiroScript({
       scenario: "no-extensions",
       frames: [
@@ -476,12 +496,20 @@ describe("KiroAdapterV2", () => {
         }),
         answer("session/prompt", { stopReason: "end_turn" }),
       ],
-      drive: ({ events, startTurn }) =>
+      drive: ({ events, startTurn, compact }) =>
         Effect.gen(function* () {
           yield* startTurn;
           assert.equal(terminalStatus(yield* collectTurn(events)), "completed");
+          // `_kiro/session/compact` is not advertised, so T3 must not send it.
+          const compacted = yield* Effect.exit(compact(2));
+          const error = Exit.isFailure(compacted) ? Cause.squash(compacted.cause) : undefined;
+          assert.instanceOf(error, ProviderAdapterTurnStartError);
+          assert.instanceOf(
+            (error as ProviderAdapterTurnStartError).cause,
+            ProviderCompactionUnsupportedError,
+          );
         }),
-    }).pipe(Effect.provide(testLayer), Effect.scoped),
+    }).pipe(Effect.provide(testLayer)),
   );
 
   it.effect("switches back to Kiro's default model after a named one", () =>
@@ -529,7 +557,7 @@ describe("KiroAdapterV2", () => {
             assert.equal(terminalStatus(yield* collectTurn(events)), "completed");
           }
         }),
-    }).pipe(Effect.provide(testLayer), Effect.scoped),
+    }).pipe(Effect.provide(testLayer)),
   );
 
   it.effect("sets the thread's effort once the model write advertises it, and after a switch", () =>
@@ -610,7 +638,7 @@ describe("KiroAdapterV2", () => {
             assert.equal(terminalStatus(yield* collectTurn(events)), "completed");
           }
         }),
-    }).pipe(Effect.provide(testLayer), Effect.scoped),
+    }).pipe(Effect.provide(testLayer)),
   );
 
   it.effect("waits for Kiro to advertise the model before setting its effort", () =>
@@ -660,7 +688,7 @@ describe("KiroAdapterV2", () => {
           yield* startTurnOn(1, "claude-opus-5.5", reasoning("high"));
           assert.equal(terminalStatus(yield* collectTurn(events)), "completed");
         }),
-    }).pipe(Effect.provide(testLayer), Effect.scoped),
+    }).pipe(Effect.provide(testLayer)),
   );
 
   it.effect("never sends an effort level the model does not offer", () =>
@@ -716,7 +744,7 @@ describe("KiroAdapterV2", () => {
             assert.equal(terminalStatus(yield* collectTurn(events)), "completed");
           }
         }),
-    }).pipe(Effect.provide(testLayer), Effect.scoped),
+    }).pipe(Effect.provide(testLayer)),
   );
 
   it.effect("answers a stale 'this session' approval with Kiro's allow_once", () =>
@@ -777,7 +805,7 @@ describe("KiroAdapterV2", () => {
           yield* respond(yield* Deferred.await(pending), "acceptForSession");
           assert.equal(terminalStatus(yield* Fiber.join(turn)), "completed");
         }),
-    }).pipe(Effect.provide(testLayer), Effect.scoped),
+    }).pipe(Effect.provide(testLayer)),
   );
 
   it.effect("sends a model Kiro does not list, and fails with Kiro's own message", () =>
@@ -827,7 +855,7 @@ describe("KiroAdapterV2", () => {
           }
           assert.include(terminal.failure.message, "'claude-opus-9' is not available");
         }),
-    }).pipe(Effect.provide(testLayer), Effect.scoped),
+    }).pipe(Effect.provide(testLayer)),
   );
 });
 
@@ -893,7 +921,7 @@ describe("KiroAdapterV2 agents", () => {
           yield* startTurnOn(2, "claude-opus-5.5", agent("spec"));
           assert.equal(terminalStatus(yield* collectTurn(events)), "completed");
         }),
-    }).pipe(Effect.provide(testLayer), Effect.scoped),
+    }).pipe(Effect.provide(testLayer)),
   );
 
   it.effect("puts Kiro default back after an agent switch moved the session off it", () =>
@@ -929,7 +957,7 @@ describe("KiroAdapterV2 agents", () => {
           yield* startTurn;
           assert.equal(terminalStatus(yield* collectTurn(events)), "completed");
         }),
-    }).pipe(Effect.provide(testLayer), Effect.scoped),
+    }).pipe(Effect.provide(testLayer)),
   );
 
   it.effect("keeps the session's agent when the thread's agent no longer exists", () =>
@@ -956,7 +984,7 @@ describe("KiroAdapterV2 agents", () => {
           yield* startTurn;
           assert.equal(terminalStatus(yield* collectTurn(events)), "completed");
         }),
-    }).pipe(Effect.provide(testLayer), Effect.scoped),
+    }).pipe(Effect.provide(testLayer)),
   );
 });
 
@@ -1320,7 +1348,7 @@ describe("KiroAdapterV2 MCP tools", () => {
             );
           }),
       });
-    }).pipe(Effect.provide(testLayer), Effect.scoped),
+    }).pipe(Effect.provide(testLayer)),
   );
 });
 
@@ -1375,7 +1403,7 @@ describe("KiroAdapterV2 unknown model", () => {
             assert.equal(terminal.failure.code, "-32000");
           }),
       });
-    }).pipe(Effect.provide(testLayer), Effect.scoped),
+    }).pipe(Effect.provide(testLayer)),
   );
 });
 
diff --git a/apps/server/src/orchestration-v2/Adapters/OpenCode2AdapterV2.test.ts b/apps/server/src/orchestration-v2/Adapters/OpenCode2AdapterV2.test.ts
index 1efbbfad09d8..d469ad6c8108 100644
--- a/apps/server/src/orchestration-v2/Adapters/OpenCode2AdapterV2.test.ts
+++ b/apps/server/src/orchestration-v2/Adapters/OpenCode2AdapterV2.test.ts
@@ -17,6 +17,7 @@ import {
   ProviderTurnId,
   RunAttemptId,
   RunId,
+  type RuntimeRequestId,
   ThreadId,
   type ModelSelection,
   type OrchestrationV2AppThread,
@@ -33,6 +34,7 @@ import * as Fiber from "effect/Fiber";
 import * as FileSystem from "effect/FileSystem";
 import * as Layer from "effect/Layer";
 import * as Option from "effect/Option";
+import * as Queue from "effect/Queue";
 import * as Scope from "effect/Scope";
 import * as Stream from "effect/Stream";
 import * as Exit from "effect/Exit";
@@ -328,12 +330,14 @@ const resumed = (
     readonly goal?: OrchestrationV2ProviderThread["goal"];
     readonly external?: boolean;
     readonly supervised?: boolean;
+    readonly processExit?: Effect.Effect<void>;
+    readonly beforeResponse?: (path: string) => Effect.Effect<void>;
+    readonly borrowers?: { current: number };
     readonly replayGate?: ProviderReplayGate;
     readonly attachmentsDir?: string;
     readonly resolveExtractedTextPath?: (path: string) => Effect.Effect<string | undefined>;
     readonly fileSystem?: FileSystem.FileSystem;
     readonly onPrompt?: (input: unknown) => void;
-    readonly borrowers?: { current: number };
   },
 ) =>
   Effect.gen(function* () {
@@ -372,6 +376,10 @@ const resumed = (
         ...(options?.fileSystem === undefined ? {} : { fileSystem: options.fileSystem }),
         ...(options?.onPrompt === undefined ? {} : { onPrompt: options.onPrompt }),
         ...(options?.external === undefined ? {} : { external: options.external }),
+        ...(options?.processExit === undefined ? {} : { processExit: options.processExit }),
+        ...(options?.beforeResponse === undefined
+          ? {}
+          : { beforeResponse: options.beforeResponse }),
         ...(options?.replayGate === undefined ? {} : { replayGate: options.replayGate }),
         ...(options?.attachmentsDir === undefined
           ? {}
@@ -493,7 +501,22 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
         }),
       );
       assert.equal((yield* Fiber.join(terminal))?.status, "completed");
-    }).pipe(Effect.scoped),
+    }),
+  );
+
+  it.effect("never sends a saved variant the catalog model does not list", () =>
+    Effect.gen(function* () {
+      const { runtime, thread } = yield* resumed([
+        out("session.prompt", { sessionID: SESSION, text: "<any>" }),
+        promptAccepted,
+        event("session.execution.succeeded", { sessionID: SESSION }),
+      ]);
+      const terminal = yield* terminalOf(runtime).pipe(Effect.forkScoped);
+      yield* runtime.startTurn(
+        turnInput(thread, { ...bigPickle, options: [{ id: "variant", value: "medium" }] }),
+      );
+      assert.equal((yield* Fiber.join(terminal))?.status, "completed");
+    }),
   );
 
   it.effect("renames the session before the first turn after the thread was renamed", () =>
@@ -522,7 +545,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
         attemptId: RunAttemptId.make("attempt:opencode2-adapter:2"),
       });
       assert.equal((yield* Fiber.join(second))?.status, "completed");
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("ends a turn on the provider thread it started on", () =>
@@ -539,7 +562,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
       const terminal = yield* terminalOf(runtime).pipe(Effect.forkScoped);
       yield* runtime.startTurn(turnInput(forkedRow));
       assert.equal((yield* Fiber.join(terminal))?.providerThreadId, forkedRow.id);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   // regression: #18315 OpenCode Go quota stops were not shown as usage limits
@@ -567,7 +590,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
         message: "Provider rejected the request",
         retryable: null,
       });
-    }).pipe(Effect.scoped),
+    }),
   );
 
   // OpenCode types an empty balance as provider.quota too, but answers it with
@@ -648,7 +671,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
         message: error.message,
         retryable: null,
       });
-    }).pipe(Effect.scoped),
+    }),
   );
 
   // regression: #29289 Claude weekly limits through claude-agent lost their usage-limit reset
@@ -677,7 +700,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
           retryable: null,
           resetAt: "2026-11-02T20:00:00.000Z",
         });
-      }).pipe(Effect.scoped),
+      }),
   );
 
   it.effect("ends the turn when its terminal event is one this build cannot decode", () =>
@@ -690,7 +713,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
       const terminal = yield* terminalOf(runtime).pipe(Effect.forkScoped);
       yield* runtime.startTurn(turnInput(thread));
       assert.equal((yield* Fiber.join(terminal))?.status, "interrupted");
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("keeps a turn running through a start event this build cannot decode", () =>
@@ -744,7 +767,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
             event.turnItem.text === "DONE",
         ),
       );
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("stops running turns on an external server when the session closes", () =>
@@ -820,7 +843,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
       yield* Fiber.join(started);
       assert.equal((yield* Fiber.join(terminal))?.status, "interrupted");
       assert.lengthOf(prompts, 0);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   const childCreated = (child: string) => ({
@@ -1042,7 +1065,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
           output: stop === "burst" ? "x".repeat(262127) + "FINAL DIAGNOSTIC\n" : "retained\n",
         });
         assert.isFalse(items.some((i) => i.type === "subagent"));
-      }).pipe(Effect.scoped),
+      }),
   );
 
   it.effect.each([
@@ -1211,7 +1234,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
           output: "retained",
         });
       }
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect.each(["remove", "lookup", "output", "timeout"] as const)(
@@ -1343,7 +1366,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
         if (failure === "remove")
           yield* runtime.stopTask!({ providerThread: thread, taskId: ids[0]! });
         assert.isFalse(yield* runtime.hasPendingBackgroundWorkForThread!(thread));
-      }).pipe(Effect.scoped),
+      }),
   );
 
   it.effect("keeps background subagents running when a turn is interrupted to restart it", () =>
@@ -1363,7 +1386,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
       });
       assert.equal((yield* watch.terminal)?.status, "interrupted");
       assert.isTrue(yield* runtime.hasPendingBackgroundWork!);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("stops background subagents on a user Stop", () =>
@@ -1386,7 +1409,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
       });
       assert.equal((yield* watch.terminal)?.status, "interrupted");
       assert.isFalse(yield* runtime.hasPendingBackgroundWork!);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("gives a background subagent the rules of a mode changed while it runs", () =>
@@ -1434,7 +1457,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
         [...(yield* Fiber.join(ended))].map((terminal) => terminal.status),
         ["completed", "completed"],
       );
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect(
@@ -1515,7 +1538,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
         assert.isAbove(timeline.indexOf(false), timeline.indexOf("completed"));
         assert.strictEqual(timeline.at(-1), false);
         assert.isFalse(yield* runtime.hasPendingBackgroundWorkForThread!(thread));
-      }).pipe(Effect.scoped),
+      }),
   );
 
   const returnedRunning = (id: string): ProviderReplayEntry => ({
@@ -1745,7 +1768,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
         );
         assert.deepEqual(watch.state.roster, []);
         assert.isFalse(yield* runtime.hasPendingBackgroundWorkForThread!(thread));
-      }).pipe(Effect.scoped),
+      }),
   );
 
   // regression: #21979 a failed background subagent pinned its thread as busy
@@ -1787,7 +1810,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
       );
       assert.deepEqual(watch.state.roster, []);
       assert.isFalse(yield* runtime.hasPendingBackgroundWorkForThread!(thread));
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("settles every call that joined a running subagent with its one report", () =>
@@ -1811,7 +1834,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
         Sleep: { status: "completed", result: "CHILD_OK" },
         Again: { status: "completed", result: "CHILD_OK" },
       });
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("keeps a call to a finished subagent for its own run's report", () =>
@@ -1835,7 +1858,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
       });
       yield* watch.until(() => watch.calls.get("Again")?.status === "completed");
       assert.deepEqual(watch.calls.get("Again"), { status: "completed", result: "SECOND_OK" });
-    }).pipe(Effect.scoped),
+    }),
   );
 
   const MIDDLE = "ses_middle0000000000000000000";
@@ -2025,7 +2048,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
       yield* watch.until(() => watch.rootVariant === "none");
       assert.isFalse(yield* runtime.hasPendingBackgroundWork!);
       assert.strictEqual(watch.pendingSnapshots.get(MIDDLE), false);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("clears the caller's pending work when a called session's held wake runs", () =>
@@ -2107,7 +2130,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
       yield* watch.until(() => watch.variants.get(OTHER) === "none");
       assert.isFalse(watch.pendingSnapshots.get(OTHER));
       assert.isFalse(watch.pendingSnapshots.get(SESSION));
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("stops a foreground subagent's background subagent after the turn ended", () =>
@@ -2144,7 +2167,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
       yield* Deferred.await(offered);
       assert.equal(watch.deep.at(-1), "interrupted");
       assert.deepEqual([...watch.middleTurns.keys()], [`${MIDDLE}:turn:1`]);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("stops the turn a foreground subagent runs to answer its background subagent", () =>
@@ -2176,7 +2199,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
       });
       yield* watch.until(() => watch.middleTurns.get(`${MIDDLE}:turn:2`) === "interrupted");
       assert.isFalse(yield* runtime.hasPendingBackgroundWorkForThread!(thread));
-    }).pipe(Effect.scoped),
+    }),
   );
 
   const stopTimedOut: ReadonlyArray<ProviderReplayEntry> = [
@@ -2569,7 +2592,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
         .pipe(Effect.flip);
       assert.equal(failed._tag, "ProviderAdapterInterruptError");
       assert.equal((yield* Fiber.join(terminal))?.status, "completed");
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("gives a resumed session T3's rules when it was made with others", () =>
@@ -2596,7 +2619,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
         modelSelection: bigPickle,
         runtimePolicy: policy(),
       });
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("moves the session when the thread's worktree changed", () =>
@@ -2616,7 +2639,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
         modelSelection: bigPickle,
         runtimePolicy: { ...policy(), cwd: "/work/opencode2-feature" },
       });
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("breaks the thread and forgets it when the session was deleted outside T3", () =>
@@ -2640,7 +2663,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
       const again = yield* runtime.startTurn(turnInput(thread)).pipe(Effect.flip);
       assert.equal(again._tag, "ProviderAdapterProtocolError");
       assert.include(again.message, "not registered");
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("stops the requests a session still waits on when a restarted T3 loads it", () =>
@@ -2681,7 +2704,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
       const terminal = yield* terminalOf(runtime).pipe(Effect.forkScoped);
       yield* runtime.startTurn(turnInput(thread));
       assert.equal((yield* Fiber.join(terminal))?.status, "completed");
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("ends the turn when an answer to its request cannot be delivered", () =>
@@ -2720,7 +2743,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
         ended?.status === "failed" ? ended.failure.message : undefined,
         "OpenCode is waiting on a request T3 Code couldn't answer.",
       );
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("counts an answer to a request OpenCode already dropped as delivered", () =>
@@ -2753,7 +2776,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
       const request = yield* Fiber.join(requested);
       yield* runtime.respondToRuntimeRequest({ requestId: request!.id, decision: "accept" });
       assert.equal((yield* Fiber.join(terminal))?.status, "completed");
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("declines a form T3 cannot show with the reason, instead of leaving it open", () =>
@@ -2791,7 +2814,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
         ended?.status === "failed" ? ended.failure.message : "",
         "asked for a link to open",
       );
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("asks a subagent's permission request on the parent thread's turn", () =>
@@ -2837,7 +2860,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
       assert.equal(request?.nativeRequestRef?.nativeId, shellAsk.data.id);
       yield* runtime.respondToRuntimeRequest({ requestId: request!.id, decision: "accept" });
       assert.equal((yield* Fiber.join(terminal))?.status, "completed");
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("keeps 'allow this session' in the session's rules, not OpenCode's saved grants", () =>
@@ -2875,7 +2898,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
         decision: "acceptForSession",
       });
       assert.equal((yield* Fiber.join(terminal))?.status, "completed");
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("reads the agents again while a fresh server still lists none", () =>
@@ -2903,7 +2926,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
         .pipe(Effect.forkScoped);
       yield* TestClock.adjust("250 millis");
       assert.equal((yield* Fiber.join(created)).nativeThreadRef?.nativeId, SESSION);
-    }).pipe(Effect.scoped),
+    }),
   );
   const reconnected = (
     active: Record<string, unknown>,
@@ -3056,7 +3079,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
                 e.turnItem.text === "Steer processed",
             ),
           );
-      }).pipe(Effect.scoped),
+      }),
   );
 
   it.effect("does not end a turn from an earlier turn's history when its prompt is not there", () =>
@@ -3102,7 +3125,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
         "An earlier turn's answer.",
       );
       assert.deepInclude(collected.at(-1), { type: "turn.terminal", status: "interrupted" });
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("ends a turn that finished while the stream was down with the server's outcome", () =>
@@ -3147,7 +3170,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
         settled?.type === "provider_turn.updated" ? settled.providerTurn.turnTokenUsage : undefined;
       assert.deepInclude(usage, { usageStatus: "partial", inputTokens: 100, outputTokens: 10 });
       assert.notProperty(usage, "models");
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("finishes a workspace command whose stream dropped before its inbox event", () =>
@@ -3210,7 +3233,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
       );
       assert.include(texts, "HELLO WORLD");
       assert.deepInclude(collected.at(-1), { type: "turn.terminal", status: "completed" });
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("sends a $skill that appears once OpenCode finishes scanning the directory", () =>
@@ -3246,7 +3269,183 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
       assert.deepInclude(prompts[0], { skills: [{ id: "greet" }] });
       assert.isTrue(Exit.isSuccess(started));
       assert.equal((yield* Fiber.join(terminal))?.status, "completed");
-    }).pipe(Effect.scoped),
+    }),
+  );
+
+  it.effect("keeps owned work through a stalled reconciliation without releasing its server", () =>
+    Effect.gen(function* () {
+      const reading = yield* Deferred.make<void>();
+      const resume = yield* Deferred.make<void>();
+      const borrowers = { current: 0 };
+      const { runtime, thread } = yield* resumed(
+        [
+          out("session.prompt", { sessionID: SESSION, id: PROMPT_ID, text: "<any>" }),
+          promptAccepted,
+          ...reconnected({ [SESSION]: { type: "running" } }),
+          ...openRequests([]),
+          event("session.execution.succeeded", { sessionID: SESSION }),
+        ],
+        {
+          borrowers,
+          beforeResponse: (path) =>
+            path.endsWith("/message")
+              ? Deferred.succeed(reading, undefined).pipe(Effect.andThen(Deferred.await(resume)))
+              : Effect.void,
+        },
+      );
+      const collected: Array<ProviderAdapter.ProviderAdapterV2Event> = [];
+      const ended = yield* runtime.events.pipe(
+        Stream.tap((event) => Effect.sync(() => collected.push(event))),
+        Stream.takeUntil((event) => event.type === "turn.terminal"),
+        Stream.runDrain,
+        Effect.forkScoped,
+      );
+      yield* runtime.startTurn(turnInput(thread));
+      yield* Deferred.await(reading);
+      yield* TestClock.adjust("3 minutes");
+      assert.isFalse(collected.some((event) => event.type === "turn.terminal"));
+      assert.equal(borrowers.current, 1);
+      yield* Deferred.succeed(resume, undefined);
+      yield* Fiber.join(ended);
+      assert.deepInclude(collected.at(-1), { type: "turn.terminal", status: "completed" });
+    }),
+  );
+
+  it.effect("reconciles a session deleted after the active snapshot", () =>
+    Effect.gen(function* () {
+      const otherId = "ses_other_stalled_session";
+      const otherPrompt = "msg_other_stalled_prompt";
+      const history = (sessionID: string, id: string) => [
+        out("message.list", { sessionID, order: "desc", limit: "50" }),
+        reply("message.list", {
+          data: [{ id, time: { created: 1 }, text: "hi", type: "user" }],
+          cursor: {},
+        }),
+      ];
+      const requests = (sessionID: string) => [
+        out("permission.list", { sessionID }),
+        replyData("permission.list", []),
+        out("session.form.list", { sessionID }),
+        replyData("session.form.list", []),
+      ];
+      const { runtime, thread } = yield* resumed([
+        out("session.get", { sessionID: otherId }),
+        replyData("session.get", sessionInfo({ id: otherId })),
+        ...requests(otherId),
+        out("session.prompt", { sessionID: SESSION, id: PROMPT_ID, text: "<any>" }),
+        promptAccepted,
+        out("session.instructions.entry.put", {
+          sessionID: otherId,
+          key: "t3-code",
+          value: "<any>",
+        }),
+        reply("session.instructions.entry.put", null),
+        out("session.prompt", { sessionID: otherId, id: otherPrompt, text: "<any>" }),
+        replyData("session.prompt", {
+          id: otherPrompt,
+          sessionID: otherId,
+          time: { created: 1 },
+          type: "user",
+          payload: { text: "hi" },
+          delivery: "steer",
+        }),
+        { type: "runtime_exit", status: "success" },
+        out("event.subscribe"),
+        out("session.active"),
+        replyData("session.active", {
+          [SESSION]: { type: "running" },
+          [otherId]: { type: "running" },
+        }),
+        out("message.list", { sessionID: SESSION, order: "desc", limit: "50" }),
+        reply("message.list", {
+          status: 404,
+          body: {
+            _tag: "SessionNotFoundError",
+            sessionID: SESSION,
+            message: "Deleted during recovery",
+          },
+        }),
+        ...history(otherId, otherPrompt),
+        ...requests(otherId),
+        event("session.execution.succeeded", { sessionID: otherId }),
+      ]);
+      const other = yield* runtime.resumeThread({
+        providerThread: {
+          ...providerThread(yield* DateTime.now),
+          id: ProviderThreadId.make("provider-thread:other"),
+          nativeThreadRef: { driver: OPENCODE_PROVIDER, nativeId: otherId, strength: "strong" },
+        },
+        threadId,
+        modelSelection: bigPickle,
+        runtimePolicy: policy(),
+      });
+      const terminals = yield* runtime.events.pipe(
+        Stream.filter((event) => event.type === "turn.terminal"),
+        Stream.take(2),
+        Stream.runCollect,
+        Effect.forkScoped,
+      );
+      yield* runtime.startTurn(turnInput(thread));
+      yield* runtime.startTurn({
+        ...turnInput(other),
+        runId: RunId.make("run:other"),
+        attemptId: RunAttemptId.make("attempt:other"),
+      });
+      const ended = yield* Fiber.join(terminals);
+      assert.deepEqual(
+        ended.map((event) => event.status),
+        ["interrupted", "completed"],
+      );
+      assert.equal(ended[0]?.threadDisposition, "broken");
+      assert.sameMembers(
+        ended.map((event) => event.providerThreadId),
+        [thread.id, other.id],
+      );
+    }),
+  );
+
+  it.effect.each([503, 429])(
+    "recovers an owned server after more than five HTTP %s reconciliation replies",
+    (status) =>
+      Effect.gen(function* () {
+        const allowRecovery = yield* Deferred.make<void>();
+        const attempts = yield* Queue.unbounded<void>();
+        let attempt = 0;
+        const { runtime, thread } = yield* resumed(
+          [
+            out("session.prompt", { sessionID: SESSION, text: "<any>" }),
+            promptAccepted,
+            { type: "runtime_exit", status: "success" },
+            out("event.subscribe"),
+            ...Array.from({ length: 6 }, () => [
+              out("session.active"),
+              reply("session.active", { status, body: { message: "Recovering" } }),
+            ]).flat(),
+            ...reconnected({ [SESSION]: { type: "running" } }).slice(2),
+            ...openRequests([]),
+            event("session.execution.succeeded", { sessionID: SESSION }),
+          ],
+          {
+            beforeResponse: (path) =>
+              path === "/api/session/active"
+                ? Effect.gen(function* () {
+                    attempt += 1;
+                    yield* Queue.offer(attempts, undefined);
+                    if (attempt === 7) yield* Deferred.await(allowRecovery);
+                  })
+                : Effect.void,
+          },
+        );
+        const terminal = yield* terminalOf(runtime).pipe(Effect.forkScoped);
+        yield* runtime.startTurn(turnInput(thread));
+        for (let retry = 0; retry < 6; retry += 1) {
+          yield* Queue.take(attempts);
+          yield* TestClock.adjust("30 seconds");
+        }
+        yield* Queue.take(attempts);
+        yield* Deferred.succeed(allowRecovery, undefined);
+        assert.equal((yield* Fiber.join(terminal))?.status, "completed");
+      }),
   );
 
   it.effect(
@@ -3280,7 +3479,365 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
         });
         assert.equal((yield* Fiber.join(terminal))?.status, "completed");
         assert.deepInclude(prompts[0], { skills: [{ id: "greet" }] });
-      }).pipe(Effect.scoped),
+      }),
+  );
+
+  it.effect.each([
+    {
+      server: "an external server keeps rejecting requests",
+      external: true,
+      status: 503,
+      tries: 5,
+    },
+    { server: "an owned server rejects its credentials", external: false, status: 401, tries: 1 },
+  ])("bounds recovery when $server", ({ external, status, tries }) =>
+    Effect.gen(function* () {
+      const attempts = yield* Queue.unbounded<void>();
+      const { runtime, thread } = yield* resumed(
+        [
+          out("session.prompt", { sessionID: SESSION, text: "<any>" }),
+          promptAccepted,
+          { type: "runtime_exit", status: "success" },
+          ...Array.from({ length: tries }, () => [
+            out("event.subscribe"),
+            out("session.active"),
+            reply("session.active", { status, body: { message: "Unavailable" } }),
+          ]).flat(),
+        ],
+        {
+          external,
+          beforeResponse: (path) =>
+            path === "/api/session/active"
+              ? Queue.offer(attempts, undefined).pipe(Effect.asVoid)
+              : Effect.void,
+        },
+      );
+      const terminal = yield* terminalOf(runtime).pipe(Effect.forkScoped);
+      yield* runtime.startTurn(turnInput(thread));
+      for (let attempt = 1; attempt < tries; attempt += 1) {
+        yield* Queue.take(attempts);
+        yield* TestClock.adjust("2 seconds");
+      }
+      yield* Queue.take(attempts);
+      assert.equal((yield* Fiber.join(terminal))?.status, "failed");
+    }),
+  );
+
+  it.effect.each(["lists", "stream"] as const)(
+    "restores approvals and questions from %s after slow recovery",
+    (source) =>
+      Effect.gen(function* () {
+        const gate = makeProviderReplayGate(["late-permission"]);
+        let holdReads = false;
+        const reading = yield* Deferred.make<void>();
+        const resume = yield* Deferred.make<void>();
+        const requests = yield* Queue.unbounded<RuntimeRequestId>();
+        const { runtime, thread } = yield* resumed(
+          [
+            out("session.prompt", { sessionID: SESSION, id: PROMPT_ID, text: "<any>" }),
+            promptAccepted,
+            ...reconnected({ [SESSION]: { type: "running" } }),
+            ...openRequests(
+              source === "lists" ? [shellAsk.data] : [],
+              source === "lists" ? [colorForm] : [],
+            ),
+            ...(source === "stream"
+              ? [
+                  event("permission.asked", shellAsk.data, "late-permission"),
+                  event("form.created", { form: colorForm }),
+                ]
+              : []),
+            out("permission.reply", {
+              sessionID: SESSION,
+              requestID: shellAsk.data.id,
+              decision: "once",
+            }),
+            reply("permission.reply", null),
+            out("session.form.reply", {
+              sessionID: SESSION,
+              formID: colorForm.id,
+              answer: { q0: "Red" },
+            }),
+            reply("session.form.reply", null),
+            event("session.execution.succeeded", { sessionID: SESSION }),
+          ],
+          {
+            supervised: true,
+            replayGate: gate,
+            beforeResponse: (path) =>
+              holdReads && path.endsWith(source === "stream" ? "/form" : "/message")
+                ? Deferred.succeed(reading, undefined).pipe(Effect.andThen(Deferred.await(resume)))
+                : Effect.void,
+          },
+        );
+        const ended = yield* Deferred.make<string>();
+        yield* runtime.events.pipe(
+          Stream.runForEach((event) =>
+            Effect.gen(function* () {
+              if (
+                event.type === "runtime_request.updated" &&
+                event.runtimeRequest.status === "pending"
+              ) {
+                yield* Queue.offer(requests, event.runtimeRequest.id);
+              }
+              if (event.type === "turn.terminal") {
+                yield* Deferred.succeed(ended, event.status);
+              }
+            }),
+          ),
+          Effect.forkScoped,
+        );
+        holdReads = true;
+        yield* runtime.startTurn(turnInput(thread, bigPickle, "approval-required"));
+        yield* Deferred.await(reading);
+        if (source === "stream") {
+          yield* Effect.promise(() => gate.waitForReached("late-permission"));
+          gate.release("late-permission");
+        }
+        yield* TestClock.adjust("2 minutes");
+        assert.equal(yield* Queue.size(requests), 0);
+        yield* Deferred.succeed(resume, undefined);
+        yield* runtime.respondToRuntimeRequest({
+          requestId: yield* Queue.take(requests),
+          decision: "accept",
+        });
+        yield* runtime.respondToRuntimeRequest({
+          requestId: yield* Queue.take(requests),
+          answers: { q0: "Red" },
+        });
+        assert.equal(yield* Deferred.await(ended), "completed");
+      }),
+  );
+
+  it.effect(
+    "recovers through a restarted server when the process exits during a history read",
+    () =>
+      Effect.gen(function* () {
+        const reading = yield* Deferred.make<void>();
+        const cancelled = yield* Deferred.make<void>();
+        let restarted = false;
+        let held = false;
+        const { runtime, thread } = yield* resumed(
+          [
+            out("session.prompt", { sessionID: SESSION, text: "<any>" }),
+            promptAccepted,
+            ...reconnected({ [SESSION]: { type: "running" } }),
+            ...reconnected({}).slice(1),
+          ],
+          {
+            // The replay lends one connection; only the first borrow's process exits.
+            processExit: Effect.suspend(() =>
+              restarted
+                ? Effect.never
+                : Effect.sleep("1 second").pipe(
+                    Effect.tap(() =>
+                      Effect.sync(() => {
+                        restarted = true;
+                      }),
+                    ),
+                  ),
+            ),
+            beforeResponse: (path) =>
+              path.endsWith("/message") && !held
+                ? Effect.sync(() => (held = true)).pipe(
+                    Effect.andThen(Deferred.succeed(reading, undefined)),
+                    Effect.andThen(Effect.never),
+                    Effect.onInterrupt(() => Deferred.succeed(cancelled, undefined)),
+                  )
+                : Effect.void,
+          },
+        );
+        const terminal = yield* terminalOf(runtime).pipe(Effect.forkScoped);
+        yield* runtime.startTurn(turnInput(thread));
+        yield* Deferred.await(reading);
+        // The exit at 1s cuts the stalled read; the retry 2s later borrows the restarted server.
+        yield* TestClock.adjust("3 seconds");
+        yield* Deferred.await(cancelled);
+        assert.equal((yield* Fiber.join(terminal))?.status, "interrupted");
+        assert.equal(runtime.providerSession.status, "ready");
+      }),
+  );
+
+  it.effect("releases a recovering session on shutdown without waiting for its HTTP read", () =>
+    Effect.gen(function* () {
+      const sessionScope = yield* Effect.acquireRelease(Scope.make(), (scope) =>
+        Scope.close(scope, Exit.void),
+      );
+      const reading = yield* Deferred.make<void>();
+      const cancelled = yield* Deferred.make<void>();
+      const borrowers = { current: 0 };
+      const { runtime, thread } = yield* resumed(
+        [
+          out("session.prompt", { sessionID: SESSION, text: "<any>" }),
+          promptAccepted,
+          ...reconnected({ [SESSION]: { type: "running" } }),
+        ],
+        {
+          borrowers,
+          beforeResponse: (path) =>
+            path.endsWith("/message")
+              ? Deferred.succeed(reading, undefined).pipe(
+                  Effect.andThen(Effect.never),
+                  Effect.onInterrupt(() => Deferred.succeed(cancelled, undefined)),
+                )
+              : Effect.void,
+        },
+      ).pipe(Effect.provideService(Scope.Scope, sessionScope));
+      yield* runtime.startTurn(turnInput(thread));
+      yield* Deferred.await(reading);
+      assert.equal(borrowers.current, 1);
+      yield* Scope.close(sessionScope, Exit.void);
+      yield* Deferred.await(cancelled);
+      assert.equal(borrowers.current, 0);
+    }),
+  );
+
+  it.effect("honors a confirmed Stop during recovery and ignores its late backfill", () =>
+    Effect.gen(function* () {
+      const recovered = yield* Deferred.make<void>();
+      const reading = yield* Deferred.make<void>();
+      const resume = yield* Deferred.make<void>();
+      const { runtime, thread } = yield* resumed(
+        [
+          out("session.prompt", { sessionID: SESSION, text: "<any>" }),
+          promptAccepted,
+          ...reconnected({ [SESSION]: { type: "running" } }),
+          out("session.interrupt", { sessionID: SESSION }),
+          reply("session.interrupt", { interrupted: true }),
+          ...openRequests([]),
+          event("session.execution.interrupted", { sessionID: SESSION }),
+          event("session.model.selected", {
+            sessionID: SESSION,
+            model: { providerID: "opencode", id: "recovered" },
+          }),
+        ],
+        {
+          beforeResponse: (path) =>
+            path.endsWith("/message")
+              ? Deferred.succeed(reading, undefined).pipe(Effect.andThen(Deferred.await(resume)))
+              : Effect.void,
+        },
+      );
+      const collected: Array<ProviderAdapter.ProviderAdapterV2Event> = [];
+      const stopped = yield* Deferred.make<void>();
+      yield* runtime.events.pipe(
+        Stream.runForEach((event) =>
+          Effect.gen(function* () {
+            collected.push(event);
+            if (
+              event.type === "provider_thread.updated" &&
+              event.providerThread.nativeMetadata?.modelSelection?.model === "opencode/recovered"
+            ) {
+              yield* Deferred.succeed(recovered, undefined);
+            }
+            if (event.type === "turn.terminal") yield* Deferred.succeed(stopped, undefined);
+          }),
+        ),
+        Effect.forkScoped,
+      );
+      yield* runtime.startTurn(turnInput(thread));
+      yield* Deferred.await(reading);
+      const stopping = yield* runtime
+        .interruptTurn({
+          providerThread: thread,
+          providerTurnId: yield* providerTurnId,
+        })
+        .pipe(Effect.forkScoped);
+      yield* Fiber.join(stopping);
+      assert.equal(runtime.providerSession.status, "ready");
+      yield* Deferred.await(stopped);
+      yield* Deferred.succeed(resume, undefined);
+      yield* Deferred.await(recovered);
+      assert.deepEqual(
+        collected.filter((event) => event.type === "turn.terminal").map((event) => event.status),
+        ["interrupted"],
+      );
+      assert.isFalse(
+        collected.some(
+          (event) =>
+            event.type === "turn_item.updated" && event.turnItem.type === "assistant_message",
+        ),
+      );
+    }),
+  );
+
+  it.effect("keeps a background child's requests when its parent stops during reconciliation", () =>
+    Effect.gen(function* () {
+      const reading = yield* Deferred.make<void>();
+      const resume = yield* Deferred.make<void>();
+      const recovered = yield* Deferred.make<void>();
+      const permission = { ...shellAsk.data, sessionID: CHILD };
+      const form = { ...colorForm, sessionID: CHILD };
+      const { runtime, thread } = yield* resumed(
+        [
+          ...backgroundLaunch(CHILD),
+          event("permission.asked", permission),
+          event("form.created", { form }),
+          ...reconnected({ [SESSION]: { type: "running" }, [CHILD]: { type: "running" } }),
+          ...openRequests([]),
+          out("permission.list", { sessionID: CHILD }),
+          replyData("permission.list", [permission]),
+          out("session.form.list", { sessionID: CHILD }),
+          replyData("session.form.list", [form]),
+          out("session.interrupt", { sessionID: SESSION }),
+          reply("session.interrupt", { interrupted: true }),
+          event("session.model.selected", {
+            sessionID: SESSION,
+            model: { providerID: "opencode", id: "recovered" },
+          }),
+          out("permission.reply", { sessionID: CHILD, requestID: permission.id, decision: "once" }),
+          reply("permission.reply", null),
+          out("session.form.reply", { sessionID: CHILD, formID: form.id, answer: { q0: "Red" } }),
+          reply("session.form.reply", null),
+        ],
+        {
+          beforeResponse: (path) =>
+            path === `/api/session/${CHILD}/form`
+              ? Deferred.succeed(reading, undefined).pipe(Effect.andThen(Deferred.await(resume)))
+              : Effect.void,
+        },
+      );
+      const requests = new Map<
+        string,
+        { readonly id: RuntimeRequestId; readonly status: string }
+      >();
+      yield* runtime.events.pipe(
+        Stream.runForEach((event) =>
+          Effect.gen(function* () {
+            if (event.type === "runtime_request.updated") {
+              const nativeId = event.runtimeRequest.nativeRequestRef?.nativeId;
+              if (nativeId != null) requests.set(nativeId, event.runtimeRequest);
+            }
+            if (
+              event.type === "provider_thread.updated" &&
+              event.providerThread.nativeMetadata?.modelSelection?.model === "opencode/recovered"
+            ) {
+              yield* Deferred.succeed(recovered, undefined);
+            }
+          }),
+        ),
+        Effect.forkScoped,
+      );
+      yield* runtime.startTurn(withLineage(thread));
+      yield* Deferred.await(reading);
+      const stopping = yield* runtime
+        .interruptTurn({ providerThread: thread, providerTurnId: yield* providerTurnId })
+        .pipe(Effect.forkScoped);
+      yield* Fiber.join(stopping);
+      yield* Deferred.succeed(resume, undefined);
+      yield* Deferred.await(recovered);
+      assert.isTrue(yield* runtime.hasPendingBackgroundWorkForThread!(thread));
+      assert.equal(requests.get(permission.id)?.status, "pending");
+      assert.equal(requests.get(form.id)?.status, "pending");
+      yield* runtime.respondToRuntimeRequest({
+        requestId: requests.get(permission.id)!.id,
+        decision: "accept",
+      });
+      yield* runtime.respondToRuntimeRequest({
+        requestId: requests.get(form.id)!.id,
+        answers: { q0: "Red" },
+      });
+    }),
   );
 
   it.effect("keeps a turn still running after a reconnect open for its next events", () =>
@@ -3315,7 +3872,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
         "Arrived on the new stream.",
       ]);
       assert.deepInclude(collected.at(-1), { type: "turn.terminal", status: "completed" });
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("continues a reply still streaming at reconnect from the text already shown", () =>
@@ -3358,7 +3915,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
         "Sent before the stream dropped and after it came back.",
         "Sent before the stream dropped and after it came back.",
       ]);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("shows a permission asked while the stream was down, and answers it", () =>
@@ -3386,7 +3943,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
       assert.equal(request?.nativeRequestRef?.nativeId, shellAsk.data.id);
       yield* runtime.respondToRuntimeRequest({ requestId: request!.id, decision: "accept" });
       assert.equal((yield* Fiber.join(terminal))?.status, "completed");
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("settles a request OpenCode no longer lists after the stream came back", () =>
@@ -3414,7 +3971,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
       );
       assert.deepEqual(statuses, ["pending", "cancelled"]);
       assert.deepInclude(collected.at(-1), { type: "turn.terminal", status: "completed" });
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect.each(["delegate_task", "html_preview", "mcp__acme__edit_document"])(
@@ -3477,7 +4034,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
           toolOutputImages(last?.type === "dynamic_tool" ? last.output : null),
           toolName !== "delegate_task" ? [{ mimeType: "image/png", data: "iVBORw0KGgo=" }] : [],
         );
-      }).pipe(Effect.scoped),
+      }),
   );
 
   it.effect.each(["completed", "error", "cancelled"] as const)(
@@ -3586,7 +4143,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
         );
         assert.isTrue(rosters.some((tasks) => tasks.some((task) => task.taskId === "image_test")));
         assert.deepEqual(rosters.at(-1), []);
-      }).pipe(Effect.scoped),
+      }),
   );
 
   it.effect.each(["history", "list", "late-preview"] as const)(
@@ -3726,7 +4283,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
               e.providerThread.pendingBackgroundTasks?.some((task) => task.taskId === "image_gap"),
           ),
         );
-      }).pipe(Effect.scoped),
+      }),
   );
 
   it.effect("settles a recovered image outcome when preview I/O is interrupted", () =>
@@ -3900,7 +4457,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
             e.providerThread.pendingBackgroundTasks?.some((task) => task.taskId === "image_lost"),
           ),
         );
-      }).pipe(Effect.scoped),
+      }),
   );
 
   it.effect("projects successful native todo updates into one checklist", () =>
@@ -4025,7 +4582,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
         items.find((item) => item.nativeItemRef?.nativeId === "call-malformed"),
         { type: "dynamic_tool", status: "completed" },
       );
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("recovers native todo updates missed during reconnect", () =>
@@ -4068,7 +4625,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
         [["Saved during disconnect", "running"]],
       );
       assert.include(turnItems(collected), "todo_list:completed");
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("stores a shell command that exits non-zero as failed", () =>
@@ -4118,7 +4675,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
           .findLast((node) => node.id === item?.nodeId)?.status,
         "failed",
       );
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("re-registers T3 MCP each turn and drops its instructions when adding fails", () =>
@@ -4183,7 +4740,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
         yield* Fiber.join(started);
         assert.equal((yield* Fiber.join(terminal))?.status, "completed");
       }
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("registers a long thread id's MCP server under a name OpenCode accepts", () =>
@@ -4248,7 +4805,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
       yield* Fiber.join(started);
       assert.equal((yield* Fiber.join(terminal))?.status, "completed");
       yield* runtime.unloadThread!({ providerThread: thread });
-    }).pipe(Effect.scoped),
+    }),
   );
 
   // regression: #16142 OpenCode 2 threads were missing T3 Code's MCP tools
@@ -4576,7 +5133,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
         snapshot.providerThread.nativeConversationHeadRef?.nativeId,
         history.data[0]!.id,
       );
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("ends a turn before re-reading a model list that never answers", () =>
@@ -4604,7 +5161,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
       yield* runtime.startTurn(turnInput(thread));
       assert.equal((yield* Fiber.join(terminal))?.status, "completed");
       for (let i = 0; i < 20; i++) yield* Effect.yieldNow;
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("leaves models unknown when a step ends without a seen start", () =>
@@ -4638,7 +5195,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
         settled?.type === "provider_turn.updated" ? settled.providerTurn.turnTokenUsage : undefined;
       assert.deepInclude(usage, { usageStatus: "complete", inputTokens: 20, outputTokens: 2 });
       assert.notProperty(usage, "models");
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("reports cache writes as cache creation, not only as input", () =>
@@ -4674,7 +5231,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
           outputTokens: 40,
         },
       );
-    }).pipe(Effect.scoped),
+    }),
   );
 
   const ASSISTANT = "msg_0eb735d5b001oAFVeY5jz3WD4Z";
@@ -4778,7 +5335,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
         ],
       );
       assert.deepInclude(seen.at(-1), { type: "turn.terminal", status: ended, failure: null });
-    }).pipe(Effect.scoped),
+    }),
   );
 
   // regression: #15672 OpenCode 2 provider retries ran silently instead of showing
@@ -4848,7 +5405,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
           ),
         );
       }
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("replaces a provider retry with the error that failed the turn", () =>
@@ -4931,7 +5488,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
         retry: lastRetry,
         retryStartedAt: startedAt,
       });
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("reports each directory's own limit for a model its project config changed", () =>
@@ -4990,7 +5547,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
         turn?.type === "provider_turn.updated" ? turn.providerTurn.tokenUsage?.maxTokens : null,
         48000,
       );
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("rejects unreadable rollback history before cutting the native session", () =>
@@ -5040,7 +5597,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
         .pipe(Effect.flip);
       assert.equal(failure._tag, "ProviderAdapterRollbackThreadError");
       assert.include(Cause.pretty(Cause.fail(failure)), '["recent"]');
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("clears a staged revert whose commit failed, before the next prompt too", () =>
@@ -5108,7 +5665,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
       assert.isTrue(Exit.isFailure(rollback));
       yield* runtime.startTurn(turnInput(thread));
       assert.equal((yield* terminalOf(runtime))?.status, "completed");
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("offers no follow-up for the execution a cleared revert starts", () =>
@@ -5175,7 +5732,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
       assert.isTrue(Exit.isFailure(rollback));
       assert.lengthOf(offers, 0);
       assert.isFalse(yield* runtime.hasPendingBackgroundWorkForThread!(thread));
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("prompts under ids no other session on the server can hold", () =>
@@ -5332,7 +5889,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
         ),
         ["running", "ready"],
       );
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect.each([
@@ -5491,7 +6048,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
         attemptId: RunAttemptId.make("attempt:opencode2-adapter:3"),
       });
       yield* Deferred.await(thirdEnded);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("drops the turns a rollback cut from the snapshot it returns", () =>
@@ -5560,7 +6117,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
         snapshot.providerTurns.map((turn) => turn.id),
         [first!.id],
       );
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("starts a turn sent during a rollback only once the cut is made", () =>
@@ -5611,7 +6168,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
       yield* runtime.startTurn({ ...turnInput(thread), providerTurnOrdinal: 1 });
       yield* Fiber.join(rollback);
       assert.equal((yield* Fiber.join(terminal))?.status, "completed");
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect.each([
@@ -5695,7 +6252,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
           [kept.id],
         );
       }
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("refuses to fork a session while OpenCode runs a follow-up on it", () =>
@@ -5717,7 +6274,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
         })
         .pipe(Effect.flip);
       assert.equal(refused._tag, "ProviderAdapterProtocolError");
-    }).pipe(Effect.scoped),
+    }),
   );
 
   // regression: #24549 a Stop whose interrupted event never arrives blocked the next fork
@@ -5763,7 +6320,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
       const [first, second] = yield* Fiber.join(ended);
       assert.equal(first?.status, "interrupted");
       assert.equal(second?.failure?.message, "second turn failed");
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("refuses to fork a stopped session OpenCode still runs", () =>
@@ -5789,7 +6346,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
         })
         .pipe(Effect.flip);
       assert.equal(refused._tag, "ProviderAdapterProtocolError");
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("moves a fork into its target thread's worktree before the first prompt", () =>
@@ -5818,7 +6375,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
         runtimePolicy: { ...policy(), cwd: target },
       });
       assert.equal(forked.nativeThreadRef?.nativeId, FORK);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   const continued = (after: ReadonlyArray<ProviderReplayEntry>, external?: string) =>
@@ -5942,7 +6499,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
         sourceProviderTurns: [first, second],
       });
       assert.equal(forked.nativeThreadRef?.nativeId, FORK);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect(
@@ -5995,7 +6552,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
           snapshot.providerTurns.map((turn) => turn.id),
           [first.id],
         );
-      }).pipe(Effect.scoped),
+      }),
   );
 
   it.effect("keeps a subagent a stopped background reply started off the next turn", () =>
@@ -6182,7 +6739,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
         ),
         [],
       );
-    }).pipe(Effect.scoped),
+    }),
   );
 
   // regression: #14752 continuations replayed background replies that were not theirs
@@ -6271,7 +6828,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
         [...(yield* Fiber.join(ended))].map((terminal) => terminal.status),
         ["completed", "completed"],
       );
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("replays only its own background reply into a continuation turn", () =>
@@ -6507,7 +7064,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
           snapshot.providerTurns.map((turn) => turn.id),
           [first!.id],
         );
-      }).pipe(Effect.scoped),
+      }),
   );
 
   it.effect(
@@ -6629,7 +7186,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
           snapshot.providerTurns.map((turn) => turn.id),
           [first!.id],
         );
-      }).pipe(Effect.scoped),
+      }),
   );
 
   it.effect("shows a second prompt another client sent while its continuation was pending", () =>
@@ -6712,7 +7269,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
         ],
         ["user: first?", "user: second?", "assistant: Both!"],
       );
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("shows a question asked while OpenCode wakes for a background reply", () =>
@@ -6820,7 +7377,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
       yield* Deferred.await(ended);
       const last = collected.findLast((event) => event.type === "turn.terminal");
       assert.equal(last?.type === "turn.terminal" ? last.status : undefined, "completed");
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("ends a follow-up turn a steer joined exactly once", () =>
@@ -6966,7 +7523,31 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
           ),
         );
         assert.deepInclude(collected.at(-1), { type: "turn.terminal", status: "completed" });
-      }).pipe(Effect.scoped),
+      }),
+  );
+
+  // regression: #35872
+  it.effect("completes /goal clear when OpenCode has no goal to clear", () =>
+    Effect.gen(function* () {
+      const { runtime, thread } = yield* resumed(
+        [
+          out("command.list", "<any>"),
+          reply("command.list", { location: { directory: WORK }, data: [{ name: "goal" }] }),
+          out("message.list", { sessionID: SESSION, order: "desc", limit: "1" }),
+          reply("message.list", { data: [], cursor: {} }),
+          out("session.command", { sessionID: SESSION, name: "goal", text: "clear" }),
+          reply("session.command", {
+            status: 500,
+            body: { _tag: "CommandExecutionError", command: "goal", message: "No goal is set." },
+          }),
+        ],
+        { version: "2.2.5" },
+      );
+      const terminal = yield* terminalOf(runtime).pipe(Effect.forkScoped);
+      const input = turnInput(thread);
+      yield* runtime.startTurn({ ...input, message: { ...input.message, text: "/goal clear" } });
+      assert.equal((yield* Fiber.join(terminal))?.status, "completed");
+    }),
   );
 
   it.effect("reads an existing OpenCode 2.2.5 goal when resuming a session", () =>
@@ -7001,7 +7582,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
         checks: 2,
         lastCheck: "Checked proof.txt",
       });
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect.each([
@@ -7090,7 +7671,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
             ),
           );
         assert.deepInclude(collected.at(-1), { type: "turn.terminal", status: "completed" });
-      }).pipe(Effect.scoped),
+      }),
   );
 
   it.effect("does not replace a newer goal event with an older goal RPC response", () =>
@@ -7135,7 +7716,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
           : undefined,
         "paused",
       );
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect.each(["unreadable", "stalled"] as const)(
@@ -7179,7 +7760,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
         }
         const collected = yield* Fiber.join(events);
         assert.deepInclude(collected.at(-1), { type: "turn.terminal", status: "completed" });
-      }).pipe(Effect.scoped),
+      }),
   );
 
   it.effect.each([
@@ -7245,7 +7826,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
             ),
           );
         assert.deepInclude(collected.at(-1), { type: "turn.terminal", status: "completed" });
-      }).pipe(Effect.scoped),
+      }),
   );
 
   it.effect.each(["show", "pause", "clear"] as const)(
@@ -7315,7 +7896,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
               e.turnItem.text === "Replacement still tracked",
           ),
         );
-      }).pipe(Effect.scoped),
+      }),
   );
 
   it.effect.each(["show", "pause", "clear"] as const)(
@@ -7356,7 +7937,7 @@ it.layer(McpProviderSessions.layer)("OpenCode2 adapter", (it) => {
           goal?.status ?? null,
         );
         assert.deepInclude(collected.at(-1), { type: "turn.terminal", status: "completed" });
-      }).pipe(Effect.scoped),
+      }),
   );
 });
 
diff --git a/apps/server/src/orchestration-v2/Adapters/OpenCode2AdapterV2.testkit.ts b/apps/server/src/orchestration-v2/Adapters/OpenCode2AdapterV2.testkit.ts
index c031e8d52913..000176e33469 100644
--- a/apps/server/src/orchestration-v2/Adapters/OpenCode2AdapterV2.testkit.ts
+++ b/apps/server/src/orchestration-v2/Adapters/OpenCode2AdapterV2.testkit.ts
@@ -152,6 +152,7 @@ const replayHttpClient = (
   controller: OpenCodeReplayController,
   replayGate: ProviderReplayGate | undefined,
   onPrompt: ((input: unknown) => void) | undefined,
+  beforeResponse: ((path: string) => Effect.Effect<void>) | undefined,
 ) =>
   HttpClient.make((request, url) =>
     Effect.tryPromise({
@@ -210,13 +211,18 @@ const replayHttpClient = (
         new HttpClientError.HttpClientError({
           reason: new HttpClientError.TransportError({ request, cause }),
         }),
-    }).pipe(Effect.map((response) => HttpClientResponse.fromWeb(request, response))),
+    }).pipe(
+      Effect.map((response) => HttpClientResponse.fromWeb(request, response)),
+      Effect.tap(() => beforeResponse?.(url.pathname) ?? Effect.void),
+    ),
   );
 
 export const replayServer = (
   transcript: ProviderReplayTranscript,
   options?: {
     readonly external?: boolean;
+    readonly processExit?: Effect.Effect<void>;
+    readonly beforeResponse?: (path: string) => Effect.Effect<void>;
     readonly onPrompt?: (input: unknown) => void;
     readonly replayGate?: ProviderReplayGate;
     readonly borrowers?: { current: number };
@@ -233,7 +239,12 @@ export const replayServer = (
     const opencode = yield* OpenCode2Client.make.pipe(
       Effect.provideService(
         HttpClient.HttpClient,
-        replayHttpClient(controller, options?.replayGate, options?.onPrompt),
+        replayHttpClient(
+          controller,
+          options?.replayGate,
+          options?.onPrompt,
+          options?.beforeResponse,
+        ),
       ),
     );
     const connection = {
@@ -241,6 +252,7 @@ export const replayServer = (
       url: BASE_URL,
       version: transcript.version,
       external: options?.external ?? false,
+      ...(options?.external ? {} : { processExit: options?.processExit ?? Effect.never }),
     };
     const borrowers = options?.borrowers;
     return OpenCode2Server.OpenCode2Server.of({
@@ -265,6 +277,8 @@ const makeReplayAdapter = (
   transcript: ProviderReplayTranscript,
   options?: {
     readonly external?: boolean;
+    readonly processExit?: Effect.Effect<void>;
+    readonly beforeResponse?: (path: string) => Effect.Effect<void>;
     readonly onPrompt?: (input: unknown) => void;
     readonly replayGate?: ProviderReplayGate;
     readonly borrowers?: { current: number };
@@ -318,6 +332,8 @@ export const openCode2ReplayRuntime = (
   entries: ReadonlyArray<ProviderReplayEntry>,
   options?: {
     readonly external?: boolean;
+    readonly processExit?: Effect.Effect<void>;
+    readonly beforeResponse?: (path: string) => Effect.Effect<void>;
     readonly version?: string;
     readonly onPrompt?: (input: unknown) => void;
     readonly borrowers?: { current: number };
diff --git a/apps/server/src/orchestration-v2/Adapters/PiAdapterV2.testkit.ts b/apps/server/src/orchestration-v2/Adapters/PiAdapterV2.testkit.ts
index 49eb6c9b3b99..b83ed9d5d90a 100644
--- a/apps/server/src/orchestration-v2/Adapters/PiAdapterV2.testkit.ts
+++ b/apps/server/src/orchestration-v2/Adapters/PiAdapterV2.testkit.ts
@@ -113,7 +113,7 @@ function replayValueMatches(expected: unknown, actual: unknown): boolean {
   return Object.is(expected, actual);
 }
 
-const ADAPTER_REQUEST_ID = /^t3-\d+$/u;
+const ADAPTER_REQUEST_ID = /^t3-(?:prompt-)?\d+$/u;
 
 function adapterRequestId(frame: unknown): string | undefined {
   const id = isRecord(frame) ? frame.id : undefined;
@@ -123,7 +123,10 @@ function adapterRequestId(frame: unknown): string | undefined {
 /** Rebind adapter request ids without pinning counters; provider ids that responses must echo stay exact. */
 function withRequestId(expected: unknown, actual: unknown): unknown {
   const actualId = adapterRequestId(actual);
-  return isRecord(expected) && adapterRequestId(expected) !== undefined && actualId !== undefined
+  return isRecord(expected) &&
+    actualId !== undefined &&
+    (adapterRequestId(expected) !== undefined ||
+      (expected.type === "prompt" && expected.id === undefined))
     ? { ...expected, id: actualId }
     : expected;
 }
diff --git a/apps/server/src/orchestration-v2/BackgroundWorkStop.integration.test.ts b/apps/server/src/orchestration-v2/BackgroundWorkStop.integration.test.ts
index ffe8203c8cbb..4a4726bcb9bd 100644
--- a/apps/server/src/orchestration-v2/BackgroundWorkStop.integration.test.ts
+++ b/apps/server/src/orchestration-v2/BackgroundWorkStop.integration.test.ts
@@ -20,6 +20,7 @@ import * as Effect from "effect/Effect";
 import * as Fiber from "effect/Fiber";
 import * as Queue from "effect/Queue";
 import * as Stream from "effect/Stream";
+import * as TestClock from "effect/testing/TestClock";
 import { CodexProviderCapabilitiesV2 } from "./Adapters/CodexAdapterV2.ts";
 import * as EffectWorker from "./EffectWorker.ts";
 import * as EventSink from "./EventSink.ts";
@@ -51,981 +52,979 @@ const stopEarlierBackgroundWork = ({
   readonly workflowMember?: boolean;
   readonly stalledRun?: "missing-session-terminal" | "returned-interrupt" | "superseded-attempt";
 }) =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      const cwd = yield* checkpointWorkspace("background-work-stop");
-      const events = yield* Queue.unbounded<ProviderAdapter.ProviderAdapterV2Event>();
-      const started: ProviderAdapter.ProviderAdapterV2TurnInput[] = [];
-      const interrupts: ProviderAdapter.ProviderAdapterV2InterruptInput[] = [];
-      const adapter: ProviderAdapter.ProviderAdapterV2["Service"] = {
-        instanceId,
-        driver,
-        getCapabilities: () => Effect.succeed(CodexProviderCapabilitiesV2),
-        planSelectionTransition: () => Effect.succeed({ type: "apply_on_next_turn" }),
-        openSession: (input) =>
-          Effect.gen(function* () {
-            const now = yield* DateTime.now;
-            return {
-              instanceId,
+  Effect.gen(function* () {
+    const cwd = yield* checkpointWorkspace("background-work-stop");
+    const events = yield* Queue.unbounded<ProviderAdapter.ProviderAdapterV2Event>();
+    const started: ProviderAdapter.ProviderAdapterV2TurnInput[] = [];
+    const interrupts: ProviderAdapter.ProviderAdapterV2InterruptInput[] = [];
+    const interruptCalls = yield* Queue.unbounded<void>();
+    const adapter: ProviderAdapter.ProviderAdapterV2["Service"] = {
+      instanceId,
+      driver,
+      getCapabilities: () => Effect.succeed(CodexProviderCapabilitiesV2),
+      planSelectionTransition: () => Effect.succeed({ type: "apply_on_next_turn" }),
+      openSession: (input) =>
+        Effect.gen(function* () {
+          const now = yield* DateTime.now;
+          return {
+            instanceId,
+            driver,
+            providerSessionId: input.providerSessionId,
+            providerSession: {
+              id: input.providerSessionId,
               driver,
-              providerSessionId: input.providerSessionId,
-              providerSession: {
-                id: input.providerSessionId,
+              providerInstanceId: instanceId,
+              status: "ready",
+              cwd,
+              model: modelSelection.model,
+              capabilities: CodexProviderCapabilitiesV2,
+              createdAt: now,
+              updatedAt: now,
+              lastError: null,
+            },
+            events: Stream.fromQueue(events),
+            ...(failedStart
+              ? {
+                  hasPendingBackgroundWorkForThread: (providerThread) =>
+                    Effect.gen(function* () {
+                      if (
+                        !interrupts.some((input) => input.providerThread.id === providerThread.id)
+                      ) {
+                        return false;
+                      }
+                      if (backgroundWorkAfterStop === "unknown") {
+                        return yield* Effect.die("Background work probe failed");
+                      }
+                      return backgroundWorkAfterStop === "running";
+                    }),
+                }
+              : {}),
+            ensureThread: ({ threadId }) =>
+              Effect.succeed({
+                id: ProviderThreadId.make(`provider-thread:codex:${threadId}`),
                 driver,
                 providerInstanceId: instanceId,
-                status: "ready",
-                cwd,
-                model: modelSelection.model,
-                capabilities: CodexProviderCapabilitiesV2,
+                providerSessionId: input.providerSessionId,
+                appThreadId: threadId,
+                ownerNodeId: null,
+                nativeThreadRef: { driver, nativeId: "native-thread", strength: "strong" },
+                nativeConversationHeadRef: null,
+                status: "idle",
+                firstRunOrdinal: null,
+                lastRunOrdinal: null,
+                handoffIds: [],
+                forkedFrom: null,
                 createdAt: now,
                 updatedAt: now,
-                lastError: null,
-              },
-              events: Stream.fromQueue(events),
-              ...(failedStart
-                ? {
-                    hasPendingBackgroundWorkForThread: (providerThread) =>
-                      Effect.gen(function* () {
-                        if (
-                          !interrupts.some((input) => input.providerThread.id === providerThread.id)
-                        ) {
-                          return false;
-                        }
-                        if (backgroundWorkAfterStop === "unknown") {
-                          return yield* Effect.die("Background work probe failed");
-                        }
-                        return backgroundWorkAfterStop === "running";
-                      }),
-                  }
-                : {}),
-              ensureThread: ({ threadId }) =>
-                Effect.succeed({
-                  id: ProviderThreadId.make(`provider-thread:codex:${threadId}`),
+              }),
+            resumeThread: ({ providerThread }) => Effect.succeed(providerThread),
+            startTurn: (turn) =>
+              Effect.gen(function* () {
+                started.push(turn);
+                yield* Queue.offer(events, {
+                  type: "provider_turn.updated",
                   driver,
-                  providerInstanceId: instanceId,
-                  providerSessionId: input.providerSessionId,
-                  appThreadId: threadId,
-                  ownerNodeId: null,
-                  nativeThreadRef: { driver, nativeId: "native-thread", strength: "strong" },
-                  nativeConversationHeadRef: null,
-                  status: "idle",
-                  firstRunOrdinal: null,
-                  lastRunOrdinal: null,
-                  handoffIds: [],
-                  forkedFrom: null,
-                  createdAt: now,
-                  updatedAt: now,
-                }),
-              resumeThread: ({ providerThread }) => Effect.succeed(providerThread),
-              startTurn: (turn) =>
-                Effect.gen(function* () {
-                  started.push(turn);
-                  yield* Queue.offer(events, {
-                    type: "provider_turn.updated",
-                    driver,
-                    providerTurn: {
-                      id: ProviderTurnId.make(`provider-turn:${turn.attemptId}`),
-                      providerThreadId: turn.providerThread.id,
-                      nodeId: turn.rootNodeId,
-                      runAttemptId: turn.attemptId,
-                      nativeTurnRef: {
-                        driver,
-                        nativeId: `native:${turn.attemptId}`,
-                        strength: "strong",
-                      },
-                      ordinal: turn.providerTurnOrdinal,
-                      status: "running",
-                      startedAt: now,
-                      completedAt: null,
+                  providerTurn: {
+                    id: ProviderTurnId.make(`provider-turn:${turn.attemptId}`),
+                    providerThreadId: turn.providerThread.id,
+                    nodeId: turn.rootNodeId,
+                    runAttemptId: turn.attemptId,
+                    nativeTurnRef: {
+                      driver,
+                      nativeId: `native:${turn.attemptId}`,
+                      strength: "strong",
                     },
-                  });
-                }),
-              steerTurn: () => Effect.die("unused"),
-              interruptTurn: (interrupt) =>
-                Effect.sync(() => {
-                  interrupts.push(interrupt);
-                }),
-              respondToRuntimeRequest: () => Effect.die("unused"),
-              readThreadSnapshot: () => Effect.die("unused"),
-              rollbackThread: () => Effect.die("unused"),
-              forkThread: () => Effect.die("unused"),
-            };
-          }),
-      };
-      yield* Effect.gen(function* () {
-        const orchestrator = yield* Orchestrator.OrchestratorV2;
-        const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
-        const sink = yield* EventSink.EventSinkV2;
-        const threadId = ThreadId.make("thread:background-work-stop");
-        const watch = (predicate: (event: OrchestrationV2DomainEvent) => boolean) =>
-          orchestrator.streamDomainEvents.pipe(
-            Stream.filter(predicate),
-            Stream.take(1),
-            Stream.runDrain,
-            Effect.forkScoped,
-          );
-        yield* orchestrator.dispatch({
-          type: "thread.create",
-          commandId: CommandId.make("create"),
-          threadId,
-          projectId: ProjectId.make("project:background-work-stop"),
-          title: "Background work stop",
-          modelSelection,
-          runtimeMode: "full-access",
-          interactionMode: "default",
-          branch: null,
-          worktreePath: cwd,
-          createdBy: "user",
-          creationSource: "web",
-        });
-        const running = yield* watch(
-          (event) => event.type === "provider-turn.updated" && event.payload.status === "running",
+                    ordinal: turn.providerTurnOrdinal,
+                    status: "running",
+                    startedAt: now,
+                    completedAt: null,
+                  },
+                });
+              }),
+            steerTurn: () => Effect.die("unused"),
+            interruptTurn: (interrupt) =>
+              Effect.sync(() => {
+                interrupts.push(interrupt);
+              }).pipe(Effect.andThen(Queue.offer(interruptCalls, undefined))),
+            respondToRuntimeRequest: () => Effect.die("unused"),
+            readThreadSnapshot: () => Effect.die("unused"),
+            rollbackThread: () => Effect.die("unused"),
+            forkThread: () => Effect.die("unused"),
+          };
+        }),
+    };
+    yield* Effect.gen(function* () {
+      const orchestrator = yield* Orchestrator.OrchestratorV2;
+      const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
+      const sink = yield* EventSink.EventSinkV2;
+      const threadId = ThreadId.make("thread:background-work-stop");
+      // This provider never confirms Stop, so Stop gives up waiting at its bound.
+      const drainUnconfirmedStop = Effect.gen(function* () {
+        const drained = yield* Effect.forkChild(worker.drain());
+        yield* Queue.take(interruptCalls);
+        yield* TestClock.adjust("2 seconds");
+        yield* Fiber.join(drained);
+      });
+      const watch = (predicate: (event: OrchestrationV2DomainEvent) => boolean) =>
+        orchestrator.streamDomainEvents.pipe(
+          Stream.filter(predicate),
+          Stream.take(1),
+          Stream.runDrain,
+          Effect.forkScoped,
         );
+      yield* orchestrator.dispatch({
+        type: "thread.create",
+        commandId: CommandId.make("create"),
+        threadId,
+        projectId: ProjectId.make("project:background-work-stop"),
+        title: "Background work stop",
+        modelSelection,
+        runtimeMode: "full-access",
+        interactionMode: "default",
+        branch: null,
+        worktreePath: cwd,
+        createdBy: "user",
+        creationSource: "web",
+      });
+      const running = yield* watch(
+        (event) => event.type === "provider-turn.updated" && event.payload.status === "running",
+      );
+      yield* orchestrator.dispatch({
+        type: "message.dispatch",
+        commandId: CommandId.make("start-dev-server"),
+        threadId,
+        messageId: MessageId.make("message:start-dev-server"),
+        text: "Start the dev server",
+        attachments: [],
+        dispatchMode: { type: "start_immediately" },
+        createdBy: "user",
+        creationSource: "web",
+      });
+      yield* worker.drain();
+      yield* Fiber.join(running);
+      if (wakeAfterStop) {
+        const send = (id: string, provider = false) =>
+          orchestrator.dispatch({
+            type: "message.dispatch",
+            commandId: CommandId.make(id),
+            threadId,
+            messageId: MessageId.make(`message:${id}`),
+            text: id,
+            attachments: [],
+            dispatchMode: { type: "queue_after_active" },
+            createdBy: provider ? "agent" : "user",
+            creationSource: provider ? "provider" : "web",
+          });
+        yield* send("follow-up");
         yield* orchestrator.dispatch({
-          type: "message.dispatch",
-          commandId: CommandId.make("start-dev-server"),
+          type: "thread.stop",
+          commandId: CommandId.make("stop"),
           threadId,
-          messageId: MessageId.make("message:start-dev-server"),
-          text: "Start the dev server",
-          attachments: [],
-          dispatchMode: { type: "start_immediately" },
-          createdBy: "user",
-          creationSource: "web",
         });
+        // Stop is committed, but its provider interrupt has not run yet.
+        yield* send("Background task completed.", true);
+        const [stopped, followUp, wake] = (yield* orchestrator.getThreadProjection(threadId)).runs;
+        assert.equal(stopped?.status, "running");
+        assert.isTrue(followUp?.queueHeld);
+        assert.isTrue(wake?.queueHeld);
+
+        yield* drainUnconfirmedStop;
+        yield* orchestrator.resumeQueuedRuns;
         yield* worker.drain();
-        yield* Fiber.join(running);
-        if (wakeAfterStop) {
-          const send = (id: string, provider = false) =>
-            orchestrator.dispatch({
-              type: "message.dispatch",
-              commandId: CommandId.make(id),
-              threadId,
-              messageId: MessageId.make(`message:${id}`),
-              text: id,
-              attachments: [],
-              dispatchMode: { type: "queue_after_active" },
-              createdBy: provider ? "agent" : "user",
-              creationSource: provider ? "provider" : "web",
-            });
-          yield* send("follow-up");
-          yield* orchestrator.dispatch({
-            type: "thread.stop",
-            commandId: CommandId.make("stop"),
+        const after = yield* orchestrator.getThreadProjection(threadId);
+        assert.deepEqual(
+          after.runs.map((run) => run.status),
+          ["interrupted", "queued", "queued"],
+        );
+        assert.isTrue(after.runs.find((run) => run.id === followUp?.id)?.queueHeld);
+        assert.isTrue(after.runs.find((run) => run.id === wake?.id)?.queueHeld);
+        assert.lengthOf(started, 1);
+        return;
+      }
+      const first = started[0]!;
+      const codexTurn = (yield* orchestrator.getThreadProjection(threadId)).providerTurns[0]!;
+      const devServerId = TurnItemId.make("turn-item:dev-server");
+      const now = yield* DateTime.now;
+      yield* sink.write({
+        events: [
+          {
+            id: EventId.make("dev-server"),
+            type: "turn-item.updated",
             threadId,
-          });
-          // Stop is committed, but its provider interrupt has not run yet.
-          yield* send("Background task completed.", true);
-          const [stopped, followUp, wake] = (yield* orchestrator.getThreadProjection(threadId))
-            .runs;
-          assert.equal(stopped?.status, "running");
-          assert.isTrue(followUp?.queueHeld);
-          assert.isTrue(wake?.queueHeld);
-
-          yield* worker.drain();
-          yield* orchestrator.resumeQueuedRuns;
-          yield* worker.drain();
-          const after = yield* orchestrator.getThreadProjection(threadId);
-          assert.deepEqual(
-            after.runs.map((run) => run.status),
-            ["interrupted", "queued", "queued"],
+            runId: first.runId,
+            occurredAt: now,
+            payload: {
+              id: devServerId,
+              threadId,
+              runId: first.runId,
+              nodeId: first.rootNodeId,
+              providerThreadId: codexTurn.providerThreadId,
+              providerTurnId: codexTurn.id,
+              nativeItemRef: null,
+              parentItemId: null,
+              ordinal: 100,
+              status: "running",
+              title: null,
+              startedAt: now,
+              completedAt: null,
+              updatedAt: now,
+              type: "command_execution",
+              input: "vp run dev --share",
+            },
+          },
+        ],
+      });
+      if (stalledRun !== undefined) {
+        const before = yield* orchestrator.getThreadProjection(threadId);
+        const run = before.runs[0]!;
+        const node = before.nodes.find((candidate) => candidate.id === run.rootNodeId)!;
+        const attempt = before.attempts[0]!;
+        if (stalledRun === "missing-session-terminal") {
+          const sessions = yield* ProviderSessionManager.ProviderSessionManagerV2;
+          const failed = yield* watch(
+            (event) => event.type === "run.updated" && event.payload.status === "failed",
           );
-          assert.isTrue(after.runs.find((run) => run.id === followUp?.id)?.queueHeld);
-          assert.isTrue(after.runs.find((run) => run.id === wake?.id)?.queueHeld);
-          assert.lengthOf(started, 1);
-          return;
+          yield* sessions.release({
+            providerSessionId: first.providerThread.providerSessionId!,
+            reason: "runtime_error",
+          });
+          yield* Fiber.join(failed);
+          yield* sink.write({
+            events: [
+              {
+                id: EventId.make("stale-run"),
+                type: "run.updated",
+                threadId,
+                occurredAt: now,
+                payload: run,
+              },
+              {
+                id: EventId.make("stale-node"),
+                type: "node.updated",
+                threadId,
+                occurredAt: now,
+                payload: node,
+              },
+              {
+                id: EventId.make("stale-attempt"),
+                type: "run-attempt.updated",
+                threadId,
+                occurredAt: now,
+                payload: attempt,
+              },
+            ],
+          });
+        }
+        const messageId = MessageId.make("partial-output");
+        const item = before.turnItems.find((candidate) => candidate.id === devServerId)!;
+        assert.ok(item.type === "command_execution");
+        const terminalProviderTurn = stalledRun.endsWith("-terminal");
+        if (terminalProviderTurn) {
+          yield* sink.write({
+            events: [
+              {
+                id: EventId.make("terminal-provider-turn"),
+                type: "provider-turn.updated",
+                threadId,
+                occurredAt: now,
+                payload: { ...codexTurn, status: "completed", completedAt: now },
+              },
+              ...(stalledRun === "missing-session-terminal"
+                ? [
+                    {
+                      id: EventId.make("completed-dev-server"),
+                      type: "turn-item.updated" as const,
+                      threadId,
+                      occurredAt: now,
+                      payload: { ...item, status: "completed" as const, completedAt: now },
+                    },
+                  ]
+                : []),
+            ],
+          });
         }
-        const first = started[0]!;
-        const codexTurn = (yield* orchestrator.getThreadProjection(threadId)).providerTurns[0]!;
-        const devServerId = TurnItemId.make("turn-item:dev-server");
-        const now = yield* DateTime.now;
         yield* sink.write({
           events: [
             {
-              id: EventId.make("dev-server"),
-              type: "turn-item.updated",
+              id: EventId.make("partial-message"),
+              type: "message.updated",
               threadId,
-              runId: first.runId,
+              runId: run.id,
               occurredAt: now,
               payload: {
-                id: devServerId,
+                id: messageId,
                 threadId,
-                runId: first.runId,
-                nodeId: first.rootNodeId,
+                runId: run.id,
+                nodeId: node.id,
+                role: "assistant",
+                text: "Partial output",
+                attachments: [],
+                streaming: true,
+                createdBy: "agent",
+                creationSource: "provider",
+                createdAt: now,
+                updatedAt: now,
+              },
+            },
+            {
+              id: EventId.make("partial-item"),
+              type: "turn-item.updated",
+              threadId,
+              runId: run.id,
+              occurredAt: now,
+              payload: {
+                ...item,
                 providerThreadId: codexTurn.providerThreadId,
                 providerTurnId: codexTurn.id,
-                nativeItemRef: null,
-                parentItemId: null,
-                ordinal: 100,
-                status: "running",
-                title: null,
-                startedAt: now,
-                completedAt: null,
-                updatedAt: now,
-                type: "command_execution",
-                input: "vp run dev --share",
+                id: TurnItemId.make("partial-output"),
+                type: "assistant_message",
+                messageId,
+                text: "Partial output",
+                streaming: true,
               },
             },
           ],
         });
-        if (stalledRun !== undefined) {
-          const before = yield* orchestrator.getThreadProjection(threadId);
-          const run = before.runs[0]!;
-          const node = before.nodes.find((candidate) => candidate.id === run.rootNodeId)!;
-          const attempt = before.attempts[0]!;
-          if (stalledRun === "missing-session-terminal") {
-            const sessions = yield* ProviderSessionManager.ProviderSessionManagerV2;
-            const failed = yield* watch(
-              (event) => event.type === "run.updated" && event.payload.status === "failed",
-            );
-            yield* sessions.release({
-              providerSessionId: first.providerThread.providerSessionId!,
-              reason: "runtime_error",
-            });
-            yield* Fiber.join(failed);
-            yield* sink.write({
-              events: [
-                {
-                  id: EventId.make("stale-run"),
-                  type: "run.updated",
-                  threadId,
-                  occurredAt: now,
-                  payload: run,
-                },
-                {
-                  id: EventId.make("stale-node"),
-                  type: "node.updated",
-                  threadId,
-                  occurredAt: now,
-                  payload: node,
-                },
-                {
-                  id: EventId.make("stale-attempt"),
-                  type: "run-attempt.updated",
-                  threadId,
-                  occurredAt: now,
-                  payload: attempt,
-                },
-              ],
-            });
-          }
-          const messageId = MessageId.make("partial-output");
-          const item = before.turnItems.find((candidate) => candidate.id === devServerId)!;
-          assert.ok(item.type === "command_execution");
-          const terminalProviderTurn = stalledRun.endsWith("-terminal");
-          if (terminalProviderTurn) {
-            yield* sink.write({
-              events: [
-                {
-                  id: EventId.make("terminal-provider-turn"),
-                  type: "provider-turn.updated",
-                  threadId,
-                  occurredAt: now,
-                  payload: { ...codexTurn, status: "completed", completedAt: now },
-                },
-                ...(stalledRun === "missing-session-terminal"
-                  ? [
-                      {
-                        id: EventId.make("completed-dev-server"),
-                        type: "turn-item.updated" as const,
-                        threadId,
-                        occurredAt: now,
-                        payload: { ...item, status: "completed" as const, completedAt: now },
-                      },
-                    ]
-                  : []),
-              ],
-            });
-          }
+        if (stalledRun === "superseded-attempt") {
           yield* sink.write({
             events: [
               {
-                id: EventId.make("partial-message"),
-                type: "message.updated",
+                id: EventId.make("new-attempt"),
+                type: "run.updated",
                 threadId,
-                runId: run.id,
                 occurredAt: now,
-                payload: {
-                  id: messageId,
-                  threadId,
-                  runId: run.id,
-                  nodeId: node.id,
-                  role: "assistant",
-                  text: "Partial output",
-                  attachments: [],
-                  streaming: true,
-                  createdBy: "agent",
-                  creationSource: "provider",
-                  createdAt: now,
-                  updatedAt: now,
-                },
+                payload: { ...run, activeAttemptId: RunAttemptId.make("new-attempt") },
               },
-              {
-                id: EventId.make("partial-item"),
-                type: "turn-item.updated",
+            ],
+          });
+        }
+        yield* orchestrator.dispatch(
+          stalledRun === "superseded-attempt"
+            ? {
+                type: "thread.background-work.settle",
+                commandId: CommandId.make("late-settle"),
                 threadId,
-                runId: run.id,
+                providerThreadId: codexTurn.providerThreadId,
+                providerTurnId: codexTurn.id,
+              }
+            : {
+                type: "thread.stop",
+                commandId: CommandId.make("stop-stalled-run"),
+                threadId,
+              },
+        );
+        yield* stalledRun === "returned-interrupt" ? drainUnconfirmedStop : worker.drain();
+        const after = yield* orchestrator.getThreadProjection(threadId);
+        const interrupted = stalledRun !== "superseded-attempt";
+        assert.equal(after.runs[0]?.status, interrupted ? "interrupted" : "running");
+        assert.equal(after.attempts[0]?.status, interrupted ? "interrupted" : "running");
+        assert.equal(
+          after.providerTurns[0]?.status,
+          terminalProviderTurn ? "completed" : interrupted ? "interrupted" : "running",
+        );
+        assert.equal(
+          after.nodes.find((candidate) => candidate.id === node.id)?.status,
+          interrupted ? "interrupted" : "running",
+        );
+        const output = after.messages.find((message) => message.id === messageId)!;
+        assert.equal(output.streaming, !interrupted);
+        assert.equal(output.text, "Partial output");
+        assert.equal(
+          after.turnItems.find((candidate) => candidate.id === devServerId)?.status,
+          stalledRun === "missing-session-terminal"
+            ? "completed"
+            : interrupted
+              ? "interrupted"
+              : "running",
+        );
+        assert.equal(
+          after.turnItems.find((candidate) => candidate.type === "assistant_message")?.status,
+          interrupted ? "interrupted" : "running",
+        );
+        assert.equal(
+          after.turnItems.filter((candidate) => candidate.type === "run_interrupt_result").length,
+          interrupted ? 1 : 0,
+        );
+        assert.isEmpty(after.runs.filter((candidate) => candidate.status === "waiting"));
+        return;
+      }
+      const settled = yield* watch(
+        (event) =>
+          event.type === "run.updated" &&
+          event.payload.id === first.runId &&
+          event.payload.status === "waiting",
+      );
+      yield* Queue.offer(events, {
+        type: "provider_turn.updated",
+        driver,
+        providerTurn: { ...codexTurn, status: "completed", completedAt: now },
+      });
+      yield* Queue.offer(events, {
+        type: "turn.terminal",
+        driver,
+        providerThreadId: codexTurn.providerThreadId,
+        providerTurnId: codexTurn.id,
+        runOrdinal: first.runOrdinal,
+        status: "completed",
+        failure: null,
+        threadDisposition: "reusable",
+      });
+      yield* Fiber.join(settled);
+      yield* worker.drain();
+
+      const codexProviderThread = (yield* orchestrator.getThreadProjection(threadId))
+        .providerThreads[0]!;
+      const backgroundTasks = [
+        { taskId: "sleep", description: "Wait before the recheck", kind: "command" as const },
+      ];
+      const otherBackgroundTasks = [{ ...backgroundTasks[0]!, taskId: "other-sleep" }];
+      const subagentThread = (name: string) =>
+        Effect.gen(function* () {
+          const subagentThreadId = ThreadId.make(`thread:${name}`);
+          const rootId = NodeId.make(`node:${name}-root`);
+          yield* orchestrator.dispatch({
+            type: "thread.create",
+            commandId: CommandId.make(`create-${name}`),
+            threadId: subagentThreadId,
+            projectId: ProjectId.make("project:background-work-stop"),
+            title: name,
+            modelSelection,
+            runtimeMode: "full-access",
+            interactionMode: "default",
+            branch: null,
+            worktreePath: cwd,
+            createdBy: "agent",
+            creationSource: "provider",
+          });
+          yield* sink.write({
+            events: [
+              {
+                id: EventId.make(`${name}-root`),
+                type: "node.updated",
+                threadId: subagentThreadId,
                 occurredAt: now,
                 payload: {
-                  ...item,
-                  providerThreadId: codexTurn.providerThreadId,
-                  providerTurnId: codexTurn.id,
-                  id: TurnItemId.make("partial-output"),
-                  type: "assistant_message",
-                  messageId,
-                  text: "Partial output",
-                  streaming: true,
+                  id: rootId,
+                  threadId: subagentThreadId,
+                  runId: null,
+                  parentNodeId: null,
+                  rootNodeId: rootId,
+                  kind: "root_turn",
+                  status: "running",
+                  countsForRun: false,
+                  providerThreadId: null,
+                  providerTurnId: null,
+                  nativeItemRef: null,
+                  runtimeRequestId: null,
+                  checkpointScopeId: null,
+                  startedAt: now,
+                  completedAt: null,
                 },
               },
             ],
           });
-          if (stalledRun === "superseded-attempt") {
-            yield* sink.write({
-              events: [
-                {
-                  id: EventId.make("new-attempt"),
-                  type: "run.updated",
-                  threadId,
-                  occurredAt: now,
-                  payload: { ...run, activeAttemptId: RunAttemptId.make("new-attempt") },
-                },
-              ],
-            });
-          }
-          yield* orchestrator.dispatch(
-            stalledRun === "superseded-attempt"
-              ? {
-                  type: "thread.background-work.settle",
-                  commandId: CommandId.make("late-settle"),
-                  threadId,
-                  providerThreadId: codexTurn.providerThreadId,
-                  providerTurnId: codexTurn.id,
-                }
-              : {
-                  type: "thread.stop",
-                  commandId: CommandId.make("stop-stalled-run"),
-                  threadId,
-                },
-          );
-          yield* worker.drain();
-          const after = yield* orchestrator.getThreadProjection(threadId);
-          const interrupted = stalledRun !== "superseded-attempt";
-          assert.equal(after.runs[0]?.status, interrupted ? "interrupted" : "running");
-          assert.equal(after.attempts[0]?.status, interrupted ? "interrupted" : "running");
-          assert.equal(
-            after.providerTurns[0]?.status,
-            terminalProviderTurn ? "completed" : interrupted ? "interrupted" : "running",
-          );
-          assert.equal(
-            after.nodes.find((candidate) => candidate.id === node.id)?.status,
-            interrupted ? "interrupted" : "running",
-          );
-          const output = after.messages.find((message) => message.id === messageId)!;
-          assert.equal(output.streaming, !interrupted);
-          assert.equal(output.text, "Partial output");
-          assert.equal(
-            after.turnItems.find((candidate) => candidate.id === devServerId)?.status,
-            stalledRun === "missing-session-terminal"
-              ? "completed"
-              : interrupted
-                ? "interrupted"
-                : "running",
-          );
-          assert.equal(
-            after.turnItems.find((candidate) => candidate.type === "assistant_message")?.status,
-            interrupted ? "interrupted" : "running",
-          );
-          assert.equal(
-            after.turnItems.filter((candidate) => candidate.type === "run_interrupt_result").length,
-            interrupted ? 1 : 0,
-          );
-          assert.isEmpty(after.runs.filter((candidate) => candidate.status === "waiting"));
-          return;
-        }
-        const settled = yield* watch(
-          (event) =>
-            event.type === "run.updated" &&
-            event.payload.id === first.runId &&
-            event.payload.status === "waiting",
-        );
-        yield* Queue.offer(events, {
-          type: "provider_turn.updated",
-          driver,
-          providerTurn: { ...codexTurn, status: "completed", completedAt: now },
+          return { threadId: subagentThreadId, rootId };
         });
-        yield* Queue.offer(events, {
-          type: "turn.terminal",
-          driver,
-          providerThreadId: codexTurn.providerThreadId,
-          providerTurnId: codexTurn.id,
-          runOrdinal: first.runOrdinal,
-          status: "completed",
-          failure: null,
-          threadDisposition: "reusable",
-        });
-        yield* Fiber.join(settled);
-        yield* worker.drain();
-
-        const codexProviderThread = (yield* orchestrator.getThreadProjection(threadId))
-          .providerThreads[0]!;
-        const backgroundTasks = [
-          { taskId: "sleep", description: "Wait before the recheck", kind: "command" as const },
-        ];
-        const otherBackgroundTasks = [{ ...backgroundTasks[0]!, taskId: "other-sleep" }];
-        const subagentThread = (name: string) =>
-          Effect.gen(function* () {
-            const subagentThreadId = ThreadId.make(`thread:${name}`);
-            const rootId = NodeId.make(`node:${name}-root`);
-            yield* orchestrator.dispatch({
-              type: "thread.create",
-              commandId: CommandId.make(`create-${name}`),
-              threadId: subagentThreadId,
-              projectId: ProjectId.make("project:background-work-stop"),
-              title: name,
-              modelSelection,
-              runtimeMode: "full-access",
-              interactionMode: "default",
-              branch: null,
-              worktreePath: cwd,
-              createdBy: "agent",
-              creationSource: "provider",
-            });
-            yield* sink.write({
-              events: [
+      const { threadId: reviewerThreadId, rootId: reviewerRootId } =
+        yield* subagentThread("reviewer");
+      const tester = yield* subagentThread("tester");
+      const nestedSubagentId = NodeId.make("subagent:nested");
+      const nestedItemId = TurnItemId.make("turn-item:nested-subagent");
+      const nested = {
+        threadId: reviewerThreadId,
+        runId: null,
+        origin: "provider_native",
+        driver,
+        providerInstanceId: instanceId,
+        providerThreadId: null,
+        childThreadId: tester.threadId,
+        prompt: "Check the tests",
+        title: null,
+        status: "running",
+        result: null,
+        startedAt: now,
+        completedAt: null,
+        updatedAt: now,
+      } as const;
+      yield* sink.write({
+        events: [
+          ...(workflowMember
+            ? []
+            : [
                 {
-                  id: EventId.make(`${name}-root`),
-                  type: "node.updated",
-                  threadId: subagentThreadId,
+                  id: EventId.make("nested-subagent-item"),
+                  type: "turn-item.updated",
+                  threadId: reviewerThreadId,
                   occurredAt: now,
                   payload: {
-                    id: rootId,
-                    threadId: subagentThreadId,
-                    runId: null,
-                    parentNodeId: null,
-                    rootNodeId: rootId,
-                    kind: "root_turn",
-                    status: "running",
-                    countsForRun: false,
-                    providerThreadId: null,
+                    ...nested,
+                    id: nestedItemId,
+                    nodeId: nestedSubagentId,
                     providerTurnId: null,
                     nativeItemRef: null,
-                    runtimeRequestId: null,
-                    checkpointScopeId: null,
-                    startedAt: now,
-                    completedAt: null,
+                    parentItemId: null,
+                    ordinal: 1,
+                    type: "subagent",
+                    subagentId: nestedSubagentId,
                   },
-                },
-              ],
-            });
-            return { threadId: subagentThreadId, rootId };
-          });
-        const { threadId: reviewerThreadId, rootId: reviewerRootId } =
-          yield* subagentThread("reviewer");
-        const tester = yield* subagentThread("tester");
-        const nestedSubagentId = NodeId.make("subagent:nested");
-        const nestedItemId = TurnItemId.make("turn-item:nested-subagent");
-        const nested = {
-          threadId: reviewerThreadId,
-          runId: null,
-          origin: "provider_native",
-          driver,
-          providerInstanceId: instanceId,
-          providerThreadId: null,
-          childThreadId: tester.threadId,
-          prompt: "Check the tests",
-          title: null,
-          status: "running",
-          result: null,
-          startedAt: now,
-          completedAt: null,
-          updatedAt: now,
-        } as const;
+                } as const,
+              ]),
+          {
+            id: EventId.make("nested-subagent"),
+            type: "subagent.updated",
+            threadId: reviewerThreadId,
+            occurredAt: now,
+            payload: {
+              ...nested,
+              id: nestedSubagentId,
+              parentNodeId: reviewerRootId,
+              createdBy: "agent",
+              nativeTaskRef: workflowMember
+                ? { driver, nativeId: "workflow:member", strength: "strong" }
+                : null,
+              model: null,
+            },
+          },
+        ],
+      });
+      if (workflowMember) {
+        const memberRoot = (yield* orchestrator.getThreadProjection(tester.threadId)).nodes[0]!;
         yield* sink.write({
           events: [
-            ...(workflowMember
-              ? []
-              : [
-                  {
-                    id: EventId.make("nested-subagent-item"),
-                    type: "turn-item.updated",
-                    threadId: reviewerThreadId,
-                    occurredAt: now,
-                    payload: {
-                      ...nested,
-                      id: nestedItemId,
-                      nodeId: nestedSubagentId,
-                      providerTurnId: null,
-                      nativeItemRef: null,
-                      parentItemId: null,
-                      ordinal: 1,
-                      type: "subagent",
-                      subagentId: nestedSubagentId,
-                    },
-                  } as const,
-                ]),
             {
-              id: EventId.make("nested-subagent"),
-              type: "subagent.updated",
+              id: EventId.make("workflow-member-node"),
+              type: "node.updated",
               threadId: reviewerThreadId,
               occurredAt: now,
               payload: {
-                ...nested,
+                ...memberRoot,
                 id: nestedSubagentId,
+                threadId: reviewerThreadId,
                 parentNodeId: reviewerRootId,
-                createdBy: "agent",
-                nativeTaskRef: workflowMember
-                  ? { driver, nativeId: "workflow:member", strength: "strong" }
-                  : null,
-                model: null,
+                rootNodeId: reviewerRootId,
+                kind: "subagent",
               },
             },
           ],
         });
-        if (workflowMember) {
-          const memberRoot = (yield* orchestrator.getThreadProjection(tester.threadId)).nodes[0]!;
-          yield* sink.write({
-            events: [
-              {
-                id: EventId.make("workflow-member-node"),
-                type: "node.updated",
-                threadId: reviewerThreadId,
-                occurredAt: now,
-                payload: {
-                  ...memberRoot,
-                  id: nestedSubagentId,
-                  threadId: reviewerThreadId,
-                  parentNodeId: reviewerRootId,
-                  rootNodeId: reviewerRootId,
-                  kind: "subagent",
-                },
-              },
-            ],
+      }
+      const settledRun = (input: {
+        readonly ordinal: number;
+        readonly providerThreadId: ProviderThreadId;
+        readonly runningItem?: {
+          readonly id: TurnItemId;
+          readonly kind: "command" | "subagent";
+        };
+      }) => {
+        const runId = RunId.make(`run:${input.ordinal}`);
+        const attemptId = RunAttemptId.make(`attempt:${input.ordinal}`);
+        const nodeId = NodeId.make(`node:${input.ordinal}`);
+        const providerTurnId = ProviderTurnId.make(`provider-turn:${input.ordinal}`);
+        const events: Array<OrchestrationV2DomainEvent> = [
+          {
+            id: EventId.make(`run:${input.ordinal}`),
+            type: "run.created",
+            threadId,
+            occurredAt: now,
+            payload: {
+              id: runId,
+              threadId,
+              ordinal: input.ordinal,
+              providerInstanceId: instanceId,
+              modelSelection,
+              providerThreadId: input.providerThreadId,
+              userMessageId: MessageId.make(`message:${input.ordinal}`),
+              rootNodeId: nodeId,
+              activeAttemptId: attemptId,
+              status: "completed",
+              requestedAt: now,
+              startedAt: now,
+              completedAt: now,
+              checkpointId: null,
+              contextHandoffId: null,
+            },
+          },
+          {
+            id: EventId.make(`node:${input.ordinal}`),
+            type: "node.updated",
+            threadId,
+            runId,
+            occurredAt: now,
+            payload: {
+              id: nodeId,
+              threadId,
+              runId,
+              parentNodeId: null,
+              rootNodeId: nodeId,
+              kind: "root_turn",
+              status: "completed",
+              countsForRun: true,
+              providerThreadId: input.providerThreadId,
+              providerTurnId,
+              nativeItemRef: null,
+              runtimeRequestId: null,
+              checkpointScopeId: null,
+              startedAt: now,
+              completedAt: now,
+            },
+          },
+          {
+            id: EventId.make(`attempt:${input.ordinal}`),
+            type: "run-attempt.created",
+            threadId,
+            occurredAt: now,
+            payload: {
+              id: attemptId,
+              runId,
+              attemptOrdinal: 1,
+              rootNodeId: nodeId,
+              providerInstanceId: instanceId,
+              providerThreadId: input.providerThreadId,
+              providerTurnId,
+              reason: "initial",
+              status: "completed",
+              startedAt: now,
+              completedAt: now,
+            },
+          },
+          {
+            id: EventId.make(`provider-turn:${input.ordinal}`),
+            type: "provider-turn.updated",
+            threadId,
+            occurredAt: now,
+            payload: {
+              id: providerTurnId,
+              providerThreadId: input.providerThreadId,
+              nodeId,
+              runAttemptId: attemptId,
+              nativeTurnRef: null,
+              ordinal: input.ordinal,
+              status: "completed",
+              startedAt: now,
+              completedAt: now,
+            },
+          },
+        ];
+        const item = input.runningItem;
+        if (item !== undefined) {
+          const base = {
+            id: item.id,
+            threadId,
+            runId,
+            nodeId,
+            providerThreadId: input.providerThreadId,
+            providerTurnId,
+            nativeItemRef: null,
+            parentItemId: null,
+            ordinal: input.ordinal * 100,
+            status: "running",
+            title: null,
+            startedAt: now,
+            completedAt: null,
+            updatedAt: now,
+          } as const;
+          events.push({
+            id: EventId.make(`item:${input.ordinal}`),
+            type: "turn-item.updated",
+            threadId,
+            runId,
+            occurredAt: now,
+            payload:
+              item.kind === "command"
+                ? { ...base, type: "command_execution", input: "vp run test --watch" }
+                : {
+                    ...base,
+                    providerThreadId: ProviderThreadId.make("provider-thread:codex-subagent"),
+                    type: "subagent",
+                    subagentId: NodeId.make(`subagent:${input.ordinal}`),
+                    origin: "provider_native",
+                    driver,
+                    providerInstanceId: instanceId,
+                    childThreadId: reviewerThreadId,
+                    prompt: "Review the change",
+                    result: null,
+                  },
           });
-        }
-        const settledRun = (input: {
-          readonly ordinal: number;
-          readonly providerThreadId: ProviderThreadId;
-          readonly runningItem?: {
-            readonly id: TurnItemId;
-            readonly kind: "command" | "subagent";
-          };
-        }) => {
-          const runId = RunId.make(`run:${input.ordinal}`);
-          const attemptId = RunAttemptId.make(`attempt:${input.ordinal}`);
-          const nodeId = NodeId.make(`node:${input.ordinal}`);
-          const providerTurnId = ProviderTurnId.make(`provider-turn:${input.ordinal}`);
-          const events: Array<OrchestrationV2DomainEvent> = [
-            {
-              id: EventId.make(`run:${input.ordinal}`),
-              type: "run.created",
+          if (item.kind === "subagent") {
+            events.push({
+              id: EventId.make(`subagent:${input.ordinal}`),
+              type: "subagent.updated",
               threadId,
+              runId,
               occurredAt: now,
               payload: {
-                id: runId,
-                threadId,
-                ordinal: input.ordinal,
+                ...base,
+                id: NodeId.make(`subagent:${input.ordinal}`),
+                parentNodeId: nodeId,
+                origin: "provider_native",
+                createdBy: "agent",
+                driver,
                 providerInstanceId: instanceId,
-                modelSelection,
-                providerThreadId: input.providerThreadId,
-                userMessageId: MessageId.make(`message:${input.ordinal}`),
-                rootNodeId: nodeId,
-                activeAttemptId: attemptId,
-                status: "completed",
-                requestedAt: now,
-                startedAt: now,
-                completedAt: now,
-                checkpointId: null,
-                contextHandoffId: null,
+                providerThreadId: null,
+                childThreadId: reviewerThreadId,
+                nativeTaskRef: null,
+                prompt: "Review the change",
+                model: null,
+                result: null,
               },
+            });
+          }
+        }
+        return { runId, providerTurnId, events };
+      };
+
+      const watcherId = TurnItemId.make("turn-item:watcher");
+      const otherProviderThreadId = ProviderThreadId.make("provider-thread:other");
+      const watcherRun = settledRun({
+        ordinal: 2,
+        providerThreadId: olderStart ? otherProviderThreadId : codexProviderThread.id,
+        ...(olderStart ? {} : { runningItem: { id: watcherId, kind: "command" as const } }),
+      });
+      const reviewerId = TurnItemId.make("turn-item:reviewer");
+      const reviewerRun = settledRun({
+        ordinal: 3,
+        providerThreadId: codexProviderThread.id,
+        runningItem: { id: reviewerId, kind: "subagent" },
+      });
+      const latestRun = settledRun({ ordinal: 4, providerThreadId: otherProviderThreadId });
+      yield* sink.write({
+        events: [
+          ...watcherRun.events,
+          ...reviewerRun.events,
+          {
+            id: EventId.make("provider-thread:other"),
+            type: "provider-thread.updated",
+            threadId,
+            occurredAt: now,
+            payload: {
+              ...codexProviderThread,
+              id: otherProviderThreadId,
+              firstRunOrdinal: 4,
+              lastRunOrdinal: 4,
+              ...(failedStart ? { pendingBackgroundTasks: otherBackgroundTasks } : {}),
             },
+          },
+          ...latestRun.events,
+        ],
+      });
+
+      const failedRun = settledRun({ ordinal: 5, providerThreadId: codexProviderThread.id });
+      if (failedStart) {
+        yield* sink.write({
+          events: [
             {
-              id: EventId.make(`node:${input.ordinal}`),
-              type: "node.updated",
+              id: EventId.make("failed-start-roster"),
+              type: "provider-thread.updated",
               threadId,
-              runId,
               occurredAt: now,
               payload: {
-                id: nodeId,
-                threadId,
-                runId,
-                parentNodeId: null,
-                rootNodeId: nodeId,
-                kind: "root_turn",
-                status: "completed",
-                countsForRun: true,
-                providerThreadId: input.providerThreadId,
-                providerTurnId,
-                nativeItemRef: null,
-                runtimeRequestId: null,
-                checkpointScopeId: null,
-                startedAt: now,
-                completedAt: now,
+                ...codexProviderThread,
+                lastRunOrdinal: 5,
+                pendingBackgroundTasks: backgroundTasks,
               },
             },
+            ...failedRun.events.flatMap((event): Array<OrchestrationV2DomainEvent> => {
+              switch (event.type) {
+                case "provider-turn.updated":
+                  return [];
+                case "run.created":
+                  return [{ ...event, payload: { ...event.payload, status: "failed" } }];
+                case "node.updated":
+                  return [
+                    {
+                      ...event,
+                      payload: { ...event.payload, status: "failed", providerTurnId: null },
+                    },
+                  ];
+                case "run-attempt.created":
+                  return [
+                    {
+                      ...event,
+                      payload: { ...event.payload, status: "failed", providerTurnId: null },
+                    },
+                  ];
+                default:
+                  return [event];
+              }
+            }),
+          ],
+        });
+        // The older turn reports an empty roster, but the refused run owns the row now.
+        const clear = yield* sink.writeIfProviderThreadOwner({
+          providerThreadId: codexProviderThread.id,
+          runId: reviewerRun.runId,
+          activeAttemptId: RunAttemptId.make("attempt:3"),
+          expectedLastRunOrdinal: 3,
+          events: [
             {
-              id: EventId.make(`attempt:${input.ordinal}`),
-              type: "run-attempt.created",
+              id: EventId.make("dropped-roster-clear"),
+              type: "provider-thread.updated",
               threadId,
               occurredAt: now,
-              payload: {
-                id: attemptId,
-                runId,
-                attemptOrdinal: 1,
-                rootNodeId: nodeId,
-                providerInstanceId: instanceId,
-                providerThreadId: input.providerThreadId,
-                providerTurnId,
-                reason: "initial",
-                status: "completed",
-                startedAt: now,
-                completedAt: now,
-              },
+              payload: { ...codexProviderThread, pendingBackgroundTasks: [] },
             },
+          ],
+        });
+        assert.isFalse(clear.committed);
+        const beforeStop = (yield* orchestrator.getThreadProjection(threadId)).providerThreads.find(
+          (thread) => thread.id === codexProviderThread.id,
+        )!;
+        assert.equal(beforeStop.lastRunOrdinal, 5);
+        assert.deepEqual(beforeStop.pendingBackgroundTasks, backgroundTasks);
+      }
+
+      if (stopWithQueue !== undefined) {
+        const owner = (yield* orchestrator.getThreadProjection(threadId)).runs.find(
+          (run) => run.id === latestRun.runId,
+        )!;
+        yield* sink.write({
+          events: [
             {
-              id: EventId.make(`provider-turn:${input.ordinal}`),
-              type: "provider-turn.updated",
+              id: EventId.make("latest-run-waiting"),
+              type: "run.updated",
               threadId,
+              runId: owner.id,
               occurredAt: now,
-              payload: {
-                id: providerTurnId,
-                providerThreadId: input.providerThreadId,
-                nodeId,
-                runAttemptId: attemptId,
-                nativeTurnRef: null,
-                ordinal: input.ordinal,
-                status: "completed",
-                startedAt: now,
-                completedAt: now,
-              },
+              payload: { ...owner, status: "waiting", completedAt: null },
             },
-          ];
-          const item = input.runningItem;
-          if (item !== undefined) {
-            const base = {
-              id: item.id,
+          ],
+        });
+        yield* orchestrator.dispatch({
+          type: "message.dispatch",
+          commandId: CommandId.make("queue-follow-up"),
+          threadId,
+          messageId: MessageId.make("message:queue-follow-up"),
+          text: "Follow up after the background work",
+          attachments: [],
+          dispatchMode: { type: "queue_after_active" },
+          createdBy: "user",
+          creationSource: "web",
+        });
+        const queued = (yield* orchestrator.getThreadProjection(threadId)).runs.at(-1)!;
+        assert.equal(queued.status, "queued");
+        yield* sink.write({
+          events: [
+            {
+              id: EventId.make("queue-held"),
+              type: "run.updated",
               threadId,
-              runId,
-              nodeId,
-              providerThreadId: input.providerThreadId,
-              providerTurnId,
-              nativeItemRef: null,
-              parentItemId: null,
-              ordinal: input.ordinal * 100,
-              status: "running",
-              title: null,
-              startedAt: now,
-              completedAt: null,
-              updatedAt: now,
-            } as const;
-            events.push({
-              id: EventId.make(`item:${input.ordinal}`),
-              type: "turn-item.updated",
+              runId: queued.id,
+              occurredAt: now,
+              payload: { ...queued, queueHeld: true },
+            },
+            {
+              id: EventId.make("latest-run-settled"),
+              type: "run.updated",
               threadId,
-              runId,
+              runId: owner.id,
               occurredAt: now,
-              payload:
-                item.kind === "command"
-                  ? { ...base, type: "command_execution", input: "vp run test --watch" }
-                  : {
-                      ...base,
-                      providerThreadId: ProviderThreadId.make("provider-thread:codex-subagent"),
-                      type: "subagent",
-                      subagentId: NodeId.make(`subagent:${input.ordinal}`),
-                      origin: "provider_native",
-                      driver,
-                      providerInstanceId: instanceId,
-                      childThreadId: reviewerThreadId,
-                      prompt: "Review the change",
-                      result: null,
-                    },
-            });
-            if (item.kind === "subagent") {
-              events.push({
-                id: EventId.make(`subagent:${input.ordinal}`),
-                type: "subagent.updated",
-                threadId,
-                runId,
-                occurredAt: now,
-                payload: {
-                  ...base,
-                  id: NodeId.make(`subagent:${input.ordinal}`),
-                  parentNodeId: nodeId,
-                  origin: "provider_native",
-                  createdBy: "agent",
-                  driver,
-                  providerInstanceId: instanceId,
-                  providerThreadId: null,
-                  childThreadId: reviewerThreadId,
-                  nativeTaskRef: null,
-                  prompt: "Review the change",
-                  model: null,
-                  result: null,
-                },
-              });
-            }
-          }
-          return { runId, providerTurnId, events };
-        };
-
-        const watcherId = TurnItemId.make("turn-item:watcher");
-        const otherProviderThreadId = ProviderThreadId.make("provider-thread:other");
-        const watcherRun = settledRun({
-          ordinal: 2,
-          providerThreadId: olderStart ? otherProviderThreadId : codexProviderThread.id,
-          ...(olderStart ? {} : { runningItem: { id: watcherId, kind: "command" as const } }),
-        });
-        const reviewerId = TurnItemId.make("turn-item:reviewer");
-        const reviewerRun = settledRun({
-          ordinal: 3,
-          providerThreadId: codexProviderThread.id,
-          runningItem: { id: reviewerId, kind: "subagent" },
+              payload: owner,
+            },
+          ],
         });
-        const latestRun = settledRun({ ordinal: 4, providerThreadId: otherProviderThreadId });
+      }
+
+      if (olderStart) {
+        const older = (yield* orchestrator.getThreadProjection(threadId)).runs.find(
+          (run) => run.id === watcherRun.runId,
+        )!;
         yield* sink.write({
           events: [
-            ...watcherRun.events,
-            ...reviewerRun.events,
             {
-              id: EventId.make("provider-thread:other"),
-              type: "provider-thread.updated",
+              id: EventId.make("older-run-starting"),
+              type: "run.updated",
               threadId,
+              runId: older.id,
               occurredAt: now,
-              payload: {
-                ...codexProviderThread,
-                id: otherProviderThreadId,
-                firstRunOrdinal: 4,
-                lastRunOrdinal: 4,
-                ...(failedStart ? { pendingBackgroundTasks: otherBackgroundTasks } : {}),
-              },
+              payload: { ...older, status: "starting", startedAt: null, completedAt: null },
             },
-            ...latestRun.events,
           ],
         });
+      }
 
-        const failedRun = settledRun({ ordinal: 5, providerThreadId: codexProviderThread.id });
-        if (failedStart) {
-          yield* sink.write({
-            events: [
-              {
-                id: EventId.make("failed-start-roster"),
-                type: "provider-thread.updated",
-                threadId,
-                occurredAt: now,
-                payload: {
-                  ...codexProviderThread,
-                  lastRunOrdinal: 5,
-                  pendingBackgroundTasks: backgroundTasks,
-                },
-              },
-              ...failedRun.events.flatMap((event): Array<OrchestrationV2DomainEvent> => {
-                switch (event.type) {
-                  case "provider-turn.updated":
-                    return [];
-                  case "run.created":
-                    return [{ ...event, payload: { ...event.payload, status: "failed" } }];
-                  case "node.updated":
-                    return [
-                      {
-                        ...event,
-                        payload: { ...event.payload, status: "failed", providerTurnId: null },
-                      },
-                    ];
-                  case "run-attempt.created":
-                    return [
-                      {
-                        ...event,
-                        payload: { ...event.payload, status: "failed", providerTurnId: null },
-                      },
-                    ];
-                  default:
-                    return [event];
-                }
-              }),
-            ],
-          });
-          // The older turn reports an empty roster, but the refused run owns the row now.
-          const clear = yield* sink.writeIfProviderThreadOwner({
-            providerThreadId: codexProviderThread.id,
-            runId: reviewerRun.runId,
-            activeAttemptId: RunAttemptId.make("attempt:3"),
-            expectedLastRunOrdinal: 3,
-            events: [
-              {
-                id: EventId.make("dropped-roster-clear"),
-                type: "provider-thread.updated",
-                threadId,
-                occurredAt: now,
-                payload: { ...codexProviderThread, pendingBackgroundTasks: [] },
-              },
-            ],
-          });
-          assert.isFalse(clear.committed);
-          const beforeStop = (yield* orchestrator.getThreadProjection(
-            threadId,
-          )).providerThreads.find((thread) => thread.id === codexProviderThread.id)!;
-          assert.equal(beforeStop.lastRunOrdinal, 5);
-          assert.deepEqual(beforeStop.pendingBackgroundTasks, backgroundTasks);
-        }
-
-        if (stopWithQueue !== undefined) {
-          const owner = (yield* orchestrator.getThreadProjection(threadId)).runs.find(
-            (run) => run.id === latestRun.runId,
-          )!;
-          yield* sink.write({
-            events: [
-              {
-                id: EventId.make("latest-run-waiting"),
-                type: "run.updated",
-                threadId,
-                runId: owner.id,
-                occurredAt: now,
-                payload: { ...owner, status: "waiting", completedAt: null },
-              },
-            ],
-          });
-          yield* orchestrator.dispatch({
-            type: "message.dispatch",
-            commandId: CommandId.make("queue-follow-up"),
-            threadId,
-            messageId: MessageId.make("message:queue-follow-up"),
-            text: "Follow up after the background work",
-            attachments: [],
-            dispatchMode: { type: "queue_after_active" },
-            createdBy: "user",
-            creationSource: "web",
-          });
-          const queued = (yield* orchestrator.getThreadProjection(threadId)).runs.at(-1)!;
-          assert.equal(queued.status, "queued");
-          yield* sink.write({
-            events: [
-              {
-                id: EventId.make("queue-held"),
-                type: "run.updated",
-                threadId,
-                runId: queued.id,
-                occurredAt: now,
-                payload: { ...queued, queueHeld: true },
-              },
-              {
-                id: EventId.make("latest-run-settled"),
-                type: "run.updated",
-                threadId,
-                runId: owner.id,
-                occurredAt: now,
-                payload: owner,
-              },
-            ],
-          });
-        }
-
-        if (olderStart) {
-          const older = (yield* orchestrator.getThreadProjection(threadId)).runs.find(
-            (run) => run.id === watcherRun.runId,
-          )!;
-          yield* sink.write({
-            events: [
-              {
-                id: EventId.make("older-run-starting"),
-                type: "run.updated",
-                threadId,
-                runId: older.id,
-                occurredAt: now,
-                payload: { ...older, status: "starting", startedAt: null, completedAt: null },
-              },
-            ],
-          });
-        }
+      yield* orchestrator.dispatch(
+        stopWithQueue === "thread.stop"
+          ? {
+              type: "thread.stop",
+              commandId: CommandId.make("stop-background-work"),
+              threadId,
+            }
+          : {
+              type: "run.interrupt",
+              commandId: CommandId.make("stop-background-work"),
+              threadId,
+              runId: olderStart
+                ? watcherRun.runId
+                : failedStart
+                  ? failedRun.runId
+                  : latestRun.runId,
+              ...(stopWithQueue === undefined ? {} : { holdQueue: true }),
+            },
+      );
+      yield* worker.drain();
 
-        yield* orchestrator.dispatch(
-          stopWithQueue === "thread.stop"
-            ? {
-                type: "thread.stop",
-                commandId: CommandId.make("stop-background-work"),
-                threadId,
-              }
-            : {
-                type: "run.interrupt",
-                commandId: CommandId.make("stop-background-work"),
-                threadId,
-                runId: olderStart
-                  ? watcherRun.runId
-                  : failedStart
-                    ? failedRun.runId
-                    : latestRun.runId,
-                ...(stopWithQueue === undefined ? {} : { holdQueue: true }),
-              },
+      assert.sameDeepMembers(
+        interrupts.map((interrupt) => [interrupt.providerThread.id, interrupt.providerTurnId]),
+        [
+          ...(olderStart || failedStart ? [] : [[otherProviderThreadId, latestRun.providerTurnId]]),
+          [codexProviderThread.id, reviewerRun.providerTurnId],
+        ],
+      );
+      const after = yield* orchestrator.getThreadProjection(threadId);
+      if (olderStart) {
+        assert.equal(after.runs.find((run) => run.id === watcherRun.runId)?.status, "interrupted");
+      }
+      if (stopWithQueue !== undefined) {
+        assert.equal(after.runs.at(-1)?.status, "queued");
+        assert.equal(after.runs.at(-1)?.queueHeld, true);
+        assert.lengthOf(started, 1);
+      }
+      assert.deepEqual(
+        [devServerId, ...(olderStart ? [] : [watcherId]), reviewerId].map(
+          (id) => after.turnItems.find((item) => item.id === id)?.status,
+        ),
+        olderStart ? ["interrupted", "interrupted"] : ["interrupted", "interrupted", "interrupted"],
+      );
+      assert.equal(after.subagents[0]?.status, "interrupted");
+      const reviewerThread = yield* orchestrator.getThreadProjection(reviewerThreadId);
+      assert.equal(reviewerThread.nodes[0]?.status, "interrupted");
+      assert.equal(reviewerThread.subagents[0]?.status, "interrupted");
+      if (workflowMember) {
+        assert.isUndefined(reviewerThread.turnItems.find((item) => item.id === nestedItemId));
+        assert.equal(
+          reviewerThread.nodes.find((node) => node.id === nestedSubagentId)?.status,
+          "interrupted",
         );
-        yield* worker.drain();
-
-        assert.sameDeepMembers(
-          interrupts.map((interrupt) => [interrupt.providerThread.id, interrupt.providerTurnId]),
-          [
-            ...(olderStart || failedStart
-              ? []
-              : [[otherProviderThreadId, latestRun.providerTurnId]]),
-            [codexProviderThread.id, reviewerRun.providerTurnId],
-          ],
+      } else {
+        assert.equal(
+          reviewerThread.turnItems.find((item) => item.id === nestedItemId)?.status,
+          "interrupted",
         );
-        const after = yield* orchestrator.getThreadProjection(threadId);
-        if (olderStart) {
-          assert.equal(
-            after.runs.find((run) => run.id === watcherRun.runId)?.status,
-            "interrupted",
-          );
-        }
-        if (stopWithQueue !== undefined) {
-          assert.equal(after.runs.at(-1)?.status, "queued");
-          assert.equal(after.runs.at(-1)?.queueHeld, true);
-          assert.lengthOf(started, 1);
-        }
+      }
+      const testerThread = yield* orchestrator.getThreadProjection(tester.threadId);
+      assert.equal(testerThread.nodes[0]?.status, "interrupted");
+      if (failedStart) {
         assert.deepEqual(
-          [devServerId, ...(olderStart ? [] : [watcherId]), reviewerId].map(
-            (id) => after.turnItems.find((item) => item.id === id)?.status,
-          ),
-          olderStart
-            ? ["interrupted", "interrupted"]
-            : ["interrupted", "interrupted", "interrupted"],
+          after.providerThreads.find((candidate) => candidate.id === codexProviderThread.id)
+            ?.pendingBackgroundTasks,
+          backgroundWorkAfterStop === undefined ? [] : backgroundTasks,
         );
-        assert.equal(after.subagents[0]?.status, "interrupted");
-        const reviewerThread = yield* orchestrator.getThreadProjection(reviewerThreadId);
-        assert.equal(reviewerThread.nodes[0]?.status, "interrupted");
-        assert.equal(reviewerThread.subagents[0]?.status, "interrupted");
-        if (workflowMember) {
-          assert.isUndefined(reviewerThread.turnItems.find((item) => item.id === nestedItemId));
-          assert.equal(
-            reviewerThread.nodes.find((node) => node.id === nestedSubagentId)?.status,
-            "interrupted",
-          );
-        } else {
-          assert.equal(
-            reviewerThread.turnItems.find((item) => item.id === nestedItemId)?.status,
-            "interrupted",
-          );
-        }
-        const testerThread = yield* orchestrator.getThreadProjection(tester.threadId);
-        assert.equal(testerThread.nodes[0]?.status, "interrupted");
-        if (failedStart) {
-          assert.deepEqual(
-            after.providerThreads.find((candidate) => candidate.id === codexProviderThread.id)
-              ?.pendingBackgroundTasks,
-            backgroundWorkAfterStop === undefined ? [] : backgroundTasks,
-          );
-          assert.deepEqual(
-            after.providerThreads.find((candidate) => candidate.id === otherProviderThreadId)
-              ?.pendingBackgroundTasks,
-            otherBackgroundTasks,
-          );
-        }
-      }).pipe(
-        Effect.provide(
-          ProviderReplayHarness.layerWithRegistry(
-            { name: "background-work-stop" },
-            ProviderAdapterRegistry.layerSingle(adapter),
-            { runEffectWorker: false },
-          ),
+        assert.deepEqual(
+          after.providerThreads.find((candidate) => candidate.id === otherProviderThreadId)
+            ?.pendingBackgroundTasks,
+          otherBackgroundTasks,
+        );
+      }
+    }).pipe(
+      Effect.provide(
+        ProviderReplayHarness.layerWithRegistry(
+          { name: "background-work-stop" },
+          ProviderAdapterRegistry.layerSingle(adapter),
+          { runEffectWorker: false },
         ),
-      );
-    }),
-  );
+      ),
+    );
+  });
 
 it.effect("Stop reaches background work an earlier provider thread still runs", () =>
   stopEarlierBackgroundWork({}),
diff --git a/apps/server/src/orchestration-v2/CheckpointRollbackService.test.ts b/apps/server/src/orchestration-v2/CheckpointRollbackService.test.ts
index e5ef81ad46b5..224fafb02c92 100644
--- a/apps/server/src/orchestration-v2/CheckpointRollbackService.test.ts
+++ b/apps/server/src/orchestration-v2/CheckpointRollbackService.test.ts
@@ -32,7 +32,7 @@ import * as SqlitePersistence from "../persistence/Sqlite.ts";
 import * as ServerConfig from "../config.ts";
 import * as ServerSettings from "../serverSettings.ts";
 import * as GitWorkflow from "../git/GitWorkflowService.ts";
-import { withWorkspaceLease } from "../workspace/workspaceLease.ts";
+import { withTurnStartReservation, withWorkspaceLease } from "../workspace/workspaceLease.ts";
 import { ProviderWorkspaceMissingError } from "../provider/Errors.ts";
 import { resolveCodexRollbackTurnCount } from "./Adapters/CodexAdapterV2.ts";
 import * as CheckpointService from "./CheckpointService.ts";
@@ -394,6 +394,136 @@ it.effect.each([
   }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
 );
 
+it.effect.each([{ restoreFiles: true }, { restoreFiles: false }])(
+  "holds turn starts inside the worktree during rollback with restoreFiles $restoreFiles",
+  ({ restoreFiles }) =>
+    Effect.gen(function* () {
+      const fileSystem = yield* FileSystem.FileSystem;
+      const path = yield* Path.Path;
+      const workspaceRoot = yield* fileSystem.realPath(
+        yield* fileSystem.makeTempDirectoryScoped({ prefix: "t3-rollback-reservation-" }),
+      );
+      const worktreesDir = path.join(workspaceRoot, "worktrees");
+      const worktreePath = path.join(worktreesDir, "repo", "feature");
+      yield* fileSystem.makeDirectory(path.join(worktreePath, ".git"), { recursive: true });
+      const threadId = ThreadId.make("rollback-reservation");
+      const providerThreadId = ProviderThreadId.make("rollback-reservation-provider-thread");
+      const providerInstanceId = ProviderInstanceId.make("rollback-reservation-provider");
+      const checkpointId = CheckpointId.make("rollback-reservation-checkpoint");
+      const scopeId = CheckpointScopeId.make("rollback-reservation-scope");
+      const release = Deferred.makeUnsafe<void>();
+      const openEntered = Deferred.makeUnsafe<void>();
+      const restoreEntered = Deferred.makeUnsafe<void>();
+      const releaseRestore = Deferred.makeUnsafe<void>();
+      const calls: string[] = [];
+      const projection = {
+        thread: {
+          id: threadId,
+          projectId: ProjectId.make("rollback-reservation-project"),
+          worktreePath,
+          branch: "feature/rollback-reservation",
+          activeProviderThreadId: providerThreadId,
+          modelSelection: { instanceId: providerInstanceId, model: "test-model" },
+        },
+        providerThread: {
+          id: providerThreadId,
+          providerSessionId: ProviderSessionId.make("rollback-reservation-session"),
+          providerInstanceId,
+        },
+        providerSession: undefined,
+        checkpoint: { id: checkpointId, scopeId, status: "ready", appRunOrdinal: 0 },
+        scope: { id: scopeId, cwd: worktreePath },
+        runsToRollback: [],
+        targetAttempt: undefined,
+        rolledBackAttemptIds: [],
+        staleCheckpoints: [],
+        rootNodes: [],
+        providerTurns: [],
+      } as unknown as ProjectionStore.ProjectionCheckpointRollbackContext;
+      const testLayer = CheckpointRollbackService.layer.pipe(
+        Layer.provide(
+          Layer.mergeAll(
+            ThreadCommandExecutor.layer,
+            NodeServices.layer,
+            Layer.mock(ServerConfig.ServerConfig)({ worktreesDir } as never),
+            ServerSettings.layerTest(),
+            Layer.mock(ProjectStore.ProjectStoreV2)({
+              get: () => Effect.succeedSome({ workspaceRoot } as never),
+            }),
+            Layer.mock(GitWorkflow.GitWorkflowService)({}),
+            Layer.mock(CheckpointService.CheckpointServiceV2)({
+              restore: () =>
+                Deferred.succeed(restoreEntered, undefined).pipe(
+                  Effect.andThen(Deferred.await(releaseRestore)),
+                  Effect.andThen(Effect.sync(() => calls.push("files"))),
+                ),
+            }),
+            Layer.mock(EventSink.EventSinkV2)({ write: () => Effect.succeed([]) }),
+            IdAllocator.layer,
+            Layer.mock(ProjectionStore.ProjectionStoreV2)({
+              getThread: () => Effect.succeed(projection.thread),
+              getCheckpointRollbackContext: () => Effect.succeed(projection),
+              getShellSnapshot: () =>
+                Effect.succeed({
+                  schemaVersion: 1,
+                  snapshotSequence: 0,
+                  threads: [],
+                  archivedThreads: [],
+                }),
+            }),
+            Layer.mock(ProviderSessionManager.ProviderSessionManagerV2)({
+              open: () =>
+                Deferred.succeed(openEntered, undefined).pipe(
+                  Effect.andThen(Deferred.await(release)),
+                  Effect.as({} as never),
+                ),
+            }),
+            Layer.mock(RuntimePolicy.RuntimePolicyV2)({
+              resolve: () => Effect.succeed({ cwd: worktreePath } as never),
+            }),
+          ),
+        ),
+      );
+      yield* Effect.gen(function* () {
+        const service = yield* CheckpointRollbackService.CheckpointRollbackServiceV2;
+        const rollback = yield* service
+          .execute({ threadId, providerThreadId, checkpointId, scopeId, restoreFiles })
+          .pipe(Effect.forkChild({ startImmediately: true }));
+        yield* Deferred.await(openEntered);
+        // A synchronous realPath lets the forked start reach the reservation
+        // before the next assertion, so "not entered" means "waiting".
+        const startTurn = withTurnStartReservation(
+          FileSystem.makeNoop({ realPath: (target) => Effect.succeed(target) }),
+          path,
+          path.join(worktreePath, "packages", "app"),
+          Effect.sync(() => calls.push("turn start")),
+        ).pipe(Effect.forkChild({ startImmediately: true }));
+        const turnStart = yield* startTurn;
+        if (restoreFiles) {
+          assert.deepEqual(calls, []);
+          yield* Deferred.succeed(release, undefined);
+          // The reservation must still be held while files are being restored,
+          // not only while the provider rollback is in flight.
+          yield* Deferred.await(restoreEntered);
+          const duringRestore = yield* startTurn;
+          assert.deepEqual(calls, []);
+          yield* Deferred.succeed(releaseRestore, undefined);
+          yield* Fiber.join(duringRestore);
+        } else {
+          // Nothing is rewritten, so the turn start must not wait for the provider.
+          yield* Fiber.join(turnStart);
+          yield* Deferred.succeed(release, undefined);
+        }
+        yield* Fiber.join(rollback);
+        yield* Fiber.join(turnStart);
+        assert.deepEqual(
+          calls,
+          restoreFiles ? ["files", "turn start", "turn start"] : ["turn start"],
+        );
+      }).pipe(Effect.provide(testLayer));
+    }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
+);
+
 const seedRollbackHistory = Effect.gen(function* () {
   const store = yield* ProjectionStore.ProjectionStoreV2;
   const now = yield* DateTime.now;
diff --git a/apps/server/src/orchestration-v2/CheckpointRollbackService.ts b/apps/server/src/orchestration-v2/CheckpointRollbackService.ts
index 16cbe8b101e2..8924a3eb9a78 100644
--- a/apps/server/src/orchestration-v2/CheckpointRollbackService.ts
+++ b/apps/server/src/orchestration-v2/CheckpointRollbackService.ts
@@ -21,7 +21,10 @@ import * as GitWorkflowService from "../git/GitWorkflowService.ts";
 import type * as ServerConfig from "../config.ts";
 import type * as ServerSettings from "../serverSettings.ts";
 import { makeIsManagedWorktreePath } from "../worktreesDirectory.ts";
-import { withWorkspaceLease } from "../workspace/workspaceLease.ts";
+import {
+  withCheckpointRestoreReservation,
+  withWorkspaceLease,
+} from "../workspace/workspaceLease.ts";
 import {
   isCheckpointRestoreIsolated,
   SHARED_WORKSPACE_RESTORE_MESSAGE,
@@ -422,9 +425,15 @@ export const layer: Layer.Layer<
         function* (input) {
           // Storage cleanup removes worktrees under the same lease.
           const thread = yield* projections.getThread(input.threadId);
-          yield* thread.worktreePath === null
-            ? execute(input)
-            : withWorkspaceLease(path.resolve(thread.worktreePath), execute(input));
+          if (thread.worktreePath === null) return yield* execute(input);
+          const worktreePath = path.resolve(thread.worktreePath);
+          const rollback = withWorkspaceLease(worktreePath, execute(input));
+          // Shared-workspace restores are rejected and conversation-only rewinds
+          // touch no files; reserving for them would stall turn starts on the
+          // slow provider rollback for nothing.
+          yield* input.restoreFiles === false
+            ? rollback
+            : withCheckpointRestoreReservation(fileSystem, path, worktreePath, rollback);
         },
         (effect, input) =>
           effect.pipe(
diff --git a/apps/server/src/orchestration-v2/ClaudeAutomaticDelivery.integration.test.ts b/apps/server/src/orchestration-v2/ClaudeAutomaticDelivery.integration.test.ts
index faa8d8b8b3cb..0352b9099c61 100644
--- a/apps/server/src/orchestration-v2/ClaudeAutomaticDelivery.integration.test.ts
+++ b/apps/server/src/orchestration-v2/ClaudeAutomaticDelivery.integration.test.ts
@@ -136,374 +136,13 @@ const deliveries = [
 it.effect.each(deliveries)(
   "delivers %s with Claude's native pending-tool cancellation behavior",
   (delivery) =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const cwd = yield* checkpointWorkspace("claude-automatic-delivery");
-        const sdkMessages = yield* Queue.unbounded<SDKMessage>();
-        const offers: SDKUserMessage[] = [];
-        const nativeQueue: SDKUserMessage[] = [];
-        // @effect-diagnostics-next-line abortControllerInEffect:off - The fake SDK interrupts its batch independently of the test fiber.
-        const batchAbort = new AbortController();
-        const adapter = yield* ClaudeAdapterV2.makeClaudeAdapterV2({
-          instanceId: modelSelection.instanceId,
-          settings,
-          environment: {},
-          attachmentsDir: cwd,
-          fileSystem: yield* FileSystem.FileSystem,
-          path: yield* Path.Path,
-          random: yield* SecureRandom.SecureRandom,
-          idAllocator: yield* IdAllocator.IdAllocatorV2,
-          queryRunner: {
-            allocateSessionId: Effect.succeed(sessionId),
-            open: () =>
-              Effect.succeed({
-                messages: Stream.fromQueue(sdkMessages),
-                offer: (message) =>
-                  Effect.sync(() => {
-                    offers.push(message);
-                    nativeQueue.push(message);
-                    // Claude Code 2.1.289 aborts on now-priority commands even while Bash blocks reads.
-                    if (nativeQueue.some((command) => command.priority === "now")) {
-                      batchAbort.abort({ kind: "interrupt" });
-                    }
-                  }),
-                setModel: () => Effect.void,
-                applyFlagSettings: () => Effect.void,
-                setPermissionMode: () => Effect.void,
-                backgroundTasks: () => Effect.succeed(false),
-                mcpServerStatus: Effect.succeed([]),
-                readMcpResource: () => Effect.die("unexpected MCP resource read"),
-                callMcpTool: () => Effect.die("unexpected MCP tool call"),
-                listPermissionRules: Effect.die("unexpected permission rules read"),
-                stopTask: () => Effect.void,
-                interrupt: Effect.die("automatic delivery must never interrupt"),
-                close: Effect.void,
-              }),
-            forkSession: () => Effect.die("unused"),
-            subagentLaunchToolUseId: () => Effect.succeed(null),
-            subagentModel: () => Effect.succeed(null),
-            assertComplete: Effect.void,
-          },
-        });
-        yield* Effect.gen(function* () {
-          const orchestrator = yield* Orchestrator.OrchestratorV2;
-          const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
-          const threadId = ThreadId.make("thread:automatic-delivery");
-          const projectId = ProjectId.make("project:automatic-delivery");
-          const watch = (predicate: (event: OrchestrationV2DomainEvent) => boolean) =>
-            orchestrator.streamDomainEvents.pipe(
-              Stream.filter(predicate),
-              Stream.take(1),
-              Stream.runDrain,
-              Effect.forkScoped,
-            );
-          yield* orchestrator.dispatch({
-            type: "thread.create",
-            commandId: CommandId.make("create"),
-            threadId,
-            projectId,
-            title: "Automatic delivery",
-            modelSelection,
-            runtimeMode: "full-access",
-            interactionMode: "default",
-            branch: null,
-            worktreePath: cwd,
-            createdBy: "user",
-            creationSource: "web",
-          });
-          const running = yield* watch(
-            (event) => event.type === "provider-turn.updated" && event.payload.status === "running",
-          );
-          yield* orchestrator.dispatch({
-            type: "message.dispatch",
-            commandId: CommandId.make("first"),
-            threadId,
-            messageId: MessageId.make("first"),
-            text: "Build and check all four tasks.",
-            attachments: [],
-            dispatchMode: { type: "start_immediately" },
-            createdBy: "user",
-            creationSource: "web",
-          });
-          yield* worker.drain();
-          yield* Fiber.join(running);
-          const pending = yield* watch(
-            (event) =>
-              event.type === "turn-item.updated" &&
-              event.payload.nativeItemRef?.nativeId === "status-4",
-          );
-          yield* Queue.offer(sdkMessages, batch);
-          yield* Fiber.join(pending);
-          const before = yield* orchestrator.getThreadProjection(threadId);
-          assert.equal(before.turnItems.filter((item) => item.status === "running").length, 5);
-          const parent = before.runs[0]!;
-          if (parent.rootNodeId === null) return yield* Effect.die("parent has no root node");
-          const messageId = MessageId.make("automatic-notice");
-          if (delivery === "child completion") {
-            const taskId = NodeId.make("completed-child");
-            const now = yield* DateTime.now;
-            const sink = yield* EventSink.EventSinkV2;
-            yield* sink.write({
-              events: [
-                {
-                  id: EventId.make("cohort"),
-                  type: "run.updated",
-                  threadId,
-                  runId: parent.id,
-                  occurredAt: now,
-                  payload: {
-                    ...parent,
-                    delegatedCompletion: {
-                      disposition: "open",
-                      nextGeneration: 2,
-                      delivery: { generation: 1, messageId, taskIds: [taskId] },
-                    },
-                  },
-                },
-                {
-                  id: EventId.make("child"),
-                  type: "subagent.updated",
-                  threadId,
-                  runId: parent.id,
-                  nodeId: taskId,
-                  occurredAt: now,
-                  payload: {
-                    id: taskId,
-                    threadId,
-                    runId: parent.id,
-                    parentNodeId: parent.rootNodeId,
-                    origin: "app_owned",
-                    createdBy: "agent",
-                    driver: ClaudeAdapterV2.CLAUDE_PROVIDER,
-                    providerInstanceId: modelSelection.instanceId,
-                    providerThreadId: null,
-                    childThreadId: null,
-                    nativeTaskRef: null,
-                    prompt: "Background work",
-                    title: "Child",
-                    model: null,
-                    completionWake: "always",
-                    completionDelivery: { state: "claimed", observedByRunId: null },
-                    status: "completed",
-                    result: "done",
-                    startedAt: now,
-                    completedAt: now,
-                    updatedAt: now,
-                  },
-                },
-              ],
-            });
-            const command = {
-              type: "message.dispatch" as const,
-              commandId: CommandId.make("completion"),
-              threadId,
-              messageId,
-              text: "Child completed",
-              attachments: [],
-              dispatchMode: { type: "queue_after_active" as const },
-              createdBy: "agent" as const,
-              creationSource: "server" as const,
-              delegatedCompletion: { parentRunId: parent.id, generation: 1, taskIds: [taskId] },
-            };
-            yield* orchestrator.dispatch(command);
-            yield* orchestrator.dispatch(command);
-            yield* orchestrator.recoverDelegatedTasks;
-          } else if (delivery === "scheduled message") {
-            yield* Effect.gen(function* () {
-              const service = yield* ScheduledTaskService.ScheduledTaskService;
-              const { task } = yield* service.upsert(
-                yield* decodeScheduledTask({
-                  title: "Status check",
-                  prompt: "Check the four tasks.",
-                  enabled: true,
-                  schedule: { type: "interval", everyMs: 60_000 },
-                  projectId,
-                  threadId,
-                  workspaceStrategy: { type: "root" },
-                  modelSelection,
-                  runtimeMode: "full-access",
-                  interactionMode: "default",
-                }),
-              );
-              const ran = yield* service.runNow({ id: task.id });
-              assert.equal(ran.task.lastRunStatus, "succeeded");
-            }).pipe(
-              Effect.provide(
-                ScheduledTaskService.layer.pipe(
-                  Layer.provide(ThreadManagementService.layer),
-                  Layer.provide(ServerSettings.layerTest()),
-                  Layer.provide(
-                    Layer.mock(LegacyV1ThreadImporter.LegacyV1ThreadImporter)({
-                      ensureTranscript: () =>
-                        Effect.succeed({ importedThreadCount: 0, importedMessageCount: 0 }),
-                    }),
-                  ),
-                  Layer.provide(Layer.mock(ThreadLaunchService.ThreadLaunchService)({})),
-                  Layer.provide(ManagedPolicy.layerTest()),
-                  Layer.provide(
-                    Layer.mock(ManagedProjectFolders.ManagedProjectFolders)({
-                      namedProjectsRoot: "/projects",
-                      isScratchProject: () => Effect.succeed(false),
-                    }),
-                  ),
-                  Layer.provide(Layer.mock(SecretRequests.SecretRequests)({})),
-                  Layer.provide(
-                    CommandReceiptStore.layer.pipe(Layer.provide(SqlitePersistence.layerMemory)),
-                  ),
-                  Layer.provide(
-                    Layer.mergeAll(
-                      NodeCrypto.layer,
-                      Scheduler.layer,
-                      SqlitePersistence.layerMemory,
-                    ),
-                  ),
-                ),
-              ),
-            );
-          } else if (delivery === "user steering") {
-            yield* orchestrator.dispatch({
-              type: "message.dispatch",
-              commandId: CommandId.make("steer"),
-              threadId,
-              messageId,
-              text: "Change direction now.",
-              attachments: [],
-              dispatchMode: { type: "steer_active", targetRunId: parent.id },
-              createdBy: "user",
-              creationSource: "web",
-            });
-          } else {
-            yield* orchestrator.dispatch({
-              type: "message.dispatch",
-              commandId: CommandId.make("queue"),
-              threadId,
-              messageId,
-              text: "Change direction now.",
-              attachments: [],
-              dispatchMode: { type: "queue_after_active" },
-              createdBy: "user",
-              creationSource: "web",
-            });
-            const queuedRun = (yield* orchestrator.getThreadProjection(threadId)).runs[1]!;
-            yield* orchestrator.dispatch({
-              type: "queued-message.promote-to-steer",
-              commandId: CommandId.make("promote"),
-              threadId,
-              queuedRunId: queuedRun.id,
-              targetRunId: parent.id,
-            });
-            const promoted = yield* orchestrator.getThreadProjection(threadId);
-            assert.equal(promoted.runs.find((run) => run.id === queuedRun.id)?.status, "cancelled");
-            assert.equal(
-              promoted.messages.find((message) => message.id === messageId)?.runId,
-              parent.id,
-            );
-            const steer = promoted.turnItems.find(
-              (item) => item.type === "user_message" && item.messageId === messageId,
-            );
-            assert.ok(steer?.type === "user_message");
-            assert.equal(steer.inputIntent, "promoted_queued_to_steer");
-          }
-          yield* worker.drain();
-          const explicitSteer =
-            delivery === "user steering" || delivery === "promoted queued message";
-          assert.equal(batchAbort.signal.aborted, explicitSteer);
-          assert.equal(offers.length, explicitSteer ? 2 : 1);
-          const finished = yield* watch(
-            (event) =>
-              event.type === "run.updated" &&
-              event.payload.id === parent.id &&
-              event.payload.status === "waiting",
-          );
-          yield* Queue.offer(sdkMessages, toolResult("build", false));
-          for (const id of statusIds)
-            yield* Queue.offer(sdkMessages, toolResult(id, batchAbort.signal.aborted));
-          if (explicitSteer) yield* Queue.offer(sdkMessages, result("aborted", true));
-          yield* Queue.offer(sdkMessages, result("completed", false));
-          yield* Fiber.join(finished);
-          yield* worker.drain();
-          yield* orchestrator.resumeQueuedRuns;
-          yield* worker.drain();
-          if (!explicitSteer) {
-            const queued = (yield* orchestrator.getThreadProjection(threadId)).runs[1]!;
-            const noticeFinished = yield* watch(
-              (event) =>
-                event.type === "run.updated" &&
-                event.payload.id === queued.id &&
-                event.payload.status === "waiting",
-            );
-            const delivered =
-              delivery === "child completion"
-                ? yield* watch(
-                    (event) =>
-                      event.type === "subagent.updated" &&
-                      event.payload.completionDelivery?.state === "delivered",
-                  )
-                : null;
-            yield* Queue.offer(sdkMessages, result("notice-completed", false));
-            yield* Fiber.join(noticeFinished);
-            yield* worker.drain();
-            if (delivered !== null) yield* Fiber.join(delivered);
-          }
-          const after = yield* orchestrator.getThreadProjection(threadId);
-          const reads = after.turnItems.filter((item) =>
-            statusIds.includes(item.nativeItemRef?.nativeId ?? ""),
-          );
-          assert.equal(reads.length, 4);
-          for (const read of reads) {
-            assert.equal(read.status, explicitSteer ? "cancelled" : "completed");
-            assert.equal(read.toolNonExecutionKind, explicitSteer ? "cancelled" : undefined);
-            assert.equal(read.type === "dynamic_tool" && read.output === refusal, explicitSteer);
-          }
-          assert.equal(offers.length, 2);
-          assert.equal(
-            offers.filter((offer) => offer.priority === "now").length,
-            explicitSteer ? 1 : 0,
-          );
-          if (!explicitSteer) {
-            assert.equal(after.runs.length, 2);
-            if (delivery === "child completion") {
-              assert.equal(after.messages.filter((message) => message.id === messageId).length, 1);
-              assert.equal(after.subagents[0]?.completionDelivery?.state, "delivered");
-            } else {
-              assert.equal(
-                after.messages.filter((message) => message.scheduledTaskId !== undefined).length,
-                1,
-              );
-            }
-          }
-          yield* orchestrator.recoverDelegatedTasks;
-          yield* orchestrator.resumeQueuedRuns;
-          yield* worker.drain();
-          assert.equal(offers.length, 2);
-        }).pipe(
-          Effect.provide(
-            ProviderReplayHarness.layerWithRegistry(
-              { name: "claude-automatic-delivery" },
-              ProviderAdapterRegistry.layerSingle(adapter),
-              { runEffectWorker: false },
-            ),
-          ),
-        );
-      }).pipe(
-        Effect.provide(
-          Layer.mergeAll(
-            IdAllocator.layer,
-            McpProviderSessions.layer,
-            NodeServices.layer,
-            NodeCrypto.layer,
-          ),
-        ),
-      ),
-    ),
-);
-
-it.effect("applies an effort change to the running Claude query without waiting for a turn", () =>
-  Effect.scoped(
     Effect.gen(function* () {
-      const cwd = yield* checkpointWorkspace("claude-live-effort");
+      const cwd = yield* checkpointWorkspace("claude-automatic-delivery");
       const sdkMessages = yield* Queue.unbounded<SDKMessage>();
-      const flagSettings: unknown[] = [];
+      const offers: SDKUserMessage[] = [];
+      const nativeQueue: SDKUserMessage[] = [];
+      // @effect-diagnostics-next-line abortControllerInEffect:off - The fake SDK interrupts its batch independently of the test fiber.
+      const batchAbort = new AbortController();
       const adapter = yield* ClaudeAdapterV2.makeClaudeAdapterV2({
         instanceId: modelSelection.instanceId,
         settings,
@@ -518,12 +157,17 @@ it.effect("applies an effort change to the running Claude query without waiting
           open: () =>
             Effect.succeed({
               messages: Stream.fromQueue(sdkMessages),
-              offer: () => Effect.void,
-              setModel: () => Effect.void,
-              applyFlagSettings: (flags) =>
+              offer: (message) =>
                 Effect.sync(() => {
-                  flagSettings.push(flags);
+                  offers.push(message);
+                  nativeQueue.push(message);
+                  // Claude Code 2.1.289 aborts on now-priority commands even while Bash blocks reads.
+                  if (nativeQueue.some((command) => command.priority === "now")) {
+                    batchAbort.abort({ kind: "interrupt" });
+                  }
                 }),
+              setModel: () => Effect.void,
+              applyFlagSettings: () => Effect.void,
               setPermissionMode: () => Effect.void,
               backgroundTasks: () => Effect.succeed(false),
               mcpServerStatus: Effect.succeed([]),
@@ -531,7 +175,7 @@ it.effect("applies an effort change to the running Claude query without waiting
               callMcpTool: () => Effect.die("unexpected MCP tool call"),
               listPermissionRules: Effect.die("unexpected permission rules read"),
               stopTask: () => Effect.void,
-              interrupt: Effect.die("an effort change must not interrupt the turn"),
+              interrupt: Effect.die("automatic delivery must never interrupt"),
               close: Effect.void,
             }),
           forkSession: () => Effect.die("unused"),
@@ -543,23 +187,22 @@ it.effect("applies an effort change to the running Claude query without waiting
       yield* Effect.gen(function* () {
         const orchestrator = yield* Orchestrator.OrchestratorV2;
         const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
-        const threadId = ThreadId.make("thread:live-effort");
-        const high = { ...modelSelection, options: [{ id: "effort", value: "high" }] };
-        const running = yield* orchestrator.streamDomainEvents.pipe(
-          Stream.filter(
-            (event) => event.type === "provider-turn.updated" && event.payload.status === "running",
-          ),
-          Stream.take(1),
-          Stream.runDrain,
-          Effect.forkScoped,
-        );
+        const threadId = ThreadId.make("thread:automatic-delivery");
+        const projectId = ProjectId.make("project:automatic-delivery");
+        const watch = (predicate: (event: OrchestrationV2DomainEvent) => boolean) =>
+          orchestrator.streamDomainEvents.pipe(
+            Stream.filter(predicate),
+            Stream.take(1),
+            Stream.runDrain,
+            Effect.forkScoped,
+          );
         yield* orchestrator.dispatch({
           type: "thread.create",
           commandId: CommandId.make("create"),
           threadId,
-          projectId: ProjectId.make("project:live-effort"),
-          title: "Live effort",
-          modelSelection: high,
+          projectId,
+          title: "Automatic delivery",
+          modelSelection,
           runtimeMode: "full-access",
           interactionMode: "default",
           branch: null,
@@ -567,12 +210,15 @@ it.effect("applies an effort change to the running Claude query without waiting
           createdBy: "user",
           creationSource: "web",
         });
+        const running = yield* watch(
+          (event) => event.type === "provider-turn.updated" && event.payload.status === "running",
+        );
         yield* orchestrator.dispatch({
           type: "message.dispatch",
           commandId: CommandId.make("first"),
           threadId,
           messageId: MessageId.make("first"),
-          text: "Keep working.",
+          text: "Build and check all four tasks.",
           attachments: [],
           dispatchMode: { type: "start_immediately" },
           createdBy: "user",
@@ -580,23 +226,255 @@ it.effect("applies an effort change to the running Claude query without waiting
         });
         yield* worker.drain();
         yield* Fiber.join(running);
-        assert.deepEqual(flagSettings, []);
-
-        yield* orchestrator.dispatch({
-          type: "thread.model-selection.set",
-          commandId: CommandId.make("medium"),
-          threadId,
-          modelSelection: { ...modelSelection, options: [{ id: "effort", value: "medium" }] },
-        });
+        const pending = yield* watch(
+          (event) =>
+            event.type === "turn-item.updated" &&
+            event.payload.nativeItemRef?.nativeId === "status-4",
+        );
+        yield* Queue.offer(sdkMessages, batch);
+        yield* Fiber.join(pending);
+        const before = yield* orchestrator.getThreadProjection(threadId);
+        assert.equal(before.turnItems.filter((item) => item.status === "running").length, 5);
+        const parent = before.runs[0]!;
+        if (parent.rootNodeId === null) return yield* Effect.die("parent has no root node");
+        const messageId = MessageId.make("automatic-notice");
+        if (delivery === "child completion") {
+          const taskId = NodeId.make("completed-child");
+          const now = yield* DateTime.now;
+          const sink = yield* EventSink.EventSinkV2;
+          yield* sink.write({
+            events: [
+              {
+                id: EventId.make("cohort"),
+                type: "run.updated",
+                threadId,
+                runId: parent.id,
+                occurredAt: now,
+                payload: {
+                  ...parent,
+                  delegatedCompletion: {
+                    disposition: "open",
+                    nextGeneration: 2,
+                    delivery: { generation: 1, messageId, taskIds: [taskId] },
+                  },
+                },
+              },
+              {
+                id: EventId.make("child"),
+                type: "subagent.updated",
+                threadId,
+                runId: parent.id,
+                nodeId: taskId,
+                occurredAt: now,
+                payload: {
+                  id: taskId,
+                  threadId,
+                  runId: parent.id,
+                  parentNodeId: parent.rootNodeId,
+                  origin: "app_owned",
+                  createdBy: "agent",
+                  driver: ClaudeAdapterV2.CLAUDE_PROVIDER,
+                  providerInstanceId: modelSelection.instanceId,
+                  providerThreadId: null,
+                  childThreadId: null,
+                  nativeTaskRef: null,
+                  prompt: "Background work",
+                  title: "Child",
+                  model: null,
+                  completionWake: "always",
+                  completionDelivery: { state: "claimed", observedByRunId: null },
+                  status: "completed",
+                  result: "done",
+                  startedAt: now,
+                  completedAt: now,
+                  updatedAt: now,
+                },
+              },
+            ],
+          });
+          const command = {
+            type: "message.dispatch" as const,
+            commandId: CommandId.make("completion"),
+            threadId,
+            messageId,
+            text: "Child completed",
+            attachments: [],
+            dispatchMode: { type: "queue_after_active" as const },
+            createdBy: "agent" as const,
+            creationSource: "server" as const,
+            delegatedCompletion: { parentRunId: parent.id, generation: 1, taskIds: [taskId] },
+          };
+          yield* orchestrator.dispatch(command);
+          yield* orchestrator.dispatch(command);
+          yield* orchestrator.recoverDelegatedTasks;
+        } else if (delivery === "scheduled message") {
+          yield* Effect.gen(function* () {
+            const service = yield* ScheduledTaskService.ScheduledTaskService;
+            const { task } = yield* service.upsert(
+              yield* decodeScheduledTask({
+                title: "Status check",
+                prompt: "Check the four tasks.",
+                enabled: true,
+                schedule: { type: "interval", everyMs: 60_000 },
+                projectId,
+                threadId,
+                workspaceStrategy: { type: "root" },
+                modelSelection,
+                runtimeMode: "full-access",
+                interactionMode: "default",
+              }),
+            );
+            const ran = yield* service.runNow({ id: task.id });
+            assert.equal(ran.task.lastRunStatus, "succeeded");
+          }).pipe(
+            Effect.provide(
+              ScheduledTaskService.layer.pipe(
+                Layer.provide(ThreadManagementService.layer),
+                Layer.provide(ServerSettings.layerTest()),
+                Layer.provide(
+                  Layer.mock(LegacyV1ThreadImporter.LegacyV1ThreadImporter)({
+                    ensureTranscript: () =>
+                      Effect.succeed({ importedThreadCount: 0, importedMessageCount: 0 }),
+                  }),
+                ),
+                Layer.provide(Layer.mock(ThreadLaunchService.ThreadLaunchService)({})),
+                Layer.provide(ManagedPolicy.layerTest()),
+                Layer.provide(
+                  Layer.mock(ManagedProjectFolders.ManagedProjectFolders)({
+                    namedProjectsRoot: "/projects",
+                    isScratchProject: () => Effect.succeed(false),
+                  }),
+                ),
+                Layer.provide(Layer.mock(SecretRequests.SecretRequests)({})),
+                Layer.provide(
+                  CommandReceiptStore.layer.pipe(Layer.provide(SqlitePersistence.layerMemory)),
+                ),
+                Layer.provide(
+                  Layer.mergeAll(NodeCrypto.layer, Scheduler.layer, SqlitePersistence.layerMemory),
+                ),
+              ),
+            ),
+          );
+        } else if (delivery === "user steering") {
+          yield* orchestrator.dispatch({
+            type: "message.dispatch",
+            commandId: CommandId.make("steer"),
+            threadId,
+            messageId,
+            text: "Change direction now.",
+            attachments: [],
+            dispatchMode: { type: "steer_active", targetRunId: parent.id },
+            createdBy: "user",
+            creationSource: "web",
+          });
+        } else {
+          yield* orchestrator.dispatch({
+            type: "message.dispatch",
+            commandId: CommandId.make("queue"),
+            threadId,
+            messageId,
+            text: "Change direction now.",
+            attachments: [],
+            dispatchMode: { type: "queue_after_active" },
+            createdBy: "user",
+            creationSource: "web",
+          });
+          const queuedRun = (yield* orchestrator.getThreadProjection(threadId)).runs[1]!;
+          yield* orchestrator.dispatch({
+            type: "queued-message.promote-to-steer",
+            commandId: CommandId.make("promote"),
+            threadId,
+            queuedRunId: queuedRun.id,
+            targetRunId: parent.id,
+          });
+          const promoted = yield* orchestrator.getThreadProjection(threadId);
+          assert.equal(promoted.runs.find((run) => run.id === queuedRun.id)?.status, "cancelled");
+          assert.equal(
+            promoted.messages.find((message) => message.id === messageId)?.runId,
+            parent.id,
+          );
+          const steer = promoted.turnItems.find(
+            (item) => item.type === "user_message" && item.messageId === messageId,
+          );
+          assert.ok(steer?.type === "user_message");
+          assert.equal(steer.inputIntent, "promoted_queued_to_steer");
+        }
         yield* worker.drain();
-
-        assert.deepEqual(flagSettings, [
-          { effortLevel: "medium", fastMode: null, ultracode: null },
-        ]);
+        const explicitSteer =
+          delivery === "user steering" || delivery === "promoted queued message";
+        assert.equal(batchAbort.signal.aborted, explicitSteer);
+        assert.equal(offers.length, explicitSteer ? 2 : 1);
+        const finished = yield* watch(
+          (event) =>
+            event.type === "run.updated" &&
+            event.payload.id === parent.id &&
+            event.payload.status === "waiting",
+        );
+        yield* Queue.offer(sdkMessages, toolResult("build", false));
+        for (const id of statusIds)
+          yield* Queue.offer(sdkMessages, toolResult(id, batchAbort.signal.aborted));
+        if (explicitSteer) yield* Queue.offer(sdkMessages, result("aborted", true));
+        yield* Queue.offer(sdkMessages, result("completed", false));
+        yield* Fiber.join(finished);
+        yield* worker.drain();
+        yield* orchestrator.resumeQueuedRuns;
+        yield* worker.drain();
+        if (!explicitSteer) {
+          const queued = (yield* orchestrator.getThreadProjection(threadId)).runs[1]!;
+          const noticeFinished = yield* watch(
+            (event) =>
+              event.type === "run.updated" &&
+              event.payload.id === queued.id &&
+              event.payload.status === "waiting",
+          );
+          const delivered =
+            delivery === "child completion"
+              ? yield* watch(
+                  (event) =>
+                    event.type === "subagent.updated" &&
+                    event.payload.completionDelivery?.state === "delivered",
+                )
+              : null;
+          yield* Queue.offer(sdkMessages, result("notice-completed", false));
+          yield* Fiber.join(noticeFinished);
+          yield* worker.drain();
+          if (delivered !== null) yield* Fiber.join(delivered);
+        }
+        const after = yield* orchestrator.getThreadProjection(threadId);
+        const reads = after.turnItems.filter((item) =>
+          statusIds.includes(item.nativeItemRef?.nativeId ?? ""),
+        );
+        assert.equal(reads.length, 4);
+        for (const read of reads) {
+          assert.equal(read.status, explicitSteer ? "cancelled" : "completed");
+          assert.equal(read.toolNonExecutionKind, explicitSteer ? "cancelled" : undefined);
+          assert.equal(read.type === "dynamic_tool" && read.output === refusal, explicitSteer);
+        }
+        assert.equal(offers.length, 2);
+        assert.equal(
+          offers.filter((offer) => offer.priority === "now").length,
+          explicitSteer ? 1 : 0,
+        );
+        if (!explicitSteer) {
+          assert.equal(after.runs.length, 2);
+          if (delivery === "child completion") {
+            assert.equal(after.messages.filter((message) => message.id === messageId).length, 1);
+            assert.equal(after.subagents[0]?.completionDelivery?.state, "delivered");
+          } else {
+            assert.equal(
+              after.messages.filter((message) => message.scheduledTaskId !== undefined).length,
+              1,
+            );
+          }
+        }
+        yield* orchestrator.recoverDelegatedTasks;
+        yield* orchestrator.resumeQueuedRuns;
+        yield* worker.drain();
+        assert.equal(offers.length, 2);
       }).pipe(
         Effect.provide(
           ProviderReplayHarness.layerWithRegistry(
-            { name: "claude-live-effort" },
+            { name: "claude-automatic-delivery" },
             ProviderAdapterRegistry.layerSingle(adapter),
             { runEffectWorker: false },
           ),
@@ -612,6 +490,118 @@ it.effect("applies an effort change to the running Claude query without waiting
         ),
       ),
     ),
+);
+
+it.effect("applies an effort change to the running Claude query without waiting for a turn", () =>
+  Effect.gen(function* () {
+    const cwd = yield* checkpointWorkspace("claude-live-effort");
+    const sdkMessages = yield* Queue.unbounded<SDKMessage>();
+    const flagSettings: unknown[] = [];
+    const adapter = yield* ClaudeAdapterV2.makeClaudeAdapterV2({
+      instanceId: modelSelection.instanceId,
+      settings,
+      environment: {},
+      attachmentsDir: cwd,
+      fileSystem: yield* FileSystem.FileSystem,
+      path: yield* Path.Path,
+      random: yield* SecureRandom.SecureRandom,
+      idAllocator: yield* IdAllocator.IdAllocatorV2,
+      queryRunner: {
+        allocateSessionId: Effect.succeed(sessionId),
+        open: () =>
+          Effect.succeed({
+            messages: Stream.fromQueue(sdkMessages),
+            offer: () => Effect.void,
+            setModel: () => Effect.void,
+            applyFlagSettings: (flags) =>
+              Effect.sync(() => {
+                flagSettings.push(flags);
+              }),
+            setPermissionMode: () => Effect.void,
+            backgroundTasks: () => Effect.succeed(false),
+            mcpServerStatus: Effect.succeed([]),
+            readMcpResource: () => Effect.die("unexpected MCP resource read"),
+            callMcpTool: () => Effect.die("unexpected MCP tool call"),
+            listPermissionRules: Effect.die("unexpected permission rules read"),
+            stopTask: () => Effect.void,
+            interrupt: Effect.die("an effort change must not interrupt the turn"),
+            close: Effect.void,
+          }),
+        forkSession: () => Effect.die("unused"),
+        subagentLaunchToolUseId: () => Effect.succeed(null),
+        subagentModel: () => Effect.succeed(null),
+        assertComplete: Effect.void,
+      },
+    });
+    yield* Effect.gen(function* () {
+      const orchestrator = yield* Orchestrator.OrchestratorV2;
+      const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
+      const threadId = ThreadId.make("thread:live-effort");
+      const high = { ...modelSelection, options: [{ id: "effort", value: "high" }] };
+      const running = yield* orchestrator.streamDomainEvents.pipe(
+        Stream.filter(
+          (event) => event.type === "provider-turn.updated" && event.payload.status === "running",
+        ),
+        Stream.take(1),
+        Stream.runDrain,
+        Effect.forkScoped,
+      );
+      yield* orchestrator.dispatch({
+        type: "thread.create",
+        commandId: CommandId.make("create"),
+        threadId,
+        projectId: ProjectId.make("project:live-effort"),
+        title: "Live effort",
+        modelSelection: high,
+        runtimeMode: "full-access",
+        interactionMode: "default",
+        branch: null,
+        worktreePath: cwd,
+        createdBy: "user",
+        creationSource: "web",
+      });
+      yield* orchestrator.dispatch({
+        type: "message.dispatch",
+        commandId: CommandId.make("first"),
+        threadId,
+        messageId: MessageId.make("first"),
+        text: "Keep working.",
+        attachments: [],
+        dispatchMode: { type: "start_immediately" },
+        createdBy: "user",
+        creationSource: "web",
+      });
+      yield* worker.drain();
+      yield* Fiber.join(running);
+      assert.deepEqual(flagSettings, []);
+
+      yield* orchestrator.dispatch({
+        type: "thread.model-selection.set",
+        commandId: CommandId.make("medium"),
+        threadId,
+        modelSelection: { ...modelSelection, options: [{ id: "effort", value: "medium" }] },
+      });
+      yield* worker.drain();
+
+      assert.deepEqual(flagSettings, [{ effortLevel: "medium", fastMode: null, ultracode: null }]);
+    }).pipe(
+      Effect.provide(
+        ProviderReplayHarness.layerWithRegistry(
+          { name: "claude-live-effort" },
+          ProviderAdapterRegistry.layerSingle(adapter),
+          { runEffectWorker: false },
+        ),
+      ),
+    );
+  }).pipe(
+    Effect.provide(
+      Layer.mergeAll(
+        IdAllocator.layer,
+        McpProviderSessions.layer,
+        NodeServices.layer,
+        NodeCrypto.layer,
+      ),
+    ),
   ),
 );
 
@@ -660,246 +650,237 @@ const wakeAssistant = (uuid: string) =>
   });
 
 it.effect("offers a continuation for a later wake after a queued continuation is cancelled", () =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      const cwd = yield* checkpointWorkspace("claude-cancelled-continuation");
-      const sdkMessages = yield* Queue.unbounded<SDKMessage>();
-      const processed = new WeakMap<SDKMessage, Deferred.Deferred<void>>();
-      const offerAndWait = Effect.fnUntraced(function* (message: SDKMessage) {
-        const done = yield* Deferred.make<void>();
-        processed.set(message, done);
-        yield* Queue.offer(sdkMessages, message);
-        yield* Deferred.await(done);
-      });
-      const fileSystem = yield* FileSystem.FileSystem;
-      const path = yield* Path.Path;
-      const random = yield* SecureRandom.SecureRandom;
-      const idAllocator = yield* IdAllocator.IdAllocatorV2;
-      const continuations: ProviderContinuationRequests.ProviderContinuationRequest[] = [];
-      const services =
-        yield* Effect.context<
-          Effect.Services<ReturnType<typeof ClaudeAdapterV2.makeClaudeAdapterV2>>
-        >();
-      const registry = ProviderAdapterRegistry.layerFromAdaptersEffect(
-        Effect.gen(function* () {
-          const requests = yield* ProviderContinuationRequests.ProviderContinuationRequests;
-          const adapter = yield* ClaudeAdapterV2.makeClaudeAdapterV2({
-            instanceId: modelSelection.instanceId,
-            settings,
-            environment: {},
-            attachmentsDir: cwd,
-            fileSystem,
-            path,
-            random,
-            idAllocator,
-            continuationRequests: {
-              offer: (request) =>
-                Effect.sync(() => continuations.push(request)).pipe(
-                  Effect.andThen(requests.offer(request)),
-                ),
-            },
-            queryRunner: {
-              allocateSessionId: Effect.succeed(sessionId),
-              open: () =>
-                Effect.succeed({
-                  // Resolve each frame's Deferred once the adapter pulls the next one.
-                  messages: Stream.fromQueue(sdkMessages).pipe(
-                    Stream.flatMap((message) =>
-                      Stream.make(message).pipe(
-                        Stream.concat(
-                          Stream.fromEffect(
-                            Effect.suspend(() => {
-                              const done = processed.get(message);
-                              return done === undefined
-                                ? Effect.void
-                                : Deferred.succeed(done, undefined);
-                            }),
-                          ).pipe(Stream.drain),
-                        ),
+  Effect.gen(function* () {
+    const cwd = yield* checkpointWorkspace("claude-cancelled-continuation");
+    const sdkMessages = yield* Queue.unbounded<SDKMessage>();
+    const processed = new WeakMap<SDKMessage, Deferred.Deferred<void>>();
+    const offerAndWait = Effect.fnUntraced(function* (message: SDKMessage) {
+      const done = yield* Deferred.make<void>();
+      processed.set(message, done);
+      yield* Queue.offer(sdkMessages, message);
+      yield* Deferred.await(done);
+    });
+    const fileSystem = yield* FileSystem.FileSystem;
+    const path = yield* Path.Path;
+    const random = yield* SecureRandom.SecureRandom;
+    const idAllocator = yield* IdAllocator.IdAllocatorV2;
+    const continuations: ProviderContinuationRequests.ProviderContinuationRequest[] = [];
+    const services =
+      yield* Effect.context<
+        Effect.Services<ReturnType<typeof ClaudeAdapterV2.makeClaudeAdapterV2>>
+      >();
+    const registry = ProviderAdapterRegistry.layerFromAdaptersEffect(
+      Effect.gen(function* () {
+        const requests = yield* ProviderContinuationRequests.ProviderContinuationRequests;
+        const adapter = yield* ClaudeAdapterV2.makeClaudeAdapterV2({
+          instanceId: modelSelection.instanceId,
+          settings,
+          environment: {},
+          attachmentsDir: cwd,
+          fileSystem,
+          path,
+          random,
+          idAllocator,
+          continuationRequests: {
+            offer: (request) =>
+              Effect.sync(() => continuations.push(request)).pipe(
+                Effect.andThen(requests.offer(request)),
+              ),
+          },
+          queryRunner: {
+            allocateSessionId: Effect.succeed(sessionId),
+            open: () =>
+              Effect.succeed({
+                // Resolve each frame's Deferred once the adapter pulls the next one.
+                messages: Stream.fromQueue(sdkMessages).pipe(
+                  Stream.flatMap((message) =>
+                    Stream.make(message).pipe(
+                      Stream.concat(
+                        Stream.fromEffect(
+                          Effect.suspend(() => {
+                            const done = processed.get(message);
+                            return done === undefined
+                              ? Effect.void
+                              : Deferred.succeed(done, undefined);
+                          }),
+                        ).pipe(Stream.drain),
                       ),
                     ),
                   ),
-                  offer: () => Effect.void,
-                  setModel: () => Effect.void,
-                  applyFlagSettings: () => Effect.void,
-                  setPermissionMode: () => Effect.void,
-                  backgroundTasks: () => Effect.succeed(false),
-                  mcpServerStatus: Effect.succeed([]),
-                  readMcpResource: () => Effect.die("unexpected MCP resource read"),
-                  callMcpTool: () => Effect.die("unexpected MCP tool call"),
-                  listPermissionRules: Effect.die("unexpected permission rules read"),
-                  stopTask: () => Effect.void,
-                  interrupt: Effect.void,
-                  close: Effect.void,
-                }),
-              forkSession: () => Effect.die("unused"),
-              subagentLaunchToolUseId: () => Effect.succeed(null),
-              subagentModel: () => Effect.succeed(null),
-              assertComplete: Effect.void,
-            },
-          }).pipe(Effect.provideContext(services));
-          return [adapter];
-        }),
-      );
-      yield* Effect.gen(function* () {
-        const orchestrator = yield* Orchestrator.OrchestratorV2;
-        const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
-        const threadId = ThreadId.make("thread:cancelled-continuation");
-        const watch = (predicate: (event: OrchestrationV2DomainEvent) => boolean) =>
-          orchestrator.streamDomainEvents.pipe(
-            Stream.filter(predicate),
-            Stream.take(1),
-            Stream.runDrain,
-            Effect.forkScoped,
-          );
-        const runUpdated = (messageId: string, status: string) =>
-          watch(
-            (event) =>
-              event.type === "run.updated" &&
-              event.payload.userMessageId === messageId &&
-              event.payload.status === status,
-          );
-        // A user turn that leaves a background task running when it ends.
-        const userTurnWithBackgroundTask = Effect.fnUntraced(function* (
-          id: string,
-          taskId: string,
-        ) {
-          const running = yield* runUpdated(id, "running");
-          yield* orchestrator.dispatch({
-            type: "message.dispatch",
-            commandId: CommandId.make(id),
-            threadId,
-            messageId: MessageId.make(id),
-            text: "Run the build in the background.",
-            attachments: [],
-            dispatchMode: { type: "start_immediately" },
-            createdBy: "user",
-            creationSource: "web",
-          });
-          yield* worker.drain();
-          yield* Fiber.join(running);
-          const waiting = yield* runUpdated(id, "waiting");
-          yield* Queue.offer(sdkMessages, backgroundTaskStarted(taskId));
-          yield* Queue.offer(sdkMessages, result(`result-${id}`, false));
-          yield* Fiber.join(waiting);
-        });
-        yield* orchestrator.dispatch({
-          type: "thread.create",
-          commandId: CommandId.make("create"),
-          threadId,
-          projectId: ProjectId.make("project:cancelled-continuation"),
-          title: "Cancelled continuation",
-          modelSelection,
-          runtimeMode: "full-access",
-          interactionMode: "default",
-          branch: null,
-          worktreePath: cwd,
-          createdBy: "user",
-          creationSource: "web",
-        });
-
-        // The first run is still finalizing when its background task wakes Claude.
-        yield* userTurnWithBackgroundTask("first", "build-1");
-        const queued = yield* watch(
-          (event) => event.type === "run.created" && event.payload.status === "queued",
+                ),
+                offer: () => Effect.void,
+                setModel: () => Effect.void,
+                applyFlagSettings: () => Effect.void,
+                setPermissionMode: () => Effect.void,
+                backgroundTasks: () => Effect.succeed(false),
+                mcpServerStatus: Effect.succeed([]),
+                readMcpResource: () => Effect.die("unexpected MCP resource read"),
+                callMcpTool: () => Effect.die("unexpected MCP tool call"),
+                listPermissionRules: Effect.die("unexpected permission rules read"),
+                stopTask: () => Effect.void,
+                interrupt: Effect.void,
+                close: Effect.void,
+              }),
+            forkSession: () => Effect.die("unused"),
+            subagentLaunchToolUseId: () => Effect.succeed(null),
+            subagentModel: () => Effect.succeed(null),
+            assertComplete: Effect.void,
+          },
+        }).pipe(Effect.provideContext(services));
+        return [adapter];
+      }),
+    );
+    yield* Effect.gen(function* () {
+      const orchestrator = yield* Orchestrator.OrchestratorV2;
+      const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
+      const threadId = ThreadId.make("thread:cancelled-continuation");
+      const watch = (predicate: (event: OrchestrationV2DomainEvent) => boolean) =>
+        orchestrator.streamDomainEvents.pipe(
+          Stream.filter(predicate),
+          Stream.take(1),
+          Stream.runDrain,
+          Effect.forkScoped,
         );
-        yield* offerAndWait(backgroundTaskNotification("build-1"));
-        yield* offerAndWait(wakeAssistant("wake-1"));
-        yield* Fiber.join(queued);
-        assert.lengthOf(continuations, 1);
-        const continuationRun = (yield* orchestrator.getThreadProjection(threadId)).runs.find(
-          (run) => run.status === "queued",
+      const runUpdated = (messageId: string, status: string) =>
+        watch(
+          (event) =>
+            event.type === "run.updated" &&
+            event.payload.userMessageId === messageId &&
+            event.payload.status === status,
         );
-        assert.ok(continuationRun !== undefined);
+      // A user turn that leaves a background task running when it ends.
+      const userTurnWithBackgroundTask = Effect.fnUntraced(function* (id: string, taskId: string) {
+        const running = yield* runUpdated(id, "running");
         yield* orchestrator.dispatch({
-          type: "queued-run.cancel",
-          commandId: CommandId.make("cancel"),
+          type: "message.dispatch",
+          commandId: CommandId.make(id),
           threadId,
-          runId: continuationRun.id,
+          messageId: MessageId.make(id),
+          text: "Run the build in the background.",
+          attachments: [],
+          dispatchMode: { type: "start_immediately" },
+          createdBy: "user",
+          creationSource: "web",
         });
-        yield* offerAndWait(result("wake-1-result", false));
         yield* worker.drain();
-        yield* orchestrator.resumeQueuedRuns;
-        yield* worker.drain();
-        const idle = yield* orchestrator.getThreadProjection(threadId);
-        assert.equal(idle.runs.find((run) => run.id === continuationRun.id)?.status, "cancelled");
-        assert.isFalse(idle.runs.some((run) => run.status === "queued"));
+        yield* Fiber.join(running);
+        const waiting = yield* runUpdated(id, "waiting");
+        yield* Queue.offer(sdkMessages, backgroundTaskStarted(taskId));
+        yield* Queue.offer(sdkMessages, result(`result-${id}`, false));
+        yield* Fiber.join(waiting);
+      });
+      yield* orchestrator.dispatch({
+        type: "thread.create",
+        commandId: CommandId.make("create"),
+        threadId,
+        projectId: ProjectId.make("project:cancelled-continuation"),
+        title: "Cancelled continuation",
+        modelSelection,
+        runtimeMode: "full-access",
+        interactionMode: "default",
+        branch: null,
+        worktreePath: cwd,
+        createdBy: "user",
+        creationSource: "web",
+      });
 
-        yield* userTurnWithBackgroundTask("second", "build-2");
-        yield* worker.drain();
-        // The second user run has completed, so this continuation starts without queueing.
-        const isContinuationRun = (
-          event: OrchestrationV2DomainEvent,
-          type: string,
-          status: string,
-        ) =>
-          (event.type === "run.created" || event.type === "run.updated") &&
-          event.type === type &&
-          event.payload.status === status &&
-          event.payload.userMessageId !== MessageId.make("first") &&
-          event.payload.userMessageId !== MessageId.make("second");
-        const secondCreated = yield* watch((event) =>
-          isContinuationRun(event, "run.created", "starting"),
-        );
-        const secondRunning = yield* watch((event) =>
-          isContinuationRun(event, "run.updated", "running"),
-        );
-        yield* offerAndWait(backgroundTaskNotification("build-2"));
-        yield* offerAndWait(wakeAssistant("wake-2"));
-        assert.lengthOf(
-          continuations,
-          2,
-          "the wake after a cancelled queued continuation must offer a new continuation",
-        );
-        yield* Fiber.join(secondCreated);
-        yield* worker.drain();
-        yield* Fiber.join(secondRunning);
-        const secondContinuation = (yield* orchestrator.getThreadProjection(threadId)).runs.find(
-          (run) => run.status === "running",
-        );
-        assert.ok(secondContinuation !== undefined);
-        const secondWaiting = yield* watch(
-          (event) =>
-            event.type === "run.updated" &&
-            event.payload.id === secondContinuation.id &&
-            event.payload.status === "waiting",
-        );
-        yield* offerAndWait(result("wake-2-result", false));
-        yield* Fiber.join(secondWaiting);
-        yield* worker.drain();
-        const settled = yield* orchestrator.getThreadProjection(threadId);
-        assert.equal(
-          settled.runs.find((run) => run.id === secondContinuation.id)?.status,
-          "completed",
-        );
-        assert.deepEqual(
-          settled.turnItems.flatMap((item) =>
-            item.runId === secondContinuation.id && item.type === "assistant_message"
-              ? [item.text]
-              : [],
-          ),
-          ["Background build finished (wake-2)."],
-          "the continuation must carry only its own wake's output",
-        );
-        assert.lengthOf(continuations, 2, "two wakes must offer exactly two continuations");
-      }).pipe(
-        Effect.provide(
-          ProviderReplayHarness.layerWithRegistry(
-            { name: "claude-cancelled-continuation" },
-            registry,
-            { runEffectWorker: false, runContinuationWorker: true },
-          ),
+      // The first run is still finalizing when its background task wakes Claude.
+      yield* userTurnWithBackgroundTask("first", "build-1");
+      const queued = yield* watch(
+        (event) => event.type === "run.created" && event.payload.status === "queued",
+      );
+      yield* offerAndWait(backgroundTaskNotification("build-1"));
+      yield* offerAndWait(wakeAssistant("wake-1"));
+      yield* Fiber.join(queued);
+      assert.lengthOf(continuations, 1);
+      const continuationRun = (yield* orchestrator.getThreadProjection(threadId)).runs.find(
+        (run) => run.status === "queued",
+      );
+      assert.ok(continuationRun !== undefined);
+      yield* orchestrator.dispatch({
+        type: "queued-run.cancel",
+        commandId: CommandId.make("cancel"),
+        threadId,
+        runId: continuationRun.id,
+      });
+      yield* offerAndWait(result("wake-1-result", false));
+      yield* worker.drain();
+      yield* orchestrator.resumeQueuedRuns;
+      yield* worker.drain();
+      const idle = yield* orchestrator.getThreadProjection(threadId);
+      assert.equal(idle.runs.find((run) => run.id === continuationRun.id)?.status, "cancelled");
+      assert.isFalse(idle.runs.some((run) => run.status === "queued"));
+
+      yield* userTurnWithBackgroundTask("second", "build-2");
+      yield* worker.drain();
+      // The second user run has completed, so this continuation starts without queueing.
+      const isContinuationRun = (event: OrchestrationV2DomainEvent, type: string, status: string) =>
+        (event.type === "run.created" || event.type === "run.updated") &&
+        event.type === type &&
+        event.payload.status === status &&
+        event.payload.userMessageId !== MessageId.make("first") &&
+        event.payload.userMessageId !== MessageId.make("second");
+      const secondCreated = yield* watch((event) =>
+        isContinuationRun(event, "run.created", "starting"),
+      );
+      const secondRunning = yield* watch((event) =>
+        isContinuationRun(event, "run.updated", "running"),
+      );
+      yield* offerAndWait(backgroundTaskNotification("build-2"));
+      yield* offerAndWait(wakeAssistant("wake-2"));
+      assert.lengthOf(
+        continuations,
+        2,
+        "the wake after a cancelled queued continuation must offer a new continuation",
+      );
+      yield* Fiber.join(secondCreated);
+      yield* worker.drain();
+      yield* Fiber.join(secondRunning);
+      const secondContinuation = (yield* orchestrator.getThreadProjection(threadId)).runs.find(
+        (run) => run.status === "running",
+      );
+      assert.ok(secondContinuation !== undefined);
+      const secondWaiting = yield* watch(
+        (event) =>
+          event.type === "run.updated" &&
+          event.payload.id === secondContinuation.id &&
+          event.payload.status === "waiting",
+      );
+      yield* offerAndWait(result("wake-2-result", false));
+      yield* Fiber.join(secondWaiting);
+      yield* worker.drain();
+      const settled = yield* orchestrator.getThreadProjection(threadId);
+      assert.equal(
+        settled.runs.find((run) => run.id === secondContinuation.id)?.status,
+        "completed",
+      );
+      assert.deepEqual(
+        settled.turnItems.flatMap((item) =>
+          item.runId === secondContinuation.id && item.type === "assistant_message"
+            ? [item.text]
+            : [],
         ),
+        ["Background build finished (wake-2)."],
+        "the continuation must carry only its own wake's output",
       );
+      assert.lengthOf(continuations, 2, "two wakes must offer exactly two continuations");
     }).pipe(
       Effect.provide(
-        Layer.mergeAll(
-          IdAllocator.layer,
-          McpProviderSessions.layer,
-          NodeServices.layer,
-          NodeCrypto.layer,
+        ProviderReplayHarness.layerWithRegistry(
+          { name: "claude-cancelled-continuation" },
+          registry,
+          { runEffectWorker: false, runContinuationWorker: true },
         ),
       ),
+    );
+  }).pipe(
+    Effect.provide(
+      Layer.mergeAll(
+        IdAllocator.layer,
+        McpProviderSessions.layer,
+        NodeServices.layer,
+        NodeCrypto.layer,
+      ),
     ),
   ),
 );
diff --git a/apps/server/src/orchestration-v2/CommandOutputHub.test.ts b/apps/server/src/orchestration-v2/CommandOutputHub.test.ts
index 3740f4f9a240..3d7c859fe0ad 100644
--- a/apps/server/src/orchestration-v2/CommandOutputHub.test.ts
+++ b/apps/server/src/orchestration-v2/CommandOutputHub.test.ts
@@ -175,54 +175,52 @@ layer("CommandOutputHub", (it) => {
   it.effect(
     "a late subscriber gets the running tail, then live appends, then the final output",
     () =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const hub = yield* CommandOutputHub.CommandOutputHub;
-          const threadId = yield* seedThread;
-          yield* writeCommandItem(threadId, { status: "running" });
-          yield* hub.append({
-            threadId,
-            itemId: ITEM_ID,
-            chunk: "\u001b[32mbuilding\u001b[0m\n10%",
-          });
-          yield* hub.append({ threadId, itemId: ITEM_ID, chunk: "\r55%\u001b[3" });
+      Effect.gen(function* () {
+        const hub = yield* CommandOutputHub.CommandOutputHub;
+        const threadId = yield* seedThread;
+        yield* writeCommandItem(threadId, { status: "running" });
+        yield* hub.append({
+          threadId,
+          itemId: ITEM_ID,
+          chunk: "\u001b[32mbuilding\u001b[0m\n10%",
+        });
+        yield* hub.append({ threadId, itemId: ITEM_ID, chunk: "\r55%\u001b[3" });
 
-          const frames = yield* subscribeFrames(threadId);
-          const first = yield* takeFrame(frames);
-          assert.equal(first.kind, "replace");
-          assert.isTrue(first.running);
-          let client = applyFrame(EMPTY_TERMINAL_OUTPUT, first);
-          assert.equal(client.text, "\u001b[0;32mbuilding\u001b[0m\n55%");
+        const frames = yield* subscribeFrames(threadId);
+        const first = yield* takeFrame(frames);
+        assert.equal(first.kind, "replace");
+        assert.isTrue(first.running);
+        let client = applyFrame(EMPTY_TERMINAL_OUTPUT, first);
+        assert.equal(client.text, "\u001b[0;32mbuilding\u001b[0m\n55%");
 
-          yield* TestClock.adjust("1 second");
-          yield* hub.append({ threadId, itemId: ITEM_ID, chunk: "1m" });
-          yield* hub.append({ threadId, itemId: ITEM_ID, chunk: "\r100%\u001b[0m\ndone\n" });
-          const append = yield* takeFrame(frames);
-          assert.equal(append.kind, "append");
-          client = applyFrame(client, append);
-          assert.equal(
-            client.text,
-            normalizeTerminalOutput(
-              "\u001b[32mbuilding\u001b[0m\n10%\r55%\u001b[31m\r100%\u001b[0m\ndone\n",
-            ).text,
-          );
+        yield* TestClock.adjust("1 second");
+        yield* hub.append({ threadId, itemId: ITEM_ID, chunk: "1m" });
+        yield* hub.append({ threadId, itemId: ITEM_ID, chunk: "\r100%\u001b[0m\ndone\n" });
+        const append = yield* takeFrame(frames);
+        assert.equal(append.kind, "append");
+        client = applyFrame(client, append);
+        assert.equal(
+          client.text,
+          normalizeTerminalOutput(
+            "\u001b[32mbuilding\u001b[0m\n10%\r55%\u001b[31m\r100%\u001b[0m\ndone\n",
+          ).text,
+        );
 
-          yield* TestClock.adjust("1 second");
-          yield* writeCommandItem(threadId, {
-            status: "completed",
-            exitCode: 0,
-            output: "building\n100%\ndone\n",
-          });
-          const final = yield* takeFrame(frames);
-          assert.deepEqual(final, {
-            kind: "replace",
-            text: "building\n100%\ndone\n",
-            truncated: false,
-            running: false,
-          });
-          assert.equal(yield* Queue.take(frames), "ended");
-        }),
-      ),
+        yield* TestClock.adjust("1 second");
+        yield* writeCommandItem(threadId, {
+          status: "completed",
+          exitCode: 0,
+          output: "building\n100%\ndone\n",
+        });
+        const final = yield* takeFrame(frames);
+        assert.deepEqual(final, {
+          kind: "replace",
+          text: "building\n100%\ndone\n",
+          truncated: false,
+          running: false,
+        });
+        assert.equal(yield* Queue.take(frames), "ended");
+      }),
   );
 
   it.effect("a row that is not a known command fails instead of waiting forever", () =>
@@ -238,128 +236,116 @@ layer("CommandOutputHub", (it) => {
   );
 
   it.effect("a viewer whose command was evicted for newer ones is resynced, not appended to", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const hub = yield* CommandOutputHub.CommandOutputHub;
-        const threadId = yield* seedThread;
-        yield* writeCommandItem(threadId, { status: "running" });
-        yield* hub.append({ threadId, itemId: ITEM_ID, chunk: "abc" });
-        const frames = yield* subscribeFrames(threadId);
-        let client = applyFrame(EMPTY_TERMINAL_OUTPUT, yield* takeFrame(frames));
-        assert.equal(client.text, "abc");
-        for (let index = 0; index < 64; index += 1) {
-          yield* hub.append({
-            threadId,
-            itemId: TurnItemId.make(`turn-item:other-${index}`),
-            chunk: "x",
-          });
-        }
-        yield* TestClock.adjust("1 second");
-        yield* hub.append({ threadId, itemId: ITEM_ID, chunk: "\rX" });
-        const next = yield* takeFrame(frames);
-        assert.equal(next.kind, "replace");
-        client = applyFrame(client, next);
-        assert.equal(client.text, "X");
-      }),
-    ),
+    Effect.gen(function* () {
+      const hub = yield* CommandOutputHub.CommandOutputHub;
+      const threadId = yield* seedThread;
+      yield* writeCommandItem(threadId, { status: "running" });
+      yield* hub.append({ threadId, itemId: ITEM_ID, chunk: "abc" });
+      const frames = yield* subscribeFrames(threadId);
+      let client = applyFrame(EMPTY_TERMINAL_OUTPUT, yield* takeFrame(frames));
+      assert.equal(client.text, "abc");
+      for (let index = 0; index < 64; index += 1) {
+        yield* hub.append({
+          threadId,
+          itemId: TurnItemId.make(`turn-item:other-${index}`),
+          chunk: "x",
+        });
+      }
+      yield* TestClock.adjust("1 second");
+      yield* hub.append({ threadId, itemId: ITEM_ID, chunk: "\rX" });
+      const next = yield* takeFrame(frames);
+      assert.equal(next.kind, "replace");
+      client = applyFrame(client, next);
+      assert.equal(client.text, "X");
+    }),
   );
 
   it.effect("a finished command sends only its bounded final output", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const threadId = yield* seedThread;
-        const huge = Array.from({ length: 400_000 }, (_, index) => `line ${index}`).join("\n");
-        yield* writeCommandItem(threadId, { status: "failed", exitCode: 1, output: huge });
-        const frames = yield* subscribeFrames(threadId);
-        const final = yield* takeFrame(frames);
-        assert.equal(final.kind, "replace");
-        assert.isFalse(final.running);
-        assert.isTrue(final.truncated);
-        assert.isAtMost(final.text.length, TERMINAL_OUTPUT_TAIL_CHARS);
-        assert.isTrue(final.text.endsWith("line 399999"));
-        assert.equal(yield* Queue.take(frames), "ended");
-      }),
-    ),
+    Effect.gen(function* () {
+      const threadId = yield* seedThread;
+      const huge = Array.from({ length: 400_000 }, (_, index) => `line ${index}`).join("\n");
+      yield* writeCommandItem(threadId, { status: "failed", exitCode: 1, output: huge });
+      const frames = yield* subscribeFrames(threadId);
+      const final = yield* takeFrame(frames);
+      assert.equal(final.kind, "replace");
+      assert.isFalse(final.running);
+      assert.isTrue(final.truncated);
+      assert.isAtMost(final.text.length, TERMINAL_OUTPUT_TAIL_CHARS);
+      assert.isTrue(final.text.endsWith("line 399999"));
+      assert.equal(yield* Queue.take(frames), "ended");
+    }),
   );
 
   it.effect("a finished command whose output is one huge line still shows its tail", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const threadId = yield* seedThread;
-        const line = "x".repeat(TERMINAL_OUTPUT_TAIL_CHARS * 8);
-        yield* writeCommandItem(threadId, {
-          status: "completed",
-          exitCode: 0,
-          output: `${line}\n`,
-        });
-        const frames = yield* subscribeFrames(threadId);
-        const final = yield* takeFrame(frames);
-        assert.equal(final.kind, "replace");
-        assert.isTrue(final.truncated);
-        assert.isTrue(final.text.includes("xxxx"));
-        assert.isAtMost(final.text.length, TERMINAL_OUTPUT_TAIL_CHARS);
-      }),
-    ),
+    Effect.gen(function* () {
+      const threadId = yield* seedThread;
+      const line = "x".repeat(TERMINAL_OUTPUT_TAIL_CHARS * 8);
+      yield* writeCommandItem(threadId, {
+        status: "completed",
+        exitCode: 0,
+        output: `${line}\n`,
+      });
+      const frames = yield* subscribeFrames(threadId);
+      const final = yield* takeFrame(frames);
+      assert.equal(final.kind, "replace");
+      assert.isTrue(final.truncated);
+      assert.isTrue(final.text.includes("xxxx"));
+      assert.isAtMost(final.text.length, TERMINAL_OUTPUT_TAIL_CHARS);
+    }),
   );
 
   it.effect("an old Claude row's raw Bash result shows as its stdout and stderr", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const threadId = yield* seedThread;
-        yield* writeCommandItem(threadId, {
-          status: "completed",
-          exitCode: 0,
-          output: '{"stdout":"built","stderr":"1 warning","interrupted":false}',
-        });
-        const frames = yield* subscribeFrames(threadId);
-        const final = yield* takeFrame(frames);
-        assert.equal(final.text, "built\n1 warning");
-      }),
-    ),
+    Effect.gen(function* () {
+      const threadId = yield* seedThread;
+      yield* writeCommandItem(threadId, {
+        status: "completed",
+        exitCode: 0,
+        output: '{"stdout":"built","stderr":"1 warning","interrupted":false}',
+      });
+      const frames = yield* subscribeFrames(threadId);
+      const final = yield* takeFrame(frames);
+      assert.equal(final.text, "built\n1 warning");
+    }),
   );
 
   it.effect("providers that only report output in item snapshots still stream", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const threadId = yield* seedThread;
-        yield* writeCommandItem(threadId, { status: "running", output: "step 1\n" });
-        const frames = yield* subscribeFrames(threadId);
-        assert.equal((yield* takeFrame(frames)).text, "step 1\n");
-        yield* TestClock.adjust("1 second");
-        yield* writeCommandItem(threadId, { status: "running", output: "step 1\nstep 2\n" });
-        const update = yield* takeFrame(frames);
-        assert.deepEqual(update, {
-          kind: "replace",
-          text: "step 1\nstep 2\n",
-          truncated: false,
-          running: true,
-        });
-      }),
-    ),
+    Effect.gen(function* () {
+      const threadId = yield* seedThread;
+      yield* writeCommandItem(threadId, { status: "running", output: "step 1\n" });
+      const frames = yield* subscribeFrames(threadId);
+      assert.equal((yield* takeFrame(frames)).text, "step 1\n");
+      yield* TestClock.adjust("1 second");
+      yield* writeCommandItem(threadId, { status: "running", output: "step 1\nstep 2\n" });
+      const update = yield* takeFrame(frames);
+      assert.deepEqual(update, {
+        kind: "replace",
+        text: "step 1\nstep 2\n",
+        truncated: false,
+        running: true,
+      });
+    }),
   );
 
   it.effect("an interrupted command ends the stream with the output it printed", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const hub = yield* CommandOutputHub.CommandOutputHub;
-        const threadId = yield* seedThread;
-        yield* writeCommandItem(threadId, { status: "running" });
-        yield* hub.append({ threadId, itemId: ITEM_ID, chunk: "waiting for server\n" });
-        const frames = yield* subscribeFrames(threadId);
-        yield* takeFrame(frames);
-        yield* TestClock.adjust("1 second");
-        // Some providers omit stopped-command output; the live tail is released before the settled item persists.
-        yield* hub.finish({ threadId, itemId: ITEM_ID });
-        yield* writeCommandItem(threadId, { status: "interrupted" });
-        const final = yield* takeFrame(frames);
-        assert.deepEqual(final, {
-          kind: "replace",
-          text: "waiting for server\n",
-          truncated: false,
-          running: false,
-        });
-        assert.equal(yield* Queue.take(frames), "ended");
-      }),
-    ),
+    Effect.gen(function* () {
+      const hub = yield* CommandOutputHub.CommandOutputHub;
+      const threadId = yield* seedThread;
+      yield* writeCommandItem(threadId, { status: "running" });
+      yield* hub.append({ threadId, itemId: ITEM_ID, chunk: "waiting for server\n" });
+      const frames = yield* subscribeFrames(threadId);
+      yield* takeFrame(frames);
+      yield* TestClock.adjust("1 second");
+      // Some providers omit stopped-command output; the live tail is released before the settled item persists.
+      yield* hub.finish({ threadId, itemId: ITEM_ID });
+      yield* writeCommandItem(threadId, { status: "interrupted" });
+      const final = yield* takeFrame(frames);
+      assert.deepEqual(final, {
+        kind: "replace",
+        text: "waiting for server\n",
+        truncated: false,
+        running: false,
+      });
+      assert.equal(yield* Queue.take(frames), "ended");
+    }),
   );
 });
diff --git a/apps/server/src/orchestration-v2/ContextHandoffDelivery.ts b/apps/server/src/orchestration-v2/ContextHandoffDelivery.ts
index 8919030f4a2c..5211da2faf16 100644
--- a/apps/server/src/orchestration-v2/ContextHandoffDelivery.ts
+++ b/apps/server/src/orchestration-v2/ContextHandoffDelivery.ts
@@ -44,7 +44,7 @@ export const deliverContextHandoffs = Effect.fn("orchestrationV2.deliverContextH
         (handoff) =>
           `Context handoff (${handoff.strategy === "fork_delta_summary" ? "merge_back / fork_delta_summary" : handoff.strategy}):\n${
             handoff.history?.coverage ??
-            `From thread ${handoff.threadId}, runs ${handoff.coveredRunOrdinals.from}-${handoff.coveredRunOrdinals.to}. Recover history with t3_thread_read, view=activity; paginate with afterPosition, and use itemId/textOffset for long items.`
+            `From thread ${handoff.threadId}, runs ${handoff.coveredRunOrdinals.from}-${handoff.coveredRunOrdinals.to}. Recover history with t3_thread_read, view=activity, afterPosition=-1; paginate with afterPosition=nextPosition, and use itemId/textOffset for long items.`
           }`,
       )
       .join("\n");
diff --git a/apps/server/src/orchestration-v2/EventSink.ts b/apps/server/src/orchestration-v2/EventSink.ts
index 81ec4019f2c0..edae3077912e 100644
--- a/apps/server/src/orchestration-v2/EventSink.ts
+++ b/apps/server/src/orchestration-v2/EventSink.ts
@@ -169,6 +169,17 @@ export interface EventSinkV2Shape {
     },
     EventSinkV2Error
   >;
+  /** Commits only if the stored turn item still equals expected. */
+  readonly writeIfTurnItemUnchanged: (input: {
+    readonly expected: OrchestrationV2TurnItem;
+    readonly events: ReadonlyArray<OrchestrationV2DomainEvent>;
+  }) => Effect.Effect<
+    {
+      readonly committed: boolean;
+      readonly storedEvents: ReadonlyArray<OrchestrationV2StoredEvent>;
+    },
+    EventSinkV2Error
+  >;
   readonly commitCommand: (input: {
     readonly commandId: CommandId;
     readonly threadId: ThreadId;
@@ -634,23 +645,15 @@ const layerBase: Layer.Layer<
       );
     });
 
-    const writeIfProviderThreadUnchangedEffect = Effect.fn(
-      "orchestrationV2.EventSink.writeIfProviderThreadUnchanged",
-    )(function* (input: Parameters<EventSinkV2Shape["writeIfProviderThreadUnchanged"]>[0]) {
-      yield* Effect.annotateCurrentSpan({
-        "orchestration_v2.event_count": input.events.length,
-        "orchestration_v2.provider_thread_id": input.expected.id,
-      });
-      const expectedJson = yield* ProjectionStore.encodeProviderThreadPayload(input.expected);
-
-      return yield* commitThenPublish(
+    // Appends the events only if the stored payload still matches, in one transaction.
+    const writeIfStoredPayloadMatches = <E>(
+      readStoredPayload: Effect.Effect<ReadonlyArray<{ readonly payload_json: string }>, E>,
+      expectedJson: string,
+      events: ReadonlyArray<OrchestrationV2DomainEvent>,
+    ) =>
+      commitThenPublish(
         Effect.gen(function* () {
-          const rows = yield* sql<{ readonly payload_json: string }>`
-            SELECT payload_json
-            FROM orchestration_v2_projection_provider_threads
-            WHERE provider_thread_id = ${input.expected.id}
-            LIMIT 1
-          `;
+          const rows = yield* readStoredPayload;
           if (rows[0]?.payload_json !== expectedJson) {
             return {
               committed: false as const,
@@ -658,7 +661,7 @@ const layerBase: Layer.Layer<
             };
           }
 
-          const normalized = yield* normalizeEvents(input.events);
+          const normalized = yield* normalizeEvents(events);
           const storedEvents = yield* eventStore.append({ events: normalized });
           const outcomes = yield* applyStoredEvents(storedEvents);
           return { committed: true as const, storedEvents, outcomes };
@@ -668,6 +671,45 @@ const layerBase: Layer.Layer<
             ? publishStoredEvents(result.storedEvents, result.outcomes)
             : Effect.void,
       );
+
+    const writeIfProviderThreadUnchangedEffect = Effect.fn(
+      "orchestrationV2.EventSink.writeIfProviderThreadUnchanged",
+    )(function* (input: Parameters<EventSinkV2Shape["writeIfProviderThreadUnchanged"]>[0]) {
+      yield* Effect.annotateCurrentSpan({
+        "orchestration_v2.event_count": input.events.length,
+        "orchestration_v2.provider_thread_id": input.expected.id,
+      });
+      const expectedJson = yield* ProjectionStore.encodeProviderThreadPayload(input.expected);
+      return yield* writeIfStoredPayloadMatches(
+        sql<{ readonly payload_json: string }>`
+          SELECT payload_json
+          FROM orchestration_v2_projection_provider_threads
+          WHERE provider_thread_id = ${input.expected.id}
+          LIMIT 1
+        `,
+        expectedJson,
+        input.events,
+      );
+    });
+
+    const writeIfTurnItemUnchangedEffect = Effect.fn(
+      "orchestrationV2.EventSink.writeIfTurnItemUnchanged",
+    )(function* (input: Parameters<EventSinkV2Shape["writeIfTurnItemUnchanged"]>[0]) {
+      yield* Effect.annotateCurrentSpan({
+        "orchestration_v2.event_count": input.events.length,
+        "orchestration_v2.turn_item_id": input.expected.id,
+      });
+      const expectedJson = yield* ProjectionStore.encodeTurnItemPayload(input.expected);
+      return yield* writeIfStoredPayloadMatches(
+        sql<{ readonly payload_json: string }>`
+          SELECT payload_json
+          FROM orchestration_v2_projection_turn_items
+          WHERE turn_item_id = ${input.expected.id}
+          LIMIT 1
+        `,
+        expectedJson,
+        input.events,
+      );
     });
 
     const existingCommandResult =
@@ -1070,6 +1112,12 @@ const layerBase: Layer.Layer<
             (cause) => new EventSinkWriteError({ eventCount: input.events.length, cause }),
           ),
         ),
+      writeIfTurnItemUnchanged: (input) =>
+        writeIfTurnItemUnchangedEffect(input).pipe(
+          Effect.mapError(
+            (cause) => new EventSinkWriteError({ eventCount: input.events.length, cause }),
+          ),
+        ),
       commitCommand: (input) =>
         commitCommandEffect(input).pipe(
           Effect.mapError(
diff --git a/apps/server/src/orchestration-v2/FoundationPersistence.test.ts b/apps/server/src/orchestration-v2/FoundationPersistence.test.ts
index 6a4c51a7a427..841e4b3dfb08 100644
--- a/apps/server/src/orchestration-v2/FoundationPersistence.test.ts
+++ b/apps/server/src/orchestration-v2/FoundationPersistence.test.ts
@@ -1,4 +1,4 @@
-import * as NodeSqlite from "node:sqlite";
+import type * as NodeWorkerThreads from "node:worker_threads";
 import * as NodeServices from "@effect/platform-node/NodeServices";
 import { assert, it } from "@effect/vitest";
 import {
@@ -73,6 +73,29 @@ import * as ProjectStore from "./ProjectStore.ts";
 import * as ProviderRuntimeRecovery from "./ProviderRuntimeRecoveryService.ts";
 import * as TurnItemPositionStore from "./TurnItemPositionStore.ts";
 
+const workerStatements = vi.hoisted(
+  (): Array<{ readonly readOnly: boolean; readonly sql: string }> => [],
+);
+
+vi.mock("node:worker_threads", async (importOriginal) => {
+  const actual = await importOriginal<typeof NodeWorkerThreads>();
+  class RecordedWorker extends actual.Worker {
+    readonly #readOnly: boolean;
+    constructor(...args: ConstructorParameters<typeof actual.Worker>) {
+      super(...args);
+      this.#readOnly = args[1]?.workerData?.readOnly === true;
+    }
+    override postMessage(...args: Parameters<NodeWorkerThreads.Worker["postMessage"]>) {
+      const [message] = args;
+      if (typeof message === "object" && message !== null && typeof message.sql === "string") {
+        workerStatements.push({ readOnly: this.#readOnly, sql: message.sql });
+      }
+      return super.postMessage(...args);
+    }
+  }
+  return { ...actual, Worker: RecordedWorker };
+});
+
 const isLiveStreamBufferError = Schema.is(LiveStreamBufferError);
 const encodeJson = Schema.encodeEffect(Schema.fromJsonString(Schema.Unknown));
 
@@ -193,45 +216,22 @@ it.effect("discovers on the reader worker and deletes on the writer", () =>
     yield* Effect.gen(function* () {
       const sql = yield* SqlClient.SqlClient;
       yield* seedCompaction();
-      // Establish the reader before recording main-thread statements.
+      // Establish the reader before recording statements.
       yield* sql`SELECT 1`.pipe(NodeSqliteClient.readOnly);
-      const reads: string[] = [];
-      const writes: string[] = [];
-      const all = NodeSqlite.StatementSync.prototype.all;
-      const run = NodeSqlite.StatementSync.prototype.run;
-      yield* Effect.acquireRelease(
-        Effect.sync(() => {
-          const readSpy = vi
-            .spyOn(NodeSqlite.StatementSync.prototype, "all")
-            .mockImplementation(function (this: NodeSqlite.StatementSync, ...params) {
-              reads.push(this.sourceSQL);
-              return all.apply(this, params);
-            });
-          const writeSpy = vi
-            .spyOn(NodeSqlite.StatementSync.prototype, "run")
-            .mockImplementation(function (this: NodeSqlite.StatementSync, ...params) {
-              writes.push(this.sourceSQL);
-              return run.apply(this, params);
-            });
-          return { readSpy, writeSpy };
-        }),
-        ({ readSpy, writeSpy }) =>
-          Effect.sync(() => {
-            readSpy.mockRestore();
-            writeSpy.mockRestore();
-          }),
-      );
+      workerStatements.length = 0;
       const maintenance = yield* ProjectionMaintenance.ProjectionMaintenanceV2;
       const result = yield* maintenance.pruneEventStore();
       assert.equal(result.deletedEventCount, 150);
       assert.equal(result.deletedReceiptCount, 100);
+      const writer = workerStatements.filter((statement) => !statement.readOnly);
       // Only the in-transaction check for rows appended during the pass reads on the writer.
       assert.deepEqual(
-        reads.filter((query) => /\bSELECT\b/.test(query) && !query.includes("AS prompt_sequence")),
+        writer.filter(({ sql }) => /\bSELECT\b/.test(sql) && !sql.includes("AS prompt_sequence")),
         [],
       );
-      assert(writes.some((query) => query.includes("DELETE FROM orchestration_events")));
-      assert(writes.some((query) => query.includes("DELETE FROM orchestration_command_receipts")));
+      assert(workerStatements.some(({ readOnly, sql }) => readOnly && /\bSELECT\b/.test(sql)));
+      assert(writer.some(({ sql }) => sql.includes("DELETE FROM orchestration_events")));
+      assert(writer.some(({ sql }) => sql.includes("DELETE FROM orchestration_command_receipts")));
     }).pipe(
       Effect.provide(
         ProjectionMaintenance.layer.pipe(
@@ -416,7 +416,7 @@ it.effect(
         yield* store.read({ afterSequence: highWater }).pipe(Stream.runCollect),
         published,
       );
-    }).pipe(Effect.provide(Layer.fresh(layerTest)), Effect.scoped),
+    }).pipe(Effect.provide(Layer.fresh(layerTest))),
 );
 
 it.effect.each(
@@ -718,313 +718,301 @@ it.effect.each([false, true])("groups shutdown commits with rollback=%s", (fail)
 
 it.layer(layerTest)("orchestration V2 foundation persistence", (it) => {
   it.effect("projects oversized tool bodies once before replay and live RPC retention", () =>
-    Effect.scoped(
+    Effect.gen(function* () {
+      const sink = yield* EventSink.EventSinkV2;
+      const store = yield* EventStore.EventStoreV2;
+      const projections = yield* ProjectionStore.ProjectionStoreV2;
+      const now = yield* DateTime.now;
+      const thread = makeThread(ThreadId.make("thread:large-stream-body"), now);
+      const output = {
+        content: [{ type: "text", text: "first line\n" + "x".repeat(9 * 1024 * 1024) }],
+      };
+      const tool: OrchestrationV2TurnItem = {
+        id: TurnItemId.make("tool:large-stream-body"),
+        type: "dynamic_tool",
+        threadId: thread.id,
+        runId: null,
+        nodeId: null,
+        providerThreadId: null,
+        providerTurnId: null,
+        nativeItemRef: null,
+        parentItemId: null,
+        ordinal: 1,
+        status: "running",
+        title: "Large tool",
+        toolName: "mcp__large_tool",
+        input: { query: "details" },
+        output,
+        startedAt: now,
+        completedAt: null,
+        updatedAt: now,
+      };
+      const [created] = yield* sink.write({
+        events: [
+          threadCreatedEvent({ id: "event:large-stream-body:created", thread, now }),
+          {
+            id: EventId.make("event:large-stream-body:replay"),
+            type: "turn-item.updated",
+            threadId: thread.id,
+            occurredAt: now,
+            payload: tool,
+          },
+        ],
+      });
+      const subscribe = () =>
+        Stream.toPull(
+          sink.stream({
+            threadId: thread.id,
+            afterSequence: created!.sequence,
+            bounded: true,
+          }),
+        );
+      const pull = yield* subscribe();
+      const other = yield* subscribe();
+      const replay = yield* pull;
+      assert.lengthOf(replay, 1);
+      assert.lengthOf(yield* other, 1);
+      assert.equal(replay[0]!.event.type, "turn-item.updated");
+      assert.isBelow(Buffer.byteLength(yield* encodeJson(replay)), 4_000);
+      const stringify = yield* Effect.acquireRelease(
+        Effect.sync(() => vi.spyOn(JSON, "stringify")),
+        (spy) => Effect.sync(() => spy.mockRestore()),
+      );
+      const [completed] = yield* sink.write({
+        events: [
+          {
+            id: EventId.make("event:large-stream-body:live"),
+            type: "turn-item.updated",
+            threadId: thread.id,
+            occurredAt: now,
+            payload: { ...tool, status: "completed", completedAt: now },
+          },
+        ],
+      });
+      const live = yield* pull;
+      const otherLive = yield* other;
+      assert.deepEqual(
+        live.map((stored) => stored.sequence),
+        [completed!.sequence],
+      );
+      // Both subscribers get one shared projection, so the live budget sizes it once.
+      assert.strictEqual(otherLive[0], live[0]);
+      assert.lengthOf(
+        stringify.mock.calls.filter(([value]) => value === live[0] || value === otherLive[0]),
+        1,
+      );
+      assert.isBelow(Buffer.byteLength(yield* encodeJson(live)), 4_000);
+      for (const stored of [...replay, ...live]) {
+        assert.equal(stored.event.type, "turn-item.updated");
+        if (stored.event.type !== "turn-item.updated") return;
+        assert.equal(stored.event.payload.type, "dynamic_tool");
+        if (stored.event.payload.type !== "dynamic_tool") return;
+        assert.notProperty(stored.event.payload, "output");
+      }
+      const persisted = yield* store.read({ threadId: thread.id }).pipe(Stream.runCollect);
+      const fullEvent = persisted.find((stored) => stored.sequence === completed!.sequence)!.event;
+      assert.equal(fullEvent.type, "turn-item.updated");
+      if (fullEvent.type !== "turn-item.updated") return;
+      assert.equal(fullEvent.payload.type, "dynamic_tool");
+      if (fullEvent.payload.type !== "dynamic_tool") return;
+      assert.deepEqual(fullEvent.payload.output, output);
+      const detail = (yield* projections.getThreadProjection(thread.id)).turnItems.find(
+        (item) => item.id === tool.id,
+      )!;
+      assert.equal(detail.type, "dynamic_tool");
+      if (detail.type === "dynamic_tool") assert.deepEqual(detail.output, output);
+    }),
+  );
+
+  it.effect.each(["high-water", "replay"] as const)(
+    "bounds live events while the V2 %s query is blocked",
+    (phase) =>
       Effect.gen(function* () {
         const sink = yield* EventSink.EventSinkV2;
-        const store = yield* EventStore.EventStoreV2;
-        const projections = yield* ProjectionStore.ProjectionStoreV2;
         const now = yield* DateTime.now;
-        const thread = makeThread(ThreadId.make("thread:large-stream-body"), now);
-        const output = {
-          content: [{ type: "text", text: "first line\n" + "x".repeat(9 * 1024 * 1024) }],
-        };
-        const tool: OrchestrationV2TurnItem = {
-          id: TurnItemId.make("tool:large-stream-body"),
-          type: "dynamic_tool",
-          threadId: thread.id,
-          runId: null,
-          nodeId: null,
-          providerThreadId: null,
-          providerTurnId: null,
-          nativeItemRef: null,
-          parentItemId: null,
-          ordinal: 1,
-          status: "running",
-          title: "Large tool",
-          toolName: "mcp__large_tool",
-          input: { query: "details" },
-          output,
-          startedAt: now,
-          completedAt: null,
-          updatedAt: now,
-        };
+        const thread = makeThread(ThreadId.make(`thread:blocked-${phase}`), now);
         const [created] = yield* sink.write({
-          events: [
-            threadCreatedEvent({ id: "event:large-stream-body:created", thread, now }),
-            {
-              id: EventId.make("event:large-stream-body:replay"),
-              type: "turn-item.updated",
-              threadId: thread.id,
-              occurredAt: now,
-              payload: tool,
-            },
-          ],
+          events: [threadCreatedEvent({ id: `event:blocked-${phase}:created`, thread, now })],
         });
-        const subscribe = () =>
-          Stream.toPull(
-            sink.stream({
-              threadId: thread.id,
-              afterSequence: created!.sequence,
-              bounded: true,
-            }),
+        const readStarted = yield* Deferred.make<void>();
+        const readClosed = yield* Deferred.make<void>();
+        const blockRead: Statement.Transformer = (statement) => {
+          const [query] = statement.compile();
+          if (
+            query.includes("FROM orchestration_events") &&
+            query.includes("MAX(sequence)") === (phase === "high-water")
+          ) {
+            return Deferred.succeed(readStarted, undefined).pipe(
+              Effect.andThen(Effect.never),
+              Effect.ensuring(Deferred.succeed(readClosed, undefined)),
+              Effect.as(statement),
+            );
+          }
+          return Effect.succeed(statement);
+        };
+        const reader = yield* sink
+          .stream({ threadId: thread.id, afterSequence: created!.sequence, bounded: true })
+          .pipe(
+            Stream.provideService(Statement.CurrentTransformer, blockRead),
+            Stream.runDrain,
+            Effect.result,
+            Effect.forkScoped,
           );
-        const pull = yield* subscribe();
-        const other = yield* subscribe();
-        const replay = yield* pull;
-        assert.lengthOf(replay, 1);
-        assert.lengthOf(yield* other, 1);
-        assert.equal(replay[0]!.event.type, "turn-item.updated");
-        assert.isBelow(Buffer.byteLength(yield* encodeJson(replay)), 4_000);
-        const stringify = yield* Effect.acquireRelease(
-          Effect.sync(() => vi.spyOn(JSON, "stringify")),
-          (spy) => Effect.sync(() => spy.mockRestore()),
-        );
-        const [completed] = yield* sink.write({
-          events: [
-            {
-              id: EventId.make("event:large-stream-body:live"),
-              type: "turn-item.updated",
-              threadId: thread.id,
-              occurredAt: now,
-              payload: { ...tool, status: "completed", completedAt: now },
-            },
-          ],
+        yield* Deferred.await(readStarted);
+        yield* sink.write({
+          events: Array.from({ length: LIVE_STREAM_MAX_ITEMS + 1 }, (_, index) => ({
+            id: EventId.make(`event:blocked-${phase}:${index}`),
+            type: "thread.metadata-updated" as const,
+            threadId: thread.id,
+            occurredAt: now,
+            payload: { ...thread, title: `Updated ${index}` },
+          })),
         });
-        const live = yield* pull;
-        const otherLive = yield* other;
-        assert.deepEqual(
-          live.map((stored) => stored.sequence),
-          [completed!.sequence],
-        );
-        // Both subscribers get one shared projection, so the live budget sizes it once.
-        assert.strictEqual(otherLive[0], live[0]);
-        assert.lengthOf(
-          stringify.mock.calls.filter(([value]) => value === live[0] || value === otherLive[0]),
-          1,
-        );
-        assert.isBelow(Buffer.byteLength(yield* encodeJson(live)), 4_000);
-        for (const stored of [...replay, ...live]) {
-          assert.equal(stored.event.type, "turn-item.updated");
-          if (stored.event.type !== "turn-item.updated") return;
-          assert.equal(stored.event.payload.type, "dynamic_tool");
-          if (stored.event.payload.type !== "dynamic_tool") return;
-          assert.notProperty(stored.event.payload, "output");
+        yield* Deferred.await(readClosed);
+        const result = yield* Fiber.join(reader);
+        assert.equal(result._tag, "Failure");
+        if (result._tag === "Failure") {
+          assert.equal(result.failure._tag, "EventSinkStreamError");
+          assert.isTrue(isLiveStreamBufferError(result.failure.cause));
         }
-        const persisted = yield* store.read({ threadId: thread.id }).pipe(Stream.runCollect);
-        const fullEvent = persisted.find(
-          (stored) => stored.sequence === completed!.sequence,
-        )!.event;
-        assert.equal(fullEvent.type, "turn-item.updated");
-        if (fullEvent.type !== "turn-item.updated") return;
-        assert.equal(fullEvent.payload.type, "dynamic_tool");
-        if (fullEvent.payload.type !== "dynamic_tool") return;
-        assert.deepEqual(fullEvent.payload.output, output);
-        const detail = (yield* projections.getThreadProjection(thread.id)).turnItems.find(
-          (item) => item.id === tool.id,
-        )!;
-        assert.equal(detail.type, "dynamic_tool");
-        if (detail.type === "dynamic_tool") assert.deepEqual(detail.output, output);
       }),
-    ),
-  );
-
-  it.effect.each(["high-water", "replay"] as const)(
-    "bounds live events while the V2 %s query is blocked",
-    (phase) =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const sink = yield* EventSink.EventSinkV2;
-          const now = yield* DateTime.now;
-          const thread = makeThread(ThreadId.make(`thread:blocked-${phase}`), now);
-          const [created] = yield* sink.write({
-            events: [threadCreatedEvent({ id: `event:blocked-${phase}:created`, thread, now })],
-          });
-          const readStarted = yield* Deferred.make<void>();
-          const readClosed = yield* Deferred.make<void>();
-          const blockRead: Statement.Transformer = (statement) => {
-            const [query] = statement.compile();
-            if (
-              query.includes("FROM orchestration_events") &&
-              query.includes("MAX(sequence)") === (phase === "high-water")
-            ) {
-              return Deferred.succeed(readStarted, undefined).pipe(
-                Effect.andThen(Effect.never),
-                Effect.ensuring(Deferred.succeed(readClosed, undefined)),
-                Effect.as(statement),
-              );
-            }
-            return Effect.succeed(statement);
-          };
-          const reader = yield* sink
-            .stream({ threadId: thread.id, afterSequence: created!.sequence, bounded: true })
-            .pipe(
-              Stream.provideService(Statement.CurrentTransformer, blockRead),
-              Stream.runDrain,
-              Effect.result,
-              Effect.forkScoped,
-            );
-          yield* Deferred.await(readStarted);
-          yield* sink.write({
-            events: Array.from({ length: LIVE_STREAM_MAX_ITEMS + 1 }, (_, index) => ({
-              id: EventId.make(`event:blocked-${phase}:${index}`),
-              type: "thread.metadata-updated" as const,
-              threadId: thread.id,
-              occurredAt: now,
-              payload: { ...thread, title: `Updated ${index}` },
-            })),
-          });
-          yield* Deferred.await(readClosed);
-          const result = yield* Fiber.join(reader);
-          assert.equal(result._tag, "Failure");
-          if (result._tag === "Failure") {
-            assert.equal(result.failure._tag, "EventSinkStreamError");
-            assert.isTrue(isLiveStreamBufferError(result.failure.cause));
-          }
-        }),
-      ),
   );
 
   it.effect(
     "keeps internal streams subscribed while replay is blocked beyond the RPC buffer cap",
     () =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const sink = yield* EventSink.EventSinkV2;
-          const now = yield* DateTime.now;
-          const thread = makeThread(ThreadId.make("thread:internal-stream-burst"), now);
-          const [created] = yield* sink.write({
-            events: [
-              threadCreatedEvent({ id: "event:internal-stream-burst:created", thread, now }),
-            ],
-          });
-          const readStarted = yield* Deferred.make<void>();
-          const releaseRead = yield* Deferred.make<void>();
-          const blockHighWater: Statement.Transformer = (statement) => {
-            const [query] = statement.compile();
-            return query.includes("MAX(sequence)") && query.includes("FROM orchestration_events")
-              ? Deferred.succeed(readStarted, undefined).pipe(
-                  Effect.andThen(Deferred.await(releaseRead)),
-                  Effect.as(statement),
-                )
-              : Effect.succeed(statement);
-          };
-          const eventCount = LIVE_STREAM_MAX_ITEMS + 1;
-          const reader = yield* sink
-            .stream({ threadId: thread.id, afterSequence: created!.sequence })
-            .pipe(
-              Stream.provideService(Statement.CurrentTransformer, blockHighWater),
-              Stream.take(eventCount),
-              Stream.runCollect,
-              Effect.forkScoped,
-            );
-          yield* Deferred.await(readStarted);
-          const written = yield* sink.write({
-            events: Array.from({ length: eventCount }, (_, index) => ({
-              id: EventId.make(`event:internal-stream-burst:${index}`),
-              type: "thread.metadata-updated" as const,
-              threadId: thread.id,
-              occurredAt: now,
-              payload: { ...thread, title: `Updated ${index}` },
-            })),
-          });
-          yield* Deferred.succeed(releaseRead, undefined);
-          assert.deepEqual(
-            (yield* Fiber.join(reader)).map((event) => event.sequence),
-            written.map((event) => event.sequence),
-          );
-        }),
-      ),
-  );
-
-  it.effect("filters worker replay and live queues without losing matching events", () =>
-    Effect.scoped(
       Effect.gen(function* () {
         const sink = yield* EventSink.EventSinkV2;
-        const sql = yield* SqlClient.SqlClient;
         const now = yield* DateTime.now;
-        const thread = makeThread(ThreadId.make("thread:filtered-worker"), now);
-        const other = makeThread(ThreadId.make("thread:filtered-worker-other"), now);
-        const run: OrchestrationV2Run = {
-          id: RunId.make("run:filtered-worker"),
-          threadId: thread.id,
-          ordinal: 1,
-          providerInstanceId,
-          modelSelection,
-          providerThreadId: null,
-          userMessageId: MessageId.make("message:filtered-worker"),
-          rootNodeId: null,
-          activeAttemptId: null,
-          status: "completed",
-          queuePosition: null,
-          requestedAt: now,
-          startedAt: now,
-          completedAt: now,
-          checkpointId: null,
-          contextHandoffId: null,
-        };
-        const runEvent = (id: string, payload: OrchestrationV2Run): OrchestrationV2DomainEvent => ({
-          id: EventId.make(id),
-          type: "run.updated",
-          threadId: payload.threadId,
-          runId: payload.id,
-          occurredAt: now,
-          payload,
+        const thread = makeThread(ThreadId.make("thread:internal-stream-burst"), now);
+        const [created] = yield* sink.write({
+          events: [threadCreatedEvent({ id: "event:internal-stream-burst:created", thread, now })],
         });
-        const history = yield* sink.write({
-          events: [
-            threadCreatedEvent({ id: "event:filtered-worker:created", thread, now }),
-            threadCreatedEvent({ id: "event:filtered-worker:other", thread: other, now }),
-            runEvent("event:filtered-worker:history", run),
-            runEvent("event:filtered-worker:other-history", {
-              ...run,
-              id: RunId.make("run:filtered-worker-other"),
-              threadId: other.id,
-            }),
-          ],
+        const readStarted = yield* Deferred.make<void>();
+        const releaseRead = yield* Deferred.make<void>();
+        const blockHighWater: Statement.Transformer = (statement) => {
+          const [query] = statement.compile();
+          return query.includes("MAX(sequence)") && query.includes("FROM orchestration_events")
+            ? Deferred.succeed(readStarted, undefined).pipe(
+                Effect.andThen(Deferred.await(releaseRead)),
+                Effect.as(statement),
+              )
+            : Effect.succeed(statement);
+        };
+        const eventCount = LIVE_STREAM_MAX_ITEMS + 1;
+        const reader = yield* sink
+          .stream({ threadId: thread.id, afterSequence: created!.sequence })
+          .pipe(
+            Stream.provideService(Statement.CurrentTransformer, blockHighWater),
+            Stream.take(eventCount),
+            Stream.runCollect,
+            Effect.forkScoped,
+          );
+        yield* Deferred.await(readStarted);
+        const written = yield* sink.write({
+          events: Array.from({ length: eventCount }, (_, index) => ({
+            id: EventId.make(`event:internal-stream-burst:${index}`),
+            type: "thread.metadata-updated" as const,
+            threadId: thread.id,
+            occurredAt: now,
+            payload: { ...thread, title: `Updated ${index}` },
+          })),
         });
-        const original = yield* sql<{ readonly payload_json: string }>`
+        yield* Deferred.succeed(releaseRead, undefined);
+        assert.deepEqual(
+          (yield* Fiber.join(reader)).map((event) => event.sequence),
+          written.map((event) => event.sequence),
+        );
+      }),
+  );
+
+  it.effect("filters worker replay and live queues without losing matching events", () =>
+    Effect.gen(function* () {
+      const sink = yield* EventSink.EventSinkV2;
+      const sql = yield* SqlClient.SqlClient;
+      const now = yield* DateTime.now;
+      const thread = makeThread(ThreadId.make("thread:filtered-worker"), now);
+      const other = makeThread(ThreadId.make("thread:filtered-worker-other"), now);
+      const run: OrchestrationV2Run = {
+        id: RunId.make("run:filtered-worker"),
+        threadId: thread.id,
+        ordinal: 1,
+        providerInstanceId,
+        modelSelection,
+        providerThreadId: null,
+        userMessageId: MessageId.make("message:filtered-worker"),
+        rootNodeId: null,
+        activeAttemptId: null,
+        status: "completed",
+        queuePosition: null,
+        requestedAt: now,
+        startedAt: now,
+        completedAt: now,
+        checkpointId: null,
+        contextHandoffId: null,
+      };
+      const runEvent = (id: string, payload: OrchestrationV2Run): OrchestrationV2DomainEvent => ({
+        id: EventId.make(id),
+        type: "run.updated",
+        threadId: payload.threadId,
+        runId: payload.id,
+        occurredAt: now,
+        payload,
+      });
+      const history = yield* sink.write({
+        events: [
+          threadCreatedEvent({ id: "event:filtered-worker:created", thread, now }),
+          threadCreatedEvent({ id: "event:filtered-worker:other", thread: other, now }),
+          runEvent("event:filtered-worker:history", run),
+          runEvent("event:filtered-worker:other-history", {
+            ...run,
+            id: RunId.make("run:filtered-worker-other"),
+            threadId: other.id,
+          }),
+        ],
+      });
+      const original = yield* sql<{ readonly payload_json: string }>`
           SELECT payload_json FROM orchestration_events
           WHERE sequence = ${history[0]!.sequence}
         `;
-        yield* Effect.acquireRelease(
-          sql`
+      yield* Effect.acquireRelease(
+        sql`
             UPDATE orchestration_events SET payload_json = 'unreadable unrelated payload'
             WHERE sequence = ${history[0]!.sequence}
           `,
-          () =>
-            sql`
+        () =>
+          sql`
               UPDATE orchestration_events SET payload_json = ${original[0]!.payload_json}
               WHERE sequence = ${history[0]!.sequence}
             `.pipe(Effect.orDie),
-        );
-        const pull = yield* Stream.toPull(
-          sink.stream({ threadId: thread.id, eventType: "run.updated" }),
-        );
-        assert.deepEqual(
-          (yield* pull).map((stored) => stored.sequence),
-          [history[2]!.sequence],
-        );
-        yield* sink.write({
-          events: Array.from({ length: LIVE_STREAM_MAX_ITEMS + 1 }, (_, index) => ({
-            id: EventId.make(`event:filtered-worker:output:${index}`),
-            type: "thread.metadata-updated" as const,
-            threadId: thread.id,
-            occurredAt: now,
-            payload: { ...thread, title: `Output ${index}` },
-          })),
-        });
-        const live = yield* sink.write({
-          events: [
-            runEvent("event:filtered-worker:live:1", { ...run, status: "interrupted" }),
-            runEvent("event:filtered-worker:live:2", { ...run, status: "failed" }),
-          ],
-        });
-        assert.deepEqual(
-          (yield* pull).map((stored) => stored.sequence),
-          live.map((stored) => stored.sequence),
-        );
-      }),
-    ),
+      );
+      const pull = yield* Stream.toPull(
+        sink.stream({ threadId: thread.id, eventType: "run.updated" }),
+      );
+      assert.deepEqual(
+        (yield* pull).map((stored) => stored.sequence),
+        [history[2]!.sequence],
+      );
+      yield* sink.write({
+        events: Array.from({ length: LIVE_STREAM_MAX_ITEMS + 1 }, (_, index) => ({
+          id: EventId.make(`event:filtered-worker:output:${index}`),
+          type: "thread.metadata-updated" as const,
+          threadId: thread.id,
+          occurredAt: now,
+          payload: { ...thread, title: `Output ${index}` },
+        })),
+      });
+      const live = yield* sink.write({
+        events: [
+          runEvent("event:filtered-worker:live:1", { ...run, status: "interrupted" }),
+          runEvent("event:filtered-worker:live:2", { ...run, status: "failed" }),
+        ],
+      });
+      assert.deepEqual(
+        (yield* pull).map((stored) => stored.sequence),
+        live.map((stored) => stored.sequence),
+      );
+    }),
   );
 
   it.effect("paginates catch-up beyond the event-store read limit", () =>
diff --git a/apps/server/src/orchestration-v2/IdleCompaction.test.ts b/apps/server/src/orchestration-v2/IdleCompaction.test.ts
index a11a534b3261..4369220911d5 100644
--- a/apps/server/src/orchestration-v2/IdleCompaction.test.ts
+++ b/apps/server/src/orchestration-v2/IdleCompaction.test.ts
@@ -214,147 +214,30 @@ describe("IdleCompactionService", () => {
         projectDisabled: false,
         ...scenario,
       } as const;
-      return Effect.scoped(
-        Effect.gen(function* () {
-          yield* TestClock.setTime(NOW_MS);
-          const selectedInstance = ProviderInstanceId.make(
-            "instance" in test ? test.instance : "claudeAgent",
-          );
-          const driver = ProviderDriverKind.make("driver" in test ? test.driver : "claudeAgent");
-          const base = records({ cacheExpiresInMs: 2 * MINUTE_MS });
-          const data: OrchestrationV2ThreadProjection = {
-            ...base,
-            thread: {
-              ...base.thread,
-              providerInstanceId: selectedInstance,
-              modelSelection: { ...base.thread.modelSelection, instanceId: selectedInstance },
-            },
-            runs: base.runs.map((run) => ({
-              ...run,
-              providerInstanceId: selectedInstance,
-              modelSelection: { ...run.modelSelection, instanceId: selectedInstance },
-            })),
-            providerThreads: base.providerThreads.map((thread) => ({
-              ...thread,
-              driver,
-              providerInstanceId: selectedInstance,
-            })),
-            attempts: [],
-            nodes: [],
-            subagents: [],
-            providerSessions: [],
-            plans: [],
-            checkpointScopes: [],
-            checkpoints: [],
-            contextHandoffs: [],
-            visibleTurnItems: [],
-            updatedAt: at(),
-          };
-          let historyReads = 0;
-          let dispatches = 0;
-          const done = yield* Deferred.make<void>();
-          const tracer = Tracer.make({
-            span(options) {
-              const span = new Tracer.NativeSpan(options);
-              const end = span.end.bind(span);
-              span.end = (...args) => {
-                end(...args);
-                if (span.name === "IdleCompactionService.compactWhenDue")
-                  Deferred.doneUnsafe(done, Effect.void);
-              };
-              return span;
-            },
-          });
-          const dependencies = Layer.mergeAll(
-            Layer.mock(Orchestrator.OrchestratorV2)({
-              streamDomainEvents: Stream.make({
-                id: EventId.make("idle-completed"),
-                type: "run.updated",
-                threadId,
-                runId,
-                occurredAt: at(),
-                payload: data.runs[0]!,
-              }),
-              dispatch: () =>
-                Effect.sync(() => {
-                  dispatches++;
-                  return { sequence: 1, storedEvents: [] };
-                }),
-            }),
-            Layer.mock(ProjectionStore.ProjectionStoreV2)({
-              getThread: () => Effect.succeed(data.thread),
-              getThreadRecords: () =>
-                Effect.sync(() => {
-                  historyReads++;
-                  return data;
-                }),
-            }),
-            Layer.mock(ServerSettings.ServerSettingsService)({
-              getSettings: Effect.succeed({
-                ...DEFAULT_SERVER_SETTINGS,
-                idleCompaction: test.mode,
-                providerInstances:
-                  "unconfigured" in test
-                    ? {}
-                    : {
-                        [selectedInstance]: {
-                          driver,
-                          enabled: test.enabled,
-                          config: { idleCompaction: test.override },
-                        },
-                      },
-                projectSettingsOverrides: test.projectDisabled
-                  ? {
-                      [data.thread.projectId]: {
-                        providerInstances: { [selectedInstance]: { enabled: false } },
-                      },
-                    }
-                  : {},
-              }),
-            }),
-          );
-          yield* Effect.gen(function* () {
-            const service = yield* IdleCompactionService.make;
-            yield* service.start();
-            yield* Deferred.await(done);
-          }).pipe(Effect.provide(dependencies), Effect.withTracer(tracer));
-          expect(historyReads).toBe(test.reads);
-          expect(dispatches).toBe(test.reads);
-        }),
-      );
-    },
-  );
-
-  it.effect("keeps the latest run's compaction when an earlier run reports completed again", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
+      return Effect.gen(function* () {
         yield* TestClock.setTime(NOW_MS);
-        const base = records({ cacheExpiresInMs: 10 * MINUTE_MS });
-        const laterRunId = RunId.make("run-2");
-        const laterMessageId = MessageId.make("message-2");
-        const earlierRun = base.runs[0]!;
-        const laterRun = {
-          ...earlierRun,
-          id: laterRunId,
-          ordinal: 2,
-          userMessageId: laterMessageId,
-        };
-        const cancelledRun = {
-          ...earlierRun,
-          id: RunId.make("run-3"),
-          ordinal: 3,
-          userMessageId: MessageId.make("message-3"),
-          status: "cancelled" as const,
-          startedAt: null,
-        };
+        const selectedInstance = ProviderInstanceId.make(
+          "instance" in test ? test.instance : "claudeAgent",
+        );
+        const driver = ProviderDriverKind.make("driver" in test ? test.driver : "claudeAgent");
+        const base = records({ cacheExpiresInMs: 2 * MINUTE_MS });
         const data: OrchestrationV2ThreadProjection = {
           ...base,
-          runs: [earlierRun, laterRun, cancelledRun],
-          messages: [
-            ...base.messages,
-            { ...base.messages[0]!, id: laterMessageId, runId: laterRunId, text: "Keep going" },
-          ],
-          providerThreads: [{ ...base.providerThreads[0]!, lastRunOrdinal: 2 }],
+          thread: {
+            ...base.thread,
+            providerInstanceId: selectedInstance,
+            modelSelection: { ...base.thread.modelSelection, instanceId: selectedInstance },
+          },
+          runs: base.runs.map((run) => ({
+            ...run,
+            providerInstanceId: selectedInstance,
+            modelSelection: { ...run.modelSelection, instanceId: selectedInstance },
+          })),
+          providerThreads: base.providerThreads.map((thread) => ({
+            ...thread,
+            driver,
+            providerInstanceId: selectedInstance,
+          })),
           attempts: [],
           nodes: [],
           subagents: [],
@@ -366,55 +249,168 @@ describe("IdleCompactionService", () => {
           visibleTurnItems: [],
           updatedAt: at(),
         };
-        const completed = (run: typeof earlierRun) => ({
-          id: EventId.make(`completed-${run.id}`),
-          type: "run.updated" as const,
-          threadId,
-          runId: run.id,
-          occurredAt: at(),
-          payload: run,
+        let historyReads = 0;
+        let dispatches = 0;
+        const done = yield* Deferred.make<void>();
+        const tracer = Tracer.make({
+          span(options) {
+            const span = new Tracer.NativeSpan(options);
+            const end = span.end.bind(span);
+            span.end = (...args) => {
+              end(...args);
+              if (span.name === "IdleCompactionService.compactWhenDue")
+                Deferred.doneUnsafe(done, Effect.void);
+            };
+            return span;
+          },
         });
-        const dispatched: Array<string> = [];
-        const streamDone = yield* Deferred.make<void>();
         const dependencies = Layer.mergeAll(
           Layer.mock(Orchestrator.OrchestratorV2)({
-            // A delegated completion on the earlier run lands after the later run completed.
-            streamDomainEvents: Stream.make(completed(laterRun), completed(earlierRun)).pipe(
-              Stream.ensuring(Deferred.succeed(streamDone, undefined)),
-            ),
-            dispatch: (command) =>
+            streamDomainEvents: Stream.make({
+              id: EventId.make("idle-completed"),
+              type: "run.updated",
+              threadId,
+              runId,
+              occurredAt: at(),
+              payload: data.runs[0]!,
+            }),
+            dispatch: () =>
               Effect.sync(() => {
-                dispatched.push(command.commandId);
+                dispatches++;
                 return { sequence: 1, storedEvents: [] };
               }),
           }),
           Layer.mock(ProjectionStore.ProjectionStoreV2)({
             getThread: () => Effect.succeed(data.thread),
-            getThreadRecords: (_threadId, _keys, options) =>
-              Effect.succeed({
-                ...data,
-                messages: data.messages.filter(
-                  (message) =>
-                    options?.messageRunIds === undefined ||
-                    (message.runId !== null && options.messageRunIds.includes(message.runId)),
-                ),
+            getThreadRecords: () =>
+              Effect.sync(() => {
+                historyReads++;
+                return data;
               }),
           }),
           Layer.mock(ServerSettings.ServerSettingsService)({
             getSettings: Effect.succeed({
               ...DEFAULT_SERVER_SETTINGS,
-              idleCompaction: "beforeCacheExpires",
+              idleCompaction: test.mode,
+              providerInstances:
+                "unconfigured" in test
+                  ? {}
+                  : {
+                      [selectedInstance]: {
+                        driver,
+                        enabled: test.enabled,
+                        config: { idleCompaction: test.override },
+                      },
+                    },
+              projectSettingsOverrides: test.projectDisabled
+                ? {
+                    [data.thread.projectId]: {
+                      providerInstances: { [selectedInstance]: { enabled: false } },
+                    },
+                  }
+                : {},
             }),
           }),
         );
         yield* Effect.gen(function* () {
           const service = yield* IdleCompactionService.make;
           yield* service.start();
-          yield* Deferred.await(streamDone);
-          yield* TestClock.adjust(9 * MINUTE_MS);
-        }).pipe(Effect.provide(dependencies));
-        expect(dispatched).toEqual(["server:idle-compact:idle-thread:run-2"]);
-      }),
-    ),
+          yield* Deferred.await(done);
+        }).pipe(Effect.provide(dependencies), Effect.withTracer(tracer));
+        expect(historyReads).toBe(test.reads);
+        expect(dispatches).toBe(test.reads);
+      });
+    },
+  );
+
+  it.effect("keeps the latest run's compaction when an earlier run reports completed again", () =>
+    Effect.gen(function* () {
+      yield* TestClock.setTime(NOW_MS);
+      const base = records({ cacheExpiresInMs: 10 * MINUTE_MS });
+      const laterRunId = RunId.make("run-2");
+      const laterMessageId = MessageId.make("message-2");
+      const earlierRun = base.runs[0]!;
+      const laterRun = {
+        ...earlierRun,
+        id: laterRunId,
+        ordinal: 2,
+        userMessageId: laterMessageId,
+      };
+      const cancelledRun = {
+        ...earlierRun,
+        id: RunId.make("run-3"),
+        ordinal: 3,
+        userMessageId: MessageId.make("message-3"),
+        status: "cancelled" as const,
+        startedAt: null,
+      };
+      const data: OrchestrationV2ThreadProjection = {
+        ...base,
+        runs: [earlierRun, laterRun, cancelledRun],
+        messages: [
+          ...base.messages,
+          { ...base.messages[0]!, id: laterMessageId, runId: laterRunId, text: "Keep going" },
+        ],
+        providerThreads: [{ ...base.providerThreads[0]!, lastRunOrdinal: 2 }],
+        attempts: [],
+        nodes: [],
+        subagents: [],
+        providerSessions: [],
+        plans: [],
+        checkpointScopes: [],
+        checkpoints: [],
+        contextHandoffs: [],
+        visibleTurnItems: [],
+        updatedAt: at(),
+      };
+      const completed = (run: typeof earlierRun) => ({
+        id: EventId.make(`completed-${run.id}`),
+        type: "run.updated" as const,
+        threadId,
+        runId: run.id,
+        occurredAt: at(),
+        payload: run,
+      });
+      const dispatched: Array<string> = [];
+      const streamDone = yield* Deferred.make<void>();
+      const dependencies = Layer.mergeAll(
+        Layer.mock(Orchestrator.OrchestratorV2)({
+          // A delegated completion on the earlier run lands after the later run completed.
+          streamDomainEvents: Stream.make(completed(laterRun), completed(earlierRun)).pipe(
+            Stream.ensuring(Deferred.succeed(streamDone, undefined)),
+          ),
+          dispatch: (command) =>
+            Effect.sync(() => {
+              dispatched.push(command.commandId);
+              return { sequence: 1, storedEvents: [] };
+            }),
+        }),
+        Layer.mock(ProjectionStore.ProjectionStoreV2)({
+          getThread: () => Effect.succeed(data.thread),
+          getThreadRecords: (_threadId, _keys, options) =>
+            Effect.succeed({
+              ...data,
+              messages: data.messages.filter(
+                (message) =>
+                  options?.messageRunIds === undefined ||
+                  (message.runId !== null && options.messageRunIds.includes(message.runId)),
+              ),
+            }),
+        }),
+        Layer.mock(ServerSettings.ServerSettingsService)({
+          getSettings: Effect.succeed({
+            ...DEFAULT_SERVER_SETTINGS,
+            idleCompaction: "beforeCacheExpires",
+          }),
+        }),
+      );
+      yield* Effect.gen(function* () {
+        const service = yield* IdleCompactionService.make;
+        yield* service.start();
+        yield* Deferred.await(streamDone);
+        yield* TestClock.adjust(9 * MINUTE_MS);
+      }).pipe(Effect.provide(dependencies));
+      expect(dispatched).toEqual(["server:idle-compact:idle-thread:run-2"]);
+    }),
   );
 });
diff --git a/apps/server/src/orchestration-v2/LiveStreamBudget.test.ts b/apps/server/src/orchestration-v2/LiveStreamBudget.test.ts
index 44e66412fcd5..5c9a9b6cd1b6 100644
--- a/apps/server/src/orchestration-v2/LiveStreamBudget.test.ts
+++ b/apps/server/src/orchestration-v2/LiveStreamBudget.test.ts
@@ -16,38 +16,36 @@ import {
 
 describe("LiveStreamBudget", () => {
   it.effect("closes the source without releasing a batch still waiting for an ACK", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const budget = yield* makeLiveStreamBudget({ maxItems: 3 });
-        const queue = yield* Queue.unbounded<RetainedLiveItem<{ text: string }>>();
-        const sourceClosed = yield* Deferred.make<void>();
-        const first = yield* budget.retain({ text: "first" });
-        const second = yield* budget.retain({ text: "second" });
-        const third = yield* budget.retain({ text: "third" });
-        yield* Queue.offerAll(queue, [first, second, third]);
-        yield* Effect.scoped(
-          Effect.gen(function* () {
-            const pull = yield* Stream.toPull(
-              budget.deliver(
-                Stream.fromQueue(queue).pipe(
-                  Stream.rechunk(1),
-                  Stream.ensuring(Deferred.succeed(sourceClosed, undefined)),
-                ),
+    Effect.gen(function* () {
+      const budget = yield* makeLiveStreamBudget({ maxItems: 3 });
+      const queue = yield* Queue.unbounded<RetainedLiveItem<{ text: string }>>();
+      const sourceClosed = yield* Deferred.make<void>();
+      const first = yield* budget.retain({ text: "first" });
+      const second = yield* budget.retain({ text: "second" });
+      const third = yield* budget.retain({ text: "third" });
+      yield* Queue.offerAll(queue, [first, second, third]);
+      yield* Effect.scoped(
+        Effect.gen(function* () {
+          const pull = yield* Stream.toPull(
+            budget.deliver(
+              Stream.fromQueue(queue).pipe(
+                Stream.rechunk(1),
+                Stream.ensuring(Deferred.succeed(sourceClosed, undefined)),
               ),
-            );
-            expect(yield* pull).toEqual([{ text: "first" }]);
-            expect(yield* Queue.size(queue)).toBe(0);
-            expect((yield* budget.usage).retainedItems).toBe(3);
-            const overflow = yield* budget.retain({ text: "fourth" }).pipe(Effect.result);
-            expect(overflow._tag).toBe("Failure");
-            yield* Deferred.await(sourceClosed);
-            yield* budget.closed;
-            expect((yield* budget.usage).retainedItems).toBe(1);
-          }),
-        );
-        expect(yield* budget.usage).toEqual({ retainedItems: 0, retainedSerializedBytes: 0 });
-      }),
-    ),
+            ),
+          );
+          expect(yield* pull).toEqual([{ text: "first" }]);
+          expect(yield* Queue.size(queue)).toBe(0);
+          expect((yield* budget.usage).retainedItems).toBe(3);
+          const overflow = yield* budget.retain({ text: "fourth" }).pipe(Effect.result);
+          expect(overflow._tag).toBe("Failure");
+          yield* Deferred.await(sourceClosed);
+          yield* budget.closed;
+          expect((yield* budget.usage).retainedItems).toBe(1);
+        }),
+      );
+      expect(yield* budget.usage).toEqual({ retainedItems: 0, retainedSerializedBytes: 0 });
+    }),
   );
 });
 
@@ -57,32 +55,30 @@ describe("bufferLatestLiveStream", () => {
   it.effect.each(["items", "bytes"] as const)(
     "counts an unacknowledged state against the %s limit when its replacement arrives",
     (limit) =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const releaseUpdate = yield* Deferred.make<void>();
-          const closed = yield* Deferred.make<void>();
-          const first = { sequence: 1, text: "é".repeat(20) };
-          const next = { ...first, sequence: 2 };
-          const pull = yield* Stream.toPull(
-            bufferLatestLiveStream(
-              Stream.concat(
-                Stream.succeed(first),
-                Stream.fromEffect(Deferred.await(releaseUpdate)).pipe(Stream.map(() => next)),
-              ).pipe(Stream.ensuring(Deferred.succeed(closed, undefined))),
-              () => "same-thread",
-              limit === "items"
-                ? { maxItems: 1 }
-                : { maxSerializedBytes: Buffer.byteLength(JSON.stringify(first)) },
-            ),
-          );
-          expect(yield* pull).toEqual([first]);
-          yield* Deferred.succeed(releaseUpdate, undefined);
-          yield* Deferred.await(closed);
-          const result = yield* pull.pipe(Effect.result);
-          expect(result._tag).toBe("Failure");
-          if (result._tag === "Failure") expect(result.failure._tag).toBe("LiveStreamBufferError");
-        }),
-      ),
+      Effect.gen(function* () {
+        const releaseUpdate = yield* Deferred.make<void>();
+        const closed = yield* Deferred.make<void>();
+        const first = { sequence: 1, text: "é".repeat(20) };
+        const next = { ...first, sequence: 2 };
+        const pull = yield* Stream.toPull(
+          bufferLatestLiveStream(
+            Stream.concat(
+              Stream.succeed(first),
+              Stream.fromEffect(Deferred.await(releaseUpdate)).pipe(Stream.map(() => next)),
+            ).pipe(Stream.ensuring(Deferred.succeed(closed, undefined))),
+            () => "same-thread",
+            limit === "items"
+              ? { maxItems: 1 }
+              : { maxSerializedBytes: Buffer.byteLength(JSON.stringify(first)) },
+          ),
+        );
+        expect(yield* pull).toEqual([first]);
+        yield* Deferred.succeed(releaseUpdate, undefined);
+        yield* Deferred.await(closed);
+        const result = yield* pull.pipe(Effect.result);
+        expect(result._tag).toBe("Failure");
+        if (result._tag === "Failure") expect(result.failure._tag).toBe("LiveStreamBufferError");
+      }),
   );
 });
 
@@ -90,167 +86,159 @@ describe("replayAndBufferProjectedLiveEvents", () => {
   it.effect.each(["items", "bytes"] as const)(
     "replays the undelivered tail after a %s overflow without losing or duplicating events",
     (limit) =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const pubsub = yield* PubSub.unbounded<Event>();
-          const subscribed = yield* Deferred.make<PubSub.Subscription<Event>>();
-          const events = [
-            { sequence: 1, text: "one" },
-            { sequence: 2, text: "two" },
-            { sequence: 3, text: "three" },
-          ];
-          const limits = limit === "items" ? { maxItems: 1 } : { maxSerializedBytes: 40 };
-          const pull = yield* Stream.toPull(
-            replayAndBufferProjectedLiveEvents(
-              {
-                project: (event: Event) => event,
-                subscribe: PubSub.subscribe(pubsub).pipe(
-                  Effect.tap((subscription) => Deferred.succeed(subscribed, subscription)),
-                ),
-                latestSequence: Effect.succeed(1),
-                replay: () => Stream.succeed(events[0]!),
-              },
-              limits,
-            ),
-          );
-          const received = [...(yield* pull)];
-          // Hold the ACK while more durable events arrive.
-          yield* PubSub.publishAll(pubsub, events.slice(1));
-          yield* (yield* Deferred.await(subscribed)).shutdownHook.await;
-          const overflow = yield* pull.pipe(Effect.result);
-          expect(overflow._tag).toBe("Failure");
-          if (overflow._tag === "Failure")
-            expect(overflow.failure._tag).toBe("LiveStreamBufferError");
-
-          const afterSequence = received.at(-1)!.sequence;
-          const resumed = yield* replayAndBufferProjectedLiveEvents(
+      Effect.gen(function* () {
+        const pubsub = yield* PubSub.unbounded<Event>();
+        const subscribed = yield* Deferred.make<PubSub.Subscription<Event>>();
+        const events = [
+          { sequence: 1, text: "one" },
+          { sequence: 2, text: "two" },
+          { sequence: 3, text: "three" },
+        ];
+        const limits = limit === "items" ? { maxItems: 1 } : { maxSerializedBytes: 40 };
+        const pull = yield* Stream.toPull(
+          replayAndBufferProjectedLiveEvents(
             {
               project: (event: Event) => event,
-              subscribe: PubSub.subscribe(pubsub),
-              afterSequence,
-              latestSequence: Effect.succeed(3),
-              replay: (throughSequence) =>
-                Stream.fromIterable(
-                  events.filter(
-                    (event) => event.sequence > afterSequence && event.sequence <= throughSequence,
-                  ),
-                ),
+              subscribe: PubSub.subscribe(pubsub).pipe(
+                Effect.tap((subscription) => Deferred.succeed(subscribed, subscription)),
+              ),
+              latestSequence: Effect.succeed(1),
+              replay: () => Stream.succeed(events[0]!),
             },
             limits,
-          ).pipe(Stream.take(2), Stream.runCollect);
-          expect([...received, ...resumed]).toEqual(events);
-          expect(yield* PubSub.size(pubsub)).toBe(0);
-        }),
-      ),
+          ),
+        );
+        const received = [...(yield* pull)];
+        // Hold the ACK while more durable events arrive.
+        yield* PubSub.publishAll(pubsub, events.slice(1));
+        yield* (yield* Deferred.await(subscribed)).shutdownHook.await;
+        const overflow = yield* pull.pipe(Effect.result);
+        expect(overflow._tag).toBe("Failure");
+        if (overflow._tag === "Failure")
+          expect(overflow.failure._tag).toBe("LiveStreamBufferError");
+
+        const afterSequence = received.at(-1)!.sequence;
+        const resumed = yield* replayAndBufferProjectedLiveEvents(
+          {
+            project: (event: Event) => event,
+            subscribe: PubSub.subscribe(pubsub),
+            afterSequence,
+            latestSequence: Effect.succeed(3),
+            replay: (throughSequence) =>
+              Stream.fromIterable(
+                events.filter(
+                  (event) => event.sequence > afterSequence && event.sequence <= throughSequence,
+                ),
+              ),
+          },
+          limits,
+        ).pipe(Stream.take(2), Stream.runCollect);
+        expect([...received, ...resumed]).toEqual(events);
+        expect(yield* PubSub.size(pubsub)).toBe(0);
+      }),
   );
 
   it.effect.each(["high-water", "replay"] as const)(
     "unsubscribes and cancels a blocked %s read on live overflow",
     (phase) =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const pubsub = yield* PubSub.unbounded<Event>();
-          const subscribed = yield* Deferred.make<PubSub.Subscription<Event>>();
-          const readStarted = yield* Deferred.make<void>();
-          const readClosed = yield* Deferred.make<void>();
-          const blockedRead = Deferred.succeed(readStarted, undefined).pipe(
-            Effect.andThen(Effect.never),
-            Effect.ensuring(Deferred.succeed(readClosed, undefined)),
-          );
-          const pull = yield* Stream.toPull(
-            replayAndBufferProjectedLiveEvents(
-              {
-                project: (event: Event) => event,
-                subscribe: PubSub.subscribe(pubsub).pipe(
-                  Effect.tap((subscription) => Deferred.succeed(subscribed, subscription)),
-                ),
-                latestSequence:
-                  phase === "high-water" ? blockedRead.pipe(Effect.as(0)) : Effect.succeed(0),
-                replay: () => (phase === "replay" ? Stream.fromEffect(blockedRead) : Stream.empty),
-              },
-              { maxItems: 2 },
-            ),
-          );
-          const reader = yield* pull.pipe(Effect.result, Effect.forkScoped);
-          yield* Deferred.await(readStarted);
-          yield* PubSub.publishAll(pubsub, [
-            { sequence: 1, text: "one" },
-            { sequence: 2, text: "two" },
-            { sequence: 3, text: "overflow" },
-          ]);
-          yield* (yield* Deferred.await(subscribed)).shutdownHook.await;
-          yield* Deferred.await(readClosed);
-          const result = yield* Fiber.join(reader);
-          expect(result._tag).toBe("Failure");
-          if (result._tag === "Failure") expect(result.failure._tag).toBe("LiveStreamBufferError");
-          expect(yield* PubSub.size(pubsub)).toBe(0);
-          yield* PubSub.publish(pubsub, { sequence: 4, text: "after overflow" });
-          expect(yield* PubSub.size(pubsub)).toBe(0);
-        }),
-      ),
+      Effect.gen(function* () {
+        const pubsub = yield* PubSub.unbounded<Event>();
+        const subscribed = yield* Deferred.make<PubSub.Subscription<Event>>();
+        const readStarted = yield* Deferred.make<void>();
+        const readClosed = yield* Deferred.make<void>();
+        const blockedRead = Deferred.succeed(readStarted, undefined).pipe(
+          Effect.andThen(Effect.never),
+          Effect.ensuring(Deferred.succeed(readClosed, undefined)),
+        );
+        const pull = yield* Stream.toPull(
+          replayAndBufferProjectedLiveEvents(
+            {
+              project: (event: Event) => event,
+              subscribe: PubSub.subscribe(pubsub).pipe(
+                Effect.tap((subscription) => Deferred.succeed(subscribed, subscription)),
+              ),
+              latestSequence:
+                phase === "high-water" ? blockedRead.pipe(Effect.as(0)) : Effect.succeed(0),
+              replay: () => (phase === "replay" ? Stream.fromEffect(blockedRead) : Stream.empty),
+            },
+            { maxItems: 2 },
+          ),
+        );
+        const reader = yield* pull.pipe(Effect.result, Effect.forkScoped);
+        yield* Deferred.await(readStarted);
+        yield* PubSub.publishAll(pubsub, [
+          { sequence: 1, text: "one" },
+          { sequence: 2, text: "two" },
+          { sequence: 3, text: "overflow" },
+        ]);
+        yield* (yield* Deferred.await(subscribed)).shutdownHook.await;
+        yield* Deferred.await(readClosed);
+        const result = yield* Fiber.join(reader);
+        expect(result._tag).toBe("Failure");
+        if (result._tag === "Failure") expect(result.failure._tag).toBe("LiveStreamBufferError");
+        expect(yield* PubSub.size(pubsub)).toBe(0);
+        yield* PubSub.publish(pubsub, { sequence: 4, text: "after overflow" });
+        expect(yield* PubSub.size(pubsub)).toBe(0);
+      }),
   );
 
   it.effect("lets a fast reader replay a database page larger than both buffer limits", () =>
-    Effect.scoped(
+    Effect.gen(function* () {
+      const pubsub = yield* PubSub.unbounded<Event>();
+      const events = Array.from({ length: 20 }, (_, index) => ({
+        sequence: index + 1,
+        text: "historical event",
+      }));
+      const replayed = yield* replayAndBufferProjectedLiveEvents(
+        {
+          project: (event: Event) => event,
+          subscribe: PubSub.subscribe(pubsub),
+          latestSequence: Effect.succeed(20),
+          replay: () => Stream.fromIterable(events),
+        },
+        { maxItems: 2, maxSerializedBytes: 100 },
+      ).pipe(Stream.take(20), Stream.runCollect);
+      expect(replayed).toEqual(events);
+      expect(yield* PubSub.size(pubsub)).toBe(0);
+    }),
+  );
+
+  it.effect(
+    "filters unrelated events before buffering and deduplicates the replay/live overlap",
+    () =>
       Effect.gen(function* () {
         const pubsub = yield* PubSub.unbounded<Event>();
-        const events = Array.from({ length: 20 }, (_, index) => ({
-          sequence: index + 1,
-          text: "historical event",
-        }));
-        const replayed = yield* replayAndBufferProjectedLiveEvents(
+        const highWaterStarted = yield* Deferred.make<void>();
+        const highWater = yield* Deferred.make<number>();
+        const first = { sequence: 1, text: "first", threadId: "selected" };
+        const unrelatedReplay = { sequence: 0, text: "unrelated replay", threadId: "other" };
+        const overlap = { sequence: 2, text: "overlap", threadId: "selected" };
+        const last = { sequence: 10, text: "last", threadId: "selected" };
+        const reader = yield* replayAndBufferProjectedLiveEvents(
           {
             project: (event: Event) => event,
             subscribe: PubSub.subscribe(pubsub),
-            latestSequence: Effect.succeed(20),
-            replay: () => Stream.fromIterable(events),
+            latestSequence: Deferred.succeed(highWaterStarted, undefined).pipe(
+              Effect.andThen(Deferred.await(highWater)),
+            ),
+            replay: () => Stream.make(unrelatedReplay, first, overlap),
+            filter: (event) => event.threadId === "selected",
           },
-          { maxItems: 2, maxSerializedBytes: 100 },
-        ).pipe(Stream.take(20), Stream.runCollect);
-        expect(replayed).toEqual(events);
+          { maxItems: 4 },
+        ).pipe(Stream.take(3), Stream.runCollect, Effect.forkScoped);
+        yield* Deferred.await(highWaterStarted);
+        yield* PubSub.publishAll(pubsub, [
+          overlap,
+          ...Array.from({ length: 6 }, (_, index) => ({
+            sequence: index + 3,
+            text: "unrelated",
+            threadId: "other",
+          })),
+          last,
+        ]);
+        yield* Deferred.succeed(highWater, 2);
+        expect(yield* Fiber.join(reader)).toEqual([first, overlap, last]);
         expect(yield* PubSub.size(pubsub)).toBe(0);
       }),
-    ),
-  );
-
-  it.effect(
-    "filters unrelated events before buffering and deduplicates the replay/live overlap",
-    () =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const pubsub = yield* PubSub.unbounded<Event>();
-          const highWaterStarted = yield* Deferred.make<void>();
-          const highWater = yield* Deferred.make<number>();
-          const first = { sequence: 1, text: "first", threadId: "selected" };
-          const unrelatedReplay = { sequence: 0, text: "unrelated replay", threadId: "other" };
-          const overlap = { sequence: 2, text: "overlap", threadId: "selected" };
-          const last = { sequence: 10, text: "last", threadId: "selected" };
-          const reader = yield* replayAndBufferProjectedLiveEvents(
-            {
-              project: (event: Event) => event,
-              subscribe: PubSub.subscribe(pubsub),
-              latestSequence: Deferred.succeed(highWaterStarted, undefined).pipe(
-                Effect.andThen(Deferred.await(highWater)),
-              ),
-              replay: () => Stream.make(unrelatedReplay, first, overlap),
-              filter: (event) => event.threadId === "selected",
-            },
-            { maxItems: 4 },
-          ).pipe(Stream.take(3), Stream.runCollect, Effect.forkScoped);
-          yield* Deferred.await(highWaterStarted);
-          yield* PubSub.publishAll(pubsub, [
-            overlap,
-            ...Array.from({ length: 6 }, (_, index) => ({
-              sequence: index + 3,
-              text: "unrelated",
-              threadId: "other",
-            })),
-            last,
-          ]);
-          yield* Deferred.succeed(highWater, 2);
-          expect(yield* Fiber.join(reader)).toEqual([first, overlap, last]);
-          expect(yield* PubSub.size(pubsub)).toBe(0);
-        }),
-      ),
   );
 });
diff --git a/apps/server/src/orchestration-v2/OpenCode2OrchestratorV2.integration.test.ts b/apps/server/src/orchestration-v2/OpenCode2OrchestratorV2.integration.test.ts
index eea36ac3b769..8681ce4333cb 100644
--- a/apps/server/src/orchestration-v2/OpenCode2OrchestratorV2.integration.test.ts
+++ b/apps/server/src/orchestration-v2/OpenCode2OrchestratorV2.integration.test.ts
@@ -346,7 +346,7 @@ describe("OpenCode 2 through the orchestrator", () => {
         );
 
         assert.lengthOf(projection.providerThreads, 1);
-      }).pipe(Effect.scoped),
+      }),
   );
 
   it.effect("rewrites the session's rules when the thread's mode changes between turns", () =>
@@ -397,7 +397,7 @@ describe("OpenCode 2 through the orchestrator", () => {
         ["completed", "completed", "completed"],
       );
       assert.lengthOf(projection.providerThreads, 1);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("denies edits outside the plan directory in plan mode and lifts it after", () =>
@@ -439,7 +439,7 @@ describe("OpenCode 2 through the orchestrator", () => {
         projection.runs.map((run) => run.status),
         ["completed", "completed"],
       );
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("forks from an earlier turn before the next turn's user message", () =>
diff --git a/apps/server/src/orchestration-v2/Orchestrator.control-reads.test.ts b/apps/server/src/orchestration-v2/Orchestrator.control-reads.test.ts
index f7773665aa9b..f36ce5bdc564 100644
--- a/apps/server/src/orchestration-v2/Orchestrator.control-reads.test.ts
+++ b/apps/server/src/orchestration-v2/Orchestrator.control-reads.test.ts
@@ -28,6 +28,7 @@ import * as Result from "effect/Result";
 import * as Stream from "effect/Stream";
 import * as TestClock from "effect/testing/TestClock";
 import * as SqlClient from "effect/sql/SqlClient";
+import * as Statement from "effect/sql/Statement";
 import {
   orchestrationCommandDuration,
   orchestrationCommandsTotal,
@@ -2199,3 +2200,413 @@ it.effect("a user message dispatched first stays run 1 when its lineage read is
     );
   }).pipe(Effect.provide(layerGatedLineageRead));
 });
+
+it.effect("queued-message commands read a long thread's history without walking all of it", () =>
+  Effect.gen(function* () {
+    const orchestrator = yield* Orchestrator.OrchestratorV2;
+    const projections = yield* ProjectionStore.ProjectionStoreV2;
+    const sql = yield* SqlClient.SqlClient;
+    const threadId = ThreadId.make("thread:long-history-reads");
+    const driver = ProviderDriverKind.make("codex");
+    const now = yield* DateTime.now;
+    yield* orchestrator.dispatch({
+      type: "thread.create",
+      commandId: CommandId.make("create-long-history-reads"),
+      threadId,
+      projectId: ProjectId.make("project:long-history-reads"),
+      title: "Long history",
+      modelSelection,
+      runtimeMode: "full-access",
+      interactionMode: "default",
+      branch: null,
+      worktreePath: null,
+      createdBy: "user",
+      creationSource: "web",
+    });
+    const providerThreadId = ProviderThreadId.make("provider-thread:long-history-reads");
+    yield* projections.apply({
+      id: EventId.make("event:long-history-reads:provider-thread"),
+      type: "provider-thread.updated",
+      threadId,
+      driver,
+      providerInstanceId: instanceId,
+      occurredAt: now,
+      payload: {
+        id: providerThreadId,
+        appThreadId: threadId,
+        ownerNodeId: null,
+        driver,
+        providerInstanceId: instanceId,
+        providerSessionId: null,
+        nativeThreadRef: null,
+        nativeConversationHeadRef: null,
+        status: "idle",
+        firstRunOrdinal: 1,
+        lastRunOrdinal: 4,
+        handoffIds: [],
+        forkedFrom: null,
+        createdAt: now,
+        updatedAt: now,
+        pendingBackgroundTasks: [],
+      },
+    });
+    const dispatch = (name: string) =>
+      orchestrator.dispatch({
+        type: "message.dispatch",
+        commandId: CommandId.make(`dispatch:long-history-reads:${name}`),
+        threadId,
+        messageId: MessageId.make(`message:long-history-reads:${name}`),
+        // A compacting target lets promote skip it without a live provider session.
+        text: name === "active" ? "/compact" : `Request ${name}`,
+        attachments: [],
+        dispatchMode: { type: "defer_start" },
+        createdBy: "user",
+        creationSource: "web",
+      });
+    const nextOrdinal = Effect.gen(function* () {
+      const [row] = yield* sql<{ readonly ordinal: number }>`
+        SELECT COALESCE(MAX(ordinal), 0) + 1 AS ordinal
+        FROM orchestration_v2_projection_turn_items WHERE thread_id = ${threadId}`;
+      return row!.ordinal;
+    });
+    // Settled history: each run leaves completed leaf nodes, tool output and a reply.
+    for (const name of ["1", "2", "3", "active"]) {
+      yield* dispatch(name);
+      const run = (yield* projections.getThreadProjection(threadId)).runs.at(-1)!;
+      const active = name === "active";
+      yield* projections.apply({
+        id: EventId.make(`event:long-history-reads:${name}:run`),
+        type: "run.updated",
+        threadId,
+        runId: run.id,
+        occurredAt: now,
+        payload: {
+          ...run,
+          providerThreadId,
+          status: active ? "running" : "completed",
+          queuePosition: null,
+          startedAt: now,
+          completedAt: active ? null : now,
+        },
+      });
+      if (active) continue;
+      for (const kind of ["tool_call", "assistant_message"] as const) {
+        const nodeId = NodeId.make(`node:long-history-reads:${name}:${kind}`);
+        yield* projections.apply({
+          id: EventId.make(`event:${nodeId}`),
+          type: "node.updated",
+          threadId,
+          runId: run.id,
+          nodeId,
+          driver,
+          occurredAt: now,
+          payload: {
+            id: nodeId,
+            threadId,
+            runId: run.id,
+            rootNodeId: run.rootNodeId!,
+            parentNodeId: run.rootNodeId,
+            kind,
+            status: "completed",
+            countsForRun: false,
+            providerThreadId,
+            providerTurnId: null,
+            nativeItemRef: null,
+            runtimeRequestId: null,
+            checkpointScopeId: null,
+            startedAt: now,
+            completedAt: now,
+          },
+        });
+      }
+      const replyId = MessageId.make(`message:long-history-reads:${name}:reply`);
+      yield* projections.apply({
+        id: EventId.make(`event:${replyId}`),
+        type: "message.updated",
+        threadId,
+        occurredAt: now,
+        payload: {
+          id: replyId,
+          threadId,
+          runId: run.id,
+          nodeId: NodeId.make(`node:long-history-reads:${name}:assistant_message`),
+          createdBy: "agent",
+          creationSource: "server",
+          role: "assistant",
+          text: `Reply ${name}`,
+          attachments: [],
+          streaming: false,
+          createdAt: now,
+          updatedAt: now,
+        },
+      });
+      const itemBase = {
+        threadId,
+        runId: run.id,
+        providerThreadId,
+        providerTurnId: null,
+        nativeItemRef: null,
+        parentItemId: null,
+        status: "completed" as const,
+        startedAt: now,
+        completedAt: now,
+        updatedAt: now,
+      };
+      for (const item of [
+        {
+          ...itemBase,
+          id: TurnItemId.make(`item:long-history-reads:${name}:command`),
+          nodeId: NodeId.make(`node:long-history-reads:${name}:tool_call`),
+          ordinal: yield* nextOrdinal,
+          title: "command",
+          type: "command_execution" as const,
+          input: "cat build.log",
+        },
+        {
+          ...itemBase,
+          id: TurnItemId.make(`item:long-history-reads:${name}:reply`),
+          nodeId: NodeId.make(`node:long-history-reads:${name}:assistant_message`),
+          ordinal: yield* nextOrdinal,
+          title: null,
+          type: "assistant_message" as const,
+          messageId: replyId,
+          text: `Reply ${name}`,
+          streaming: false,
+        },
+      ]) {
+        yield* projections.apply({
+          id: EventId.make(`event:${item.id}`),
+          type: "turn-item.updated",
+          threadId,
+          runId: run.id,
+          nodeId: item.nodeId,
+          driver,
+          occurredAt: now,
+          payload: item,
+        });
+      }
+    }
+    const activeRun = (yield* projections.getThreadProjection(threadId)).runs.at(-1)!;
+    // Stop needs a live provider turn to interrupt.
+    yield* projections.apply({
+      id: EventId.make("event:long-history-reads:active-turn"),
+      type: "provider-turn.updated",
+      threadId,
+      runId: activeRun.id,
+      occurredAt: now,
+      payload: {
+        id: ProviderTurnId.make("provider-turn:long-history-reads"),
+        providerThreadId,
+        nodeId: activeRun.rootNodeId!,
+        runAttemptId: activeRun.activeAttemptId!,
+        nativeTurnRef: { driver, nativeId: "native:long-history-reads", strength: "strong" },
+        ordinal: 4,
+        status: "running",
+        startedAt: now,
+        completedAt: null,
+      },
+    });
+
+    const statements: Array<ReturnType<Statement.Statement<unknown>["compile"]>> = [];
+    const observe: Statement.Transformer = (statement) => {
+      const compiled = statement.compile();
+      // Row reads and the message-ordering pass; a MAX(ordinal) probe reads one index entry.
+      if (/_(nodes|turn_items)\b/.test(compiled[0]) && /payload_json|GROUP BY/.test(compiled[0])) {
+        statements.push(compiled);
+      }
+      return Effect.succeed(statement);
+    };
+    const historyWalks = Effect.fnUntraced(function* (commandType: string) {
+      const walks: Array<string> = [];
+      for (const [query, params] of statements.splice(0)) {
+        const plan = yield* sql.unsafe<{ detail: string }>(`EXPLAIN QUERY PLAN ${query}`, params);
+        for (const { detail } of plan) {
+          // A history-sized read: an ordering pass over every message item for a narrowed
+          // message read, or a node/turn-item row search bounded by nothing but the thread.
+          // Walking only a covering index's ids reads no payloads. Stop still loads every
+          // message, so its ordering pass is no larger than that read.
+          if (
+            (detail.includes("TEMP B-TREE FOR GROUP BY") && query.includes("json_each")) ||
+            (/^SEARCH .*(node|turn_item).* \(thread_id=\?\)$/.test(detail) &&
+              !detail.includes("USING COVERING INDEX")) ||
+            // Every active run in the environment, not only this thread's.
+            /^SEARCH .*runs.* \(status=\?\)$/.test(detail) ||
+            // A status-filtered read that fetches every typed row to check its status.
+            (/^SEARCH .*turn_items USING INDEX .* \(thread_id=\? AND type=\?\)$/.test(detail) &&
+              query.includes("status IN"))
+          ) {
+            walks.push(`${commandType}: ${detail}\n  in: ${query.replace(/\s+/g, " ").trim()}`);
+          }
+        }
+      }
+      return walks;
+    });
+    const observed = <A, E, R>(effect: Effect.Effect<A, E, R>) =>
+      effect.pipe(Effect.provideService(Statement.CurrentTransformer, observe));
+
+    yield* observed(dispatch("queued"));
+    const walks = yield* historyWalks("message.dispatch");
+    const queuedRun = (yield* projections.getThreadProjection(threadId)).runs.at(-1)!;
+    assert.equal(queuedRun.status, "queued");
+    yield* observed(
+      orchestrator.dispatch({
+        type: "queued-run.edit",
+        commandId: CommandId.make("edit:long-history-reads"),
+        threadId,
+        runId: queuedRun.id,
+        text: "Request queued, edited",
+      }),
+    );
+    walks.push(...(yield* historyWalks("queued-run.edit")));
+    yield* observed(
+      orchestrator.dispatch({
+        type: "queued-message.promote-to-steer",
+        commandId: CommandId.make("promote:long-history-reads"),
+        threadId,
+        queuedRunId: queuedRun.id,
+        targetRunId: activeRun.id,
+      }),
+    );
+    walks.push(...(yield* historyWalks("queued-message.promote-to-steer")));
+    yield* dispatch("cancelled");
+    const cancelledRun = (yield* projections.getThreadProjection(threadId)).runs.at(-1)!;
+    assert.equal(cancelledRun.status, "queued");
+    statements.splice(0);
+    yield* observed(
+      orchestrator.dispatch({
+        type: "queued-run.cancel",
+        commandId: CommandId.make("cancel:long-history-reads"),
+        threadId,
+        runId: cancelledRun.id,
+      }),
+    );
+    walks.push(...(yield* historyWalks("queued-run.cancel")));
+    yield* observed(
+      orchestrator.dispatch({
+        type: "run.interrupt",
+        commandId: CommandId.make("interrupt:long-history-reads"),
+        threadId,
+        runId: activeRun.id,
+      }),
+    );
+    walks.push(...(yield* historyWalks("run.interrupt")));
+
+    const after = yield* projections.getThreadProjection(threadId);
+    assert.deepEqual(
+      after.messages.filter((message) => message.role === "user").map((message) => message.text),
+      [
+        "Request 1",
+        "Request 2",
+        "Request 3",
+        "/compact",
+        "Request cancelled",
+        "Request queued, edited",
+      ],
+    );
+    assert.deepEqual(
+      after.providerThreads.map((providerThread) => providerThread.id),
+      [providerThreadId],
+    );
+    assert.deepEqual(walks, [], walks.join("\n"));
+  }).pipe(Effect.provide(layerTest)),
+);
+
+it.effect("a running provider-turn update reads only the thread's queued and running runs", () =>
+  Effect.gen(function* () {
+    const runsReads = yield* Deferred.make<ReturnType<Statement.Statement<unknown>["compile"]>>();
+    let armed = false;
+    // The deferred-steer reactor runs in a fiber forked by the layer, so observe at layer level.
+    const observe: Statement.Transformer = (statement) => {
+      const compiled = statement.compile();
+      return armed && /FROM orchestration_v2_projection_runs\b/.test(compiled[0])
+        ? Deferred.succeed(runsReads, compiled).pipe(Effect.as(statement))
+        : Effect.succeed(statement);
+    };
+    yield* Effect.gen(function* () {
+      const orchestrator = yield* Orchestrator.OrchestratorV2;
+      const projections = yield* ProjectionStore.ProjectionStoreV2;
+      const eventSink = yield* EventSink.EventSinkV2;
+      const sql = yield* SqlClient.SqlClient;
+      const threadId = ThreadId.make("thread:deferred-steer-reads");
+      const driver = ProviderDriverKind.make("codex");
+      const now = yield* DateTime.now;
+      yield* orchestrator.dispatch({
+        type: "thread.create",
+        commandId: CommandId.make("create-deferred-steer-reads"),
+        threadId,
+        projectId: ProjectId.make("project:deferred-steer-reads"),
+        title: "Deferred steer reads",
+        modelSelection,
+        runtimeMode: "full-access",
+        interactionMode: "default",
+        branch: null,
+        worktreePath: null,
+        createdBy: "user",
+        creationSource: "web",
+      });
+      yield* orchestrator.dispatch({
+        type: "message.dispatch",
+        commandId: CommandId.make("dispatch:deferred-steer-reads"),
+        threadId,
+        messageId: MessageId.make("message:deferred-steer-reads"),
+        text: "Request",
+        attachments: [],
+        dispatchMode: { type: "defer_start" },
+        createdBy: "user",
+        creationSource: "web",
+      });
+      const run = (yield* projections.getThreadProjection(threadId)).runs.at(-1)!;
+      const providerThreadId = ProviderThreadId.make("provider-thread:deferred-steer-reads");
+      yield* eventSink.write({
+        events: [
+          {
+            id: EventId.make("event:deferred-steer-reads:run"),
+            type: "run.updated",
+            threadId,
+            runId: run.id,
+            occurredAt: now,
+            payload: { ...run, providerThreadId, status: "running", queuePosition: null },
+          },
+        ],
+      });
+      armed = true;
+      yield* eventSink.write({
+        events: [
+          {
+            id: EventId.make("event:deferred-steer-reads:turn"),
+            type: "provider-turn.updated",
+            threadId,
+            runId: run.id,
+            occurredAt: now,
+            payload: {
+              id: ProviderTurnId.make("provider-turn:deferred-steer-reads"),
+              providerThreadId,
+              nodeId: run.rootNodeId!,
+              runAttemptId: run.activeAttemptId!,
+              nativeTurnRef: {
+                driver,
+                nativeId: "native:deferred-steer-reads",
+                strength: "strong",
+              },
+              ordinal: 1,
+              status: "running",
+              startedAt: now,
+              completedAt: null,
+            },
+          },
+        ],
+      });
+      const [query, params] = yield* Deferred.await(runsReads);
+      const plan = yield* sql.unsafe<{ detail: string }>(`EXPLAIN QUERY PLAN ${query}`, params);
+      // Every run the thread ever had, when only queued steers and the running run matter.
+      assert.isFalse(
+        plan.some(({ detail }) => /^SEARCH .*runs.* \(thread_id=\?\)$/.test(detail)),
+        `${plan.map(({ detail }) => detail).join("\n")}\n  in: ${query.replace(/\s+/g, " ").trim()}`,
+      );
+    }).pipe(
+      Effect.provide(
+        layerTest.pipe(Layer.provide(Layer.succeed(Statement.CurrentTransformer, observe))),
+      ),
+    );
+  }),
+);
diff --git a/apps/server/src/orchestration-v2/Orchestrator.ts b/apps/server/src/orchestration-v2/Orchestrator.ts
index c186c40f9e73..e78b473e5c4f 100644
--- a/apps/server/src/orchestration-v2/Orchestrator.ts
+++ b/apps/server/src/orchestration-v2/Orchestrator.ts
@@ -430,6 +430,13 @@ export interface OrchestratorV2Shape {
     options: ProjectionTimelinePageOptions,
   ) => Effect.Effect<ProjectionTimelinePage, OrchestratorProjectionError>;
   readonly getMessageCount: (threadId: ThreadId) => Effect.Effect<number, OrchestratorV2Error>;
+  readonly getMessagesById: (
+    threadId: ThreadId,
+    messageIds: ReadonlyArray<MessageId>,
+  ) => Effect.Effect<
+    ReadonlyMap<MessageId, OrchestrationV2ConversationMessage>,
+    OrchestratorV2Error
+  >;
   readonly getTranscriptByteFloor: (
     threadId: ThreadId,
     limit: number,
@@ -631,6 +638,7 @@ function commandThreadId(command: OrchestrationV2ServerCommand): ThreadId {
     case "thread.pull-request-link.sync":
     case "thread.pull-request.watch":
     case "thread.pull-request-watch.sync":
+    case "thread.pull-request-watch.checks-reopen":
     case "thread.pull-request.sync":
     case "thread.title.regeneration.complete":
     case "thread.project.adopt-folder":
@@ -782,6 +790,26 @@ function withPullRequestWatch(
   return ended === undefined ? rest : { ...rest, endedWatch: ended };
 }
 
+function syncedPullRequestWatch(
+  existing: ThreadPullRequestWatch | undefined,
+  command: {
+    readonly watch: ThreadPullRequestWatch | null;
+    readonly checksPendingBefore?: boolean | undefined;
+  },
+): ThreadPullRequestWatch | undefined {
+  if (command.watch === null) return undefined;
+  // A push cleared the answer while this read was in flight, so its answer is the old head's.
+  if (command.checksPendingBefore === undefined || existing?.checksPending !== undefined) {
+    return command.watch;
+  }
+  return withoutChecksAnswer(command.watch);
+}
+
+const withoutChecksAnswer = ({
+  checksPending: _answer,
+  ...watch
+}: ThreadPullRequestWatch): ThreadPullRequestWatch => watch;
+
 function legacyPullRequestLink(
   thread: OrchestrationV2AppThread,
   linked: ThreadLinkedPullRequest,
@@ -1246,22 +1274,35 @@ function appendContextHandoffId(
   return handoffId === null ? handoffIds : Array.from(new Set([...handoffIds, handoffId]));
 }
 
+/** A fresh-session schedule run starts a side conversation; the thread's own one continues past it. */
+function isScheduledFreshRun(
+  run: Pick<OrchestrationV2Run, "freshContext" | "userMessageId">,
+  turnItems: OrchestrationV2ThreadProjection["turnItems"],
+): boolean {
+  // Turn items, unlike messages, are not narrowed to the runs since the latest compaction.
+  return (
+    run.freshContext === true &&
+    turnItems.some(
+      (item) =>
+        item.type === "user_message" &&
+        item.messageId === run.userMessageId &&
+        item.scheduledTaskId !== undefined,
+    )
+  );
+}
+
 /** Ordinal of the latest started fresh-context run. Runs before it never reach a provider again. */
 function contextBoundaryOrdinal(
-  runs: ReadonlyArray<
-    Pick<
-      OrchestrationV2Run,
-      "ordinal" | "freshContext" | "status" | "startedAt" | "restartContinuationOfRunId"
-    >
-  >,
+  projection: Pick<OrchestrationV2ThreadProjection, "runs" | "turnItems">,
 ): number {
   let boundary = 0;
-  for (const run of runs) {
+  for (const run of projection.runs) {
     if (
       run.freshContext === true &&
       run.status !== "queued" &&
       !cancelledBeforeStart(run) &&
-      run.ordinal > boundary
+      run.ordinal > boundary &&
+      !isScheduledFreshRun(run, projection.turnItems)
     ) {
       boundary = run.ordinal;
     }
@@ -1269,6 +1310,57 @@ function contextBoundaryOrdinal(
   return boundary;
 }
 
+/** The provider thread a message continues: the active one, unless a fresh-session schedule run started it. */
+function conversationProviderThread(
+  projection: Pick<
+    OrchestrationV2ThreadProjection,
+    "thread" | "providerThreads" | "runs" | "turnItems"
+  >,
+): OrchestrationV2ProviderThread | undefined {
+  const startedByScheduledFreshRun = (providerThread: OrchestrationV2ProviderThread) =>
+    projection.runs.some(
+      (run) =>
+        run.ordinal === providerThread.firstRunOrdinal &&
+        isScheduledFreshRun(run, projection.turnItems),
+    );
+  const active = projection.providerThreads.find(
+    (candidate) => candidate.id === projection.thread.activeProviderThreadId,
+  );
+  if (active === undefined || !startedByScheduledFreshRun(active)) return active;
+  const boundary = contextBoundaryOrdinal(projection);
+  return (
+    projection.providerThreads
+      .filter(
+        (candidate) =>
+          candidate.appThreadId === projection.thread.id &&
+          candidate.ownerNodeId === null &&
+          candidate.lastRunOrdinal !== null &&
+          !providerThreadPredatesBoundary(candidate, boundary) &&
+          !startedByScheduledFreshRun(candidate),
+      )
+      .toSorted((left, right) => (right.lastRunOrdinal ?? 0) - (left.lastRunOrdinal ?? 0))[0] ??
+    active
+  );
+}
+
+/** Wakes and fresh starts act on the active session; a message continues the conversation. */
+function dispatchProviderThread(
+  projection: Pick<
+    OrchestrationV2ThreadProjection,
+    "thread" | "providerThreads" | "runs" | "turnItems"
+  >,
+  message: Pick<OrchestrationV2ConversationMessage, "notification" | "delegatedCompletion">,
+  freshContext: boolean,
+): OrchestrationV2ProviderThread | undefined {
+  return freshContext ||
+    message.notification !== undefined ||
+    message.delegatedCompletion !== undefined
+    ? projection.providerThreads.find(
+        (candidate) => candidate.id === projection.thread.activeProviderThreadId,
+      )
+    : conversationProviderThread(projection);
+}
+
 /** Threads with no started run (imported, or reserved by another queued run) never cross it. */
 function providerThreadPredatesBoundary(
   providerThread: Pick<OrchestrationV2ProviderThread, "firstRunOrdinal">,
@@ -1304,10 +1396,13 @@ function uniqueSessions(
 }
 
 function rootProviderThreadsForProvider(
-  projection: Pick<OrchestrationV2ThreadProjection, "providerThreads" | "thread" | "runs">,
+  projection: Pick<
+    OrchestrationV2ThreadProjection,
+    "providerThreads" | "thread" | "runs" | "turnItems"
+  >,
   providerInstanceId: ModelSelection["instanceId"],
 ): ReadonlyArray<OrchestrationV2ProviderThread> {
-  const boundary = contextBoundaryOrdinal(projection.runs);
+  const boundary = contextBoundaryOrdinal(projection);
   return projection.providerThreads
     .filter(
       (providerThread) =>
@@ -1400,14 +1495,14 @@ const makeOrchestrator = Effect.fn("orchestrationV2.Orchestrator.layer")(functio
   ) {
     const adapter = yield* providerAdapters.get(providerInstanceId).pipe(mapDispatchError(command));
     const { driver } = adapter;
-    if (driver === "opencode") {
+    if (driver === "opencode" || driver === "antigravity") {
       const capabilities = yield* adapter.getCapabilities().pipe(mapDispatchError(command));
       return capabilities.turns.supportsNativeGoals === true ? driver : undefined;
     }
     return driver === "codex" || driver === "claudeAgent" ? driver : undefined;
   });
 
-  /** Claude Code reads `/goal pause` and `/goal resume` as new goals named "pause" and "resume". */
+  /** Unsupported goal controls can become new objectives in native providers. */
   const ensureGoalCommandSupported = Effect.fn("Orchestrator.ensureGoalCommandSupported")(
     function* (
       command: OrchestrationV2ServerCommand,
@@ -1415,8 +1510,18 @@ const makeOrchestrator = Effect.fn("orchestrationV2.Orchestrator.layer")(functio
       providerInstanceId: ProviderInstanceId,
     ) {
       const goalCommand = parseGoalCommand(message);
-      if (goalCommand?.type !== "pause" && goalCommand?.type !== "resume") return;
-      if ((yield* goalDriverFor(command, providerInstanceId)) !== "claudeAgent") return;
+      if (goalCommand === null || goalCommand.type === "set") return;
+      const driver = yield* goalDriverFor(command, providerInstanceId);
+      if (driver === "antigravity") {
+        return yield* new OrchestratorDispatchError({
+          commandId: command.commandId,
+          commandType: command.type,
+          cause:
+            "Antigravity accepts /goal followed by an objective. Interrupt the running turn, then ask Antigravity to stop the current goal.",
+        });
+      }
+      if (goalCommand.type !== "pause" && goalCommand.type !== "resume") return;
+      if (driver !== "claudeAgent") return;
       return yield* new OrchestratorDispatchError({
         commandId: command.commandId,
         commandType: command.type,
@@ -1963,13 +2068,19 @@ const makeOrchestrator = Effect.fn("orchestrationV2.Orchestrator.layer")(functio
     const projection = yield* projectionStore.getThreadRecords(
       threadId,
       ["runs", "nodes", "attempts", "providerThreads", "turnItems", "messages"],
-      { turnItemTypes: [], messageRoles: ["user"] },
+      { turnItemTypes: ["user_message"], messageRoles: ["user"] },
     );
     const queuedRun =
       queuedRunId === undefined
         ? nextQueuedRun(projection)
         : projection.runs.find((run) => run.id === queuedRunId && run.status === "queued");
     if (queuedRun === undefined) return;
+    // A steer that fell back to the queue keeps its user item, hidden while the
+    // run is queued. Republish it before the failure so clients whose bounded
+    // snapshot omitted it can show the prompt beside the error.
+    const retainedUserItems = projection.turnItems.filter(
+      (item) => item.type === "user_message" && item.runId === queuedRun.id,
+    );
     const now = yield* DateTime.now;
     const rootNode = projection.nodes.find((node) => node.id === queuedRun.rootNodeId);
     const attempt = projection.attempts.find((entry) => entry.id === queuedRun.activeAttemptId);
@@ -1995,6 +2106,15 @@ const makeOrchestrator = Effect.fn("orchestrationV2.Orchestrator.layer")(functio
       class: handoffUnsupported ? "validation_error" : "unknown",
     });
     yield* writeSystemEvents([
+      ...retainedUserItems.map((item) => ({
+        type: "turn-item.updated" as const,
+        threadId,
+        runId: queuedRun.id,
+        ...(rootNode === undefined ? {} : { nodeId: rootNode.id }),
+        providerInstanceId: queuedRun.providerInstanceId,
+        occurredAt: now,
+        payload: { ...item, status: "failed" as const, completedAt: now, updatedAt: now },
+      })),
       ...(attempt !== undefined && rootNode !== undefined
         ? [
             {
@@ -2344,12 +2464,10 @@ const makeOrchestrator = Effect.fn("orchestrationV2.Orchestrator.layer")(functio
             }),
         ),
       );
-      const activeProviderThread = projection.providerThreads.find(
-        (candidate) => candidate.id === projection.thread.activeProviderThreadId,
-      );
       const followsCurrent = followsCurrentConversation(queuedMessage);
       const freshContext = queuedRun.freshContext === true;
-      const contextBoundary = freshContext ? ordinal : contextBoundaryOrdinal(projection.runs);
+      const activeProviderThread = dispatchProviderThread(projection, queuedMessage, freshContext);
+      const contextBoundary = freshContext ? ordinal : contextBoundaryOrdinal(projection);
       // A run queued before a fresh run started is bound to the conversation that run left behind.
       const followsLatestContext =
         !freshContext &&
@@ -3608,19 +3726,19 @@ const makeOrchestrator = Effect.fn("orchestrationV2.Orchestrator.layer")(functio
           command.searchQuery,
         )
       : null;
-    // Viewing a thread changes read state only. Loading its transcript (or
-    // bumping updatedAt) makes a routine read receipt scale with its history.
+    if (!movesForward && opens === null) return;
+    // Viewing a thread changes read state only. Loading its transcript, bumping
+    // updatedAt, or copying the thread into the event makes a read receipt scale with it.
     yield* emit(
       events,
       command,
     )({
-      type: "thread.visited",
+      type: "thread.visit-recorded",
       threadId: command.threadId,
       providerInstanceId: thread.providerInstanceId,
       occurredAt,
       payload: {
-        ...thread,
-        ...(movesForward ? { lastVisitedAt: visitedAt.value } : {}),
+        lastVisitedAt: movesForward ? visitedAt.value : thread.lastVisitedAt,
         ...(opens ? { opens } : {}),
       },
     });
@@ -3846,6 +3964,7 @@ const makeOrchestrator = Effect.fn("orchestrationV2.Orchestrator.layer")(functio
           | "thread.pull-request-link.sync"
           | "thread.pull-request.watch"
           | "thread.pull-request-watch.sync"
+          | "thread.pull-request-watch.checks-reopen"
           | "thread.pull-request.sync"
           | "thread.title.regeneration.complete"
           | "thread.runtime-mode.set"
@@ -3969,6 +4088,25 @@ const makeOrchestrator = Effect.fn("orchestrationV2.Orchestrator.layer")(functio
         cause: `Thread ${command.threadId} is already archived.`,
       });
     }
+    if (command.type === "thread.archive") {
+      const records = yield* projectionStore
+        .getThreadRecords(command.threadId, ["subagents"])
+        .pipe(mapDispatchError(command));
+      if (
+        records.subagents.some(
+          (task) =>
+            task.origin === "app_owned" &&
+            task.childThreadId !== null &&
+            isOrchestrationV2WorkActive(task.status),
+        )
+      ) {
+        return yield* new OrchestratorDispatchError({
+          commandId: command.commandId,
+          commandType: command.type,
+          cause: `Thread ${command.threadId} has running delegated tasks. Wait for them or cancel them before archiving.`,
+        });
+      }
+    }
     if (command.type === "thread.unarchive" && thread.archivedAt === null) {
       return yield* new OrchestratorDispatchError({
         commandId: command.commandId,
@@ -4644,6 +4782,18 @@ const makeOrchestrator = Effect.fn("orchestrationV2.Orchestrator.layer")(functio
             updatedAt: command.type === "thread.pull-request-link.sync" ? thread.updatedAt : now,
           };
         }
+        case "thread.pull-request-watch.checks-reopen": {
+          const linked = threadPullRequestsOf(thread);
+          if (!linked.some((link) => link.watch?.checksPending !== undefined)) return thread;
+          return {
+            ...thread,
+            pullRequests: linked.map((link) =>
+              link.watch?.checksPending === undefined
+                ? link
+                : { ...link, watch: withoutChecksAnswer(link.watch) },
+            ),
+          };
+        }
         case "thread.pull-request.watch":
         case "thread.pull-request-watch.sync": {
           const key = normalizeThreadPullRequestKey(command);
@@ -4680,7 +4830,7 @@ const makeOrchestrator = Effect.fn("orchestrationV2.Orchestrator.layer")(functio
           const watch =
             command.type === "thread.pull-request-watch.sync"
               ? existing.watch?.startedAt === command.startedAt
-                ? (command.watch ?? undefined)
+                ? syncedPullRequestWatch(existing.watch, command)
                 : existing.watch
               : !command.watching
                 ? undefined
@@ -4699,6 +4849,9 @@ const makeOrchestrator = Effect.fn("orchestrationV2.Orchestrator.layer")(functio
                       passedChecks: existing.endedWatch.passedChecks,
                       conflicting: existing.endedWatch.conflicting,
                     }),
+                    awaitingBaseline: existing.endedWatch
+                      ? existing.endedWatch.awaitingBaseline
+                      : "all",
                     ...(existing.endedWatch?.owedChecks !== undefined && {
                       owedChecks: existing.endedWatch.owedChecks,
                     }),
@@ -4708,6 +4861,8 @@ const makeOrchestrator = Effect.fn("orchestrationV2.Orchestrator.layer")(functio
                     ...(existing.endedWatch?.approvalAnnounced !== undefined && {
                       approvalAnnounced: existing.endedWatch.approvalAnnounced,
                     }),
+                    // A finished-checks answer may be an older head's; a fresh read decides.
+                    ...(existing.endedWatch?.checksPending === true && { checksPending: true }),
                     ...(existing.endedWatch?.checksAwaitedSince !== undefined && {
                       checksAwaitedSince: existing.endedWatch.checksAwaitedSince,
                     }),
@@ -4768,6 +4923,15 @@ const makeOrchestrator = Effect.fn("orchestrationV2.Orchestrator.layer")(functio
             ? {
                 ...thread,
                 ...(command.title === undefined ? {} : { title: command.title }),
+                ...(command.outcome === undefined
+                  ? {}
+                  : {
+                      lastTitleRegeneration: {
+                        ...command.outcome,
+                        requestId: command.requestId,
+                        completedAt: now,
+                      },
+                    }),
                 titleRegeneration: null,
                 updatedAt: now,
               }
@@ -4786,6 +4950,20 @@ const makeOrchestrator = Effect.fn("orchestrationV2.Orchestrator.layer")(functio
           };
       }
     })();
+    if (command.type === "thread.pull-request-watch.checks-reopen") {
+      if (updatedThread === thread) return;
+      yield* emit(
+        events,
+        command,
+      )({
+        type: "thread.pull-request-synced",
+        threadId: command.threadId,
+        providerInstanceId: updatedThread.providerInstanceId,
+        occurredAt: now,
+        payload: updatedThread,
+      });
+      return;
+    }
     if (
       command.type === "thread.pull-request-link.sync" ||
       command.type === "thread.pull-request-watch.sync"
@@ -6010,7 +6188,7 @@ const makeOrchestrator = Effect.fn("orchestrationV2.Orchestrator.layer")(functio
           type: "provider_handoff",
         }),
       );
-      const contextBoundary = contextBoundaryOrdinal(input.projection.runs);
+      const contextBoundary = contextBoundaryOrdinal(input.projection);
       restartHandoff = yield* contextHandoffService
         .prepareProviderHandoff({
           threadId: input.command.threadId,
@@ -6974,17 +7152,18 @@ const makeOrchestrator = Effect.fn("orchestrationV2.Orchestrator.layer")(functio
       return;
     }
 
-    const activeProviderThread = projection.providerThreads.find(
-      (candidate) => candidate.id === projection.thread.activeProviderThreadId,
+    const activeProviderThread = dispatchProviderThread(
+      projection,
+      { ...command, delegatedCompletion },
+      freshContext,
     );
     const activeRun = projection.runs.find(isActiveRun);
-    // A message queued during worktree setup can arrive after that setup failed
-    // without a worktree. It waits, held, like the messages queued before the
-    // failure, instead of starting in the project checkout.
+    // Messages after failed or stopped worktree setup must wait for a worktree,
+    // rather than start in the project checkout.
     const latestRun = latestExecutedRun(projection.runs);
     const worktreeMissingRun =
       activeRun === undefined &&
-      dispatchMode.type === "queue_after_active" &&
+      (dispatchMode.type === "queue_after_active" || dispatchMode.type === "start_immediately") &&
       (latestRun?.status === "failed" || latestRun?.status === "interrupted") &&
       latestRun.workspacePreparation?.type === "worktree" &&
       projection.thread.worktreePath === null
@@ -7439,7 +7618,7 @@ const makeOrchestrator = Effect.fn("orchestrationV2.Orchestrator.layer")(functio
     }
     const ordinal = nextRunOrdinal(projection);
     const runId = idAllocator.derive.run({ threadId: command.threadId, ordinal });
-    const contextBoundary = freshContext ? ordinal : contextBoundaryOrdinal(projection.runs);
+    const contextBoundary = freshContext ? ordinal : contextBoundaryOrdinal(projection);
     const latestCompletedRun = projection.runs.findLast((run) => run.status === "completed");
     const latestHandoffRun = projection.runs.findLast(isHandoffSourceRun);
     const legacyImportItems =
@@ -10733,8 +10912,8 @@ const makeOrchestrator = Effect.fn("orchestrationV2.Orchestrator.layer")(functio
         "runtimeRequests",
         "subagents",
       ],
-      // User messages measure a restart's model switch.
-      { turnItemTypes: ["user_message"], messageRoles: ["user"] },
+      // User messages measure a restart's model switch. Steering reads root and live nodes only.
+      { turnItemTypes: ["user_message"], messageRoles: ["user"], omitSettledLeafNodes: true },
     );
     if (projection.thread.archivedAt !== null || projection.thread.deletedAt !== null) {
       return yield* new OrchestratorDispatchError({
@@ -11064,7 +11243,13 @@ const makeOrchestrator = Effect.fn("orchestrationV2.Orchestrator.layer")(functio
     const projection = yield* loadProjectionForCommand(
       command,
       ["runs", "messages", "nodes", "attempts", "subagents", "turnItems"],
-      { turnItemTypes: [], messageRoles: ["user"] },
+      // Cancelling reads the queued run's own message and root node, never a settled leaf.
+      {
+        turnItemTypes: [],
+        messageRoles: ["user"],
+        messageRunIds: [command.runId],
+        omitSettledLeafNodes: true,
+      },
     );
     const queuedRun = projection.runs.find((candidate) => candidate.id === command.runId);
     if (queuedRun === undefined || queuedRun.status !== "queued") {
@@ -12538,6 +12723,8 @@ const makeOrchestrator = Effect.fn("orchestrationV2.Orchestrator.layer")(functio
           "reasoning",
         ],
         turnItemStatuses: ["pending", "running", "waiting"],
+        // Stop reads root nodes and ends open ones; a settled leaf has nothing left to end.
+        omitSettledLeafNodes: true,
       },
     );
     const run = projection.runs.find((candidate) => candidate.id === command.runId);
@@ -14444,6 +14631,9 @@ const makeOrchestrator = Effect.fn("orchestrationV2.Orchestrator.layer")(functio
       case "provider.switch":
         yield* dispatchThreadMutation(command, events, effects);
         break;
+      case "thread.pull-request-watch.checks-reopen":
+        yield* dispatchThreadMutation(command, events, effects);
+        break;
       case "thread.pull-request-watch.sync":
         yield* dispatchPullRequestWatchSync(command, events, effects);
         break;
@@ -14801,6 +14991,10 @@ const makeOrchestrator = Effect.fn("orchestrationV2.Orchestrator.layer")(functio
           planned.events.length > 0 ||
           isUnobservedAcknowledgement(command) ||
           command.type === "thread.background-work.settle" ||
+          // A stale visit changes no read state.
+          command.type === "thread.visit" ||
+          // A read can answer a watch again before a push's reopen lands; nothing is left to clear.
+          command.type === "thread.pull-request-watch.checks-reopen" ||
           command.type === "thread.interrupt.unresponsive" ||
           command.type === "thread.stop" ||
           command.type === "subagent.stop" ||
@@ -15169,7 +15363,9 @@ const makeOrchestrator = Effect.fn("orchestrationV2.Orchestrator.layer")(functio
             if (stored.event.type !== "provider-turn.updated") return;
             const threadId = stored.event.threadId;
             const turn = stored.event.payload;
-            const projection = yield* projectionStore.getThreadRecords(threadId, ["runs"]);
+            const projection = yield* projectionStore.getThreadRecords(threadId, ["runs"], {
+              runStatuses: ["queued", "running"],
+            });
             const run = projection.runs.find(
               (candidate) =>
                 candidate.activeAttemptId === turn.runAttemptId && candidate.status === "running",
@@ -15578,6 +15774,11 @@ const makeOrchestrator = Effect.fn("orchestrationV2.Orchestrator.layer")(functio
         .getMessageCount(threadId)
         .pipe(Effect.mapError((cause) => new OrchestratorProjectionError({ threadId, cause })));
     }),
+    getMessagesById: Effect.fn("OrchestratorV2.getMessagesById")(function (threadId, messageIds) {
+      return projectionStore
+        .getMessagesById(threadId, messageIds)
+        .pipe(Effect.mapError((cause) => new OrchestratorProjectionError({ threadId, cause })));
+    }),
     getTranscriptByteFloor: Effect.fn("OrchestratorV2.getTranscriptByteFloor")(
       function (threadId, limit) {
         return projectionStore
diff --git a/apps/server/src/orchestration-v2/ProjectCommands.test.ts b/apps/server/src/orchestration-v2/ProjectCommands.test.ts
index 96249ece4c10..85cf6d08efc1 100644
--- a/apps/server/src/orchestration-v2/ProjectCommands.test.ts
+++ b/apps/server/src/orchestration-v2/ProjectCommands.test.ts
@@ -19,6 +19,7 @@ const row = (overrides: Partial<ProjectRow> = {}): ProjectRow => ({
   workspaceRoot: "/tmp/scripts",
   defaultModelSelection: null,
   defaultThreadEnvMode: null,
+  hasCustomTitle: false,
   autoPull: false,
   faviconPath: null,
   projectIcon: null,
diff --git a/apps/server/src/orchestration-v2/ProjectStore.test.ts b/apps/server/src/orchestration-v2/ProjectStore.test.ts
index 3eeabb6f89a8..322ae0641758 100644
--- a/apps/server/src/orchestration-v2/ProjectStore.test.ts
+++ b/apps/server/src/orchestration-v2/ProjectStore.test.ts
@@ -96,5 +96,69 @@ it.layer(ProjectStore.layer.pipe(Layer.provideMerge(SqlitePersistence.layerMemor
         assert.strictEqual(project?.archivedAt, at);
       }),
     );
+
+    it.effect("marks a project's title as custom only once it is renamed", () =>
+      Effect.gen(function* () {
+        const projects = yield* ProjectStore.ProjectStoreV2;
+        const projectId = ProjectId.make("project-renamed");
+        const event = {
+          aggregateKind: "project",
+          aggregateId: projectId,
+          occurredAt: "2026-03-24T00:00:00.000Z",
+          commandId: null,
+          causationEventId: null,
+          correlationId: null,
+          metadata: {},
+        } as const;
+        const hasCustomTitle = () =>
+          projects
+            .getShell(projectId)
+            .pipe(Effect.map((shell) => Option.getOrNull(shell)?.hasCustomTitle));
+        yield* projects.apply({
+          ...event,
+          sequence: 1,
+          eventId: EventId.make("event-renamed-created"),
+          type: "project.created",
+          payload: {
+            projectId,
+            title: "repo",
+            workspaceRoot: "/tmp/repo",
+            defaultModelSelection: null,
+            scripts: [],
+            createdAt: "2026-03-24T00:00:00.000Z",
+            updatedAt: "2026-03-24T00:00:00.000Z",
+          },
+        });
+        assert.strictEqual(yield* hasCustomTitle(), false);
+        yield* projects.apply({
+          ...event,
+          sequence: 2,
+          eventId: EventId.make("event-renamed-title"),
+          type: "project.meta-updated",
+          payload: { projectId, title: "custom repo", updatedAt: "2026-03-24T00:00:02.000Z" },
+        });
+        assert.strictEqual(yield* hasCustomTitle(), true);
+        yield* projects.apply({
+          ...event,
+          sequence: 3,
+          eventId: EventId.make("migration:39:project:project-renamed:baseline"),
+          type: "project.created",
+          payload: {
+            projectId,
+            title: "repo",
+            workspaceRoot: "/tmp/repo",
+            defaultModelSelection: null,
+            scripts: [],
+            createdAt: "2026-03-24T00:00:00.000Z",
+            updatedAt: "2026-03-24T00:00:03.000Z",
+          },
+        });
+        assert.strictEqual(yield* hasCustomTitle(), true);
+        assert.strictEqual(
+          Option.getOrNull(yield* projects.getShell(projectId))?.title,
+          "custom repo",
+        );
+      }),
+    );
   },
 );
diff --git a/apps/server/src/orchestration-v2/ProjectStore.ts b/apps/server/src/orchestration-v2/ProjectStore.ts
index 2be0a765c784..af39d565109f 100644
--- a/apps/server/src/orchestration-v2/ProjectStore.ts
+++ b/apps/server/src/orchestration-v2/ProjectStore.ts
@@ -32,6 +32,7 @@ export class ProjectStoreV2Error extends Schema.TaggedError<ProjectStoreV2Error>
 export const ProjectRow = Schema.Struct({
   projectId: ProjectId,
   title: Schema.String,
+  hasCustomTitle: Schema.Boolean,
   workspaceRoot: Schema.String,
   defaultModelSelection: Schema.NullOr(ModelSelection),
   defaultThreadEnvMode: Schema.NullOr(ThreadEnvMode),
@@ -50,6 +51,7 @@ export type ProjectRow = typeof ProjectRow.Type;
 const ProjectDbRow = Schema.Struct({
   ...ProjectRow.fields,
   defaultModelSelection: Schema.NullOr(Schema.fromJsonString(ModelSelection)),
+  hasCustomTitle: Schema.BooleanFromBit,
   autoPull: Schema.BooleanFromBit,
   projectIcon: Schema.NullOr(Schema.fromJsonString(StoredProjectIcon)),
   scripts: Schema.fromJsonString(Schema.Array(ProjectScript)),
@@ -59,6 +61,7 @@ function toShell(row: ProjectRow): OrchestrationProjectShell {
   return {
     id: row.projectId,
     title: row.title,
+    hasCustomTitle: row.hasCustomTitle,
     workspaceRoot: row.workspaceRoot,
     repositoryIdentity: null,
     defaultModelSelection: row.defaultModelSelection,
@@ -117,6 +120,7 @@ export const make = Effect.gen(function* () {
       SELECT
         project_id AS "projectId",
         title,
+        has_custom_title AS "hasCustomTitle",
         workspace_root AS "workspaceRoot",
         default_model_selection_json AS "defaultModelSelection",
         default_thread_env_mode AS "defaultThreadEnvMode",
@@ -149,6 +153,7 @@ export const make = Effect.gen(function* () {
           INSERT INTO projection_projects (
             project_id,
             title,
+            has_custom_title,
             workspace_root,
             default_model_selection_json,
             default_thread_env_mode,
@@ -165,6 +170,7 @@ export const make = Effect.gen(function* () {
           VALUES (
             ${encoded.projectId},
             ${encoded.title},
+            ${encoded.hasCustomTitle},
             ${encoded.workspaceRoot},
             ${encoded.defaultModelSelection},
             ${encoded.defaultThreadEnvMode},
@@ -180,7 +186,12 @@ export const make = Effect.gen(function* () {
           )
           ON CONFLICT (project_id)
           DO UPDATE SET
-            title = excluded.title,
+            title = CASE
+              WHEN projection_projects.has_custom_title = 1 AND excluded.has_custom_title = 0
+                THEN projection_projects.title
+              ELSE excluded.title
+            END,
+            has_custom_title = MAX(projection_projects.has_custom_title, excluded.has_custom_title),
             workspace_root = excluded.workspace_root,
             default_model_selection_json = excluded.default_model_selection_json,
             default_thread_env_mode = excluded.default_thread_env_mode,
@@ -231,6 +242,7 @@ export const make = Effect.gen(function* () {
         return yield* upsertRow({
           projectId: payload.projectId,
           title: payload.title,
+          hasCustomTitle: false,
           workspaceRoot: payload.workspaceRoot,
           defaultModelSelection: payload.defaultModelSelection,
           defaultThreadEnvMode: payload.defaultThreadEnvMode ?? null,
@@ -258,7 +270,7 @@ export const make = Effect.gen(function* () {
       const payload = event.payload;
       yield* upsertRow({
         ...row,
-        ...(payload.title === undefined ? {} : { title: payload.title }),
+        ...(payload.title === undefined ? {} : { title: payload.title, hasCustomTitle: true }),
         ...(payload.workspaceRoot === undefined ? {} : { workspaceRoot: payload.workspaceRoot }),
         ...(payload.defaultModelSelection === undefined
           ? {}
diff --git a/apps/server/src/orchestration-v2/ProjectionControlReads.test.ts b/apps/server/src/orchestration-v2/ProjectionControlReads.test.ts
index d63c13699fa2..988fc7b494fb 100644
--- a/apps/server/src/orchestration-v2/ProjectionControlReads.test.ts
+++ b/apps/server/src/orchestration-v2/ProjectionControlReads.test.ts
@@ -14,12 +14,18 @@ import {
   RuntimeRequestId,
   ThreadId,
   type OrchestrationV2DomainEvent,
+  type OrchestrationV2StoredEvent,
 } from "@t3tools/contracts";
 import * as DateTime from "effect/DateTime";
 import * as Effect from "effect/Effect";
+import * as Fiber from "effect/Fiber";
 import * as Layer from "effect/Layer";
+import * as Queue from "effect/Queue";
+import * as Stream from "effect/Stream";
+import * as TestClock from "effect/testing/TestClock";
 import * as SqlClient from "effect/sql/SqlClient";
 import * as SqlitePersistence from "../persistence/Sqlite.ts";
+import * as EventSink from "./EventSink.ts";
 import * as ProjectionStore from "./ProjectionStore.ts";
 import * as ProviderSessionManager from "./ProviderSessionManager.ts";
 import * as ProviderTurnControlService from "./ProviderTurnControlService.ts";
@@ -295,10 +301,30 @@ it.effect.each(storageCases)(
               }),
           } as never),
       });
+      // Each pull is announced, so a second pull proves Stop judged the first event.
+      const pulls = yield* Queue.unbounded<void>();
+      const committed = yield* Queue.unbounded<OrchestrationV2StoredEvent>();
+      const layerEvents = Layer.mock(EventSink.EventSinkV2)({
+        latestSequence: () => Effect.succeed(0),
+        stream: () =>
+          Stream.fromEffectRepeat(
+            Queue.offer(pulls, undefined).pipe(Effect.andThen(Queue.take(committed))),
+          ),
+      });
       yield* Effect.gen(function* () {
         const control = yield* ProviderTurnControlService.ProviderTurnControlServiceV2;
         const reply = yield* RuntimeRequestService.RuntimeRequestServiceV2;
-        yield* control.interrupt({ threadId, providerThreadId, providerTurnId, providerSessionId });
+        const interrupt = control.interrupt({
+          threadId,
+          providerThreadId,
+          providerTurnId,
+          providerSessionId,
+        });
+        // The provider never reports the turn settled, so Stop returns at the bound.
+        const unconfirmed = yield* Effect.forkChild(interrupt);
+        yield* Queue.take(pulls);
+        yield* TestClock.adjust("2 seconds");
+        yield* Fiber.join(unconfirmed);
         yield* control.steer({
           threadId,
           providerThreadId,
@@ -332,20 +358,42 @@ it.effect.each(storageCases)(
           "Failure",
         );
         assert.lengthOf(calls, 3);
-        const turn = context.providerTurn!;
-        yield* store.apply({
+        const confirmed = yield* Effect.forkChild(interrupt);
+        yield* Queue.take(pulls);
+        const ingest = (sequence: number, event: OrchestrationV2DomainEvent) =>
+          store
+            .apply(event)
+            .pipe(Effect.andThen(Queue.offer(committed, { sequence, commandId: null, event })));
+        yield* ingest(1, {
           id: EventId.make("control:turn-completed"),
           type: "provider-turn.updated",
           threadId,
           occurredAt: now,
-          payload: { ...turn, status: "completed", completedAt: now },
+          payload: { ...context.providerTurn!, status: "completed", completedAt: now },
+        });
+        // A settled provider turn is not enough; Stop waits for its attempt to finalize.
+        yield* Queue.take(pulls);
+        assert.isUndefined(confirmed.pollUnsafe());
+        yield* ingest(2, {
+          id: EventId.make("control:attempt-completed"),
+          type: "run-attempt.updated",
+          threadId,
+          occurredAt: now,
+          payload: { ...context.attempt!, status: "completed", completedAt: now },
         });
-        yield* control.interrupt({ threadId, providerThreadId, providerTurnId, providerSessionId });
-        assert.deepEqual(calls, ["interrupt", "Use the smaller fix.", "reply", "interrupt"]);
+        yield* Fiber.join(confirmed);
+        yield* interrupt;
+        assert.deepEqual(calls, [
+          "interrupt",
+          "Use the smaller fix.",
+          "reply",
+          "interrupt",
+          "interrupt",
+        ]);
       }).pipe(
         Effect.provide(
           Layer.merge(ProviderTurnControlService.layer, RuntimeRequestService.layer).pipe(
-            Layer.provide(layerSessions),
+            Layer.provide(Layer.merge(layerSessions, layerEvents)),
           ),
         ),
       );
diff --git a/apps/server/src/orchestration-v2/ProjectionStore.test.ts b/apps/server/src/orchestration-v2/ProjectionStore.test.ts
index fa670c448c89..6886912fc4cc 100644
--- a/apps/server/src/orchestration-v2/ProjectionStore.test.ts
+++ b/apps/server/src/orchestration-v2/ProjectionStore.test.ts
@@ -54,6 +54,7 @@ import {
   encodeThreadHistoryCursor,
   selectHistoryPageFromCursor,
   THREAD_HISTORY_PAGE_POLICY,
+  THREAD_HISTORY_SNAPSHOT_ROW_LIMIT,
   THREAD_HISTORY_TURN_SNAPSHOT_ROW_LIMIT,
 } from "./threadHistoryPaging.ts";
 import { buildBoundedThreadStreamSnapshot } from "./ThreadStream.ts";
@@ -754,7 +755,7 @@ it.effect("idle compaction filters keep the latest run, live work and the newest
       })
       .pipe(Effect.withTracer(command.tracer));
     for (const [table, seeks] of [
-      ["turn_items", ["USING INDEX orchestration_v2_projection_turn_items_conversation_idx"]],
+      ["turn_items", ["turn_items_thread_type_idx (thread_id=? AND type=?)"]],
       ["nodes", ["nodes_settled_leaf_idx (thread_id=? AND <expr>=?)"]],
       ["subagents", ["USING COVERING INDEX orchestration_v2_projection_subagents_settled_idx"]],
       [
@@ -1291,9 +1292,9 @@ it.effect("record reads filter notification sources without dropping matching me
       `EXPLAIN QUERY PLAN ${ordinalLookup}`,
       [threadId, "[]"],
     )).map((row) => row.detail);
-    // User-only reads must stay on the partial index instead of scanning every turn item.
+    // User-only reads must stay on a type-bounded index instead of scanning every turn item.
     assert.isTrue(
-      plan.some((detail) => detail.includes("turn_items_user_message_idx")),
+      plan.some((detail) => /turn_items_(user_message|thread_type)_idx/.test(detail)),
       plan.join("\n"),
     );
     // With every user item loaded, the items give the order and the lookup does not run.
@@ -2806,11 +2807,25 @@ it.effect("SQL shells read a subagent family and a worktree's threads", () =>
     assert.deepEqual([...(yield* family(id("missing")))], []);
 
     // Includes another root's idle child on the same path, which a shell may leave out.
-    const onWorktree = yield* store.getShellSnapshot({ location: "active", worktreePath });
+    const { statements, tracer } = traceSqlStatements();
+    const onWorktree = yield* store
+      .getShellSnapshot({ location: "active", worktreePath })
+      .pipe(Effect.withTracer(tracer));
     assert.sameMembers(
       onWorktree.threads.map((thread) => thread.id),
       [id("root"), id("child"), id("other-child")],
     );
+    // A path names a few threads; scanning every thread parses every payload.
+    const sql = yield* SqlClient.SqlClient;
+    const threadQuery = statements.find((statement) =>
+      statement.includes("AS latest_run_stop_requested"),
+    );
+    assert.isDefined(threadQuery);
+    const threadPlan = (yield* sql.unsafe<{ readonly detail: string }>(
+      `EXPLAIN QUERY PLAN ${threadQuery}`,
+      [],
+    )).map((row) => row.detail);
+    assert.notInclude(threadPlan, "SCAN t", threadPlan.join("\n"));
     // A fork keeps its deleted source's root, so the deleted root still names the live tree.
     yield* store.apply({
       id: EventId.make("event:family:root-deleted"),
@@ -5017,29 +5032,38 @@ it.layer(layerTest)("ProjectionStoreV2", (it) => {
           })}
         )
       `;
-      const cancelledSuffixSnapshot = yield* projectionStore.getThreadSnapshotWindow(threadId, {
-        rowLimit: sqlPageLimit,
-      });
-      const cancelledSuffixPage = buildBoundedThreadProjection({
-        policy: { ...THREAD_HISTORY_PAGE_POLICY, maxUserTurns: undefined },
-        projection: cancelledSuffixSnapshot.projection,
-        snapshotSequence: cancelledSuffixSnapshot.snapshotSequence,
-      });
-      assert.strictEqual(cancelledSuffixPage.latestLocalTurnOrdinal, 1_202);
-      assert.lengthOf(cancelledSuffixPage.projection.visibleTurnItems, 75);
-      assert.isFalse(
-        cancelledSuffixPage.projection.visibleTurnItems.some((row) =>
-          String(row.sourceItemId).includes(":cancelled:"),
-        ),
-      );
-      assert.isTrue(
-        cancelledSuffixPage.projection.visibleTurnItems.some(
-          (row) => row.sourceItemId === runlessQueuedId,
-        ),
-      );
+      // A steer that fell back to the queue keeps its queued-turn item while its
+      // run waits. End on cancelled for the checks below.
+      for (const status of ["queued", "cancelled"] as const) {
+        yield* sql`
+          UPDATE orchestration_v2_projection_runs
+          SET status = ${status}, payload_json = json_set(payload_json, '$.status', ${status})
+          WHERE run_id = ${cancelledRunId}
+        `;
+        const cancelledSuffixSnapshot = yield* projectionStore.getThreadSnapshotWindow(threadId, {
+          rowLimit: sqlPageLimit,
+        });
+        const cancelledSuffixPage = buildBoundedThreadProjection({
+          policy: { ...THREAD_HISTORY_PAGE_POLICY, maxUserTurns: undefined },
+          projection: cancelledSuffixSnapshot.projection,
+          snapshotSequence: cancelledSuffixSnapshot.snapshotSequence,
+        });
+        assert.strictEqual(cancelledSuffixPage.latestLocalTurnOrdinal, 1_202);
+        assert.lengthOf(cancelledSuffixPage.projection.visibleTurnItems, 75);
+        assert.isFalse(
+          cancelledSuffixPage.projection.visibleTurnItems.some((row) =>
+            String(row.sourceItemId).includes(":cancelled:"),
+          ),
+          status,
+        );
+        assert.isTrue(
+          cancelledSuffixPage.projection.visibleTurnItems.some(
+            (row) => row.sourceItemId === runlessQueuedId,
+          ),
+        );
+      }
 
-      // A steer cancels the queued run before it starts while the steered run keeps writing, so
-      // the queued message leaves the window but its run is still the shell's latest run.
+      // A steer moves the cancelled queued message outside the window.
       const steeredItemId = "turn-item:bounded-sql-history:steered-output";
       const steeredRunId = RunId.make("run:bounded-sql-history:1000");
       yield* sql`
@@ -5077,7 +5101,14 @@ it.layer(layerTest)("ProjectionStoreV2", (it) => {
       assert.isFalse(
         steeredSnapshot.projection.turnItems.some((item) => item.runId === cancelledRunId),
       );
-      assert.isTrue(steeredSnapshot.projection.runs.some((run) => run.id === cancelledRunId));
+      const latestRunId = (yield* projectionStore.getShellSnapshot()).threads.find(
+        (thread) => thread.id === threadId,
+      )?.latestRunId;
+      assert.equal(latestRunId, hiddenRunId);
+      assert.isFalse(
+        steeredSnapshot.projection.turnItems.some((item) => item.runId === latestRunId),
+      );
+      assert.isTrue(steeredSnapshot.projection.runs.some((run) => run.id === latestRunId));
       yield* sql`DELETE FROM orchestration_v2_projection_turn_items WHERE turn_item_id = ${steeredItemId}`;
 
       const interruptRunId = RunId.make("run:bounded-sql-history:interrupt");
@@ -5688,6 +5719,79 @@ it.layer(layerTest)("ProjectionStoreV2", (it) => {
         )
       `;
       assert.strictEqual((yield* forkPage()).totalItems, forkTotal + 2);
+
+      // An agent started this thread, so the snapshot folds no work. Its cursor then names a
+      // command that an older page folds into the run's one work group.
+      yield* sql`
+        UPDATE orchestration_v2_projection_turn_items
+        SET type = CASE WHEN ordinal = 0 THEN type ELSE 'assistant_message' END,
+          payload_json = CASE
+            WHEN ordinal = 0 THEN json_set(payload_json, '$.createdBy', 'agent')
+            ELSE json_set(payload_json, '$.type', 'assistant_message',
+              '$.messageId', turn_item_id, '$.streaming', json('false'))
+          END
+        WHERE thread_id = ${threadId} AND type = 'user_message'
+      `;
+      yield* sql`
+        INSERT INTO orchestration_events (
+          event_id, aggregate_kind, stream_id, stream_version, event_type,
+          occurred_at, actor_kind, payload_json, metadata_json, application_event_version
+        ) VALUES (
+          'event:paged-scrollback:agent-started', 'thread', ${threadId}, 2,
+          'turn-item.updated', ${nowIso}, 'user', '{}', '{}', 2
+        )
+      `;
+      const window = yield* projectionStore.getThreadSnapshotWindow(threadId, {
+        rowLimit: THREAD_HISTORY_SNAPSHOT_ROW_LIMIT,
+        userTurnLimit: THREAD_HISTORY_PAGE_POLICY.maxUserTurns,
+        deferWork: true,
+      });
+      const bounded = buildBoundedThreadProjection({
+        projection: window.projection,
+        snapshotSequence: window.snapshotSequence,
+      });
+      const loaded = [bounded.projection.visibleTurnItems];
+      let earlier = bounded.hasMoreHistory ? bounded.historyCursor : null;
+      while (earlier !== null) {
+        assert.isBelow(loaded.length, 20);
+        const page: OrchestrationV2ThreadHistoryPage = yield* projectionStore.getThreadHistoryPage(
+          threadId,
+          earlier,
+          undefined,
+          false,
+          "deferred",
+        );
+        loaded.unshift(page.items);
+        earlier = page.hasMoreHistory ? page.nextCursor : null;
+      }
+      const held = loaded.flat();
+      const heldOrdinals = held.map((row) => row.item.ordinal);
+      assert.deepEqual(
+        heldOrdinals,
+        [...new Set(heldOrdinals)].toSorted((left, right) => left - right),
+      );
+      const folded = held.find((row) => row.item.deferredWork !== undefined)?.item;
+      assert.isAbove(folded?.deferredWork?.itemCount ?? 0, 150);
+      const everyRow = yield* projectionStore.getTimelinePage(threadId, {
+        view: "activity",
+        limit: itemCount + 2,
+      });
+      // Every row is on the client, or is work that the folded row stands for.
+      assert.deepEqual(
+        everyRow.items
+          .filter(
+            ({ item }) =>
+              !heldOrdinals.includes(item.ordinal) &&
+              !(
+                item.type === "command_execution" &&
+                folded?.deferredWork !== undefined &&
+                item.ordinal > folded.ordinal &&
+                item.ordinal <= folded.deferredWork.lastOrdinal
+              ),
+          )
+          .map(({ item }) => item.ordinal),
+        [],
+      );
     }),
   );
 
@@ -5714,7 +5818,7 @@ it.layer(layerTest)("ProjectionStoreV2", (it) => {
       let windowReads = 0;
       let foldedGroups = 0;
 
-      for (let round = 0; round < 4; round += 1) {
+      for (let round = 0; round < 5; round += 1) {
         const threadId = ThreadId.make(`thread:window-equivalence:${round}`);
         const created = {
           id: EventId.make(`event:window-equivalence:${round}`),
@@ -5746,34 +5850,41 @@ it.layer(layerTest)("ProjectionStoreV2", (it) => {
           },
         } satisfies Parameters<typeof projectionStore.apply>[0];
         yield* projectionStore.apply(created);
+        // The last thread puts three things below a window: a user turn under a hidden queued
+        // turn, the start of a long run that folds, and the start of the run before it, which
+        // has later rows among the first rows of the long run.
+        const windowEdges = round === 4;
         // One run of each kind in a random order, then an active run. Every other thread has
         // one user turn and then only wake turns.
-        // The last thread is a long run that a late notification wakes, then enough one-row
-        // runs that a page stops at the raw turn limit only if it counts that wake as a turn.
+        // The fourth thread is a turn, many rolled-back rows, a late notification of that turn,
+        // then 149 one-row turns. A page stops at that notification only if it counts as a turn.
         const kinds =
           round === 3
-            ? ["late wake", ...Array.from({ length: 148 }, () => "one row")]
-            : [
-                "rolled back",
-                "cancelled queued turn",
-                "replaced attempt",
-                "stopped",
-                "stopped",
-                "folds work",
-                "folds work",
-                "short",
-                "short",
-                "short",
-              ]
-                .map((kind) => ({ kind, order: random() }))
-                .toSorted((left, right) => left.order - right.order)
-                .map(({ kind }) => kind);
+            ? ["rolled back", "late wake", ...Array.from({ length: 149 }, () => "one row")]
+            : windowEdges
+              ? ["short", "cancelled queued turn", "folds work", "long fold", "stopped"]
+              : [
+                  "rolled back",
+                  "cancelled queued turn",
+                  "held queued turn",
+                  "replaced attempt",
+                  "stopped",
+                  "stopped",
+                  "folds work",
+                  "folds work",
+                  "short",
+                  "short",
+                  "short",
+                ]
+                  .map((kind) => ({ kind, order: random() }))
+                  .toSorted((left, right) => left.order - right.order)
+                  .map(({ kind }) => kind);
         const agentDriven = round === 1;
         const runs: Array<unknown> = [];
         const attempts: Array<unknown> = [];
         const items: Array<unknown> = [];
         const tiedWithHidden: Array<TurnItemId> = [];
-        const repliesInStoppedRuns: Array<string> = [];
+        const pageEnds: Array<string> = [];
         let ordinal = 0;
         for (const [index, kind] of [...kinds, "active"].entries()) {
           const run = index + 1;
@@ -5786,9 +5897,11 @@ it.layer(layerTest)("ProjectionStoreV2", (it) => {
                 ? "rolled_back"
                 : kind === "cancelled queued turn"
                   ? "cancelled"
-                  : kind === "short" && chance(0.5)
-                    ? "interrupted"
-                    : "completed";
+                  : kind === "held queued turn"
+                    ? "queued"
+                    : kind === "short" && chance(0.5)
+                      ? "interrupted"
+                      : "completed";
           runs.push({
             id: runId,
             threadId,
@@ -5865,9 +5978,18 @@ it.layer(layerTest)("ProjectionStoreV2", (it) => {
           const wakes =
             kind === "one row"
               ? run % 10 !== 0
-              : kind !== "late wake" && (agentDriven ? run > 1 : chance(0.2));
+              : windowEdges
+                ? ["folds work", "long fold", "stopped"].includes(kind)
+                : kind !== "late wake" && (agentDriven ? run > 1 : chance(0.2));
+          if (round === 3 && kind === "active")
+            pageEnds.push(`turn-item:window-equivalence:${round}:${items.length}`);
           if (wakes) notification();
-          else userMessage(kind === "cancelled queued turn" ? "queued_turn" : "turn_start");
+          else
+            userMessage(
+              kind === "cancelled queued turn" || kind === "held queued turn"
+                ? "queued_turn"
+                : "turn_start",
+            );
           // A stopped run never folds, so it is long enough for page ends to fall inside it.
           const work =
             kind === "late wake"
@@ -5876,25 +5998,40 @@ it.layer(layerTest)("ProjectionStoreV2", (it) => {
                 ? 320 + Math.floor(random() * 60)
                 : kind === "folds work"
                   ? 155 + Math.floor(random() * 60)
-                  : kind === "one row"
-                    ? 0
-                    : Math.floor(random() * 30);
+                  : kind === "long fold"
+                    ? 300
+                    : kind === "one row"
+                      ? 0
+                      : Math.floor(random() * 30);
           for (let row = 0; row < work; row += 1) {
-            if (chance(0.5)) add("command_execution", { input: "echo", output: "ok", exitCode: 0 });
-            else add("reasoning", { text: "", streaming: false });
+            // The first rows of a long fold and the work of a late wake belong to the run before.
+            const owner =
+              (kind === "long fold" && row < 140) || kind === "late wake"
+                ? {
+                    runId: `run:window-equivalence:${round}:${run - 1}`,
+                    nodeId: `node:window-equivalence:${round}:${run - 1}`,
+                  }
+                : {};
+            if (chance(0.5))
+              add("command_execution", { input: "echo", output: "ok", exitCode: 0, ...owner });
+            else add("reasoning", { text: "", streaming: false, ...owner });
             // A reply deep in a stopped run: a page that ends on it has enough work below it
             // to fold, and only the stop request above it says that it does not.
             const reply = kind === "stopped" && row === 200;
-            if (reply)
-              repliesInStoppedRuns.push(`turn-item:window-equivalence:${round}:${items.length}`);
-            if (reply || chance(0.02))
+            if (reply) pageEnds.push(`turn-item:window-equivalence:${round}:${items.length}`);
+            // With these replies, the part of a long fold in one window is too small to fold,
+            // and a shown row lies below the notification of a late wake.
+            const replies = kind === "long fold" || kind === "late wake";
+            if (reply || (replies && row % 5 === 0) || chance(0.02))
               add("assistant_message", {
                 messageId: `message:window-equivalence:${round}:${items.length}`,
                 text: "Reply",
                 streaming: false,
               });
-            if (chance(0.01)) notification();
-            if (chance(0.004) && !agentDriven) userMessage("steer");
+            // A late wake has no other input above its turn start.
+            if (chance(0.01) && kind !== "late wake") notification();
+            if (chance(0.004) && !agentDriven && !windowEdges && kind !== "late wake")
+              userMessage("steer");
           }
           if (kind === "late wake") notification();
           if (kind === "stopped") add("run_interrupt_request", { message: "Stop" });
@@ -5989,7 +6126,7 @@ it.layer(layerTest)("ProjectionStoreV2", (it) => {
             cursor = page.nextCursor;
           }
         }
-        for (const sourceItemId of repliesInStoppedRuns) {
+        for (const sourceItemId of pageEnds) {
           const cursor = encodeThreadHistoryCursor({
             snapshotSequence: 0,
             sourceThreadId: threadId,
@@ -6006,6 +6143,13 @@ it.layer(layerTest)("ProjectionStoreV2", (it) => {
         for (const view of ["messages", "activity"] as const) {
           for (const afterPosition of [-1, Math.floor(totalItems / 3), totalItems - 5])
             yield* windowed(timeline({ view, afterPosition, limit: 20 }));
+          for (const beforePosition of [
+            Number.POSITIVE_INFINITY,
+            Math.floor(totalItems / 3),
+            totalItems - 5,
+          ])
+            yield* windowed(timeline({ view, beforePosition, limit: 20 }));
+          yield* windowed(timeline({ view, afterPosition: 3, beforePosition: 40, limit: 20 }));
         }
         for (const itemId of [newest.sourceItemId, ...tiedWithHidden])
           yield* windowed(timeline({ itemId, limit: 1 }));
@@ -6499,7 +6643,17 @@ it.layer(layerTest)("ProjectionStoreV2", (it) => {
       assert.isNotEmpty(countQueries);
       for (const countQuery of countQueries) {
         for (const detail of yield* planOf(countQuery)) {
-          assert.notInclude(detail, "orchestration_v2_projection_turn_items");
+          // A thread's counts read only each run's status, never its row and payload.
+          if (/^SEARCH (r|run) /.test(detail)) {
+            assert.include(detail, "COVERING INDEX", detail);
+          }
+          if (detail.includes("orchestration_v2_projection_turn_items")) {
+            // Only held input is read from the sparse index; transcript history stays unread.
+            assert.include(
+              detail,
+              "SEARCH held USING INDEX orchestration_v2_projection_turn_items_queued_input_idx (run_id=?)",
+            );
+          }
         }
       }
     }),
@@ -7321,6 +7475,28 @@ it.layer(layerTest)("ProjectionStoreV2", (it) => {
           silent ? hidden : visible,
         ]);
 
+        // A follow-up removed before it started stays latest unless a visible run outlives it.
+        const removedRunId = RunId.make(`run:projection-shell-silent:${key}:removed`);
+        yield* projectionStore.apply({
+          id: EventId.make(`event:projection-shell-silent:${key}:removed`),
+          type: "run.updated",
+          threadId,
+          occurredAt: now,
+          payload: {
+            ...(yield* projectionStore.getThreadProjection(threadId)).runs[0]!,
+            id: removedRunId,
+            ordinal: 2,
+            userMessageId: MessageId.make(`message:projection-shell-silent:${key}:removed`),
+            status: "cancelled",
+            startedAt: null,
+            completedAt: now,
+          },
+        });
+        assert.deepStrictEqual(
+          (yield* presented).map((shell) => shell.latestRunId),
+          silent ? [removedRunId, removedRunId] : [runId, runId],
+        );
+
         // A run that fails outright, e.g. on a provider error, needs the user too.
         const running = (yield* projectionStore.getThreadProjection(threadId)).runs[0]!;
         const setRunStatus = (status: "failed" | "running") =>
@@ -7559,9 +7735,27 @@ it.layer(layerTest)("ProjectionStoreV2", (it) => {
             value == null ? null : DateTime.toEpochMillis(value);
           assert.equal(timestamp(sqlShell.activityRunStartedAt), expected);
           assert.equal(timestamp(memoryShell.activityRunStartedAt), expected);
-          assert.equal(sqlShell.latestRunId, "run:clock:newer");
+          // A queued message steered or removed before it started never ran, so the run that did presents.
+          for (const shell of [sqlShell, memoryShell]) {
+            assert.equal(shell.latestRunId, status === "cancelled" ? runId : "run:clock:newer");
+          }
         }
       }
+      // Removing a message after the earlier run ended leaves the cancelled run as the latest.
+      yield* projectionStore.apply({
+        id: EventId.make("event:clock:ended-before-cancel"),
+        type: "run.updated",
+        threadId,
+        occurredAt: later,
+        payload: { ...run, status: "completed", startedAt: now, completedAt: now },
+      });
+      const endedBeforeCancelProjection = yield* projectionStore.getThreadProjection(threadId);
+      for (const shell of [
+        (yield* projectionStore.getShellSnapshot()).threads.find((row) => row.id === threadId)!,
+        ProjectionStore.threadShellFromProjection(endedBeforeCancelProjection),
+      ]) {
+        assert.equal(shell.latestRunId, "run:clock:newer");
+      }
 
       yield* projectionStore.apply({
         id: EventId.make("event:clock:newer:held"),
@@ -8755,6 +8949,7 @@ it.layer(layerTest)("ProjectionStoreV2", (it) => {
       ]) {
         assert.equal(shell?.pendingRuntimeRequest?.id, "secret:b");
         assert.isTrue(shell?.pendingRuntimeRequest?.blocking);
+        assert.isTrue(shell?.pendingRuntimeRequest?.userOnly);
       }
 
       const requestId = RuntimeRequestId.make(`request:${suffix}:async`);
@@ -8846,6 +9041,10 @@ it.layer(layerTest)("ProjectionStoreV2", (it) => {
           [thread?.pendingRuntimeRequest?.blocking, memoryShell.pendingRuntimeRequest?.blocking],
           terminal ? [false, false] : [true, true],
         );
+        assert.deepEqual(
+          [thread?.pendingRuntimeRequest?.userOnly, memoryShell.pendingRuntimeRequest?.userOnly],
+          terminal ? [undefined, undefined] : [true, true],
+        );
       }
     }),
   );
@@ -9685,6 +9884,23 @@ it.layer(layerTest)("ProjectionStoreV2", (it) => {
       });
       assert.deepEqual(followingPage.items, targetAfterRollback.visibleTurnItems.slice(2));
       assert.isFalse(followingPage.hasMore);
+      assert.isTrue(followingPage.hasEarlier);
+      const newestPage = yield* projectionStore.getTimelinePage(targetThreadId, {
+        view: "activity",
+        limit: 2,
+        beforePosition: Number.POSITIVE_INFINITY,
+      });
+      assert.deepEqual(newestPage.items, targetAfterRollback.visibleTurnItems.slice(-2));
+      assert.isFalse(newestPage.hasMore);
+      assert.isTrue(newestPage.hasEarlier);
+      const earlierPage = yield* projectionStore.getTimelinePage(targetThreadId, {
+        view: "activity",
+        limit: 10,
+        beforePosition: newestPage.items[0]!.position,
+      });
+      assert.deepEqual(earlierPage.items, targetAfterRollback.visibleTurnItems.slice(0, -2));
+      assert.isTrue(earlierPage.hasMore);
+      assert.isFalse(earlierPage.hasEarlier);
       const tracedTimelinePage = (limit: number) =>
         Effect.gen(function* () {
           const { statements, tracer } = traceSqlStatements();
@@ -10342,6 +10558,236 @@ it.layer(layerTest)("ProjectionStoreV2", (it) => {
     }),
   );
 
+  it.effect("keeps undelivered queued input out of forks taken after a later run", () =>
+    Effect.gen(function* () {
+      const projectionStore = yield* ProjectionStore.ProjectionStoreV2;
+      const now = yield* DateTime.now;
+      const projectId = ProjectId.make("project:projection-fork-held-queue");
+
+      for (const heldStatus of ["queued", "cancelled"] as const) {
+        const prefix = `projection-fork-held-queue:${heldStatus}`;
+        const sourceThreadId = ThreadId.make(`thread:${prefix}:source`);
+        const targetThreadId = ThreadId.make(`thread:${prefix}:target`);
+        const heldRunId = RunId.make(`run:${prefix}:held`);
+        const heldAttemptId = RunAttemptId.make(`attempt:${prefix}:held`);
+        const answeredRunId = RunId.make(`run:${prefix}:answered`);
+
+        for (const [threadId, forkedFrom] of [
+          [sourceThreadId, null],
+          [targetThreadId, { type: "run", threadId: sourceThreadId, runId: answeredRunId }],
+        ] as const) {
+          yield* projectionStore.apply({
+            id: EventId.make(`event:${threadId}:created`),
+            type: "thread.created",
+            threadId,
+            occurredAt: now,
+            payload: {
+              createdBy: "user",
+              creationSource: "web",
+              id: threadId,
+              projectId,
+              title: threadId,
+              providerInstanceId,
+              modelSelection,
+              runtimeMode: "full-access",
+              interactionMode: "default",
+              branch: null,
+              worktreePath: null,
+              activeProviderThreadId: null,
+              lineage: {
+                parentThreadId: forkedFrom === null ? null : sourceThreadId,
+                relationshipToParent: forkedFrom === null ? null : "fork",
+                rootThreadId: sourceThreadId,
+              },
+              forkedFrom,
+              createdAt: now,
+              updatedAt: now,
+              archivedAt: null,
+              settledOverride: null,
+              settledAt: null,
+              lastVisitedAt: null,
+              deletedAt: null,
+            },
+          });
+        }
+
+        const applyRun = (
+          runId: RunId,
+          ordinal: number,
+          status: typeof heldStatus | "completed" | "rolled_back",
+        ) =>
+          projectionStore.apply({
+            id: EventId.make(`event:${runId}:${status}`),
+            type: "run.updated",
+            threadId: sourceThreadId,
+            runId,
+            nodeId: NodeId.make(`node:${runId}`),
+            driver,
+            occurredAt: now,
+            payload: {
+              id: runId,
+              threadId: sourceThreadId,
+              ordinal,
+              providerInstanceId,
+              modelSelection,
+              providerThreadId: null,
+              userMessageId: MessageId.make(`message:${runId}`),
+              rootNodeId: NodeId.make(`node:${runId}`),
+              activeAttemptId: runId === heldRunId ? heldAttemptId : null,
+              status,
+              requestedAt: now,
+              startedAt: runId === heldRunId ? null : now,
+              completedAt: status === "queued" ? null : now,
+              checkpointId: null,
+              contextHandoffId: null,
+            },
+          });
+        const applyUserItem = (input: {
+          readonly threadId: ThreadId;
+          readonly runId: RunId | null;
+          readonly ordinal: number;
+          readonly text: string;
+          readonly inputIntent: "turn_start" | "queued_turn";
+        }) =>
+          projectionStore.apply({
+            id: EventId.make(`event:${input.threadId}:item:${input.ordinal}`),
+            type: "turn-item.updated",
+            threadId: input.threadId,
+            ...(input.runId === null ? {} : { runId: input.runId }),
+            occurredAt: now,
+            payload: {
+              createdBy: "user",
+              creationSource: "web",
+              id: TurnItemId.make(`turn-item:${input.threadId}:${input.ordinal}`),
+              threadId: input.threadId,
+              runId: input.runId,
+              nodeId: null,
+              providerThreadId: null,
+              providerTurnId: null,
+              nativeItemRef: null,
+              parentItemId: null,
+              ordinal: input.ordinal,
+              status: "completed",
+              title: null,
+              startedAt: now,
+              completedAt: now,
+              updatedAt: now,
+              type: "user_message",
+              messageId: MessageId.make(`message:${input.threadId}:${input.ordinal}`),
+              inputIntent: input.inputIntent,
+              text: input.text,
+              attachments: [],
+            },
+          });
+
+        yield* applyRun(heldRunId, 1, heldStatus);
+        yield* projectionStore.apply({
+          id: EventId.make(`event:${heldAttemptId}:created`),
+          type: "run-attempt.created",
+          threadId: sourceThreadId,
+          runId: heldRunId,
+          nodeId: NodeId.make(`node:${heldRunId}`),
+          driver,
+          occurredAt: now,
+          payload: {
+            id: heldAttemptId,
+            runId: heldRunId,
+            attemptOrdinal: 1,
+            rootNodeId: NodeId.make(`node:${heldRunId}`),
+            providerInstanceId,
+            providerThreadId: ProviderThreadId.make(`provider-thread:${prefix}`),
+            providerTurnId: null,
+            reason: "initial",
+            status: heldStatus === "queued" ? "pending" : "cancelled",
+            startedAt: null,
+            completedAt: heldStatus === "queued" ? null : now,
+          },
+        });
+        yield* applyRun(answeredRunId, 2, "completed");
+        yield* applyUserItem({
+          threadId: sourceThreadId,
+          runId: heldRunId,
+          ordinal: 100,
+          text: "held",
+          inputIntent: "queued_turn",
+        });
+        yield* applyUserItem({
+          threadId: sourceThreadId,
+          runId: answeredRunId,
+          ordinal: 200,
+          text: "answered",
+          inputIntent: "turn_start",
+        });
+        yield* applyUserItem({
+          threadId: sourceThreadId,
+          runId: answeredRunId,
+          ordinal: 201,
+          text: "delivered steer",
+          inputIntent: "queued_turn",
+        });
+        // Enough local turns for a turn-limited window to count inherited rows in SQL.
+        for (let index = 0; index < THREAD_HISTORY_PAGE_POLICY.maxUserTurns; index += 1) {
+          yield* applyUserItem({
+            threadId: targetThreadId,
+            runId: null,
+            ordinal: index,
+            text: `local ${index}`,
+            inputIntent: "turn_start",
+          });
+        }
+
+        const assertForkHidesHeldInput = Effect.fn("assertForkHidesHeldInput")(function* () {
+          const target = yield* projectionStore.getThreadProjection(targetThreadId);
+          assert.deepEqual(
+            target.visibleTurnItems
+              .slice(0, 3)
+              .map((row) => (row.item.type === "user_message" ? row.item.text : row.item.type)),
+            ["answered", "delivered steer", "fork"],
+          );
+          const page = yield* projectionStore.getTimelinePage(targetThreadId, {
+            view: "activity",
+            limit: target.visibleTurnItems.length + 1,
+          });
+          assert.deepEqual(page.items, target.visibleTurnItems);
+          const bounded = yield* projectionStore.getThreadSnapshotWindow(targetThreadId, {
+            rowLimit: target.visibleTurnItems.length + 1,
+          });
+          assert.deepEqual(bounded.projection.visibleTurnItems, target.visibleTurnItems);
+          const shellSnapshot = yield* projectionStore.getShellSnapshot();
+          for (const projection of [
+            yield* projectionStore.getThreadProjection(sourceThreadId),
+            target,
+          ]) {
+            for (const shell of [
+              yield* projectionStore.getThreadShell(projection.thread.id),
+              shellSnapshot.threads.find((thread) => thread.id === projection.thread.id),
+            ]) {
+              assert.equal(shell?.visibleItemCount, projection.visibleTurnItems.length);
+            }
+          }
+          const filledLocalPage = yield* projectionStore.getThreadSnapshotWindow(targetThreadId, {
+            rowLimit: target.visibleTurnItems.length,
+            userTurnLimit: THREAD_HISTORY_PAGE_POLICY.maxUserTurns,
+          });
+          assert.deepEqual(
+            filledLocalPage.projection.visibleTurnItems.filter((row) => row.visibility === "local"),
+            target.visibleTurnItems.filter((row) => row.visibility === "local"),
+          );
+        });
+
+        yield* assertForkHidesHeldInput();
+        // Forks keep rolled-back source history, but still not undelivered input.
+        yield* applyRun(answeredRunId, 2, "rolled_back");
+        yield* assertForkHidesHeldInput();
+        // Rollback also takes cancelled runs, and overwrites the status that hid their input.
+        if (heldStatus === "cancelled") {
+          yield* applyRun(heldRunId, 1, "rolled_back");
+          yield* assertForkHidesHeldInput();
+        }
+      }
+    }),
+  );
+
   it.effect("hides source turns rewound before the fork from a fork's visible items", () =>
     Effect.gen(function* () {
       const projectionStore = yield* ProjectionStore.ProjectionStoreV2;
diff --git a/apps/server/src/orchestration-v2/ProjectionStore.ts b/apps/server/src/orchestration-v2/ProjectionStore.ts
index 22d8cfe25ddb..e90a82786953 100644
--- a/apps/server/src/orchestration-v2/ProjectionStore.ts
+++ b/apps/server/src/orchestration-v2/ProjectionStore.ts
@@ -1,5 +1,5 @@
 import type { ProjectThreadAwarenessV2Input } from "@t3tools/shared/agentAwareness";
-import { pendingGuestMessageCount } from "@t3tools/contracts";
+import { applyOrchestrationV2ThreadVisit, pendingGuestMessageCount } from "@t3tools/contracts";
 import { applyThreadPullRequestLinkUpdate } from "../sourceControl/threadPullRequests.ts";
 import { projectTurnItemForWire } from "./WireProjection.ts";
 import * as Stream from "effect/Stream";
@@ -78,10 +78,7 @@ import {
   ProjectId,
   ProviderInstanceId,
 } from "@t3tools/contracts";
-import {
-  createOrchestrationV2TurnItemVisibility,
-  isOrchestrationV2SupersededInterrupt,
-} from "@t3tools/shared/orchestrationV2Timeline";
+import { createOrchestrationV2TurnItemVisibility } from "@t3tools/shared/orchestrationV2Timeline";
 import {
   deriveBlockedOnThreadWait,
   derivePendingBackgroundWork,
@@ -425,8 +422,13 @@ export type ProjectionRecords<K extends ProjectionRecordField> = Pick<
   "thread" | K
 >;
 
+/**
+ * A page holds the oldest matches after `afterPosition`, or with `beforePosition`,
+ * the newest matches before it. `itemId` ignores both bounds.
+ */
 export interface ProjectionTimelinePageOptions {
   readonly afterPosition?: number;
+  readonly beforePosition?: number;
   readonly itemId?: TurnItemId;
   readonly attachmentId?: string;
   readonly view?: "messages" | "activity";
@@ -435,7 +437,10 @@ export interface ProjectionTimelinePageOptions {
 export interface ProjectionTimelinePage {
   readonly items: ReadonlyArray<OrchestrationV2ProjectedTurnItem>;
   readonly totalItems: number;
+  /** Matches exist after the page. */
   readonly hasMore: boolean;
+  /** Matches exist before the page. */
+  readonly hasEarlier: boolean;
 }
 
 export interface ShellSnapshotOptions {
@@ -922,6 +927,11 @@ export function applyToProjection(
         ...projection,
         thread: event.payload,
       };
+    case "thread.visit-recorded":
+      return {
+        ...projection,
+        thread: applyOrchestrationV2ThreadVisit(projection.thread, event.payload),
+      };
     case "run.created":
     case "run.updated":
       return withLocalVisibleTurnItems({
@@ -1146,15 +1156,6 @@ const encodeIdList = Schema.encodeSync(Schema.fromJsonString(Schema.Array(Schema
 const matchesNothing = (...filters: ReadonlyArray<ReadonlyArray<unknown> | undefined>) =>
   filters.some((values) => values?.length === 0);
 
-// A typed item read that names no tool type fits in migration 082's conversation index. A run or
-// node filter is left alone: it already reads through a narrower index.
-const readsConversationItemsOnly = (filter: ProjectionRecordFilter | undefined) =>
-  filter?.turnItemTypes !== undefined &&
-  filter.turnItemRunId === undefined &&
-  filter.turnItemRunIds === undefined &&
-  filter.turnItemNodeIds === undefined &&
-  filter.turnItemTypes.every((type) => DEFERRED_WORK_ITEM_TYPES.every((tool) => tool !== type));
-
 const encodeThreadPayload = Schema.encodeEffect(
   Schema.fromJsonString(OrchestrationV2AppThreadJsonSchema),
 );
@@ -1192,7 +1193,7 @@ const encodeMessagePayload = Schema.encodeEffect(
 const encodePlanPayload = Schema.encodeEffect(
   Schema.fromJsonString(OrchestrationV2PlanArtifactSchema),
 );
-const encodeTurnItemPayload = Schema.encodeEffect(
+export const encodeTurnItemPayload = Schema.encodeEffect(
   Schema.fromJsonString(OrchestrationV2TurnItemJsonSchema),
 );
 // The codec every *Json payload schema uses for timestamps, so index columns match payload_json.
@@ -1461,6 +1462,28 @@ function isTurnItemAtOrBeforeRun(input: {
   return ordinal !== undefined && ordinal <= input.sourceRunOrdinal;
 }
 
+// Run ordinals enforce the fork cutoff; this keeps later rollbacks from hiding
+// inherited history while retaining cancellation evidence for undelivered input.
+function createInheritedTurnItemVisibility(
+  source: Parameters<typeof createOrchestrationV2TurnItemVisibility>[0],
+) {
+  const cancelledRunIds = new Set(
+    source.attempts
+      .filter((attempt) => attempt.status === "cancelled")
+      .map((attempt) => attempt.runId),
+  );
+  return createOrchestrationV2TurnItemVisibility({
+    ...source,
+    runs: source.runs.flatMap((run) =>
+      run.status !== "rolled_back"
+        ? [run]
+        : cancelledRunIds.has(run.id)
+          ? [{ ...run, status: "cancelled" as const }]
+          : [],
+    ),
+  });
+}
+
 // Rollback stamps completedAt; a fork made after the rewind never received that run.
 function runRolledBackAt(run: Pick<OrchestrationV2Run, "status" | "completedAt">) {
   return run.status === "rolled_back" ? run.completedAt : null;
@@ -1495,6 +1518,11 @@ function visibleTurnItemsThroughRun(input: {
   }
 
   const runOrdinalById = forkInheritedRunOrdinals(input.sourceProjection.runs, input.forkCreatedAt);
+  const isVisible = createInheritedTurnItemVisibility({
+    runs: input.sourceProjection.runs,
+    attempts: input.sourceProjection.attempts,
+    items: input.sourceProjection.turnItems,
+  });
   const inheritedPrefix = input.sourceProjection.visibleTurnItems
     .filter(
       (row) => row.item.threadId !== input.sourceProjection.thread.id || row.item.type === "fork",
@@ -1506,23 +1534,16 @@ function visibleTurnItemsThroughRun(input: {
       item: row.item,
     }));
   const localPrefix = inheritedVisibleTurnItemsFromLocalItems(
-    input.sourceProjection.turnItems.filter((item) => {
-      if (
-        isOrchestrationV2SupersededInterrupt({
-          item,
-          attempts: input.sourceProjection.attempts,
-          items: input.sourceProjection.turnItems,
-        })
-      ) {
-        return false;
-      }
-      return isTurnItemAtOrBeforeRun({
-        historyOrigin: input.sourceProjection.thread.historyOrigin,
-        itemRunId: item.runId,
-        runOrdinalById,
-        sourceRunOrdinal: sourceRun.ordinal,
-      });
-    }),
+    input.sourceProjection.turnItems.filter(
+      (item) =>
+        isVisible(item) &&
+        isTurnItemAtOrBeforeRun({
+          historyOrigin: input.sourceProjection.thread.historyOrigin,
+          itemRunId: item.runId,
+          runOrdinalById,
+          sourceRunOrdinal: sourceRun.ordinal,
+        }),
+    ),
   );
 
   return [...inheritedPrefix, ...localPrefix];
@@ -1605,6 +1626,7 @@ function secretRequestAsPendingInput(
     kind: "user_input",
     createdAt: item.startedAt ?? item.updatedAt,
     blocking: true,
+    userOnly: true,
   };
 }
 
@@ -1795,6 +1817,7 @@ export function threadShellFromProjection(
     lastVisitedAt: projection.thread.lastVisitedAt,
     opens: projection.thread.opens ?? null,
     titleRegeneration: projection.thread.titleRegeneration ?? null,
+    lastTitleRegeneration: projection.thread.lastTitleRegeneration ?? null,
     limitRecovery: projection.thread.limitRecovery ?? null,
     deletedAt: projection.thread.deletedAt,
   };
@@ -2091,6 +2114,7 @@ function shellFromState(input: {
     lastVisitedAt: input.state.thread.lastVisitedAt,
     opens: input.state.thread.opens ?? null,
     titleRegeneration: input.state.thread.titleRegeneration ?? null,
+    lastTitleRegeneration: input.state.thread.lastTitleRegeneration ?? null,
     limitRecovery: input.state.thread.limitRecovery ?? null,
     deletedAt: input.state.thread.deletedAt,
   };
@@ -2223,6 +2247,15 @@ export const layer: Layer.Layer<ProjectionStoreV2, never, SqlClient.SqlClient> =
               });
               break;
             }
+            case "thread.visit-recorded": {
+              const thread = yield* getThread(event.threadId);
+              yield* apply({
+                ...event,
+                type: "thread.visited",
+                payload: applyOrchestrationV2ThreadVisit(thread, event.payload),
+              });
+              break;
+            }
             case "thread.created":
             case "thread.archived":
             case "thread.unarchived":
@@ -3055,6 +3088,7 @@ export const layer: Layer.Layer<ProjectionStoreV2, never, SqlClient.SqlClient> =
             event.type !== "thread.active-reordered" &&
             event.type !== "thread.tags-updated" &&
             event.type !== "thread.visited" &&
+            event.type !== "thread.visit-recorded" &&
             event.type !== "thread.marked-unread" &&
             event.type !== "thread.metadata-updated" &&
             event.type !== "thread.pull-request-synced" &&
@@ -3119,16 +3153,27 @@ export const layer: Layer.Layer<ProjectionStoreV2, never, SqlClient.SqlClient> =
                       ),
                       9223372036854775807
                     )
+                    -- The fork cutoff below filters rewound runs; undelivered queued input stays hidden.
                     AND (
                       ${window.requiredRunId ?? null} IS NOT NULL
-                      OR (
-                        (run.status IS NULL OR run.status <> 'rolled_back')
-                        AND NOT (
-                          item.type = 'user_message'
-                          AND json_extract(item.payload_json, '$.inputIntent') = 'queued_turn'
-                          AND run.status IS 'cancelled'
+                      OR run.status IS NULL
+                      OR run.status <> 'rolled_back'
+                    )
+                    AND NOT (
+                      item.type = 'user_message'
+                      AND (
+                        COALESCE(run.status IN ('queued', 'cancelled'), 0)
+                        OR (
+                          run.status = 'rolled_back'
+                          AND EXISTS (
+                            SELECT 1
+                            FROM orchestration_v2_projection_run_attempts AS attempt
+                            WHERE attempt.run_id = run.run_id
+                              AND attempt.status = 'cancelled'
+                          )
                         )
                       )
+                      AND json_extract(item.payload_json, '$.inputIntent') = 'queued_turn'
                     )
                     AND (
                       ${window.requiredRunId ?? null} IS NULL
@@ -3451,6 +3496,16 @@ export const layer: Layer.Layer<ProjectionStoreV2, never, SqlClient.SqlClient> =
               `;
     });
 
+    const turnItemMatch = (threadId: ThreadId, filter: ProjectionRecordFilter | undefined) => sql`
+      thread_id = ${threadId}
+        ${filter?.turnItemRequestIds === undefined ? sql`` : sql`AND json_extract(payload_json, '$.requestId') IN (SELECT value FROM json_each(${encodeIdList(filter.turnItemRequestIds)}))`}
+        ${filter?.turnItemTypes === undefined ? sql`` : sql`AND type IN (SELECT value FROM json_each(${encodeIdList(filter.turnItemTypes)}))`}
+        ${filter?.turnItemStatuses === undefined ? sql`` : sql`AND status IN (SELECT value FROM json_each(${encodeIdList(filter.turnItemStatuses)}))`}
+        ${filter?.turnItemRunId === undefined ? sql`` : sql`AND run_id = ${filter.turnItemRunId}`}
+        ${filter?.turnItemNodeIds === undefined ? sql`` : sql`AND node_id IN (SELECT value FROM json_each(${encodeIdList(filter.turnItemNodeIds)}))`}
+        ${filter?.turnItemRunIds === undefined ? sql`` : sql`AND (run_id IN (SELECT value FROM json_each(${encodeIdList(filter.turnItemRunIds.filter((id): id is RunId => id !== null))})) OR (${filter.turnItemRunIds.includes(null) ? 1 : 0} = 1 AND run_id IS NULL))`}
+    `;
+
     // An id filter reads by primary key. `+` keeps SQLite off the thread index, which walks
     // every row of the thread to find the few ids.
     const threadColumn = (ids: ReadonlyArray<unknown> | undefined, column = "thread_id") =>
@@ -3551,19 +3606,14 @@ export const layer: Layer.Layer<ProjectionStoreV2, never, SqlClient.SqlClient> =
                 SELECT payload_json
                 FROM orchestration_v2_projection_turn_items
                 ${
-                  // A type list of conversation items reads them from the conversation index.
-                  // Any other plan fetches every tool call of the thread to check its type.
-                  readsConversationItemsOnly(filter)
-                    ? sql`INDEXED BY orchestration_v2_projection_turn_items_conversation_idx
-                WHERE thread_id = ${threadId} AND type NOT IN ${CONVERSATION_INDEX_EXCLUDED_TYPES}`
-                    : sql`WHERE thread_id = ${threadId}`
+                  filter?.turnItemTypes === undefined
+                    ? sql`WHERE ${turnItemMatch(threadId, filter)}`
+                    : // Seeks the type index. Sorted, SQLite would walk the thread by ordinal instead.
+                      sql`WHERE rowid IN (
+                    SELECT rowid FROM orchestration_v2_projection_turn_items
+                    WHERE ${turnItemMatch(threadId, filter)}
+                  )`
                 }
-                  ${filter?.turnItemRequestIds === undefined ? sql`` : sql`AND json_extract(payload_json, '$.requestId') IN (SELECT value FROM json_each(${encodeIdList(filter.turnItemRequestIds)}))`}
-                  ${filter?.turnItemTypes === undefined ? sql`` : sql`AND type IN (SELECT value FROM json_each(${encodeIdList(filter.turnItemTypes)}))`}
-                  ${filter?.turnItemStatuses === undefined ? sql`` : sql`AND status IN (SELECT value FROM json_each(${encodeIdList(filter.turnItemStatuses)}))`}
-                  ${filter?.turnItemRunId === undefined ? sql`` : sql`AND run_id = ${filter.turnItemRunId}`}
-                  ${filter?.turnItemNodeIds === undefined ? sql`` : sql`AND node_id IN (SELECT value FROM json_each(${encodeIdList(filter.turnItemNodeIds)}))`}
-                  ${filter?.turnItemRunIds === undefined ? sql`` : sql`AND (run_id IN (SELECT value FROM json_each(${encodeIdList(filter.turnItemRunIds.filter((id): id is RunId => id !== null))})) OR (${filter.turnItemRunIds.includes(null) ? 1 : 0} = 1 AND run_id IS NULL))`}
                 ORDER BY ordinal ASC, turn_item_id ASC
               `
               : yield* sql<PayloadRow>`
@@ -3782,7 +3832,7 @@ export const layer: Layer.Layer<ProjectionStoreV2, never, SqlClient.SqlClient> =
                 OR run_id IN (SELECT value FROM json_each(${cohortRunIds}))
                 OR run_id = ${window.requiredRunId ?? null}
                 ${
-                  // The shell's latest run, even a steer-cancelled one outside the newest window.
+                  // Keep the shell's latest run even when its items are outside the newest window.
                   window.anchorItemId === undefined && window.requiredRunId === undefined
                     ? sql`OR run_id = ${presentedShellRunId(sql`${threadId}`)}`
                     : sql``
@@ -6365,18 +6415,18 @@ export const layer: Layer.Layer<ProjectionStoreV2, never, SqlClient.SqlClient> =
         let inherited: Array<TimelineIndexRow> = [];
         if (sourceRun !== undefined) {
           const ordinals = forkInheritedRunOrdinals(source.records.runs, records.thread.createdAt);
-          const sourceItems = source.local.map((row) => row.item);
+          const isInheritedVisible = createInheritedTurnItemVisibility({
+            runs: source.records.runs,
+            attempts: source.records.attempts,
+            items: source.local.map((row) => row.item),
+          });
           inherited = [
             ...source.visible.filter(
               (row) => row.item.threadId !== fork.threadId || row.item.type === "fork",
             ),
             ...source.local.filter(
               (row) =>
-                !isOrchestrationV2SupersededInterrupt({
-                  item: row.item,
-                  attempts: source.records.attempts,
-                  items: sourceItems,
-                }) &&
+                isInheritedVisible(row.item) &&
                 isTurnItemAtOrBeforeRun({
                   historyOrigin: source.records.thread.historyOrigin,
                   itemRunId: row.item.runId,
@@ -6573,13 +6623,13 @@ export const layer: Layer.Layer<ProjectionStoreV2, never, SqlClient.SqlClient> =
         })),
       });
       // Only these runs can hide rows: every row of a rolled-back run, the queued turn of a
-      // cancelled run, and the stop result of a replaced attempt. So the hidden rows are found
-      // without reading the thread.
+      // queued or cancelled run, and the stop result of a replaced attempt. So the hidden rows
+      // are found without reading the thread.
       const stoppedRuns = new Set(stopRequests.map((row) => row.run_id));
-      const runsWithStatus = (status: "rolled_back" | "cancelled") =>
-        records.runs.flatMap((run) => (run.status === status ? [String(run.id)] : []));
+      const runsWithStatus = (...statuses: ReadonlyArray<OrchestrationV2Run["status"]>) =>
+        records.runs.flatMap((run) => (statuses.includes(run.status) ? [String(run.id)] : []));
       const rolledBack = runsWithStatus("rolled_back");
-      const cancelled = runsWithStatus("cancelled");
+      const heldInput = runsWithStatus("queued", "cancelled");
       const steered = [...new Set(superseded.map((attempt) => String(attempt.runId)))].filter(
         (runId) => !stoppedRuns.has(runId) && !rolledBack.includes(runId),
       );
@@ -6604,8 +6654,8 @@ export const layer: Layer.Layer<ProjectionStoreV2, never, SqlClient.SqlClient> =
                 INDEXED BY orchestration_v2_projection_turn_items_thread_run_idx
                 ON item.thread_id = ${threadId} AND item.run_id = wanted.value`,
         // The conversation index holds the type and run of these rows, so only the matches are
-        // fetched. Through the run index, every row of each cancelled run would be.
-        cancelled.length + steered.length === 0
+        // fetched. Through the run index, every row of each such run would be.
+        heldInput.length + steered.length === 0
           ? Effect.succeed([])
           : sql<HiddenCandidate>`
               SELECT ${candidateColumns}
@@ -6614,7 +6664,7 @@ export const layer: Layer.Layer<ProjectionStoreV2, never, SqlClient.SqlClient> =
               WHERE item.thread_id = ${threadId}
                 AND item.type NOT IN ${CONVERSATION_INDEX_EXCLUDED_TYPES}
                 AND ((item.type = 'user_message'
-                    AND item.run_id IN (SELECT value FROM json_each(${encodeIdList(cancelled)})))
+                    AND item.run_id IN (SELECT value FROM json_each(${encodeIdList(heldInput)})))
                   OR (item.type = 'run_interrupt_result'
                     AND item.run_id IN (SELECT value FROM json_each(${encodeIdList(steered)}))))`,
       ]);
@@ -6943,6 +6993,16 @@ export const layer: Layer.Layer<ProjectionStoreV2, never, SqlClient.SqlClient> =
                   const historyItems =
                     workMode === "deferred" ? deferWorkHistoryRows(indexed) : indexed;
                   const policy = olderHistoryPagePolicy({ items: indexed, cursor, throughEntryId });
+                  // Folding can hide the cursor's row: a snapshot folds no work in a thread with no
+                  // user turn. The page then ends at the first row kept from the cursor on.
+                  const cursorRow =
+                    indexed[findCursorEndIndex(indexed, decodeThreadHistoryCursor(cursor))];
+                  const end =
+                    cursorRow === undefined
+                      ? -1
+                      : historyItems.findIndex(
+                          (row) => row.canonicalPosition >= cursorRow.canonicalPosition,
+                        );
                   const page =
                     workMode === "work"
                       ? selectDeferredWorkPage({
@@ -6955,6 +7015,7 @@ export const layer: Layer.Layer<ProjectionStoreV2, never, SqlClient.SqlClient> =
                       : selectHistoryPageFromCursor({
                           items: historyItems,
                           cursor,
+                          exclusiveEndIndex: end === -1 ? historyItems.length : end,
                           snapshotSequence,
                           rowEncodedBytes: () => 0,
                           policy,
@@ -7141,12 +7202,9 @@ export const layer: Layer.Layer<ProjectionStoreV2, never, SqlClient.SqlClient> =
     const matchLocalTimelineRows = Effect.fn("ProjectionStore.matchLocalTimelineRows")(function* (
       local: LocalTimeline,
       options: ProjectionTimelinePageOptions,
+      totalItems: number,
     ) {
       const threadId = local.records.thread.id;
-      const totals = yield* sql<{ count: number }>`
-        SELECT COUNT(*) AS count FROM orchestration_v2_projection_turn_items
-        WHERE thread_id = ${threadId}`;
-      const totalItems = (totals[0]?.count ?? 0) - local.hidden.length;
       if (options.itemId !== undefined) {
         const found = (yield* local.read(sql`AND item.turn_item_id = ${options.itemId}`)).filter(
           local.isVisible,
@@ -7156,7 +7214,7 @@ export const layer: Layer.Layer<ProjectionStoreV2, never, SqlClient.SqlClient> =
             .visibleBefore(item.ordinal, item.id)
             .pipe(Effect.map((position) => ({ ...localTimelineRow(item), position }))),
         );
-        return { matching, totalItems };
+        return { matching, totalItems, hasEarlier: false };
       }
       const afterPosition = options.afterPosition ?? -1;
       const firstPosition = Math.max(afterPosition + 1, 0);
@@ -7167,7 +7225,7 @@ export const layer: Layer.Layer<ProjectionStoreV2, never, SqlClient.SqlClient> =
         WHERE thread_id = ${threadId}
         ORDER BY ordinal ASC, turn_item_id ASC LIMIT 1 OFFSET ${firstPosition}`;
       const start = starts[0]?.ordinal;
-      if (start === undefined) return { matching: [], totalItems };
+      if (start === undefined) return { matching: [], totalItems, hasEarlier: false };
       const base = yield* local.visibleBefore(start);
       const hiddenAfter = local.hidden.filter((row) => row.ordinal >= start).length;
       const messagesOnly = options.view !== "activity";
@@ -7191,13 +7249,69 @@ export const layer: Layer.Layer<ProjectionStoreV2, never, SqlClient.SqlClient> =
             positions.set(row.turn_item_id, base + positions.size);
         }
       }
-      const matching = candidates
-        .map((item, offset) => ({
-          ...localTimelineRow(item),
-          position: messagesOnly ? (positions.get(item.id) ?? -1) : base + offset,
-        }))
-        .filter((row) => row.position > afterPosition);
-      return { matching, totalItems };
+      const rows = candidates.map((item, offset) => ({
+        ...localTimelineRow(item),
+        position: messagesOnly ? (positions.get(item.id) ?? -1) : base + offset,
+      }));
+      const matching = rows.filter((row) => row.position > afterPosition);
+      // At most `hidden.length` of the first matches before the start are hidden.
+      const hasEarlier =
+        matching.length < rows.length ||
+        (base > 0 &&
+          (!messagesOnly ||
+            (yield* local.read(
+              sql`AND item.ordinal < ${start}
+                AND item.type IN ('user_message', 'assistant_message', 'proposed_plan')`,
+              sql`LIMIT ${local.hidden.length + 1}`,
+            )).some(local.isVisible)));
+      return { matching, totalItems, hasEarlier };
+    });
+
+    /**
+     * A `getTimelinePage` page from `matchLocalTimelineRows`. A backward page reads forward from
+     * ever earlier starts until it holds `limit` matches or reaches `afterPosition`.
+     */
+    const readLocalTimelinePage = Effect.fn("ProjectionStore.readLocalTimelinePage")(function* (
+      local: LocalTimeline,
+      options: ProjectionTimelinePageOptions,
+    ) {
+      const totals = yield* sql<{ count: number }>`
+        SELECT COUNT(*) AS count FROM orchestration_v2_projection_turn_items
+        WHERE thread_id = ${local.records.thread.id}`;
+      const totalItems = (totals[0]?.count ?? 0) - local.hidden.length;
+      if (options.beforePosition === undefined || options.itemId !== undefined) {
+        const { matching, hasEarlier } = yield* matchLocalTimelineRows(local, options, totalItems);
+        return {
+          page: matching.slice(0, options.limit),
+          totalItems,
+          hasMore: matching.length > options.limit,
+          hasEarlier,
+        };
+      }
+      const afterPosition = options.afterPosition ?? -1;
+      const end = Math.min(options.beforePosition, totalItems);
+      let span = Math.max(options.limit, 1);
+      while (true) {
+        // The `span` positions before `end` hold at most `span` matches, so a forward read of
+        // `span + 1` from the start holds all of them and shows whether any follow.
+        const from = Math.max(afterPosition, end - span - 1);
+        const read = yield* matchLocalTimelineRows(
+          local,
+          { ...options, afterPosition: from, limit: span },
+          totalItems,
+        );
+        const before = read.matching.filter((row) => row.position < end);
+        if (before.length >= options.limit || from === afterPosition) {
+          const page = before.slice(Math.max(0, before.length - options.limit));
+          return {
+            page,
+            totalItems,
+            hasMore: read.matching.length > before.length,
+            hasEarlier: read.hasEarlier || before.length > page.length,
+          };
+        }
+        span *= 2;
+      }
     });
 
     const getTimelinePage: ProjectionStoreV2Shape["getTimelinePage"] = (threadId, options) =>
@@ -7208,7 +7322,10 @@ export const layer: Layer.Layer<ProjectionStoreV2, never, SqlClient.SqlClient> =
               options.attachmentId === undefined &&
               Number.isSafeInteger(options.limit) &&
               options.limit >= 0 &&
-              Number.isSafeInteger(options.afterPosition ?? -1)
+              Number.isSafeInteger(options.afterPosition ?? -1) &&
+              (options.beforePosition === undefined ||
+                options.beforePosition === Number.POSITIVE_INFINITY ||
+                Number.isSafeInteger(options.beforePosition))
                 ? yield* openLocalTimeline(threadId)
                 : null;
             const whole = Effect.gen(function* () {
@@ -7227,26 +7344,43 @@ export const layer: Layer.Layer<ProjectionStoreV2, never, SqlClient.SqlClient> =
                         (row) => `${row.thread_id}:${row.turn_item_id}`,
                       ),
                     );
-              const matching = index.visible
+              const inView = index.visible
                 .map((row, position) => ({ ...row, position }))
                 .filter((row) =>
                   options.itemId === undefined
-                    ? row.position > (options.afterPosition ?? -1) &&
-                      (options.view === "activity" ||
-                        ["user_message", "assistant_message", "proposed_plan"].includes(
-                          row.item.type,
-                        ))
+                    ? options.view === "activity" ||
+                      ["user_message", "assistant_message", "proposed_plan"].includes(row.item.type)
                     : row.sourceItemId === options.itemId,
                 )
                 .filter(
                   (row) =>
                     attachmentOwners?.has(`${row.sourceThreadId}:${row.sourceItemId}`) ?? true,
                 );
-              return { matching, totalItems: index.visible.length };
+              const before = options.beforePosition ?? Number.POSITIVE_INFINITY;
+              const matching =
+                options.itemId === undefined
+                  ? inView.filter(
+                      (row) =>
+                        row.position > (options.afterPosition ?? -1) && row.position < before,
+                    )
+                  : inView;
+              const page =
+                options.beforePosition === undefined
+                  ? matching.slice(0, options.limit)
+                  : matching.slice(Math.max(0, matching.length - options.limit));
+              const pageStart = page[0]?.position ?? (options.afterPosition ?? -1) + 1;
+              return {
+                page,
+                totalItems: index.visible.length,
+                hasMore:
+                  options.beforePosition === undefined
+                    ? matching.length > page.length
+                    : (inView.at(-1)?.position ?? -1) >= before,
+                hasEarlier: (inView[0]?.position ?? Number.POSITIVE_INFINITY) < pageStart,
+              };
             });
-            const { matching, totalItems } =
-              local === null ? yield* whole : yield* matchLocalTimelineRows(local, options);
-            const page = matching.slice(0, options.limit);
+            const { page, totalItems, hasMore, hasEarlier } =
+              local === null ? yield* whole : yield* readLocalTimelinePage(local, options);
             const sources = yield* encodeTimelineSources(
               page
                 .filter((row) => row.synthetic === undefined)
@@ -7295,7 +7429,7 @@ export const layer: Layer.Layer<ProjectionStoreV2, never, SqlClient.SqlClient> =
                 };
               }),
             );
-            return { items, totalItems, hasMore: matching.length > page.length };
+            return { items, totalItems, hasMore, hasEarlier };
           }),
         )
         .pipe(
@@ -7422,7 +7556,7 @@ export const layer: Layer.Layer<ProjectionStoreV2, never, SqlClient.SqlClient> =
         )
       )`;
     };
-    // The newest run not waiting in a held queue, matching latestUnheldRun.
+    // The newest run not held or outlived before it started, matching latestUnheldRun.
     const presentedShellRunId = (threadId: Statement.Fragment) => sql`(
       SELECT candidate.run_id
       FROM orchestration_v2_projection_runs candidate
@@ -7431,6 +7565,22 @@ export const layer: Layer.Layer<ProjectionStoreV2, never, SqlClient.SqlClient> =
           candidate.status = 'queued'
           AND json_extract(candidate.payload_json, '$.queueHeld') IS 1
         )
+        AND NOT (
+          candidate.status = 'cancelled'
+          AND json_extract(candidate.payload_json, '$.startedAt') IS NULL
+          AND candidate.completed_at IS NOT NULL
+          AND EXISTS (
+            SELECT 1 FROM orchestration_v2_projection_runs earlier
+            WHERE earlier.thread_id = candidate.thread_id
+              AND earlier.ordinal < candidate.ordinal
+              AND earlier.status <> 'queued'
+              AND NOT ${isSilentShellRun("earlier")}
+              AND (
+                earlier.completed_at IS NULL
+                OR julianday(earlier.completed_at) >= julianday(candidate.completed_at)
+              )
+          )
+        )
         AND NOT ${isSilentShellRun("candidate")}
       ORDER BY candidate.ordinal DESC, candidate.run_id DESC
       LIMIT 1
@@ -7531,12 +7681,11 @@ export const layer: Layer.Layer<ProjectionStoreV2, never, SqlClient.SqlClient> =
               (
                 SELECT item.payload_json
                 FROM orchestration_v2_projection_turn_items item
-                INNER JOIN orchestration_v2_projection_runs r ON r.run_id = item.run_id
-                WHERE r.run_id = presented.run_id
-                  AND r.status = 'failed'
+                WHERE presented.status = 'failed'
                   AND item.thread_id = t.thread_id
+                  AND item.run_id = presented.run_id
                   AND item.type = 'error' AND item.status = 'failed'
-                  AND item.node_id IS json_extract(r.payload_json, '$.rootNodeId')
+                  AND item.node_id IS json_extract(presented.payload_json, '$.rootNodeId')
                 ORDER BY item.updated_at DESC, item.ordinal DESC, item.turn_item_id DESC
                 LIMIT 1
               ) AS terminal_failure_payload_json,
@@ -7654,9 +7803,9 @@ export const layer: Layer.Layer<ProjectionStoreV2, never, SqlClient.SqlClient> =
               projectId === undefined ? sql`` : sql` AND t.project_id = ${projectId}`
             }${
               location === "active"
-                ? sql` AND json_extract(t.payload_json, '$.archivedAt') IS NULL`
+                ? sql` AND t.archived_at IS NULL`
                 : location === "archive"
-                  ? sql` AND json_extract(t.payload_json, '$.archivedAt') IS NOT NULL`
+                  ? sql` AND t.archived_at IS NOT NULL`
                   : sql``
             }${
               unsettledOnly
@@ -7665,7 +7814,8 @@ export const layer: Layer.Layer<ProjectionStoreV2, never, SqlClient.SqlClient> =
             }${
               familyOf === undefined
                 ? sql``
-                : sql` AND json_extract(t.payload_json, '$.lineage.rootThreadId') = (
+                : sql` AND CASE WHEN json_valid(t.payload_json)
+                    THEN json_extract(t.payload_json, '$.lineage.rootThreadId') END = (
                     SELECT json_extract(member.payload_json, '$.lineage.rootThreadId')
                     FROM orchestration_v2_projection_threads member
                     WHERE member.thread_id = ${familyOf}
@@ -7673,7 +7823,8 @@ export const layer: Layer.Layer<ProjectionStoreV2, never, SqlClient.SqlClient> =
             }${
               worktreePath === undefined
                 ? sql``
-                : sql` AND json_extract(t.payload_json, '$.worktreePath') = ${worktreePath}`
+                : sql` AND CASE WHEN json_valid(t.payload_json)
+                    THEN json_extract(t.payload_json, '$.worktreePath') END = ${worktreePath}`
             }${threadIds === undefined ? sql`` : sql` AND t.thread_id IN (SELECT value FROM json_each(${encodeIdList(threadIds)}))`}
             ORDER BY t.updated_at ASC, t.thread_id ASC
           `;
@@ -7692,22 +7843,66 @@ export const layer: Layer.Layer<ProjectionStoreV2, never, SqlClient.SqlClient> =
             WHERE thread_id IN (SELECT value FROM json_each(${encodeIdList(threadIds)}))
           `;
 
+    // Forks do not inherit undelivered queued input, including from cancelled runs
+    // rolled back later. Checking the run first limits sparse-index seeks to those few runs.
     const selectShellRunItemCounts = (threadIds: ReadonlyArray<ThreadId>) =>
       sql<ShellRunItemCountRow>`
-        SELECT thread_id, run_key AS run_id, item_count
-        FROM orchestration_v2_projection_turn_item_counts
-        WHERE run_key <> '' AND thread_id IN (SELECT value FROM json_each(${encodeIdList(threadIds)}))
+        SELECT per_run.thread_id, per_run.run_key AS run_id,
+          per_run.item_count - CASE
+            WHEN EXISTS (
+              SELECT 1
+              FROM orchestration_v2_projection_runs AS run
+                INDEXED BY orchestration_v2_projection_runs_run_status_idx
+              WHERE run.run_id = per_run.run_key
+                AND (
+                  run.status IN ('queued', 'cancelled')
+                  OR (
+                    run.status = 'rolled_back'
+                    AND EXISTS (
+                      SELECT 1
+                      FROM orchestration_v2_projection_run_attempts AS attempt
+                      WHERE attempt.run_id = run.run_id
+                        AND attempt.status = 'cancelled'
+                    )
+                  )
+                )
+            ) THEN (
+              SELECT COUNT(*)
+              FROM orchestration_v2_projection_turn_items AS held
+                INDEXED BY orchestration_v2_projection_turn_items_queued_input_idx
+              WHERE held.run_id = per_run.run_key
+                AND held.type = 'user_message'
+                AND json_extract(held.payload_json, '$.inputIntent') = 'queued_turn'
+            )
+            ELSE 0
+          END AS item_count
+        FROM orchestration_v2_projection_turn_item_counts AS per_run
+        WHERE per_run.run_key <> '' AND per_run.thread_id IN (SELECT value FROM json_each(${encodeIdList(threadIds)}))
       `;
 
     const selectShellItemCounts = (threadIds: ReadonlyArray<ThreadId>) =>
       sql<ShellItemCountRow>`
         SELECT counts.thread_id,
           SUM(CASE WHEN counts.run_key = '' OR r.status <> 'rolled_back'
-            THEN counts.item_count ELSE 0 END) AS item_count,
+            THEN counts.item_count - CASE
+              WHEN r.status IN ('queued', 'cancelled') THEN (
+                SELECT COUNT(*)
+                FROM orchestration_v2_projection_turn_items held
+                INDEXED BY orchestration_v2_projection_turn_items_queued_input_idx
+                WHERE held.run_id = counts.run_key
+                  AND held.type = 'user_message'
+                  AND json_extract(held.payload_json, '$.inputIntent') = 'queued_turn'
+              )
+              ELSE 0
+            END
+            ELSE 0 END) AS item_count,
           SUM(CASE WHEN counts.run_key = '' THEN counts.item_count ELSE 0 END)
             AS runless_item_count
         FROM orchestration_v2_projection_turn_item_counts counts
-        LEFT JOIN orchestration_v2_projection_runs r ON r.run_id = counts.run_key
+        -- The primary key would load each run's whole row just for its status.
+        LEFT JOIN orchestration_v2_projection_runs r
+          INDEXED BY orchestration_v2_projection_runs_run_status_idx
+          ON r.run_id = counts.run_key
         WHERE counts.thread_id IN (SELECT value FROM json_each(${encodeIdList(threadIds)}))
         GROUP BY counts.thread_id
       `;
@@ -8567,7 +8762,7 @@ export const layer: Layer.Layer<ProjectionStoreV2, never, SqlClient.SqlClient> =
           ) AS has_remote_tasks
         FROM orchestration_v2_projection_threads t
         WHERE t.deleted_at IS NULL
-          AND json_extract(t.payload_json, '$.archivedAt') IS NULL
+          AND t.archived_at IS NULL
         ORDER BY t.updated_at ASC, t.thread_id ASC
       `;
       return rows.map((row): ActiveShellIndexEntry => ({
diff --git a/apps/server/src/orchestration-v2/ProviderCommitBatch.test.ts b/apps/server/src/orchestration-v2/ProviderCommitBatch.test.ts
index 6655d1554533..dd159a2ff14e 100644
--- a/apps/server/src/orchestration-v2/ProviderCommitBatch.test.ts
+++ b/apps/server/src/orchestration-v2/ProviderCommitBatch.test.ts
@@ -81,7 +81,7 @@ it.effect("publishes preceding snapshots before a control", () =>
     assert.deepEqual(yield* Queue.take(recorder.output), [event(2)]);
     assert.deepEqual(yield* Queue.take(recorder.output), [control]);
     yield* Fiber.join(consumer);
-  }).pipe(Effect.scoped),
+  }),
 );
 
 it.effect("publishes isolated snapshots without advancing the clock", () =>
@@ -104,7 +104,7 @@ it.effect("publishes isolated snapshots without advancing the clock", () =>
       assert.equal(published._tag, "Some");
       if (published._tag === "Some") assert.deepEqual(published.value, [raw]);
     }
-  }).pipe(Effect.scoped),
+  }),
 );
 
 it.effect("bounds transactions by count and bytes, including the final partial group", () =>
@@ -148,7 +148,7 @@ it.effect("bounds transactions by count and bytes, including the final partial g
       );
       assert.deepEqual(batches.flat(), events);
     }
-  }).pipe(Effect.scoped),
+  }),
 );
 
 it.effect("keeps updates immediate and ordered when batching is disabled", () =>
@@ -164,7 +164,7 @@ it.effect("keeps updates immediate and ordered when batching is disabled", () =>
       Effect.succeed(false),
     );
     assert.deepEqual(seen, [event(1), control, event(2)]);
-  }).pipe(Effect.scoped),
+  }),
 );
 
 it.effect.each([
@@ -226,7 +226,7 @@ it.effect.each([
       );
       for (const input of inputs) yield* Queue.offer(input, control);
       yield* Effect.forEach(consumers, Fiber.join);
-    }).pipe(Effect.scoped),
+    }),
 );
 
 it.effect("does not hold the shared worker while one consumer checks background work", () =>
@@ -251,7 +251,7 @@ it.effect("does not hold the shared worker while one consumer checks background
     );
     yield* Deferred.succeed(release, undefined);
     yield* Fiber.join(consumer);
-  }).pipe(Effect.scoped),
+  }),
 );
 
 it.effect.each(["job", "commit"] as const)(
@@ -296,7 +296,7 @@ it.effect.each(["job", "commit"] as const)(
         yield* coordinator.barrier(Effect.fail("original error")).pipe(Effect.exit),
         Exit.fail("original error"),
       );
-    }).pipe(Effect.scoped),
+    }),
 );
 
 it.effect("keeps a transaction failure when rolling back one failed snapshot", () =>
@@ -315,7 +315,7 @@ it.effect("keeps a transaction failure when rolling back one failed snapshot", (
       .pipe(Effect.exit);
     assert.isTrue(Exit.isFailure(exit));
     if (Exit.isFailure(exit)) assert.strictEqual(Cause.squash(exit.cause), transactionError);
-  }).pipe(Effect.scoped),
+  }),
 );
 
 it.effect(
@@ -353,7 +353,7 @@ it.effect(
       assert.isTrue(yield* Deferred.isDone(committed));
       yield* Fiber.join(command);
       yield* Fiber.join(consumer);
-    }).pipe(Effect.scoped),
+    }),
 );
 
 it.effect.each([false, true])(
@@ -401,7 +401,7 @@ it.effect.each([false, true])(
         [event(-1)],
         Array.from({ length: cancel ? 9 : 10 }, (_, index) => event(index + (cancel ? 1 : 0))),
       ]);
-    }).pipe(Effect.scoped),
+    }),
 );
 
 it.effect.each(["failure", "stop"] as const)(
@@ -430,7 +430,7 @@ it.effect.each(["failure", "stop"] as const)(
         yield* coordinator.barrier(Effect.succeed("still available")),
         "still available",
       );
-    }).pipe(Effect.scoped),
+    }),
 );
 
 it.effect("does not force a separate commit for every consumer that ends", () =>
@@ -458,7 +458,7 @@ it.effect("does not force a separate commit for every consumer that ends", () =>
       (yield* Queue.takeAll(coordinator.output)).map((batch) => batch.length),
       [10],
     );
-  }).pipe(Effect.scoped),
+  }),
 );
 
 it.effect("settles calls made after the coordinator's scope closes", () =>
diff --git a/apps/server/src/orchestration-v2/ProviderEventIngestor.test.ts b/apps/server/src/orchestration-v2/ProviderEventIngestor.test.ts
index 520fea7c0575..f69444d23571 100644
--- a/apps/server/src/orchestration-v2/ProviderEventIngestor.test.ts
+++ b/apps/server/src/orchestration-v2/ProviderEventIngestor.test.ts
@@ -231,99 +231,97 @@ function threadCreatedEvent(
 const layer = it.layer(layerTest);
 
 it.effect("refreshes the failing instance snapshot after a committed usage_limit terminal", () =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      const refreshed = yield* Deferred.make<void>();
-      const adapter = yield* ProviderAdapter.ProviderAdapterV2.pipe(
-        Effect.provide(
-          Layer.mock(ProviderAdapter.ProviderAdapterV2)({
-            instanceId: ProviderInstanceId.make("cursor-work"),
-            driver: ProviderDriverKind.make("cursor"),
-          }),
-        ),
-      );
-      const instance: ProviderInstance = {
-        instanceId: ProviderInstanceId.make("cursor-work"),
+  Effect.gen(function* () {
+    const refreshed = yield* Deferred.make<void>();
+    const adapter = yield* ProviderAdapter.ProviderAdapterV2.pipe(
+      Effect.provide(
+        Layer.mock(ProviderAdapter.ProviderAdapterV2)({
+          instanceId: ProviderInstanceId.make("cursor-work"),
+          driver: ProviderDriverKind.make("cursor"),
+        }),
+      ),
+    );
+    const instance: ProviderInstance = {
+      instanceId: ProviderInstanceId.make("cursor-work"),
+      driverKind: ProviderDriverKind.make("cursor"),
+      continuationIdentity: {
         driverKind: ProviderDriverKind.make("cursor"),
-        continuationIdentity: {
-          driverKind: ProviderDriverKind.make("cursor"),
-          continuationKey: "work",
-        },
-        enabled: true,
-        displayName: undefined,
-        orchestrationAdapter: adapter,
-        textGeneration: {
-          generateBranchName: () => Effect.die("unused"),
-          generateCommitMessage: () => Effect.die("unused"),
-          generatePrContent: () => Effect.die("unused"),
-          generateThreadTitle: () => Effect.die("unused"),
-          generateReviewGuide: () => Effect.die("unused"),
-          generateTranscriptionPostProcessing: () => Effect.die("unused"),
-        },
-        snapshot: {
-          refreshUsage: Deferred.succeed(refreshed, undefined).pipe(Effect.asVoid),
-          getSnapshot: Effect.die("unused"),
-          refresh: Effect.die("unused"),
-          resolveMaintenance: () => Effect.die("unused"),
-          applyUsageLimits: () => Effect.die("unused"),
-          streamChanges: Stream.empty,
-        },
-      };
-      const lookups: ProviderInstanceId[] = [];
-      const instances = Layer.mock(ProviderInstanceRegistry.ProviderInstanceRegistry)({
-        getInstance: (id) =>
-          Effect.sync(() => {
-            lookups.push(id);
-            return id === instance.instanceId ? instance : undefined;
-          }),
-      });
-      yield* Effect.gen(function* () {
-        const now = yield* DateTime.now;
-        const eventSink = yield* EventSink.EventSinkV2;
-        const ingestor = yield* ProviderEventIngestor.ProviderEventIngestorV2;
-        const idAllocator = yield* IdAllocator.IdAllocatorV2;
-        const threadEvent = yield* threadCreatedEvent(now);
-        yield* eventSink.write({ events: [threadEvent] });
-        const input = {
-          providerSessionId: yield* idAllocator.allocate.providerSession({
-            providerInstanceId: instance.instanceId,
-            threadId: threadEvent.threadId,
-          }),
+        continuationKey: "work",
+      },
+      enabled: true,
+      displayName: undefined,
+      orchestrationAdapter: adapter,
+      textGeneration: {
+        generateBranchName: () => Effect.die("unused"),
+        generateCommitMessage: () => Effect.die("unused"),
+        generatePrContent: () => Effect.die("unused"),
+        generateThreadTitle: () => Effect.die("unused"),
+        generateReviewGuide: () => Effect.die("unused"),
+        generateTranscriptionPostProcessing: () => Effect.die("unused"),
+      },
+      snapshot: {
+        refreshUsage: Deferred.succeed(refreshed, undefined).pipe(Effect.asVoid),
+        getSnapshot: Effect.die("unused"),
+        refresh: Effect.die("unused"),
+        resolveMaintenance: () => Effect.die("unused"),
+        applyUsageLimits: () => Effect.die("unused"),
+        streamChanges: Stream.empty,
+      },
+    };
+    const lookups: ProviderInstanceId[] = [];
+    const instances = Layer.mock(ProviderInstanceRegistry.ProviderInstanceRegistry)({
+      getInstance: (id) =>
+        Effect.sync(() => {
+          lookups.push(id);
+          return id === instance.instanceId ? instance : undefined;
+        }),
+    });
+    yield* Effect.gen(function* () {
+      const now = yield* DateTime.now;
+      const eventSink = yield* EventSink.EventSinkV2;
+      const ingestor = yield* ProviderEventIngestor.ProviderEventIngestorV2;
+      const idAllocator = yield* IdAllocator.IdAllocatorV2;
+      const threadEvent = yield* threadCreatedEvent(now);
+      yield* eventSink.write({ events: [threadEvent] });
+      const input = {
+        providerSessionId: yield* idAllocator.allocate.providerSession({
           providerInstanceId: instance.instanceId,
           threadId: threadEvent.threadId,
-        };
-        for (const failureClass of ["validation_error", "usage_limit"] as const) {
-          const stored = yield* ingestor.ingestNormalized({
-            ...input,
-            event: {
-              type: "turn.terminal",
+        }),
+        providerInstanceId: instance.instanceId,
+        threadId: threadEvent.threadId,
+      };
+      for (const failureClass of ["validation_error", "usage_limit"] as const) {
+        const stored = yield* ingestor.ingestNormalized({
+          ...input,
+          event: {
+            type: "turn.terminal",
+            driver: instance.driverKind,
+            providerThreadId: idAllocator.derive.providerThread({
               driver: instance.driverKind,
-              providerThreadId: idAllocator.derive.providerThread({
-                driver: instance.driverKind,
-                nativeThreadId: "limited",
-              }),
-              providerTurnId: idAllocator.derive.providerTurn({
-                driver: instance.driverKind,
-                nativeTurnId: failureClass,
-              }),
-              runOrdinal: 1,
-              failureItemOrdinal: 1,
-              status: "failed",
-              failure: makeProviderFailure({
-                class: failureClass,
-                message: "Provider rejected turn.",
-              }),
-              threadDisposition: "reusable",
-            },
-          });
-          assert.equal(stored.length, 1);
-          if (failureClass === "validation_error") assert.deepEqual(lookups, []);
-        }
-        assert.deepEqual(lookups, [instance.instanceId]);
-        yield* Deferred.await(refreshed);
-      }).pipe(Effect.provide(makeLayerTest(layerTestEventSink, instances)));
-    }),
-  ),
+              nativeThreadId: "limited",
+            }),
+            providerTurnId: idAllocator.derive.providerTurn({
+              driver: instance.driverKind,
+              nativeTurnId: failureClass,
+            }),
+            runOrdinal: 1,
+            failureItemOrdinal: 1,
+            status: "failed",
+            failure: makeProviderFailure({
+              class: failureClass,
+              message: "Provider rejected turn.",
+            }),
+            threadDisposition: "reusable",
+          },
+        });
+        assert.equal(stored.length, 1);
+        if (failureClass === "validation_error") assert.deepEqual(lookups, []);
+      }
+      assert.deepEqual(lookups, [instance.instanceId]);
+      yield* Deferred.await(refreshed);
+    }).pipe(Effect.provide(makeLayerTest(layerTestEventSink, instances)));
+  }),
 );
 
 it.effect("records accepted billed turn usage once without billing the context window", () => {
@@ -1306,173 +1304,171 @@ layer("ProviderEventIngestorV2", (it) => {
   it.effect(
     "preserves an answer committed after terminal normalization reads a pending question",
     () =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const eventSink = yield* EventSink.EventSinkV2;
-          const eventStore = yield* EventStore.EventStoreV2;
-          const projections = yield* ProjectionStore.ProjectionStoreV2;
-          const idAllocator = yield* IdAllocator.IdAllocatorV2;
-          const now = yield* DateTime.now;
-          const threadEvent = yield* threadCreatedEvent(now);
-          const threadId = threadEvent.threadId;
-          const providerSessionId = yield* idAllocator.allocate.providerSession({
-            providerInstanceId: modelSelection.instanceId,
+      Effect.gen(function* () {
+        const eventSink = yield* EventSink.EventSinkV2;
+        const eventStore = yield* EventStore.EventStoreV2;
+        const projections = yield* ProjectionStore.ProjectionStoreV2;
+        const idAllocator = yield* IdAllocator.IdAllocatorV2;
+        const now = yield* DateTime.now;
+        const threadEvent = yield* threadCreatedEvent(now);
+        const threadId = threadEvent.threadId;
+        const providerSessionId = yield* idAllocator.allocate.providerSession({
+          providerInstanceId: modelSelection.instanceId,
+          threadId,
+        });
+        const providerThreadId = idAllocator.derive.providerThread({
+          driver: CODEX_DRIVER,
+          nativeThreadId: `${threadId}:race`,
+        });
+        const providerTurnId = idAllocator.derive.providerTurn({
+          driver: CODEX_DRIVER,
+          nativeTurnId: `${threadId}:race`,
+        });
+        const nodeId = NodeId.make(`${threadId}:question`);
+        const request: OrchestrationV2RuntimeRequest = {
+          id: RuntimeRequestId.make(`${threadId}:question`),
+          nodeId,
+          providerTurnId,
+          nativeRequestRef: null,
+          kind: "user_input",
+          status: "pending",
+          responseCapability: { type: "live", providerSessionId },
+          createdAt: now,
+          resolvedAt: null,
+        };
+        const node: OrchestrationV2ExecutionNode = {
+          id: nodeId,
+          threadId,
+          runId: null,
+          parentNodeId: null,
+          rootNodeId: nodeId,
+          kind: "user_input_request",
+          status: "waiting",
+          countsForRun: false,
+          providerThreadId,
+          providerTurnId,
+          nativeItemRef: null,
+          runtimeRequestId: request.id,
+          checkpointScopeId: null,
+          startedAt: now,
+          completedAt: null,
+        };
+        const item: OrchestrationV2TurnItem = {
+          id: TurnItemId.make(`${threadId}:question`),
+          threadId,
+          runId: null,
+          nodeId,
+          providerThreadId,
+          providerTurnId,
+          nativeItemRef: null,
+          parentItemId: null,
+          ordinal: 1,
+          status: "waiting",
+          title: "Which option?",
+          startedAt: now,
+          completedAt: null,
+          updatedAt: now,
+          type: "user_input_request",
+          requestId: request.id,
+          questions: [],
+        };
+        const seedEvents: Array<OrchestrationV2DomainEvent> = [threadEvent];
+        for (const payload of [
+          { type: "runtime-request.updated" as const, payload: request },
+          { type: "node.updated" as const, payload: node },
+          { type: "turn-item.updated" as const, payload: item },
+        ])
+          seedEvents.push({
+            id: yield* idAllocator.allocate.event({ threadId }),
             threadId,
+            occurredAt: now,
+            ...payload,
           });
-          const providerThreadId = idAllocator.derive.providerThread({
-            driver: CODEX_DRIVER,
-            nativeThreadId: `${threadId}:race`,
-          });
-          const providerTurnId = idAllocator.derive.providerTurn({
-            driver: CODEX_DRIVER,
-            nativeTurnId: `${threadId}:race`,
-          });
-          const nodeId = NodeId.make(`${threadId}:question`);
-          const request: OrchestrationV2RuntimeRequest = {
-            id: RuntimeRequestId.make(`${threadId}:question`),
-            nodeId,
-            providerTurnId,
-            nativeRequestRef: null,
-            kind: "user_input",
-            status: "pending",
-            responseCapability: { type: "live", providerSessionId },
-            createdAt: now,
-            resolvedAt: null,
-          };
-          const node: OrchestrationV2ExecutionNode = {
-            id: nodeId,
-            threadId,
-            runId: null,
-            parentNodeId: null,
-            rootNodeId: nodeId,
-            kind: "user_input_request",
-            status: "waiting",
-            countsForRun: false,
-            providerThreadId,
-            providerTurnId,
-            nativeItemRef: null,
-            runtimeRequestId: request.id,
-            checkpointScopeId: null,
-            startedAt: now,
-            completedAt: null,
-          };
-          const item: OrchestrationV2TurnItem = {
-            id: TurnItemId.make(`${threadId}:question`),
+        yield* eventSink.write({ events: seedEvents });
+        const normalized = yield* Deferred.make<void>();
+        const releaseTerminalWrite = yield* Deferred.make<void>();
+        const gatedSink = EventSink.EventSinkV2.of({
+          ...eventSink,
+          write: (input) =>
+            Deferred.succeed(normalized, undefined).pipe(
+              Effect.andThen(Deferred.await(releaseTerminalWrite)),
+              Effect.andThen(eventSink.write(input)),
+            ),
+        });
+        const ingestor = yield* ProviderEventIngestor.ProviderEventIngestorV2.pipe(
+          Effect.provide(Layer.fresh(ProviderEventIngestor.layer)),
+          Effect.provideService(EventSink.EventSinkV2, gatedSink),
+        );
+        const terminal = yield* ingestor
+          .ingestNormalized({
+            providerSessionId,
+            providerInstanceId: modelSelection.instanceId,
             threadId,
-            runId: null,
-            nodeId,
-            providerThreadId,
-            providerTurnId,
-            nativeItemRef: null,
-            parentItemId: null,
-            ordinal: 1,
-            status: "waiting",
-            title: "Which option?",
-            startedAt: now,
-            completedAt: null,
-            updatedAt: now,
-            type: "user_input_request",
-            requestId: request.id,
-            questions: [],
-          };
-          const seedEvents: Array<OrchestrationV2DomainEvent> = [threadEvent];
-          for (const payload of [
-            { type: "runtime-request.updated" as const, payload: request },
-            { type: "node.updated" as const, payload: node },
-            { type: "turn-item.updated" as const, payload: item },
-          ])
-            seedEvents.push({
-              id: yield* idAllocator.allocate.event({ threadId }),
-              threadId,
-              occurredAt: now,
-              ...payload,
-            });
-          yield* eventSink.write({ events: seedEvents });
-          const normalized = yield* Deferred.make<void>();
-          const releaseTerminalWrite = yield* Deferred.make<void>();
-          const gatedSink = EventSink.EventSinkV2.of({
-            ...eventSink,
-            write: (input) =>
-              Deferred.succeed(normalized, undefined).pipe(
-                Effect.andThen(Deferred.await(releaseTerminalWrite)),
-                Effect.andThen(eventSink.write(input)),
-              ),
-          });
-          const ingestor = yield* ProviderEventIngestor.ProviderEventIngestorV2.pipe(
-            Effect.provide(Layer.fresh(ProviderEventIngestor.layer)),
-            Effect.provideService(EventSink.EventSinkV2, gatedSink),
-          );
-          const terminal = yield* ingestor
-            .ingestNormalized({
-              providerSessionId,
-              providerInstanceId: modelSelection.instanceId,
-              threadId,
-              event: {
-                type: "provider_turn.updated",
-                driver: CODEX_DRIVER,
-                providerTurn: {
-                  id: providerTurnId,
-                  providerThreadId,
-                  nodeId,
-                  runAttemptId: null,
-                  nativeTurnRef: null,
-                  ordinal: 1,
-                  status: "completed",
-                  startedAt: now,
-                  completedAt: now,
-                },
+            event: {
+              type: "provider_turn.updated",
+              driver: CODEX_DRIVER,
+              providerTurn: {
+                id: providerTurnId,
+                providerThreadId,
+                nodeId,
+                runAttemptId: null,
+                nativeTurnRef: null,
+                ordinal: 1,
+                status: "completed",
+                startedAt: now,
+                completedAt: now,
               },
-            })
-            .pipe(Effect.forkScoped);
-          yield* Deferred.await(normalized);
-          const answers = { decision: "Use the existing workspace" };
-          const responseEvents: Array<OrchestrationV2DomainEvent> = [];
-          for (const payload of [
-            {
-              type: "runtime-request.updated" as const,
-              payload: { ...request, status: "resolved" as const, answers, resolvedAt: now },
-            },
-            {
-              type: "node.updated" as const,
-              payload: { ...node, status: "completed" as const, completedAt: now },
-            },
-            {
-              type: "turn-item.updated" as const,
-              payload: { ...item, status: "completed" as const, completedAt: now },
             },
-          ])
-            responseEvents.push({
-              id: yield* idAllocator.allocate.event({ threadId }),
-              threadId,
-              occurredAt: now,
-              ...payload,
-            });
-          yield* eventSink.write({ events: responseEvents });
-          yield* Deferred.succeed(releaseTerminalWrite, undefined);
-          const committedTerminal = yield* Fiber.join(terminal);
-          assert.deepEqual(
-            committedTerminal.map((stored) => stored.event.type),
-            ["provider-turn.updated"],
-          );
-          const projection = yield* projections.getThreadProjection(threadId);
-          const answered = projection.runtimeRequests.find((entry) => entry.id === request.id)!;
-          assert.equal(answered.status, "resolved");
-          assert.deepEqual(answered.answers, answers);
-          assert.equal(projection.nodes.find((entry) => entry.id === nodeId)!.status, "completed");
-          assert.equal(
-            projection.turnItems.find((entry) => entry.id === item.id)!.status,
-            "completed",
-          );
-          const history = yield* eventStore.read({ threadId }).pipe(Stream.runCollect);
-          assert.isFalse(
-            history.some(
-              (stored) =>
-                stored.event.type === "runtime-request.updated" &&
-                stored.event.payload.status === "cancelled",
-            ),
-          );
-        }),
-      ),
+          })
+          .pipe(Effect.forkScoped);
+        yield* Deferred.await(normalized);
+        const answers = { decision: "Use the existing workspace" };
+        const responseEvents: Array<OrchestrationV2DomainEvent> = [];
+        for (const payload of [
+          {
+            type: "runtime-request.updated" as const,
+            payload: { ...request, status: "resolved" as const, answers, resolvedAt: now },
+          },
+          {
+            type: "node.updated" as const,
+            payload: { ...node, status: "completed" as const, completedAt: now },
+          },
+          {
+            type: "turn-item.updated" as const,
+            payload: { ...item, status: "completed" as const, completedAt: now },
+          },
+        ])
+          responseEvents.push({
+            id: yield* idAllocator.allocate.event({ threadId }),
+            threadId,
+            occurredAt: now,
+            ...payload,
+          });
+        yield* eventSink.write({ events: responseEvents });
+        yield* Deferred.succeed(releaseTerminalWrite, undefined);
+        const committedTerminal = yield* Fiber.join(terminal);
+        assert.deepEqual(
+          committedTerminal.map((stored) => stored.event.type),
+          ["provider-turn.updated"],
+        );
+        const projection = yield* projections.getThreadProjection(threadId);
+        const answered = projection.runtimeRequests.find((entry) => entry.id === request.id)!;
+        assert.equal(answered.status, "resolved");
+        assert.deepEqual(answered.answers, answers);
+        assert.equal(projection.nodes.find((entry) => entry.id === nodeId)!.status, "completed");
+        assert.equal(
+          projection.turnItems.find((entry) => entry.id === item.id)!.status,
+          "completed",
+        );
+        const history = yield* eventStore.read({ threadId }).pipe(Stream.runCollect);
+        assert.isFalse(
+          history.some(
+            (stored) =>
+              stored.event.type === "runtime-request.updated" &&
+              stored.event.payload.status === "cancelled",
+          ),
+        );
+      }),
   );
 
   it.effect("persists a failed provider terminal as one expected error item", () =>
@@ -1863,15 +1859,18 @@ layer("ProviderEventIngestorV2", (it) => {
   );
 
   it.effect.each([
-    { parentMoved: false, failure: null },
-    { parentMoved: true, failure: null },
-    { parentMoved: false, failure: "write" },
-    { parentMoved: false, failure: "git" },
+    { parentMoved: false, failure: null, temporaryBranch: "t3/abcd1234" },
+    { parentMoved: true, failure: null, temporaryBranch: "t3/abcd1234" },
+    { parentMoved: false, failure: "write", temporaryBranch: "t3/abcd1234" },
+    { parentMoved: false, failure: "git", temporaryBranch: "t3/abcd1234" },
+    { parentMoved: false, failure: null, temporaryBranch: "my-prefix/abcd1234" },
   ])(
     "rechecks a pending native child's branch after the rename scan: %j",
-    ({ parentMoved, failure }) =>
+    ({ parentMoved, failure, temporaryBranch }) =>
       Effect.gen(function* () {
         const { worktreePath, command } = yield* makeSharedWorktree;
+        if (temporaryBranch !== "t3/abcd1234")
+          yield* command(worktreePath, ["branch", "-m", temporaryBranch]);
         const git = yield* GitVcsDriver.GitVcsDriver;
         const now = yield* DateTime.now;
         const eventSink = yield* EventSink.EventSinkV2;
@@ -1881,13 +1880,13 @@ layer("ProviderEventIngestorV2", (it) => {
         if (rootEvent.type !== "thread.created") throw new Error("Expected thread fixture");
         const parent = {
           ...rootEvent.payload,
-          branch: "t3/abcd1234",
+          branch: temporaryBranch,
           worktreePath,
         };
         yield* eventSink.write({ events: [{ ...rootEvent, payload: parent }] });
         const childId = ids.derive.threadFromProviderThread({
           driver: CODEX_DRIVER,
-          nativeThreadId: `child-created-during-rename:${parentMoved}:${failure}`,
+          nativeThreadId: `child-created-during-rename:${parentMoved}:${failure}:${temporaryBranch}`,
         });
         const beforeCommit = yield* Deferred.make<
           void,
@@ -2056,7 +2055,7 @@ layer("ProviderEventIngestorV2", (it) => {
         });
         assert.equal((yield* projections.getThread(childId)).branch, branch);
         assert.equal(stored.length, 1);
-        assert.equal(gitReads, scenario === "explicit" ? 0 : 1);
+        assert.equal(gitReads, 1);
       }),
   );
 
diff --git a/apps/server/src/orchestration-v2/ProviderEventIngestor.ts b/apps/server/src/orchestration-v2/ProviderEventIngestor.ts
index 623fddb49110..6fd6e7bc3129 100644
--- a/apps/server/src/orchestration-v2/ProviderEventIngestor.ts
+++ b/apps/server/src/orchestration-v2/ProviderEventIngestor.ts
@@ -25,7 +25,6 @@ import * as Schema from "effect/Schema";
 import * as SqlError from "effect/sql/SqlError";
 
 import { AgentScope } from "@t3tools/shared/AgentScope";
-import { isTemporaryWorktreeBranch } from "@t3tools/shared/git";
 import { modelSelectionsEqual } from "@t3tools/shared/model";
 import {
   ProviderTurnAnalytics,
@@ -771,12 +770,7 @@ export const layer: Layer.Layer<
                   );
                   if (created?.event.type !== "thread.created") return storedEvents;
                   const child = created.event.payload;
-                  if (
-                    child.worktreePath === null ||
-                    child.branch === null ||
-                    !isTemporaryWorktreeBranch(child.branch)
-                  )
-                    return storedEvents;
+                  if (child.worktreePath === null || child.branch === null) return storedEvents;
                   // Git renames before scanning committed threads. If that scan missed this
                   // creation, HEAD already has the new name, even if the parent moved away.
                   const branch = yield* git.resolveBranchName(child.worktreePath, "HEAD");
diff --git a/apps/server/src/orchestration-v2/ProviderSessionManager.test.ts b/apps/server/src/orchestration-v2/ProviderSessionManager.test.ts
index 03a6a2ef547d..3dff759550c7 100644
--- a/apps/server/src/orchestration-v2/ProviderSessionManager.test.ts
+++ b/apps/server/src/orchestration-v2/ProviderSessionManager.test.ts
@@ -12,6 +12,7 @@ import {
   type OrchestrationV2ProviderCapabilities,
   type OrchestrationV2ProviderSession,
   type OrchestrationV2ProviderThread,
+  type OrchestrationV2TurnItem,
   type Project,
   ProjectId,
   ProviderDriverKind,
@@ -19,6 +20,7 @@ import {
   type ProviderSessionId,
   RunId,
   ThreadId,
+  TurnItemId,
 } from "@t3tools/contracts";
 import * as Cause from "effect/Cause";
 import * as DateTime from "effect/DateTime";
@@ -155,7 +157,11 @@ const layerPausingAttachEventSink = (pause: {
     }),
   ).pipe(Layer.provide(layerTestEventSink));
 
-const layerBeforeUnchangedWriteEventSink = (before: Ref.Ref<Effect.Effect<void>>) =>
+const layerBeforeUnchangedWriteEventSink = (
+  before: Ref.Ref<Effect.Effect<void>>,
+  // One effect runs before each turn-item write, in order.
+  beforeTurnItems: Ref.Ref<ReadonlyArray<Effect.Effect<void>>> | undefined,
+) =>
   Layer.effect(
     EventSink.EventSinkV2,
     Effect.gen(function* () {
@@ -167,6 +173,13 @@ const layerBeforeUnchangedWriteEventSink = (before: Ref.Ref<Effect.Effect<void>>
             Effect.flatten,
             Effect.andThen(delegate.writeIfProviderThreadUnchanged(input)),
           ),
+        writeIfTurnItemUnchanged: (input) =>
+          (beforeTurnItems === undefined
+            ? Effect.void
+            : Ref.modify(beforeTurnItems, ([next, ...rest]) => [next ?? Effect.void, rest]).pipe(
+                Effect.flatten,
+              )
+          ).pipe(Effect.andThen(delegate.writeIfTurnItemUnchanged(input))),
       });
     }),
   ).pipe(Layer.provide(layerTestEventSink));
@@ -619,6 +632,7 @@ function layerTest(input: {
   readonly flakyReleaseWrites?: FlakyReleaseWrites;
   readonly pauseAttachWrite?: Parameters<typeof layerPausingAttachEventSink>[0];
   readonly beforeUnchangedWrite?: Ref.Ref<Effect.Effect<void>>;
+  readonly beforeTurnItemsWrite?: Ref.Ref<ReadonlyArray<Effect.Effect<void>>>;
   readonly pauseResolve?: {
     readonly armed: Ref.Ref<boolean>;
     readonly paused: Deferred.Deferred<void>;
@@ -644,7 +658,10 @@ function layerTest(input: {
       : input.pauseAttachWrite !== undefined
         ? layerPausingAttachEventSink(input.pauseAttachWrite)
         : input.beforeUnchangedWrite !== undefined
-          ? layerBeforeUnchangedWriteEventSink(input.beforeUnchangedWrite)
+          ? layerBeforeUnchangedWriteEventSink(
+              input.beforeUnchangedWrite,
+              input.beforeTurnItemsWrite,
+            )
           : input.failReleaseEventWrites
             ? layerFailingReleaseEventSink
             : layerTestEventSink;
@@ -1609,6 +1626,73 @@ it.effect("ProviderSessionManagerV2 gives up on a provider that never confirms a
   }),
 );
 
+it.effect("ProviderSessionManagerV2 still idles out a session releaseUnlessBusy kept", () =>
+  Effect.gen(function* () {
+    const state = yield* Ref.make(emptyState);
+    yield* Effect.gen(function* () {
+      const eventSink = yield* EventSink.EventSinkV2;
+      const idAllocator = yield* IdAllocator.IdAllocatorV2;
+      const manager = yield* ProviderSessionManager.ProviderSessionManagerV2;
+      const projectionStore = yield* ProjectionStore.ProjectionStoreV2;
+      const now = yield* DateTime.now;
+      const threadId = ThreadId.make("thread-provider-session-manager-kept-idles");
+      const providerSessionId = idAllocator.derive.providerSession({
+        providerInstanceId: modelSelection.instanceId,
+      });
+      yield* eventSink.write({
+        events: [yield* makeThreadCreatedEvent({ idAllocator, threadId, now })],
+      });
+      const runtime = yield* manager.open({
+        threadId,
+        providerSessionId,
+        modelSelection,
+        runtimePolicy,
+      });
+      const providerThread = makeProviderThread({
+        idAllocator,
+        threadId,
+        providerSessionId,
+        now,
+        nativeThreadId: `native-${threadId}`,
+      });
+      const runId = idAllocator.derive.run({ threadId, ordinal: 1 });
+      yield* runtime.startTurn({
+        appThread: (yield* projectionStore.getThreadProjection(threadId)).thread,
+        threadId,
+        runId,
+        runOrdinal: 1,
+        providerTurnOrdinal: 1,
+        attemptId: idAllocator.derive.runAttempt({ runId, attemptOrdinal: 1 }),
+        rootNodeId: idAllocator.derive.rootNode({ runId }),
+        providerThread,
+        message: {
+          createdBy: "user",
+          creationSource: "web",
+          messageId: yield* idAllocator.allocate.message({ threadId, ordinal: 1 }),
+          text: "turn",
+          attachments: [],
+        },
+        modelSelection,
+        runtimePolicy,
+      });
+
+      assert.isFalse(
+        yield* manager.releaseUnlessBusy({
+          providerSessionId,
+          ownProviderThreadIds: [providerThread.id],
+          throughRunOrdinal: 1,
+          keepIf: Effect.succeed(true),
+          reason: "manual_shutdown",
+        }),
+      );
+      assert.isTrue(yield* manager.isLive(providerSessionId));
+      // The stopped run 1 never reports its end.
+      yield* TestClock.adjust("2 seconds");
+      assert.isFalse(yield* manager.isLive(providerSessionId));
+    }).pipe(Effect.provide(layerTest({ state, idleTimeoutMs: 1_000 })));
+  }),
+);
+
 it.effect(
   "ProviderSessionManagerV2 keeps a shared session a sibling is busy on when releasing",
   () =>
@@ -1675,6 +1759,7 @@ it.effect(
           manager.releaseUnlessBusy({
             providerSessionId,
             ownProviderThreadIds: [providerThreadOf(own).id],
+            throughRunOrdinal: 1,
             reason: "manual_shutdown",
           });
 
@@ -3171,7 +3256,75 @@ const openSessionWithBackgroundCommand = (fixtureName: string) =>
       events: [yield* makeThreadCreatedEvent({ idAllocator, threadId, now })],
     });
     yield* Effect.forEach(providerThreads, writeProviderThread);
+    const toolCall = (
+      nativeItemId: string,
+      providerThread: OrchestrationV2ProviderThread,
+      status: "running" | "completed",
+      startedAt: DateTime.Utc,
+    ) =>
+      ({
+        id: idAllocator.derive.turnItemFromProviderItem({ driver: CODEX_DRIVER, nativeItemId }),
+        threadId,
+        runId: null,
+        nodeId: null,
+        providerThreadId: providerThread.id,
+        providerTurnId: null,
+        nativeItemRef: null,
+        parentItemId: null,
+        ordinal: 1,
+        status,
+        title: null,
+        startedAt,
+        completedAt: status === "completed" ? startedAt : null,
+        updatedAt: startedAt,
+        type: "dynamic_tool",
+        toolName: "mcp__t3-code__t3_worktree_handoff",
+        input: {},
+      }) satisfies OrchestrationV2TurnItem;
+    const seededToolCalls = {
+      cutOff: toolCall("cut-off", providerThreads[0]!, "running", now),
+      finished: toolCall("finished", providerThreads[0]!, "completed", now),
+      otherSession: toolCall("other-session", providerThreads[1]!, "running", now),
+      // Started by a replacement session after the release.
+      replacement: toolCall(
+        "replacement",
+        providerThreads[0]!,
+        "running",
+        DateTime.add(now, { hours: 1 }),
+      ),
+    };
+    const writeToolCall = (payload: OrchestrationV2TurnItem) =>
+      Effect.gen(function* () {
+        yield* eventSink.write({
+          events: [
+            {
+              id: yield* idAllocator.allocate.event({ threadId }),
+              type: "turn-item.updated",
+              threadId,
+              driver: CODEX_DRIVER,
+              occurredAt: now,
+              payload,
+            },
+          ],
+        });
+      });
+    yield* Effect.forEach(Object.values(seededToolCalls), writeToolCall);
     yield* manager.open({ threadId, providerSessionId, modelSelection, runtimePolicy });
+    const toolCallStatus = (id: OrchestrationV2TurnItem["id"]) =>
+      Effect.gen(function* () {
+        const projectionStore = yield* ProjectionStore.ProjectionStoreV2;
+        const projection = yield* projectionStore.getThreadProjection(threadId);
+        return projection.turnItems.find((item) => item.id === id)?.status;
+      });
+    const toolCalls = Effect.gen(function* () {
+      const statusOf = (seeded: OrchestrationV2TurnItem) => toolCallStatus(seeded.id);
+      return {
+        cutOff: yield* statusOf(seededToolCalls.cutOff),
+        finished: yield* statusOf(seededToolCalls.finished),
+        otherSession: yield* statusOf(seededToolCalls.otherSession),
+        replacement: yield* statusOf(seededToolCalls.replacement),
+      };
+    });
     const rosters = Effect.gen(function* () {
       const projectionStore = yield* ProjectionStore.ProjectionStoreV2;
       const projection = yield* projectionStore.getThreadProjection(threadId);
@@ -3182,25 +3335,95 @@ const openSessionWithBackgroundCommand = (fixtureName: string) =>
         ).map((task) => task.taskId),
       );
     });
-    return { threadId, providerSessionId, providerThreads, writeProviderThread, rosters };
+    return {
+      threadId,
+      providerSessionId,
+      providerThreads,
+      writeProviderThread,
+      rosters,
+      seededToolCalls,
+      writeToolCall,
+      toolCalls,
+      toolCallStatus,
+    };
   });
 
-it.effect(
-  "ProviderSessionManagerV2 clears the background roster of a session a detach releases",
-  () =>
+// regression: #15993 a worktree handoff left its tool call running, so the thread stayed Waiting
+it.effect.each(["detach", "stream failure", "provider stop", "early close"] as const)(
+  "ProviderSessionManagerV2 clears background work after queued events drain on %s",
+  (release) =>
     Effect.gen(function* () {
       const state = yield* Ref.make(emptyState);
       const effect = Effect.gen(function* () {
         const manager = yield* ProviderSessionManager.ProviderSessionManagerV2;
-        const { threadId, providerSessionId, rosters } = yield* openSessionWithBackgroundCommand(
-          "provider-session-manager-detach-roster",
+        const { threadId, providerSessionId, rosters, toolCalls, seededToolCalls, writeToolCall } =
+          yield* openSessionWithBackgroundCommand("provider-session-manager-detach-roster");
+        const runtime = Option.getOrThrow(yield* manager.get(providerSessionId));
+        const subscription = yield* runtime.subscribeEvents!;
+        const consuming = yield* Deferred.make<void>();
+        const resume = yield* Deferred.make<void>();
+        const consumer = yield* subscription.events.pipe(
+          Stream.tap(() =>
+            Deferred.succeed(consuming, undefined).pipe(
+              Effect.andThen(Deferred.await(resume)),
+              Effect.andThen(writeToolCall(seededToolCalls.cutOff)),
+            ),
+          ),
+          (events) => (release === "early close" ? events.pipe(Stream.take(1)) : events),
+          Stream.runDrain,
+          Effect.exit,
+          Effect.forkScoped,
         );
+        const queue = (yield* Ref.get(state)).eventQueues.get(String(providerSessionId))!;
+        yield* Queue.offer(queue, {
+          type: "provider_session.updated",
+          driver: CODEX_DRIVER,
+          providerSession: runtime.providerSession,
+        });
+        yield* Deferred.await(consuming);
         assert.deepStrictEqual(yield* rosters, [["dev-server"], ["dev-server"]]);
 
-        yield* manager.detach({ providerSessionId, threadId, detail: "Thread settled." });
+        const eventSink = yield* EventSink.EventSinkV2;
+        const afterSequence = yield* eventSink.latestSequence({ threadId });
+        if (release === "detach" || release === "early close") {
+          yield* manager.detach({ providerSessionId, threadId, detail: "Workspace changed." });
+        } else {
+          if (release === "provider stop") {
+            yield* Queue.offer(queue, {
+              type: "provider_session.updated",
+              driver: CODEX_DRIVER,
+              providerSession: { ...runtime.providerSession, status: "stopped" },
+            });
+          }
+          yield* Queue.end(queue);
+        }
+        const interrupts = (count: number) =>
+          eventSink.stream({ threadId, afterSequence }).pipe(
+            Stream.filter(
+              ({ event }) =>
+                event.type === "turn-item.updated" &&
+                event.payload.id === seededToolCalls.cutOff.id &&
+                event.payload.status === "interrupted",
+            ),
+            Stream.take(count),
+            Stream.runDrain,
+          );
+        yield* interrupts(1);
+        yield* Deferred.succeed(resume, undefined);
+        assert.equal(
+          Exit.isFailure(yield* Fiber.join(consumer)),
+          release !== "provider stop" && release !== "early close",
+        );
+        yield* interrupts(2);
 
         assert.isTrue(Option.isNone(yield* manager.get(providerSessionId)));
         assert.deepStrictEqual(yield* rosters, [[], ["dev-server"]]);
+        assert.deepStrictEqual(yield* toolCalls, {
+          cutOff: "interrupted",
+          finished: "completed",
+          otherSession: "running",
+          replacement: "running",
+        });
       });
 
       yield* effect.pipe(
@@ -3211,37 +3434,94 @@ it.effect(
     }),
 );
 
-it.effect("ProviderSessionManagerV2 keeps the roster of a runtime whose tasks can outlive it", () =>
-  Effect.gen(function* () {
-    const state = yield* Ref.make(emptyState);
-    const effect = Effect.gen(function* () {
-      const manager = yield* ProviderSessionManager.ProviderSessionManagerV2;
-      const { providerSessionId, rosters } = yield* openSessionWithBackgroundCommand(
-        "provider-session-manager-outliving-roster",
-      );
+it.effect.each(["a runtime whose tasks can outlive it", "server shutdown"] as const)(
+  "ProviderSessionManagerV2 keeps the background work after the release of %s",
+  (release) =>
+    Effect.gen(function* () {
+      const state = yield* Ref.make(emptyState);
+      const effect = Effect.gen(function* () {
+        const manager = yield* ProviderSessionManager.ProviderSessionManagerV2;
+        const { providerSessionId, rosters, toolCalls } = yield* openSessionWithBackgroundCommand(
+          "provider-session-manager-outliving-roster",
+        );
 
-      yield* manager.close(providerSessionId);
+        yield* release === "server shutdown"
+          ? manager.release({ providerSessionId, reason: "server_shutdown" })
+          : manager.close(providerSessionId);
 
-      assert.deepStrictEqual(yield* rosters, [["dev-server"], ["dev-server"]]);
-    });
+        assert.deepStrictEqual(yield* rosters, [["dev-server"], ["dev-server"]]);
+        assert.equal((yield* toolCalls).cutOff, "running");
+      });
 
-    yield* effect.pipe(
-      Effect.provide(
-        layerTest({ state, idleTimeoutMs: 60_000, backgroundTasksEndWithProcess: false }),
-      ),
-    );
-  }),
+      yield* effect.pipe(
+        Effect.provide(
+          layerTest({
+            state,
+            idleTimeoutMs: 60_000,
+            ...(release === "server shutdown" ? {} : { backgroundTasksEndWithProcess: false }),
+          }),
+        ),
+      );
+    }),
 );
 
 // regression: #19355 settled and idle-released threads stayed Waiting
-it.effect("ProviderSessionManagerV2 keeps a provider update that lands while release clears", () =>
+it.effect("ProviderSessionManagerV2 keeps provider updates that land while release clears", () =>
   Effect.gen(function* () {
     const state = yield* Ref.make(emptyState);
     const beforeUnchangedWrite = yield* Ref.make<Effect.Effect<void>>(Effect.void);
+    const beforeTurnItemsWrite = yield* Ref.make<ReadonlyArray<Effect.Effect<void>>>([]);
     const effect = Effect.gen(function* () {
       const manager = yield* ProviderSessionManager.ProviderSessionManagerV2;
-      const { providerSessionId, providerThreads, writeProviderThread, rosters } =
-        yield* openSessionWithBackgroundCommand("provider-session-manager-raced-roster");
+      const {
+        providerSessionId,
+        providerThreads,
+        writeProviderThread,
+        rosters,
+        seededToolCalls,
+        writeToolCall,
+        toolCallStatus,
+      } = yield* openSessionWithBackgroundCommand("provider-session-manager-raced-roster");
+      // Before each of the first four cleanup writes, one of these calls completes late. The
+      // completion must win, and the conflicts must not stop the open calls from being interrupted.
+      const lateCompleted = ["late-1", "late-2", "late-3", "late-4"].map((name) => ({
+        ...seededToolCalls.cutOff,
+        id: TurnItemId.make(`turn-item:${name}`),
+      }));
+      // Read after the late calls, so one write for all items would run out of tries first.
+      const lastOpen = { ...seededToolCalls.cutOff, id: TurnItemId.make("turn-item:last-open") };
+      yield* Effect.forEach([...lateCompleted, lastOpen], writeToolCall);
+      const storedLate = {
+        ...seededToolCalls.cutOff,
+        id: TurnItemId.make("turn-item:stored-late"),
+      };
+      const storedInCleanPass = {
+        ...seededToolCalls.cutOff,
+        id: TurnItemId.make("turn-item:stored-in-clean-pass"),
+      };
+      const complete = (item: OrchestrationV2TurnItem) =>
+        writeToolCall({ ...item, status: "completed" });
+      // One hook runs before each cleanup write. The first pass writes the cut-off call, the
+      // four late calls and the last open call; the second pass writes the cut-off call again
+      // and the call stored late; the third pass writes the call stored in the clean pass.
+      yield* Ref.set(
+        beforeTurnItemsWrite,
+        [
+          // The cut-off call gets an update that keeps it open, so it needs a second pass, and
+          // the dead session stores one more call.
+          complete(lateCompleted[0]!).pipe(
+            Effect.andThen(writeToolCall({ ...seededToolCalls.cutOff, title: "late output" })),
+            Effect.andThen(writeToolCall(storedLate)),
+          ),
+          complete(lateCompleted[1]!),
+          complete(lateCompleted[2]!),
+          complete(lateCompleted[3]!),
+          Effect.void,
+          Effect.void,
+          // The second pass has no conflict, but one more call lands during it.
+          writeToolCall(storedInCleanPass),
+        ].map(Effect.orDie),
+      );
       const seeded = providerThreads[0]!;
       yield* Ref.set(
         beforeUnchangedWrite,
@@ -3257,10 +3537,25 @@ it.effect("ProviderSessionManagerV2 keeps a provider update that lands while rel
       yield* manager.close(providerSessionId);
 
       assert.deepStrictEqual(yield* rosters, [["replacement-task"], ["dev-server"]]);
+      const statuses = Object.fromEntries(
+        yield* Effect.forEach(
+          [seededToolCalls.cutOff, ...lateCompleted, lastOpen, storedLate, storedInCleanPass],
+          (item) => toolCallStatus(item.id).pipe(Effect.map((status) => [item.id, status])),
+        ),
+      );
+      assert.deepStrictEqual(statuses, {
+        [seededToolCalls.cutOff.id]: "interrupted",
+        ...Object.fromEntries(lateCompleted.map((item) => [item.id, "completed"])),
+        [lastOpen.id]: "interrupted",
+        [storedLate.id]: "interrupted",
+        [storedInCleanPass.id]: "interrupted",
+      });
     });
 
     yield* effect.pipe(
-      Effect.provide(layerTest({ state, idleTimeoutMs: 60_000, beforeUnchangedWrite })),
+      Effect.provide(
+        layerTest({ state, idleTimeoutMs: 60_000, beforeUnchangedWrite, beforeTurnItemsWrite }),
+      ),
     );
   }),
 );
diff --git a/apps/server/src/orchestration-v2/ProviderSessionManager.ts b/apps/server/src/orchestration-v2/ProviderSessionManager.ts
index eccbb8157ac4..c2f7eb767945 100644
--- a/apps/server/src/orchestration-v2/ProviderSessionManager.ts
+++ b/apps/server/src/orchestration-v2/ProviderSessionManager.ts
@@ -71,6 +71,17 @@ export const PROVIDER_INTERRUPT_TIMEOUT_MS = 15 * 1000;
 const busyTurnPrefix = (providerThreadId: ProviderThreadId) => `${providerThreadId}#`;
 const busyTurnKey = (providerThreadId: ProviderThreadId, runOrdinal: number) =>
   `${busyTurnPrefix(providerThreadId)}${runOrdinal}`;
+interface OwnBusyTurns {
+  readonly providerThreadIds: ReadonlyArray<ProviderThreadId>;
+  readonly throughRunOrdinal: number;
+}
+const isOwnBusyTurn = (turnKey: string, own: OwnBusyTurns) =>
+  own.providerThreadIds.some((id) => {
+    const prefix = busyTurnPrefix(id);
+    return (
+      turnKey.startsWith(prefix) && Number(turnKey.slice(prefix.length)) <= own.throughRunOrdinal
+    );
+  });
 const UNLOAD_THREAD_TIMEOUT_MS = 10 * 1000;
 // Providers can announce a retry and never resume. Longer than any adapter's own stall handling.
 const PROVIDER_RETRY_STALL_TIMEOUT = Duration.minutes(15);
@@ -121,6 +132,17 @@ export const ProviderSessionReleaseReason = Schema.Literals([
 ]);
 export type ProviderSessionReleaseReason = typeof ProviderSessionReleaseReason.Type;
 
+// Tool calls that only a live provider process can end.
+const releasedToolCallTypes: ReadonlyArray<OrchestrationV2TurnItem["type"]> = [
+  "command_execution",
+  "dynamic_tool",
+];
+const activeTurnItemStatuses: ReadonlyArray<OrchestrationV2TurnItem["status"]> = [
+  "pending",
+  "running",
+  "waiting",
+];
+
 export class ProviderSessionOpenError extends Schema.TaggedError<ProviderSessionOpenError>()(
   "ProviderSessionOpenError",
   {
@@ -232,13 +254,16 @@ export interface ProviderSessionManagerV2Shape {
     readonly revokeMcpCredential?: boolean;
   }) => Effect.Effect<void, ProviderSessionManagerV2Error>;
   /**
-   * Releases the session unless, at the moment of removal, a turn of a provider thread outside
-   * `ownProviderThreadIds` is busy on it. Checked atomically with turn starts. Succeeds with
-   * whether it was released.
+   * Releases the session unless, at the moment of removal, a turn is busy on it other than one
+   * of `ownProviderThreadIds` from a run up to `throughRunOrdinal`. Checked atomically with turn
+   * starts. Succeeds with whether it was released.
    */
   readonly releaseUnlessBusy: (input: {
     readonly providerSessionId: ProviderSessionId;
     readonly ownProviderThreadIds: ReadonlyArray<ProviderThreadId>;
+    readonly throughRunOrdinal: number;
+    /** Keeps the session when it succeeds with true, checked atomically with the removal. */
+    readonly keepIf?: Effect.Effect<boolean>;
     readonly reason: ProviderSessionReleaseReason;
     readonly detail?: string;
   }) => Effect.Effect<boolean, ProviderSessionManagerV2Error>;
@@ -606,6 +631,11 @@ export const layerWithOptions = (
               ),
             );
 
+      const subscriberReleaseCleanup = new WeakMap<
+        Queue.Queue<ProviderSessionEventSignal, Cause.Done>,
+        Effect.Effect<void>
+      >();
+
       const publishToSubscribers = (
         subscribers: Ref.Ref<
           ReadonlyMap<number, Queue.Queue<ProviderSessionEventSignal, Cause.Done>>
@@ -623,6 +653,8 @@ export const layerWithOptions = (
       const failSubscribers = Effect.fn("ProviderSessionManager.failSubscribers")(function* (
         entry: LiveSessionEntry,
         detail: string,
+        afterDrain: Effect.Effect<void>,
+        cause?: Cause.Cause<ProviderAdapter.ProviderAdapterV2Error>,
       ) {
         const error = new ProviderAdapter.ProviderAdapterEventStreamError({
           driver: entry.runtime.driver,
@@ -632,11 +664,13 @@ export const layerWithOptions = (
         const subscribers = yield* Ref.getAndSet(entry.eventSubscribers, new Map());
         yield* Effect.forEach(
           subscribers.values(),
-          (queue) =>
-            Queue.offer(queue, {
+          (queue) => {
+            subscriberReleaseCleanup.set(queue, afterDrain);
+            return Queue.offer(queue, {
               type: "failure",
-              cause: Cause.fail(error),
-            }),
+              cause: cause ?? Cause.fail(error),
+            });
+          },
           { discard: true },
         );
       });
@@ -659,11 +693,17 @@ export const layerWithOptions = (
       // must let consumers drain them before the stream completes.
       const endSubscribers = Effect.fn("ProviderSessionManager.endSubscribers")(function* (
         entry: LiveSessionEntry,
+        afterDrain: Effect.Effect<void>,
       ) {
         const subscribers = yield* Ref.getAndSet(entry.eventSubscribers, new Map());
-        yield* Effect.forEach(subscribers.values(), (queue) => Queue.end(queue), {
-          discard: true,
-        });
+        yield* Effect.forEach(
+          subscribers.values(),
+          (queue) => {
+            subscriberReleaseCleanup.set(queue, afterDrain);
+            return Queue.end(queue);
+          },
+          { discard: true },
+        );
       });
 
       const cancelIdleFiber = (fiber: Fiber.Fiber<void, never> | null) =>
@@ -854,10 +894,11 @@ export const layerWithOptions = (
         }
       });
 
-      // Read tasks as soon as the session leaves the live map, before a replacement reports its own.
-      // Keep OpenCode's roster: its background subagents share a server and can outlive the session.
-      const readReleasedBackgroundTasks = Effect.fn(
-        "ProviderSessionManager.readReleasedBackgroundTasks",
+      // Read the session's provider threads as soon as it leaves the live map, before a
+      // replacement reports its own tasks. Keep OpenCode's background work: its background
+      // subagents share a server and can outlive the session.
+      const readReleasedProviderThreads = Effect.fn(
+        "ProviderSessionManager.readReleasedProviderThreads",
       )(
         function* (input: {
           readonly entry: LiveSessionEntry;
@@ -877,15 +918,15 @@ export const layerWithOptions = (
               "providerThreads",
             ]);
             for (const providerThread of projection.providerThreads) {
-              const tasks = providerThread.pendingBackgroundTasks ?? [];
-              if (providerThread.providerSessionId !== providerSessionId || tasks.length === 0) {
-                continue;
-              }
+              if (providerThread.providerSessionId !== providerSessionId) continue;
               released.push({
                 threadId,
                 providerSessionId,
                 providerThreadId: providerThread.id,
-                taskIds: new Set(tasks.map((task) => task.taskId)),
+                driver: providerThread.driver,
+                taskIds: new Set(
+                  (providerThread.pendingBackgroundTasks ?? []).map((task) => task.taskId),
+                ),
               });
             }
           }
@@ -901,57 +942,119 @@ export const layerWithOptions = (
             ),
           ),
       );
-      type ReleasedBackgroundTasks = Effect.Success<
-        ReturnType<typeof readReleasedBackgroundTasks>
+      type ReleasedProviderThread = Effect.Success<
+        ReturnType<typeof readReleasedProviderThreads>
       >[number];
 
       // Dead processes cannot report task endings; stale rosters keep threads Waiting.
+      const writeReleasedRosterEvents = Effect.fn(
+        "ProviderSessionManager.writeReleasedRosterEvents",
+      )(function* ({
+        threadId,
+        providerSessionId,
+        providerThreadId,
+        taskIds,
+      }: ReleasedProviderThread) {
+        if (taskIds.size === 0) return;
+        for (let attempt = 0; attempt < 3; attempt++) {
+          const projection = yield* projectionStore.getThreadRecords(threadId, ["providerThreads"]);
+          const providerThread = projection.providerThreads.find(
+            (candidate) => candidate.id === providerThreadId,
+          );
+          const tasks = providerThread?.pendingBackgroundTasks ?? [];
+          const remaining = tasks.filter((task) => !taskIds.has(task.taskId));
+          if (providerThread === undefined || remaining.length === tasks.length) return;
+          const now = yield* DateTime.now;
+          const { committed } = yield* eventSink.writeIfProviderThreadUnchanged({
+            expected: providerThread,
+            events: [
+              {
+                id: yield* idAllocator.allocate.event({ threadId, providerSessionId }),
+                type: "provider-thread.updated",
+                threadId,
+                driver: providerThread.driver,
+                providerInstanceId: providerThread.providerInstanceId,
+                occurredAt: now,
+                payload: {
+                  ...providerThread,
+                  pendingBackgroundTasks: remaining,
+                  updatedAt: now,
+                },
+              },
+            ],
+          });
+          if (committed) return;
+        }
+        yield* Effect.logWarning("orchestration-v2.provider-session-release-roster-conflict", {
+          providerSessionId,
+          providerThreadId,
+        });
+      });
+
+      // Tool calls the dead process started never report an end either, and run finalization
+      // keeps them open for a late result. Items started after the release belong to a
+      // replacement session. Subagent rows are left out: run finalization ends run-owned ones.
+      const writeReleasedToolCallEvents = Effect.fn(
+        "ProviderSessionManager.writeReleasedToolCallEvents",
+      )(function* (released: ReleasedProviderThread, releasedAt: DateTime.Utc) {
+        const { threadId, providerSessionId, providerThreadId, driver } = released;
+        const readCutOff = projectionStore
+          .getThreadRecords(threadId, ["turnItems"], {
+            turnItemTypes: releasedToolCallTypes,
+            turnItemStatuses: activeTurnItemStatuses,
+          })
+          .pipe(
+            Effect.map((projection) =>
+              projection.turnItems.filter(
+                (item) =>
+                  item.providerThreadId === providerThreadId &&
+                  DateTime.isLessThanOrEqualTo(item.startedAt ?? item.updatedAt, releasedAt),
+              ),
+            ),
+          );
+        // One write per item: a late completion from the dead session's queued events rejects
+        // only the interrupt of its own item, and that item then is no longer open. Read again
+        // after each pass: queued events can also store more cut-off items.
+        let pending = yield* readCutOff;
+        for (let pass = 0; pass < 3 && pending.length > 0; pass++) {
+          for (const item of pending) {
+            const now = yield* DateTime.now;
+            yield* eventSink.writeIfTurnItemUnchanged({
+              expected: item,
+              events: [
+                {
+                  id: yield* idAllocator.allocate.event({ threadId, providerSessionId }),
+                  type: "turn-item.updated",
+                  threadId,
+                  ...(item.runId === null ? {} : { runId: item.runId }),
+                  ...(item.nodeId === null ? {} : { nodeId: item.nodeId }),
+                  driver,
+                  occurredAt: now,
+                  payload: { ...item, status: "interrupted", completedAt: now, updatedAt: now },
+                },
+              ],
+            });
+          }
+          pending = yield* readCutOff;
+        }
+        if (pending.length === 0) return;
+        yield* Effect.logWarning("orchestration-v2.provider-session-release-tool-call-conflict", {
+          providerSessionId,
+          providerThreadId,
+          openToolCalls: pending.length,
+        });
+      });
+
       const writeReleasedBackgroundWorkEvents = (
-        released: ReadonlyArray<ReleasedBackgroundTasks>,
+        released: ReadonlyArray<ReleasedProviderThread>,
+        releasedAt: DateTime.Utc,
       ) =>
         Effect.forEach(
           released,
-          ({ threadId, providerSessionId, providerThreadId, taskIds }) =>
-            Effect.gen(function* () {
-              for (let attempt = 0; attempt < 3; attempt++) {
-                const projection = yield* projectionStore.getThreadRecords(threadId, [
-                  "providerThreads",
-                ]);
-                const providerThread = projection.providerThreads.find(
-                  (candidate) => candidate.id === providerThreadId,
-                );
-                const tasks = providerThread?.pendingBackgroundTasks ?? [];
-                const remaining = tasks.filter((task) => !taskIds.has(task.taskId));
-                if (providerThread === undefined || remaining.length === tasks.length) return;
-                const now = yield* DateTime.now;
-                const { committed } = yield* eventSink.writeIfProviderThreadUnchanged({
-                  expected: providerThread,
-                  events: [
-                    {
-                      id: yield* idAllocator.allocate.event({ threadId, providerSessionId }),
-                      type: "provider-thread.updated",
-                      threadId,
-                      driver: providerThread.driver,
-                      providerInstanceId: providerThread.providerInstanceId,
-                      occurredAt: now,
-                      payload: {
-                        ...providerThread,
-                        pendingBackgroundTasks: remaining,
-                        updatedAt: now,
-                      },
-                    },
-                  ],
-                });
-                if (committed) return;
-              }
-              yield* Effect.logWarning(
-                "orchestration-v2.provider-session-release-roster-conflict",
-                {
-                  providerSessionId,
-                  providerThreadId,
-                },
-              );
-            }),
+          (providerThread) =>
+            writeReleasedRosterEvents(providerThread).pipe(
+              Effect.andThen(writeReleasedToolCallEvents(providerThread, releasedAt)),
+            ),
           { discard: true },
         );
 
@@ -959,7 +1062,7 @@ export const layerWithOptions = (
         readonly entry: LiveSessionEntry;
         readonly reason: ProviderSessionReleaseReason;
         readonly detail?: string;
-        readonly releasedBackgroundTasks: ReadonlyArray<ReleasedBackgroundTasks>;
+        readonly releasedProviderThreads: ReadonlyArray<ReleasedProviderThread>;
         readonly releasedAt: DateTime.Utc;
         readonly detachedThreadId?: ThreadId;
         readonly replaced: boolean;
@@ -974,7 +1077,9 @@ export const layerWithOptions = (
                 input.entry.requestEventPermit.withPermits(1),
               ),
             ),
-            Effect.exit(writeReleasedBackgroundWorkEvents(input.releasedBackgroundTasks)),
+            Effect.exit(
+              writeReleasedBackgroundWorkEvents(input.releasedProviderThreads, input.releasedAt),
+            ),
           ],
           { concurrency: 1 },
         ).pipe(Effect.flatMap(Exit.asVoidAll));
@@ -1034,7 +1139,7 @@ export const layerWithOptions = (
         function* (input: {
           readonly providerSessionId: ProviderSessionId;
           readonly onlyIfIdleGeneration?: number;
-          readonly keepIfBusyOtherThan?: ReadonlyArray<ProviderThreadId>;
+          readonly keepIfBusyOtherThan?: OwnBusyTurns;
           readonly keepIf?: Effect.Effect<boolean>;
         }): Effect.fn.Return<readonly [Option.Option<LiveSessionEntry>, DateTime.Utc]> {
           const key = sessionKey(input.providerSessionId);
@@ -1042,40 +1147,48 @@ export const layerWithOptions = (
           if (candidate === undefined) {
             return [Option.none<LiveSessionEntry>(), yield* DateTime.now] as const;
           }
-          const remove = Effect.zip(
-            Ref.modify(sessions, (current) => {
-              const existing = current.get(key);
-              if (existing !== candidate) {
-                return [existing === undefined ? "gone" : "changed", current] as const;
-              }
-              if (
-                input.onlyIfIdleGeneration !== undefined &&
-                (existing.busyTurns.size > 0 ||
-                  existing.idleGeneration !== input.onlyIfIdleGeneration)
-              ) {
-                return ["kept", current] as const;
-              }
-              const own = input.keepIfBusyOtherThan;
-              if (
-                own !== undefined &&
-                [...existing.busyTurns].some(
-                  (turnKey) => !own.some((id) => turnKey.startsWith(busyTurnPrefix(id))),
-                )
-              ) {
-                return ["kept", current] as const;
-              }
-              const updated = new Map(current);
-              updated.delete(key);
-              return ["removed", updated] as const;
-            }),
-            DateTime.now,
+          const remove = (keepRequested: boolean) =>
+            Effect.zip(
+              Ref.modify(sessions, (current) => {
+                const existing = current.get(key);
+                if (existing !== candidate) {
+                  return [existing === undefined ? "gone" : "changed", current] as const;
+                }
+                if (
+                  input.onlyIfIdleGeneration !== undefined &&
+                  (existing.busyTurns.size > 0 ||
+                    existing.idleGeneration !== input.onlyIfIdleGeneration)
+                ) {
+                  return ["kept", current] as const;
+                }
+                const own = input.keepIfBusyOtherThan;
+                if (
+                  keepRequested ||
+                  (own !== undefined &&
+                    [...existing.busyTurns].some((turnKey) => !isOwnBusyTurn(turnKey, own)))
+                ) {
+                  if (own === undefined) return ["kept", current] as const;
+                  // The caller settled its own turns; one whose end never arrives must not keep
+                  // the session from going idle once the turn it was kept for ends.
+                  const kept = new Map(current);
+                  kept.set(key, {
+                    ...existing,
+                    busyTurns: new Set(
+                      [...existing.busyTurns].filter((turnKey) => !isOwnBusyTurn(turnKey, own)),
+                    ),
+                  });
+                  return ["kept", kept] as const;
+                }
+                const updated = new Map(current);
+                updated.delete(key);
+                return ["removed", updated] as const;
+              }),
+              DateTime.now,
+            );
+          const [outcome, releasedAt] = yield* (input.keepIf ?? Effect.succeed(false)).pipe(
+            Effect.flatMap(remove),
+            candidate.requestEventPermit.withPermits(1),
           );
-          const [outcome, releasedAt] = yield* Effect.gen(function* () {
-            if (input.keepIf !== undefined && (yield* input.keepIf)) {
-              return ["kept" as const, yield* DateTime.now] as const;
-            }
-            return yield* remove;
-          }).pipe(candidate.requestEventPermit.withPermits(1));
           if (outcome === "changed") return yield* removeLiveEntry(input);
           return [
             outcome === "removed" ? Option.some(candidate) : Option.none<LiveSessionEntry>(),
@@ -1127,9 +1240,10 @@ export const layerWithOptions = (
         readonly detachedThreadId?: ThreadId;
         readonly cancelIdleFiber?: boolean;
         readonly onlyIfIdleGeneration?: number;
-        readonly keepIfBusyOtherThan?: ReadonlyArray<ProviderThreadId>;
+        readonly keepIfBusyOtherThan?: OwnBusyTurns;
         readonly keepIf?: Effect.Effect<boolean>;
         readonly gracefulSubscribers?: boolean;
+        readonly eventStreamCause?: Cause.Cause<ProviderAdapter.ProviderAdapterV2Error>;
       }) =>
         Effect.acquireUseRelease(
           removeLiveEntry(input),
@@ -1142,7 +1256,7 @@ export const layerWithOptions = (
                     input.detachedThreadId === undefined
                       ? {}
                       : { detachedThreadId: input.detachedThreadId };
-                  const releasedBackgroundTasks = yield* readReleasedBackgroundTasks({
+                  const releasedProviderThreads = yield* readReleasedProviderThreads({
                     entry,
                     reason: input.reason,
                     ...detachedThread,
@@ -1150,14 +1264,22 @@ export const layerWithOptions = (
                   if (input.cancelIdleFiber !== false) {
                     yield* cancelIdleFiber(entry.idleFiber);
                   }
+                  // Queued events can persist tool calls after the release-time scan.
+                  const afterDrain = Effect.forEach(
+                    releasedProviderThreads,
+                    (thread) => writeReleasedToolCallEvents(thread, releasedAt),
+                    { discard: true },
+                  ).pipe(logReleaseFailure(input.providerSessionId));
                   if (input.gracefulSubscribers === true) {
-                    yield* endSubscribers(entry);
+                    yield* endSubscribers(entry, afterDrain);
                   } else if (input.reason === "server_shutdown") {
                     yield* interruptSubscribers(entry);
                   } else {
                     yield* failSubscribers(
                       entry,
                       input.detail ?? `Provider session released: ${input.reason}.`,
+                      afterDrain,
+                      input.eventStreamCause,
                     );
                   }
                   const closeExit = yield* closeScopeWithin(entry.scope, {
@@ -1168,7 +1290,7 @@ export const layerWithOptions = (
                     entry,
                     reason: input.reason,
                     ...(input.detail === undefined ? {} : { detail: input.detail }),
-                    releasedBackgroundTasks,
+                    releasedProviderThreads,
                     releasedAt,
                     ...detachedThread,
                   };
@@ -2045,6 +2167,14 @@ export const layerWithOptions = (
                 ? Queue.clear(queue).pipe(Effect.andThen(Queue.end(queue)), Effect.asVoid)
                 : Effect.void,
             ),
+            // Detached so the consumer's run failure is not ordered behind release cleanup.
+            Effect.andThen(
+              Effect.suspend(() => {
+                const cleanup = subscriberReleaseCleanup.get(queue);
+                subscriberReleaseCleanup.delete(queue);
+                return cleanup === undefined ? Effect.void : Effect.forkDetach(cleanup);
+              }),
+            ),
           );
           const events = Stream.fromQueue(queue).pipe(
             Stream.mapEffect((signal) =>
@@ -2663,11 +2793,6 @@ export const layerWithOptions = (
                         cause: "Provider event stream ended unexpectedly.",
                       }),
                     );
-              yield* publishToSubscribers(entry.eventSubscribers, {
-                type: "failure",
-                cause,
-              });
-              yield* Ref.set(entry.eventSubscribers, new Map());
               // lastError is the thread banner, so it gets the same bounded
               // message as a failed turn; the raw cause survives only in the log.
               yield* Effect.logWarning("orchestration-v2.provider-session-runtime-failed", {
@@ -2678,6 +2803,7 @@ export const layerWithOptions = (
                 providerSessionId: entry.runtime.providerSessionId,
                 reason: "runtime_error",
                 detail: makeProviderFailure({ cause }).message,
+                eventStreamCause: cause,
               }).pipe(logReleaseFailure(entry.runtime.providerSessionId));
             }),
           ),
@@ -2972,10 +3098,19 @@ export const layerWithOptions = (
             providerSessionId: input.providerSessionId,
             reason: input.reason,
             ...(input.detail === undefined ? {} : { detail: input.detail }),
-            keepIfBusyOtherThan: input.ownProviderThreadIds,
+            keepIfBusyOtherThan: {
+              providerThreadIds: input.ownProviderThreadIds,
+              throughRunOrdinal: input.throughRunOrdinal,
+            },
+            ...(input.keepIf === undefined ? {} : { keepIf: input.keepIf }),
           });
-          // Identity, not presence: open can install a replacement under the same id meanwhile.
-          return before !== undefined && (yield* Ref.get(sessions)).get(key) !== before;
+          // Scope, not presence: open can install a replacement under the same id meanwhile, and
+          // a kept entry is rewritten with the same scope.
+          const released =
+            before !== undefined && (yield* Ref.get(sessions)).get(key)?.scope !== before.scope;
+          // The stopped turn's markBusy cancelled the idle timer and its markIdle may never come.
+          if (!released) yield* scheduleIdleReleaseInternal(input.providerSessionId);
+          return released;
         }),
         otherWorkingThreads: Effect.fn("ProviderSessionManager.otherWorkingThreads")(
           function* (input) {
diff --git a/apps/server/src/orchestration-v2/ProviderSwitchService.test.ts b/apps/server/src/orchestration-v2/ProviderSwitchService.test.ts
index f44ee0187507..cde112bb74b0 100644
--- a/apps/server/src/orchestration-v2/ProviderSwitchService.test.ts
+++ b/apps/server/src/orchestration-v2/ProviderSwitchService.test.ts
@@ -252,6 +252,24 @@ it.effect.each(["stopped", "error"] as const)(
     ),
 );
 
+it.effect("applies a model change on next turn after a settled thread's session detached", () =>
+  Effect.gen(function* () {
+    const service = yield* ProviderSwitch.ProviderSwitchServiceV2;
+    const result = yield* service.plan({
+      projection: { ...deadNativeThreadProjection("stopped"), providerSessions: [] },
+      targetModelSelection: { instanceId: currentInstanceId, model: "gpt-5.2-codex" },
+    });
+    assert.equal(result.transition.type, "switch_model_in_session");
+    assert.deepEqual(result.releaseProviderSessionIds, []);
+  }).pipe(
+    Effect.provide(
+      layerTest({ [currentInstanceId]: { continuationKey: "codex:account:primary" } }, (input) =>
+        Effect.succeed(acpSelectionTransition(input)),
+      ),
+    ),
+  ),
+);
+
 it.effect("rejects a model change the dead record never negotiated support for", () =>
   Effect.gen(function* () {
     const service = yield* ProviderSwitch.ProviderSwitchServiceV2;
diff --git a/apps/server/src/orchestration-v2/ProviderSwitchService.ts b/apps/server/src/orchestration-v2/ProviderSwitchService.ts
index aca19902ae06..a31b5120964e 100644
--- a/apps/server/src/orchestration-v2/ProviderSwitchService.ts
+++ b/apps/server/src/orchestration-v2/ProviderSwitchService.ts
@@ -104,11 +104,14 @@ export const layer: Layer.Layer<
             Option.isSome(targetAdapter) &&
             Option.isSome(currentInstance) &&
             (currentSession !== undefined || currentProviderThread !== undefined)
-              ? yield* targetAdapter.value.planSelectionTransition({
-                  current,
-                  target: targetModelSelection,
-                  sessionCapabilities: negotiatedCapabilities ?? currentInstance.value.capabilities,
-                })
+              ? negotiatedCapabilities === undefined
+                ? // No session record left to switch in place; the next session starts with it.
+                  ({ type: "apply_on_next_turn" } as const)
+                : yield* targetAdapter.value.planSelectionTransition({
+                    current,
+                    target: targetModelSelection,
+                    sessionCapabilities: negotiatedCapabilities,
+                  })
               : undefined;
           const transition =
             Option.isNone(targetInstance) || Option.isNone(targetAdapter)
diff --git a/apps/server/src/orchestration-v2/ProviderTurnControlService.test.ts b/apps/server/src/orchestration-v2/ProviderTurnControlService.test.ts
index 34ff5a763110..3ede421ad72a 100644
--- a/apps/server/src/orchestration-v2/ProviderTurnControlService.test.ts
+++ b/apps/server/src/orchestration-v2/ProviderTurnControlService.test.ts
@@ -23,6 +23,7 @@ import * as Ref from "effect/Ref";
 import * as Stream from "effect/Stream";
 
 import { CodexProviderCapabilitiesV2 } from "./Adapters/CodexAdapterV2.ts";
+import * as EventSink from "./EventSink.ts";
 import * as ProjectionStore from "./ProjectionStore.ts";
 import type * as ProviderAdapter from "@t3tools/provider-core/server/ProviderAdapter";
 import * as ProviderSessionManager from "./ProviderSessionManager.ts";
@@ -301,7 +302,13 @@ it.effect(
         }),
       );
       const layerControl = ProviderTurnControlService.layer.pipe(
-        Layer.provide(Layer.merge(layerProjection, layerSessionManager)),
+        Layer.provide(
+          Layer.mergeAll(
+            layerProjection,
+            layerSessionManager,
+            Layer.mock(EventSink.EventSinkV2)({}),
+          ),
+        ),
       );
 
       const [ordinaryInterrupt, unrelatedRestart] = yield* Effect.gen(function* () {
diff --git a/apps/server/src/orchestration-v2/ProviderTurnControlService.ts b/apps/server/src/orchestration-v2/ProviderTurnControlService.ts
index 0973be037e39..5de7f965474b 100644
--- a/apps/server/src/orchestration-v2/ProviderTurnControlService.ts
+++ b/apps/server/src/orchestration-v2/ProviderTurnControlService.ts
@@ -9,15 +9,16 @@ import {
   RunAttemptId,
   ThreadId,
 } from "@t3tools/contracts";
-import * as Clock from "effect/Clock";
 import type * as DateTime from "effect/DateTime";
 import * as Context from "effect/Context";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 import * as Option from "effect/Option";
 import * as Schema from "effect/Schema";
+import * as Stream from "effect/Stream";
 
 import * as ProviderAdapter from "@t3tools/provider-core/server/ProviderAdapter";
+import * as EventSink from "./EventSink.ts";
 import * as ProjectionStore from "./ProjectionStore.ts";
 import * as ProviderSessionManager from "./ProviderSessionManager.ts";
 
@@ -101,10 +102,13 @@ export class ProviderTurnControlServiceV2 extends Context.Service<
 export const layer: Layer.Layer<
   ProviderTurnControlServiceV2,
   never,
-  ProjectionStore.ProjectionStoreV2 | ProviderSessionManager.ProviderSessionManagerV2
+  | EventSink.EventSinkV2
+  | ProjectionStore.ProjectionStoreV2
+  | ProviderSessionManager.ProviderSessionManagerV2
 > = Layer.effect(
   ProviderTurnControlServiceV2,
   Effect.gen(function* () {
+    const eventSink = yield* EventSink.EventSinkV2;
     const projections = yield* ProjectionStore.ProjectionStoreV2;
     const sessions = yield* ProviderSessionManager.ProviderSessionManagerV2;
 
@@ -199,6 +203,31 @@ export const layer: Layer.Layer<
       return { context, providerThread: interruptProviderThread, providerTurn, session };
     });
 
+    const awaitSettled = Effect.fn("ProviderTurnControlService.awaitSettled")(function* (
+      threadId: ThreadId,
+      target: ProjectionStore.ProjectionProviderControlTarget,
+    ) {
+      const isSettled = projections
+        .getProviderControlContext(threadId, target)
+        .pipe(
+          Effect.map(
+            ({ providerTurn, attempt }) =>
+              providerTurn?.status !== "running" && attempt?.status !== "running",
+          ),
+        );
+      const afterSequence = yield* eventSink.latestSequence({ threadId });
+      if (yield* isSettled) return;
+      yield* eventSink.stream({ threadId, afterSequence }).pipe(
+        Stream.filter(
+          ({ event }) =>
+            event.type === "provider-turn.updated" || event.type === "run-attempt.updated",
+        ),
+        Stream.mapEffect(() => isSettled),
+        Stream.takeUntil((settled) => settled),
+        Stream.runDrain,
+      );
+    });
+
     return ProviderTurnControlServiceV2.of({
       applyModelSelection: Effect.fn("ProviderTurnControlService.applyModelSelection")(
         function* (input) {
@@ -275,23 +304,15 @@ export const layer: Layer.Layer<
                   ),
               }),
             );
-          // Use real time; ingestion fibers do not advance TestClock and would leave Stop blocked.
-          yield* Effect.gen(function* () {
-            const deadline = (yield* Clock.currentTimeMillis) + 2_000;
-            while (
-              loaded.providerTurn.status === "running" &&
-              (yield* Clock.currentTimeMillis) < deadline
-            ) {
-              const current = yield* projections.getProviderControlContext(input.threadId, input);
-              if (
-                current.providerTurn?.status !== "running" &&
-                current.attempt?.status !== "running"
-              ) {
-                return;
-              }
-              yield* Effect.sleep("10 millis");
-            }
-          }).pipe(Effect.provideService(Clock.Clock, Clock.Clock.defaultValue()));
+          if (loaded.providerTurn.status === "running") {
+            // Let native terminal ingestion finalize the attempt before the Stop follow-up repairs it.
+            const { runAttemptId } = loaded.providerTurn;
+            yield* awaitSettled(input.threadId, {
+              providerThreadId: input.providerThreadId,
+              providerTurnId: input.providerTurnId,
+              ...(runAttemptId === null ? {} : { attemptId: runAttemptId }),
+            }).pipe(Effect.timeoutOption("2 seconds"));
+          }
         },
         (effect, input) =>
           effect.pipe(
diff --git a/apps/server/src/orchestration-v2/ProviderTurnStartService.test.ts b/apps/server/src/orchestration-v2/ProviderTurnStartService.test.ts
index ac2692907cbb..62f095b6fd91 100644
--- a/apps/server/src/orchestration-v2/ProviderTurnStartService.test.ts
+++ b/apps/server/src/orchestration-v2/ProviderTurnStartService.test.ts
@@ -35,7 +35,10 @@ import * as PlatformError from "effect/PlatformError";
 import * as Schema from "effect/Schema";
 
 import * as ServerConfig from "../config.ts";
-import { withWorkspaceLease } from "../workspace/workspaceLease.ts";
+import {
+  withCheckpointRestoreReservation,
+  withWorkspaceLease,
+} from "../workspace/workspaceLease.ts";
 import * as GitWorkflow from "../git/GitWorkflowService.ts";
 import * as GitVcsDriver from "../vcs/GitVcsDriver.ts";
 import { layerRealGit } from "./ProviderTurnStartService.testkit.ts";
@@ -272,6 +275,7 @@ it.each([
 function makeLocalCommandHarness(input: {
   readonly text: string;
   readonly nativeGoals?: boolean;
+  readonly goalDriver?: "opencode" | "antigravity";
   readonly worktreePath?: string;
   readonly worktreesDir?: string;
   readonly workspaceRoot?: string;
@@ -341,7 +345,9 @@ function makeLocalCommandHarness(input: {
   };
   const providerThread: OrchestrationV2ThreadProjection["providerThreads"][number] = {
     id: providerThreadId,
-    driver: ProviderDriverKind.make(input.nativeGoals === undefined ? "codex" : "opencode"),
+    driver: ProviderDriverKind.make(
+      input.nativeGoals === undefined ? "codex" : (input.goalDriver ?? "opencode"),
+    ),
     providerInstanceId: newInstanceId,
     providerSessionId,
     appThreadId: threadId,
@@ -1134,6 +1140,12 @@ effectIt.effect(
           upstream: "refs/remotes/origin/feature/restore",
           base: "",
         },
+        "pushed-sole-remote": {
+          tip: threadTip,
+          file: "thread.txt",
+          upstream: "refs/remotes/upstream/feature/restore",
+          base: "",
+        },
         detached: { tip: baseTip, file: null, upstream: null, base: "main" },
         "detached-no-remote": { tip: projectTip, file: "project.txt", upstream: null, base: "" },
       } as const;
@@ -1148,7 +1160,11 @@ effectIt.effect(
           yield* git(workspaceRoot, ["switch", "--detach"]);
           expect(yield* git(workspaceRoot, ["branch", "--show-current"])).toBe("");
         }
+        if (scenario === "pushed-sole-remote") {
+          yield* git(workspaceRoot, ["remote", "rename", "origin", "upstream"]);
+        }
         if (scenario === "detached") {
+          yield* git(workspaceRoot, ["remote", "rename", "upstream", "origin"]);
           yield* git(workspaceRoot, ["push", "origin", "--delete", "feature/restore"]);
         }
         if (scenario === "detached-no-remote") {
@@ -1366,12 +1382,18 @@ effectIt.effect.each([
     }),
 );
 
-effectIt.effect.each([false, true])(
-  "OpenCode goal prompts defer switched-provider history only with native support: %s",
-  (nativeGoals) =>
+effectIt.effect.each([
+  { goalDriver: "opencode", nativeGoals: false },
+  { goalDriver: "opencode", nativeGoals: true },
+  { goalDriver: "antigravity", nativeGoals: false },
+  { goalDriver: "antigravity", nativeGoals: true },
+] as const)(
+  "$goalDriver goal prompts defer switched-provider history only with native support: $nativeGoals",
+  ({ goalDriver, nativeGoals }) =>
     Effect.gen(function* () {
       const harness = makeLocalCommandHarness({
         text: "/goal all tests pass",
+        goalDriver,
         nativeGoals,
         sideChat: { contextRun: "failed", switchedProvider: true },
       });
@@ -1546,6 +1568,92 @@ effectIt.effect.each(["cleanup-first", "startup-first"])(
     }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
 );
 
+// regression: #12341 a turn start overlapping a checkpoint restore wrote into the checkout
+// The filesystem is synchronous so the turn start either reaches the provider or parks on the
+// lease before the restore is released; realPath models the symlink alias and missing worktrees.
+effectIt.effect.each([
+  {
+    overlap: "a project-root thread during a restore of the project checkout",
+    restorePath: "/tmp/native-account-project",
+    worktreePath: undefined,
+    realPaths: {},
+    missing: [],
+  },
+  {
+    overlap: "a symlink alias of the restoring checkout",
+    restorePath: "/tmp/restore-overlap/link",
+    worktreePath: "/tmp/restore-overlap/checkout",
+    realPaths: { "/tmp/restore-overlap/link": "/tmp/restore-overlap/checkout" },
+    missing: [],
+  },
+  {
+    overlap: "a directory inside the restoring checkout",
+    restorePath: "/tmp/restore-overlap/checkout",
+    worktreePath: "/tmp/restore-overlap/checkout/packages/app",
+    realPaths: {},
+    missing: [],
+  },
+  {
+    overlap: "a not-yet-recreated worktree under a symlink alias of the restoring one",
+    restorePath: "/tmp/restore-overlap/link/missing-child",
+    worktreePath: "/tmp/restore-overlap/checkout/missing-child",
+    realPaths: { "/tmp/restore-overlap/link": "/tmp/restore-overlap/checkout" },
+    missing: [
+      "/tmp/restore-overlap/link/missing-child",
+      "/tmp/restore-overlap/checkout/missing-child",
+    ],
+  },
+] as const)(
+  "does not start provider work in $overlap until the restore finishes",
+  ({ restorePath, worktreePath, realPaths, missing }) =>
+    Effect.gen(function* () {
+      const order: Array<string> = [];
+      const releaseRestore = yield* Deferred.make<void>();
+      const restoreEntered = yield* Deferred.make<void>();
+      const fileSystem = FileSystem.makeNoop({
+        exists: () => Effect.succeed(true),
+        realPath: (candidate) =>
+          (missing as ReadonlyArray<string>).includes(candidate)
+            ? Effect.fail(
+                PlatformError.systemError({
+                  _tag: "NotFound",
+                  module: "FileSystem",
+                  method: "realPath",
+                  pathOrDescriptor: candidate,
+                }),
+              )
+            : Effect.succeed((realPaths as Record<string, string>)[candidate] ?? candidate),
+      });
+      const harness = makeLocalCommandHarness({
+        text: "Continue",
+        ...(worktreePath === undefined ? {} : { worktreePath }),
+        fileSystem,
+        failReadsAfterRunning: true,
+      });
+      const open = harness.open.getMockImplementation()!;
+      harness.open.mockImplementation(() =>
+        Effect.sync(() => order.push("provider session opened")).pipe(Effect.andThen(open())),
+      );
+      // The reservation CheckpointRollbackServiceV2.execute holds around its
+      // isolation check, provider rollback, and git restore of `restorePath`.
+      const restore = yield* withCheckpointRestoreReservation(
+        fileSystem,
+        yield* Path.Path,
+        restorePath,
+        Deferred.succeed(restoreEntered, undefined).pipe(
+          Effect.andThen(Deferred.await(releaseRestore)),
+          Effect.andThen(Effect.sync(() => order.push("checkpoint files restored"))),
+        ),
+      ).pipe(Effect.forkChild({ startImmediately: true }));
+      yield* Deferred.await(restoreEntered);
+      const startup = yield* harness.start.pipe(Effect.forkChild({ startImmediately: true }));
+      yield* Deferred.succeed(releaseRestore, undefined);
+      yield* Fiber.join(restore);
+      yield* Fiber.join(startup);
+      expect(order).toEqual(["checkpoint files restored", "provider session opened"]);
+    }).pipe(Effect.provide(Path.layer)),
+);
+
 effectIt.effect("reads current startup state after waiting for the workspace lease", () =>
   Effect.gen(function* () {
     const worktreePath = "/tmp/provider-start-fresh-state";
diff --git a/apps/server/src/orchestration-v2/ProviderTurnStartService.ts b/apps/server/src/orchestration-v2/ProviderTurnStartService.ts
index 2de9fcbc70d9..ddb941668271 100644
--- a/apps/server/src/orchestration-v2/ProviderTurnStartService.ts
+++ b/apps/server/src/orchestration-v2/ProviderTurnStartService.ts
@@ -30,12 +30,12 @@ import {
   CLAUDE_PROVIDER,
   CLAUDE_QUERY_ENDED_BEFORE_TURN_DETAIL,
 } from "./Adapters/ClaudeAdapterV2.ts";
-import { withWorkspaceLease } from "../workspace/workspaceLease.ts";
+import { withTurnStartReservation, withWorkspaceLease } from "../workspace/workspaceLease.ts";
 import * as GitWorkflowService from "../git/GitWorkflowService.ts";
 import * as ProjectService from "../project/ProjectService.ts";
 import * as ProviderAuthService from "../provider/ProviderAuthService.ts";
 import * as ServerSettings from "../serverSettings.ts";
-import { makeIsManagedWorktreePath } from "../worktreesDirectory.ts";
+import { makeRestoreMissingWorktree } from "../workspace/restoreMissingWorktree.ts";
 import * as EventSink from "./EventSink.ts";
 import * as ProviderUsageAnalytics from "../telemetry/ProviderUsageAnalytics.ts";
 import * as ContextHandoffService from "./ContextHandoffService.ts";
@@ -77,28 +77,6 @@ export class ProviderTurnStartError extends Schema.TaggedError<ProviderTurnStart
   },
 ) {}
 
-class WorktreeRecreateError extends Schema.TaggedError<WorktreeRecreateError>()(
-  "WorktreeRecreateError",
-  {
-    worktreePath: Schema.String,
-    branch: Schema.String,
-    cause: Schema.Defect(),
-  },
-) {
-  override get message(): string {
-    return `Could not recreate the worktree for branch '${this.branch}' at ${this.worktreePath}.`;
-  }
-}
-
-class WorktreeRecreateNoBaseError extends Schema.TaggedError<WorktreeRecreateNoBaseError>()(
-  "WorktreeRecreateNoBaseError",
-  { worktreePath: Schema.String, branch: Schema.String },
-) {
-  override get message(): string {
-    return `Could not recreate branch '${this.branch}' at ${this.worktreePath}: the project workspace has no commit to start it from.`;
-  }
-}
-
 const isProviderTurnStartError = Schema.is(ProviderTurnStartError);
 const isProviderAdapterProtocolError = Schema.is(ProviderAdapter.ProviderAdapterProtocolError);
 const isProviderAdapterOpenSessionError = Schema.is(
@@ -178,78 +156,14 @@ export const layer: Layer.Layer<
     const idAllocator = yield* IdAllocator.IdAllocatorV2;
     const fileSystem = yield* FileSystem.FileSystem;
     const path = yield* Path.Path;
-    const gitWorkflow = yield* GitWorkflowService.GitWorkflowService;
     const projects = yield* ProjectService.ProjectService;
     const providerAuth = yield* ProviderAuthService.ProviderAuthService;
     const projectionStore = yield* ProjectionStore.ProjectionStoreV2;
     const providerSessions = yield* ProviderSessionManager.ProviderSessionManagerV2;
     const runExecution = yield* RunExecutionService.RunExecutionServiceV2;
     const runtimePolicy = yield* RuntimePolicy.RuntimePolicyV2;
+    const restoreMissingWorktree = yield* makeRestoreMissingWorktree;
     const turnItemPositions = yield* TurnItemPositionStore.TurnItemPositionStoreV2;
-    const isManagedWorktreePath = yield* makeIsManagedWorktreePath;
-
-    const resolveRecreateBase = Effect.fn("ProviderTurnStartService.resolveRecreateBase")(
-      function* (cwd: string) {
-        // Recovery can follow an external checkout, before the status cache expires.
-        yield* gitWorkflow.invalidateLocalStatus(cwd);
-        const { refName: currentBranch } = yield* gitWorkflow.localStatus({ cwd });
-        if (currentBranch !== null) {
-          const refName = `refs/heads/${currentBranch}`;
-          return { refName, baseRefName: refName };
-        }
-        if (yield* gitWorkflow.hasCommit({ cwd, refName: "refs/remotes/origin/HEAD" })) {
-          const { commitSha } = yield* gitWorkflow.resolveRemoteTrackingCommit({
-            cwd,
-            refName: "HEAD",
-            fallbackRemoteName: "origin",
-          });
-          // Start from the commit so the thread branch does not track the default branch.
-          return { refName: commitSha, baseRefName: "refs/remotes/origin/HEAD" };
-        }
-        if (yield* gitWorkflow.hasCommit({ cwd, refName: "HEAD" })) {
-          return { refName: "HEAD", baseRefName: undefined };
-        }
-        return null;
-      },
-    );
-
-    const recreateMissingWorktree = Effect.fn("ProviderTurnStartService.recreateMissingWorktree")(
-      function* (input: {
-        readonly cwd: string;
-        readonly worktreePath: string;
-        readonly branch: string;
-      }) {
-        const { cwd, worktreePath, branch } = input;
-        yield* gitWorkflow.pruneWorktrees({ cwd });
-        const localBranchNames = yield* gitWorkflow.listLocalBranchNames(cwd);
-        if (localBranchNames.includes(branch)) {
-          yield* gitWorkflow.createWorktree({ cwd, refName: branch, path: worktreePath });
-          return;
-        }
-        // Push keeps the tracking ref current, so recovery reads it without fetching.
-        const pushedRef = `refs/remotes/origin/${branch}`;
-        if (yield* gitWorkflow.hasCommit({ cwd, refName: pushedRef })) {
-          yield* gitWorkflow.createWorktree({
-            cwd,
-            refName: pushedRef,
-            newRefName: branch,
-            path: worktreePath,
-          });
-          return;
-        }
-        const base = yield* resolveRecreateBase(cwd);
-        if (base === null) {
-          return yield* new WorktreeRecreateNoBaseError({ worktreePath, branch });
-        }
-        yield* gitWorkflow.createWorktree({
-          cwd,
-          refName: base.refName,
-          newRefName: branch,
-          ...(base.baseRefName === undefined ? {} : { baseRefName: base.baseRefName }),
-          path: worktreePath,
-        });
-      },
-    );
 
     // Build draining callbacks outside startup scope so they cannot retain full thread history.
     const makeRunControls = (input: {
@@ -650,47 +564,16 @@ export const layer: Layer.Layer<
           return;
         }
       }
-      const { worktreePath, branch } = projection.thread;
-      if (worktreePath !== null && branch !== null) {
-        const exists = yield* fileSystem
-          .exists(worktreePath)
-          .pipe(Effect.orElseSucceed(() => true));
-        if (!exists && (yield* isManagedWorktreePath(worktreePath))) {
-          const project = yield* projects.getById(projection.thread.projectId).pipe(
-            Effect.map(Option.getOrUndefined),
-            Effect.orElseSucceed(() => undefined),
-          );
-          if (project !== undefined) {
-            yield* Effect.logWarning("provider turn start recreating missing worktree", {
-              threadId: projection.thread.id,
-              worktreePath,
-              branch,
-            });
-            const recreateResult = yield* Effect.result(
-              recreateMissingWorktree({
-                cwd: project.workspaceRoot,
-                worktreePath,
-                branch,
-              }).pipe(
-                Effect.mapError((cause) =>
-                  cause._tag === "WorktreeRecreateNoBaseError"
-                    ? cause
-                    : new WorktreeRecreateError({ worktreePath, branch, cause }),
-                ),
-              ),
-            );
-            if (recreateResult._tag === "Failure") {
-              if (input.willRetry === true) return yield* recreateResult.failure;
-              yield* settleStartFailure({
-                signal: "worktree-recreate-failure",
-                title: "Couldn't recreate thread workspace",
-                error: recreateResult.failure,
-                message: recreateResult.failure.message,
-              });
-              return;
-            }
-          }
-        }
+      const recreateResult = yield* Effect.result(restoreMissingWorktree(projection.thread));
+      if (recreateResult._tag === "Failure") {
+        if (input.willRetry === true) return yield* recreateResult.failure;
+        yield* settleStartFailure({
+          signal: "worktree-recreate-failure",
+          title: "Couldn't recreate thread workspace",
+          error: recreateResult.failure,
+          message: recreateResult.failure.message,
+        });
+        return;
       }
       const selectInheritedBackgroundItems = (
         current: ProjectionStore.ProjectionRuntimeRecoveryState,
@@ -873,8 +756,7 @@ export const layer: Layer.Layer<
       const goalDriver =
         session.driver === "codex" ||
         session.driver === "claudeAgent" ||
-        (session.driver === "opencode" &&
-          session.providerSession.capabilities.turns.supportsNativeGoals === true);
+        session.providerSession.capabilities.turns.supportsNativeGoals === true;
       const goalCommand = goalDriver && parseGoalCommand(message) !== null;
       // The provider turn marks cancellation work delivered; restart continuations use their own text or resume natively.
       const noteContinuation = isRestartNoteContinuation(
@@ -1757,12 +1639,11 @@ export const layer: Layer.Layer<
             .filter((part) => part !== "")
             .join("\n\n");
           const { restartContinuationOfRunId: _resumedRunId, ...promptedInput } = turnInput;
+          const text = goalCommand ? userText : withInlineContext(context, userText);
           yield* start({
             ...(noteContinuation ? promptedInput : turnInput),
-            message: {
-              ...turnInput.message,
-              text: goalCommand ? userText : withInlineContext(context, userText),
-            },
+            message: { ...turnInput.message, text },
+            ...(text === userText ? {} : { inlineContextLength: text.length - userText.length }),
           }).pipe(
             // Clear pending handoff markers for refused prompts so the next turn retains the native session.
             Effect.tapError((error) =>
@@ -1883,9 +1764,21 @@ export const layer: Layer.Layer<
           // Storage cleanup removes worktrees under the same lease. Only startup
           // holds it; the provider turn runs after it is released.
           const { thread } = yield* projectionStore.getThreadRecords(input.threadId, []);
-          const providerTurn = yield* thread.worktreePath === null
+          const cwd =
+            thread.worktreePath ??
+            (yield* projects
+              .getById(thread.projectId, { includeDeleted: true })
+              .pipe(Effect.map((project) => Option.getOrUndefined(project)?.workspaceRoot)));
+          const providerTurn = yield* cwd === undefined
             ? start(input)
-            : withWorkspaceLease(path.resolve(thread.worktreePath), start(input));
+            : withTurnStartReservation(
+                fileSystem,
+                path,
+                path.resolve(cwd),
+                thread.worktreePath === null
+                  ? start(input)
+                  : withWorkspaceLease(path.resolve(thread.worktreePath), start(input)),
+              );
           if (providerTurn !== undefined) yield* providerTurn;
         },
         (effect, input) =>
diff --git a/apps/server/src/orchestration-v2/PullRequestSyncReactor.test.ts b/apps/server/src/orchestration-v2/PullRequestSyncReactor.test.ts
index 06b1e3d9f9f6..098c76184bbc 100644
--- a/apps/server/src/orchestration-v2/PullRequestSyncReactor.test.ts
+++ b/apps/server/src/orchestration-v2/PullRequestSyncReactor.test.ts
@@ -12,6 +12,7 @@ import {
   ThreadId,
   TurnItemId,
   type OrchestrationV2Command as OrchestrationCommand,
+  type OrchestrationV2InternalCommand,
   type OrchestrationV2DomainEvent,
   type OrchestrationV2Run,
   type OrchestrationProjectShell,
@@ -51,6 +52,10 @@ type SyncCommand = Extract<
   { readonly type: "thread.pull-request-link.sync" }
 >;
 type LinkCommand = Extract<OrchestrationCommand, { readonly type: "thread.pull-request.link" }>;
+type ChecksReopenCommand = Extract<
+  OrchestrationV2InternalCommand,
+  { readonly type: "thread.pull-request-watch.checks-reopen" }
+>;
 
 const testCrypto = SecureRandom.make((size) => new Uint8Array(size).fill(1));
 
@@ -171,6 +176,7 @@ const missingSummary = Effect.fail(
 
 interface HarnessOptions {
   readonly invalidate?: PullRequestService.PullRequestService["Service"]["invalidate"];
+  readonly batchesReads?: (input: PullRequestRef) => boolean;
   readonly snapshot: TestShellSnapshot;
   readonly summary?: (
     input: PullRequestRef,
@@ -188,6 +194,7 @@ const makeHarness = Effect.fn("makePullRequestSyncHarness")(function* (options:
   const shellSnapshotReads = yield* Ref.make(0);
   const syncCommands = yield* Ref.make<ReadonlyArray<SyncCommand>>([]);
   const linkCommands = yield* Ref.make<ReadonlyArray<LinkCommand>>([]);
+  const reopenCommands = yield* Queue.unbounded<ChecksReopenCommand>();
   const summaryCalls = yield* Ref.make<ReadonlyArray<PullRequestRef>>([]);
   const stackCalls = yield* Ref.make<ReadonlyArray<PullRequestRef>>([]);
   const domainEvents = yield* Queue.unbounded<OrchestrationV2DomainEvent>();
@@ -222,12 +229,18 @@ const makeHarness = Effect.fn("makePullRequestSyncHarness")(function* (options:
         Effect.as({ sequence: 1, storedEvents: [] }),
       );
     }
+    if (command.type === "thread.pull-request-watch.checks-reopen") {
+      return Queue.offer(reopenCommands, command).pipe(
+        Effect.as({ sequence: 1, storedEvents: [] }),
+      );
+    }
     return Effect.die(new Error(`Unexpected command: ${command.type}`));
   };
 
   const layerDependencies = Layer.mergeAll(
     Layer.mock(PullRequestService.PullRequestService)({
       withSharedProjectReads: (effect) => effect,
+      batchesReads: (input) => Effect.succeed(options.batchesReads?.(input) ?? true),
       summary,
       stack,
       invalidate: options.invalidate ?? (() => Effect.void),
@@ -282,6 +295,7 @@ const makeHarness = Effect.fn("makePullRequestSyncHarness")(function* (options:
     shellSnapshotReads,
     syncCommands,
     linkCommands,
+    reopenCommands,
     summaryCalls,
     stackCalls,
     domainEvents,
@@ -541,566 +555,530 @@ describe("PullRequestSyncReactor", () => {
   );
 
   it.effect("retries a failed stack read after the summary becomes terminal", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        yield* TestClock.setTime(Date.parse(NOW));
-        let attempts = 0;
-        const nativeStack: PullRequestStack = {
-          id: "stack",
-          number: 7,
-          url: "https://github.com/owner/repository/stacks/7",
-          base: "main",
-          layers: [{ number: 7, headBranch: "feature", state: "merged" }],
-        };
-        const fixture = yield* makeHarness({
-          snapshot: makeSnapshot([makeThread("one", { pullRequests: [makeLink(7)] })]),
-          summary: (input) =>
-            Effect.succeed(makeSummary(input, { state: "merged", mergedAt: NOW })),
-          stack: () =>
-            ++attempts === 1
-              ? Effect.fail(
-                  new PullRequestOperationError({
-                    operation: "stack",
-                    detail: "temporary failure",
-                  }),
-                )
-              : Effect.succeed(nativeStack),
+    Effect.gen(function* () {
+      yield* TestClock.setTime(Date.parse(NOW));
+      let attempts = 0;
+      const nativeStack: PullRequestStack = {
+        id: "stack",
+        number: 7,
+        url: "https://github.com/owner/repository/stacks/7",
+        base: "main",
+        layers: [{ number: 7, headBranch: "feature", state: "merged" }],
+      };
+      const fixture = yield* makeHarness({
+        snapshot: makeSnapshot([makeThread("one", { pullRequests: [makeLink(7)] })]),
+        summary: (input) => Effect.succeed(makeSummary(input, { state: "merged", mergedAt: NOW })),
+        stack: () =>
+          ++attempts === 1
+            ? Effect.fail(
+                new PullRequestOperationError({
+                  operation: "stack",
+                  detail: "temporary failure",
+                }),
+              )
+            : Effect.succeed(nativeStack),
+      });
+      yield* Effect.gen(function* () {
+        const reactor = yield* startAndSweep(fixture);
+        const commands = yield* Ref.get(fixture.syncCommands);
+        yield* Ref.update(fixture.snapshots, (snapshot) => applySync(snapshot, commands));
+        yield* sweepAgain(fixture, reactor);
+        assert.strictEqual(attempts, 2);
+        assert.deepStrictEqual((yield* Ref.get(fixture.syncCommands)).at(-1)?.stack, {
+          kind: "native",
+          ...nativeStack,
         });
-        yield* Effect.gen(function* () {
-          const reactor = yield* startAndSweep(fixture);
-          const commands = yield* Ref.get(fixture.syncCommands);
-          yield* Ref.update(fixture.snapshots, (snapshot) => applySync(snapshot, commands));
-          yield* sweepAgain(fixture, reactor);
-          assert.strictEqual(attempts, 2);
-          assert.deepStrictEqual((yield* Ref.get(fixture.syncCommands)).at(-1)?.stack, {
-            kind: "native",
-            ...nativeStack,
-          });
-        }).pipe(Effect.provide(fixture.layer));
-      }),
-    ),
+      }).pipe(Effect.provide(fixture.layer));
+    }),
   );
 
   it.effect("explicit refresh reads a changed stack even when its PR summary is unchanged", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        yield* TestClock.setTime(Date.parse(NOW));
-        const fixture = yield* makeHarness({
-          snapshot: makeSnapshot([makeThread("one", { pullRequests: [makeLink(7, {})] })]),
+    Effect.gen(function* () {
+      yield* TestClock.setTime(Date.parse(NOW));
+      const fixture = yield* makeHarness({
+        snapshot: makeSnapshot([makeThread("one", { pullRequests: [makeLink(7, {})] })]),
+      });
+      yield* Effect.gen(function* () {
+        const reactor = yield* startAndSweep(fixture);
+        assert.strictEqual((yield* Ref.get(fixture.stackCalls)).length, 0);
+        yield* reactor.requestSync({
+          host: "github.com",
+          repository: "owner/repository",
+          number: 7,
         });
-        yield* Effect.gen(function* () {
-          const reactor = yield* startAndSweep(fixture);
-          assert.strictEqual((yield* Ref.get(fixture.stackCalls)).length, 0);
-          yield* reactor.requestSync({
-            host: "github.com",
-            repository: "owner/repository",
-            number: 7,
-          });
-          yield* Queue.take(fixture.snapshotReads);
-          yield* reactor.drain;
-          assert.strictEqual((yield* Ref.get(fixture.stackCalls)).length, 1);
-        }).pipe(Effect.provide(fixture.layer));
-      }),
-    ),
+        yield* Queue.take(fixture.snapshotReads);
+        yield* reactor.drain;
+        assert.strictEqual((yield* Ref.get(fixture.stackCalls)).length, 1);
+      }).pipe(Effect.provide(fixture.layer));
+    }),
   );
   it.effect("snapshots an unsynced link once and writes it to the thread", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        yield* TestClock.setTime(Date.parse(NOW));
-        const fixture = yield* makeHarness({
-          snapshot: makeSnapshot([makeThread("one", { pullRequests: [makeLink(42)] })]),
-          summary: (input) =>
-            Effect.succeed(makeSummary(input, { title: "Ship it", isDraft: true })),
-        });
+    Effect.gen(function* () {
+      yield* TestClock.setTime(Date.parse(NOW));
+      const fixture = yield* makeHarness({
+        snapshot: makeSnapshot([makeThread("one", { pullRequests: [makeLink(42)] })]),
+        summary: (input) => Effect.succeed(makeSummary(input, { title: "Ship it", isDraft: true })),
+      });
 
-        yield* Effect.gen(function* () {
-          yield* startAndSweep(fixture);
+      yield* Effect.gen(function* () {
+        yield* startAndSweep(fixture);
 
-          assert.deepStrictEqual(yield* Ref.get(fixture.summaryCalls), [
+        assert.deepStrictEqual(yield* Ref.get(fixture.summaryCalls), [
+          {
+            projectId: PROJECT_ID,
+            host: "github.com",
+            repository: "owner/repository",
+            number: 42,
+          },
+        ]);
+        assert.deepStrictEqual(
+          (yield* Ref.get(fixture.syncCommands)).map(({ commandId: _, ...rest }) => rest),
+          [
             {
-              projectId: PROJECT_ID,
+              type: "thread.pull-request-link.sync",
+              threadId: ThreadId.make("one"),
               host: "github.com",
               repository: "owner/repository",
               number: 42,
-            },
-          ]);
-          assert.deepStrictEqual(
-            (yield* Ref.get(fixture.syncCommands)).map(({ commandId: _, ...rest }) => rest),
-            [
-              {
-                type: "thread.pull-request-link.sync",
-                threadId: ThreadId.make("one"),
-                host: "github.com",
-                repository: "owner/repository",
-                number: 42,
-                snapshot: {
-                  state: "open",
-                  title: "Ship it",
-                  headBranch: "feature",
-                  baseBranch: "main",
-                  isDraft: true,
-                  updatedAt: "2026-08-27T00:00:00.000Z",
-                  syncedAt: NOW,
-                  closedAt: null,
-                  mergedAt: null,
-                },
-                stack: null,
+              snapshot: {
+                state: "open",
+                title: "Ship it",
+                headBranch: "feature",
+                baseBranch: "main",
+                isDraft: true,
+                updatedAt: "2026-08-27T00:00:00.000Z",
+                syncedAt: NOW,
+                closedAt: null,
+                mergedAt: null,
               },
-            ],
-          );
-          assert.strictEqual((yield* Ref.get(fixture.stackCalls)).length, 1);
-          assert.strictEqual(yield* Ref.get(fixture.shellSnapshotReads), 0);
-        }).pipe(Effect.provide(fixture.layer));
-      }),
-    ),
+              stack: null,
+            },
+          ],
+        );
+        assert.strictEqual((yield* Ref.get(fixture.stackCalls)).length, 1);
+        assert.strictEqual(yield* Ref.get(fixture.shellSnapshotReads), 0);
+      }).pipe(Effect.provide(fixture.layer));
+    }),
   );
 
   it.effect("asks the host once for a pull request shared by two threads in one project", () =>
-    Effect.scoped(
+    Effect.gen(function* () {
+      yield* TestClock.setTime(Date.parse(NOW));
+      const fixture = yield* makeHarness({
+        snapshot: makeSnapshot([
+          makeThread("one", { pullRequests: [makeLink(42)] }),
+          makeThread("two", {
+            pullRequests: [makeLink(42, null, { repository: "Owner/Repository" })],
+          }),
+        ]),
+      });
+
+      yield* Effect.gen(function* () {
+        yield* startAndSweep(fixture);
+
+        assert.strictEqual((yield* Ref.get(fixture.summaryCalls)).length, 1);
+        assert.strictEqual((yield* Ref.get(fixture.stackCalls)).length, 1);
+        const commands = yield* Ref.get(fixture.syncCommands);
+        assert.deepStrictEqual(
+          commands
+            .map((command) => [command.threadId, command.repository] as const)
+            .sort((left, right) => left[0].localeCompare(right[0])),
+          [
+            [ThreadId.make("one"), "owner/repository"],
+            [ThreadId.make("two"), "Owner/Repository"],
+          ],
+        );
+      }).pipe(Effect.provide(fixture.layer));
+    }),
+  );
+
+  it.effect.each(["summary", "stack"] as const)(
+    "isolates a failed project %s refresh and retries it after the other project succeeds",
+    (operation) =>
       Effect.gen(function* () {
         yield* TestClock.setTime(Date.parse(NOW));
+        const otherProject = ProjectId.make("other-project");
+        const link = makeLink(42, { state: "merged", mergedAt: NOW });
+        let failing = true;
+        const failure = new PullRequestOperationError({ operation, detail: "checkout missing" });
         const fixture = yield* makeHarness({
           snapshot: makeSnapshot([
-            makeThread("one", { pullRequests: [makeLink(42)] }),
-            makeThread("two", {
-              pullRequests: [makeLink(42, null, { repository: "Owner/Repository" })],
-            }),
+            makeThread("failing", { pullRequests: [link] }),
+            makeThread("healthy", { projectId: otherProject, pullRequests: [link] }),
+            makeThread("same-project", { projectId: otherProject, pullRequests: [link] }),
           ]),
+          summary: (input) =>
+            failing && input.projectId === PROJECT_ID && operation === "summary"
+              ? Effect.fail(failure)
+              : Effect.succeed(
+                  makeSummary(input, {
+                    state: "merged",
+                    mergedAt: NOW,
+                    title: input.projectId,
+                  }),
+                ),
+          stack: (input) =>
+            failing && input.projectId === PROJECT_ID && operation === "stack"
+              ? Effect.fail(failure)
+              : Effect.succeed({
+                  id: input.projectId,
+                  number: 42,
+                  url: "https://github.com/owner/repository/stacks/42",
+                  base: "main",
+                  layers: [{ number: 42, headBranch: "feature", state: "merged" }],
+                }),
         });
-
         yield* Effect.gen(function* () {
-          yield* startAndSweep(fixture);
-
-          assert.strictEqual((yield* Ref.get(fixture.summaryCalls)).length, 1);
-          assert.strictEqual((yield* Ref.get(fixture.stackCalls)).length, 1);
+          const reactor = yield* startAndSweep(fixture);
+          assert.deepStrictEqual(yield* Ref.get(fixture.summaryCalls), []);
+          yield* reactor.requestSync(link);
+          yield* Queue.take(fixture.snapshotReads);
+          yield* reactor.drain;
           const commands = yield* Ref.get(fixture.syncCommands);
-          assert.deepStrictEqual(
-            commands
-              .map((command) => [command.threadId, command.repository] as const)
-              .sort((left, right) => left[0].localeCompare(right[0])),
+          assert.sameDeepMembers(
+            commands.map((command) => [
+              command.threadId,
+              command.snapshot.title,
+              command.stack?.id,
+            ]),
             [
-              [ThreadId.make("one"), "owner/repository"],
-              [ThreadId.make("two"), "Owner/Repository"],
+              ["healthy", otherProject, otherProject],
+              ["same-project", otherProject, otherProject],
             ],
           );
+          assert.sameMembers(
+            (yield* Ref.get(fixture.summaryCalls)).map((call) => call.projectId),
+            [PROJECT_ID, otherProject],
+          );
+          assert.sameMembers(
+            (yield* Ref.get(fixture.stackCalls)).map((call) => call.projectId),
+            operation === "stack" ? [PROJECT_ID, otherProject] : [otherProject],
+          );
+          yield* Ref.update(fixture.snapshots, (snapshot) => applySync(snapshot, commands));
+          failing = false;
+          yield* sweepAgain(fixture, reactor);
+          assert.strictEqual((yield* Ref.get(fixture.summaryCalls)).length, 3);
+          assert.strictEqual((yield* Ref.get(fixture.summaryCalls)).at(-1)?.projectId, PROJECT_ID);
+          const retried = (yield* Ref.get(fixture.syncCommands)).at(-1);
+          assert.strictEqual(retried?.threadId, ThreadId.make("failing"));
+          assert.strictEqual(retried?.snapshot.title, PROJECT_ID);
+          assert.strictEqual(retried?.stack?.id, PROJECT_ID);
         }).pipe(Effect.provide(fixture.layer));
       }),
-    ),
-  );
-
-  it.effect.each(["summary", "stack"] as const)(
-    "isolates a failed project %s refresh and retries it after the other project succeeds",
-    (operation) =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          yield* TestClock.setTime(Date.parse(NOW));
-          const otherProject = ProjectId.make("other-project");
-          const link = makeLink(42, { state: "merged", mergedAt: NOW });
-          let failing = true;
-          const failure = new PullRequestOperationError({ operation, detail: "checkout missing" });
-          const fixture = yield* makeHarness({
-            snapshot: makeSnapshot([
-              makeThread("failing", { pullRequests: [link] }),
-              makeThread("healthy", { projectId: otherProject, pullRequests: [link] }),
-              makeThread("same-project", { projectId: otherProject, pullRequests: [link] }),
-            ]),
-            summary: (input) =>
-              failing && input.projectId === PROJECT_ID && operation === "summary"
-                ? Effect.fail(failure)
-                : Effect.succeed(
-                    makeSummary(input, {
-                      state: "merged",
-                      mergedAt: NOW,
-                      title: input.projectId,
-                    }),
-                  ),
-            stack: (input) =>
-              failing && input.projectId === PROJECT_ID && operation === "stack"
-                ? Effect.fail(failure)
-                : Effect.succeed({
-                    id: input.projectId,
-                    number: 42,
-                    url: "https://github.com/owner/repository/stacks/42",
-                    base: "main",
-                    layers: [{ number: 42, headBranch: "feature", state: "merged" }],
-                  }),
-          });
-          yield* Effect.gen(function* () {
-            const reactor = yield* startAndSweep(fixture);
-            assert.deepStrictEqual(yield* Ref.get(fixture.summaryCalls), []);
-            yield* reactor.requestSync(link);
-            yield* Queue.take(fixture.snapshotReads);
-            yield* reactor.drain;
-            const commands = yield* Ref.get(fixture.syncCommands);
-            assert.sameDeepMembers(
-              commands.map((command) => [
-                command.threadId,
-                command.snapshot.title,
-                command.stack?.id,
-              ]),
-              [
-                ["healthy", otherProject, otherProject],
-                ["same-project", otherProject, otherProject],
-              ],
-            );
-            assert.sameMembers(
-              (yield* Ref.get(fixture.summaryCalls)).map((call) => call.projectId),
-              [PROJECT_ID, otherProject],
-            );
-            assert.sameMembers(
-              (yield* Ref.get(fixture.stackCalls)).map((call) => call.projectId),
-              operation === "stack" ? [PROJECT_ID, otherProject] : [otherProject],
-            );
-            yield* Ref.update(fixture.snapshots, (snapshot) => applySync(snapshot, commands));
-            failing = false;
-            yield* sweepAgain(fixture, reactor);
-            assert.strictEqual((yield* Ref.get(fixture.summaryCalls)).length, 3);
-            assert.strictEqual(
-              (yield* Ref.get(fixture.summaryCalls)).at(-1)?.projectId,
-              PROJECT_ID,
-            );
-            const retried = (yield* Ref.get(fixture.syncCommands)).at(-1);
-            assert.strictEqual(retried?.threadId, ThreadId.make("failing"));
-            assert.strictEqual(retried?.snapshot.title, PROJECT_ID);
-            assert.strictEqual(retried?.stack?.id, PROJECT_ID);
-          }).pipe(Effect.provide(fixture.layer));
-        }),
-      ),
   );
 
   it.effect("recovers the HTTP port when syncing an older Forgejo link", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const fixture = yield* makeHarness({
-          snapshot: makeSnapshot([
-            makeThread("one", {
-              pullRequests: [
-                makeLink(42, null, {
-                  host: "forge.example",
-                  url: "http://forge.example:3000/owner/repository/pulls/42",
-                }),
-              ],
-            }),
-          ]),
-          summary: (input) => Effect.succeed(makeSummary(input)),
-        });
-        yield* Effect.gen(function* () {
-          yield* startAndSweep(fixture);
-          assert.strictEqual((yield* Ref.get(fixture.summaryCalls))[0]?.host, "forge.example:3000");
-          assert.strictEqual((yield* Ref.get(fixture.syncCommands))[0]?.host, "forge.example:3000");
-        }).pipe(Effect.provide(fixture.layer));
-      }),
-    ),
+    Effect.gen(function* () {
+      const fixture = yield* makeHarness({
+        snapshot: makeSnapshot([
+          makeThread("one", {
+            pullRequests: [
+              makeLink(42, null, {
+                host: "forge.example",
+                url: "http://forge.example:3000/owner/repository/pulls/42",
+              }),
+            ],
+          }),
+        ]),
+        summary: (input) => Effect.succeed(makeSummary(input)),
+      });
+      yield* Effect.gen(function* () {
+        yield* startAndSweep(fixture);
+        assert.strictEqual((yield* Ref.get(fixture.summaryCalls))[0]?.host, "forge.example:3000");
+        assert.strictEqual((yield* Ref.get(fixture.syncCommands))[0]?.host, "forge.example:3000");
+      }).pipe(Effect.provide(fixture.layer));
+    }),
   );
 
   it.effect("dispatches nothing when the host snapshot is unchanged", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        yield* TestClock.setTime(Date.parse(NOW));
-        const fixture = yield* makeHarness({
-          snapshot: makeSnapshot([makeThread("one", { pullRequests: [makeLink(42)] })]),
-          summary: (input) => Effect.succeed(makeSummary(input, { updatedAt: NOW })),
-        });
+    Effect.gen(function* () {
+      yield* TestClock.setTime(Date.parse(NOW));
+      const fixture = yield* makeHarness({
+        snapshot: makeSnapshot([makeThread("one", { pullRequests: [makeLink(42)] })]),
+        summary: (input) => Effect.succeed(makeSummary(input, { updatedAt: NOW })),
+      });
 
-        yield* Effect.gen(function* () {
-          const reactor = yield* startAndSweep(fixture);
-          const firstSweep = yield* Ref.get(fixture.syncCommands);
-          assert.strictEqual(firstSweep.length, 1);
-          yield* Ref.update(fixture.snapshots, (snapshot) => applySync(snapshot, firstSweep));
+      yield* Effect.gen(function* () {
+        const reactor = yield* startAndSweep(fixture);
+        const firstSweep = yield* Ref.get(fixture.syncCommands);
+        assert.strictEqual(firstSweep.length, 1);
+        yield* Ref.update(fixture.snapshots, (snapshot) => applySync(snapshot, firstSweep));
 
-          yield* sweepAgain(fixture, reactor);
+        yield* sweepAgain(fixture, reactor);
 
-          assert.strictEqual((yield* Ref.get(fixture.summaryCalls)).length, 2);
-          assert.strictEqual((yield* Ref.get(fixture.stackCalls)).length, 1);
-          assert.strictEqual((yield* Ref.get(fixture.syncCommands)).length, 1);
-        }).pipe(Effect.provide(fixture.layer));
-      }),
-    ),
+        assert.strictEqual((yield* Ref.get(fixture.summaryCalls)).length, 2);
+        assert.strictEqual((yield* Ref.get(fixture.stackCalls)).length, 1);
+        assert.strictEqual((yield* Ref.get(fixture.syncCommands)).length, 1);
+      }).pipe(Effect.provide(fixture.layer));
+    }),
   );
 
   it.effect("keeps the known mergeability while the host recomputes it", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        yield* TestClock.setTime(Date.parse(NOW));
-        const answers = yield* Ref.make<ReadonlyArray<"unknown" | "mergeable">>([
-          "unknown",
-          "mergeable",
-        ]);
-        const fixture = yield* makeHarness({
-          snapshot: makeSnapshot([
-            makeThread("one", {
-              pullRequests: [makeLink(42, { mergeability: "conflicting" })],
-            }),
+    Effect.gen(function* () {
+      yield* TestClock.setTime(Date.parse(NOW));
+      const answers = yield* Ref.make<ReadonlyArray<"unknown" | "mergeable">>([
+        "unknown",
+        "mergeable",
+      ]);
+      const fixture = yield* makeHarness({
+        snapshot: makeSnapshot([
+          makeThread("one", {
+            pullRequests: [makeLink(42, { mergeability: "conflicting" })],
+          }),
+        ]),
+        summary: (input) =>
+          Ref.modify(answers, ([next = "mergeable", ...rest]) => [
+            makeSummary(input, { mergeability: next }),
+            rest,
           ]),
-          summary: (input) =>
-            Ref.modify(answers, ([next = "mergeable", ...rest]) => [
-              makeSummary(input, { mergeability: next }),
-              rest,
-            ]),
-        });
-
-        yield* Effect.gen(function* () {
-          const reactor = yield* startAndSweep(fixture);
-          assert.deepStrictEqual(yield* Ref.get(fixture.syncCommands), []);
-
-          // An unchanged old PR uses main's five-minute quiet polling cadence.
-          yield* TestClock.adjust("5 minutes");
-          yield* Queue.take(fixture.snapshotReads);
-          yield* reactor.drain;
-          assert.strictEqual((yield* Ref.get(fixture.summaryCalls)).length, 2);
+      });
 
-          const commands = yield* Ref.get(fixture.syncCommands);
-          assert.deepStrictEqual(
-            commands.map((command) => command.snapshot.mergeability),
-            ["mergeable"],
-          );
-        }).pipe(Effect.provide(fixture.layer));
-      }),
-    ),
+      yield* Effect.gen(function* () {
+        const reactor = yield* startAndSweep(fixture);
+        assert.deepStrictEqual(yield* Ref.get(fixture.syncCommands), []);
+
+        // An unchanged old PR uses main's five-minute quiet polling cadence.
+        yield* TestClock.adjust("5 minutes");
+        yield* Queue.take(fixture.snapshotReads);
+        yield* reactor.drain;
+        assert.strictEqual((yield* Ref.get(fixture.summaryCalls)).length, 2);
+
+        const commands = yield* Ref.get(fixture.syncCommands);
+        assert.deepStrictEqual(
+          commands.map((command) => command.snapshot.mergeability),
+          ["mergeable"],
+        );
+      }).pipe(Effect.provide(fixture.layer));
+    }),
   );
 
   it.effect.each([
     { provider: "github" as const, updatedAt: "2026-08-28T00:00:00.000Z" },
     { provider: "forgejo" as const, updatedAt: "2026-08-27T00:00:00.000Z" },
   ])("persists unknown mergeability for $provider at $updatedAt", ({ provider, updatedAt }) =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        yield* TestClock.setTime(Date.parse(NOW));
-        const fixture = yield* makeHarness({
-          snapshot: makeSnapshot([
-            makeThread("one", {
-              pullRequests: [makeLink(42, { mergeability: "mergeable" })],
+    Effect.gen(function* () {
+      yield* TestClock.setTime(Date.parse(NOW));
+      const fixture = yield* makeHarness({
+        snapshot: makeSnapshot([
+          makeThread("one", {
+            pullRequests: [makeLink(42, { mergeability: "mergeable" })],
+          }),
+        ]),
+        summary: (input) =>
+          Effect.succeed(
+            makeSummary(input, {
+              provider: SourceControlProviderKind.make(provider),
+              updatedAt,
+              mergeability: "unknown",
             }),
-          ]),
-          summary: (input) =>
-            Effect.succeed(
+          ),
+      });
+      yield* Effect.gen(function* () {
+        yield* startAndSweep(fixture);
+        const commands = yield* Ref.get(fixture.syncCommands);
+        assert.deepStrictEqual(
+          commands.map((command) => command.snapshot.mergeability),
+          ["unknown"],
+        );
+      }).pipe(Effect.provide(fixture.layer));
+    }),
+  );
+
+  it.effect("refreshes closed links through each project after reopening elsewhere", () =>
+    Effect.gen(function* () {
+      yield* TestClock.setTime(Date.parse(NOW));
+      const invalidated = yield* Ref.make<ReadonlyArray<ProjectId>>([]);
+      const fixture = yield* makeHarness({
+        snapshot: makeSnapshot([
+          makeThread("first", { pullRequests: [makeLink(42, { state: "closed" })] }),
+          makeThread("second", {
+            projectId: ProjectId.make("second-project"),
+            pullRequests: [makeLink(42, { state: "closed" })],
+          }),
+        ]),
+        invalidate: ({ reference }) =>
+          reference !== undefined
+            ? Ref.update(invalidated, (projects) => [...projects, reference.projectId])
+            : Effect.void,
+        summary: (input) =>
+          Ref.get(invalidated).pipe(
+            Effect.map((projects) =>
               makeSummary(input, {
-                provider: SourceControlProviderKind.make(provider),
-                updatedAt,
-                mergeability: "unknown",
+                state: projects.includes(input.projectId) ? "open" : "closed",
               }),
             ),
+          ),
+      });
+      yield* Effect.gen(function* () {
+        const reactor = yield* startAndSweep(fixture);
+        assert.strictEqual((yield* Ref.get(fixture.summaryCalls)).length, 2);
+        yield* reactor.requestSync({
+          host: "github.com",
+          repository: "owner/repository",
+          number: 42,
         });
-        yield* Effect.gen(function* () {
-          yield* startAndSweep(fixture);
-          const commands = yield* Ref.get(fixture.syncCommands);
-          assert.deepStrictEqual(
-            commands.map((command) => command.snapshot.mergeability),
-            ["unknown"],
-          );
-        }).pipe(Effect.provide(fixture.layer));
-      }),
-    ),
+        yield* Queue.take(fixture.snapshotReads);
+        yield* reactor.drain;
+        assert.sameMembers(
+          [...(yield* Ref.get(invalidated))],
+          [PROJECT_ID, ProjectId.make("second-project")],
+        );
+        assert.sameMembers(
+          (yield* Ref.get(fixture.stackCalls)).map((call) => call.projectId),
+          [PROJECT_ID, ProjectId.make("second-project")],
+        );
+        const commands = yield* Ref.get(fixture.syncCommands);
+        yield* Ref.update(fixture.snapshots, (snapshot) => applySync(snapshot, commands));
+        const snapshot = yield* Ref.get(fixture.snapshots);
+        assert.deepStrictEqual(
+          snapshot.threads.map((thread) => thread.pullRequests[0]?.snapshot?.state),
+          ["open", "open"],
+        );
+      }).pipe(Effect.provide(fixture.layer));
+    }),
   );
 
-  it.effect("refreshes closed links through each project after reopening elsewhere", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        yield* TestClock.setTime(Date.parse(NOW));
-        const invalidated = yield* Ref.make<ReadonlyArray<ProjectId>>([]);
-        const fixture = yield* makeHarness({
-          snapshot: makeSnapshot([
-            makeThread("first", { pullRequests: [makeLink(42, { state: "closed" })] }),
-            makeThread("second", {
-              projectId: ProjectId.make("second-project"),
-              pullRequests: [makeLink(42, { state: "closed" })],
-            }),
-          ]),
-          invalidate: ({ reference }) =>
-            reference !== undefined
-              ? Ref.update(invalidated, (projects) => [...projects, reference.projectId])
-              : Effect.void,
-          summary: (input) =>
-            Ref.get(invalidated).pipe(
-              Effect.map((projects) =>
-                makeSummary(input, {
-                  state: projects.includes(input.projectId) ? "open" : "closed",
-                }),
-              ),
-            ),
+  it.effect("stops asking the host once a pull request is merged", () =>
+    Effect.gen(function* () {
+      yield* TestClock.setTime(Date.parse(NOW));
+      const fixture = yield* makeHarness({
+        snapshot: makeSnapshot([
+          makeThread("merged", {
+            pullRequests: [makeLink(1, { state: "merged", mergedAt: "2026-08-27T00:00:00.000Z" })],
+          }),
+        ]),
+      });
+
+      yield* Effect.gen(function* () {
+        const reactor = yield* startAndSweep(fixture);
+        yield* sweepAgain(fixture, reactor);
+
+        assert.deepStrictEqual(yield* Ref.get(fixture.summaryCalls), []);
+        assert.deepStrictEqual(yield* Ref.get(fixture.syncCommands), []);
+
+        yield* reactor.requestSync({
+          host: "github.com",
+          repository: "owner/repository",
+          number: 1,
         });
-        yield* Effect.gen(function* () {
-          const reactor = yield* startAndSweep(fixture);
-          assert.strictEqual((yield* Ref.get(fixture.summaryCalls)).length, 2);
-          yield* reactor.requestSync({
-            host: "github.com",
-            repository: "owner/repository",
-            number: 42,
-          });
-          yield* Queue.take(fixture.snapshotReads);
-          yield* reactor.drain;
-          assert.sameMembers(
-            [...(yield* Ref.get(invalidated))],
-            [PROJECT_ID, ProjectId.make("second-project")],
-          );
-          assert.sameMembers(
-            (yield* Ref.get(fixture.stackCalls)).map((call) => call.projectId),
-            [PROJECT_ID, ProjectId.make("second-project")],
-          );
-          const commands = yield* Ref.get(fixture.syncCommands);
-          yield* Ref.update(fixture.snapshots, (snapshot) => applySync(snapshot, commands));
-          const snapshot = yield* Ref.get(fixture.snapshots);
-          assert.deepStrictEqual(
-            snapshot.threads.map((thread) => thread.pullRequests[0]?.snapshot?.state),
-            ["open", "open"],
-          );
-        }).pipe(Effect.provide(fixture.layer));
-      }),
-    ),
-  );
-
-  it.effect("stops asking the host once a pull request is merged", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        yield* TestClock.setTime(Date.parse(NOW));
-        const fixture = yield* makeHarness({
-          snapshot: makeSnapshot([
-            makeThread("merged", {
-              pullRequests: [
-                makeLink(1, { state: "merged", mergedAt: "2026-08-27T00:00:00.000Z" }),
-              ],
-            }),
-          ]),
-        });
-
-        yield* Effect.gen(function* () {
-          const reactor = yield* startAndSweep(fixture);
-          yield* sweepAgain(fixture, reactor);
-
-          assert.deepStrictEqual(yield* Ref.get(fixture.summaryCalls), []);
-          assert.deepStrictEqual(yield* Ref.get(fixture.syncCommands), []);
+        yield* Queue.take(fixture.snapshotReads);
+        yield* reactor.drain;
 
-          yield* reactor.requestSync({
-            host: "github.com",
-            repository: "owner/repository",
-            number: 1,
-          });
-          yield* Queue.take(fixture.snapshotReads);
-          yield* reactor.drain;
-
-          assert.deepStrictEqual(
-            (yield* Ref.get(fixture.summaryCalls)).map((call) => call.number),
-            [1],
-          );
-        }).pipe(Effect.provide(fixture.layer));
-      }),
-    ),
+        assert.deepStrictEqual(
+          (yield* Ref.get(fixture.summaryCalls)).map((call) => call.number),
+          [1],
+        );
+      }).pipe(Effect.provide(fixture.layer));
+    }),
   );
 
   it.effect("stops reading a pull request a day after it closed, until a refresh asks", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        yield* TestClock.setTime(Date.parse(NOW));
-        const closed = (closedAt: string | null) => ({ state: "closed" as const, closedAt });
-        const fixture = yield* makeHarness({
-          snapshot: makeSnapshot([
-            makeThread("closed", {
-              pullRequests: [
-                makeLink(1, closed("2026-08-20T00:00:00.000Z")),
-                makeLink(2, closed("2026-08-26T00:00:00.000Z")),
-                makeLink(3, closed("2026-08-28T11:00:00.000Z")),
-                makeLink(4, closed(null)),
-              ],
-            }),
-          ]),
-          summary: (input) =>
-            Effect.succeed(makeSummary(input, { state: "closed", closedAt: NOW })),
-        });
-        const reads = Ref.get(fixture.summaryCalls).pipe(
-          Effect.map((calls) => calls.map((call) => call.number).toSorted()),
-        );
-
-        yield* Effect.gen(function* () {
-          const reactor = yield* startAndSweep(fixture);
-          // Closed within the day, or with no close time, keeps the fifteen-minute cadence.
-          assert.deepStrictEqual(yield* reads, [3, 4]);
-          for (let index = 0; index < 15; index += 1) yield* sweepAgain(fixture, reactor);
-          assert.deepStrictEqual(yield* reads, [3, 3, 4, 4]);
+    Effect.gen(function* () {
+      yield* TestClock.setTime(Date.parse(NOW));
+      const closed = (closedAt: string | null) => ({ state: "closed" as const, closedAt });
+      const fixture = yield* makeHarness({
+        snapshot: makeSnapshot([
+          makeThread("closed", {
+            pullRequests: [
+              makeLink(1, closed("2026-08-20T00:00:00.000Z")),
+              makeLink(2, closed("2026-08-26T00:00:00.000Z")),
+              makeLink(3, closed("2026-08-28T11:00:00.000Z")),
+              makeLink(4, closed(null)),
+            ],
+          }),
+        ]),
+        summary: (input) => Effect.succeed(makeSummary(input, { state: "closed", closedAt: NOW })),
+      });
+      const reads = Ref.get(fixture.summaryCalls).pipe(
+        Effect.map((calls) => calls.map((call) => call.number).toSorted()),
+      );
 
-          yield* reactor.requestSync({
-            host: "github.com",
-            repository: "owner/repository",
-            number: 1,
-          });
-          yield* Queue.take(fixture.snapshotReads);
-          yield* reactor.drain;
-          assert.deepStrictEqual(yield* reads, [1, 3, 3, 4, 4]);
-        }).pipe(Effect.provide(fixture.layer));
-      }),
-    ),
+      yield* Effect.gen(function* () {
+        const reactor = yield* startAndSweep(fixture);
+        // Closed within the day, or with no close time, keeps the fifteen-minute cadence.
+        assert.deepStrictEqual(yield* reads, [3, 4]);
+        for (let index = 0; index < 15; index += 1) yield* sweepAgain(fixture, reactor);
+        assert.deepStrictEqual(yield* reads, [3, 3, 4, 4]);
+
+        yield* reactor.requestSync({
+          host: "github.com",
+          repository: "owner/repository",
+          number: 1,
+        });
+        yield* Queue.take(fixture.snapshotReads);
+        yield* reactor.drain;
+        assert.deepStrictEqual(yield* reads, [1, 3, 3, 4, 4]);
+      }).pipe(Effect.provide(fixture.layer));
+    }),
   );
 
   it.effect("re-reads a merged pull request until the host supplies its merge time", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        yield* TestClock.setTime(Date.parse(NOW));
-        const invalidated = yield* Ref.make<ReadonlyArray<number>>([]);
-        const fixture = yield* makeHarness({
-          snapshot: makeSnapshot([
-            makeThread("merged", { pullRequests: [makeLink(1, { state: "merged" })] }),
-          ]),
-          invalidate: ({ reference }) =>
-            Ref.update(invalidated, (numbers) => [...numbers, reference?.number ?? -1]),
-          summary: (input) =>
-            Effect.succeed(
-              makeSummary(input, { state: "merged", mergedAt: "2026-08-27T00:00:00.000Z" }),
-            ),
-        });
-
-        yield* Effect.gen(function* () {
-          const reactor = yield* startAndSweep(fixture);
-          const firstSweep = yield* Ref.get(fixture.syncCommands);
-          assert.deepStrictEqual(yield* Ref.get(invalidated), [1]);
-          assert.strictEqual(firstSweep.at(-1)?.snapshot.mergedAt, "2026-08-27T00:00:00.000Z");
-          yield* Ref.update(fixture.snapshots, (snapshot) => applySync(snapshot, firstSweep));
+    Effect.gen(function* () {
+      yield* TestClock.setTime(Date.parse(NOW));
+      const invalidated = yield* Ref.make<ReadonlyArray<number>>([]);
+      const fixture = yield* makeHarness({
+        snapshot: makeSnapshot([
+          makeThread("merged", { pullRequests: [makeLink(1, { state: "merged" })] }),
+        ]),
+        invalidate: ({ reference }) =>
+          Ref.update(invalidated, (numbers) => [...numbers, reference?.number ?? -1]),
+        summary: (input) =>
+          Effect.succeed(
+            makeSummary(input, { state: "merged", mergedAt: "2026-08-27T00:00:00.000Z" }),
+          ),
+      });
 
-          for (let index = 0; index < 15; index += 1) yield* sweepAgain(fixture, reactor);
-          assert.strictEqual((yield* Ref.get(fixture.summaryCalls)).length, 1);
-        }).pipe(Effect.provide(fixture.layer));
-      }),
-    ),
+      yield* Effect.gen(function* () {
+        const reactor = yield* startAndSweep(fixture);
+        const firstSweep = yield* Ref.get(fixture.syncCommands);
+        assert.deepStrictEqual(yield* Ref.get(invalidated), [1]);
+        assert.strictEqual(firstSweep.at(-1)?.snapshot.mergedAt, "2026-08-27T00:00:00.000Z");
+        yield* Ref.update(fixture.snapshots, (snapshot) => applySync(snapshot, firstSweep));
+
+        for (let index = 0; index < 15; index += 1) yield* sweepAgain(fixture, reactor);
+        assert.strictEqual((yield* Ref.get(fixture.summaryCalls)).length, 1);
+      }).pipe(Effect.provide(fixture.layer));
+    }),
   );
 
   it.effect("syncs a pull request a reader saw merge without waiting for the sweep", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        yield* TestClock.setTime(Date.parse(NOW));
-        const state = yield* Ref.make<PullRequestSummary["state"]>("open");
-        const invalidated = yield* Ref.make<ReadonlyArray<number>>([]);
-        const fixture = yield* makeHarness({
-          snapshot: makeSnapshot([
-            makeThread("agent", { pullRequests: [makeLink(7, { state: "open" })] }),
-          ]),
-          summary: (input) =>
-            Ref.get(state).pipe(
-              Effect.map((current) =>
-                makeSummary(input, current === "merged" ? { state: current, mergedAt: NOW } : {}),
-              ),
+    Effect.gen(function* () {
+      yield* TestClock.setTime(Date.parse(NOW));
+      const state = yield* Ref.make<PullRequestSummary["state"]>("open");
+      const invalidated = yield* Ref.make<ReadonlyArray<number>>([]);
+      const fixture = yield* makeHarness({
+        snapshot: makeSnapshot([
+          makeThread("agent", { pullRequests: [makeLink(7, { state: "open" })] }),
+        ]),
+        summary: (input) =>
+          Ref.get(state).pipe(
+            Effect.map((current) =>
+              makeSummary(input, current === "merged" ? { state: current, mergedAt: NOW } : {}),
             ),
-          invalidate: ({ reference }) =>
-            Ref.update(invalidated, (numbers) => [...numbers, reference?.number ?? -1]),
-        });
+          ),
+        invalidate: ({ reference }) =>
+          Ref.update(invalidated, (numbers) => [...numbers, reference?.number ?? -1]),
+      });
 
-        yield* Effect.gen(function* () {
-          const reactor = yield* startAndSweep(fixture);
-          yield* Ref.set(state, "merged");
+      yield* Effect.gen(function* () {
+        const reactor = yield* startAndSweep(fixture);
+        yield* Ref.set(state, "merged");
 
-          yield* Queue.offer(fixture.stateChanges, {
-            host: "github.com",
-            repository: "owner/repository",
-            number: 7,
-          });
-          yield* Queue.take(fixture.snapshotReads);
-          yield* reactor.drain;
+        yield* Queue.offer(fixture.stateChanges, {
+          host: "github.com",
+          repository: "owner/repository",
+          number: 7,
+        });
+        yield* Queue.take(fixture.snapshotReads);
+        yield* reactor.drain;
 
-          assert.deepStrictEqual(yield* Ref.get(invalidated), [7]);
-          assert.deepStrictEqual(
-            (yield* Ref.get(fixture.syncCommands)).map((command) => command.snapshot.state),
-            ["merged"],
-          );
-        }).pipe(Effect.provide(fixture.layer));
-      }),
-    ),
+        assert.deepStrictEqual(yield* Ref.get(invalidated), [7]);
+        assert.deepStrictEqual(
+          (yield* Ref.get(fixture.syncCommands)).map((command) => command.snapshot.state),
+          ["merged"],
+        );
+      }).pipe(Effect.provide(fixture.layer));
+    }),
   );
 
   it.effect.each([true, false])(
@@ -1141,672 +1119,837 @@ describe("PullRequestSyncReactor", () => {
   );
 
   it.effect("preserves a refresh requested while an older host read is in flight", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        yield* TestClock.setTime(Date.parse(NOW));
-        const reading = yield* Deferred.make<void>();
-        const release = yield* Deferred.make<void>();
-        let calls = 0;
-        const fixture = yield* makeHarness({
-          snapshot: makeSnapshot([]),
-          summary: (input) =>
-            Effect.gen(function* () {
-              calls += 1;
-              if (calls === 1) {
-                yield* Deferred.succeed(reading, undefined);
-                yield* Deferred.await(release);
-              }
-              return makeSummary(input, { state: calls === 1 ? "closed" : "open" });
+    Effect.gen(function* () {
+      yield* TestClock.setTime(Date.parse(NOW));
+      const reading = yield* Deferred.make<void>();
+      const release = yield* Deferred.make<void>();
+      let calls = 0;
+      const fixture = yield* makeHarness({
+        snapshot: makeSnapshot([]),
+        summary: (input) =>
+          Effect.gen(function* () {
+            calls += 1;
+            if (calls === 1) {
+              yield* Deferred.succeed(reading, undefined);
+              yield* Deferred.await(release);
+            }
+            return makeSummary(input, { state: calls === 1 ? "closed" : "open" });
+          }),
+      });
+      yield* Effect.gen(function* () {
+        const reactor = yield* startAndSweep(fixture);
+        yield* Ref.set(
+          fixture.snapshots,
+          makeSnapshot([
+            makeThread("closed", { pullRequests: [makeLink(2, { state: "closed" })] }),
+          ]),
+        );
+        const key = { host: "github.com", repository: "owner/repository", number: 2 };
+        yield* reactor.requestSync(key);
+        yield* Deferred.await(reading);
+        yield* reactor.requestSync(key);
+        yield* Deferred.succeed(release, undefined);
+        yield* reactor.drain;
+        assert.strictEqual((yield* Ref.get(fixture.summaryCalls)).length, 2);
+        assert.strictEqual((yield* Ref.get(fixture.syncCommands)).at(-1)?.snapshot.state, "open");
+      }).pipe(Effect.provide(fixture.layer));
+    }),
+  );
+
+  it.effect("reads a burst of requested links in one sweep", () =>
+    Effect.gen(function* () {
+      yield* TestClock.setTime(Date.parse(NOW));
+      const reading = yield* Deferred.make<void>();
+      const release = yield* Deferred.make<void>();
+      const fixture = yield* makeHarness({
+        snapshot: makeSnapshot([]),
+        summary: (input) =>
+          Effect.gen(function* () {
+            if (input.number === 1) {
+              yield* Deferred.succeed(reading, undefined);
+              yield* Deferred.await(release);
+            }
+            return makeSummary(input);
+          }),
+      });
+      yield* Effect.gen(function* () {
+        const reactor = yield* startAndSweep(fixture);
+        yield* Ref.set(
+          fixture.snapshots,
+          makeSnapshot(
+            [1, 2, 3, 4].map((number) =>
+              makeThread(`thread-${number}`, { pullRequests: [makeLink(number)] }),
+            ),
+          ),
+        );
+        const request = (number: number) =>
+          reactor.requestSync({ host: "github.com", repository: "owner/repository", number });
+        yield* request(1);
+        yield* Deferred.await(reading);
+        yield* Effect.forEach([2, 3, 4], request, { discard: true });
+        yield* Deferred.succeed(release, undefined);
+        yield* reactor.drain;
+        assert.strictEqual(yield* Queue.size(fixture.snapshotReads), 2);
+        assert.deepStrictEqual(
+          (yield* Ref.get(fixture.summaryCalls)).map((ref) => ref.number).toSorted(),
+          [1, 2, 3, 4],
+        );
+      }).pipe(Effect.provide(fixture.layer));
+    }),
+  );
+
+  it.effect("reads hosts that batch all at once and other hosts at the old sweep width", () =>
+    Effect.gen(function* () {
+      yield* TestClock.setTime(Date.parse(NOW));
+      const numbers = Array.from({ length: 60 }, (_, index) => index + 1);
+      const hostOf = (number: number) => (number <= 30 ? "github.com" : "gitlab.example.com");
+      const batches = (input: PullRequestRef) => input.host === "github.com";
+      const batched = yield* Ref.make(0);
+      const unbatched = yield* Ref.make(0);
+      const started = yield* Queue.unbounded<void>();
+      const release = yield* Deferred.make<void>();
+      const fixture = yield* makeHarness({
+        snapshot: makeSnapshot(
+          numbers.map((number) =>
+            makeThread(`thread-${number}`, {
+              pullRequests: [makeLink(number, null, { host: hostOf(number) })],
             }),
-        });
-        yield* Effect.gen(function* () {
-          const reactor = yield* startAndSweep(fixture);
-          yield* Ref.set(
-            fixture.snapshots,
-            makeSnapshot([
-              makeThread("closed", { pullRequests: [makeLink(2, { state: "closed" })] }),
-            ]),
+          ),
+        ),
+        batchesReads: batches,
+        summary: (input) => {
+          const inFlight = batches(input) ? batched : unbatched;
+          return Ref.update(inFlight, (count) => count + 1).pipe(
+            Effect.andThen(Queue.offer(started, undefined)),
+            Effect.andThen(Deferred.await(release)),
+            Effect.andThen(Ref.update(inFlight, (count) => count - 1)),
+            Effect.as(makeSummary(input)),
           );
-          const key = { host: "github.com", repository: "owner/repository", number: 2 };
-          yield* reactor.requestSync(key);
-          yield* Deferred.await(reading);
-          yield* reactor.requestSync(key);
-          yield* Deferred.succeed(release, undefined);
-          yield* reactor.drain;
-          assert.strictEqual((yield* Ref.get(fixture.summaryCalls)).length, 2);
-          assert.strictEqual((yield* Ref.get(fixture.syncCommands)).at(-1)?.snapshot.state, "open");
-        }).pipe(Effect.provide(fixture.layer));
-      }),
-    ),
+        },
+      });
+      yield* Effect.gen(function* () {
+        const reactor = yield* PullRequestSyncReactor.PullRequestSyncReactor;
+        yield* reactor.start();
+        yield* Deferred.succeed(fixture.activation, undefined);
+        yield* Queue.takeN(started, 55);
+        assert.strictEqual(yield* Ref.get(batched), 30);
+        assert.strictEqual(yield* Ref.get(unbatched), 25);
+        yield* Deferred.succeed(release, undefined);
+        yield* reactor.drain;
+        assert.strictEqual((yield* Ref.get(fixture.summaryCalls)).length, numbers.length);
+      }).pipe(Effect.provide(fixture.layer));
+    }),
   );
 
-  it.effect("reads a burst of requested links in one sweep", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        yield* TestClock.setTime(Date.parse(NOW));
-        const reading = yield* Deferred.make<void>();
-        const release = yield* Deferred.make<void>();
-        const fixture = yield* makeHarness({
-          snapshot: makeSnapshot([]),
-          summary: (input) =>
-            Effect.gen(function* () {
-              if (input.number === 1) {
-                yield* Deferred.succeed(reading, undefined);
-                yield* Deferred.await(release);
-              }
-              return makeSummary(input);
+  it.effect("reads a member a sibling flags while the sweep is full", () =>
+    Effect.gen(function* () {
+      yield* TestClock.setTime(Date.parse(NOW));
+      const stackOf = (layers: ReadonlyArray<number>) => ({
+        id: "9",
+        number: 9,
+        url: "https://github.com/owner/repository/stack/9",
+        base: "main",
+        layers: layers.map(stackLayer),
+      });
+      // #50 is merged and not due until #1's stack read shows it a different layer list.
+      const merged = makeLink(
+        50,
+        { state: "merged", mergedAt: NOW },
+        { stack: { kind: "native", ...stackOf([50]) } },
+      );
+      const started = yield* Ref.make(0);
+      const full = yield* Deferred.make<void>();
+      const synced1 = yield* Deferred.make<void>();
+      const fixture = yield* makeHarness({
+        snapshot: makeSnapshot([
+          // Another host takes 24 of the 25 shared slots and #1 the last one.
+          ...Array.from({ length: 24 }, (_, index) =>
+            makeThread(`thread-${index + 2}`, {
+              pullRequests: [makeLink(index + 2, null, { host: "gitlab.example.com" })],
             }),
-        });
-        yield* Effect.gen(function* () {
-          const reactor = yield* startAndSweep(fixture);
-          yield* Ref.set(
-            fixture.snapshots,
-            makeSnapshot(
-              [1, 2, 3, 4].map((number) =>
-                makeThread(`thread-${number}`, { pullRequests: [makeLink(number)] }),
-              ),
+          ),
+          makeThread("thread-1", { pullRequests: [makeLink(1)] }),
+          makeThread("thread-50", { pullRequests: [merged] }),
+        ]),
+        batchesReads: () => false,
+        // #1 reads once all 25 slots are taken; the other 24 hold theirs until #1 has synced.
+        summary: (input) =>
+          Ref.updateAndGet(started, (count) => count + 1).pipe(
+            // Forked, so #1 resumes only after the sweep has handed out its next slot.
+            Effect.tap((count) =>
+              count === 25 ? Effect.forkChild(Deferred.succeed(full, undefined)) : Effect.void,
             ),
-          );
-          const request = (number: number) =>
-            reactor.requestSync({ host: "github.com", repository: "owner/repository", number });
-          yield* request(1);
-          yield* Deferred.await(reading);
-          yield* Effect.forEach([2, 3, 4], request, { discard: true });
-          yield* Deferred.succeed(release, undefined);
-          yield* reactor.drain;
-          assert.strictEqual(yield* Queue.size(fixture.snapshotReads), 2);
-          assert.deepStrictEqual(
-            (yield* Ref.get(fixture.summaryCalls)).map((ref) => ref.number).toSorted(),
-            [1, 2, 3, 4],
-          );
-        }).pipe(Effect.provide(fixture.layer));
-      }),
-    ),
+            Effect.andThen(
+              input.number === 50
+                ? Effect.void
+                : Deferred.await(input.number === 1 ? full : synced1),
+            ),
+            Effect.as(makeSummary(input)),
+          ),
+        stack: (input) => Effect.succeed(input.number === 1 ? stackOf([1, 50]) : null),
+        onSync: (command) =>
+          command.number === 1 ? Deferred.succeed(synced1, undefined) : Effect.void,
+      });
+      yield* Effect.gen(function* () {
+        yield* startAndSweep(fixture);
+        const read = (yield* Ref.get(fixture.summaryCalls)).map((ref) => ref.number);
+        assert.include(read, 50);
+      }).pipe(Effect.provide(fixture.layer));
+    }),
   );
 
   it.effect("skips the stack read for a pull request the summary places in no stack", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        yield* TestClock.setTime(Date.parse(NOW));
-        const fixture = yield* makeHarness({
-          snapshot: makeSnapshot([
-            makeThread("unstacked", { pullRequests: [makeLink(1)] }),
-            makeThread("stacked", { pullRequests: [makeLink(2)] }),
-            makeThread("unknown", { pullRequests: [makeLink(3)] }),
-          ]),
-          summary: (input) =>
-            Effect.succeed(
-              makeSummary(
-                input,
-                input.number === 1
-                  ? { stack: null }
-                  : input.number === 2
-                    ? { stack: { number: 9, position: 1, size: 2, base: "main" } }
-                    : {},
-              ),
+    Effect.gen(function* () {
+      yield* TestClock.setTime(Date.parse(NOW));
+      const fixture = yield* makeHarness({
+        snapshot: makeSnapshot([
+          makeThread("unstacked", { pullRequests: [makeLink(1)] }),
+          makeThread("stacked", { pullRequests: [makeLink(2)] }),
+          makeThread("unknown", { pullRequests: [makeLink(3)] }),
+        ]),
+        summary: (input) =>
+          Effect.succeed(
+            makeSummary(
+              input,
+              input.number === 1
+                ? { stack: null }
+                : input.number === 2
+                  ? { stack: { number: 9, position: 1, size: 2, base: "main" } }
+                  : {},
             ),
-        });
-        yield* Effect.gen(function* () {
-          yield* startAndSweep(fixture);
-          assert.deepStrictEqual(
-            (yield* Ref.get(fixture.stackCalls)).map((ref) => ref.number).toSorted(),
-            [2, 3],
-          );
-          assert.deepStrictEqual(
-            (yield* Ref.get(fixture.syncCommands)).map((command) => command.number).toSorted(),
-            [1, 2, 3],
-          );
-        }).pipe(Effect.provide(fixture.layer));
-      }),
-    ),
+          ),
+      });
+      yield* Effect.gen(function* () {
+        yield* startAndSweep(fixture);
+        assert.deepStrictEqual(
+          (yield* Ref.get(fixture.stackCalls)).map((ref) => ref.number).toSorted(),
+          [2, 3],
+        );
+        assert.deepStrictEqual(
+          (yield* Ref.get(fixture.syncCommands)).map((command) => command.number).toSorted(),
+          [1, 2, 3],
+        );
+      }).pipe(Effect.provide(fixture.layer));
+    }),
   );
 
   it.effect("reads a settled thread's links once when it settles, then until unsettled", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        yield* TestClock.setTime(Date.parse(NOW));
-        const fixture = yield* makeHarness({
-          snapshot: makeSnapshot([
-            makeThread("settled", {
-              settledOverride: "settled",
-              settledAt: "2026-08-21T00:00:00.000Z",
-              pullRequests: [
-                makeLink(5, { state: "open" }),
-                makeLink(6, { state: "closed" }),
-                makeLink(7),
-              ],
-            }),
-          ]),
-        });
-
-        yield* Effect.gen(function* () {
-          const reactor = yield* startAndSweep(fixture);
-          assert.deepStrictEqual(yield* Ref.get(fixture.summaryCalls), []);
-
-          const threadId = ThreadId.make("settled");
-          const at = DateTime.makeUnsafe(NOW);
-          yield* Queue.offer(fixture.domainEvents, {
-            type: "thread.settled",
-            id: EventId.make("event:settled"),
-            threadId,
-            occurredAt: at,
-            payload: {
-              createdBy: "user",
-              creationSource: "web",
-              id: threadId,
-              projectId: PROJECT_ID,
-              title: "settled",
-              providerInstanceId: ProviderInstanceId.make("codex"),
-              modelSelection: { instanceId: ProviderInstanceId.make("codex"), model: "gpt-5" },
-              runtimeMode: "full-access",
-              interactionMode: "default",
-              branch: null,
-              worktreePath: null,
-              activeProviderThreadId: null,
-              lineage: { parentThreadId: null, relationshipToParent: null, rootThreadId: threadId },
-              forkedFrom: null,
-              createdAt: at,
-              updatedAt: at,
-              archivedAt: null,
-              settledOverride: "settled",
-              settledAt: at,
-              lastVisitedAt: null,
-              deletedAt: null,
-            },
-          });
-          yield* Queue.take(fixture.snapshotReads);
-          yield* Queue.take(fixture.snapshotReads);
-          yield* reactor.drain;
-          assert.deepStrictEqual(
-            (yield* Ref.getAndSet(fixture.summaryCalls, [])).map((call) => call.number).toSorted(),
-            [5, 6],
-          );
-          for (let index = 0; index < 15; index += 1) yield* sweepAgain(fixture, reactor);
-          assert.deepStrictEqual(yield* Ref.get(fixture.summaryCalls), []);
+    Effect.gen(function* () {
+      yield* TestClock.setTime(Date.parse(NOW));
+      const fixture = yield* makeHarness({
+        snapshot: makeSnapshot([
+          makeThread("settled", {
+            settledOverride: "settled",
+            settledAt: "2026-08-21T00:00:00.000Z",
+            pullRequests: [
+              makeLink(5, { state: "open" }),
+              makeLink(6, { state: "closed" }),
+              makeLink(7),
+            ],
+          }),
+        ]),
+      });
 
-          yield* Ref.update(fixture.snapshots, (snapshot) => ({
-            ...snapshot,
-            threads: snapshot.threads.map((thread) => ({
-              ...thread,
-              settledOverride: null,
-              settledAt: null,
-            })),
-          }));
-          yield* sweepAgain(fixture, reactor);
-          assert.deepStrictEqual(
-            (yield* Ref.get(fixture.summaryCalls)).map((call) => call.number).toSorted(),
-            [5, 6, 7],
-          );
-        }).pipe(Effect.provide(fixture.layer));
-      }),
-    ),
+      yield* Effect.gen(function* () {
+        const reactor = yield* startAndSweep(fixture);
+        assert.deepStrictEqual(yield* Ref.get(fixture.summaryCalls), []);
+
+        const threadId = ThreadId.make("settled");
+        const at = DateTime.makeUnsafe(NOW);
+        yield* Queue.offer(fixture.domainEvents, {
+          type: "thread.settled",
+          id: EventId.make("event:settled"),
+          threadId,
+          occurredAt: at,
+          payload: {
+            createdBy: "user",
+            creationSource: "web",
+            id: threadId,
+            projectId: PROJECT_ID,
+            title: "settled",
+            providerInstanceId: ProviderInstanceId.make("codex"),
+            modelSelection: { instanceId: ProviderInstanceId.make("codex"), model: "gpt-5" },
+            runtimeMode: "full-access",
+            interactionMode: "default",
+            branch: null,
+            worktreePath: null,
+            activeProviderThreadId: null,
+            lineage: { parentThreadId: null, relationshipToParent: null, rootThreadId: threadId },
+            forkedFrom: null,
+            createdAt: at,
+            updatedAt: at,
+            archivedAt: null,
+            settledOverride: "settled",
+            settledAt: at,
+            lastVisitedAt: null,
+            deletedAt: null,
+          },
+        });
+        yield* Queue.take(fixture.snapshotReads);
+        yield* Queue.take(fixture.snapshotReads);
+        yield* reactor.drain;
+        assert.deepStrictEqual(
+          (yield* Ref.getAndSet(fixture.summaryCalls, [])).map((call) => call.number).toSorted(),
+          [5, 6],
+        );
+        for (let index = 0; index < 15; index += 1) yield* sweepAgain(fixture, reactor);
+        assert.deepStrictEqual(yield* Ref.get(fixture.summaryCalls), []);
+
+        yield* Ref.update(fixture.snapshots, (snapshot) => ({
+          ...snapshot,
+          threads: snapshot.threads.map((thread) => ({
+            ...thread,
+            settledOverride: null,
+            settledAt: null,
+          })),
+        }));
+        yield* sweepAgain(fixture, reactor);
+        assert.deepStrictEqual(
+          (yield* Ref.get(fixture.summaryCalls)).map((call) => call.number).toSorted(),
+          [5, 6, 7],
+        );
+      }).pipe(Effect.provide(fixture.layer));
+    }),
   );
 
   it.effect("auto-links missing native stack layers on active threads only", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        yield* TestClock.setTime(Date.parse(NOW));
-        const stack: PullRequestStack = {
-          id: "stack-1",
-          number: 42,
-          url: "https://github.com/owner/repository/stack/1",
-          base: "main",
-          layers: [
-            { number: 41, headBranch: "layer-1", state: "merged" },
-            { number: 42, headBranch: "layer-2", state: "open" },
-            { number: 43, headBranch: "layer-3", state: "open" },
-          ],
-        };
-        const fixture = yield* makeHarness({
-          snapshot: makeSnapshot([
-            makeThread("one", {
-              pullRequests: [
-                makeLink(42),
-                makeLink(41, { state: "merged" }, { source: "stack-dismissed" }),
-              ],
-            }),
-            makeThread("settled", {
-              settledOverride: "settled",
-              settledAt: "2026-08-21T00:00:00.000Z",
-              pullRequests: [makeLink(42)],
-            }),
-          ]),
-          stack: () => Effect.succeed(stack),
-        });
+    Effect.gen(function* () {
+      yield* TestClock.setTime(Date.parse(NOW));
+      const stack: PullRequestStack = {
+        id: "stack-1",
+        number: 42,
+        url: "https://github.com/owner/repository/stack/1",
+        base: "main",
+        layers: [
+          { number: 41, headBranch: "layer-1", state: "merged" },
+          { number: 42, headBranch: "layer-2", state: "open" },
+          { number: 43, headBranch: "layer-3", state: "open" },
+        ],
+      };
+      const fixture = yield* makeHarness({
+        snapshot: makeSnapshot([
+          makeThread("one", {
+            pullRequests: [
+              makeLink(42),
+              makeLink(41, { state: "merged" }, { source: "stack-dismissed" }),
+            ],
+          }),
+          makeThread("settled", {
+            settledOverride: "settled",
+            settledAt: "2026-08-21T00:00:00.000Z",
+            pullRequests: [makeLink(42)],
+          }),
+        ]),
+        stack: () => Effect.succeed(stack),
+      });
 
-        yield* Effect.gen(function* () {
-          yield* startAndSweep(fixture);
+      yield* Effect.gen(function* () {
+        yield* startAndSweep(fixture);
 
-          const syncCommands = yield* Ref.get(fixture.syncCommands);
-          assert.deepStrictEqual(
-            syncCommands.map((command) => [command.threadId, command.stack] as const),
-            [
-              [ThreadId.make("one"), { kind: "native", ...stack }],
-              [ThreadId.make("settled"), { kind: "native", ...stack }],
-            ],
-          );
-          assert.deepStrictEqual(
-            (yield* Ref.get(fixture.linkCommands)).map(({ commandId: _, ...rest }) => rest),
-            [
-              {
-                type: "thread.pull-request.link",
-                threadId: ThreadId.make("one"),
-                host: "github.com",
-                repository: "owner/repository",
-                number: 43,
-                url: "https://github.com/owner/repository/pull/43",
-                source: "stack",
-              },
-            ],
-          );
-        }).pipe(Effect.provide(fixture.layer));
-      }),
-    ),
+        const syncCommands = yield* Ref.get(fixture.syncCommands);
+        assert.deepStrictEqual(
+          syncCommands.map((command) => [command.threadId, command.stack] as const),
+          [
+            [ThreadId.make("one"), { kind: "native", ...stack }],
+            [ThreadId.make("settled"), { kind: "native", ...stack }],
+          ],
+        );
+        assert.deepStrictEqual(
+          (yield* Ref.get(fixture.linkCommands)).map(({ commandId: _, ...rest }) => rest),
+          [
+            {
+              type: "thread.pull-request.link",
+              threadId: ThreadId.make("one"),
+              host: "github.com",
+              repository: "owner/repository",
+              number: 43,
+              url: "https://github.com/owner/repository/pull/43",
+              source: "stack",
+            },
+          ],
+        );
+      }).pipe(Effect.provide(fixture.layer));
+    }),
   );
 
   it.effect("re-reads every member's layers once a new layer joins the stack", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        yield* TestClock.setTime(Date.parse(NOW));
-        const stack = makeGrowingStack();
-        const fixture = yield* makeHarness({
-          snapshot: makeSnapshot([
-            makeThread("one", { pullRequests: [makeLink(18), makeLink(20)] }),
-          ]),
-          stack: stack.read,
-        });
-        const sweepAndApply = (reactor: PullRequestSyncReactor.PullRequestSyncReactor["Service"]) =>
-          sweepAgain(fixture, reactor).pipe(Effect.andThen(applyRecordedSyncs(fixture)));
-
-        yield* Effect.gen(function* () {
-          const reactor = yield* startAndSweep(fixture);
-          yield* applyRecordedSyncs(fixture);
-          assert.deepStrictEqual(yield* storedStackLayers(fixture), [
-            [18, [18, 20]],
-            [20, [18, 20]],
-          ]);
-          const readsBeforeGrowth = (yield* Ref.get(fixture.stackCalls)).length;
-
-          // #83 is pushed on top and linked; only its own link starts without a snapshot.
-          stack.grow();
-          yield* linkPullRequest83(fixture);
-          yield* sweepAndApply(reactor);
-          yield* sweepAndApply(reactor);
-
-          assert.deepStrictEqual(yield* storedStackLayers(fixture), [
-            [18, [18, 20, 83]],
-            [20, [18, 20, 83]],
-            [83, [18, 20, 83]],
-          ]);
-          const readsAfterGrowth = (yield* Ref.get(fixture.stackCalls)).slice(readsBeforeGrowth);
-          assert.deepStrictEqual(
-            readsAfterGrowth.map((ref) => ref.number).toSorted(),
-            [18, 20, 83],
-          );
+    Effect.gen(function* () {
+      yield* TestClock.setTime(Date.parse(NOW));
+      const stack = makeGrowingStack();
+      const fixture = yield* makeHarness({
+        snapshot: makeSnapshot([makeThread("one", { pullRequests: [makeLink(18), makeLink(20)] })]),
+        stack: stack.read,
+      });
+      const sweepAndApply = (reactor: PullRequestSyncReactor.PullRequestSyncReactor["Service"]) =>
+        sweepAgain(fixture, reactor).pipe(Effect.andThen(applyRecordedSyncs(fixture)));
 
-          // Every member agrees now, so a further sweep reads no stack.
-          yield* sweepAndApply(reactor);
-          assert.strictEqual(
-            (yield* Ref.get(fixture.stackCalls)).length,
-            readsBeforeGrowth + readsAfterGrowth.length,
-          );
-        }).pipe(Effect.provide(fixture.layer));
-      }),
-    ),
+      yield* Effect.gen(function* () {
+        const reactor = yield* startAndSweep(fixture);
+        yield* applyRecordedSyncs(fixture);
+        assert.deepStrictEqual(yield* storedStackLayers(fixture), [
+          [18, [18, 20]],
+          [20, [18, 20]],
+        ]);
+        const readsBeforeGrowth = (yield* Ref.get(fixture.stackCalls)).length;
+
+        // #83 is pushed on top and linked; only its own link starts without a snapshot.
+        stack.grow();
+        yield* linkPullRequest83(fixture);
+        yield* sweepAndApply(reactor);
+        yield* sweepAndApply(reactor);
+
+        assert.deepStrictEqual(yield* storedStackLayers(fixture), [
+          [18, [18, 20, 83]],
+          [20, [18, 20, 83]],
+          [83, [18, 20, 83]],
+        ]);
+        const readsAfterGrowth = (yield* Ref.get(fixture.stackCalls)).slice(readsBeforeGrowth);
+        assert.deepStrictEqual(readsAfterGrowth.map((ref) => ref.number).toSorted(), [18, 20, 83]);
+
+        // Every member agrees now, so a further sweep reads no stack.
+        yield* sweepAndApply(reactor);
+        assert.strictEqual(
+          (yield* Ref.get(fixture.stackCalls)).length,
+          readsBeforeGrowth + readsAfterGrowth.length,
+        );
+      }).pipe(Effect.provide(fixture.layer));
+    }),
   );
 
-  it.effect("reads past the cache when a sibling flags a member during its summary read", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        yield* TestClock.setTime(Date.parse(NOW));
-        const stack = makeGrowingStack();
-        const synced83 = yield* Deferred.make<void>();
-        let holdSummary = false;
-        const fixture = yield* makeHarness({
-          snapshot: makeSnapshot([makeThread("one", { pullRequests: [makeLink(18)] })]),
-          invalidate: stack.invalidate,
-          stack: stack.cachedRead,
-          // #18's summary stays in flight until #83 has read its stack, flagged #18 and synced.
-          summary: (input) =>
-            (holdSummary && input.number === 18 ? Deferred.await(synced83) : Effect.void).pipe(
-              Effect.as(makeSummary(input, { updatedAt: NOW })),
-            ),
-          onSync: (command) =>
-            command.number === 83 ? Deferred.succeed(synced83, undefined) : Effect.void,
-        });
-
-        yield* Effect.gen(function* () {
-          const reactor = yield* startAndSweep(fixture);
-          yield* applyRecordedSyncs(fixture);
-
-          // 30 s later a state change refreshes #18, which caches its two-layer read until 90 s.
-          yield* TestClock.adjust("30 seconds");
-          yield* requestAndApply(fixture, reactor, 18);
-
-          // #83 is pushed on top and linked as the scheduled sweep at 60 s starts, so that sweep
-          // reads #83 for the first time while #18's summary is still in flight.
-          stack.grow();
-          yield* linkPullRequest83(fixture);
-          holdSummary = true;
-          const invalidatedBefore = stack.invalidated.length;
-          yield* TestClock.adjust("30 seconds");
-          yield* Queue.take(fixture.snapshotReads);
-          yield* reactor.drain;
-          yield* applyRecordedSyncs(fixture);
+  it.effect("reads past the cache when a sibling flags a member during its summary read", () =>
+    Effect.gen(function* () {
+      yield* TestClock.setTime(Date.parse(NOW));
+      const stack = makeGrowingStack();
+      const synced83 = yield* Deferred.make<void>();
+      let holdSummary = false;
+      const fixture = yield* makeHarness({
+        snapshot: makeSnapshot([makeThread("one", { pullRequests: [makeLink(18)] })]),
+        invalidate: stack.invalidate,
+        stack: stack.cachedRead,
+        // #18's summary stays in flight until #83 has read its stack, flagged #18 and synced.
+        summary: (input) =>
+          (holdSummary && input.number === 18 ? Deferred.await(synced83) : Effect.void).pipe(
+            Effect.as(makeSummary(input, { updatedAt: NOW })),
+          ),
+        onSync: (command) =>
+          command.number === 83 ? Deferred.succeed(synced83, undefined) : Effect.void,
+      });
 
-          assert.deepStrictEqual(yield* storedStackLayers(fixture), [
-            [18, [18, 20, 83]],
-            [83, [18, 20, 83]],
-          ]);
-          assert.deepStrictEqual(stack.invalidated.slice(invalidatedBefore), [18]);
-        }).pipe(Effect.provide(fixture.layer));
-      }),
-    ),
+      yield* Effect.gen(function* () {
+        const reactor = yield* startAndSweep(fixture);
+        yield* applyRecordedSyncs(fixture);
+
+        // 30 s later a state change refreshes #18, which caches its two-layer read until 90 s.
+        yield* TestClock.adjust("30 seconds");
+        yield* requestAndApply(fixture, reactor, 18);
+
+        // #83 is pushed on top and linked as the scheduled sweep at 60 s starts, so that sweep
+        // reads #83 for the first time while #18's summary is still in flight.
+        stack.grow();
+        yield* linkPullRequest83(fixture);
+        holdSummary = true;
+        const invalidatedBefore = stack.invalidated.length;
+        yield* TestClock.adjust("30 seconds");
+        yield* Queue.take(fixture.snapshotReads);
+        yield* reactor.drain;
+        yield* applyRecordedSyncs(fixture);
+
+        assert.deepStrictEqual(yield* storedStackLayers(fixture), [
+          [18, [18, 20, 83]],
+          [83, [18, 20, 83]],
+        ]);
+        assert.deepStrictEqual(stack.invalidated.slice(invalidatedBefore), [18]);
+      }).pipe(Effect.provide(fixture.layer));
+    }),
   );
 
   it.effect("leaves stacks in other repositories alone when their ids match", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        yield* TestClock.setTime(Date.parse(NOW));
-        // Without a host id the GitHub decoder falls back to the stack number, so two
-        // repositories can both report stack "3".
-        const otherLink = makeLink(7, null, {
-          repository: "owner/other",
-          url: "https://github.com/owner/other/pull/7",
-        });
-        const fixture = yield* makeHarness({
-          snapshot: makeSnapshot([makeThread("one", { pullRequests: [makeLink(1), otherLink] })]),
-          stack: (input) =>
-            Effect.succeed({
-              id: "3",
-              number: 3,
-              url: `https://github.com/${input.repository}/stack/3`,
-              base: "main",
-              layers: [
-                { number: input.number, headBranch: "layer-1", state: "open" },
-                { number: input.number + 1, headBranch: "layer-2", state: "open" },
-              ],
-            }),
-        });
+    Effect.gen(function* () {
+      yield* TestClock.setTime(Date.parse(NOW));
+      // Without a host id the GitHub decoder falls back to the stack number, so two
+      // repositories can both report stack "3".
+      const otherLink = makeLink(7, null, {
+        repository: "owner/other",
+        url: "https://github.com/owner/other/pull/7",
+      });
+      const fixture = yield* makeHarness({
+        snapshot: makeSnapshot([makeThread("one", { pullRequests: [makeLink(1), otherLink] })]),
+        stack: (input) =>
+          Effect.succeed({
+            id: "3",
+            number: 3,
+            url: `https://github.com/${input.repository}/stack/3`,
+            base: "main",
+            layers: [
+              { number: input.number, headBranch: "layer-1", state: "open" },
+              { number: input.number + 1, headBranch: "layer-2", state: "open" },
+            ],
+          }),
+      });
 
-        yield* Effect.gen(function* () {
-          const reactor = yield* startAndSweep(fixture);
-          yield* applyRecordedSyncs(fixture);
-          assert.strictEqual((yield* Ref.get(fixture.stackCalls)).length, 2);
+      yield* Effect.gen(function* () {
+        const reactor = yield* startAndSweep(fixture);
+        yield* applyRecordedSyncs(fixture);
+        assert.strictEqual((yield* Ref.get(fixture.stackCalls)).length, 2);
 
-          yield* sweepAgain(fixture, reactor);
-          yield* sweepAgain(fixture, reactor);
-          assert.strictEqual((yield* Ref.get(fixture.stackCalls)).length, 2);
-        }).pipe(Effect.provide(fixture.layer));
-      }),
-    ),
+        yield* sweepAgain(fixture, reactor);
+        yield* sweepAgain(fixture, reactor);
+        assert.strictEqual((yield* Ref.get(fixture.stackCalls)).length, 2);
+      }).pipe(Effect.provide(fixture.layer));
+    }),
   );
 
   it.effect("keeps existing snapshots and continues when the host fails", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        yield* TestClock.setTime(Date.parse(NOW));
-        const fixture = yield* makeHarness({
-          snapshot: makeSnapshot([
-            makeThread("failing", { pullRequests: [makeLink(7, { state: "open" })] }),
-            makeThread("fine", { pullRequests: [makeLink(8)] }),
-          ]),
-          summary: (input) =>
-            input.number === 7
-              ? Effect.fail(
-                  new PullRequestOperationError({ operation: "summary", detail: "host down" }),
-                )
-              : Effect.succeed(makeSummary(input)),
-        });
+    Effect.gen(function* () {
+      yield* TestClock.setTime(Date.parse(NOW));
+      const fixture = yield* makeHarness({
+        snapshot: makeSnapshot([
+          makeThread("failing", { pullRequests: [makeLink(7, { state: "open" })] }),
+          makeThread("fine", { pullRequests: [makeLink(8)] }),
+        ]),
+        summary: (input) =>
+          input.number === 7
+            ? Effect.fail(
+                new PullRequestOperationError({ operation: "summary", detail: "host down" }),
+              )
+            : Effect.succeed(makeSummary(input)),
+      });
 
-        yield* Effect.gen(function* () {
-          yield* startAndSweep(fixture);
+      yield* Effect.gen(function* () {
+        yield* startAndSweep(fixture);
 
-          assert.deepStrictEqual(
-            (yield* Ref.get(fixture.syncCommands)).map((command) => command.number),
-            [8],
-          );
-        }).pipe(Effect.provide(fixture.layer));
-      }),
-    ),
+        assert.deepStrictEqual(
+          (yield* Ref.get(fixture.syncCommands)).map((command) => command.number),
+          [8],
+        );
+      }).pipe(Effect.provide(fixture.layer));
+    }),
   );
 
   it.effect(
     "retries missing links every fifteen minutes and resumes normal reads after recovery",
     () =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          yield* TestClock.setTime(Date.parse(NOW));
-          const found = yield* Ref.make(false);
-          const fixture = yield* makeHarness({
-            snapshot: makeSnapshot([
-              makeThread("missing", { pullRequests: [makeLink(9), makeLink(10, {})] }),
-            ]),
-            summary: (input) =>
-              Ref.get(found).pipe(
-                Effect.flatMap((available) =>
-                  available ? Effect.succeed(makeSummary(input)) : missingSummary,
-                ),
-              ),
-          });
-          yield* Effect.gen(function* () {
-            const reactor = yield* startAndSweep(fixture);
-            assert.strictEqual((yield* Ref.get(fixture.summaryCalls)).length, 2);
-            for (let index = 0; index < 14; index += 1) yield* sweepAgain(fixture, reactor);
-            assert.strictEqual((yield* Ref.get(fixture.summaryCalls)).length, 2);
-            yield* sweepAgain(fixture, reactor);
-            assert.strictEqual((yield* Ref.get(fixture.summaryCalls)).length, 4);
-            assert.deepStrictEqual(yield* Ref.get(fixture.syncCommands), []);
-
-            yield* Ref.set(found, true);
-            for (let index = 0; index < 14; index += 1) yield* sweepAgain(fixture, reactor);
-            assert.strictEqual((yield* Ref.get(fixture.summaryCalls)).length, 4);
-            yield* sweepAgain(fixture, reactor);
-            const commands = yield* Ref.get(fixture.syncCommands);
-            assert.deepStrictEqual(
-              commands.map((command) => command.number),
-              [9],
-            );
-            yield* Ref.update(fixture.snapshots, (snapshot) => applySync(snapshot, commands));
-            // Recovered quiet open pull requests return to the five-minute cadence.
-            for (let index = 0; index < 5; index += 1) yield* sweepAgain(fixture, reactor);
-            assert.deepStrictEqual(
-              (yield* Ref.get(fixture.summaryCalls))
-                .map((call) => call.number)
-                .toSorted((left, right) => left - right),
-              [9, 9, 9, 9, 10, 10, 10, 10],
-            );
-          }).pipe(Effect.provide(fixture.layer));
-        }),
-      ),
-  );
-
-  it.effect(
-    "holds missing links through sibling and link updates but honors a reader refresh",
-    () =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          yield* TestClock.setTime(Date.parse(NOW));
-          const fixture = yield* makeHarness({
-            snapshot: makeSnapshot([makeThread("missing", { pullRequests: [makeLink(9)] })]),
-            summary: (input) =>
-              input.number === 9 ? missingSummary : Effect.succeed(makeSummary(input)),
-          });
-          const missingReads = Ref.get(fixture.summaryCalls).pipe(
-            Effect.map((calls) => calls.filter((call) => call.number === 9).length),
-          );
-          yield* Effect.gen(function* () {
-            const reactor = yield* startAndSweep(fixture);
-            const linked = makeThread("missing", { pullRequests: [makeLink(9), makeLink(8)] });
-            yield* Ref.set(fixture.snapshots, makeSnapshot([linked]));
-            yield* Queue.offer(fixture.domainEvents, {
-              type: "thread.pull-request-synced",
-              id: EventId.make("sibling-synced"),
-              threadId: linked.id,
-              occurredAt: DateTime.makeUnsafe(NOW),
-              payload: { ...v2PullRequestThread(linked), lastVisitedAt: null },
-            });
-            yield* Queue.take(fixture.snapshotReads);
-            yield* reactor.drain;
-            const afterSiblingSync = yield* missingReads;
-            assert.deepStrictEqual(
-              (yield* Ref.get(fixture.syncCommands)).map((command) => command.number),
-              [8],
-            );
-
-            yield* Queue.offer(fixture.domainEvents, {
-              type: "thread.pull-request-link-updated",
-              id: EventId.make("missing-link-updated"),
-              threadId: linked.id,
-              occurredAt: DateTime.makeUnsafe(NOW),
-              payload: makeLink(9),
-            });
-            // Let the event consumer finish even when it correctly queues no sweep.
-            yield* TestClock.adjust(0);
-            yield* reactor.drain;
-            const afterLinkUpdate = yield* missingReads;
-
-            yield* Queue.offer(fixture.stateChanges, makeLink(9));
-            yield* TestClock.adjust(0);
-            yield* reactor.drain;
-            const afterReaderRefresh = yield* missingReads;
-            yield* sweepAgain(fixture, reactor);
-            assert.deepStrictEqual(
-              {
-                afterSiblingSync,
-                afterLinkUpdate,
-                afterReaderRefresh,
-                afterSweep: yield* missingReads,
-              },
-              { afterSiblingSync: 1, afterLinkUpdate: 1, afterReaderRefresh: 2, afterSweep: 2 },
-            );
-          }).pipe(Effect.provide(fixture.layer));
-        }),
-      ),
-  );
-
-  it.effect("a pending stack retry respects the missing summary backoff", () =>
-    Effect.scoped(
       Effect.gen(function* () {
         yield* TestClock.setTime(Date.parse(NOW));
-        const found = yield* Ref.make(true);
+        const found = yield* Ref.make(false);
         const fixture = yield* makeHarness({
-          snapshot: makeSnapshot([makeThread("missing", { pullRequests: [makeLink(4)] })]),
+          snapshot: makeSnapshot([
+            makeThread("missing", { pullRequests: [makeLink(9), makeLink(10, {})] }),
+          ]),
           summary: (input) =>
             Ref.get(found).pipe(
               Effect.flatMap((available) =>
                 available ? Effect.succeed(makeSummary(input)) : missingSummary,
               ),
             ),
-          stack: () =>
-            Effect.fail(new PullRequestOperationError({ operation: "stack", detail: "host down" })),
         });
         yield* Effect.gen(function* () {
           const reactor = yield* startAndSweep(fixture);
-          assert.strictEqual((yield* Ref.get(fixture.stackCalls)).length, 1);
-          yield* Ref.set(found, false);
-          yield* sweepAgain(fixture, reactor);
           assert.strictEqual((yield* Ref.get(fixture.summaryCalls)).length, 2);
           for (let index = 0; index < 14; index += 1) yield* sweepAgain(fixture, reactor);
           assert.strictEqual((yield* Ref.get(fixture.summaryCalls)).length, 2);
           yield* sweepAgain(fixture, reactor);
-          assert.strictEqual((yield* Ref.get(fixture.summaryCalls)).length, 3);
-          assert.strictEqual((yield* Ref.get(fixture.stackCalls)).length, 1);
+          assert.strictEqual((yield* Ref.get(fixture.summaryCalls)).length, 4);
+          assert.deepStrictEqual(yield* Ref.get(fixture.syncCommands), []);
+
+          yield* Ref.set(found, true);
+          for (let index = 0; index < 14; index += 1) yield* sweepAgain(fixture, reactor);
+          assert.strictEqual((yield* Ref.get(fixture.summaryCalls)).length, 4);
+          yield* sweepAgain(fixture, reactor);
+          const commands = yield* Ref.get(fixture.syncCommands);
+          assert.deepStrictEqual(
+            commands.map((command) => command.number),
+            [9],
+          );
+          yield* Ref.update(fixture.snapshots, (snapshot) => applySync(snapshot, commands));
+          // Recovered quiet open pull requests return to the five-minute cadence.
+          for (let index = 0; index < 5; index += 1) yield* sweepAgain(fixture, reactor);
+          assert.deepStrictEqual(
+            (yield* Ref.get(fixture.summaryCalls))
+              .map((call) => call.number)
+              .toSorted((left, right) => left - right),
+            [9, 9, 9, 9, 10, 10, 10, 10],
+          );
         }).pipe(Effect.provide(fixture.layer));
       }),
-    ),
   );
 
-  it.effect.each([
-    "gh pr merge 7 --squash 2>&1 | tail -3",
-    "cafe pr merge 7 --squash",
-    "az repos pr update --id 7 --status completed",
-  ])("reads open links fresh only for a thread that ran `%s`", (mergeCommand) =>
-    Effect.scoped(
+  it.effect(
+    "holds missing links through sibling and link updates but honors a reader refresh",
+    () =>
       Effect.gen(function* () {
         yield* TestClock.setTime(Date.parse(NOW));
-        const state = yield* Ref.make<PullRequestSummary["state"]>("open");
-        const invalidated = yield* Ref.make<ReadonlyArray<number>>([]);
         const fixture = yield* makeHarness({
-          snapshot: makeSnapshot([
-            makeThread("agent", { pullRequests: [makeLink(7, { state: "open" })] }),
-            makeThread("other", { pullRequests: [makeLink(9, { state: "open" })] }),
-          ]),
+          snapshot: makeSnapshot([makeThread("missing", { pullRequests: [makeLink(9)] })]),
           summary: (input) =>
-            Ref.get(state).pipe(
-              Effect.map((current) =>
-                makeSummary(input, current === "merged" ? { state: current, mergedAt: NOW } : {}),
-              ),
-            ),
-          invalidate: ({ reference }) =>
-            Ref.update(invalidated, (numbers) => [...numbers, reference?.number ?? -1]),
+            input.number === 9 ? missingSummary : Effect.succeed(makeSummary(input)),
         });
-
+        const missingReads = Ref.get(fixture.summaryCalls).pipe(
+          Effect.map((calls) => calls.filter((call) => call.number === 9).length),
+        );
         yield* Effect.gen(function* () {
           const reactor = yield* startAndSweep(fixture);
-          yield* Ref.set(state, "merged");
-          yield* Ref.set(fixture.summaryCalls, []);
-
-          yield* Queue.offerAll(fixture.domainEvents, [
-            commandRan(ThreadId.make("other"), "gh pr view 9"),
-            runUpdated(ThreadId.make("other"), "completed"),
-            commandRan(ThreadId.make("agent"), mergeCommand),
-            runUpdated(ThreadId.make("agent"), "completed"),
-          ]);
-          yield* Queue.take(fixture.snapshotReads);
+          const linked = makeThread("missing", { pullRequests: [makeLink(9), makeLink(8)] });
+          yield* Ref.set(fixture.snapshots, makeSnapshot([linked]));
+          yield* Queue.offer(fixture.domainEvents, {
+            type: "thread.pull-request-synced",
+            id: EventId.make("sibling-synced"),
+            threadId: linked.id,
+            occurredAt: DateTime.makeUnsafe(NOW),
+            payload: { ...v2PullRequestThread(linked), lastVisitedAt: null },
+          });
           yield* Queue.take(fixture.snapshotReads);
           yield* reactor.drain;
-
-          assert.deepStrictEqual(yield* Ref.get(invalidated), [7]);
+          const afterSiblingSync = yield* missingReads;
           assert.deepStrictEqual(
-            (yield* Ref.get(fixture.summaryCalls)).map((call) => call.number),
-            [7],
+            (yield* Ref.get(fixture.syncCommands)).map((command) => command.number),
+            [8],
           );
+
+          yield* Queue.offer(fixture.domainEvents, {
+            type: "thread.pull-request-link-updated",
+            id: EventId.make("missing-link-updated"),
+            threadId: linked.id,
+            occurredAt: DateTime.makeUnsafe(NOW),
+            payload: makeLink(9),
+          });
+          // Let the event consumer finish even when it correctly queues no sweep.
+          yield* TestClock.adjust(0);
+          yield* reactor.drain;
+          const afterLinkUpdate = yield* missingReads;
+
+          yield* Queue.offer(fixture.stateChanges, makeLink(9));
+          yield* TestClock.adjust(0);
+          yield* reactor.drain;
+          const afterReaderRefresh = yield* missingReads;
+          yield* sweepAgain(fixture, reactor);
           assert.deepStrictEqual(
-            (yield* Ref.get(fixture.syncCommands)).map((command) => [
-              command.number,
-              command.snapshot.state,
-            ]),
-            [[7, "merged"]],
+            {
+              afterSiblingSync,
+              afterLinkUpdate,
+              afterReaderRefresh,
+              afterSweep: yield* missingReads,
+            },
+            { afterSiblingSync: 1, afterLinkUpdate: 1, afterReaderRefresh: 2, afterSweep: 2 },
           );
         }).pipe(Effect.provide(fixture.layer));
       }),
-    ),
+  );
+
+  it.effect("a pending stack retry respects the missing summary backoff", () =>
+    Effect.gen(function* () {
+      yield* TestClock.setTime(Date.parse(NOW));
+      const found = yield* Ref.make(true);
+      const fixture = yield* makeHarness({
+        snapshot: makeSnapshot([makeThread("missing", { pullRequests: [makeLink(4)] })]),
+        summary: (input) =>
+          Ref.get(found).pipe(
+            Effect.flatMap((available) =>
+              available ? Effect.succeed(makeSummary(input)) : missingSummary,
+            ),
+          ),
+        stack: () =>
+          Effect.fail(new PullRequestOperationError({ operation: "stack", detail: "host down" })),
+      });
+      yield* Effect.gen(function* () {
+        const reactor = yield* startAndSweep(fixture);
+        assert.strictEqual((yield* Ref.get(fixture.stackCalls)).length, 1);
+        yield* Ref.set(found, false);
+        yield* sweepAgain(fixture, reactor);
+        assert.strictEqual((yield* Ref.get(fixture.summaryCalls)).length, 2);
+        for (let index = 0; index < 14; index += 1) yield* sweepAgain(fixture, reactor);
+        assert.strictEqual((yield* Ref.get(fixture.summaryCalls)).length, 2);
+        yield* sweepAgain(fixture, reactor);
+        assert.strictEqual((yield* Ref.get(fixture.summaryCalls)).length, 3);
+        assert.strictEqual((yield* Ref.get(fixture.stackCalls)).length, 1);
+      }).pipe(Effect.provide(fixture.layer));
+    }),
+  );
+
+  it.effect.each([
+    "gh pr merge 7 --squash 2>&1 | tail -3",
+    "cafe pr merge 7 --squash",
+    "az repos pr update --id 7 --status completed",
+  ])("reads open links fresh only for a thread that ran `%s`", (mergeCommand) =>
+    Effect.gen(function* () {
+      yield* TestClock.setTime(Date.parse(NOW));
+      const state = yield* Ref.make<PullRequestSummary["state"]>("open");
+      const invalidated = yield* Ref.make<ReadonlyArray<number>>([]);
+      const fixture = yield* makeHarness({
+        snapshot: makeSnapshot([
+          makeThread("agent", { pullRequests: [makeLink(7, { state: "open" })] }),
+          makeThread("other", { pullRequests: [makeLink(9, { state: "open" })] }),
+        ]),
+        summary: (input) =>
+          Ref.get(state).pipe(
+            Effect.map((current) =>
+              makeSummary(input, current === "merged" ? { state: current, mergedAt: NOW } : {}),
+            ),
+          ),
+        invalidate: ({ reference }) =>
+          Ref.update(invalidated, (numbers) => [...numbers, reference?.number ?? -1]),
+      });
+
+      yield* Effect.gen(function* () {
+        const reactor = yield* startAndSweep(fixture);
+        yield* Ref.set(state, "merged");
+        yield* Ref.set(fixture.summaryCalls, []);
+
+        yield* Queue.offerAll(fixture.domainEvents, [
+          commandRan(ThreadId.make("other"), "gh pr view 9"),
+          runUpdated(ThreadId.make("other"), "completed"),
+          commandRan(ThreadId.make("agent"), mergeCommand),
+          runUpdated(ThreadId.make("agent"), "completed"),
+        ]);
+        yield* Queue.take(fixture.snapshotReads);
+        yield* Queue.take(fixture.snapshotReads);
+        yield* reactor.drain;
+
+        assert.deepStrictEqual(yield* Ref.get(invalidated), [7]);
+        assert.deepStrictEqual(
+          (yield* Ref.get(fixture.summaryCalls)).map((call) => call.number),
+          [7],
+        );
+        assert.deepStrictEqual(
+          (yield* Ref.get(fixture.syncCommands)).map((command) => [
+            command.number,
+            command.snapshot.state,
+          ]),
+          [[7, "merged"]],
+        );
+      }).pipe(Effect.provide(fixture.layer));
+    }),
+  );
+
+  it.effect("reopens a watch's checks when its thread's agent pushes", () =>
+    Effect.gen(function* () {
+      yield* TestClock.setTime(Date.parse(NOW));
+      const watch = {
+        startedAt: NOW,
+        headSha: "aaaaaaaaaa",
+        failedChecks: [],
+        passed: true,
+        passedChecks: ["test"],
+        remarksThrough: NOW,
+        remarkIds: [],
+        conflicting: false,
+        wakes: 0,
+      };
+      const fixture = yield* makeHarness({
+        snapshot: makeSnapshot([
+          makeThread("agent", {
+            pullRequests: [
+              makeLink(7, { state: "open" }, { watch: { ...watch, checksPending: false } }),
+            ],
+          }),
+          makeThread("unread", {
+            pullRequests: [makeLink(8, { state: "open" }, { watch })],
+          }),
+        ]),
+      });
+
+      yield* Effect.gen(function* () {
+        yield* startAndSweep(fixture);
+        const agent = ThreadId.make("agent");
+        yield* Queue.offerAll(fixture.domainEvents, [
+          commandRan(agent, "git status && echo 'then git push'", undefined, "status"),
+          // A watch that has not read its checks yet has no answer to forget.
+          commandRan(ThreadId.make("unread"), "git push", undefined, "unread-push"),
+          commandRan(agent, "cd app && git -C . push --force-with-lease", undefined, "push"),
+          commandRan(agent, '/bin/zsh -lc "gh stack submit --auto"', undefined, "stack"),
+        ]);
+        for (const item of ["push", "stack"]) {
+          const command = yield* Queue.take(fixture.reopenCommands);
+          assert.deepStrictEqual(
+            [command.threadId, command.commandId],
+            [agent, `server:pr-push-checks:agent:item:agent:${item}`],
+          );
+        }
+      }).pipe(Effect.provide(fixture.layer));
+    }),
   );
 
   it.effect("reads open links again when the run ends, after `merge --auto` left them open", () =>
-    Effect.scoped(
+    Effect.gen(function* () {
+      yield* TestClock.setTime(Date.parse(NOW));
+      const state = yield* Ref.make<PullRequestSummary["state"]>("open");
+      const fixture = yield* makeHarness({
+        snapshot: makeSnapshot([
+          makeThread("agent", { pullRequests: [makeLink(7, { state: "open" })] }),
+        ]),
+        summary: (input) =>
+          Ref.get(state).pipe(
+            Effect.map((current) =>
+              makeSummary(input, current === "merged" ? { state: current, mergedAt: NOW } : {}),
+            ),
+          ),
+      });
+
+      yield* Effect.gen(function* () {
+        const reactor = yield* startAndSweep(fixture);
+        yield* Queue.offer(
+          fixture.domainEvents,
+          commandRan(ThreadId.make("agent"), "gh pr merge 7 --auto"),
+        );
+        yield* Queue.take(fixture.snapshotReads);
+        yield* Queue.take(fixture.snapshotReads);
+        yield* reactor.drain;
+        yield* Ref.set(state, "merged");
+        yield* Ref.set(fixture.syncCommands, []);
+
+        yield* Queue.offer(fixture.domainEvents, runUpdated(ThreadId.make("agent"), "completed"));
+        yield* Queue.take(fixture.snapshotReads);
+        yield* Queue.take(fixture.snapshotReads);
+        yield* reactor.drain;
+
+        assert.deepStrictEqual(
+          (yield* Ref.get(fixture.syncCommands)).map((command) => [
+            command.number,
+            command.snapshot.state,
+          ]),
+          [[7, "merged"]],
+        );
+      }).pipe(Effect.provide(fixture.layer));
+    }),
+  );
+
+  it.effect.each(["open", "closed"] as const)(
+    "reads %s links fresh as soon as a merge command ends, before its run ends",
+    (initialState) =>
       Effect.gen(function* () {
         yield* TestClock.setTime(Date.parse(NOW));
-        const state = yield* Ref.make<PullRequestSummary["state"]>("open");
+        const state = yield* Ref.make<PullRequestSummary["state"]>(initialState);
+        const initialSnapshot = {
+          state: initialState,
+          closedAt: initialState === "closed" ? "2026-08-20T00:00:00.000Z" : null,
+        };
         const fixture = yield* makeHarness({
           snapshot: makeSnapshot([
-            makeThread("agent", { pullRequests: [makeLink(7, { state: "open" })] }),
+            makeThread("agent", { pullRequests: [makeLink(7, initialSnapshot)] }),
           ]),
           summary: (input) =>
             Ref.get(state).pipe(
               Effect.map((current) =>
-                makeSummary(input, current === "merged" ? { state: current, mergedAt: NOW } : {}),
+                makeSummary(
+                  input,
+                  current === "merged" ? { state: current, mergedAt: NOW } : initialSnapshot,
+                ),
               ),
             ),
         });
 
         yield* Effect.gen(function* () {
           const reactor = yield* startAndSweep(fixture);
+          yield* Ref.set(state, "merged");
+          yield* Ref.set(fixture.summaryCalls, []);
+
           yield* Queue.offer(
             fixture.domainEvents,
-            commandRan(ThreadId.make("agent"), "gh pr merge 7 --auto"),
+            commandRan(ThreadId.make("agent"), "gh pr merge 7"),
           );
           yield* Queue.take(fixture.snapshotReads);
           yield* Queue.take(fixture.snapshotReads);
           yield* reactor.drain;
-          yield* Ref.set(state, "merged");
-          yield* Ref.set(fixture.syncCommands, []);
-
-          yield* Queue.offer(fixture.domainEvents, runUpdated(ThreadId.make("agent"), "completed"));
-          yield* Queue.take(fixture.snapshotReads);
-          yield* Queue.take(fixture.snapshotReads);
-          yield* reactor.drain;
 
           assert.deepStrictEqual(
             (yield* Ref.get(fixture.syncCommands)).map((command) => [
@@ -1817,58 +1960,6 @@ describe("PullRequestSyncReactor", () => {
           );
         }).pipe(Effect.provide(fixture.layer));
       }),
-    ),
-  );
-
-  it.effect.each(["open", "closed"] as const)(
-    "reads %s links fresh as soon as a merge command ends, before its run ends",
-    (initialState) =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          yield* TestClock.setTime(Date.parse(NOW));
-          const state = yield* Ref.make<PullRequestSummary["state"]>(initialState);
-          const initialSnapshot = {
-            state: initialState,
-            closedAt: initialState === "closed" ? "2026-08-20T00:00:00.000Z" : null,
-          };
-          const fixture = yield* makeHarness({
-            snapshot: makeSnapshot([
-              makeThread("agent", { pullRequests: [makeLink(7, initialSnapshot)] }),
-            ]),
-            summary: (input) =>
-              Ref.get(state).pipe(
-                Effect.map((current) =>
-                  makeSummary(
-                    input,
-                    current === "merged" ? { state: current, mergedAt: NOW } : initialSnapshot,
-                  ),
-                ),
-              ),
-          });
-
-          yield* Effect.gen(function* () {
-            const reactor = yield* startAndSweep(fixture);
-            yield* Ref.set(state, "merged");
-            yield* Ref.set(fixture.summaryCalls, []);
-
-            yield* Queue.offer(
-              fixture.domainEvents,
-              commandRan(ThreadId.make("agent"), "gh pr merge 7"),
-            );
-            yield* Queue.take(fixture.snapshotReads);
-            yield* Queue.take(fixture.snapshotReads);
-            yield* reactor.drain;
-
-            assert.deepStrictEqual(
-              (yield* Ref.get(fixture.syncCommands)).map((command) => [
-                command.number,
-                command.snapshot.state,
-              ]),
-              [[7, "merged"]],
-            );
-          }).pipe(Effect.provide(fixture.layer));
-        }),
-      ),
   );
 
   it.effect.each([
@@ -1999,54 +2090,50 @@ describe("PullRequestSyncReactor", () => {
       linked: [],
     },
   ])("links what the command created: $name", ({ input, output, linked }) =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        yield* TestClock.setTime(Date.parse(NOW));
-        const fixture = yield* makeHarness({ snapshot: mergingSnapshot() });
+    Effect.gen(function* () {
+      yield* TestClock.setTime(Date.parse(NOW));
+      const fixture = yield* makeHarness({ snapshot: mergingSnapshot() });
 
-        yield* Effect.gen(function* () {
-          const reactor = yield* startAndSweep(fixture);
-          const child = ThreadId.make("delegated-child");
-          const links = yield* linksFrom(fixture, reactor, [commandRan(child, input, output)]);
+      yield* Effect.gen(function* () {
+        const reactor = yield* startAndSweep(fixture);
+        const child = ThreadId.make("delegated-child");
+        const links = yield* linksFrom(fixture, reactor, [commandRan(child, input, output)]);
 
-          assert.deepStrictEqual(
-            links.map((command) => [command.threadId, command.number, command.source]),
-            linked.map((number) => [child, number, "created"]),
-          );
-        }).pipe(Effect.provide(fixture.layer));
-      }),
-    ),
+        assert.deepStrictEqual(
+          links.map((command) => [command.threadId, command.number, command.source]),
+          linked.map((number) => [child, number, "created"]),
+        );
+      }).pipe(Effect.provide(fixture.layer));
+    }),
   );
 
   it.effect("links a created pull request once its command settles, with one command id", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        yield* TestClock.setTime(Date.parse(NOW));
-        const fixture = yield* makeHarness({ snapshot: mergingSnapshot() });
+    Effect.gen(function* () {
+      yield* TestClock.setTime(Date.parse(NOW));
+      const fixture = yield* makeHarness({ snapshot: mergingSnapshot() });
 
-        yield* Effect.gen(function* () {
-          const reactor = yield* startAndSweep(fixture);
-          const settled = commandRan(
-            ThreadId.make("agent"),
-            "gh pr create --fill",
-            "https://github.com/owner/repository/pull/124",
-          );
-          assert.strictEqual(settled.type, "turn-item.updated");
-          if (settled.type !== "turn-item.updated") return;
+      yield* Effect.gen(function* () {
+        const reactor = yield* startAndSweep(fixture);
+        const settled = commandRan(
+          ThreadId.make("agent"),
+          "gh pr create --fill",
+          "https://github.com/owner/repository/pull/124",
+        );
+        assert.strictEqual(settled.type, "turn-item.updated");
+        if (settled.type !== "turn-item.updated") return;
 
-          const links = yield* linksFrom(fixture, reactor, [
-            { ...settled, payload: { ...settled.payload, status: "running" } },
-            settled,
-            settled,
-          ]);
+        const links = yield* linksFrom(fixture, reactor, [
+          { ...settled, payload: { ...settled.payload, status: "running" } },
+          settled,
+          settled,
+        ]);
 
-          assert.deepStrictEqual(
-            links.map((command) => command.number),
-            [124, 124],
-          );
-          assert.strictEqual(links[0]!.commandId, links[1]!.commandId);
-        }).pipe(Effect.provide(fixture.layer));
-      }),
-    ),
+        assert.deepStrictEqual(
+          links.map((command) => command.number),
+          [124, 124],
+        );
+        assert.strictEqual(links[0]!.commandId, links[1]!.commandId);
+      }).pipe(Effect.provide(fixture.layer));
+    }),
   );
 });
diff --git a/apps/server/src/orchestration-v2/PullRequestSyncReactor.ts b/apps/server/src/orchestration-v2/PullRequestSyncReactor.ts
index 5590a20ce019..b654364d3a7f 100644
--- a/apps/server/src/orchestration-v2/PullRequestSyncReactor.ts
+++ b/apps/server/src/orchestration-v2/PullRequestSyncReactor.ts
@@ -72,6 +72,11 @@ const CREATE_COMMANDS = sourceControlDefinitions.definitions.flatMap(
 );
 const createCommandCount = (code: string) =>
   CREATE_COMMANDS.reduce((count, { run }) => count + [...code.matchAll(run)].length, 0);
+// A push, directly or through a stack tool, that can start checks on a linked pull request.
+const PUSH_COMMAND = new RegExp(
+  `${COMMAND_START}(?:git(?:\\s+-[cC]\\s+\\S+)*\\s+push|gh\\s+stack\\s+(?:push|submit)|cafe\\s+stack\\s+submit|jj\\s+git\\s+push)(?=$|[\\s;&|)])`,
+  "u",
+);
 
 // Codex runs each command as `/bin/zsh -lc <script>`, quoting the script in pieces such as
 // `"a "'`b`'" c"`.
@@ -134,6 +139,8 @@ function shellSegments(script: string): ReadonlyArray<string> {
 const shellCode = (script: string) =>
   script.replace(HEREDOC_BODY, "<<").replace(QUOTED_OR_COMMENT, "''");
 
+const isPushCommand = (input: string) => PUSH_COMMAND.test(shellCode(shellScript(input)));
+
 type CommandExecution = Extract<OrchestrationV2TurnItem, { readonly type: "command_execution" }>;
 
 /**
@@ -183,6 +190,19 @@ interface LinkEntry {
   readonly link: ThreadPullRequestLink;
 }
 
+const referenceOf = ({ thread, link }: LinkEntry) => ({
+  projectId: thread.projectId,
+  host: normalizeThreadPullRequestKey(link).host,
+  repository: link.repository,
+  number: link.number,
+});
+
+/** Pauses and batching both belong to a project's host. */
+const pauseKeyOf = (entry: LinkEntry) => {
+  const { projectId, host } = referenceOf(entry);
+  return `${projectId}\0${host}`;
+};
+
 /** Another layer of the stack `url` belongs to, in its host's canonical shape. */
 function siblingChangeRequestUrl(url: string, number: number): string | null {
   if (!Number.isSafeInteger(number) || number < 1) return null;
@@ -478,12 +498,7 @@ export const make = Effect.gen(function* () {
 
     const syncGroup = Effect.fnUntraced(function* (key: string, entries: ReadonlyArray<LinkEntry>) {
       const first = entries[0]!;
-      const ref = {
-        projectId: first.thread.projectId,
-        host: normalizeThreadPullRequestKey(first.link).host,
-        repository: first.link.repository,
-        number: first.link.number,
-      };
+      const ref = referenceOf(first);
       const refreshRequested = requested.has(key);
       // A held merged summary is served without asking the host, so a snapshot still missing its
       // merge time has to drop it or the slow-cadence re-read would hand back the same gap.
@@ -612,25 +627,63 @@ export const make = Effect.gen(function* () {
           return Effect.void;
         }),
       );
+    const pools = {
+      // Wider than one summary batch, so reads that finish their cache checks at different
+      // times still share batches.
+      batched: { width: 100, reads: yield* Semaphore.make(100) },
+      // One read per pull request, often a CLI process, so these keep the narrower width.
+      unbatched: { width: 25, reads: yield* Semaphore.make(25) },
+    };
+    const isPaused = (pauseKey: string, atMs: number) => (pausedUntil.get(pauseKey) ?? 0) > atMs;
+    // Judged once a slot is free, so a stack retry a sibling flags meanwhile still counts, and
+    // pauses set during the sweep apply at once.
+    const readIfDue = (
+      key: string,
+      entries: ReadonlyArray<LinkEntry>,
+      pauseKey: string,
+      reads: Semaphore.Semaphore,
+    ) =>
+      reads.withPermits(1)(
+        Effect.suspend(() =>
+          isDue(key, entries, nowMs)
+            ? Clock.currentTimeMillis.pipe(
+                Effect.flatMap((startedAtMs) =>
+                  isPaused(pauseKey, startedAtMs) ? Effect.void : readGroup(key, entries, pauseKey),
+                ),
+              )
+            : Effect.void,
+        ),
+      );
+    const groupsByHost = Map.groupBy(
+      Array.from(groups).filter(([key]) => scope === "all" || requested.has(key)),
+      ([, entries]) => pauseKeyOf(entries[0]!),
+    );
     yield* Effect.forEach(
-      groups,
-      ([key, entries]) => {
-        if (!((scope === "all" || requested.has(key)) && isDue(key, entries, nowMs))) {
+      groupsByHost,
+      ([pauseKey, hostGroups]) => {
+        // A host paused or with nothing due skips the lookup. Stack retries only flag groups on
+        // the flagging group's own host, so nothing on it becomes due this sweep.
+        if (
+          isPaused(pauseKey, nowMs) ||
+          !hostGroups.some(([key, entries]) => isDue(key, entries, nowMs))
+        ) {
           return Effect.void;
         }
-        const first = entries[0]!;
-        const pauseKey = `${first.thread.projectId}\0${normalizeThreadPullRequestKey(first.link).host}`;
-        // Check pauses at each read so changes during the sweep apply immediately.
-        return Clock.currentTimeMillis.pipe(
-          Effect.flatMap((startedAtMs) =>
-            (pausedUntil.get(pauseKey) ?? 0) > startedAtMs
-              ? Effect.void
-              : readGroup(key, entries, pauseKey),
-          ),
+        return pullRequests.batchesReads(referenceOf(hostGroups[0]![1][0]!)).pipe(
+          Effect.flatMap((batches) => {
+            const { width, reads } = batches ? pools.batched : pools.unbatched;
+            return Effect.forEach(
+              hostGroups,
+              ([key, entries]) => readIfDue(key, entries, pauseKey, reads),
+              {
+                concurrency: width,
+                discard: true,
+              },
+            );
+          }),
         );
       },
-      // Match summary batch width so GitHub reads coalesce into one request.
-      { concurrency: 25, discard: true },
+      { concurrency: "unbounded", discard: true },
     );
     for (const [reason, { count, key }] of skips) {
       yield* Effect.logWarning("pull request sync skipped", { count, key, reason });
@@ -711,6 +764,32 @@ export const make = Effect.gen(function* () {
     },
   );
 
+  // A push can start new checks, so the thread's watches forget whether checks were running and
+  // hold the thread until they read the pull request again. The run is still going, so the
+  // thread never shows as done in between.
+  const reopenWatchedChecks = Effect.fn("PullRequestSyncReactor.reopenWatchedChecks")(
+    function* (threadId: ThreadId, item: CommandExecution) {
+      if (isOrchestrationV2WorkActive(item.status) || !isPushCommand(item.input)) return;
+      const threads = yield* projections.getThreadsWithPullRequests(threadId);
+      const answered = threads.some((thread) =>
+        (thread.pullRequests ?? []).some((link) => link.watch?.checksPending !== undefined),
+      );
+      if (!answered) return;
+      yield* engine.dispatch({
+        type: "thread.pull-request-watch.checks-reopen",
+        // Stable per command, so a repeated settlement clears an answer read since only once.
+        commandId: CommandId.make(`server:pr-push-checks:${threadId}:${item.id}`),
+        threadId,
+      });
+    },
+    (effect, threadId) =>
+      effect.pipe(
+        Effect.catchCause(
+          logSkipped("reopening a watch's checks after a push failed", { threadId }),
+        ),
+      ),
+  );
+
   const start: PullRequestSyncReactor["Service"]["start"] = Effect.fn(
     "PullRequestSyncReactor.start",
   )(function* () {
@@ -741,7 +820,10 @@ export const make = Effect.gen(function* () {
           case "turn-item.updated": {
             const item = event.payload;
             if (item.type !== "command_execution") return Effect.void;
-            const linked = linkCreatedChangeRequests(event.threadId, item);
+            const linked = Effect.andThen(
+              linkCreatedChangeRequests(event.threadId, item),
+              reopenWatchedChecks(event.threadId, item),
+            );
             if (!isChangeRequestCloseCommand(item.input)) return linked;
             const ended = closeCommands.get(event.threadId) ?? new Set<string>();
             closeCommands.set(event.threadId, ended);
diff --git a/apps/server/src/orchestration-v2/PullRequestWatchReactor.ts b/apps/server/src/orchestration-v2/PullRequestWatchReactor.ts
index 511b65c3b2aa..ddfe74160459 100644
--- a/apps/server/src/orchestration-v2/PullRequestWatchReactor.ts
+++ b/apps/server/src/orchestration-v2/PullRequestWatchReactor.ts
@@ -165,11 +165,13 @@ function planRead(
   if (last === undefined || group.targets.some((target) => !last.watches.has(watchKey(target)))) {
     return { detail: true, activity: true };
   }
-  // Nothing on the host changes when the no-checks deadline passes, so it alone prompts a read.
+  // Nothing on the host changes when the no-checks deadline passes, or when a push to another
+  // branch clears a watch's answer, so either alone prompts a read.
   const checksDue = group.targets.some(
     ({ watch }) =>
-      watch.checksAwaitedSince != null &&
-      now - Date.parse(watch.checksAwaitedSince) >= PULL_REQUEST_WATCH_NO_CHECKS_MS,
+      watch.checksPending === undefined ||
+      (watch.checksAwaitedSince != null &&
+        now - Date.parse(watch.checksAwaitedSince) >= PULL_REQUEST_WATCH_NO_CHECKS_MS),
   );
   if (fingerprint === null) {
     const read =
@@ -189,6 +191,10 @@ function planRead(
   };
 }
 
+// Lets the orchestrator tell that a push cleared the answer while this read was in flight.
+const checksPendingBeforeOf = ({ watch }: WatchTarget) =>
+  watch.checksPending === undefined ? {} : { checksPendingBefore: watch.checksPending };
+
 function watchesEqual(left: ThreadPullRequestWatch, right: ThreadPullRequestWatch): boolean {
   return (
     left.startedAt === right.startedAt &&
@@ -202,8 +208,11 @@ function watchesEqual(left: ThreadPullRequestWatch, right: ThreadPullRequestWatc
     left.remarksThrough === right.remarksThrough &&
     left.remarkIds.join("\n") === right.remarkIds.join("\n") &&
     left.conflicting === right.conflicting &&
+    left.mergeQueueRemovalId === right.mergeQueueRemovalId &&
     left.wakes === right.wakes &&
-    left.checksAwaitedSince === right.checksAwaitedSince
+    left.awaitingBaseline === right.awaitingBaseline &&
+    left.checksAwaitedSince === right.checksAwaitedSince &&
+    left.checksPending === right.checksPending
   );
 }
 
@@ -312,6 +321,7 @@ export const make = Effect.gen(function* () {
       ...identityOf(target.link),
       startedAt: target.watch.startedAt,
       watch: next,
+      ...checksPendingBeforeOf(target),
       ...(endedWatch === undefined ? {} : { endedWatch }),
       ...(wake === undefined
         ? {}
@@ -453,11 +463,13 @@ export const make = Effect.gen(function* () {
       ...identityOf(first.target.link),
       startedAt: first.target.watch.startedAt,
       watch: first.next,
+      ...checksPendingBeforeOf(first.target),
       ...(first.endedWatch === undefined ? {} : { endedWatch: first.endedWatch }),
       others: rest.map((item) => ({
         ...identityOf(item.target.link),
         startedAt: item.target.watch.startedAt,
         watch: item.next,
+        ...checksPendingBeforeOf(item.target),
         ...(item.endedWatch === undefined ? {} : { endedWatch: item.endedWatch }),
         ...(item.wake.includesRemarks === true ? { includesRemarks: true } : {}),
       })),
diff --git a/apps/server/src/orchestration-v2/RemoteDelegatedTask.test.ts b/apps/server/src/orchestration-v2/RemoteDelegatedTask.test.ts
index f8363bef98f9..f075b43d9f88 100644
--- a/apps/server/src/orchestration-v2/RemoteDelegatedTask.test.ts
+++ b/apps/server/src/orchestration-v2/RemoteDelegatedTask.test.ts
@@ -226,6 +226,13 @@ it.layer(layerTest)("a delegated task in a linked environment", (it) => {
       const index = yield* (yield* ProjectionStore.ProjectionStoreV2).listActiveShellIndex();
       assert.isTrue(index.find((entry) => entry.id === parent.threadId)?.hasRemoteTasks);
       assert.isFalse(index.find((entry) => entry.id === other.threadId)?.hasRemoteTasks);
+      // Nothing here can cancel the task there, so it must not block archiving.
+      yield* orchestrator.dispatch({
+        type: "thread.archive",
+        commandId: CommandId.make("command:archive:records"),
+        threadId: parent.threadId,
+      });
+      assert.isNotNull((yield* orchestrator.getThreadShell(parent.threadId))?.archivedAt);
     }),
   );
 
diff --git a/apps/server/src/orchestration-v2/RunExecutionService.test.ts b/apps/server/src/orchestration-v2/RunExecutionService.test.ts
index 0e584bcf0c0a..fc6a65776593 100644
--- a/apps/server/src/orchestration-v2/RunExecutionService.test.ts
+++ b/apps/server/src/orchestration-v2/RunExecutionService.test.ts
@@ -2050,7 +2050,7 @@ it.effect(
         },
       ).pipe(Effect.forkScoped);
       assert.isFalse(yield* Deferred.await(active));
-    }).pipe(Effect.scoped),
+    }),
 );
 
 it.effect("keeps ingesting a failed root's background item when its work continues", () =>
diff --git a/apps/server/src/orchestration-v2/RuntimePolicy.test.ts b/apps/server/src/orchestration-v2/RuntimePolicy.test.ts
index ec610b093f7d..6f9fbe53d911 100644
--- a/apps/server/src/orchestration-v2/RuntimePolicy.test.ts
+++ b/apps/server/src/orchestration-v2/RuntimePolicy.test.ts
@@ -99,6 +99,7 @@ const layerWithPolicy = (policy?: ManagedPolicySummary) =>
             workspaceRoot: "/project-root",
             defaultModelSelection: null,
             defaultThreadEnvMode: null,
+            hasCustomTitle: false,
             autoPull: false,
             faviconPath: null,
             projectIcon: null,
diff --git a/apps/server/src/orchestration-v2/SelectionRestart.integration.test.ts b/apps/server/src/orchestration-v2/SelectionRestart.integration.test.ts
index ba49f0bcfba5..2dcbbd2ba2e1 100644
--- a/apps/server/src/orchestration-v2/SelectionRestart.integration.test.ts
+++ b/apps/server/src/orchestration-v2/SelectionRestart.integration.test.ts
@@ -285,728 +285,716 @@ function makeRestartAdapter(
 }
 
 it.live("retries a failed selection restart session open before completing", () =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      const cwd = yield* checkpointWorkspace("selection-restart-lifecycle");
-      const threadId = ThreadId.make("thread:selection-restart-lifecycle");
-      const state = yield* Ref.make<RestartAdapterState>({
-        activeTurn: null,
-        opened: [],
-        started: [],
-        closedSessionCount: 0,
-        failedReplacementOpen: false,
-      });
-      const layerRegistry = ProviderAdapterRegistry.layerSingle(makeRestartAdapter(state));
+  Effect.gen(function* () {
+    const cwd = yield* checkpointWorkspace("selection-restart-lifecycle");
+    const threadId = ThreadId.make("thread:selection-restart-lifecycle");
+    const state = yield* Ref.make<RestartAdapterState>({
+      activeTurn: null,
+      opened: [],
+      started: [],
+      closedSessionCount: 0,
+      failedReplacementOpen: false,
+    });
+    const layerRegistry = ProviderAdapterRegistry.layerSingle(makeRestartAdapter(state));
 
-      const result = yield* Effect.gen(function* () {
-        const orchestrator = yield* Orchestrator.OrchestratorV2;
-        const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
-        const eventSink = yield* EventSink.EventSinkV2;
+    const result = yield* Effect.gen(function* () {
+      const orchestrator = yield* Orchestrator.OrchestratorV2;
+      const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
+      const eventSink = yield* EventSink.EventSinkV2;
 
-        yield* orchestrator.dispatch({
-          type: "thread.create",
-          createdBy: "user",
-          creationSource: "web",
-          commandId: CommandId.make("command:selection-restart:create"),
+      yield* orchestrator.dispatch({
+        type: "thread.create",
+        createdBy: "user",
+        creationSource: "web",
+        commandId: CommandId.make("command:selection-restart:create"),
+        threadId,
+        projectId: ProjectId.make("project:selection-restart"),
+        title: "Selection restart",
+        modelSelection: initialSelection,
+        runtimeMode: "full-access",
+        interactionMode: "default",
+        branch: null,
+        worktreePath: cwd,
+      });
+      const running = yield* eventSink
+        .stream({
           threadId,
-          projectId: ProjectId.make("project:selection-restart"),
-          title: "Selection restart",
-          modelSelection: initialSelection,
-          runtimeMode: "full-access",
-          interactionMode: "default",
-          branch: null,
-          worktreePath: cwd,
-        });
-        const running = yield* eventSink
-          .stream({
-            threadId,
-            afterSequence: yield* eventSink.latestSequence({ threadId }),
-          })
-          .pipe(
-            Stream.map((stored) => stored.event),
-            Stream.filter(
-              (event) =>
-                event.type === "provider-turn.updated" && event.payload.status === "running",
-            ),
-            Stream.take(1),
-            Stream.runDrain,
-            Effect.forkScoped,
-          );
-        yield* orchestrator.dispatch({
-          type: "message.dispatch",
-          createdBy: "user",
-          creationSource: "web",
-          commandId: CommandId.make("command:selection-restart:first"),
+          afterSequence: yield* eventSink.latestSequence({ threadId }),
+        })
+        .pipe(
+          Stream.map((stored) => stored.event),
+          Stream.filter(
+            (event) => event.type === "provider-turn.updated" && event.payload.status === "running",
+          ),
+          Stream.take(1),
+          Stream.runDrain,
+          Effect.forkScoped,
+        );
+      yield* orchestrator.dispatch({
+        type: "message.dispatch",
+        createdBy: "user",
+        creationSource: "web",
+        commandId: CommandId.make("command:selection-restart:first"),
+        threadId,
+        messageId: MessageId.make("message:selection-restart:first"),
+        text: "first",
+        attachments: [],
+        modelSelection: initialSelection,
+        dispatchMode: { type: "start_immediately" },
+      });
+      yield* Fiber.join(running);
+      yield* worker.drain();
+      const activeProjection = yield* orchestrator.getThreadProjection(threadId);
+      assert.isTrue(activeProjection.providerTurns.some((turn) => turn.status === "running"));
+      const activeRunId = activeProjection.runs[0]?.id;
+      if (activeRunId === undefined) {
+        return yield* Effect.die("active restart test run is missing");
+      }
+
+      const completed = yield* eventSink
+        .stream({
           threadId,
-          messageId: MessageId.make("message:selection-restart:first"),
-          text: "first",
-          attachments: [],
-          modelSelection: initialSelection,
-          dispatchMode: { type: "start_immediately" },
-        });
-        yield* Fiber.join(running);
-        yield* worker.drain();
-        const activeProjection = yield* orchestrator.getThreadProjection(threadId);
-        assert.isTrue(activeProjection.providerTurns.some((turn) => turn.status === "running"));
-        const activeRunId = activeProjection.runs[0]?.id;
-        if (activeRunId === undefined) {
-          return yield* Effect.die("active restart test run is missing");
-        }
+          afterSequence: yield* eventSink.latestSequence({ threadId }),
+        })
+        .pipe(
+          Stream.map((stored) => stored.event),
+          Stream.filter(
+            (event) => event.type === "run.updated" && event.payload.status === "completed",
+          ),
+          Stream.take(1),
+          Stream.runDrain,
+          Effect.forkScoped,
+        );
+      yield* orchestrator.dispatch({
+        type: "message.dispatch",
+        createdBy: "user",
+        creationSource: "web",
+        commandId: CommandId.make("command:selection-restart:second"),
+        threadId,
+        messageId: MessageId.make("message:selection-restart:second"),
+        text: "second",
+        attachments: [],
+        modelSelection: replacementSelection,
+        dispatchMode: { type: "restart_active", targetRunId: activeRunId },
+      });
+      yield* Fiber.join(completed);
+      yield* worker.drain();
+      return {
+        projection: yield* orchestrator.getThreadProjection(threadId),
+        captured: yield* Ref.get(state),
+      };
+    }).pipe(
+      Effect.provide(
+        ProviderReplayHarness.layerWithRegistry(
+          { name: "selection-restart-lifecycle" },
+          layerRegistry,
+        ),
+      ),
+    );
+    const { projection, captured } = result;
 
-        const completed = yield* eventSink
-          .stream({
-            threadId,
-            afterSequence: yield* eventSink.latestSequence({ threadId }),
-          })
-          .pipe(
-            Stream.map((stored) => stored.event),
-            Stream.filter(
-              (event) => event.type === "run.updated" && event.payload.status === "completed",
-            ),
-            Stream.take(1),
-            Stream.runDrain,
-            Effect.forkScoped,
-          );
-        yield* orchestrator.dispatch({
-          type: "message.dispatch",
-          createdBy: "user",
-          creationSource: "web",
-          commandId: CommandId.make("command:selection-restart:second"),
+    assert.lengthOf(projection.runs, 1);
+    assert.lengthOf(projection.attempts, 2);
+    assert.deepEqual(
+      projection.attempts.map((attempt) => attempt.status),
+      ["superseded", "completed"],
+    );
+    assert.deepEqual(
+      projection.providerTurns.map((turn) => turn.status),
+      ["interrupted", "completed"],
+    );
+    assert.isFalse(
+      projection.turnItems.some(
+        (item) => item.type === "run_interrupt_request" || item.type === "run_interrupt_result",
+      ),
+      "selection restart supersede must not project hard-Stop interrupt items",
+    );
+    assert.equal(projection.runs.at(-1)?.modelSelection.model, replacementSelection.model);
+    assert.deepEqual(modelSwitches(projection), [
+      { from: initialSelection, to: replacementSelection },
+    ]);
+    assert.equal(projection.runs.at(-1)?.status, "completed");
+    assert.isTrue(captured.failedReplacementOpen);
+    assert.equal(captured.closedSessionCount, 0);
+    assert.deepEqual(
+      captured.opened.map((open) => [open.model, open.cwd]),
+      [
+        [initialSelection.model, cwd],
+        [replacementSelection.model, cwd],
+        [replacementSelection.model, cwd],
+      ],
+    );
+    assert.deepEqual(
+      captured.started.map((turn) => [turn.model, turn.cwd]),
+      [
+        [initialSelection.model, cwd],
+        [replacementSelection.model, cwd],
+      ],
+    );
+    assert.notEqual(
+      projection.providerSessions[0]?.id,
+      projection.providerThreads[0]?.providerSessionId,
+    );
+    assert.equal(
+      projection.providerThreads[0]?.providerSessionId,
+      projection.providerSessions.find((session) => session.model === replacementSelection.model)
+        ?.id,
+    );
+  }),
+);
+
+it.live("a workspace handoff during a run does not leave the run interrupted", () =>
+  Effect.gen(function* () {
+    const cwd = yield* checkpointWorkspace("workspace-handoff-lifecycle");
+    const handoffCwd = yield* checkpointWorkspace("workspace-handoff-lifecycle-target");
+    const threadId = ThreadId.make("thread:workspace-handoff-lifecycle");
+    const state = yield* Ref.make<RestartAdapterState>({
+      activeTurn: null,
+      opened: [],
+      started: [],
+      closedSessionCount: 0,
+      failedReplacementOpen: false,
+    });
+    const layerRegistry = ProviderAdapterRegistry.layerSingle(makeRestartAdapter(state));
+
+    const projection = yield* Effect.gen(function* () {
+      const orchestrator = yield* Orchestrator.OrchestratorV2;
+      const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
+      const eventSink = yield* EventSink.EventSinkV2;
+
+      yield* orchestrator.dispatch({
+        type: "thread.create",
+        createdBy: "user",
+        creationSource: "web",
+        commandId: CommandId.make("command:workspace-handoff:create"),
+        threadId,
+        projectId: ProjectId.make("project:workspace-handoff"),
+        title: "Workspace handoff",
+        modelSelection: initialSelection,
+        runtimeMode: "full-access",
+        interactionMode: "default",
+        branch: null,
+        worktreePath: cwd,
+      });
+      const running = yield* eventSink
+        .stream({
           threadId,
-          messageId: MessageId.make("message:selection-restart:second"),
-          text: "second",
-          attachments: [],
-          modelSelection: replacementSelection,
-          dispatchMode: { type: "restart_active", targetRunId: activeRunId },
-        });
-        yield* Fiber.join(completed);
-        yield* worker.drain();
-        return {
-          projection: yield* orchestrator.getThreadProjection(threadId),
-          captured: yield* Ref.get(state),
-        };
-      }).pipe(
-        Effect.provide(
-          ProviderReplayHarness.layerWithRegistry(
-            { name: "selection-restart-lifecycle" },
-            layerRegistry,
+          afterSequence: yield* eventSink.latestSequence({ threadId }),
+        })
+        .pipe(
+          Stream.map((stored) => stored.event),
+          Stream.filter(
+            (event) => event.type === "provider-turn.updated" && event.payload.status === "running",
+          ),
+          Stream.take(1),
+          Stream.runDrain,
+          Effect.forkScoped,
+        );
+      yield* orchestrator.dispatch({
+        type: "message.dispatch",
+        createdBy: "user",
+        creationSource: "web",
+        commandId: CommandId.make("command:workspace-handoff:first"),
+        threadId,
+        messageId: MessageId.make("message:workspace-handoff:first"),
+        text: "move to a worktree",
+        attachments: [],
+        modelSelection: initialSelection,
+        dispatchMode: { type: "start_immediately" },
+      });
+      yield* Fiber.join(running);
+      yield* worker.drain();
+
+      const settled = yield* eventSink
+        .stream({
+          threadId,
+          afterSequence: yield* eventSink.latestSequence({ threadId }),
+        })
+        .pipe(
+          Stream.map((stored) => stored.event),
+          Stream.filter(
+            (event) =>
+              event.type === "run.updated" &&
+              event.payload.status !== "running" &&
+              event.payload.status !== "queued" &&
+              event.payload.status !== "starting",
           ),
+          Stream.take(1),
+          Stream.runDrain,
+          Effect.forkScoped,
+        );
+      // What t3_worktree_handoff dispatches while the calling turn is still running.
+      yield* orchestrator.dispatch({
+        type: "thread.metadata.update",
+        commandId: CommandId.make("command:workspace-handoff:rebind"),
+        threadId,
+        branch: "repro-handoff",
+        worktreePath: handoffCwd,
+      });
+      yield* Fiber.join(settled);
+      yield* worker.drain();
+      return yield* orchestrator.getThreadProjection(threadId);
+    }).pipe(
+      Effect.provide(
+        ProviderReplayHarness.layerWithRegistry(
+          { name: "workspace-handoff-lifecycle" },
+          layerRegistry,
         ),
-      );
-      const { projection, captured } = result;
+      ),
+    );
 
-      assert.lengthOf(projection.runs, 1);
-      assert.lengthOf(projection.attempts, 2);
-      assert.deepEqual(
-        projection.attempts.map((attempt) => attempt.status),
-        ["superseded", "completed"],
-      );
-      assert.deepEqual(
-        projection.providerTurns.map((turn) => turn.status),
-        ["interrupted", "completed"],
-      );
-      assert.isFalse(
-        projection.turnItems.some(
-          (item) => item.type === "run_interrupt_request" || item.type === "run_interrupt_result",
+    assert.equal(projection.thread.worktreePath, handoffCwd);
+    assert.equal(projection.runs[0]?.status, "completed");
+    assert.isNotNull(projection.runs[0]?.checkpointId ?? null);
+    assert.isFalse(
+      projection.turnItems.some((item) => item.type === "run_interrupt_result"),
+      "an intentional workspace handoff must not project an interrupt result",
+    );
+  }),
+);
+
+it.live("Stop during a restart interrupts the turn the restart could not stop", () =>
+  Effect.gen(function* () {
+    const cwd = yield* checkpointWorkspace("selection-restart-stop");
+    const threadId = ThreadId.make("thread:selection-restart-stop");
+    const state = yield* Ref.make<RestartAdapterState>({
+      activeTurn: null,
+      opened: [],
+      started: [],
+      closedSessionCount: 0,
+      failedReplacementOpen: false,
+    });
+    const base = makeRestartAdapter(state);
+    // A wedged provider ignores the restart's soft cancel; only Stop ends its turn.
+    const adapter: ProviderAdapter.ProviderAdapterV2["Service"] = {
+      ...base,
+      openSession: (input) =>
+        base.openSession(input).pipe(
+          Effect.map((session) => ({
+            ...session,
+            interruptTurn: (interrupt: ProviderAdapter.ProviderAdapterV2InterruptInput) =>
+              interrupt.requestRuntimeRestart === true
+                ? session.interruptTurn(interrupt)
+                : Effect.never,
+          })),
         ),
-        "selection restart supersede must not project hard-Stop interrupt items",
-      );
-      assert.equal(projection.runs.at(-1)?.modelSelection.model, replacementSelection.model);
-      assert.deepEqual(modelSwitches(projection), [
-        { from: initialSelection, to: replacementSelection },
-      ]);
-      assert.equal(projection.runs.at(-1)?.status, "completed");
-      assert.isTrue(captured.failedReplacementOpen);
-      assert.equal(captured.closedSessionCount, 0);
-      assert.deepEqual(
-        captured.opened.map((open) => [open.model, open.cwd]),
-        [
-          [initialSelection.model, cwd],
-          [replacementSelection.model, cwd],
-          [replacementSelection.model, cwd],
-        ],
-      );
-      assert.deepEqual(
-        captured.started.map((turn) => [turn.model, turn.cwd]),
-        [
-          [initialSelection.model, cwd],
-          [replacementSelection.model, cwd],
-        ],
-      );
-      assert.notEqual(
-        projection.providerSessions[0]?.id,
-        projection.providerThreads[0]?.providerSessionId,
-      );
-      assert.equal(
-        projection.providerThreads[0]?.providerSessionId,
-        projection.providerSessions.find((session) => session.model === replacementSelection.model)
-          ?.id,
+    };
+
+    const result = yield* Effect.gen(function* () {
+      const orchestrator = yield* Orchestrator.OrchestratorV2;
+      const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
+      const running = yield* orchestrator.streamDomainEvents.pipe(
+        Stream.filter(
+          (event) => event.type === "provider-turn.updated" && event.payload.status === "running",
+        ),
+        Stream.take(1),
+        Stream.runDrain,
+        Effect.forkScoped({ startImmediately: true }),
       );
-    }),
-  ),
+      yield* orchestrator.dispatch({
+        type: "thread.create",
+        createdBy: "user",
+        creationSource: "web",
+        commandId: CommandId.make("command:selection-restart-stop:create"),
+        threadId,
+        projectId: ProjectId.make("project:selection-restart-stop"),
+        title: "Stop during restart",
+        modelSelection: initialSelection,
+        runtimeMode: "full-access",
+        interactionMode: "default",
+        branch: null,
+        worktreePath: cwd,
+      });
+      yield* orchestrator.dispatch({
+        type: "message.dispatch",
+        createdBy: "user",
+        creationSource: "web",
+        commandId: CommandId.make("command:selection-restart-stop:first"),
+        threadId,
+        messageId: MessageId.make("message:selection-restart-stop:first"),
+        text: "first",
+        attachments: [],
+        modelSelection: initialSelection,
+        dispatchMode: { type: "start_immediately" },
+      });
+      yield* worker.drain();
+      yield* Fiber.join(running);
+      const runId = (yield* orchestrator.getThreadProjection(threadId)).runs[0]!.id;
+
+      yield* orchestrator.dispatch({
+        type: "message.dispatch",
+        createdBy: "user",
+        creationSource: "web",
+        commandId: CommandId.make("command:selection-restart-stop:steer"),
+        threadId,
+        messageId: MessageId.make("message:selection-restart-stop:steer"),
+        text: "Are you still going?",
+        attachments: [],
+        modelSelection: initialSelection,
+        dispatchMode: { type: "restart_active", targetRunId: runId },
+      });
+      yield* orchestrator.dispatch({
+        type: "run.interrupt",
+        commandId: CommandId.make("command:selection-restart-stop:stop"),
+        threadId,
+        runId,
+      });
+      yield* worker.drain();
+      return {
+        projection: yield* orchestrator.getThreadProjection(threadId),
+        captured: yield* Ref.get(state),
+      };
+    }).pipe(
+      Effect.provide(
+        ProviderReplayHarness.layerWithRegistry(
+          { name: "selection-restart-stop" },
+          ProviderAdapterRegistry.layerSingle(adapter),
+        ),
+      ),
+    );
+
+    assert.isNull(result.captured.activeTurn);
+    assert.lengthOf(result.captured.started, 1);
+    assert.equal(result.projection.runs[0]?.status, "interrupted");
+    assert.deepEqual(
+      result.projection.providerTurns.map((turn) => turn.status),
+      ["interrupted"],
+    );
+  }),
 );
 
-it.live("a workspace handoff during a run does not leave the run interrupted", () =>
-  Effect.scoped(
+it.live(
+  "restarts the live session on a model change when a newer stopped session record exists",
+  () =>
     Effect.gen(function* () {
-      const cwd = yield* checkpointWorkspace("workspace-handoff-lifecycle");
-      const handoffCwd = yield* checkpointWorkspace("workspace-handoff-lifecycle-target");
-      const threadId = ThreadId.make("thread:workspace-handoff-lifecycle");
+      const name = "selection-restart-dead-stopped";
+      const cwd = yield* checkpointWorkspace(name);
+      const threadId = ThreadId.make(`thread:${name}`);
       const state = yield* Ref.make<RestartAdapterState>({
         activeTurn: null,
         opened: [],
         started: [],
         closedSessionCount: 0,
-        failedReplacementOpen: false,
+        failedReplacementOpen: true,
       });
-      const layerRegistry = ProviderAdapterRegistry.layerSingle(makeRestartAdapter(state));
+      const layerRegistry = ProviderAdapterRegistry.layerSingle(
+        makeRestartAdapter(state, exclusiveCapabilities),
+      );
 
-      const projection = yield* Effect.gen(function* () {
+      const result = yield* Effect.gen(function* () {
         const orchestrator = yield* Orchestrator.OrchestratorV2;
         const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
         const eventSink = yield* EventSink.EventSinkV2;
-
+        const dispatch = (step: string, modelSelection: ModelSelection) =>
+          Effect.gen(function* () {
+            const terminal = yield* orchestrator.streamDomainEvents.pipe(
+              Stream.filter(
+                (event) => event.type === "run.updated" && event.payload.status === "completed",
+              ),
+              Stream.take(1),
+              Stream.runDrain,
+              Effect.forkScoped,
+            );
+            yield* orchestrator.dispatch({
+              type: "message.dispatch",
+              createdBy: "user",
+              creationSource: "web",
+              commandId: CommandId.make(`${name}:${step}`),
+              threadId,
+              messageId: MessageId.make(`${name}:${step}`),
+              text: step,
+              attachments: [],
+              modelSelection,
+              dispatchMode: { type: "start_immediately" },
+            });
+            yield* worker.drain();
+            yield* Fiber.join(terminal);
+            yield* worker.drain();
+            return yield* orchestrator.getThreadProjection(threadId);
+          });
         yield* orchestrator.dispatch({
           type: "thread.create",
           createdBy: "user",
           creationSource: "web",
-          commandId: CommandId.make("command:workspace-handoff:create"),
+          commandId: CommandId.make(`${name}:create`),
           threadId,
-          projectId: ProjectId.make("project:workspace-handoff"),
-          title: "Workspace handoff",
-          modelSelection: initialSelection,
+          projectId: ProjectId.make(`project:${name}`),
+          title: name,
+          modelSelection: seedSelection,
           runtimeMode: "full-access",
           interactionMode: "default",
           branch: null,
           worktreePath: cwd,
         });
-        const running = yield* eventSink
-          .stream({
-            threadId,
-            afterSequence: yield* eventSink.latestSequence({ threadId }),
-          })
-          .pipe(
-            Stream.map((stored) => stored.event),
-            Stream.filter(
-              (event) =>
-                event.type === "provider-turn.updated" && event.payload.status === "running",
-            ),
-            Stream.take(1),
-            Stream.runDrain,
-            Effect.forkScoped,
-          );
-        yield* orchestrator.dispatch({
-          type: "message.dispatch",
-          createdBy: "user",
-          creationSource: "web",
-          commandId: CommandId.make("command:workspace-handoff:first"),
-          threadId,
-          messageId: MessageId.make("message:workspace-handoff:first"),
-          text: "move to a worktree",
-          attachments: [],
-          modelSelection: initialSelection,
-          dispatchMode: { type: "start_immediately" },
+        const first = yield* dispatch("first", seedSelection);
+        const liveSession = first.providerSessions.find(
+          (session) => session.status !== "stopped" && session.status !== "error",
+        );
+        assert.isDefined(liveSession);
+
+        const deadAt = yield* DateTime.now;
+        const deadSession: OrchestrationV2ProviderSession = {
+          id: ProviderSessionId.make(`session:${name}:dead`),
+          driver,
+          providerInstanceId,
+          status: "ready",
+          cwd,
+          model: seedSelection.model,
+          capabilities: exclusiveCapabilities,
+          createdAt: deadAt,
+          updatedAt: deadAt,
+          lastError: null,
+        };
+        yield* eventSink.write({
+          events: [
+            {
+              id: EventId.make(`event:${name}:dead-attached`),
+              type: "provider-session.attached",
+              threadId,
+              driver,
+              providerInstanceId,
+              occurredAt: deadAt,
+              payload: deadSession,
+            },
+            {
+              id: EventId.make(`event:${name}:dead-updated`),
+              type: "provider-session.updated",
+              threadId,
+              driver,
+              providerInstanceId,
+              occurredAt: deadAt,
+              payload: {
+                ...deadSession,
+                status: "stopped",
+                updatedAt: deadAt,
+                lastError: null,
+              },
+            },
+          ],
         });
-        yield* Fiber.join(running);
-        yield* worker.drain();
 
-        const settled = yield* eventSink
-          .stream({
-            threadId,
-            afterSequence: yield* eventSink.latestSequence({ threadId }),
-          })
-          .pipe(
-            Stream.map((stored) => stored.event),
-            Stream.filter(
-              (event) =>
-                event.type === "run.updated" &&
-                event.payload.status !== "running" &&
-                event.payload.status !== "queued" &&
-                event.payload.status !== "starting",
-            ),
-            Stream.take(1),
-            Stream.runDrain,
-            Effect.forkScoped,
-          );
-        // What t3_worktree_handoff dispatches while the calling turn is still running.
+        const switchCommandId = CommandId.make(`${name}:switch`);
         yield* orchestrator.dispatch({
-          type: "thread.metadata.update",
-          commandId: CommandId.make("command:workspace-handoff:rebind"),
+          type: "thread.model-selection.set",
+          commandId: switchCommandId,
           threadId,
-          branch: "repro-handoff",
-          worktreePath: handoffCwd,
+          modelSelection: replacementSelection,
         });
-        yield* Fiber.join(settled);
         yield* worker.drain();
-        return yield* orchestrator.getThreadProjection(threadId);
-      }).pipe(
-        Effect.provide(
-          ProviderReplayHarness.layerWithRegistry(
-            { name: "workspace-handoff-lifecycle" },
-            layerRegistry,
-          ),
-        ),
-      );
+        const storedSwitchEvents = yield* eventSink
+          .readByCommandId({ commandId: switchCommandId })
+          .pipe(Stream.runCollect);
+        const detachedSessionIds = [...storedSwitchEvents].flatMap((stored) =>
+          stored.event.type === "provider-session.detached"
+            ? [stored.event.payload.providerSessionId]
+            : [],
+        );
+
+        const second = yield* dispatch("second", replacementSelection);
+        return {
+          projection: second,
+          captured: yield* Ref.get(state),
+          liveSessionId: liveSession.id,
+          detachedSessionIds,
+        };
+      }).pipe(Effect.provide(ProviderReplayHarness.layerWithRegistry({ name }, layerRegistry)));
 
-      assert.equal(projection.thread.worktreePath, handoffCwd);
-      assert.equal(projection.runs[0]?.status, "completed");
-      assert.isNotNull(projection.runs[0]?.checkpointId ?? null);
-      assert.isFalse(
-        projection.turnItems.some((item) => item.type === "run_interrupt_result"),
-        "an intentional workspace handoff must not project an interrupt result",
+      const { projection, captured } = result;
+      assert.lengthOf(projection.runs, 2);
+      assert.equal(projection.runs[1]?.modelSelection.model, replacementSelection.model);
+      assert.deepEqual(modelSwitches(projection), [
+        { from: seedSelection, to: replacementSelection },
+      ]);
+      assert.deepEqual(result.detachedSessionIds, [result.liveSessionId]);
+      assert.equal(captured.closedSessionCount, 1);
+      assert.deepEqual(
+        captured.opened.map((open) => open.model),
+        [seedSelection.model, replacementSelection.model],
+      );
+      assert.deepEqual(
+        captured.started.map((turn) => turn.model),
+        [seedSelection.model, replacementSelection.model],
       );
+      const servingSession = projection.providerSessions.find(
+        (session) =>
+          session.id ===
+          projection.providerThreads.find(
+            (providerThread) => providerThread.id === projection.thread.activeProviderThreadId,
+          )?.providerSessionId,
+      );
+      assert.equal(servingSession?.model, replacementSelection.model);
     }),
-  ),
 );
 
-it.live("Stop during a restart interrupts the turn the restart could not stop", () =>
-  Effect.scoped(
+it.live.each(["active", "idle", "selection-command", "pooled", "separate-home"] as const)(
+  "preserves native history only for compatible account switches (%s)",
+  (mode) =>
     Effect.gen(function* () {
-      const cwd = yield* checkpointWorkspace("selection-restart-stop");
-      const threadId = ThreadId.make("thread:selection-restart-stop");
+      const name = `shared-home-${mode}`;
+      const cwd = yield* checkpointWorkspace(name);
+      const threadId = ThreadId.make(`thread:${name}`);
+      const targetId = ProviderInstanceId.make("codex-shadow-account");
       const state = yield* Ref.make<RestartAdapterState>({
         activeTurn: null,
         opened: [],
         started: [],
         closedSessionCount: 0,
-        failedReplacementOpen: false,
+        failedReplacementOpen: true,
       });
-      const base = makeRestartAdapter(state);
-      // A wedged provider ignores the restart's soft cancel; only Stop ends its turn.
-      const adapter: ProviderAdapter.ProviderAdapterV2["Service"] = {
-        ...base,
-        openSession: (input) =>
-          base.openSession(input).pipe(
-            Effect.map((session) => ({
-              ...session,
-              interruptTurn: (interrupt: ProviderAdapter.ProviderAdapterV2InterruptInput) =>
-                interrupt.requestRuntimeRestart === true
-                  ? session.interruptTurn(interrupt)
-                  : Effect.never,
-            })),
-          ),
-      };
-
-      const result = yield* Effect.gen(function* () {
+      const resumes: Array<{
+        instanceId: ProviderInstanceId;
+        nativeId: string | null | undefined;
+      }> = [];
+      const messages: string[] = [];
+      const capabilities = mode === "pooled" ? pooledCapabilities : exclusiveCapabilities;
+      const adapters = [providerInstanceId, targetId].map((instanceId) => {
+        const base = makeRestartAdapter(state, capabilities, instanceId);
+        return {
+          ...base,
+          openSession: (input) =>
+            base.openSession(input).pipe(
+              Effect.map((session) => ({
+                ...session,
+                resumeThread: (input) =>
+                  Effect.gen(function* () {
+                    resumes.push({
+                      instanceId,
+                      nativeId: input.providerThread.nativeThreadRef?.nativeId,
+                    });
+                    return yield* session.resumeThread(input);
+                  }),
+                startTurn: (input) =>
+                  Effect.gen(function* () {
+                    messages.push(input.message.text);
+                    yield* session.startTurn(input);
+                  }),
+              })),
+            ),
+        } satisfies ProviderAdapter.ProviderAdapterV2["Service"];
+      });
+      const layerRegistry = Layer.succeed(ProviderAdapterRegistry.ProviderAdapterRegistryV2, {
+        get: (instanceId) =>
+          Effect.succeed(adapters.find((adapter) => adapter.instanceId === instanceId)!),
+        list: () => Effect.succeed([providerInstanceId, targetId]),
+        getMetadata: (instanceId) =>
+          Effect.succeed({
+            driver,
+            continuationKey:
+              mode === "separate-home" ? `codex:home:/${instanceId}` : "codex:home:/shared",
+            enabled: true,
+            capabilities,
+          }),
+      });
+      yield* Effect.gen(function* () {
         const orchestrator = yield* Orchestrator.OrchestratorV2;
         const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
-        const running = yield* orchestrator.streamDomainEvents.pipe(
-          Stream.filter(
-            (event) => event.type === "provider-turn.updated" && event.payload.status === "running",
-          ),
-          Stream.take(1),
-          Stream.runDrain,
-          Effect.forkScoped({ startImmediately: true }),
-        );
+        const selection = {
+          ...initialSelection,
+          model: mode === "active" ? initialSelection.model : "complete",
+        };
         yield* orchestrator.dispatch({
           type: "thread.create",
-          createdBy: "user",
-          creationSource: "web",
-          commandId: CommandId.make("command:selection-restart-stop:create"),
+          commandId: CommandId.make(`${name}:create`),
           threadId,
-          projectId: ProjectId.make("project:selection-restart-stop"),
-          title: "Stop during restart",
-          modelSelection: initialSelection,
+          projectId: ProjectId.make(`project:${name}`),
+          title: name,
+          modelSelection: selection,
           runtimeMode: "full-access",
           interactionMode: "default",
           branch: null,
           worktreePath: cwd,
-        });
-        yield* orchestrator.dispatch({
-          type: "message.dispatch",
           createdBy: "user",
           creationSource: "web",
-          commandId: CommandId.make("command:selection-restart-stop:first"),
-          threadId,
-          messageId: MessageId.make("message:selection-restart-stop:first"),
-          text: "first",
-          attachments: [],
-          modelSelection: initialSelection,
-          dispatchMode: { type: "start_immediately" },
-        });
-        yield* worker.drain();
-        yield* Fiber.join(running);
-        const runId = (yield* orchestrator.getThreadProjection(threadId)).runs[0]!.id;
-
-        yield* orchestrator.dispatch({
-          type: "message.dispatch",
-          createdBy: "user",
-          creationSource: "web",
-          commandId: CommandId.make("command:selection-restart-stop:steer"),
-          threadId,
-          messageId: MessageId.make("message:selection-restart-stop:steer"),
-          text: "Are you still going?",
-          attachments: [],
-          modelSelection: initialSelection,
-          dispatchMode: { type: "restart_active", targetRunId: runId },
-        });
-        yield* orchestrator.dispatch({
-          type: "run.interrupt",
-          commandId: CommandId.make("command:selection-restart-stop:stop"),
-          threadId,
-          runId,
-        });
-        yield* worker.drain();
-        return {
-          projection: yield* orchestrator.getThreadProjection(threadId),
-          captured: yield* Ref.get(state),
-        };
-      }).pipe(
-        Effect.provide(
-          ProviderReplayHarness.layerWithRegistry(
-            { name: "selection-restart-stop" },
-            ProviderAdapterRegistry.layerSingle(adapter),
-          ),
-        ),
-      );
-
-      assert.isNull(result.captured.activeTurn);
-      assert.lengthOf(result.captured.started, 1);
-      assert.equal(result.projection.runs[0]?.status, "interrupted");
-      assert.deepEqual(
-        result.projection.providerTurns.map((turn) => turn.status),
-        ["interrupted"],
-      );
-    }),
-  ),
-);
-
-it.live(
-  "restarts the live session on a model change when a newer stopped session record exists",
-  () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const name = "selection-restart-dead-stopped";
-        const cwd = yield* checkpointWorkspace(name);
-        const threadId = ThreadId.make(`thread:${name}`);
-        const state = yield* Ref.make<RestartAdapterState>({
-          activeTurn: null,
-          opened: [],
-          started: [],
-          closedSessionCount: 0,
-          failedReplacementOpen: true,
         });
-        const layerRegistry = ProviderAdapterRegistry.layerSingle(
-          makeRestartAdapter(state, exclusiveCapabilities),
-        );
-
-        const result = yield* Effect.gen(function* () {
-          const orchestrator = yield* Orchestrator.OrchestratorV2;
-          const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
-          const eventSink = yield* EventSink.EventSinkV2;
-          const dispatch = (step: string, modelSelection: ModelSelection) =>
-            Effect.gen(function* () {
-              const terminal = yield* orchestrator.streamDomainEvents.pipe(
-                Stream.filter(
-                  (event) => event.type === "run.updated" && event.payload.status === "completed",
-                ),
-                Stream.take(1),
-                Stream.runDrain,
-                Effect.forkScoped,
-              );
-              yield* orchestrator.dispatch({
-                type: "message.dispatch",
-                createdBy: "user",
-                creationSource: "web",
-                commandId: CommandId.make(`${name}:${step}`),
-                threadId,
-                messageId: MessageId.make(`${name}:${step}`),
-                text: step,
-                attachments: [],
-                modelSelection,
-                dispatchMode: { type: "start_immediately" },
-              });
-              yield* worker.drain();
-              yield* Fiber.join(terminal);
-              yield* worker.drain();
-              return yield* orchestrator.getThreadProjection(threadId);
+        const dispatch = (step: string, modelSelection: ModelSelection, targetRunId?: RunId) =>
+          Effect.gen(function* () {
+            const terminal = yield* orchestrator.streamDomainEvents.pipe(
+              Stream.filter((event) =>
+                mode === "active" && step === "first"
+                  ? event.type === "provider-turn.updated" && event.payload.status === "running"
+                  : event.type === "run.updated" && event.payload.status === "completed",
+              ),
+              Stream.take(1),
+              Stream.runDrain,
+              Effect.forkScoped,
+            );
+            yield* orchestrator.dispatch({
+              type: "message.dispatch",
+              commandId: CommandId.make(`${name}:${step}`),
+              threadId,
+              messageId: MessageId.make(`${name}:${step}`),
+              text: step,
+              attachments: [],
+              modelSelection,
+              dispatchMode:
+                targetRunId === undefined
+                  ? { type: "start_immediately" }
+                  : { type: "restart_active", targetRunId },
+              createdBy: "user",
+              creationSource: "web",
             });
-          yield* orchestrator.dispatch({
-            type: "thread.create",
-            createdBy: "user",
-            creationSource: "web",
-            commandId: CommandId.make(`${name}:create`),
-            threadId,
-            projectId: ProjectId.make(`project:${name}`),
-            title: name,
-            modelSelection: seedSelection,
-            runtimeMode: "full-access",
-            interactionMode: "default",
-            branch: null,
-            worktreePath: cwd,
-          });
-          const first = yield* dispatch("first", seedSelection);
-          const liveSession = first.providerSessions.find(
-            (session) => session.status !== "stopped" && session.status !== "error",
-          );
-          assert.isDefined(liveSession);
-
-          const deadAt = yield* DateTime.now;
-          const deadSession: OrchestrationV2ProviderSession = {
-            id: ProviderSessionId.make(`session:${name}:dead`),
-            driver,
-            providerInstanceId,
-            status: "ready",
-            cwd,
-            model: seedSelection.model,
-            capabilities: exclusiveCapabilities,
-            createdAt: deadAt,
-            updatedAt: deadAt,
-            lastError: null,
-          };
-          yield* eventSink.write({
-            events: [
-              {
-                id: EventId.make(`event:${name}:dead-attached`),
-                type: "provider-session.attached",
-                threadId,
-                driver,
-                providerInstanceId,
-                occurredAt: deadAt,
-                payload: deadSession,
-              },
-              {
-                id: EventId.make(`event:${name}:dead-updated`),
-                type: "provider-session.updated",
-                threadId,
-                driver,
-                providerInstanceId,
-                occurredAt: deadAt,
-                payload: {
-                  ...deadSession,
-                  status: "stopped",
-                  updatedAt: deadAt,
-                  lastError: null,
-                },
-              },
-            ],
+            yield* worker.drain();
+            yield* Fiber.join(terminal);
+            yield* worker.drain();
+            return yield* orchestrator.getThreadProjection(threadId);
           });
-
-          const switchCommandId = CommandId.make(`${name}:switch`);
+        const first = yield* dispatch("first", selection);
+        const originalThread = first.providerThreads.find(
+          (thread) => thread.id === first.thread.activeProviderThreadId,
+        )!;
+        const targetSelection = { instanceId: targetId, model: "complete" };
+        if (mode === "selection-command") {
           yield* orchestrator.dispatch({
-            type: "thread.model-selection.set",
-            commandId: switchCommandId,
+            type: "provider.switch",
+            commandId: CommandId.make(`${name}:switch`),
             threadId,
-            modelSelection: replacementSelection,
+            modelSelection: targetSelection,
           });
           yield* worker.drain();
-          const storedSwitchEvents = yield* eventSink
-            .readByCommandId({ commandId: switchCommandId })
-            .pipe(Stream.runCollect);
-          const detachedSessionIds = [...storedSwitchEvents].flatMap((stored) =>
-            stored.event.type === "provider-session.detached"
-              ? [stored.event.payload.providerSessionId]
-              : [],
-          );
-
-          const second = yield* dispatch("second", replacementSelection);
-          return {
-            projection: second,
-            captured: yield* Ref.get(state),
-            liveSessionId: liveSession.id,
-            detachedSessionIds,
-          };
-        }).pipe(Effect.provide(ProviderReplayHarness.layerWithRegistry({ name }, layerRegistry)));
-
-        const { projection, captured } = result;
-        assert.lengthOf(projection.runs, 2);
-        assert.equal(projection.runs[1]?.modelSelection.model, replacementSelection.model);
-        assert.deepEqual(modelSwitches(projection), [
-          { from: seedSelection, to: replacementSelection },
-        ]);
-        assert.deepEqual(result.detachedSessionIds, [result.liveSessionId]);
-        assert.equal(captured.closedSessionCount, 1);
-        assert.deepEqual(
-          captured.opened.map((open) => open.model),
-          [seedSelection.model, replacementSelection.model],
-        );
-        assert.deepEqual(
-          captured.started.map((turn) => turn.model),
-          [seedSelection.model, replacementSelection.model],
-        );
-        const servingSession = projection.providerSessions.find(
-          (session) =>
-            session.id ===
-            projection.providerThreads.find(
-              (providerThread) => providerThread.id === projection.thread.activeProviderThreadId,
-            )?.providerSessionId,
+        }
+        const second = yield* dispatch(
+          "second",
+          targetSelection,
+          mode === "active" ? first.runs[0]!.id : undefined,
         );
-        assert.equal(servingSession?.model, replacementSelection.model);
-      }),
-    ),
-);
-
-it.live.each(["active", "idle", "selection-command", "pooled", "separate-home"] as const)(
-  "preserves native history only for compatible account switches (%s)",
-  (mode) =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const name = `shared-home-${mode}`;
-        const cwd = yield* checkpointWorkspace(name);
-        const threadId = ThreadId.make(`thread:${name}`);
-        const targetId = ProviderInstanceId.make("codex-shadow-account");
-        const state = yield* Ref.make<RestartAdapterState>({
-          activeTurn: null,
-          opened: [],
-          started: [],
-          closedSessionCount: 0,
-          failedReplacementOpen: true,
-        });
-        const resumes: Array<{
-          instanceId: ProviderInstanceId;
-          nativeId: string | null | undefined;
-        }> = [];
-        const messages: string[] = [];
-        const capabilities = mode === "pooled" ? pooledCapabilities : exclusiveCapabilities;
-        const adapters = [providerInstanceId, targetId].map((instanceId) => {
-          const base = makeRestartAdapter(state, capabilities, instanceId);
-          return {
-            ...base,
-            openSession: (input) =>
-              base.openSession(input).pipe(
-                Effect.map((session) => ({
-                  ...session,
-                  resumeThread: (input) =>
-                    Effect.gen(function* () {
-                      resumes.push({
-                        instanceId,
-                        nativeId: input.providerThread.nativeThreadRef?.nativeId,
-                      });
-                      return yield* session.resumeThread(input);
-                    }),
-                  startTurn: (input) =>
-                    Effect.gen(function* () {
-                      messages.push(input.message.text);
-                      yield* session.startTurn(input);
-                    }),
-                })),
-              ),
-          } satisfies ProviderAdapter.ProviderAdapterV2["Service"];
-        });
-        const layerRegistry = Layer.succeed(ProviderAdapterRegistry.ProviderAdapterRegistryV2, {
-          get: (instanceId) =>
-            Effect.succeed(adapters.find((adapter) => adapter.instanceId === instanceId)!),
-          list: () => Effect.succeed([providerInstanceId, targetId]),
-          getMetadata: (instanceId) =>
-            Effect.succeed({
-              driver,
-              continuationKey:
-                mode === "separate-home" ? `codex:home:/${instanceId}` : "codex:home:/shared",
-              enabled: true,
-              capabilities,
-            }),
-        });
-        yield* Effect.gen(function* () {
-          const orchestrator = yield* Orchestrator.OrchestratorV2;
-          const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
-          const selection = {
-            ...initialSelection,
-            model: mode === "active" ? initialSelection.model : "complete",
-          };
-          yield* orchestrator.dispatch({
-            type: "thread.create",
-            commandId: CommandId.make(`${name}:create`),
-            threadId,
-            projectId: ProjectId.make(`project:${name}`),
-            title: name,
-            modelSelection: selection,
-            runtimeMode: "full-access",
-            interactionMode: "default",
-            branch: null,
-            worktreePath: cwd,
-            createdBy: "user",
-            creationSource: "web",
-          });
-          const dispatch = (step: string, modelSelection: ModelSelection, targetRunId?: RunId) =>
-            Effect.gen(function* () {
-              const terminal = yield* orchestrator.streamDomainEvents.pipe(
-                Stream.filter((event) =>
-                  mode === "active" && step === "first"
-                    ? event.type === "provider-turn.updated" && event.payload.status === "running"
-                    : event.type === "run.updated" && event.payload.status === "completed",
-                ),
-                Stream.take(1),
-                Stream.runDrain,
-                Effect.forkScoped,
-              );
-              yield* orchestrator.dispatch({
-                type: "message.dispatch",
-                commandId: CommandId.make(`${name}:${step}`),
-                threadId,
-                messageId: MessageId.make(`${name}:${step}`),
-                text: step,
-                attachments: [],
-                modelSelection,
-                dispatchMode:
-                  targetRunId === undefined
-                    ? { type: "start_immediately" }
-                    : { type: "restart_active", targetRunId },
-                createdBy: "user",
-                creationSource: "web",
-              });
-              yield* worker.drain();
-              yield* Fiber.join(terminal);
-              yield* worker.drain();
-              return yield* orchestrator.getThreadProjection(threadId);
-            });
-          const first = yield* dispatch("first", selection);
-          const originalThread = first.providerThreads.find(
-            (thread) => thread.id === first.thread.activeProviderThreadId,
-          )!;
-          const targetSelection = { instanceId: targetId, model: "complete" };
-          if (mode === "selection-command") {
-            yield* orchestrator.dispatch({
-              type: "provider.switch",
-              commandId: CommandId.make(`${name}:switch`),
-              threadId,
-              modelSelection: targetSelection,
-            });
-            yield* worker.drain();
-          }
-          const second = yield* dispatch(
-            "second",
-            targetSelection,
-            mode === "active" ? first.runs[0]!.id : undefined,
+        const targetThread = second.providerThreads.find(
+          (thread) => thread.id === second.thread.activeProviderThreadId,
+        )!;
+        if (mode === "separate-home") {
+          assert.notEqual(targetThread.id, originalThread.id);
+          assert.lengthOf(second.contextHandoffs, 1);
+          assert.lengthOf(second.contextTransfers, 1);
+          assert.isEmpty(resumes);
+          assert.notEqual(messages[1], "second");
+          return;
+        }
+        assert.equal(targetThread.id, originalThread.id);
+        assert.deepEqual(targetThread.nativeThreadRef, originalThread.nativeThreadRef);
+        assert.equal(targetThread.providerInstanceId, targetId);
+        assert.notEqual(targetThread.providerSessionId, originalThread.providerSessionId);
+        assert.isEmpty(second.contextHandoffs);
+        assert.isEmpty(second.contextTransfers);
+        assert.deepEqual(resumes, [
+          { instanceId: targetId, nativeId: originalThread.nativeThreadRef?.nativeId },
+        ]);
+        assert.deepEqual(messages, ["first", "second"]);
+        assert.equal((yield* Ref.get(state)).closedSessionCount, mode === "pooled" ? 0 : 1);
+        if (mode === "pooled") {
+          assert.isFalse(
+            second.providerSessions.some(
+              (session) => session.id === originalThread.providerSessionId,
+            ),
           );
-          const targetThread = second.providerThreads.find(
-            (thread) => thread.id === second.thread.activeProviderThreadId,
-          )!;
-          if (mode === "separate-home") {
-            assert.notEqual(targetThread.id, originalThread.id);
-            assert.lengthOf(second.contextHandoffs, 1);
-            assert.lengthOf(second.contextTransfers, 1);
-            assert.isEmpty(resumes);
-            assert.notEqual(messages[1], "second");
-            return;
-          }
-          assert.equal(targetThread.id, originalThread.id);
-          assert.deepEqual(targetThread.nativeThreadRef, originalThread.nativeThreadRef);
-          assert.equal(targetThread.providerInstanceId, targetId);
-          assert.notEqual(targetThread.providerSessionId, originalThread.providerSessionId);
-          assert.isEmpty(second.contextHandoffs);
-          assert.isEmpty(second.contextTransfers);
-          assert.deepEqual(resumes, [
-            { instanceId: targetId, nativeId: originalThread.nativeThreadRef?.nativeId },
-          ]);
-          assert.deepEqual(messages, ["first", "second"]);
-          assert.equal((yield* Ref.get(state)).closedSessionCount, mode === "pooled" ? 0 : 1);
-          if (mode === "pooled") {
-            assert.isFalse(
-              second.providerSessions.some(
-                (session) => session.id === originalThread.providerSessionId,
-              ),
-            );
-          }
-          const third = yield* dispatch("third", { ...selection, model: "complete" });
-          const returnedThread = third.providerThreads.find(
-            (thread) => thread.id === third.thread.activeProviderThreadId,
-          )!;
-          assert.equal(returnedThread.id, originalThread.id);
-          assert.deepEqual(returnedThread.nativeThreadRef, originalThread.nativeThreadRef);
-          assert.equal(returnedThread.providerInstanceId, providerInstanceId);
-          assert.isEmpty(third.contextHandoffs);
-          assert.deepEqual(messages, ["first", "second", "third"]);
-        }).pipe(Effect.provide(ProviderReplayHarness.layerWithRegistry({ name }, layerRegistry)));
-      }),
-    ),
+        }
+        const third = yield* dispatch("third", { ...selection, model: "complete" });
+        const returnedThread = third.providerThreads.find(
+          (thread) => thread.id === third.thread.activeProviderThreadId,
+        )!;
+        assert.equal(returnedThread.id, originalThread.id);
+        assert.deepEqual(returnedThread.nativeThreadRef, originalThread.nativeThreadRef);
+        assert.equal(returnedThread.providerInstanceId, providerInstanceId);
+        assert.isEmpty(third.contextHandoffs);
+        assert.deepEqual(messages, ["first", "second", "third"]);
+      }).pipe(Effect.provide(ProviderReplayHarness.layerWithRegistry({ name }, layerRegistry)));
+    }),
 );
diff --git a/apps/server/src/orchestration-v2/ShellStream.test.ts b/apps/server/src/orchestration-v2/ShellStream.test.ts
index 336f9b12f96b..fbc610235dd0 100644
--- a/apps/server/src/orchestration-v2/ShellStream.test.ts
+++ b/apps/server/src/orchestration-v2/ShellStream.test.ts
@@ -38,8 +38,8 @@ const emptyShellSnapshot = {
 } as OrchestrationV2ShellSnapshot;
 
 describe("subagent shell events", () => {
-  const stored = (threadId: string, type: string) =>
-    ({ event: { threadId, type } }) as ApplicationStoredEvent;
+  const stored = (threadId: string, type: string, itemType = "command_execution") =>
+    ({ event: { threadId, type, payload: { type: itemType } } }) as ApplicationStoredEvent;
 
   it("keeps regular threads and subagent state changes while omitting subagent transcript updates", () => {
     const subagents = new Set(["child"]);
@@ -49,6 +49,14 @@ describe("subagent shell events", () => {
     expect(
       shouldPublishShellApplicationEvent(stored("child", "turn-item.updated"), subagents),
     ).toBe(false);
+    for (const itemType of ["secret_request", "link_request", "user_message"]) {
+      expect(
+        shouldPublishShellApplicationEvent(
+          stored("child", "turn-item.updated", itemType),
+          subagents,
+        ),
+      ).toBe(true);
+    }
     expect(shouldPublishShellApplicationEvent(stored("child", "node.updated"), subagents)).toBe(
       false,
     );
@@ -81,61 +89,59 @@ describe("subagent shell events", () => {
 });
 
 it.effect("coalesces a slow shell subscriber by identity and location in sequence order", () =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      const input = yield* Queue.unbounded<
-        Extract<OrchestrationV2ShellStreamItem, { readonly sequence: number }>,
-        Cause.Done
-      >();
-      const drained = yield* Deferred.make<void>();
-      const shell = shellFixture({ id: ThreadId.make("same"), title: "Before" });
-      const project = {
-        id: ProjectId.make("same"),
-        title: "Before",
-        workspaceRoot: "/workspace/same",
-        repositoryIdentity: null,
-        defaultModelSelection: null,
-        scripts: [],
-        createdAt: "2026-09-01T00:00:00Z",
-        updatedAt: "2026-09-01T00:00:00Z",
-      };
-      const initial = {
-        kind: "thread.updated" as const,
-        sequence: 1,
-        location: "active" as const,
-        thread: shell,
-      };
-      const updates = [
-        { kind: "project.updated", sequence: 2, project },
-        { ...initial, sequence: 3 },
-        { ...initial, sequence: 4, location: "archive" },
-        { ...initial, sequence: 5, thread: { ...shell, id: ThreadId.make("other") } },
-        {
-          kind: "project.updated",
-          sequence: 6,
-          project: { ...project, id: ProjectId.make("other") },
-        },
-        { kind: "project.removed", sequence: 7, projectId: project.id },
-        { kind: "thread.removed", sequence: 8, location: "active", threadId: shell.id },
-        { kind: "project.updated", sequence: 9, project: { ...project, title: "Recreated" } },
-        { ...initial, sequence: 10, thread: { ...shell, title: "Recreated" } },
-        { kind: "thread.removed", sequence: 11, location: "archive", threadId: shell.id },
-      ] satisfies Array<Extract<OrchestrationV2ShellStreamItem, { readonly sequence: number }>>;
-      const pull = yield* Stream.toPull(
-        bufferShellLiveStream(
-          Stream.fromQueue(input).pipe(Stream.ensuring(Deferred.succeed(drained, undefined))),
-          { maxItems: 6, maxSerializedBytes: 1_500 },
-        ),
-      );
-      yield* Queue.offer(input, initial);
-      expect(yield* pull).toEqual([initial]);
-      yield* Queue.offerAll(input, updates);
-      yield* Queue.end(input);
-      // Finish producing the burst while the first batch is still awaiting its ACK.
-      yield* Deferred.await(drained);
-      expect(yield* pull).toEqual([updates[3], updates[4], updates[7], updates[8], updates[9]]);
-    }),
-  ),
+  Effect.gen(function* () {
+    const input = yield* Queue.unbounded<
+      Extract<OrchestrationV2ShellStreamItem, { readonly sequence: number }>,
+      Cause.Done
+    >();
+    const drained = yield* Deferred.make<void>();
+    const shell = shellFixture({ id: ThreadId.make("same"), title: "Before" });
+    const project = {
+      id: ProjectId.make("same"),
+      title: "Before",
+      workspaceRoot: "/workspace/same",
+      repositoryIdentity: null,
+      defaultModelSelection: null,
+      scripts: [],
+      createdAt: "2026-09-01T00:00:00Z",
+      updatedAt: "2026-09-01T00:00:00Z",
+    };
+    const initial = {
+      kind: "thread.updated" as const,
+      sequence: 1,
+      location: "active" as const,
+      thread: shell,
+    };
+    const updates = [
+      { kind: "project.updated", sequence: 2, project },
+      { ...initial, sequence: 3 },
+      { ...initial, sequence: 4, location: "archive" },
+      { ...initial, sequence: 5, thread: { ...shell, id: ThreadId.make("other") } },
+      {
+        kind: "project.updated",
+        sequence: 6,
+        project: { ...project, id: ProjectId.make("other") },
+      },
+      { kind: "project.removed", sequence: 7, projectId: project.id },
+      { kind: "thread.removed", sequence: 8, location: "active", threadId: shell.id },
+      { kind: "project.updated", sequence: 9, project: { ...project, title: "Recreated" } },
+      { ...initial, sequence: 10, thread: { ...shell, title: "Recreated" } },
+      { kind: "thread.removed", sequence: 11, location: "archive", threadId: shell.id },
+    ] satisfies Array<Extract<OrchestrationV2ShellStreamItem, { readonly sequence: number }>>;
+    const pull = yield* Stream.toPull(
+      bufferShellLiveStream(
+        Stream.fromQueue(input).pipe(Stream.ensuring(Deferred.succeed(drained, undefined))),
+        { maxItems: 6, maxSerializedBytes: 1_500 },
+      ),
+    );
+    yield* Queue.offer(input, initial);
+    expect(yield* pull).toEqual([initial]);
+    yield* Queue.offerAll(input, updates);
+    yield* Queue.end(input);
+    // Finish producing the burst while the first batch is still awaiting its ACK.
+    yield* Deferred.await(drained);
+    expect(yield* pull).toEqual([updates[3], updates[4], updates[7], updates[8], updates[9]]);
+  }),
 );
 
 function shellFixture(overrides: Partial<OrchestrationV2ThreadShell>): OrchestrationV2ThreadShell {
@@ -198,7 +204,13 @@ describe("omitIdleSubagentShells", () => {
     expect(omitted.threads.map((thread) => thread.id)).toEqual(["root"]);
     expect(
       shouldPublishShellApplicationEvent(
-        { event: { threadId: "idle", type: "turn-item.updated" } } as ApplicationStoredEvent,
+        {
+          event: {
+            threadId: "idle",
+            type: "turn-item.updated",
+            payload: { type: "command_execution" },
+          },
+        } as ApplicationStoredEvent,
         omitted.subagentThreadIds,
       ),
     ).toBe(false);
@@ -351,101 +363,96 @@ describe("shellStreamItemsFromInitialSnapshot", () => {
 
 describe("composeShellStreamWithEnrichment", () => {
   it.effect("preserves pending repository resolutions while an enrichment ACK is withheld", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        // Match ProjectEnrichmentService's sliding notifications and the WS batching path.
-        const changes = yield* Effect.acquireRelease(
-          PubSub.sliding<{ readonly workspaceRoot: string }>(256),
-          PubSub.shutdown,
-        );
-        const subscription = yield* PubSub.subscribe(changes);
-        const pull = yield* Stream.toPull(
-          composeShellStreamWithEnrichment({
-            initial: Stream.empty,
-            tail: Stream.empty,
-            enrichment: Stream.fromSubscription(subscription).pipe(
-              Stream.groupedWithin(64, Duration.millis(25)),
-              Stream.map((changes) =>
-                shellStreamItemFromEnrichmentRefresh({
-                  snapshot: emptyShellSnapshot,
-                  changes,
-                }),
-              ),
+    Effect.gen(function* () {
+      // Match ProjectEnrichmentService's sliding notifications and the WS batching path.
+      const changes = yield* Effect.acquireRelease(
+        PubSub.sliding<{ readonly workspaceRoot: string }>(256),
+        PubSub.shutdown,
+      );
+      const subscription = yield* PubSub.subscribe(changes);
+      const pull = yield* Stream.toPull(
+        composeShellStreamWithEnrichment({
+          initial: Stream.empty,
+          tail: Stream.empty,
+          enrichment: Stream.fromSubscription(subscription).pipe(
+            Stream.groupedWithin(64, Duration.millis(25)),
+            Stream.map((changes) =>
+              shellStreamItemFromEnrichmentRefresh({
+                snapshot: emptyShellSnapshot,
+                changes,
+              }),
             ),
-          }),
-        );
+          ),
+        }),
+      );
 
-        const firstRoots = Array.from({ length: 64 }, (_, index) => `/workspace/first-${index}`);
-        yield* PubSub.publishAll(
-          changes,
-          firstRoots.map((workspaceRoot) => ({ workspaceRoot })),
-        );
-        expect(yield* pull).toMatchObject([{ resolvedRepositoryIdentityRoots: firstRoots }]);
-
-        // The next completion can be batched before the client acknowledges the first.
-        yield* PubSub.publish(changes, { workspaceRoot: "/workspace/pending" });
-        yield* Effect.yieldNow;
-        yield* TestClock.adjust(Duration.millis(25));
-        const laterRoots = Array.from({ length: 256 }, (_, index) => `/workspace/later-${index}`);
-        yield* PubSub.publishAll(
-          changes,
-          laterRoots.map((workspaceRoot) => ({ workspaceRoot })),
-        );
+      const firstRoots = Array.from({ length: 64 }, (_, index) => `/workspace/first-${index}`);
+      yield* PubSub.publishAll(
+        changes,
+        firstRoots.map((workspaceRoot) => ({ workspaceRoot })),
+      );
+      expect(yield* pull).toMatchObject([{ resolvedRepositoryIdentityRoots: firstRoots }]);
+
+      // The next completion can be batched before the client acknowledges the first.
+      yield* PubSub.publish(changes, { workspaceRoot: "/workspace/pending" });
+      yield* Effect.yieldNow;
+      yield* TestClock.adjust(Duration.millis(25));
+      const laterRoots = Array.from({ length: 256 }, (_, index) => `/workspace/later-${index}`);
+      yield* PubSub.publishAll(
+        changes,
+        laterRoots.map((workspaceRoot) => ({ workspaceRoot })),
+      );
 
-        const resumed = yield* Stream.fromPull(Effect.succeed(pull)).pipe(
-          Stream.takeUntil(
-            (item) =>
-              item.resolvedRepositoryIdentityRoots?.includes("/workspace/later-255") ?? false,
-          ),
-          Stream.runCollect,
-        );
-        expect(resumed.flatMap((item) => item.resolvedRepositoryIdentityRoots ?? [])).toEqual([
-          "/workspace/pending",
-          ...laterRoots,
-        ]);
-      }),
-    ),
+      const resumed = yield* Stream.fromPull(Effect.succeed(pull)).pipe(
+        Stream.takeUntil(
+          (item) => item.resolvedRepositoryIdentityRoots?.includes("/workspace/later-255") ?? false,
+        ),
+        Stream.runCollect,
+      );
+      expect(resumed.flatMap((item) => item.resolvedRepositoryIdentityRoots ?? [])).toEqual([
+        "/workspace/pending",
+        ...laterRoots,
+      ]);
+    }),
   );
 
   it.effect("keeps a merged shell batch charged while the client withholds its ACK", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const update = yield* Deferred.make<void>();
-        const closed = yield* Deferred.make<void>();
-        const initial = {
-          kind: "thread.removed" as const,
-          sequence: 1,
-          location: "active" as const,
-          threadId: ThreadId.make("thread-a"),
-        };
-        const pull = yield* Stream.toPull(
-          composeShellStreamWithEnrichment({
-            initial: Stream.empty,
-            tail: bufferShellLiveStream(
-              Stream.concat(
-                Stream.succeed(initial),
-                Stream.fromEffect(Deferred.await(update)).pipe(
-                  Stream.map(() => ({ ...initial, sequence: 2 })),
-                ),
-              ).pipe(Stream.ensuring(Deferred.succeed(closed, undefined))),
-              { maxItems: 1 },
-            ),
-            enrichment: Stream.empty,
-          }),
-        );
-        expect(yield* pull).toEqual([initial]);
-        // Let the merge producer run while the client still withholds its ACK.
-        yield* Effect.yieldNow;
-        yield* Deferred.succeed(update, undefined);
-        yield* Deferred.await(closed);
-        const result = yield* Stream.fromPull(Effect.succeed(pull)).pipe(
-          Stream.runDrain,
-          Effect.result,
-        );
-        expect(result._tag).toBe("Failure");
-        if (result._tag === "Failure") expect(result.failure._tag).toBe("LiveStreamBufferError");
-      }),
-    ),
+    Effect.gen(function* () {
+      const update = yield* Deferred.make<void>();
+      const closed = yield* Deferred.make<void>();
+      const initial = {
+        kind: "thread.removed" as const,
+        sequence: 1,
+        location: "active" as const,
+        threadId: ThreadId.make("thread-a"),
+      };
+      const pull = yield* Stream.toPull(
+        composeShellStreamWithEnrichment({
+          initial: Stream.empty,
+          tail: bufferShellLiveStream(
+            Stream.concat(
+              Stream.succeed(initial),
+              Stream.fromEffect(Deferred.await(update)).pipe(
+                Stream.map(() => ({ ...initial, sequence: 2 })),
+              ),
+            ).pipe(Stream.ensuring(Deferred.succeed(closed, undefined))),
+            { maxItems: 1 },
+          ),
+          enrichment: Stream.empty,
+        }),
+      );
+      expect(yield* pull).toEqual([initial]);
+      // Let the merge producer run while the client still withholds its ACK.
+      yield* Effect.yieldNow;
+      yield* Deferred.succeed(update, undefined);
+      yield* Deferred.await(closed);
+      const result = yield* Stream.fromPull(Effect.succeed(pull)).pipe(
+        Stream.runDrain,
+        Effect.result,
+      );
+      expect(result._tag).toBe("Failure");
+      if (result._tag === "Failure") expect(result.failure._tag).toBe("LiveStreamBufferError");
+    }),
   );
 
   it.effect(
diff --git a/apps/server/src/orchestration-v2/ShellStream.ts b/apps/server/src/orchestration-v2/ShellStream.ts
index 9a2b3c9a949f..5ee1005b1683 100644
--- a/apps/server/src/orchestration-v2/ShellStream.ts
+++ b/apps/server/src/orchestration-v2/ShellStream.ts
@@ -18,6 +18,7 @@ import {
   OrchestrationProjectShell as ProjectShellSchema,
   OrchestrationV2ThreadShell as ThreadShellSchema,
 } from "@t3tools/contracts";
+import { turnItemCanChangeUserWait } from "@t3tools/shared/agentAwareness";
 import * as NodeSqliteClient from "@t3tools/shared/nodeSqliteClient";
 // @effect-diagnostics-next-line nodeBuiltinImport:off - a synchronous digest of a few project rows.
 import * as NodeCrypto from "node:crypto";
@@ -547,6 +548,9 @@ export function shouldPublishShellApplicationEvent(
     // Replay and the live tail overlap; keep known IDs so late events stay filtered.
     return true;
   }
+  if (event.type === "turn-item.updated" && turnItemCanChangeUserWait(event.payload)) {
+    return true;
+  }
   return !(
     subagentThreadIds.has(event.threadId) &&
     (event.type === "node.updated" ||
diff --git a/apps/server/src/orchestration-v2/SteeringCompletion.integration.test.ts b/apps/server/src/orchestration-v2/SteeringCompletion.integration.test.ts
index ad0c179d783f..c0c8cfae5a80 100644
--- a/apps/server/src/orchestration-v2/SteeringCompletion.integration.test.ts
+++ b/apps/server/src/orchestration-v2/SteeringCompletion.integration.test.ts
@@ -27,6 +27,7 @@ import { CodexProviderCapabilitiesV2 } from "./Adapters/CodexAdapterV2.ts";
 import * as EffectWorker from "./EffectWorker.ts";
 import * as EffectOutbox from "./EffectOutbox.ts";
 import * as EventSink from "./EventSink.ts";
+import * as ThreadCommandExecutor from "./ThreadCommandExecutor.ts";
 import * as Orchestrator from "./Orchestrator.ts";
 import * as ProviderAdapterRegistry from "./ProviderAdapterRegistry.ts";
 import * as ProviderReplayHarness from "./testkit/ProviderReplayHarness.ts";
@@ -62,371 +63,231 @@ it.effect.each(
       kind === "question" ? "delegated task question" : kind ? "mailbox notification" : "steering",
   })),
 )("delivers $label when completion wins $timing", ({ mailbox, question, timing }) =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      const cwd = yield* checkpointWorkspace(`steering-completion-${timing.replaceAll(" ", "-")}`);
-      const events = yield* Queue.unbounded<ProviderAdapter.ProviderAdapterV2Event>();
-      const started: ProviderAdapter.ProviderAdapterV2TurnInput[] = [];
-      const steerEntered = yield* Deferred.make<void>();
-      const rejectSteer = yield* Deferred.make<void>();
-      let steerCalls = 0;
-      const capabilities = {
-        ...CodexProviderCapabilitiesV2,
-        turns: {
-          ...CodexProviderCapabilitiesV2.turns,
-          supportsActiveSteering: timing !== "without native steering",
-          activeSteeringInterruptsTools: timing === "with interrupting native steering",
-        },
-      };
-      const adapter: ProviderAdapter.ProviderAdapterV2["Service"] = {
-        instanceId,
-        driver,
-        getCapabilities: () => Effect.succeed(capabilities),
-        planSelectionTransition: () => Effect.succeed({ type: "apply_on_next_turn" }),
-        openSession: (input) =>
-          Effect.gen(function* () {
-            const now = yield* DateTime.now;
-            return {
-              instanceId,
+  Effect.gen(function* () {
+    const cwd = yield* checkpointWorkspace(`steering-completion-${timing.replaceAll(" ", "-")}`);
+    const events = yield* Queue.unbounded<ProviderAdapter.ProviderAdapterV2Event>();
+    const started: ProviderAdapter.ProviderAdapterV2TurnInput[] = [];
+    const steerEntered = yield* Deferred.make<void>();
+    const rejectSteer = yield* Deferred.make<void>();
+    let steerCalls = 0;
+    const capabilities = {
+      ...CodexProviderCapabilitiesV2,
+      turns: {
+        ...CodexProviderCapabilitiesV2.turns,
+        supportsActiveSteering: timing !== "without native steering",
+        activeSteeringInterruptsTools: timing === "with interrupting native steering",
+      },
+    };
+    const adapter: ProviderAdapter.ProviderAdapterV2["Service"] = {
+      instanceId,
+      driver,
+      getCapabilities: () => Effect.succeed(capabilities),
+      planSelectionTransition: () => Effect.succeed({ type: "apply_on_next_turn" }),
+      openSession: (input) =>
+        Effect.gen(function* () {
+          const now = yield* DateTime.now;
+          return {
+            instanceId,
+            driver,
+            providerSessionId: input.providerSessionId,
+            providerSession: {
+              id: input.providerSessionId,
               driver,
-              providerSessionId: input.providerSessionId,
-              providerSession: {
-                id: input.providerSessionId,
+              providerInstanceId: instanceId,
+              status: "ready",
+              cwd,
+              model: modelSelection.model,
+              capabilities,
+              createdAt: now,
+              updatedAt: now,
+              lastError: null,
+            },
+            events: Stream.fromQueue(events),
+            ensureThread: ({ threadId }) =>
+              Effect.succeed({
+                id: ProviderThreadId.make(`provider-thread:${threadId}`),
                 driver,
                 providerInstanceId: instanceId,
-                status: "ready",
-                cwd,
-                model: modelSelection.model,
-                capabilities,
+                providerSessionId: input.providerSessionId,
+                appThreadId: threadId,
+                ownerNodeId: null,
+                nativeThreadRef: { driver, nativeId: "native-thread", strength: "strong" },
+                nativeConversationHeadRef: null,
+                status: "idle",
+                firstRunOrdinal: null,
+                lastRunOrdinal: null,
+                handoffIds: [],
+                forkedFrom: null,
                 createdAt: now,
                 updatedAt: now,
-                lastError: null,
-              },
-              events: Stream.fromQueue(events),
-              ensureThread: ({ threadId }) =>
-                Effect.succeed({
-                  id: ProviderThreadId.make(`provider-thread:${threadId}`),
+              }),
+            resumeThread: ({ providerThread }) => Effect.succeed(providerThread),
+            startTurn: (turn) =>
+              Effect.gen(function* () {
+                started.push(turn);
+                yield* Queue.offer(events, {
+                  type: "provider_turn.updated",
                   driver,
-                  providerInstanceId: instanceId,
-                  providerSessionId: input.providerSessionId,
-                  appThreadId: threadId,
-                  ownerNodeId: null,
-                  nativeThreadRef: { driver, nativeId: "native-thread", strength: "strong" },
-                  nativeConversationHeadRef: null,
-                  status: "idle",
-                  firstRunOrdinal: null,
-                  lastRunOrdinal: null,
-                  handoffIds: [],
-                  forkedFrom: null,
-                  createdAt: now,
-                  updatedAt: now,
-                }),
-              resumeThread: ({ providerThread }) => Effect.succeed(providerThread),
-              startTurn: (turn) =>
-                Effect.gen(function* () {
-                  started.push(turn);
-                  yield* Queue.offer(events, {
-                    type: "provider_turn.updated",
-                    driver,
-                    providerTurn: {
-                      id: ProviderTurnId.make(`provider-turn:${turn.attemptId}`),
-                      providerThreadId: turn.providerThread.id,
-                      nodeId: turn.rootNodeId,
-                      runAttemptId: turn.attemptId,
-                      nativeTurnRef: {
-                        driver,
-                        nativeId: `native:${turn.attemptId}`,
-                        strength: "strong",
-                      },
-                      ordinal: turn.providerTurnOrdinal,
-                      status: "running",
-                      startedAt: now,
-                      completedAt: null,
-                    },
-                  });
-                }),
-              steerTurn: (turn) =>
-                Effect.gen(function* () {
-                  steerCalls += 1;
-                  if (timing === "after delivery" || timing === "during continuation") return;
-                  yield* Deferred.succeed(steerEntered, undefined);
-                  yield* Deferred.await(rejectSteer);
-                  return yield* new ProviderAdapter.ProviderAdapterSteerRunError({
-                    driver,
+                  providerTurn: {
+                    id: ProviderTurnId.make(`provider-turn:${turn.attemptId}`),
                     providerThreadId: turn.providerThread.id,
-                    providerTurnId: turn.providerTurnId,
-                    cause: "turn already completed",
-                  });
-                }),
-              interruptTurn: () => Effect.void,
-              respondToRuntimeRequest: () => Effect.void,
-              readThreadSnapshot: () => Effect.die("unused"),
-              rollbackThread: () => Effect.die("unused"),
-              forkThread: () => Effect.die("unused"),
-            };
-          }),
-      };
-      yield* Effect.gen(function* () {
-        const orchestrator = yield* Orchestrator.OrchestratorV2;
-        const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
-        const threadId = ThreadId.make("thread:steering-completion");
-        const watch = (predicate: (event: OrchestrationV2DomainEvent) => boolean) =>
-          orchestrator.streamDomainEvents.pipe(
-            Stream.filter(predicate),
-            Stream.take(1),
-            Stream.runDrain,
-            Effect.forkScoped,
-          );
-        yield* orchestrator.dispatch({
-          type: "thread.create",
-          commandId: CommandId.make("create"),
-          threadId,
-          projectId: ProjectId.make("project:steering-completion"),
-          title: "Steering race",
-          modelSelection,
-          runtimeMode: "full-access",
-          interactionMode: "default",
-          branch: null,
-          worktreePath: cwd,
-          createdBy: "user",
-          creationSource: "web",
-        });
-        yield* orchestrator.dispatch({
-          type: "message.dispatch",
-          commandId: CommandId.make("first"),
-          threadId,
-          messageId: MessageId.make("message:first"),
-          text: "first",
-          attachments: [],
-          dispatchMode: { type: "start_immediately" },
-          createdBy: "user",
-          creationSource: "web",
-        });
-        const running = yield* watch(
-          (event) => event.type === "provider-turn.updated" && event.payload.status === "running",
-        );
-        yield* worker.drain();
-        yield* Fiber.join(running);
-        const first = started[0]!;
-        const messageId = MessageId.make("message:steering");
-        const taskId = NodeId.make("task:mailbox");
-        if (mailbox) {
-          const sink = yield* EventSink.EventSinkV2;
-          const current = yield* orchestrator.getThreadProjection(threadId);
-          const parentRun = current.runs.find((run) => run.id === first.runId)!;
-          const now = yield* DateTime.now;
-          yield* sink.write({
-            events: [
-              {
-                id: EventId.make("mailbox:cohort"),
-                type: "run.updated",
-                threadId,
-                runId: first.runId,
-                occurredAt: now,
-                payload: {
-                  ...parentRun,
-                  delegatedCompletion: {
-                    disposition: "open",
-                    nextGeneration: 2,
-                    delivery: { generation: 1, messageId, taskIds: [taskId] },
+                    nodeId: turn.rootNodeId,
+                    runAttemptId: turn.attemptId,
+                    nativeTurnRef: {
+                      driver,
+                      nativeId: `native:${turn.attemptId}`,
+                      strength: "strong",
+                    },
+                    ordinal: turn.providerTurnOrdinal,
+                    status: "running",
+                    startedAt: now,
+                    completedAt: null,
                   },
-                },
-              },
-              {
-                id: EventId.make("mailbox:task"),
-                type: "subagent.updated",
-                threadId,
-                runId: first.runId,
-                nodeId: taskId,
-                occurredAt: now,
-                payload: {
-                  id: taskId,
-                  threadId,
-                  runId: first.runId,
-                  parentNodeId: first.rootNodeId,
-                  origin: "app_owned",
-                  createdBy: "agent",
+                });
+              }),
+            steerTurn: (turn) =>
+              Effect.gen(function* () {
+                steerCalls += 1;
+                if (timing === "after delivery" || timing === "during continuation") return;
+                yield* Deferred.succeed(steerEntered, undefined);
+                yield* Deferred.await(rejectSteer);
+                return yield* new ProviderAdapter.ProviderAdapterSteerRunError({
                   driver,
-                  providerInstanceId: instanceId,
-                  providerThreadId: null,
-                  childThreadId: null,
-                  nativeTaskRef: null,
-                  prompt: "Do background work",
-                  title: "Background test",
-                  model: null,
-                  completionWake: timing === "settled only" ? "settled_only" : "always",
-                  completionDelivery: { state: "claimed", observedByRunId: null },
-                  status: "completed",
-                  result: "done",
-                  startedAt: now,
-                  completedAt: now,
-                  updatedAt: now,
+                  providerThreadId: turn.providerThread.id,
+                  providerTurnId: turn.providerTurnId,
+                  cause: "turn already completed",
+                });
+              }),
+            interruptTurn: () => Effect.void,
+            respondToRuntimeRequest: () => Effect.void,
+            readThreadSnapshot: () => Effect.die("unused"),
+            rollbackThread: () => Effect.die("unused"),
+            forkThread: () => Effect.die("unused"),
+          };
+        }),
+    };
+    yield* Effect.gen(function* () {
+      const orchestrator = yield* Orchestrator.OrchestratorV2;
+      const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
+      const threadId = ThreadId.make("thread:steering-completion");
+      const watch = (predicate: (event: OrchestrationV2DomainEvent) => boolean) =>
+        orchestrator.streamDomainEvents.pipe(
+          Stream.filter(predicate),
+          Stream.take(1),
+          Stream.runDrain,
+          Effect.forkScoped,
+        );
+      yield* orchestrator.dispatch({
+        type: "thread.create",
+        commandId: CommandId.make("create"),
+        threadId,
+        projectId: ProjectId.make("project:steering-completion"),
+        title: "Steering race",
+        modelSelection,
+        runtimeMode: "full-access",
+        interactionMode: "default",
+        branch: null,
+        worktreePath: cwd,
+        createdBy: "user",
+        creationSource: "web",
+      });
+      yield* orchestrator.dispatch({
+        type: "message.dispatch",
+        commandId: CommandId.make("first"),
+        threadId,
+        messageId: MessageId.make("message:first"),
+        text: "first",
+        attachments: [],
+        dispatchMode: { type: "start_immediately" },
+        createdBy: "user",
+        creationSource: "web",
+      });
+      const running = yield* watch(
+        (event) => event.type === "provider-turn.updated" && event.payload.status === "running",
+      );
+      yield* worker.drain();
+      yield* Fiber.join(running);
+      const first = started[0]!;
+      const messageId = MessageId.make("message:steering");
+      const taskId = NodeId.make("task:mailbox");
+      if (mailbox) {
+        const sink = yield* EventSink.EventSinkV2;
+        const current = yield* orchestrator.getThreadProjection(threadId);
+        const parentRun = current.runs.find((run) => run.id === first.runId)!;
+        const now = yield* DateTime.now;
+        yield* sink.write({
+          events: [
+            {
+              id: EventId.make("mailbox:cohort"),
+              type: "run.updated",
+              threadId,
+              runId: first.runId,
+              occurredAt: now,
+              payload: {
+                ...parentRun,
+                delegatedCompletion: {
+                  disposition: "open",
+                  nextGeneration: 2,
+                  delivery: { generation: 1, messageId, taskIds: [taskId] },
                 },
               },
-            ],
-          });
-        }
-        if (question) {
-          const { thread } = yield* orchestrator.getThreadProjection(threadId);
-          yield* (yield* EventSink.EventSinkV2).write({
-            events: [
-              {
-                id: EventId.make("event:composer-selection"),
-                type: "thread.model-selection-updated",
+            },
+            {
+              id: EventId.make("mailbox:task"),
+              type: "subagent.updated",
+              threadId,
+              runId: first.runId,
+              nodeId: taskId,
+              occurredAt: now,
+              payload: {
+                id: taskId,
                 threadId,
+                runId: first.runId,
+                parentNodeId: first.rootNodeId,
+                origin: "app_owned",
+                createdBy: "agent",
+                driver,
                 providerInstanceId: instanceId,
-                occurredAt: yield* DateTime.now,
-                payload: { ...thread, modelSelection: composerSelection },
+                providerThreadId: null,
+                childThreadId: null,
+                nativeTaskRef: null,
+                prompt: "Do background work",
+                title: "Background test",
+                model: null,
+                completionWake: timing === "settled only" ? "settled_only" : "always",
+                completionDelivery: { state: "claimed", observedByRunId: null },
+                status: "completed",
+                result: "done",
+                startedAt: now,
+                completedAt: now,
+                updatedAt: now,
               },
-            ],
-          });
-        }
-        const dispatchSteer = orchestrator.dispatch({
-          type: "message.dispatch",
-          commandId: CommandId.make("steer"),
-          threadId,
-          messageId,
-          text: "fix the popover",
-          attachments: [
-            {
-              type: "image",
-              id: "steering-screenshot",
-              name: "image.png",
-              mimeType: "image/png",
-              sizeBytes: 10,
             },
           ],
-          dispatchMode:
-            mailbox || question
-              ? { type: "queue_after_active" }
-              : { type: "steer_active", targetRunId: first.runId },
-          createdBy: mailbox || question ? "agent" : "user",
-          creationSource: mailbox || question ? "server" : "web",
-          ...(question
-            ? {
-                notification: {
-                  source: { kind: "delegated_task", taskIds: [taskId] },
-                  outcome: "updated",
-                  summary: "Delegated task has a question",
-                },
-              }
-            : {}),
-          ...(mailbox
-            ? {
-                delegatedCompletion: {
-                  parentRunId: first.runId,
-                  generation: 1,
-                  taskIds: [taskId],
-                },
-              }
-            : {}),
-        });
-        if (timing !== "before dispatch") yield* dispatchSteer;
-        if (timing === "during continuation") {
-          const projection = yield* orchestrator.getThreadProjection(threadId);
-          const turn = projection.providerTurns[0]!;
-          const failed = yield* watch(
-            (event) => event.type === "provider-turn.updated" && event.payload.status === "failed",
-          );
-          yield* Queue.offer(events, {
-            type: "provider_turn.updated",
-            driver,
-            providerTurn: { ...turn, status: "failed", completedAt: yield* DateTime.now },
-          });
-          yield* Fiber.join(failed);
-          yield* worker.drain();
-          assert.equal(steerCalls, 1);
-          assert.lengthOf(started, 1);
-          const continued = yield* orchestrator.getThreadProjection(threadId);
-          assert.equal(continued.runs[0]?.status, "running");
-          assert.equal(
-            continued.messages.find((message) => message.id === messageId)?.runId,
-            first.runId,
-          );
-          return;
-        }
-        if (timing === "after delivery") yield* worker.drain();
-        const delivery =
-          timing === "during delivery" ? yield* worker.runOnce().pipe(Effect.forkScoped) : null;
-        if (delivery !== null) yield* Deferred.await(steerEntered);
-        const completed = yield* watch(
-          (event) =>
-            event.type === "run.updated" &&
-            event.payload.id === first.runId &&
-            event.payload.status === "waiting",
-        );
-        const projection = yield* orchestrator.getThreadProjection(threadId);
-        const turn = projection.providerTurns[0]!;
-        yield* Queue.offer(events, {
-          type: "provider_turn.updated",
-          driver,
-          providerTurn: { ...turn, status: "completed", completedAt: yield* DateTime.now },
-        });
-        yield* Queue.offer(events, {
-          type: "turn.terminal",
-          driver,
-          providerThreadId: turn.providerThreadId,
-          providerTurnId: turn.id,
-          runOrdinal: first.runOrdinal,
-          status: "completed",
-          failure: null,
-          threadDisposition: "reusable",
         });
-        yield* Fiber.join(completed);
-        if (delivery !== null) {
-          yield* Deferred.succeed(rejectSteer, undefined);
-          yield* Fiber.join(delivery);
-        }
-        if (delivery !== null && !question) {
-          const requeued = yield* orchestrator.getThreadProjection(threadId);
-          const item = requeued.turnItems.find(
-            (item) => item.type === "user_message" && item.messageId === messageId,
-          );
-          assert.equal(item?.status, "pending");
-          assert.isNull(item?.startedAt);
-          assert.isNull(item?.completedAt);
-        }
-        if (timing === "before dispatch") yield* dispatchSteer;
-        yield* worker.drain();
-        yield* orchestrator.resumeQueuedRuns;
-        yield* worker.drain();
-        if (timing === "after delivery") {
-          assert.equal(steerCalls, 1);
-          assert.equal(started.length, 1);
-          if (mailbox) {
-            const delivered = yield* orchestrator.getThreadProjection(threadId);
-            assert.equal(delivered.subagents[0]?.completionDelivery?.state, "delivered");
-            assert.equal(delivered.subagents[0]?.completionDelivery?.observedByRunId, null);
-            assert.equal(delivered.runs[0]?.delegatedCompletion?.delivery, null);
-            assert.equal(
-              delivered.turnItems.filter((item) => item.type === "notification").length,
-              1,
-            );
-            yield* orchestrator.dispatch({
-              type: "notification.delivery.accept",
-              commandId: CommandId.make("duplicate-acceptance"),
+      }
+      if (question) {
+        const { thread } = yield* orchestrator.getThreadProjection(threadId);
+        yield* (yield* EventSink.EventSinkV2).write({
+          events: [
+            {
+              id: EventId.make("event:composer-selection"),
+              type: "thread.model-selection-updated",
               threadId,
-              messageId,
-            });
-            yield* worker.drain();
-            assert.equal(steerCalls, 1);
-            yield* orchestrator.dispatch({
-              type: "delegated_task.completion-delivery.acknowledge",
-              commandId: CommandId.make("read-result"),
-              parentThreadId: threadId,
-              taskId,
-              observedByRunId: first.runId,
-            });
-            const acknowledged = yield* orchestrator.getThreadProjection(threadId);
-            assert.equal(acknowledged.subagents[0]?.completionDelivery?.state, "acknowledged");
-          }
-          return;
-        }
-        assert.equal(started.length, 2);
-        assert.equal(started[1]?.message.messageId, messageId);
-        if (mailbox) assert.include(started[1]?.message.text ?? "", String(taskId));
-        else assert.equal(started[1]?.message.text, "fix the popover");
-        assert.deepEqual(started[1]?.message.attachments, [
+              providerInstanceId: instanceId,
+              occurredAt: yield* DateTime.now,
+              payload: { ...thread, modelSelection: composerSelection },
+            },
+          ],
+        });
+      }
+      const dispatchSteer = orchestrator.dispatch({
+        type: "message.dispatch",
+        commandId: CommandId.make("steer"),
+        threadId,
+        messageId,
+        text: "fix the popover",
+        attachments: [
           {
             type: "image",
             id: "steering-screenshot",
@@ -434,47 +295,200 @@ it.effect.each(
             mimeType: "image/png",
             sizeBytes: 10,
           },
-        ]);
-        assert.equal(steerCalls, timing === "during delivery" ? 1 : 0);
-        const final = yield* orchestrator.getThreadProjection(threadId);
-        if (question) {
-          assert.deepEqual(final.thread.modelSelection, composerSelection);
-          assert.deepEqual(started[1]?.modelSelection, composerSelection);
-        }
-        if (!mailbox && !question) {
+        ],
+        dispatchMode:
+          mailbox || question
+            ? { type: "queue_after_active" }
+            : { type: "steer_active", targetRunId: first.runId },
+        createdBy: mailbox || question ? "agent" : "user",
+        creationSource: mailbox || question ? "server" : "web",
+        ...(question
+          ? {
+              notification: {
+                source: { kind: "delegated_task", taskIds: [taskId] },
+                outcome: "updated",
+                summary: "Delegated task has a question",
+              },
+            }
+          : {}),
+        ...(mailbox
+          ? {
+              delegatedCompletion: {
+                parentRunId: first.runId,
+                generation: 1,
+                taskIds: [taskId],
+              },
+            }
+          : {}),
+      });
+      if (timing !== "before dispatch") yield* dispatchSteer;
+      if (timing === "during continuation") {
+        const projection = yield* orchestrator.getThreadProjection(threadId);
+        const turn = projection.providerTurns[0]!;
+        const failed = yield* watch(
+          (event) => event.type === "provider-turn.updated" && event.payload.status === "failed",
+        );
+        yield* Queue.offer(events, {
+          type: "provider_turn.updated",
+          driver,
+          providerTurn: { ...turn, status: "failed", completedAt: yield* DateTime.now },
+        });
+        yield* Fiber.join(failed);
+        yield* worker.drain();
+        assert.equal(steerCalls, 1);
+        assert.lengthOf(started, 1);
+        const continued = yield* orchestrator.getThreadProjection(threadId);
+        assert.equal(continued.runs[0]?.status, "running");
+        assert.equal(
+          continued.messages.find((message) => message.id === messageId)?.runId,
+          first.runId,
+        );
+        return;
+      }
+      if (timing === "after delivery") yield* worker.drain();
+      const delivery =
+        timing === "during delivery" ? yield* worker.runOnce().pipe(Effect.forkScoped) : null;
+      if (delivery !== null) yield* Deferred.await(steerEntered);
+      const completed = yield* watch(
+        (event) =>
+          event.type === "run.updated" &&
+          event.payload.id === first.runId &&
+          event.payload.status === "waiting",
+      );
+      const projection = yield* orchestrator.getThreadProjection(threadId);
+      const turn = projection.providerTurns[0]!;
+      yield* Queue.offer(events, {
+        type: "provider_turn.updated",
+        driver,
+        providerTurn: { ...turn, status: "completed", completedAt: yield* DateTime.now },
+      });
+      yield* Queue.offer(events, {
+        type: "turn.terminal",
+        driver,
+        providerThreadId: turn.providerThreadId,
+        providerTurnId: turn.id,
+        runOrdinal: first.runOrdinal,
+        status: "completed",
+        failure: null,
+        threadDisposition: "reusable",
+      });
+      yield* Fiber.join(completed);
+      if (delivery !== null) {
+        yield* Deferred.succeed(rejectSteer, undefined);
+        yield* Fiber.join(delivery);
+      }
+      if (delivery !== null && !question) {
+        const requeued = yield* orchestrator.getThreadProjection(threadId);
+        assert.isTrue(requeued.runs.some((run) => run.status === "queued"));
+        assert.isFalse(
+          requeued.visibleTurnItems.some(
+            ({ item }) => item.type === "user_message" && item.messageId === messageId,
+          ),
+          "a steer that fell back to the queue must not appear delivered",
+        );
+        const item = requeued.turnItems.find(
+          (item) => item.type === "user_message" && item.messageId === messageId,
+        );
+        assert.equal(item?.status, "pending");
+        assert.isNull(item?.startedAt);
+        assert.isNull(item?.completedAt);
+      }
+      if (timing === "before dispatch") yield* dispatchSteer;
+      yield* worker.drain();
+      yield* orchestrator.resumeQueuedRuns;
+      yield* worker.drain();
+      if (timing === "after delivery") {
+        assert.equal(steerCalls, 1);
+        assert.equal(started.length, 1);
+        if (mailbox) {
+          const delivered = yield* orchestrator.getThreadProjection(threadId);
+          assert.equal(delivered.subagents[0]?.completionDelivery?.state, "delivered");
+          assert.equal(delivered.subagents[0]?.completionDelivery?.observedByRunId, null);
+          assert.equal(delivered.runs[0]?.delegatedCompletion?.delivery, null);
           assert.equal(
-            final.turnItems.find(
-              (item) => item.type === "user_message" && item.messageId === messageId,
-            )?.status,
-            "completed",
+            delivered.turnItems.filter((item) => item.type === "notification").length,
+            1,
           );
+          yield* orchestrator.dispatch({
+            type: "notification.delivery.accept",
+            commandId: CommandId.make("duplicate-acceptance"),
+            threadId,
+            messageId,
+          });
+          yield* worker.drain();
+          assert.equal(steerCalls, 1);
+          yield* orchestrator.dispatch({
+            type: "delegated_task.completion-delivery.acknowledge",
+            commandId: CommandId.make("read-result"),
+            parentThreadId: threadId,
+            taskId,
+            observedByRunId: first.runId,
+          });
+          const acknowledged = yield* orchestrator.getThreadProjection(threadId);
+          assert.equal(acknowledged.subagents[0]?.completionDelivery?.state, "acknowledged");
         }
-        assert.equal(final.messages.filter((message) => message.id === messageId).length, 1);
+        return;
+      }
+      assert.equal(started.length, 2);
+      assert.equal(started[1]?.message.messageId, messageId);
+      if (mailbox) assert.include(started[1]?.message.text ?? "", String(taskId));
+      else assert.equal(started[1]?.message.text, "fix the popover");
+      assert.deepEqual(started[1]?.message.attachments, [
+        {
+          type: "image",
+          id: "steering-screenshot",
+          name: "image.png",
+          mimeType: "image/png",
+          sizeBytes: 10,
+        },
+      ]);
+      assert.equal(steerCalls, timing === "during delivery" ? 1 : 0);
+      const final = yield* orchestrator.getThreadProjection(threadId);
+      if (question) {
+        assert.deepEqual(final.thread.modelSelection, composerSelection);
+        assert.deepEqual(started[1]?.modelSelection, composerSelection);
+      }
+      if (!mailbox && !question) {
         assert.equal(
-          final.messages.find((message) => message.id === messageId)?.runId,
-          started[1]?.runId,
+          final.turnItems.find(
+            (item) => item.type === "user_message" && item.messageId === messageId,
+          )?.status,
+          "completed",
         );
+      }
+      assert.equal(final.messages.filter((message) => message.id === messageId).length, 1);
+      assert.equal(
+        final.messages.find((message) => message.id === messageId)?.runId,
+        started[1]?.runId,
+      );
+      assert.equal(
+        final.turnItems.filter((item) =>
+          mailbox || question
+            ? item.type === "notification"
+            : item.type === "user_message" && item.messageId === messageId,
+        ).length,
+        1,
+      );
+      if (!mailbox && !question) {
         assert.equal(
-          final.turnItems.filter((item) =>
-            mailbox || question
-              ? item.type === "notification"
-              : item.type === "user_message" && item.messageId === messageId,
+          final.visibleTurnItems.filter(
+            ({ item }) => item.type === "user_message" && item.messageId === messageId,
           ).length,
           1,
         );
-        yield* worker.drain();
-        assert.equal(started.length, 2);
-      }).pipe(
-        Effect.provide(
-          ProviderReplayHarness.layerWithRegistry(
-            { name: `steering-completion-${timing}` },
-            ProviderAdapterRegistry.layerSingle(adapter),
-            { runEffectWorker: false },
-          ),
+      }
+      yield* worker.drain();
+      assert.equal(started.length, 2);
+    }).pipe(
+      Effect.provide(
+        ProviderReplayHarness.layerWithRegistry(
+          { name: `steering-completion-${timing}` },
+          ProviderAdapterRegistry.layerSingle(adapter),
+          { runEffectWorker: false },
         ),
-      );
-    }),
-  ),
+      ),
+    );
+  }),
 );
 
 const runSelection = {
@@ -605,7 +619,21 @@ const nextTurnSelectionHarness = Effect.fn("nextTurnSelectionHarness")(function*
                     (turn) =>
                       ProviderTurnId.make(`provider-turn:${turn.attemptId}`) === providerTurnId,
                   ),
-                  (turn) => turnUpdated(turn, "interrupted"),
+                  (turn) =>
+                    turnUpdated(turn, "interrupted").pipe(
+                      Effect.andThen(
+                        Queue.offer(events, {
+                          type: "turn.terminal",
+                          driver,
+                          providerThreadId: turn.providerThread.id,
+                          providerTurnId,
+                          runOrdinal: turn.runOrdinal,
+                          status: "interrupted",
+                          failure: null,
+                          threadDisposition: "reusable",
+                        }),
+                      ),
+                    ),
                   { discard: true },
                 ),
               ),
@@ -662,6 +690,8 @@ const nextTurnSelectionHarness = Effect.fn("nextTurnSelectionHarness")(function*
     });
     yield* worker.drain();
     yield* Fiber.join(running);
+    // Ingestion checks turn ownership under this lock after committing the running turn.
+    yield* (yield* ThreadCommandExecutor.ThreadCommandExecutor).withLock(threadId, Effect.void);
     return threadId;
   });
   return { cwd, events, started, steered, steeredSelections, interrupted, layer, startFirstTurn };
@@ -674,183 +704,179 @@ it.effect.each([
 ] as const)(
   "a $notice notice steers into the running turn: $steers (goal $goal)",
   ({ notice, goal, steers }) =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const { started, steered, layer, startFirstTurn } = yield* nextTurnSelectionHarness(
-          `notice-steer-${notice.replaceAll(" ", "-")}-${goal ?? "none"}`,
-        );
-        yield* Effect.gen(function* () {
-          const orchestrator = yield* Orchestrator.OrchestratorV2;
-          const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
-          const threadId = yield* startFirstTurn;
-          const { thread } = yield* orchestrator.getThreadProjection(threadId);
+    Effect.gen(function* () {
+      const { started, steered, layer, startFirstTurn } = yield* nextTurnSelectionHarness(
+        `notice-steer-${notice.replaceAll(" ", "-")}-${goal ?? "none"}`,
+      );
+      yield* Effect.gen(function* () {
+        const orchestrator = yield* Orchestrator.OrchestratorV2;
+        const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
+        const threadId = yield* startFirstTurn;
+        const { thread } = yield* orchestrator.getThreadProjection(threadId);
+        yield* (yield* EventSink.EventSinkV2).write({
+          events: [
+            {
+              id: EventId.make("event:composer-selection"),
+              type: "thread.model-selection-updated",
+              threadId,
+              providerInstanceId: instanceId,
+              occurredAt: yield* DateTime.now,
+              payload: { ...thread, modelSelection: composerSelection },
+            },
+          ],
+        });
+        if (goal !== null) {
+          const providerThread = (yield* orchestrator.getThreadProjection(threadId))
+            .providerThreads[0]!;
           yield* (yield* EventSink.EventSinkV2).write({
             events: [
               {
-                id: EventId.make("event:composer-selection"),
-                type: "thread.model-selection-updated",
+                id: EventId.make("event:goal-active"),
+                type: "provider-thread.updated",
                 threadId,
-                providerInstanceId: instanceId,
                 occurredAt: yield* DateTime.now,
-                payload: { ...thread, modelSelection: composerSelection },
+                payload: { ...providerThread, goal: { objective: "Ship it", status: goal } },
               },
             ],
           });
-          if (goal !== null) {
-            const providerThread = (yield* orchestrator.getThreadProjection(threadId))
-              .providerThreads[0]!;
-            yield* (yield* EventSink.EventSinkV2).write({
-              events: [
-                {
-                  id: EventId.make("event:goal-active"),
-                  type: "provider-thread.updated",
-                  threadId,
-                  occurredAt: yield* DateTime.now,
-                  payload: { ...providerThread, goal: { objective: "Ship it", status: goal } },
-                },
-              ],
-            });
-          }
-          const messageId = MessageId.make("message:notice");
-          const notification =
-            notice === "delegated task question"
-              ? {
-                  source: {
-                    kind: "delegated_task" as const,
-                    taskIds: [NodeId.make("task:question")],
-                    childThreadId: ThreadId.make("thread:question-child"),
-                  },
-                  outcome: "updated" as const,
-                  summary: "Delegated task has a question",
-                }
-              : {
-                  source: { kind: "command" as const },
-                  outcome: "completed" as const,
-                  summary: "Background command finished",
-                };
-          yield* orchestrator.dispatch({
-            type: "message.dispatch",
-            commandId: CommandId.make("notice-wake"),
-            threadId,
-            messageId,
-            text: `${notification.summary}\nexit 0: built 12 files`,
-            notification,
-            attachments: [],
-            dispatchMode: { type: "queue_after_active" },
-            createdBy: "agent",
-            creationSource: "server",
-          });
-          yield* worker.drain();
-          const after = yield* orchestrator.getThreadProjection(threadId);
-          assert.deepEqual(
-            steered,
-            steers ? [`${notification.summary}\nexit 0: built 12 files`] : [],
-          );
-          assert.lengthOf(started, 1);
-          assert.equal(
-            after.runs.some((run) => run.status === "queued"),
-            !steers,
-          );
-          const message = after.messages.find((candidate) => candidate.id === messageId);
-          assert.deepEqual(message?.notification, notification);
-          if (steers) assert.equal(message?.runId, started[0]?.runId);
-          assert.deepEqual(after.thread.modelSelection, composerSelection);
-        }).pipe(Effect.provide(layer));
-      }),
-    ),
-);
-
-it.effect("sends a selected held message once and preserves the remaining queue order", () =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      const { started, steered, layer, startFirstTurn } =
-        yield* nextTurnSelectionHarness("send-held-message");
-      yield* Effect.gen(function* () {
-        const orchestrator = yield* Orchestrator.OrchestratorV2;
-        const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
-        const threadId = yield* startFirstTurn;
-        yield* Effect.forEach(["queued-first", "selected", "queued-last"], (text) =>
-          orchestrator.dispatch({
-            type: "message.dispatch",
-            commandId: CommandId.make(text),
-            threadId,
-            messageId: MessageId.make(`message:${text}`),
-            text,
-            attachments: [],
-            modelSelection: runSelection,
-            dispatchMode: { type: "queue_after_active" },
-            createdBy: "user",
-            creationSource: "web",
-          }),
-        );
-        const before = yield* orchestrator.getThreadProjection(threadId);
-        const selected = before.runs.find(
-          (run) => run.userMessageId === MessageId.make("message:selected"),
-        )!;
-        const sink = yield* EventSink.EventSinkV2;
-        const now = yield* DateTime.now;
-        // Restart recovery cancels the active run and holds every queued message.
-        yield* sink.write({
-          events: [
-            ...before.runs.map((run) => ({
-              id: EventId.make(`restart:${run.id}`),
-              type: "run.updated" as const,
-              threadId,
-              runId: run.id,
-              occurredAt: now,
-              payload:
-                run.status === "queued"
-                  ? { ...run, queueHeld: true }
-                  : { ...run, status: "cancelled" as const, completedAt: now },
-            })),
-            ...before.providerTurns.map((turn) => ({
-              id: EventId.make(`restart:${turn.id}`),
-              type: "provider-turn.updated" as const,
-              threadId,
-              occurredAt: now,
-              payload: { ...turn, status: "cancelled" as const, completedAt: now },
-            })),
-          ],
-        });
-        const command = {
-          type: "queued-run.start" as const,
-          commandId: CommandId.make("send-selected"),
+        }
+        const messageId = MessageId.make("message:notice");
+        const notification =
+          notice === "delegated task question"
+            ? {
+                source: {
+                  kind: "delegated_task" as const,
+                  taskIds: [NodeId.make("task:question")],
+                  childThreadId: ThreadId.make("thread:question-child"),
+                },
+                outcome: "updated" as const,
+                summary: "Delegated task has a question",
+              }
+            : {
+                source: { kind: "command" as const },
+                outcome: "completed" as const,
+                summary: "Background command finished",
+              };
+        yield* orchestrator.dispatch({
+          type: "message.dispatch",
+          commandId: CommandId.make("notice-wake"),
           threadId,
-          runId: selected.id,
-        };
-        yield* orchestrator.dispatch(command);
-        yield* worker.drain();
-        yield* orchestrator.dispatch(command);
+          messageId,
+          text: `${notification.summary}\nexit 0: built 12 files`,
+          notification,
+          attachments: [],
+          dispatchMode: { type: "queue_after_active" },
+          createdBy: "agent",
+          creationSource: "server",
+        });
         yield* worker.drain();
         const after = yield* orchestrator.getThreadProjection(threadId);
-        assert.equal(after.runs.find((run) => run.id === selected.id)?.status, "running");
         assert.deepEqual(
-          started.map((input) => input.message.text),
-          ["first", "selected"],
-        );
-        assert.equal(started[1]?.runId, selected.id);
-        assert.equal(started[1]?.message.messageId, selected.userMessageId);
-        assert.deepEqual(started[1]?.modelSelection, runSelection);
-        assert.deepEqual(steered, []);
-        assert.lengthOf(
-          after.messages.filter((message) => message.id === selected.userMessageId),
-          1,
+          steered,
+          steers ? [`${notification.summary}\nexit 0: built 12 files`] : [],
         );
-        assert.deepEqual(
-          after.runs.filter((run) => run.status === "queued").map((run) => run.userMessageId),
-          [MessageId.make("message:queued-first"), MessageId.make("message:queued-last")],
+        assert.lengthOf(started, 1);
+        assert.equal(
+          after.runs.some((run) => run.status === "queued"),
+          !steers,
         );
-        assert.isFalse(after.runs.some((run) => run.status === "queued" && run.queueHeld));
-        const duplicate = yield* orchestrator
-          .dispatch({
-            ...command,
-            commandId: CommandId.make("send-selected-again"),
-          })
-          .pipe(Effect.flip);
-        assert.equal(duplicate._tag, "OrchestratorDispatchError");
+        const message = after.messages.find((candidate) => candidate.id === messageId);
+        assert.deepEqual(message?.notification, notification);
+        if (steers) assert.equal(message?.runId, started[0]?.runId);
+        assert.deepEqual(after.thread.modelSelection, composerSelection);
       }).pipe(Effect.provide(layer));
     }),
-  ),
+);
+
+it.effect("sends a selected held message once and preserves the remaining queue order", () =>
+  Effect.gen(function* () {
+    const { started, steered, layer, startFirstTurn } =
+      yield* nextTurnSelectionHarness("send-held-message");
+    yield* Effect.gen(function* () {
+      const orchestrator = yield* Orchestrator.OrchestratorV2;
+      const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
+      const threadId = yield* startFirstTurn;
+      yield* Effect.forEach(["queued-first", "selected", "queued-last"], (text) =>
+        orchestrator.dispatch({
+          type: "message.dispatch",
+          commandId: CommandId.make(text),
+          threadId,
+          messageId: MessageId.make(`message:${text}`),
+          text,
+          attachments: [],
+          modelSelection: runSelection,
+          dispatchMode: { type: "queue_after_active" },
+          createdBy: "user",
+          creationSource: "web",
+        }),
+      );
+      const before = yield* orchestrator.getThreadProjection(threadId);
+      const selected = before.runs.find(
+        (run) => run.userMessageId === MessageId.make("message:selected"),
+      )!;
+      const sink = yield* EventSink.EventSinkV2;
+      const now = yield* DateTime.now;
+      // Restart recovery cancels the active run and holds every queued message.
+      yield* sink.write({
+        events: [
+          ...before.runs.map((run) => ({
+            id: EventId.make(`restart:${run.id}`),
+            type: "run.updated" as const,
+            threadId,
+            runId: run.id,
+            occurredAt: now,
+            payload:
+              run.status === "queued"
+                ? { ...run, queueHeld: true }
+                : { ...run, status: "cancelled" as const, completedAt: now },
+          })),
+          ...before.providerTurns.map((turn) => ({
+            id: EventId.make(`restart:${turn.id}`),
+            type: "provider-turn.updated" as const,
+            threadId,
+            occurredAt: now,
+            payload: { ...turn, status: "cancelled" as const, completedAt: now },
+          })),
+        ],
+      });
+      const command = {
+        type: "queued-run.start" as const,
+        commandId: CommandId.make("send-selected"),
+        threadId,
+        runId: selected.id,
+      };
+      yield* orchestrator.dispatch(command);
+      yield* worker.drain();
+      yield* orchestrator.dispatch(command);
+      yield* worker.drain();
+      const after = yield* orchestrator.getThreadProjection(threadId);
+      assert.equal(after.runs.find((run) => run.id === selected.id)?.status, "running");
+      assert.deepEqual(
+        started.map((input) => input.message.text),
+        ["first", "selected"],
+      );
+      assert.equal(started[1]?.runId, selected.id);
+      assert.equal(started[1]?.message.messageId, selected.userMessageId);
+      assert.deepEqual(started[1]?.modelSelection, runSelection);
+      assert.deepEqual(steered, []);
+      assert.lengthOf(
+        after.messages.filter((message) => message.id === selected.userMessageId),
+        1,
+      );
+      assert.deepEqual(
+        after.runs.filter((run) => run.status === "queued").map((run) => run.userMessageId),
+        [MessageId.make("message:queued-first"), MessageId.make("message:queued-last")],
+      );
+      assert.isFalse(after.runs.some((run) => run.status === "queued" && run.queueHeld));
+      const duplicate = yield* orchestrator
+        .dispatch({
+          ...command,
+          commandId: CommandId.make("send-selected-again"),
+        })
+        .pipe(Effect.flip);
+      assert.equal(duplicate._tag, "OrchestratorDispatchError");
+    }).pipe(Effect.provide(layer));
+  }),
 );
 
 it.effect.each(
@@ -858,712 +884,586 @@ it.effect.each(
     [false, true].map((direct) => ({ status, direct })),
   ),
 )("delivers a deferred steer for a $status run (direct: $direct)", ({ status, direct }) =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      const restarting = status === "starting" && !direct;
-      const { started, steered, layer, startFirstTurn, events } = yield* nextTurnSelectionHarness(
-        `deferred-steer-${status}-${direct}`,
-        restarting,
-        !restarting,
-      );
-      yield* Effect.gen(function* () {
-        const orchestrator = yield* Orchestrator.OrchestratorV2;
-        const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
-        const threadId = yield* startFirstTurn;
-        const before = yield* orchestrator.getThreadProjection(threadId);
-        const run = before.runs[0]!;
-        const turn = before.providerTurns[0]!;
-        const now = yield* DateTime.now;
-        yield* (yield* EventSink.EventSinkV2).write({
-          events: [
-            {
-              id: EventId.make("setup-run"),
-              type: "run.updated",
-              threadId,
-              occurredAt: now,
-              payload: { ...run, status },
-            },
-            {
-              id: EventId.make("setup-turn"),
-              type: "provider-turn.updated",
-              threadId,
-              occurredAt: now,
-              payload: { ...turn, status: "pending" },
-            },
-          ],
-        });
-        if (status === "preparing" && !direct) {
-          yield* orchestrator.dispatch({
-            type: "message.dispatch",
-            commandId: CommandId.make("edited-steer"),
-            threadId,
-            messageId: MessageId.make("message:edited-steer"),
-            text: "edit this steer",
-            attachments: [],
-            deliveryIntent: "steer",
-            dispatchMode: { type: "queue_after_active" },
-            createdBy: "user",
-            creationSource: "web",
-          });
-          const edited = (yield* orchestrator.getThreadProjection(threadId)).runs.find(
-            (candidate) => candidate.userMessageId === MessageId.make("message:edited-steer"),
-          )!;
-          yield* orchestrator.dispatch({
-            type: "queued-run.edit",
-            commandId: CommandId.make("edit-steer-to-compact"),
+  Effect.gen(function* () {
+    const restarting = status === "starting" && !direct;
+    const { started, steered, layer, startFirstTurn, events } = yield* nextTurnSelectionHarness(
+      `deferred-steer-${status}-${direct}`,
+      restarting,
+      !restarting,
+    );
+    yield* Effect.gen(function* () {
+      const orchestrator = yield* Orchestrator.OrchestratorV2;
+      const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
+      const threadId = yield* startFirstTurn;
+      const before = yield* orchestrator.getThreadProjection(threadId);
+      const run = before.runs[0]!;
+      const turn = before.providerTurns[0]!;
+      const now = yield* DateTime.now;
+      yield* (yield* EventSink.EventSinkV2).write({
+        events: [
+          {
+            id: EventId.make("setup-run"),
+            type: "run.updated",
             threadId,
-            runId: edited.id,
-            text: "/compact",
-          });
-        }
-        if (direct) {
-          yield* orchestrator.dispatch({
-            type: "message.dispatch",
-            commandId: CommandId.make("earlier-queue"),
+            occurredAt: now,
+            payload: { ...run, status },
+          },
+          {
+            id: EventId.make("setup-turn"),
+            type: "provider-turn.updated",
             threadId,
-            messageId: MessageId.make("message:earlier-queue"),
-            text: "earlier queued selection",
-            modelSelection: composerSelection,
-            attachments: [],
-            dispatchMode: { type: "queue_after_active" },
-            createdBy: "user",
-            creationSource: "web",
-          });
-        }
+            occurredAt: now,
+            payload: { ...turn, status: "pending" },
+          },
+        ],
+      });
+      if (status === "preparing" && !direct) {
         yield* orchestrator.dispatch({
           type: "message.dispatch",
-          commandId: CommandId.make("queue"),
+          commandId: CommandId.make("edited-steer"),
           threadId,
-          messageId: MessageId.make("message:steer-after-setup"),
-          text: "steer after setup",
+          messageId: MessageId.make("message:edited-steer"),
+          text: "edit this steer",
           attachments: [],
+          deliveryIntent: "steer",
           dispatchMode: { type: "queue_after_active" },
-          ...(direct ? { deliveryIntent: "steer" as const } : {}),
           createdBy: "user",
           creationSource: "web",
         });
-        const queued = (yield* orchestrator.getThreadProjection(threadId)).runs.find(
-          (candidate) => candidate.userMessageId === MessageId.make("message:steer-after-setup"),
+        const edited = (yield* orchestrator.getThreadProjection(threadId)).runs.find(
+          (candidate) => candidate.userMessageId === MessageId.make("message:edited-steer"),
         )!;
-        assert.deepEqual(queued.modelSelection, runSelection);
-        for (const text of ["/compact", "/logout"]) {
-          yield* orchestrator.dispatch({
-            type: "message.dispatch",
-            commandId: CommandId.make(`queue-${text}`),
-            threadId,
-            messageId: MessageId.make(`message:${text}`),
-            text,
-            attachments: [],
-            dispatchMode: { type: "queue_after_active" },
-            createdBy: "user",
-            creationSource: "web",
-          });
-          const maintenance = (yield* orchestrator.getThreadProjection(threadId)).runs.find(
-            (candidate) => candidate.userMessageId === MessageId.make(`message:${text}`),
-          )!;
-          const error = yield* orchestrator
-            .dispatch({
-              type: "queued-message.promote-to-steer",
-              commandId: CommandId.make(`promote-${text}`),
-              threadId,
-              queuedRunId: maintenance.id,
-              targetRunId: run.id,
-            })
-            .pipe(Effect.flip);
-          assert.equal(error._tag, "OrchestratorDispatchError");
-        }
-        const command = {
-          type: "queued-message.promote-to-steer" as const,
-          commandId: CommandId.make("promote"),
+        yield* orchestrator.dispatch({
+          type: "queued-run.edit",
+          commandId: CommandId.make("edit-steer-to-compact"),
           threadId,
-          queuedRunId: queued.id,
-          targetRunId: run.id,
-        };
-        if (!direct) {
-          yield* orchestrator.dispatch(command);
-          yield* orchestrator.dispatch(command);
-        }
-        let secondQueuedId: typeof queued.id | undefined;
-        if (restarting) {
-          yield* orchestrator.dispatch({
-            type: "message.dispatch",
-            commandId: CommandId.make("second"),
+          runId: edited.id,
+          text: "/compact",
+        });
+      }
+      if (direct) {
+        yield* orchestrator.dispatch({
+          type: "message.dispatch",
+          commandId: CommandId.make("earlier-queue"),
+          threadId,
+          messageId: MessageId.make("message:earlier-queue"),
+          text: "earlier queued selection",
+          modelSelection: composerSelection,
+          attachments: [],
+          dispatchMode: { type: "queue_after_active" },
+          createdBy: "user",
+          creationSource: "web",
+        });
+      }
+      yield* orchestrator.dispatch({
+        type: "message.dispatch",
+        commandId: CommandId.make("queue"),
+        threadId,
+        messageId: MessageId.make("message:steer-after-setup"),
+        text: "steer after setup",
+        attachments: [],
+        dispatchMode: { type: "queue_after_active" },
+        ...(direct ? { deliveryIntent: "steer" as const } : {}),
+        createdBy: "user",
+        creationSource: "web",
+      });
+      const queued = (yield* orchestrator.getThreadProjection(threadId)).runs.find(
+        (candidate) => candidate.userMessageId === MessageId.make("message:steer-after-setup"),
+      )!;
+      assert.deepEqual(queued.modelSelection, runSelection);
+      for (const text of ["/compact", "/logout"]) {
+        yield* orchestrator.dispatch({
+          type: "message.dispatch",
+          commandId: CommandId.make(`queue-${text}`),
+          threadId,
+          messageId: MessageId.make(`message:${text}`),
+          text,
+          attachments: [],
+          dispatchMode: { type: "queue_after_active" },
+          createdBy: "user",
+          creationSource: "web",
+        });
+        const maintenance = (yield* orchestrator.getThreadProjection(threadId)).runs.find(
+          (candidate) => candidate.userMessageId === MessageId.make(`message:${text}`),
+        )!;
+        const error = yield* orchestrator
+          .dispatch({
+            type: "queued-message.promote-to-steer",
+            commandId: CommandId.make(`promote-${text}`),
             threadId,
-            messageId: MessageId.make("message:second"),
-            text: "second steer",
-            attachments: [],
-            dispatchMode: { type: "queue_after_active" },
-            createdBy: "user",
-            creationSource: "web",
-          });
-          secondQueuedId = (yield* orchestrator.getThreadProjection(threadId)).runs.find(
-            (candidate) => candidate.userMessageId === MessageId.make("message:second"),
-          )!.id;
-          yield* orchestrator.dispatch({
-            ...command,
-            commandId: CommandId.make("promote-second"),
-            queuedRunId: secondQueuedId,
-          });
-        }
-        const secondReDeferred = yield* orchestrator.streamDomainEvents.pipe(
-          Stream.filter(
-            (event) =>
-              event.type === "run.updated" &&
-              event.payload.id === secondQueuedId &&
-              event.payload.status === "queued",
-          ),
-          Stream.take(1),
-          Stream.runDrain,
-          Effect.forkScoped,
-        );
-        const secondPromoted = yield* orchestrator.streamDomainEvents.pipe(
-          Stream.filter(
-            (event) =>
-              event.type === "run.updated" &&
-              event.payload.id === secondQueuedId &&
-              event.payload.status === "cancelled",
-          ),
-          Stream.take(1),
-          Stream.runDrain,
-          Effect.forkScoped,
-        );
-        yield* worker.drain();
-        assert.deepEqual(steered, []);
-        const promoted = yield* orchestrator.streamDomainEvents.pipe(
-          Stream.filter(
-            (event) =>
-              event.type === "run.updated" &&
-              event.payload.id === queued.id &&
-              event.payload.status === "cancelled",
-          ),
-          Stream.take(1),
-          Stream.runDrain,
-          Effect.forkScoped,
-        );
-        yield* (yield* EventSink.EventSinkV2).write({
-          events: [
-            {
-              id: EventId.make("ready-run"),
-              type: "run.updated",
-              threadId,
-              occurredAt: now,
-              payload: run,
-            },
-          ],
+            queuedRunId: maintenance.id,
+            targetRunId: run.id,
+          })
+          .pipe(Effect.flip);
+        assert.equal(error._tag, "OrchestratorDispatchError");
+      }
+      const command = {
+        type: "queued-message.promote-to-steer" as const,
+        commandId: CommandId.make("promote"),
+        threadId,
+        queuedRunId: queued.id,
+        targetRunId: run.id,
+      };
+      if (!direct) {
+        yield* orchestrator.dispatch(command);
+        yield* orchestrator.dispatch(command);
+      }
+      let secondQueuedId: typeof queued.id | undefined;
+      if (restarting) {
+        yield* orchestrator.dispatch({
+          type: "message.dispatch",
+          commandId: CommandId.make("second"),
+          threadId,
+          messageId: MessageId.make("message:second"),
+          text: "second steer",
+          attachments: [],
+          dispatchMode: { type: "queue_after_active" },
+          createdBy: "user",
+          creationSource: "web",
         });
-        yield* Queue.offer(events, { type: "provider_turn.updated", driver, providerTurn: turn });
-        yield* Fiber.join(promoted);
-        if (restarting) yield* Fiber.join(secondReDeferred);
+        secondQueuedId = (yield* orchestrator.getThreadProjection(threadId)).runs.find(
+          (candidate) => candidate.userMessageId === MessageId.make("message:second"),
+        )!.id;
+        yield* orchestrator.dispatch({
+          ...command,
+          commandId: CommandId.make("promote-second"),
+          queuedRunId: secondQueuedId,
+        });
+      }
+      const secondReDeferred = yield* orchestrator.streamDomainEvents.pipe(
+        Stream.filter(
+          (event) =>
+            event.type === "run.updated" &&
+            event.payload.id === secondQueuedId &&
+            event.payload.status === "queued",
+        ),
+        Stream.take(1),
+        Stream.runDrain,
+        Effect.forkScoped,
+      );
+      const secondPromoted = yield* orchestrator.streamDomainEvents.pipe(
+        Stream.filter(
+          (event) =>
+            event.type === "run.updated" &&
+            event.payload.id === secondQueuedId &&
+            event.payload.status === "cancelled",
+        ),
+        Stream.take(1),
+        Stream.runDrain,
+        Effect.forkScoped,
+      );
+      yield* worker.drain();
+      assert.deepEqual(steered, []);
+      const promoted = yield* orchestrator.streamDomainEvents.pipe(
+        Stream.filter(
+          (event) =>
+            event.type === "run.updated" &&
+            event.payload.id === queued.id &&
+            event.payload.status === "cancelled",
+        ),
+        Stream.take(1),
+        Stream.runDrain,
+        Effect.forkScoped,
+      );
+      yield* (yield* EventSink.EventSinkV2).write({
+        events: [
+          {
+            id: EventId.make("ready-run"),
+            type: "run.updated",
+            threadId,
+            occurredAt: now,
+            payload: run,
+          },
+        ],
+      });
+      yield* Queue.offer(events, { type: "provider_turn.updated", driver, providerTurn: turn });
+      yield* Fiber.join(promoted);
+      if (restarting) yield* Fiber.join(secondReDeferred);
+      yield* worker.drain();
+      if (restarting) {
+        yield* Fiber.join(secondPromoted);
         yield* worker.drain();
-        if (restarting) {
-          yield* Fiber.join(secondPromoted);
-          yield* worker.drain();
-          assert.deepEqual(
-            started.map((turn) => turn.message.text),
-            ["first", "steer after setup", "second steer"],
-          );
-        } else {
-          assert.deepEqual(steered, ["steer after setup"]);
-          assert.lengthOf(started, 1);
-        }
-        const after = yield* orchestrator.getThreadProjection(threadId);
-        assert.equal(
-          after.messages.find((message) => message.id === queued.userMessageId)?.runId,
-          run.id,
+        assert.deepEqual(
+          started.map((turn) => turn.message.text),
+          ["first", "steer after setup", "second steer"],
         );
-        assert.equal(after.runs.find((candidate) => candidate.id === run.id)?.status, "running");
-      }).pipe(Effect.provide(layer));
-    }),
-  ),
+      } else {
+        assert.deepEqual(steered, ["steer after setup"]);
+        assert.lengthOf(started, 1);
+      }
+      const after = yield* orchestrator.getThreadProjection(threadId);
+      assert.equal(
+        after.messages.find((message) => message.id === queued.userMessageId)?.runId,
+        run.id,
+      );
+      assert.equal(after.runs.find((candidate) => candidate.id === run.id)?.status, "running");
+    }).pipe(Effect.provide(layer));
+  }),
 );
 
 it.effect("force sends multiple queued messages and can force send a requeued message again", () =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      const { started, steered, layer, startFirstTurn } = yield* nextTurnSelectionHarness(
-        "multiple-promoted-messages",
-      );
-      yield* Effect.gen(function* () {
-        const orchestrator = yield* Orchestrator.OrchestratorV2;
-        const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
-        const threadId = yield* startFirstTurn;
-        const queue = (text: string, commandId: string) =>
-          orchestrator.dispatch({
-            type: "message.dispatch",
-            commandId: CommandId.make(commandId),
-            threadId,
-            messageId: MessageId.make(`message:${text}`),
-            text,
-            attachments: [],
-            dispatchMode: { type: "queue_after_active" },
-            createdBy: "user",
-            creationSource: "web",
-          });
-        for (const text of ["one", "two", "remaining"]) yield* queue(text, `queue-${text}`);
-        const promote = Effect.fn("test.promote")(function* (text: string, commandId: string) {
-          const projection = yield* orchestrator.getThreadProjection(threadId);
-          const queued = projection.runs.find(
-            (run) =>
-              run.status === "queued" && run.userMessageId === MessageId.make(`message:${text}`),
-          )!;
-          yield* orchestrator.dispatch({
-            type: "queued-message.promote-to-steer",
-            commandId: CommandId.make(commandId),
-            threadId,
-            queuedRunId: queued.id,
-            targetRunId: started[0]!.runId,
-          });
+  Effect.gen(function* () {
+    const { started, steered, layer, startFirstTurn } = yield* nextTurnSelectionHarness(
+      "multiple-promoted-messages",
+    );
+    yield* Effect.gen(function* () {
+      const orchestrator = yield* Orchestrator.OrchestratorV2;
+      const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
+      const threadId = yield* startFirstTurn;
+      const queue = (text: string, commandId: string) =>
+        orchestrator.dispatch({
+          type: "message.dispatch",
+          commandId: CommandId.make(commandId),
+          threadId,
+          messageId: MessageId.make(`message:${text}`),
+          text,
+          attachments: [],
+          dispatchMode: { type: "queue_after_active" },
+          createdBy: "user",
+          creationSource: "web",
         });
-        yield* promote("one", "promote-one");
-        yield* promote("two", "promote-two");
-        yield* worker.drain();
-        assert.deepEqual(steered, ["one", "two"]);
-
-        // The completion-race fallback redispatches the same message into the queue.
-        yield* queue("one", "requeue-one");
-        const requeued = yield* orchestrator.getThreadProjection(threadId);
-        assert.equal(
-          requeued.turnItems.find(
-            (item) => item.type === "user_message" && item.messageId === "message:one",
-          )?.status,
-          "pending",
-        );
-        yield* promote("one", "promote-one-again");
-        yield* worker.drain();
-        assert.deepEqual(steered, ["one", "two", "one"]);
-        assert.lengthOf(started, 1);
-        const final = yield* orchestrator.getThreadProjection(threadId);
-        assert.deepEqual(
-          final.runs.filter((run) => run.status === "queued").map((run) => run.userMessageId),
-          [MessageId.make("message:remaining")],
-        );
-        for (const text of ["one", "two"]) {
-          const items = final.turnItems.filter(
-            (item) => item.type === "user_message" && item.messageId === `message:${text}`,
-          );
-          assert.lengthOf(items, 1);
-          assert.equal(items[0]?.status, "completed");
-        }
-      }).pipe(Effect.provide(layer));
-    }),
-  ),
+      for (const text of ["one", "two", "remaining"]) yield* queue(text, `queue-${text}`);
+      const promote = Effect.fn("test.promote")(function* (text: string, commandId: string) {
+        const projection = yield* orchestrator.getThreadProjection(threadId);
+        const queued = projection.runs.find(
+          (run) =>
+            run.status === "queued" && run.userMessageId === MessageId.make(`message:${text}`),
+        )!;
+        yield* orchestrator.dispatch({
+          type: "queued-message.promote-to-steer",
+          commandId: CommandId.make(commandId),
+          threadId,
+          queuedRunId: queued.id,
+          targetRunId: started[0]!.runId,
+        });
+      });
+      yield* promote("one", "promote-one");
+      yield* promote("two", "promote-two");
+      yield* worker.drain();
+      assert.deepEqual(steered, ["one", "two"]);
+
+      // The completion-race fallback redispatches the same message into the queue.
+      yield* queue("one", "requeue-one");
+      const requeued = yield* orchestrator.getThreadProjection(threadId);
+      assert.equal(
+        requeued.turnItems.find(
+          (item) => item.type === "user_message" && item.messageId === "message:one",
+        )?.status,
+        "pending",
+      );
+      yield* promote("one", "promote-one-again");
+      yield* worker.drain();
+      assert.deepEqual(steered, ["one", "two", "one"]);
+      assert.lengthOf(started, 1);
+      const final = yield* orchestrator.getThreadProjection(threadId);
+      assert.deepEqual(
+        final.runs.filter((run) => run.status === "queued").map((run) => run.userMessageId),
+        [MessageId.make("message:remaining")],
+      );
+      for (const text of ["one", "two"]) {
+        const items = final.turnItems.filter(
+          (item) => item.type === "user_message" && item.messageId === `message:${text}`,
+        );
+        assert.lengthOf(items, 1);
+        assert.equal(items[0]?.status, "completed");
+      }
+    }).pipe(Effect.provide(layer));
+  }),
 );
 
 it.effect("keeps a message queued when send now races with a running turn", () =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      const { started, layer, startFirstTurn } =
-        yield* nextTurnSelectionHarness("send-queued-race");
-      yield* Effect.gen(function* () {
-        const orchestrator = yield* Orchestrator.OrchestratorV2;
-        const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
-        const threadId = yield* startFirstTurn;
-        yield* orchestrator.dispatch({
-          type: "message.dispatch",
-          commandId: CommandId.make("queue"),
+  Effect.gen(function* () {
+    const { started, layer, startFirstTurn } = yield* nextTurnSelectionHarness("send-queued-race");
+    yield* Effect.gen(function* () {
+      const orchestrator = yield* Orchestrator.OrchestratorV2;
+      const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
+      const threadId = yield* startFirstTurn;
+      yield* orchestrator.dispatch({
+        type: "message.dispatch",
+        commandId: CommandId.make("queue"),
+        threadId,
+        messageId: MessageId.make("message:queued"),
+        text: "queued",
+        attachments: [],
+        dispatchMode: { type: "queue_after_active" },
+        createdBy: "user",
+        creationSource: "web",
+      });
+      const before = yield* orchestrator.getThreadProjection(threadId);
+      const queued = before.runs.find((run) => run.status === "queued")!;
+      const error = yield* orchestrator
+        .dispatch({
+          type: "queued-run.start",
+          commandId: CommandId.make("send-now"),
           threadId,
-          messageId: MessageId.make("message:queued"),
-          text: "queued",
-          attachments: [],
-          dispatchMode: { type: "queue_after_active" },
-          createdBy: "user",
-          creationSource: "web",
-        });
-        const before = yield* orchestrator.getThreadProjection(threadId);
-        const queued = before.runs.find((run) => run.status === "queued")!;
-        const error = yield* orchestrator
-          .dispatch({
-            type: "queued-run.start",
-            commandId: CommandId.make("send-now"),
-            threadId,
-            runId: queued.id,
-          })
-          .pipe(Effect.flip);
-        yield* worker.drain();
-        assert.equal(error._tag, "OrchestratorDispatchError");
-        assert.equal(started.length, 1);
-        const after = yield* orchestrator.getThreadProjection(threadId);
-        assert.deepEqual(after.runs, before.runs);
-      }).pipe(Effect.provide(layer));
-    }),
-  ),
+          runId: queued.id,
+        })
+        .pipe(Effect.flip);
+      yield* worker.drain();
+      assert.equal(error._tag, "OrchestratorDispatchError");
+      assert.equal(started.length, 1);
+      const after = yield* orchestrator.getThreadProjection(threadId);
+      assert.deepEqual(after.runs, before.runs);
+    }).pipe(Effect.provide(layer));
+  }),
 );
 
 // regression: #19210 a provider that can restart the turn must still steer, since restarting ends its native subagents
 it.effect(
   "steers a changed turn-scoped selection into a running turn the provider could restart",
   () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const { started, steered, steeredSelections, layer, startFirstTurn } =
-          yield* nextTurnSelectionHarness("steering-selection-change", true);
-        yield* Effect.gen(function* () {
-          const orchestrator = yield* Orchestrator.OrchestratorV2;
-          const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
-          const threadId = yield* startFirstTurn;
-          const steer = (id: string, selection: ModelSelection) =>
-            orchestrator
-              .dispatch({
-                type: "message.dispatch",
-                commandId: CommandId.make(id),
-                threadId,
-                messageId: MessageId.make(`message:${id}`),
-                text: id,
-                attachments: [],
-                modelSelection: selection,
-                dispatchMode: { type: "steer_active", targetRunId: started[0]!.runId },
-                createdBy: "user",
-                creationSource: "web",
-              })
-              .pipe(Effect.andThen(worker.drain()));
-
-          yield* steer("steer-changed", composerSelection);
-          const changed = yield* orchestrator.getThreadProjection(threadId);
-          assert.deepEqual(steered, ["steer-changed"]);
-          assert.equal(started.length, 1);
-          assert.lengthOf(changed.attempts, 1);
-          assert.equal(changed.runs[0]?.status, "running");
-          assert.deepEqual(changed.runs[0]?.modelSelection, runSelection);
-          assert.deepEqual(changed.thread.modelSelection, composerSelection);
-
-          yield* steer("steer-reverted", runSelection);
-          const reverted = yield* orchestrator.getThreadProjection(threadId);
-          assert.deepEqual(steered, ["steer-changed", "steer-reverted"]);
-          assert.lengthOf(reverted.attempts, 1);
-          assert.deepEqual(reverted.thread.modelSelection, runSelection);
-
-          const otherSelection = {
-            instanceId: ProviderInstanceId.make("codex-work"),
-            model: "other",
-          };
-          const sink = yield* EventSink.EventSinkV2;
-          yield* sink.write({
-            events: [
-              {
-                id: EventId.make("switched-away"),
-                type: "thread.provider-switched",
-                threadId,
-                providerInstanceId: otherSelection.instanceId,
-                occurredAt: yield* DateTime.now,
-                payload: {
-                  ...reverted.thread,
-                  providerInstanceId: otherSelection.instanceId,
-                  modelSelection: otherSelection,
-                },
-              },
-            ],
-          });
-          yield* steer("steer-back", runSelection);
-          const back = yield* orchestrator.getThreadProjection(threadId);
-          assert.deepEqual(steered, ["steer-changed", "steer-reverted", "steer-back"]);
-          // The adapter gets each steer's selection so it can switch the live turn, and back.
-          assert.deepEqual(steeredSelections, [composerSelection, runSelection, runSelection]);
-          assert.equal(back.thread.providerInstanceId, instanceId);
-          assert.deepEqual(back.thread.modelSelection, runSelection);
-        }).pipe(Effect.provide(layer));
-      }),
-    ),
-);
-
-it.effect("restarts the turn for an image when native steering takes text only", () =>
-  Effect.scoped(
     Effect.gen(function* () {
-      const { started, steered, layer, startFirstTurn } = yield* nextTurnSelectionHarness(
-        "steering-text-only-attachment",
-        true,
-        true,
-        Effect.void,
-        false,
-      );
+      const { started, steered, steeredSelections, layer, startFirstTurn } =
+        yield* nextTurnSelectionHarness("steering-selection-change", true);
       yield* Effect.gen(function* () {
         const orchestrator = yield* Orchestrator.OrchestratorV2;
         const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
         const threadId = yield* startFirstTurn;
-        yield* orchestrator.dispatch({
-          type: "message.dispatch",
-          commandId: CommandId.make("steer-image"),
-          threadId,
-          messageId: MessageId.make("message:steer-image"),
-          text: "look at this",
-          attachments: [
+        const steer = (id: string, selection: ModelSelection) =>
+          orchestrator
+            .dispatch({
+              type: "message.dispatch",
+              commandId: CommandId.make(id),
+              threadId,
+              messageId: MessageId.make(`message:${id}`),
+              text: id,
+              attachments: [],
+              modelSelection: selection,
+              dispatchMode: { type: "steer_active", targetRunId: started[0]!.runId },
+              createdBy: "user",
+              creationSource: "web",
+            })
+            .pipe(Effect.andThen(worker.drain()));
+
+        yield* steer("steer-changed", composerSelection);
+        const changed = yield* orchestrator.getThreadProjection(threadId);
+        assert.deepEqual(steered, ["steer-changed"]);
+        assert.equal(started.length, 1);
+        assert.lengthOf(changed.attempts, 1);
+        assert.equal(changed.runs[0]?.status, "running");
+        assert.deepEqual(changed.runs[0]?.modelSelection, runSelection);
+        assert.deepEqual(changed.thread.modelSelection, composerSelection);
+
+        yield* steer("steer-reverted", runSelection);
+        const reverted = yield* orchestrator.getThreadProjection(threadId);
+        assert.deepEqual(steered, ["steer-changed", "steer-reverted"]);
+        assert.lengthOf(reverted.attempts, 1);
+        assert.deepEqual(reverted.thread.modelSelection, runSelection);
+
+        const otherSelection = {
+          instanceId: ProviderInstanceId.make("codex-work"),
+          model: "other",
+        };
+        const sink = yield* EventSink.EventSinkV2;
+        yield* sink.write({
+          events: [
             {
-              type: "image",
-              id: ChatAttachmentId.make("steer-image"),
-              name: "screenshot.png",
-              mimeType: "image/png",
-              sizeBytes: 4,
+              id: EventId.make("switched-away"),
+              type: "thread.provider-switched",
+              threadId,
+              providerInstanceId: otherSelection.instanceId,
+              occurredAt: yield* DateTime.now,
+              payload: {
+                ...reverted.thread,
+                providerInstanceId: otherSelection.instanceId,
+                modelSelection: otherSelection,
+              },
             },
           ],
-          modelSelection: runSelection,
-          dispatchMode: { type: "steer_active", targetRunId: started[0]!.runId },
-          createdBy: "user",
-          creationSource: "web",
         });
-        yield* worker.drain();
-        assert.deepEqual(steered, []);
-        assert.deepEqual(
-          started.map((turn) => [turn.message.text, turn.message.attachments.length]),
-          [
-            ["first", 0],
-            ["look at this", 1],
-          ],
-        );
+        yield* steer("steer-back", runSelection);
+        const back = yield* orchestrator.getThreadProjection(threadId);
+        assert.deepEqual(steered, ["steer-changed", "steer-reverted", "steer-back"]);
+        // The adapter gets each steer's selection so it can switch the live turn, and back.
+        assert.deepEqual(steeredSelections, [composerSelection, runSelection, runSelection]);
+        assert.equal(back.thread.providerInstanceId, instanceId);
+        assert.deepEqual(back.thread.modelSelection, runSelection);
       }).pipe(Effect.provide(layer));
     }),
-  ),
+);
+
+it.effect("restarts the turn for an image when native steering takes text only", () =>
+  Effect.gen(function* () {
+    const { started, steered, layer, startFirstTurn } = yield* nextTurnSelectionHarness(
+      "steering-text-only-attachment",
+      true,
+      true,
+      Effect.void,
+      false,
+    );
+    yield* Effect.gen(function* () {
+      const orchestrator = yield* Orchestrator.OrchestratorV2;
+      const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
+      const threadId = yield* startFirstTurn;
+      yield* orchestrator.dispatch({
+        type: "message.dispatch",
+        commandId: CommandId.make("steer-image"),
+        threadId,
+        messageId: MessageId.make("message:steer-image"),
+        text: "look at this",
+        attachments: [
+          {
+            type: "image",
+            id: ChatAttachmentId.make("steer-image"),
+            name: "screenshot.png",
+            mimeType: "image/png",
+            sizeBytes: 4,
+          },
+        ],
+        modelSelection: runSelection,
+        dispatchMode: { type: "steer_active", targetRunId: started[0]!.runId },
+        createdBy: "user",
+        creationSource: "web",
+      });
+      yield* worker.drain();
+      assert.deepEqual(steered, []);
+      assert.deepEqual(
+        started.map((turn) => [turn.message.text, turn.message.attachments.length]),
+        [
+          ["first", 0],
+          ["look at this", 1],
+        ],
+      );
+    }).pipe(Effect.provide(layer));
+  }),
 );
 
 it.effect("starts a steer that missed the turn on the saved next-turn selection", () =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      const { events, started, steered, layer, startFirstTurn } = yield* nextTurnSelectionHarness(
-        "steering-selection-follow-up",
+  Effect.gen(function* () {
+    const { events, started, steered, layer, startFirstTurn } = yield* nextTurnSelectionHarness(
+      "steering-selection-follow-up",
+    );
+    yield* Effect.gen(function* () {
+      const orchestrator = yield* Orchestrator.OrchestratorV2;
+      const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
+      const threadId = yield* startFirstTurn;
+      const first = started[0]!;
+      yield* orchestrator.dispatch({
+        type: "message.dispatch",
+        commandId: CommandId.make("steer"),
+        threadId,
+        messageId: MessageId.make("message:steer"),
+        text: "late steer",
+        attachments: [],
+        modelSelection: composerSelection,
+        dispatchMode: { type: "steer_active", targetRunId: first.runId },
+        createdBy: "user",
+        creationSource: "web",
+      });
+      const settled = yield* orchestrator.streamDomainEvents.pipe(
+        Stream.filter(
+          (event) =>
+            event.type === "run.updated" &&
+            event.payload.id === first.runId &&
+            event.payload.status === "waiting",
+        ),
+        Stream.take(1),
+        Stream.runDrain,
+        Effect.forkScoped,
       );
-      yield* Effect.gen(function* () {
-        const orchestrator = yield* Orchestrator.OrchestratorV2;
-        const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
-        const threadId = yield* startFirstTurn;
-        const first = started[0]!;
-        yield* orchestrator.dispatch({
-          type: "message.dispatch",
-          commandId: CommandId.make("steer"),
-          threadId,
-          messageId: MessageId.make("message:steer"),
-          text: "late steer",
-          attachments: [],
-          modelSelection: composerSelection,
-          dispatchMode: { type: "steer_active", targetRunId: first.runId },
-          createdBy: "user",
-          creationSource: "web",
-        });
-        const settled = yield* orchestrator.streamDomainEvents.pipe(
-          Stream.filter(
-            (event) =>
-              event.type === "run.updated" &&
-              event.payload.id === first.runId &&
-              event.payload.status === "waiting",
-          ),
-          Stream.take(1),
-          Stream.runDrain,
-          Effect.forkScoped,
-        );
-        const turn = (yield* orchestrator.getThreadProjection(threadId)).providerTurns[0]!;
-        yield* Queue.offer(events, {
-          type: "provider_turn.updated",
-          driver,
-          providerTurn: { ...turn, status: "completed", completedAt: yield* DateTime.now },
-        });
-        yield* Queue.offer(events, {
-          type: "turn.terminal",
-          driver,
-          providerThreadId: turn.providerThreadId,
-          providerTurnId: turn.id,
-          runOrdinal: first.runOrdinal,
-          status: "completed",
-          failure: null,
-          threadDisposition: "reusable",
-        });
-        yield* Fiber.join(settled);
-        yield* worker.drain();
-        yield* orchestrator.resumeQueuedRuns;
-        yield* worker.drain();
+      const turn = (yield* orchestrator.getThreadProjection(threadId)).providerTurns[0]!;
+      yield* Queue.offer(events, {
+        type: "provider_turn.updated",
+        driver,
+        providerTurn: { ...turn, status: "completed", completedAt: yield* DateTime.now },
+      });
+      yield* Queue.offer(events, {
+        type: "turn.terminal",
+        driver,
+        providerThreadId: turn.providerThreadId,
+        providerTurnId: turn.id,
+        runOrdinal: first.runOrdinal,
+        status: "completed",
+        failure: null,
+        threadDisposition: "reusable",
+      });
+      yield* Fiber.join(settled);
+      yield* worker.drain();
+      yield* orchestrator.resumeQueuedRuns;
+      yield* worker.drain();
 
-        const projection = yield* orchestrator.getThreadProjection(threadId);
-        assert.deepEqual(steered, []);
-        assert.equal(started.length, 2);
-        assert.equal(started[1]?.message.messageId, MessageId.make("message:steer"));
-        assert.deepEqual(started[1]?.modelSelection, composerSelection);
-        assert.deepEqual(projection.thread.modelSelection, composerSelection);
-      }).pipe(Effect.provide(layer));
-    }),
-  ),
+      const projection = yield* orchestrator.getThreadProjection(threadId);
+      assert.deepEqual(steered, []);
+      assert.equal(started.length, 2);
+      assert.equal(started[1]?.message.messageId, MessageId.make("message:steer"));
+      assert.deepEqual(started[1]?.modelSelection, composerSelection);
+      assert.deepEqual(projection.thread.modelSelection, composerSelection);
+    }).pipe(Effect.provide(layer));
+  }),
 );
 
 it.effect.each(["complete", "stop-before-decline", "stop-after-decline", "queued-model"] as const)(
   "persists a declined steer without blocking the worker: %s",
   (timing) =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        let beforeDecline: Effect.Effect<void> = Effect.void;
-        const { events, started, layer, startFirstTurn } = yield* nextTurnSelectionHarness(
-          `steering-declined-${timing}`,
-          false,
-          true,
-          Effect.void,
-          true,
-          undefined,
-          (turn) =>
-            Effect.suspend(() => beforeDecline).pipe(
-              Effect.andThen(
-                Effect.fail(
-                  new ProviderAdapter.ProviderAdapterSteerDeclinedError({
-                    driver,
-                    providerThreadId: turn.providerThread.id,
-                    providerTurnId: turn.providerTurnId,
-                  }),
-                ),
-              ),
-            ),
-        );
-        yield* Effect.gen(function* () {
-          const orchestrator = yield* Orchestrator.OrchestratorV2;
-          const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
-          const threadId = yield* startFirstTurn;
-          const first = started[0]!;
-          const stop = orchestrator
-            .dispatch({
-              type: "run.interrupt",
-              commandId: CommandId.make("stop"),
-              threadId,
-              runId: first.runId,
-              holdQueue: true,
-            })
-            .pipe(Effect.asVoid, Effect.orDie);
-          if (timing === "stop-before-decline") beforeDecline = stop;
-          const steerSelection = { ...runSelection, model: "steer-model" };
-          if (timing === "queued-model") {
-            yield* orchestrator.dispatch({
-              type: "message.dispatch",
-              commandId: CommandId.make("queued-model"),
-              threadId,
-              messageId: MessageId.make("message:queued-model"),
-              text: "already queued",
-              attachments: [],
-              modelSelection: composerSelection,
-              dispatchMode: { type: "queue_after_active" },
-              createdBy: "user",
-              creationSource: "web",
-            });
-            beforeDecline = Effect.forEach(["queued-later", "steer-later", "queued-last"], (id) =>
-              orchestrator.dispatch({
-                type: "message.dispatch",
-                commandId: CommandId.make(id),
-                threadId,
-                messageId: MessageId.make(`message:${id}`),
-                text: id,
-                attachments: [],
-                dispatchMode:
-                  id === "steer-later"
-                    ? { type: "steer_active", targetRunId: first.runId }
-                    : { type: "queue_after_active" },
-                createdBy: "user",
-                creationSource: "web",
-              }),
-            ).pipe(Effect.asVoid, Effect.orDie);
-          }
-          const messageId = MessageId.make("message:declined");
-          yield* orchestrator.dispatch({
-            type: "message.dispatch",
-            commandId: CommandId.make("steer"),
-            threadId,
-            messageId,
-            text: "follow up",
-            attachments: [],
-            ...(timing === "queued-model" ? { modelSelection: steerSelection } : {}),
-            dispatchMode: { type: "steer_active", targetRunId: first.runId },
-            createdBy: "user",
-            creationSource: "web",
-          });
-          yield* worker.drain();
-          const pending = yield* orchestrator.getThreadProjection(threadId);
-          const queued = pending.runs.find(
-            (run) => run.userMessageId === messageId && run.id !== first.runId,
-          );
-          const effects = yield* (yield* EffectOutbox.EffectOutboxV2).listByCommandId(
-            CommandId.make("steer"),
-          );
-          assert.deepEqual(
-            effects.map((effect) => [effect.request.type, effect.status]),
-            [["provider-turn.steer", "succeeded"]],
-          );
-          assert.equal(started.length, 1);
-          if (timing === "stop-before-decline") {
-            assert.isUndefined(queued);
-            return;
-          }
-          assert.equal(queued?.status, "queued");
-          assert.equal(queued?.userMessageId, messageId);
-          if (timing === "queued-model") {
-            assert.deepEqual(queued?.modelSelection, steerSelection);
-            assert.deepEqual(
-              pending.runs
-                .filter((run) => run.status === "queued")
-                .toSorted(
-                  (left, right) =>
-                    (left.queuePosition ?? left.ordinal) - (right.queuePosition ?? right.ordinal),
-                )
-                .map((run) => run.userMessageId),
-              [
-                MessageId.make("message:queued-model"),
-                messageId,
-                MessageId.make("message:queued-later"),
-                MessageId.make("message:steer-later"),
-                MessageId.make("message:queued-last"),
-              ],
-            );
-            return;
-          }
-          if (timing === "stop-after-decline") {
-            yield* stop;
-            yield* worker.drain();
-            yield* orchestrator.resumeQueuedRuns;
-            yield* worker.drain();
-            const held = yield* orchestrator.getThreadProjection(threadId);
-            assert.equal(held.runs.find((run) => run.id === queued?.id)?.queueHeld, true);
-            assert.equal(started.length, 1);
-            return;
-          }
-          const settled = yield* orchestrator.streamDomainEvents.pipe(
-            Stream.filter(
-              (event) =>
-                event.type === "run.updated" &&
-                event.payload.id === first.runId &&
-                event.payload.status === "waiting",
-            ),
-            Stream.take(1),
-            Stream.runDrain,
-            Effect.forkScoped,
-          );
-          const turn = pending.providerTurns[0]!;
-          yield* Queue.offer(events, {
-            type: "provider_turn.updated",
-            driver,
-            providerTurn: { ...turn, status: "completed", completedAt: yield* DateTime.now },
-          });
-          yield* Queue.offer(events, {
-            type: "turn.terminal",
-            driver,
-            providerThreadId: turn.providerThreadId,
-            providerTurnId: turn.id,
-            runOrdinal: first.runOrdinal,
-            status: "completed",
-            failure: null,
-            threadDisposition: "reusable",
-          });
-          yield* Fiber.join(settled);
-          yield* worker.drain();
-          yield* orchestrator.resumeQueuedRuns;
-          yield* worker.drain();
-          assert.equal(started.length, 2);
-          assert.equal(started[1]?.message.messageId, messageId);
-          assert.equal(started[1]?.runId, queued?.id);
-        }).pipe(Effect.provide(layer));
-      }),
-    ),
-);
-
-// regression: #26695 cancelling a Copilot prompt to steer it kills its background agents
-it.effect("queues a steer until the turn ends when the provider cannot steer it", () =>
-  Effect.scoped(
     Effect.gen(function* () {
-      const { events, started, steered, interrupted, layer, startFirstTurn } =
-        yield* nextTurnSelectionHarness("steering-unsupported", false, false);
+      let beforeDecline: Effect.Effect<void> = Effect.void;
+      const { events, started, layer, startFirstTurn } = yield* nextTurnSelectionHarness(
+        `steering-declined-${timing}`,
+        false,
+        true,
+        Effect.void,
+        true,
+        undefined,
+        (turn) =>
+          Effect.suspend(() => beforeDecline).pipe(
+            Effect.andThen(
+              Effect.fail(
+                new ProviderAdapter.ProviderAdapterSteerDeclinedError({
+                  driver,
+                  providerThreadId: turn.providerThread.id,
+                  providerTurnId: turn.providerTurnId,
+                }),
+              ),
+            ),
+          ),
+      );
       yield* Effect.gen(function* () {
         const orchestrator = yield* Orchestrator.OrchestratorV2;
         const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
         const threadId = yield* startFirstTurn;
         const first = started[0]!;
-        const messageId = MessageId.make("message:steer");
+        const stop = orchestrator
+          .dispatch({
+            type: "run.interrupt",
+            commandId: CommandId.make("stop"),
+            threadId,
+            runId: first.runId,
+            holdQueue: true,
+          })
+          .pipe(Effect.asVoid, Effect.orDie);
+        if (timing === "stop-before-decline") beforeDecline = stop;
+        const steerSelection = { ...runSelection, model: "steer-model" };
+        if (timing === "queued-model") {
+          yield* orchestrator.dispatch({
+            type: "message.dispatch",
+            commandId: CommandId.make("queued-model"),
+            threadId,
+            messageId: MessageId.make("message:queued-model"),
+            text: "already queued",
+            attachments: [],
+            modelSelection: composerSelection,
+            dispatchMode: { type: "queue_after_active" },
+            createdBy: "user",
+            creationSource: "web",
+          });
+          beforeDecline = Effect.forEach(["queued-later", "steer-later", "queued-last"], (id) =>
+            orchestrator.dispatch({
+              type: "message.dispatch",
+              commandId: CommandId.make(id),
+              threadId,
+              messageId: MessageId.make(`message:${id}`),
+              text: id,
+              attachments: [],
+              dispatchMode:
+                id === "steer-later"
+                  ? { type: "steer_active", targetRunId: first.runId }
+                  : { type: "queue_after_active" },
+              createdBy: "user",
+              creationSource: "web",
+            }),
+          ).pipe(Effect.asVoid, Effect.orDie);
+        }
+        const messageId = MessageId.make("message:declined");
         yield* orchestrator.dispatch({
           type: "message.dispatch",
           commandId: CommandId.make("steer"),
@@ -1571,22 +1471,60 @@ it.effect("queues a steer until the turn ends when the provider cannot steer it"
           messageId,
           text: "follow up",
           attachments: [],
-          modelSelection: runSelection,
-          dispatchMode: { type: "start_immediately" },
-          deliveryIntent: "steer",
+          ...(timing === "queued-model" ? { modelSelection: steerSelection } : {}),
+          dispatchMode: { type: "steer_active", targetRunId: first.runId },
           createdBy: "user",
           creationSource: "web",
         });
         yield* worker.drain();
-
-        const held = yield* orchestrator.getThreadProjection(threadId);
-        assert.deepEqual(steered, []);
-        assert.deepEqual(interrupted, []);
+        const pending = yield* orchestrator.getThreadProjection(threadId);
+        const queued = pending.runs.find(
+          (run) => run.userMessageId === messageId && run.id !== first.runId,
+        );
+        const effects = yield* (yield* EffectOutbox.EffectOutboxV2).listByCommandId(
+          CommandId.make("steer"),
+        );
+        assert.deepEqual(
+          effects.map((effect) => [effect.request.type, effect.status]),
+          [["provider-turn.steer", "succeeded"]],
+        );
         assert.equal(started.length, 1);
-        assert.equal(held.runs.find((run) => run.id === first.runId)?.status, "running");
-        const queued = held.runs.find((run) => run.userMessageId === messageId);
+        if (timing === "stop-before-decline") {
+          assert.isUndefined(queued);
+          return;
+        }
         assert.equal(queued?.status, "queued");
-
+        assert.equal(queued?.userMessageId, messageId);
+        if (timing === "queued-model") {
+          assert.deepEqual(queued?.modelSelection, steerSelection);
+          assert.deepEqual(
+            pending.runs
+              .filter((run) => run.status === "queued")
+              .toSorted(
+                (left, right) =>
+                  (left.queuePosition ?? left.ordinal) - (right.queuePosition ?? right.ordinal),
+              )
+              .map((run) => run.userMessageId),
+            [
+              MessageId.make("message:queued-model"),
+              messageId,
+              MessageId.make("message:queued-later"),
+              MessageId.make("message:steer-later"),
+              MessageId.make("message:queued-last"),
+            ],
+          );
+          return;
+        }
+        if (timing === "stop-after-decline") {
+          yield* stop;
+          yield* worker.drain();
+          yield* orchestrator.resumeQueuedRuns;
+          yield* worker.drain();
+          const held = yield* orchestrator.getThreadProjection(threadId);
+          assert.equal(held.runs.find((run) => run.id === queued?.id)?.queueHeld, true);
+          assert.equal(started.length, 1);
+          return;
+        }
         const settled = yield* orchestrator.streamDomainEvents.pipe(
           Stream.filter(
             (event) =>
@@ -1598,7 +1536,7 @@ it.effect("queues a steer until the turn ends when the provider cannot steer it"
           Stream.runDrain,
           Effect.forkScoped,
         );
-        const turn = held.providerTurns[0]!;
+        const turn = pending.providerTurns[0]!;
         yield* Queue.offer(events, {
           type: "provider_turn.updated",
           driver,
@@ -1618,14 +1556,85 @@ it.effect("queues a steer until the turn ends when the provider cannot steer it"
         yield* worker.drain();
         yield* orchestrator.resumeQueuedRuns;
         yield* worker.drain();
-
-        assert.deepEqual(interrupted, []);
         assert.equal(started.length, 2);
+        assert.equal(started[1]?.message.messageId, messageId);
         assert.equal(started[1]?.runId, queued?.id);
-        assert.equal(started[1]?.message.text, "follow up");
       }).pipe(Effect.provide(layer));
     }),
-  ),
+);
+
+// regression: #26695 cancelling a Copilot prompt to steer it kills its background agents
+it.effect("queues a steer until the turn ends when the provider cannot steer it", () =>
+  Effect.gen(function* () {
+    const { events, started, steered, interrupted, layer, startFirstTurn } =
+      yield* nextTurnSelectionHarness("steering-unsupported", false, false);
+    yield* Effect.gen(function* () {
+      const orchestrator = yield* Orchestrator.OrchestratorV2;
+      const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
+      const threadId = yield* startFirstTurn;
+      const first = started[0]!;
+      const messageId = MessageId.make("message:steer");
+      yield* orchestrator.dispatch({
+        type: "message.dispatch",
+        commandId: CommandId.make("steer"),
+        threadId,
+        messageId,
+        text: "follow up",
+        attachments: [],
+        modelSelection: runSelection,
+        dispatchMode: { type: "start_immediately" },
+        deliveryIntent: "steer",
+        createdBy: "user",
+        creationSource: "web",
+      });
+      yield* worker.drain();
+
+      const held = yield* orchestrator.getThreadProjection(threadId);
+      assert.deepEqual(steered, []);
+      assert.deepEqual(interrupted, []);
+      assert.equal(started.length, 1);
+      assert.equal(held.runs.find((run) => run.id === first.runId)?.status, "running");
+      const queued = held.runs.find((run) => run.userMessageId === messageId);
+      assert.equal(queued?.status, "queued");
+
+      const settled = yield* orchestrator.streamDomainEvents.pipe(
+        Stream.filter(
+          (event) =>
+            event.type === "run.updated" &&
+            event.payload.id === first.runId &&
+            event.payload.status === "waiting",
+        ),
+        Stream.take(1),
+        Stream.runDrain,
+        Effect.forkScoped,
+      );
+      const turn = held.providerTurns[0]!;
+      yield* Queue.offer(events, {
+        type: "provider_turn.updated",
+        driver,
+        providerTurn: { ...turn, status: "completed", completedAt: yield* DateTime.now },
+      });
+      yield* Queue.offer(events, {
+        type: "turn.terminal",
+        driver,
+        providerThreadId: turn.providerThreadId,
+        providerTurnId: turn.id,
+        runOrdinal: first.runOrdinal,
+        status: "completed",
+        failure: null,
+        threadDisposition: "reusable",
+      });
+      yield* Fiber.join(settled);
+      yield* worker.drain();
+      yield* orchestrator.resumeQueuedRuns;
+      yield* worker.drain();
+
+      assert.deepEqual(interrupted, []);
+      assert.equal(started.length, 2);
+      assert.equal(started[1]?.runId, queued?.id);
+      assert.equal(started[1]?.message.text, "follow up");
+    }).pipe(Effect.provide(layer));
+  }),
 );
 
 // regression: #33454 a steer that restarts a completion wake run left its cohort claimed forever
@@ -1876,485 +1885,463 @@ const restartCompletionWake = Effect.fn("restartCompletionWake")(function* (
 });
 
 it.effect("wakes the parent for a sibling result after a steer restarts the completion wake", () =>
-  Effect.scoped(
+  Effect.gen(function* () {
+    const harness = yield* nextTurnSelectionHarness("steered-completion-wake", true, false);
+    yield* Effect.gen(function* () {
+      const orchestrator = yield* Orchestrator.OrchestratorV2;
+      const {
+        threadId,
+        origin,
+        wake,
+        steered,
+        firstTaskId,
+        siblingTaskId,
+        watchRun,
+        finishTurn,
+        completeTask,
+      } = yield* restartCompletionWake(harness, false);
+
+      // A follow-up queued behind the wake starts once the terminal-run listener has settled it.
+      const followUp = MessageId.make("message:follow-up");
+      yield* orchestrator.dispatch({
+        type: "message.dispatch",
+        commandId: CommandId.make("command:follow-up"),
+        threadId,
+        messageId: followUp,
+        text: "follow up",
+        attachments: [],
+        modelSelection: runSelection,
+        dispatchMode: { type: "queue_after_active" },
+        createdBy: "user",
+        creationSource: "web",
+      });
+      const followUpRun = (yield* orchestrator.getThreadProjection(threadId)).runs.find(
+        (run) => run.userMessageId === followUp,
+      )!;
+      const followUpStarted = yield* watchRun(followUpRun.id, "starting");
+      yield* finishTurn(steered);
+      yield* Fiber.join(followUpStarted);
+      assert.equal(
+        (yield* orchestrator.getThreadProjection(threadId)).runs.find(
+          (run) => run.id === wake.runId,
+        )?.status,
+        "completed",
+      );
+
+      yield* completeTask(siblingTaskId);
+      const final = yield* orchestrator.getThreadProjection(threadId);
+      const tasks = new Map(
+        final.subagents.map((task) => [task.id, task.completionDelivery?.state]),
+      );
+      assert.deepInclude(
+        final.runs.find((run) => run.id === origin.runId)?.delegatedCompletion?.delivery ?? {},
+        { generation: 2, taskIds: [siblingTaskId] },
+        "the sibling finished after the steered wake but no new completion wake was reserved",
+      );
+      assert.equal(tasks.get(siblingTaskId), "claimed");
+      assert.equal(
+        tasks.get(firstTaskId),
+        "delivered",
+        "the steered wake run's own task stays claimed after that run completed",
+      );
+    }).pipe(Effect.provide(harness.layer));
+  }),
+);
+
+it.effect.each([false, true])(
+  "settles a steered completion wake whose parent run is before the last compaction (restart by intent: %s)",
+  (intentNamesTarget) =>
     Effect.gen(function* () {
-      const harness = yield* nextTurnSelectionHarness("steered-completion-wake", true, false);
+      const harness = yield* nextTurnSelectionHarness(
+        `steered-wake-after-compaction-${intentNamesTarget}`,
+        true,
+        false,
+      );
       yield* Effect.gen(function* () {
         const orchestrator = yield* Orchestrator.OrchestratorV2;
-        const {
-          threadId,
-          origin,
-          wake,
-          steered,
-          firstTaskId,
-          siblingTaskId,
-          watchRun,
-          finishTurn,
-          completeTask,
-        } = yield* restartCompletionWake(harness, false);
-
-        // A follow-up queued behind the wake starts once the terminal-run listener has settled it.
-        const followUp = MessageId.make("message:follow-up");
-        yield* orchestrator.dispatch({
-          type: "message.dispatch",
-          commandId: CommandId.make("command:follow-up"),
-          threadId,
-          messageId: followUp,
-          text: "follow up",
-          attachments: [],
-          modelSelection: runSelection,
-          dispatchMode: { type: "queue_after_active" },
-          createdBy: "user",
-          creationSource: "web",
-        });
-        const followUpRun = (yield* orchestrator.getThreadProjection(threadId)).runs.find(
-          (run) => run.userMessageId === followUp,
-        )!;
-        const followUpStarted = yield* watchRun(followUpRun.id, "starting");
-        yield* finishTurn(steered);
-        yield* Fiber.join(followUpStarted);
-        assert.equal(
-          (yield* orchestrator.getThreadProjection(threadId)).runs.find(
-            (run) => run.id === wake.runId,
-          )?.status,
-          "completed",
-        );
-
-        yield* completeTask(siblingTaskId);
-        const final = yield* orchestrator.getThreadProjection(threadId);
-        const tasks = new Map(
-          final.subagents.map((task) => [task.id, task.completionDelivery?.state]),
-        );
-        assert.deepInclude(
-          final.runs.find((run) => run.id === origin.runId)?.delegatedCompletion?.delivery ?? {},
-          { generation: 2, taskIds: [siblingTaskId] },
-          "the sibling finished after the steered wake but no new completion wake was reserved",
+        const { threadId, steered, firstTaskId, finishTurn } = yield* restartCompletionWake(
+          harness,
+          false,
+          true,
+          intentNamesTarget,
         );
-        assert.equal(tasks.get(siblingTaskId), "claimed");
+        yield* finishTurn(steered);
+        const tasks = (yield* orchestrator.getThreadProjection(threadId)).subagents;
         assert.equal(
-          tasks.get(firstTaskId),
+          tasks.find((task) => task.id === firstTaskId)?.completionDelivery?.state,
           "delivered",
-          "the steered wake run's own task stays claimed after that run completed",
         );
       }).pipe(Effect.provide(harness.layer));
     }),
-  ),
-);
-
-it.effect.each([false, true])(
-  "settles a steered completion wake whose parent run is before the last compaction (restart by intent: %s)",
-  (intentNamesTarget) =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const harness = yield* nextTurnSelectionHarness(
-          `steered-wake-after-compaction-${intentNamesTarget}`,
-          true,
-          false,
-        );
-        yield* Effect.gen(function* () {
-          const orchestrator = yield* Orchestrator.OrchestratorV2;
-          const { threadId, steered, firstTaskId, finishTurn } = yield* restartCompletionWake(
-            harness,
-            false,
-            true,
-            intentNamesTarget,
-          );
-          yield* finishTurn(steered);
-          const tasks = (yield* orchestrator.getThreadProjection(threadId)).subagents;
-          assert.equal(
-            tasks.find((task) => task.id === firstTaskId)?.completionDelivery?.state,
-            "delivered",
-          );
-        }).pipe(Effect.provide(harness.layer));
-      }),
-    ),
 );
 
 it.effect(
   "offers the next completion wake when a steer restarts a wake a sibling finished behind",
   () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const harness = yield* nextTurnSelectionHarness(
-          "steered-completion-wake-behind",
+    Effect.gen(function* () {
+      const harness = yield* nextTurnSelectionHarness(
+        "steered-completion-wake-behind",
+        true,
+        false,
+      );
+      const offers: ProviderContinuationRequests.ProviderContinuationRequest[] = [];
+      const requests = Layer.succeed(ProviderContinuationRequests.ProviderContinuationRequests, {
+        offer: (request) => Effect.sync(() => void offers.push(request)),
+        take: Effect.never,
+      });
+      yield* Effect.gen(function* () {
+        const orchestrator = yield* Orchestrator.OrchestratorV2;
+        const { threadId, origin, firstTaskId, siblingTaskId } = yield* restartCompletionWake(
+          harness,
           true,
-          false,
         );
-        const offers: ProviderContinuationRequests.ProviderContinuationRequest[] = [];
-        const requests = Layer.succeed(ProviderContinuationRequests.ProviderContinuationRequests, {
-          offer: (request) => Effect.sync(() => void offers.push(request)),
-          take: Effect.never,
+        const projection = yield* orchestrator.getThreadProjection(threadId);
+        const delivery = projection.runs.find((run) => run.id === origin.runId)?.delegatedCompletion
+          ?.delivery;
+        assert.deepInclude(delivery ?? {}, { generation: 2, taskIds: [siblingTaskId] });
+        const tasks = new Map(
+          projection.subagents.map((task) => [task.id, task.completionDelivery?.state]),
+        );
+        assert.equal(tasks.get(firstTaskId), "delivered");
+        assert.equal(tasks.get(siblingTaskId), "claimed");
+        assert.deepEqual(offers.at(-1)?.delegatedCompletion, {
+          parentRunId: origin.runId,
+          generation: 2,
+          messageId: delivery!.messageId,
         });
-        yield* Effect.gen(function* () {
-          const orchestrator = yield* Orchestrator.OrchestratorV2;
-          const { threadId, origin, firstTaskId, siblingTaskId } = yield* restartCompletionWake(
-            harness,
-            true,
-          );
-          const projection = yield* orchestrator.getThreadProjection(threadId);
-          const delivery = projection.runs.find((run) => run.id === origin.runId)
-            ?.delegatedCompletion?.delivery;
-          assert.deepInclude(delivery ?? {}, { generation: 2, taskIds: [siblingTaskId] });
-          const tasks = new Map(
-            projection.subagents.map((task) => [task.id, task.completionDelivery?.state]),
-          );
-          assert.equal(tasks.get(firstTaskId), "delivered");
-          assert.equal(tasks.get(siblingTaskId), "claimed");
-          assert.deepEqual(offers.at(-1)?.delegatedCompletion, {
-            parentRunId: origin.runId,
-            generation: 2,
-            messageId: delivery!.messageId,
-          });
-        }).pipe(Effect.provide(harness.layer.pipe(Layer.provide(requests))));
-      }),
-    ),
+      }).pipe(Effect.provide(harness.layer.pipe(Layer.provide(requests))));
+    }),
 );
 
 // Codex flushes held drafts after the final answer; reserve their pre-steer position before turn end.
 it.effect("keeps a held commentary draft before the steer when turn end flushes it", () =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      const { events, started, layer, startFirstTurn } =
-        yield* nextTurnSelectionHarness("steering-held-draft");
-      yield* Effect.gen(function* () {
-        const orchestrator = yield* Orchestrator.OrchestratorV2;
-        const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
-        const threadId = yield* startFirstTurn;
-        const first = started[0]!;
-        const turn = (yield* orchestrator.getThreadProjection(threadId)).providerTurns[0]!;
-        const now = yield* DateTime.now;
-        const assistantItem = (id: string, text: string, streaming: boolean) =>
-          ({
-            type: "turn_item.updated",
-            driver,
-            turnItem: {
-              id: TurnItemId.make(id),
-              threadId,
-              runId: first.runId,
-              nodeId: first.rootNodeId,
-              providerThreadId: turn.providerThreadId,
-              providerTurnId: turn.id,
-              nativeItemRef: null,
-              parentItemId: null,
-              ordinal: 0,
-              status: streaming ? "running" : "completed",
-              title: null,
-              startedAt: now,
-              completedAt: streaming ? null : now,
-              updatedAt: now,
-              type: "assistant_message",
-              messageId: MessageId.make(`message:${id}`),
-              text,
-              streaming,
-            },
-          }) satisfies ProviderAdapter.ProviderAdapterV2Event;
-        const watch = (predicate: (event: OrchestrationV2DomainEvent) => boolean) =>
-          orchestrator.streamDomainEvents.pipe(
-            Stream.filter(predicate),
-            Stream.take(1),
-            Stream.runDrain,
-            Effect.forkScoped,
-          );
-
-        yield* Queue.offer(events, assistantItem("draft", "Let me look at the", true));
-        const commentaryWritten = yield* watch(
-          (event) => event.type === "turn-item.updated" && event.payload.id === "commentary",
+  Effect.gen(function* () {
+    const { events, started, layer, startFirstTurn } =
+      yield* nextTurnSelectionHarness("steering-held-draft");
+    yield* Effect.gen(function* () {
+      const orchestrator = yield* Orchestrator.OrchestratorV2;
+      const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
+      const threadId = yield* startFirstTurn;
+      const first = started[0]!;
+      const turn = (yield* orchestrator.getThreadProjection(threadId)).providerTurns[0]!;
+      const now = yield* DateTime.now;
+      const assistantItem = (id: string, text: string, streaming: boolean) =>
+        ({
+          type: "turn_item.updated",
+          driver,
+          turnItem: {
+            id: TurnItemId.make(id),
+            threadId,
+            runId: first.runId,
+            nodeId: first.rootNodeId,
+            providerThreadId: turn.providerThreadId,
+            providerTurnId: turn.id,
+            nativeItemRef: null,
+            parentItemId: null,
+            ordinal: 0,
+            status: streaming ? "running" : "completed",
+            title: null,
+            startedAt: now,
+            completedAt: streaming ? null : now,
+            updatedAt: now,
+            type: "assistant_message",
+            messageId: MessageId.make(`message:${id}`),
+            text,
+            streaming,
+          },
+        }) satisfies ProviderAdapter.ProviderAdapterV2Event;
+      const watch = (predicate: (event: OrchestrationV2DomainEvent) => boolean) =>
+        orchestrator.streamDomainEvents.pipe(
+          Stream.filter(predicate),
+          Stream.take(1),
+          Stream.runDrain,
+          Effect.forkScoped,
         );
-        yield* Queue.offer(events, assistantItem("commentary", "Checking the popover.", false));
-        yield* Fiber.join(commentaryWritten);
 
-        yield* orchestrator.dispatch({
-          type: "message.dispatch",
-          commandId: CommandId.make("steer"),
-          threadId,
-          messageId: MessageId.make("message:steer"),
-          text: "fix the popover",
-          attachments: [],
-          dispatchMode: { type: "steer_active", targetRunId: first.runId },
-          createdBy: "user",
-          creationSource: "web",
-        });
-        yield* worker.drain();
+      yield* Queue.offer(events, assistantItem("draft", "Let me look at the", true));
+      const commentaryWritten = yield* watch(
+        (event) => event.type === "turn-item.updated" && event.payload.id === "commentary",
+      );
+      yield* Queue.offer(events, assistantItem("commentary", "Checking the popover.", false));
+      yield* Fiber.join(commentaryWritten);
 
-        const settled = yield* watch(
-          (event) =>
-            event.type === "run.updated" &&
-            event.payload.id === first.runId &&
-            event.payload.status === "waiting",
-        );
-        yield* Queue.offer(events, assistantItem("answer", "All fixed.", false));
-        yield* Queue.offer(events, assistantItem("draft", "Let me look at the", false));
-        yield* Queue.offer(events, {
-          type: "provider_turn.updated",
-          driver,
-          providerTurn: { ...turn, status: "completed", completedAt: yield* DateTime.now },
-        });
-        yield* Queue.offer(events, {
-          type: "turn.terminal",
-          driver,
-          providerThreadId: turn.providerThreadId,
-          providerTurnId: turn.id,
-          runOrdinal: first.runOrdinal,
-          status: "completed",
-          failure: null,
-          threadDisposition: "reusable",
-        });
-        yield* Fiber.join(settled);
-        yield* worker.drain();
+      yield* orchestrator.dispatch({
+        type: "message.dispatch",
+        commandId: CommandId.make("steer"),
+        threadId,
+        messageId: MessageId.make("message:steer"),
+        text: "fix the popover",
+        attachments: [],
+        dispatchMode: { type: "steer_active", targetRunId: first.runId },
+        createdBy: "user",
+        creationSource: "web",
+      });
+      yield* worker.drain();
+
+      const settled = yield* watch(
+        (event) =>
+          event.type === "run.updated" &&
+          event.payload.id === first.runId &&
+          event.payload.status === "waiting",
+      );
+      yield* Queue.offer(events, assistantItem("answer", "All fixed.", false));
+      yield* Queue.offer(events, assistantItem("draft", "Let me look at the", false));
+      yield* Queue.offer(events, {
+        type: "provider_turn.updated",
+        driver,
+        providerTurn: { ...turn, status: "completed", completedAt: yield* DateTime.now },
+      });
+      yield* Queue.offer(events, {
+        type: "turn.terminal",
+        driver,
+        providerThreadId: turn.providerThreadId,
+        providerTurnId: turn.id,
+        runOrdinal: first.runOrdinal,
+        status: "completed",
+        failure: null,
+        threadDisposition: "reusable",
+      });
+      yield* Fiber.join(settled);
+      yield* worker.drain();
 
-        const items = (yield* orchestrator.getThreadProjection(threadId)).turnItems
-          .toSorted((left, right) => left.ordinal - right.ordinal)
-          .flatMap((item) =>
-            item.type === "user_message"
-              ? [String(item.messageId)]
-              : item.type === "assistant_message"
-                ? [String(item.id)]
-                : [],
-          );
-        assert.deepEqual(items, [
-          "message:first",
-          "draft",
-          "commentary",
-          "message:steer",
-          "answer",
-        ]);
-      }).pipe(Effect.provide(layer));
-    }),
-  ),
+      const items = (yield* orchestrator.getThreadProjection(threadId)).turnItems
+        .toSorted((left, right) => left.ordinal - right.ordinal)
+        .flatMap((item) =>
+          item.type === "user_message"
+            ? [String(item.messageId)]
+            : item.type === "assistant_message"
+              ? [String(item.id)]
+              : [],
+        );
+      assert.deepEqual(items, ["message:first", "draft", "commentary", "message:steer", "answer"]);
+    }).pipe(Effect.provide(layer));
+  }),
 );
 
 it.effect("steers a promoted queued message with the selection it was queued with", () =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      const { started, steered, layer, startFirstTurn } = yield* nextTurnSelectionHarness(
-        "promote-queued-selection",
-      );
-      yield* Effect.gen(function* () {
-        const orchestrator = yield* Orchestrator.OrchestratorV2;
-        const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
-        const threadId = yield* startFirstTurn;
-        yield* orchestrator.dispatch({
-          type: "message.dispatch",
-          commandId: CommandId.make("queued"),
-          threadId,
-          messageId: MessageId.make("message:queued"),
-          text: "queued",
-          attachments: [],
-          modelSelection: composerSelection,
-          dispatchMode: { type: "queue_after_active" },
-          createdBy: "user",
-          creationSource: "web",
-        });
-        const queuedRun = (yield* orchestrator.getThreadProjection(threadId)).runs.find(
-          (run) => run.status === "queued",
-        )!;
-        yield* orchestrator.dispatch({
-          type: "queued-message.promote-to-steer",
-          commandId: CommandId.make("promote"),
-          threadId,
-          queuedRunId: queuedRun.id,
-          targetRunId: started[0]!.runId,
-        });
-        yield* worker.drain();
+  Effect.gen(function* () {
+    const { started, steered, layer, startFirstTurn } = yield* nextTurnSelectionHarness(
+      "promote-queued-selection",
+    );
+    yield* Effect.gen(function* () {
+      const orchestrator = yield* Orchestrator.OrchestratorV2;
+      const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
+      const threadId = yield* startFirstTurn;
+      yield* orchestrator.dispatch({
+        type: "message.dispatch",
+        commandId: CommandId.make("queued"),
+        threadId,
+        messageId: MessageId.make("message:queued"),
+        text: "queued",
+        attachments: [],
+        modelSelection: composerSelection,
+        dispatchMode: { type: "queue_after_active" },
+        createdBy: "user",
+        creationSource: "web",
+      });
+      const queuedRun = (yield* orchestrator.getThreadProjection(threadId)).runs.find(
+        (run) => run.status === "queued",
+      )!;
+      yield* orchestrator.dispatch({
+        type: "queued-message.promote-to-steer",
+        commandId: CommandId.make("promote"),
+        threadId,
+        queuedRunId: queuedRun.id,
+        targetRunId: started[0]!.runId,
+      });
+      yield* worker.drain();
 
-        const projection = yield* orchestrator.getThreadProjection(threadId);
-        assert.deepEqual(steered, ["queued"]);
-        assert.deepEqual(projection.thread.modelSelection, composerSelection);
-      }).pipe(Effect.provide(layer));
-    }),
-  ),
+      const projection = yield* orchestrator.getThreadProjection(threadId);
+      assert.deepEqual(steered, ["queued"]);
+      assert.deepEqual(projection.thread.modelSelection, composerSelection);
+    }).pipe(Effect.provide(layer));
+  }),
 );
 
 it.effect("marks the model switch on a promoted message that restarts the turn", () =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      const { started, layer, startFirstTurn } = yield* nextTurnSelectionHarness(
-        "promote-restart-switch",
-        true,
-        false,
+  Effect.gen(function* () {
+    const { started, layer, startFirstTurn } = yield* nextTurnSelectionHarness(
+      "promote-restart-switch",
+      true,
+      false,
+    );
+    const otherSelection = { ...runSelection, model: "other-model" };
+    yield* Effect.gen(function* () {
+      const orchestrator = yield* Orchestrator.OrchestratorV2;
+      const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
+      const threadId = yield* startFirstTurn;
+      yield* orchestrator.dispatch({
+        type: "message.dispatch",
+        commandId: CommandId.make("queued"),
+        threadId,
+        messageId: MessageId.make("message:queued"),
+        text: "queued",
+        attachments: [],
+        modelSelection: otherSelection,
+        dispatchMode: { type: "queue_after_active" },
+        createdBy: "user",
+        creationSource: "web",
+      });
+      const queuedRun = (yield* orchestrator.getThreadProjection(threadId)).runs.find(
+        (run) => run.status === "queued",
+      )!;
+      yield* orchestrator.dispatch({
+        type: "queued-message.promote-to-steer",
+        commandId: CommandId.make("promote"),
+        threadId,
+        queuedRunId: queuedRun.id,
+        targetRunId: started[0]!.runId,
+      });
+      yield* worker.drain();
+
+      const promoted = (yield* orchestrator.getThreadProjection(threadId)).turnItems.find(
+        (item) => item.type === "user_message" && item.messageId === "message:queued",
       );
-      const otherSelection = { ...runSelection, model: "other-model" };
-      yield* Effect.gen(function* () {
-        const orchestrator = yield* Orchestrator.OrchestratorV2;
-        const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
-        const threadId = yield* startFirstTurn;
-        yield* orchestrator.dispatch({
-          type: "message.dispatch",
-          commandId: CommandId.make("queued"),
-          threadId,
-          messageId: MessageId.make("message:queued"),
-          text: "queued",
-          attachments: [],
-          modelSelection: otherSelection,
-          dispatchMode: { type: "queue_after_active" },
-          createdBy: "user",
-          creationSource: "web",
-        });
-        const queuedRun = (yield* orchestrator.getThreadProjection(threadId)).runs.find(
-          (run) => run.status === "queued",
-        )!;
-        yield* orchestrator.dispatch({
+      assert.deepEqual(promoted?.type === "user_message" ? promoted.modelSwitch : undefined, {
+        from: runSelection,
+        to: otherSelection,
+      });
+    }).pipe(Effect.provide(layer));
+  }),
+);
+
+it.effect("keeps a queued message queued when promoted into a run that Stop reached", () =>
+  Effect.gen(function* () {
+    const { started, steered, layer, startFirstTurn } =
+      yield* nextTurnSelectionHarness("steering-after-stop");
+    yield* Effect.gen(function* () {
+      const orchestrator = yield* Orchestrator.OrchestratorV2;
+      const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
+      const threadId = yield* startFirstTurn;
+      const first = started[0]!;
+      yield* orchestrator.dispatch({
+        type: "message.dispatch",
+        commandId: CommandId.make("queued"),
+        threadId,
+        messageId: MessageId.make("message:queued"),
+        text: "queued",
+        attachments: [],
+        modelSelection: runSelection,
+        dispatchMode: { type: "queue_after_active" },
+        createdBy: "user",
+        creationSource: "web",
+      });
+      const queuedRun = (yield* orchestrator.getThreadProjection(threadId)).runs.find(
+        (run) => run.status === "queued",
+      )!;
+      // The worker has not delivered the interrupt yet, so the run still reads as running.
+      yield* orchestrator.dispatch({
+        type: "run.interrupt",
+        commandId: CommandId.make("stop"),
+        threadId,
+        runId: first.runId,
+        holdQueue: true,
+      });
+
+      const promoteError = yield* orchestrator
+        .dispatch({
           type: "queued-message.promote-to-steer",
           commandId: CommandId.make("promote"),
           threadId,
           queuedRunId: queuedRun.id,
-          targetRunId: started[0]!.runId,
-        });
-        yield* worker.drain();
+          targetRunId: first.runId,
+        })
+        .pipe(Effect.flip);
+      yield* worker.drain();
 
-        const promoted = (yield* orchestrator.getThreadProjection(threadId)).turnItems.find(
-          (item) => item.type === "user_message" && item.messageId === "message:queued",
-        );
-        assert.deepEqual(promoted?.type === "user_message" ? promoted.modelSwitch : undefined, {
-          from: runSelection,
-          to: otherSelection,
-        });
-      }).pipe(Effect.provide(layer));
-    }),
-  ),
+      const projection = yield* orchestrator.getThreadProjection(threadId);
+      assert.equal(promoteError._tag, "OrchestratorDispatchError");
+      assert.deepEqual(steered, []);
+      const queued = projection.runs.find((run) => run.id === queuedRun.id);
+      assert.equal(queued?.status, "queued");
+      assert.isTrue(queued?.queueHeld);
+    }).pipe(Effect.provide(layer));
+  }),
 );
 
-it.effect("keeps a queued message queued when promoted into a run that Stop reached", () =>
-  Effect.scoped(
+// regression: #32891 a restart that Stop already reached is lost
+it.effect.each([false, true])(
+  "refuses a steer after Stop (provider turn ready: %s)",
+  (providerTurnReady) =>
     Effect.gen(function* () {
       const { started, steered, layer, startFirstTurn } =
-        yield* nextTurnSelectionHarness("steering-after-stop");
+        yield* nextTurnSelectionHarness("restart-after-stop");
       yield* Effect.gen(function* () {
         const orchestrator = yield* Orchestrator.OrchestratorV2;
         const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
         const threadId = yield* startFirstTurn;
         const first = started[0]!;
-        yield* orchestrator.dispatch({
-          type: "message.dispatch",
-          commandId: CommandId.make("queued"),
-          threadId,
-          messageId: MessageId.make("message:queued"),
-          text: "queued",
-          attachments: [],
-          modelSelection: runSelection,
-          dispatchMode: { type: "queue_after_active" },
-          createdBy: "user",
-          creationSource: "web",
-        });
-        const queuedRun = (yield* orchestrator.getThreadProjection(threadId)).runs.find(
-          (run) => run.status === "queued",
-        )!;
         // The worker has not delivered the interrupt yet, so the run still reads as running.
         yield* orchestrator.dispatch({
           type: "run.interrupt",
           commandId: CommandId.make("stop"),
           threadId,
           runId: first.runId,
-          holdQueue: true,
         });
-
-        const promoteError = yield* orchestrator
-          .dispatch({
-            type: "queued-message.promote-to-steer",
-            commandId: CommandId.make("promote"),
-            threadId,
-            queuedRunId: queuedRun.id,
-            targetRunId: first.runId,
-          })
-          .pipe(Effect.flip);
-        yield* worker.drain();
-
-        const projection = yield* orchestrator.getThreadProjection(threadId);
-        assert.equal(promoteError._tag, "OrchestratorDispatchError");
-        assert.deepEqual(steered, []);
-        const queued = projection.runs.find((run) => run.id === queuedRun.id);
-        assert.equal(queued?.status, "queued");
-        assert.isTrue(queued?.queueHeld);
-      }).pipe(Effect.provide(layer));
-    }),
-  ),
-);
-
-// regression: #32891 a restart that Stop already reached is lost
-it.effect.each([false, true])(
-  "refuses a steer after Stop (provider turn ready: %s)",
-  (providerTurnReady) =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const { started, steered, layer, startFirstTurn } =
-          yield* nextTurnSelectionHarness("restart-after-stop");
-        yield* Effect.gen(function* () {
-          const orchestrator = yield* Orchestrator.OrchestratorV2;
-          const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
-          const threadId = yield* startFirstTurn;
-          const first = started[0]!;
-          // The worker has not delivered the interrupt yet, so the run still reads as running.
-          yield* orchestrator.dispatch({
-            type: "run.interrupt",
-            commandId: CommandId.make("stop"),
-            threadId,
-            runId: first.runId,
+        const turn = (yield* orchestrator.getThreadProjection(threadId)).providerTurns[0]!;
+        if (!providerTurnReady) {
+          yield* (yield* EventSink.EventSinkV2).write({
+            events: [
+              {
+                id: EventId.make("turn-not-ready"),
+                type: "provider-turn.updated",
+                threadId,
+                occurredAt: yield* DateTime.now,
+                payload: { ...turn, status: "pending" },
+              },
+            ],
           });
-          const turn = (yield* orchestrator.getThreadProjection(threadId)).providerTurns[0]!;
-          if (!providerTurnReady) {
-            yield* (yield* EventSink.EventSinkV2).write({
-              events: [
-                {
-                  id: EventId.make("turn-not-ready"),
-                  type: "provider-turn.updated",
-                  threadId,
-                  occurredAt: yield* DateTime.now,
-                  payload: { ...turn, status: "pending" },
-                },
-              ],
-            });
-          }
-          const steerError = yield* orchestrator
-            .dispatch({
-              type: "message.dispatch",
-              commandId: CommandId.make("steer"),
-              threadId,
-              messageId: MessageId.make("message:steer"),
-              text: "steer",
-              attachments: [],
-              modelSelection: runSelection,
-              dispatchMode: { type: "steer_active", targetRunId: first.runId },
-              createdBy: "user",
-              creationSource: "web",
-            })
-            .pipe(Effect.flip);
-          assert.equal(steerError._tag, "OrchestratorDispatchError");
-          assert.include(String(steerError.cause), "is stopping and cannot be steered");
-          if (!providerTurnReady) {
-            yield* (yield* EventSink.EventSinkV2).write({
-              events: [
-                {
-                  id: EventId.make("restore-ready-turn"),
-                  type: "provider-turn.updated",
-                  threadId,
-                  occurredAt: yield* DateTime.now,
-                  payload: turn,
-                },
-              ],
-            });
-          }
-          yield* orchestrator.dispatch({
+        }
+        const steerError = yield* orchestrator
+          .dispatch({
             type: "message.dispatch",
-            commandId: CommandId.make("restart"),
+            commandId: CommandId.make("steer"),
             threadId,
-            messageId: MessageId.make("message:restart"),
-            text: "restart",
+            messageId: MessageId.make("message:steer"),
+            text: "steer",
             attachments: [],
             modelSelection: runSelection,
-            dispatchMode: { type: "restart_active", targetRunId: first.runId },
+            dispatchMode: { type: "steer_active", targetRunId: first.runId },
             createdBy: "user",
             creationSource: "web",
+          })
+          .pipe(Effect.flip);
+        assert.equal(steerError._tag, "OrchestratorDispatchError");
+        assert.include(String(steerError.cause), "is stopping and cannot be steered");
+        if (!providerTurnReady) {
+          yield* (yield* EventSink.EventSinkV2).write({
+            events: [
+              {
+                id: EventId.make("restore-ready-turn"),
+                type: "provider-turn.updated",
+                threadId,
+                occurredAt: yield* DateTime.now,
+                payload: turn,
+              },
+            ],
           });
-          yield* worker.drain();
+        }
+        yield* orchestrator.dispatch({
+          type: "message.dispatch",
+          commandId: CommandId.make("restart"),
+          threadId,
+          messageId: MessageId.make("message:restart"),
+          text: "restart",
+          attachments: [],
+          modelSelection: runSelection,
+          dispatchMode: { type: "restart_active", targetRunId: first.runId },
+          createdBy: "user",
+          creationSource: "web",
+        });
+        yield* worker.drain();
 
-          assert.deepEqual(steered, []);
-          assert.deepEqual(
-            started.map((turn) => turn.message.text),
-            ["first", "restart"],
-          );
-        }).pipe(Effect.provide(layer));
-      }),
-    ),
+        assert.deepEqual(steered, []);
+        assert.deepEqual(
+          started.map((turn) => turn.message.text),
+          ["first", "restart"],
+        );
+      }).pipe(Effect.provide(layer));
+    }),
 );
 
 // regression: #32891 a restart that arrives after the turn ended is lost
@@ -2362,112 +2349,14 @@ it.effect.each([
   { status: "completed", settled: true },
   { status: "completed", settled: false },
   { status: "interrupted", settled: true },
-  { status: "interrupted", settled: false },
-  { status: "cancelled", settled: false },
-] as const)(
-  "starts a restart that missed the turn ($status, run settled: $settled) as a new turn",
-  ({ status, settled: runSettled }) =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const { events, started, steered, layer, startFirstTurn } = yield* nextTurnSelectionHarness(
-          `restart-after-${status}-${runSettled ? "settled" : "unsettled"}`,
-        );
-        yield* Effect.gen(function* () {
-          const orchestrator = yield* Orchestrator.OrchestratorV2;
-          const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
-          const threadId = yield* startFirstTurn;
-          const first = started[0]!;
-          const turn = (yield* orchestrator.getThreadProjection(threadId)).providerTurns[0]!;
-          const turnEnded = yield* orchestrator.streamDomainEvents.pipe(
-            Stream.filter(
-              (event) =>
-                event.type === "provider-turn.updated" &&
-                event.payload.id === turn.id &&
-                event.payload.status === status,
-            ),
-            Stream.take(1),
-            Stream.runDrain,
-            Effect.forkScoped,
-          );
-          yield* Queue.offer(events, {
-            type: "provider_turn.updated",
-            driver,
-            providerTurn: { ...turn, status, completedAt: yield* DateTime.now },
-          });
-          yield* Fiber.join(turnEnded);
-          const settleRun = Effect.gen(function* () {
-            const settled = yield* orchestrator.streamDomainEvents.pipe(
-              Stream.filter(
-                (event) =>
-                  event.type === "run.updated" &&
-                  event.payload.id === first.runId &&
-                  event.payload.status !== "running",
-              ),
-              Stream.take(1),
-              Stream.runDrain,
-              Effect.forkScoped,
-            );
-            yield* Queue.offer(events, {
-              type: "turn.terminal",
-              driver,
-              providerThreadId: turn.providerThreadId,
-              providerTurnId: turn.id,
-              runOrdinal: first.runOrdinal,
-              status,
-              failure: null,
-              threadDisposition: "reusable",
-            });
-            yield* Fiber.join(settled);
-            yield* worker.drain();
-          });
-          if (runSettled) yield* settleRun;
-
-          yield* orchestrator.dispatch({
-            type: "message.dispatch",
-            commandId: CommandId.make("restart"),
-            threadId,
-            messageId: MessageId.make("message:restart"),
-            text: "restart",
-            attachments: [],
-            modelSelection: runSelection,
-            dispatchMode: { type: "restart_active", targetRunId: first.runId },
-            createdBy: "user",
-            creationSource: "web",
-          });
-          yield* worker.drain();
-          if (!runSettled) {
-            const restartLeftQueue = yield* orchestrator.streamDomainEvents.pipe(
-              Stream.filter(
-                (event) =>
-                  event.type === "run.updated" &&
-                  event.payload.userMessageId === "message:restart" &&
-                  event.payload.status !== "queued",
-              ),
-              Stream.take(1),
-              Stream.runDrain,
-              Effect.forkScoped,
-            );
-            yield* settleRun;
-            yield* Fiber.join(restartLeftQueue);
-            yield* worker.drain();
-          }
-
-          assert.deepEqual(steered, []);
-          assert.deepEqual(
-            started.map((turn) => turn.message.text),
-            ["first", "restart"],
-          );
-        }).pipe(Effect.provide(layer));
-      }),
-    ),
-);
-
-// regression: #32891 a restart into a failed provider turn is lost
-it.effect("queues a restart sent into a provider turn that failed before its run settled", () =>
-  Effect.scoped(
+  { status: "interrupted", settled: false },
+  { status: "cancelled", settled: false },
+] as const)(
+  "starts a restart that missed the turn ($status, run settled: $settled) as a new turn",
+  ({ status, settled: runSettled }) =>
     Effect.gen(function* () {
       const { events, started, steered, layer, startFirstTurn } = yield* nextTurnSelectionHarness(
-        "restart-after-failed-unsettled",
+        `restart-after-${status}-${runSettled ? "settled" : "unsettled"}`,
       );
       yield* Effect.gen(function* () {
         const orchestrator = yield* Orchestrator.OrchestratorV2;
@@ -2475,12 +2364,12 @@ it.effect("queues a restart sent into a provider turn that failed before its run
         const threadId = yield* startFirstTurn;
         const first = started[0]!;
         const turn = (yield* orchestrator.getThreadProjection(threadId)).providerTurns[0]!;
-        const turnFailed = yield* orchestrator.streamDomainEvents.pipe(
+        const turnEnded = yield* orchestrator.streamDomainEvents.pipe(
           Stream.filter(
             (event) =>
               event.type === "provider-turn.updated" &&
               event.payload.id === turn.id &&
-              event.payload.status === "failed",
+              event.payload.status === status,
           ),
           Stream.take(1),
           Stream.runDrain,
@@ -2489,9 +2378,35 @@ it.effect("queues a restart sent into a provider turn that failed before its run
         yield* Queue.offer(events, {
           type: "provider_turn.updated",
           driver,
-          providerTurn: { ...turn, status: "failed", completedAt: yield* DateTime.now },
+          providerTurn: { ...turn, status, completedAt: yield* DateTime.now },
+        });
+        yield* Fiber.join(turnEnded);
+        const settleRun = Effect.gen(function* () {
+          const settled = yield* orchestrator.streamDomainEvents.pipe(
+            Stream.filter(
+              (event) =>
+                event.type === "run.updated" &&
+                event.payload.id === first.runId &&
+                event.payload.status !== "running",
+            ),
+            Stream.take(1),
+            Stream.runDrain,
+            Effect.forkScoped,
+          );
+          yield* Queue.offer(events, {
+            type: "turn.terminal",
+            driver,
+            providerThreadId: turn.providerThreadId,
+            providerTurnId: turn.id,
+            runOrdinal: first.runOrdinal,
+            status,
+            failure: null,
+            threadDisposition: "reusable",
+          });
+          yield* Fiber.join(settled);
+          yield* worker.drain();
         });
-        yield* Fiber.join(turnFailed);
+        if (runSettled) yield* settleRun;
 
         yield* orchestrator.dispatch({
           type: "message.dispatch",
@@ -2506,84 +2421,150 @@ it.effect("queues a restart sent into a provider turn that failed before its run
           creationSource: "web",
         });
         yield* worker.drain();
+        if (!runSettled) {
+          const restartLeftQueue = yield* orchestrator.streamDomainEvents.pipe(
+            Stream.filter(
+              (event) =>
+                event.type === "run.updated" &&
+                event.payload.userMessageId === "message:restart" &&
+                event.payload.status !== "queued",
+            ),
+            Stream.take(1),
+            Stream.runDrain,
+            Effect.forkScoped,
+          );
+          yield* settleRun;
+          yield* Fiber.join(restartLeftQueue);
+          yield* worker.drain();
+        }
 
         assert.deepEqual(steered, []);
-        const projection = yield* orchestrator.getThreadProjection(threadId);
-        assert.equal(
-          projection.runs.find((run) => run.userMessageId === "message:restart")?.status,
-          "queued",
+        assert.deepEqual(
+          started.map((turn) => turn.message.text),
+          ["first", "restart"],
         );
       }).pipe(Effect.provide(layer));
     }),
-  ),
 );
 
-it.effect("queues a plain send behind the stopped queue and releases its hold", () =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      const interruptReached = yield* Deferred.make<void>();
-      const releaseInterrupt = yield* Deferred.make<void>();
-      const { started, steered, layer, startFirstTurn } = yield* nextTurnSelectionHarness(
-        "plain-send-after-stop",
-        false,
-        true,
-        Deferred.succeed(interruptReached, undefined).pipe(
-          Effect.andThen(Deferred.await(releaseInterrupt)),
+// regression: #32891 a restart into a failed provider turn is lost
+it.effect("queues a restart sent into a provider turn that failed before its run settled", () =>
+  Effect.gen(function* () {
+    const { events, started, steered, layer, startFirstTurn } = yield* nextTurnSelectionHarness(
+      "restart-after-failed-unsettled",
+    );
+    yield* Effect.gen(function* () {
+      const orchestrator = yield* Orchestrator.OrchestratorV2;
+      const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
+      const threadId = yield* startFirstTurn;
+      const first = started[0]!;
+      const turn = (yield* orchestrator.getThreadProjection(threadId)).providerTurns[0]!;
+      const turnFailed = yield* orchestrator.streamDomainEvents.pipe(
+        Stream.filter(
+          (event) =>
+            event.type === "provider-turn.updated" &&
+            event.payload.id === turn.id &&
+            event.payload.status === "failed",
         ),
+        Stream.take(1),
+        Stream.runDrain,
+        Effect.forkScoped,
       );
-      yield* Effect.gen(function* () {
-        const orchestrator = yield* Orchestrator.OrchestratorV2;
-        const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
-        const threadId = yield* startFirstTurn;
-        const send = (id: string, delivery: "queue" | "auto") =>
-          orchestrator.dispatch({
-            type: "message.dispatch",
-            commandId: CommandId.make(id),
-            threadId,
-            messageId: MessageId.make(`message:${id}`),
-            text: id,
-            attachments: [],
-            modelSelection: runSelection,
-            ...(delivery === "queue"
-              ? { dispatchMode: { type: "queue_after_active" } }
-              : { dispatchMode: { type: "start_immediately" }, deliveryIntent: "auto" }),
-            createdBy: "user",
-            creationSource: "web",
-          });
-        yield* send("queued", "queue");
-        yield* orchestrator.dispatch({
-          type: "run.interrupt",
-          commandId: CommandId.make("stop"),
+      yield* Queue.offer(events, {
+        type: "provider_turn.updated",
+        driver,
+        providerTurn: { ...turn, status: "failed", completedAt: yield* DateTime.now },
+      });
+      yield* Fiber.join(turnFailed);
+
+      yield* orchestrator.dispatch({
+        type: "message.dispatch",
+        commandId: CommandId.make("restart"),
+        threadId,
+        messageId: MessageId.make("message:restart"),
+        text: "restart",
+        attachments: [],
+        modelSelection: runSelection,
+        dispatchMode: { type: "restart_active", targetRunId: first.runId },
+        createdBy: "user",
+        creationSource: "web",
+      });
+      yield* worker.drain();
+
+      assert.deepEqual(steered, []);
+      const projection = yield* orchestrator.getThreadProjection(threadId);
+      assert.equal(
+        projection.runs.find((run) => run.userMessageId === "message:restart")?.status,
+        "queued",
+      );
+    }).pipe(Effect.provide(layer));
+  }),
+);
+
+it.effect("queues a plain send behind the stopped queue and releases its hold", () =>
+  Effect.gen(function* () {
+    const interruptReached = yield* Deferred.make<void>();
+    const releaseInterrupt = yield* Deferred.make<void>();
+    const { started, steered, layer, startFirstTurn } = yield* nextTurnSelectionHarness(
+      "plain-send-after-stop",
+      false,
+      true,
+      Deferred.succeed(interruptReached, undefined).pipe(
+        Effect.andThen(Deferred.await(releaseInterrupt)),
+      ),
+    );
+    yield* Effect.gen(function* () {
+      const orchestrator = yield* Orchestrator.OrchestratorV2;
+      const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
+      const threadId = yield* startFirstTurn;
+      const send = (id: string, delivery: "queue" | "auto") =>
+        orchestrator.dispatch({
+          type: "message.dispatch",
+          commandId: CommandId.make(id),
           threadId,
-          runId: started[0]!.runId,
-          holdQueue: true,
+          messageId: MessageId.make(`message:${id}`),
+          text: id,
+          attachments: [],
+          modelSelection: runSelection,
+          ...(delivery === "queue"
+            ? { dispatchMode: { type: "queue_after_active" } }
+            : { dispatchMode: { type: "start_immediately" }, deliveryIntent: "auto" }),
+          createdBy: "user",
+          creationSource: "web",
         });
-        // The provider has not stopped yet, so a plain send still resolves to a steer.
-        yield* send("sent", "auto");
-        // Once the stop settles, the run-update reactor promotes the queue on
-        // its own fiber, so read the queue while the provider is still stopping.
-        const draining = yield* worker.drain().pipe(Effect.forkScoped);
-        yield* Deferred.await(interruptReached);
-
-        const projection = yield* orchestrator.getThreadProjection(threadId);
-        assert.equal(started.length, 1);
-        const queued = projection.runs
-          .filter((run) => run.status === "queued")
-          .sort((left, right) => (left.queuePosition ?? 0) - (right.queuePosition ?? 0));
-        assert.deepEqual(
-          queued.map(
-            (run) => projection.messages.find((message) => message.id === run.userMessageId)?.text,
-          ),
-          ["queued", "sent"],
-        );
-        // The user sent it, so the queue they stopped runs again once the provider stops.
-        assert.isFalse(queued.some((run) => run.queueHeld === true));
-        yield* Deferred.succeed(releaseInterrupt, undefined);
-        yield* Fiber.join(draining);
-        assert.deepEqual(steered, []);
-      }).pipe(Effect.provide(layer));
-    }),
-  ),
+      yield* send("queued", "queue");
+      yield* orchestrator.dispatch({
+        type: "run.interrupt",
+        commandId: CommandId.make("stop"),
+        threadId,
+        runId: started[0]!.runId,
+        holdQueue: true,
+      });
+      // The provider has not stopped yet, so a plain send still resolves to a steer.
+      yield* send("sent", "auto");
+      // Once the stop settles, the run-update reactor promotes the queue on
+      // its own fiber, so read the queue while the provider is still stopping.
+      const draining = yield* worker.drain().pipe(Effect.forkScoped);
+      yield* Deferred.await(interruptReached);
+
+      const projection = yield* orchestrator.getThreadProjection(threadId);
+      assert.equal(started.length, 1);
+      const queued = projection.runs
+        .filter((run) => run.status === "queued")
+        .sort((left, right) => (left.queuePosition ?? 0) - (right.queuePosition ?? 0));
+      assert.deepEqual(
+        queued.map(
+          (run) => projection.messages.find((message) => message.id === run.userMessageId)?.text,
+        ),
+        ["queued", "sent"],
+      );
+      // The user sent it, so the queue they stopped runs again once the provider stops.
+      assert.isFalse(queued.some((run) => run.queueHeld === true));
+      yield* Deferred.succeed(releaseInterrupt, undefined);
+      yield* Fiber.join(draining);
+      assert.deepEqual(steered, []);
+    }).pipe(Effect.provide(layer));
+  }),
 );
 
 const goalHarness = Effect.fn("goalHarness")(function* (name: string, nativeGoals?: boolean) {
@@ -2637,507 +2618,294 @@ const goalHarness = Effect.fn("goalHarness")(function* (name: string, nativeGoal
 it.effect.each([undefined, false, true])(
   "goal dispatch stops the active turn only with native support: %s",
   (nativeGoals) =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const { steered, layer, startFirstTurn, send, read } = yield* goalHarness(
-          "goal-steer",
-          nativeGoals,
-        );
-        yield* Effect.gen(function* () {
-          const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
-          const threadId = yield* startFirstTurn;
-          yield* send("queued", "queued", "queue");
-          const sending = send("goal", "/goal all tests pass", "auto");
-          if (nativeGoals === false) {
-            yield* Effect.flip(sending);
-          } else yield* sending;
-          yield* worker.drain();
-
-          assert.deepEqual(steered, []);
-          assert.deepEqual(yield* read(threadId), {
-            queue: ["queued"],
-            started: nativeGoals === false ? ["first"] : ["first", "/goal all tests pass"],
-            stopRequested: nativeGoals !== false,
-          });
-        }).pipe(Effect.provide(layer));
-      }),
-    ),
-);
-
-it.effect("starts a goal that names no model on the thread's model ahead of a queued pick", () =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      const { started, layer, startFirstTurn, read } = yield* goalHarness("goal-ahead-of-pick");
-      yield* Effect.gen(function* () {
-        const orchestrator = yield* Orchestrator.OrchestratorV2;
-        const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
-        const threadId = yield* startFirstTurn;
-        for (const [id, text, modelSelection] of [
-          ["picked", "picked", composerSelection],
-          ["goal", "/goal all tests pass", undefined],
-        ] as const) {
-          yield* orchestrator.dispatch({
-            type: "message.dispatch",
-            commandId: CommandId.make(id),
-            threadId,
-            messageId: MessageId.make(`message:${id}`),
-            text,
-            attachments: [],
-            ...(modelSelection === undefined ? {} : { modelSelection }),
-            dispatchMode:
-              id === "picked" ? { type: "queue_after_active" } : { type: "start_immediately" },
-            ...(id === "picked" ? {} : { deliveryIntent: "auto" as const }),
-            createdBy: "user",
-            creationSource: "web",
-          });
-        }
-        yield* worker.drain();
-
-        assert.deepEqual(yield* read(threadId), {
-          queue: ["picked"],
-          started: ["first", "/goal all tests pass"],
-          stopRequested: true,
-        });
-        assert.deepEqual(started[1]?.modelSelection, runSelection);
-      }).pipe(Effect.provide(layer));
-    }),
-  ),
-);
-
-it.effect("restarts by stopping the running turn when the provider cannot interrupt-restart", () =>
-  Effect.scoped(
     Effect.gen(function* () {
-      const { started, steered, layer, startFirstTurn, send, read } = yield* goalHarness(
-        "restart-without-interrupt-restart",
+      const { steered, layer, startFirstTurn, send, read } = yield* goalHarness(
+        "goal-steer",
+        nativeGoals,
       );
       yield* Effect.gen(function* () {
-        const orchestrator = yield* Orchestrator.OrchestratorV2;
         const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
         const threadId = yield* startFirstTurn;
         yield* send("queued", "queued", "queue");
-        yield* orchestrator.dispatch({
-          type: "message.dispatch",
-          commandId: CommandId.make("restart"),
-          threadId,
-          messageId: MessageId.make("message:restart"),
-          text: "do this instead",
-          attachments: [],
-          modelSelection: runSelection,
-          dispatchMode: { type: "restart_active", targetRunId: started[0]!.runId },
-          createdBy: "agent",
-          creationSource: "server",
-        });
+        const sending = send("goal", "/goal all tests pass", "auto");
+        if (nativeGoals === false) {
+          yield* Effect.flip(sending);
+        } else yield* sending;
         yield* worker.drain();
 
         assert.deepEqual(steered, []);
         assert.deepEqual(yield* read(threadId), {
           queue: ["queued"],
-          started: ["first", "do this instead"],
-          stopRequested: true,
+          started: nativeGoals === false ? ["first"] : ["first", "/goal all tests pass"],
+          stopRequested: nativeGoals !== false,
         });
       }).pipe(Effect.provide(layer));
     }),
-  ),
 );
 
-it.effect("starts a restart that stops the running turn ahead of an older held queue", () =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      const { started, layer, startFirstTurn, send, read } =
-        yield* goalHarness("restart-past-held-queue");
-      yield* Effect.gen(function* () {
-        const orchestrator = yield* Orchestrator.OrchestratorV2;
-        const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
-        const threadId = yield* startFirstTurn;
-        yield* send("queued", "queued", "queue");
-        yield* orchestrator.dispatch({
-          type: "thread.stop",
-          commandId: CommandId.make("stop"),
-          threadId,
-        });
-        yield* worker.drain();
-        const secondRunning = yield* orchestrator.streamDomainEvents.pipe(
-          Stream.filter(
-            (event) => event.type === "provider-turn.updated" && event.payload.status === "running",
-          ),
-          Stream.take(1),
-          Stream.runDrain,
-          Effect.forkScoped,
-        );
-        yield* orchestrator.dispatch({
-          type: "message.dispatch",
-          commandId: CommandId.make("second"),
-          threadId,
-          messageId: MessageId.make("message:second"),
-          text: "second",
-          attachments: [],
-          dispatchMode: { type: "start_immediately" },
-          createdBy: "agent",
-          creationSource: "mcp",
-        });
-        yield* worker.drain();
-        yield* Fiber.join(secondRunning);
+it.effect("starts a goal that names no model on the thread's model ahead of a queued pick", () =>
+  Effect.gen(function* () {
+    const { started, layer, startFirstTurn, read } = yield* goalHarness("goal-ahead-of-pick");
+    yield* Effect.gen(function* () {
+      const orchestrator = yield* Orchestrator.OrchestratorV2;
+      const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
+      const threadId = yield* startFirstTurn;
+      for (const [id, text, modelSelection] of [
+        ["picked", "picked", composerSelection],
+        ["goal", "/goal all tests pass", undefined],
+      ] as const) {
         yield* orchestrator.dispatch({
           type: "message.dispatch",
-          commandId: CommandId.make("restart"),
+          commandId: CommandId.make(id),
           threadId,
-          messageId: MessageId.make("message:restart"),
-          text: "do this instead",
+          messageId: MessageId.make(`message:${id}`),
+          text,
           attachments: [],
-          dispatchMode: { type: "restart_active", targetRunId: started[1]!.runId },
-          createdBy: "agent",
-          creationSource: "mcp",
+          ...(modelSelection === undefined ? {} : { modelSelection }),
+          dispatchMode:
+            id === "picked" ? { type: "queue_after_active" } : { type: "start_immediately" },
+          ...(id === "picked" ? {} : { deliveryIntent: "auto" as const }),
+          createdBy: "user",
+          creationSource: "web",
         });
-        yield* worker.drain();
+      }
+      yield* worker.drain();
 
-        const { queue, started: startedTexts } = yield* read(threadId);
-        assert.deepEqual(
-          { queue, started: startedTexts },
-          { queue: ["queued"], started: ["first", "second", "do this instead"] },
-        );
-      }).pipe(Effect.provide(layer));
-    }),
-  ),
+      assert.deepEqual(yield* read(threadId), {
+        queue: ["picked"],
+        started: ["first", "/goal all tests pass"],
+        stopRequested: true,
+      });
+      assert.deepEqual(started[1]?.modelSelection, runSelection);
+    }).pipe(Effect.provide(layer));
+  }),
 );
 
-it.effect("reports a restart that stops the running turn as restarted", () =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      const { started, layer, startFirstTurn } = yield* goalHarness("restart-send-delivery");
-      yield* Effect.gen(function* () {
-        const orchestrator = yield* Orchestrator.OrchestratorV2;
-        const threadManagement = yield* ThreadManagementService.ThreadManagementService;
-        const threadId = yield* startFirstTurn;
-        const input = {
-          projectId: ProjectId.make("project:restart-send-delivery"),
-          commandId: CommandId.make("restart"),
-          threadId,
-          messageId: MessageId.make("message:restart"),
-          text: "do this instead",
-          attachments: [],
-          mode: "restart",
-          createdBy: "agent",
-          creationSource: "mcp",
-        } as const;
-        const sent = yield* threadManagement.sendToThread(input);
-        // Stop holds the replacement before it starts; a replay must still report the restart.
-        yield* orchestrator.dispatch({
-          type: "thread.stop",
-          commandId: CommandId.make("stop-after-restart"),
-          threadId,
-        });
-        const replayed = yield* threadManagement.sendToThread(input);
+it.effect("restarts by stopping the running turn when the provider cannot interrupt-restart", () =>
+  Effect.gen(function* () {
+    const { started, steered, layer, startFirstTurn, send, read } = yield* goalHarness(
+      "restart-without-interrupt-restart",
+    );
+    yield* Effect.gen(function* () {
+      const orchestrator = yield* Orchestrator.OrchestratorV2;
+      const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
+      const threadId = yield* startFirstTurn;
+      yield* send("queued", "queued", "queue");
+      yield* orchestrator.dispatch({
+        type: "message.dispatch",
+        commandId: CommandId.make("restart"),
+        threadId,
+        messageId: MessageId.make("message:restart"),
+        text: "do this instead",
+        attachments: [],
+        modelSelection: runSelection,
+        dispatchMode: { type: "restart_active", targetRunId: started[0]!.runId },
+        createdBy: "agent",
+        creationSource: "server",
+      });
+      yield* worker.drain();
 
-        assert.equal(started.length, 1);
-        assert.deepEqual([sent.delivery, replayed.delivery], ["restarted", "restarted"]);
-      }).pipe(
-        Effect.provide(
-          ThreadManagementService.layer.pipe(
-            Layer.provideMerge(layer),
-            Layer.provide(ServerSettings.layerTest()),
-            Layer.provide(
-              CommandReceiptStore.layer.pipe(Layer.provide(SqlitePersistence.layerMemory)),
-            ),
+      assert.deepEqual(steered, []);
+      assert.deepEqual(yield* read(threadId), {
+        queue: ["queued"],
+        started: ["first", "do this instead"],
+        stopRequested: true,
+      });
+    }).pipe(Effect.provide(layer));
+  }),
+);
+
+it.effect("starts a restart that stops the running turn ahead of an older held queue", () =>
+  Effect.gen(function* () {
+    const { started, layer, startFirstTurn, send, read } =
+      yield* goalHarness("restart-past-held-queue");
+    yield* Effect.gen(function* () {
+      const orchestrator = yield* Orchestrator.OrchestratorV2;
+      const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
+      const threadId = yield* startFirstTurn;
+      yield* send("queued", "queued", "queue");
+      yield* orchestrator.dispatch({
+        type: "thread.stop",
+        commandId: CommandId.make("stop"),
+        threadId,
+      });
+      yield* worker.drain();
+      const secondRunning = yield* orchestrator.streamDomainEvents.pipe(
+        Stream.filter(
+          (event) => event.type === "provider-turn.updated" && event.payload.status === "running",
+        ),
+        Stream.take(1),
+        Stream.runDrain,
+        Effect.forkScoped,
+      );
+      yield* orchestrator.dispatch({
+        type: "message.dispatch",
+        commandId: CommandId.make("second"),
+        threadId,
+        messageId: MessageId.make("message:second"),
+        text: "second",
+        attachments: [],
+        dispatchMode: { type: "start_immediately" },
+        createdBy: "agent",
+        creationSource: "mcp",
+      });
+      yield* worker.drain();
+      yield* Fiber.join(secondRunning);
+      yield* orchestrator.dispatch({
+        type: "message.dispatch",
+        commandId: CommandId.make("restart"),
+        threadId,
+        messageId: MessageId.make("message:restart"),
+        text: "do this instead",
+        attachments: [],
+        dispatchMode: { type: "restart_active", targetRunId: started[1]!.runId },
+        createdBy: "agent",
+        creationSource: "mcp",
+      });
+      yield* worker.drain();
+
+      const { queue, started: startedTexts } = yield* read(threadId);
+      assert.deepEqual(
+        { queue, started: startedTexts },
+        { queue: ["queued"], started: ["first", "second", "do this instead"] },
+      );
+    }).pipe(Effect.provide(layer));
+  }),
+);
+
+it.effect("reports a restart that stops the running turn as restarted", () =>
+  Effect.gen(function* () {
+    const { started, layer, startFirstTurn } = yield* goalHarness("restart-send-delivery");
+    yield* Effect.gen(function* () {
+      const orchestrator = yield* Orchestrator.OrchestratorV2;
+      const threadManagement = yield* ThreadManagementService.ThreadManagementService;
+      const threadId = yield* startFirstTurn;
+      const input = {
+        projectId: ProjectId.make("project:restart-send-delivery"),
+        commandId: CommandId.make("restart"),
+        threadId,
+        messageId: MessageId.make("message:restart"),
+        text: "do this instead",
+        attachments: [],
+        mode: "restart",
+        createdBy: "agent",
+        creationSource: "mcp",
+      } as const;
+      const sent = yield* threadManagement.sendToThread(input);
+      // Stop holds the replacement before it starts; a replay must still report the restart.
+      yield* orchestrator.dispatch({
+        type: "thread.stop",
+        commandId: CommandId.make("stop-after-restart"),
+        threadId,
+      });
+      const replayed = yield* threadManagement.sendToThread(input);
+
+      assert.equal(started.length, 1);
+      assert.deepEqual([sent.delivery, replayed.delivery], ["restarted", "restarted"]);
+    }).pipe(
+      Effect.provide(
+        ThreadManagementService.layer.pipe(
+          Layer.provideMerge(layer),
+          Layer.provide(ServerSettings.layerTest()),
+          Layer.provide(
+            CommandReceiptStore.layer.pipe(Layer.provide(SqlitePersistence.layerMemory)),
           ),
         ),
-      );
-    }),
-  ),
+      ),
+    );
+  }),
 );
 
 it.effect("queues a goal clear without stopping work when no goal drives it", () =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      const { steered, layer, startFirstTurn, send, read } = yield* goalHarness("goal-clear");
-      yield* Effect.gen(function* () {
-        const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
-        const threadId = yield* startFirstTurn;
-        yield* send("queued", "queued", "queue");
-        yield* send("clear", "/goal clear", "auto");
-        yield* worker.drain();
+  Effect.gen(function* () {
+    const { steered, layer, startFirstTurn, send, read } = yield* goalHarness("goal-clear");
+    yield* Effect.gen(function* () {
+      const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
+      const threadId = yield* startFirstTurn;
+      yield* send("queued", "queued", "queue");
+      yield* send("clear", "/goal clear", "auto");
+      yield* worker.drain();
 
-        assert.deepEqual(steered, []);
-        assert.deepEqual(yield* read(threadId), {
-          queue: ["queued", "/goal clear"],
-          started: ["first"],
-          stopRequested: false,
-        });
-      }).pipe(Effect.provide(layer));
-    }),
-  ),
+      assert.deepEqual(steered, []);
+      assert.deepEqual(yield* read(threadId), {
+        queue: ["queued", "/goal clear"],
+        started: ["first"],
+        stopRequested: false,
+      });
+    }).pipe(Effect.provide(layer));
+  }),
 );
 
 it.effect("promotes a queued goal by stopping the running turn", () =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      const { started, steered, layer, startFirstTurn, send, read } =
-        yield* goalHarness("goal-promote");
-      yield* Effect.gen(function* () {
-        const orchestrator = yield* Orchestrator.OrchestratorV2;
-        const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
-        const threadId = yield* startFirstTurn;
-        yield* send("queued", "queued", "queue");
-        yield* send("goal", "/goal ship it", "queue");
-        const goalRun = (yield* orchestrator.getThreadProjection(threadId)).runs.find(
-          (run) => run.userMessageId === MessageId.make("message:goal"),
-        )!;
-        yield* orchestrator.dispatch({
-          type: "queued-message.promote-to-steer",
-          commandId: CommandId.make("promote"),
-          threadId,
-          queuedRunId: goalRun.id,
-          targetRunId: started[0]!.runId,
-        });
-        yield* worker.drain();
+  Effect.gen(function* () {
+    const { started, steered, layer, startFirstTurn, send, read } =
+      yield* goalHarness("goal-promote");
+    yield* Effect.gen(function* () {
+      const orchestrator = yield* Orchestrator.OrchestratorV2;
+      const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
+      const threadId = yield* startFirstTurn;
+      yield* send("queued", "queued", "queue");
+      yield* send("goal", "/goal ship it", "queue");
+      const goalRun = (yield* orchestrator.getThreadProjection(threadId)).runs.find(
+        (run) => run.userMessageId === MessageId.make("message:goal"),
+      )!;
+      yield* orchestrator.dispatch({
+        type: "queued-message.promote-to-steer",
+        commandId: CommandId.make("promote"),
+        threadId,
+        queuedRunId: goalRun.id,
+        targetRunId: started[0]!.runId,
+      });
+      yield* worker.drain();
 
-        assert.deepEqual(steered, []);
-        assert.deepEqual(yield* read(threadId), {
-          queue: ["queued"],
-          started: ["first", "/goal ship it"],
-          stopRequested: true,
-        });
-      }).pipe(Effect.provide(layer));
-    }),
-  ),
+      assert.deepEqual(steered, []);
+      assert.deepEqual(yield* read(threadId), {
+        queue: ["queued"],
+        started: ["first", "/goal ship it"],
+        stopRequested: true,
+      });
+    }).pipe(Effect.provide(layer));
+  }),
 );
 
 // A fresh message skips compaction as its own turn, which steering a running turn would not.
 it.effect.each(["next", "/goal ship it", "fresh next"])(
   "promoting %s into a compaction stops it and sends it next",
   (promoted) =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const { events, layer, send, read, started, steered, startFirstTurn } = yield* goalHarness(
-          `compaction-promote-${promoted.length}`,
-        );
-        yield* Effect.gen(function* () {
-          const orchestrator = yield* Orchestrator.OrchestratorV2;
-          const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
-          const threadId = yield* startFirstTurn;
-          yield* send("compact", "/compact", "queue");
-          yield* send("queued", "queued", "queue");
-          yield* send("next", promoted, "queue", promoted.startsWith("fresh"));
-          const settled = yield* orchestrator.streamDomainEvents.pipe(
-            Stream.filter(
-              (event) =>
-                event.type === "run.updated" &&
-                event.payload.id === started[0]!.runId &&
-                event.payload.status === "waiting",
-            ),
-            Stream.take(1),
-            Stream.runDrain,
-            Effect.forkScoped,
-          );
-          const compacting = yield* orchestrator.streamDomainEvents.pipe(
-            Stream.filter(
-              (event) =>
-                event.type === "provider-turn.updated" &&
-                event.payload.status === "running" &&
-                event.payload.runAttemptId !== started[0]!.attemptId,
-            ),
-            Stream.take(1),
-            Stream.runDrain,
-            Effect.forkScoped,
-          );
-          const turn = (yield* orchestrator.getThreadProjection(threadId)).providerTurns[0]!;
-          yield* Queue.offer(events, {
-            type: "provider_turn.updated",
-            driver,
-            providerTurn: { ...turn, status: "completed", completedAt: yield* DateTime.now },
-          });
-          yield* Queue.offer(events, {
-            type: "turn.terminal",
-            driver,
-            providerThreadId: turn.providerThreadId,
-            providerTurnId: turn.id,
-            runOrdinal: started[0]!.runOrdinal,
-            status: "completed",
-            failure: null,
-            threadDisposition: "reusable",
-          });
-          yield* Fiber.join(settled);
-          yield* worker.drain();
-          yield* orchestrator.resumeQueuedRuns;
-          yield* worker.drain();
-          yield* Fiber.join(compacting);
-          const compactRun = (yield* orchestrator.getThreadProjection(threadId)).runs.find(
-            (run) => run.userMessageId === MessageId.make("message:compact"),
-          )!;
-          const nextRun = (yield* orchestrator.getThreadProjection(threadId)).runs.find(
-            (run) => run.userMessageId === MessageId.make("message:next"),
-          )!;
-          yield* orchestrator.dispatch({
-            type: "queued-message.promote-to-steer",
-            commandId: CommandId.make("promote"),
-            threadId,
-            queuedRunId: nextRun.id,
-            targetRunId: compactRun.id,
-          });
-          yield* worker.drain();
-
-          const projection = yield* orchestrator.getThreadProjection(threadId);
-          assert.deepEqual(steered, []);
-          assert.isTrue(
-            projection.turnItems.some(
-              (item) => item.type === "run_interrupt_request" && item.runId === compactRun.id,
-            ),
-          );
-          assert.deepEqual((yield* read(threadId)).queue, ["queued"]);
-          assert.deepEqual(
-            started.map((turn) => turn.message.text),
-            ["first", "/compact", promoted],
-          );
-        }).pipe(Effect.provide(layer));
-      }),
-    ),
-);
-
-it.effect("stops a turn that is still starting when a goal is sent into it", () =>
-  Effect.scoped(
     Effect.gen(function* () {
-      const { cwd, layer, send, started } = yield* goalHarness("goal-during-start");
+      const { events, layer, send, read, started, steered, startFirstTurn } = yield* goalHarness(
+        `compaction-promote-${promoted.length}`,
+      );
       yield* Effect.gen(function* () {
         const orchestrator = yield* Orchestrator.OrchestratorV2;
         const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
-        const threadId = ThreadId.make("thread:goal-during-start");
-        yield* orchestrator.dispatch({
-          type: "thread.create",
-          commandId: CommandId.make("create"),
-          threadId,
-          projectId: ProjectId.make("project:goal-during-start"),
-          title: "Goal during start",
-          modelSelection: runSelection,
-          runtimeMode: "full-access",
-          interactionMode: "default",
-          branch: null,
-          worktreePath: cwd,
-          createdBy: "user",
-          creationSource: "web",
-        });
-        // The stopped run's end starts the queue, which then needs one more drain.
-        const goalStarting = yield* orchestrator.streamDomainEvents.pipe(
+        const threadId = yield* startFirstTurn;
+        yield* send("compact", "/compact", "queue");
+        yield* send("queued", "queued", "queue");
+        yield* send("next", promoted, "queue", promoted.startsWith("fresh"));
+        const settled = yield* orchestrator.streamDomainEvents.pipe(
           Stream.filter(
-            (event) => event.type === "run.updated" && event.payload.status === "starting",
+            (event) =>
+              event.type === "run.updated" &&
+              event.payload.id === started[0]!.runId &&
+              event.payload.status === "waiting",
           ),
           Stream.take(1),
           Stream.runDrain,
-          Effect.forkScoped({ startImmediately: true }),
-        );
-        yield* send("first", "first", "auto");
-        yield* send("goal", "/goal all tests pass", "auto");
-        yield* worker.drain();
-        yield* Fiber.join(goalStarting);
-        yield* worker.drain();
-
-        const projection = yield* orchestrator.getThreadProjection(threadId);
-        const statusOf = (text: string) =>
-          projection.runs.find(
-            (run) =>
-              projection.messages.find((message) => message.id === run.userMessageId)?.text ===
-              text,
-          )?.status;
-        assert.equal(statusOf("first"), "interrupted");
-        assert.deepEqual(
-          started.map((turn) => turn.message.text),
-          ["/goal all tests pass"],
+          Effect.forkScoped,
         );
-      }).pipe(Effect.provide(layer));
-    }),
-  ),
-);
-
-it.effect("stops the running turn when a goal clear ends the goal driving it", () =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      const { events, layer, startFirstTurn, send, read, steered } =
-        yield* goalHarness("goal-clear-active");
-      yield* Effect.gen(function* () {
-        const orchestrator = yield* Orchestrator.OrchestratorV2;
-        const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
-        const threadId = yield* startFirstTurn;
-        const providerThread = (yield* orchestrator.getThreadProjection(threadId))
-          .providerThreads[0]!;
-        const goalSeen = yield* orchestrator.streamDomainEvents.pipe(
+        const compacting = yield* orchestrator.streamDomainEvents.pipe(
           Stream.filter(
             (event) =>
-              event.type === "provider-thread.updated" && event.payload.goal?.status === "active",
+              event.type === "provider-turn.updated" &&
+              event.payload.status === "running" &&
+              event.payload.runAttemptId !== started[0]!.attemptId,
           ),
           Stream.take(1),
           Stream.runDrain,
-          Effect.forkScoped({ startImmediately: true }),
-        );
-        yield* Queue.offer(events, {
-          type: "provider_thread.updated",
-          driver,
-          providerThread: {
-            ...providerThread,
-            goal: { objective: "all tests pass", status: "active" },
-          },
-        });
-        yield* Fiber.join(goalSeen);
-        yield* send("clear", "/goal clear", "auto");
-        yield* worker.drain();
-
-        assert.deepEqual(steered, []);
-        assert.deepEqual(yield* read(threadId), {
-          queue: [],
-          started: ["first", "/goal clear"],
-          stopRequested: true,
-        });
-      }).pipe(Effect.provide(layer));
-    }),
-  ),
-);
-
-it.effect("a side chat that opens with /goal gets its context on the next question", () =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      const { events, layer, started, startFirstTurn } = yield* goalHarness("side-chat-goal");
-      yield* Effect.gen(function* () {
-        const orchestrator = yield* Orchestrator.OrchestratorV2;
-        const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
-        const parentId = yield* startFirstTurn;
-        const sideChatId = ThreadId.make("thread:side-chat-goal-child");
-        yield* orchestrator.dispatch({
-          type: "thread.fork",
-          commandId: CommandId.make("side-chat"),
-          sourceThreadId: parentId,
-          targetThreadId: sideChatId,
-          sourcePoint: { type: "latest_stable" },
-          sideChat: true,
-          createdBy: "user",
-          creationSource: "web",
-        });
-        const ask = (id: string, text: string) =>
-          orchestrator.dispatch({
-            type: "message.dispatch",
-            commandId: CommandId.make(id),
-            threadId: sideChatId,
-            messageId: MessageId.make(`message:${id}`),
-            text,
-            attachments: [],
-            modelSelection: runSelection,
-            dispatchMode: { type: "start_immediately" },
-            createdBy: "user",
-            creationSource: "web",
-          });
-        const sideChatEvent = (matches: (event: OrchestrationV2DomainEvent) => boolean) =>
-          orchestrator.streamDomainEvents.pipe(
-            Stream.filter((event) => event.threadId === sideChatId && matches(event)),
-            Stream.take(1),
-            Stream.runDrain,
-            Effect.forkScoped({ startImmediately: true }),
-          );
-        const running = yield* sideChatEvent(
-          (event) => event.type === "provider-turn.updated" && event.payload.status === "running",
-        );
-        const settled = yield* sideChatEvent(
-          (event) => event.type === "run.updated" && event.payload.status === "waiting",
+          Effect.forkScoped,
         );
-        yield* ask("goal", "/goal clear");
-        yield* worker.drain();
-        yield* Fiber.join(running);
-        const turn = (yield* orchestrator.getThreadProjection(sideChatId)).providerTurns[0]!;
+        const turn = (yield* orchestrator.getThreadProjection(threadId)).providerTurns[0]!;
         yield* Queue.offer(events, {
           type: "provider_turn.updated",
           driver,
@@ -3148,22 +2916,212 @@ it.effect("a side chat that opens with /goal gets its context on the next questi
           driver,
           providerThreadId: turn.providerThreadId,
           providerTurnId: turn.id,
-          runOrdinal: started[1]!.runOrdinal,
+          runOrdinal: started[0]!.runOrdinal,
           status: "completed",
           failure: null,
           threadDisposition: "reusable",
         });
         yield* Fiber.join(settled);
         yield* worker.drain();
-        yield* ask("question", "What is the main thread doing?");
+        yield* orchestrator.resumeQueuedRuns;
+        yield* worker.drain();
+        yield* Fiber.join(compacting);
+        const compactRun = (yield* orchestrator.getThreadProjection(threadId)).runs.find(
+          (run) => run.userMessageId === MessageId.make("message:compact"),
+        )!;
+        const nextRun = (yield* orchestrator.getThreadProjection(threadId)).runs.find(
+          (run) => run.userMessageId === MessageId.make("message:next"),
+        )!;
+        yield* orchestrator.dispatch({
+          type: "queued-message.promote-to-steer",
+          commandId: CommandId.make("promote"),
+          threadId,
+          queuedRunId: nextRun.id,
+          targetRunId: compactRun.id,
+        });
         yield* worker.drain();
 
-        const [first, goal, question] = started.map((turn) => turn.message.text);
-        assert.deepEqual([first, goal], ["first", "/goal clear"]);
-        assert.include(question, "You are in a side chat beside the main thread.");
-        assert.include(question, "- User: first");
-        assert.isTrue(question?.endsWith("What is the main thread doing?"));
+        const projection = yield* orchestrator.getThreadProjection(threadId);
+        assert.deepEqual(steered, []);
+        assert.isTrue(
+          projection.turnItems.some(
+            (item) => item.type === "run_interrupt_request" && item.runId === compactRun.id,
+          ),
+        );
+        assert.deepEqual((yield* read(threadId)).queue, ["queued"]);
+        assert.deepEqual(
+          started.map((turn) => turn.message.text),
+          ["first", "/compact", promoted],
+        );
       }).pipe(Effect.provide(layer));
     }),
-  ),
+);
+
+it.effect("stops a turn that is still starting when a goal is sent into it", () =>
+  Effect.gen(function* () {
+    const { cwd, layer, send, started } = yield* goalHarness("goal-during-start");
+    yield* Effect.gen(function* () {
+      const orchestrator = yield* Orchestrator.OrchestratorV2;
+      const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
+      const threadId = ThreadId.make("thread:goal-during-start");
+      yield* orchestrator.dispatch({
+        type: "thread.create",
+        commandId: CommandId.make("create"),
+        threadId,
+        projectId: ProjectId.make("project:goal-during-start"),
+        title: "Goal during start",
+        modelSelection: runSelection,
+        runtimeMode: "full-access",
+        interactionMode: "default",
+        branch: null,
+        worktreePath: cwd,
+        createdBy: "user",
+        creationSource: "web",
+      });
+      // The stopped run's end starts the queue, which then needs one more drain.
+      const goalStarting = yield* orchestrator.streamDomainEvents.pipe(
+        Stream.filter(
+          (event) => event.type === "run.updated" && event.payload.status === "starting",
+        ),
+        Stream.take(1),
+        Stream.runDrain,
+        Effect.forkScoped({ startImmediately: true }),
+      );
+      yield* send("first", "first", "auto");
+      yield* send("goal", "/goal all tests pass", "auto");
+      yield* worker.drain();
+      yield* Fiber.join(goalStarting);
+      yield* worker.drain();
+
+      const projection = yield* orchestrator.getThreadProjection(threadId);
+      const statusOf = (text: string) =>
+        projection.runs.find(
+          (run) =>
+            projection.messages.find((message) => message.id === run.userMessageId)?.text === text,
+        )?.status;
+      assert.equal(statusOf("first"), "interrupted");
+      assert.deepEqual(
+        started.map((turn) => turn.message.text),
+        ["/goal all tests pass"],
+      );
+    }).pipe(Effect.provide(layer));
+  }),
+);
+
+it.effect("stops the running turn when a goal clear ends the goal driving it", () =>
+  Effect.gen(function* () {
+    const { events, layer, startFirstTurn, send, read, steered } =
+      yield* goalHarness("goal-clear-active");
+    yield* Effect.gen(function* () {
+      const orchestrator = yield* Orchestrator.OrchestratorV2;
+      const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
+      const threadId = yield* startFirstTurn;
+      const providerThread = (yield* orchestrator.getThreadProjection(threadId))
+        .providerThreads[0]!;
+      const goalSeen = yield* orchestrator.streamDomainEvents.pipe(
+        Stream.filter(
+          (event) =>
+            event.type === "provider-thread.updated" && event.payload.goal?.status === "active",
+        ),
+        Stream.take(1),
+        Stream.runDrain,
+        Effect.forkScoped({ startImmediately: true }),
+      );
+      yield* Queue.offer(events, {
+        type: "provider_thread.updated",
+        driver,
+        providerThread: {
+          ...providerThread,
+          goal: { objective: "all tests pass", status: "active" },
+        },
+      });
+      yield* Fiber.join(goalSeen);
+      yield* send("clear", "/goal clear", "auto");
+      yield* worker.drain();
+
+      assert.deepEqual(steered, []);
+      assert.deepEqual(yield* read(threadId), {
+        queue: [],
+        started: ["first", "/goal clear"],
+        stopRequested: true,
+      });
+    }).pipe(Effect.provide(layer));
+  }),
+);
+
+it.effect("a side chat that opens with /goal gets its context on the next question", () =>
+  Effect.gen(function* () {
+    const { events, layer, started, startFirstTurn } = yield* goalHarness("side-chat-goal");
+    yield* Effect.gen(function* () {
+      const orchestrator = yield* Orchestrator.OrchestratorV2;
+      const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
+      const parentId = yield* startFirstTurn;
+      const sideChatId = ThreadId.make("thread:side-chat-goal-child");
+      yield* orchestrator.dispatch({
+        type: "thread.fork",
+        commandId: CommandId.make("side-chat"),
+        sourceThreadId: parentId,
+        targetThreadId: sideChatId,
+        sourcePoint: { type: "latest_stable" },
+        sideChat: true,
+        createdBy: "user",
+        creationSource: "web",
+      });
+      const ask = (id: string, text: string) =>
+        orchestrator.dispatch({
+          type: "message.dispatch",
+          commandId: CommandId.make(id),
+          threadId: sideChatId,
+          messageId: MessageId.make(`message:${id}`),
+          text,
+          attachments: [],
+          modelSelection: runSelection,
+          dispatchMode: { type: "start_immediately" },
+          createdBy: "user",
+          creationSource: "web",
+        });
+      const sideChatEvent = (matches: (event: OrchestrationV2DomainEvent) => boolean) =>
+        orchestrator.streamDomainEvents.pipe(
+          Stream.filter((event) => event.threadId === sideChatId && matches(event)),
+          Stream.take(1),
+          Stream.runDrain,
+          Effect.forkScoped({ startImmediately: true }),
+        );
+      const running = yield* sideChatEvent(
+        (event) => event.type === "provider-turn.updated" && event.payload.status === "running",
+      );
+      const settled = yield* sideChatEvent(
+        (event) => event.type === "run.updated" && event.payload.status === "waiting",
+      );
+      yield* ask("goal", "/goal clear");
+      yield* worker.drain();
+      yield* Fiber.join(running);
+      const turn = (yield* orchestrator.getThreadProjection(sideChatId)).providerTurns[0]!;
+      yield* Queue.offer(events, {
+        type: "provider_turn.updated",
+        driver,
+        providerTurn: { ...turn, status: "completed", completedAt: yield* DateTime.now },
+      });
+      yield* Queue.offer(events, {
+        type: "turn.terminal",
+        driver,
+        providerThreadId: turn.providerThreadId,
+        providerTurnId: turn.id,
+        runOrdinal: started[1]!.runOrdinal,
+        status: "completed",
+        failure: null,
+        threadDisposition: "reusable",
+      });
+      yield* Fiber.join(settled);
+      yield* worker.drain();
+      yield* ask("question", "What is the main thread doing?");
+      yield* worker.drain();
+
+      const [first, goal, question] = started.map((turn) => turn.message.text);
+      assert.deepEqual([first, goal], ["first", "/goal clear"]);
+      assert.include(question, "You are in a side chat beside the main thread.");
+      assert.include(question, "- User: first");
+      assert.isTrue(question?.endsWith("What is the main thread doing?"));
+    }).pipe(Effect.provide(layer));
+  }),
 );
diff --git a/apps/server/src/orchestration-v2/ThreadLaunchService.test.ts b/apps/server/src/orchestration-v2/ThreadLaunchService.test.ts
index a0a438bf9730..c44c3a70f19b 100644
--- a/apps/server/src/orchestration-v2/ThreadLaunchService.test.ts
+++ b/apps/server/src/orchestration-v2/ThreadLaunchService.test.ts
@@ -26,6 +26,7 @@ import {
   type ServerProvider,
   ThreadId,
   TextGenerationError,
+  ServerSettingsError,
 } from "@t3tools/contracts";
 import * as Cause from "effect/Cause";
 import * as Deferred from "effect/Deferred";
@@ -131,6 +132,7 @@ interface HarnessOptions {
   readonly generateTitle?: TextGeneration.TextGeneration["Service"]["generateThreadTitle"];
   readonly generateBranchName?: TextGeneration.TextGeneration["Service"]["generateBranchName"];
   readonly serverSettings?: Parameters<typeof ServerSettings.layerTest>[0];
+  readonly getLaunchSettings?: ServerSettings.ServerSettingsService["Service"]["getSettings"];
   readonly providers?: ReadonlyArray<ServerProvider>;
   readonly git?: Partial<GitWorkflow.GitWorkflowService["Service"]>;
 }
@@ -244,6 +246,11 @@ function makeHarness(options: HarnessOptions = {}) {
         layerReceipts,
         layerOrchestrator,
         IdAllocator.layer,
+        options.getLaunchSettings === undefined
+          ? Layer.empty
+          : Layer.mock(ServerSettings.ServerSettingsService)({
+              getSettings: options.getLaunchSettings,
+            }),
       ),
     ),
   );
@@ -257,6 +264,7 @@ function makeHarness(options: HarnessOptions = {}) {
               workspaceRoot: project.workspaceRoot,
               defaultModelSelection: project.defaultModelSelection,
               defaultThreadEnvMode: null,
+              hasCustomTitle: false,
               autoPull: false,
               faviconPath: null,
               projectIcon: null,
@@ -968,6 +976,109 @@ const preparationSettled = (threadId: ThreadId) =>
     return yield* threads.getThreadProjection(threadId);
   });
 
+it.effect.each([
+  { prefix: "my-prefix", collision: null, expected: /^my-prefix\/[0-9a-f]{8}$/ },
+  { prefix: "my-prefix", collision: "my-prefix", expected: /^my-prefix-[0-9a-f]{8}$/ },
+  { prefix: "team/topic", collision: "team", expected: /^team-topic-[0-9a-f]{8}$/ },
+])("keeps prefix '$prefix' with collision '$collision' when naming fails", (scenario) =>
+  Effect.gen(function* () {
+    const namingAttempted = yield* Deferred.make<void>();
+    const harness = makeHarness({
+      serverSettings: {
+        branchNamePrefix: "global-prefix",
+        projectSettingsOverrides: {
+          [projectId]: { branchNamingMode: "static", branchNamePrefix: scenario.prefix },
+        },
+      },
+      hasCommit: ({ refName }) => Effect.succeed(refName === `refs/heads/${scenario.collision}`),
+      generateBranchName: () =>
+        Deferred.succeed(namingAttempted, undefined).pipe(
+          Effect.andThen(
+            Effect.fail(
+              new TextGenerationError({ operation: "generateBranchName", detail: "Unavailable" }),
+            ),
+          ),
+        ),
+    });
+    yield* Effect.gen(function* () {
+      const launches = yield* ThreadLaunch.ThreadLaunchService;
+      const launched = yield* launches.launch(
+        launchInput({
+          command: "prefix-launch",
+          thread: "prefix-thread",
+          message: "Fix the parser",
+          workspace: { type: "worktree", baseRef: "main" },
+        }),
+      );
+      const projection = yield* preparationSettled(launched.threadId);
+      assert.match(projection.thread.branch!, scenario.expected);
+      yield* Deferred.await(namingAttempted);
+      assert.equal(projection.runs[0]?.status, "starting");
+      assert.equal(harness.createWorktree.mock.calls[0]?.[0]?.newRefName, projection.thread.branch);
+      assert.equal(harness.renameBranch.mock.calls.length, 0);
+      assert.isFalse(projection.turnItems.some((item) => item.type === "error"));
+    }).pipe(Effect.provide(harness.layer));
+  }),
+);
+
+it.effect(
+  "starts a worktree with the default temporary name when settings secrets cannot be read",
+  () => {
+    const harness = makeHarness({
+      getLaunchSettings: Effect.fail(
+        new ServerSettingsError({ settingsPath: "/settings.json", operation: "read-secret" }),
+      ),
+    });
+    return Effect.gen(function* () {
+      const launches = yield* ThreadLaunch.ThreadLaunchService;
+      const launched = yield* launches.launch(
+        launchInput({
+          command: "settings-fallback",
+          thread: "settings-fallback-thread",
+          message: "Fix the parser",
+          workspace: { type: "worktree", baseRef: "main" },
+        }),
+      );
+      const projection = yield* preparationSettled(launched.threadId);
+      assert.equal(projection.runs[0]?.status, "starting");
+      assert.match(projection.thread.branch!, /^t3\/[0-9a-f]{8}$/);
+      assert.equal(harness.createWorktree.mock.calls[0]?.[0]?.newRefName, projection.thread.branch);
+      assert.equal(harness.runSetup.mock.calls.length, 1);
+      assert.equal(harness.renameBranch.mock.calls.length, 0);
+      assert.isFalse(projection.turnItems.some((item) => item.type === "error"));
+    }).pipe(Effect.provide(harness.layer));
+  },
+);
+
+it.effect("renames a temporary branch with a configured prefix when generation succeeds", () => {
+  const harness = makeHarness({
+    serverSettings: { branchNamingMode: "static", branchNamePrefix: "my-prefix" },
+    generateBranchName: () => Effect.succeed({ branch: "my-prefix/fix-parser" }),
+  });
+  return Effect.gen(function* () {
+    const launches = yield* ThreadLaunch.ThreadLaunchService;
+    const threads = yield* ThreadManagement.ThreadManagementService;
+    const launched = yield* launches.launch(
+      launchInput({
+        command: "prefix-rename",
+        thread: "prefix-rename-thread",
+        message: "Fix the parser",
+        workspace: { type: "worktree", baseRef: "main" },
+      }),
+    );
+    yield* threads.streamStoredEventsFrom({ threadId: launched.threadId }).pipe(
+      Stream.filter((stored) => stored.commandId === "prefix-rename:branch-rename"),
+      Stream.runHead,
+    );
+    const projection = yield* threads.getThreadProjection(launched.threadId);
+    assert.equal(projection.thread.branch, "my-prefix/fix-parser");
+    assert.match(
+      harness.renameBranch.mock.calls[0]?.[0]?.oldBranch ?? "",
+      /^my-prefix\/[0-9a-f]{8}$/,
+    );
+  }).pipe(Effect.provide(harness.layer));
+});
+
 function scheduledTaskInput(id: string, targetProjectId: ProjectId) {
   return {
     id: ScheduledTaskId.make(id),
@@ -1429,7 +1540,7 @@ it.effect.each(["fails", "is interrupted"] as const)(
 );
 
 it.effect.each(["failed", "interrupted"] as const)(
-  "holds a message queued during setup that arrives after the setup %s",
+  "holds every message that arrives after the setup %s without a worktree",
   (ending) => {
     let fetchEntered: Deferred.Deferred<void> | null = null;
     const harness = makeHarness({
@@ -1491,9 +1602,9 @@ it.effect.each(["failed", "interrupted"] as const)(
       assert.equal(held.status, "queued");
       assert.equal(held.queueHeld, true);
 
-      // A message the user starts does not release it: the held message would
-      // run after it in the project checkout.
-      yield* threads.sendToThread({
+      // A message sent fresh after the setup ended waits behind it too, rather
+      // than starting in the project checkout with no worktree.
+      const sentAfter = yield* threads.sendToThread({
         projectId,
         commandId: CommandId.make(`command:launch:late-queued-follow-up-${ending}:start`),
         threadId: launched.threadId,
@@ -1504,6 +1615,7 @@ it.effect.each(["failed", "interrupted"] as const)(
         createdBy: "user",
         creationSource: "web",
       });
+      assert.equal(sentAfter.delivery, "queued");
       yield* threads.dispatch({
         type: "message.dispatch",
         commandId: CommandId.make(`command:launch:late-queued-follow-up-${ending}:wake`),
@@ -1519,9 +1631,7 @@ it.effect.each(["failed", "interrupted"] as const)(
       assert.equal(wake.status, "queued");
       assert.isTrue(wake.queueHeld);
 
-      // Nor does the next one, though the run that message started is now the
-      // latest and carries no workspace preparation.
-      yield* threads.sendToThread({
+      const sentAgain = yield* threads.sendToThread({
         projectId,
         commandId: CommandId.make(`command:launch:late-queued-follow-up-${ending}:again`),
         threadId: launched.threadId,
@@ -1532,8 +1642,19 @@ it.effect.each(["failed", "interrupted"] as const)(
         createdBy: "user",
         creationSource: "web",
       });
+      assert.equal(sentAgain.delivery, "queued");
       const after = yield* threads.getThreadProjection(launched.threadId);
       assert.isTrue(after.runs.find((run) => run.id === held.id)?.queueHeld);
+      assert.deepStrictEqual(
+        after.runs.slice(1).map((run) => [run.status, run.queueHeld === true]),
+        [
+          ["queued", true],
+          ["queued", true],
+          ["queued", true],
+          ["queued", true],
+        ],
+      );
+      assert.equal(after.thread.worktreePath, null);
     }).pipe(Effect.provide(harness.layer));
   },
 );
@@ -2460,6 +2581,79 @@ it.effect("tells the thread when its worktree branch could not be renamed", () =
   }),
 );
 
+it.effect("reports submodule downloads as their own setup step", () =>
+  Effect.gen(function* () {
+    const progressReady =
+      yield* Deferred.make<
+        NonNullable<
+          NonNullable<
+            Parameters<GitWorkflow.GitWorkflowService["Service"]["createWorktree"]>[1]
+          >["progress"]
+        >
+      >();
+    const release = yield* Deferred.make<void>();
+    const harness = makeHarness({
+      createWorktree: (input, options) =>
+        Deferred.succeed(progressReady, options?.progress ?? {}).pipe(
+          Effect.andThen(Deferred.await(release)),
+          Effect.as({
+            worktree: {
+              path: "/repo-worktrees/feature",
+              refName: input.newRefName,
+              headSha: "abc",
+            },
+          } as never),
+        ),
+    });
+    yield* Effect.gen(function* () {
+      const launches = yield* ThreadLaunch.ThreadLaunchService;
+      const tracker = yield* WorktreeSetupTracker.WorktreeSetupTracker;
+      const launched = yield* launches.launch(
+        launchInput({
+          command: "launch:submodule-progress",
+          thread: "thread:submodule-progress",
+          message: "Start",
+          workspace: { type: "worktree", baseRef: "main" },
+        }),
+      );
+      const stage = (id: string) =>
+        tracker
+          .get(launched.threadId)
+          .pipe(Effect.map((snapshot) => snapshot?.stages.find((entry) => entry.id === id)));
+      const progress = yield* Deferred.await(progressReady);
+      const line = (text: string) => progress.onSubmoduleLine?.(text) ?? Effect.void;
+
+      yield* progress.onSubmodulesStarted?.() ?? Effect.void;
+      yield* line("Receiving objects:  20% (2/10), 4.00 MiB | 1.50 MiB/s");
+      yield* line("Receiving objects:  30% (3/10), 6.00 MiB | 1.50 MiB/s");
+      assert.equal((yield* stage("checkout"))?.status, "done");
+      assert.deepInclude(yield* stage("submodules"), {
+        status: "running",
+        detail: "Receiving objects: 20% (2/10), 4.00 MiB | 1.50 MiB/s",
+      });
+
+      yield* TestClock.adjust("1 second");
+      yield* line("Receiving objects:  60% (6/10), 12.00 MiB | 1.50 MiB/s");
+      assert.equal(
+        (yield* stage("submodules"))?.detail,
+        "Receiving objects: 60% (6/10), 12.00 MiB | 1.50 MiB/s",
+      );
+
+      yield* line("Submodule path 'vendor/o'hare': checked out 'abc'");
+      yield* progress.onSubmodulesFinished?.({ ok: true, detail: null }) ?? Effect.void;
+      yield* Deferred.succeed(release, undefined);
+      yield* tracker.stream(launched.threadId).pipe(
+        Stream.filter((snapshot) => snapshot?.phase !== "running"),
+        Stream.runHead,
+      );
+      assert.deepInclude(yield* stage("submodules"), {
+        status: "done",
+        detail: "vendor/o'hare",
+      });
+    }).pipe(Effect.provide(harness.layer));
+  }),
+);
+
 it.effect.each([0, 1])("releases an async setup before its completion with exit %s", (exitCode) =>
   Effect.gen(function* () {
     const completion = yield* Deferred.make<{ exitCode: number | null; durationMs: number }>();
@@ -2509,6 +2703,10 @@ it.effect.each([0, 1])("releases an async setup before its completion with exit
         settled?.stages.find((stage) => stage.id === "setup-script")?.status,
         exitCode === 0 ? "done" : "failed",
       );
+      assert.deepInclude(
+        settled?.stages.find((stage) => stage.id === "submodules"),
+        { status: "skipped", detail: "none" },
+      );
       assert.equal(
         (yield* threads.getThreadProjection(launched.threadId)).runs[0]?.status,
         "starting",
diff --git a/apps/server/src/orchestration-v2/ThreadLaunchService.ts b/apps/server/src/orchestration-v2/ThreadLaunchService.ts
index c65754dece31..b354ba6737e3 100644
--- a/apps/server/src/orchestration-v2/ThreadLaunchService.ts
+++ b/apps/server/src/orchestration-v2/ThreadLaunchService.ts
@@ -22,6 +22,7 @@ import {
   ThreadId,
 } from "@t3tools/contracts";
 import * as Cause from "effect/Cause";
+import * as Clock from "effect/Clock";
 import * as Context from "effect/Context";
 import * as DateTime from "effect/DateTime";
 import * as Effect from "effect/Effect";
@@ -36,11 +37,12 @@ import * as Stream from "effect/Stream";
 import {
   buildTemporaryWorktreeBranchName,
   flattenTemporaryWorktreeBranchName,
+  formatGeneratedBranchName,
   isTemporaryWorktreeBranch,
-  WORKTREE_BRANCH_PREFIX,
 } from "@t3tools/shared/git";
 
 import * as GitWorkflow from "../git/GitWorkflowService.ts";
+import { parseGitCloneProgressLine } from "../project/gitCloneProgress.ts";
 import * as ProjectService from "../project/ProjectService.ts";
 import * as ProjectSetupScriptRunner from "../project/ProjectSetupScriptRunner.ts";
 import * as ManagedProjectFolders from "../project/ManagedProjectFolders.ts";
@@ -437,7 +439,7 @@ const make = Effect.gen(function* () {
         threadId,
         branch: input.workspaceStrategy.branch ?? null,
         baseRef: input.workspaceStrategy.baseRef,
-        stages: ["fetch", "checkout", "setup-script", "agent"],
+        stages: ["fetch", "checkout", "submodules", "setup-script", "agent"],
         fiber: yield* Effect.fiber,
       });
     } else if (reused !== undefined) {
@@ -489,10 +491,23 @@ const make = Effect.gen(function* () {
       );
 
       const requestedBranch = input.workspaceStrategy.branch;
+      const generatedTemporaryBranch =
+        input.workspaceStrategy.type === "worktree" && requestedBranch === undefined;
       let branch: string | null;
-      if (input.workspaceStrategy.type === "worktree" && requestedBranch === undefined) {
+      if (generatedTemporaryBranch) {
         const uuid = yield* randomUuidV4;
         branch = buildTemporaryWorktreeBranchName(() => uuid.replaceAll("-", ""));
+        const settings = yield* serverSettings.getSettings.pipe(
+          Effect.map((settings) => resolveProjectSettings(settings, input.projectId).settings),
+          Effect.orElseSucceed(() => null),
+        );
+        if (settings?.branchNamingMode === "static") {
+          branch = formatGeneratedBranchName(branch.slice(-8), {
+            mode: "static",
+            prefix: settings.branchNamePrefix,
+            instructions: "",
+          });
+        }
       } else {
         branch = yield* launchBranch(input.workspaceStrategy, project.workspaceRoot);
       }
@@ -539,19 +554,26 @@ const make = Effect.gen(function* () {
           }
         }
         if (shouldFetch) yield* setupTracker.stageStatus(threadId, "fetch", "done");
-        if (
-          branch !== null &&
-          isTemporaryWorktreeBranch(branch) &&
-          (yield* git
-            .hasCommit({
-              cwd: project.workspaceRoot,
-              refName: `refs/heads/${WORKTREE_BRANCH_PREFIX}`,
-            })
-            .pipe(Effect.mapError(mapError(input, "provision-worktree", threadId))))
-        ) {
-          branch = flattenTemporaryWorktreeBranchName(branch);
+        if (branch !== null && (generatedTemporaryBranch || isTemporaryWorktreeBranch(branch))) {
+          const parts = branch.split("/");
+          for (let depth = 1; depth < parts.length; depth++) {
+            if (
+              yield* git
+                .hasCommit({
+                  cwd: project.workspaceRoot,
+                  refName: `refs/heads/${parts.slice(0, depth).join("/")}`,
+                })
+                .pipe(Effect.mapError(mapError(input, "provision-worktree", threadId)))
+            ) {
+              branch = generatedTemporaryBranch
+                ? branch.replaceAll("/", "-")
+                : flattenTemporaryWorktreeBranchName(branch);
+              break;
+            }
+          }
         }
         yield* setupTracker.stageStatus(threadId, "checkout", "running");
+        let submoduleProgressReportedAt = Number.NEGATIVE_INFINITY;
         const worktree = yield* git
           .createWorktree(
             {
@@ -570,6 +592,42 @@ const make = Effect.gen(function* () {
                   }),
                 onCheckoutProgress: (progress) =>
                   setupTracker.stage(threadId, "checkout", { percent: progress.percent }),
+                onSubmodulesStarted: () =>
+                  setupTracker
+                    .stageStatus(threadId, "checkout", "done")
+                    .pipe(
+                      Effect.andThen(setupTracker.stageStatus(threadId, "submodules", "running")),
+                    ),
+                onSubmodulesDisabled: ({ source }) =>
+                  setupTracker.stageStatus(
+                    threadId,
+                    "submodules",
+                    "skipped",
+                    `disabled in ${source}`,
+                  ),
+                onSubmoduleLine: (line) => {
+                  // Paths may contain quotes; git closes the path with "': ".
+                  const submodulePath = /^\s*Submodule path '(.+)': /.exec(line)?.[1];
+                  if (submodulePath !== undefined) {
+                    return setupTracker.stage(threadId, "submodules", { detail: submodulePath });
+                  }
+                  if (parseGitCloneProgressLine(line) === null) return Effect.void;
+                  // Git redraws on every percent; hold the websocket to one update a second.
+                  return Effect.flatMap(Clock.currentTimeMillis, (now) => {
+                    if (now - submoduleProgressReportedAt < 1000) return Effect.void;
+                    submoduleProgressReportedAt = now;
+                    return setupTracker.stage(threadId, "submodules", {
+                      detail: line.trim().replace(/\s+/g, " "),
+                    });
+                  });
+                },
+                onSubmodulesFinished: ({ ok, detail }) =>
+                  setupTracker.stageStatus(
+                    threadId,
+                    "submodules",
+                    ok ? "done" : "warning",
+                    ok ? undefined : (detail ?? "submodule checkout failed"),
+                  ),
               },
             },
           )
@@ -578,7 +636,16 @@ const make = Effect.gen(function* () {
         branch = worktree.worktree.refName;
         createdWorktreePath = worktreePath;
         createdBranch = branch;
-        yield* setupTracker.update(threadId, (snapshot) => ({ ...snapshot, worktreePath, branch }));
+        yield* setupTracker.update(threadId, (snapshot) => ({
+          ...snapshot,
+          worktreePath,
+          branch,
+          stages: snapshot.stages.map((stage) =>
+            stage.id === "submodules" && stage.status === "pending"
+              ? { ...stage, status: "skipped", detail: "none" }
+              : stage,
+          ),
+        }));
         yield* setupTracker.stageStatus(threadId, "checkout", "done");
       }
 
@@ -601,7 +668,7 @@ const make = Effect.gen(function* () {
         worktreePath !== null &&
         branch !== null &&
         initialMessage !== undefined &&
-        isTemporaryWorktreeBranch(branch)
+        (generatedTemporaryBranch || isTemporaryWorktreeBranch(branch))
       ) {
         const oldBranch = branch;
         const worktreeCwd = worktreePath;
diff --git a/apps/server/src/orchestration-v2/ThreadLiveEventCoalescer.test.ts b/apps/server/src/orchestration-v2/ThreadLiveEventCoalescer.test.ts
index 7b91e479b98e..11f39f3af1c0 100644
--- a/apps/server/src/orchestration-v2/ThreadLiveEventCoalescer.test.ts
+++ b/apps/server/src/orchestration-v2/ThreadLiveEventCoalescer.test.ts
@@ -159,57 +159,51 @@ describe("ThreadLiveEventCoalescer", () => {
   it.effect.each(["items", "bytes"] as const)(
     "replaces superseded tool output before charging the %s budget",
     (limit) =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const updates = Array.from({ length: 1_100 }, (_, index) => makeToolActivity(index + 1));
-          const latest = updates.at(-1)!;
-          const coalescer = yield* makeThreadLiveEventCoalescer(
-            limit === "items"
-              ? { maxItems: 1 }
-              : { maxSerializedBytes: Buffer.byteLength(encodeEvent(latest)) },
-          );
-          yield* coalescer.offerAll(updates);
-          expect(yield* coalescer.usage).toEqual({
-            retainedItems: 1,
-            retainedSerializedBytes: Buffer.byteLength(encodeEvent(latest)),
-          });
-          yield* coalescer.end;
-          expect(yield* coalescer.stream.pipe(Stream.runCollect)).toEqual([latest]);
-          expect(yield* coalescer.usage).toEqual({ retainedItems: 0, retainedSerializedBytes: 0 });
-        }),
-      ),
-  );
-
-  it.effect("handles a tool output burst larger than the default 8 MiB buffer", () =>
-    Effect.scoped(
       Effect.gen(function* () {
-        const coalescer = yield* makeThreadLiveEventCoalescer();
-        const updates = Array.from({ length: 150 }, (_, index) =>
-          makeToolActivity(index + 1, { output: "x".repeat(64 * 1024) }),
+        const updates = Array.from({ length: 1_100 }, (_, index) => makeToolActivity(index + 1));
+        const latest = updates.at(-1)!;
+        const coalescer = yield* makeThreadLiveEventCoalescer(
+          limit === "items"
+            ? { maxItems: 1 }
+            : { maxSerializedBytes: Buffer.byteLength(encodeEvent(latest)) },
         );
         yield* coalescer.offerAll(updates);
+        expect(yield* coalescer.usage).toEqual({
+          retainedItems: 1,
+          retainedSerializedBytes: Buffer.byteLength(encodeEvent(latest)),
+        });
         yield* coalescer.end;
-        expect(yield* coalescer.stream.pipe(Stream.runCollect)).toEqual([updates.at(-1)]);
+        expect(yield* coalescer.stream.pipe(Stream.runCollect)).toEqual([latest]);
+        expect(yield* coalescer.usage).toEqual({ retainedItems: 0, retainedSerializedBytes: 0 });
       }),
-    ),
+  );
+
+  it.effect("handles a tool output burst larger than the default 8 MiB buffer", () =>
+    Effect.gen(function* () {
+      const coalescer = yield* makeThreadLiveEventCoalescer();
+      const updates = Array.from({ length: 150 }, (_, index) =>
+        makeToolActivity(index + 1, { output: "x".repeat(64 * 1024) }),
+      );
+      yield* coalescer.offerAll(updates);
+      yield* coalescer.end;
+      expect(yield* coalescer.stream.pipe(Stream.runCollect)).toEqual([updates.at(-1)]);
+    }),
   );
 
   it.effect("still fails when a single replacement exceeds the byte budget", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const first = makeToolActivity(1);
-        const coalescer = yield* makeThreadLiveEventCoalescer({
-          maxSerializedBytes: Buffer.byteLength(encodeEvent(first)),
-        });
-        yield* coalescer.offer(first);
-        const overflow = yield* coalescer
-          .offer(makeToolActivity(2, { output: "x".repeat(2_000) }))
-          .pipe(Effect.result);
-        expect(overflow._tag).toBe("Failure");
-        yield* coalescer.closed;
-        expect(yield* coalescer.usage).toEqual({ retainedItems: 0, retainedSerializedBytes: 0 });
-      }),
-    ),
+    Effect.gen(function* () {
+      const first = makeToolActivity(1);
+      const coalescer = yield* makeThreadLiveEventCoalescer({
+        maxSerializedBytes: Buffer.byteLength(encodeEvent(first)),
+      });
+      yield* coalescer.offer(first);
+      const overflow = yield* coalescer
+        .offer(makeToolActivity(2, { output: "x".repeat(2_000) }))
+        .pipe(Effect.result);
+      expect(overflow._tag).toBe("Failure");
+      yield* coalescer.closed;
+      expect(yield* coalescer.usage).toEqual({ retainedItems: 0, retainedSerializedBytes: 0 });
+    }),
   );
 
   it("preserves tool-call identity switches as insertion-order boundaries", () => {
@@ -413,119 +407,107 @@ describe("ThreadLiveEventCoalescer", () => {
   );
 
   it.effect("flushes text at synchronization and completion boundaries", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const coalescer = yield* makeThreadLiveEventCoalescer();
-        const events = [
-          makeStreamingMessage(1),
-          makeTextItem(2, { type: "reasoning" }),
-          makeStreamingMessage(3),
-          makeTextItem(4, { type: "reasoning" }),
-          { kind: "synchronized" } as const,
-          makeStreamingMessage(5),
-          makeTextItem(6, { type: "reasoning" }),
-          makeStreamingMessage(7, { streaming: false, text: "Final answer" }),
-          makeTextItem(8, {
-            type: "reasoning",
-            streaming: false,
-            status: "completed",
-            text: "Final answer",
-          }),
-          makeStreamingMessage(9),
-          makeTextItem(10, { type: "reasoning" }),
-        ];
-        yield* coalescer.offerAll(events);
-        yield* coalescer.end;
-        expect(yield* Stream.runCollect(coalescer.stream)).toEqual(events.slice(2));
-        expect(yield* coalescer.usage).toEqual({ retainedItems: 0, retainedSerializedBytes: 0 });
-      }),
-    ),
+    Effect.gen(function* () {
+      const coalescer = yield* makeThreadLiveEventCoalescer();
+      const events = [
+        makeStreamingMessage(1),
+        makeTextItem(2, { type: "reasoning" }),
+        makeStreamingMessage(3),
+        makeTextItem(4, { type: "reasoning" }),
+        { kind: "synchronized" } as const,
+        makeStreamingMessage(5),
+        makeTextItem(6, { type: "reasoning" }),
+        makeStreamingMessage(7, { streaming: false, text: "Final answer" }),
+        makeTextItem(8, {
+          type: "reasoning",
+          streaming: false,
+          status: "completed",
+          text: "Final answer",
+        }),
+        makeStreamingMessage(9),
+        makeTextItem(10, { type: "reasoning" }),
+      ];
+      yield* coalescer.offerAll(events);
+      yield* coalescer.end;
+      expect(yield* Stream.runCollect(coalescer.stream)).toEqual(events.slice(2));
+      expect(yield* coalescer.usage).toEqual({ retainedItems: 0, retainedSerializedBytes: 0 });
+    }),
   );
 
   it.effect(
     "flushes growing text on the fixed window and charges only unacknowledged survivors",
     () =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const coalescer = yield* makeThreadLiveEventCoalescer();
-          const first = [makeStreamingMessage(1, { text: "é" }), makeTextItem(2, { text: "é" })];
-          const latest = [makeStreamingMessage(3, { text: "éé" }), makeTextItem(4, { text: "éé" })];
-          const serializedBytes = (events: ReadonlyArray<ThreadEvent>) =>
-            events.reduce((sum, event) => sum + Buffer.byteLength(encodeEvent(event)), 0);
-          yield* coalescer.offerAll(first);
-          yield* TestClock.adjust("40 millis");
-          yield* coalescer.offerAll(latest);
-          expect(yield* coalescer.usage).toEqual({
-            retainedItems: 2,
-            retainedSerializedBytes: serializedBytes(latest),
-          });
-          yield* TestClock.adjust("10 millis");
-          const expectedUsage = {
-            retainedItems: 2,
-            retainedSerializedBytes: serializedBytes(latest),
-          };
-          expect(yield* coalescer.usage).toEqual(expectedUsage);
-          const pull = yield* Stream.toPull(coalescer.stream);
-          expect(yield* pull).toEqual(latest);
-          expect(yield* coalescer.usage).toEqual(expectedUsage);
-
-          const next = [makeStreamingMessage(5), makeTextItem(6)];
-          yield* coalescer.offerAll(next);
-          yield* TestClock.adjust("50 millis");
-          expect(yield* pull).toEqual(next);
-          yield* coalescer.end;
-          yield* pull.pipe(Effect.result);
-          expect(yield* coalescer.usage).toEqual({ retainedItems: 0, retainedSerializedBytes: 0 });
-        }),
-      ),
-  );
-
-  it.effect("keeps the flush timer alive when an offer's shorter scope closes", () =>
-    Effect.scoped(
       Effect.gen(function* () {
         const coalescer = yield* makeThreadLiveEventCoalescer();
-        yield* Effect.scoped(coalescer.offer(makeToolActivity(1)));
+        const first = [makeStreamingMessage(1, { text: "é" }), makeTextItem(2, { text: "é" })];
+        const latest = [makeStreamingMessage(3, { text: "éé" }), makeTextItem(4, { text: "éé" })];
+        const serializedBytes = (events: ReadonlyArray<ThreadEvent>) =>
+          events.reduce((sum, event) => sum + Buffer.byteLength(encodeEvent(event)), 0);
+        yield* coalescer.offerAll(first);
+        yield* TestClock.adjust("40 millis");
+        yield* coalescer.offerAll(latest);
+        expect(yield* coalescer.usage).toEqual({
+          retainedItems: 2,
+          retainedSerializedBytes: serializedBytes(latest),
+        });
+        yield* TestClock.adjust("10 millis");
+        const expectedUsage = {
+          retainedItems: 2,
+          retainedSerializedBytes: serializedBytes(latest),
+        };
+        expect(yield* coalescer.usage).toEqual(expectedUsage);
+        const pull = yield* Stream.toPull(coalescer.stream);
+        expect(yield* pull).toEqual(latest);
+        expect(yield* coalescer.usage).toEqual(expectedUsage);
+
+        const next = [makeStreamingMessage(5), makeTextItem(6)];
+        yield* coalescer.offerAll(next);
         yield* TestClock.adjust("50 millis");
-        const items = yield* coalescer.stream.pipe(Stream.take(1), Stream.runCollect);
-        expect(items.map((item) => (item.kind === "event" ? item.sequence : item.kind))).toEqual([
-          1,
-        ]);
+        expect(yield* pull).toEqual(next);
+        yield* coalescer.end;
+        yield* pull.pipe(Effect.result);
+        expect(yield* coalescer.usage).toEqual({ retainedItems: 0, retainedSerializedBytes: 0 });
       }),
-    ),
+  );
+
+  it.effect("keeps the flush timer alive when an offer's shorter scope closes", () =>
+    Effect.gen(function* () {
+      const coalescer = yield* makeThreadLiveEventCoalescer();
+      yield* Effect.scoped(coalescer.offer(makeToolActivity(1)));
+      yield* TestClock.adjust("50 millis");
+      const items = yield* coalescer.stream.pipe(Stream.take(1), Stream.runCollect);
+      expect(items.map((item) => (item.kind === "event" ? item.sequence : item.kind))).toEqual([1]);
+    }),
   );
 
   it.effect("keeps an unacknowledged batch charged and clears later events on overflow", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const coalescer = yield* makeThreadLiveEventCoalescer({ maxItems: 3 });
-        const first = makeMessage(1, "é".repeat(1_024));
-        yield* coalescer.offer(first);
+    Effect.gen(function* () {
+      const coalescer = yield* makeThreadLiveEventCoalescer({ maxItems: 3 });
+      const first = makeMessage(1, "é".repeat(1_024));
+      yield* coalescer.offer(first);
 
-        yield* Effect.scoped(
-          Effect.gen(function* () {
-            const pull = yield* Stream.toPull(coalescer.stream);
-            const batch = yield* pull;
-            expect(batch.map((item) => (item.kind === "event" ? item.sequence : null))).toEqual([
-              1,
-            ]);
-            yield* coalescer.offer(makeMessage(2));
-            yield* coalescer.offer(makeToolActivity(3));
-            expect((yield* coalescer.usage).retainedItems).toBe(3);
+      yield* Effect.scoped(
+        Effect.gen(function* () {
+          const pull = yield* Stream.toPull(coalescer.stream);
+          const batch = yield* pull;
+          expect(batch.map((item) => (item.kind === "event" ? item.sequence : null))).toEqual([1]);
+          yield* coalescer.offer(makeMessage(2));
+          yield* coalescer.offer(makeToolActivity(3));
+          expect((yield* coalescer.usage).retainedItems).toBe(3);
 
-            const overflow = yield* coalescer
-              .offer(makeToolActivity(4, { kind: "tool.completed" }))
-              .pipe(Effect.result);
-            expect(overflow._tag).toBe("Failure");
-            yield* coalescer.closed;
-            expect(yield* coalescer.usage).toEqual({
-              retainedItems: 1,
-              retainedSerializedBytes: Buffer.byteLength(encodeEvent(first)),
-            });
-          }),
-        );
-        expect(yield* coalescer.usage).toEqual({ retainedItems: 0, retainedSerializedBytes: 0 });
-      }),
-    ),
+          const overflow = yield* coalescer
+            .offer(makeToolActivity(4, { kind: "tool.completed" }))
+            .pipe(Effect.result);
+          expect(overflow._tag).toBe("Failure");
+          yield* coalescer.closed;
+          expect(yield* coalescer.usage).toEqual({
+            retainedItems: 1,
+            retainedSerializedBytes: Buffer.byteLength(encodeEvent(first)),
+          });
+        }),
+      );
+      expect(yield* coalescer.usage).toEqual({ retainedItems: 0, retainedSerializedBytes: 0 });
+    }),
   );
 });
 
diff --git a/apps/server/src/orchestration-v2/ThreadManagementService.test.ts b/apps/server/src/orchestration-v2/ThreadManagementService.test.ts
index ab846252c9e5..7056e07303c3 100644
--- a/apps/server/src/orchestration-v2/ThreadManagementService.test.ts
+++ b/apps/server/src/orchestration-v2/ThreadManagementService.test.ts
@@ -462,7 +462,13 @@ it.effect("waitForThread returns the cut run once its continuation is declined",
   }),
 );
 
-it.effect.each(["live", "no-session", "unsupported-runtime"] as const)(
+it.effect.each([
+  "live",
+  "no-match",
+  "no-match-clear",
+  "no-session",
+  "unsupported-runtime",
+] as const)(
   "marks background work awaited on the thread's active provider thread with state %s",
   (state) =>
     Effect.gen(function* () {
@@ -538,7 +544,11 @@ it.effect.each(["live", "no-session", "unsupported-runtime"] as const)(
       const result = yield* Effect.gen(function* () {
         const service = yield* ThreadManagementService.ThreadManagementService;
         return yield* service
-          .awaitBackgroundTasks({ threadId, taskIds: ["tests", "finished"], awaited: true })
+          .awaitBackgroundTasks({
+            threadId,
+            taskIds: state.startsWith("no-match") ? ["finished"] : ["tests", "finished"],
+            awaited: state !== "no-match-clear",
+          })
           .pipe(Effect.result);
       }).pipe(Effect.provide(Layer.merge(layerTest, ThreadCommandExecutor.layer)));
 
@@ -547,6 +557,14 @@ it.effect.each(["live", "no-session", "unsupported-runtime"] as const)(
           success: { matched: ["tests"], unmatched: ["finished"] },
         });
         expect(calls).toEqual([{ providerThreadId, awaited: true }]);
+      } else if (state === "no-match") {
+        expect(result).toMatchObject({
+          failure: { _tag: "ThreadManagementBackgroundWaitError", reason: "unmatched" },
+        });
+        expect(calls).toEqual([{ providerThreadId, awaited: true }]);
+      } else if (state === "no-match-clear") {
+        expect(result).toMatchObject({ success: { matched: [], unmatched: ["finished"] } });
+        expect(calls).toEqual([{ providerThreadId, awaited: false }]);
       } else {
         expect(result).toMatchObject({
           failure: {
diff --git a/apps/server/src/orchestration-v2/ThreadManagementService.ts b/apps/server/src/orchestration-v2/ThreadManagementService.ts
index e1a1abdc1819..e821096f6c1d 100644
--- a/apps/server/src/orchestration-v2/ThreadManagementService.ts
+++ b/apps/server/src/orchestration-v2/ThreadManagementService.ts
@@ -332,7 +332,7 @@ export class ThreadManagementBackgroundWaitError extends Schema.TaggedError<Thre
   "ThreadManagementBackgroundWaitError",
   {
     threadId: ThreadId,
-    reason: Schema.Literals(["unsupported", "unavailable", "failed"]),
+    reason: Schema.Literals(["unsupported", "unavailable", "failed", "unmatched"]),
     cause: Schema.optional(Schema.Defect()),
   },
 ) {
@@ -344,6 +344,8 @@ export class ThreadManagementBackgroundWaitError extends Schema.TaggedError<Thre
         return "This thread has no live provider session.";
       case "failed":
         return "Failed to update the awaited background work.";
+      case "unmatched":
+        return "None of these IDs is running background work on this thread, so this request registers no wait for them. If the task already finished, read its output now. Otherwise pass the task ID of a background command or Monitor you started. Subagent, Agent tool, and delegate_task IDs don't go here.";
     }
   }
 }
@@ -382,6 +384,7 @@ export interface ThreadManagementServiceShape {
   readonly getThreadHistoryPage: Orchestrator.OrchestratorV2["Service"]["getThreadHistoryPage"];
   readonly getTimelinePage: Orchestrator.OrchestratorV2["Service"]["getTimelinePage"];
   readonly getMessageCount: Orchestrator.OrchestratorV2["Service"]["getMessageCount"];
+  readonly getMessagesById: Orchestrator.OrchestratorV2["Service"]["getMessagesById"];
   readonly getTurnItem: (input: {
     readonly threadId: ThreadId;
     readonly itemId: TurnItemId;
@@ -1301,6 +1304,28 @@ const make = Effect.gen(function* () {
       const ownProviderThreadIds = records.providerThreads.flatMap((providerThread) =>
         providerThread.appThreadId === input.threadId ? [providerThread.id] : [],
       );
+      // Settling the target can promote a queued follow-up onto the same session; that run is
+      // not Force stop's to end. Only a newer run bound to a provider thread on this session
+      // counts. An unreadable thread counts as one, so its sessions are kept.
+      const throughRunOrdinal = target?.ordinal ?? 0;
+      const laterRunActive = (providerSessionId: ProviderSessionId) =>
+        orchestrator.getThreadRecords(input.threadId, ["runs", "providerThreads"]).pipe(
+          Effect.map(({ runs, providerThreads }) => {
+            const onSession = new Set(
+              providerThreads.flatMap((providerThread) =>
+                providerThread.providerSessionId === providerSessionId ? [providerThread.id] : [],
+              ),
+            );
+            return runs.some(
+              (run) =>
+                run.ordinal > throughRunOrdinal &&
+                isActiveRun(run) &&
+                run.providerThreadId !== null &&
+                onSession.has(run.providerThreadId),
+            );
+          }),
+          Effect.orElseSucceed(() => true),
+        );
       const detach = (providerSessionId: ProviderSessionId) =>
         sessions
           .detach({ providerSessionId, threadId: input.threadId, detail: FORCE_STOP_REASON })
@@ -1338,6 +1363,9 @@ const make = Effect.gen(function* () {
           .releaseUnlessBusy({
             providerSessionId,
             ownProviderThreadIds,
+            throughRunOrdinal,
+            // A promoted follow-up may not have marked its turn busy yet.
+            keepIf: laterRunActive(providerSessionId),
             reason: "manual_shutdown",
             detail: FORCE_STOP_REASON,
           })
@@ -1352,7 +1380,7 @@ const make = Effect.gen(function* () {
         );
         if (Option.isNone(released)) {
           releasing = true;
-        } else if (!released.value) {
+        } else if (!released.value && !(yield* laterRunActive(release.providerSessionId))) {
           shared = true;
           yield* detach(release.providerSessionId);
         }
@@ -1503,6 +1531,12 @@ const make = Effect.gen(function* () {
             }),
         ),
       );
+    if (input.awaited && matched.length === 0) {
+      return yield* new ThreadManagementBackgroundWaitError({
+        threadId: input.threadId,
+        reason: "unmatched",
+      });
+    }
     const matchedIds = new Set(matched);
     return { matched, unmatched: input.taskIds.filter((taskId) => !matchedIds.has(taskId)) };
   });
@@ -1619,6 +1653,13 @@ const make = Effect.gen(function* () {
         Effect.andThen(orchestrator.getMessageCount(threadId)),
       );
     }),
+    getMessagesById: Effect.fn("ThreadManagementService.getMessagesById")(
+      function (threadId, messageIds) {
+        return ensureProjectionTranscript(threadId).pipe(
+          Effect.andThen(orchestrator.getMessagesById(threadId, messageIds)),
+        );
+      },
+    ),
     getTurnItem: Effect.fn("ThreadManagementService.getTurnItem")(function (input) {
       return ensureProjectionTranscript(input.threadId).pipe(
         Effect.andThen(orchestrator.getTurnItem(input)),
diff --git a/apps/server/src/orchestration-v2/ThreadPullRequestService.test.ts b/apps/server/src/orchestration-v2/ThreadPullRequestService.test.ts
index 0bcdad9c4726..bcbfe89aa515 100644
--- a/apps/server/src/orchestration-v2/ThreadPullRequestService.test.ts
+++ b/apps/server/src/orchestration-v2/ThreadPullRequestService.test.ts
@@ -89,10 +89,343 @@ describe("ThreadPullRequestServiceV2 reads", () => {
   };
 
   it.effect("does not sweep branch pull requests while no client is connected", () =>
-    Effect.scoped(
+    Effect.gen(function* () {
+      // Polling active branches without a connected client wastes GitHub requests.
+      const thread = { ...threadShell("idle-branch-thread"), branch: "feature/idle" };
+      const project: OrchestrationProjectShell = {
+        id: thread.projectId,
+        title: "Project",
+        workspaceRoot: "/workspace/project",
+        defaultModelSelection: null,
+        scripts: [],
+        createdAt: "2026-08-01T00:00:00.000Z",
+        updatedAt: "2026-08-01T00:00:00.000Z",
+      };
+      const activation = yield* Deferred.make<void>();
+      const domainEvents = yield* Queue.unbounded<OrchestrationV2DomainEvent>();
+      const turnLookup = yield* Deferred.make<void>();
+      const lookups: Array<{ readonly refresh: boolean }> = [];
+      const dependencies = Layer.mergeAll(
+        Layer.mock(Orchestrator.OrchestratorV2)({
+          streamDomainEvents: Stream.fromQueue(domainEvents),
+          getPullRequestSnapshot: () =>
+            Effect.succeed({
+              schemaVersion: 2,
+              snapshotSequence: 1,
+              threads: [thread],
+              archivedThreads: [],
+            }),
+        }),
+        Layer.mock(ProjectStore.ProjectStoreV2)({
+          listShells: () => Effect.succeed([project]),
+          getShell: () => Effect.succeedSome(project),
+        }),
+        Layer.mock(GitManager.GitManager)({
+          branchPullRequest: (_input, options) =>
+            Effect.gen(function* () {
+              const refresh = options?.refresh ?? false;
+              lookups.push({ refresh });
+              if (refresh) yield* Deferred.succeed(turnLookup, undefined);
+              return null;
+            }),
+        }),
+        Layer.mock(PullRequestService.PullRequestService)({
+          notifyLinkedThreadsChanged: Effect.void,
+        }),
+        Layer.mock(RepositoryIdentityResolver.RepositoryIdentityResolver)({
+          resolve: () =>
+            Effect.succeed({
+              canonicalKey: "github.com/acme/project",
+              locator: {
+                source: "git-remote" as const,
+                remoteName: "origin",
+                remoteUrl: "git@github.com:acme/project.git",
+              },
+              provider: SourceControlProviderKind.make("github"),
+              owner: "acme",
+              name: "project",
+            }),
+        }),
+        // No client holds an activity lease.
+        Layer.mock(BackgroundPolicy.BackgroundPolicy)({
+          shouldRunScopeWork: () => Effect.succeed(false),
+          shouldRunOpportunisticWork: Effect.succeed(false),
+        }),
+        Layer.succeed(ServerActivation.ServerActivation, Deferred.await(activation)),
+        Layer.succeed(
+          SecureRandom.SecureRandom,
+          SecureRandom.make((size) => new Uint8Array(size).fill(1)),
+        ),
+        FileSystem.layerNoop({}),
+        Path.layer,
+      );
+      yield* Effect.gen(function* () {
+        const service = yield* ThreadPullRequestService.make;
+        yield* service.start();
+        yield* Deferred.succeed(activation, undefined);
+
+        // A finished turn still discovers the pull request for its branch.
+        yield* Queue.offer(domainEvents, {
+          type: "checkpoint.captured",
+          threadId: thread.id,
+        } as OrchestrationV2DomainEvent);
+        yield* Deferred.await(turnLookup);
+        yield* service.drain;
+        const lookupsBeforeIdle = lookups.length;
+
+        yield* TestClock.adjust("10 minutes");
+        yield* service.drain;
+
+        expect(lookups.slice(lookupsBeforeIdle)).toEqual([]);
+      }).pipe(Effect.provide(dependencies));
+    }),
+  );
+
+  it.effect("refreshes linked-thread readers at most every 10s while activity reorders them", () =>
+    Effect.gen(function* () {
+      const link = {
+        host: "github.com",
+        repository: "acme/web",
+        number: 7,
+        url: "https://github.com/acme/web/pull/7",
+        source: "agent",
+      };
+      const linked = (id: string) =>
+        ({
+          type: "thread.pull-request-synced",
+          threadId: ThreadId.make(id),
+          payload: { ...threadShell(id), pullRequests: [link] },
+        }) as unknown as OrchestrationV2DomainEvent;
+      const activity = (id: string, second: number) =>
+        ({
+          type: "message.updated",
+          threadId: ThreadId.make(id),
+          occurredAt: DateTime.makeUnsafe(`2026-09-20T00:00:${String(second).padStart(2, "0")}Z`),
+        }) as unknown as OrchestrationV2DomainEvent;
+      const domainEvents = yield* Queue.unbounded<OrchestrationV2DomainEvent>();
+      const notified = yield* Queue.unbounded<void>();
+      const dependencies = Layer.mergeAll(
+        Layer.mock(Orchestrator.OrchestratorV2)({
+          streamDomainEvents: Stream.fromQueue(domainEvents),
+          getPullRequestSnapshot: () =>
+            Effect.succeed({
+              schemaVersion: 2,
+              snapshotSequence: 1,
+              threads: [],
+              archivedThreads: [],
+            }),
+        }),
+        Layer.mock(ProjectStore.ProjectStoreV2)({ listShells: () => Effect.succeed([]) }),
+        Layer.mock(GitManager.GitManager)({}),
+        Layer.mock(PullRequestService.PullRequestService)({
+          notifyLinkedThreadsChanged: Queue.offer(notified, undefined).pipe(Effect.asVoid),
+        }),
+        Layer.mock(RepositoryIdentityResolver.RepositoryIdentityResolver)({}),
+        Layer.mock(BackgroundPolicy.BackgroundPolicy)({
+          shouldRunOpportunisticWork: Effect.succeed(false),
+        }),
+        Layer.succeed(ServerActivation.ServerActivation, undefined),
+        Layer.succeed(
+          SecureRandom.SecureRandom,
+          SecureRandom.make((size) => new Uint8Array(size).fill(1)),
+        ),
+        FileSystem.layerNoop({}),
+        Path.layer,
+      );
+      yield* Effect.gen(function* () {
+        const service = yield* ThreadPullRequestService.make;
+        yield* service.start();
+
+        yield* Queue.offerAll(domainEvents, [linked("a"), linked("b"), activity("a", 1)]);
+        yield* Queue.takeN(notified, 3);
+        // Two turns on threads linked to one pull request swap its top thread on every event.
+        yield* Queue.offerAll(
+          domainEvents,
+          Array.from({ length: 20 }, (_, index) => activity(index % 2 ? "a" : "b", index + 2)),
+        );
+        // A link change still refreshes at once, and marks the burst as processed.
+        yield* Queue.offer(domainEvents, linked("c"));
+        yield* Queue.take(notified);
+        expect(yield* Queue.size(notified)).toBe(0);
+
+        yield* TestClock.adjust("10 seconds");
+        yield* Queue.take(notified);
+        yield* TestClock.adjust("10 seconds");
+        expect(yield* Queue.size(notified)).toBe(0);
+      }).pipe(Effect.provide(dependencies));
+    }),
+  );
+
+  it.effect("looks up a finished turn's branch once for all its turn-end events", () =>
+    Effect.gen(function* () {
+      const thread = { ...threadShell("turn-end-thread"), branch: "t3/turn-end" };
+      const otherThread = {
+        ...threadShell("other-turn-end-thread"),
+        branch: "t3/other-turn-end",
+      };
+      const project: OrchestrationProjectShell = {
+        id: thread.projectId,
+        title: "Project",
+        workspaceRoot: "/workspace/project",
+        defaultModelSelection: null,
+        scripts: [],
+        createdAt: "2026-08-01T00:00:00.000Z",
+        updatedAt: "2026-08-01T00:00:00.000Z",
+      };
+      // A turn end commits its checkpoints and the run's end together. The queued
+      // non-refresh request ahead of them must still become a refresh when they join it.
+      const turnEnd = [
+        { type: "thread.metadata-updated", threadId: thread.id, payload: thread },
+        { type: "checkpoint.captured", threadId: thread.id },
+        { type: "checkpoint.captured", threadId: thread.id },
+        { type: "run.updated", threadId: thread.id, payload: { status: "completed" } },
+        { type: "checkpoint.captured", threadId: otherThread.id },
+        { type: "run.updated", threadId: otherThread.id, payload: { status: "completed" } },
+      ] as Array<OrchestrationV2DomainEvent>;
+      // Arrives during the thread's own lookup, which may already have read the old host state.
+      const duringLookup = [
+        { type: "checkpoint.captured", threadId: thread.id },
+        { type: "thread.metadata-updated", threadId: thread.id, payload: thread },
+      ] as unknown as Array<OrchestrationV2DomainEvent>;
+      const activation = yield* Deferred.make<void>();
+      const sweepStarted = yield* Deferred.make<void>();
+      const turnEndQueued = yield* Deferred.make<void>();
+      const lookupStarted = yield* Deferred.make<void>();
+      const followUpQueued = yield* Deferred.make<void>();
+      const lookups: Array<{ readonly branch: string; readonly refresh: boolean }> = [];
+      const dependencies = Layer.mergeAll(
+        Layer.mock(Orchestrator.OrchestratorV2)({
+          // The batch arrives while the worker is busy with the startup sweep.
+          streamDomainEvents: Stream.fromEffect(Deferred.await(sweepStarted)).pipe(
+            Stream.drain,
+            Stream.concat(Stream.fromIterable(turnEnd)),
+            Stream.concat(
+              Stream.fromEffect(Deferred.succeed(turnEndQueued, undefined)).pipe(Stream.drain),
+            ),
+            Stream.concat(Stream.fromEffect(Deferred.await(lookupStarted)).pipe(Stream.drain)),
+            Stream.concat(Stream.fromIterable(duringLookup)),
+            Stream.concat(
+              Stream.fromEffect(Deferred.succeed(followUpQueued, undefined)).pipe(Stream.drain),
+            ),
+            Stream.concat(Stream.never),
+          ),
+          getPullRequestSnapshot: ({ threadId }) =>
+            Effect.succeed({
+              schemaVersion: 2,
+              snapshotSequence: 1,
+              threads: [thread, otherThread].filter(
+                (candidate) => threadId === undefined || candidate.id === threadId,
+              ),
+              archivedThreads: [],
+            }),
+        }),
+        Layer.mock(ProjectStore.ProjectStoreV2)({
+          listShells: () => Effect.succeed([project]),
+          getShell: () => Effect.succeedSome(project),
+        }),
+        Layer.mock(GitManager.GitManager)({
+          branchPullRequest: (input, options) =>
+            Effect.gen(function* () {
+              lookups.push({ branch: input.branch, refresh: options?.refresh ?? false });
+              if (!(yield* Deferred.isDone(turnEndQueued))) {
+                yield* Deferred.succeed(sweepStarted, undefined);
+                yield* Deferred.await(turnEndQueued);
+              } else if (
+                input.branch === thread.branch &&
+                !(yield* Deferred.isDone(followUpQueued))
+              ) {
+                yield* Deferred.succeed(lookupStarted, undefined);
+                yield* Deferred.await(followUpQueued);
+              }
+              return null;
+            }),
+        }),
+        Layer.mock(PullRequestService.PullRequestService)({
+          notifyLinkedThreadsChanged: Effect.void,
+        }),
+        Layer.mock(RepositoryIdentityResolver.RepositoryIdentityResolver)({
+          resolve: () =>
+            Effect.succeed({
+              canonicalKey: "github.com/acme/project",
+              locator: {
+                source: "git-remote" as const,
+                remoteName: "origin",
+                remoteUrl: "git@github.com:acme/project.git",
+              },
+              provider: SourceControlProviderKind.make("github"),
+              owner: "acme",
+              name: "project",
+            }),
+        }),
+        Layer.mock(BackgroundPolicy.BackgroundPolicy)({
+          shouldRunScopeWork: () => Effect.succeed(false),
+          shouldRunOpportunisticWork: Effect.succeed(false),
+        }),
+        Layer.succeed(ServerActivation.ServerActivation, Deferred.await(activation)),
+        Layer.succeed(
+          SecureRandom.SecureRandom,
+          SecureRandom.make((size) => new Uint8Array(size).fill(1)),
+        ),
+        FileSystem.layerNoop({}),
+        Path.layer,
+      );
+      yield* Effect.gen(function* () {
+        const service = yield* ThreadPullRequestService.make;
+        yield* service.start();
+        yield* Deferred.succeed(activation, undefined);
+        yield* Deferred.await(followUpQueued);
+        yield* service.drain;
+      }).pipe(Effect.provide(dependencies));
+
+      // The startup sweep, one refresh lookup per thread for its turn-end batch, then one
+      // follow-up refresh for the events that arrived during the thread's lookup.
+      expect(lookups).toEqual([
+        { branch: thread.branch, refresh: false },
+        { branch: otherThread.branch, refresh: false },
+        { branch: thread.branch, refresh: true },
+        { branch: otherThread.branch, refresh: true },
+        { branch: thread.branch, refresh: true },
+      ]);
+    }),
+  );
+
+  it.effect.each([
+    {
+      worktree: "a linked worktree",
+      existingPaths: ["/workspace/worktree", "/workspace/worktree/.git"],
+      unreadablePaths: [],
+      cwd: "/workspace/worktree",
+    },
+    // A folder that outlived its .git makes git fail with not_a_repository.
+    {
+      worktree: "a folder without .git",
+      existingPaths: ["/workspace/worktree"],
+      unreadablePaths: [],
+      cwd: "/workspace/project",
+    },
+    {
+      worktree: "a folder whose .git cannot be checked",
+      existingPaths: ["/workspace/worktree"],
+      unreadablePaths: ["/workspace/worktree/.git"],
+      cwd: "/workspace/worktree",
+    },
+    {
+      worktree: "a missing folder",
+      existingPaths: [],
+      unreadablePaths: [],
+      cwd: "/workspace/project",
+    },
+  ] as const)(
+    "looks up a branch whose worktree is $worktree in $cwd",
+    ({ existingPaths, unreadablePaths, cwd }) =>
       Effect.gen(function* () {
-        // Polling active branches without a connected client wastes GitHub requests.
-        const thread = { ...threadShell("idle-branch-thread"), branch: "feature/idle" };
+        const thread = {
+          ...threadShell("worktree-thread"),
+          settledOverride: "settled" as const,
+          settledAt: NOW,
+          branch: "feature/worktree",
+          worktreePath: "/workspace/worktree",
+        };
         const project: OrchestrationProjectShell = {
           id: thread.projectId,
           title: "Project",
@@ -103,34 +436,35 @@ describe("ThreadPullRequestServiceV2 reads", () => {
           updatedAt: "2026-08-01T00:00:00.000Z",
         };
         const activation = yield* Deferred.make<void>();
-        const domainEvents = yield* Queue.unbounded<OrchestrationV2DomainEvent>();
-        const turnLookup = yield* Deferred.make<void>();
-        const lookups: Array<{ readonly refresh: boolean }> = [];
+        const sweepStarted = yield* Deferred.make<void>();
+        const lookupCwds: Array<string> = [];
         const dependencies = Layer.mergeAll(
           Layer.mock(Orchestrator.OrchestratorV2)({
-            streamDomainEvents: Stream.fromQueue(domainEvents),
+            streamDomainEvents: Stream.never,
             getPullRequestSnapshot: () =>
-              Effect.succeed({
-                schemaVersion: 2,
-                snapshotSequence: 1,
-                threads: [thread],
-                archivedThreads: [],
-              }),
+              Deferred.succeed(sweepStarted, undefined).pipe(
+                Effect.as({
+                  schemaVersion: 2,
+                  snapshotSequence: 1,
+                  threads: [thread],
+                  archivedThreads: [],
+                }),
+              ),
           }),
           Layer.mock(ProjectStore.ProjectStoreV2)({
             listShells: () => Effect.succeed([project]),
             getShell: () => Effect.succeedSome(project),
           }),
           Layer.mock(GitManager.GitManager)({
-            branchPullRequest: (_input, options) =>
-              Effect.gen(function* () {
-                const refresh = options?.refresh ?? false;
-                lookups.push({ refresh });
-                if (refresh) yield* Deferred.succeed(turnLookup, undefined);
+            branchPullRequest: (input) =>
+              Effect.sync(() => {
+                lookupCwds.push(input.cwd);
                 return null;
               }),
           }),
-          Layer.mock(PullRequestService.PullRequestService)({}),
+          Layer.mock(PullRequestService.PullRequestService)({
+            notifyLinkedThreadsChanged: Effect.void,
+          }),
           Layer.mock(RepositoryIdentityResolver.RepositoryIdentityResolver)({
             resolve: () =>
               Effect.succeed({
@@ -145,52 +479,195 @@ describe("ThreadPullRequestServiceV2 reads", () => {
                 name: "project",
               }),
           }),
-          // No client holds an activity lease.
-          Layer.mock(BackgroundPolicy.BackgroundPolicy)({
-            shouldRunScopeWork: () => Effect.succeed(false),
-            shouldRunOpportunisticWork: Effect.succeed(false),
-          }),
+          Layer.mock(BackgroundPolicy.BackgroundPolicy)({}),
           Layer.succeed(ServerActivation.ServerActivation, Deferred.await(activation)),
           Layer.succeed(
             SecureRandom.SecureRandom,
             SecureRandom.make((size) => new Uint8Array(size).fill(1)),
           ),
-          FileSystem.layerNoop({}),
+          FileSystem.layerNoop({
+            exists: (path) =>
+              unreadablePaths.some((entry) => entry === path)
+                ? Effect.fail(
+                    PlatformError.systemError({
+                      _tag: "PermissionDenied",
+                      module: "FileSystem",
+                      method: "exists",
+                      pathOrDescriptor: path,
+                    }),
+                  )
+                : Effect.succeed(existingPaths.some((entry) => entry === path)),
+          }),
           Path.layer,
         );
         yield* Effect.gen(function* () {
           const service = yield* ThreadPullRequestService.make;
           yield* service.start();
           yield* Deferred.succeed(activation, undefined);
-
-          // A finished turn still discovers the pull request for its branch.
-          yield* Queue.offer(domainEvents, {
-            type: "checkpoint.captured",
-            threadId: thread.id,
-          } as OrchestrationV2DomainEvent);
-          yield* Deferred.await(turnLookup);
-          yield* service.drain;
-          const lookupsBeforeIdle = lookups.length;
-
-          yield* TestClock.adjust("10 minutes");
+          yield* Deferred.await(sweepStarted);
           yield* service.drain;
-
-          expect(lookups.slice(lookupsBeforeIdle)).toEqual([]);
         }).pipe(Effect.provide(dependencies));
+
+        expect(lookupCwds).toEqual([cwd]);
       }),
-    ),
   );
 
-  it.effect("looks up a finished turn's branch once for all its turn-end events", () =>
-    Effect.scoped(
+  it.effect("leaves delegated child threads to their own refresh instead of the sweep", () =>
+    Effect.gen(function* () {
+      const parent = {
+        ...threadShell("parent-thread"),
+        branch: "feature/parent",
+        worktreePath: "/workspace/parent",
+      };
+      const child: OrchestrationV2ThreadShell = {
+        ...threadShell("child-thread"),
+        branch: "t3/reply-ok",
+        worktreePath: "/workspace/child",
+        lineage: {
+          rootThreadId: parent.id,
+          parentThreadId: parent.id,
+          relationshipToParent: "subagent",
+        },
+      };
+      const project: OrchestrationProjectShell = {
+        id: parent.projectId,
+        title: "Project",
+        workspaceRoot: "/workspace/project",
+        defaultModelSelection: null,
+        scripts: [],
+        createdAt: "2026-08-01T00:00:00.000Z",
+        updatedAt: "2026-08-01T00:00:00.000Z",
+      };
+      const activation = yield* Deferred.make<void>();
+      const domainEvents = yield* Queue.unbounded<OrchestrationV2DomainEvent>();
+      const sweeps = yield* Queue.unbounded<void>();
+      const childLookup = yield* Deferred.make<void>();
+      const lookups: Array<{ readonly branch: string; readonly refresh: boolean }> = [];
+      const dependencies = Layer.mergeAll(
+        Layer.mock(Orchestrator.OrchestratorV2)({
+          streamDomainEvents: Stream.fromQueue(domainEvents),
+          getPullRequestSnapshot: ({ threadId }) =>
+            threadId !== undefined
+              ? Effect.succeed({ snapshotSequence: 1, threads: [child] })
+              : Queue.offer(sweeps, undefined).pipe(
+                  Effect.as({
+                    schemaVersion: 2,
+                    snapshotSequence: 1,
+                    threads: [parent, child],
+                    archivedThreads: [],
+                  }),
+                ),
+        }),
+        Layer.mock(ProjectStore.ProjectStoreV2)({
+          listShells: () => Effect.succeed([project]),
+          getShell: () => Effect.succeedSome(project),
+        }),
+        Layer.mock(GitManager.GitManager)({
+          branchPullRequest: (input, options) =>
+            Effect.gen(function* () {
+              const refresh = options?.refresh ?? false;
+              lookups.push({ branch: input.branch, refresh });
+              if (input.branch === child.branch && refresh) {
+                yield* Deferred.succeed(childLookup, undefined);
+              }
+              return null;
+            }),
+        }),
+        Layer.mock(PullRequestService.PullRequestService)({
+          notifyLinkedThreadsChanged: Effect.void,
+        }),
+        Layer.mock(RepositoryIdentityResolver.RepositoryIdentityResolver)({
+          resolve: () =>
+            Effect.succeed({
+              canonicalKey: "github.com/acme/project",
+              locator: {
+                source: "git-remote" as const,
+                remoteName: "origin",
+                remoteUrl: "git@github.com:acme/project.git",
+              },
+              provider: SourceControlProviderKind.make("github"),
+              owner: "acme",
+              name: "project",
+            }),
+        }),
+        Layer.mock(BackgroundPolicy.BackgroundPolicy)({
+          shouldRunScopeWork: () => Effect.succeed(true),
+          shouldRunOpportunisticWork: Effect.succeed(true),
+        }),
+        Layer.succeed(ServerActivation.ServerActivation, Deferred.await(activation)),
+        Layer.succeed(
+          SecureRandom.SecureRandom,
+          SecureRandom.make((size) => new Uint8Array(size).fill(1)),
+        ),
+        FileSystem.layerNoop({}),
+        Path.layer,
+      );
+      yield* Effect.gen(function* () {
+        const service = yield* ThreadPullRequestService.make;
+        yield* service.start();
+        yield* Deferred.succeed(activation, undefined);
+
+        // Startup backfill sweep, then one periodic sweep.
+        yield* Queue.take(sweeps);
+        yield* service.drain;
+        yield* TestClock.adjust("1 minute");
+        yield* Queue.take(sweeps);
+        yield* service.drain;
+        const sweepLookups = lookups.map((lookup) => lookup.branch).toSorted();
+
+        // The child's own turn still discovers its pull request.
+        yield* Queue.offer(domainEvents, {
+          type: "checkpoint.captured",
+          threadId: child.id,
+        } as OrchestrationV2DomainEvent);
+        yield* Deferred.await(childLookup);
+        yield* service.drain;
+
+        expect(sweepLookups).toEqual([parent.branch, parent.branch]);
+        expect(lookups.slice(sweepLookups.length)).toEqual([
+          { branch: child.branch, refresh: true },
+        ]);
+      }).pipe(Effect.provide(dependencies));
+    }),
+  );
+
+  it.effect.each([
+    { state: "open", checkedOut: false },
+    { state: "merged", checkedOut: false },
+    { state: "closed", checkedOut: false },
+    { state: "merged", checkedOut: true },
+  ] as const)(
+    "associates a $state branch PR (checkedOut=$checkedOut) only with threads that predate its completion or saved it",
+    ({ state, checkedOut }) =>
       Effect.gen(function* () {
-        const thread = { ...threadShell("turn-end-thread"), branch: "t3/turn-end" };
-        const otherThread = {
-          ...threadShell("other-turn-end-thread"),
-          branch: "t3/other-turn-end",
+        const reference = {
+          projectId: ProjectId.make("project-1"),
+          repository: "acme/project",
+          number: 42,
+          url: "https://github.com/acme/project/pull/42",
         };
+        const terminalAt = "2026-09-19T00:00:00.000Z";
+        const detected = {
+          number: 42,
+          url: reference.url,
+          title: "Previous staging work",
+          baseRef: "main",
+          headRef: "staging",
+          state,
+          updatedAt: terminalAt,
+          closedAt: state === "closed" ? terminalAt : null,
+          mergedAt: state === "merged" ? terminalAt : null,
+          repositoryKey: "github.com/acme/project",
+        };
+        const threads = [
+          { ...threadShell("older"), createdAt: DateTime.makeUnsafe("2026-09-18T00:00:00Z") },
+          { ...threadShell("same-time"), createdAt: DateTime.makeUnsafe(terminalAt) },
+          threadShell("new"),
+          { ...threadShell("saved"), branchPullRequest: reference },
+          { ...threadShell("explicit"), linkedPullRequest: reference },
+        ].map((thread) => ({ ...thread, branch: "staging" }));
         const project: OrchestrationProjectShell = {
-          id: thread.projectId,
+          id: reference.projectId,
           title: "Project",
           workspaceRoot: "/workspace/project",
           defaultModelSelection: null,
@@ -198,51 +675,20 @@ describe("ThreadPullRequestServiceV2 reads", () => {
           createdAt: "2026-08-01T00:00:00.000Z",
           updatedAt: "2026-08-01T00:00:00.000Z",
         };
-        // A turn end commits its checkpoints and the run's end together. The queued
-        // non-refresh request ahead of them must still become a refresh when they join it.
-        const turnEnd = [
-          { type: "thread.metadata-updated", threadId: thread.id },
-          { type: "checkpoint.captured", threadId: thread.id },
-          { type: "checkpoint.captured", threadId: thread.id },
-          { type: "run.updated", threadId: thread.id, payload: { status: "completed" } },
-          { type: "checkpoint.captured", threadId: otherThread.id },
-          { type: "run.updated", threadId: otherThread.id, payload: { status: "completed" } },
-        ] as Array<OrchestrationV2DomainEvent>;
-        // Arrives during the thread's own lookup, which may already have read the old host state.
-        const duringLookup = [
-          { type: "checkpoint.captured", threadId: thread.id },
-          { type: "thread.metadata-updated", threadId: thread.id },
-        ] as Array<OrchestrationV2DomainEvent>;
         const activation = yield* Deferred.make<void>();
         const sweepStarted = yield* Deferred.make<void>();
-        const turnEndQueued = yield* Deferred.make<void>();
-        const lookupStarted = yield* Deferred.make<void>();
-        const followUpQueued = yield* Deferred.make<void>();
-        const lookups: Array<{ readonly branch: string; readonly refresh: boolean }> = [];
+        const commands: Array<OrchestrationV2ServerCommand> = [];
         const dependencies = Layer.mergeAll(
           Layer.mock(Orchestrator.OrchestratorV2)({
-            // The batch arrives while the worker is busy with the startup sweep.
-            streamDomainEvents: Stream.fromEffect(Deferred.await(sweepStarted)).pipe(
-              Stream.drain,
-              Stream.concat(Stream.fromIterable(turnEnd)),
-              Stream.concat(
-                Stream.fromEffect(Deferred.succeed(turnEndQueued, undefined)).pipe(Stream.drain),
-              ),
-              Stream.concat(Stream.fromEffect(Deferred.await(lookupStarted)).pipe(Stream.drain)),
-              Stream.concat(Stream.fromIterable(duringLookup)),
-              Stream.concat(
-                Stream.fromEffect(Deferred.succeed(followUpQueued, undefined)).pipe(Stream.drain),
+            streamDomainEvents: Stream.never,
+            getPullRequestSnapshot: () =>
+              Deferred.succeed(sweepStarted, undefined).pipe(
+                Effect.as({ snapshotSequence: 1, threads }),
               ),
-              Stream.concat(Stream.never),
-            ),
-            getPullRequestSnapshot: ({ threadId }) =>
-              Effect.succeed({
-                schemaVersion: 2,
-                snapshotSequence: 1,
-                threads: [thread, otherThread].filter(
-                  (candidate) => threadId === undefined || candidate.id === threadId,
-                ),
-                archivedThreads: [],
+            dispatch: (command) =>
+              Effect.sync(() => {
+                commands.push(command);
+                return { sequence: 2, storedEvents: [] };
               }),
           }),
           Layer.mock(ProjectStore.ProjectStoreV2)({
@@ -250,23 +696,19 @@ describe("ThreadPullRequestServiceV2 reads", () => {
             getShell: () => Effect.succeedSome(project),
           }),
           Layer.mock(GitManager.GitManager)({
-            branchPullRequest: (input, options) =>
-              Effect.gen(function* () {
-                lookups.push({ branch: input.branch, refresh: options?.refresh ?? false });
-                if (!(yield* Deferred.isDone(turnEndQueued))) {
-                  yield* Deferred.succeed(sweepStarted, undefined);
-                  yield* Deferred.await(turnEndQueued);
-                } else if (
-                  input.branch === thread.branch &&
-                  !(yield* Deferred.isDone(followUpQueued))
-                ) {
-                  yield* Deferred.succeed(lookupStarted, undefined);
-                  yield* Deferred.await(followUpQueued);
-                }
-                return null;
+            branchPullRequest: () => Effect.succeed(detected),
+            checkedOutPullRequest: () => Effect.succeed(checkedOut),
+          }),
+          Layer.mock(PullRequestService.PullRequestService)({
+            summary: () =>
+              Effect.succeed({
+                ...detected,
+                ...reference,
+                provider: SourceControlProviderKind.make("github"),
+                baseBranch: detected.baseRef,
+                headBranch: detected.headRef,
               }),
           }),
-          Layer.mock(PullRequestService.PullRequestService)({}),
           Layer.mock(RepositoryIdentityResolver.RepositoryIdentityResolver)({
             resolve: () =>
               Effect.succeed({
@@ -281,10 +723,7 @@ describe("ThreadPullRequestServiceV2 reads", () => {
                 name: "project",
               }),
           }),
-          Layer.mock(BackgroundPolicy.BackgroundPolicy)({
-            shouldRunScopeWork: () => Effect.succeed(false),
-            shouldRunOpportunisticWork: Effect.succeed(false),
-          }),
+          Layer.mock(BackgroundPolicy.BackgroundPolicy)({}),
           Layer.succeed(ServerActivation.ServerActivation, Deferred.await(activation)),
           Layer.succeed(
             SecureRandom.SecureRandom,
@@ -297,166 +736,48 @@ describe("ThreadPullRequestServiceV2 reads", () => {
           const service = yield* ThreadPullRequestService.make;
           yield* service.start();
           yield* Deferred.succeed(activation, undefined);
-          yield* Deferred.await(followUpQueued);
+          yield* Deferred.await(sweepStarted);
           yield* service.drain;
         }).pipe(Effect.provide(dependencies));
 
-        // The startup sweep, one refresh lookup per thread for its turn-end batch, then one
-        // follow-up refresh for the events that arrived during the thread's lookup.
-        expect(lookups).toEqual([
-          { branch: thread.branch, refresh: false },
-          { branch: otherThread.branch, refresh: false },
-          { branch: thread.branch, refresh: true },
-          { branch: otherThread.branch, refresh: true },
-          { branch: thread.branch, refresh: true },
-        ]);
+        expect(
+          commands.map((command) => {
+            if (command.type !== "thread.pull-request.sync") throw new Error(command.type);
+            expect(command).not.toHaveProperty("linkedPullRequest");
+            return [command.threadId, command.branchPullRequest];
+          }),
+        ).toEqual(
+          (state === "open" || checkedOut
+            ? ["older", "same-time", "new", "explicit"]
+            : ["older", "same-time"]
+          ).map((id) => [id, reference]),
+        );
       }),
-    ),
   );
 
   it.effect.each([
-    {
-      worktree: "a linked worktree",
-      existingPaths: ["/workspace/worktree", "/workspace/worktree/.git"],
-      unreadablePaths: [],
-      cwd: "/workspace/worktree",
-    },
-    // A folder that outlived its .git makes git fail with not_a_repository.
-    {
-      worktree: "a folder without .git",
-      existingPaths: ["/workspace/worktree"],
-      unreadablePaths: [],
-      cwd: "/workspace/project",
-    },
-    {
-      worktree: "a folder whose .git cannot be checked",
-      existingPaths: ["/workspace/worktree"],
-      unreadablePaths: ["/workspace/worktree/.git"],
-      cwd: "/workspace/worktree",
-    },
-    {
-      worktree: "a missing folder",
-      existingPaths: [],
-      unreadablePaths: [],
-      cwd: "/workspace/project",
-    },
+    { state: "closed", sameBranch: false },
+    { state: "merged", sameBranch: false },
+    { state: "closed", sameBranch: true },
+    { state: "merged", sameBranch: true },
   ] as const)(
-    "looks up a branch whose worktree is $worktree in $cwd",
-    ({ existingPaths, unreadablePaths, cwd }) =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const thread = {
-            ...threadShell("worktree-thread"),
-            settledOverride: "settled" as const,
-            settledAt: NOW,
-            branch: "feature/worktree",
-            worktreePath: "/workspace/worktree",
-          };
-          const project: OrchestrationProjectShell = {
-            id: thread.projectId,
-            title: "Project",
-            workspaceRoot: "/workspace/project",
-            defaultModelSelection: null,
-            scripts: [],
-            createdAt: "2026-08-01T00:00:00.000Z",
-            updatedAt: "2026-08-01T00:00:00.000Z",
-          };
-          const activation = yield* Deferred.make<void>();
-          const sweepStarted = yield* Deferred.make<void>();
-          const lookupCwds: Array<string> = [];
-          const dependencies = Layer.mergeAll(
-            Layer.mock(Orchestrator.OrchestratorV2)({
-              streamDomainEvents: Stream.never,
-              getPullRequestSnapshot: () =>
-                Deferred.succeed(sweepStarted, undefined).pipe(
-                  Effect.as({
-                    schemaVersion: 2,
-                    snapshotSequence: 1,
-                    threads: [thread],
-                    archivedThreads: [],
-                  }),
-                ),
-            }),
-            Layer.mock(ProjectStore.ProjectStoreV2)({
-              listShells: () => Effect.succeed([project]),
-              getShell: () => Effect.succeedSome(project),
-            }),
-            Layer.mock(GitManager.GitManager)({
-              branchPullRequest: (input) =>
-                Effect.sync(() => {
-                  lookupCwds.push(input.cwd);
-                  return null;
-                }),
-            }),
-            Layer.mock(PullRequestService.PullRequestService)({}),
-            Layer.mock(RepositoryIdentityResolver.RepositoryIdentityResolver)({
-              resolve: () =>
-                Effect.succeed({
-                  canonicalKey: "github.com/acme/project",
-                  locator: {
-                    source: "git-remote" as const,
-                    remoteName: "origin",
-                    remoteUrl: "git@github.com:acme/project.git",
-                  },
-                  provider: SourceControlProviderKind.make("github"),
-                  owner: "acme",
-                  name: "project",
-                }),
-            }),
-            Layer.mock(BackgroundPolicy.BackgroundPolicy)({}),
-            Layer.succeed(ServerActivation.ServerActivation, Deferred.await(activation)),
-            Layer.succeed(
-              SecureRandom.SecureRandom,
-              SecureRandom.make((size) => new Uint8Array(size).fill(1)),
-            ),
-            FileSystem.layerNoop({
-              exists: (path) =>
-                unreadablePaths.some((entry) => entry === path)
-                  ? Effect.fail(
-                      PlatformError.systemError({
-                        _tag: "PermissionDenied",
-                        module: "FileSystem",
-                        method: "exists",
-                        pathOrDescriptor: path,
-                      }),
-                    )
-                  : Effect.succeed(existingPaths.some((entry) => entry === path)),
-            }),
-            Path.layer,
-          );
-          yield* Effect.gen(function* () {
-            const service = yield* ThreadPullRequestService.make;
-            yield* service.start();
-            yield* Deferred.succeed(activation, undefined);
-            yield* Deferred.await(sweepStarted);
-            yield* service.drain;
-          }).pipe(Effect.provide(dependencies));
-
-          expect(lookupCwds).toEqual([cwd]);
-        }),
-      ),
-  );
-
-  it.effect("leaves delegated child threads to their own refresh instead of the sweep", () =>
-    Effect.scoped(
+    "restores a $state automatic PR only for its own branch (sameBranch=$sameBranch)",
+    ({ state, sameBranch }) =>
       Effect.gen(function* () {
-        const parent = {
-          ...threadShell("parent-thread"),
-          branch: "feature/parent",
-          worktreePath: "/workspace/parent",
+        const savedReference = {
+          projectId: ProjectId.make("project-1"),
+          repository: "acme/project",
+          number: 42,
+          url: "https://github.com/acme/project/pull/42",
         };
-        const child: OrchestrationV2ThreadShell = {
-          ...threadShell("child-thread"),
-          branch: "t3/reply-ok",
-          worktreePath: "/workspace/child",
-          lineage: {
-            rootThreadId: parent.id,
-            parentThreadId: parent.id,
-            relationshipToParent: "subagent",
-          },
+        const thread = {
+          ...threadShell("branch-pr-thread"),
+          branch: "main",
+          branchPullRequest: savedReference,
+          linkedPullRequest: savedReference,
         };
         const project: OrchestrationProjectShell = {
-          id: parent.projectId,
+          id: thread.projectId,
           title: "Project",
           workspaceRoot: "/workspace/project",
           defaultModelSelection: null,
@@ -465,41 +786,70 @@ describe("ThreadPullRequestServiceV2 reads", () => {
           updatedAt: "2026-08-01T00:00:00.000Z",
         };
         const activation = yield* Deferred.make<void>();
-        const domainEvents = yield* Queue.unbounded<OrchestrationV2DomainEvent>();
-        const sweeps = yield* Queue.unbounded<void>();
-        const childLookup = yield* Deferred.make<void>();
-        const lookups: Array<{ readonly branch: string; readonly refresh: boolean }> = [];
+        const sweepStarted = yield* Deferred.make<void>();
+        const commands: Array<OrchestrationV2ServerCommand> = [];
+        let snapshotThread: unknown;
         const dependencies = Layer.mergeAll(
           Layer.mock(Orchestrator.OrchestratorV2)({
-            streamDomainEvents: Stream.fromQueue(domainEvents),
-            getPullRequestSnapshot: ({ threadId }) =>
-              threadId !== undefined
-                ? Effect.succeed({ snapshotSequence: 1, threads: [child] })
-                : Queue.offer(sweeps, undefined).pipe(
-                    Effect.as({
-                      schemaVersion: 2,
-                      snapshotSequence: 1,
-                      threads: [parent, child],
-                      archivedThreads: [],
-                    }),
-                  ),
+            streamDomainEvents: Stream.never,
+            getPullRequestSnapshot: (options) =>
+              Effect.gen(function* () {
+                const store = yield* ProjectionStore.ProjectionStoreV2;
+                yield* store.apply({
+                  id: EventId.make(`event:${thread.id}:created`),
+                  type: "thread.created",
+                  threadId: thread.id,
+                  occurredAt: NOW,
+                  payload: { ...thread, lastVisitedAt: thread.lastVisitedAt ?? null },
+                });
+                const sql = yield* SqlClient.SqlClient;
+                yield* sql`INSERT INTO orchestration_events (
+                    sequence, event_id, aggregate_kind, stream_id, stream_version, event_type,
+                    occurred_at, actor_kind, payload_json, metadata_json, application_event_version
+                  ) VALUES (7, 'pr-discovery', 'thread', ${thread.id}, 1, 'thread.created',
+                    '2026-09-20T00:00:00.000Z', 'system', '{}', '{}', 2)`;
+                for (const table of [
+                  "orchestration_v2_projection_turn_items",
+                  "orchestration_v2_projection_messages",
+                  "orchestration_v2_projection_provider_threads",
+                  "orchestration_v2_projection_runs",
+                ])
+                  yield* sql.unsafe(`DROP TABLE ${table}`);
+                const snapshot = yield* store.getPullRequestSnapshot(options);
+                snapshotThread = snapshot.threads[0];
+                yield* Deferred.succeed(sweepStarted, undefined);
+                return snapshot;
+              }).pipe(
+                Effect.provide(
+                  ProjectionStore.layer.pipe(Layer.provideMerge(SqlitePersistence.layerMemory)),
+                ),
+                Effect.orDie,
+              ),
+            dispatch: (command) =>
+              Effect.sync(() => {
+                commands.push(command);
+                return { sequence: 2, storedEvents: [] };
+              }),
           }),
           Layer.mock(ProjectStore.ProjectStoreV2)({
             listShells: () => Effect.succeed([project]),
             getShell: () => Effect.succeedSome(project),
           }),
           Layer.mock(GitManager.GitManager)({
-            branchPullRequest: (input, options) =>
-              Effect.gen(function* () {
-                const refresh = options?.refresh ?? false;
-                lookups.push({ branch: input.branch, refresh });
-                if (input.branch === child.branch && refresh) {
-                  yield* Deferred.succeed(childLookup, undefined);
-                }
-                return null;
+            branchPullRequest: () => Effect.succeed(null),
+          }),
+          Layer.mock(PullRequestService.PullRequestService)({
+            summary: () =>
+              Effect.succeed({
+                ...savedReference,
+                provider: SourceControlProviderKind.make("github"),
+                title: "Previous branch work",
+                state,
+                headBranch: sameBranch ? thread.branch : "feature/previous-work",
+                baseBranch: "release",
+                updatedAt: "2026-09-19T00:00:00.000Z",
               }),
           }),
-          Layer.mock(PullRequestService.PullRequestService)({}),
           Layer.mock(RepositoryIdentityResolver.RepositoryIdentityResolver)({
             resolve: () =>
               Effect.succeed({
@@ -514,10 +864,7 @@ describe("ThreadPullRequestServiceV2 reads", () => {
                 name: "project",
               }),
           }),
-          Layer.mock(BackgroundPolicy.BackgroundPolicy)({
-            shouldRunScopeWork: () => Effect.succeed(true),
-            shouldRunOpportunisticWork: Effect.succeed(true),
-          }),
+          Layer.mock(BackgroundPolicy.BackgroundPolicy)({}),
           Layer.succeed(ServerActivation.ServerActivation, Deferred.await(activation)),
           Layer.succeed(
             SecureRandom.SecureRandom,
@@ -530,306 +877,276 @@ describe("ThreadPullRequestServiceV2 reads", () => {
           const service = yield* ThreadPullRequestService.make;
           yield* service.start();
           yield* Deferred.succeed(activation, undefined);
-
-          // Startup backfill sweep, then one periodic sweep.
-          yield* Queue.take(sweeps);
+          yield* Deferred.await(sweepStarted);
           yield* service.drain;
-          yield* TestClock.adjust("1 minute");
-          yield* Queue.take(sweeps);
-          yield* service.drain;
-          const sweepLookups = lookups.map((lookup) => lookup.branch).toSorted();
-
-          // The child's own turn still discovers its pull request.
-          yield* Queue.offer(domainEvents, {
-            type: "checkpoint.captured",
-            threadId: child.id,
-          } as OrchestrationV2DomainEvent);
-          yield* Deferred.await(childLookup);
-          yield* service.drain;
-
-          expect(sweepLookups).toEqual([parent.branch, parent.branch]);
-          expect(lookups.slice(sweepLookups.length)).toEqual([
-            { branch: child.branch, refresh: true },
-          ]);
         }).pipe(Effect.provide(dependencies));
+
+        expect(snapshotThread).toHaveProperty("createdAt", NOW);
+        if (sameBranch) {
+          expect(commands).toEqual([]);
+        } else {
+          expect(commands).toHaveLength(1);
+          expect(commands[0]).toMatchObject({
+            type: "thread.pull-request.sync",
+            threadId: thread.id,
+            snapshotSequence: 7,
+            expected: {
+              workspaceRoot: project.workspaceRoot,
+              branch: thread.branch,
+              worktreePath: thread.worktreePath,
+              linkedPullRequest: savedReference,
+              branchPullRequest: savedReference,
+            },
+            branchPullRequest: null,
+          });
+          expect(commands[0]).not.toHaveProperty("linkedPullRequest");
+        }
       }),
-    ),
   );
 
-  it.effect.each([
-    { state: "open", checkedOut: false },
-    { state: "merged", checkedOut: false },
-    { state: "closed", checkedOut: false },
-    { state: "merged", checkedOut: true },
-  ] as const)(
-    "associates a $state branch PR (checkedOut=$checkedOut) only with threads that predate its completion or saved it",
-    ({ state, checkedOut }) =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const reference = {
-            projectId: ProjectId.make("project-1"),
-            repository: "acme/project",
-            number: 42,
-            url: "https://github.com/acme/project/pull/42",
-          };
-          const terminalAt = "2026-09-19T00:00:00.000Z";
-          const detected = {
-            number: 42,
-            url: reference.url,
-            title: "Previous staging work",
-            baseRef: "main",
-            headRef: "staging",
-            state,
-            updatedAt: terminalAt,
-            closedAt: state === "closed" ? terminalAt : null,
-            mergedAt: state === "merged" ? terminalAt : null,
-            repositoryKey: "github.com/acme/project",
-          };
-          const threads = [
-            { ...threadShell("older"), createdAt: DateTime.makeUnsafe("2026-09-18T00:00:00Z") },
-            { ...threadShell("same-time"), createdAt: DateTime.makeUnsafe(terminalAt) },
-            threadShell("new"),
-            { ...threadShell("saved"), branchPullRequest: reference },
-            { ...threadShell("explicit"), linkedPullRequest: reference },
-          ].map((thread) => ({ ...thread, branch: "staging" }));
-          const project: OrchestrationProjectShell = {
-            id: reference.projectId,
-            title: "Project",
-            workspaceRoot: "/workspace/project",
-            defaultModelSelection: null,
-            scripts: [],
-            createdAt: "2026-08-01T00:00:00.000Z",
-            updatedAt: "2026-08-01T00:00:00.000Z",
-          };
-          const activation = yield* Deferred.make<void>();
-          const sweepStarted = yield* Deferred.make<void>();
-          const commands: Array<OrchestrationV2ServerCommand> = [];
-          const dependencies = Layer.mergeAll(
-            Layer.mock(Orchestrator.OrchestratorV2)({
-              streamDomainEvents: Stream.never,
-              getPullRequestSnapshot: () =>
-                Deferred.succeed(sweepStarted, undefined).pipe(
-                  Effect.as({ snapshotSequence: 1, threads }),
-                ),
-              dispatch: (command) =>
-                Effect.sync(() => {
-                  commands.push(command);
-                  return { sequence: 2, storedEvents: [] };
-                }),
-            }),
-            Layer.mock(ProjectStore.ProjectStoreV2)({
-              listShells: () => Effect.succeed([project]),
-              getShell: () => Effect.succeedSome(project),
-            }),
-            Layer.mock(GitManager.GitManager)({
-              branchPullRequest: () => Effect.succeed(detected),
-              checkedOutPullRequest: () => Effect.succeed(checkedOut),
-            }),
-            Layer.mock(PullRequestService.PullRequestService)({
-              summary: () =>
-                Effect.succeed({
-                  ...detected,
-                  ...reference,
-                  provider: SourceControlProviderKind.make("github"),
-                  baseBranch: detected.baseRef,
-                  headBranch: detected.headRef,
-                }),
+  it.effect("a saved merged branch PR rereads no git state on each sweep", () =>
+    Effect.gen(function* () {
+      const savedReference = {
+        projectId: ProjectId.make("project-1"),
+        repository: "acme/project",
+        number: 42,
+        url: "https://github.com/acme/project/pull/42",
+      };
+      const thread = {
+        ...threadShell("merged-branch-thread"),
+        branch: "feature/merged",
+        branchPullRequest: savedReference,
+      };
+      const project: OrchestrationProjectShell = {
+        id: thread.projectId,
+        title: "Project",
+        workspaceRoot: "/workspace/project",
+        defaultModelSelection: null,
+        scripts: [],
+        createdAt: "2026-08-01T00:00:00.000Z",
+        updatedAt: "2026-08-01T00:00:00.000Z",
+      };
+      const activation = yield* Deferred.make<void>();
+      const sweeps = yield* Queue.unbounded<void>();
+      const commands: Array<OrchestrationV2ServerCommand> = [];
+      const lookups: Array<Parameters<GitManager.GitManager["Service"]["branchPullRequest"]>[1]> =
+        [];
+      const dependencies = Layer.mergeAll(
+        Layer.mock(Orchestrator.OrchestratorV2)({
+          streamDomainEvents: Stream.never,
+          getPullRequestSnapshot: () =>
+            Queue.offer(sweeps, undefined).pipe(
+              Effect.as({
+                schemaVersion: 2,
+                snapshotSequence: 1,
+                threads: [thread],
+                archivedThreads: [],
+              }),
+            ),
+          dispatch: (command) =>
+            Effect.sync(() => {
+              commands.push(command);
+              return { sequence: 2, storedEvents: [] };
             }),
-            Layer.mock(RepositoryIdentityResolver.RepositoryIdentityResolver)({
-              resolve: () =>
-                Effect.succeed({
-                  canonicalKey: "github.com/acme/project",
-                  locator: {
-                    source: "git-remote" as const,
-                    remoteName: "origin",
-                    remoteUrl: "git@github.com:acme/project.git",
-                  },
-                  provider: SourceControlProviderKind.make("github"),
-                  owner: "acme",
-                  name: "project",
-                }),
+        }),
+        Layer.mock(ProjectStore.ProjectStoreV2)({
+          listShells: () => Effect.succeed([project]),
+          getShell: () => Effect.succeedSome(project),
+        }),
+        Layer.mock(GitManager.GitManager)({
+          branchPullRequest: (_input, options) =>
+            Effect.sync(() => {
+              lookups.push(options);
+              return {
+                number: 42,
+                title: "Merged work",
+                url: savedReference.url,
+                baseRef: "main",
+                headRef: thread.branch,
+                state: "merged" as const,
+                repositoryKey: "github.com/acme/project",
+                updatedAt: "2026-09-19T00:00:00.000Z",
+                closedAt: null,
+                mergedAt: "2026-09-19T00:00:00.000Z",
+              };
             }),
-            Layer.mock(BackgroundPolicy.BackgroundPolicy)({}),
-            Layer.succeed(ServerActivation.ServerActivation, Deferred.await(activation)),
-            Layer.succeed(
-              SecureRandom.SecureRandom,
-              SecureRandom.make((size) => new Uint8Array(size).fill(1)),
-            ),
-            FileSystem.layerNoop({}),
-            Path.layer,
-          );
-          yield* Effect.gen(function* () {
-            const service = yield* ThreadPullRequestService.make;
-            yield* service.start();
-            yield* Deferred.succeed(activation, undefined);
-            yield* Deferred.await(sweepStarted);
-            yield* service.drain;
-          }).pipe(Effect.provide(dependencies));
-
-          expect(
-            commands.map((command) => {
-              if (command.type !== "thread.pull-request.sync") throw new Error(command.type);
-              expect(command).not.toHaveProperty("linkedPullRequest");
-              return [command.threadId, command.branchPullRequest];
+        }),
+        Layer.mock(PullRequestService.PullRequestService)({
+          notifyLinkedThreadsChanged: Effect.void,
+        }),
+        Layer.mock(RepositoryIdentityResolver.RepositoryIdentityResolver)({
+          resolve: () =>
+            Effect.succeed({
+              canonicalKey: "github.com/acme/project",
+              locator: {
+                source: "git-remote" as const,
+                remoteName: "origin",
+                remoteUrl: "git@github.com:acme/project.git",
+              },
+              provider: SourceControlProviderKind.make("github"),
+              owner: "acme",
+              name: "project",
             }),
-          ).toEqual(
-            (state === "open" || checkedOut
-              ? ["older", "same-time", "new", "explicit"]
-              : ["older", "same-time"]
-            ).map((id) => [id, reference]),
-          );
         }),
-      ),
+        // A connected client keeps the periodic sweep running.
+        Layer.mock(BackgroundPolicy.BackgroundPolicy)({
+          shouldRunOpportunisticWork: Effect.succeed(true),
+        }),
+        Layer.succeed(ServerActivation.ServerActivation, Deferred.await(activation)),
+        Layer.succeed(
+          SecureRandom.SecureRandom,
+          SecureRandom.make((size) => new Uint8Array(size).fill(1)),
+        ),
+        FileSystem.layerNoop({}),
+        Path.layer,
+      );
+      yield* Effect.gen(function* () {
+        const service = yield* ThreadPullRequestService.make;
+        yield* service.start();
+        yield* Deferred.succeed(activation, undefined);
+        yield* Queue.take(sweeps);
+        yield* service.drain;
+        yield* TestClock.adjust("1 minute");
+        yield* Queue.take(sweeps);
+        yield* service.drain;
+      }).pipe(Effect.provide(dependencies));
+
+      expect(commands).toEqual([]);
+      expect(lookups).toHaveLength(2);
+      // GitManager rereads git state on request, and by default whenever its
+      // remembered answer is merged or closed.
+      expect(
+        lookups.filter(
+          (options) =>
+            options?.refresh === true ||
+            options?.freshGitState === true ||
+            options?.confirmTerminal !== false,
+        ),
+      ).toEqual([]);
+    }),
   );
 
+  const mergedPullRequest43 = {
+    number: 43,
+    title: "Replacement work",
+    url: "https://github.com/acme/project/pull/43",
+    baseRef: "main",
+    headRef: "feature/replaced",
+    state: "merged" as const,
+    repositoryKey: "github.com/acme/project",
+    updatedAt: "2026-09-19T00:00:00.000Z",
+    closedAt: null,
+    mergedAt: "2026-09-19T00:00:00.000Z",
+  };
+
   it.effect.each([
-    { state: "closed", sameBranch: false },
-    { state: "merged", sameBranch: false },
-    { state: "closed", sameBranch: true },
-    { state: "merged", sameBranch: true },
-  ] as const)(
-    "restores a $state automatic PR only for its own branch (sameBranch=$sameBranch)",
-    ({ state, sameBranch }) =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const savedReference = {
-            projectId: ProjectId.make("project-1"),
-            repository: "acme/project",
-            number: 42,
-            url: "https://github.com/acme/project/pull/42",
-          };
-          const thread = {
-            ...threadShell("branch-pr-thread"),
-            branch: "main",
-            branchPullRequest: savedReference,
-            linkedPullRequest: savedReference,
-          };
-          const project: OrchestrationProjectShell = {
-            id: thread.projectId,
-            title: "Project",
-            workspaceRoot: "/workspace/project",
-            defaultModelSelection: null,
-            scripts: [],
-            createdAt: "2026-08-01T00:00:00.000Z",
-            updatedAt: "2026-08-01T00:00:00.000Z",
-          };
-          const activation = yield* Deferred.make<void>();
-          const sweepStarted = yield* Deferred.make<void>();
-          const commands: Array<OrchestrationV2ServerCommand> = [];
-          let snapshotThread: unknown;
-          const dependencies = Layer.mergeAll(
-            Layer.mock(Orchestrator.OrchestratorV2)({
-              streamDomainEvents: Stream.never,
-              getPullRequestSnapshot: (options) =>
-                Effect.gen(function* () {
-                  const store = yield* ProjectionStore.ProjectionStoreV2;
-                  yield* store.apply({
-                    id: EventId.make(`event:${thread.id}:created`),
-                    type: "thread.created",
-                    threadId: thread.id,
-                    occurredAt: NOW,
-                    payload: { ...thread, lastVisitedAt: thread.lastVisitedAt ?? null },
-                  });
-                  const sql = yield* SqlClient.SqlClient;
-                  yield* sql`INSERT INTO orchestration_events (
-                    sequence, event_id, aggregate_kind, stream_id, stream_version, event_type,
-                    occurred_at, actor_kind, payload_json, metadata_json, application_event_version
-                  ) VALUES (7, 'pr-discovery', 'thread', ${thread.id}, 1, 'thread.created',
-                    '2026-09-20T00:00:00.000Z', 'system', '{}', '{}', 2)`;
-                  for (const table of [
-                    "orchestration_v2_projection_turn_items",
-                    "orchestration_v2_projection_messages",
-                    "orchestration_v2_projection_provider_threads",
-                    "orchestration_v2_projection_runs",
-                  ])
-                    yield* sql.unsafe(`DROP TABLE ${table}`);
-                  const snapshot = yield* store.getPullRequestSnapshot(options);
-                  snapshotThread = snapshot.threads[0];
-                  yield* Deferred.succeed(sweepStarted, undefined);
-                  return snapshot;
-                }).pipe(
-                  Effect.provide(
-                    ProjectionStore.layer.pipe(Layer.provideMerge(SqlitePersistence.layerMemory)),
-                  ),
-                  Effect.orDie,
-                ),
-              dispatch: (command) =>
-                Effect.sync(() => {
-                  commands.push(command);
-                  return { sequence: 2, storedEvents: [] };
-                }),
-            }),
-            Layer.mock(ProjectStore.ProjectStoreV2)({
-              listShells: () => Effect.succeed([project]),
-              getShell: () => Effect.succeedSome(project),
-            }),
-            Layer.mock(GitManager.GitManager)({
-              branchPullRequest: () => Effect.succeed(null),
-            }),
-            Layer.mock(PullRequestService.PullRequestService)({
-              summary: () =>
-                Effect.succeed({
-                  ...savedReference,
-                  provider: SourceControlProviderKind.make("github"),
-                  title: "Previous branch work",
-                  state,
-                  headBranch: sameBranch ? thread.branch : "feature/previous-work",
-                  baseBranch: "release",
-                  updatedAt: "2026-09-19T00:00:00.000Z",
-                }),
+    { name: "reopened", fresh: { ...mergedPullRequest43, state: "open" as const }, writes: false },
+    { name: "the same merged PR", fresh: mergedPullRequest43, writes: true },
+  ])("saves a remembered merged PR only when fresh git state finds $name", ({ fresh, writes }) =>
+    Effect.gen(function* () {
+      const savedReference = {
+        projectId: ProjectId.make("project-1"),
+        repository: "acme/project",
+        number: 42,
+        url: "https://github.com/acme/project/pull/42",
+      };
+      const thread = {
+        ...threadShell("replaced-branch-thread"),
+        createdAt: DateTime.makeUnsafe("2026-09-01T00:00:00.000Z"),
+        branch: mergedPullRequest43.headRef,
+        branchPullRequest: savedReference,
+      };
+      const project: OrchestrationProjectShell = {
+        id: thread.projectId,
+        title: "Project",
+        workspaceRoot: "/workspace/project",
+        defaultModelSelection: null,
+        scripts: [],
+        createdAt: "2026-08-01T00:00:00.000Z",
+        updatedAt: "2026-08-01T00:00:00.000Z",
+      };
+      const activation = yield* Deferred.make<void>();
+      const sweeps = yield* Queue.unbounded<void>();
+      const commands: Array<OrchestrationV2ServerCommand> = [];
+      const dependencies = Layer.mergeAll(
+        Layer.mock(Orchestrator.OrchestratorV2)({
+          streamDomainEvents: Stream.never,
+          getPullRequestSnapshot: () =>
+            Queue.offer(sweeps, undefined).pipe(
+              Effect.as({
+                schemaVersion: 2,
+                snapshotSequence: 1,
+                threads: [thread],
+                archivedThreads: [],
+              }),
+            ),
+          dispatch: (command) =>
+            Effect.sync(() => {
+              commands.push(command);
+              return { sequence: 2, storedEvents: [] };
             }),
-            Layer.mock(RepositoryIdentityResolver.RepositoryIdentityResolver)({
-              resolve: () =>
-                Effect.succeed({
-                  canonicalKey: "github.com/acme/project",
-                  locator: {
-                    source: "git-remote" as const,
-                    remoteName: "origin",
-                    remoteUrl: "git@github.com:acme/project.git",
-                  },
-                  provider: SourceControlProviderKind.make("github"),
-                  owner: "acme",
-                  name: "project",
-                }),
+        }),
+        Layer.mock(ProjectStore.ProjectStoreV2)({
+          listShells: () => Effect.succeed([project]),
+          getShell: () => Effect.succeedSome(project),
+        }),
+        // Only the fresh read disagrees with the remembered detection.
+        Layer.mock(GitManager.GitManager)({
+          branchPullRequest: (_input, options) =>
+            Effect.succeed(options?.freshGitState === true ? fresh : mergedPullRequest43),
+        }),
+        Layer.mock(PullRequestService.PullRequestService)({
+          notifyLinkedThreadsChanged: Effect.void,
+        }),
+        Layer.mock(RepositoryIdentityResolver.RepositoryIdentityResolver)({
+          resolve: () =>
+            Effect.succeed({
+              canonicalKey: "github.com/acme/project",
+              locator: {
+                source: "git-remote" as const,
+                remoteName: "origin",
+                remoteUrl: "git@github.com:acme/project.git",
+              },
+              provider: SourceControlProviderKind.make("github"),
+              owner: "acme",
+              name: "project",
             }),
-            Layer.mock(BackgroundPolicy.BackgroundPolicy)({}),
-            Layer.succeed(ServerActivation.ServerActivation, Deferred.await(activation)),
-            Layer.succeed(
-              SecureRandom.SecureRandom,
-              SecureRandom.make((size) => new Uint8Array(size).fill(1)),
-            ),
-            FileSystem.layerNoop({}),
-            Path.layer,
-          );
-          yield* Effect.gen(function* () {
-            const service = yield* ThreadPullRequestService.make;
-            yield* service.start();
-            yield* Deferred.succeed(activation, undefined);
-            yield* Deferred.await(sweepStarted);
-            yield* service.drain;
-          }).pipe(Effect.provide(dependencies));
+        }),
+        Layer.mock(BackgroundPolicy.BackgroundPolicy)({
+          shouldRunOpportunisticWork: Effect.succeed(true),
+        }),
+        Layer.succeed(ServerActivation.ServerActivation, Deferred.await(activation)),
+        Layer.succeed(
+          SecureRandom.SecureRandom,
+          SecureRandom.make((size) => new Uint8Array(size).fill(1)),
+        ),
+        FileSystem.layerNoop({}),
+        Path.layer,
+      );
+      yield* Effect.gen(function* () {
+        const service = yield* ThreadPullRequestService.make;
+        yield* service.start();
+        yield* Deferred.succeed(activation, undefined);
+        yield* Queue.take(sweeps);
+        yield* service.drain;
+      }).pipe(Effect.provide(dependencies));
 
-          expect(snapshotThread).toHaveProperty("createdAt", NOW);
-          if (sameBranch) {
-            expect(commands).toEqual([]);
-          } else {
-            expect(commands).toHaveLength(1);
-            expect(commands[0]).toMatchObject({
-              type: "thread.pull-request.sync",
-              threadId: thread.id,
-              snapshotSequence: 7,
-              expected: {
-                workspaceRoot: project.workspaceRoot,
-                branch: thread.branch,
-                worktreePath: thread.worktreePath,
-                linkedPullRequest: savedReference,
-                branchPullRequest: savedReference,
+      expect(
+        commands.map((command) =>
+          command.type === "thread.pull-request.sync" ? command.branchPullRequest : command.type,
+        ),
+      ).toEqual(
+        writes
+          ? [
+              {
+                projectId: project.id,
+                repository: "acme/project",
+                number: 43,
+                url: mergedPullRequest43.url,
               },
-              branchPullRequest: null,
-            });
-            expect(commands[0]).not.toHaveProperty("linkedPullRequest");
-          }
-        }),
-      ),
+            ]
+          : [],
+      );
+    }),
   );
 });
diff --git a/apps/server/src/orchestration-v2/ThreadPullRequestService.ts b/apps/server/src/orchestration-v2/ThreadPullRequestService.ts
index 69fbd1fd918b..a749621ceb4c 100644
--- a/apps/server/src/orchestration-v2/ThreadPullRequestService.ts
+++ b/apps/server/src/orchestration-v2/ThreadPullRequestService.ts
@@ -16,6 +16,7 @@ import * as Effect from "effect/Effect";
 import * as FileSystem from "effect/FileSystem";
 import * as Option from "effect/Option";
 import * as Path from "effect/Path";
+import * as Queue from "effect/Queue";
 import * as Schedule from "effect/Schedule";
 import type * as Scope from "effect/Scope";
 import * as Stream from "effect/Stream";
@@ -25,6 +26,7 @@ import * as GitManager from "../git/GitManager.ts";
 import * as GitVcsDriver from "../vcs/GitVcsDriver.ts";
 import * as ProjectStore from "./ProjectStore.ts";
 import * as PullRequestService from "../pullRequest/PullRequestService.ts";
+import { makeLinkedThreadsChangeDetector } from "../pullRequest/linkedThreads.ts";
 import * as RepositoryIdentityResolver from "../project/RepositoryIdentityResolver.ts";
 import { forkParked } from "../serverActivation.ts";
 import { sourceControlDefinitions } from "../sourceControl/sourceControlDefinitions.ts";
@@ -204,12 +206,13 @@ export const make = Effect.gen(function* () {
               .pipe(Effect.orElseSucceed(() => true)))
               ? first.worktreePath
               : project.workspaceRoot;
+          // A detected PR is confirmed against fresh git state before it is saved.
           const detected =
             first.branch === null
               ? null
               : yield* git.branchPullRequest(
                   { cwd, branch: first.branch },
-                  { refresh: request.refresh },
+                  { refresh: request.refresh, confirmTerminal: false },
                 );
           if (detected !== null && !pullRequestMatchesProject(detected, resolvedProject)) {
             return finishBackfill(group);
@@ -406,7 +409,26 @@ export const make = Effect.gen(function* () {
       return worker.enqueue(request);
     });
 
-  const processEvent = (event: OrchestrationV2DomainEvent) => {
+  const linkedThreadsChange = makeLinkedThreadsChangeDetector();
+  // A running linked thread can reorder its answers on every event, so reorders refresh readers at
+  // most once per 10s, the cadence clients used to poll at.
+  const linkedThreadReorders = yield* Queue.dropping<void>(1);
+
+  const notifyLinkedThreads = (event: OrchestrationV2DomainEvent) => {
+    switch (linkedThreadsChange(event)) {
+      case "changed":
+        return pullRequests.notifyLinkedThreadsChanged;
+      case "reordered":
+        return Queue.offer(linkedThreadReorders, undefined).pipe(Effect.asVoid);
+      case null:
+        return Effect.void;
+    }
+  };
+
+  const processEvent = (event: OrchestrationV2DomainEvent) =>
+    Effect.andThen(notifyLinkedThreads(event), refreshForEvent(event));
+
+  const refreshForEvent = (event: OrchestrationV2DomainEvent) => {
     switch (event.type) {
       case "thread.created":
       case "thread.unarchived":
@@ -433,6 +455,13 @@ export const make = Effect.gen(function* () {
     "ThreadPullRequestServiceV2.start",
   )(function* () {
     yield* forkParked(Stream.runForEach(orchestrator.streamDomainEvents, processEvent));
+    yield* forkParked(
+      Queue.take(linkedThreadReorders).pipe(
+        Effect.andThen(pullRequests.notifyLinkedThreadsChanged),
+        Effect.andThen(Effect.sleep("10 seconds")),
+        Effect.forever,
+      ),
+    );
     yield* forkParked(
       Effect.gen(function* () {
         yield* worker.enqueue({ threadId: null, refresh: false, backfill: true });
diff --git a/apps/server/src/orchestration-v2/ThreadSettlementService.test.ts b/apps/server/src/orchestration-v2/ThreadSettlementService.test.ts
index cca6ee08e711..76243589a1e6 100644
--- a/apps/server/src/orchestration-v2/ThreadSettlementService.test.ts
+++ b/apps/server/src/orchestration-v2/ThreadSettlementService.test.ts
@@ -147,6 +147,17 @@ describe("isAutoSettlementCandidate", () => {
         NOW_MS,
       ),
     ).toBe(true);
+    // A pull request watch whose checks finished holds nothing, yet still keeps the thread.
+    expect(
+      ThreadSettlementService.isAutoSettlementCandidate(
+        shell({
+          pendingBackgroundTasks: [
+            { taskId: "pull-request-watch:github.com/acme/app#1", kind: "monitor" },
+          ],
+        }),
+        NOW_MS,
+      ),
+    ).toBe(false);
   });
 
   it("never settles, or keeps snoozed, a thread whose guest is waiting on the owner", () => {
@@ -553,6 +564,18 @@ function makeBranchPullRequest(state: "open" | "closed" | "merged") {
   } satisfies GitManager.GitBranchPullRequest;
 }
 
+// GitManager rereads git state on request, and by default whenever its
+// remembered answer is merged or closed.
+function readsFreshGitState(
+  options: Parameters<GitManager.GitManager["Service"]["branchPullRequest"]>[1],
+): boolean {
+  return (
+    options?.refresh === true ||
+    options?.freshGitState === true ||
+    options?.confirmTerminal !== false
+  );
+}
+
 interface HarnessOptions {
   readonly snapshot: SettlementSnapshot;
   readonly settings?: ContractServerSettings;
@@ -820,969 +843,868 @@ const settledEvent = (thread: OrchestrationV2AppThread): OrchestrationV2DomainEv
 
 describe("ThreadSettlementServiceV2 worker", () => {
   it.effect("skips settings and PR decisions for recent branchless threads", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        yield* TestClock.setTime(Date.parse(NOW));
-        const threads = Array.from({ length: 32 }, (_, index) =>
-          makeThread(`recent-${index}`, {
-            updatedAt: DateTime.makeUnsafe(NOW),
-            latestUserMessageAt: DateTime.makeUnsafe(Date.parse(NOW) - 2 * DAY_MS),
-          }),
+    Effect.gen(function* () {
+      yield* TestClock.setTime(Date.parse(NOW));
+      const threads = Array.from({ length: 32 }, (_, index) =>
+        makeThread(`recent-${index}`, {
+          updatedAt: DateTime.makeUnsafe(NOW),
+          latestUserMessageAt: DateTime.makeUnsafe(Date.parse(NOW) - 2 * DAY_MS),
+        }),
+      );
+      const fixture = yield* makeHarness({
+        snapshot: makeSnapshot(threads),
+        settings: { ...DEFAULT_SERVER_SETTINGS, sidebarAutoSettleAfterDays: 3 },
+      });
+      yield* Effect.gen(function* () {
+        const service = yield* ThreadSettlementService.ThreadSettlementServiceV2;
+        yield* startHarness(service, fixture.activation, fixture.snapshotReads);
+        assert.deepEqual(yield* Ref.get(fixture.commands), []);
+        assert.deepEqual(yield* Ref.get(fixture.branchCalls), []);
+        assert.equal(yield* Ref.get(fixture.settingsReadCount), 2);
+        yield* fixture.updateSettings({ sidebarAutoSettleAfterDays: 1 });
+        yield* Queue.take(fixture.snapshotReads);
+        yield* service.drain;
+        assert.deepEqual(
+          new Set((yield* Ref.get(fixture.commands)).map((command) => command.threadId)),
+          new Set(threads.map((thread) => thread.id)),
         );
-        const fixture = yield* makeHarness({
-          snapshot: makeSnapshot(threads),
-          settings: { ...DEFAULT_SERVER_SETTINGS, sidebarAutoSettleAfterDays: 3 },
-        });
-        yield* Effect.gen(function* () {
-          const service = yield* ThreadSettlementService.ThreadSettlementServiceV2;
-          yield* startHarness(service, fixture.activation, fixture.snapshotReads);
-          assert.deepEqual(yield* Ref.get(fixture.commands), []);
-          assert.deepEqual(yield* Ref.get(fixture.branchCalls), []);
-          assert.equal(yield* Ref.get(fixture.settingsReadCount), 2);
-          yield* fixture.updateSettings({ sidebarAutoSettleAfterDays: 1 });
-          yield* Queue.take(fixture.snapshotReads);
-          yield* service.drain;
-          assert.deepEqual(
-            new Set((yield* Ref.get(fixture.commands)).map((command) => command.threadId)),
-            new Set(threads.map((thread) => thread.id)),
-          );
-        }).pipe(Effect.provide(fixture.layer));
-      }),
-    ),
+      }).pipe(Effect.provide(fixture.layer));
+    }),
   );
   it.effect("settles a merged pull request stored only in the thread links", () =>
-    Effect.scoped(
+    Effect.gen(function* () {
+      yield* TestClock.setTime(Date.parse(NOW));
+      const thread = makeThread("merged-link", {
+        pullRequests: [
+          {
+            host: "example.test",
+            repository: "owner/repository",
+            number: 42,
+            url: "https://example.test/owner/repository/pull/42",
+            source: "manual",
+            linkedAt: "2026-08-20T00:00:00.000Z",
+            snapshot: {
+              state: "merged",
+              title: "Pull request",
+              headBranch: "feature",
+              baseBranch: "main",
+              isDraft: false,
+              updatedAt: NOW,
+              syncedAt: NOW,
+              mergedAt: NOW,
+            },
+            stack: null,
+          },
+        ],
+      });
+      const fixture = yield* makeHarness({
+        snapshot: makeSnapshot([thread]),
+        settings: { ...DEFAULT_SERVER_SETTINGS, sidebarAutoSettleAfterDays: null },
+      });
+
+      yield* Effect.gen(function* () {
+        const service = yield* ThreadSettlementService.ThreadSettlementServiceV2;
+        yield* startHarness(service, fixture.activation, fixture.snapshotReads);
+        expect((yield* Ref.get(fixture.commands)).map((command) => command.threadId)).toEqual([
+          thread.id,
+        ]);
+      }).pipe(Effect.provide(fixture.layer));
+    }),
+  );
+
+  it.effect("settles an idle thread with an open persisted link on the inactivity sweep", () =>
+    Effect.gen(function* () {
+      yield* TestClock.setTime(Date.parse(NOW));
+      const thread = makeThread("open-link", {
+        pullRequests: [persistedLink("open", DateTime.makeUnsafe("2026-08-20T00:00:00.000Z"))],
+      });
+      const fixture = yield* makeHarness({
+        snapshot: makeSnapshot([thread]),
+        settings: {
+          ...DEFAULT_SERVER_SETTINGS,
+          sidebarAutoSettleAfterDays: 3,
+          sidebarAutoSettleKeepPullRequests: false,
+        },
+      });
+      yield* Effect.gen(function* () {
+        const service = yield* ThreadSettlementService.ThreadSettlementServiceV2;
+        yield* startHarness(service, fixture.activation, fixture.snapshotReads);
+        expect((yield* Ref.get(fixture.commands)).map((command) => command.threadId)).toEqual([
+          thread.id,
+        ]);
+      }).pipe(Effect.provide(fixture.layer));
+    }),
+  );
+
+  it.effect("settles only the project opted in while environment settlement is disabled", () =>
+    Effect.gen(function* () {
+      yield* TestClock.setTime(Date.parse(NOW));
+      const thread = makeThread("project-opt-in", {
+        latestRunCompletedAt: DateTime.makeUnsafe("2026-08-25T00:00:00.000Z"),
+      });
+      const other = makeThread("environment-off", { projectId: ProjectId.make("other-project") });
+      const fixture = yield* makeHarness({
+        snapshot: makeSnapshot([thread, other]),
+        settings: {
+          ...DEFAULT_SERVER_SETTINGS,
+          sidebarAutoSettleAfterDays: null,
+          sidebarAutoSettleOnMerge: false,
+          projectSettingsOverrides: { [PROJECT_ID]: { sidebarAutoSettleAfterDays: 2 } },
+        },
+      });
+      yield* Effect.gen(function* () {
+        const service = yield* ThreadSettlementService.ThreadSettlementServiceV2;
+        yield* startHarness(service, fixture.activation, fixture.snapshotReads);
+        const commands = yield* Ref.get(fixture.commands);
+        expect(commands.map((command) => command.threadId)).toEqual([thread.id]);
+      }).pipe(Effect.provide(fixture.layer));
+    }),
+  );
+
+  it.effect("stops settling the rest of a sweep once auto-settlement is turned off", () =>
+    Effect.gen(function* () {
+      yield* TestClock.setTime(Date.parse(NOW));
+      // Sweeps settle 8 threads at a time, so the ninth starts after a dispatch turned it off.
+      const threads = Array.from({ length: 9 }, (_, index) => makeThread(`idle-${index}`));
+      let disable: Effect.Effect<unknown> = Effect.void;
+      const fixture = yield* makeHarness({
+        snapshot: makeSnapshot(threads),
+        settings: { ...DEFAULT_SERVER_SETTINGS, sidebarAutoSettleAfterDays: 3 },
+        onDispatch: () => disable,
+      });
+      disable = fixture.updateSettings({ sidebarAutoSettleAfterDays: null });
+      yield* Effect.gen(function* () {
+        const service = yield* ThreadSettlementService.ThreadSettlementServiceV2;
+        yield* startHarness(service, fixture.activation, fixture.snapshotReads);
+        const settled = (yield* Ref.get(fixture.commands)).map((command) => command.threadId);
+        expect(settled).not.toContain(threads[8]!.id);
+      }).pipe(Effect.provide(fixture.layer));
+    }),
+  );
+
+  it.effect(
+    "drains idle subagents of a settled parent and retries busy children without PR lookups",
+    () =>
       Effect.gen(function* () {
         yield* TestClock.setTime(Date.parse(NOW));
-        const thread = makeThread("merged-link", {
-          pullRequests: [
-            {
-              host: "example.test",
-              repository: "owner/repository",
-              number: 42,
-              url: "https://example.test/owner/repository/pull/42",
-              source: "manual",
-              linkedAt: "2026-08-20T00:00:00.000Z",
-              snapshot: {
-                state: "merged",
-                title: "Pull request",
-                headBranch: "feature",
-                baseBranch: "main",
-                isDraft: false,
-                updatedAt: NOW,
-                syncedAt: NOW,
-                mergedAt: NOW,
-              },
-              stack: null,
-            },
-          ],
+        const store = yield* ProjectionStore.ProjectionStoreV2;
+        const parent = appThread("subagent-parent", "settled");
+        const child = (id: string, overrides: Partial<OrchestrationV2AppThread> = {}) => ({
+          ...appThread(id, null),
+          branch: "feature",
+          lineage: {
+            rootThreadId: parent.id,
+            parentThreadId: parent.id,
+            relationshipToParent: "subagent" as const,
+          },
+          ...overrides,
+        });
+        const empty = child("empty");
+        const recent = child("recent");
+        const busy = child("busy");
+        const marker = appThread("marker", "settled");
+        for (const thread of [
+          parent,
+          empty,
+          recent,
+          busy,
+          marker,
+          child("pinned", { pinnedAt: DateTime.makeUnsafe(NOW) }),
+          child("opted-out", { autoSettleDisabledAt: DateTime.makeUnsafe(NOW) }),
+        ]) {
+          yield* store.apply({
+            type: "thread.created",
+            id: EventId.make(`created:${thread.id}`),
+            threadId: thread.id,
+            occurredAt: thread.createdAt,
+            payload: thread,
+          });
+        }
+        const run = (threadId: ThreadId, status: "running" | "completed"): OrchestrationV2Run => ({
+          id: RunId.make(`run:${threadId}`),
+          threadId,
+          ordinal: 1,
+          providerInstanceId: parent.providerInstanceId,
+          modelSelection: parent.modelSelection,
+          providerThreadId: null,
+          userMessageId: MessageId.make(`message:${threadId}`),
+          rootNodeId: null,
+          activeAttemptId: null,
+          status,
+          requestedAt: DateTime.makeUnsafe(NOW),
+          startedAt: DateTime.makeUnsafe(NOW),
+          completedAt: status === "completed" ? DateTime.makeUnsafe(NOW) : null,
+          checkpointId: null,
+          contextHandoffId: null,
         });
+        for (const payload of [run(recent.id, "completed"), run(busy.id, "running")]) {
+          yield* store.apply({
+            type: "run.created",
+            id: EventId.make(`created:${payload.id}`),
+            threadId: payload.threadId,
+            occurredAt: DateTime.makeUnsafe(NOW),
+            payload,
+          });
+        }
         const fixture = yield* makeHarness({
-          snapshot: makeSnapshot([thread]),
-          settings: { ...DEFAULT_SERVER_SETTINGS, sidebarAutoSettleAfterDays: null },
+          snapshot: makeSnapshot([]),
+          projections: store,
+          settings: { ...DEFAULT_SERVER_SETTINGS, sidebarAutoSettleAfterDays: 2 },
+          onDispatch: (command) =>
+            store.getThread(command.threadId).pipe(
+              Effect.flatMap((thread) =>
+                store.apply(
+                  settledEvent({
+                    ...thread,
+                    settledOverride: "settled",
+                    settledAt: DateTime.makeUnsafe(NOW),
+                  }),
+                ),
+              ),
+              Effect.orDie,
+            ),
         });
-
         yield* Effect.gen(function* () {
           const service = yield* ThreadSettlementService.ThreadSettlementServiceV2;
           yield* startHarness(service, fixture.activation, fixture.snapshotReads);
+          const commands = yield* Ref.get(fixture.commands);
+          expect(commands.map((command) => command.threadId).toSorted()).toEqual([
+            empty.id,
+            recent.id,
+          ]);
+          for (const command of commands) {
+            expect(command.snapshotAt).toEqual(DateTime.makeUnsafe(NOW));
+            expect(command.settledAt).toBeUndefined();
+          }
+          const finished: OrchestrationV2DomainEvent = {
+            type: "run.updated",
+            id: EventId.make("busy:completed"),
+            threadId: busy.id,
+            occurredAt: DateTime.makeUnsafe(NOW),
+            payload: run(busy.id, "completed"),
+          };
+          yield* store.apply(finished);
+          yield* fixture.publishEvent(finished);
+          // Cleanup of the following event marks delivery of the run event before draining.
+          yield* fixture.publishEvent(settledEvent(marker));
+          expect(yield* Queue.take(fixture.closedIdle)).toEqual({ threadId: marker.id });
+          yield* service.drain;
           expect((yield* Ref.get(fixture.commands)).map((command) => command.threadId)).toEqual([
-            thread.id,
+            empty.id,
+            recent.id,
+            busy.id,
           ]);
+          expect(yield* Ref.get(fixture.branchCalls)).toEqual([]);
+          expect(yield* Ref.get(fixture.summaryCalls)).toEqual([]);
         }).pipe(Effect.provide(fixture.layer));
-      }),
-    ),
+      }).pipe(Effect.provide(projectionStoreSql)),
   );
 
-  it.effect("settles an idle thread with an open persisted link on the inactivity sweep", () =>
-    Effect.scoped(
+  it.effect(
+    "manual parent settlement drains hidden children with automatic settlement disabled",
+    () =>
       Effect.gen(function* () {
         yield* TestClock.setTime(Date.parse(NOW));
-        const thread = makeThread("open-link", {
-          pullRequests: [persistedLink("open", DateTime.makeUnsafe("2026-08-20T00:00:00.000Z"))],
-        });
-        const fixture = yield* makeHarness({
-          snapshot: makeSnapshot([thread]),
-          settings: {
-            ...DEFAULT_SERVER_SETTINGS,
-            sidebarAutoSettleAfterDays: 3,
-            sidebarAutoSettleKeepPullRequests: false,
+        const store = yield* ProjectionStore.ProjectionStoreV2;
+        const parent = appThread("manual-parent", null);
+        const child = {
+          ...appThread("manual-child", null),
+          branch: "feature",
+          lineage: {
+            rootThreadId: parent.id,
+            parentThreadId: parent.id,
+            relationshipToParent: "subagent" as const,
           },
+        };
+        const marker = appThread("marker", "settled");
+        for (const thread of [parent, child, marker]) {
+          yield* store.apply({
+            type: "thread.created",
+            id: EventId.make(`created:${thread.id}`),
+            threadId: thread.id,
+            occurredAt: thread.createdAt,
+            payload: thread,
+          });
+        }
+        const fixture = yield* makeHarness({
+          snapshot: makeSnapshot([]),
+          projections: store,
+          settings: { ...DEFAULT_SERVER_SETTINGS, sidebarAutoSettleAfterDays: 2 },
+          onDispatch: (command) =>
+            store.getThread(command.threadId).pipe(
+              Effect.flatMap((thread) =>
+                store.apply(
+                  settledEvent({
+                    ...thread,
+                    settledOverride: "settled",
+                    settledAt: DateTime.makeUnsafe(NOW),
+                  }),
+                ),
+              ),
+              Effect.orDie,
+            ),
         });
         yield* Effect.gen(function* () {
           const service = yield* ThreadSettlementService.ThreadSettlementServiceV2;
           yield* startHarness(service, fixture.activation, fixture.snapshotReads);
-          expect((yield* Ref.get(fixture.commands)).map((command) => command.threadId)).toEqual([
-            thread.id,
+          expect(yield* Ref.get(fixture.commands)).toEqual([]);
+          expect(yield* Ref.get(fixture.branchCalls)).toEqual([]);
+          // Avoid a settings-change sweep: the parent event must trigger the child dispatch.
+          yield* Ref.set(fixture.settings, {
+            ...DEFAULT_SERVER_SETTINGS,
+            sidebarAutoSettleAfterDays: null,
+            sidebarAutoSettleOnMerge: false,
+          });
+          const event = settledEvent({
+            ...parent,
+            settledOverride: "settled",
+            settledAt: DateTime.makeUnsafe(NOW),
+          });
+          yield* store.apply(event);
+          yield* fixture.publishEvent(event);
+          yield* fixture.publishEvent(settledEvent(marker));
+          expect(yield* Queue.take(fixture.closedIdle)).toEqual({ threadId: parent.id });
+          expect(yield* Queue.take(fixture.closedIdle)).toEqual({ threadId: marker.id });
+          yield* service.drain;
+          expect(yield* Ref.get(fixture.commands)).toEqual([
+            expect.objectContaining({
+              type: "thread.auto-settle",
+              threadId: child.id,
+              snapshotAt: child.updatedAt,
+            }),
           ]);
+          expect(yield* Ref.get(fixture.branchCalls)).toEqual([]);
+          expect(yield* Ref.get(fixture.summaryCalls)).toEqual([]);
         }).pipe(Effect.provide(fixture.layer));
-      }),
-    ),
+      }).pipe(Effect.provide(projectionStoreSql)),
   );
 
-  it.effect("settles only the project opted in while environment settlement is disabled", () =>
-    Effect.scoped(
+  it.effect(
+    "coalesces bulk cleanup wakes and still drains children discovered during a sweep",
+    () =>
       Effect.gen(function* () {
         yield* TestClock.setTime(Date.parse(NOW));
-        const thread = makeThread("project-opt-in", {
-          latestRunCompletedAt: DateTime.makeUnsafe("2026-08-25T00:00:00.000Z"),
-        });
-        const other = makeThread("environment-off", { projectId: ProjectId.make("other-project") });
+        const store = yield* ProjectionStore.ProjectionStoreV2;
+        const sweepStarted = yield* Deferred.make<void>();
+        const releaseSweep = yield* Deferred.make<void>();
+        const childSettled = yield* Deferred.make<void>();
+        const parent = appThread("bulk-parent", null);
+        const child = {
+          ...appThread("bulk-child", null),
+          lineage: {
+            parentThreadId: parent.id,
+            rootThreadId: parent.id,
+            relationshipToParent: "subagent" as const,
+          },
+        };
+        const marker = appThread("bulk-marker", "settled");
+        const parents = [
+          parent,
+          ...Array.from({ length: 233 }, (_, i) => appThread(`bulk-parent-${i}`, null)),
+        ];
+        for (const thread of [...parents, child, marker]) {
+          yield* store.apply({
+            type: "thread.created",
+            id: EventId.make(`created:${thread.id}`),
+            threadId: thread.id,
+            occurredAt: thread.createdAt,
+            payload: thread,
+          });
+        }
+        let blockNextSweep = false;
         const fixture = yield* makeHarness({
-          snapshot: makeSnapshot([thread, other]),
+          snapshot: makeSnapshot([]),
           settings: {
             ...DEFAULT_SERVER_SETTINGS,
             sidebarAutoSettleAfterDays: null,
             sidebarAutoSettleOnMerge: false,
-            projectSettingsOverrides: { [PROJECT_ID]: { sidebarAutoSettleAfterDays: 2 } },
           },
+          projections: {
+            ...store,
+            getSettlementCandidates: (threadId) =>
+              Effect.gen(function* () {
+                const candidates = yield* store.getSettlementCandidates(threadId);
+                if (blockNextSweep) {
+                  blockNextSweep = false;
+                  yield* Deferred.succeed(sweepStarted, undefined);
+                  yield* Deferred.await(releaseSweep);
+                }
+                return candidates;
+              }),
+          },
+          onDispatch: (command): Effect.Effect<void> =>
+            Effect.gen(function* () {
+              const thread = yield* store.getThread(command.threadId);
+              const event = settledEvent({
+                ...thread,
+                settledOverride: "settled",
+                settledAt: DateTime.makeUnsafe(NOW),
+              });
+              yield* store.apply(event);
+              yield* fixture.publishEvent(event);
+              yield* Deferred.succeed(childSettled, undefined);
+            }).pipe(Effect.orDie),
         });
         yield* Effect.gen(function* () {
           const service = yield* ThreadSettlementService.ThreadSettlementServiceV2;
           yield* startHarness(service, fixture.activation, fixture.snapshotReads);
-          const commands = yield* Ref.get(fixture.commands);
-          expect(commands.map((command) => command.threadId)).toEqual([thread.id]);
-        }).pipe(Effect.provide(fixture.layer));
-      }),
-    ),
-  );
-
-  it.effect("stops settling the rest of a sweep once auto-settlement is turned off", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        yield* TestClock.setTime(Date.parse(NOW));
-        // Sweeps settle 8 threads at a time, so the ninth starts after a dispatch turned it off.
-        const threads = Array.from({ length: 9 }, (_, index) => makeThread(`idle-${index}`));
-        let disable: Effect.Effect<unknown> = Effect.void;
-        const fixture = yield* makeHarness({
-          snapshot: makeSnapshot(threads),
-          settings: { ...DEFAULT_SERVER_SETTINGS, sidebarAutoSettleAfterDays: 3 },
-          onDispatch: () => disable,
-        });
-        disable = fixture.updateSettings({ sidebarAutoSettleAfterDays: null });
-        yield* Effect.gen(function* () {
-          const service = yield* ThreadSettlementService.ThreadSettlementServiceV2;
-          yield* startHarness(service, fixture.activation, fixture.snapshotReads);
-          const settled = (yield* Ref.get(fixture.commands)).map((command) => command.threadId);
-          expect(settled).not.toContain(threads[8]!.id);
-        }).pipe(Effect.provide(fixture.layer));
-      }),
-    ),
-  );
+          yield* Ref.set(fixture.candidateReads, []);
+          blockNextSweep = true;
+          yield* fixture.publishEvent(settledEvent(marker));
+          yield* Deferred.await(sweepStarted);
 
-  it.effect(
-    "drains idle subagents of a settled parent and retries busy children without PR lookups",
-    () =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          yield* TestClock.setTime(Date.parse(NOW));
-          const store = yield* ProjectionStore.ProjectionStoreV2;
-          const parent = appThread("subagent-parent", "settled");
-          const child = (id: string, overrides: Partial<OrchestrationV2AppThread> = {}) => ({
-            ...appThread(id, null),
-            branch: "feature",
-            lineage: {
-              rootThreadId: parent.id,
-              parentThreadId: parent.id,
-              relationshipToParent: "subagent" as const,
-            },
-            ...overrides,
-          });
-          const empty = child("empty");
-          const recent = child("recent");
-          const busy = child("busy");
-          const marker = appThread("marker", "settled");
-          for (const thread of [
-            parent,
-            empty,
-            recent,
-            busy,
-            marker,
-            child("pinned", { pinnedAt: DateTime.makeUnsafe(NOW) }),
-            child("opted-out", { autoSettleDisabledAt: DateTime.makeUnsafe(NOW) }),
-          ]) {
-            yield* store.apply({
-              type: "thread.created",
-              id: EventId.make(`created:${thread.id}`),
+          for (const [i, thread] of parents.entries()) {
+            const type = (["thread.settled", "thread.archived", "thread.deleted"] as const)[i % 3]!;
+            const event: OrchestrationV2DomainEvent = {
+              type,
+              id: EventId.make(`bulk:${thread.id}`),
               threadId: thread.id,
-              occurredAt: thread.createdAt,
-              payload: thread,
-            });
-          }
-          const run = (
-            threadId: ThreadId,
-            status: "running" | "completed",
-          ): OrchestrationV2Run => ({
-            id: RunId.make(`run:${threadId}`),
-            threadId,
-            ordinal: 1,
-            providerInstanceId: parent.providerInstanceId,
-            modelSelection: parent.modelSelection,
-            providerThreadId: null,
-            userMessageId: MessageId.make(`message:${threadId}`),
-            rootNodeId: null,
-            activeAttemptId: null,
-            status,
-            requestedAt: DateTime.makeUnsafe(NOW),
-            startedAt: DateTime.makeUnsafe(NOW),
-            completedAt: status === "completed" ? DateTime.makeUnsafe(NOW) : null,
-            checkpointId: null,
-            contextHandoffId: null,
-          });
-          for (const payload of [run(recent.id, "completed"), run(busy.id, "running")]) {
-            yield* store.apply({
-              type: "run.created",
-              id: EventId.make(`created:${payload.id}`),
-              threadId: payload.threadId,
-              occurredAt: DateTime.makeUnsafe(NOW),
-              payload,
-            });
-          }
-          const fixture = yield* makeHarness({
-            snapshot: makeSnapshot([]),
-            projections: store,
-            settings: { ...DEFAULT_SERVER_SETTINGS, sidebarAutoSettleAfterDays: 2 },
-            onDispatch: (command) =>
-              store.getThread(command.threadId).pipe(
-                Effect.flatMap((thread) =>
-                  store.apply(
-                    settledEvent({
-                      ...thread,
-                      settledOverride: "settled",
-                      settledAt: DateTime.makeUnsafe(NOW),
-                    }),
-                  ),
-                ),
-                Effect.orDie,
-              ),
-          });
-          yield* Effect.gen(function* () {
-            const service = yield* ThreadSettlementService.ThreadSettlementServiceV2;
-            yield* startHarness(service, fixture.activation, fixture.snapshotReads);
-            const commands = yield* Ref.get(fixture.commands);
-            expect(commands.map((command) => command.threadId).toSorted()).toEqual([
-              empty.id,
-              recent.id,
-            ]);
-            for (const command of commands) {
-              expect(command.snapshotAt).toEqual(DateTime.makeUnsafe(NOW));
-              expect(command.settledAt).toBeUndefined();
-            }
-            const finished: OrchestrationV2DomainEvent = {
-              type: "run.updated",
-              id: EventId.make("busy:completed"),
-              threadId: busy.id,
               occurredAt: DateTime.makeUnsafe(NOW),
-              payload: run(busy.id, "completed"),
+              payload: {
+                ...thread,
+                ...(type === "thread.settled"
+                  ? { settledOverride: "settled" as const, settledAt: DateTime.makeUnsafe(NOW) }
+                  : type === "thread.archived"
+                    ? { archivedAt: DateTime.makeUnsafe(NOW) }
+                    : { deletedAt: DateTime.makeUnsafe(NOW) }),
+              },
             };
-            yield* store.apply(finished);
-            yield* fixture.publishEvent(finished);
-            // Cleanup of the following event marks delivery of the run event before draining.
-            yield* fixture.publishEvent(settledEvent(marker));
-            expect(yield* Queue.take(fixture.closedIdle)).toEqual({ threadId: marker.id });
-            yield* service.drain;
-            expect((yield* Ref.get(fixture.commands)).map((command) => command.threadId)).toEqual([
-              empty.id,
-              recent.id,
-              busy.id,
-            ]);
-            expect(yield* Ref.get(fixture.branchCalls)).toEqual([]);
-            expect(yield* Ref.get(fixture.summaryCalls)).toEqual([]);
-          }).pipe(Effect.provide(fixture.layer));
-        }).pipe(Effect.provide(projectionStoreSql)),
-      ),
-  );
-
-  it.effect(
-    "manual parent settlement drains hidden children with automatic settlement disabled",
-    () =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          yield* TestClock.setTime(Date.parse(NOW));
-          const store = yield* ProjectionStore.ProjectionStoreV2;
-          const parent = appThread("manual-parent", null);
-          const child = {
-            ...appThread("manual-child", null),
-            branch: "feature",
-            lineage: {
-              rootThreadId: parent.id,
-              parentThreadId: parent.id,
-              relationshipToParent: "subagent" as const,
-            },
-          };
-          const marker = appThread("marker", "settled");
-          for (const thread of [parent, child, marker]) {
-            yield* store.apply({
-              type: "thread.created",
-              id: EventId.make(`created:${thread.id}`),
-              threadId: thread.id,
-              occurredAt: thread.createdAt,
-              payload: thread,
-            });
-          }
-          const fixture = yield* makeHarness({
-            snapshot: makeSnapshot([]),
-            projections: store,
-            settings: { ...DEFAULT_SERVER_SETTINGS, sidebarAutoSettleAfterDays: 2 },
-            onDispatch: (command) =>
-              store.getThread(command.threadId).pipe(
-                Effect.flatMap((thread) =>
-                  store.apply(
-                    settledEvent({
-                      ...thread,
-                      settledOverride: "settled",
-                      settledAt: DateTime.makeUnsafe(NOW),
-                    }),
-                  ),
-                ),
-                Effect.orDie,
-              ),
-          });
-          yield* Effect.gen(function* () {
-            const service = yield* ThreadSettlementService.ThreadSettlementServiceV2;
-            yield* startHarness(service, fixture.activation, fixture.snapshotReads);
-            expect(yield* Ref.get(fixture.commands)).toEqual([]);
-            expect(yield* Ref.get(fixture.branchCalls)).toEqual([]);
-            // Avoid a settings-change sweep: the parent event must trigger the child dispatch.
-            yield* Ref.set(fixture.settings, {
-              ...DEFAULT_SERVER_SETTINGS,
-              sidebarAutoSettleAfterDays: null,
-              sidebarAutoSettleOnMerge: false,
-            });
-            const event = settledEvent({
-              ...parent,
-              settledOverride: "settled",
-              settledAt: DateTime.makeUnsafe(NOW),
-            });
             yield* store.apply(event);
             yield* fixture.publishEvent(event);
-            yield* fixture.publishEvent(settledEvent(marker));
-            expect(yield* Queue.take(fixture.closedIdle)).toEqual({ threadId: parent.id });
-            expect(yield* Queue.take(fixture.closedIdle)).toEqual({ threadId: marker.id });
-            yield* service.drain;
-            expect(yield* Ref.get(fixture.commands)).toEqual([
-              expect.objectContaining({
-                type: "thread.auto-settle",
-                threadId: child.id,
-                snapshotAt: child.updatedAt,
-              }),
-            ]);
-            expect(yield* Ref.get(fixture.branchCalls)).toEqual([]);
-            expect(yield* Ref.get(fixture.summaryCalls)).toEqual([]);
-          }).pipe(Effect.provide(fixture.layer));
-        }).pipe(Effect.provide(projectionStoreSql)),
-      ),
-  );
-
-  it.effect(
-    "coalesces bulk cleanup wakes and still drains children discovered during a sweep",
-    () =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          yield* TestClock.setTime(Date.parse(NOW));
-          const store = yield* ProjectionStore.ProjectionStoreV2;
-          const sweepStarted = yield* Deferred.make<void>();
-          const releaseSweep = yield* Deferred.make<void>();
-          const childSettled = yield* Deferred.make<void>();
-          const parent = appThread("bulk-parent", null);
-          const child = {
-            ...appThread("bulk-child", null),
-            lineage: {
-              parentThreadId: parent.id,
-              rootThreadId: parent.id,
-              relationshipToParent: "subagent" as const,
-            },
-          };
-          const marker = appThread("bulk-marker", "settled");
-          const parents = [
-            parent,
-            ...Array.from({ length: 233 }, (_, i) => appThread(`bulk-parent-${i}`, null)),
-          ];
-          for (const thread of [...parents, child, marker]) {
-            yield* store.apply({
-              type: "thread.created",
-              id: EventId.make(`created:${thread.id}`),
-              threadId: thread.id,
-              occurredAt: thread.createdAt,
-              payload: thread,
-            });
           }
-          let blockNextSweep = false;
-          const fixture = yield* makeHarness({
-            snapshot: makeSnapshot([]),
-            settings: {
-              ...DEFAULT_SERVER_SETTINGS,
-              sidebarAutoSettleAfterDays: null,
-              sidebarAutoSettleOnMerge: false,
-            },
-            projections: {
-              ...store,
-              getSettlementCandidates: (threadId) =>
-                Effect.gen(function* () {
-                  const candidates = yield* store.getSettlementCandidates(threadId);
-                  if (blockNextSweep) {
-                    blockNextSweep = false;
-                    yield* Deferred.succeed(sweepStarted, undefined);
-                    yield* Deferred.await(releaseSweep);
-                  }
-                  return candidates;
-                }),
-            },
-            onDispatch: (command): Effect.Effect<void> =>
-              Effect.gen(function* () {
-                const thread = yield* store.getThread(command.threadId);
-                const event = settledEvent({
-                  ...thread,
-                  settledOverride: "settled",
-                  settledAt: DateTime.makeUnsafe(NOW),
-                });
-                yield* store.apply(event);
-                yield* fixture.publishEvent(event);
-                yield* Deferred.succeed(childSettled, undefined);
-              }).pipe(Effect.orDie),
-          });
-          yield* Effect.gen(function* () {
-            const service = yield* ThreadSettlementService.ThreadSettlementServiceV2;
-            yield* startHarness(service, fixture.activation, fixture.snapshotReads);
-            yield* Ref.set(fixture.candidateReads, []);
-            blockNextSweep = true;
-            yield* fixture.publishEvent(settledEvent(marker));
-            yield* Deferred.await(sweepStarted);
-
-            for (const [i, thread] of parents.entries()) {
-              const type = (["thread.settled", "thread.archived", "thread.deleted"] as const)[
-                i % 3
-              ]!;
-              const event: OrchestrationV2DomainEvent = {
-                type,
-                id: EventId.make(`bulk:${thread.id}`),
-                threadId: thread.id,
-                occurredAt: DateTime.makeUnsafe(NOW),
-                payload: {
-                  ...thread,
-                  ...(type === "thread.settled"
-                    ? { settledOverride: "settled" as const, settledAt: DateTime.makeUnsafe(NOW) }
-                    : type === "thread.archived"
-                      ? { archivedAt: DateTime.makeUnsafe(NOW) }
-                      : { deletedAt: DateTime.makeUnsafe(NOW) }),
-                },
-              };
-              yield* store.apply(event);
-              yield* fixture.publishEvent(event);
-            }
-            const markDelivery = (id: string) =>
-              fixture
-                .publishEvent({
-                  type: "thread.created",
-                  id: EventId.make(id),
-                  threadId: marker.id,
-                  occurredAt: marker.createdAt,
-                  payload: marker,
-                })
-                .pipe(
-                  // The next event is observed only after the previous handler has finished enqueueing.
-                  Effect.andThen(
-                    Queue.take(fixture.observedEvents).pipe(
-                      Effect.repeat({ until: (seen) => seen === id }),
-                    ),
+          const markDelivery = (id: string) =>
+            fixture
+              .publishEvent({
+                type: "thread.created",
+                id: EventId.make(id),
+                threadId: marker.id,
+                occurredAt: marker.createdAt,
+                payload: marker,
+              })
+              .pipe(
+                // The next event is observed only after the previous handler has finished enqueueing.
+                Effect.andThen(
+                  Queue.take(fixture.observedEvents).pipe(
+                    Effect.repeat({ until: (seen) => seen === id }),
                   ),
-                );
-            yield* markDelivery("bulk-delivered");
-            yield* Deferred.succeed(releaseSweep, undefined);
-            yield* Deferred.await(childSettled);
-            yield* markDelivery("child-delivered");
-            yield* service.drain;
-
-            expect(yield* Ref.get(fixture.candidateReads)).toEqual([
-              undefined,
-              undefined,
-              undefined,
-            ]);
-            expect((yield* Ref.get(fixture.commands)).map((command) => command.threadId)).toEqual([
-              child.id,
-            ]);
-            expect((yield* store.getThread(child.id)).settledOverride).toBe("settled");
-            expect(yield* Ref.get(fixture.branchCalls)).toEqual([]);
-            expect(yield* Ref.get(fixture.summaryCalls)).toEqual([]);
-          }).pipe(Effect.provide(fixture.layer));
-        }).pipe(Effect.provide(projectionStoreSql)),
-      ),
+                ),
+              );
+          yield* markDelivery("bulk-delivered");
+          yield* Deferred.succeed(releaseSweep, undefined);
+          yield* Deferred.await(childSettled);
+          yield* markDelivery("child-delivered");
+          yield* service.drain;
+
+          expect(yield* Ref.get(fixture.candidateReads)).toEqual([undefined, undefined, undefined]);
+          expect((yield* Ref.get(fixture.commands)).map((command) => command.threadId)).toEqual([
+            child.id,
+          ]);
+          expect((yield* store.getThread(child.id)).settledOverride).toBe("settled");
+          expect(yield* Ref.get(fixture.branchCalls)).toEqual([]);
+          expect(yield* Ref.get(fixture.summaryCalls)).toEqual([]);
+        }).pipe(Effect.provide(fixture.layer));
+      }).pipe(Effect.provide(projectionStoreSql)),
   );
 
   it.effect("looks up a branch in its worktree only while the worktree has .git", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        yield* TestClock.setTime(Date.parse(NOW));
-        const fixture = yield* makeHarness({
-          snapshot: makeSnapshot([
-            makeThread("linked-worktree", {
-              branch: "linked",
-              worktreePath: "/worktrees/linked",
+    Effect.gen(function* () {
+      yield* TestClock.setTime(Date.parse(NOW));
+      const fixture = yield* makeHarness({
+        snapshot: makeSnapshot([
+          makeThread("linked-worktree", {
+            branch: "linked",
+            worktreePath: "/worktrees/linked",
+            latestUserMessageAt: DateTime.makeUnsafe("2026-08-27T00:00:00.000Z"),
+          }),
+          // A folder that outlived its .git makes git fail with not_a_repository.
+          makeThread("emptied-worktree", {
+            branch: "emptied",
+            worktreePath: "/worktrees/emptied",
+            latestUserMessageAt: DateTime.makeUnsafe("2026-08-27T00:00:00.000Z"),
+          }),
+        ]),
+        existingWorktreePaths: [
+          "/worktrees/linked",
+          "/worktrees/linked/.git",
+          "/worktrees/emptied",
+        ],
+      });
+
+      yield* Effect.gen(function* () {
+        const reactor = yield* ThreadSettlementService.ThreadSettlementServiceV2;
+        yield* startHarness(reactor, fixture.activation, fixture.snapshotReads);
+        const cwdByBranch = Object.fromEntries(
+          (yield* Ref.get(fixture.branchCalls)).map((call) => [call.branch, call.cwd]),
+        );
+        expect(cwdByBranch).toEqual({
+          linked: "/worktrees/linked",
+          emptied: "/workspace/project",
+        });
+      }).pipe(Effect.provide(fixture.layer));
+    }),
+  );
+
+  it.effect("does not settle a thread whose worktree cannot be checked", () =>
+    Effect.gen(function* () {
+      yield* TestClock.setTime(Date.parse(NOW));
+      const fixture = yield* makeHarness({
+        snapshot: makeSnapshot(
+          [
+            makeThread("unreadable-worktree", {
+              branch: "unreadable",
+              worktreePath: "/worktrees/unreadable",
+              latestUserMessageAt: DateTime.makeUnsafe("2026-08-27T00:00:00.000Z"),
+            }),
+            // A merged linked pull request still needs the branch recheck before settling.
+            makeThread("unreadable-linked-worktree", {
+              branch: "feature",
+              worktreePath: "/worktrees/unreadable-linked",
               latestUserMessageAt: DateTime.makeUnsafe("2026-08-27T00:00:00.000Z"),
+              linkedPullRequest: {
+                projectId: PROJECT_ID,
+                repository: "owner/repository",
+                number: 41,
+                url: "https://example.test/owner/repository/pull/41",
+              },
             }),
-            // A folder that outlived its .git makes git fail with not_a_repository.
-            makeThread("emptied-worktree", {
-              branch: "emptied",
-              worktreePath: "/worktrees/emptied",
+            makeThread("readable-worktree", {
+              branch: "readable",
+              worktreePath: "/worktrees/readable",
               latestUserMessageAt: DateTime.makeUnsafe("2026-08-27T00:00:00.000Z"),
             }),
-          ]),
-          existingWorktreePaths: [
-            "/worktrees/linked",
-            "/worktrees/linked/.git",
-            "/worktrees/emptied",
           ],
-        });
-
-        yield* Effect.gen(function* () {
-          const reactor = yield* ThreadSettlementService.ThreadSettlementServiceV2;
-          yield* startHarness(reactor, fixture.activation, fixture.snapshotReads);
-          const cwdByBranch = Object.fromEntries(
-            (yield* Ref.get(fixture.branchCalls)).map((call) => [call.branch, call.cwd]),
-          );
-          expect(cwdByBranch).toEqual({
-            linked: "/worktrees/linked",
-            emptied: "/workspace/project",
-          });
-        }).pipe(Effect.provide(fixture.layer));
-      }),
-    ),
-  );
-
-  it.effect("does not settle a thread whose worktree cannot be checked", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        yield* TestClock.setTime(Date.parse(NOW));
-        const fixture = yield* makeHarness({
-          snapshot: makeSnapshot(
-            [
-              makeThread("unreadable-worktree", {
-                branch: "unreadable",
-                worktreePath: "/worktrees/unreadable",
-                latestUserMessageAt: DateTime.makeUnsafe("2026-08-27T00:00:00.000Z"),
-              }),
-              // A merged linked pull request still needs the branch recheck before settling.
-              makeThread("unreadable-linked-worktree", {
-                branch: "feature",
-                worktreePath: "/worktrees/unreadable-linked",
-                latestUserMessageAt: DateTime.makeUnsafe("2026-08-27T00:00:00.000Z"),
-                linkedPullRequest: {
-                  projectId: PROJECT_ID,
-                  repository: "owner/repository",
-                  number: 41,
-                  url: "https://example.test/owner/repository/pull/41",
-                },
-              }),
-              makeThread("readable-worktree", {
-                branch: "readable",
-                worktreePath: "/worktrees/readable",
-                latestUserMessageAt: DateTime.makeUnsafe("2026-08-27T00:00:00.000Z"),
-              }),
-            ],
-            [
-              {
-                ...makeProject(),
-                repositoryIdentity: {
-                  canonicalKey: "example.test/owner/repository",
-                  locator: {
-                    source: "git-remote",
-                    remoteName: "origin",
-                    remoteUrl: "https://example.test/owner/repository.git",
-                  },
-                  provider: SourceControlProviderKind.make("github"),
-                  owner: "owner",
-                  name: "repository",
+          [
+            {
+              ...makeProject(),
+              repositoryIdentity: {
+                canonicalKey: "example.test/owner/repository",
+                locator: {
+                  source: "git-remote",
+                  remoteName: "origin",
+                  remoteUrl: "https://example.test/owner/repository.git",
                 },
+                provider: SourceControlProviderKind.make("github"),
+                owner: "owner",
+                name: "repository",
               },
-            ],
-          ),
-          existingWorktreePaths: ["/worktrees/readable", "/worktrees/readable/.git"],
-          unreadablePaths: ["/worktrees/unreadable/.git", "/worktrees/unreadable-linked/.git"],
-          pullRequestSummary: (input) =>
-            Effect.succeed({
-              ...makePullRequestSummary({ ...input, state: "merged" }),
-              mergedAt: NOW,
-            }),
-          branchPullRequest: (input) =>
-            input.cwd.startsWith("/worktrees/unreadable")
-              ? Effect.die(new Error("git: permission denied"))
-              : Effect.succeed(makeBranchPullRequest("merged")),
-        });
-
-        yield* Effect.gen(function* () {
-          const reactor = yield* ThreadSettlementService.ThreadSettlementServiceV2;
-          yield* startHarness(reactor, fixture.activation, fixture.snapshotReads);
-          expect((yield* Ref.get(fixture.commands)).map((command) => command.threadId)).toEqual([
-            ThreadId.make("readable-worktree"),
-          ]);
-        }).pipe(Effect.provide(fixture.layer));
-      }),
-    ),
+            },
+          ],
+        ),
+        existingWorktreePaths: ["/worktrees/readable", "/worktrees/readable/.git"],
+        unreadablePaths: ["/worktrees/unreadable/.git", "/worktrees/unreadable-linked/.git"],
+        pullRequestSummary: (input) =>
+          Effect.succeed({
+            ...makePullRequestSummary({ ...input, state: "merged" }),
+            mergedAt: NOW,
+          }),
+        branchPullRequest: (input) =>
+          input.cwd.startsWith("/worktrees/unreadable")
+            ? Effect.die(new Error("git: permission denied"))
+            : Effect.succeed(makeBranchPullRequest("merged")),
+      });
+
+      yield* Effect.gen(function* () {
+        const reactor = yield* ThreadSettlementService.ThreadSettlementServiceV2;
+        yield* startHarness(reactor, fixture.activation, fixture.snapshotReads);
+        expect((yield* Ref.get(fixture.commands)).map((command) => command.threadId)).toEqual([
+          ThreadId.make("readable-worktree"),
+        ]);
+      }).pipe(Effect.provide(fixture.layer));
+    }),
   );
 
   it.effect("reevaluates immediately after a pull request merge", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        yield* TestClock.setTime(Date.parse(NOW));
-        const periodicLookupStarted = yield* Deferred.make<void>();
-        const releasePeriodicLookup = yield* Deferred.make<void>();
-        const mergedThreadSettled = yield* Deferred.make<void>();
-        const branchLookupCount = yield* Ref.make(0);
-        const fixture = yield* makeHarness({
-          snapshot: makeSnapshot([
-            makeThread("merged-in-app", {
-              latestUserMessageAt: DateTime.makeUnsafe("2026-08-27T00:00:00.000Z"),
-              linkedPullRequest: {
-                projectId: PROJECT_ID,
-                repository: "Owner/Repository",
-                number: 42,
-                url: "https://example.test/owner/repository/pull/42",
-              },
-            }),
-            makeThread("slow-periodic-lookup", {
-              branch: "another-feature",
-              latestUserMessageAt: DateTime.makeUnsafe("2026-08-27T00:00:00.000Z"),
-            }),
-          ]),
-          branchPullRequest: () =>
-            Ref.updateAndGet(branchLookupCount, (count) => count + 1).pipe(
-              Effect.flatMap((count) =>
-                count === 1
-                  ? Effect.succeed(makeBranchPullRequest("open"))
-                  : Deferred.succeed(periodicLookupStarted, undefined).pipe(
-                      Effect.andThen(Deferred.await(releasePeriodicLookup)),
-                      Effect.as(makeBranchPullRequest("open")),
-                    ),
-              ),
+    Effect.gen(function* () {
+      yield* TestClock.setTime(Date.parse(NOW));
+      const periodicLookupStarted = yield* Deferred.make<void>();
+      const releasePeriodicLookup = yield* Deferred.make<void>();
+      const mergedThreadSettled = yield* Deferred.make<void>();
+      const branchLookupCount = yield* Ref.make(0);
+      const fixture = yield* makeHarness({
+        snapshot: makeSnapshot([
+          makeThread("merged-in-app", {
+            latestUserMessageAt: DateTime.makeUnsafe("2026-08-27T00:00:00.000Z"),
+            linkedPullRequest: {
+              projectId: PROJECT_ID,
+              repository: "Owner/Repository",
+              number: 42,
+              url: "https://example.test/owner/repository/pull/42",
+            },
+          }),
+          makeThread("slow-periodic-lookup", {
+            branch: "another-feature",
+            latestUserMessageAt: DateTime.makeUnsafe("2026-08-27T00:00:00.000Z"),
+          }),
+        ]),
+        branchPullRequest: () =>
+          Ref.updateAndGet(branchLookupCount, (count) => count + 1).pipe(
+            Effect.flatMap((count) =>
+              count === 1
+                ? Effect.succeed(makeBranchPullRequest("open"))
+                : Deferred.succeed(periodicLookupStarted, undefined).pipe(
+                    Effect.andThen(Deferred.await(releasePeriodicLookup)),
+                    Effect.as(makeBranchPullRequest("open")),
+                  ),
             ),
-          onDispatch: () => Deferred.succeed(mergedThreadSettled, undefined),
-        });
+          ),
+        onDispatch: () => Deferred.succeed(mergedThreadSettled, undefined),
+      });
 
-        yield* Effect.gen(function* () {
-          const reactor = yield* ThreadSettlementService.ThreadSettlementServiceV2;
-          yield* startHarness(reactor, fixture.activation, fixture.snapshotReads);
-          yield* fixture.updateSettings({ sidebarAutoSettleAfterDays: 4 });
-          yield* Deferred.await(periodicLookupStarted);
+      yield* Effect.gen(function* () {
+        const reactor = yield* ThreadSettlementService.ThreadSettlementServiceV2;
+        yield* startHarness(reactor, fixture.activation, fixture.snapshotReads);
+        yield* fixture.updateSettings({ sidebarAutoSettleAfterDays: 4 });
+        yield* Deferred.await(periodicLookupStarted);
 
-          yield* fixture.publishMerge;
-          yield* Deferred.await(mergedThreadSettled);
+        yield* fixture.publishMerge;
+        yield* Deferred.await(mergedThreadSettled);
 
-          assert.deepStrictEqual(
-            (yield* Ref.get(fixture.commands)).map((command) => command.threadId),
-            [ThreadId.make("merged-in-app")],
-          );
-          yield* Deferred.succeed(releasePeriodicLookup, undefined);
-          yield* reactor.drain;
-        }).pipe(Effect.provide(fixture.layer));
-      }),
-    ),
+        assert.deepStrictEqual(
+          (yield* Ref.get(fixture.commands)).map((command) => command.threadId),
+          [ThreadId.make("merged-in-app")],
+        );
+        yield* Deferred.succeed(releasePeriodicLookup, undefined);
+        yield* reactor.drain;
+      }).pipe(Effect.provide(fixture.layer));
+    }),
   );
 
   it.effect("settles a merged thread when its background work ends, during a slow full sweep", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        yield* TestClock.setTime(Date.parse(NOW));
-        const periodicLookupStarted = yield* Deferred.make<void>();
-        const releasePeriodicLookup = yield* Deferred.make<void>();
-        const settled = yield* Deferred.make<void>();
-        const branchLookupCount = yield* Ref.make(0);
-        const mergedLink: NonNullable<SettlementShell["pullRequests"]>[number] = {
-          ...persistedLink("open", DateTime.makeUnsafe("2026-08-20T00:00:00.000Z")),
-          snapshot: {
-            state: "merged",
-            title: "Pull request",
-            headBranch: "feature",
-            baseBranch: "main",
-            isDraft: false,
-            updatedAt: NOW,
-            syncedAt: NOW,
-            mergedAt: NOW,
-          },
-        };
-        const waiting = makeThread("waiting-on-subagent", {
-          pullRequests: [mergedLink],
-          pendingBackgroundTasks: [{ taskId: "child", kind: "subagent", description: "Review" }],
-        });
-        const slow = makeThread("slow-periodic-lookup", {
-          branch: "another-feature",
-          latestUserMessageAt: DateTime.makeUnsafe("2026-08-27T00:00:00.000Z"),
-        });
-        const fixture = yield* makeHarness({
-          snapshot: makeSnapshot([waiting, slow]),
-          branchPullRequest: () =>
-            Ref.updateAndGet(branchLookupCount, (count) => count + 1).pipe(
-              Effect.flatMap((count) =>
-                count === 1
-                  ? Effect.succeed(makeBranchPullRequest("open"))
-                  : Deferred.succeed(periodicLookupStarted, undefined).pipe(
-                      Effect.andThen(Deferred.await(releasePeriodicLookup)),
-                      Effect.as(makeBranchPullRequest("open")),
-                    ),
-              ),
+    Effect.gen(function* () {
+      yield* TestClock.setTime(Date.parse(NOW));
+      const periodicLookupStarted = yield* Deferred.make<void>();
+      const releasePeriodicLookup = yield* Deferred.make<void>();
+      const settled = yield* Deferred.make<void>();
+      const branchLookupCount = yield* Ref.make(0);
+      const mergedLink: NonNullable<SettlementShell["pullRequests"]>[number] = {
+        ...persistedLink("open", DateTime.makeUnsafe("2026-08-20T00:00:00.000Z")),
+        snapshot: {
+          state: "merged",
+          title: "Pull request",
+          headBranch: "feature",
+          baseBranch: "main",
+          isDraft: false,
+          updatedAt: NOW,
+          syncedAt: NOW,
+          mergedAt: NOW,
+        },
+      };
+      const waiting = makeThread("waiting-on-subagent", {
+        pullRequests: [mergedLink],
+        pendingBackgroundTasks: [{ taskId: "child", kind: "subagent", description: "Review" }],
+      });
+      const slow = makeThread("slow-periodic-lookup", {
+        branch: "another-feature",
+        latestUserMessageAt: DateTime.makeUnsafe("2026-08-27T00:00:00.000Z"),
+      });
+      const fixture = yield* makeHarness({
+        snapshot: makeSnapshot([waiting, slow]),
+        branchPullRequest: () =>
+          Ref.updateAndGet(branchLookupCount, (count) => count + 1).pipe(
+            Effect.flatMap((count) =>
+              count === 1
+                ? Effect.succeed(makeBranchPullRequest("open"))
+                : Deferred.succeed(periodicLookupStarted, undefined).pipe(
+                    Effect.andThen(Deferred.await(releasePeriodicLookup)),
+                    Effect.as(makeBranchPullRequest("open")),
+                  ),
             ),
-          onDispatch: () => Deferred.succeed(settled, undefined),
+          ),
+        onDispatch: () => Deferred.succeed(settled, undefined),
+      });
+
+      yield* Effect.gen(function* () {
+        const reactor = yield* ThreadSettlementService.ThreadSettlementServiceV2;
+        yield* startHarness(reactor, fixture.activation, fixture.snapshotReads);
+        assert.deepStrictEqual(yield* Ref.get(fixture.commands), []);
+        yield* fixture.updateSettings({ sidebarAutoSettleAfterDays: 4 });
+        yield* Deferred.await(periodicLookupStarted);
+
+        yield* Ref.set(
+          fixture.snapshots,
+          makeSnapshot([{ ...waiting, pendingBackgroundTasks: [] }, slow]),
+        );
+        yield* fixture.publishEvent({
+          type: "run.background-work-cancelled",
+          id: EventId.make("event:background-ended"),
+          threadId: waiting.id,
+          occurredAt: DateTime.makeUnsafe(NOW),
+          payload: { runId: RunId.make("run:waiting"), restartCancelledBackgroundWork: [] },
         });
+        yield* Deferred.await(settled);
 
-        yield* Effect.gen(function* () {
-          const reactor = yield* ThreadSettlementService.ThreadSettlementServiceV2;
-          yield* startHarness(reactor, fixture.activation, fixture.snapshotReads);
-          assert.deepStrictEqual(yield* Ref.get(fixture.commands), []);
-          yield* fixture.updateSettings({ sidebarAutoSettleAfterDays: 4 });
-          yield* Deferred.await(periodicLookupStarted);
-
-          yield* Ref.set(
-            fixture.snapshots,
-            makeSnapshot([{ ...waiting, pendingBackgroundTasks: [] }, slow]),
-          );
-          yield* fixture.publishEvent({
-            type: "run.background-work-cancelled",
-            id: EventId.make("event:background-ended"),
-            threadId: waiting.id,
-            occurredAt: DateTime.makeUnsafe(NOW),
-            payload: { runId: RunId.make("run:waiting"), restartCancelledBackgroundWork: [] },
-          });
-          yield* Deferred.await(settled);
-
-          assert.deepStrictEqual(
-            (yield* Ref.get(fixture.commands)).map((command) => command.threadId),
-            [waiting.id],
-          );
-          yield* Deferred.succeed(releasePeriodicLookup, undefined);
-          yield* reactor.drain;
-        }).pipe(Effect.provide(fixture.layer));
-      }),
-    ),
+        assert.deepStrictEqual(
+          (yield* Ref.get(fixture.commands)).map((command) => command.threadId),
+          [waiting.id],
+        );
+        yield* Deferred.succeed(releasePeriodicLookup, undefined);
+        yield* reactor.drain;
+      }).pipe(Effect.provide(fixture.layer));
+    }),
   );
 
   it.effect("settles a stopped thread while another thread's lookup is slow", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        yield* TestClock.setTime(Date.parse(NOW));
-        const slowLookupStarted = yield* Deferred.make<void>();
-        const releaseSlowLookup = yield* Deferred.make<void>();
-        const settled = yield* Deferred.make<void>();
-        const branchLookupCount = yield* Ref.make(0);
-        const recent = DateTime.makeUnsafe("2026-08-27T00:00:00.000Z");
-        const slow = makeThread("slow-lookup", { branch: "feature", latestUserMessageAt: recent });
-        const merged = makeThread("merged", {
-          latestUserMessageAt: recent,
-          pullRequests: [
-            {
-              ...persistedLink("open", recent),
-              snapshot: {
-                state: "merged",
-                title: "Pull request",
-                headBranch: "feature",
-                baseBranch: "main",
-                isDraft: false,
-                updatedAt: NOW,
-                syncedAt: NOW,
-                mergedAt: NOW,
-              },
+    Effect.gen(function* () {
+      yield* TestClock.setTime(Date.parse(NOW));
+      const slowLookupStarted = yield* Deferred.make<void>();
+      const releaseSlowLookup = yield* Deferred.make<void>();
+      const settled = yield* Deferred.make<void>();
+      const branchLookupCount = yield* Ref.make(0);
+      const recent = DateTime.makeUnsafe("2026-08-27T00:00:00.000Z");
+      const slow = makeThread("slow-lookup", { branch: "feature", latestUserMessageAt: recent });
+      const merged = makeThread("merged", {
+        latestUserMessageAt: recent,
+        pullRequests: [
+          {
+            ...persistedLink("open", recent),
+            snapshot: {
+              state: "merged",
+              title: "Pull request",
+              headBranch: "feature",
+              baseBranch: "main",
+              isDraft: false,
+              updatedAt: NOW,
+              syncedAt: NOW,
+              mergedAt: NOW,
             },
-          ],
-          pendingBackgroundTasks: [{ taskId: "child", kind: "subagent", description: "Review" }],
-        });
-        const fixture = yield* makeHarness({
-          snapshot: makeSnapshot([slow, merged]),
-          branchPullRequest: () =>
-            Ref.updateAndGet(branchLookupCount, (count) => count + 1).pipe(
-              Effect.flatMap((count) =>
-                count === 1
-                  ? Effect.succeed(makeBranchPullRequest("open"))
-                  : Deferred.succeed(slowLookupStarted, undefined).pipe(
-                      Effect.andThen(Deferred.await(releaseSlowLookup)),
-                      Effect.as(makeBranchPullRequest("open")),
-                    ),
-              ),
+          },
+        ],
+        pendingBackgroundTasks: [{ taskId: "child", kind: "subagent", description: "Review" }],
+      });
+      const fixture = yield* makeHarness({
+        snapshot: makeSnapshot([slow, merged]),
+        branchPullRequest: () =>
+          Ref.updateAndGet(branchLookupCount, (count) => count + 1).pipe(
+            Effect.flatMap((count) =>
+              count === 1
+                ? Effect.succeed(makeBranchPullRequest("open"))
+                : Deferred.succeed(slowLookupStarted, undefined).pipe(
+                    Effect.andThen(Deferred.await(releaseSlowLookup)),
+                    Effect.as(makeBranchPullRequest("open")),
+                  ),
             ),
-          onDispatch: () => Deferred.succeed(settled, undefined),
-        });
-        const backgroundEnded = (threadId: ThreadId): OrchestrationV2DomainEvent => ({
-          type: "run.background-work-cancelled",
-          id: EventId.make(`event:background-ended:${threadId}`),
-          threadId,
-          occurredAt: DateTime.makeUnsafe(NOW),
-          payload: { runId: RunId.make(`run:${threadId}`), restartCancelledBackgroundWork: [] },
-        });
-
-        yield* Effect.gen(function* () {
-          const reactor = yield* ThreadSettlementService.ThreadSettlementServiceV2;
-          yield* startHarness(reactor, fixture.activation, fixture.snapshotReads);
+          ),
+        onDispatch: () => Deferred.succeed(settled, undefined),
+      });
+      const backgroundEnded = (threadId: ThreadId): OrchestrationV2DomainEvent => ({
+        type: "run.background-work-cancelled",
+        id: EventId.make(`event:background-ended:${threadId}`),
+        threadId,
+        occurredAt: DateTime.makeUnsafe(NOW),
+        payload: { runId: RunId.make(`run:${threadId}`), restartCancelledBackgroundWork: [] },
+      });
+
+      yield* Effect.gen(function* () {
+        const reactor = yield* ThreadSettlementService.ThreadSettlementServiceV2;
+        yield* startHarness(reactor, fixture.activation, fixture.snapshotReads);
+        yield* fixture.publishEvent(backgroundEnded(slow.id));
+        yield* Deferred.await(slowLookupStarted);
+        // More events for the slow thread coalesce into one more pass, not more sweeps.
+        for (let index = 0; index < 9; index++) {
           yield* fixture.publishEvent(backgroundEnded(slow.id));
-          yield* Deferred.await(slowLookupStarted);
-          // More events for the slow thread coalesce into one more pass, not more sweeps.
-          for (let index = 0; index < 9; index++) {
-            yield* fixture.publishEvent(backgroundEnded(slow.id));
-          }
+        }
 
-          yield* Ref.set(
-            fixture.snapshots,
-            makeSnapshot([slow, { ...merged, pendingBackgroundTasks: [] }]),
-          );
-          yield* fixture.publishEvent(backgroundEnded(merged.id));
-          yield* Deferred.await(settled);
+        yield* Ref.set(
+          fixture.snapshots,
+          makeSnapshot([slow, { ...merged, pendingBackgroundTasks: [] }]),
+        );
+        yield* fixture.publishEvent(backgroundEnded(merged.id));
+        yield* Deferred.await(settled);
 
-          assert.deepStrictEqual(
-            (yield* Ref.get(fixture.commands)).map((command) => command.threadId),
-            [merged.id],
-          );
-          yield* Deferred.succeed(releaseSlowLookup, undefined);
-          yield* reactor.drain;
-          // The startup sweep, the first per-thread sweep, and one coalesced rerun.
-          assert.strictEqual(yield* Ref.get(branchLookupCount), 3);
-        }).pipe(Effect.provide(fixture.layer));
-      }),
-    ),
+        assert.deepStrictEqual(
+          (yield* Ref.get(fixture.commands)).map((command) => command.threadId),
+          [merged.id],
+        );
+        yield* Deferred.succeed(releaseSlowLookup, undefined);
+        yield* reactor.drain;
+        // The startup sweep, the first per-thread sweep, and one coalesced rerun.
+        assert.strictEqual(yield* Ref.get(branchLookupCount), 3);
+      }).pipe(Effect.provide(fixture.layer));
+    }),
   );
 
   it.effect("settles an unlinked branch thread its agent merged from a shell, past the cache", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        yield* TestClock.setTime(Date.parse(NOW));
-        const settled = yield* Deferred.make<void>();
-        const thread = makeThread("shell-merged", {
-          branch: "saved-feature",
-          latestUserMessageAt: DateTime.makeUnsafe("2026-08-27T00:00:00.000Z"),
-        });
-        const fixture = yield* makeHarness({
-          snapshot: makeSnapshot([thread]),
-          // The host already merged it; only a fresh read sees that past the cached open lookup.
-          branchPullRequest: (_input, lookupOptions) =>
-            Effect.succeed(makeBranchPullRequest(lookupOptions?.refresh ? "merged" : "open")),
-          onDispatch: () => Deferred.succeed(settled, undefined),
-        });
-        const at = DateTime.makeUnsafe(NOW);
-        const runId = RunId.make("run:shell-merged");
-        const runEnded: OrchestrationV2DomainEvent = {
-          type: "run.background-work-cancelled",
-          id: EventId.make("event:shell-merged:run-ended"),
+    Effect.gen(function* () {
+      yield* TestClock.setTime(Date.parse(NOW));
+      const settled = yield* Deferred.make<void>();
+      const thread = makeThread("shell-merged", {
+        branch: "saved-feature",
+        latestUserMessageAt: DateTime.makeUnsafe("2026-08-27T00:00:00.000Z"),
+      });
+      const fixture = yield* makeHarness({
+        snapshot: makeSnapshot([thread]),
+        // The host already merged it; only a fresh read sees that past the cached open lookup.
+        branchPullRequest: (_input, lookupOptions) =>
+          Effect.succeed(makeBranchPullRequest(lookupOptions?.refresh ? "merged" : "open")),
+        onDispatch: () => Deferred.succeed(settled, undefined),
+      });
+      const at = DateTime.makeUnsafe(NOW);
+      const runId = RunId.make("run:shell-merged");
+      const runEnded: OrchestrationV2DomainEvent = {
+        type: "run.background-work-cancelled",
+        id: EventId.make("event:shell-merged:run-ended"),
+        threadId: thread.id,
+        occurredAt: at,
+        payload: { runId, restartCancelledBackgroundWork: [] },
+      };
+
+      yield* Effect.gen(function* () {
+        const reactor = yield* ThreadSettlementService.ThreadSettlementServiceV2;
+        yield* startHarness(reactor, fixture.activation, fixture.snapshotReads);
+        yield* fixture.publishEvent(runEnded);
+        yield* Queue.take(fixture.snapshotReads);
+        yield* reactor.drain;
+        assert.deepStrictEqual(yield* Ref.get(fixture.commands), []);
+
+        yield* fixture.publishEvent({
+          type: "turn-item.updated",
+          id: EventId.make("event:shell-merged:command"),
           threadId: thread.id,
+          runId,
           occurredAt: at,
-          payload: { runId, restartCancelledBackgroundWork: [] },
-        };
-
-        yield* Effect.gen(function* () {
-          const reactor = yield* ThreadSettlementService.ThreadSettlementServiceV2;
-          yield* startHarness(reactor, fixture.activation, fixture.snapshotReads);
-          yield* fixture.publishEvent(runEnded);
-          yield* Queue.take(fixture.snapshotReads);
-          yield* reactor.drain;
-          assert.deepStrictEqual(yield* Ref.get(fixture.commands), []);
-
-          yield* fixture.publishEvent({
-            type: "turn-item.updated",
-            id: EventId.make("event:shell-merged:command"),
+          payload: {
+            id: TurnItemId.make("item:shell-merged:command"),
             threadId: thread.id,
             runId,
-            occurredAt: at,
-            payload: {
-              id: TurnItemId.make("item:shell-merged:command"),
-              threadId: thread.id,
-              runId,
-              nodeId: null,
-              providerThreadId: null,
-              providerTurnId: null,
-              nativeItemRef: null,
-              parentItemId: null,
-              ordinal: 1,
-              status: "completed",
-              title: null,
-              startedAt: at,
-              completedAt: at,
-              updatedAt: at,
-              type: "command_execution",
-              input: "gh pr merge 42 --squash",
-            },
-          });
-          yield* Deferred.await(settled);
-          assert.deepStrictEqual(
-            (yield* Ref.get(fixture.commands)).map((command) => command.threadId),
-            [thread.id],
-          );
-        }).pipe(Effect.provide(fixture.layer));
-      }),
-    ),
+            nodeId: null,
+            providerThreadId: null,
+            providerTurnId: null,
+            nativeItemRef: null,
+            parentItemId: null,
+            ordinal: 1,
+            status: "completed",
+            title: null,
+            startedAt: at,
+            completedAt: at,
+            updatedAt: at,
+            type: "command_execution",
+            input: "gh pr merge 42 --squash",
+          },
+        });
+        yield* Deferred.await(settled);
+        assert.deepStrictEqual(
+          (yield* Ref.get(fixture.commands)).map((command) => command.threadId),
+          [thread.id],
+        );
+      }).pipe(Effect.provide(fixture.layer));
+    }),
   );
 
   it.effect(
     "settles branch threads on a pull request merge without waiting for the next sweep",
     () =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          yield* TestClock.setTime(Date.parse(NOW));
-          const state = yield* Ref.make<"open" | "merged">("open");
-          const mergedThreadSettled = yield* Deferred.make<void>();
-          const fixture = yield* makeHarness({
-            snapshot: makeSnapshot([
-              makeThread("branch-thread", {
-                branch: "saved-feature",
-                latestUserMessageAt: DateTime.makeUnsafe("2026-08-27T00:00:00.000Z"),
-              }),
-            ]),
-            branchPullRequest: () => Ref.get(state).pipe(Effect.map(makeBranchPullRequest)),
-            onDispatch: () => Deferred.succeed(mergedThreadSettled, undefined),
-          });
-
-          yield* Effect.gen(function* () {
-            const reactor = yield* ThreadSettlementService.ThreadSettlementServiceV2;
-            yield* startHarness(reactor, fixture.activation, fixture.snapshotReads);
-            assert.deepStrictEqual(yield* Ref.get(fixture.commands), []);
-            assert.deepStrictEqual(yield* Ref.get(fixture.invalidatedCwds), []);
-
-            yield* Ref.set(state, "merged");
-            yield* fixture.publishMerge;
-            yield* Deferred.await(mergedThreadSettled);
-
-            assert.deepStrictEqual(
-              (yield* Ref.get(fixture.commands)).map((command) => command.threadId),
-              [ThreadId.make("branch-thread")],
-            );
-            assert.deepStrictEqual(yield* Ref.get(fixture.invalidatedCwds), ["/workspace/project"]);
-            yield* reactor.drain;
-          }).pipe(Effect.provide(fixture.layer));
-        }),
-      ),
-  );
-
-  it.effect("a merge does not settle threads linked to an unrelated pull request", () =>
-    Effect.scoped(
       Effect.gen(function* () {
         yield* TestClock.setTime(Date.parse(NOW));
+        const state = yield* Ref.make<"open" | "merged">("open");
         const mergedThreadSettled = yield* Deferred.make<void>();
-        const mergeLookupStarted = yield* Deferred.make<void>();
-        const releaseMergeLookup = yield* Deferred.make<void>();
-        const lookupCount = yield* Ref.make(0);
         const fixture = yield* makeHarness({
           snapshot: makeSnapshot([
-            makeThread("merged-in-app", {
+            makeThread("branch-thread", {
+              branch: "saved-feature",
               latestUserMessageAt: DateTime.makeUnsafe("2026-08-27T00:00:00.000Z"),
-              linkedPullRequest: {
-                projectId: PROJECT_ID,
-                repository: "owner/repository",
-                number: 42,
-                url: "https://example.test/owner/repository/pull/42",
-              },
-            }),
-            makeThread("unrelated-linked", {
-              latestUserMessageAt: DateTime.makeUnsafe("2026-08-27T00:00:00.000Z"),
-              linkedPullRequest: {
-                projectId: PROJECT_ID,
-                repository: "owner/repository",
-                number: 99,
-                url: "https://example.test/owner/repository/pull/99",
-              },
             }),
           ]),
-          pullRequestSummary: (input) =>
-            Ref.updateAndGet(lookupCount, (count) => count + 1).pipe(
-              Effect.tap((count) =>
-                count === 3 ? Deferred.succeed(mergeLookupStarted, undefined) : Effect.void,
-              ),
-              Effect.tap((count) =>
-                count === 3 ? Deferred.await(releaseMergeLookup) : Effect.void,
-              ),
-              Effect.map(() => makePullRequestSummary({ ...input, state: "open" })),
-            ),
+          branchPullRequest: () => Ref.get(state).pipe(Effect.map(makeBranchPullRequest)),
           onDispatch: () => Deferred.succeed(mergedThreadSettled, undefined),
         });
 
@@ -1790,192 +1712,307 @@ describe("ThreadSettlementServiceV2 worker", () => {
           const reactor = yield* ThreadSettlementService.ThreadSettlementServiceV2;
           yield* startHarness(reactor, fixture.activation, fixture.snapshotReads);
           assert.deepStrictEqual(yield* Ref.get(fixture.commands), []);
+          assert.deepStrictEqual(yield* Ref.get(fixture.invalidatedCwds), []);
 
+          yield* Ref.set(state, "merged");
           yield* fixture.publishMerge;
-          yield* Deferred.await(mergeLookupStarted);
           yield* Deferred.await(mergedThreadSettled);
-          yield* Deferred.succeed(releaseMergeLookup, undefined);
-          yield* reactor.drain;
 
           assert.deepStrictEqual(
             (yield* Ref.get(fixture.commands)).map((command) => command.threadId),
-            [ThreadId.make("merged-in-app")],
-          );
-          assert.deepStrictEqual(
-            (yield* Ref.get(fixture.summaryCalls))
-              .map((call) => call.number)
-              .toSorted((left, right) => left - right),
-            [42, 99, 99],
+            [ThreadId.make("branch-thread")],
           );
+          assert.deepStrictEqual(yield* Ref.get(fixture.invalidatedCwds), ["/workspace/project"]);
+          yield* reactor.drain;
         }).pipe(Effect.provide(fixture.layer));
       }),
-    ),
+  );
+
+  it.effect("a merged branch PR that cannot settle its thread rereads no git state", () =>
+    Effect.gen(function* () {
+      yield* TestClock.setTime(Date.parse(NOW));
+      const freshReads = yield* Ref.make(0);
+      const fixture = yield* makeHarness({
+        snapshot: makeSnapshot([
+          makeThread("worked-after-merge", {
+            branch: "merged-feature",
+            latestUserAuthoredMessageAt: DateTime.makeUnsafe("2026-08-28T06:00:00.000Z"),
+          }),
+        ]),
+        settings: { ...DEFAULT_SERVER_SETTINGS, sidebarAutoSettleAfterDays: null },
+        branchPullRequest: (_input, lookupOptions) =>
+          Ref.update(
+            freshReads,
+            (count) => count + (readsFreshGitState(lookupOptions) ? 1 : 0),
+          ).pipe(
+            Effect.as({
+              ...makeBranchPullRequest("merged"),
+              mergedAt: "2026-08-27T00:00:00.000Z",
+            }),
+          ),
+      });
+
+      yield* Effect.gen(function* () {
+        const reactor = yield* ThreadSettlementService.ThreadSettlementServiceV2;
+        yield* startHarness(reactor, fixture.activation, fixture.snapshotReads);
+        yield* TestClock.adjust("1 minute");
+        yield* Queue.take(fixture.snapshotReads);
+        yield* reactor.drain;
+
+        assert.strictEqual((yield* Ref.get(fixture.branchCalls)).length, 2);
+        assert.strictEqual(yield* Ref.get(freshReads), 0);
+        assert.deepStrictEqual(yield* Ref.get(fixture.commands), []);
+      }).pipe(Effect.provide(fixture.layer));
+    }),
+  );
+
+  it.effect("a remembered merged branch PR settles only after fresh git state agrees", () =>
+    Effect.gen(function* () {
+      yield* TestClock.setTime(Date.parse(NOW));
+      const freshState = yield* Ref.make<"open" | "merged">("open");
+      const fixture = yield* makeHarness({
+        snapshot: makeSnapshot([makeThread("merged-branch", { branch: "merged-feature" })]),
+        settings: { ...DEFAULT_SERVER_SETTINGS, sidebarAutoSettleAfterDays: null },
+        branchPullRequest: (_input, lookupOptions) =>
+          readsFreshGitState(lookupOptions)
+            ? Ref.get(freshState).pipe(Effect.map(makeBranchPullRequest))
+            : Effect.succeed(makeBranchPullRequest("merged")),
+      });
+
+      yield* Effect.gen(function* () {
+        const reactor = yield* ThreadSettlementService.ThreadSettlementServiceV2;
+        yield* startHarness(reactor, fixture.activation, fixture.snapshotReads);
+        assert.deepStrictEqual(yield* Ref.get(fixture.commands), []);
+
+        yield* Ref.set(freshState, "merged");
+        yield* TestClock.adjust("1 minute");
+        yield* Queue.take(fixture.snapshotReads);
+        yield* reactor.drain;
+
+        assert.deepStrictEqual(
+          (yield* Ref.get(fixture.commands)).map((command) => command.threadId),
+          [ThreadId.make("merged-branch")],
+        );
+      }).pipe(Effect.provide(fixture.layer));
+    }),
+  );
+
+  it.effect("a merge does not settle threads linked to an unrelated pull request", () =>
+    Effect.gen(function* () {
+      yield* TestClock.setTime(Date.parse(NOW));
+      const mergedThreadSettled = yield* Deferred.make<void>();
+      const mergeLookupStarted = yield* Deferred.make<void>();
+      const releaseMergeLookup = yield* Deferred.make<void>();
+      const lookupCount = yield* Ref.make(0);
+      const fixture = yield* makeHarness({
+        snapshot: makeSnapshot([
+          makeThread("merged-in-app", {
+            latestUserMessageAt: DateTime.makeUnsafe("2026-08-27T00:00:00.000Z"),
+            linkedPullRequest: {
+              projectId: PROJECT_ID,
+              repository: "owner/repository",
+              number: 42,
+              url: "https://example.test/owner/repository/pull/42",
+            },
+          }),
+          makeThread("unrelated-linked", {
+            latestUserMessageAt: DateTime.makeUnsafe("2026-08-27T00:00:00.000Z"),
+            linkedPullRequest: {
+              projectId: PROJECT_ID,
+              repository: "owner/repository",
+              number: 99,
+              url: "https://example.test/owner/repository/pull/99",
+            },
+          }),
+        ]),
+        pullRequestSummary: (input) =>
+          Ref.updateAndGet(lookupCount, (count) => count + 1).pipe(
+            Effect.tap((count) =>
+              count === 3 ? Deferred.succeed(mergeLookupStarted, undefined) : Effect.void,
+            ),
+            Effect.tap((count) => (count === 3 ? Deferred.await(releaseMergeLookup) : Effect.void)),
+            Effect.map(() => makePullRequestSummary({ ...input, state: "open" })),
+          ),
+        onDispatch: () => Deferred.succeed(mergedThreadSettled, undefined),
+      });
+
+      yield* Effect.gen(function* () {
+        const reactor = yield* ThreadSettlementService.ThreadSettlementServiceV2;
+        yield* startHarness(reactor, fixture.activation, fixture.snapshotReads);
+        assert.deepStrictEqual(yield* Ref.get(fixture.commands), []);
+
+        yield* fixture.publishMerge;
+        yield* Deferred.await(mergeLookupStarted);
+        yield* Deferred.await(mergedThreadSettled);
+        yield* Deferred.succeed(releaseMergeLookup, undefined);
+        yield* reactor.drain;
+
+        assert.deepStrictEqual(
+          (yield* Ref.get(fixture.commands)).map((command) => command.threadId),
+          [ThreadId.make("merged-in-app")],
+        );
+        assert.deepStrictEqual(
+          (yield* Ref.get(fixture.summaryCalls))
+            .map((call) => call.number)
+            .toSorted((left, right) => left - right),
+          [42, 99, 99],
+        );
+      }).pipe(Effect.provide(fixture.layer));
+    }),
   );
 });
 
 describe("ThreadSettlementServiceV2 terminals", () => {
   it.effect("keeps the terminals of a thread re-engaged before the event ran", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const settled = appThread("reengaged-thread", "settled");
-        const reengaged = appThread("reengaged-thread", "active");
-        const marker = appThread("marker-thread", "settled");
-        const fixture = yield* makeHarness({
-          snapshot: makeSnapshot([]),
-          currentThreads: [reengaged, marker],
-        });
-
-        yield* Effect.gen(function* () {
-          const service = yield* ThreadSettlementService.ThreadSettlementServiceV2;
-          yield* startHarness(service, fixture.activation, fixture.snapshotReads);
-          yield* fixture.publishEvent(settledEvent(settled));
-          yield* fixture.publishEvent(settledEvent(marker));
-          assert.deepStrictEqual(yield* Queue.take(fixture.closedIdle), { threadId: marker.id });
-        }).pipe(Effect.provide(fixture.layer));
-      }),
-    ),
+    Effect.gen(function* () {
+      const settled = appThread("reengaged-thread", "settled");
+      const reengaged = appThread("reengaged-thread", "active");
+      const marker = appThread("marker-thread", "settled");
+      const fixture = yield* makeHarness({
+        snapshot: makeSnapshot([]),
+        currentThreads: [reengaged, marker],
+      });
+
+      yield* Effect.gen(function* () {
+        const service = yield* ThreadSettlementService.ThreadSettlementServiceV2;
+        yield* startHarness(service, fixture.activation, fixture.snapshotReads);
+        yield* fixture.publishEvent(settledEvent(settled));
+        yield* fixture.publishEvent(settledEvent(marker));
+        assert.deepStrictEqual(yield* Queue.take(fixture.closedIdle), { threadId: marker.id });
+      }).pipe(Effect.provide(fixture.layer));
+    }),
   );
 
   it.effect("runs the settle script in the thread's own worktree", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const shared = appThread("shared-checkout-thread", "settled");
-        const missing = appThread("removed-worktree-thread", "settled", "/worktrees/removed");
-        const worktree = appThread("worktree-thread", "settled", "/worktrees/thread");
-        const fixture = yield* makeHarness({
-          snapshot: makeSnapshot([]),
-          currentThreads: [shared, missing, worktree],
-          existingWorktreePaths: ["/worktrees/thread"],
-        });
-
-        yield* Effect.gen(function* () {
-          const service = yield* ThreadSettlementService.ThreadSettlementServiceV2;
-          yield* startHarness(service, fixture.activation, fixture.snapshotReads);
-          yield* fixture.publishEvent(settledEvent(shared));
-          yield* fixture.publishEvent(settledEvent(missing));
-          yield* fixture.publishEvent(settledEvent(worktree));
-          const run = yield* Queue.take(fixture.scriptRuns);
-          assert.strictEqual(run.threadId, worktree.id);
-          assert.strictEqual(run.worktreePath, "/worktrees/thread");
-          assert.strictEqual(run.trigger, "settle");
-        }).pipe(Effect.provide(fixture.layer));
-      }),
-    ),
+    Effect.gen(function* () {
+      const shared = appThread("shared-checkout-thread", "settled");
+      const missing = appThread("removed-worktree-thread", "settled", "/worktrees/removed");
+      const worktree = appThread("worktree-thread", "settled", "/worktrees/thread");
+      const fixture = yield* makeHarness({
+        snapshot: makeSnapshot([]),
+        currentThreads: [shared, missing, worktree],
+        existingWorktreePaths: ["/worktrees/thread"],
+      });
+
+      yield* Effect.gen(function* () {
+        const service = yield* ThreadSettlementService.ThreadSettlementServiceV2;
+        yield* startHarness(service, fixture.activation, fixture.snapshotReads);
+        yield* fixture.publishEvent(settledEvent(shared));
+        yield* fixture.publishEvent(settledEvent(missing));
+        yield* fixture.publishEvent(settledEvent(worktree));
+        const run = yield* Queue.take(fixture.scriptRuns);
+        assert.strictEqual(run.threadId, worktree.id);
+        assert.strictEqual(run.worktreePath, "/worktrees/thread");
+        assert.strictEqual(run.trigger, "settle");
+      }).pipe(Effect.provide(fixture.layer));
+    }),
   );
 
   it.effect("skips the settle script for a thread re-engaged while its shells close", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const settled = appThread("reengaging-thread", "settled", "/worktrees/reengaging");
-        const marker = appThread("marker-thread", "settled", "/worktrees/marker");
-        const currentThreads = [settled, marker];
-        const fixture = yield* makeHarness({
-          snapshot: makeSnapshot([]),
-          currentThreads,
-          existingWorktreePaths: ["/worktrees/reengaging", "/worktrees/marker"],
-          onCloseIdle: () =>
-            Effect.sync(() => {
-              currentThreads[0] = { ...settled, settledOverride: "active" };
-            }),
-        });
-
-        yield* Effect.gen(function* () {
-          const service = yield* ThreadSettlementService.ThreadSettlementServiceV2;
-          yield* startHarness(service, fixture.activation, fixture.snapshotReads);
-          yield* fixture.publishEvent(settledEvent(settled));
-          yield* fixture.publishEvent(settledEvent(marker));
-          assert.strictEqual((yield* Queue.take(fixture.scriptRuns)).threadId, marker.id);
-        }).pipe(Effect.provide(fixture.layer));
-      }),
-    ),
+    Effect.gen(function* () {
+      const settled = appThread("reengaging-thread", "settled", "/worktrees/reengaging");
+      const marker = appThread("marker-thread", "settled", "/worktrees/marker");
+      const currentThreads = [settled, marker];
+      const fixture = yield* makeHarness({
+        snapshot: makeSnapshot([]),
+        currentThreads,
+        existingWorktreePaths: ["/worktrees/reengaging", "/worktrees/marker"],
+        onCloseIdle: () =>
+          Effect.sync(() => {
+            currentThreads[0] = { ...settled, settledOverride: "active" };
+          }),
+      });
+
+      yield* Effect.gen(function* () {
+        const service = yield* ThreadSettlementService.ThreadSettlementServiceV2;
+        yield* startHarness(service, fixture.activation, fixture.snapshotReads);
+        yield* fixture.publishEvent(settledEvent(settled));
+        yield* fixture.publishEvent(settledEvent(marker));
+        assert.strictEqual((yield* Queue.take(fixture.scriptRuns)).threadId, marker.id);
+      }).pipe(Effect.provide(fixture.layer));
+    }),
   );
 
   it.effect("skips the settle script for a subagent in its parent's worktree", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const parent = appThread("subagent-parent", "settled", "/worktrees/parent");
-        const subagent = (id: string, worktreePath: string) => ({
-          ...appThread(id, "settled", worktreePath),
-          lineage: {
-            parentThreadId: parent.id,
-            relationshipToParent: "subagent" as const,
-            rootThreadId: parent.id,
-          },
-        });
-        const shared = subagent("subagent-shared", "/worktrees/parent");
-        const own = subagent("subagent-own", "/worktrees/own");
-        const fixture = yield* makeHarness({
-          snapshot: makeSnapshot([]),
-          currentThreads: [parent, shared, own],
-          existingWorktreePaths: ["/worktrees/parent", "/worktrees/own"],
-        });
-
-        yield* Effect.gen(function* () {
-          const service = yield* ThreadSettlementService.ThreadSettlementServiceV2;
-          yield* startHarness(service, fixture.activation, fixture.snapshotReads);
-          // Events run in order, so the first run belongs to the second event
-          // only if the shared-worktree child was skipped. Both still close.
-          yield* fixture.publishEvent(settledEvent(shared));
-          yield* fixture.publishEvent(settledEvent(own));
-          assert.deepStrictEqual(yield* Queue.take(fixture.closedIdle), { threadId: shared.id });
-          assert.deepStrictEqual(yield* Queue.take(fixture.closedIdle), { threadId: own.id });
-          assert.strictEqual((yield* Queue.take(fixture.scriptRuns)).threadId, own.id);
-        }).pipe(Effect.provide(fixture.layer));
-      }),
-    ),
+    Effect.gen(function* () {
+      const parent = appThread("subagent-parent", "settled", "/worktrees/parent");
+      const subagent = (id: string, worktreePath: string) => ({
+        ...appThread(id, "settled", worktreePath),
+        lineage: {
+          parentThreadId: parent.id,
+          relationshipToParent: "subagent" as const,
+          rootThreadId: parent.id,
+        },
+      });
+      const shared = subagent("subagent-shared", "/worktrees/parent");
+      const own = subagent("subagent-own", "/worktrees/own");
+      const fixture = yield* makeHarness({
+        snapshot: makeSnapshot([]),
+        currentThreads: [parent, shared, own],
+        existingWorktreePaths: ["/worktrees/parent", "/worktrees/own"],
+      });
+
+      yield* Effect.gen(function* () {
+        const service = yield* ThreadSettlementService.ThreadSettlementServiceV2;
+        yield* startHarness(service, fixture.activation, fixture.snapshotReads);
+        // Events run in order, so the first run belongs to the second event
+        // only if the shared-worktree child was skipped. Both still close.
+        yield* fixture.publishEvent(settledEvent(shared));
+        yield* fixture.publishEvent(settledEvent(own));
+        assert.deepStrictEqual(yield* Queue.take(fixture.closedIdle), { threadId: shared.id });
+        assert.deepStrictEqual(yield* Queue.take(fixture.closedIdle), { threadId: own.id });
+        assert.strictEqual((yield* Queue.take(fixture.scriptRuns)).threadId, own.id);
+      }).pipe(Effect.provide(fixture.layer));
+    }),
   );
 
   it.effect("runs the settle script once when a settlement is re-emitted", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const repeated = appThread("repeated-thread", "settled", "/worktrees/repeated");
-        const marker = appThread("marker-thread", "settled", "/worktrees/marker");
-        const fixture = yield* makeHarness({
-          snapshot: makeSnapshot([]),
-          currentThreads: [repeated, marker],
-          existingWorktreePaths: ["/worktrees/repeated", "/worktrees/marker"],
-        });
-
-        yield* Effect.gen(function* () {
-          const service = yield* ThreadSettlementService.ThreadSettlementServiceV2;
-          yield* startHarness(service, fixture.activation, fixture.snapshotReads);
-          yield* fixture.publishEvent(settledEvent(repeated));
-          yield* fixture.publishEvent(settledEvent(repeated));
-          yield* fixture.publishEvent(settledEvent(marker));
-          assert.strictEqual((yield* Queue.take(fixture.scriptRuns)).threadId, repeated.id);
-          assert.strictEqual((yield* Queue.take(fixture.scriptRuns)).threadId, marker.id);
-        }).pipe(Effect.provide(fixture.layer));
-      }),
-    ),
+    Effect.gen(function* () {
+      const repeated = appThread("repeated-thread", "settled", "/worktrees/repeated");
+      const marker = appThread("marker-thread", "settled", "/worktrees/marker");
+      const fixture = yield* makeHarness({
+        snapshot: makeSnapshot([]),
+        currentThreads: [repeated, marker],
+        existingWorktreePaths: ["/worktrees/repeated", "/worktrees/marker"],
+      });
+
+      yield* Effect.gen(function* () {
+        const service = yield* ThreadSettlementService.ThreadSettlementServiceV2;
+        yield* startHarness(service, fixture.activation, fixture.snapshotReads);
+        yield* fixture.publishEvent(settledEvent(repeated));
+        yield* fixture.publishEvent(settledEvent(repeated));
+        yield* fixture.publishEvent(settledEvent(marker));
+        assert.strictEqual((yield* Queue.take(fixture.scriptRuns)).threadId, repeated.id);
+        assert.strictEqual((yield* Queue.take(fixture.scriptRuns)).threadId, marker.id);
+      }).pipe(Effect.provide(fixture.layer));
+    }),
   );
 
   it.effect("retries the settle script on a re-emitted settlement after a failed start", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const thread = appThread("failed-start-thread", "settled", "/worktrees/failed-start");
-        const starts = yield* Ref.make(0);
-        const fixture = yield* makeHarness({
-          snapshot: makeSnapshot([]),
-          currentThreads: [thread],
-          existingWorktreePaths: ["/worktrees/failed-start"],
-          onScriptRun: () =>
-            Ref.updateAndGet(starts, (count) => count + 1).pipe(
-              Effect.flatMap((count) =>
-                count === 1 ? Effect.die(new Error("terminal failed to open")) : Effect.void,
-              ),
+    Effect.gen(function* () {
+      const thread = appThread("failed-start-thread", "settled", "/worktrees/failed-start");
+      const starts = yield* Ref.make(0);
+      const fixture = yield* makeHarness({
+        snapshot: makeSnapshot([]),
+        currentThreads: [thread],
+        existingWorktreePaths: ["/worktrees/failed-start"],
+        onScriptRun: () =>
+          Ref.updateAndGet(starts, (count) => count + 1).pipe(
+            Effect.flatMap((count) =>
+              count === 1 ? Effect.die(new Error("terminal failed to open")) : Effect.void,
             ),
-        });
-
-        yield* Effect.gen(function* () {
-          const service = yield* ThreadSettlementService.ThreadSettlementServiceV2;
-          yield* startHarness(service, fixture.activation, fixture.snapshotReads);
-          yield* fixture.publishEvent(settledEvent(thread));
-          yield* fixture.publishEvent(settledEvent(thread));
-          assert.strictEqual((yield* Queue.take(fixture.scriptRuns)).threadId, thread.id);
-          assert.strictEqual((yield* Queue.take(fixture.scriptRuns)).threadId, thread.id);
-        }).pipe(Effect.provide(fixture.layer));
-      }),
-    ),
+          ),
+      });
+
+      yield* Effect.gen(function* () {
+        const service = yield* ThreadSettlementService.ThreadSettlementServiceV2;
+        yield* startHarness(service, fixture.activation, fixture.snapshotReads);
+        yield* fixture.publishEvent(settledEvent(thread));
+        yield* fixture.publishEvent(settledEvent(thread));
+        assert.strictEqual((yield* Queue.take(fixture.scriptRuns)).threadId, thread.id);
+        assert.strictEqual((yield* Queue.take(fixture.scriptRuns)).threadId, thread.id);
+      }).pipe(Effect.provide(fixture.layer));
+    }),
   );
 });
 
diff --git a/apps/server/src/orchestration-v2/ThreadSettlementService.ts b/apps/server/src/orchestration-v2/ThreadSettlementService.ts
index 05a13cd8a399..cfcf1b1e057c 100644
--- a/apps/server/src/orchestration-v2/ThreadSettlementService.ts
+++ b/apps/server/src/orchestration-v2/ThreadSettlementService.ts
@@ -1,5 +1,6 @@
 import {
   backgroundWorkHoldsCompletion,
+  isPullRequestWatchTask,
   turnItemUpdateCanEndBackgroundWork,
 } from "@t3tools/shared/orchestrationV2PendingBackgroundWork";
 import { resolveProjectSettings } from "@t3tools/shared/projectSettings";
@@ -154,7 +155,10 @@ export function isAutoSettlementCandidate(
   // A guest is waiting on the owner; settling would hide the Request.
   if ((thread.pendingGuestMessageCount ?? 0) > 0) return false;
   if (thread.activityRunStatus != null) return false;
-  if (backgroundWorkHoldsCompletion(thread.pendingBackgroundTasks ?? [])) return false;
+  const pendingTasks = thread.pendingBackgroundTasks ?? [];
+  if (backgroundWorkHoldsCompletion(pendingTasks)) return false;
+  // Settling ends a watch, which would silently drop a reviewer's later comments.
+  if (pendingTasks.some(isPullRequestWatchTask)) return false;
   if (threadHasQueuedTurnStart(thread, nowMs)) return false;
   // Interrupted runs must keep the same snooze protection the sidebar shows.
   return !isSnoozed(thread, nowMs);
@@ -541,7 +545,15 @@ export const make = Effect.gen(function* () {
         return yield* Effect.die(new Error("thread project not found"));
       }
       const refresh = group.filter((member) => shellClosedThreads.delete(member.id)).length > 0;
-      return yield* git.branchPullRequest({ cwd, branch: thread.branch }, { refresh });
+      // Remembered git state is enough to rule a thread out; only an answer
+      // that would settle it is confirmed against fresh git state.
+      const remembered = yield* git.branchPullRequest(
+        { cwd, branch: thread.branch },
+        { refresh, confirmTerminal: false },
+      );
+      if (refresh || remembered === null || remembered.state === "open") return remembered;
+      if (!(yield* wouldSettle(group, remembered))) return undefined;
+      return yield* git.branchPullRequest({ cwd, branch: thread.branch }, { freshGitState: true });
     });
 
     yield* Effect.forEach(
diff --git a/apps/server/src/orchestration-v2/ThreadStop.test.ts b/apps/server/src/orchestration-v2/ThreadStop.test.ts
index 7c6bf4004453..aa847174ac96 100644
--- a/apps/server/src/orchestration-v2/ThreadStop.test.ts
+++ b/apps/server/src/orchestration-v2/ThreadStop.test.ts
@@ -20,7 +20,9 @@ import {
 import * as DateTime from "effect/DateTime";
 import * as Effect from "effect/Effect";
 import * as Exit from "effect/Exit";
+import * as Fiber from "effect/Fiber";
 import * as Layer from "effect/Layer";
+import * as Queue from "effect/Queue";
 import * as Schema from "effect/Schema";
 import * as SqlClient from "effect/sql/SqlClient";
 import * as Stream from "effect/Stream";
@@ -38,8 +40,10 @@ import * as EffectWorker from "./EffectWorker.ts";
 import * as EffectOutbox from "./EffectOutbox.ts";
 import * as ProjectionStore from "./ProjectionStore.ts";
 import * as ProviderAdapterRegistry from "./ProviderAdapterRegistry.ts";
+import * as ProviderSessionManager from "./ProviderSessionManager.ts";
 import * as ThreadManagementService from "./ThreadManagementService.ts";
 import * as ProviderReplayHarness from "./testkit/ProviderReplayHarness.ts";
+import { checkpointWorkspace } from "@t3tools/provider-testing/replayWorkspace";
 import type * as ProviderAdapter from "@t3tools/provider-core/server/ProviderAdapter";
 
 const instanceId = ProviderInstanceId.make("codex");
@@ -1834,3 +1838,258 @@ it.effect.each(["Stop", "Force stop"] as const)(
       );
     }).pipe(Effect.provide(layerTest)),
 );
+
+it.effect.each([
+  { followUp: "started its turn", startedBeforeRelease: true },
+  { followUp: "was promoted", startedBeforeRelease: false },
+  { followUp: "switched provider instance", startedBeforeRelease: true, switchesInstance: true },
+  { followUp: "has fresh context", startedBeforeRelease: true, freshContext: true },
+])(
+  "Force stop keeps only the session of a queued follow-up that $followUp",
+  ({ startedBeforeRelease, switchesInstance = false, freshContext = false }) =>
+    Effect.gen(function* () {
+      const cwd = yield* checkpointWorkspace("thread-stop-force-stop-follow-up");
+      const driver = adapter.driver;
+      const otherInstanceId = ProviderInstanceId.make("codex-other");
+      const eventQueues = new Map<
+        ProviderSessionId,
+        Queue.Queue<ProviderAdapter.ProviderAdapterV2Event>
+      >();
+      const started: Array<ProviderAdapter.ProviderAdapterV2TurnInput> = [];
+      const interrupted: Array<ProviderAdapter.ProviderAdapterV2InterruptInput> = [];
+      let opened = 0;
+      // Fresh context on a one-thread-per-session provider puts the follow-up on its own session.
+      // The session itself reports shared threads so fresh-context cleanup leaves the stopped
+      // run's session to Force stop, as pending background work would.
+      const adapterCapabilities = freshContext
+        ? {
+            ...CodexProviderCapabilitiesV2,
+            sessions: {
+              ...CodexProviderCapabilitiesV2.sessions,
+              supportsMultipleProviderThreadsPerSession: false,
+            },
+          }
+        : CodexProviderCapabilitiesV2;
+      const liveAdapter = (
+        instanceId: ProviderInstanceId,
+      ): ProviderAdapter.ProviderAdapterV2["Service"] => ({
+        ...adapter,
+        instanceId,
+        getCapabilities: () => Effect.succeed(adapterCapabilities),
+        openSession: (input) =>
+          Effect.gen(function* () {
+            opened += 1;
+            const now = yield* DateTime.now;
+            const events = yield* Queue.unbounded<ProviderAdapter.ProviderAdapterV2Event>();
+            eventQueues.set(input.providerSessionId, events);
+            return {
+              instanceId,
+              driver,
+              providerSessionId: input.providerSessionId,
+              providerSession: {
+                id: input.providerSessionId,
+                driver,
+                providerInstanceId: instanceId,
+                status: "ready",
+                cwd,
+                model: modelSelection.model,
+                capabilities: CodexProviderCapabilitiesV2,
+                createdAt: now,
+                updatedAt: now,
+                lastError: null,
+              },
+              events: Stream.fromQueue(events),
+              ensureThread: ({ threadId }) =>
+                Effect.succeed({
+                  id: ProviderThreadId.make(
+                    `provider-thread:${input.providerSessionId}:${threadId}`,
+                  ),
+                  driver,
+                  providerInstanceId: instanceId,
+                  providerSessionId: input.providerSessionId,
+                  appThreadId: threadId,
+                  ownerNodeId: null,
+                  nativeThreadRef: { driver, nativeId: "native-thread", strength: "strong" },
+                  nativeConversationHeadRef: null,
+                  status: "idle",
+                  firstRunOrdinal: null,
+                  lastRunOrdinal: null,
+                  handoffIds: [],
+                  forkedFrom: null,
+                  createdAt: now,
+                  updatedAt: now,
+                }),
+              resumeThread: ({ providerThread }) => Effect.succeed(providerThread),
+              startTurn: (turn) =>
+                Effect.gen(function* () {
+                  started.push(turn);
+                  yield* Queue.offer(events, {
+                    type: "provider_turn.updated",
+                    driver,
+                    providerTurn: {
+                      id: ProviderTurnId.make(`provider-turn:${turn.attemptId}`),
+                      providerThreadId: turn.providerThread.id,
+                      nodeId: turn.rootNodeId,
+                      runAttemptId: turn.attemptId,
+                      nativeTurnRef: {
+                        driver,
+                        nativeId: `native:${turn.attemptId}`,
+                        strength: "strong",
+                      },
+                      ordinal: turn.providerTurnOrdinal,
+                      status: "running",
+                      startedAt: now,
+                      completedAt: null,
+                    },
+                  });
+                }),
+              steerTurn: () => Effect.die("unused"),
+              interruptTurn: (interrupt) => Effect.sync(() => interrupted.push(interrupt)),
+              respondToRuntimeRequest: () => Effect.die("unused"),
+              readThreadSnapshot: () => Effect.die("unused"),
+              rollbackThread: () => Effect.die("unused"),
+              forkThread: () => Effect.die("unused"),
+            };
+          }),
+      });
+      // The settlement promotes the follow-up; optionally its turn starts before Force stop releases.
+      const layerSessionsStartingFollowUpFirst = Layer.effect(
+        ProviderSessionManager.ProviderSessionManagerV2,
+        Effect.gen(function* () {
+          const sessions = yield* ProviderSessionManager.ProviderSessionManagerV2;
+          const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
+          return ProviderSessionManager.ProviderSessionManagerV2.of({
+            ...sessions,
+            releaseUnlessBusy: (input) =>
+              (startedBeforeRelease ? worker.drain().pipe(Effect.orDie) : Effect.void).pipe(
+                Effect.andThen(sessions.releaseUnlessBusy(input)),
+              ),
+          });
+        }),
+      );
+      const layerLive = ThreadManagementService.layer.pipe(
+        Layer.provide(layerSessionsStartingFollowUpFirst),
+        Layer.provideMerge(
+          Layer.mergeAll(
+            layerDatabase,
+            ProjectionStore.layer.pipe(Layer.provide(layerDatabase)),
+            EventStore.layer.pipe(Layer.provide(layerDatabase)),
+            EffectOutbox.layer.pipe(Layer.provide(layerDatabase)),
+            ProviderReplayHarness.layerWithRegistry(
+              { name: "thread-stop-force-stop-follow-up" },
+              ProviderAdapterRegistry.layerFromAdapters([
+                liveAdapter(instanceId),
+                liveAdapter(otherInstanceId),
+              ]),
+              { databaseLayer: layerDatabase, runEffectWorker: false },
+            ),
+          ),
+        ),
+        Layer.provideMerge(ServerSettings.layerTest()),
+        Layer.provideMerge(CommandReceiptStore.layer.pipe(Layer.provide(layerDatabase))),
+      );
+
+      yield* Effect.gen(function* () {
+        const orchestrator = yield* Orchestrator.OrchestratorV2;
+        const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
+        const sessions = yield* ProviderSessionManager.ProviderSessionManagerV2;
+        const threads = yield* ThreadManagementService.ThreadManagementService;
+        const threadId = ThreadId.make("thread:force-stop-follow-up");
+        const runningTurn = orchestrator.streamDomainEvents.pipe(
+          Stream.filter(
+            (event) => event.type === "provider-turn.updated" && event.payload.status === "running",
+          ),
+          Stream.take(1),
+          Stream.runDrain,
+          Effect.forkScoped,
+        );
+        yield* orchestrator.dispatch({
+          type: "thread.create",
+          commandId: CommandId.make("create:force-stop-follow-up"),
+          threadId,
+          projectId: ProjectId.make("project:thread-stop"),
+          title: "Force stop follow-up",
+          modelSelection,
+          runtimeMode: "full-access",
+          interactionMode: "default",
+          branch: null,
+          worktreePath: cwd,
+          createdBy: "user",
+          creationSource: "web",
+        });
+        const firstRunning = yield* runningTurn;
+        yield* send(threadId, "first", "start_immediately");
+        yield* worker.drain();
+        yield* Fiber.join(firstRunning);
+        yield* orchestrator.dispatch({
+          type: "message.dispatch",
+          commandId: CommandId.make("send:force-stop-follow-up"),
+          threadId,
+          messageId: MessageId.make("message:force-stop-follow-up"),
+          text: "follow-up",
+          attachments: [],
+          dispatchMode: { type: "queue_after_active" },
+          ...(switchesInstance
+            ? { modelSelection: { ...modelSelection, instanceId: otherInstanceId } }
+            : {}),
+          ...(freshContext ? { freshContext } : {}),
+          createdBy: "user",
+          creationSource: "web",
+        });
+
+        const result = yield* threads.forceStopThread({ threadId });
+        yield* worker.drain();
+
+        assert.deepEqual(
+          started.map((turn) => turn.runOrdinal),
+          [1, 2],
+          "the queued follow-up did not start its turn",
+        );
+        assert.equal(
+          opened,
+          switchesInstance || freshContext ? 2 : 1,
+          "Force stop tore down the session the follow-up was promoted onto",
+        );
+        const [stopped, followUp] = [started[0]!, started[1]!];
+        const providerSessionId = followUp.providerThread.providerSessionId!;
+        assert.equal(
+          yield* sessions.isLive(stopped.providerThread.providerSessionId!),
+          !switchesInstance && !freshContext,
+          "Force stop kept the stopped run's session for a follow-up on another session",
+        );
+        assert.isFalse(
+          interrupted.some((interrupt) =>
+            String(interrupt.providerTurnId).includes(followUp.attemptId),
+          ),
+          "Force stop of the first run interrupted the follow-up's turn",
+        );
+        assert.isTrue(
+          yield* sessions.isLive(providerSessionId),
+          "Force stop of the first run released the session the follow-up's turn is running on",
+        );
+        assert.deepEqual(
+          result,
+          { outcome: "released", sharedWithThreadIds: [] },
+          "Force stop detached the thread the follow-up runs on as if its session were shared",
+        );
+
+        // The first run's provider never confirms the stop; the follow-up's turn ends normally.
+        yield* Queue.offer(eventQueues.get(providerSessionId)!, {
+          type: "turn.terminal",
+          driver,
+          providerThreadId: followUp.providerThread.id,
+          providerTurnId: ProviderTurnId.make(`provider-turn:${followUp.attemptId}`),
+          runOrdinal: followUp.runOrdinal,
+          status: "completed",
+          failure: null,
+          threadDisposition: "reusable",
+        });
+        yield* worker.drain();
+        yield* TestClock.adjust("31 minutes");
+        assert.isFalse(
+          yield* sessions.isLive(providerSessionId),
+          "the stopped run's unconfirmed turn kept the session from going idle",
+        );
+      }).pipe(Effect.provide(layerLive));
+    }),
+);
diff --git a/apps/server/src/orchestration-v2/ThreadTitleRegenerationService.test.ts b/apps/server/src/orchestration-v2/ThreadTitleRegenerationService.test.ts
index c54e6e1f4815..d56256372f73 100644
--- a/apps/server/src/orchestration-v2/ThreadTitleRegenerationService.test.ts
+++ b/apps/server/src/orchestration-v2/ThreadTitleRegenerationService.test.ts
@@ -11,6 +11,7 @@ import {
   ProviderInstanceId,
   ProviderThreadId,
   RunId,
+  TextGenerationError,
   ThreadId,
 } from "@t3tools/contracts";
 import * as DateTime from "effect/DateTime";
@@ -80,6 +81,7 @@ function makeHarness(
               workspaceRoot: "/repo",
               defaultModelSelection: modelSelection,
               defaultThreadEnvMode: null,
+              hasCustomTitle: false,
               autoPull: false,
               faviconPath: null,
               projectIcon: null,
@@ -432,6 +434,10 @@ describe("ThreadTitleRegenerationService", () => {
           const projection = yield* threads.getThreadProjection(threadId);
           assert.equal(projection.thread.title, "Fresh title");
           assert.isNotOk(projection.thread.titleRegeneration);
+          assert.deepInclude(projection.thread.lastTitleRegeneration, {
+            requestId,
+            status: "renamed",
+          });
         }
       }).pipe(Effect.provide(harness.layer));
     }).pipe(Effect.provide(NodeServices.layer)),
@@ -518,7 +524,14 @@ describe("ThreadTitleRegenerationService", () => {
   it.effect("clears the marker and keeps the title when generation fails", () =>
     Effect.gen(function* () {
       const harness = makeHarness({
-        generateTitle: () => Effect.die(new Error("model unavailable")),
+        generateTitle: () =>
+          Effect.fail(
+            new TextGenerationError({
+              operation: "generateThreadTitle",
+              detail:
+                "Codex CLI command failed: OpenAI Codex\nuser\nConversation text\nmodel unavailable\n",
+            }),
+          ),
       });
       yield* Effect.gen(function* () {
         const threads = yield* ThreadManagement.ThreadManagementService;
@@ -540,6 +553,44 @@ describe("ThreadTitleRegenerationService", () => {
         const projection = yield* threads.getThreadProjection(threadId);
         assert.equal(projection.thread.title, "Seed title");
         assert.isNotOk(projection.thread.titleRegeneration);
+        assert.deepInclude(projection.thread.lastTitleRegeneration, {
+          requestId,
+          status: "failed",
+          message: "model unavailable",
+        });
+      }).pipe(Effect.provide(harness.layer));
+    }),
+  );
+
+  it.effect("records an unchanged outcome when the model keeps the current title", () =>
+    Effect.gen(function* () {
+      const harness = makeHarness({
+        generateTitle: () => Effect.succeed({ title: "Seed title" }),
+      });
+      yield* Effect.gen(function* () {
+        const threads = yield* ThreadManagement.ThreadManagementService;
+        const titleRegeneration = yield* ThreadTitleRegeneration.ThreadTitleRegenerationService;
+        const threadId = yield* createThread({
+          command: "command:title:unchanged:create",
+          thread: "thread:title:unchanged",
+        });
+        yield* dispatchUserMessage({
+          command: "command:title:unchanged:message",
+          threadId,
+          text: "Some conversation",
+        });
+        const requestId = yield* armRegeneration({
+          command: "command:title:unchanged:1",
+          threadId,
+        });
+
+        yield* titleRegeneration.execute({ threadId, requestId, kind: { type: "regenerate" } });
+
+        const projection = yield* threads.getThreadProjection(threadId);
+        assert.deepInclude(projection.thread.lastTitleRegeneration, {
+          requestId,
+          status: "unchanged",
+        });
       }).pipe(Effect.provide(harness.layer));
     }),
   );
diff --git a/apps/server/src/orchestration-v2/ThreadTitleRegenerationService.ts b/apps/server/src/orchestration-v2/ThreadTitleRegenerationService.ts
index 686d18292717..d3216b1cbd93 100644
--- a/apps/server/src/orchestration-v2/ThreadTitleRegenerationService.ts
+++ b/apps/server/src/orchestration-v2/ThreadTitleRegenerationService.ts
@@ -8,6 +8,7 @@ import {
   type OrchestrationV2ConversationMessage,
   type RunId,
   type ServerSettingsError,
+  TextGenerationError,
   type ThreadId,
 } from "@t3tools/contracts";
 import * as Cause from "effect/Cause";
@@ -17,6 +18,7 @@ import * as FileSystem from "effect/FileSystem";
 import * as Layer from "effect/Layer";
 import * as Option from "effect/Option";
 import * as Schedule from "effect/Schedule";
+import * as Schema from "effect/Schema";
 
 import * as ServerSettings from "../serverSettings.ts";
 import * as TextGeneration from "../textGeneration/TextGeneration.ts";
@@ -46,6 +48,29 @@ export class ThreadTitleRegenerationService extends Context.Service<
   }
 >()("t3/orchestration-v2/ThreadTitleRegenerationService") {}
 
+type Outcome =
+  | { readonly status: "renamed"; readonly title: string }
+  | { readonly status: "unchanged" }
+  | { readonly status: "failed"; readonly message: string };
+
+const MAX_FAILURE_MESSAGE_LENGTH = 300;
+const isTextGenerationError = Schema.is(TextGenerationError);
+
+function failureMessage(cause: Cause.Cause<unknown>): string {
+  const error = Cause.squash(cause);
+  const lines = isTextGenerationError(error)
+    ? error.detail
+        .split("\n")
+        .map((line) => line.trim())
+        .filter((line) => line.length > 0)
+    : [];
+  const detail = lines.at(-1);
+  if (detail === undefined) return "Title generation failed.";
+  return detail.length > MAX_FAILURE_MESSAGE_LENGTH
+    ? `${detail.slice(0, MAX_FAILURE_MESSAGE_LENGTH - 1)}…`
+    : detail;
+}
+
 const make = Effect.gen(function* () {
   const threads = yield* ThreadManagementService.ThreadManagementService;
   const projects = yield* ProjectStore.ProjectStoreV2;
@@ -56,7 +81,8 @@ const make = Effect.gen(function* () {
   const complete = (input: {
     readonly threadId: ThreadId;
     readonly requestId: CommandId;
-    readonly title?: string;
+    readonly kind: { readonly type: "initial" | "regenerate" };
+    readonly outcome: Outcome;
   }) =>
     threads
       .dispatch({
@@ -64,7 +90,15 @@ const make = Effect.gen(function* () {
         commandId: CommandId.make(`${input.requestId}:title-complete`),
         threadId: input.threadId,
         requestId: input.requestId,
-        ...(input.title === undefined ? {} : { title: input.title }),
+        ...(input.outcome.status === "renamed" ? { title: input.outcome.title } : {}),
+        ...(input.kind.type === "regenerate"
+          ? {
+              outcome: {
+                status: input.outcome.status,
+                ...(input.outcome.status === "failed" ? { message: input.outcome.message } : {}),
+              },
+            }
+          : {}),
       })
       .pipe(Effect.asVoid);
 
@@ -110,9 +144,7 @@ const make = Effect.gen(function* () {
   const execute: ThreadTitleRegenerationService["Service"]["execute"] = Effect.fn(
     "ThreadTitleRegenerationService.execute",
   )(function* (input) {
-    const outcome:
-      | { readonly type: "stale" }
-      | { readonly type: "complete"; readonly title?: string } = yield* Effect.gen(function* () {
+    const outcome: Outcome | { readonly status: "stale" } = yield* Effect.gen(function* () {
       const projection = yield* threads.getThreadRecords(
         input.threadId,
         ["messages"],
@@ -121,12 +153,12 @@ const make = Effect.gen(function* () {
           : { messageRoles: ["user", "assistant"] },
       );
       if (projection.thread.titleRegeneration?.requestId !== input.requestId) {
-        return { type: "stale" as const };
+        return { status: "stale" as const };
       }
 
       const project = yield* projects.get(projection.thread.projectId);
       if (Option.isNone(project)) {
-        return { type: "complete" as const };
+        return { status: "failed" as const, message: "This thread's project no longer exists." };
       }
 
       let context: {
@@ -151,7 +183,10 @@ const make = Effect.gen(function* () {
         );
       }
       if (context.message.length === 0 && context.attachments.length === 0) {
-        return { type: "complete" as const };
+        return {
+          status: "failed" as const,
+          message: "This thread has no messages to title yet.",
+        };
       }
 
       // A deleted source should not cost the fork its title.
@@ -181,8 +216,8 @@ const make = Effect.gen(function* () {
       const generatedTitle = result.title.trim();
       return generatedTitle === "New thread" ||
         (input.kind.type === "regenerate" && generatedTitle === projection.thread.title.trim())
-        ? { type: "complete" as const }
-        : { type: "complete" as const, title: result.title };
+        ? { status: "unchanged" as const }
+        : { status: "renamed" as const, title: result.title };
     }).pipe(
       Effect.retry({
         times: input.kind.type === "initial" ? 2 : 0,
@@ -195,17 +230,14 @@ const make = Effect.gen(function* () {
               threadId: input.threadId,
               requestId: input.requestId,
               cause,
-            }).pipe(Effect.as({ type: "complete" as const })),
+            }).pipe(Effect.as({ status: "failed" as const, message: failureMessage(cause) })),
       ),
     );
 
-    if (outcome.type === "stale") {
+    if (outcome.status === "stale") {
       return;
     }
-    yield* complete({
-      ...input,
-      ...(outcome.title === undefined ? {} : { title: outcome.title }),
-    });
+    yield* complete({ ...input, outcome });
   });
 
   return ThreadTitleRegenerationService.of({ execute });
diff --git a/apps/server/src/orchestration-v2/WireProjection.test.ts b/apps/server/src/orchestration-v2/WireProjection.test.ts
index 471697f10dab..805d5e2e3258 100644
--- a/apps/server/src/orchestration-v2/WireProjection.test.ts
+++ b/apps/server/src/orchestration-v2/WireProjection.test.ts
@@ -228,6 +228,45 @@ describe("orchestration V2 wire projection", () => {
       output: { content: [{ type: "image", mimeType: "image/png" }] },
     });
     expect(item.output.content[0]?.source.data).toBe(data);
+
+    const t3McpApp = {
+      attachmentId: "app-html",
+      server: "repro",
+      tool: "chart",
+      resourceUri: "ui://repro/chart",
+    };
+    const text = { type: "text", text: "Rendered chart" };
+    const appItem = {
+      ...item,
+      toolName: "repro.chart",
+      output: {
+        t3McpApp,
+        result: { content: [text, { type: "image", mimeType: "image/png", data }] },
+      },
+    };
+    expect(projectTurnItemForDetail(appItem)).toMatchObject({
+      output: { t3McpApp, result: { content: [text, { type: "image", mimeType: "image/png" }] } },
+    });
+    const largeOutput = projectTurnItemForDetail(appItem);
+    expect(
+      JSON.stringify(largeOutput.type === "dynamic_tool" ? largeOutput.output : null),
+    ).not.toContain(data);
+
+    const smallApp = {
+      t3McpApp,
+      result: { content: [text, { type: "image", mimeType: "image/png", data: "iVBORw0KGgo=" }] },
+    };
+    expect(projectTurnItemForDetail({ ...appItem, output: smallApp })).toMatchObject({
+      output: smallApp,
+    });
+
+    const forged = projectTurnItemForDetail({
+      ...appItem,
+      output: { t3McpApp: { ...t3McpApp, resourceUri: data }, result: { content: [text] } },
+    });
+    expect(
+      JSON.stringify(forged.type === "dynamic_tool" ? forged.output : null).length,
+    ).toBeLessThan(270_000);
   });
 
   it("keeps image markers when the rest of a tool output is too large to send", () => {
diff --git a/apps/server/src/orchestration-v2/WireProjection.ts b/apps/server/src/orchestration-v2/WireProjection.ts
index 7d4805103c37..218632bea4d1 100644
--- a/apps/server/src/orchestration-v2/WireProjection.ts
+++ b/apps/server/src/orchestration-v2/WireProjection.ts
@@ -15,6 +15,7 @@ import {
   dedupeSubagentBodies,
   dedupeTurnItemBodies,
 } from "@t3tools/shared/orchestrationV2DedupedBodies";
+import { MCP_APP_OUTPUT_KEY, readMcpAppReference } from "@t3tools/shared/mcpApp";
 import {
   compactDynamicToolOutput,
   omitToolOutputImageData,
@@ -228,7 +229,7 @@ function boundDynamicValue(value: unknown): unknown {
 }
 
 /** Preserve ordered image markers in truncated output so clients can load images by index. */
-function boundToolOutput(output: unknown): unknown {
+function boundToolResult(output: unknown): unknown {
   const omitted = omitToolOutputImageData(output);
   const bounded = boundDynamicValue(omitted);
   if (typeof bounded !== "string" || typeof omitted === "string") return bounded;
@@ -241,6 +242,21 @@ function boundToolOutput(output: unknown): unknown {
       ];
 }
 
+function boundToolOutput(output: unknown): unknown {
+  if (typeof output !== "object" || output === null || !("result" in output)) {
+    return boundToolResult(output);
+  }
+  const app =
+    MCP_APP_OUTPUT_KEY in output ? readMcpAppReference(output[MCP_APP_OUTPUT_KEY]) : undefined;
+  if (app === undefined) return boundToolResult(output);
+  // The app receives this result, so its image data stays unless it is too large to send.
+  const fits = boundDynamicValue(output.result) === output.result;
+  return {
+    [MCP_APP_OUTPUT_KEY]: app,
+    result: fits ? output.result : boundToolResult(output.result),
+  };
+}
+
 export function projectTurnItemForDetail(item: OrchestrationV2TurnItem): OrchestrationV2TurnItem {
   switch (item.type) {
     case "command_execution":
diff --git a/apps/server/src/orchestration-v2/WorktreeBranchSync.test.ts b/apps/server/src/orchestration-v2/WorktreeBranchSync.test.ts
index bb95778860e5..14c5b5d2751d 100644
--- a/apps/server/src/orchestration-v2/WorktreeBranchSync.test.ts
+++ b/apps/server/src/orchestration-v2/WorktreeBranchSync.test.ts
@@ -105,7 +105,6 @@ it.effect.each([false, true])(
           }),
         ),
       ),
-      Effect.scoped,
     );
   },
 );
diff --git a/apps/server/src/orchestration-v2/legacy/LegacyV1Cutover.integration.test.ts b/apps/server/src/orchestration-v2/legacy/LegacyV1Cutover.integration.test.ts
index 7edb158f3ba6..bfd0f1445001 100644
--- a/apps/server/src/orchestration-v2/legacy/LegacyV1Cutover.integration.test.ts
+++ b/apps/server/src/orchestration-v2/legacy/LegacyV1Cutover.integration.test.ts
@@ -734,164 +734,159 @@ describe("orchestration v2 legacy v1 cutover", () => {
   it.live(
     "migrates an untouched v1 database copy through shell import, lazy transcripts, continuation and restart",
     () =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const fs = yield* FileSystem.FileSystem;
-          const path = yield* Path.Path;
-          const workspace = yield* checkpointWorkspace("legacy-v1-cutover");
-          const stateDir = yield* fs.makeTempDirectory({ prefix: "t3-v1-cutover-state-" });
-          const fixturePath = path.join(stateDir, "v1-source.sqlite");
-          const copyPath = path.join(stateDir, "userdata", "state.sqlite");
-          yield* fs.makeDirectory(path.join(stateDir, "userdata"), { recursive: true });
+      Effect.gen(function* () {
+        const fs = yield* FileSystem.FileSystem;
+        const path = yield* Path.Path;
+        const workspace = yield* checkpointWorkspace("legacy-v1-cutover");
+        const stateDir = yield* fs.makeTempDirectory({ prefix: "t3-v1-cutover-state-" });
+        const fixturePath = path.join(stateDir, "v1-source.sqlite");
+        const copyPath = path.join(stateDir, "userdata", "state.sqlite");
+        yield* fs.makeDirectory(path.join(stateDir, "userdata"), { recursive: true });
 
-          const v1Snapshot = yield* seedV1Database(fixturePath, workspace);
-          const fixtureHashBefore = yield* sha256File(fixturePath);
-          yield* fs.copyFile(fixturePath, copyPath);
+        const v1Snapshot = yield* seedV1Database(fixturePath, workspace);
+        const fixtureHashBefore = yield* sha256File(fixturePath);
+        yield* fs.copyFile(fixturePath, copyPath);
 
-          const capturedTurns = yield* Ref.make<ReadonlyArray<CapturedTurn>>([]);
-          const longThreadId = ThreadId.make(LONG_THREAD);
+        const capturedTurns = yield* Ref.make<ReadonlyArray<CapturedTurn>>([]);
+        const longThreadId = ThreadId.make(LONG_THREAD);
 
-          const boot1Logs: CapturedLog[] = [];
-          const firstBoot = yield* Effect.scoped(
-            Effect.gen(function* () {
-              const sql = yield* SqlClient.SqlClient;
-              const importer = yield* LegacyV1ThreadImporter.LegacyV1ThreadImporter;
-              const maintenance = yield* ProjectionReplay.ProjectionReplay;
-              const projections = yield* ProjectionStore.ProjectionStoreV2;
+        const boot1Logs: CapturedLog[] = [];
+        const firstBoot = yield* Effect.scoped(
+          Effect.gen(function* () {
+            const sql = yield* SqlClient.SqlClient;
+            const importer = yield* LegacyV1ThreadImporter.LegacyV1ThreadImporter;
+            const maintenance = yield* ProjectionReplay.ProjectionReplay;
+            const projections = yield* ProjectionStore.ProjectionStoreV2;
 
-              assert.equal(yield* importer.pendingThreadCount, ALL_THREADS.length);
-              const shellImport = yield* importer.reconcileShells;
-              assert.deepStrictEqual(shellImport, {
-                importedThreadCount: ALL_THREADS.length,
-                importedMessageCount: 14,
-              });
+            assert.equal(yield* importer.pendingThreadCount, ALL_THREADS.length);
+            const shellImport = yield* importer.reconcileShells;
+            assert.deepStrictEqual(shellImport, {
+              importedThreadCount: ALL_THREADS.length,
+              importedMessageCount: 14,
+            });
 
-              assert.deepStrictEqual(yield* importer.reconcileShells, {
-                importedThreadCount: 0,
-                importedMessageCount: 0,
-              });
-              assert.isTrue((yield* maintenance.rebuild).valid);
+            assert.deepStrictEqual(yield* importer.reconcileShells, {
+              importedThreadCount: 0,
+              importedMessageCount: 0,
+            });
+            assert.isTrue((yield* maintenance.rebuild).valid);
 
-              const shellSnapshot = yield* projections.getShellSnapshot();
-              const visibleShellIds = [
-                ...shellSnapshot.threads.map((thread) => thread.id),
-                ...shellSnapshot.archivedThreads.map((thread) => thread.id),
-              ];
-              assert.notInclude(visibleShellIds, ThreadId.make(DELETED_THREAD));
-              assert.include(
-                shellSnapshot.archivedThreads.map((thread) => thread.id),
-                ThreadId.make(ARCHIVED_THREAD),
-              );
-              const pinnedShell = shellSnapshot.threads.find(
-                (thread) => thread.id === PINNED_THREAD,
-              );
-              assert.equal(pinnedShell?.pinOrderKey, "a0");
+            const shellSnapshot = yield* projections.getShellSnapshot();
+            const visibleShellIds = [
+              ...shellSnapshot.threads.map((thread) => thread.id),
+              ...shellSnapshot.archivedThreads.map((thread) => thread.id),
+            ];
+            assert.notInclude(visibleShellIds, ThreadId.make(DELETED_THREAD));
+            assert.include(
+              shellSnapshot.archivedThreads.map((thread) => thread.id),
+              ThreadId.make(ARCHIVED_THREAD),
+            );
+            const pinnedShell = shellSnapshot.threads.find((thread) => thread.id === PINNED_THREAD);
+            assert.equal(pinnedShell?.pinOrderKey, "a0");
 
-              const activeShell = yield* projections.getThreadProjection(
-                ThreadId.make(ACTIVE_THREAD),
-              );
-              assert.equal(activeShell.thread.historyOrigin, "v1_import");
-              assert.isNull(activeShell.thread.activeProviderThreadId);
-              assert.deepStrictEqual(
-                activeShell.messages.map((message) => message.id),
-                ["message:cutover:active:3", "message:cutover:active:4"],
-              );
-              assert.isEmpty(activeShell.providerThreads);
+            const activeShell = yield* projections.getThreadProjection(
+              ThreadId.make(ACTIVE_THREAD),
+            );
+            assert.equal(activeShell.thread.historyOrigin, "v1_import");
+            assert.isNull(activeShell.thread.activeProviderThreadId);
+            assert.deepStrictEqual(
+              activeShell.messages.map((message) => message.id),
+              ["message:cutover:active:3", "message:cutover:active:4"],
+            );
+            assert.isEmpty(activeShell.providerThreads);
 
-              assert.isEmpty(
-                activeShell.turnItems.filter(
-                  (item) => item.type !== "user_message" && item.type !== "assistant_message",
-                ),
-              );
+            assert.isEmpty(
+              activeShell.turnItems.filter(
+                (item) => item.type !== "user_message" && item.type !== "assistant_message",
+              ),
+            );
 
-              const deletedShell = yield* projections.getThreadProjection(
-                ThreadId.make(DELETED_THREAD),
-              );
-              assert.isNotNull(deletedShell.thread.deletedAt);
-              assert.equal(
-                deletedShell.thread.deletedAt?.toString(),
-                DateTime.makeUnsafe("2026-01-09T00:00:00.000Z").toString(),
-              );
+            const deletedShell = yield* projections.getThreadProjection(
+              ThreadId.make(DELETED_THREAD),
+            );
+            assert.isNotNull(deletedShell.thread.deletedAt);
+            assert.equal(
+              deletedShell.thread.deletedAt?.toString(),
+              DateTime.makeUnsafe("2026-01-09T00:00:00.000Z").toString(),
+            );
 
-              for (const threadId of [
-                ACTIVE_THREAD,
-                ARCHIVED_THREAD,
-                PINNED_THREAD,
-                DELETED_THREAD,
-                INTERRUPTED_THREAD,
-                LONG_THREAD,
-              ]) {
-                yield* importer.ensureTranscript(ThreadId.make(threadId));
-              }
-              assert.deepStrictEqual(
-                yield* importer.ensureTranscript(ThreadId.make(ACTIVE_THREAD)),
-                { importedThreadCount: 0, importedMessageCount: 0 },
-              );
+            for (const threadId of [
+              ACTIVE_THREAD,
+              ARCHIVED_THREAD,
+              PINNED_THREAD,
+              DELETED_THREAD,
+              INTERRUPTED_THREAD,
+              LONG_THREAD,
+            ]) {
+              yield* importer.ensureTranscript(ThreadId.make(threadId));
+            }
+            assert.deepStrictEqual(yield* importer.ensureTranscript(ThreadId.make(ACTIVE_THREAD)), {
+              importedThreadCount: 0,
+              importedMessageCount: 0,
+            });
 
-              const active = yield* projections.getThreadProjection(ThreadId.make(ACTIVE_THREAD));
-              assert.deepStrictEqual(
-                active.messages.map((message) => message.id),
-                [
-                  "message:cutover:active:1",
-                  "message:cutover:active:2",
-                  "message:cutover:active:3",
-                  "message:cutover:active:4",
-                ],
-              );
-              assert.deepStrictEqual(messageOrdinals(active), [
-                ["message:cutover:active:1", 1, "completed"],
-                ["message:cutover:active:2", 2, "completed"],
-                ["message:cutover:active:3", 3, "completed"],
-                ["message:cutover:active:4", 4, "completed"],
-              ]);
-              assert.deepStrictEqual(
-                active.messages.find((message) => message.id === "message:cutover:active:2")
-                  ?.attachments,
-                [
-                  {
-                    type: "image",
-                    id: "att-1",
-                    name: "shot.png",
-                    mimeType: "image/png",
-                    sizeBytes: 1234,
-                  },
-                ],
-              );
-              assert.equal(active.thread.linkedPullRequest?.number, 9100);
-              assert.deepStrictEqual(
-                active.thread.pullRequests?.map((pullRequest) => pullRequest.number),
-                [9100],
-              );
+            const active = yield* projections.getThreadProjection(ThreadId.make(ACTIVE_THREAD));
+            assert.deepStrictEqual(
+              active.messages.map((message) => message.id),
+              [
+                "message:cutover:active:1",
+                "message:cutover:active:2",
+                "message:cutover:active:3",
+                "message:cutover:active:4",
+              ],
+            );
+            assert.deepStrictEqual(messageOrdinals(active), [
+              ["message:cutover:active:1", 1, "completed"],
+              ["message:cutover:active:2", 2, "completed"],
+              ["message:cutover:active:3", 3, "completed"],
+              ["message:cutover:active:4", 4, "completed"],
+            ]);
+            assert.deepStrictEqual(
+              active.messages.find((message) => message.id === "message:cutover:active:2")
+                ?.attachments,
+              [
+                {
+                  type: "image",
+                  id: "att-1",
+                  name: "shot.png",
+                  mimeType: "image/png",
+                  sizeBytes: 1234,
+                },
+              ],
+            );
+            assert.equal(active.thread.linkedPullRequest?.number, 9100);
+            assert.deepStrictEqual(
+              active.thread.pullRequests?.map((pullRequest) => pullRequest.number),
+              [9100],
+            );
 
-              const archived = yield* projections.getThreadProjection(
-                ThreadId.make(ARCHIVED_THREAD),
-              );
-              assert.isNotNull(archived.thread.archivedAt);
-              const pinned = yield* projections.getThreadProjection(ThreadId.make(PINNED_THREAD));
-              assert.isNotNull(pinned.thread.pinnedAt);
-              assert.equal(pinned.thread.pinOrderKey, "a0");
-              const snoozed = yield* projections.getThreadProjection(ThreadId.make(SNOOZED_THREAD));
-              assert.equal(
-                snoozed.thread.snoozedUntil?.toString(),
-                DateTime.makeUnsafe("2026-02-01T00:00:00.000Z").toString(),
-              );
+            const archived = yield* projections.getThreadProjection(ThreadId.make(ARCHIVED_THREAD));
+            assert.isNotNull(archived.thread.archivedAt);
+            const pinned = yield* projections.getThreadProjection(ThreadId.make(PINNED_THREAD));
+            assert.isNotNull(pinned.thread.pinnedAt);
+            assert.equal(pinned.thread.pinOrderKey, "a0");
+            const snoozed = yield* projections.getThreadProjection(ThreadId.make(SNOOZED_THREAD));
+            assert.equal(
+              snoozed.thread.snoozedUntil?.toString(),
+              DateTime.makeUnsafe("2026-02-01T00:00:00.000Z").toString(),
+            );
 
-              assert.deepStrictEqual(
-                snoozed.messages.map((message) => message.id),
-                ["message:cutover:snoozed:1", "message:cutover:snoozed:3"],
-              );
-              const snoozedImportRow = yield* sql<{
-                readonly transcript_imported_at: string | null;
-              }>`
+            assert.deepStrictEqual(
+              snoozed.messages.map((message) => message.id),
+              ["message:cutover:snoozed:1", "message:cutover:snoozed:3"],
+            );
+            const snoozedImportRow = yield* sql<{
+              readonly transcript_imported_at: string | null;
+            }>`
               SELECT transcript_imported_at
               FROM orchestration_v2_legacy_imports
               WHERE thread_id = ${SNOOZED_THREAD}
             `;
-              assert.isNull(snoozedImportRow[0]?.transcript_imported_at);
+            assert.isNull(snoozedImportRow[0]?.transcript_imported_at);
 
-              // A failed hydration leaves the legacy rows and pending marker
-              // available for retry in a fresh runtime after restart.
-              yield* sql`
+            // A failed hydration leaves the legacy rows and pending marker
+            // available for retry in a fresh runtime after restart.
+            yield* sql`
                 CREATE TRIGGER fail_snoozed_hydration
                 BEFORE INSERT ON orchestration_events
                 WHEN NEW.event_id = 'migration:v1:message:message:cutover:snoozed:2'
@@ -899,253 +894,246 @@ describe("orchestration v2 legacy v1 cutover", () => {
                   SELECT RAISE(ABORT, 'injected cutover hydration failure');
                 END
               `;
-              const hydrationError = yield* importer
-                .ensureTranscript(ThreadId.make(SNOOZED_THREAD))
-                .pipe(Effect.flip);
-              assert.equal(hydrationError._tag, "LegacyV1ThreadImportError");
-              assert.equal(yield* importer.pendingThreadCount, 1);
+            const hydrationError = yield* importer
+              .ensureTranscript(ThreadId.make(SNOOZED_THREAD))
+              .pipe(Effect.flip);
+            assert.equal(hydrationError._tag, "LegacyV1ThreadImportError");
+            assert.equal(yield* importer.pendingThreadCount, 1);
 
-              const interrupted = yield* projections.getThreadProjection(
-                ThreadId.make(INTERRUPTED_THREAD),
-              );
-              assert.deepStrictEqual(messageOrdinals(interrupted), [
-                ["message:cutover:interrupted:1", 1, "completed"],
-                ["message:cutover:interrupted:2", 2, "interrupted"],
-              ]);
+            const interrupted = yield* projections.getThreadProjection(
+              ThreadId.make(INTERRUPTED_THREAD),
+            );
+            assert.deepStrictEqual(messageOrdinals(interrupted), [
+              ["message:cutover:interrupted:1", 1, "completed"],
+              ["message:cutover:interrupted:2", 2, "interrupted"],
+            ]);
 
-              const continued = yield* dispatchMessageAwaitingRun({
-                threadId: longThreadId,
-                messageId: "message:cutover:long:continuation",
-                commandId: "command:cutover:continue",
-                text: CONTINUATION_PROMPT,
-              });
+            const continued = yield* dispatchMessageAwaitingRun({
+              threadId: longThreadId,
+              messageId: "message:cutover:long:continuation",
+              commandId: "command:cutover:continue",
+              text: CONTINUATION_PROMPT,
+            });
 
-              const runs = continued.runs.filter((run) => run.ordinal >= 1);
-              assert.equal(runs.at(-1)?.status, "completed");
-              assert.equal(continued.providerThreads.length, 1);
-              assert.isNotNull(continued.providerThreads[0]?.nativeThreadRef);
-              assert.equal(continued.contextHandoffs.length, 1);
-              const handoff = continued.contextHandoffs[0]!;
-              assert.equal(handoff.strategy, "manual_context");
-              assert.isAtMost(handoff.summaryText.length, 32_000);
-              assert.include(handoff.summaryText, LATEST_MARKER);
-              assert.notInclude(handoff.summaryText, EARLIEST_MARKER);
-              const turns = yield* Ref.get(capturedTurns);
-              assert.equal(turns.length, 1);
-              assert.include(turns[0]!.text, "Context handoff (manual_context):");
-              assert.include(turns[0]!.text, `User message:\n${CONTINUATION_PROMPT}`);
+            const runs = continued.runs.filter((run) => run.ordinal >= 1);
+            assert.equal(runs.at(-1)?.status, "completed");
+            assert.equal(continued.providerThreads.length, 1);
+            assert.isNotNull(continued.providerThreads[0]?.nativeThreadRef);
+            assert.equal(continued.contextHandoffs.length, 1);
+            const handoff = continued.contextHandoffs[0]!;
+            assert.equal(handoff.strategy, "manual_context");
+            assert.isAtMost(handoff.summaryText.length, 32_000);
+            assert.include(handoff.summaryText, LATEST_MARKER);
+            assert.notInclude(handoff.summaryText, EARLIEST_MARKER);
+            const turns = yield* Ref.get(capturedTurns);
+            assert.equal(turns.length, 1);
+            assert.include(turns[0]!.text, "Context handoff (manual_context):");
+            assert.include(turns[0]!.text, `User message:\n${CONTINUATION_PROMPT}`);
 
-              const continuedAgain = yield* dispatchMessageAwaitingRun({
-                threadId: longThreadId,
-                messageId: "message:cutover:long:continuation:2",
-                commandId: "command:cutover:continue:again",
-                text: "One more.",
-              });
-              assert.equal(continuedAgain.contextHandoffs.length, 1);
-              assert.equal((yield* Ref.get(capturedTurns)).length, 2);
+            const continuedAgain = yield* dispatchMessageAwaitingRun({
+              threadId: longThreadId,
+              messageId: "message:cutover:long:continuation:2",
+              commandId: "command:cutover:continue:again",
+              text: "One more.",
+            });
+            assert.equal(continuedAgain.contextHandoffs.length, 1);
+            assert.equal((yield* Ref.get(capturedTurns)).length, 2);
 
-              const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
-              yield* worker.drain();
+            const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
+            yield* worker.drain();
 
-              const migrationEventCount = yield* sql<{ readonly count: number }>`
+            const migrationEventCount = yield* sql<{ readonly count: number }>`
               SELECT COUNT(*) AS count
               FROM orchestration_events
               WHERE application_event_version = 2
                 AND event_id LIKE 'migration:v1:%'
             `;
-              const importRows = yield* sql<{
-                readonly thread_id: string;
-                readonly transcript_imported_at: string | null;
-              }>`
+            const importRows = yield* sql<{
+              readonly thread_id: string;
+              readonly transcript_imported_at: string | null;
+            }>`
               SELECT thread_id, transcript_imported_at
               FROM orchestration_v2_legacy_imports
               ORDER BY thread_id
             `;
-              const legacyProjects = yield* sql<Record<string, unknown>>`
+            const legacyProjects = yield* sql<Record<string, unknown>>`
               SELECT * FROM projection_projects ORDER BY project_id
             `;
-              const legacyThreads = yield* sql<Record<string, unknown>>`
+            const legacyThreads = yield* sql<Record<string, unknown>>`
               SELECT * FROM projection_threads ORDER BY thread_id
             `;
-              const legacyMessages = yield* sql<Record<string, unknown>>`
+            const legacyMessages = yield* sql<Record<string, unknown>>`
               SELECT * FROM projection_thread_messages ORDER BY message_id
             `;
-              const recordedMigration41 = yield* sql<{ readonly name: string }>`
+            const recordedMigration41 = yield* sql<{ readonly name: string }>`
               SELECT name FROM effect_sql_migrations WHERE migration_id = 41
             `;
-              const authSessionColumns = yield* sql<{ readonly name: string }>`
+            const authSessionColumns = yield* sql<{ readonly name: string }>`
               PRAGMA table_info(auth_sessions)
             `;
-              return {
-                migrationEventCount: migrationEventCount[0]?.count ?? 0,
-                importRows,
-                legacyProjects,
-                legacyThreads,
-                legacyMessages,
-                longProjection: continuedAgain,
-                migration41Name: recordedMigration41[0]?.name ?? null,
-                authSessionColumnNames: authSessionColumns.map((column) => column.name),
-              };
-            }).pipe(
-              Effect.provide(
-                layerBoot({
-                  name: "legacy-v1-cutover-first",
-                  dbPath: copyPath,
-                  workspace,
-                  capturedTurns,
-                }),
-              ),
-              Effect.provideService(
-                Logger.CurrentLoggers,
-                new Set([makeCapturingLogger(boot1Logs)]),
-              ),
+            return {
+              migrationEventCount: migrationEventCount[0]?.count ?? 0,
+              importRows,
+              legacyProjects,
+              legacyThreads,
+              legacyMessages,
+              longProjection: continuedAgain,
+              migration41Name: recordedMigration41[0]?.name ?? null,
+              authSessionColumnNames: authSessionColumns.map((column) => column.name),
+            };
+          }).pipe(
+            Effect.provide(
+              layerBoot({
+                name: "legacy-v1-cutover-first",
+                dbPath: copyPath,
+                workspace,
+                capturedTurns,
+              }),
             ),
-          );
+            Effect.provideService(Logger.CurrentLoggers, new Set([makeCapturingLogger(boot1Logs)])),
+          ),
+        );
 
-          const divergenceLog = boot1Logs.find((log) =>
-            String(log.message).includes("migration history diverges"),
-          );
-          assert.deepStrictEqual(divergenceLog?.annotations.divergent, [
-            "41:ThreadSummaryTimeline (this build: AuthSessionClientConnection)",
-          ]);
-          assert.equal(firstBoot.migration41Name, "ThreadSummaryTimeline");
+        const divergenceLog = boot1Logs.find((log) =>
+          String(log.message).includes("migration history diverges"),
+        );
+        assert.deepStrictEqual(divergenceLog?.annotations.divergent, [
+          "41:ThreadSummaryTimeline (this build: AuthSessionClientConnection)",
+        ]);
+        assert.equal(firstBoot.migration41Name, "ThreadSummaryTimeline");
 
-          assert.notInclude(firstBoot.authSessionColumnNames, "client_surface");
-          assert.notInclude(firstBoot.authSessionColumnNames, "client_app_version");
+        assert.notInclude(firstBoot.authSessionColumnNames, "client_surface");
+        assert.notInclude(firstBoot.authSessionColumnNames, "client_app_version");
 
-          // Full row contents of the legacy recovery tables survive migration
-          // and continuation unchanged, not just their counts.
-          assert.deepStrictEqual(
-            restrictToSnapshotColumns(firstBoot.legacyProjects, v1Snapshot.projects),
-            v1Snapshot.projects.rows,
-          );
-          assert.deepStrictEqual(
-            restrictToSnapshotColumns(firstBoot.legacyThreads, v1Snapshot.threads),
-            v1Snapshot.threads.rows,
-          );
-          assert.deepStrictEqual(
-            restrictToSnapshotColumns(firstBoot.legacyMessages, v1Snapshot.messages),
-            v1Snapshot.messages.rows,
-          );
+        // Full row contents of the legacy recovery tables survive migration
+        // and continuation unchanged, not just their counts.
+        assert.deepStrictEqual(
+          restrictToSnapshotColumns(firstBoot.legacyProjects, v1Snapshot.projects),
+          v1Snapshot.projects.rows,
+        );
+        assert.deepStrictEqual(
+          restrictToSnapshotColumns(firstBoot.legacyThreads, v1Snapshot.threads),
+          v1Snapshot.threads.rows,
+        );
+        assert.deepStrictEqual(
+          restrictToSnapshotColumns(firstBoot.legacyMessages, v1Snapshot.messages),
+          v1Snapshot.messages.rows,
+        );
 
-          assert.equal(firstBoot.importRows.length, ALL_THREADS.length);
-          const unhydratedRows = firstBoot.importRows.filter(
-            (row) => row.transcript_imported_at === null,
-          );
-          assert.deepStrictEqual(
-            unhydratedRows.map((row) => row.thread_id),
-            [SNOOZED_THREAD],
-          );
+        assert.equal(firstBoot.importRows.length, ALL_THREADS.length);
+        const unhydratedRows = firstBoot.importRows.filter(
+          (row) => row.transcript_imported_at === null,
+        );
+        assert.deepStrictEqual(
+          unhydratedRows.map((row) => row.thread_id),
+          [SNOOZED_THREAD],
+        );
 
-          const boot2Logs: CapturedLog[] = [];
-          yield* Effect.scoped(
-            Effect.gen(function* () {
-              const sql = yield* SqlClient.SqlClient;
-              const importer = yield* LegacyV1ThreadImporter.LegacyV1ThreadImporter;
-              const projections = yield* ProjectionStore.ProjectionStoreV2;
+        const boot2Logs: CapturedLog[] = [];
+        yield* Effect.scoped(
+          Effect.gen(function* () {
+            const sql = yield* SqlClient.SqlClient;
+            const importer = yield* LegacyV1ThreadImporter.LegacyV1ThreadImporter;
+            const projections = yield* ProjectionStore.ProjectionStoreV2;
 
-              assert.equal(yield* importer.pendingThreadCount, 1);
-              assert.deepStrictEqual(yield* importer.reconcileShells, {
+            assert.equal(yield* importer.pendingThreadCount, 1);
+            assert.deepStrictEqual(yield* importer.reconcileShells, {
+              importedThreadCount: 0,
+              importedMessageCount: 0,
+            });
+            yield* sql`DROP TRIGGER fail_snoozed_hydration`;
+            assert.deepStrictEqual(
+              yield* importer.ensureTranscript(ThreadId.make(SNOOZED_THREAD)),
+              { importedThreadCount: 1, importedMessageCount: 1 },
+            );
+            const snoozed = yield* projections.getThreadProjection(ThreadId.make(SNOOZED_THREAD));
+            assert.deepStrictEqual(
+              snoozed.messages.map((message) => message.id),
+              [
+                "message:cutover:snoozed:1",
+                "message:cutover:snoozed:2",
+                "message:cutover:snoozed:3",
+              ],
+            );
+            assert.equal(yield* importer.pendingThreadCount, 0);
+            for (const threadId of ALL_THREADS) {
+              assert.deepStrictEqual(yield* importer.ensureTranscript(ThreadId.make(threadId)), {
                 importedThreadCount: 0,
                 importedMessageCount: 0,
               });
-              yield* sql`DROP TRIGGER fail_snoozed_hydration`;
-              assert.deepStrictEqual(
-                yield* importer.ensureTranscript(ThreadId.make(SNOOZED_THREAD)),
-                { importedThreadCount: 1, importedMessageCount: 1 },
-              );
-              const snoozed = yield* projections.getThreadProjection(ThreadId.make(SNOOZED_THREAD));
-              assert.deepStrictEqual(
-                snoozed.messages.map((message) => message.id),
-                [
-                  "message:cutover:snoozed:1",
-                  "message:cutover:snoozed:2",
-                  "message:cutover:snoozed:3",
-                ],
-              );
-              assert.equal(yield* importer.pendingThreadCount, 0);
-              for (const threadId of ALL_THREADS) {
-                assert.deepStrictEqual(yield* importer.ensureTranscript(ThreadId.make(threadId)), {
-                  importedThreadCount: 0,
-                  importedMessageCount: 0,
-                });
-              }
-              const migrationEventCount = yield* sql<{ readonly count: number }>`
+            }
+            const migrationEventCount = yield* sql<{ readonly count: number }>`
               SELECT COUNT(*) AS count
               FROM orchestration_events
               WHERE application_event_version = 2
                 AND event_id LIKE 'migration:v1:%'
             `;
 
-              assert.equal(migrationEventCount[0]?.count, firstBoot.migrationEventCount + 2);
+            assert.equal(migrationEventCount[0]?.count, firstBoot.migrationEventCount + 2);
 
-              const restarted = yield* projections.getThreadProjection(longThreadId);
-              assert.equal(restarted.thread.historyOrigin, "v1_import");
-              assert.equal(restarted.contextHandoffs.length, 1);
-              assert.isNotNull(restarted.thread.activeProviderThreadId);
-              assert.deepStrictEqual(
-                restarted.runs.map((run) => run.status),
-                firstBoot.longProjection.runs.map((run) => run.status),
-              );
+            const restarted = yield* projections.getThreadProjection(longThreadId);
+            assert.equal(restarted.thread.historyOrigin, "v1_import");
+            assert.equal(restarted.contextHandoffs.length, 1);
+            assert.isNotNull(restarted.thread.activeProviderThreadId);
+            assert.deepStrictEqual(
+              restarted.runs.map((run) => run.status),
+              firstBoot.longProjection.runs.map((run) => run.status),
+            );
 
-              assert.deepStrictEqual(
-                restrictToSnapshotColumns(
-                  yield* sql<Record<string, unknown>>`
+            assert.deepStrictEqual(
+              restrictToSnapshotColumns(
+                yield* sql<Record<string, unknown>>`
                     SELECT * FROM projection_projects ORDER BY project_id
                   `,
-                  v1Snapshot.projects,
-                ),
-                v1Snapshot.projects.rows,
-              );
-              assert.deepStrictEqual(
-                restrictToSnapshotColumns(
-                  yield* sql<Record<string, unknown>>`
+                v1Snapshot.projects,
+              ),
+              v1Snapshot.projects.rows,
+            );
+            assert.deepStrictEqual(
+              restrictToSnapshotColumns(
+                yield* sql<Record<string, unknown>>`
                     SELECT * FROM projection_threads ORDER BY thread_id
                   `,
-                  v1Snapshot.threads,
-                ),
-                v1Snapshot.threads.rows,
-              );
-              assert.deepStrictEqual(
-                restrictToSnapshotColumns(
-                  yield* sql<Record<string, unknown>>`
+                v1Snapshot.threads,
+              ),
+              v1Snapshot.threads.rows,
+            );
+            assert.deepStrictEqual(
+              restrictToSnapshotColumns(
+                yield* sql<Record<string, unknown>>`
                     SELECT * FROM projection_thread_messages ORDER BY message_id
                   `,
-                  v1Snapshot.messages,
-                ),
-                v1Snapshot.messages.rows,
-              );
-              const quickCheck = yield* sql<{ readonly quick_check: string }>`
+                v1Snapshot.messages,
+              ),
+              v1Snapshot.messages.rows,
+            );
+            const quickCheck = yield* sql<{ readonly quick_check: string }>`
               PRAGMA quick_check
             `;
-              assert.deepStrictEqual(
-                quickCheck.map((row) => row.quick_check),
-                ["ok"],
-              );
-            }).pipe(
-              Effect.provide(
-                layerBoot({
-                  name: "legacy-v1-cutover-restart",
-                  dbPath: copyPath,
-                  workspace,
-                  capturedTurns,
-                }),
-              ),
-              Effect.provideService(
-                Logger.CurrentLoggers,
-                new Set([makeCapturingLogger(boot2Logs)]),
-              ),
+            assert.deepStrictEqual(
+              quickCheck.map((row) => row.quick_check),
+              ["ok"],
+            );
+          }).pipe(
+            Effect.provide(
+              layerBoot({
+                name: "legacy-v1-cutover-restart",
+                dbPath: copyPath,
+                workspace,
+                capturedTurns,
+              }),
             ),
-          );
+            Effect.provideService(Logger.CurrentLoggers, new Set([makeCapturingLogger(boot2Logs)])),
+          ),
+        );
 
-          assert.isTrue(
-            boot2Logs.some((log) => String(log.message).includes("migration history diverges")),
-          );
+        assert.isTrue(
+          boot2Logs.some((log) => String(log.message).includes("migration history diverges")),
+        );
 
-          // The seeded source file is the untouched recovery copy: migration
-          // only ever ran against the file copied out of it.
-          assert.equal(yield* sha256File(fixturePath), fixtureHashBefore);
-        }).pipe(Effect.provide(NodeServices.layer)),
-      ),
+        // The seeded source file is the untouched recovery copy: migration
+        // only ever ran against the file copied out of it.
+        assert.equal(yield* sha256File(fixturePath), fixtureHashBefore);
+      }).pipe(Effect.provide(NodeServices.layer)),
   );
 });
diff --git a/apps/server/src/orchestration-v2/pullRequestWatch.test.ts b/apps/server/src/orchestration-v2/pullRequestWatch.test.ts
index dece3e344983..eb2ae2756d54 100644
--- a/apps/server/src/orchestration-v2/pullRequestWatch.test.ts
+++ b/apps/server/src/orchestration-v2/pullRequestWatch.test.ts
@@ -81,6 +81,204 @@ const remark = (
 const noRemarks: ReadonlyArray<PullRequestComment> = [];
 
 describe("evaluatePullRequestWatch", () => {
+  it.each([false, true])("baselines already-passed checks (required: %s)", (required) => {
+    const green = detail({ checks: [{ ...check("test", "success"), required }] });
+    const baseline = evaluatePullRequestWatch(watch({ awaitingBaseline: "all" }), green, noRemarks);
+    assert.deepEqual(baseline.changes, []);
+    assert.equal(baseline.next.headSha, green.headSha);
+    assert.isTrue(baseline.next.passed);
+    assert.deepEqual(baseline.next.passedChecks, ["test"]);
+    assert.isFalse(baseline.exhausted);
+    assert.deepEqual(evaluatePullRequestWatch(baseline.next, green, noRemarks).changes, []);
+
+    const pending = evaluatePullRequestWatch(
+      baseline.next,
+      detail({ checks: [{ ...check("test", "pending"), required }] }),
+      noRemarks,
+    );
+    assert.deepEqual(pending.changes, []);
+    const failed = evaluatePullRequestWatch(
+      pending.next,
+      detail({ checks: [{ ...check("test", "failure"), required }] }),
+      noRemarks,
+    );
+    assert.equal(failed.changes[0]?.kind, "checks-failed");
+    const passed = evaluatePullRequestWatch(failed.next, green, noRemarks);
+    assert.deepEqual(passed.changes, [{ kind: "checks-passed", count: 1, required }]);
+    assert.deepEqual(
+      evaluatePullRequestWatch(passed.next, { ...green, headSha: "bbbbbbbbbb" }, noRemarks).changes,
+      [{ kind: "checks-passed", count: 1, required }],
+    );
+  });
+
+  it("baselines existing failures and conflicts, then reports new ones", () => {
+    const broken = detail({
+      checks: [check("lint", "failure"), check("test", "pending")],
+      mergeability: "conflicting",
+    });
+    const baseline = evaluatePullRequestWatch(
+      watch({ awaitingBaseline: "all" }),
+      broken,
+      noRemarks,
+    );
+    assert.deepEqual(baseline.changes, []);
+    assert.deepEqual(baseline.next.failedChecks, ["lint"]);
+    assert.isFalse(baseline.next.passed);
+    assert.isTrue(baseline.next.conflicting);
+    assert.deepEqual(evaluatePullRequestWatch(baseline.next, broken, noRemarks).changes, []);
+
+    const failed = evaluatePullRequestWatch(
+      baseline.next,
+      { ...broken, checks: [check("lint", "failure"), check("test", "failure")] },
+      noRemarks,
+    );
+    assert.deepEqual(failed.changes, [
+      { kind: "checks-failed", failed: [check("test", "failure")] },
+    ]);
+    const clean = evaluatePullRequestWatch(failed.next, detail(), noRemarks);
+    assert.deepEqual(clean.changes, []);
+    assert.deepEqual(evaluatePullRequestWatch(clean.next, broken, noRemarks).changes, [
+      { kind: "checks-failed", failed: [check("lint", "failure")] },
+      { kind: "conflicting" },
+    ]);
+  });
+
+  it("baselines checks already awaiting approval", () => {
+    const gated = detail({ checks: [{ ...check("CI", "action-required"), url: run(1) }] });
+    const baseline = evaluatePullRequestWatch(watch({ awaitingBaseline: "all" }), gated, noRemarks);
+    assert.deepEqual(baseline.changes, []);
+    assert.deepEqual(evaluatePullRequestWatch(baseline.next, gated, noRemarks).changes, []);
+  });
+
+  it("reports remarks after the watch started while baselining checks and conflicts", () => {
+    const green = detail({
+      checks: [check("test", "success")],
+      mergeability: "conflicting",
+    });
+    const comments = [
+      remark("reviewer", "2026-10-02T11:00:00Z"),
+      remark("reviewer", "2026-10-02T12:06:00Z"),
+    ];
+    const baseline = evaluatePullRequestWatch(watch({ awaitingBaseline: "all" }), green, comments);
+    assert.deepEqual(baseline.changes, [{ kind: "remarks", remarks: [comments[1]!] }]);
+    assert.isTrue(baseline.next.passed);
+    assert.isTrue(baseline.next.conflicting);
+    assert.equal(baseline.next.wakes, 1);
+    assert.deepEqual(evaluatePullRequestWatch(baseline.next, green, comments).changes, []);
+  });
+
+  it("reports a failure once the head SHA appears after a baseline without one", () => {
+    const waiting = evaluatePullRequestWatch(
+      watch({ awaitingBaseline: "all" }),
+      detail({ headSha: undefined, checks: [check("test", "pending")] }),
+      noRemarks,
+    );
+    assert.deepEqual(waiting.changes, []);
+    const failed = evaluatePullRequestWatch(
+      waiting.next,
+      detail({ checks: [check("test", "failure")] }),
+      noRemarks,
+    );
+    assert.deepEqual(failed.changes, [
+      { kind: "checks-failed", failed: [check("test", "failure")] },
+    ]);
+  });
+
+  it("keeps a baseline taken without a head SHA once the SHA appears", () => {
+    const green = detail({ checks: [check("test", "success")] });
+    const baseline = evaluatePullRequestWatch(
+      watch({ awaitingBaseline: "all" }),
+      { ...green, headSha: undefined },
+      noRemarks,
+    );
+    const known = evaluatePullRequestWatch(baseline.next, green, noRemarks);
+    assert.deepEqual(known.changes, []);
+    assert.equal(known.next.headSha, green.headSha);
+    const unknown = evaluatePullRequestWatch(
+      known.next,
+      { ...green, headSha: undefined },
+      noRemarks,
+    );
+    assert.equal(unknown.next.headSha, green.headSha);
+    assert.deepEqual(
+      evaluatePullRequestWatch(unknown.next, { ...green, headSha: "bbbbbbbbbb" }, noRemarks)
+        .changes,
+      [{ kind: "checks-passed", count: 1, required: false }],
+    );
+  });
+
+  it.each(["success", "failure"] as const)(
+    "reports %s on checks that appear after a first read without any",
+    (status) => {
+      const empty = evaluatePullRequestWatch(
+        watch({ awaitingBaseline: "all" }),
+        detail({ checks: [] }),
+        noRemarks,
+      );
+      assert.deepEqual(empty.changes, []);
+      assert.isUndefined(empty.next.awaitingBaseline);
+      assert.isTrue(empty.next.checksPending);
+      assert.deepEqual(
+        evaluatePullRequestWatch(empty.next, detail({ checks: [check("test", status)] }), noRemarks)
+          .changes,
+        status === "success"
+          ? [{ kind: "checks-passed", count: 1, required: false }]
+          : [{ kind: "checks-failed", failed: [check("test", "failure")] }],
+      );
+    },
+  );
+
+  it("keeps the check baseline through a read whose approval lookup failed", () => {
+    const bot = check("bot", "success");
+    const unavailable = { ...check("Workflow approval status", "pending"), placeholder: true };
+    const partial = evaluatePullRequestWatch(
+      watch({ awaitingBaseline: "all" }),
+      detail({ checks: [bot, unavailable] }),
+      noRemarks,
+    );
+    assert.deepEqual(partial.changes, []);
+    assert.equal(partial.next.awaitingBaseline, "checks");
+    const approval = { ...check("CI", "action-required"), url: run(1) };
+    for (const checks of [[bot], [bot, approval]]) {
+      assert.deepEqual(
+        evaluatePullRequestWatch(partial.next, detail({ checks }), noRemarks).changes,
+        [],
+      );
+    }
+  });
+
+  it("reports pending advisory checks finishing after a required-check baseline", () => {
+    const initial = detail({
+      checks: [{ ...check("test", "success"), required: true }, check("bot", "pending")],
+    });
+    const baseline = evaluatePullRequestWatch(
+      watch({ awaitingBaseline: "all" }),
+      initial,
+      noRemarks,
+    );
+    assert.deepEqual(baseline.changes, []);
+    const settled = evaluatePullRequestWatch(
+      baseline.next,
+      {
+        ...initial,
+        checks: [initial.checks[0]!, check("bot", "success")],
+      },
+      noRemarks,
+    );
+    assert.deepEqual(settled.changes, [{ kind: "checks-passed", count: 2, required: false }]);
+    assert.deepEqual(
+      evaluatePullRequestWatch(
+        settled.next,
+        {
+          ...initial,
+          checks: [initial.checks[0]!, check("bot", "success")],
+        },
+        noRemarks,
+      ).changes,
+      [],
+    );
+  });
+
   it("waits for workflow approval once, through reads that miss it, until the run finishes", () => {
     const bot = check("bot", "success");
     const approval = { ...check("CI", "action-required"), url: run(1) };
@@ -528,6 +726,80 @@ describe("evaluatePullRequestWatch", () => {
     );
   });
 
+  it("reports each merge queue removal once while the head checks stay green", () => {
+    const green = detail({ checks: [check("test", "success")] });
+    const watching = evaluatePullRequestWatch(watch(), green, noRemarks).next;
+    const removed = (id: string, removedAt: string) =>
+      detail({ ...green, mergeQueueRemoval: { id, removedAt, reason: "Merge conflict" } });
+
+    const dropped = removed("first", "2026-10-02T12:10:00Z");
+    const first = evaluatePullRequestWatch(watching, dropped, noRemarks);
+    assert.deepEqual(first.changes, [{ kind: "merge-queue-removed", reason: "Merge conflict" }]);
+    const wake = pullRequestWatchMessage({
+      number: 1,
+      url: "https://github.com/o/r/pull/1",
+      baseBranch: "main",
+      headSha: first.next.headSha,
+      report: first,
+    });
+    assert.deepEqual(wake.notification, {
+      source: { kind: "monitor" },
+      outcome: "failed",
+      summary: "#1: removed from merge queue",
+    });
+    assert.deepEqual(evaluatePullRequestWatch(first.next, dropped, noRemarks).changes, []);
+    // A read without queue news keeps the removal already told.
+    const quiet = evaluatePullRequestWatch(first.next, green, noRemarks);
+    assert.deepEqual(evaluatePullRequestWatch(quiet.next, dropped, noRemarks).changes, []);
+
+    const again = removed("second", "2026-10-02T12:20:00Z");
+    assert.equal(evaluatePullRequestWatch(first.next, again, noRemarks).changes.length, 1);
+    const before = removed("before", "2026-10-02T11:00:00Z");
+    const baseline = evaluatePullRequestWatch(
+      watch({ headSha: watching.headSha, passed: true, passedChecks: watching.passedChecks }),
+      before,
+      noRemarks,
+    );
+    assert.deepEqual(baseline.changes, []);
+    for (const prior of [watching, baseline.next]) {
+      const skewed = evaluatePullRequestWatch(
+        prior,
+        removed("new", "2026-10-02T11:59:58Z"),
+        noRemarks,
+      );
+      assert.deepEqual(skewed.changes, [{ kind: "merge-queue-removed", reason: "Merge conflict" }]);
+      assert.deepEqual(
+        evaluatePullRequestWatch(skewed.next, removed("new", "2026-10-02T11:59:58Z"), noRemarks)
+          .changes,
+        [],
+      );
+    }
+  });
+
+  it("reports a merge queue removal stamped in the second the watch started", () => {
+    const watching = watch({ startedAt: "2026-10-02T12:00:00.500Z" });
+    const removed = (removedAt: string) =>
+      detail({ mergeQueueRemoval: { id: "first", removedAt, reason: "CI failed" } });
+    assert.deepEqual(
+      evaluatePullRequestWatch(watching, removed("2026-10-02T12:00:00Z"), noRemarks).changes,
+      [{ kind: "merge-queue-removed", reason: "CI failed" }],
+    );
+    assert.deepEqual(
+      evaluatePullRequestWatch(watching, removed("2026-10-02T11:59:59Z"), noRemarks).changes,
+      [],
+    );
+  });
+
+  it("stays quiet when the queue lets go of a pull request by merging it", () => {
+    const watching = evaluatePullRequestWatch(watch(), detail(), noRemarks).next;
+    const merging = detail({
+      mergeQueueRemoval: { id: "landed", removedAt: "2026-10-02T12:10:00Z", reason: "merged" },
+    });
+    const read = evaluatePullRequestWatch(watching, merging, noRemarks);
+    assert.deepEqual(read.changes, []);
+    assert.equal(read.next.mergeQueueRemovalId, "landed");
+  });
+
   it("does not spend the comment wake limit on check results", () => {
     const tired = watch({ headSha: "aaaaaaaaaa", wakes: PULL_REQUEST_WATCH_WAKE_LIMIT - 1 });
     const result = evaluatePullRequestWatch(
@@ -571,16 +843,81 @@ describe("evaluatePullRequestWatch", () => {
     const unknown = detail({
       checks: [{ ...check("Workflow approval status", "action-required"), placeholder: true }],
     });
-    assert.deepEqual(anHourLater(watch(), unknown).flat(), []);
-    const unread = evaluate(watch(), unknown, noRemarks, 0);
+    const fresh = watch({ awaitingBaseline: "all" });
+    assert.deepEqual(anHourLater(fresh, unknown).flat(), []);
+    const unread = evaluate(fresh, unknown, noRemarks, 0);
     assert.deepEqual(
       evaluate(unread.next, detail({ checks: [] }), noRemarks, 60 * 60_000).changes,
       [{ kind: "no-checks", minutes: 60 }],
     );
   });
 
+  it("starts the no-checks clock while a fresh watch awaits its baseline", () => {
+    assert.deepEqual(
+      anHourLater(watch({ awaitingBaseline: "all" }), detail({ checks: [] })).flat(),
+      ["no-checks"],
+    );
+  });
+
   it("never reports missing checks on a host where an empty list says nothing", () => {
     const silent = detail({ capabilities: capabilities(false), checks: [] });
     assert.isTrue(anHourLater(watch(), silent).every((kinds) => kinds.length === 0));
   });
+
+  it("counts checks as pending until every one, a review bot's included, has finished", () => {
+    const pending = (checks: ReadonlyArray<PullRequestCheck>, from = watch()) =>
+      evaluatePullRequestWatch(from, detail({ checks }), noRemarks).next.checksPending;
+    const ci = { ...check("test", "success"), required: true };
+    assert.isTrue(pending([ci, check("CodeRabbit", "pending")]));
+    assert.isFalse(pending([ci, check("CodeRabbit", "success")]));
+    assert.isFalse(pending([ci, check("CodeRabbit", "failure")]));
+    assert.isFalse(pending([ci, check("deploy", "action-required")]));
+    // A failed read keeps the last answer, as does one with only an unreadable approval check.
+    assert.isFalse(pending([], watch({ headSha: "aaaaaaaaaa", checksPending: false })));
+    const unreadable = { ...check("approvals", "action-required"), placeholder: true };
+    assert.isTrue(pending([unreadable], watch({ headSha: "aaaaaaaaaa", checksPending: true })));
+  });
+
+  it("waits a while for a new head's checks on every host", () => {
+    const pushed = (checksAlwaysReport: boolean) =>
+      evaluatePullRequestWatch(
+        watch({ headSha: "aaaaaaaaaa", checksPending: false }),
+        detail({
+          headSha: "bbbbbbbbbb",
+          capabilities: capabilities(checksAlwaysReport),
+          checks: [],
+        }),
+        noRemarks,
+      ).next.checksPending;
+    assert.isTrue(pushed(true));
+    assert.isTrue(pushed(false));
+
+    // Once the no-checks window passes, the watch stops waiting for them.
+    for (const checksAlwaysReport of [true, false]) {
+      let current = watch({ headSha: "aaaaaaaaaa" });
+      for (const minute of [0, 20]) {
+        current = evaluate(
+          current,
+          detail({
+            headSha: "bbbbbbbbbb",
+            capabilities: capabilities(checksAlwaysReport),
+            checks: [],
+          }),
+          noRemarks,
+          minute * 60_000,
+        ).next;
+      }
+      assert.isFalse(current.checksPending);
+    }
+
+    // A watch with no answer waits on an empty list only while the no-checks clock runs.
+    const unanswered = (checksAwaitedSince: string | null) =>
+      evaluatePullRequestWatch(
+        watch({ headSha: "bbbbbbbbbb", checksAwaitedSince }),
+        detail({ headSha: "bbbbbbbbbb", checks: [] }),
+        noRemarks,
+      ).next.checksPending;
+    assert.isFalse(unanswered(null));
+    assert.isTrue(unanswered(STARTED));
+  });
 });
diff --git a/apps/server/src/orchestration-v2/pullRequestWatch.ts b/apps/server/src/orchestration-v2/pullRequestWatch.ts
index 05b08df73fb4..e12d9a124df8 100644
--- a/apps/server/src/orchestration-v2/pullRequestWatch.ts
+++ b/apps/server/src/orchestration-v2/pullRequestWatch.ts
@@ -20,7 +20,8 @@ export type PullRequestWatchChange =
   | { readonly kind: "checks-awaiting-approval"; readonly checks: ReadonlyArray<PullRequestCheck> }
   | { readonly kind: "remarks"; readonly remarks: ReadonlyArray<PullRequestComment> }
   | { readonly kind: "no-checks"; readonly minutes: number }
-  | { readonly kind: "conflicting" };
+  | { readonly kind: "conflicting" }
+  | { readonly kind: "merge-queue-removed"; readonly reason: string | null };
 
 export interface PullRequestWatchReport {
   readonly changes: ReadonlyArray<PullRequestWatchChange>;
@@ -39,15 +40,22 @@ export function evaluatePullRequestWatch(
   watch: ThreadPullRequestWatch,
   detail: Pick<
     PullRequestDetail,
-    "capabilities" | "headSha" | "checks" | "mergeability" | "viewer" | "author"
+    | "capabilities"
+    | "headSha"
+    | "checks"
+    | "mergeability"
+    | "viewer"
+    | "author"
+    | "mergeQueueRemoval"
   >,
   remarks: ReadonlyArray<PullRequestComment> | null,
   now: number,
 ): PullRequestWatchReport {
   const changes: Array<PullRequestWatchChange> = [];
-  // Azure DevOps omits the head when its iteration read fails; that is not a push.
+  // A read without a head says nothing about pushes, so it keeps the last known one.
   const headSha = detail.headSha ?? watch.headSha;
-  const headMoved = headSha !== watch.headSha;
+  const headMoved = watch.headSha !== null && headSha !== watch.headSha;
+  const checksBaseline = watch.awaitingBaseline !== undefined && !headMoved;
 
   // Hosts can return no checks on read failure; preserve prior state.
   let failedChecks = headMoved ? [] : watch.failedChecks;
@@ -56,16 +64,23 @@ export function evaluatePullRequestWatch(
   let owedChecks = headMoved ? [] : (watch.owedChecks ?? []);
   let awaitingApproval = headMoved ? [] : (watch.awaitingApproval ?? []);
   let approvalAnnounced = headMoved ? false : (watch.approvalAnnounced ?? false);
+  // A watch with no answer (saved before the field, or since a push) waits only while the clock
+  // below runs.
+  let checksPending = headMoved ? false : (watch.checksPending ?? watch.checksAwaitedSince != null);
   // An unavailable approval read cannot establish success or that no checks exist.
   const unread = detail.checks.some((check) => check.placeholder === true);
   const checks = detail.checks.filter((check) => check.placeholder !== true);
   const failed = checks.filter(isFailedCheck);
   const awaiting = checks.filter((check) => check.status === "action-required");
   if (checks.length > 0) {
+    // A run awaiting approval waits on a person, like a review, so only running checks count.
+    checksPending = checks.some((check) => check.status === "pending");
     const newlyFailed = failed.filter((check) => !failedChecks.includes(check.name));
-    if (newlyFailed.length > 0) changes.push({ kind: "checks-failed", failed: newlyFailed });
+    if (!checksBaseline && newlyFailed.length > 0) {
+      changes.push({ kind: "checks-failed", failed: newlyFailed });
+    }
     if (!approvalAnnounced && awaiting.length > 0) {
-      changes.push({ kind: "checks-awaiting-approval", checks: awaiting });
+      if (!checksBaseline) changes.push({ kind: "checks-awaiting-approval", checks: awaiting });
       approvalAnnounced = true;
     }
     failedChecks = failed.map((check) => check.name);
@@ -125,7 +140,9 @@ export function evaluatePullRequestWatch(
       checks.every((check) => check.status !== "pending");
     owedChecks = owed;
     if (passedNow && (!passed || gateGrew)) {
-      changes.push({ kind: "checks-passed", count: gate.length, required: required.length > 0 });
+      if (!checksBaseline) {
+        changes.push({ kind: "checks-passed", count: gate.length, required: required.length > 0 });
+      }
       owedChecks =
         required.length > 0
           ? checks
@@ -140,21 +157,23 @@ export function evaluatePullRequestWatch(
     passedChecks = passedNow ? gateNames : [];
   }
 
-  // Only a head never read with checks waits for them: an empty read after checks were seen is
-  // the failed read above. A watch saved before this field may have seen pending checks on its
-  // head, so its clock starts only at the next push. Where a host's empty list can mean the
-  // repository runs no checks at all, nothing waits.
-  let checksAwaitedSince = watch.checksAwaitedSince;
-  if (detail.capabilities.checksAlwaysReport === true) {
-    const awaitedBefore = headMoved
+  // Only a head never read with checks waits for them; a legacy watch's clock starts at its next
+  // push. CI can register late on any host, so every host waits, but running out of time is news
+  // only where a host always reports checks: elsewhere an empty list can mean there are none.
+  const awaitedBefore =
+    headMoved || watch.awaitingBaseline === "all"
       ? DateTime.formatIso(DateTime.makeUnsafe(now))
       : (watch.checksAwaitedSince ?? null);
-    checksAwaitedSince = checks.length > 0 ? null : awaitedBefore;
-    const awaitedMs = checksAwaitedSince === null ? 0 : now - Date.parse(checksAwaitedSince);
-    if (!unread && awaitedMs >= PULL_REQUEST_WATCH_NO_CHECKS_MS) {
+  let checksAwaitedSince = checks.length > 0 ? null : awaitedBefore;
+  const awaitedMs = checksAwaitedSince === null ? 0 : now - Date.parse(checksAwaitedSince);
+  if (!unread && awaitedMs >= PULL_REQUEST_WATCH_NO_CHECKS_MS) {
+    if (detail.capabilities.checksAlwaysReport === true) {
       changes.push({ kind: "no-checks", minutes: Math.round(awaitedMs / 60_000) });
-      checksAwaitedSince = null;
     }
+    checksAwaitedSince = null;
+    checksPending = false;
+  } else if (checksAwaitedSince !== null) {
+    checksPending = true;
   }
 
   const own = (detail.viewer ?? detail.author?.login)?.toLowerCase();
@@ -179,13 +198,30 @@ export function evaluatePullRequestWatch(
 
   // Like a failed check, a conflict a push did not resolve is news for the new head.
   const toldConflict = !headMoved && watch.conflicting;
-  if (detail.mergeability === "conflicting" && !toldConflict) {
+  if (watch.awaitingBaseline !== "all" && detail.mergeability === "conflicting" && !toldConflict) {
     changes.push({ kind: "conflicting" });
   }
   // "unknown" is a host still computing after a push; only a clean answer clears a conflict.
   const conflicting =
     detail.mergeability === "unknown" ? toldConflict : detail.mergeability === "conflicting";
 
+  // The queue's checks run on a commit of its own, so its head can stay green after the queue
+  // drops it. After the first read, IDs avoid comparing the server clock with the host clock.
+  // The initial read uses whole seconds to exclude historical removals.
+  const removal = detail.mergeQueueRemoval;
+  if (
+    removal !== undefined &&
+    // Merging also records a removal, up to a second before the pull request reads as merged.
+    removal.reason !== "merged" &&
+    removal.id !== watch.mergeQueueRemovalId &&
+    (watch.mergeQueueRemovalId !== undefined ||
+      Date.parse(removal.removedAt) >= Math.floor(Date.parse(watch.startedAt) / 1000) * 1000)
+  ) {
+    changes.push({ kind: "merge-queue-removed", reason: removal.reason });
+  }
+  // Null records an empty baseline; historical IDs are saved without waking the watch.
+  const mergeQueueRemovalId = removal?.id ?? watch.mergeQueueRemovalId ?? null;
+
   const commentsOnly = changes.length > 0 && changes.every((change) => change.kind === "remarks");
   const progress = headMoved || (changes.length > 0 && !commentsOnly);
   const wakes = (progress ? 0 : watch.wakes) + (commentsOnly ? 1 : 0);
@@ -203,8 +239,15 @@ export function evaluatePullRequestWatch(
       remarksThrough,
       remarkIds,
       conflicting,
+      mergeQueueRemovalId,
       wakes,
+      // Only a read that cannot be trusted to show the checks leaves the baseline to the next one.
+      ...(checksBaseline &&
+        (unread || (detail.headSha === undefined && checks.length === 0)) && {
+          awaitingBaseline: "checks" as const,
+        }),
       checksAwaitedSince,
+      checksPending,
     },
     exhausted: commentsOnly && wakes >= PULL_REQUEST_WATCH_WAKE_LIMIT,
   };
@@ -267,6 +310,10 @@ function changeLines(
       ];
     case "conflicting":
       return [`- The branch now conflicts with ${context.baseBranch}.`];
+    case "merge-queue-removed":
+      return [
+        `- It was removed from the merge queue without merging${change.reason === null ? "" : `: ${change.reason}`}.`,
+      ];
   }
 }
 
@@ -277,6 +324,7 @@ const SUMMARY: Record<PullRequestWatchChange["kind"], string> = {
   remarks: "new comments",
   "no-checks": "no checks reported",
   conflicting: "merge conflict",
+  "merge-queue-removed": "removed from merge queue",
 };
 
 const WATCHING_CLOSING =
@@ -337,7 +385,10 @@ export function pullRequestWatchMessage(input: {
       : WATCHING_CLOSING,
   ].join("\n");
   const failed = changes.some(
-    (change) => change.kind === "checks-failed" || change.kind === "conflicting",
+    (change) =>
+      change.kind === "checks-failed" ||
+      change.kind === "conflicting" ||
+      change.kind === "merge-queue-removed",
   );
   const summary = changes.map((change) => SUMMARY[change.kind]);
   if (exhausted) summary.push("stopped watching");
diff --git a/apps/server/src/orchestration-v2/runtimeLayer.test.ts b/apps/server/src/orchestration-v2/runtimeLayer.test.ts
index 1557e411af93..e6b7ec2e944c 100644
--- a/apps/server/src/orchestration-v2/runtimeLayer.test.ts
+++ b/apps/server/src/orchestration-v2/runtimeLayer.test.ts
@@ -25,6 +25,7 @@ import {
   type OrchestrationV2ShellSnapshot,
   type OrchestrationV2RuntimeRequest,
   ProjectId,
+  type PullRequestCheck,
   type PullRequestDetail,
   type PullRequestComment,
   PullRequestOperationError,
@@ -182,19 +183,43 @@ const claudeProviderInstance = {
   },
 } satisfies ProviderInstance;
 
+const antigravityInstanceId = ProviderInstanceId.make("antigravity_test");
+const antigravityDriver = ProviderDriverKind.make("antigravity");
+const antigravityProviderInstance = {
+  ...providerInstance,
+  instanceId: antigravityInstanceId,
+  driverKind: antigravityDriver,
+  continuationIdentity: { driverKind: antigravityDriver, continuationKey: "antigravity:test" },
+  displayName: "Antigravity test",
+  orchestrationAdapter: {
+    ...orchestrationAdapter,
+    instanceId: antigravityInstanceId,
+    driver: antigravityDriver,
+    getCapabilities: () =>
+      Effect.succeed({
+        ...CodexProviderCapabilitiesV2,
+        turns: { ...CodexProviderCapabilitiesV2.turns, supportsNativeGoals: true },
+      }),
+  },
+} satisfies ProviderInstance;
+
 const layerTestProviderInstanceRegistry = Layer.succeed(
   ProviderInstanceRegistry.ProviderInstanceRegistry,
   {
     getInstance: (instanceId) =>
       Effect.succeed(
-        [providerInstance, alternateProviderInstance, claudeProviderInstance].find(
-          (instance) => instanceId === instance.instanceId,
-        ),
+        [
+          providerInstance,
+          alternateProviderInstance,
+          claudeProviderInstance,
+          antigravityProviderInstance,
+        ].find((instance) => instanceId === instance.instanceId),
       ),
     listInstances: Effect.succeed([
       providerInstance,
       alternateProviderInstance,
       claudeProviderInstance,
+      antigravityProviderInstance,
     ]),
     listUnavailable: Effect.succeed([]),
     streamChanges: Stream.empty,
@@ -3996,9 +4021,10 @@ it.layer(layerTest)("OrchestrationV2LayerLive lifecycle", (it) => {
     }),
   );
 
-  it.effect("wakes once for a state it reported, across a restart and a new watch", () =>
+  it.effect("baselines a new watch across restarts and reports later changes", () =>
     Effect.gen(function* () {
       const orchestrator = yield* Orchestrator.OrchestratorV2;
+      const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
       const threadId = ThreadId.make("runtime-pull-request-watch-told");
       const projectId = ProjectId.make("pr-watch-told-project");
       yield* seedProject({
@@ -4073,22 +4099,38 @@ it.layer(layerTest)("OrchestrationV2LayerLive lifecycle", (it) => {
 
       const reactor = yield* PullRequestWatchReactor.make.pipe(Effect.provide(host));
       yield* reactor.sweep;
+      yield* worker.drain();
+      assert.deepEqual(yield* summaries, []);
+      const baseline = (yield* orchestrator.getThreadShell(threadId))?.pullRequests?.[0]?.watch;
+      assert.equal(baseline?.headSha, headSha);
+      assert.isTrue(baseline?.passed);
+      assert.deepEqual(baseline?.passedChecks, ["lint", "test"]);
       yield* TestClock.adjust("10 minutes");
       yield* reactor.sweep;
-      assert.deepEqual(yield* summaries, ["#12: checks passed"]);
+      yield* worker.drain();
+      assert.deepEqual(yield* summaries, []);
 
       const restarted = yield* PullRequestWatchReactor.make.pipe(Effect.provide(host));
       yield* restarted.sweep;
+      yield* worker.drain();
+      assert.deepEqual(yield* summaries, []);
+
+      headSha = "bbbbbbbbbb";
+      yield* TestClock.adjust("10 minutes");
+      yield* restarted.sweep;
+      yield* worker.drain();
       assert.deepEqual(yield* summaries, ["#12: checks passed"]);
 
       yield* watch(false, "stop");
       yield* watch(true, "again");
       yield* restarted.sweep;
+      yield* worker.drain();
       assert.deepEqual(yield* summaries, ["#12: checks passed"]);
 
-      headSha = "bbbbbbbbbb";
+      headSha = "cccccccccc";
       yield* TestClock.adjust("10 minutes");
       yield* restarted.sweep;
+      yield* worker.drain();
       assert.deepEqual(yield* summaries, ["#12: checks passed", "#12: checks passed"]);
       yield* watch(false, "end");
     }),
@@ -4152,22 +4194,21 @@ it.layer(layerTest)("OrchestrationV2LayerLive lifecycle", (it) => {
             dispatchMode: { type: "start_immediately" },
           });
         }
+        let status: "pending" | "failure" = "pending";
         const host = Layer.mergeAll(
           NodeServices.layer,
           NodeCrypto.layer,
           Layer.mock(PullRequestService.PullRequestService)({
             detail: (input) =>
-              Effect.succeed({
+              Effect.sync(() => ({
                 ...watchedPullRequestDetail({
                   projectId,
                   number: input.number,
                   at: "2026-10-02T12:00:00.000Z",
                 }),
                 headSha: `head${input.number}`,
-                checks: [
-                  { name: "test", status: "failure", description: null, url: null, required: true },
-                ],
-              }),
+                checks: [{ name: "test", status, description: null, url: null, required: true }],
+              })),
             activity: () =>
               Effect.succeed({
                 comments: [],
@@ -4181,6 +4222,8 @@ it.layer(layerTest)("OrchestrationV2LayerLive lifecycle", (it) => {
 
         const reactor = yield* PullRequestWatchReactor.make.pipe(Effect.provide(host));
         yield* reactor.sweep;
+        status = "failure";
+        yield* reactor.sweep;
         const { messages } = yield* orchestrator.getThreadRecords(threadId, ["messages"]);
         const wakes = messages.filter((message) => message.notification !== undefined);
         const stamps = wakes.map(({ notification }) =>
@@ -4223,6 +4266,153 @@ it.layer(layerTest)("OrchestrationV2LayerLive lifecycle", (it) => {
       }),
   );
 
+  it.effect(
+    "records when a watched PR's checks finish, unless a push cleared that during the read",
+    () =>
+      Effect.gen(function* () {
+        const orchestrator = yield* Orchestrator.OrchestratorV2;
+        const threadId = ThreadId.make("runtime-pull-request-watch-quiet");
+        const projectId = ProjectId.make("pr-watch-quiet-project");
+        yield* seedProject({
+          projectId,
+          title: "Watch quiet",
+          workspaceRoot: "/workspace/watch-quiet",
+          defaultModelSelection: null,
+          createdAt: "2026-10-01T00:00:00.000Z",
+        });
+        yield* orchestrator.dispatch({
+          type: "thread.create",
+          createdBy: "user",
+          creationSource: "web",
+          commandId: CommandId.make("pr-watch-quiet-create"),
+          threadId,
+          projectId,
+          title: "Watch quiet",
+          modelSelection,
+          runtimeMode: "full-access",
+          interactionMode: "default",
+          branch: null,
+          worktreePath: null,
+        });
+        // Two watches, as with a stack, so news on both wakes the thread once for both.
+        for (const number of [17, 18]) {
+          yield* orchestrator.dispatch({
+            type: "thread.pull-request.watch",
+            commandId: CommandId.make(`pr-watch-quiet-start-${number}`),
+            threadId,
+            host: "github.com",
+            repository: "pingdotgg/t3code",
+            number,
+            watching: true,
+            link: { url: `https://github.com/pingdotgg/t3code/pull/${number}`, source: "agent" },
+          });
+        }
+
+        let e2e: PullRequestCheck["status"] = "pending";
+        let comments: ReadonlyArray<PullRequestComment> = [];
+        let gate: {
+          readonly started: Deferred.Deferred<void>;
+          readonly release: Deferred.Deferred<void>;
+        } | null = null;
+        const host = Layer.mergeAll(
+          NodeServices.layer,
+          NodeCrypto.layer,
+          Layer.mock(PullRequestService.PullRequestService)({
+            detail: (input) =>
+              Effect.gen(function* () {
+                if (gate !== null) {
+                  yield* Deferred.succeed(gate.started, undefined);
+                  yield* Deferred.await(gate.release);
+                }
+                return {
+                  ...watchedPullRequestDetail({
+                    projectId,
+                    number: input.number,
+                    at: "2026-10-02T12:00:00.000Z",
+                  }),
+                  checks: [
+                    { name: "test", status: "failure" as const, description: null, url: null },
+                    { name: "e2e", status: e2e, description: null, url: null },
+                  ],
+                };
+              }),
+            activity: () =>
+              Effect.sync(() => ({
+                comments,
+                commentCount: comments.length,
+                commentsTruncated: false,
+                reviewThreads: [],
+                commits: [],
+              })),
+          }),
+        );
+        const summaries = Effect.map(
+          orchestrator.getThreadRecords(threadId, ["messages"]),
+          ({ messages }) => messages.flatMap((message) => message.notification?.summary ?? []),
+        );
+        const checksPending = Effect.map(orchestrator.getThreadShell(threadId), (thread) => {
+          const answers = (thread?.pullRequests ?? []).map((link) => link.watch?.checksPending);
+          assert.lengthOf(answers, 2);
+          assert.strictEqual(answers[0], answers[1]);
+          return answers[0];
+        });
+
+        const reactor = yield* PullRequestWatchReactor.make.pipe(Effect.provide(host));
+        yield* reactor.sweep;
+        assert.deepEqual(yield* summaries, []);
+        assert.isTrue(yield* checksPending);
+        const reopen = (id: string) =>
+          orchestrator.dispatch({
+            type: "thread.pull-request-watch.checks-reopen",
+            commandId: CommandId.make(`pr-watch-quiet-${id}`),
+            threadId,
+          });
+        // A push forgets a running answer too, so a read begun before it cannot settle it.
+        yield* reopen("push-pending");
+        assert.isUndefined(yield* checksPending);
+
+        e2e = "success";
+        yield* TestClock.adjust("10 minutes");
+        yield* reactor.sweep;
+        assert.deepEqual(yield* summaries, []);
+        assert.isFalse(yield* checksPending);
+
+        // A push clears the answer while a read with news is in flight. That read's answer is the
+        // old head's, so the answer stays cleared while its news still wakes the agent.
+        const started = yield* Deferred.make<void>();
+        const release = yield* Deferred.make<void>();
+        gate = { started, release };
+        comments = [
+          {
+            id: "comment-1",
+            kind: "issue-comment",
+            author: { login: "reviewer", name: null, avatarUrl: null },
+            body: "Looks good once CI passes.",
+            createdAt: "2999-01-01T00:00:00.000Z",
+            url: null,
+            path: null,
+            reviewState: null,
+          },
+        ];
+        yield* TestClock.adjust("10 minutes");
+        const inFlight = yield* reactor.sweep.pipe(Effect.forkChild({ startImmediately: true }));
+        yield* Deferred.await(started);
+        yield* reopen("push");
+        // Another push before the watch read again finds nothing to clear, which is fine.
+        yield* reopen("push-again");
+        gate = null;
+        yield* Deferred.succeed(release, undefined);
+        yield* Fiber.join(inFlight);
+        assert.lengthOf(yield* summaries, 1);
+        assert.isUndefined(yield* checksPending);
+
+        // The next sweep reads it again though nothing on the host changed.
+        yield* TestClock.adjust("2 minutes");
+        yield* reactor.sweep;
+        assert.isFalse(yield* checksPending);
+      }),
+  );
+
   it.effect.each(["pending", "action-required"] as const)("recovers %s watches", (initialStatus) =>
     Effect.gen(function* () {
       const orchestrator = yield* Orchestrator.OrchestratorV2;
@@ -4265,7 +4455,6 @@ it.layer(layerTest)("OrchestrationV2LayerLive lifecycle", (it) => {
 
       let remainingStatus: "pending" | "action-required" | "success" = initialStatus;
       const approval = initialStatus === "action-required";
-      const firstSummary = approval ? "#12: checks await approval" : "#12: checks passed";
       const runUrl = "https://github.com/pingdotgg/t3code/actions/runs/123";
       const host = Layer.mergeAll(
         NodeServices.layer,
@@ -4308,7 +4497,7 @@ it.layer(layerTest)("OrchestrationV2LayerLive lifecycle", (it) => {
       yield* TestClock.adjust("10 minutes");
       yield* reactor.sweep;
       yield* worker.drain();
-      assert.deepEqual(yield* summaries, [firstSummary]);
+      assert.deepEqual(yield* summaries, []);
 
       assert.deepEqual(
         (yield* orchestrator.getThreadShell(threadId))?.pullRequests?.[0]?.watch?.[
@@ -4320,14 +4509,19 @@ it.layer(layerTest)("OrchestrationV2LayerLive lifecycle", (it) => {
       const restarted = yield* PullRequestWatchReactor.make.pipe(Effect.provide(host));
       yield* restarted.sweep;
       yield* worker.drain();
-      assert.deepEqual(yield* summaries, [firstSummary]);
+      assert.deepEqual(yield* summaries, []);
 
-      // A new watch on the same pull request knows what the last one told.
+      // A new watch on the same pull request knows what the last one told, and that its checks
+      // were still running. A finished answer may be an older head's, so it reads again.
       yield* watch(false, "stop");
       yield* watch(true, "again");
+      assert.strictEqual(
+        (yield* orchestrator.getThreadShell(threadId))?.pullRequests?.[0]?.watch?.checksPending,
+        approval ? undefined : true,
+      );
       yield* restarted.sweep;
       yield* worker.drain();
-      assert.deepEqual(yield* summaries, [firstSummary]);
+      assert.deepEqual(yield* summaries, []);
 
       assert.deepEqual(
         (yield* orchestrator.getThreadShell(threadId))?.pullRequests?.[0]?.watch?.[
@@ -4339,11 +4533,11 @@ it.layer(layerTest)("OrchestrationV2LayerLive lifecycle", (it) => {
       yield* TestClock.adjust("10 minutes");
       yield* restarted.sweep;
       yield* worker.drain();
-      assert.deepEqual(yield* summaries, [firstSummary, "#12: checks passed"]);
+      assert.deepEqual(yield* summaries, ["#12: checks passed"]);
       yield* TestClock.adjust("10 minutes");
       yield* restarted.sweep;
       yield* worker.drain();
-      assert.deepEqual(yield* summaries, [firstSummary, "#12: checks passed"]);
+      assert.deepEqual(yield* summaries, ["#12: checks passed"]);
       assert.deepEqual(
         (yield* orchestrator.getThreadShell(threadId))?.pullRequests?.[0]?.watch?.owedChecks,
         [],
@@ -4584,122 +4778,120 @@ it.layer(layerTest)("OrchestrationV2LayerLive lifecycle", (it) => {
   it.effect(
     "reads a watched pull request when the host reports a change, and wakes once per change",
     () =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const orchestrator = yield* Orchestrator.OrchestratorV2;
-          const threadId = ThreadId.make("runtime-pull-request-watch-host-event");
-          const projectId = ProjectId.make("pr-watch-host-event-project");
-          yield* seedProject({
-            projectId,
-            title: "Watch host events",
-            workspaceRoot: "/workspace/watch-host-event",
-            defaultModelSelection: null,
-            createdAt: "2026-10-01T00:00:00.000Z",
-          });
-          yield* orchestrator.dispatch({
-            type: "thread.create",
-            createdBy: "user",
-            creationSource: "web",
-            commandId: CommandId.make("pr-watch-host-event-create"),
-            threadId,
-            projectId,
-            title: "Watch host events",
-            modelSelection,
-            runtimeMode: "full-access",
-            interactionMode: "default",
-            branch: null,
-            worktreePath: null,
-          });
-          const key = { host: "github.com", repository: "pingdotgg/t3code", number: 15 };
-          yield* orchestrator.dispatch({
-            type: "thread.pull-request.watch",
-            commandId: CommandId.make("pr-watch-host-event-start"),
-            threadId,
-            ...key,
-            watching: true,
-            link: { url: "https://github.com/pingdotgg/t3code/pull/15", source: "agent" },
-          });
+      Effect.gen(function* () {
+        const orchestrator = yield* Orchestrator.OrchestratorV2;
+        const threadId = ThreadId.make("runtime-pull-request-watch-host-event");
+        const projectId = ProjectId.make("pr-watch-host-event-project");
+        yield* seedProject({
+          projectId,
+          title: "Watch host events",
+          workspaceRoot: "/workspace/watch-host-event",
+          defaultModelSelection: null,
+          createdAt: "2026-10-01T00:00:00.000Z",
+        });
+        yield* orchestrator.dispatch({
+          type: "thread.create",
+          createdBy: "user",
+          creationSource: "web",
+          commandId: CommandId.make("pr-watch-host-event-create"),
+          threadId,
+          projectId,
+          title: "Watch host events",
+          modelSelection,
+          runtimeMode: "full-access",
+          interactionMode: "default",
+          branch: null,
+          worktreePath: null,
+        });
+        const key = { host: "github.com", repository: "pingdotgg/t3code", number: 15 };
+        yield* orchestrator.dispatch({
+          type: "thread.pull-request.watch",
+          commandId: CommandId.make("pr-watch-host-event-start"),
+          threadId,
+          ...key,
+          watching: true,
+          link: { url: "https://github.com/pingdotgg/t3code/pull/15", source: "agent" },
+        });
 
-          let checks: PullRequestDetail["checks"] = [
-            { name: "lint", status: "pending", description: null, url: null, required: true },
-          ];
-          let fingerprints = 0;
-          const events = yield* Queue.unbounded<void>();
-          const following = yield* Deferred.make<void>();
-          const detailReads = yield* Queue.unbounded<void>();
-          const host = Layer.mergeAll(
-            NodeServices.layer,
-            NodeCrypto.layer,
-            Layer.mock(PullRequestService.PullRequestService)({
-              detail: () =>
-                Queue.offer(detailReads, undefined).pipe(
-                  Effect.as({
-                    ...watchedPullRequestDetail({
-                      projectId,
-                      number: 15,
-                      at: "2026-10-02T12:00:00.000Z",
-                    }),
-                    headSha: "aaaaaaaaaa",
-                    checks,
+        let checks: PullRequestDetail["checks"] = [
+          { name: "lint", status: "pending", description: null, url: null, required: true },
+        ];
+        let fingerprints = 0;
+        const events = yield* Queue.unbounded<void>();
+        const following = yield* Deferred.make<void>();
+        const detailReads = yield* Queue.unbounded<void>();
+        const host = Layer.mergeAll(
+          NodeServices.layer,
+          NodeCrypto.layer,
+          Layer.mock(PullRequestService.PullRequestService)({
+            detail: () =>
+              Queue.offer(detailReads, undefined).pipe(
+                Effect.as({
+                  ...watchedPullRequestDetail({
+                    projectId,
+                    number: 15,
+                    at: "2026-10-02T12:00:00.000Z",
                   }),
-                ),
-              activity: () =>
-                Effect.succeed({
-                  comments: [],
-                  commentCount: 0,
-                  commentsTruncated: false,
-                  reviewThreads: [],
-                  commits: [],
+                  headSha: "aaaaaaaaaa",
+                  checks,
                 }),
-              // A fresh fingerprint every time, so every pass reads the detail.
-              watchFingerprint: () =>
-                Effect.sync(() => ({ status: String(++fingerprints), remarks: "" })),
-              invalidate: () => Effect.void,
-              changes: () =>
-                Stream.fromEffectDrain(Deferred.succeed(following, undefined)).pipe(
-                  Stream.concat(Stream.fromQueue(events)),
-                ),
-            }),
-          );
-          const wakes = Effect.map(
-            orchestrator.getThreadRecords(threadId, ["messages"]),
-            ({ messages }) =>
-              messages.filter(
-                (message) => message.notification !== undefined && message.notification !== null,
               ),
-          );
-          const reactor = yield* PullRequestWatchReactor.make.pipe(Effect.provide(host));
-          const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
-          yield* reactor.start();
-          // The feed starts after the first sweep has read the pull request.
-          yield* Deferred.await(following);
-          yield* Queue.take(detailReads);
-
-          checks = [
-            { name: "lint", status: "failure", description: null, url: null, required: true },
-          ];
-          yield* Queue.offer(events, undefined);
-          // The clock never moves, so no sweep can be the one that reads the failure.
-          yield* Queue.take(detailReads);
-          // Nothing new: this read must compare against the watch the last one recorded.
-          yield* Queue.offer(events, undefined);
-          yield* Queue.take(detailReads);
-          // A sweep waits for the change read in flight.
-          yield* reactor.sweep;
-          yield* worker.drain();
-          const woken = yield* wakes;
-          assert.lengthOf(woken, 1);
-          assert.include(woken[0]!.notification?.summary ?? "", "failed");
+            activity: () =>
+              Effect.succeed({
+                comments: [],
+                commentCount: 0,
+                commentsTruncated: false,
+                reviewThreads: [],
+                commits: [],
+              }),
+            // A fresh fingerprint every time, so every pass reads the detail.
+            watchFingerprint: () =>
+              Effect.sync(() => ({ status: String(++fingerprints), remarks: "" })),
+            invalidate: () => Effect.void,
+            changes: () =>
+              Stream.fromEffectDrain(Deferred.succeed(following, undefined)).pipe(
+                Stream.concat(Stream.fromQueue(events)),
+              ),
+          }),
+        );
+        const wakes = Effect.map(
+          orchestrator.getThreadRecords(threadId, ["messages"]),
+          ({ messages }) =>
+            messages.filter(
+              (message) => message.notification !== undefined && message.notification !== null,
+            ),
+        );
+        const reactor = yield* PullRequestWatchReactor.make.pipe(Effect.provide(host));
+        const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
+        yield* reactor.start();
+        // The feed starts after the first sweep has read the pull request.
+        yield* Deferred.await(following);
+        yield* Queue.take(detailReads);
 
-          yield* orchestrator.dispatch({
-            type: "thread.pull-request.watch",
-            commandId: CommandId.make("pr-watch-host-event-end"),
-            threadId,
-            ...key,
-            watching: false,
-          });
-        }),
-      ),
+        checks = [
+          { name: "lint", status: "failure", description: null, url: null, required: true },
+        ];
+        yield* Queue.offer(events, undefined);
+        // The clock never moves, so no sweep can be the one that reads the failure.
+        yield* Queue.take(detailReads);
+        // Nothing new: this read must compare against the watch the last one recorded.
+        yield* Queue.offer(events, undefined);
+        yield* Queue.take(detailReads);
+        // A sweep waits for the change read in flight.
+        yield* reactor.sweep;
+        yield* worker.drain();
+        const woken = yield* wakes;
+        assert.lengthOf(woken, 1);
+        assert.include(woken[0]!.notification?.summary ?? "", "failed");
+
+        yield* orchestrator.dispatch({
+          type: "thread.pull-request.watch",
+          commandId: CommandId.make("pr-watch-host-event-end"),
+          threadId,
+          ...key,
+          watching: false,
+        });
+      }),
   );
 
   it.effect("wakes for checks that complete after the no-checks notice on the same head", () =>
@@ -4992,6 +5184,104 @@ it.layer(layerTest)("OrchestrationV2LayerLive lifecycle", (it) => {
     }),
   );
 
+  it.effect("persists each merge queue removal wake across reactor restarts", () =>
+    Effect.gen(function* () {
+      const orchestrator = yield* Orchestrator.OrchestratorV2;
+      const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
+      const threadId = ThreadId.make("queue-removal-watch");
+      const projectId = ProjectId.make("queue-removal-project");
+      yield* seedProject({
+        projectId,
+        title: "Queue removal",
+        workspaceRoot: "/workspace/watch",
+        defaultModelSelection: null,
+        createdAt: "2026-10-01T00:00:00.000Z",
+      });
+      yield* orchestrator.dispatch({
+        type: "thread.create",
+        createdBy: "user",
+        creationSource: "web",
+        commandId: CommandId.make("queue-removal-create"),
+        threadId,
+        projectId,
+        title: "Queue removal",
+        modelSelection,
+        runtimeMode: "full-access",
+        interactionMode: "default",
+        branch: null,
+        worktreePath: null,
+      });
+      yield* orchestrator.dispatch({
+        type: "thread.pull-request.watch",
+        commandId: CommandId.make("queue-removal-start"),
+        threadId,
+        host: "github.com",
+        repository: "pingdotgg/t3code",
+        number: 7,
+        watching: true,
+        link: { url: "https://github.com/pingdotgg/t3code/pull/7", source: "agent" },
+      });
+      let removal: PullRequestDetail["mergeQueueRemoval"];
+      const host = Layer.mergeAll(
+        NodeServices.layer,
+        NodeCrypto.layer,
+        Layer.mock(PullRequestService.PullRequestService)({
+          watchFingerprint: () =>
+            Effect.succeed({ status: removal?.id ?? "green", remarks: "none" }),
+          invalidate: () => Effect.void,
+          detail: () =>
+            Effect.succeed({
+              ...watchedPullRequestDetail({ projectId, number: 7, at: "2026-10-02T12:00:00.000Z" }),
+              checks: [{ name: "lint", status: "success", description: null, url: null }],
+              ...(removal === undefined ? {} : { mergeQueueRemoval: removal }),
+            }),
+          activity: () =>
+            Effect.succeed({
+              comments: [],
+              commentCount: 0,
+              commentsTruncated: false,
+              reviewThreads: [],
+              commits: [],
+            }),
+        }),
+      );
+      const reactor = yield* PullRequestWatchReactor.make.pipe(Effect.provide(host));
+      yield* reactor.sweep;
+      yield* worker.drain();
+      removal = {
+        id: "first",
+        removedAt: "2000-01-01T00:00:00Z",
+        reason: "Required checks failed",
+      };
+      yield* reactor.sweep;
+      yield* worker.drain();
+      const persisted = (yield* orchestrator.getThreadShell(threadId))?.pullRequests?.[0]?.watch;
+      assert.equal(persisted?.mergeQueueRemovalId, "first");
+      const restarted = yield* PullRequestWatchReactor.make.pipe(Effect.provide(host));
+      yield* restarted.sweep;
+      yield* worker.drain();
+      removal = { ...removal, id: "second" };
+      yield* restarted.sweep;
+      yield* worker.drain();
+      yield* restarted.sweep;
+      yield* worker.drain();
+      const { messages } = yield* orchestrator.getThreadRecords(threadId, ["messages"]);
+      const removals = messages.filter(
+        (message) => message.notification?.summary === "#7: removed from merge queue",
+      );
+      assert.lengthOf(removals, 2);
+      for (const message of removals) {
+        assert.equal(message.notification?.outcome, "failed");
+        assert.include(message.text, "Required checks failed");
+      }
+      assert.equal(
+        (yield* orchestrator.getThreadShell(threadId))?.pullRequests?.[0]?.watch
+          ?.mergeQueueRemovalId,
+        "second",
+      );
+    }),
+  );
+
   it.effect.each([
     "single page",
     "paginated",
@@ -5150,10 +5440,7 @@ it.layer(layerTest)("OrchestrationV2LayerLive lifecycle", (it) => {
         assert.deepEqual(held?.remarkIds, initialWatch?.remarkIds);
         assert.deepEqual(held?.failedChecks, ["lint"]);
         const { messages } = yield* orchestrator.getThreadRecords(threadId, ["messages"]);
-        assert.deepEqual(
-          messages.map((message) => message.notification?.summary),
-          ["#7: checks failed"],
-        );
+        assert.deepEqual(messages, []);
         yield* TestClock.adjust("1 millis");
         recovering = true;
       }
@@ -5167,9 +5454,7 @@ it.layer(layerTest)("OrchestrationV2LayerLive lifecycle", (it) => {
         messages.flatMap((message) =>
           message.notification === undefined ? [] : [message.notification.summary],
         ),
-        incomplete
-          ? ["#7: checks failed", "#7: new comments"]
-          : ["#7: checks failed, new comments"],
+        ["#7: new comments"],
       );
       if (mode !== "single page") {
         const wake = messages.at(-1);
@@ -5182,7 +5467,7 @@ it.layer(layerTest)("OrchestrationV2LayerLive lifecycle", (it) => {
       assert.deepEqual(watch?.remarkIds, [remark.id]);
       assert.deepEqual(
         { headSha: watch?.headSha, failedChecks: watch?.failedChecks, wakes: watch?.wakes },
-        { headSha: "abc1234def", failedChecks: ["lint"], wakes: incomplete ? 1 : 0 },
+        { headSha: "abc1234def", failedChecks: ["lint"], wakes: 1 },
       );
     }),
   );
@@ -5577,12 +5862,10 @@ it.layer(layerTest)("OrchestrationV2LayerLive lifecycle", (it) => {
         });
       }
       const at = "2026-10-02T12:00:00.000Z";
-      const texts = (number: number) =>
+      const readHead = (number: number) =>
         orchestrator
-          .getThreadRecords(ThreadId.make(`runtime-pull-request-watch-pipeline-${number}`), [
-            "messages",
-          ])
-          .pipe(Effect.map(({ messages }) => messages.map((message) => message.text).join("\n")));
+          .getThreadShell(ThreadId.make(`runtime-pull-request-watch-pipeline-${number}`))
+          .pipe(Effect.map((thread) => thread?.pullRequests?.[0]?.watch?.headSha));
       // #21's host answers only after #22 has been read, so waiting on every fingerprint first
       // never finishes.
       const read22 = yield* Deferred.make<void>();
@@ -5610,8 +5893,8 @@ it.layer(layerTest)("OrchestrationV2LayerLive lifecycle", (it) => {
       );
       const reactor = yield* PullRequestWatchReactor.make.pipe(Effect.provide(host));
       yield* reactor.sweep;
-      assert.include(yield* texts(21), "#21");
-      assert.include(yield* texts(22), "#22");
+      assert.equal(yield* readHead(21), "abc1234def");
+      assert.equal(yield* readHead(22), "abc1234def");
     }),
   );
 
@@ -6262,6 +6545,127 @@ it.layer(layerTest)("OrchestrationV2LayerLive lifecycle", (it) => {
     }),
   );
 
+  it.effect("rejects archiving an idle parent until its delegated child completes", () =>
+    Effect.gen(function* () {
+      const orchestrator = yield* Orchestrator.OrchestratorV2;
+      const sink = yield* EventSink.EventSinkV2;
+      const threadId = ThreadId.make("archive-delegated-parent");
+      const projectId = ProjectId.make("archive-delegated-project");
+      yield* seedProject({
+        projectId,
+        title: "Delegated archive",
+        workspaceRoot: "/workspace/archive-delegated",
+        defaultModelSelection: null,
+        createdAt: "2026-09-07T00:00:00.000Z",
+      });
+      yield* orchestrator.dispatch({
+        type: "thread.create",
+        createdBy: "user",
+        creationSource: "web",
+        commandId: CommandId.make("archive-delegated-create"),
+        threadId,
+        projectId,
+        title: "Delegated archive",
+        modelSelection,
+        runtimeMode: "full-access",
+        interactionMode: "default",
+        branch: null,
+        worktreePath: null,
+      });
+      yield* orchestrator.dispatch({
+        type: "message.dispatch",
+        createdBy: "user",
+        creationSource: "web",
+        commandId: CommandId.make("archive-delegated-message"),
+        threadId,
+        messageId: MessageId.make("archive-delegated-message"),
+        text: "Delegate the work, then finish your turn.",
+        attachments: [],
+        modelSelection,
+        dispatchMode: { type: "start_immediately" },
+      });
+      const parentRun = (yield* orchestrator.getThreadProjection(threadId)).runs[0]!;
+      yield* orchestrator.dispatch({
+        type: "delegated_task.request",
+        createdBy: "agent",
+        creationSource: "mcp",
+        commandId: CommandId.make("archive-delegated-request"),
+        parentThreadId: threadId,
+        parentRunId: parentRun.id,
+        parentNodeId: parentRun.rootNodeId!,
+        task: "Keep working after the parent finishes.",
+        modelSelection,
+        runtimeMode: "full-access",
+        interactionMode: "default",
+        completionWake: "always",
+      });
+      const delegatedParentRun = (yield* orchestrator.getThreadProjection(threadId)).runs[0]!;
+      const now = yield* DateTime.now;
+      yield* sink.write({
+        events: [
+          {
+            id: EventId.make("archive-delegated-parent-completed"),
+            type: "run.updated",
+            threadId,
+            runId: parentRun.id,
+            occurredAt: now,
+            payload: { ...delegatedParentRun, status: "completed", completedAt: now },
+          },
+        ],
+      });
+      const parent = yield* orchestrator.getThreadProjection(threadId);
+      const task = parent.subagents[0]!;
+      assert.equal(parent.runs[0]?.status, "completed");
+      assert.equal(task.origin, "app_owned");
+      assert.equal(task.status, "running");
+      assert.isNotNull(task.childThreadId);
+
+      // Archive must preserve the idle parent's path for receiving this child's result.
+      const error = yield* orchestrator
+        .dispatch({
+          type: "thread.archive",
+          commandId: CommandId.make("archive-delegated-blocked"),
+          threadId,
+        })
+        .pipe(Effect.flip);
+      assert.instanceOf(error, Orchestrator.OrchestratorDispatchError);
+      assert.equal(
+        error.cause,
+        `Thread ${threadId} has running delegated tasks. Wait for them or cancel them before archiving.`,
+      );
+      assert.isNull((yield* orchestrator.getThreadProjection(threadId)).thread.archivedAt);
+
+      const childThreadId = task.childThreadId!;
+      const childRun = (yield* orchestrator.getThreadProjection(childThreadId)).runs[0]!;
+      yield* sink.write({
+        events: [
+          {
+            id: EventId.make("archive-delegated-child-run-completed"),
+            type: "run.updated",
+            threadId: childThreadId,
+            runId: childRun.id,
+            occurredAt: now,
+            payload: { ...childRun, status: "completed", completedAt: now },
+          },
+          {
+            id: EventId.make("archive-delegated-child-completed"),
+            type: "subagent.updated",
+            threadId,
+            nodeId: task.id,
+            occurredAt: now,
+            payload: { ...task, status: "completed", result: "Done", completedAt: now },
+          },
+        ],
+      });
+      yield* orchestrator.dispatch({
+        type: "thread.archive",
+        commandId: CommandId.make("archive-delegated-allowed"),
+        threadId,
+      });
+      assert.isNotNull((yield* orchestrator.getThreadProjection(threadId)).thread.archivedAt);
+    }),
+  );
+
   it.effect("cancels preparing work on archive and keeps it cancelled through replay", () =>
     Effect.gen(function* () {
       const orchestrator = yield* Orchestrator.OrchestratorV2;
@@ -7963,6 +8367,49 @@ it.layer(layerTest)("OrchestrationV2LayerLive lifecycle", (it) => {
     }),
   );
 
+  it.effect.each(["", "pause", "resume", "clear", "edit"])(
+    "refuses unsupported Antigravity goal controls: %s",
+    (control) =>
+      Effect.gen(function* () {
+        const orchestrator = yield* Orchestrator.OrchestratorV2;
+        const threadId = ThreadId.make(`antigravity-goal-control-${control}`);
+        yield* orchestrator.dispatch({
+          type: "thread.create",
+          commandId: CommandId.make(`${threadId}:create`),
+          threadId,
+          projectId: ProjectId.make(`${threadId}:project`),
+          createdBy: "user",
+          creationSource: "web",
+          title: "Native goal",
+          modelSelection: { ...modelSelection, instanceId: antigravityInstanceId },
+          runtimeMode: "full-access",
+          interactionMode: "default",
+          branch: null,
+          worktreePath: process.cwd(),
+        });
+        const sequence = yield* orchestrator.getThreadEventSequence(threadId);
+        const refused = yield* Effect.flip(
+          orchestrator.dispatch({
+            type: "message.dispatch",
+            commandId: CommandId.make(`${threadId}:goal`),
+            threadId,
+            messageId: MessageId.make(`${threadId}:goal`),
+            text: `/goal ${control}`,
+            attachments: [],
+            dispatchMode: { type: "start_immediately" },
+            createdBy: "user",
+            creationSource: "web",
+          }),
+        );
+        assert.instanceOf(refused, Orchestrator.OrchestratorDispatchError);
+        assert.equal(
+          refused.cause,
+          "Antigravity accepts /goal followed by an objective. Interrupt the running turn, then ask Antigravity to stop the current goal.",
+        );
+        assert.equal(yield* orchestrator.getThreadEventSequence(threadId), sequence);
+      }),
+  );
+
   it.effect("checks a queued goal pause against the model picked ahead of it", () =>
     Effect.gen(function* () {
       const orchestrator = yield* Orchestrator.OrchestratorV2;
@@ -9455,6 +9902,19 @@ it.layer(layerSharedApplicationDataPlaneTest)("visited projection", (it) => {
       assert.isNotNull(visited.thread.lastVisitedAt);
       assert.equal(DateTime.formatIso(visited.thread.lastVisitedAt!), visitedAt);
       assert.deepEqual(visited.thread.updatedAt, createdUpdatedAt);
+      const sql = yield* SqlClient.SqlClient;
+      const visitPayloadKeys = (commandId: string) =>
+        sql<{ readonly payload_json: string }>`
+          SELECT payload_json FROM orchestration_events WHERE command_id = ${commandId}
+        `.pipe(
+          Effect.map((rows) =>
+            rows.map((row) => Object.keys(JSON.parse(row.payload_json)).toSorted()),
+          ),
+        );
+      // A visit stores read state, not a copy of the thread.
+      for (const keys of yield* visitPayloadKeys("runtime-layer-visited-thread-visit")) {
+        assert.includeMembers(["lastVisitedAt", "opens", "threadId"], keys);
+      }
 
       yield* orchestrator.dispatch({
         type: "thread.visit",
@@ -9464,6 +9924,8 @@ it.layer(layerSharedApplicationDataPlaneTest)("visited projection", (it) => {
       });
       const afterStaleVisit = yield* orchestrator.getThreadProjection(threadId);
       assert.equal(DateTime.formatIso(afterStaleVisit.thread.lastVisitedAt!), visitedAt);
+      // A stale visit with no open changes nothing, so it stores nothing.
+      assert.deepEqual(yield* visitPayloadKeys("runtime-layer-visited-thread-visit-stale"), []);
 
       const shell = yield* orchestrator.getShellSnapshot();
       const thread = shell.threads.find((candidate) => candidate.id === threadId);
@@ -9480,7 +9942,6 @@ it.layer(layerSharedApplicationDataPlaneTest)("visited projection", (it) => {
         .pipe(Effect.flip);
       assert.instanceOf(markUnread, Orchestrator.OrchestratorDispatchError);
 
-      const sql = yield* SqlClient.SqlClient;
       yield* sql`INSERT INTO orchestration_v2_projection_turn_items (
         turn_item_id, thread_id, ordinal, type, status, updated_at, payload_json
       ) VALUES (
diff --git a/apps/server/src/orchestration-v2/runtimeLayer.ts b/apps/server/src/orchestration-v2/runtimeLayer.ts
index d83f0603d7f7..0cfa599ed548 100644
--- a/apps/server/src/orchestration-v2/runtimeLayer.ts
+++ b/apps/server/src/orchestration-v2/runtimeLayer.ts
@@ -182,7 +182,9 @@ const layerProviderTurnStartServiceProvided = ProviderTurnStartService.layer.pip
 );
 
 const layerProviderTurnControlServiceProvided = ProviderTurnControlService.layer.pipe(
-  Layer.provide(Layer.merge(ProjectionStore.layer, layerProviderSessionManagerProvided)),
+  Layer.provide(
+    Layer.mergeAll(layerEventSink, ProjectionStore.layer, layerProviderSessionManagerProvided),
+  ),
 );
 const layerRuntimeRequestServiceProvided = RuntimeRequestService.layer.pipe(
   Layer.provide(Layer.merge(ProjectionStore.layer, layerProviderSessionManagerProvided)),
diff --git a/apps/server/src/orchestration-v2/testkit/OpenCode2PendingSnapshots.evidence.test.ts b/apps/server/src/orchestration-v2/testkit/OpenCode2PendingSnapshots.evidence.test.ts
index c22913a23f5a..9c0f6602b53c 100644
--- a/apps/server/src/orchestration-v2/testkit/OpenCode2PendingSnapshots.evidence.test.ts
+++ b/apps/server/src/orchestration-v2/testkit/OpenCode2PendingSnapshots.evidence.test.ts
@@ -151,9 +151,6 @@ const runRow = (row: Row) =>
 
 describe("OpenCode 2 pending-work snapshots (#19228 evidence)", () => {
   it.effect.each(ROWS.map((row) => [`${row.id} ${row.fixture}`, row] as const))("%s", ([, row]) =>
-    runRow(row).pipe(
-      Effect.map((failures) => assert.deepEqual(failures, [])),
-      Effect.scoped,
-    ),
+    runRow(row).pipe(Effect.map((failures) => assert.deepEqual(failures, []))),
   );
 });
diff --git a/apps/server/src/orchestration-v2/testkit/OrchestratorReplayRecovery.integration.test.ts b/apps/server/src/orchestration-v2/testkit/OrchestratorReplayRecovery.integration.test.ts
index 233139235a70..e1ef5e5dc3fe 100644
--- a/apps/server/src/orchestration-v2/testkit/OrchestratorReplayRecovery.integration.test.ts
+++ b/apps/server/src/orchestration-v2/testkit/OrchestratorReplayRecovery.integration.test.ts
@@ -275,351 +275,341 @@ describe("orchestrator replay recovery", () => {
   it.effect(
     "resumes a provider-native Codex thread after recreating the orchestrator runtime",
     () =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          // Use a throwaway checkpoint workspace; cold full-repo capture exceeds CI wait budgets.
-          const workspace = yield* checkpointWorkspace("provider_thread_resume");
-          const transcript = yield* readCodexTranscript(workspace);
-          const fs = yield* FileSystem.FileSystem;
-          const path = yield* Path.Path;
-          const tempDir = yield* Effect.acquireRelease(
-            fs.makeTempDirectory({
-              prefix: "t3-orchestration-v2-recovery-",
-            }),
-            (directory) =>
-              fs.remove(directory, { recursive: true, force: true }).pipe(Effect.orDie),
-          );
-          yield* fs.makeDirectory(tempDir, { recursive: true });
-          const dbPath = path.join(tempDir, "state.sqlite");
-          const driver = yield* CodexReplay.makeReplayDriver(transcript);
-          const materialized = yield* materializeFixtureInput({
-            scenario: "provider_thread_resume",
-            fixtureInput: {
-              steps: [
-                { type: "message", text: PROVIDER_THREAD_RESUME_FIRST_PROMPT },
-                { type: "message", text: PROVIDER_THREAD_RESUME_SECOND_PROMPT },
-              ],
-            },
-            driver: ProviderDriverKind.make("codex"),
-            modelSelection: CODEX_MODEL_SELECTION,
-          });
-          const { phase1Commands, phase1Steps, phase2Commands, phase2Steps } =
-            splitAfterFirstIdle(materialized);
-
-          const harness = {
-            ...CodexOrchestratorReplayHarness,
-            makeProviderAdapterRegistryLayer: () =>
-              CodexAdapterV2Testkit.layer({ transcript, driver }),
-          };
-          const options = {
-            databaseLayer: SqlitePersistence.layerFromPath(dbPath).pipe(
-              Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
-            ),
-          };
-
-          yield* runOrchestratorV2ProviderReplayScenario(
-            {
-              name: "provider_thread_resume/codex:first-runtime",
-              transcript,
-              commands: phase1Commands,
-              steps: phase1Steps,
-              projectionThreadIds: materialized.projectionThreadIds,
-              runtimePolicyOverride: { cwd: workspace },
-            },
-            harness,
-            options,
-          );
-
-          const result = yield* runOrchestratorV2ProviderReplayScenario(
-            {
-              name: "provider_thread_resume/codex:second-runtime",
-              transcript,
-              commands: phase2Commands,
-              steps: phase2Steps,
-              projectionThreadIds: materialized.projectionThreadIds,
-              runtimePolicyOverride: { cwd: workspace },
-            },
-            harness,
-            { ...options, recoverOnStartup: true },
-          );
-
-          assertBaseProjection({
-            result,
-            transcript,
-            runCount: 2,
-            runStatuses: ["completed", "completed"],
-          });
-          const projection = projectionFor(result, transcript.scenario);
-          assertSemanticProjectionIntegrity(projection);
-          assertRunOrdinals(projection, [1, 2]);
-          assertConversationMessageRoles(projection, ["user", "assistant", "user", "assistant"]);
-          assertTurnItemTypes(projection, ["user_message", "assistant_message"]);
-          assertUserMessagesInclude(projection, [
-            PROVIDER_THREAD_RESUME_FIRST_PROMPT,
-            PROVIDER_THREAD_RESUME_SECOND_PROMPT,
-          ]);
-          assertAssistantTextIncludes(projection, FIRST_FINAL);
-          assertAssistantTextIncludes(projection, SECOND_FINAL);
-          assert.lengthOf(projection.providerThreads, 1);
-        }).pipe(
-          provideDeterministicTestRuntime,
-          Effect.provide(
-            Layer.merge(IdAllocator.layer, Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
-          ),
-        ),
-      ),
-  );
-
-  it.effect(
-    "resumes a provider-native Cursor thread after recreating the orchestrator runtime",
-    () =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const transcript = yield* readCursorTranscript();
-          const runner = makeCursorAgentSdkReplayRunner(transcript);
-          yield* runCursorRecovery({ transcript, runner });
-          yield* runner.assertComplete;
-        }).pipe(
-          provideDeterministicTestRuntime,
-          Effect.provide(
-            Layer.merge(IdAllocator.layer, Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
-          ),
-        ),
-      ),
-  );
-  it.effect("keeps a Claude subagent resumed after a server restart in its own thread", () =>
-    Effect.scoped(
       Effect.gen(function* () {
-        const transcript = yield* readClaudeSubagentResumeTranscript();
-        const [launchPrompt, resumePrompt] = yield* decodePromptPair(transcript.metadata?.prompts);
-        const workspace = yield* checkpointWorkspace(transcript.scenario);
+        // Use a throwaway checkpoint workspace; cold full-repo capture exceeds CI wait budgets.
+        const workspace = yield* checkpointWorkspace("provider_thread_resume");
+        const transcript = yield* readCodexTranscript(workspace);
         const fs = yield* FileSystem.FileSystem;
         const path = yield* Path.Path;
         const tempDir = yield* Effect.acquireRelease(
-          fs.makeTempDirectory({ prefix: "t3-orchestration-v2-claude-recovery-" }),
+          fs.makeTempDirectory({
+            prefix: "t3-orchestration-v2-recovery-",
+          }),
           (directory) => fs.remove(directory, { recursive: true, force: true }).pipe(Effect.orDie),
         );
+        yield* fs.makeDirectory(tempDir, { recursive: true });
+        const dbPath = path.join(tempDir, "state.sqlite");
+        const driver = yield* CodexReplay.makeReplayDriver(transcript);
         const materialized = yield* materializeFixtureInput({
-          scenario: transcript.scenario,
+          scenario: "provider_thread_resume",
           fixtureInput: {
             steps: [
-              { type: "message", text: launchPrompt },
-              { type: "message", text: resumePrompt },
+              { type: "message", text: PROVIDER_THREAD_RESUME_FIRST_PROMPT },
+              { type: "message", text: PROVIDER_THREAD_RESUME_SECOND_PROMPT },
             ],
           },
-          driver: ProviderDriverKind.make("claudeAgent"),
-          modelSelection: CLAUDE_MODEL_SELECTION,
+          driver: ProviderDriverKind.make("codex"),
+          modelSelection: CODEX_MODEL_SELECTION,
         });
         const { phase1Commands, phase1Steps, phase2Commands, phase2Steps } =
           splitAfterFirstIdle(materialized);
-        const { harness, assertComplete } = makeClaudeRestartReplayHarness(transcript);
+
+        const harness = {
+          ...CodexOrchestratorReplayHarness,
+          makeProviderAdapterRegistryLayer: () =>
+            CodexAdapterV2Testkit.layer({ transcript, driver }),
+        };
         const options = {
-          databaseLayer: SqlitePersistence.layerFromPath(path.join(tempDir, "state.sqlite")).pipe(
+          databaseLayer: SqlitePersistence.layerFromPath(dbPath).pipe(
             Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
           ),
         };
 
-        yield* Effect.scoped(
-          runOrchestratorV2ProviderReplayScenario(
-            {
-              name: `${transcript.scenario}:first-runtime`,
-              transcript,
-              commands: phase1Commands,
-              steps: phase1Steps,
-              projectionThreadIds: materialized.projectionThreadIds,
-              runtimePolicyOverride: { cwd: workspace },
-            },
-            harness,
-            options,
-          ),
+        yield* runOrchestratorV2ProviderReplayScenario(
+          {
+            name: "provider_thread_resume/codex:first-runtime",
+            transcript,
+            commands: phase1Commands,
+            steps: phase1Steps,
+            projectionThreadIds: materialized.projectionThreadIds,
+            runtimePolicyOverride: { cwd: workspace },
+          },
+          harness,
+          options,
         );
-        const result = yield* Effect.scoped(
-          runOrchestratorV2ProviderReplayScenario(
-            {
-              name: `${transcript.scenario}:second-runtime`,
-              transcript,
-              commands: phase2Commands,
-              steps: phase2Steps,
-              projectionThreadIds: materialized.projectionThreadIds,
-              runtimePolicyOverride: { cwd: workspace },
-            },
-            harness,
-            { ...options, recoverOnStartup: true },
-          ),
+
+        const result = yield* runOrchestratorV2ProviderReplayScenario(
+          {
+            name: "provider_thread_resume/codex:second-runtime",
+            transcript,
+            commands: phase2Commands,
+            steps: phase2Steps,
+            projectionThreadIds: materialized.projectionThreadIds,
+            runtimePolicyOverride: { cwd: workspace },
+          },
+          harness,
+          { ...options, recoverOnStartup: true },
         );
-        yield* assertComplete;
 
+        assertBaseProjection({
+          result,
+          transcript,
+          runCount: 2,
+          runStatuses: ["completed", "completed"],
+        });
         const projection = projectionFor(result, transcript.scenario);
         assertSemanticProjectionIntegrity(projection);
-        assert.lengthOf(projection.subagents, 1);
-        const subagent = projection.subagents[0];
-        assert.equal(subagent?.status, "completed");
-        const childThreads = [...result.projections.values()].filter(
-          (candidate) => candidate.thread.lineage.parentThreadId === projection.thread.id,
-        );
-        assert.lengthOf(childThreads, 1);
-        const child = childThreads[0];
-        assert.equal(child?.thread.id, subagent?.childThreadId);
-        assert.deepEqual(child?.thread.modelSelection, {
-          instanceId: CLAUDE_MODEL_SELECTION.instanceId,
-          model: "claude-sonnet-5",
-        });
+        assertRunOrdinals(projection, [1, 2]);
+        assertConversationMessageRoles(projection, ["user", "assistant", "user", "assistant"]);
+        assertTurnItemTypes(projection, ["user_message", "assistant_message"]);
+        assertUserMessagesInclude(projection, [
+          PROVIDER_THREAD_RESUME_FIRST_PROMPT,
+          PROVIDER_THREAD_RESUME_SECOND_PROMPT,
+        ]);
+        assertAssistantTextIncludes(projection, FIRST_FINAL);
+        assertAssistantTextIncludes(projection, SECOND_FINAL);
+        assert.lengthOf(projection.providerThreads, 1);
+      }).pipe(
+        provideDeterministicTestRuntime,
+        Effect.provide(
+          Layer.merge(IdAllocator.layer, Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
+        ),
+      ),
+  );
 
-        const conversation = (child?.turnItems ?? [])
-          .toSorted((left, right) => left.ordinal - right.ordinal)
-          .flatMap((item) =>
-            item.type === "user_message" || item.type === "assistant_message"
-              ? [`${item.type === "user_message" ? "user" : "assistant"}:${item.text}`]
-              : [],
-          );
-        const launchTask = conversation[0];
-        assert.deepEqual(
-          conversation.map((entry) => entry.slice(0, entry.indexOf(":"))),
-          ["user", "assistant", "user", "assistant"],
-        );
-        assert.include(launchTask, "Your job is just the file");
-        assert.include(conversation[1], "is 1 line long");
-        assert.include(conversation[2], "Look again at");
-        assert.include(conversation[3], "Bug/edge case found and fixed");
-        const childCommands = (child?.turnItems ?? []).filter(
-          (item) => item.type === "command_execution",
-        );
-        assert.lengthOf(childCommands, 3);
-        assert.isFalse(
-          projection.turnItems.some(
-            (item) =>
-              item.type === "assistant_message" && item.text.includes("Bug/edge case found"),
-          ),
-          "the resumed subagent's reply leaked into the parent thread",
-        );
+  it.effect(
+    "resumes a provider-native Cursor thread after recreating the orchestrator runtime",
+    () =>
+      Effect.gen(function* () {
+        const transcript = yield* readCursorTranscript();
+        const runner = makeCursorAgentSdkReplayRunner(transcript);
+        yield* runCursorRecovery({ transcript, runner });
+        yield* runner.assertComplete;
       }).pipe(
         provideDeterministicTestRuntime,
         Effect.provide(
           Layer.merge(IdAllocator.layer, Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
         ),
       ),
+  );
+  it.effect("keeps a Claude subagent resumed after a server restart in its own thread", () =>
+    Effect.gen(function* () {
+      const transcript = yield* readClaudeSubagentResumeTranscript();
+      const [launchPrompt, resumePrompt] = yield* decodePromptPair(transcript.metadata?.prompts);
+      const workspace = yield* checkpointWorkspace(transcript.scenario);
+      const fs = yield* FileSystem.FileSystem;
+      const path = yield* Path.Path;
+      const tempDir = yield* Effect.acquireRelease(
+        fs.makeTempDirectory({ prefix: "t3-orchestration-v2-claude-recovery-" }),
+        (directory) => fs.remove(directory, { recursive: true, force: true }).pipe(Effect.orDie),
+      );
+      const materialized = yield* materializeFixtureInput({
+        scenario: transcript.scenario,
+        fixtureInput: {
+          steps: [
+            { type: "message", text: launchPrompt },
+            { type: "message", text: resumePrompt },
+          ],
+        },
+        driver: ProviderDriverKind.make("claudeAgent"),
+        modelSelection: CLAUDE_MODEL_SELECTION,
+      });
+      const { phase1Commands, phase1Steps, phase2Commands, phase2Steps } =
+        splitAfterFirstIdle(materialized);
+      const { harness, assertComplete } = makeClaudeRestartReplayHarness(transcript);
+      const options = {
+        databaseLayer: SqlitePersistence.layerFromPath(path.join(tempDir, "state.sqlite")).pipe(
+          Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
+        ),
+      };
+
+      yield* Effect.scoped(
+        runOrchestratorV2ProviderReplayScenario(
+          {
+            name: `${transcript.scenario}:first-runtime`,
+            transcript,
+            commands: phase1Commands,
+            steps: phase1Steps,
+            projectionThreadIds: materialized.projectionThreadIds,
+            runtimePolicyOverride: { cwd: workspace },
+          },
+          harness,
+          options,
+        ),
+      );
+      const result = yield* Effect.scoped(
+        runOrchestratorV2ProviderReplayScenario(
+          {
+            name: `${transcript.scenario}:second-runtime`,
+            transcript,
+            commands: phase2Commands,
+            steps: phase2Steps,
+            projectionThreadIds: materialized.projectionThreadIds,
+            runtimePolicyOverride: { cwd: workspace },
+          },
+          harness,
+          { ...options, recoverOnStartup: true },
+        ),
+      );
+      yield* assertComplete;
+
+      const projection = projectionFor(result, transcript.scenario);
+      assertSemanticProjectionIntegrity(projection);
+      assert.lengthOf(projection.subagents, 1);
+      const subagent = projection.subagents[0];
+      assert.equal(subagent?.status, "completed");
+      const childThreads = [...result.projections.values()].filter(
+        (candidate) => candidate.thread.lineage.parentThreadId === projection.thread.id,
+      );
+      assert.lengthOf(childThreads, 1);
+      const child = childThreads[0];
+      assert.equal(child?.thread.id, subagent?.childThreadId);
+      assert.deepEqual(child?.thread.modelSelection, {
+        instanceId: CLAUDE_MODEL_SELECTION.instanceId,
+        model: "claude-sonnet-5",
+      });
+
+      const conversation = (child?.turnItems ?? [])
+        .toSorted((left, right) => left.ordinal - right.ordinal)
+        .flatMap((item) =>
+          item.type === "user_message" || item.type === "assistant_message"
+            ? [`${item.type === "user_message" ? "user" : "assistant"}:${item.text}`]
+            : [],
+        );
+      const launchTask = conversation[0];
+      assert.deepEqual(
+        conversation.map((entry) => entry.slice(0, entry.indexOf(":"))),
+        ["user", "assistant", "user", "assistant"],
+      );
+      assert.include(launchTask, "Your job is just the file");
+      assert.include(conversation[1], "is 1 line long");
+      assert.include(conversation[2], "Look again at");
+      assert.include(conversation[3], "Bug/edge case found and fixed");
+      const childCommands = (child?.turnItems ?? []).filter(
+        (item) => item.type === "command_execution",
+      );
+      assert.lengthOf(childCommands, 3);
+      assert.isFalse(
+        projection.turnItems.some(
+          (item) => item.type === "assistant_message" && item.text.includes("Bug/edge case found"),
+        ),
+        "the resumed subagent's reply leaked into the parent thread",
+      );
+    }).pipe(
+      provideDeterministicTestRuntime,
+      Effect.provide(
+        Layer.merge(IdAllocator.layer, Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
+      ),
     ),
   );
   it.effect("reopens the thread of a Claude subagent the restart cancelled when resumed", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const transcript = yield* readClaudeCancelledSubagentResumeTranscript();
-        const [launchPrompt, resumePrompt] = yield* decodePromptPair(transcript.metadata?.prompts);
-        const workspace = yield* checkpointWorkspace(transcript.scenario);
-        const fs = yield* FileSystem.FileSystem;
-        const path = yield* Path.Path;
-        const tempDir = yield* Effect.acquireRelease(
-          fs.makeTempDirectory({ prefix: "t3-orchestration-v2-claude-recovery-" }),
-          (directory) => fs.remove(directory, { recursive: true, force: true }).pipe(Effect.orDie),
+    Effect.gen(function* () {
+      const transcript = yield* readClaudeCancelledSubagentResumeTranscript();
+      const [launchPrompt, resumePrompt] = yield* decodePromptPair(transcript.metadata?.prompts);
+      const workspace = yield* checkpointWorkspace(transcript.scenario);
+      const fs = yield* FileSystem.FileSystem;
+      const path = yield* Path.Path;
+      const tempDir = yield* Effect.acquireRelease(
+        fs.makeTempDirectory({ prefix: "t3-orchestration-v2-claude-recovery-" }),
+        (directory) => fs.remove(directory, { recursive: true, force: true }).pipe(Effect.orDie),
+      );
+      const materialized = yield* materializeFixtureInput({
+        scenario: transcript.scenario,
+        fixtureInput: {
+          steps: [
+            { type: "message", text: launchPrompt },
+            { type: "message", text: resumePrompt },
+          ],
+        },
+        driver: ProviderDriverKind.make("claudeAgent"),
+        modelSelection: CLAUDE_MODEL_SELECTION,
+      });
+      const { phase1Commands, phase1Steps, phase2Commands, phase2Steps } =
+        splitAfterFirstIdle(materialized);
+      const { harness, assertComplete } = makeClaudeRestartReplayHarness(transcript);
+      const options = {
+        databaseLayer: SqlitePersistence.layerFromPath(path.join(tempDir, "state.sqlite")).pipe(
+          Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
+        ),
+      };
+      const childThreadOf = (result: OrchestratorV2ScenarioResult, parentThreadId: ThreadId) =>
+        [...result.projections.values()].find(
+          (candidate) => candidate.thread.lineage.parentThreadId === parentThreadId,
         );
-        const materialized = yield* materializeFixtureInput({
-          scenario: transcript.scenario,
-          fixtureInput: {
-            steps: [
-              { type: "message", text: launchPrompt },
-              { type: "message", text: resumePrompt },
-            ],
-          },
-          driver: ProviderDriverKind.make("claudeAgent"),
-          modelSelection: CLAUDE_MODEL_SELECTION,
-        });
-        const { phase1Commands, phase1Steps, phase2Commands, phase2Steps } =
-          splitAfterFirstIdle(materialized);
-        const { harness, assertComplete } = makeClaudeRestartReplayHarness(transcript);
-        const options = {
-          databaseLayer: SqlitePersistence.layerFromPath(path.join(tempDir, "state.sqlite")).pipe(
-            Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
-          ),
-        };
-        const childThreadOf = (result: OrchestratorV2ScenarioResult, parentThreadId: ThreadId) =>
-          [...result.projections.values()].find(
-            (candidate) => candidate.thread.lineage.parentThreadId === parentThreadId,
-          );
-        const childRootStatus = (child: OrchestrationV2ThreadProjection | undefined) =>
-          child?.nodes.find((node) => node.kind === "root_turn" && node.runId === null)?.status;
+      const childRootStatus = (child: OrchestrationV2ThreadProjection | undefined) =>
+        child?.nodes.find((node) => node.kind === "root_turn" && node.runId === null)?.status;
 
-        const snapshotPath = path.join(tempDir, "restart-state.sqlite");
-        const beforeScenario = {
-          name: `${transcript.scenario}:cancelled-first-runtime`,
-          transcript,
-          commands: phase1Commands,
-          steps: phase1Steps,
-          projectionThreadIds: materialized.projectionThreadIds,
-          runtimePolicyOverride: { cwd: workspace },
-        };
-        const before = yield* Effect.scoped(
-          Effect.gen(function* () {
-            const result = yield* runOrchestratorV2Scenario(beforeScenario);
-            const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
-            yield* worker.drain();
-            // Preserve the orphan before scoped teardown settles its provider work.
-            const sql = yield* SqlClient.SqlClient;
-            yield* sql`VACUUM INTO ${snapshotPath}`;
-            return result;
-          }).pipe(
-            Effect.provide(
-              Layer.merge(
-                layerProviderReplay(beforeScenario, harness, options),
-                options.databaseLayer,
-              ),
+      const snapshotPath = path.join(tempDir, "restart-state.sqlite");
+      const beforeScenario = {
+        name: `${transcript.scenario}:cancelled-first-runtime`,
+        transcript,
+        commands: phase1Commands,
+        steps: phase1Steps,
+        projectionThreadIds: materialized.projectionThreadIds,
+        runtimePolicyOverride: { cwd: workspace },
+      };
+      const before = yield* Effect.scoped(
+        Effect.gen(function* () {
+          const result = yield* runOrchestratorV2Scenario(beforeScenario);
+          const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
+          yield* worker.drain();
+          // Preserve the orphan before scoped teardown settles its provider work.
+          const sql = yield* SqlClient.SqlClient;
+          yield* sql`VACUUM INTO ${snapshotPath}`;
+          return result;
+        }).pipe(
+          Effect.provide(
+            Layer.merge(
+              layerProviderReplay(beforeScenario, harness, options),
+              options.databaseLayer,
             ),
           ),
-        );
-        const settled = projectionFor(before, transcript.scenario);
-        assert.equal(settled.subagents[0]?.status, "running");
-        assert.equal(childRootStatus(childThreadOf(before, settled.thread.id)), "running");
+        ),
+      );
+      const settled = projectionFor(before, transcript.scenario);
+      assert.equal(settled.subagents[0]?.status, "running");
+      assert.equal(childRootStatus(childThreadOf(before, settled.thread.id)), "running");
 
-        const result = yield* Effect.scoped(
-          runOrchestratorV2ProviderReplayScenario(
-            {
-              name: `${transcript.scenario}:cancelled-second-runtime`,
-              transcript,
-              commands: phase2Commands,
-              steps: phase2Steps,
-              projectionThreadIds: materialized.projectionThreadIds,
-              runtimePolicyOverride: { cwd: workspace },
-            },
-            harness,
-            {
-              databaseLayer: SqlitePersistence.layerFromPath(snapshotPath).pipe(
-                Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
-              ),
-              recoverOnStartup: true,
-              continueThreadsAfterServerUpdate: false,
-            },
-          ),
-        );
-        yield* assertComplete;
+      const result = yield* Effect.scoped(
+        runOrchestratorV2ProviderReplayScenario(
+          {
+            name: `${transcript.scenario}:cancelled-second-runtime`,
+            transcript,
+            commands: phase2Commands,
+            steps: phase2Steps,
+            projectionThreadIds: materialized.projectionThreadIds,
+            runtimePolicyOverride: { cwd: workspace },
+          },
+          harness,
+          {
+            databaseLayer: SqlitePersistence.layerFromPath(snapshotPath).pipe(
+              Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
+            ),
+            recoverOnStartup: true,
+            continueThreadsAfterServerUpdate: false,
+          },
+        ),
+      );
+      yield* assertComplete;
 
-        const projection = projectionFor(result, transcript.scenario);
-        assertSemanticProjectionIntegrity(projection);
-        assert.equal(projection.subagents[0]?.status, "completed");
-        const child = childThreadOf(result, projection.thread.id);
-        assert.equal(child?.thread.id, projection.subagents[0]?.childThreadId);
-        assert.equal(childRootStatus(child), "completed");
-        const conversation = (child?.turnItems ?? [])
-          .toSorted((left, right) => left.ordinal - right.ordinal)
-          .flatMap((item) =>
-            item.type === "user_message" || item.type === "assistant_message"
-              ? [`${item.type === "user_message" ? "user" : "assistant"}:${item.text}`]
-              : [],
-          );
-        assert.deepEqual(
-          conversation.map((entry) => entry.slice(0, entry.indexOf(":"))),
-          ["user", "user", "assistant"],
-        );
-        assert.include(conversation[0], "Your job is just the file");
-        assert.include(conversation[1], "Look again at");
-        assert.include(conversation[2], "Bug/edge case found and fixed");
-        assert.lengthOf(
-          (child?.turnItems ?? []).filter((item) => item.type === "command_execution"),
-          2,
+      const projection = projectionFor(result, transcript.scenario);
+      assertSemanticProjectionIntegrity(projection);
+      assert.equal(projection.subagents[0]?.status, "completed");
+      const child = childThreadOf(result, projection.thread.id);
+      assert.equal(child?.thread.id, projection.subagents[0]?.childThreadId);
+      assert.equal(childRootStatus(child), "completed");
+      const conversation = (child?.turnItems ?? [])
+        .toSorted((left, right) => left.ordinal - right.ordinal)
+        .flatMap((item) =>
+          item.type === "user_message" || item.type === "assistant_message"
+            ? [`${item.type === "user_message" ? "user" : "assistant"}:${item.text}`]
+            : [],
         );
-      }).pipe(
-        provideDeterministicTestRuntime,
-        Effect.provide(
-          Layer.merge(IdAllocator.layer, Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
-        ),
+      assert.deepEqual(
+        conversation.map((entry) => entry.slice(0, entry.indexOf(":"))),
+        ["user", "user", "assistant"],
+      );
+      assert.include(conversation[0], "Your job is just the file");
+      assert.include(conversation[1], "Look again at");
+      assert.include(conversation[2], "Bug/edge case found and fixed");
+      assert.lengthOf(
+        (child?.turnItems ?? []).filter((item) => item.type === "command_execution"),
+        2,
+      );
+    }).pipe(
+      provideDeterministicTestRuntime,
+      Effect.provide(
+        Layer.merge(IdAllocator.layer, Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
       ),
     ),
   );
diff --git a/apps/server/src/orchestration-v2/testkit/OrchestratorReplayRestartBackgroundNote.integration.test.ts b/apps/server/src/orchestration-v2/testkit/OrchestratorReplayRestartBackgroundNote.integration.test.ts
index ff901ee36108..d8b2a0332eba 100644
--- a/apps/server/src/orchestration-v2/testkit/OrchestratorReplayRestartBackgroundNote.integration.test.ts
+++ b/apps/server/src/orchestration-v2/testkit/OrchestratorReplayRestartBackgroundNote.integration.test.ts
@@ -268,34 +268,30 @@ describe("restart-cancelled background work", () => {
   it.effect.each([false, true])(
     "keeps the thread settled and tells the next user turn once when continuation is %s",
     (continueThreadsAfterServerUpdate) =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const projection = yield* runRestart({
-            resumedPrompts: [
-              `${NOTE}\n\nUser message:\n${FIRST_AFTER_RESTART}`,
-              SECOND_AFTER_RESTART,
-            ],
-            userMessagesAfterRestart: [FIRST_AFTER_RESTART, SECOND_AFTER_RESTART],
-            continueThreadsAfterServerUpdate,
-          });
-          assert.deepEqual(
-            projection.runs.map((run) => run.status),
-            ["completed", "completed", "completed"],
-          );
-          assert.isFalse(
-            projection.runs.some((run) => run.restartContinuationOfRunId !== undefined),
-          );
-
-          assert.deepEqual(userTexts(projection), [
-            CLAUDE_BACKGROUND_SUBAGENT_AFTER_ROOT_PROMPT,
-            FIRST_AFTER_RESTART,
+      Effect.gen(function* () {
+        const projection = yield* runRestart({
+          resumedPrompts: [
+            `${NOTE}\n\nUser message:\n${FIRST_AFTER_RESTART}`,
             SECOND_AFTER_RESTART,
-          ]);
-        }).pipe(
-          provideDeterministicTestRuntime,
-          Effect.provide(
-            Layer.merge(IdAllocator.layer, Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
-          ),
+          ],
+          userMessagesAfterRestart: [FIRST_AFTER_RESTART, SECOND_AFTER_RESTART],
+          continueThreadsAfterServerUpdate,
+        });
+        assert.deepEqual(
+          projection.runs.map((run) => run.status),
+          ["completed", "completed", "completed"],
+        );
+        assert.isFalse(projection.runs.some((run) => run.restartContinuationOfRunId !== undefined));
+
+        assert.deepEqual(userTexts(projection), [
+          CLAUDE_BACKGROUND_SUBAGENT_AFTER_ROOT_PROMPT,
+          FIRST_AFTER_RESTART,
+          SECOND_AFTER_RESTART,
+        ]);
+      }).pipe(
+        provideDeterministicTestRuntime,
+        Effect.provide(
+          Layer.merge(IdAllocator.layer, Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
         ),
       ),
   );
diff --git a/apps/server/src/orchestration-v2/testkit/OrchestratorScenario.ts b/apps/server/src/orchestration-v2/testkit/OrchestratorScenario.ts
index b413c0aefa25..0d428e1a6e1e 100644
--- a/apps/server/src/orchestration-v2/testkit/OrchestratorScenario.ts
+++ b/apps/server/src/orchestration-v2/testkit/OrchestratorScenario.ts
@@ -14,6 +14,7 @@ import type {
   TurnItemId,
 } from "@t3tools/contracts";
 import * as Clock from "effect/Clock";
+import * as Deferred from "effect/Deferred";
 import * as Duration from "effect/Duration";
 import * as Effect from "effect/Effect";
 import * as Fiber from "effect/Fiber";
@@ -37,6 +38,8 @@ export type OrchestratorV2ScenarioStep =
   | {
       readonly type: "advance_clock";
       readonly duration: Duration.Input;
+      /** Wait until the jump idle-releases this thread's provider session. */
+      readonly awaitProviderSessionRelease?: ThreadId;
     }
   | {
       readonly type: "await";
@@ -271,9 +274,21 @@ export function runOrchestratorV2Scenario(
       const orchestrator = yield* Orchestrator.OrchestratorV2;
       const storedEventGroups: Array<ReadonlyArray<OrchestrationV2StoredEvent>> = [];
       const observedStoredEvents = yield* Ref.make<Array<OrchestrationV2StoredEvent>>([]);
+      let releaseWatch:
+        | { readonly threadId: ThreadId; readonly released: Deferred.Deferred<void> }
+        | undefined;
       yield* orchestrator.streamStoredEvents.pipe(
-        Stream.runForEach((event) =>
-          Ref.update(observedStoredEvents, (existing) => [...existing, event]),
+        Stream.runForEach((stored) =>
+          Ref.update(observedStoredEvents, (existing) => [...existing, stored]).pipe(
+            Effect.andThen(
+              releaseWatch !== undefined &&
+                stored.event.type === "provider-session.updated" &&
+                stored.event.threadId === releaseWatch.threadId &&
+                stored.event.payload.status === "stopped"
+                ? Deferred.succeed(releaseWatch.released, undefined)
+                : Effect.void,
+            ),
+          ),
         ),
         Effect.forkScoped,
       );
@@ -647,9 +662,28 @@ export function runOrchestratorV2Scenario(
             );
             break;
           }
-          case "advance_clock":
+          case "advance_clock": {
+            if (step.awaitProviderSessionRelease === undefined) {
+              yield* TestClock.adjust(step.duration);
+              break;
+            }
+            // The release runs on a woken fiber; a dispatch before it commits cancels it.
+            const released = yield* Deferred.make<void>();
+            releaseWatch = { threadId: step.awaitProviderSessionRelease, released };
             yield* TestClock.adjust(step.duration);
+            const settled = yield* Deferred.await(released).pipe(
+              Effect.timeoutOption(Duration.millis(SCENARIO_WAIT_DEADLINE_MS)),
+              Effect.provideService(Clock.Clock, Clock.Clock.defaultValue()),
+            );
+            releaseWatch = undefined;
+            if (Option.isNone(settled)) {
+              return yield* new OrchestratorV2ScenarioStepError({
+                scenario: scenario.name,
+                step: `advance_clock:${step.awaitProviderSessionRelease}:no_provider_session_release`,
+              });
+            }
             break;
+          }
           case "await":
             yield* awaitDispatch(step.key);
             break;
diff --git a/apps/server/src/orchestration-v2/testkit/ProviderReplayHarness.ts b/apps/server/src/orchestration-v2/testkit/ProviderReplayHarness.ts
index c742f83d3758..9f035b7e039b 100644
--- a/apps/server/src/orchestration-v2/testkit/ProviderReplayHarness.ts
+++ b/apps/server/src/orchestration-v2/testkit/ProviderReplayHarness.ts
@@ -295,7 +295,8 @@ export function layerWithRegistry<Error>(
   | EffectWorker.OrchestrationEffectWorkerV2
   | EventSink.EventSinkV2
   | ProviderSessionManager.ProviderSessionManagerV2
-  | CommandOutputRecorder.CommandOutputRecorder,
+  | CommandOutputRecorder.CommandOutputRecorder
+  | ThreadCommandExecutor.ThreadCommandExecutor,
   Error | MigrationError | PlatformError.PlatformError | SqlError
 > {
   const layerServerConfig = Layer.effect(
@@ -452,7 +453,9 @@ export function layerWithRegistry<Error>(
     ),
   );
   const layerProviderTurnControlServiceProvided = ProviderTurnControlService.layer.pipe(
-    Layer.provide(Layer.merge(layerStores, layerProviderSessionManagerProvided)),
+    Layer.provide(
+      Layer.mergeAll(layerEventSinkProvided, layerStores, layerProviderSessionManagerProvided),
+    ),
   );
   const layerRuntimeRequestServiceProvided = RuntimeRequestService.layer.pipe(
     Layer.provide(Layer.merge(layerStores, layerProviderSessionManagerProvided)),
@@ -563,6 +566,7 @@ export function layerWithRegistry<Error>(
     layerEventSinkProvided,
     layerContinuationWorkerProvided,
     layerCommandOutputHubProvided,
+    ThreadCommandExecutor.layer,
   ).pipe(
     Layer.provide(ProviderTurnStartServiceTestkit.layer),
     Layer.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
diff --git a/apps/server/src/orchestration-v2/testkit/ProviderSwitch.integration.test.ts b/apps/server/src/orchestration-v2/testkit/ProviderSwitch.integration.test.ts
index 4ca516284a3b..e4371b54ee4b 100644
--- a/apps/server/src/orchestration-v2/testkit/ProviderSwitch.integration.test.ts
+++ b/apps/server/src/orchestration-v2/testkit/ProviderSwitch.integration.test.ts
@@ -8,6 +8,7 @@ import {
   MessageId,
   type ModelSelection,
   type OrchestrationV2Command,
+  type OrchestrationV2DomainEvent,
   type OrchestrationV2ProviderCapabilities,
   type OrchestrationV2ProviderSession,
   type OrchestrationV2ProviderThread,
@@ -23,6 +24,7 @@ import {
   TurnItemId,
   ProviderDriverKind,
 } from "@t3tools/contracts";
+import { derivePendingBackgroundWork } from "@t3tools/shared/orchestrationV2PendingBackgroundWork";
 import * as DateTime from "effect/DateTime";
 import * as Deferred from "effect/Deferred";
 import * as Effect from "effect/Effect";
@@ -121,6 +123,12 @@ function makeTestAdapter(input: {
   readonly subagentOnlyBackgroundWork?: boolean;
   readonly holdFirstTurn?: Deferred.Deferred<void>;
   readonly releaseFirstTurn?: Deferred.Deferred<void>;
+  /** A tool call the held turn reports running before it holds. */
+  readonly heldRunningToolCall?: {
+    readonly id: TurnItemId;
+    readonly toolName: string;
+  };
+  readonly backgroundTasksEndWithProcess?: true;
   readonly backgroundWork?: Ref.Ref<boolean>;
   readonly closedSessions?: Ref.Ref<ReadonlyArray<string>>;
 }): ProviderAdapter.ProviderAdapterV2["Service"] {
@@ -158,6 +166,9 @@ function makeTestAdapter(input: {
           providerSessionId: sessionInput.providerSessionId,
           providerSession,
           events: Stream.fromPubSub(events),
+          ...(input.backgroundTasksEndWithProcess === undefined
+            ? {}
+            : { backgroundTasksEndWithProcess: input.backgroundTasksEndWithProcess }),
           ...(input.pendingBackgroundWork === undefined
             ? {}
             : {
@@ -281,18 +292,59 @@ function makeTestAdapter(input: {
                     : { nativeThreadHasTurns: turnInput.nativeThreadHasTurns }),
                 },
               ]);
+              const providerTurnId = ProviderTurnId.make(
+                `provider-turn:${input.driver}:${turnInput.threadId}:${turnInput.runOrdinal}`,
+              );
               if (
                 turnInput.runOrdinal === (input.holdRunOrdinal ?? 1) &&
                 input.holdFirstTurn !== undefined
               ) {
+                if (input.heldRunningToolCall !== undefined) {
+                  const startedAt = yield* DateTime.now;
+                  yield* PubSub.publish(events, {
+                    type: "provider_turn.updated",
+                    driver: input.driver,
+                    providerTurn: {
+                      id: providerTurnId,
+                      providerThreadId: turnInput.providerThread.id,
+                      nodeId: turnInput.rootNodeId,
+                      runAttemptId: turnInput.attemptId,
+                      nativeTurnRef: null,
+                      ordinal: turnInput.runOrdinal,
+                      status: "running",
+                      startedAt,
+                      completedAt: null,
+                    },
+                  });
+                  yield* PubSub.publish(events, {
+                    type: "turn_item.updated",
+                    driver: input.driver,
+                    turnItem: {
+                      id: input.heldRunningToolCall.id,
+                      threadId: turnInput.threadId,
+                      runId: turnInput.runId,
+                      nodeId: turnInput.rootNodeId,
+                      providerThreadId: turnInput.providerThread.id,
+                      providerTurnId,
+                      nativeItemRef: null,
+                      parentItemId: null,
+                      ordinal: turnInput.runOrdinal * 100 + 1,
+                      status: "running",
+                      title: null,
+                      startedAt,
+                      completedAt: null,
+                      updatedAt: startedAt,
+                      type: "dynamic_tool",
+                      toolName: input.heldRunningToolCall.toolName,
+                      input: {},
+                    },
+                  });
+                }
                 yield* Deferred.succeed(input.holdFirstTurn, undefined);
                 if (input.releaseFirstTurn === undefined) return;
                 yield* Deferred.await(input.releaseFirstTurn);
               }
               const eventTime = yield* DateTime.now;
-              const providerTurnId = ProviderTurnId.make(
-                `provider-turn:${input.driver}:${turnInput.threadId}:${turnInput.runOrdinal}`,
-              );
               const terminalStatus = input.failedRunOrdinals?.has(turnInput.runOrdinal)
                 ? "failed"
                 : input.interruptedRunOrdinals?.has(turnInput.runOrdinal)
@@ -463,38 +515,594 @@ describe("orchestration v2 provider switching", () => {
     "prior-images-legacy-replacement-native",
     "delivery-write-failure",
   ] as const)("preserves handoffs through %s", (scenario) =>
-    Effect.scoped(
+    Effect.gen(function* () {
+      const cwd = yield* checkpointWorkspace(`handoff-${scenario}`);
+      const capturedTurns = yield* Ref.make<ReadonlyArray<CapturedTurn>>([]);
+      const injectedHistory = yield* Ref.make<ReadonlyArray<unknown>>([]);
+      const reasoningScenario = scenario.includes("reasoning-change");
+      const turnUsageScenario = reasoningScenario || scenario.includes("turn-usage");
+      const modelScenario =
+        scenario.includes("model") || scenario.includes("option-change") || reasoningScenario;
+      const failStartOnce = yield* Ref.make(false);
+      const failResumeOnce = yield* Ref.make(false);
+      const generation = yield* Ref.make(0);
+      const pendingBackgroundWork = yield* Ref.make(false);
+      const priorImages = scenario.includes("prior-images");
+      const exhaustedTarget = scenario.includes("exhausted-target");
+      const replaceNative = scenario.includes("replacement");
+      const capacityScenario = modelScenario || scenario.includes("reported-capacity");
+      const returning =
+        scenario === "large-current-input" ||
+        scenario.includes("-change-") ||
+        priorImages ||
+        exhaustedTarget;
+      const targetSelection: ModelSelection = !modelScenario
+        ? CLAUDE_MODEL_SELECTION
+        : {
+            ...CLAUDE_MODEL_SELECTION,
+            ...(reasoningScenario
+              ? { options: [{ id: "reasoningEffort", value: "low" }] }
+              : scenario.includes("option-change")
+                ? { options: [{ id: "contextWindow", value: "1m" }] }
+                : { model: `${CLAUDE_MODEL_SELECTION.model}-large` }),
+          };
+      const layerRegistry = ProviderAdapterRegistry.layerFromAdapters([
+        makeTestAdapter({
+          instanceId: CODEX_MODEL_SELECTION.instanceId,
+          driver: CODEX_DRIVER,
+          capabilities: CodexProviderCapabilitiesV2,
+          modelSelection: CODEX_MODEL_SELECTION,
+          responseByRunOrdinal: { 1: "Original partial work" },
+          capturedTurns,
+        }),
+        makeTestAdapter({
+          instanceId: CLAUDE_MODEL_SELECTION.instanceId,
+          driver: CLAUDE_DRIVER,
+          capabilities: ClaudeProviderCapabilitiesV2,
+          modelSelection: CLAUDE_MODEL_SELECTION,
+          responseByRunOrdinal: scenario.includes("target-estimate")
+            ? { 2: "x".repeat(64_000) }
+            : {},
+          capturedTurns,
+          ...(scenario.includes("retry") || scenario.includes("unsent") ? { failStartOnce } : {}),
+          ...(replaceNative ? { failResumeOnce, nativeThreadGeneration: generation } : {}),
+          ...(exhaustedTarget ? { nativeThreadGeneration: generation } : {}),
+          ...(scenario.includes("target-background") || scenario.includes("target-subagent")
+            ? {
+                pendingBackgroundWork,
+                subagentOnlyBackgroundWork: scenario.includes("target-subagent"),
+              }
+            : {}),
+          ...(scenario.includes("reported-capacity")
+            ? { initialContextUsage: { usedTokens: 999_999, maxTokens: 1_000_000 } }
+            : {}),
+          ...(turnUsageScenario
+            ? {
+                canReuseContextUsage: canReuseCodexContextUsage,
+                tokenUsageByRunOrdinal: {
+                  2: {
+                    usedTokens: replaceNative ? 30_000 : 37_321,
+                    maxTokens: replaceNative
+                      ? scenario.includes("small")
+                        ? 32_000
+                        : 64_000
+                      : 258_400,
+                  },
+                },
+              }
+            : modelScenario
+              ? {
+                  getModelContextWindow: (selection: ModelSelection) =>
+                    selection.model.endsWith("-large") ||
+                    selection.options?.some(
+                      (option) => option.id === "contextWindow" && option.value === "1m",
+                    )
+                      ? 1_000_000
+                      : 32_000,
+                }
+              : scenario === "large-current-input" || priorImages || exhaustedTarget
+                ? {
+                    getModelContextWindow: () =>
+                      scenario.includes("target-tight") ? 25_121 : 32_000,
+                  }
+                : {}),
+          ...(scenario.endsWith("-native") || scenario === "large-current-input"
+            ? { injectedHistory }
+            : {}),
+        }),
+      ]);
+      yield* Effect.gen(function* () {
+        const orchestrator = yield* Orchestrator.OrchestratorV2;
+        const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
+        const eventSink = yield* EventSink.EventSinkV2;
+        const screenshot: ChatAttachment = {
+          type: "image",
+          id: "screenshot",
+          name: "screenshot.png",
+          mimeType: "image/png",
+          sizeBytes: 100_000,
+        };
+        const screenshots = Array.from(
+          {
+            length:
+              scenario.includes("eight") || capacityScenario
+                ? 8
+                : scenario.includes("pair")
+                  ? 2
+                  : 1,
+          },
+          (_, index) => ({ ...screenshot, id: `screenshot-${index}` }),
+        );
+        const targetOrdinal = returning ? 4 : 2;
+        const dispatch = (ordinal: number, text: string, selection: ModelSelection) =>
+          orchestrator.dispatch({
+            type: "message.dispatch",
+            commandId: CommandId.make(`regression:${ordinal}`),
+            threadId,
+            messageId: MessageId.make(`regression:${ordinal}`),
+            createdBy: "user",
+            creationSource: "web",
+            text,
+            attachments:
+              turnUsageScenario && ordinal === 2
+                ? Array.from({ length: 8 }, (_, index) => ({
+                    ...screenshot,
+                    id: `prior-${index}`,
+                  }))
+                : turnUsageScenario && ordinal >= targetOrdinal
+                  ? [screenshot, { ...screenshot, id: "current-2" }]
+                  : scenario.startsWith("screenshot") &&
+                      ordinal >= targetOrdinal &&
+                      (!exhaustedTarget || ordinal === targetOrdinal)
+                    ? screenshots
+                    : priorImages && ordinal === (scenario.startsWith("imported") ? 1 : 2)
+                      ? [screenshot]
+                      : [],
+            modelSelection: selection,
+            dispatchMode: { type: "start_immediately" },
+          });
+        const wait = (ordinal: number) =>
+          orchestrator.streamStoredEvents.pipe(
+            Stream.filter(
+              ({ event }) =>
+                event.type === "run.updated" &&
+                event.payload.ordinal === ordinal &&
+                (event.payload.status === "completed" || event.payload.status === "failed"),
+            ),
+            Stream.runHead,
+            Effect.andThen(worker.drain()),
+          );
+        yield* orchestrator.dispatch({
+          type: "thread.create",
+          commandId: CommandId.make("regression:create"),
+          threadId,
+          projectId,
+          createdBy: "user",
+          creationSource: "web",
+          title: "Handoff regression",
+          modelSelection: CODEX_MODEL_SELECTION,
+          runtimeMode: "full-access",
+          interactionMode: "default",
+          branch: null,
+          worktreePath: null,
+        });
+        yield* dispatch(1, "Original request with constraints", CODEX_MODEL_SELECTION);
+        yield* wait(1);
+        const write = eventSink.write;
+        const spy =
+          scenario === "delivery-write-failure"
+            ? vi.spyOn(eventSink, "write").mockImplementation((input) =>
+                input.events.some(
+                  (event) =>
+                    event.type === "context-handoff.updated" &&
+                    event.payload.delivery?.status === "inline",
+                )
+                  ? Effect.fail(
+                      new EventSink.EventSinkWriteError({
+                        eventCount: input.events.length,
+                        cause: "bookkeeping unavailable",
+                      }),
+                    )
+                  : write(input),
+              )
+            : undefined;
+        yield* Effect.addFinalizer(() => Effect.sync(() => spy?.mockRestore()));
+        const current = scenario.startsWith("compact")
+          ? "/compact"
+          : scenario.includes("target-oversized")
+            ? "x".repeat(40_000)
+            : capacityScenario && !turnUsageScenario
+              ? "x".repeat(70_000)
+              : scenario === "large-current-input"
+                ? "x".repeat(9_000)
+                : "Continue work";
+        if (returning) {
+          if (scenario.includes("unsent")) yield* Ref.set(failStartOnce, true);
+          yield* dispatch(
+            2,
+            turnUsageScenario
+              ? "x".repeat(27_460)
+              : scenario.includes("target-estimate")
+                ? "x".repeat(12_000)
+                : "Establish target",
+            CLAUDE_MODEL_SELECTION,
+          );
+          yield* wait(2);
+          if (exhaustedTarget) {
+            assert.equal(
+              (yield* orchestrator.getThreadProjection(threadId)).runs.at(-1)?.status,
+              "completed",
+            );
+          }
+          if (exhaustedTarget && !scenario.includes("target-estimate")) {
+            const target = (yield* orchestrator.getThreadProjection(threadId)).providerThreads.find(
+              (thread) => thread.providerInstanceId === CLAUDE_MODEL_SELECTION.instanceId,
+            )!;
+            yield* eventSink.write({
+              events: [
+                {
+                  id: EventId.make("exhausted-target-usage"),
+                  type: "provider-thread.updated",
+                  threadId,
+                  occurredAt: yield* DateTime.now,
+                  payload: { ...target, contextUsage: { usedTokens: 30_000, maxTokens: 32_000 } },
+                },
+              ],
+            });
+          }
+          if (modelScenario && !turnUsageScenario) {
+            const target = (yield* orchestrator.getThreadProjection(threadId)).providerThreads.find(
+              (thread) => thread.providerInstanceId === CLAUDE_MODEL_SELECTION.instanceId,
+            )!;
+            yield* eventSink.write({
+              events: [
+                {
+                  id: EventId.make("old-model-usage"),
+                  type: "provider-thread.updated",
+                  threadId,
+                  occurredAt: yield* DateTime.now,
+                  payload: {
+                    ...target,
+                    contextUsage: {
+                      usedTokens: 30_000,
+                      maxTokens: 32_000,
+                      autoCompactThreshold: 31_000,
+                    },
+                  },
+                },
+              ],
+            });
+          }
+          if (scenario.includes("legacy-replacement")) {
+            const existing = yield* orchestrator.getThreadProjection(threadId);
+            yield* eventSink.write({
+              events: existing.attempts.map(
+                ({ nativeThreadId: _nativeThreadId, ...legacy }, index) => ({
+                  id: EventId.make(`legacy-attempt:${index}`),
+                  type: "run-attempt.updated" as const,
+                  threadId,
+                  occurredAt: existing.thread.createdAt,
+                  payload: legacy,
+                }),
+              ),
+            });
+          }
+          if (scenario.includes("telemetry")) {
+            const target = (yield* orchestrator.getThreadProjection(threadId)).providerThreads.find(
+              (thread) => thread.providerInstanceId === CLAUDE_MODEL_SELECTION.instanceId,
+            )!;
+            yield* eventSink.write({
+              events: [
+                {
+                  id: EventId.make("compacted-context-usage"),
+                  type: "provider-thread.updated",
+                  threadId,
+                  occurredAt: yield* DateTime.now,
+                  payload: { ...target, contextUsage: { usedTokens: 100, maxTokens: 32_000 } },
+                },
+              ],
+            });
+          }
+          yield* dispatch(
+            3,
+            priorImages && !replaceNative
+              ? "New source constraint " + "q".repeat(9_000)
+              : "New source constraint",
+            CODEX_MODEL_SELECTION,
+          );
+          yield* wait(3);
+        }
+        if (replaceNative) {
+          // Switching back to Codex already released Claude's session.
+          yield* Ref.set(failResumeOnce, true);
+        }
+        if (scenario.includes("retry")) yield* Ref.set(failStartOnce, true);
+        if (scenario.includes("target-background") || scenario.includes("target-subagent"))
+          yield* Ref.set(pendingBackgroundWork, true);
+        yield* dispatch(targetOrdinal, current, targetSelection);
+        yield* wait(targetOrdinal);
+        if (scenario.includes("retry")) {
+          const failed = yield* orchestrator.getThreadProjection(threadId);
+          assert.equal(failed.runs.at(-1)?.status, "failed");
+          const failedUsage = failed.providerThreads.find(
+            (thread) => thread.providerInstanceId === CLAUDE_MODEL_SELECTION.instanceId,
+          )!.contextUsage;
+          if (reasoningScenario || scenario.includes("turn-usage")) {
+            assert.deepEqual(failedUsage, { usedTokens: 37_321, maxTokens: 258_400 });
+          } else {
+            assert.deepEqual(failedUsage, { usedTokens: 30_000, maxTokens: 1_000_000 });
+          }
+          if (reasoningScenario) {
+            const target = failed.providerThreads.find(
+              (thread) => thread.providerInstanceId === CLAUDE_MODEL_SELECTION.instanceId,
+            )!;
+            yield* orchestrator.dispatch({
+              type: "provider-session.detach",
+              commandId: CommandId.make("detach-before-reasoning-retry"),
+              threadId,
+              providerSessionId: target.providerSessionId!,
+            });
+            yield* worker.drain();
+          }
+          yield* dispatch(targetOrdinal + 1, current, targetSelection);
+          yield* wait(targetOrdinal + 1);
+        }
+        if (reasoningScenario && replaceNative) {
+          const replaced = yield* orchestrator.getThreadProjection(threadId);
+          assert.equal(
+            replaced.runs.at(-1)?.status,
+            scenario.includes("small") ? "failed" : "completed",
+          );
+          const target = replaced.providerThreads.find(
+            (thread) => thread.providerInstanceId === CLAUDE_MODEL_SELECTION.instanceId,
+          )!;
+          assert.isNull(target.contextUsage);
+          assert.equal(yield* Ref.get(generation), 2);
+          assert.equal(
+            (yield* Ref.get(capturedTurns)).at(-1)!.driver,
+            scenario.includes("small") ? CODEX_DRIVER : CLAUDE_DRIVER,
+          );
+          return;
+        }
+        if (replaceNative) {
+          if (scenario.includes("legacy-replacement")) {
+            const recovered = yield* orchestrator.getThreadProjection(threadId);
+            const handoff = recovered.contextHandoffs.at(-1)!;
+            const { history: _history, ...legacyHandoff } = handoff;
+            yield* eventSink.write({
+              events: [
+                {
+                  id: EventId.make("legacy-replacement-handoff"),
+                  type: "context-handoff.updated",
+                  threadId,
+                  occurredAt: yield* DateTime.now,
+                  payload: {
+                    ...legacyHandoff,
+                    delivery: {
+                      nativeThreadId: handoff.delivery!.nativeThreadId,
+                      status: handoff.delivery!.status,
+                      itemIds: [],
+                    },
+                  },
+                },
+              ],
+            });
+          }
+          yield* dispatch(
+            targetOrdinal + 1,
+            "Continue after native replacement",
+            CLAUDE_MODEL_SELECTION,
+          );
+          yield* wait(targetOrdinal + 1);
+          yield* dispatch(
+            targetOrdinal + 2,
+            "Another source constraint " + "q".repeat(9_000),
+            CODEX_MODEL_SELECTION,
+          );
+          yield* wait(targetOrdinal + 2);
+          yield* dispatch(targetOrdinal + 3, current, CLAUDE_MODEL_SELECTION);
+          yield* wait(targetOrdinal + 3);
+        }
+        const projection = yield* orchestrator.getThreadProjection(threadId);
+        if (
+          scenario.includes("target-oversized") ||
+          scenario.includes("target-tight") ||
+          scenario.includes("target-background") ||
+          scenario.includes("target-subagent")
+        ) {
+          assert.equal(projection.runs.at(-1)?.status, "failed");
+          assert.equal(yield* Ref.get(generation), 1);
+          assert.equal(projection.messages.at(-1)!.text, current);
+          assert.deepEqual(projection.messages.at(-1)!.attachments, screenshots);
+          if (scenario.includes("target-background") || scenario.includes("target-subagent")) {
+            assert.isTrue(yield* Ref.get(pendingBackgroundWork));
+            const failure = projection.turnItems.findLast((item) => item.type === "error");
+            assert.equal(
+              failure?.type === "error" ? failure.failure.message : null,
+              "The target provider still has background work running. Wait for it to finish or stop it before retrying the handoff.",
+            );
+          }
+          return;
+        }
+        assert.equal(projection.runs.at(-1)?.status, "completed");
+        if (exhaustedTarget) {
+          assert.equal(yield* Ref.get(generation), 2);
+          const turns = (yield* Ref.get(capturedTurns)).filter(
+            (turn) => turn.driver === CLAUDE_DRIVER,
+          );
+          assert.notEqual(turns[0]!.nativeThreadId, turns[1]!.nativeThreadId);
+          const latestRun = projection.runs.at(-1)!;
+          assert.equal(
+            projection.attempts.find((attempt) => attempt.id === latestRun.activeAttemptId)!
+              .nativeThreadId,
+            turns[1]!.nativeThreadId,
+          );
+          const context = scenario.endsWith("-native")
+            ? yield* encodeJson(yield* Ref.get(injectedHistory))
+            : turns[1]!.text;
+          assert.include(context, "Original request with constraints");
+          assert.include(context, "Original partial work");
+          assert.include(context, "New source constraint");
+          assert.include(turns[1]!.text, current);
+          assert.deepEqual(turns[1]!.attachments, screenshots);
+          const historyBeforeFollowup = yield* Ref.get(injectedHistory);
+          yield* dispatch(5, "Continue after automatic recovery", CLAUDE_MODEL_SELECTION);
+          yield* wait(5);
+          assert.equal(
+            (yield* orchestrator.getThreadProjection(threadId)).runs.at(-1)?.status,
+            "completed",
+          );
+          assert.equal(yield* Ref.get(generation), 2);
+          assert.equal(
+            (yield* Ref.get(capturedTurns)).at(-1)!.text,
+            "Continue after automatic recovery",
+          );
+          assert.deepEqual(yield* Ref.get(injectedHistory), historyBeforeFollowup);
+          if (scenario.includes("target-estimate")) {
+            yield* dispatch(6, "Another source turn", CODEX_MODEL_SELECTION);
+            yield* wait(6);
+            yield* dispatch(7, "Return after recovery", CLAUDE_MODEL_SELECTION);
+            yield* wait(7);
+            assert.equal(
+              (yield* orchestrator.getThreadProjection(threadId)).runs.at(-1)?.status,
+              "completed",
+            );
+            assert.equal(yield* Ref.get(generation), 2);
+          }
+          return;
+        }
+        if (priorImages) {
+          const handoff = projection.contextHandoffs.at(-1)!;
+          const context = scenario.endsWith("-native")
+            ? yield* encodeJson(yield* Ref.get(injectedHistory))
+            : (yield* Ref.get(capturedTurns)).at(-1)!.text;
+          const shouldFit =
+            turnUsageScenario ||
+            scenario.startsWith("imported") ||
+            scenario.includes("telemetry") ||
+            scenario.includes("unsent") ||
+            replaceNative;
+          const sourceText =
+            `${replaceNative ? "Another" : "New"} source constraint ` + "q".repeat(9_000);
+          const sourceItem = projection.turnItems.find(
+            (item) => item.type === "user_message" && item.text === sourceText,
+          )!;
+          assert.isDefined(sourceItem);
+          if (shouldFit) {
+            assert.include(context, sourceText);
+            assert.include(
+              projection.contextHandoffs
+                .filter(
+                  (record) =>
+                    record.targetRunId ===
+                    (scenario.includes("retry")
+                      ? projection.runs.find((run) => run.ordinal === targetOrdinal)!.id
+                      : projection.runs.at(-1)!.id),
+                )
+                .flatMap((record) => record.delivery?.itemIds ?? []),
+              sourceItem.id,
+            );
+          } else {
+            assert.notInclude(context, "q".repeat(9_000));
+            assert.isAbove(handoff.delivery!.omittedItemIds!.length, 0);
+          }
+          const latestRun = projection.runs.at(-1)!;
+          const latestAttempt = projection.attempts.find(
+            (attempt) => attempt.id === latestRun.activeAttemptId,
+          )!;
+          const target = projection.providerThreads.find(
+            (thread) => thread.id === latestAttempt.providerThreadId,
+          )!;
+          assert.equal(latestAttempt.nativeThreadId, target.nativeThreadRef!.nativeId);
+          if (turnUsageScenario) {
+            if (replaceNative) assert.isNull(target.contextUsage);
+            else assert.deepEqual(target.contextUsage, { usedTokens: 37_321, maxTokens: 258_400 });
+            assert.lengthOf((yield* Ref.get(capturedTurns)).at(-1)!.attachments, 2);
+          }
+          if (replaceNative) assert.equal(yield* Ref.get(generation), 2);
+          return;
+        }
+        const handoff = projection.contextHandoffs.at(-1)!;
+        if (scenario.startsWith("screenshot")) {
+          assert.deepEqual((yield* Ref.get(capturedTurns)).at(-1)!.attachments, screenshots);
+        }
+        if (scenario === "compact-legacy") {
+          const { history: _history, ...legacyHandoff } = handoff;
+          yield* eventSink.write({
+            events: [
+              {
+                id: EventId.make("legacy-handoff-shape"),
+                type: "context-handoff.updated",
+                threadId,
+                runId: handoff.targetRunId,
+                occurredAt: yield* DateTime.now,
+                payload: legacyHandoff,
+              },
+            ],
+          });
+          assert.isUndefined(handoff.delivery);
+          yield* dispatch(3, "Continue after compact", CLAUDE_MODEL_SELECTION);
+          yield* wait(3);
+          assert.include(
+            (yield* Ref.get(capturedTurns)).at(-1)!.text,
+            "Original request with constraints",
+          );
+          assert.equal(
+            (yield* orchestrator.getThreadProjection(threadId)).contextHandoffs.at(-1)?.delivery
+              ?.status,
+            "inline",
+          );
+        } else if (
+          scenario === "delivery-write-failure" ||
+          (scenario.startsWith("screenshot") && scenario.endsWith("fallback"))
+        ) {
+          assert.equal(
+            handoff.delivery?.status,
+            scenario.startsWith("screenshot") ? "inline" : "pending",
+          );
+          assert.include(
+            (yield* Ref.get(capturedTurns)).at(-1)!.text,
+            "Original request with constraints",
+          );
+        } else {
+          assert.equal(handoff.delivery?.status, "injected");
+          assert.equal((yield* Ref.get(capturedTurns)).at(-1)!.text, current);
+          assert.include(
+            yield* encodeJson(yield* Ref.get(injectedHistory)),
+            "Original request with constraints",
+          );
+        }
+      }).pipe(
+        Effect.provide(
+          ProviderReplayHarness.layerWithRegistry(
+            {
+              name: `handoff-${scenario}`,
+              runtimePolicyOverride: {
+                cwd,
+                approvalPolicy: "never",
+                sandboxPolicy: { type: "readOnly" },
+              },
+            },
+            layerRegistry,
+          ),
+        ),
+      );
+    }),
+  );
+  it.live.each([
+    "turn-start",
+    "injection",
+    "large-missed-request",
+    "exhausted-target-retry",
+  ] as const)(
+    "recovers %s failure without duplicating history in the same native thread",
+    (failure) =>
       Effect.gen(function* () {
-        const cwd = yield* checkpointWorkspace(`handoff-${scenario}`);
+        const cwd = yield* checkpointWorkspace(`handoff-retry-${failure}`);
         const capturedTurns = yield* Ref.make<ReadonlyArray<CapturedTurn>>([]);
         const injectedHistory = yield* Ref.make<ReadonlyArray<unknown>>([]);
-        const reasoningScenario = scenario.includes("reasoning-change");
-        const turnUsageScenario = reasoningScenario || scenario.includes("turn-usage");
-        const modelScenario =
-          scenario.includes("model") || scenario.includes("option-change") || reasoningScenario;
-        const failStartOnce = yield* Ref.make(false);
-        const failResumeOnce = yield* Ref.make(false);
+        const failOnce = yield* Ref.make(true);
         const generation = yield* Ref.make(0);
-        const pendingBackgroundWork = yield* Ref.make(false);
-        const priorImages = scenario.includes("prior-images");
-        const exhaustedTarget = scenario.includes("exhausted-target");
-        const replaceNative = scenario.includes("replacement");
-        const capacityScenario = modelScenario || scenario.includes("reported-capacity");
-        const returning =
-          scenario === "large-current-input" ||
-          scenario.includes("-change-") ||
-          priorImages ||
-          exhaustedTarget;
-        const targetSelection: ModelSelection = !modelScenario
-          ? CLAUDE_MODEL_SELECTION
-          : {
-              ...CLAUDE_MODEL_SELECTION,
-              ...(reasoningScenario
-                ? { options: [{ id: "reasoningEffort", value: "low" }] }
-                : scenario.includes("option-change")
-                  ? { options: [{ id: "contextWindow", value: "1m" }] }
-                  : { model: `${CLAUDE_MODEL_SELECTION.model}-large` }),
-            };
         const layerRegistry = ProviderAdapterRegistry.layerFromAdapters([
           makeTestAdapter({
             instanceId: CODEX_MODEL_SELECTION.instanceId,
@@ -509,108 +1117,33 @@ describe("orchestration v2 provider switching", () => {
             driver: CLAUDE_DRIVER,
             capabilities: ClaudeProviderCapabilitiesV2,
             modelSelection: CLAUDE_MODEL_SELECTION,
-            responseByRunOrdinal: scenario.includes("target-estimate")
-              ? { 2: "x".repeat(64_000) }
-              : {},
+            responseByRunOrdinal: {},
             capturedTurns,
-            ...(scenario.includes("retry") || scenario.includes("unsent") ? { failStartOnce } : {}),
-            ...(replaceNative ? { failResumeOnce, nativeThreadGeneration: generation } : {}),
-            ...(exhaustedTarget ? { nativeThreadGeneration: generation } : {}),
-            ...(scenario.includes("target-background") || scenario.includes("target-subagent")
-              ? {
-                  pendingBackgroundWork,
-                  subagentOnlyBackgroundWork: scenario.includes("target-subagent"),
-                }
-              : {}),
-            ...(scenario.includes("reported-capacity")
-              ? { initialContextUsage: { usedTokens: 999_999, maxTokens: 1_000_000 } }
-              : {}),
-            ...(turnUsageScenario
-              ? {
-                  canReuseContextUsage: canReuseCodexContextUsage,
-                  tokenUsageByRunOrdinal: {
-                    2: {
-                      usedTokens: replaceNative ? 30_000 : 37_321,
-                      maxTokens: replaceNative
-                        ? scenario.includes("small")
-                          ? 32_000
-                          : 64_000
-                        : 258_400,
-                    },
-                  },
-                }
-              : modelScenario
-                ? {
-                    getModelContextWindow: (selection: ModelSelection) =>
-                      selection.model.endsWith("-large") ||
-                      selection.options?.some(
-                        (option) => option.id === "contextWindow" && option.value === "1m",
-                      )
-                        ? 1_000_000
-                        : 32_000,
-                  }
-                : scenario === "large-current-input" || priorImages || exhaustedTarget
-                  ? {
-                      getModelContextWindow: () =>
-                        scenario.includes("target-tight") ? 25_121 : 32_000,
-                    }
-                  : {}),
-            ...(scenario.endsWith("-native") || scenario === "large-current-input"
-              ? { injectedHistory }
-              : {}),
+            injectedHistory,
+            nativeThreadGeneration: generation,
+            getModelContextWindow: () => 32_000,
+            ...(failure !== "injection"
+              ? { failStartOnce: failOnce }
+              : { failInjectionOnce: failOnce }),
           }),
         ]);
         yield* Effect.gen(function* () {
           const orchestrator = yield* Orchestrator.OrchestratorV2;
           const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
-          const eventSink = yield* EventSink.EventSinkV2;
-          const screenshot: ChatAttachment = {
-            type: "image",
-            id: "screenshot",
-            name: "screenshot.png",
-            mimeType: "image/png",
-            sizeBytes: 100_000,
-          };
-          const screenshots = Array.from(
-            {
-              length:
-                scenario.includes("eight") || capacityScenario
-                  ? 8
-                  : scenario.includes("pair")
-                    ? 2
-                    : 1,
-            },
-            (_, index) => ({ ...screenshot, id: `screenshot-${index}` }),
-          );
-          const targetOrdinal = returning ? 4 : 2;
           const dispatch = (ordinal: number, text: string, selection: ModelSelection) =>
             orchestrator.dispatch({
               type: "message.dispatch",
-              commandId: CommandId.make(`regression:${ordinal}`),
+              commandId: CommandId.make(`retry:${ordinal}`),
               threadId,
-              messageId: MessageId.make(`regression:${ordinal}`),
+              messageId: MessageId.make(`retry:${ordinal}`),
               createdBy: "user",
               creationSource: "web",
               text,
-              attachments:
-                turnUsageScenario && ordinal === 2
-                  ? Array.from({ length: 8 }, (_, index) => ({
-                      ...screenshot,
-                      id: `prior-${index}`,
-                    }))
-                  : turnUsageScenario && ordinal >= targetOrdinal
-                    ? [screenshot, { ...screenshot, id: "current-2" }]
-                    : scenario.startsWith("screenshot") &&
-                        ordinal >= targetOrdinal &&
-                        (!exhaustedTarget || ordinal === targetOrdinal)
-                      ? screenshots
-                      : priorImages && ordinal === (scenario.startsWith("imported") ? 1 : 2)
-                        ? [screenshot]
-                        : [],
+              attachments: [],
               modelSelection: selection,
               dispatchMode: { type: "start_immediately" },
             });
-          const wait = (ordinal: number) =>
+          const wait = (ordinal: number, status: "failed" | "completed") =>
             orchestrator.streamStoredEvents.pipe(
               Stream.filter(
                 ({ event }) =>
@@ -620,15 +1153,23 @@ describe("orchestration v2 provider switching", () => {
               ),
               Stream.runHead,
               Effect.andThen(worker.drain()),
+              Effect.andThen(
+                Effect.gen(function* () {
+                  assert.equal(
+                    (yield* orchestrator.getThreadProjection(threadId)).runs.at(-1)?.status,
+                    status,
+                  );
+                }),
+              ),
             );
           yield* orchestrator.dispatch({
             type: "thread.create",
-            commandId: CommandId.make("regression:create"),
+            commandId: CommandId.make("retry:create"),
             threadId,
             projectId,
             createdBy: "user",
             creationSource: "web",
-            title: "Handoff regression",
+            title: "Handoff retry",
             modelSelection: CODEX_MODEL_SELECTION,
             runtimeMode: "full-access",
             interactionMode: "default",
@@ -636,403 +1177,87 @@ describe("orchestration v2 provider switching", () => {
             worktreePath: null,
           });
           yield* dispatch(1, "Original request with constraints", CODEX_MODEL_SELECTION);
-          yield* wait(1);
-          const write = eventSink.write;
-          const spy =
-            scenario === "delivery-write-failure"
-              ? vi.spyOn(eventSink, "write").mockImplementation((input) =>
-                  input.events.some(
-                    (event) =>
-                      event.type === "context-handoff.updated" &&
-                      event.payload.delivery?.status === "inline",
-                  )
-                    ? Effect.fail(
-                        new EventSink.EventSinkWriteError({
-                          eventCount: input.events.length,
-                          cause: "bookkeeping unavailable",
-                        }),
-                      )
-                    : write(input),
-                )
-              : undefined;
-          yield* Effect.addFinalizer(() => Effect.sync(() => spy?.mockRestore()));
-          const current = scenario.startsWith("compact")
-            ? "/compact"
-            : scenario.includes("target-oversized")
-              ? "x".repeat(40_000)
-              : capacityScenario && !turnUsageScenario
-                ? "x".repeat(70_000)
-                : scenario === "large-current-input"
-                  ? "x".repeat(9_000)
-                  : "Continue work";
-          if (returning) {
-            if (scenario.includes("unsent")) yield* Ref.set(failStartOnce, true);
-            yield* dispatch(
-              2,
-              turnUsageScenario
-                ? "x".repeat(27_460)
-                : scenario.includes("target-estimate")
-                  ? "x".repeat(12_000)
-                  : "Establish target",
-              CLAUDE_MODEL_SELECTION,
+          yield* wait(1, "completed");
+          yield* dispatch(
+            2,
+            failure === "large-missed-request" ? "x".repeat(7_000) : "First target request",
+            CLAUDE_MODEL_SELECTION,
+          );
+          yield* wait(2, "failed");
+          const failed = yield* orchestrator.getThreadProjection(threadId);
+          const failedHandoff = failed.contextHandoffs.at(-1)!;
+          assert.equal(
+            failedHandoff.delivery?.status,
+            failure !== "injection" ? "injected" : "pending",
+          );
+          const historyBeforeRetry = (yield* Ref.get(injectedHistory)).length;
+          if (failure === "exhausted-target-retry") {
+            const target = failed.providerThreads.find(
+              (thread) => thread.providerInstanceId === CLAUDE_MODEL_SELECTION.instanceId,
+            )!;
+            yield* (yield* EventSink.EventSinkV2).write({
+              events: [
+                {
+                  id: EventId.make("exhausted-retry-usage"),
+                  type: "provider-thread.updated",
+                  threadId,
+                  occurredAt: yield* DateTime.now,
+                  payload: { ...target, contextUsage: { usedTokens: 30_000, maxTokens: 32_000 } },
+                },
+              ],
+            });
+          }
+          const retryText =
+            failure === "large-missed-request" ? "y".repeat(10_000) : "Retry target request";
+          yield* dispatch(3, retryText, CLAUDE_MODEL_SELECTION);
+          yield* wait(3, "completed");
+          const retried = yield* orchestrator.getThreadProjection(threadId);
+          const lastTurn = (yield* Ref.get(capturedTurns)).at(-1)!;
+          assert.equal(lastTurn.text, retryText);
+          if (failure !== "injection" && failure !== "exhausted-target-retry") {
+            const delta = yield* encodeJson(
+              (yield* Ref.get(injectedHistory)).slice(historyBeforeRetry),
             );
-            yield* wait(2);
-            if (exhaustedTarget) {
-              assert.equal(
-                (yield* orchestrator.getThreadProjection(threadId)).runs.at(-1)?.status,
-                "completed",
-              );
-            }
-            if (exhaustedTarget && !scenario.includes("target-estimate")) {
-              const target = (yield* orchestrator.getThreadProjection(
-                threadId,
-              )).providerThreads.find(
-                (thread) => thread.providerInstanceId === CLAUDE_MODEL_SELECTION.instanceId,
-              )!;
-              yield* eventSink.write({
-                events: [
-                  {
-                    id: EventId.make("exhausted-target-usage"),
-                    type: "provider-thread.updated",
-                    threadId,
-                    occurredAt: yield* DateTime.now,
-                    payload: { ...target, contextUsage: { usedTokens: 30_000, maxTokens: 32_000 } },
-                  },
-                ],
-              });
-            }
-            if (modelScenario && !turnUsageScenario) {
-              const target = (yield* orchestrator.getThreadProjection(
-                threadId,
-              )).providerThreads.find(
-                (thread) => thread.providerInstanceId === CLAUDE_MODEL_SELECTION.instanceId,
-              )!;
-              yield* eventSink.write({
-                events: [
-                  {
-                    id: EventId.make("old-model-usage"),
-                    type: "provider-thread.updated",
-                    threadId,
-                    occurredAt: yield* DateTime.now,
-                    payload: {
-                      ...target,
-                      contextUsage: {
-                        usedTokens: 30_000,
-                        maxTokens: 32_000,
-                        autoCompactThreshold: 31_000,
-                      },
-                    },
-                  },
-                ],
-              });
-            }
-            if (scenario.includes("legacy-replacement")) {
-              const existing = yield* orchestrator.getThreadProjection(threadId);
-              yield* eventSink.write({
-                events: existing.attempts.map(
-                  ({ nativeThreadId: _nativeThreadId, ...legacy }, index) => ({
-                    id: EventId.make(`legacy-attempt:${index}`),
-                    type: "run-attempt.updated" as const,
-                    threadId,
-                    occurredAt: existing.thread.createdAt,
-                    payload: legacy,
-                  }),
-                ),
-              });
-            }
-            if (scenario.includes("telemetry")) {
-              const target = (yield* orchestrator.getThreadProjection(
-                threadId,
-              )).providerThreads.find(
-                (thread) => thread.providerInstanceId === CLAUDE_MODEL_SELECTION.instanceId,
+            if (failure === "large-missed-request") {
+              assert.include(delta, "omitted 1 items");
+              const missedRequest = retried.turnItems.find(
+                (item) => item.type === "user_message" && item.text === "x".repeat(7_000),
               )!;
-              yield* eventSink.write({
-                events: [
-                  {
-                    id: EventId.make("compacted-context-usage"),
-                    type: "provider-thread.updated",
-                    threadId,
-                    occurredAt: yield* DateTime.now,
-                    payload: { ...target, contextUsage: { usedTokens: 100, maxTokens: 32_000 } },
-                  },
-                ],
-              });
-            }
-            yield* dispatch(
-              3,
-              priorImages && !replaceNative
-                ? "New source constraint " + "q".repeat(9_000)
-                : "New source constraint",
-              CODEX_MODEL_SELECTION,
-            );
-            yield* wait(3);
-          }
-          if (replaceNative) {
-            // Switching back to Codex already released Claude's session.
-            yield* Ref.set(failResumeOnce, true);
-          }
-          if (scenario.includes("retry")) yield* Ref.set(failStartOnce, true);
-          if (scenario.includes("target-background") || scenario.includes("target-subagent"))
-            yield* Ref.set(pendingBackgroundWork, true);
-          yield* dispatch(targetOrdinal, current, targetSelection);
-          yield* wait(targetOrdinal);
-          if (scenario.includes("retry")) {
-            const failed = yield* orchestrator.getThreadProjection(threadId);
-            assert.equal(failed.runs.at(-1)?.status, "failed");
-            const failedUsage = failed.providerThreads.find(
-              (thread) => thread.providerInstanceId === CLAUDE_MODEL_SELECTION.instanceId,
-            )!.contextUsage;
-            if (reasoningScenario || scenario.includes("turn-usage")) {
-              assert.deepEqual(failedUsage, { usedTokens: 37_321, maxTokens: 258_400 });
-            } else {
-              assert.deepEqual(failedUsage, { usedTokens: 30_000, maxTokens: 1_000_000 });
-            }
-            if (reasoningScenario) {
-              const target = failed.providerThreads.find(
-                (thread) => thread.providerInstanceId === CLAUDE_MODEL_SELECTION.instanceId,
-              )!;
-              yield* orchestrator.dispatch({
-                type: "provider-session.detach",
-                commandId: CommandId.make("detach-before-reasoning-retry"),
-                threadId,
-                providerSessionId: target.providerSessionId!,
-              });
-              yield* worker.drain();
-            }
-            yield* dispatch(targetOrdinal + 1, current, targetSelection);
-            yield* wait(targetOrdinal + 1);
-          }
-          if (reasoningScenario && replaceNative) {
-            const replaced = yield* orchestrator.getThreadProjection(threadId);
-            assert.equal(
-              replaced.runs.at(-1)?.status,
-              scenario.includes("small") ? "failed" : "completed",
-            );
-            const target = replaced.providerThreads.find(
-              (thread) => thread.providerInstanceId === CLAUDE_MODEL_SELECTION.instanceId,
-            )!;
-            assert.isNull(target.contextUsage);
-            assert.equal(yield* Ref.get(generation), 2);
-            assert.equal(
-              (yield* Ref.get(capturedTurns)).at(-1)!.driver,
-              scenario.includes("small") ? CODEX_DRIVER : CLAUDE_DRIVER,
-            );
-            return;
-          }
-          if (replaceNative) {
-            if (scenario.includes("legacy-replacement")) {
-              const recovered = yield* orchestrator.getThreadProjection(threadId);
-              const handoff = recovered.contextHandoffs.at(-1)!;
-              const { history: _history, ...legacyHandoff } = handoff;
-              yield* eventSink.write({
-                events: [
-                  {
-                    id: EventId.make("legacy-replacement-handoff"),
-                    type: "context-handoff.updated",
-                    threadId,
-                    occurredAt: yield* DateTime.now,
-                    payload: {
-                      ...legacyHandoff,
-                      delivery: {
-                        nativeThreadId: handoff.delivery!.nativeThreadId,
-                        status: handoff.delivery!.status,
-                        itemIds: [],
-                      },
-                    },
-                  },
-                ],
-              });
-            }
-            yield* dispatch(
-              targetOrdinal + 1,
-              "Continue after native replacement",
-              CLAUDE_MODEL_SELECTION,
-            );
-            yield* wait(targetOrdinal + 1);
-            yield* dispatch(
-              targetOrdinal + 2,
-              "Another source constraint " + "q".repeat(9_000),
-              CODEX_MODEL_SELECTION,
-            );
-            yield* wait(targetOrdinal + 2);
-            yield* dispatch(targetOrdinal + 3, current, CLAUDE_MODEL_SELECTION);
-            yield* wait(targetOrdinal + 3);
-          }
-          const projection = yield* orchestrator.getThreadProjection(threadId);
-          if (
-            scenario.includes("target-oversized") ||
-            scenario.includes("target-tight") ||
-            scenario.includes("target-background") ||
-            scenario.includes("target-subagent")
-          ) {
-            assert.equal(projection.runs.at(-1)?.status, "failed");
+              const delivery = retried.contextHandoffs.at(-1)!.delivery!;
+              assert.include(delivery.omittedItemIds ?? [], missedRequest.id);
+              assert.notInclude(delivery.itemIds, missedRequest.id);
+            } else assert.include(delta, "First target request");
+            assert.notInclude(delta, "Original request with constraints");
+            assert.notInclude(delta, "Original partial work");
             assert.equal(yield* Ref.get(generation), 1);
-            assert.equal(projection.messages.at(-1)!.text, current);
-            assert.deepEqual(projection.messages.at(-1)!.attachments, screenshots);
-            if (scenario.includes("target-background") || scenario.includes("target-subagent")) {
-              assert.isTrue(yield* Ref.get(pendingBackgroundWork));
-              const failure = projection.turnItems.findLast((item) => item.type === "error");
-              assert.equal(
-                failure?.type === "error" ? failure.failure.message : null,
-                "The target provider still has background work running. Wait for it to finish or stop it before retrying the handoff.",
-              );
-            }
-            return;
-          }
-          assert.equal(projection.runs.at(-1)?.status, "completed");
-          if (exhaustedTarget) {
-            assert.equal(yield* Ref.get(generation), 2);
-            const turns = (yield* Ref.get(capturedTurns)).filter(
-              (turn) => turn.driver === CLAUDE_DRIVER,
-            );
-            assert.notEqual(turns[0]!.nativeThreadId, turns[1]!.nativeThreadId);
-            const latestRun = projection.runs.at(-1)!;
-            assert.equal(
-              projection.attempts.find((attempt) => attempt.id === latestRun.activeAttemptId)!
-                .nativeThreadId,
-              turns[1]!.nativeThreadId,
-            );
-            const context = scenario.endsWith("-native")
-              ? yield* encodeJson(yield* Ref.get(injectedHistory))
-              : turns[1]!.text;
-            assert.include(context, "Original request with constraints");
-            assert.include(context, "Original partial work");
-            assert.include(context, "New source constraint");
-            assert.include(turns[1]!.text, current);
-            assert.deepEqual(turns[1]!.attachments, screenshots);
-            const historyBeforeFollowup = yield* Ref.get(injectedHistory);
-            yield* dispatch(5, "Continue after automatic recovery", CLAUDE_MODEL_SELECTION);
-            yield* wait(5);
-            assert.equal(
-              (yield* orchestrator.getThreadProjection(threadId)).runs.at(-1)?.status,
-              "completed",
-            );
+          } else {
             assert.equal(yield* Ref.get(generation), 2);
-            assert.equal(
-              (yield* Ref.get(capturedTurns)).at(-1)!.text,
-              "Continue after automatic recovery",
-            );
-            assert.deepEqual(yield* Ref.get(injectedHistory), historyBeforeFollowup);
-            if (scenario.includes("target-estimate")) {
-              yield* dispatch(6, "Another source turn", CODEX_MODEL_SELECTION);
-              yield* wait(6);
-              yield* dispatch(7, "Return after recovery", CLAUDE_MODEL_SELECTION);
-              yield* wait(7);
-              assert.equal(
-                (yield* orchestrator.getThreadProjection(threadId)).runs.at(-1)?.status,
-                "completed",
-              );
-              assert.equal(yield* Ref.get(generation), 2);
-            }
-            return;
-          }
-          if (priorImages) {
-            const handoff = projection.contextHandoffs.at(-1)!;
-            const context = scenario.endsWith("-native")
-              ? yield* encodeJson(yield* Ref.get(injectedHistory))
-              : (yield* Ref.get(capturedTurns)).at(-1)!.text;
-            const shouldFit =
-              turnUsageScenario ||
-              scenario.startsWith("imported") ||
-              scenario.includes("telemetry") ||
-              scenario.includes("unsent") ||
-              replaceNative;
-            const sourceText =
-              `${replaceNative ? "Another" : "New"} source constraint ` + "q".repeat(9_000);
-            const sourceItem = projection.turnItems.find(
-              (item) => item.type === "user_message" && item.text === sourceText,
-            )!;
-            assert.isDefined(sourceItem);
-            if (shouldFit) {
-              assert.include(context, sourceText);
-              assert.include(
-                projection.contextHandoffs
-                  .filter(
-                    (record) =>
-                      record.targetRunId ===
-                      (scenario.includes("retry")
-                        ? projection.runs.find((run) => run.ordinal === targetOrdinal)!.id
-                        : projection.runs.at(-1)!.id),
-                  )
-                  .flatMap((record) => record.delivery?.itemIds ?? []),
-                sourceItem.id,
-              );
-            } else {
-              assert.notInclude(context, "q".repeat(9_000));
-              assert.isAbove(handoff.delivery!.omittedItemIds!.length, 0);
-            }
-            const latestRun = projection.runs.at(-1)!;
-            const latestAttempt = projection.attempts.find(
-              (attempt) => attempt.id === latestRun.activeAttemptId,
-            )!;
-            const target = projection.providerThreads.find(
-              (thread) => thread.id === latestAttempt.providerThreadId,
-            )!;
-            assert.equal(latestAttempt.nativeThreadId, target.nativeThreadRef!.nativeId);
-            if (turnUsageScenario) {
-              if (replaceNative) assert.isNull(target.contextUsage);
-              else
-                assert.deepEqual(target.contextUsage, { usedTokens: 37_321, maxTokens: 258_400 });
-              assert.lengthOf((yield* Ref.get(capturedTurns)).at(-1)!.attachments, 2);
-            }
-            if (replaceNative) assert.equal(yield* Ref.get(generation), 2);
-            return;
-          }
-          const handoff = projection.contextHandoffs.at(-1)!;
-          if (scenario.startsWith("screenshot")) {
-            assert.deepEqual((yield* Ref.get(capturedTurns)).at(-1)!.attachments, screenshots);
-          }
-          if (scenario === "compact-legacy") {
-            const { history: _history, ...legacyHandoff } = handoff;
-            yield* eventSink.write({
-              events: [
-                {
-                  id: EventId.make("legacy-handoff-shape"),
-                  type: "context-handoff.updated",
-                  threadId,
-                  runId: handoff.targetRunId,
-                  occurredAt: yield* DateTime.now,
-                  payload: legacyHandoff,
-                },
-              ],
-            });
-            assert.isUndefined(handoff.delivery);
-            yield* dispatch(3, "Continue after compact", CLAUDE_MODEL_SELECTION);
-            yield* wait(3);
-            assert.include(
-              (yield* Ref.get(capturedTurns)).at(-1)!.text,
-              "Original request with constraints",
-            );
-            assert.equal(
-              (yield* orchestrator.getThreadProjection(threadId)).contextHandoffs.at(-1)?.delivery
-                ?.status,
-              "inline",
-            );
-          } else if (
-            scenario === "delivery-write-failure" ||
-            (scenario.startsWith("screenshot") && scenario.endsWith("fallback"))
-          ) {
-            assert.equal(
-              handoff.delivery?.status,
-              scenario.startsWith("screenshot") ? "inline" : "pending",
+            assert.notEqual(
+              retried.contextHandoffs.at(-1)?.delivery?.nativeThreadId,
+              failedHandoff.delivery?.nativeThreadId,
             );
-            assert.include(
-              (yield* Ref.get(capturedTurns)).at(-1)!.text,
-              "Original request with constraints",
-            );
-          } else {
-            assert.equal(handoff.delivery?.status, "injected");
-            assert.equal((yield* Ref.get(capturedTurns)).at(-1)!.text, current);
-            assert.include(
-              yield* encodeJson(yield* Ref.get(injectedHistory)),
-              "Original request with constraints",
+            const newHistory = yield* encodeJson(
+              (yield* Ref.get(injectedHistory)).slice(historyBeforeRetry),
             );
+            assert.include(newHistory, "Original request with constraints");
+            assert.include(newHistory, "Original partial work");
+            assert.notInclude(newHistory, "Retry target request");
           }
+          const beforeFollowup = yield* Ref.get(injectedHistory);
+          const followup = "z".repeat(6_000);
+          yield* dispatch(4, followup, CLAUDE_MODEL_SELECTION);
+          yield* wait(4, "completed");
+          assert.equal((yield* Ref.get(capturedTurns)).at(-1)!.text, followup);
+          assert.deepEqual(yield* Ref.get(injectedHistory), beforeFollowup);
+          assert.equal(
+            (yield* orchestrator.getThreadProjection(threadId)).contextHandoffs.length,
+            retried.contextHandoffs.length,
+          );
         }).pipe(
           Effect.provide(
             ProviderReplayHarness.layerWithRegistry(
               {
-                name: `handoff-${scenario}`,
+                name: `handoff-retry-${failure}`,
                 runtimePolicyOverride: {
                   cwd,
                   approvalPolicy: "never",
@@ -1044,238 +1269,143 @@ describe("orchestration v2 provider switching", () => {
           ),
         );
       }),
-    ),
   );
-  it.live.each([
-    "turn-start",
-    "injection",
-    "large-missed-request",
-    "exhausted-target-retry",
-  ] as const)(
-    "recovers %s failure without duplicating history in the same native thread",
-    (failure) =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const cwd = yield* checkpointWorkspace(`handoff-retry-${failure}`);
-          const capturedTurns = yield* Ref.make<ReadonlyArray<CapturedTurn>>([]);
-          const injectedHistory = yield* Ref.make<ReadonlyArray<unknown>>([]);
-          const failOnce = yield* Ref.make(true);
-          const generation = yield* Ref.make(0);
-          const layerRegistry = ProviderAdapterRegistry.layerFromAdapters([
-            makeTestAdapter({
-              instanceId: CODEX_MODEL_SELECTION.instanceId,
-              driver: CODEX_DRIVER,
-              capabilities: CodexProviderCapabilitiesV2,
-              modelSelection: CODEX_MODEL_SELECTION,
-              responseByRunOrdinal: { 1: "Original partial work" },
-              capturedTurns,
-            }),
-            makeTestAdapter({
-              instanceId: CLAUDE_MODEL_SELECTION.instanceId,
-              driver: CLAUDE_DRIVER,
-              capabilities: ClaudeProviderCapabilitiesV2,
-              modelSelection: CLAUDE_MODEL_SELECTION,
-              responseByRunOrdinal: {},
-              capturedTurns,
-              injectedHistory,
-              nativeThreadGeneration: generation,
-              getModelContextWindow: () => 32_000,
-              ...(failure !== "injection"
-                ? { failStartOnce: failOnce }
-                : { failInjectionOnce: failOnce }),
-            }),
-          ]);
-          yield* Effect.gen(function* () {
-            const orchestrator = yield* Orchestrator.OrchestratorV2;
-            const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
-            const dispatch = (ordinal: number, text: string, selection: ModelSelection) =>
-              orchestrator.dispatch({
-                type: "message.dispatch",
-                commandId: CommandId.make(`retry:${ordinal}`),
-                threadId,
-                messageId: MessageId.make(`retry:${ordinal}`),
-                createdBy: "user",
-                creationSource: "web",
-                text,
-                attachments: [],
-                modelSelection: selection,
-                dispatchMode: { type: "start_immediately" },
-              });
-            const wait = (ordinal: number, status: "failed" | "completed") =>
-              orchestrator.streamStoredEvents.pipe(
-                Stream.filter(
-                  ({ event }) =>
-                    event.type === "run.updated" &&
-                    event.payload.ordinal === ordinal &&
-                    (event.payload.status === "completed" || event.payload.status === "failed"),
-                ),
-                Stream.runHead,
-                Effect.andThen(worker.drain()),
-                Effect.andThen(
-                  Effect.gen(function* () {
-                    assert.equal(
-                      (yield* orchestrator.getThreadProjection(threadId)).runs.at(-1)?.status,
-                      status,
-                    );
-                  }),
-                ),
-              );
-            yield* orchestrator.dispatch({
-              type: "thread.create",
-              commandId: CommandId.make("retry:create"),
-              threadId,
-              projectId,
-              createdBy: "user",
-              creationSource: "web",
-              title: "Handoff retry",
-              modelSelection: CODEX_MODEL_SELECTION,
-              runtimeMode: "full-access",
-              interactionMode: "default",
-              branch: null,
-              worktreePath: null,
-            });
-            yield* dispatch(1, "Original request with constraints", CODEX_MODEL_SELECTION);
-            yield* wait(1, "completed");
-            yield* dispatch(
-              2,
-              failure === "large-missed-request" ? "x".repeat(7_000) : "First target request",
-              CLAUDE_MODEL_SELECTION,
-            );
-            yield* wait(2, "failed");
-            const failed = yield* orchestrator.getThreadProjection(threadId);
-            const failedHandoff = failed.contextHandoffs.at(-1)!;
-            assert.equal(
-              failedHandoff.delivery?.status,
-              failure !== "injection" ? "injected" : "pending",
-            );
-            const historyBeforeRetry = (yield* Ref.get(injectedHistory)).length;
-            if (failure === "exhausted-target-retry") {
-              const target = failed.providerThreads.find(
-                (thread) => thread.providerInstanceId === CLAUDE_MODEL_SELECTION.instanceId,
-              )!;
-              yield* (yield* EventSink.EventSinkV2).write({
-                events: [
-                  {
-                    id: EventId.make("exhausted-retry-usage"),
-                    type: "provider-thread.updated",
-                    threadId,
-                    occurredAt: yield* DateTime.now,
-                    payload: { ...target, contextUsage: { usedTokens: 30_000, maxTokens: 32_000 } },
-                  },
-                ],
-              });
-            }
-            const retryText =
-              failure === "large-missed-request" ? "y".repeat(10_000) : "Retry target request";
-            yield* dispatch(3, retryText, CLAUDE_MODEL_SELECTION);
-            yield* wait(3, "completed");
-            const retried = yield* orchestrator.getThreadProjection(threadId);
-            const lastTurn = (yield* Ref.get(capturedTurns)).at(-1)!;
-            assert.equal(lastTurn.text, retryText);
-            if (failure !== "injection" && failure !== "exhausted-target-retry") {
-              const delta = yield* encodeJson(
-                (yield* Ref.get(injectedHistory)).slice(historyBeforeRetry),
-              );
-              if (failure === "large-missed-request") {
-                assert.include(delta, "omitted 1 items");
-                const missedRequest = retried.turnItems.find(
-                  (item) => item.type === "user_message" && item.text === "x".repeat(7_000),
-                )!;
-                const delivery = retried.contextHandoffs.at(-1)!.delivery!;
-                assert.include(delivery.omittedItemIds ?? [], missedRequest.id);
-                assert.notInclude(delivery.itemIds, missedRequest.id);
-              } else assert.include(delta, "First target request");
-              assert.notInclude(delta, "Original request with constraints");
-              assert.notInclude(delta, "Original partial work");
-              assert.equal(yield* Ref.get(generation), 1);
-            } else {
-              assert.equal(yield* Ref.get(generation), 2);
-              assert.notEqual(
-                retried.contextHandoffs.at(-1)?.delivery?.nativeThreadId,
-                failedHandoff.delivery?.nativeThreadId,
-              );
-              const newHistory = yield* encodeJson(
-                (yield* Ref.get(injectedHistory)).slice(historyBeforeRetry),
-              );
-              assert.include(newHistory, "Original request with constraints");
-              assert.include(newHistory, "Original partial work");
-              assert.notInclude(newHistory, "Retry target request");
-            }
-            const beforeFollowup = yield* Ref.get(injectedHistory);
-            const followup = "z".repeat(6_000);
-            yield* dispatch(4, followup, CLAUDE_MODEL_SELECTION);
-            yield* wait(4, "completed");
-            assert.equal((yield* Ref.get(capturedTurns)).at(-1)!.text, followup);
-            assert.deepEqual(yield* Ref.get(injectedHistory), beforeFollowup);
-            assert.equal(
-              (yield* orchestrator.getThreadProjection(threadId)).contextHandoffs.length,
-              retried.contextHandoffs.length,
-            );
-          }).pipe(
-            Effect.provide(
-              ProviderReplayHarness.layerWithRegistry(
-                {
-                  name: `handoff-retry-${failure}`,
-                  runtimePolicyOverride: {
-                    cwd,
-                    approvalPolicy: "never",
-                    sandboxPolicy: { type: "readOnly" },
-                  },
-                },
-                layerRegistry,
-              ),
+
+  it.live("keeps a native session whose stored prose is far below an unreported window", () =>
+    Effect.gen(function* () {
+      const cwd = yield* checkpointWorkspace("handoff-estimate-headroom");
+      const capturedTurns = yield* Ref.make<ReadonlyArray<CapturedTurn>>([]);
+      const generation = yield* Ref.make(0);
+      // About 112 KB of ordinary English is about 25k tokens: a quarter of a 128k window.
+      const prose = "The quick brown fox jumps over the lazy dog. ".repeat(2_500);
+      const layerRegistry = ProviderAdapterRegistry.layerFromAdapters([
+        makeTestAdapter({
+          instanceId: CODEX_MODEL_SELECTION.instanceId,
+          driver: CODEX_DRIVER,
+          capabilities: CodexProviderCapabilitiesV2,
+          modelSelection: CODEX_MODEL_SELECTION,
+          responseByRunOrdinal: { 2: "Source work" },
+          capturedTurns,
+        }),
+        // No window and no usage, like an ACP registry agent that sends no usage_update.
+        makeTestAdapter({
+          instanceId: CLAUDE_MODEL_SELECTION.instanceId,
+          driver: CLAUDE_DRIVER,
+          capabilities: ClaudeProviderCapabilitiesV2,
+          modelSelection: CLAUDE_MODEL_SELECTION,
+          responseByRunOrdinal: { 1: prose },
+          capturedTurns,
+          nativeThreadGeneration: generation,
+        }),
+      ]);
+      yield* Effect.gen(function* () {
+        const orchestrator = yield* Orchestrator.OrchestratorV2;
+        const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
+        const dispatch = (ordinal: number, text: string, selection: ModelSelection) =>
+          orchestrator.dispatch({
+            type: "message.dispatch",
+            commandId: CommandId.make(`headroom:${ordinal}`),
+            threadId,
+            messageId: MessageId.make(`headroom:${ordinal}`),
+            createdBy: "user",
+            creationSource: "web",
+            text,
+            attachments: [],
+            modelSelection: selection,
+            dispatchMode: { type: "start_immediately" },
+          });
+        const wait = (ordinal: number) =>
+          orchestrator.streamStoredEvents.pipe(
+            Stream.filter(
+              ({ event }) =>
+                event.type === "run.updated" &&
+                event.payload.ordinal === ordinal &&
+                (event.payload.status === "completed" || event.payload.status === "failed"),
             ),
+            Stream.runHead,
+            Effect.andThen(worker.drain()),
           );
-        }),
-      ),
+        yield* orchestrator.dispatch({
+          type: "thread.create",
+          commandId: CommandId.make("headroom:create"),
+          threadId,
+          projectId,
+          createdBy: "user",
+          creationSource: "web",
+          title: "Handoff estimate headroom",
+          modelSelection: CLAUDE_MODEL_SELECTION,
+          runtimeMode: "full-access",
+          interactionMode: "default",
+          branch: null,
+          worktreePath: null,
+        });
+        yield* dispatch(1, "Write the long report", CLAUDE_MODEL_SELECTION);
+        yield* wait(1);
+        yield* dispatch(2, "Continue elsewhere", CODEX_MODEL_SELECTION);
+        yield* wait(2);
+        yield* dispatch(3, "Back to the first provider", CLAUDE_MODEL_SELECTION);
+        yield* wait(3);
+        assert.equal(
+          (yield* orchestrator.getThreadProjection(threadId)).runs.at(-1)?.status,
+          "completed",
+        );
+        // A second generation means T3 discarded the native session as full.
+        assert.equal(yield* Ref.get(generation), 1);
+      }).pipe(
+        Effect.provide(
+          ProviderReplayHarness.layerWithRegistry(
+            {
+              name: "handoff-estimate-headroom",
+              runtimePolicyOverride: {
+                cwd,
+                approvalPolicy: "never",
+                sandboxPolicy: { type: "readOnly" },
+              },
+            },
+            layerRegistry,
+          ),
+        ),
+      );
+    }),
   );
 
-  it.live("keeps a native session whose stored prose is far below an unreported window", () =>
-    Effect.scoped(
+  it.live.each(["native", "legacy"] as const)(
+    "starts a replacement native thread as new after the resume fallback with %s attempts",
+    (attempts) =>
       Effect.gen(function* () {
-        const cwd = yield* checkpointWorkspace("handoff-estimate-headroom");
+        const cwd = yield* checkpointWorkspace("resume-fallback-native-turns");
         const capturedTurns = yield* Ref.make<ReadonlyArray<CapturedTurn>>([]);
+        const failResumeOnce = yield* Ref.make(false);
         const generation = yield* Ref.make(0);
-        // About 112 KB of ordinary English is about 25k tokens: a quarter of a 128k window.
-        const prose = "The quick brown fox jumps over the lazy dog. ".repeat(2_500);
         const layerRegistry = ProviderAdapterRegistry.layerFromAdapters([
-          makeTestAdapter({
-            instanceId: CODEX_MODEL_SELECTION.instanceId,
-            driver: CODEX_DRIVER,
-            capabilities: CodexProviderCapabilitiesV2,
-            modelSelection: CODEX_MODEL_SELECTION,
-            responseByRunOrdinal: { 2: "Source work" },
-            capturedTurns,
-          }),
-          // No window and no usage, like an ACP registry agent that sends no usage_update.
           makeTestAdapter({
             instanceId: CLAUDE_MODEL_SELECTION.instanceId,
             driver: CLAUDE_DRIVER,
             capabilities: ClaudeProviderCapabilitiesV2,
             modelSelection: CLAUDE_MODEL_SELECTION,
-            responseByRunOrdinal: { 1: prose },
+            responseByRunOrdinal: {},
             capturedTurns,
+            failResumeOnce,
             nativeThreadGeneration: generation,
           }),
         ]);
         yield* Effect.gen(function* () {
           const orchestrator = yield* Orchestrator.OrchestratorV2;
           const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
-          const dispatch = (ordinal: number, text: string, selection: ModelSelection) =>
-            orchestrator.dispatch({
+          const runToCompletion = Effect.fn("runToCompletion")(function* (ordinal: number) {
+            yield* orchestrator.dispatch({
               type: "message.dispatch",
-              commandId: CommandId.make(`headroom:${ordinal}`),
+              commandId: CommandId.make(`resume-fallback:${ordinal}`),
               threadId,
-              messageId: MessageId.make(`headroom:${ordinal}`),
+              messageId: MessageId.make(`resume-fallback:${ordinal}`),
               createdBy: "user",
               creationSource: "web",
-              text,
+              text: `Request ${ordinal}`,
               attachments: [],
-              modelSelection: selection,
+              modelSelection: CLAUDE_MODEL_SELECTION,
               dispatchMode: { type: "start_immediately" },
             });
-          const wait = (ordinal: number) =>
-            orchestrator.streamStoredEvents.pipe(
+            yield* orchestrator.streamStoredEvents.pipe(
               Stream.filter(
                 ({ event }) =>
                   event.type === "run.updated" &&
@@ -1283,39 +1413,86 @@ describe("orchestration v2 provider switching", () => {
                   (event.payload.status === "completed" || event.payload.status === "failed"),
               ),
               Stream.runHead,
-              Effect.andThen(worker.drain()),
             );
+            yield* worker.drain();
+            assert.equal(
+              (yield* orchestrator.getThreadProjection(threadId)).runs.at(-1)?.status,
+              "completed",
+            );
+          });
           yield* orchestrator.dispatch({
             type: "thread.create",
-            commandId: CommandId.make("headroom:create"),
+            commandId: CommandId.make("resume-fallback:create"),
             threadId,
             projectId,
             createdBy: "user",
             creationSource: "web",
-            title: "Handoff estimate headroom",
+            title: "Resume fallback",
             modelSelection: CLAUDE_MODEL_SELECTION,
             runtimeMode: "full-access",
             interactionMode: "default",
             branch: null,
             worktreePath: null,
           });
-          yield* dispatch(1, "Write the long report", CLAUDE_MODEL_SELECTION);
-          yield* wait(1);
-          yield* dispatch(2, "Continue elsewhere", CODEX_MODEL_SELECTION);
-          yield* wait(2);
-          yield* dispatch(3, "Back to the first provider", CLAUDE_MODEL_SELECTION);
-          yield* wait(3);
-          assert.equal(
-            (yield* orchestrator.getThreadProjection(threadId)).runs.at(-1)?.status,
-            "completed",
+          yield* runToCompletion(1);
+          const providerThread = (yield* orchestrator.getThreadProjection(
+            threadId,
+          )).providerThreads.at(0);
+          if (providerThread === undefined || providerThread.providerSessionId === null) {
+            return yield* Effect.die("Expected a provider session after the first turn.");
+          }
+          yield* orchestrator.dispatch({
+            type: "provider-session.detach",
+            commandId: CommandId.make("resume-fallback:detach"),
+            threadId,
+            providerSessionId: providerThread.providerSessionId,
+          });
+          yield* worker.drain();
+          if (attempts === "legacy") {
+            const existing = yield* orchestrator.getThreadProjection(threadId);
+            yield* (yield* EventSink.EventSinkV2).write({
+              events: existing.attempts.map(
+                ({ nativeThreadId: _nativeThreadId, ...legacy }, index) => ({
+                  id: EventId.make(`resume-fallback-legacy-attempt:${index}`),
+                  type: "run-attempt.updated" as const,
+                  threadId,
+                  occurredAt: existing.thread.createdAt,
+                  payload: legacy,
+                }),
+              ),
+            });
+          }
+          yield* Ref.set(failResumeOnce, true);
+          yield* runToCompletion(2);
+          yield* runToCompletion(3);
+
+          const turns = yield* Ref.get(capturedTurns);
+          assert.equal(turns.length, 3);
+          assert.equal(yield* Ref.get(generation), 2);
+          assert.notEqual(turns[1]?.nativeThreadId, turns[0]?.nativeThreadId);
+          assert.isAbove(turns[1]?.providerTurnOrdinal ?? 0, 1);
+          assert.isFalse(turns[1]?.nativeThreadHasTurns);
+          assert.equal(turns[2]?.nativeThreadId, turns[1]?.nativeThreadId);
+          assert.isTrue(turns[2]?.nativeThreadHasTurns);
+
+          const projection = yield* orchestrator.getThreadProjection(threadId);
+          const run2 = projection.runs[1]!;
+          const handoff = projection.contextHandoffs.find(
+            (candidate) => candidate.targetRunId === run2.id,
+          );
+          assert.deepEqual(
+            projection.turnItems
+              .filter((item) => item.runId === run2.id)
+              .toSorted((left, right) => left.ordinal - right.ordinal)
+              .slice(0, 2)
+              .map((item) => (item.type === "handoff" ? item.contextHandoffId : item.type)),
+            [handoff?.id, "user_message"],
           );
-          // A second generation means T3 discarded the native session as full.
-          assert.equal(yield* Ref.get(generation), 1);
         }).pipe(
           Effect.provide(
             ProviderReplayHarness.layerWithRegistry(
               {
-                name: "handoff-estimate-headroom",
+                name: "resume-fallback-native-turns",
                 runtimePolicyOverride: {
                   cwd,
                   approvalPolicy: "never",
@@ -1327,327 +1504,64 @@ describe("orchestration v2 provider switching", () => {
           ),
         );
       }),
-    ),
   );
 
-  it.live.each(["native", "legacy"] as const)(
-    "starts a replacement native thread as new after the resume fallback with %s attempts",
-    (attempts) =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const cwd = yield* checkpointWorkspace("resume-fallback-native-turns");
-          const capturedTurns = yield* Ref.make<ReadonlyArray<CapturedTurn>>([]);
-          const failResumeOnce = yield* Ref.make(false);
-          const generation = yield* Ref.make(0);
-          const layerRegistry = ProviderAdapterRegistry.layerFromAdapters([
-            makeTestAdapter({
-              instanceId: CLAUDE_MODEL_SELECTION.instanceId,
-              driver: CLAUDE_DRIVER,
-              capabilities: ClaudeProviderCapabilitiesV2,
-              modelSelection: CLAUDE_MODEL_SELECTION,
-              responseByRunOrdinal: {},
-              capturedTurns,
-              failResumeOnce,
-              nativeThreadGeneration: generation,
-            }),
-          ]);
-          yield* Effect.gen(function* () {
-            const orchestrator = yield* Orchestrator.OrchestratorV2;
-            const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
-            const runToCompletion = Effect.fn("runToCompletion")(function* (ordinal: number) {
+  it.live.each(["an older handoff", "a missed request"] as const)(
+    "keeps the latest turn when a resume fallback also delivers %s",
+    (older) =>
+      Effect.gen(function* () {
+        // A run that fails before its provider turn starts is retried as a missed request.
+        const missed = older === "a missed request";
+        const name = `resume-fallback-handoff-order${missed ? "-missed" : ""}`;
+        const cwd = yield* checkpointWorkspace(name);
+        const failStartOnce = yield* Ref.make(false);
+        const capturedTurns = yield* Ref.make<ReadonlyArray<CapturedTurn>>([]);
+        const injectedHistory = yield* Ref.make<ReadonlyArray<unknown>>([]);
+        const oldResult = `old result ${"o".repeat(2_500)}`;
+        const latestResult = `latest result ${"l".repeat(2_500)}`;
+        const layerRegistry = ProviderAdapterRegistry.layerFromAdapters([
+          makeTestAdapter({
+            instanceId: CLAUDE_MODEL_SELECTION.instanceId,
+            driver: CLAUDE_DRIVER,
+            capabilities: ClaudeProviderCapabilitiesV2,
+            modelSelection: CLAUDE_MODEL_SELECTION,
+            responseByRunOrdinal: { 1: oldResult, 3: latestResult },
+            capturedTurns,
+            injectedHistory,
+            failResume: true,
+            ...(missed ? { failStartOnce } : { failedRunOrdinals: new Set([2]) }),
+            nativeThreadGeneration: yield* Ref.make(0),
+          }),
+        ]);
+        yield* Effect.gen(function* () {
+          const orchestrator = yield* Orchestrator.OrchestratorV2;
+          const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
+          const runAfterDetach = Effect.fn("runAfterDetach")(function* (
+            ordinal: number,
+            text: string,
+          ) {
+            const providerSessionId = (yield* orchestrator.getThreadProjection(threadId))
+              .providerThreads[0]?.providerSessionId;
+            if (providerSessionId != null) {
               yield* orchestrator.dispatch({
-                type: "message.dispatch",
-                commandId: CommandId.make(`resume-fallback:${ordinal}`),
+                type: "provider-session.detach",
+                commandId: CommandId.make(`handoff-order:detach:${ordinal}`),
                 threadId,
-                messageId: MessageId.make(`resume-fallback:${ordinal}`),
-                createdBy: "user",
-                creationSource: "web",
-                text: `Request ${ordinal}`,
-                attachments: [],
-                modelSelection: CLAUDE_MODEL_SELECTION,
-                dispatchMode: { type: "start_immediately" },
+                providerSessionId,
               });
-              yield* orchestrator.streamStoredEvents.pipe(
-                Stream.filter(
-                  ({ event }) =>
-                    event.type === "run.updated" &&
-                    event.payload.ordinal === ordinal &&
-                    (event.payload.status === "completed" || event.payload.status === "failed"),
-                ),
-                Stream.runHead,
-              );
               yield* worker.drain();
-              assert.equal(
-                (yield* orchestrator.getThreadProjection(threadId)).runs.at(-1)?.status,
-                "completed",
-              );
-            });
+            }
             yield* orchestrator.dispatch({
-              type: "thread.create",
-              commandId: CommandId.make("resume-fallback:create"),
+              type: "message.dispatch",
+              commandId: CommandId.make(`handoff-order:${ordinal}`),
               threadId,
-              projectId,
+              messageId: MessageId.make(`handoff-order:${ordinal}`),
               createdBy: "user",
               creationSource: "web",
-              title: "Resume fallback",
+              text,
+              attachments: [],
               modelSelection: CLAUDE_MODEL_SELECTION,
-              runtimeMode: "full-access",
-              interactionMode: "default",
-              branch: null,
-              worktreePath: null,
-            });
-            yield* runToCompletion(1);
-            const providerThread = (yield* orchestrator.getThreadProjection(
-              threadId,
-            )).providerThreads.at(0);
-            if (providerThread === undefined || providerThread.providerSessionId === null) {
-              return yield* Effect.die("Expected a provider session after the first turn.");
-            }
-            yield* orchestrator.dispatch({
-              type: "provider-session.detach",
-              commandId: CommandId.make("resume-fallback:detach"),
-              threadId,
-              providerSessionId: providerThread.providerSessionId,
-            });
-            yield* worker.drain();
-            if (attempts === "legacy") {
-              const existing = yield* orchestrator.getThreadProjection(threadId);
-              yield* (yield* EventSink.EventSinkV2).write({
-                events: existing.attempts.map(
-                  ({ nativeThreadId: _nativeThreadId, ...legacy }, index) => ({
-                    id: EventId.make(`resume-fallback-legacy-attempt:${index}`),
-                    type: "run-attempt.updated" as const,
-                    threadId,
-                    occurredAt: existing.thread.createdAt,
-                    payload: legacy,
-                  }),
-                ),
-              });
-            }
-            yield* Ref.set(failResumeOnce, true);
-            yield* runToCompletion(2);
-            yield* runToCompletion(3);
-
-            const turns = yield* Ref.get(capturedTurns);
-            assert.equal(turns.length, 3);
-            assert.equal(yield* Ref.get(generation), 2);
-            assert.notEqual(turns[1]?.nativeThreadId, turns[0]?.nativeThreadId);
-            assert.isAbove(turns[1]?.providerTurnOrdinal ?? 0, 1);
-            assert.isFalse(turns[1]?.nativeThreadHasTurns);
-            assert.equal(turns[2]?.nativeThreadId, turns[1]?.nativeThreadId);
-            assert.isTrue(turns[2]?.nativeThreadHasTurns);
-
-            const projection = yield* orchestrator.getThreadProjection(threadId);
-            const run2 = projection.runs[1]!;
-            const handoff = projection.contextHandoffs.find(
-              (candidate) => candidate.targetRunId === run2.id,
-            );
-            assert.deepEqual(
-              projection.turnItems
-                .filter((item) => item.runId === run2.id)
-                .toSorted((left, right) => left.ordinal - right.ordinal)
-                .slice(0, 2)
-                .map((item) => (item.type === "handoff" ? item.contextHandoffId : item.type)),
-              [handoff?.id, "user_message"],
-            );
-          }).pipe(
-            Effect.provide(
-              ProviderReplayHarness.layerWithRegistry(
-                {
-                  name: "resume-fallback-native-turns",
-                  runtimePolicyOverride: {
-                    cwd,
-                    approvalPolicy: "never",
-                    sandboxPolicy: { type: "readOnly" },
-                  },
-                },
-                layerRegistry,
-              ),
-            ),
-          );
-        }),
-      ),
-  );
-
-  it.live.each(["an older handoff", "a missed request"] as const)(
-    "keeps the latest turn when a resume fallback also delivers %s",
-    (older) =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          // A run that fails before its provider turn starts is retried as a missed request.
-          const missed = older === "a missed request";
-          const name = `resume-fallback-handoff-order${missed ? "-missed" : ""}`;
-          const cwd = yield* checkpointWorkspace(name);
-          const failStartOnce = yield* Ref.make(false);
-          const capturedTurns = yield* Ref.make<ReadonlyArray<CapturedTurn>>([]);
-          const injectedHistory = yield* Ref.make<ReadonlyArray<unknown>>([]);
-          const oldResult = `old result ${"o".repeat(2_500)}`;
-          const latestResult = `latest result ${"l".repeat(2_500)}`;
-          const layerRegistry = ProviderAdapterRegistry.layerFromAdapters([
-            makeTestAdapter({
-              instanceId: CLAUDE_MODEL_SELECTION.instanceId,
-              driver: CLAUDE_DRIVER,
-              capabilities: ClaudeProviderCapabilitiesV2,
-              modelSelection: CLAUDE_MODEL_SELECTION,
-              responseByRunOrdinal: { 1: oldResult, 3: latestResult },
-              capturedTurns,
-              injectedHistory,
-              failResume: true,
-              ...(missed ? { failStartOnce } : { failedRunOrdinals: new Set([2]) }),
-              nativeThreadGeneration: yield* Ref.make(0),
-            }),
-          ]);
-          yield* Effect.gen(function* () {
-            const orchestrator = yield* Orchestrator.OrchestratorV2;
-            const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
-            const runAfterDetach = Effect.fn("runAfterDetach")(function* (
-              ordinal: number,
-              text: string,
-            ) {
-              const providerSessionId = (yield* orchestrator.getThreadProjection(threadId))
-                .providerThreads[0]?.providerSessionId;
-              if (providerSessionId != null) {
-                yield* orchestrator.dispatch({
-                  type: "provider-session.detach",
-                  commandId: CommandId.make(`handoff-order:detach:${ordinal}`),
-                  threadId,
-                  providerSessionId,
-                });
-                yield* worker.drain();
-              }
-              yield* orchestrator.dispatch({
-                type: "message.dispatch",
-                commandId: CommandId.make(`handoff-order:${ordinal}`),
-                threadId,
-                messageId: MessageId.make(`handoff-order:${ordinal}`),
-                createdBy: "user",
-                creationSource: "web",
-                text,
-                attachments: [],
-                modelSelection: CLAUDE_MODEL_SELECTION,
-                dispatchMode: { type: "start_immediately" },
-              });
-              yield* orchestrator.streamStoredEvents.pipe(
-                Stream.filter(
-                  ({ event }) =>
-                    event.type === "run.updated" &&
-                    event.payload.ordinal === ordinal &&
-                    (event.payload.status === "completed" || event.payload.status === "failed"),
-                ),
-                Stream.runHead,
-              );
-              yield* worker.drain();
-            });
-            yield* orchestrator.dispatch({
-              type: "thread.create",
-              commandId: CommandId.make("handoff-order:create"),
-              threadId,
-              projectId,
-              createdBy: "user",
-              creationSource: "web",
-              title: "Resume fallback handoff order",
-              modelSelection: CLAUDE_MODEL_SELECTION,
-              runtimeMode: "full-access",
-              interactionMode: "default",
-              branch: null,
-              worktreePath: null,
-            });
-            yield* runAfterDetach(1, `Original brief ${"b".repeat(9_000)}`);
-            yield* Ref.set(failStartOnce, missed);
-            yield* runAfterDetach(2, missed ? `Request 2 ${"r".repeat(6_000)}` : "Request 2");
-            yield* runAfterDetach(3, "Request 3");
-            const historyBeforeRun4 = (yield* Ref.get(injectedHistory)).length;
-            yield* runAfterDetach(4, "Request 4");
-
-            const projection = yield* orchestrator.getThreadProjection(threadId);
-            assert.deepEqual(
-              projection.runs.map((run) => run.status),
-              ["completed", "failed", "completed", "completed"],
-            );
-            const run4NativeThreadId = (yield* Ref.get(capturedTurns)).at(-1)?.nativeThreadId;
-            assert.equal(
-              projection.contextHandoffs.find(
-                (handoff) => handoff.targetRunId === projection.runs[1]?.id,
-              )?.delivery?.nativeThreadId,
-              run4NativeThreadId,
-            );
-            const run4History = yield* encodeJson(
-              (yield* Ref.get(injectedHistory)).slice(historyBeforeRun4),
-            );
-            assert.include(run4History, "Original brief");
-            assert.include(run4History, latestResult);
-          }).pipe(
-            Effect.provide(
-              ProviderReplayHarness.layerWithRegistry(
-                {
-                  name,
-                  runtimePolicyOverride: {
-                    cwd,
-                    approvalPolicy: "never",
-                    sandboxPolicy: { type: "readOnly" },
-                  },
-                },
-                layerRegistry,
-              ),
-            ),
-          );
-        }),
-      ),
-  );
-
-  it.live.each([
-    ["background work", new ClaudeBackgroundWorkBlocksQueryReplacementError()],
-    ["an unreadable append file", new ClaudeAppendSystemPromptFileError({ path: "missing.md" })],
-    [
-      "an MCP registration timeout",
-      new ClaudeAgentSdkQueryRunnerError({
-        method: "setMcpServers",
-        cause: new ClaudeMcpRegistrationTimeoutError(),
-      }),
-    ],
-    // Claude Code ends the query with "No message found with message.uuid" before the prompt.
-    [
-      "a resume point Claude rejects",
-      new ProviderAdapter.ProviderAdapterProtocolError({
-        driver: CLAUDE_DRIVER,
-        detail: "Claude provider query ended before the turn could start.",
-      }),
-    ],
-  ] as const)("keeps the native session after turns refused for %s", ([, refusalCause]) =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const cwd = yield* checkpointWorkspace("refused-start-keeps-native");
-        const capturedTurns = yield* Ref.make<ReadonlyArray<CapturedTurn>>([]);
-        const refuseStarts = yield* Ref.make(0);
-        const generation = yield* Ref.make(0);
-        const registry = ProviderAdapterRegistry.layerFromAdapters([
-          makeTestAdapter({
-            instanceId: CLAUDE_MODEL_SELECTION.instanceId,
-            driver: CLAUDE_DRIVER,
-            capabilities: ClaudeProviderCapabilitiesV2,
-            modelSelection: CLAUDE_MODEL_SELECTION,
-            responseByRunOrdinal: {},
-            capturedTurns,
-            refuseStarts,
-            refusalCause,
-            nativeThreadGeneration: generation,
-          }),
-        ]);
-        yield* Effect.gen(function* () {
-          const orchestrator = yield* Orchestrator.OrchestratorV2;
-          const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
-          const run = Effect.fn("run")(function* (ordinal: number) {
-            yield* orchestrator.dispatch({
-              type: "message.dispatch",
-              commandId: CommandId.make(`refused-start:${ordinal}`),
-              threadId,
-              messageId: MessageId.make(`refused-start:${ordinal}`),
-              createdBy: "user",
-              creationSource: "web",
-              text: `Request ${ordinal}`,
-              attachments: [],
-              modelSelection: CLAUDE_MODEL_SELECTION,
-              dispatchMode: { type: "start_immediately" },
+              dispatchMode: { type: "start_immediately" },
             });
             yield* orchestrator.streamStoredEvents.pipe(
               Stream.filter(
@@ -1659,51 +1573,170 @@ describe("orchestration v2 provider switching", () => {
               Stream.runHead,
             );
             yield* worker.drain();
-            return (yield* orchestrator.getThreadProjection(threadId)).runs.at(-1)?.status;
           });
           yield* orchestrator.dispatch({
             type: "thread.create",
-            commandId: CommandId.make("refused-start:create"),
+            commandId: CommandId.make("handoff-order:create"),
             threadId,
             projectId,
             createdBy: "user",
             creationSource: "web",
-            title: "Refused start",
+            title: "Resume fallback handoff order",
             modelSelection: CLAUDE_MODEL_SELECTION,
             runtimeMode: "full-access",
             interactionMode: "default",
             branch: null,
             worktreePath: null,
           });
-          assert.equal(yield* run(1), "completed");
-          yield* Ref.set(refuseStarts, 2);
-          assert.equal(yield* run(2), "failed");
-          assert.equal(yield* run(3), "failed");
-          assert.equal(yield* run(4), "completed");
+          yield* runAfterDetach(1, `Original brief ${"b".repeat(9_000)}`);
+          yield* Ref.set(failStartOnce, missed);
+          yield* runAfterDetach(2, missed ? `Request 2 ${"r".repeat(6_000)}` : "Request 2");
+          yield* runAfterDetach(3, "Request 3");
+          const historyBeforeRun4 = (yield* Ref.get(injectedHistory)).length;
+          yield* runAfterDetach(4, "Request 4");
 
-          const turns = yield* Ref.get(capturedTurns);
-          assert.equal(turns.length, 2);
-          assert.equal(yield* Ref.get(generation), 1);
-          assert.equal(turns[1]?.nativeThreadId, turns[0]?.nativeThreadId);
-          assert.include(turns[1]?.text, "Request 2");
-          assert.include(turns[1]?.text, "Request 3");
+          const projection = yield* orchestrator.getThreadProjection(threadId);
+          assert.deepEqual(
+            projection.runs.map((run) => run.status),
+            ["completed", "failed", "completed", "completed"],
+          );
+          const run4NativeThreadId = (yield* Ref.get(capturedTurns)).at(-1)?.nativeThreadId;
+          assert.equal(
+            projection.contextHandoffs.find(
+              (handoff) => handoff.targetRunId === projection.runs[1]?.id,
+            )?.delivery?.nativeThreadId,
+            run4NativeThreadId,
+          );
+          const run4History = yield* encodeJson(
+            (yield* Ref.get(injectedHistory)).slice(historyBeforeRun4),
+          );
+          assert.include(run4History, "Original brief");
+          assert.include(run4History, latestResult);
         }).pipe(
           Effect.provide(
             ProviderReplayHarness.layerWithRegistry(
               {
-                name: "refused-start-keeps-native",
+                name,
                 runtimePolicyOverride: {
                   cwd,
                   approvalPolicy: "never",
                   sandboxPolicy: { type: "readOnly" },
                 },
               },
-              registry,
+              layerRegistry,
             ),
           ),
         );
       }),
-    ),
+  );
+
+  it.live.each([
+    ["background work", new ClaudeBackgroundWorkBlocksQueryReplacementError()],
+    ["an unreadable append file", new ClaudeAppendSystemPromptFileError({ path: "missing.md" })],
+    [
+      "an MCP registration timeout",
+      new ClaudeAgentSdkQueryRunnerError({
+        method: "setMcpServers",
+        cause: new ClaudeMcpRegistrationTimeoutError(),
+      }),
+    ],
+    // Claude Code ends the query with "No message found with message.uuid" before the prompt.
+    [
+      "a resume point Claude rejects",
+      new ProviderAdapter.ProviderAdapterProtocolError({
+        driver: CLAUDE_DRIVER,
+        detail: "Claude provider query ended before the turn could start.",
+      }),
+    ],
+  ] as const)("keeps the native session after turns refused for %s", ([, refusalCause]) =>
+    Effect.gen(function* () {
+      const cwd = yield* checkpointWorkspace("refused-start-keeps-native");
+      const capturedTurns = yield* Ref.make<ReadonlyArray<CapturedTurn>>([]);
+      const refuseStarts = yield* Ref.make(0);
+      const generation = yield* Ref.make(0);
+      const registry = ProviderAdapterRegistry.layerFromAdapters([
+        makeTestAdapter({
+          instanceId: CLAUDE_MODEL_SELECTION.instanceId,
+          driver: CLAUDE_DRIVER,
+          capabilities: ClaudeProviderCapabilitiesV2,
+          modelSelection: CLAUDE_MODEL_SELECTION,
+          responseByRunOrdinal: {},
+          capturedTurns,
+          refuseStarts,
+          refusalCause,
+          nativeThreadGeneration: generation,
+        }),
+      ]);
+      yield* Effect.gen(function* () {
+        const orchestrator = yield* Orchestrator.OrchestratorV2;
+        const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
+        const run = Effect.fn("run")(function* (ordinal: number) {
+          yield* orchestrator.dispatch({
+            type: "message.dispatch",
+            commandId: CommandId.make(`refused-start:${ordinal}`),
+            threadId,
+            messageId: MessageId.make(`refused-start:${ordinal}`),
+            createdBy: "user",
+            creationSource: "web",
+            text: `Request ${ordinal}`,
+            attachments: [],
+            modelSelection: CLAUDE_MODEL_SELECTION,
+            dispatchMode: { type: "start_immediately" },
+          });
+          yield* orchestrator.streamStoredEvents.pipe(
+            Stream.filter(
+              ({ event }) =>
+                event.type === "run.updated" &&
+                event.payload.ordinal === ordinal &&
+                (event.payload.status === "completed" || event.payload.status === "failed"),
+            ),
+            Stream.runHead,
+          );
+          yield* worker.drain();
+          return (yield* orchestrator.getThreadProjection(threadId)).runs.at(-1)?.status;
+        });
+        yield* orchestrator.dispatch({
+          type: "thread.create",
+          commandId: CommandId.make("refused-start:create"),
+          threadId,
+          projectId,
+          createdBy: "user",
+          creationSource: "web",
+          title: "Refused start",
+          modelSelection: CLAUDE_MODEL_SELECTION,
+          runtimeMode: "full-access",
+          interactionMode: "default",
+          branch: null,
+          worktreePath: null,
+        });
+        assert.equal(yield* run(1), "completed");
+        yield* Ref.set(refuseStarts, 2);
+        assert.equal(yield* run(2), "failed");
+        assert.equal(yield* run(3), "failed");
+        assert.equal(yield* run(4), "completed");
+
+        const turns = yield* Ref.get(capturedTurns);
+        assert.equal(turns.length, 2);
+        assert.equal(yield* Ref.get(generation), 1);
+        assert.equal(turns[1]?.nativeThreadId, turns[0]?.nativeThreadId);
+        assert.include(turns[1]?.text, "Request 2");
+        assert.include(turns[1]?.text, "Request 3");
+      }).pipe(
+        Effect.provide(
+          ProviderReplayHarness.layerWithRegistry(
+            {
+              name: "refused-start-keeps-native",
+              runtimePolicyOverride: {
+                cwd,
+                approvalPolicy: "never",
+                sandboxPolicy: { type: "readOnly" },
+              },
+            },
+            registry,
+          ),
+        ),
+      );
+    }),
   );
 
   it.live.each(
@@ -1724,590 +1757,340 @@ describe("orchestration v2 provider switching", () => {
         ] as const,
     ),
   )("hands off %s", ([, { status, queued, returning, native }]) =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const cwd = yield* checkpointWorkspace(`handoff-${status}-${queued}-${returning}`);
-        const capturedTurns = yield* Ref.make<ReadonlyArray<CapturedTurn>>([]);
-        const injectedHistory = yield* Ref.make<ReadonlyArray<unknown>>([]);
-        const started = yield* Deferred.make<void>();
-        const release = yield* Deferred.make<void>();
-        const sourceOrdinal = returning ? 2 : 1;
-        const sourceSelection = returning ? CLAUDE_MODEL_SELECTION : CODEX_MODEL_SELECTION;
-        const targetSelection = returning ? CODEX_MODEL_SELECTION : CLAUDE_MODEL_SELECTION;
-        const originalPrompt = "Keep the release marker violet and preserve the existing API.";
-        const partialResponse = "I checked the API and found the release configuration.";
-        const layerRegistry = ProviderAdapterRegistry.layerFromAdapters(
-          (
-            [
-              [CODEX_MODEL_SELECTION, CODEX_DRIVER, CodexProviderCapabilitiesV2],
-              [CLAUDE_MODEL_SELECTION, CLAUDE_DRIVER, ClaudeProviderCapabilitiesV2],
-            ] as const
-          ).map(([modelSelection, driver, capabilities]) =>
-            makeTestAdapter({
-              instanceId: modelSelection.instanceId,
-              driver,
-              capabilities,
-              modelSelection,
-              responseByRunOrdinal: { [sourceOrdinal]: partialResponse },
-              capturedTurns,
-              ...(native && modelSelection.instanceId === targetSelection.instanceId
-                ? { injectedHistory }
-                : {}),
-              ...(modelSelection.instanceId === sourceSelection.instanceId
-                ? {
-                    failedRunOrdinals: new Set(status === "failed" ? [sourceOrdinal] : []),
-                    interruptedRunOrdinals: new Set(
-                      status === "interrupted" ? [sourceOrdinal] : [],
-                    ),
-                    cancelledRunOrdinals: new Set(status === "cancelled" ? [sourceOrdinal] : []),
-                    holdRunOrdinal: sourceOrdinal,
-                    holdFirstTurn: started,
-                    releaseFirstTurn: release,
-                  }
-                : {}),
-            }),
-          ),
-        );
-        yield* Effect.gen(function* () {
-          const orchestrator = yield* Orchestrator.OrchestratorV2;
-          const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
-          const waitForRun = (
-            ordinal: number,
-            expectedStatus: "completed" | "failed" | "interrupted" | "cancelled",
-          ) =>
-            orchestrator.streamStoredEvents.pipe(
-              Stream.filter(
-                ({ event }) =>
-                  event.type === "run.updated" &&
-                  event.threadId === threadId &&
-                  event.payload.ordinal === ordinal &&
-                  event.payload.status === expectedStatus,
-              ),
-              Stream.runHead,
-              Effect.andThen(worker.drain()),
-            );
-          const dispatch = (
-            key: string,
-            text: string,
-            modelSelection: ModelSelection,
-            queue = false,
-          ) =>
-            orchestrator.dispatch({
-              type: "message.dispatch",
-              commandId: CommandId.make(`command:handoff:${key}`),
-              threadId,
-              messageId: MessageId.make(`message:handoff:${key}`),
-              createdBy: "user",
-              creationSource: "web",
-              text,
-              attachments: [],
-              modelSelection,
-              dispatchMode: { type: queue ? "queue_after_active" : "start_immediately" },
-            });
-          yield* orchestrator.dispatch({
-            type: "thread.create",
-            commandId: CommandId.make("command:handoff:create"),
-            threadId,
-            projectId,
-            createdBy: "user",
-            creationSource: "web",
-            title: "Interrupted provider handoff",
-            modelSelection: CODEX_MODEL_SELECTION,
-            runtimeMode: "full-access",
-            interactionMode: "default",
-            branch: null,
-            worktreePath: null,
-          });
-          if (returning) {
-            yield* dispatch("initial", "Earlier successful request.", CODEX_MODEL_SELECTION);
-            yield* waitForRun(1, "completed");
-          }
-          yield* dispatch("source", originalPrompt, sourceSelection);
-          yield* Deferred.await(started);
-          if (queued) {
-            yield* dispatch("target", "Continue", targetSelection, true);
-            assert.equal(
-              (yield* orchestrator.getThreadProjection(threadId)).runs.at(-1)?.status,
-              "queued",
-            );
-          }
-          yield* Deferred.succeed(release, undefined);
-          yield* waitForRun(sourceOrdinal, status);
-          if (!queued) {
-            yield* dispatch("target", "Continue", targetSelection);
-          }
-          yield* waitForRun(sourceOrdinal + 1, "completed");
-          const projection = yield* orchestrator.getThreadProjection(threadId);
-          const targetRun = projection.runs.at(-1)!;
-          const handoff = projection.contextHandoffs.find(
-            (candidate) => candidate.id === targetRun.contextHandoffId,
-          );
-          assert.isDefined(handoff);
-          assert.equal(
-            handoff?.strategy,
-            returning ? "delta_since_target_last_seen" : "full_thread_summary",
-          );
-          assert.deepEqual(handoff?.coveredRunOrdinals, {
-            from: sourceOrdinal,
-            to: sourceOrdinal,
-          });
-          const delivered = (yield* Ref.get(capturedTurns)).at(-1)!;
-          const history = yield* Ref.get(injectedHistory);
-          const deliveredHistory = native ? yield* encodeJson(history) : delivered.text;
-          assert.include(deliveredHistory, originalPrompt);
-          assert.include(deliveredHistory, partialResponse);
-          assert.include(deliveredHistory, `run-status=${status}`);
-          if (native) {
-            assert.equal(delivered.text, "Continue");
-            assert.notInclude(deliveredHistory, '"text":"Continue"');
-            assert.include(deliveredHistory, '"role":"assistant"');
-            assert.include(deliveredHistory, '"role":"user"');
-            assert.equal(handoff?.delivery?.status, "injected");
-          } else {
-            assert.include(delivered.text, "User message:\nContinue");
-            assert.equal(handoff?.delivery?.status, "inline");
-          }
-          assert.notInclude(deliveredHistory, "Earlier successful request.");
-          yield* dispatch("back", "Finish the remaining work", sourceSelection);
-          yield* waitForRun(sourceOrdinal + 2, "completed");
-          const back = (yield* Ref.get(capturedTurns)).at(-1)!;
-          assert.notInclude(back.text, originalPrompt);
-          assert.notInclude(back.text, partialResponse);
-        }).pipe(
-          Effect.provide(
-            ProviderReplayHarness.layerWithRegistry(
-              {
-                name: `handoff-${status}-${queued}-${returning}`,
-                runtimePolicyOverride: {
-                  cwd,
-                  approvalPolicy: "never",
-                  sandboxPolicy: {
-                    type: "readOnly",
-                    access: { type: "fullAccess" },
-                    networkAccess: false,
-                  },
-                },
-              },
-              layerRegistry,
-            ),
-          ),
-        );
-      }),
-    ),
-  );
-
-  it.live("checks the queued provider's capability while the current provider stays running", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        for (const scenario of [
-          { activeSupportsQueue: false, selectedSupportsQueue: true },
-          { activeSupportsQueue: true, selectedSupportsQueue: false },
-        ]) {
-          const key = `active-${scenario.activeSupportsQueue}-selected-${scenario.selectedSupportsQueue}`;
-          const cwd = yield* checkpointWorkspace(`queued-capability-${key}`);
-          const capturedTurns = yield* Ref.make<ReadonlyArray<CapturedTurn>>([]);
-          const started = yield* Deferred.make<void>();
-          const scenarioThreadId = ThreadId.make(`thread:queued-capability:${key}`);
-          const layerRegistry = ProviderAdapterRegistry.layerFromAdapters([
-            makeTestAdapter({
-              instanceId: CODEX_MODEL_SELECTION.instanceId,
-              driver: CODEX_DRIVER,
-              capabilities: {
-                ...CodexProviderCapabilitiesV2,
-                turns: {
-                  ...CodexProviderCapabilitiesV2.turns,
-                  supportsQueuedMessages: scenario.activeSupportsQueue,
-                },
-              },
-              modelSelection: CODEX_MODEL_SELECTION,
-              responseByRunOrdinal: {},
-              capturedTurns,
-              holdFirstTurn: started,
-            }),
-            makeTestAdapter({
-              instanceId: CLAUDE_MODEL_SELECTION.instanceId,
-              driver: CLAUDE_DRIVER,
-              capabilities: {
-                ...ClaudeProviderCapabilitiesV2,
-                turns: {
-                  ...ClaudeProviderCapabilitiesV2.turns,
-                  supportsQueuedMessages: scenario.selectedSupportsQueue,
-                },
-              },
-              modelSelection: CLAUDE_MODEL_SELECTION,
-              responseByRunOrdinal: {},
-              capturedTurns,
-            }),
-          ]);
-          yield* Effect.gen(function* () {
-            const orchestrator = yield* Orchestrator.OrchestratorV2;
-            const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
-            yield* orchestrator.dispatch({
-              type: "thread.create",
-              createdBy: "user",
-              creationSource: "web",
-              commandId: CommandId.make(`command:queued-capability:create:${key}`),
-              threadId: scenarioThreadId,
-              projectId: ProjectId.make(`project:queued-capability:${key}`),
-              title: "Queued capability",
-              modelSelection: CODEX_MODEL_SELECTION,
-              runtimeMode: "full-access",
-              interactionMode: "default",
-              branch: null,
-              worktreePath: cwd,
-            });
-            yield* orchestrator.dispatch({
-              type: "message.dispatch",
-              createdBy: "user",
-              creationSource: "web",
-              commandId: CommandId.make(`command:queued-capability:first:${key}`),
-              threadId: scenarioThreadId,
-              messageId: MessageId.make(`message:queued-capability:first:${key}`),
-              text: "Current Codex turn",
-              attachments: [],
-              modelSelection: CODEX_MODEL_SELECTION,
-              dispatchMode: { type: "start_immediately" },
-            });
-            yield* Deferred.await(started);
-            yield* worker.drain();
-            const queue = orchestrator.dispatch({
-              type: "message.dispatch",
-              createdBy: "user",
-              creationSource: "web",
-              commandId: CommandId.make(`command:queued-capability:claude:${key}`),
-              threadId: scenarioThreadId,
-              messageId: MessageId.make(`message:queued-capability:claude:${key}`),
-              text: "Queued Claude turn",
-              attachments: [],
-              modelSelection: CLAUDE_MODEL_SELECTION,
-              dispatchMode: { type: "queue_after_active" },
-            });
-            if (scenario.selectedSupportsQueue) {
-              yield* queue;
-            } else {
-              const error = yield* queue.pipe(Effect.flip);
-              assert.instanceOf(error, Orchestrator.OrchestratorDispatchError);
-              assert.instanceOf(error.cause, CommandPolicyCapabilityUnsupportedError);
-              assert.equal(error.cause.capability, "queued_messages");
-            }
-            const projection = yield* orchestrator.getThreadProjection(scenarioThreadId);
-            assert.deepEqual(
-              projection.runs.map((run) => run.status),
-              scenario.selectedSupportsQueue ? ["running", "queued"] : ["running"],
-            );
-            assert.deepEqual(projection.thread.modelSelection, CODEX_MODEL_SELECTION);
-          }).pipe(
-            Effect.provide(
-              ProviderReplayHarness.layerWithRegistry(
-                {
-                  name: `queued-capability-${key}`,
-                  runtimePolicyOverride: {
-                    cwd,
-                    approvalPolicy: "never",
-                    sandboxPolicy: {
-                      type: "readOnly",
-                      access: { type: "fullAccess" },
-                      networkAccess: false,
-                    },
-                  },
-                },
-                layerRegistry,
-              ),
-            ),
-          );
-        }
-      }),
-    ),
-  );
-
-  it.live("hands completed Grok steering context to earlier queued Codex and later Claude", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const cwd = yield* checkpointWorkspace("queued-steer-provider-switch");
-        const capturedTurns = yield* Ref.make<ReadonlyArray<CapturedTurn>>([]);
-        const started = yield* Deferred.make<void>();
-        const layerRegistry = ProviderAdapterRegistry.layerFromAdapters([
-          makeTestAdapter({
-            instanceId: CODEX_MODEL_SELECTION.instanceId,
-            driver: CODEX_DRIVER,
-            capabilities: CodexProviderCapabilitiesV2,
-            modelSelection: CODEX_MODEL_SELECTION,
-            responseByRunOrdinal: { 2: "Codex queued response" },
-            capturedTurns,
-            holdFirstTurn: started,
-          }),
-          makeTestAdapter({
-            instanceId: CLAUDE_MODEL_SELECTION.instanceId,
-            driver: CLAUDE_DRIVER,
-            capabilities: ClaudeProviderCapabilitiesV2,
-            modelSelection: CLAUDE_MODEL_SELECTION,
-            responseByRunOrdinal: { 3: "Claude queued response" },
-            capturedTurns,
-          }),
+    Effect.gen(function* () {
+      const cwd = yield* checkpointWorkspace(`handoff-${status}-${queued}-${returning}`);
+      const capturedTurns = yield* Ref.make<ReadonlyArray<CapturedTurn>>([]);
+      const injectedHistory = yield* Ref.make<ReadonlyArray<unknown>>([]);
+      const started = yield* Deferred.make<void>();
+      const release = yield* Deferred.make<void>();
+      const sourceOrdinal = returning ? 2 : 1;
+      const sourceSelection = returning ? CLAUDE_MODEL_SELECTION : CODEX_MODEL_SELECTION;
+      const targetSelection = returning ? CODEX_MODEL_SELECTION : CLAUDE_MODEL_SELECTION;
+      const originalPrompt = "Keep the release marker violet and preserve the existing API.";
+      const partialResponse = "I checked the API and found the release configuration.";
+      const layerRegistry = ProviderAdapterRegistry.layerFromAdapters(
+        (
+          [
+            [CODEX_MODEL_SELECTION, CODEX_DRIVER, CodexProviderCapabilitiesV2],
+            [CLAUDE_MODEL_SELECTION, CLAUDE_DRIVER, ClaudeProviderCapabilitiesV2],
+          ] as const
+        ).map(([modelSelection, driver, capabilities]) =>
           makeTestAdapter({
-            instanceId: GROK_MODEL_SELECTION.instanceId,
-            driver: GROK_DRIVER,
-            capabilities: AcpProviderCapabilitiesV2,
-            modelSelection: GROK_MODEL_SELECTION,
-            responseByRunOrdinal: { 1: "Grok steered response" },
+            instanceId: modelSelection.instanceId,
+            driver,
+            capabilities,
+            modelSelection,
+            responseByRunOrdinal: { [sourceOrdinal]: partialResponse },
             capturedTurns,
-          }),
-        ]);
-        const queuedThreadId = ThreadId.make("thread:queued-steer-provider-switch");
-        const projection = yield* Effect.gen(function* () {
-          const orchestrator = yield* Orchestrator.OrchestratorV2;
-          const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
-          const eventSink = yield* EventSink.EventSinkV2;
-          const dispatch = (
-            key: string,
-            modelSelection: ModelSelection,
-            dispatchMode: Extract<
-              OrchestrationV2Command,
-              { readonly type: "message.dispatch" }
-            >["dispatchMode"],
-          ) =>
-            orchestrator.dispatch({
-              type: "message.dispatch",
-              createdBy: "user",
-              creationSource: "web",
-              commandId: CommandId.make(`command:queued-steer-provider-switch:${key}`),
-              threadId: queuedThreadId,
-              messageId: MessageId.make(`message:queued-steer-provider-switch:${key}`),
-              text: `Prompt ${key}`,
-              attachments: [],
-              modelSelection,
-              dispatchMode,
-            });
-          yield* orchestrator.dispatch({
-            type: "thread.create",
-            createdBy: "user",
-            creationSource: "web",
-            commandId: CommandId.make("command:queued-steer-provider-switch:create"),
-            threadId: queuedThreadId,
-            projectId: ProjectId.make("project:queued-steer-provider-switch"),
-            title: "Queued steer provider switch",
-            modelSelection: CODEX_MODEL_SELECTION,
-            runtimeMode: "full-access",
-            interactionMode: "default",
-            branch: null,
-            worktreePath: cwd,
-          });
-          yield* dispatch("first", CODEX_MODEL_SELECTION, { type: "start_immediately" });
-          yield* Deferred.await(started);
-          yield* worker.drain();
-          yield* dispatch("codex-queued", CODEX_MODEL_SELECTION, { type: "queue_after_active" });
-          yield* dispatch("claude-queued", CLAUDE_MODEL_SELECTION, { type: "queue_after_active" });
-          const beforeSteer = yield* orchestrator.getThreadProjection(queuedThreadId);
-          assert.deepEqual(
-            beforeSteer.runs.map((run) => run.status),
-            ["running", "queued", "queued"],
-          );
-          assert.equal(beforeSteer.thread.providerInstanceId, CODEX_MODEL_SELECTION.instanceId);
-          assert.lengthOf(beforeSteer.contextHandoffs, 0);
-          const now = yield* DateTime.now;
-          yield* eventSink.write({
-            events: [
-              {
-                id: EventId.make("event:queued-steer-provider-switch:first-turn-running"),
-                type: "provider-turn.updated",
-                threadId: queuedThreadId,
-                runId: beforeSteer.runs[0]!.id,
-                nodeId: beforeSteer.runs[0]!.rootNodeId!,
-                driver: CODEX_DRIVER,
-                providerInstanceId: CODEX_MODEL_SELECTION.instanceId,
-                occurredAt: now,
-                payload: {
-                  id: ProviderTurnId.make("provider-turn:queued-steer-provider-switch:first"),
-                  providerThreadId: beforeSteer.runs[0]!.providerThreadId!,
-                  nodeId: beforeSteer.runs[0]!.rootNodeId!,
-                  runAttemptId: beforeSteer.runs[0]!.activeAttemptId!,
-                  nativeTurnRef: null,
-                  ordinal: 1,
-                  status: "running",
-                  startedAt: now,
-                  completedAt: null,
-                },
-              },
-            ],
-          });
-          const queuedClaudeCompleted = yield* orchestrator.streamStoredEvents.pipe(
-            Stream.filter(
-              (event) =>
-                event.event.type === "run.updated" &&
-                event.event.runId === beforeSteer.runs[2]?.id &&
-                event.event.payload.status === "completed",
-            ),
-            Stream.runHead,
-            Effect.forkScoped,
-          );
-          yield* dispatch("grok-steer", GROK_MODEL_SELECTION, {
-            type: "steer_active",
-            targetRunId: beforeSteer.runs[0]!.id,
-          });
-          const afterSteer = yield* orchestrator.getThreadProjection(queuedThreadId);
-          assert.deepEqual(afterSteer.thread.modelSelection, GROK_MODEL_SELECTION);
-          const interruptedTurn = afterSteer.providerTurns.find(
-            (turn) => turn.runAttemptId === beforeSteer.runs[0]?.activeAttemptId,
-          )!;
-          const interruptedAttempt = afterSteer.attempts.find(
-            (attempt) => attempt.id === beforeSteer.runs[0]?.activeAttemptId,
-          )!;
-          const interruptedAt = yield* DateTime.now;
-          yield* eventSink.write({
-            events: [
-              {
-                id: EventId.make("event:queued-steer-provider-switch:first-turn-interrupted"),
-                type: "provider-turn.updated",
-                threadId: queuedThreadId,
-                runId: beforeSteer.runs[0]!.id,
-                nodeId: beforeSteer.runs[0]!.rootNodeId!,
-                driver: CODEX_DRIVER,
-                providerInstanceId: CODEX_MODEL_SELECTION.instanceId,
-                occurredAt: interruptedAt,
-                payload: {
-                  ...interruptedTurn,
-                  status: "interrupted",
-                  completedAt: interruptedAt,
-                },
-              },
-              {
-                id: EventId.make("event:queued-steer-provider-switch:first-attempt-interrupted"),
-                type: "run-attempt.updated",
-                threadId: queuedThreadId,
-                runId: beforeSteer.runs[0]!.id,
-                nodeId: beforeSteer.runs[0]!.rootNodeId!,
-                providerInstanceId: CODEX_MODEL_SELECTION.instanceId,
-                occurredAt: interruptedAt,
-                payload: {
-                  ...interruptedAttempt,
-                  status: "interrupted",
-                  completedAt: interruptedAt,
-                },
-              },
-            ],
+            ...(native && modelSelection.instanceId === targetSelection.instanceId
+              ? { injectedHistory }
+              : {}),
+            ...(modelSelection.instanceId === sourceSelection.instanceId
+              ? {
+                  failedRunOrdinals: new Set(status === "failed" ? [sourceOrdinal] : []),
+                  interruptedRunOrdinals: new Set(status === "interrupted" ? [sourceOrdinal] : []),
+                  cancelledRunOrdinals: new Set(status === "cancelled" ? [sourceOrdinal] : []),
+                  holdRunOrdinal: sourceOrdinal,
+                  holdFirstTurn: started,
+                  releaseFirstTurn: release,
+                }
+              : {}),
+          }),
+        ),
+      );
+      yield* Effect.gen(function* () {
+        const orchestrator = yield* Orchestrator.OrchestratorV2;
+        const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
+        const waitForRun = (
+          ordinal: number,
+          expectedStatus: "completed" | "failed" | "interrupted" | "cancelled",
+        ) =>
+          orchestrator.streamStoredEvents.pipe(
+            Stream.filter(
+              ({ event }) =>
+                event.type === "run.updated" &&
+                event.threadId === threadId &&
+                event.payload.ordinal === ordinal &&
+                event.payload.status === expectedStatus,
+            ),
+            Stream.runHead,
+            Effect.andThen(worker.drain()),
+          );
+        const dispatch = (
+          key: string,
+          text: string,
+          modelSelection: ModelSelection,
+          queue = false,
+        ) =>
+          orchestrator.dispatch({
+            type: "message.dispatch",
+            commandId: CommandId.make(`command:handoff:${key}`),
+            threadId,
+            messageId: MessageId.make(`message:handoff:${key}`),
+            createdBy: "user",
+            creationSource: "web",
+            text,
+            attachments: [],
+            modelSelection,
+            dispatchMode: { type: queue ? "queue_after_active" : "start_immediately" },
           });
-          yield* worker.drain();
-          yield* Fiber.join(queuedClaudeCompleted);
-          return yield* orchestrator.getThreadProjection(queuedThreadId);
-        }).pipe(
-          Effect.provide(
-            ProviderReplayHarness.layerWithRegistry(
-              {
-                name: "queued-steer-provider-switch",
-                runtimePolicyOverride: {
-                  cwd,
-                  approvalPolicy: "never",
-                  sandboxPolicy: {
-                    type: "readOnly",
-                    access: { type: "fullAccess" },
-                    networkAccess: false,
-                  },
+        yield* orchestrator.dispatch({
+          type: "thread.create",
+          commandId: CommandId.make("command:handoff:create"),
+          threadId,
+          projectId,
+          createdBy: "user",
+          creationSource: "web",
+          title: "Interrupted provider handoff",
+          modelSelection: CODEX_MODEL_SELECTION,
+          runtimeMode: "full-access",
+          interactionMode: "default",
+          branch: null,
+          worktreePath: null,
+        });
+        if (returning) {
+          yield* dispatch("initial", "Earlier successful request.", CODEX_MODEL_SELECTION);
+          yield* waitForRun(1, "completed");
+        }
+        yield* dispatch("source", originalPrompt, sourceSelection);
+        yield* Deferred.await(started);
+        if (queued) {
+          yield* dispatch("target", "Continue", targetSelection, true);
+          assert.equal(
+            (yield* orchestrator.getThreadProjection(threadId)).runs.at(-1)?.status,
+            "queued",
+          );
+        }
+        yield* Deferred.succeed(release, undefined);
+        yield* waitForRun(sourceOrdinal, status);
+        if (!queued) {
+          yield* dispatch("target", "Continue", targetSelection);
+        }
+        yield* waitForRun(sourceOrdinal + 1, "completed");
+        const projection = yield* orchestrator.getThreadProjection(threadId);
+        const targetRun = projection.runs.at(-1)!;
+        const handoff = projection.contextHandoffs.find(
+          (candidate) => candidate.id === targetRun.contextHandoffId,
+        );
+        assert.isDefined(handoff);
+        assert.equal(
+          handoff?.strategy,
+          returning ? "delta_since_target_last_seen" : "full_thread_summary",
+        );
+        assert.deepEqual(handoff?.coveredRunOrdinals, {
+          from: sourceOrdinal,
+          to: sourceOrdinal,
+        });
+        const delivered = (yield* Ref.get(capturedTurns)).at(-1)!;
+        const history = yield* Ref.get(injectedHistory);
+        const deliveredHistory = native ? yield* encodeJson(history) : delivered.text;
+        assert.include(deliveredHistory, originalPrompt);
+        assert.include(deliveredHistory, partialResponse);
+        assert.include(deliveredHistory, `run-status=${status}`);
+        if (native) {
+          assert.equal(delivered.text, "Continue");
+          assert.notInclude(deliveredHistory, '"text":"Continue"');
+          assert.include(deliveredHistory, '"role":"assistant"');
+          assert.include(deliveredHistory, '"role":"user"');
+          assert.equal(handoff?.delivery?.status, "injected");
+        } else {
+          assert.include(delivered.text, "User message:\nContinue");
+          assert.equal(handoff?.delivery?.status, "inline");
+        }
+        assert.notInclude(deliveredHistory, "Earlier successful request.");
+        yield* dispatch("back", "Finish the remaining work", sourceSelection);
+        yield* waitForRun(sourceOrdinal + 2, "completed");
+        const back = (yield* Ref.get(capturedTurns)).at(-1)!;
+        assert.notInclude(back.text, originalPrompt);
+        assert.notInclude(back.text, partialResponse);
+      }).pipe(
+        Effect.provide(
+          ProviderReplayHarness.layerWithRegistry(
+            {
+              name: `handoff-${status}-${queued}-${returning}`,
+              runtimePolicyOverride: {
+                cwd,
+                approvalPolicy: "never",
+                sandboxPolicy: {
+                  type: "readOnly",
+                  access: { type: "fullAccess" },
+                  networkAccess: false,
                 },
               },
-              layerRegistry,
-            ),
+            },
+            layerRegistry,
           ),
+        ),
+      );
+    }),
+  );
+
+  // regression: #15993 t3_worktree_handoff releases the Claude session that runs it. Nothing
+  // was left to report how the call ended, so it stayed running and the thread stayed Waiting.
+  it.live("interrupts the handoff tool call that releases its own session", () =>
+    Effect.gen(function* () {
+      const key = "handoff-cuts-off-tool-call";
+      const worktreePath = yield* checkpointWorkspace(key);
+      const capturedTurns = yield* Ref.make<ReadonlyArray<CapturedTurn>>([]);
+      const started = yield* Deferred.make<void>();
+      const toolCallId = TurnItemId.make(`turn-item:${key}`);
+      const scenarioThreadId = ThreadId.make(`thread:${key}`);
+      const layerRegistry = ProviderAdapterRegistry.layerFromAdapters([
+        makeTestAdapter({
+          instanceId: CLAUDE_MODEL_SELECTION.instanceId,
+          driver: CLAUDE_DRIVER,
+          capabilities: ClaudeProviderCapabilitiesV2,
+          modelSelection: CLAUDE_MODEL_SELECTION,
+          responseByRunOrdinal: {},
+          capturedTurns,
+          holdFirstTurn: started,
+          heldRunningToolCall: {
+            id: toolCallId,
+            toolName: "mcp__t3-code__t3_worktree_handoff",
+          },
+          backgroundTasksEndWithProcess: true,
+        }),
+        makeTestAdapter({
+          instanceId: CODEX_MODEL_SELECTION.instanceId,
+          driver: CODEX_DRIVER,
+          capabilities: CodexProviderCapabilitiesV2,
+          modelSelection: CODEX_MODEL_SELECTION,
+          responseByRunOrdinal: {},
+          capturedTurns,
+        }),
+      ]);
+      yield* Effect.gen(function* () {
+        const orchestrator = yield* Orchestrator.OrchestratorV2;
+        const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
+        const awaitEvent = (predicate: (event: OrchestrationV2DomainEvent) => boolean) =>
+          orchestrator.streamDomainEvents.pipe(
+            Stream.filter(predicate),
+            Stream.take(1),
+            Stream.runDrain,
+            Effect.forkScoped,
+          );
+        yield* orchestrator.dispatch({
+          type: "thread.create",
+          createdBy: "user",
+          creationSource: "web",
+          commandId: CommandId.make(`command:${key}:create`),
+          threadId: scenarioThreadId,
+          projectId: ProjectId.make(`project:${key}`),
+          title: "Tool call releases its session",
+          modelSelection: CLAUDE_MODEL_SELECTION,
+          runtimeMode: "full-access",
+          interactionMode: "default",
+          branch: null,
+          worktreePath: null,
+        });
+        const toolCallRunning = yield* awaitEvent(
+          (event) =>
+            event.type === "turn-item.updated" &&
+            event.payload.id === toolCallId &&
+            event.payload.status === "running",
         );
-        assert.deepEqual(
-          projection.runs.map((run) => [run.providerInstanceId, run.status]),
-          [
-            [GROK_MODEL_SELECTION.instanceId, "completed"],
-            [CODEX_MODEL_SELECTION.instanceId, "completed"],
-            [CLAUDE_MODEL_SELECTION.instanceId, "completed"],
-          ],
-        );
-        const turns = yield* Ref.get(capturedTurns);
-        assert.deepEqual(
-          turns.map((turn) => turn.driver),
-          [CODEX_DRIVER, GROK_DRIVER, CODEX_DRIVER, CLAUDE_DRIVER],
+        yield* orchestrator.dispatch({
+          type: "message.dispatch",
+          createdBy: "user",
+          creationSource: "web",
+          commandId: CommandId.make(`command:${key}:message`),
+          threadId: scenarioThreadId,
+          messageId: MessageId.make(`message:${key}`),
+          text: "Release this session",
+          attachments: [],
+          modelSelection: CLAUDE_MODEL_SELECTION,
+          dispatchMode: { type: "start_immediately" },
+        });
+        yield* Deferred.await(started);
+        yield* Fiber.join(toolCallRunning);
+
+        const runFailed = yield* awaitEvent(
+          (event) => event.type === "run.updated" && event.payload.status === "failed",
         );
-        assert.include(turns[2]?.text ?? "", "Grok steered response");
-        assert.include(turns[3]?.text ?? "", "Grok steered response");
-        assert.include(turns[3]?.text ?? "", "Codex queued response");
+        yield* orchestrator.dispatch({
+          type: "thread.metadata.update",
+          commandId: CommandId.make(`command:${key}:release`),
+          threadId: scenarioThreadId,
+          branch: `t3/${key}`,
+          worktreePath,
+          expectedWorktreePath: null,
+        });
+        yield* worker.drain();
+        yield* Fiber.join(runFailed);
+
+        const projection = yield* orchestrator.getThreadProjection(scenarioThreadId);
+        const toolCall = projection.turnItems.find((item) => item.id === toolCallId);
+        assert.equal(toolCall?.status, "interrupted");
+        assert.isNotNull(toolCall?.completedAt);
         assert.deepEqual(
-          projection.contextHandoffs.map((handoff) => handoff.targetRunId),
-          [projection.runs[0]?.id, projection.runs[1]?.id, projection.runs[2]?.id],
+          derivePendingBackgroundWork({
+            latestRun: projection.runs.at(-1),
+            providerThreads: projection.providerThreads,
+            turnItems: projection.turnItems,
+            activeProviderThreadId: projection.thread.activeProviderThreadId,
+            runs: projection.runs,
+          }),
+          [],
         );
-      }),
-    ),
+      }).pipe(
+        Effect.provide(ProviderReplayHarness.layerWithRegistry({ name: key }, layerRegistry)),
+      );
+    }),
   );
 
-  it.live("resumes a queued account switch without requiring a portable handoff", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const cwd = yield* checkpointWorkspace("queued-account-switch");
+  it.live("checks the queued provider's capability while the current provider stays running", () =>
+    Effect.gen(function* () {
+      for (const scenario of [
+        { activeSupportsQueue: false, selectedSupportsQueue: true },
+        { activeSupportsQueue: true, selectedSupportsQueue: false },
+      ]) {
+        const key = `active-${scenario.activeSupportsQueue}-selected-${scenario.selectedSupportsQueue}`;
+        const cwd = yield* checkpointWorkspace(`queued-capability-${key}`);
         const capturedTurns = yield* Ref.make<ReadonlyArray<CapturedTurn>>([]);
         const started = yield* Deferred.make<void>();
-        const alternateSelection: ModelSelection = {
-          ...CODEX_MODEL_SELECTION,
-          instanceId: ProviderInstanceId.make("codex-alternate"),
-        };
-        const alternateCapabilities = {
-          ...CodexProviderCapabilitiesV2,
-          canConsumeHandoffSummaries: false,
-        };
-        const adapters = [
+        const scenarioThreadId = ThreadId.make(`thread:queued-capability:${key}`);
+        const layerRegistry = ProviderAdapterRegistry.layerFromAdapters([
           makeTestAdapter({
             instanceId: CODEX_MODEL_SELECTION.instanceId,
             driver: CODEX_DRIVER,
-            capabilities: CodexProviderCapabilitiesV2,
+            capabilities: {
+              ...CodexProviderCapabilitiesV2,
+              turns: {
+                ...CodexProviderCapabilitiesV2.turns,
+                supportsQueuedMessages: scenario.activeSupportsQueue,
+              },
+            },
             modelSelection: CODEX_MODEL_SELECTION,
             responseByRunOrdinal: {},
             capturedTurns,
             holdFirstTurn: started,
           }),
           makeTestAdapter({
-            instanceId: alternateSelection.instanceId,
-            driver: CODEX_DRIVER,
-            capabilities: alternateCapabilities,
-            modelSelection: alternateSelection,
-            responseByRunOrdinal: { 2: "Alternate account complete" },
-            capturedTurns,
-          }),
-        ];
-        const layerRegistry = Layer.succeed(
-          ProviderAdapterRegistry.ProviderAdapterRegistryV2,
-          ProviderAdapterRegistry.ProviderAdapterRegistryV2.of({
-            get: (instanceId) => {
-              const adapter = adapters.find((candidate) => candidate.instanceId === instanceId);
-              return adapter === undefined
-                ? Effect.fail(
-                    new ProviderAdapterRegistry.ProviderAdapterRegistryLookupError({ instanceId }),
-                  )
-                : Effect.succeed(adapter);
-            },
-            list: () => Effect.succeed(adapters.map((adapter) => adapter.instanceId)),
-            getMetadata: (instanceId) => {
-              const adapter = adapters.find((candidate) => candidate.instanceId === instanceId);
-              return adapter === undefined
-                ? Effect.fail(
-                    new ProviderAdapterRegistry.ProviderAdapterRegistryLookupError({ instanceId }),
-                  )
-                : Effect.succeed({
-                    driver: CODEX_DRIVER,
-                    continuationKey: "codex:shared-native-account-history",
-                    enabled: true,
-                    capabilities:
-                      instanceId === alternateSelection.instanceId
-                        ? alternateCapabilities
-                        : CodexProviderCapabilitiesV2,
-                  });
+            instanceId: CLAUDE_MODEL_SELECTION.instanceId,
+            driver: CLAUDE_DRIVER,
+            capabilities: {
+              ...ClaudeProviderCapabilitiesV2,
+              turns: {
+                ...ClaudeProviderCapabilitiesV2.turns,
+                supportsQueuedMessages: scenario.selectedSupportsQueue,
+              },
             },
+            modelSelection: CLAUDE_MODEL_SELECTION,
+            responseByRunOrdinal: {},
+            capturedTurns,
           }),
-        );
-        const queuedThreadId = ThreadId.make("thread:queued-account-switch");
-        const projection = yield* Effect.gen(function* () {
+        ]);
+        yield* Effect.gen(function* () {
           const orchestrator = yield* Orchestrator.OrchestratorV2;
-          const eventSink = yield* EventSink.EventSinkV2;
           const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
           yield* orchestrator.dispatch({
             type: "thread.create",
             createdBy: "user",
             creationSource: "web",
-            commandId: CommandId.make("command:queued-account-switch:create"),
-            threadId: queuedThreadId,
-            projectId: ProjectId.make("project:queued-account-switch"),
-            title: "Queued account switch",
+            commandId: CommandId.make(`command:queued-capability:create:${key}`),
+            threadId: scenarioThreadId,
+            projectId: ProjectId.make(`project:queued-capability:${key}`),
+            title: "Queued capability",
             modelSelection: CODEX_MODEL_SELECTION,
             runtimeMode: "full-access",
             interactionMode: "default",
@@ -2318,73 +2101,47 @@ describe("orchestration v2 provider switching", () => {
             type: "message.dispatch",
             createdBy: "user",
             creationSource: "web",
-            commandId: CommandId.make("command:queued-account-switch:first"),
-            threadId: queuedThreadId,
-            messageId: MessageId.make("message:queued-account-switch:first"),
-            text: "First account turn",
+            commandId: CommandId.make(`command:queued-capability:first:${key}`),
+            threadId: scenarioThreadId,
+            messageId: MessageId.make(`message:queued-capability:first:${key}`),
+            text: "Current Codex turn",
             attachments: [],
             modelSelection: CODEX_MODEL_SELECTION,
             dispatchMode: { type: "start_immediately" },
           });
           yield* Deferred.await(started);
-          yield* orchestrator.dispatch({
+          yield* worker.drain();
+          const queue = orchestrator.dispatch({
             type: "message.dispatch",
             createdBy: "user",
             creationSource: "web",
-            commandId: CommandId.make("command:queued-account-switch:second"),
-            threadId: queuedThreadId,
-            messageId: MessageId.make("message:queued-account-switch:second"),
-            text: "Alternate account turn",
+            commandId: CommandId.make(`command:queued-capability:claude:${key}`),
+            threadId: scenarioThreadId,
+            messageId: MessageId.make(`message:queued-capability:claude:${key}`),
+            text: "Queued Claude turn",
             attachments: [],
-            modelSelection: alternateSelection,
+            modelSelection: CLAUDE_MODEL_SELECTION,
             dispatchMode: { type: "queue_after_active" },
           });
-          const queued = yield* orchestrator.getThreadProjection(queuedThreadId);
+          if (scenario.selectedSupportsQueue) {
+            yield* queue;
+          } else {
+            const error = yield* queue.pipe(Effect.flip);
+            assert.instanceOf(error, Orchestrator.OrchestratorDispatchError);
+            assert.instanceOf(error.cause, CommandPolicyCapabilityUnsupportedError);
+            assert.equal(error.cause.capability, "queued_messages");
+          }
+          const projection = yield* orchestrator.getThreadProjection(scenarioThreadId);
           assert.deepEqual(
-            queued.runs.map((run) => run.status),
-            ["running", "queued"],
-          );
-          assert.equal(queued.thread.providerInstanceId, CODEX_MODEL_SELECTION.instanceId);
-          const sourceNativeRef = queued.providerThreads.find(
-            (providerThread) => providerThread.id === queued.runs[0]?.providerThreadId,
-          )?.nativeThreadRef;
-          assert.isNotNull(sourceNativeRef);
-          const now = yield* DateTime.now;
-          yield* eventSink.write({
-            events: [
-              {
-                id: EventId.make("event:queued-account-switch:first-complete"),
-                type: "run.updated",
-                threadId: queuedThreadId,
-                runId: queued.runs[0]!.id,
-                providerInstanceId: CODEX_MODEL_SELECTION.instanceId,
-                occurredAt: now,
-                payload: { ...queued.runs[0]!, status: "completed", completedAt: now },
-              },
-            ],
-          });
-          yield* orchestrator.resumeQueuedRuns;
-          yield* orchestrator.streamStoredEvents.pipe(
-            Stream.filter(
-              (event) =>
-                event.event.type === "run.updated" &&
-                event.event.runId === queued.runs[1]?.id &&
-                event.event.payload.status === "completed",
-            ),
-            Stream.runHead,
+            projection.runs.map((run) => run.status),
+            scenario.selectedSupportsQueue ? ["running", "queued"] : ["running"],
           );
-          yield* worker.drain();
-          const delivered = yield* orchestrator.getThreadProjection(queuedThreadId);
-          const targetNativeRef = delivered.providerThreads.find(
-            (providerThread) => providerThread.id === delivered.runs[1]?.providerThreadId,
-          )?.nativeThreadRef;
-          assert.deepEqual(targetNativeRef, sourceNativeRef);
-          return delivered;
+          assert.deepEqual(projection.thread.modelSelection, CODEX_MODEL_SELECTION);
         }).pipe(
           Effect.provide(
             ProviderReplayHarness.layerWithRegistry(
               {
-                name: "queued-account-switch",
+                name: `queued-capability-${key}`,
                 runtimePolicyOverride: {
                   cwd,
                   approvalPolicy: "never",
@@ -2399,261 +2156,636 @@ describe("orchestration v2 provider switching", () => {
             ),
           ),
         );
-        assert.deepEqual(
-          projection.runs.map((run) => [run.providerInstanceId, run.status]),
-          [
-            [CODEX_MODEL_SELECTION.instanceId, "completed"],
-            [alternateSelection.instanceId, "completed"],
-          ],
-        );
-        assert.lengthOf(projection.contextHandoffs, 0);
-        assert.deepEqual(
-          (yield* Ref.get(capturedTurns)).map((turn) => turn.text),
-          ["First account turn", "Alternate account turn"],
-        );
-      }),
-    ),
+      }
+    }),
   );
 
-  it.live("finishes earlier queued Codex turns before handing context to queued Claude", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const cwd = yield* checkpointWorkspace("queued-provider-switch");
-        const capturedTurns = yield* Ref.make<ReadonlyArray<CapturedTurn>>([]);
-        const started = yield* Deferred.make<void>();
-        const layerRegistry = ProviderAdapterRegistry.layerFromAdapters([
-          makeTestAdapter({
-            instanceId: ProviderInstanceId.make("codex"),
-            driver: CODEX_DRIVER,
-            capabilities: CodexProviderCapabilitiesV2,
-            modelSelection: CODEX_MODEL_SELECTION,
-            responseByRunOrdinal: {
-              1: "Codex current turn complete",
-              2: "Codex first queued turn complete",
-              3: "Codex second queued turn complete",
-            },
-            capturedTurns,
-            holdFirstTurn: started,
-          }),
-          makeTestAdapter({
-            instanceId: ProviderInstanceId.make("claudeAgent"),
-            driver: CLAUDE_DRIVER,
-            capabilities: ClaudeProviderCapabilitiesV2,
-            modelSelection: CLAUDE_MODEL_SELECTION,
-            responseByRunOrdinal: { 4: "Claude turn complete" },
-            capturedTurns,
-          }),
-        ]);
-        const queuedThreadId = ThreadId.make("thread:queued-provider-switch");
-        const layerDatabase = SqlitePersistence.layerMemory;
-        const layerOutboxProvided = EffectOutbox.layer.pipe(Layer.provide(layerDatabase));
-        const projection = yield* Effect.gen(function* () {
-          const orchestrator = yield* Orchestrator.OrchestratorV2;
-          const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
-          const eventSink = yield* EventSink.EventSinkV2;
-          const effectOutbox = yield* EffectOutbox.EffectOutboxV2;
-          const dispatch = (ordinal: number, modelSelection: ModelSelection) =>
-            orchestrator.dispatch({
-              type: "message.dispatch",
-              createdBy: "user",
-              creationSource: "web",
-              commandId: CommandId.make(`command:queued-provider-switch:${ordinal}`),
-              threadId: queuedThreadId,
-              messageId: MessageId.make(`message:queued-provider-switch:${ordinal}`),
-              text: `Prompt ${ordinal}`,
-              attachments: [],
-              modelSelection,
-              dispatchMode: {
-                type: ordinal === 1 ? "start_immediately" : "queue_after_active",
-              },
-            });
-          yield* orchestrator.dispatch({
-            type: "thread.create",
+  it.live("hands completed Grok steering context to earlier queued Codex and later Claude", () =>
+    Effect.gen(function* () {
+      const cwd = yield* checkpointWorkspace("queued-steer-provider-switch");
+      const capturedTurns = yield* Ref.make<ReadonlyArray<CapturedTurn>>([]);
+      const started = yield* Deferred.make<void>();
+      const layerRegistry = ProviderAdapterRegistry.layerFromAdapters([
+        makeTestAdapter({
+          instanceId: CODEX_MODEL_SELECTION.instanceId,
+          driver: CODEX_DRIVER,
+          capabilities: CodexProviderCapabilitiesV2,
+          modelSelection: CODEX_MODEL_SELECTION,
+          responseByRunOrdinal: { 2: "Codex queued response" },
+          capturedTurns,
+          holdFirstTurn: started,
+        }),
+        makeTestAdapter({
+          instanceId: CLAUDE_MODEL_SELECTION.instanceId,
+          driver: CLAUDE_DRIVER,
+          capabilities: ClaudeProviderCapabilitiesV2,
+          modelSelection: CLAUDE_MODEL_SELECTION,
+          responseByRunOrdinal: { 3: "Claude queued response" },
+          capturedTurns,
+        }),
+        makeTestAdapter({
+          instanceId: GROK_MODEL_SELECTION.instanceId,
+          driver: GROK_DRIVER,
+          capabilities: AcpProviderCapabilitiesV2,
+          modelSelection: GROK_MODEL_SELECTION,
+          responseByRunOrdinal: { 1: "Grok steered response" },
+          capturedTurns,
+        }),
+      ]);
+      const queuedThreadId = ThreadId.make("thread:queued-steer-provider-switch");
+      const projection = yield* Effect.gen(function* () {
+        const orchestrator = yield* Orchestrator.OrchestratorV2;
+        const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
+        const eventSink = yield* EventSink.EventSinkV2;
+        const dispatch = (
+          key: string,
+          modelSelection: ModelSelection,
+          dispatchMode: Extract<
+            OrchestrationV2Command,
+            { readonly type: "message.dispatch" }
+          >["dispatchMode"],
+        ) =>
+          orchestrator.dispatch({
+            type: "message.dispatch",
             createdBy: "user",
             creationSource: "web",
-            commandId: CommandId.make("command:queued-provider-switch:create"),
+            commandId: CommandId.make(`command:queued-steer-provider-switch:${key}`),
             threadId: queuedThreadId,
-            projectId: ProjectId.make("project:queued-provider-switch"),
-            title: "Queued provider switch",
-            modelSelection: CODEX_MODEL_SELECTION,
-            runtimeMode: "full-access",
-            interactionMode: "default",
-            branch: null,
-            worktreePath: cwd,
+            messageId: MessageId.make(`message:queued-steer-provider-switch:${key}`),
+            text: `Prompt ${key}`,
+            attachments: [],
+            modelSelection,
+            dispatchMode,
           });
-          yield* dispatch(1, CODEX_MODEL_SELECTION);
-          yield* Deferred.await(started);
-          yield* dispatch(2, CODEX_MODEL_SELECTION);
-          yield* dispatch(3, CODEX_MODEL_SELECTION);
-          yield* dispatch(4, CLAUDE_MODEL_SELECTION);
-          const queued = yield* orchestrator.getThreadProjection(queuedThreadId);
-          assert.deepEqual(
-            queued.runs.map((run) => run.status),
-            ["running", "queued", "queued", "queued"],
-          );
-          assert.equal(queued.thread.activeProviderThreadId, queued.runs[0]?.providerThreadId);
-          assert.equal(queued.thread.providerInstanceId, CODEX_MODEL_SELECTION.instanceId);
-          assert.lengthOf(queued.contextHandoffs, 0);
-          const activeSession = queued.providerSessions.find(
-            (session) => session.providerInstanceId === CODEX_MODEL_SELECTION.instanceId,
-          );
-          assert.isDefined(activeSession);
-          const now = yield* DateTime.now;
-          yield* eventSink.write({
-            events: [
-              ...(["stopped", "error"] as const).map((status) => ({
-                id: EventId.make(`event:queued-provider-switch:dead-session:${status}`),
-                type: "provider-session.updated" as const,
-                threadId: queuedThreadId,
-                providerInstanceId: CODEX_MODEL_SELECTION.instanceId,
-                occurredAt: now,
-                payload: {
-                  ...activeSession!,
-                  id: ProviderSessionId.make(`provider-session:queued-provider-switch:${status}`),
-                  status,
-                },
-              })),
-              {
-                id: EventId.make("event:queued-provider-switch:first-response"),
-                type: "turn-item.updated",
-                threadId: queuedThreadId,
-                runId: queued.runs[0]!.id,
-                nodeId: queued.runs[0]!.rootNodeId!,
-                providerInstanceId: CODEX_MODEL_SELECTION.instanceId,
-                occurredAt: now,
-                payload: {
-                  id: TurnItemId.make("turn-item:queued-provider-switch:first-response"),
-                  threadId: queuedThreadId,
-                  runId: queued.runs[0]!.id,
-                  nodeId: queued.runs[0]!.rootNodeId!,
-                  providerThreadId: queued.runs[0]!.providerThreadId,
-                  providerTurnId: null,
-                  nativeItemRef: null,
-                  parentItemId: null,
-                  ordinal: 101,
-                  status: "completed",
-                  title: null,
-                  startedAt: now,
-                  completedAt: now,
-                  updatedAt: now,
-                  type: "assistant_message",
-                  messageId: MessageId.make("message:queued-provider-switch:first-response"),
-                  text: "Codex current turn complete",
-                  streaming: false,
-                },
+        yield* orchestrator.dispatch({
+          type: "thread.create",
+          createdBy: "user",
+          creationSource: "web",
+          commandId: CommandId.make("command:queued-steer-provider-switch:create"),
+          threadId: queuedThreadId,
+          projectId: ProjectId.make("project:queued-steer-provider-switch"),
+          title: "Queued steer provider switch",
+          modelSelection: CODEX_MODEL_SELECTION,
+          runtimeMode: "full-access",
+          interactionMode: "default",
+          branch: null,
+          worktreePath: cwd,
+        });
+        yield* dispatch("first", CODEX_MODEL_SELECTION, { type: "start_immediately" });
+        yield* Deferred.await(started);
+        yield* worker.drain();
+        yield* dispatch("codex-queued", CODEX_MODEL_SELECTION, { type: "queue_after_active" });
+        yield* dispatch("claude-queued", CLAUDE_MODEL_SELECTION, { type: "queue_after_active" });
+        const beforeSteer = yield* orchestrator.getThreadProjection(queuedThreadId);
+        assert.deepEqual(
+          beforeSteer.runs.map((run) => run.status),
+          ["running", "queued", "queued"],
+        );
+        assert.equal(beforeSteer.thread.providerInstanceId, CODEX_MODEL_SELECTION.instanceId);
+        assert.lengthOf(beforeSteer.contextHandoffs, 0);
+        const now = yield* DateTime.now;
+        yield* eventSink.write({
+          events: [
+            {
+              id: EventId.make("event:queued-steer-provider-switch:first-turn-running"),
+              type: "provider-turn.updated",
+              threadId: queuedThreadId,
+              runId: beforeSteer.runs[0]!.id,
+              nodeId: beforeSteer.runs[0]!.rootNodeId!,
+              driver: CODEX_DRIVER,
+              providerInstanceId: CODEX_MODEL_SELECTION.instanceId,
+              occurredAt: now,
+              payload: {
+                id: ProviderTurnId.make("provider-turn:queued-steer-provider-switch:first"),
+                providerThreadId: beforeSteer.runs[0]!.providerThreadId!,
+                nodeId: beforeSteer.runs[0]!.rootNodeId!,
+                runAttemptId: beforeSteer.runs[0]!.activeAttemptId!,
+                nativeTurnRef: null,
+                ordinal: 1,
+                status: "running",
+                startedAt: now,
+                completedAt: null,
               },
-              {
-                id: EventId.make("event:queued-provider-switch:first-complete"),
-                type: "run.updated",
-                threadId: queuedThreadId,
-                runId: queued.runs[0]!.id,
-                providerInstanceId: CODEX_MODEL_SELECTION.instanceId,
-                occurredAt: now,
-                payload: { ...queued.runs[0]!, status: "completed", completedAt: now },
+            },
+          ],
+        });
+        const queuedClaudeCompleted = yield* orchestrator.streamStoredEvents.pipe(
+          Stream.filter(
+            (event) =>
+              event.event.type === "run.updated" &&
+              event.event.runId === beforeSteer.runs[2]?.id &&
+              event.event.payload.status === "completed",
+          ),
+          Stream.runHead,
+          Effect.forkScoped,
+        );
+        yield* dispatch("grok-steer", GROK_MODEL_SELECTION, {
+          type: "steer_active",
+          targetRunId: beforeSteer.runs[0]!.id,
+        });
+        const afterSteer = yield* orchestrator.getThreadProjection(queuedThreadId);
+        assert.deepEqual(afterSteer.thread.modelSelection, GROK_MODEL_SELECTION);
+        const interruptedTurn = afterSteer.providerTurns.find(
+          (turn) => turn.runAttemptId === beforeSteer.runs[0]?.activeAttemptId,
+        )!;
+        const interruptedAttempt = afterSteer.attempts.find(
+          (attempt) => attempt.id === beforeSteer.runs[0]?.activeAttemptId,
+        )!;
+        const interruptedAt = yield* DateTime.now;
+        yield* eventSink.write({
+          events: [
+            {
+              id: EventId.make("event:queued-steer-provider-switch:first-turn-interrupted"),
+              type: "provider-turn.updated",
+              threadId: queuedThreadId,
+              runId: beforeSteer.runs[0]!.id,
+              nodeId: beforeSteer.runs[0]!.rootNodeId!,
+              driver: CODEX_DRIVER,
+              providerInstanceId: CODEX_MODEL_SELECTION.instanceId,
+              occurredAt: interruptedAt,
+              payload: {
+                ...interruptedTurn,
+                status: "interrupted",
+                completedAt: interruptedAt,
               },
-            ],
-          });
-          yield* orchestrator.resumeQueuedRuns;
-          yield* orchestrator.streamStoredEvents.pipe(
-            Stream.filter(
-              (event) =>
-                event.event.type === "run.updated" &&
-                event.event.runId === queued.runs[3]?.id &&
-                event.event.payload.status === "completed",
-            ),
-            Stream.runHead,
-          );
-          yield* worker.drain();
-          const detachEvents = yield* eventSink.stream({ threadId: queuedThreadId }).pipe(
-            Stream.filter((stored) => stored.event.type === "provider-session.detached"),
-            Stream.take(1),
-            Stream.runCollect,
-          );
-          assert.equal(
-            detachEvents[0]?.event.type === "provider-session.detached"
-              ? detachEvents[0].event.payload.providerSessionId
-              : null,
-            activeSession?.id,
-          );
-          const startCommandId = CommandId.make(
-            `command:system:start-queued:${queued.runs[3]!.id}`,
-          );
-          const detachEffects = (yield* effectOutbox.listByCommandId(startCommandId)).filter(
-            (effect) => effect.request.type === "provider-session.detach",
-          );
-          assert.deepEqual(
-            detachEffects.map((effect) =>
-              effect.request.type === "provider-session.detach"
-                ? effect.request.providerSessionId
-                : null,
-            ),
-            [activeSession?.id],
-          );
-          return yield* orchestrator.getThreadProjection(queuedThreadId);
-        }).pipe(
-          Effect.provide(
-            Layer.merge(
-              ProviderReplayHarness.layerWithRegistry(
-                {
-                  name: "queued-provider-switch",
-                  runtimePolicyOverride: {
-                    cwd,
-                    approvalPolicy: "never",
-                    sandboxPolicy: {
-                      type: "readOnly",
-                      access: { type: "fullAccess" },
-                      networkAccess: false,
-                    },
-                  },
+            },
+            {
+              id: EventId.make("event:queued-steer-provider-switch:first-attempt-interrupted"),
+              type: "run-attempt.updated",
+              threadId: queuedThreadId,
+              runId: beforeSteer.runs[0]!.id,
+              nodeId: beforeSteer.runs[0]!.rootNodeId!,
+              providerInstanceId: CODEX_MODEL_SELECTION.instanceId,
+              occurredAt: interruptedAt,
+              payload: {
+                ...interruptedAttempt,
+                status: "interrupted",
+                completedAt: interruptedAt,
+              },
+            },
+          ],
+        });
+        yield* worker.drain();
+        yield* Fiber.join(queuedClaudeCompleted);
+        return yield* orchestrator.getThreadProjection(queuedThreadId);
+      }).pipe(
+        Effect.provide(
+          ProviderReplayHarness.layerWithRegistry(
+            {
+              name: "queued-steer-provider-switch",
+              runtimePolicyOverride: {
+                cwd,
+                approvalPolicy: "never",
+                sandboxPolicy: {
+                  type: "readOnly",
+                  access: { type: "fullAccess" },
+                  networkAccess: false,
                 },
-                layerRegistry,
-                { databaseLayer: layerDatabase },
-              ),
-              layerOutboxProvided,
-            ),
+              },
+            },
+            layerRegistry,
           ),
-        );
-        const turns = yield* Ref.get(capturedTurns);
+        ),
+      );
+      assert.deepEqual(
+        projection.runs.map((run) => [run.providerInstanceId, run.status]),
+        [
+          [GROK_MODEL_SELECTION.instanceId, "completed"],
+          [CODEX_MODEL_SELECTION.instanceId, "completed"],
+          [CLAUDE_MODEL_SELECTION.instanceId, "completed"],
+        ],
+      );
+      const turns = yield* Ref.get(capturedTurns);
+      assert.deepEqual(
+        turns.map((turn) => turn.driver),
+        [CODEX_DRIVER, GROK_DRIVER, CODEX_DRIVER, CLAUDE_DRIVER],
+      );
+      assert.include(turns[2]?.text ?? "", "Grok steered response");
+      assert.include(turns[3]?.text ?? "", "Grok steered response");
+      assert.include(turns[3]?.text ?? "", "Codex queued response");
+      assert.deepEqual(
+        projection.contextHandoffs.map((handoff) => handoff.targetRunId),
+        [projection.runs[0]?.id, projection.runs[1]?.id, projection.runs[2]?.id],
+      );
+    }),
+  );
+
+  it.live("resumes a queued account switch without requiring a portable handoff", () =>
+    Effect.gen(function* () {
+      const cwd = yield* checkpointWorkspace("queued-account-switch");
+      const capturedTurns = yield* Ref.make<ReadonlyArray<CapturedTurn>>([]);
+      const started = yield* Deferred.make<void>();
+      const alternateSelection: ModelSelection = {
+        ...CODEX_MODEL_SELECTION,
+        instanceId: ProviderInstanceId.make("codex-alternate"),
+      };
+      const alternateCapabilities = {
+        ...CodexProviderCapabilitiesV2,
+        canConsumeHandoffSummaries: false,
+      };
+      const adapters = [
+        makeTestAdapter({
+          instanceId: CODEX_MODEL_SELECTION.instanceId,
+          driver: CODEX_DRIVER,
+          capabilities: CodexProviderCapabilitiesV2,
+          modelSelection: CODEX_MODEL_SELECTION,
+          responseByRunOrdinal: {},
+          capturedTurns,
+          holdFirstTurn: started,
+        }),
+        makeTestAdapter({
+          instanceId: alternateSelection.instanceId,
+          driver: CODEX_DRIVER,
+          capabilities: alternateCapabilities,
+          modelSelection: alternateSelection,
+          responseByRunOrdinal: { 2: "Alternate account complete" },
+          capturedTurns,
+        }),
+      ];
+      const layerRegistry = Layer.succeed(
+        ProviderAdapterRegistry.ProviderAdapterRegistryV2,
+        ProviderAdapterRegistry.ProviderAdapterRegistryV2.of({
+          get: (instanceId) => {
+            const adapter = adapters.find((candidate) => candidate.instanceId === instanceId);
+            return adapter === undefined
+              ? Effect.fail(
+                  new ProviderAdapterRegistry.ProviderAdapterRegistryLookupError({ instanceId }),
+                )
+              : Effect.succeed(adapter);
+          },
+          list: () => Effect.succeed(adapters.map((adapter) => adapter.instanceId)),
+          getMetadata: (instanceId) => {
+            const adapter = adapters.find((candidate) => candidate.instanceId === instanceId);
+            return adapter === undefined
+              ? Effect.fail(
+                  new ProviderAdapterRegistry.ProviderAdapterRegistryLookupError({ instanceId }),
+                )
+              : Effect.succeed({
+                  driver: CODEX_DRIVER,
+                  continuationKey: "codex:shared-native-account-history",
+                  enabled: true,
+                  capabilities:
+                    instanceId === alternateSelection.instanceId
+                      ? alternateCapabilities
+                      : CodexProviderCapabilitiesV2,
+                });
+          },
+        }),
+      );
+      const queuedThreadId = ThreadId.make("thread:queued-account-switch");
+      const projection = yield* Effect.gen(function* () {
+        const orchestrator = yield* Orchestrator.OrchestratorV2;
+        const eventSink = yield* EventSink.EventSinkV2;
+        const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
+        yield* orchestrator.dispatch({
+          type: "thread.create",
+          createdBy: "user",
+          creationSource: "web",
+          commandId: CommandId.make("command:queued-account-switch:create"),
+          threadId: queuedThreadId,
+          projectId: ProjectId.make("project:queued-account-switch"),
+          title: "Queued account switch",
+          modelSelection: CODEX_MODEL_SELECTION,
+          runtimeMode: "full-access",
+          interactionMode: "default",
+          branch: null,
+          worktreePath: cwd,
+        });
+        yield* orchestrator.dispatch({
+          type: "message.dispatch",
+          createdBy: "user",
+          creationSource: "web",
+          commandId: CommandId.make("command:queued-account-switch:first"),
+          threadId: queuedThreadId,
+          messageId: MessageId.make("message:queued-account-switch:first"),
+          text: "First account turn",
+          attachments: [],
+          modelSelection: CODEX_MODEL_SELECTION,
+          dispatchMode: { type: "start_immediately" },
+        });
+        yield* Deferred.await(started);
+        yield* orchestrator.dispatch({
+          type: "message.dispatch",
+          createdBy: "user",
+          creationSource: "web",
+          commandId: CommandId.make("command:queued-account-switch:second"),
+          threadId: queuedThreadId,
+          messageId: MessageId.make("message:queued-account-switch:second"),
+          text: "Alternate account turn",
+          attachments: [],
+          modelSelection: alternateSelection,
+          dispatchMode: { type: "queue_after_active" },
+        });
+        const queued = yield* orchestrator.getThreadProjection(queuedThreadId);
         assert.deepEqual(
-          projection.runs.map((run) => [run.providerInstanceId, run.status]),
-          [
-            ["codex", "completed"],
-            ["codex", "completed"],
-            ["codex", "completed"],
-            ["claudeAgent", "completed"],
+          queued.runs.map((run) => run.status),
+          ["running", "queued"],
+        );
+        assert.equal(queued.thread.providerInstanceId, CODEX_MODEL_SELECTION.instanceId);
+        const sourceNativeRef = queued.providerThreads.find(
+          (providerThread) => providerThread.id === queued.runs[0]?.providerThreadId,
+        )?.nativeThreadRef;
+        assert.isNotNull(sourceNativeRef);
+        const now = yield* DateTime.now;
+        yield* eventSink.write({
+          events: [
+            {
+              id: EventId.make("event:queued-account-switch:first-complete"),
+              type: "run.updated",
+              threadId: queuedThreadId,
+              runId: queued.runs[0]!.id,
+              providerInstanceId: CODEX_MODEL_SELECTION.instanceId,
+              occurredAt: now,
+              payload: { ...queued.runs[0]!, status: "completed", completedAt: now },
+            },
           ],
+        });
+        yield* orchestrator.resumeQueuedRuns;
+        yield* orchestrator.streamStoredEvents.pipe(
+          Stream.filter(
+            (event) =>
+              event.event.type === "run.updated" &&
+              event.event.runId === queued.runs[1]?.id &&
+              event.event.payload.status === "completed",
+          ),
+          Stream.runHead,
         );
+        yield* worker.drain();
+        const delivered = yield* orchestrator.getThreadProjection(queuedThreadId);
+        const targetNativeRef = delivered.providerThreads.find(
+          (providerThread) => providerThread.id === delivered.runs[1]?.providerThreadId,
+        )?.nativeThreadRef;
+        assert.deepEqual(targetNativeRef, sourceNativeRef);
+        return delivered;
+      }).pipe(
+        Effect.provide(
+          ProviderReplayHarness.layerWithRegistry(
+            {
+              name: "queued-account-switch",
+              runtimePolicyOverride: {
+                cwd,
+                approvalPolicy: "never",
+                sandboxPolicy: {
+                  type: "readOnly",
+                  access: { type: "fullAccess" },
+                  networkAccess: false,
+                },
+              },
+            },
+            layerRegistry,
+          ),
+        ),
+      );
+      assert.deepEqual(
+        projection.runs.map((run) => [run.providerInstanceId, run.status]),
+        [
+          [CODEX_MODEL_SELECTION.instanceId, "completed"],
+          [alternateSelection.instanceId, "completed"],
+        ],
+      );
+      assert.lengthOf(projection.contextHandoffs, 0);
+      assert.deepEqual(
+        (yield* Ref.get(capturedTurns)).map((turn) => turn.text),
+        ["First account turn", "Alternate account turn"],
+      );
+    }),
+  );
+
+  it.live("finishes earlier queued Codex turns before handing context to queued Claude", () =>
+    Effect.gen(function* () {
+      const cwd = yield* checkpointWorkspace("queued-provider-switch");
+      const capturedTurns = yield* Ref.make<ReadonlyArray<CapturedTurn>>([]);
+      const started = yield* Deferred.make<void>();
+      const layerRegistry = ProviderAdapterRegistry.layerFromAdapters([
+        makeTestAdapter({
+          instanceId: ProviderInstanceId.make("codex"),
+          driver: CODEX_DRIVER,
+          capabilities: CodexProviderCapabilitiesV2,
+          modelSelection: CODEX_MODEL_SELECTION,
+          responseByRunOrdinal: {
+            1: "Codex current turn complete",
+            2: "Codex first queued turn complete",
+            3: "Codex second queued turn complete",
+          },
+          capturedTurns,
+          holdFirstTurn: started,
+        }),
+        makeTestAdapter({
+          instanceId: ProviderInstanceId.make("claudeAgent"),
+          driver: CLAUDE_DRIVER,
+          capabilities: ClaudeProviderCapabilitiesV2,
+          modelSelection: CLAUDE_MODEL_SELECTION,
+          responseByRunOrdinal: { 4: "Claude turn complete" },
+          capturedTurns,
+        }),
+      ]);
+      const queuedThreadId = ThreadId.make("thread:queued-provider-switch");
+      const layerDatabase = SqlitePersistence.layerMemory;
+      const layerOutboxProvided = EffectOutbox.layer.pipe(Layer.provide(layerDatabase));
+      const projection = yield* Effect.gen(function* () {
+        const orchestrator = yield* Orchestrator.OrchestratorV2;
+        const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
+        const eventSink = yield* EventSink.EventSinkV2;
+        const effectOutbox = yield* EffectOutbox.EffectOutboxV2;
+        const dispatch = (ordinal: number, modelSelection: ModelSelection) =>
+          orchestrator.dispatch({
+            type: "message.dispatch",
+            createdBy: "user",
+            creationSource: "web",
+            commandId: CommandId.make(`command:queued-provider-switch:${ordinal}`),
+            threadId: queuedThreadId,
+            messageId: MessageId.make(`message:queued-provider-switch:${ordinal}`),
+            text: `Prompt ${ordinal}`,
+            attachments: [],
+            modelSelection,
+            dispatchMode: {
+              type: ordinal === 1 ? "start_immediately" : "queue_after_active",
+            },
+          });
+        yield* orchestrator.dispatch({
+          type: "thread.create",
+          createdBy: "user",
+          creationSource: "web",
+          commandId: CommandId.make("command:queued-provider-switch:create"),
+          threadId: queuedThreadId,
+          projectId: ProjectId.make("project:queued-provider-switch"),
+          title: "Queued provider switch",
+          modelSelection: CODEX_MODEL_SELECTION,
+          runtimeMode: "full-access",
+          interactionMode: "default",
+          branch: null,
+          worktreePath: cwd,
+        });
+        yield* dispatch(1, CODEX_MODEL_SELECTION);
+        yield* Deferred.await(started);
+        yield* dispatch(2, CODEX_MODEL_SELECTION);
+        yield* dispatch(3, CODEX_MODEL_SELECTION);
+        yield* dispatch(4, CLAUDE_MODEL_SELECTION);
+        const queued = yield* orchestrator.getThreadProjection(queuedThreadId);
         assert.deepEqual(
-          turns.map((turn) => [turn.driver, turn.text.includes("Prompt 4")]),
-          [
-            ["codex", false],
-            ["codex", false],
-            ["codex", false],
-            ["claudeAgent", true],
+          queued.runs.map((run) => run.status),
+          ["running", "queued", "queued", "queued"],
+        );
+        assert.equal(queued.thread.activeProviderThreadId, queued.runs[0]?.providerThreadId);
+        assert.equal(queued.thread.providerInstanceId, CODEX_MODEL_SELECTION.instanceId);
+        assert.lengthOf(queued.contextHandoffs, 0);
+        const activeSession = queued.providerSessions.find(
+          (session) => session.providerInstanceId === CODEX_MODEL_SELECTION.instanceId,
+        );
+        assert.isDefined(activeSession);
+        const now = yield* DateTime.now;
+        yield* eventSink.write({
+          events: [
+            ...(["stopped", "error"] as const).map((status) => ({
+              id: EventId.make(`event:queued-provider-switch:dead-session:${status}`),
+              type: "provider-session.updated" as const,
+              threadId: queuedThreadId,
+              providerInstanceId: CODEX_MODEL_SELECTION.instanceId,
+              occurredAt: now,
+              payload: {
+                ...activeSession!,
+                id: ProviderSessionId.make(`provider-session:queued-provider-switch:${status}`),
+                status,
+              },
+            })),
+            {
+              id: EventId.make("event:queued-provider-switch:first-response"),
+              type: "turn-item.updated",
+              threadId: queuedThreadId,
+              runId: queued.runs[0]!.id,
+              nodeId: queued.runs[0]!.rootNodeId!,
+              providerInstanceId: CODEX_MODEL_SELECTION.instanceId,
+              occurredAt: now,
+              payload: {
+                id: TurnItemId.make("turn-item:queued-provider-switch:first-response"),
+                threadId: queuedThreadId,
+                runId: queued.runs[0]!.id,
+                nodeId: queued.runs[0]!.rootNodeId!,
+                providerThreadId: queued.runs[0]!.providerThreadId,
+                providerTurnId: null,
+                nativeItemRef: null,
+                parentItemId: null,
+                ordinal: 101,
+                status: "completed",
+                title: null,
+                startedAt: now,
+                completedAt: now,
+                updatedAt: now,
+                type: "assistant_message",
+                messageId: MessageId.make("message:queued-provider-switch:first-response"),
+                text: "Codex current turn complete",
+                streaming: false,
+              },
+            },
+            {
+              id: EventId.make("event:queued-provider-switch:first-complete"),
+              type: "run.updated",
+              threadId: queuedThreadId,
+              runId: queued.runs[0]!.id,
+              providerInstanceId: CODEX_MODEL_SELECTION.instanceId,
+              occurredAt: now,
+              payload: { ...queued.runs[0]!, status: "completed", completedAt: now },
+            },
           ],
+        });
+        yield* orchestrator.resumeQueuedRuns;
+        yield* orchestrator.streamStoredEvents.pipe(
+          Stream.filter(
+            (event) =>
+              event.event.type === "run.updated" &&
+              event.event.runId === queued.runs[3]?.id &&
+              event.event.payload.status === "completed",
+          ),
+          Stream.runHead,
         );
-        assert.lengthOf(projection.contextHandoffs, 1);
-        assert.equal(projection.contextHandoffs[0]?.targetRunId, projection.runs[3]?.id);
-        const handoffItem = projection.turnItems.find(
-          (item) => item.type === "handoff" && item.runId === projection.runs[3]?.id,
+        yield* worker.drain();
+        const detachEvents = yield* eventSink.stream({ threadId: queuedThreadId }).pipe(
+          Stream.filter((stored) => stored.event.type === "provider-session.detached"),
+          Stream.take(1),
+          Stream.runCollect,
         );
         assert.equal(
-          handoffItem?.type === "handoff" ? handoffItem.contextHandoffId : null,
-          projection.contextHandoffs[0]?.id,
+          detachEvents[0]?.event.type === "provider-session.detached"
+            ? detachEvents[0].event.payload.providerSessionId
+            : null,
+          activeSession?.id,
         );
-        const queuedUserItem = projection.turnItems.find(
-          (item) => item.type === "user_message" && item.runId === projection.runs[3]?.id,
+        const startCommandId = CommandId.make(`command:system:start-queued:${queued.runs[3]!.id}`);
+        const detachEffects = (yield* effectOutbox.listByCommandId(startCommandId)).filter(
+          (effect) => effect.request.type === "provider-session.detach",
         );
-        assert.isBelow(handoffItem?.ordinal ?? Infinity, queuedUserItem?.ordinal ?? -Infinity);
-        assert.include(
-          handoffItem?.type === "handoff" ? handoffItem.summary : "",
-          "Codex second queued turn complete",
+        assert.deepEqual(
+          detachEffects.map((effect) =>
+            effect.request.type === "provider-session.detach"
+              ? effect.request.providerSessionId
+              : null,
+          ),
+          [activeSession?.id],
         );
-        assert.include(turns[3]?.text ?? "", "Codex current turn complete");
-        assert.include(turns[3]?.text ?? "", "Codex first queued turn complete");
-        assert.include(turns[3]?.text ?? "", "Codex second queued turn complete");
-      }),
-    ),
+        return yield* orchestrator.getThreadProjection(queuedThreadId);
+      }).pipe(
+        Effect.provide(
+          Layer.merge(
+            ProviderReplayHarness.layerWithRegistry(
+              {
+                name: "queued-provider-switch",
+                runtimePolicyOverride: {
+                  cwd,
+                  approvalPolicy: "never",
+                  sandboxPolicy: {
+                    type: "readOnly",
+                    access: { type: "fullAccess" },
+                    networkAccess: false,
+                  },
+                },
+              },
+              layerRegistry,
+              { databaseLayer: layerDatabase },
+            ),
+            layerOutboxProvided,
+          ),
+        ),
+      );
+      const turns = yield* Ref.get(capturedTurns);
+      assert.deepEqual(
+        projection.runs.map((run) => [run.providerInstanceId, run.status]),
+        [
+          ["codex", "completed"],
+          ["codex", "completed"],
+          ["codex", "completed"],
+          ["claudeAgent", "completed"],
+        ],
+      );
+      assert.deepEqual(
+        turns.map((turn) => [turn.driver, turn.text.includes("Prompt 4")]),
+        [
+          ["codex", false],
+          ["codex", false],
+          ["codex", false],
+          ["claudeAgent", true],
+        ],
+      );
+      assert.lengthOf(projection.contextHandoffs, 1);
+      assert.equal(projection.contextHandoffs[0]?.targetRunId, projection.runs[3]?.id);
+      const handoffItem = projection.turnItems.find(
+        (item) => item.type === "handoff" && item.runId === projection.runs[3]?.id,
+      );
+      assert.equal(
+        handoffItem?.type === "handoff" ? handoffItem.contextHandoffId : null,
+        projection.contextHandoffs[0]?.id,
+      );
+      const queuedUserItem = projection.turnItems.find(
+        (item) => item.type === "user_message" && item.runId === projection.runs[3]?.id,
+      );
+      assert.isBelow(handoffItem?.ordinal ?? Infinity, queuedUserItem?.ordinal ?? -Infinity);
+      assert.include(
+        handoffItem?.type === "handoff" ? handoffItem.summary : "",
+        "Codex second queued turn complete",
+      );
+      assert.include(turns[3]?.text ?? "", "Codex current turn complete");
+      assert.include(turns[3]?.text ?? "", "Codex first queued turn complete");
+      assert.include(turns[3]?.text ?? "", "Codex second queued turn complete");
+    }),
   );
 
   // regression: #20343 sending to an instance with separate history must release the old session
@@ -2675,225 +2807,223 @@ describe("orchestration v2 provider switching", () => {
       { background: true, queued: true, sharedHistory: true },
     ],
   ] as const)("%s", ([, { background, queued, sharedHistory }]) =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const cwd = yield* checkpointWorkspace("handoff-releases-session");
-        const capturedTurns = yield* Ref.make<ReadonlyArray<CapturedTurn>>([]);
-        const backgroundWork = yield* Ref.make(background);
-        const closedSessions = yield* Ref.make<ReadonlyArray<string>>([]);
-        const firstStarted = yield* Deferred.make<void>();
-        const releaseFirst = yield* Deferred.make<void>();
-        const secondSelection: ModelSelection = {
-          ...CLAUDE_MODEL_SELECTION,
-          instanceId: ProviderInstanceId.make("claude-second-account"),
-        };
-        const adapters = [
-          makeTestAdapter({
-            instanceId: CLAUDE_MODEL_SELECTION.instanceId,
-            driver: CLAUDE_DRIVER,
-            capabilities: ClaudeProviderCapabilitiesV2,
-            modelSelection: CLAUDE_MODEL_SELECTION,
-            responseByRunOrdinal: { 1: "First account complete" },
-            capturedTurns,
-            backgroundWork,
-            closedSessions,
-            ...(queued ? { holdFirstTurn: firstStarted, releaseFirstTurn: releaseFirst } : {}),
-          }),
-          makeTestAdapter({
-            instanceId: secondSelection.instanceId,
-            driver: CLAUDE_DRIVER,
-            capabilities: ClaudeProviderCapabilitiesV2,
-            modelSelection: secondSelection,
-            responseByRunOrdinal: { 2: "Second account complete" },
-            capturedTurns,
-          }),
-        ];
-        // Without a shared continuation key, each Claude instance owns its own native history.
-        const layerRegistry = sharedHistory
-          ? Layer.succeed(
-              ProviderAdapterRegistry.ProviderAdapterRegistryV2,
-              ProviderAdapterRegistry.ProviderAdapterRegistryV2.of({
-                get: (instanceId) => {
-                  const adapter = adapters.find((candidate) => candidate.instanceId === instanceId);
-                  return adapter === undefined
-                    ? Effect.fail(
-                        new ProviderAdapterRegistry.ProviderAdapterRegistryLookupError({
-                          instanceId,
-                        }),
-                      )
-                    : Effect.succeed(adapter);
-                },
-                list: () => Effect.succeed(adapters.map((adapter) => adapter.instanceId)),
-                getMetadata: () =>
-                  Effect.succeed({
-                    driver: CLAUDE_DRIVER,
-                    continuationKey: "claude:shared-native-account-history",
-                    enabled: true,
-                    capabilities: ClaudeProviderCapabilitiesV2,
-                  }),
-              }),
-            )
-          : ProviderAdapterRegistry.layerFromAdapters(adapters);
-        const handoffThreadId = ThreadId.make("thread:handoff-releases-session");
-        yield* Effect.gen(function* () {
-          const orchestrator = yield* Orchestrator.OrchestratorV2;
-          const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
-          const send = (ordinal: number, modelSelection: ModelSelection, attempt = "") =>
-            orchestrator.dispatch({
-              type: "message.dispatch",
-              createdBy: "user",
-              creationSource: "web",
-              commandId: CommandId.make(`command:handoff-releases-session:${ordinal}${attempt}`),
-              threadId: handoffThreadId,
-              messageId: MessageId.make(`message:handoff-releases-session:${ordinal}${attempt}`),
-              text: `Prompt ${ordinal}`,
-              attachments: [],
-              modelSelection,
-              dispatchMode: { type: queued ? "queue_after_active" : "start_immediately" },
-            });
-          yield* orchestrator.dispatch({
-            type: "thread.create",
+    Effect.gen(function* () {
+      const cwd = yield* checkpointWorkspace("handoff-releases-session");
+      const capturedTurns = yield* Ref.make<ReadonlyArray<CapturedTurn>>([]);
+      const backgroundWork = yield* Ref.make(background);
+      const closedSessions = yield* Ref.make<ReadonlyArray<string>>([]);
+      const firstStarted = yield* Deferred.make<void>();
+      const releaseFirst = yield* Deferred.make<void>();
+      const secondSelection: ModelSelection = {
+        ...CLAUDE_MODEL_SELECTION,
+        instanceId: ProviderInstanceId.make("claude-second-account"),
+      };
+      const adapters = [
+        makeTestAdapter({
+          instanceId: CLAUDE_MODEL_SELECTION.instanceId,
+          driver: CLAUDE_DRIVER,
+          capabilities: ClaudeProviderCapabilitiesV2,
+          modelSelection: CLAUDE_MODEL_SELECTION,
+          responseByRunOrdinal: { 1: "First account complete" },
+          capturedTurns,
+          backgroundWork,
+          closedSessions,
+          ...(queued ? { holdFirstTurn: firstStarted, releaseFirstTurn: releaseFirst } : {}),
+        }),
+        makeTestAdapter({
+          instanceId: secondSelection.instanceId,
+          driver: CLAUDE_DRIVER,
+          capabilities: ClaudeProviderCapabilitiesV2,
+          modelSelection: secondSelection,
+          responseByRunOrdinal: { 2: "Second account complete" },
+          capturedTurns,
+        }),
+      ];
+      // Without a shared continuation key, each Claude instance owns its own native history.
+      const layerRegistry = sharedHistory
+        ? Layer.succeed(
+            ProviderAdapterRegistry.ProviderAdapterRegistryV2,
+            ProviderAdapterRegistry.ProviderAdapterRegistryV2.of({
+              get: (instanceId) => {
+                const adapter = adapters.find((candidate) => candidate.instanceId === instanceId);
+                return adapter === undefined
+                  ? Effect.fail(
+                      new ProviderAdapterRegistry.ProviderAdapterRegistryLookupError({
+                        instanceId,
+                      }),
+                    )
+                  : Effect.succeed(adapter);
+              },
+              list: () => Effect.succeed(adapters.map((adapter) => adapter.instanceId)),
+              getMetadata: () =>
+                Effect.succeed({
+                  driver: CLAUDE_DRIVER,
+                  continuationKey: "claude:shared-native-account-history",
+                  enabled: true,
+                  capabilities: ClaudeProviderCapabilitiesV2,
+                }),
+            }),
+          )
+        : ProviderAdapterRegistry.layerFromAdapters(adapters);
+      const handoffThreadId = ThreadId.make("thread:handoff-releases-session");
+      yield* Effect.gen(function* () {
+        const orchestrator = yield* Orchestrator.OrchestratorV2;
+        const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
+        const send = (ordinal: number, modelSelection: ModelSelection, attempt = "") =>
+          orchestrator.dispatch({
+            type: "message.dispatch",
             createdBy: "user",
             creationSource: "web",
-            commandId: CommandId.make("command:handoff-releases-session:create"),
+            commandId: CommandId.make(`command:handoff-releases-session:${ordinal}${attempt}`),
             threadId: handoffThreadId,
-            projectId: ProjectId.make("project:handoff-releases-session"),
-            title: "Handoff releases session",
-            modelSelection: CLAUDE_MODEL_SELECTION,
-            runtimeMode: "full-access",
-            interactionMode: "default",
-            branch: null,
-            worktreePath: cwd,
+            messageId: MessageId.make(`message:handoff-releases-session:${ordinal}${attempt}`),
+            text: `Prompt ${ordinal}`,
+            attachments: [],
+            modelSelection,
+            dispatchMode: { type: queued ? "queue_after_active" : "start_immediately" },
           });
-          yield* send(1, CLAUDE_MODEL_SELECTION);
+        yield* orchestrator.dispatch({
+          type: "thread.create",
+          createdBy: "user",
+          creationSource: "web",
+          commandId: CommandId.make("command:handoff-releases-session:create"),
+          threadId: handoffThreadId,
+          projectId: ProjectId.make("project:handoff-releases-session"),
+          title: "Handoff releases session",
+          modelSelection: CLAUDE_MODEL_SELECTION,
+          runtimeMode: "full-access",
+          interactionMode: "default",
+          branch: null,
+          worktreePath: cwd,
+        });
+        yield* send(1, CLAUDE_MODEL_SELECTION);
 
-          if (queued) {
-            yield* Deferred.await(firstStarted);
-            yield* send(2, secondSelection);
-            const queuedRunId = (yield* orchestrator.getThreadProjection(handoffThreadId)).runs[1]
-              ?.id;
-            assert.isDefined(queuedRunId);
-            yield* Deferred.succeed(releaseFirst, undefined);
-            yield* orchestrator.streamStoredEvents.pipe(
-              Stream.filter(
-                ({ event }) =>
-                  event.type === "run.updated" &&
-                  event.runId === queuedRunId &&
-                  (event.payload.queueHeld === true || event.payload.status === "completed"),
-              ),
-              Stream.runHead,
-            );
-            yield* worker.drain();
-            const afterQueue = yield* orchestrator.getThreadProjection(handoffThreadId);
-            const firstSession = afterQueue.providerSessions.find(
-              (session) => session.providerInstanceId === CLAUDE_MODEL_SELECTION.instanceId,
-            );
-            // Detaching would end the background agents, so the busy session must stay up.
-            assert.deepEqual(yield* Ref.get(closedSessions), []);
-            assert.equal(firstSession?.status, "ready");
-            if (!sharedHistory) {
-              assert.deepEqual(
-                afterQueue.runs.map((run) => [run.providerInstanceId, run.status]),
-                [
-                  [CLAUDE_MODEL_SELECTION.instanceId, "completed"],
-                  [secondSelection.instanceId, "completed"],
-                ],
-              );
-              return;
-            }
-            // Resuming the native thread beside the busy session would fork its history.
-            assert.deepEqual(
-              afterQueue.runs.map((run) => [run.status, run.queueHeld === true]),
-              [
-                ["completed", false],
-                ["queued", true],
-              ],
-            );
-            assert.lengthOf(yield* Ref.get(capturedTurns), 1);
-            yield* Ref.set(backgroundWork, false);
-            yield* orchestrator.dispatch({
-              type: "queue.resume",
-              commandId: CommandId.make("command:handoff-releases-session:resume"),
-              threadId: handoffThreadId,
-            });
-            yield* worker.drain();
-            const resumed = yield* waitForIdle(handoffThreadId);
+        if (queued) {
+          yield* Deferred.await(firstStarted);
+          yield* send(2, secondSelection);
+          const queuedRunId = (yield* orchestrator.getThreadProjection(handoffThreadId)).runs[1]
+            ?.id;
+          assert.isDefined(queuedRunId);
+          yield* Deferred.succeed(releaseFirst, undefined);
+          yield* orchestrator.streamStoredEvents.pipe(
+            Stream.filter(
+              ({ event }) =>
+                event.type === "run.updated" &&
+                event.runId === queuedRunId &&
+                (event.payload.queueHeld === true || event.payload.status === "completed"),
+            ),
+            Stream.runHead,
+          );
+          yield* worker.drain();
+          const afterQueue = yield* orchestrator.getThreadProjection(handoffThreadId);
+          const firstSession = afterQueue.providerSessions.find(
+            (session) => session.providerInstanceId === CLAUDE_MODEL_SELECTION.instanceId,
+          );
+          // Detaching would end the background agents, so the busy session must stay up.
+          assert.deepEqual(yield* Ref.get(closedSessions), []);
+          assert.equal(firstSession?.status, "ready");
+          if (!sharedHistory) {
             assert.deepEqual(
-              resumed.runs.map((run) => [run.providerInstanceId, run.status]),
+              afterQueue.runs.map((run) => [run.providerInstanceId, run.status]),
               [
                 [CLAUDE_MODEL_SELECTION.instanceId, "completed"],
                 [secondSelection.instanceId, "completed"],
               ],
             );
-            assert.deepEqual(yield* Ref.get(closedSessions), [firstSession!.id]);
             return;
           }
-
-          yield* worker.drain();
-          const afterFirst = yield* waitForIdle(handoffThreadId);
-          const firstSession = afterFirst.providerSessions.find(
-            (session) => session.providerInstanceId === CLAUDE_MODEL_SELECTION.instanceId,
+          // Resuming the native thread beside the busy session would fork its history.
+          assert.deepEqual(
+            afterQueue.runs.map((run) => [run.status, run.queueHeld === true]),
+            [
+              ["completed", false],
+              ["queued", true],
+            ],
           );
-          assert.equal(firstSession?.status, "ready");
-
-          if (background) {
-            // Native subagents live only in the adapter's roster, so the projection's
-            // pendingBackgroundTasks stays empty while the probe still reports work.
-            assert.deepEqual(afterFirst.providerThreads[0]?.pendingBackgroundTasks ?? [], []);
-            const refused = yield* send(2, secondSelection, ":refused").pipe(Effect.flip);
-            assert.include(String(refused.cause), "still running background agents or commands");
-            const unchanged = yield* orchestrator.getThreadProjection(handoffThreadId);
-            assert.lengthOf(unchanged.runs, 1);
-            assert.deepEqual(yield* Ref.get(closedSessions), []);
-            assert.equal(unchanged.thread.providerInstanceId, CLAUDE_MODEL_SELECTION.instanceId);
-            assert.deepEqual(
-              unchanged.providerSessions.map((session) => [session.id, session.status]),
-              [[firstSession!.id, "ready"]],
-            );
-            yield* Ref.set(backgroundWork, false);
-          }
-
-          yield* send(2, secondSelection);
-          yield* worker.drain();
-          const afterSecond = yield* waitForIdle(handoffThreadId);
+          assert.lengthOf(yield* Ref.get(capturedTurns), 1);
+          yield* Ref.set(backgroundWork, false);
+          yield* orchestrator.dispatch({
+            type: "queue.resume",
+            commandId: CommandId.make("command:handoff-releases-session:resume"),
+            threadId: handoffThreadId,
+          });
           yield* worker.drain();
-          const projection = yield* orchestrator.getThreadProjection(handoffThreadId);
-
+          const resumed = yield* waitForIdle(handoffThreadId);
           assert.deepEqual(
-            projection.runs.map((run) => [run.providerInstanceId, run.status]),
+            resumed.runs.map((run) => [run.providerInstanceId, run.status]),
             [
               [CLAUDE_MODEL_SELECTION.instanceId, "completed"],
               [secondSelection.instanceId, "completed"],
             ],
           );
-          assert.lengthOf(afterSecond.contextHandoffs, 1);
+          assert.deepEqual(yield* Ref.get(closedSessions), [firstSession!.id]);
+          return;
+        }
+
+        yield* worker.drain();
+        const afterFirst = yield* waitForIdle(handoffThreadId);
+        const firstSession = afterFirst.providerSessions.find(
+          (session) => session.providerInstanceId === CLAUDE_MODEL_SELECTION.instanceId,
+        );
+        assert.equal(firstSession?.status, "ready");
+
+        if (background) {
+          // Native subagents live only in the adapter's roster, so the projection's
+          // pendingBackgroundTasks stays empty while the probe still reports work.
+          assert.deepEqual(afterFirst.providerThreads[0]?.pendingBackgroundTasks ?? [], []);
+          const refused = yield* send(2, secondSelection, ":refused").pipe(Effect.flip);
+          assert.include(String(refused.cause), "still running background agents or commands");
+          const unchanged = yield* orchestrator.getThreadProjection(handoffThreadId);
+          assert.lengthOf(unchanged.runs, 1);
+          assert.deepEqual(yield* Ref.get(closedSessions), []);
+          assert.equal(unchanged.thread.providerInstanceId, CLAUDE_MODEL_SELECTION.instanceId);
           assert.deepEqual(
-            projection.providerSessions.map((session) => session.providerInstanceId),
-            [secondSelection.instanceId],
+            unchanged.providerSessions.map((session) => [session.id, session.status]),
+            [[firstSession!.id, "ready"]],
           );
-          // The detached event alone hides the session; the runtime must also close.
-          assert.deepEqual(yield* Ref.get(closedSessions), [firstSession!.id]);
-        }).pipe(
-          Effect.provide(
-            ProviderReplayHarness.layerWithRegistry(
-              {
-                name: "handoff-releases-session",
-                runtimePolicyOverride: {
-                  cwd,
-                  approvalPolicy: "never",
-                  sandboxPolicy: {
-                    type: "readOnly",
-                    access: { type: "fullAccess" },
-                    networkAccess: false,
-                  },
+          yield* Ref.set(backgroundWork, false);
+        }
+
+        yield* send(2, secondSelection);
+        yield* worker.drain();
+        const afterSecond = yield* waitForIdle(handoffThreadId);
+        yield* worker.drain();
+        const projection = yield* orchestrator.getThreadProjection(handoffThreadId);
+
+        assert.deepEqual(
+          projection.runs.map((run) => [run.providerInstanceId, run.status]),
+          [
+            [CLAUDE_MODEL_SELECTION.instanceId, "completed"],
+            [secondSelection.instanceId, "completed"],
+          ],
+        );
+        assert.lengthOf(afterSecond.contextHandoffs, 1);
+        assert.deepEqual(
+          projection.providerSessions.map((session) => session.providerInstanceId),
+          [secondSelection.instanceId],
+        );
+        // The detached event alone hides the session; the runtime must also close.
+        assert.deepEqual(yield* Ref.get(closedSessions), [firstSession!.id]);
+      }).pipe(
+        Effect.provide(
+          ProviderReplayHarness.layerWithRegistry(
+            {
+              name: "handoff-releases-session",
+              runtimePolicyOverride: {
+                cwd,
+                approvalPolicy: "never",
+                sandboxPolicy: {
+                  type: "readOnly",
+                  access: { type: "fullAccess" },
+                  networkAccess: false,
                 },
               },
-              layerRegistry,
-            ),
+            },
+            layerRegistry,
           ),
-        );
-      }),
-    ),
+        ),
+      );
+    }),
   );
 
   // regression: #16000 thread setting changes must not end a Claude session's background work
@@ -2902,88 +3032,282 @@ describe("orchestration v2 provider switching", () => {
     ["worktree", "worktree"],
     ["provider instance", "instance"],
   ] as const)("keeps background work alive when the %s changes on an idle thread", ([, change]) =>
-    Effect.scoped(
+    Effect.gen(function* () {
+      const cwd = yield* checkpointWorkspace(`settings-background-${change}`);
+      const nextCwd = yield* checkpointWorkspace(`settings-background-${change}-next`);
+      const capturedTurns = yield* Ref.make<ReadonlyArray<CapturedTurn>>([]);
+      const backgroundWork = yield* Ref.make(false);
+      const closedSessions = yield* Ref.make<ReadonlyArray<string>>([]);
+      const secondSelection: ModelSelection = {
+        ...CLAUDE_MODEL_SELECTION,
+        instanceId: ProviderInstanceId.make("claude-second-account"),
+      };
+      const threadId = ThreadId.make(`thread:settings-background-${change}`);
+      yield* Effect.gen(function* () {
+        const orchestrator = yield* Orchestrator.OrchestratorV2;
+        const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
+        yield* orchestrator.dispatch({
+          type: "thread.create",
+          createdBy: "user",
+          creationSource: "web",
+          commandId: CommandId.make(`command:settings-background-${change}:create`),
+          threadId,
+          projectId: ProjectId.make(`project:settings-background-${change}`),
+          title: "Settings change with background work",
+          modelSelection: CLAUDE_MODEL_SELECTION,
+          runtimeMode: "full-access",
+          interactionMode: "default",
+          branch: null,
+          worktreePath: cwd,
+        });
+        yield* orchestrator.dispatch({
+          type: "message.dispatch",
+          createdBy: "user",
+          creationSource: "web",
+          commandId: CommandId.make(`command:settings-background-${change}:send`),
+          threadId,
+          messageId: MessageId.make(`message:settings-background-${change}:send`),
+          text: "Start background work",
+          attachments: [],
+          modelSelection: CLAUDE_MODEL_SELECTION,
+          dispatchMode: { type: "start_immediately" },
+        });
+        yield* worker.drain();
+        const afterFirst = yield* waitForIdle(threadId);
+        const session = afterFirst.providerSessions[0];
+        assert.equal(session?.status, "ready");
+        // The turn ended but a background subagent keeps running in the CLI process.
+        yield* Ref.set(backgroundWork, true);
+
+        const commandId = CommandId.make(`command:settings-background-${change}:change`);
+        yield* orchestrator
+          .dispatch(
+            change === "runtime-mode"
+              ? {
+                  type: "thread.runtime-mode.set",
+                  commandId,
+                  threadId,
+                  runtimeMode: "auto-accept-edits",
+                }
+              : change === "worktree"
+                ? { type: "thread.metadata.update", commandId, threadId, worktreePath: nextCwd }
+                : {
+                    type: "thread.model-selection.set",
+                    commandId,
+                    threadId,
+                    modelSelection: secondSelection,
+                  },
+          )
+          .pipe(Effect.ignore);
+        yield* worker.drain();
+
+        const projection = yield* orchestrator.getThreadProjection(threadId);
+        // Refusing or deferring are both fine; closing the busy process is not.
+        assert.deepEqual(yield* Ref.get(closedSessions), []);
+        assert.deepEqual(
+          projection.providerSessions.map((candidate) => [candidate.id, candidate.status]),
+          [[session!.id, "ready"]],
+        );
+      }).pipe(
+        Effect.provide(
+          ProviderReplayHarness.layerWithRegistry(
+            {
+              name: `settings-background-${change}`,
+              runtimePolicyOverride: {
+                cwd,
+                approvalPolicy: "never",
+                sandboxPolicy: {
+                  type: "readOnly",
+                  access: { type: "fullAccess" },
+                  networkAccess: false,
+                },
+              },
+            },
+            ProviderAdapterRegistry.layerFromAdapters([
+              makeTestAdapter({
+                instanceId: CLAUDE_MODEL_SELECTION.instanceId,
+                driver: CLAUDE_DRIVER,
+                capabilities: ClaudeProviderCapabilitiesV2,
+                modelSelection: CLAUDE_MODEL_SELECTION,
+                responseByRunOrdinal: { 1: "Background work started" },
+                capturedTurns,
+                backgroundWork,
+                closedSessions,
+              }),
+              makeTestAdapter({
+                instanceId: secondSelection.instanceId,
+                driver: CLAUDE_DRIVER,
+                capabilities: ClaudeProviderCapabilitiesV2,
+                modelSelection: secondSelection,
+                responseByRunOrdinal: {},
+                capturedTurns,
+              }),
+            ]),
+          ),
+        ),
+      );
+    }),
+  );
+
+  it.live.each(["immediately", "behind a running turn"] as const)(
+    "starts a fresh provider session %s and never hands earlier runs to a later provider",
+    (variant) =>
       Effect.gen(function* () {
-        const cwd = yield* checkpointWorkspace(`settings-background-${change}`);
-        const nextCwd = yield* checkpointWorkspace(`settings-background-${change}-next`);
+        const queued = variant !== "immediately";
+        const key = queued ? "queued" : "immediate";
+        const cwd = yield* checkpointWorkspace(`fresh-context-${key}`);
         const capturedTurns = yield* Ref.make<ReadonlyArray<CapturedTurn>>([]);
-        const backgroundWork = yield* Ref.make(false);
         const closedSessions = yield* Ref.make<ReadonlyArray<string>>([]);
-        const secondSelection: ModelSelection = {
-          ...CLAUDE_MODEL_SELECTION,
-          instanceId: ProviderInstanceId.make("claude-second-account"),
-        };
-        const threadId = ThreadId.make(`thread:settings-background-${change}`);
+        // A queued start has nobody to refuse, so a busy session must stay up.
+        const backgroundWork = yield* Ref.make(queued);
+        const started = yield* Deferred.make<void>();
+        const release = yield* Deferred.make<void>();
+        const layerRegistry = ProviderAdapterRegistry.layerFromAdapters([
+          makeTestAdapter({
+            instanceId: CLAUDE_MODEL_SELECTION.instanceId,
+            driver: CLAUDE_DRIVER,
+            capabilities: ClaudeProviderCapabilitiesV2,
+            modelSelection: CLAUDE_MODEL_SELECTION,
+            responseByRunOrdinal: {},
+            capturedTurns,
+            closedSessions,
+            backgroundWork,
+            nativeThreadGeneration: yield* Ref.make(0),
+            ...(queued
+              ? { holdFirstTurn: started, releaseFirstTurn: release, holdRunOrdinal: 2 }
+              : {}),
+          }),
+          makeTestAdapter({
+            instanceId: CODEX_MODEL_SELECTION.instanceId,
+            driver: CODEX_DRIVER,
+            capabilities: CodexProviderCapabilitiesV2,
+            modelSelection: CODEX_MODEL_SELECTION,
+            responseByRunOrdinal: {},
+            capturedTurns,
+          }),
+        ]);
+        const freshThreadId = ThreadId.make(`thread:fresh-context:${key}`);
         yield* Effect.gen(function* () {
           const orchestrator = yield* Orchestrator.OrchestratorV2;
           const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
+          const send = (
+            name: string,
+            modelSelection: ModelSelection,
+            options: { readonly freshContext?: boolean } = {},
+          ) =>
+            orchestrator.dispatch({
+              type: "message.dispatch",
+              createdBy: "user",
+              creationSource: "web",
+              commandId: CommandId.make(`command:fresh-context:${key}:${name}`),
+              threadId: freshThreadId,
+              messageId: MessageId.make(`message:fresh-context:${key}:${name}`),
+              text: `Prompt ${name}`,
+              attachments: [],
+              modelSelection,
+              ...options,
+              // A fresh send must never steer the running turn.
+              deliveryIntent: "auto",
+              dispatchMode: { type: "start_immediately" },
+            });
           yield* orchestrator.dispatch({
             type: "thread.create",
             createdBy: "user",
             creationSource: "web",
-            commandId: CommandId.make(`command:settings-background-${change}:create`),
-            threadId,
-            projectId: ProjectId.make(`project:settings-background-${change}`),
-            title: "Settings change with background work",
+            commandId: CommandId.make(`command:fresh-context:${key}:create`),
+            threadId: freshThreadId,
+            projectId: ProjectId.make(`project:fresh-context:${key}`),
+            title: "Fresh context",
             modelSelection: CLAUDE_MODEL_SELECTION,
             runtimeMode: "full-access",
             interactionMode: "default",
             branch: null,
             worktreePath: cwd,
           });
-          yield* orchestrator.dispatch({
-            type: "message.dispatch",
-            createdBy: "user",
-            creationSource: "web",
-            commandId: CommandId.make(`command:settings-background-${change}:send`),
-            threadId,
-            messageId: MessageId.make(`message:settings-background-${change}:send`),
-            text: "Start background work",
-            attachments: [],
-            modelSelection: CLAUDE_MODEL_SELECTION,
-            dispatchMode: { type: "start_immediately" },
-          });
+          // Codex keeps a native thread from before the fresh run that must not resume.
+          yield* send("zero", CODEX_MODEL_SELECTION);
           yield* worker.drain();
-          const afterFirst = yield* waitForIdle(threadId);
-          const session = afterFirst.providerSessions[0];
-          assert.equal(session?.status, "ready");
-          // The turn ended but a background subagent keeps running in the CLI process.
-          yield* Ref.set(backgroundWork, true);
-
-          const commandId = CommandId.make(`command:settings-background-${change}:change`);
-          yield* orchestrator
-            .dispatch(
-              change === "runtime-mode"
-                ? {
-                    type: "thread.runtime-mode.set",
-                    commandId,
-                    threadId,
-                    runtimeMode: "auto-accept-edits",
-                  }
-                : change === "worktree"
-                  ? { type: "thread.metadata.update", commandId, threadId, worktreePath: nextCwd }
-                  : {
-                      type: "thread.model-selection.set",
-                      commandId,
-                      threadId,
-                      modelSelection: secondSelection,
-                    },
-            )
-            .pipe(Effect.ignore);
+          yield* waitForIdle(freshThreadId);
+          yield* send("alpha", CLAUDE_MODEL_SELECTION);
+          if (queued) {
+            yield* Deferred.await(started);
+            yield* worker.drain();
+          } else {
+            yield* worker.drain();
+            yield* waitForIdle(freshThreadId);
+          }
+          const firstSession = (yield* orchestrator.getThreadProjection(
+            freshThreadId,
+          )).providerSessions.find(
+            (session) => session.providerInstanceId === CLAUDE_MODEL_SELECTION.instanceId,
+          )!;
+          yield* send("beta", CLAUDE_MODEL_SELECTION, { freshContext: true });
+          if (queued) {
+            // Queued before the fresh run started, so it is bound to the old conversation.
+            yield* send("gamma", CLAUDE_MODEL_SELECTION);
+            const waiting = yield* orchestrator.getThreadProjection(freshThreadId);
+            assert.deepEqual(
+              waiting.runs.map((run) => run.status),
+              ["completed", "running", "queued", "queued"],
+            );
+            // Steering would send it into the conversation it is meant to leave.
+            const promoted = yield* orchestrator
+              .dispatch({
+                type: "queued-message.promote-to-steer",
+                commandId: CommandId.make(`command:fresh-context:${key}:promote`),
+                threadId: freshThreadId,
+                queuedRunId: waiting.runs.find((run) => run.freshContext === true)!.id,
+                targetRunId: waiting.runs.find((run) => run.status === "running")!.id,
+              })
+              .pipe(Effect.flip);
+            assert.instanceOf(promoted, Orchestrator.OrchestratorDispatchError);
+            assert.include(String(promoted.cause), "fresh session");
+            yield* Deferred.succeed(release, undefined);
+          }
+          yield* worker.drain();
+          yield* waitForIdle(freshThreadId);
+          // Claude hosts one native thread per session, so an idle old one is closed.
+          assert.deepEqual(yield* Ref.get(closedSessions), queued ? [] : [firstSession.id]);
+          yield* Ref.set(backgroundWork, false);
+          yield* send("delta", CODEX_MODEL_SELECTION);
+          yield* worker.drain();
+          yield* waitForIdle(freshThreadId);
           yield* worker.drain();
+          const projection = yield* orchestrator.getThreadProjection(freshThreadId);
+          const turns = yield* Ref.get(capturedTurns);
+          const turnFor = (name: string) =>
+            turns.find((turn) => turn.text.endsWith(`Prompt ${name}`))!;
 
-          const projection = yield* orchestrator.getThreadProjection(threadId);
-          // Refusing or deferring are both fine; closing the busy process is not.
-          assert.deepEqual(yield* Ref.get(closedSessions), []);
-          assert.deepEqual(
-            projection.providerSessions.map((candidate) => [candidate.id, candidate.status]),
-            [[session!.id, "ready"]],
+          const freshRun = projection.runs.find(
+            (run) => run.userMessageId === `message:fresh-context:${key}:beta`,
+          )!;
+          assert.isTrue(freshRun.freshContext);
+          assert.equal(freshRun.contextHandoffId, null);
+          assert.isTrue(
+            projection.turnItems.some(
+              (item) =>
+                item.type === "user_message" &&
+                item.messageId === freshRun.userMessageId &&
+                item.freshContext === true,
+            ),
           );
+          assert.notEqual(turnFor("beta").providerThreadId, turnFor("alpha").providerThreadId);
+          assert.notEqual(turnFor("beta").nativeThreadId, turnFor("alpha").nativeThreadId);
+          assert.equal(turnFor("beta").text, "Prompt beta");
+          if (queued) {
+            assert.equal(turnFor("gamma").providerThreadId, turnFor("beta").providerThreadId);
+          }
+          const codexTurn = turnFor("delta");
+          assert.notEqual(codexTurn.providerThreadId, turnFor("zero").providerThreadId);
+          assert.include(codexTurn.text, "Prompt beta");
+          assert.notInclude(codexTurn.text, "Prompt alpha");
+          assert.notInclude(codexTurn.text, "Prompt zero");
+          assert.equal(projection.contextHandoffs.at(-1)!.coveredRunOrdinals.from, 3);
         }).pipe(
           Effect.provide(
             ProviderReplayHarness.layerWithRegistry(
               {
-                name: `settings-background-${change}`,
+                name: `fresh-context-${key}`,
                 runtimePolicyOverride: {
                   cwd,
                   approvalPolicy: "never",
@@ -2994,312 +3318,21 @@ describe("orchestration v2 provider switching", () => {
                   },
                 },
               },
-              ProviderAdapterRegistry.layerFromAdapters([
-                makeTestAdapter({
-                  instanceId: CLAUDE_MODEL_SELECTION.instanceId,
-                  driver: CLAUDE_DRIVER,
-                  capabilities: ClaudeProviderCapabilitiesV2,
-                  modelSelection: CLAUDE_MODEL_SELECTION,
-                  responseByRunOrdinal: { 1: "Background work started" },
-                  capturedTurns,
-                  backgroundWork,
-                  closedSessions,
-                }),
-                makeTestAdapter({
-                  instanceId: secondSelection.instanceId,
-                  driver: CLAUDE_DRIVER,
-                  capabilities: ClaudeProviderCapabilitiesV2,
-                  modelSelection: secondSelection,
-                  responseByRunOrdinal: {},
-                  capturedTurns,
-                }),
-              ]),
+              layerRegistry,
             ),
           ),
         );
       }),
-    ),
-  );
-
-  it.live.each(["immediately", "behind a running turn"] as const)(
-    "starts a fresh provider session %s and never hands earlier runs to a later provider",
-    (variant) =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const queued = variant !== "immediately";
-          const key = queued ? "queued" : "immediate";
-          const cwd = yield* checkpointWorkspace(`fresh-context-${key}`);
-          const capturedTurns = yield* Ref.make<ReadonlyArray<CapturedTurn>>([]);
-          const closedSessions = yield* Ref.make<ReadonlyArray<string>>([]);
-          // A queued start has nobody to refuse, so a busy session must stay up.
-          const backgroundWork = yield* Ref.make(queued);
-          const started = yield* Deferred.make<void>();
-          const release = yield* Deferred.make<void>();
-          const layerRegistry = ProviderAdapterRegistry.layerFromAdapters([
-            makeTestAdapter({
-              instanceId: CLAUDE_MODEL_SELECTION.instanceId,
-              driver: CLAUDE_DRIVER,
-              capabilities: ClaudeProviderCapabilitiesV2,
-              modelSelection: CLAUDE_MODEL_SELECTION,
-              responseByRunOrdinal: {},
-              capturedTurns,
-              closedSessions,
-              backgroundWork,
-              nativeThreadGeneration: yield* Ref.make(0),
-              ...(queued
-                ? { holdFirstTurn: started, releaseFirstTurn: release, holdRunOrdinal: 2 }
-                : {}),
-            }),
-            makeTestAdapter({
-              instanceId: CODEX_MODEL_SELECTION.instanceId,
-              driver: CODEX_DRIVER,
-              capabilities: CodexProviderCapabilitiesV2,
-              modelSelection: CODEX_MODEL_SELECTION,
-              responseByRunOrdinal: {},
-              capturedTurns,
-            }),
-          ]);
-          const freshThreadId = ThreadId.make(`thread:fresh-context:${key}`);
-          yield* Effect.gen(function* () {
-            const orchestrator = yield* Orchestrator.OrchestratorV2;
-            const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
-            const send = (
-              name: string,
-              modelSelection: ModelSelection,
-              options: { readonly freshContext?: boolean } = {},
-            ) =>
-              orchestrator.dispatch({
-                type: "message.dispatch",
-                createdBy: "user",
-                creationSource: "web",
-                commandId: CommandId.make(`command:fresh-context:${key}:${name}`),
-                threadId: freshThreadId,
-                messageId: MessageId.make(`message:fresh-context:${key}:${name}`),
-                text: `Prompt ${name}`,
-                attachments: [],
-                modelSelection,
-                ...options,
-                // A fresh send must never steer the running turn.
-                deliveryIntent: "auto",
-                dispatchMode: { type: "start_immediately" },
-              });
-            yield* orchestrator.dispatch({
-              type: "thread.create",
-              createdBy: "user",
-              creationSource: "web",
-              commandId: CommandId.make(`command:fresh-context:${key}:create`),
-              threadId: freshThreadId,
-              projectId: ProjectId.make(`project:fresh-context:${key}`),
-              title: "Fresh context",
-              modelSelection: CLAUDE_MODEL_SELECTION,
-              runtimeMode: "full-access",
-              interactionMode: "default",
-              branch: null,
-              worktreePath: cwd,
-            });
-            // Codex keeps a native thread from before the fresh run that must not resume.
-            yield* send("zero", CODEX_MODEL_SELECTION);
-            yield* worker.drain();
-            yield* waitForIdle(freshThreadId);
-            yield* send("alpha", CLAUDE_MODEL_SELECTION);
-            if (queued) {
-              yield* Deferred.await(started);
-              yield* worker.drain();
-            } else {
-              yield* worker.drain();
-              yield* waitForIdle(freshThreadId);
-            }
-            const firstSession = (yield* orchestrator.getThreadProjection(
-              freshThreadId,
-            )).providerSessions.find(
-              (session) => session.providerInstanceId === CLAUDE_MODEL_SELECTION.instanceId,
-            )!;
-            yield* send("beta", CLAUDE_MODEL_SELECTION, { freshContext: true });
-            if (queued) {
-              // Queued before the fresh run started, so it is bound to the old conversation.
-              yield* send("gamma", CLAUDE_MODEL_SELECTION);
-              const waiting = yield* orchestrator.getThreadProjection(freshThreadId);
-              assert.deepEqual(
-                waiting.runs.map((run) => run.status),
-                ["completed", "running", "queued", "queued"],
-              );
-              // Steering would send it into the conversation it is meant to leave.
-              const promoted = yield* orchestrator
-                .dispatch({
-                  type: "queued-message.promote-to-steer",
-                  commandId: CommandId.make(`command:fresh-context:${key}:promote`),
-                  threadId: freshThreadId,
-                  queuedRunId: waiting.runs.find((run) => run.freshContext === true)!.id,
-                  targetRunId: waiting.runs.find((run) => run.status === "running")!.id,
-                })
-                .pipe(Effect.flip);
-              assert.instanceOf(promoted, Orchestrator.OrchestratorDispatchError);
-              assert.include(String(promoted.cause), "fresh session");
-              yield* Deferred.succeed(release, undefined);
-            }
-            yield* worker.drain();
-            yield* waitForIdle(freshThreadId);
-            // Claude hosts one native thread per session, so an idle old one is closed.
-            assert.deepEqual(yield* Ref.get(closedSessions), queued ? [] : [firstSession.id]);
-            yield* Ref.set(backgroundWork, false);
-            yield* send("delta", CODEX_MODEL_SELECTION);
-            yield* worker.drain();
-            yield* waitForIdle(freshThreadId);
-            yield* worker.drain();
-            const projection = yield* orchestrator.getThreadProjection(freshThreadId);
-            const turns = yield* Ref.get(capturedTurns);
-            const turnFor = (name: string) =>
-              turns.find((turn) => turn.text.endsWith(`Prompt ${name}`))!;
-
-            const freshRun = projection.runs.find(
-              (run) => run.userMessageId === `message:fresh-context:${key}:beta`,
-            )!;
-            assert.isTrue(freshRun.freshContext);
-            assert.equal(freshRun.contextHandoffId, null);
-            assert.isTrue(
-              projection.turnItems.some(
-                (item) =>
-                  item.type === "user_message" &&
-                  item.messageId === freshRun.userMessageId &&
-                  item.freshContext === true,
-              ),
-            );
-            assert.notEqual(turnFor("beta").providerThreadId, turnFor("alpha").providerThreadId);
-            assert.notEqual(turnFor("beta").nativeThreadId, turnFor("alpha").nativeThreadId);
-            assert.equal(turnFor("beta").text, "Prompt beta");
-            if (queued) {
-              assert.equal(turnFor("gamma").providerThreadId, turnFor("beta").providerThreadId);
-            }
-            const codexTurn = turnFor("delta");
-            assert.notEqual(codexTurn.providerThreadId, turnFor("zero").providerThreadId);
-            assert.include(codexTurn.text, "Prompt beta");
-            assert.notInclude(codexTurn.text, "Prompt alpha");
-            assert.notInclude(codexTurn.text, "Prompt zero");
-            assert.equal(projection.contextHandoffs.at(-1)!.coveredRunOrdinals.from, 3);
-          }).pipe(
-            Effect.provide(
-              ProviderReplayHarness.layerWithRegistry(
-                {
-                  name: `fresh-context-${key}`,
-                  runtimePolicyOverride: {
-                    cwd,
-                    approvalPolicy: "never",
-                    sandboxPolicy: {
-                      type: "readOnly",
-                      access: { type: "fullAccess" },
-                      networkAccess: false,
-                    },
-                  },
-                },
-                layerRegistry,
-              ),
-            ),
-          );
-        }),
-      ),
   );
 
   it.live(
     "starts a scheduled fresh run while the previous run's session still has background work",
     () =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const cwd = yield* checkpointWorkspace("scheduled-fresh-background");
-          const capturedTurns = yield* Ref.make<ReadonlyArray<CapturedTurn>>([]);
-          const closedSessions = yield* Ref.make<ReadonlyArray<string>>([]);
-          const backgroundWork = yield* Ref.make(false);
-          const layerRegistry = ProviderAdapterRegistry.layerFromAdapters([
-            makeTestAdapter({
-              instanceId: CLAUDE_MODEL_SELECTION.instanceId,
-              driver: CLAUDE_DRIVER,
-              capabilities: ClaudeProviderCapabilitiesV2,
-              modelSelection: CLAUDE_MODEL_SELECTION,
-              responseByRunOrdinal: {},
-              capturedTurns,
-              closedSessions,
-              backgroundWork,
-              nativeThreadGeneration: yield* Ref.make(0),
-            }),
-          ]);
-          const threadId = ThreadId.make("thread:scheduled-fresh-background");
-          yield* Effect.gen(function* () {
-            const orchestrator = yield* Orchestrator.OrchestratorV2;
-            const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
-            // The command ScheduledTaskService sends for a fresh-session schedule.
-            const fire = (name: string) =>
-              orchestrator.dispatch({
-                type: "message.dispatch",
-                createdBy: "user",
-                creationSource: "web",
-                commandId: CommandId.make(`scheduled-task:scheduled-fresh-background:${name}`),
-                threadId,
-                messageId: MessageId.make(`message:scheduled-fresh-background:${name}`),
-                scheduledTaskId: ScheduledTaskId.make("scheduled-fresh-background"),
-                text: `Scheduled ${name}`,
-                attachments: [],
-                modelSelection: CLAUDE_MODEL_SELECTION,
-                freshContext: true,
-                dispatchMode: { type: "queue_after_active" },
-              });
-            yield* orchestrator.dispatch({
-              type: "thread.create",
-              createdBy: "user",
-              creationSource: "web",
-              commandId: CommandId.make("command:scheduled-fresh-background:create"),
-              threadId,
-              projectId: ProjectId.make("project:scheduled-fresh-background"),
-              title: "Scheduled fresh session",
-              modelSelection: CLAUDE_MODEL_SELECTION,
-              runtimeMode: "full-access",
-              interactionMode: "default",
-              branch: null,
-              worktreePath: cwd,
-            });
-            yield* fire("first");
-            yield* worker.drain();
-            yield* waitForIdle(threadId);
-            // The first run left a background command running after its turn ended.
-            yield* Ref.set(backgroundWork, true);
-            yield* fire("second");
-            yield* worker.drain();
-            yield* waitForIdle(threadId);
-            const turns = yield* Ref.get(capturedTurns);
-            const turnFor = (name: string) =>
-              turns.find((turn) => turn.text.endsWith(`Scheduled ${name}`));
-            assert.isDefined(turnFor("second"));
-            assert.notEqual(turnFor("second")!.nativeThreadId, turnFor("first")!.nativeThreadId);
-            // Closing the busy session would end its background work.
-            assert.deepEqual(yield* Ref.get(closedSessions), []);
-          }).pipe(
-            Effect.provide(
-              ProviderReplayHarness.layerWithRegistry(
-                {
-                  name: "scheduled-fresh-background",
-                  runtimePolicyOverride: {
-                    cwd,
-                    approvalPolicy: "never",
-                    sandboxPolicy: {
-                      type: "readOnly",
-                      access: { type: "fullAccess" },
-                      networkAccess: false,
-                    },
-                  },
-                },
-                layerRegistry,
-              ),
-            ),
-          );
-        }),
-      ),
-  );
-
-  it.live("keeps the thread a queued fresh run reserved for that run", () =>
-    Effect.scoped(
       Effect.gen(function* () {
-        const cwd = yield* checkpointWorkspace("fresh-context-reserved");
+        const cwd = yield* checkpointWorkspace("scheduled-fresh-background");
         const capturedTurns = yield* Ref.make<ReadonlyArray<CapturedTurn>>([]);
-        const started = yield* Deferred.make<void>();
-        const release = yield* Deferred.make<void>();
+        const closedSessions = yield* Ref.make<ReadonlyArray<string>>([]);
+        const backgroundWork = yield* Ref.make(false);
         const layerRegistry = ProviderAdapterRegistry.layerFromAdapters([
           makeTestAdapter({
             instanceId: CLAUDE_MODEL_SELECTION.instanceId,
@@ -3308,85 +3341,65 @@ describe("orchestration v2 provider switching", () => {
             modelSelection: CLAUDE_MODEL_SELECTION,
             responseByRunOrdinal: {},
             capturedTurns,
-            nativeThreadGeneration: yield* Ref.make(0),
-            holdFirstTurn: started,
-            releaseFirstTurn: release,
-            holdRunOrdinal: 2,
-          }),
-          makeTestAdapter({
-            instanceId: CODEX_MODEL_SELECTION.instanceId,
-            driver: CODEX_DRIVER,
-            capabilities: CodexProviderCapabilitiesV2,
-            modelSelection: CODEX_MODEL_SELECTION,
-            responseByRunOrdinal: {},
-            capturedTurns,
+            closedSessions,
+            backgroundWork,
             nativeThreadGeneration: yield* Ref.make(0),
           }),
         ]);
-        const reservedThreadId = ThreadId.make("thread:fresh-context-reserved");
+        const threadId = ThreadId.make("thread:scheduled-fresh-background");
         yield* Effect.gen(function* () {
           const orchestrator = yield* Orchestrator.OrchestratorV2;
           const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
-          const send = (
-            name: string,
-            modelSelection: ModelSelection,
-            options: { readonly freshContext?: boolean } = {},
-          ) =>
+          // The command ScheduledTaskService sends for a fresh-session schedule.
+          const fire = (name: string) =>
             orchestrator.dispatch({
               type: "message.dispatch",
               createdBy: "user",
               creationSource: "web",
-              commandId: CommandId.make(`command:fresh-context-reserved:${name}`),
-              threadId: reservedThreadId,
-              messageId: MessageId.make(`message:fresh-context-reserved:${name}`),
-              text: `Prompt ${name}`,
+              commandId: CommandId.make(`scheduled-task:scheduled-fresh-background:${name}`),
+              threadId,
+              messageId: MessageId.make(`message:scheduled-fresh-background:${name}`),
+              scheduledTaskId: ScheduledTaskId.make("scheduled-fresh-background"),
+              text: `Scheduled ${name}`,
               attachments: [],
-              modelSelection,
-              ...options,
+              modelSelection: CLAUDE_MODEL_SELECTION,
+              freshContext: true,
               dispatchMode: { type: "queue_after_active" },
             });
           yield* orchestrator.dispatch({
             type: "thread.create",
             createdBy: "user",
             creationSource: "web",
-            commandId: CommandId.make("command:fresh-context-reserved:create"),
-            threadId: reservedThreadId,
-            projectId: ProjectId.make("project:fresh-context-reserved"),
-            title: "Fresh context reserved",
-            modelSelection: CODEX_MODEL_SELECTION,
+            commandId: CommandId.make("command:scheduled-fresh-background:create"),
+            threadId,
+            projectId: ProjectId.make("project:scheduled-fresh-background"),
+            title: "Scheduled fresh session",
+            modelSelection: CLAUDE_MODEL_SELECTION,
             runtimeMode: "full-access",
             interactionMode: "default",
             branch: null,
             worktreePath: cwd,
           });
-          yield* send("zero", CODEX_MODEL_SELECTION);
-          yield* worker.drain();
-          yield* waitForIdle(reservedThreadId);
-          yield* send("alpha", CLAUDE_MODEL_SELECTION);
-          yield* Deferred.await(started);
+          yield* fire("first");
           yield* worker.drain();
-          // Queued while no fresh run has started: gamma binds to zero's Codex thread, and
-          // delta reserves its own. Once beta starts, gamma must not take delta's thread.
-          yield* send("beta", CLAUDE_MODEL_SELECTION, { freshContext: true });
-          yield* send("gamma", CODEX_MODEL_SELECTION);
-          yield* send("delta", CODEX_MODEL_SELECTION, { freshContext: true });
-          yield* Deferred.succeed(release, undefined);
-          yield* worker.drain();
-          yield* waitForIdle(reservedThreadId);
+          yield* waitForIdle(threadId);
+          // The first run left a background command running after its turn ended.
+          yield* Ref.set(backgroundWork, true);
+          yield* fire("second");
           yield* worker.drain();
+          yield* waitForIdle(threadId);
           const turns = yield* Ref.get(capturedTurns);
           const turnFor = (name: string) =>
-            turns.find((turn) => turn.text.endsWith(`Prompt ${name}`))!;
-
-          assert.notEqual(turnFor("gamma").providerThreadId, turnFor("zero").providerThreadId);
-          assert.notEqual(turnFor("delta").providerThreadId, turnFor("gamma").providerThreadId);
-          assert.notEqual(turnFor("delta").nativeThreadId, turnFor("gamma").nativeThreadId);
-          assert.equal(turnFor("delta").text, "Prompt delta");
+            turns.find((turn) => turn.text.endsWith(`Scheduled ${name}`));
+          assert.isDefined(turnFor("second"));
+          assert.notEqual(turnFor("second")!.nativeThreadId, turnFor("first")!.nativeThreadId);
+          // Closing the busy session would end its background work.
+          assert.deepEqual(yield* Ref.get(closedSessions), []);
         }).pipe(
           Effect.provide(
             ProviderReplayHarness.layerWithRegistry(
               {
-                name: "fresh-context-reserved",
+                name: "scheduled-fresh-background",
                 runtimePolicyOverride: {
                   cwd,
                   approvalPolicy: "never",
@@ -3397,12 +3410,253 @@ describe("orchestration v2 provider switching", () => {
                   },
                 },
               },
-              layerRegistry,
-            ),
+              layerRegistry,
+            ),
+          ),
+        );
+      }),
+  );
+
+  it.live("keeps the user's conversation after a scheduled fresh run in the same thread", () =>
+    Effect.gen(function* () {
+      const cwd = yield* checkpointWorkspace("scheduled-fresh-user-chat");
+      const capturedTurns = yield* Ref.make<ReadonlyArray<CapturedTurn>>([]);
+      const layerRegistry = ProviderAdapterRegistry.layerFromAdapters([
+        makeTestAdapter({
+          instanceId: CLAUDE_MODEL_SELECTION.instanceId,
+          driver: CLAUDE_DRIVER,
+          capabilities: ClaudeProviderCapabilitiesV2,
+          modelSelection: CLAUDE_MODEL_SELECTION,
+          responseByRunOrdinal: {},
+          capturedTurns,
+          nativeThreadGeneration: yield* Ref.make(0),
+        }),
+      ]);
+      const threadId = ThreadId.make("thread:scheduled-fresh-user-chat");
+      yield* Effect.gen(function* () {
+        const orchestrator = yield* Orchestrator.OrchestratorV2;
+        const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
+        const send = (name: string, scheduled: boolean) =>
+          orchestrator.dispatch({
+            type: "message.dispatch",
+            createdBy: "user",
+            creationSource: "web",
+            commandId: CommandId.make(`command:scheduled-fresh-user-chat:${name}`),
+            threadId,
+            messageId: MessageId.make(`message:scheduled-fresh-user-chat:${name}`),
+            text: name,
+            attachments: [],
+            modelSelection: CLAUDE_MODEL_SELECTION,
+            dispatchMode: { type: "queue_after_active" },
+            ...(scheduled
+              ? {
+                  scheduledTaskId: ScheduledTaskId.make("scheduled-fresh-user-chat"),
+                  freshContext: true,
+                }
+              : {}),
+          });
+        yield* orchestrator.dispatch({
+          type: "thread.create",
+          createdBy: "user",
+          creationSource: "web",
+          commandId: CommandId.make("command:scheduled-fresh-user-chat:create"),
+          threadId,
+          projectId: ProjectId.make("project:scheduled-fresh-user-chat"),
+          title: "User chat with a fresh-session schedule",
+          modelSelection: CLAUDE_MODEL_SELECTION,
+          runtimeMode: "full-access",
+          interactionMode: "default",
+          branch: null,
+          worktreePath: cwd,
+        });
+        const eventSink = yield* EventSink.EventSinkV2;
+        for (const [name, scheduled] of [
+          ["user-first", false],
+          ["scheduled", true],
+          ["user-second", false],
+          ["compaction", false],
+          ["scheduled-after-compaction", true],
+          ["user-third", false],
+        ] as const) {
+          if (name === "compaction") {
+            // The user's run compacts, so later dispatches no longer read the first scheduled run's message.
+            const run = (yield* orchestrator.getThreadProjection(threadId)).runs.at(-1)!;
+            const compactedAt = yield* DateTime.now;
+            yield* eventSink.write({
+              events: [
+                {
+                  id: EventId.make("event:scheduled-fresh-user-chat:compaction"),
+                  type: "turn-item.updated",
+                  threadId,
+                  runId: run.id,
+                  nodeId: run.rootNodeId!,
+                  occurredAt: compactedAt,
+                  payload: {
+                    id: TurnItemId.make("item:scheduled-fresh-user-chat:compaction"),
+                    threadId,
+                    runId: run.id,
+                    nodeId: run.rootNodeId,
+                    providerThreadId: null,
+                    providerTurnId: null,
+                    nativeItemRef: null,
+                    parentItemId: null,
+                    ordinal: 1_000,
+                    status: "completed",
+                    title: null,
+                    startedAt: compactedAt,
+                    completedAt: compactedAt,
+                    updatedAt: compactedAt,
+                    type: "compaction",
+                    driver: CLAUDE_DRIVER,
+                  },
+                },
+              ],
+            });
+            continue;
+          }
+          yield* send(name, scheduled);
+          yield* worker.drain();
+          yield* waitForIdle(threadId);
+        }
+        const turns = yield* Ref.get(capturedTurns);
+        const turnFor = (name: string) => turns.find((turn) => turn.text.endsWith(name));
+        assert.notEqual(
+          turnFor("scheduled")!.nativeThreadId,
+          turnFor("user-first")!.nativeThreadId,
+        );
+        // The scheduled run's fresh session must not replace the user's conversation.
+        assert.equal(turnFor("user-second")!.nativeThreadId, turnFor("user-first")!.nativeThreadId);
+        assert.equal(turnFor("user-third")!.nativeThreadId, turnFor("user-first")!.nativeThreadId);
+      }).pipe(
+        Effect.provide(
+          ProviderReplayHarness.layerWithRegistry(
+            {
+              name: "scheduled-fresh-user-chat",
+              runtimePolicyOverride: {
+                cwd,
+                approvalPolicy: "never",
+                sandboxPolicy: {
+                  type: "readOnly",
+                  access: { type: "fullAccess" },
+                  networkAccess: false,
+                },
+              },
+            },
+            layerRegistry,
+          ),
+        ),
+      );
+    }),
+  );
+
+  it.live("keeps the thread a queued fresh run reserved for that run", () =>
+    Effect.gen(function* () {
+      const cwd = yield* checkpointWorkspace("fresh-context-reserved");
+      const capturedTurns = yield* Ref.make<ReadonlyArray<CapturedTurn>>([]);
+      const started = yield* Deferred.make<void>();
+      const release = yield* Deferred.make<void>();
+      const layerRegistry = ProviderAdapterRegistry.layerFromAdapters([
+        makeTestAdapter({
+          instanceId: CLAUDE_MODEL_SELECTION.instanceId,
+          driver: CLAUDE_DRIVER,
+          capabilities: ClaudeProviderCapabilitiesV2,
+          modelSelection: CLAUDE_MODEL_SELECTION,
+          responseByRunOrdinal: {},
+          capturedTurns,
+          nativeThreadGeneration: yield* Ref.make(0),
+          holdFirstTurn: started,
+          releaseFirstTurn: release,
+          holdRunOrdinal: 2,
+        }),
+        makeTestAdapter({
+          instanceId: CODEX_MODEL_SELECTION.instanceId,
+          driver: CODEX_DRIVER,
+          capabilities: CodexProviderCapabilitiesV2,
+          modelSelection: CODEX_MODEL_SELECTION,
+          responseByRunOrdinal: {},
+          capturedTurns,
+          nativeThreadGeneration: yield* Ref.make(0),
+        }),
+      ]);
+      const reservedThreadId = ThreadId.make("thread:fresh-context-reserved");
+      yield* Effect.gen(function* () {
+        const orchestrator = yield* Orchestrator.OrchestratorV2;
+        const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
+        const send = (
+          name: string,
+          modelSelection: ModelSelection,
+          options: { readonly freshContext?: boolean } = {},
+        ) =>
+          orchestrator.dispatch({
+            type: "message.dispatch",
+            createdBy: "user",
+            creationSource: "web",
+            commandId: CommandId.make(`command:fresh-context-reserved:${name}`),
+            threadId: reservedThreadId,
+            messageId: MessageId.make(`message:fresh-context-reserved:${name}`),
+            text: `Prompt ${name}`,
+            attachments: [],
+            modelSelection,
+            ...options,
+            dispatchMode: { type: "queue_after_active" },
+          });
+        yield* orchestrator.dispatch({
+          type: "thread.create",
+          createdBy: "user",
+          creationSource: "web",
+          commandId: CommandId.make("command:fresh-context-reserved:create"),
+          threadId: reservedThreadId,
+          projectId: ProjectId.make("project:fresh-context-reserved"),
+          title: "Fresh context reserved",
+          modelSelection: CODEX_MODEL_SELECTION,
+          runtimeMode: "full-access",
+          interactionMode: "default",
+          branch: null,
+          worktreePath: cwd,
+        });
+        yield* send("zero", CODEX_MODEL_SELECTION);
+        yield* worker.drain();
+        yield* waitForIdle(reservedThreadId);
+        yield* send("alpha", CLAUDE_MODEL_SELECTION);
+        yield* Deferred.await(started);
+        yield* worker.drain();
+        // Queued while no fresh run has started: gamma binds to zero's Codex thread, and
+        // delta reserves its own. Once beta starts, gamma must not take delta's thread.
+        yield* send("beta", CLAUDE_MODEL_SELECTION, { freshContext: true });
+        yield* send("gamma", CODEX_MODEL_SELECTION);
+        yield* send("delta", CODEX_MODEL_SELECTION, { freshContext: true });
+        yield* Deferred.succeed(release, undefined);
+        yield* worker.drain();
+        yield* waitForIdle(reservedThreadId);
+        yield* worker.drain();
+        const turns = yield* Ref.get(capturedTurns);
+        const turnFor = (name: string) =>
+          turns.find((turn) => turn.text.endsWith(`Prompt ${name}`))!;
+
+        assert.notEqual(turnFor("gamma").providerThreadId, turnFor("zero").providerThreadId);
+        assert.notEqual(turnFor("delta").providerThreadId, turnFor("gamma").providerThreadId);
+        assert.notEqual(turnFor("delta").nativeThreadId, turnFor("gamma").nativeThreadId);
+        assert.equal(turnFor("delta").text, "Prompt delta");
+      }).pipe(
+        Effect.provide(
+          ProviderReplayHarness.layerWithRegistry(
+            {
+              name: "fresh-context-reserved",
+              runtimePolicyOverride: {
+                cwd,
+                approvalPolicy: "never",
+                sandboxPolicy: {
+                  type: "readOnly",
+                  access: { type: "fullAccess" },
+                  networkAccess: false,
+                },
+              },
+            },
+            layerRegistry,
           ),
-        );
-      }),
-    ),
+        ),
+      );
+    }),
   );
 
   // regression: #21314 a queued PR update must follow the provider that took over the thread
@@ -3412,438 +3666,476 @@ describe("orchestration v2 provider switching", () => {
   ] as const)(
     "delivers a queued PR update on the current provider through %s (%s)",
     ([delivery, target]) =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const cwd = yield* checkpointWorkspace(`pr-wake-${delivery}`);
-          const capturedTurns = yield* Ref.make<ReadonlyArray<CapturedTurn>>([]);
-          const started = yield* Deferred.make<void>();
-          const release = yield* Deferred.make<void>();
-          const compatible = target === "compatible Codex";
-          const selection = {
-            ...(compatible
-              ? { ...CODEX_MODEL_SELECTION, instanceId: ProviderInstanceId.make("codex-alternate") }
-              : CLAUDE_MODEL_SELECTION),
-            options: [{ id: "reasoningEffort", value: "low" }],
-          };
-          const targetCapabilities = compatible
-            ? {
-                ...CodexProviderCapabilitiesV2,
-                context: {
-                  ...CodexProviderCapabilitiesV2.context,
-                  canConsumeHandoffSummaries: false,
-                },
-              }
-            : ClaudeProviderCapabilitiesV2;
-          const adapters = [
-            makeTestAdapter({
-              instanceId: CODEX_MODEL_SELECTION.instanceId,
-              driver: CODEX_DRIVER,
-              capabilities: CodexProviderCapabilitiesV2,
-              modelSelection: CODEX_MODEL_SELECTION,
-              responseByRunOrdinal: {},
-              capturedTurns,
-              holdFirstTurn: started,
-              releaseFirstTurn: release,
-              failedRunOrdinals: new Set([1]),
-              failure: makeProviderFailure({
-                message: "Usage limit reached",
-                class: "usage_limit",
-                code: "usage_limit",
-              }),
-            }),
-            makeTestAdapter({
-              instanceId: selection.instanceId,
-              driver: compatible ? CODEX_DRIVER : CLAUDE_DRIVER,
-              capabilities: targetCapabilities,
-              modelSelection: selection,
-              responseByRunOrdinal: {},
-              capturedTurns,
-            }),
-          ];
-          const layerRegistry = compatible
-            ? Layer.succeed(
-                ProviderAdapterRegistry.ProviderAdapterRegistryV2,
-                ProviderAdapterRegistry.ProviderAdapterRegistryV2.of({
-                  get: (instanceId) => {
-                    const adapter = adapters.find(
-                      (candidate) => candidate.instanceId === instanceId,
-                    );
-                    return adapter === undefined
-                      ? Effect.fail(
-                          new ProviderAdapterRegistry.ProviderAdapterRegistryLookupError({
-                            instanceId,
-                          }),
-                        )
-                      : Effect.succeed(adapter);
-                  },
-                  list: () => Effect.succeed(adapters.map((adapter) => adapter.instanceId)),
-                  getMetadata: (instanceId) =>
-                    Effect.succeed({
-                      driver: CODEX_DRIVER,
-                      continuationKey: "codex:shared-native-account-history",
-                      enabled: true,
-                      capabilities:
-                        instanceId === selection.instanceId
-                          ? targetCapabilities
-                          : CodexProviderCapabilitiesV2,
-                    }),
-                }),
-              )
-            : ProviderAdapterRegistry.layerFromAdapters(adapters);
-          yield* Effect.gen(function* () {
-            const orchestrator = yield* Orchestrator.OrchestratorV2;
-            const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
-            const dispatch = (text: string, modelSelection: ModelSelection) =>
-              orchestrator.dispatch({
-                type: "message.dispatch",
-                commandId: CommandId.make(text),
-                messageId: MessageId.make(text),
-                threadId,
-                text,
-                modelSelection,
-                attachments: [],
-                createdBy: "user",
-                creationSource: "web",
-                dispatchMode: { type: "start_immediately" },
-              });
-            yield* orchestrator.dispatch({
-              type: "thread.create",
-              commandId: CommandId.make("create"),
-              threadId,
-              projectId,
-              createdBy: "user",
-              creationSource: "web",
-              title: "PR wake",
-              modelSelection: CODEX_MODEL_SELECTION,
-              runtimeMode: "full-access",
-              interactionMode: "default",
-              branch: null,
-              worktreePath: cwd,
-            });
-            yield* dispatch("Original work", CODEX_MODEL_SELECTION);
-            yield* Deferred.await(started);
-            yield* orchestrator.dispatch({
-              type: "message.dispatch",
-              commandId: CommandId.make("wake"),
-              messageId: MessageId.make("wake"),
-              threadId,
-              text: "Review the new PR comments",
-              attachments: [],
-              createdBy: "agent",
-              creationSource: "server",
-              dispatchMode: { type: "queue_after_active" },
-              notification: {
-                source: { kind: "monitor" },
-                outcome: "updated",
-                summary: "New PR comments",
-              },
-            });
-            const [active, wake] = (yield* orchestrator.getThreadProjection(threadId)).runs;
-            assert.isDefined(active);
-            assert.isDefined(wake);
-            assert.equal(wake.status, "queued");
-            yield* Deferred.succeed(release, undefined);
-            yield* orchestrator.streamStoredEvents.pipe(
-              Stream.filter(
-                ({ event }) =>
-                  event.type === "run.updated" &&
-                  event.runId === active.id &&
-                  event.payload.status === "failed",
-              ),
-              Stream.runHead,
-            );
-            yield* worker.drain();
-
-            if (delivery === "automatic") {
-              yield* dispatch("Take over the work", selection);
-            } else {
-              yield* orchestrator.dispatch({
-                type: "thread.model-selection.set",
-                commandId: CommandId.make("select"),
-                threadId,
-                modelSelection: selection,
-              });
-              yield* orchestrator.dispatch({
-                type: "queue.resume",
-                commandId: CommandId.make("resume"),
-                threadId,
-              });
-            }
-            yield* orchestrator.streamStoredEvents.pipe(
-              Stream.filter(
-                ({ event }) =>
-                  event.type === "run.updated" &&
-                  event.runId === wake.id &&
-                  (event.payload.status === "completed" || event.payload.status === "failed"),
-              ),
-              Stream.runHead,
-            );
-            yield* worker.drain();
-            const after = yield* orchestrator.getThreadProjection(threadId);
-            const turns = yield* Ref.get(capturedTurns);
-            assert.lengthOf(turns, delivery === "automatic" ? 3 : 2);
-            const executed = turns.at(-1)!;
-            assert.equal(executed.driver, compatible ? CODEX_DRIVER : CLAUDE_DRIVER);
-            assert.include(executed.text, "Review the new PR comments");
-            assert.deepEqual(executed.modelSelection, selection);
-            assert.deepEqual(after.thread.modelSelection, selection);
-            const delivered = after.runs.find((run) => run.id === wake.id)!;
-            assert.equal(delivered.status, "completed");
-            assert.deepEqual(delivered.modelSelection, selection);
-            assert.equal(delivered.providerInstanceId, selection.instanceId);
-            assert.equal(delivered.providerThreadId, executed.providerThreadId);
-            assert.equal(after.thread.activeProviderThreadId, delivered.providerThreadId);
-            if (delivery === "automatic") {
-              assert.equal(executed.providerThreadId, turns[1]!.providerThreadId);
-              assert.equal(executed.nativeThreadId, turns[1]!.nativeThreadId);
-            }
-            if (compatible) {
-              assert.equal(executed.nativeThreadId, turns[0]!.nativeThreadId);
-              assert.isEmpty(after.contextHandoffs);
-            }
-            assert.equal(
-              after.providerThreads.find((entry) => entry.id === delivered.providerThreadId)
-                ?.providerInstanceId,
-              selection.instanceId,
-            );
-            assert.equal(
-              after.turnItems.find(
-                (entry) => entry.type === "notification" && entry.runId === wake.id,
-              )?.providerThreadId,
-              delivered.providerThreadId,
-            );
-            const attempt = after.attempts.find((entry) => entry.id === delivered.activeAttemptId);
-            const root = after.nodes.find((entry) => entry.id === delivered.rootNodeId);
-            assert.equal(attempt?.providerInstanceId, selection.instanceId);
-            assert.equal(attempt?.providerThreadId, delivered.providerThreadId);
-            assert.equal(root?.providerThreadId, delivered.providerThreadId);
-            assert.equal(
-              after.checkpointScopes.find((entry) => entry.id === root?.checkpointScopeId)
-                ?.providerThreadId,
-              delivered.providerThreadId,
-            );
-          }).pipe(
-            Effect.provide(
-              ProviderReplayHarness.layerWithRegistry(
-                { name: `pr-wake-${delivery}`, runtimePolicyOverride: { cwd } },
-                layerRegistry,
-              ),
-            ),
-          );
-        }),
-      ),
-  );
-
-  it.live("fails an unsupported queued handoff and advances to the next queued provider", () =>
-    Effect.scoped(
       Effect.gen(function* () {
-        const cwd = yield* checkpointWorkspace("queued-handoff-rejection");
+        const cwd = yield* checkpointWorkspace(`pr-wake-${delivery}`);
         const capturedTurns = yield* Ref.make<ReadonlyArray<CapturedTurn>>([]);
         const started = yield* Deferred.make<void>();
-        const rejectedThreadId = ThreadId.make("thread:queued-handoff-rejection");
-        const rejectedMessageId = MessageId.make("message:queued-handoff-rejection:claude");
-        const unsupportedClaudeCapabilities = {
-          ...ClaudeProviderCapabilitiesV2,
-          context: {
-            ...ClaudeProviderCapabilitiesV2.context,
-            canConsumeHandoffSummaries: false,
-          },
+        const release = yield* Deferred.make<void>();
+        const compatible = target === "compatible Codex";
+        const selection = {
+          ...(compatible
+            ? { ...CODEX_MODEL_SELECTION, instanceId: ProviderInstanceId.make("codex-alternate") }
+            : CLAUDE_MODEL_SELECTION),
+          options: [{ id: "reasoningEffort", value: "low" }],
         };
-        const layerRegistry = ProviderAdapterRegistry.layerFromAdapters([
+        const targetCapabilities = compatible
+          ? {
+              ...CodexProviderCapabilitiesV2,
+              context: {
+                ...CodexProviderCapabilitiesV2.context,
+                canConsumeHandoffSummaries: false,
+              },
+            }
+          : ClaudeProviderCapabilitiesV2;
+        const adapters = [
           makeTestAdapter({
             instanceId: CODEX_MODEL_SELECTION.instanceId,
             driver: CODEX_DRIVER,
             capabilities: CodexProviderCapabilitiesV2,
             modelSelection: CODEX_MODEL_SELECTION,
-            responseByRunOrdinal: { 3: "Later Codex queued turn complete" },
+            responseByRunOrdinal: {},
             capturedTurns,
             holdFirstTurn: started,
+            releaseFirstTurn: release,
+            failedRunOrdinals: new Set([1]),
+            failure: makeProviderFailure({
+              message: "Usage limit reached",
+              class: "usage_limit",
+              code: "usage_limit",
+            }),
           }),
           makeTestAdapter({
-            instanceId: CLAUDE_MODEL_SELECTION.instanceId,
-            driver: CLAUDE_DRIVER,
-            capabilities: unsupportedClaudeCapabilities,
-            modelSelection: CLAUDE_MODEL_SELECTION,
+            instanceId: selection.instanceId,
+            driver: compatible ? CODEX_DRIVER : CLAUDE_DRIVER,
+            capabilities: targetCapabilities,
+            modelSelection: selection,
             responseByRunOrdinal: {},
             capturedTurns,
           }),
-        ]);
-        const projection = yield* Effect.gen(function* () {
+        ];
+        const layerRegistry = compatible
+          ? Layer.succeed(
+              ProviderAdapterRegistry.ProviderAdapterRegistryV2,
+              ProviderAdapterRegistry.ProviderAdapterRegistryV2.of({
+                get: (instanceId) => {
+                  const adapter = adapters.find((candidate) => candidate.instanceId === instanceId);
+                  return adapter === undefined
+                    ? Effect.fail(
+                        new ProviderAdapterRegistry.ProviderAdapterRegistryLookupError({
+                          instanceId,
+                        }),
+                      )
+                    : Effect.succeed(adapter);
+                },
+                list: () => Effect.succeed(adapters.map((adapter) => adapter.instanceId)),
+                getMetadata: (instanceId) =>
+                  Effect.succeed({
+                    driver: CODEX_DRIVER,
+                    continuationKey: "codex:shared-native-account-history",
+                    enabled: true,
+                    capabilities:
+                      instanceId === selection.instanceId
+                        ? targetCapabilities
+                        : CodexProviderCapabilitiesV2,
+                  }),
+              }),
+            )
+          : ProviderAdapterRegistry.layerFromAdapters(adapters);
+        yield* Effect.gen(function* () {
           const orchestrator = yield* Orchestrator.OrchestratorV2;
-          const eventSink = yield* EventSink.EventSinkV2;
           const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
+          const dispatch = (text: string, modelSelection: ModelSelection) =>
+            orchestrator.dispatch({
+              type: "message.dispatch",
+              commandId: CommandId.make(text),
+              messageId: MessageId.make(text),
+              threadId,
+              text,
+              modelSelection,
+              attachments: [],
+              createdBy: "user",
+              creationSource: "web",
+              dispatchMode: { type: "start_immediately" },
+            });
           yield* orchestrator.dispatch({
             type: "thread.create",
+            commandId: CommandId.make("create"),
+            threadId,
+            projectId,
             createdBy: "user",
             creationSource: "web",
-            commandId: CommandId.make("command:queued-handoff-rejection:create"),
-            threadId: rejectedThreadId,
-            projectId: ProjectId.make("project:queued-handoff-rejection"),
-            title: "Queued handoff rejection",
+            title: "PR wake",
             modelSelection: CODEX_MODEL_SELECTION,
             runtimeMode: "full-access",
             interactionMode: "default",
             branch: null,
             worktreePath: cwd,
           });
-          yield* orchestrator.dispatch({
-            type: "message.dispatch",
-            createdBy: "user",
-            creationSource: "web",
-            commandId: CommandId.make("command:queued-handoff-rejection:first"),
-            threadId: rejectedThreadId,
-            messageId: MessageId.make("message:queued-handoff-rejection:first"),
-            text: "First Codex turn",
-            attachments: [],
-            modelSelection: CODEX_MODEL_SELECTION,
-            dispatchMode: { type: "start_immediately" },
-          });
+          yield* dispatch("Original work", CODEX_MODEL_SELECTION);
           yield* Deferred.await(started);
-          const active = yield* orchestrator.getThreadProjection(rejectedThreadId);
-          const now = yield* DateTime.now;
-          yield* eventSink.write({
-            events: [
-              {
-                id: EventId.make("event:queued-handoff-rejection:existing-item"),
-                type: "turn-item.updated",
-                threadId: rejectedThreadId,
-                runId: active.runs[0]!.id,
-                nodeId: active.runs[0]!.rootNodeId!,
-                providerInstanceId: CODEX_MODEL_SELECTION.instanceId,
-                occurredAt: now,
-                payload: {
-                  id: TurnItemId.make("turn-item:queued-handoff-rejection:existing-item"),
-                  threadId: rejectedThreadId,
-                  runId: active.runs[0]!.id,
-                  nodeId: active.runs[0]!.rootNodeId!,
-                  providerThreadId: active.runs[0]!.providerThreadId,
-                  providerTurnId: null,
-                  nativeItemRef: null,
-                  parentItemId: null,
-                  ordinal: 150,
-                  status: "completed",
-                  title: null,
-                  inputIntent: "turn_start",
-                  startedAt: now,
-                  completedAt: now,
-                  updatedAt: now,
-                  type: "user_message",
-                  messageId: rejectedMessageId,
-                  text: "Unsupported Claude turn",
-                  attachments: [],
-                  createdBy: "user",
-                  creationSource: "web",
-                },
-              },
-            ],
-          });
-          yield* orchestrator.dispatch({
-            type: "message.dispatch",
-            createdBy: "user",
-            creationSource: "web",
-            commandId: CommandId.make("command:queued-handoff-rejection:claude"),
-            threadId: rejectedThreadId,
-            messageId: rejectedMessageId,
-            text: "Unsupported Claude turn",
-            attachments: [],
-            modelSelection: CLAUDE_MODEL_SELECTION,
-            dispatchMode: { type: "queue_after_active" },
-          });
           yield* orchestrator.dispatch({
             type: "message.dispatch",
-            createdBy: "user",
-            creationSource: "web",
-            commandId: CommandId.make("command:queued-handoff-rejection:later"),
-            threadId: rejectedThreadId,
-            messageId: MessageId.make("message:queued-handoff-rejection:later"),
-            text: "Later Codex turn",
+            commandId: CommandId.make("wake"),
+            messageId: MessageId.make("wake"),
+            threadId,
+            text: "Review the new PR comments",
             attachments: [],
-            modelSelection: CODEX_MODEL_SELECTION,
+            createdBy: "agent",
+            creationSource: "server",
             dispatchMode: { type: "queue_after_active" },
+            notification: {
+              source: { kind: "monitor" },
+              outcome: "updated",
+              summary: "New PR comments",
+            },
           });
-          const queued = yield* orchestrator.getThreadProjection(rejectedThreadId);
-          assert.deepEqual(
-            queued.runs.map((run) => run.status),
-            ["running", "queued", "queued"],
-          );
-          const queuedItem = queued.turnItems.find(
-            (item) => item.type === "user_message" && item.messageId === rejectedMessageId,
+          const [active, wake] = (yield* orchestrator.getThreadProjection(threadId)).runs;
+          assert.isDefined(active);
+          assert.isDefined(wake);
+          assert.equal(wake.status, "queued");
+          yield* Deferred.succeed(release, undefined);
+          yield* orchestrator.streamStoredEvents.pipe(
+            Stream.filter(
+              ({ event }) =>
+                event.type === "run.updated" &&
+                event.runId === active.id &&
+                event.payload.status === "failed",
+            ),
+            Stream.runHead,
           );
-          assert.equal(queuedItem?.runId, queued.runs[1]?.id);
-          assert.equal(queuedItem?.providerThreadId, queued.runs[1]?.providerThreadId);
-          yield* eventSink.write({
-            events: [
-              {
-                id: EventId.make("event:queued-handoff-rejection:first-complete"),
-                type: "run.updated",
-                threadId: rejectedThreadId,
-                runId: queued.runs[0]!.id,
-                providerInstanceId: CODEX_MODEL_SELECTION.instanceId,
-                occurredAt: now,
-                payload: { ...queued.runs[0]!, status: "completed", completedAt: now },
-              },
-            ],
-          });
-          yield* orchestrator.resumeQueuedRuns;
+          yield* worker.drain();
+
+          if (delivery === "automatic") {
+            yield* dispatch("Take over the work", selection);
+          } else {
+            yield* orchestrator.dispatch({
+              type: "thread.model-selection.set",
+              commandId: CommandId.make("select"),
+              threadId,
+              modelSelection: selection,
+            });
+            yield* orchestrator.dispatch({
+              type: "queue.resume",
+              commandId: CommandId.make("resume"),
+              threadId,
+            });
+          }
           yield* orchestrator.streamStoredEvents.pipe(
             Stream.filter(
-              (event) =>
-                event.event.type === "run.updated" &&
-                event.event.runId === queued.runs[2]?.id &&
-                event.event.payload.status === "completed",
+              ({ event }) =>
+                event.type === "run.updated" &&
+                event.runId === wake.id &&
+                (event.payload.status === "completed" || event.payload.status === "failed"),
             ),
             Stream.runHead,
           );
           yield* worker.drain();
-          return yield* orchestrator.getThreadProjection(rejectedThreadId);
+          const after = yield* orchestrator.getThreadProjection(threadId);
+          const turns = yield* Ref.get(capturedTurns);
+          assert.lengthOf(turns, delivery === "automatic" ? 3 : 2);
+          const executed = turns.at(-1)!;
+          assert.equal(executed.driver, compatible ? CODEX_DRIVER : CLAUDE_DRIVER);
+          assert.include(executed.text, "Review the new PR comments");
+          assert.deepEqual(executed.modelSelection, selection);
+          assert.deepEqual(after.thread.modelSelection, selection);
+          const delivered = after.runs.find((run) => run.id === wake.id)!;
+          assert.equal(delivered.status, "completed");
+          assert.deepEqual(delivered.modelSelection, selection);
+          assert.equal(delivered.providerInstanceId, selection.instanceId);
+          assert.equal(delivered.providerThreadId, executed.providerThreadId);
+          assert.equal(after.thread.activeProviderThreadId, delivered.providerThreadId);
+          if (delivery === "automatic") {
+            assert.equal(executed.providerThreadId, turns[1]!.providerThreadId);
+            assert.equal(executed.nativeThreadId, turns[1]!.nativeThreadId);
+          }
+          if (compatible) {
+            assert.equal(executed.nativeThreadId, turns[0]!.nativeThreadId);
+            assert.isEmpty(after.contextHandoffs);
+          }
+          assert.equal(
+            after.providerThreads.find((entry) => entry.id === delivered.providerThreadId)
+              ?.providerInstanceId,
+            selection.instanceId,
+          );
+          assert.equal(
+            after.turnItems.find(
+              (entry) => entry.type === "notification" && entry.runId === wake.id,
+            )?.providerThreadId,
+            delivered.providerThreadId,
+          );
+          const attempt = after.attempts.find((entry) => entry.id === delivered.activeAttemptId);
+          const root = after.nodes.find((entry) => entry.id === delivered.rootNodeId);
+          assert.equal(attempt?.providerInstanceId, selection.instanceId);
+          assert.equal(attempt?.providerThreadId, delivered.providerThreadId);
+          assert.equal(root?.providerThreadId, delivered.providerThreadId);
+          assert.equal(
+            after.checkpointScopes.find((entry) => entry.id === root?.checkpointScopeId)
+              ?.providerThreadId,
+            delivered.providerThreadId,
+          );
         }).pipe(
           Effect.provide(
             ProviderReplayHarness.layerWithRegistry(
-              {
-                name: "queued-handoff-rejection",
-                runtimePolicyOverride: {
-                  cwd,
-                  approvalPolicy: "never",
-                  sandboxPolicy: {
-                    type: "readOnly",
-                    access: { type: "fullAccess" },
-                    networkAccess: false,
-                  },
-                },
-              },
+              { name: `pr-wake-${delivery}`, runtimePolicyOverride: { cwd } },
               layerRegistry,
             ),
           ),
         );
+      }),
+  );
+
+  it.live("fails an unsupported queued handoff and advances to the next queued provider", () =>
+    Effect.gen(function* () {
+      const cwd = yield* checkpointWorkspace("queued-handoff-rejection");
+      const capturedTurns = yield* Ref.make<ReadonlyArray<CapturedTurn>>([]);
+      const started = yield* Deferred.make<void>();
+      const rejectedThreadId = ThreadId.make("thread:queued-handoff-rejection");
+      const rejectedMessageId = MessageId.make("message:queued-handoff-rejection:claude");
+      const unsupportedClaudeCapabilities = {
+        ...ClaudeProviderCapabilitiesV2,
+        context: {
+          ...ClaudeProviderCapabilitiesV2.context,
+          canConsumeHandoffSummaries: false,
+        },
+      };
+      const layerRegistry = ProviderAdapterRegistry.layerFromAdapters([
+        makeTestAdapter({
+          instanceId: CODEX_MODEL_SELECTION.instanceId,
+          driver: CODEX_DRIVER,
+          capabilities: CodexProviderCapabilitiesV2,
+          modelSelection: CODEX_MODEL_SELECTION,
+          responseByRunOrdinal: { 3: "Later Codex queued turn complete" },
+          capturedTurns,
+          holdFirstTurn: started,
+        }),
+        makeTestAdapter({
+          instanceId: CLAUDE_MODEL_SELECTION.instanceId,
+          driver: CLAUDE_DRIVER,
+          capabilities: unsupportedClaudeCapabilities,
+          modelSelection: CLAUDE_MODEL_SELECTION,
+          responseByRunOrdinal: {},
+          capturedTurns,
+        }),
+      ]);
+      const projection = yield* Effect.gen(function* () {
+        const orchestrator = yield* Orchestrator.OrchestratorV2;
+        const eventSink = yield* EventSink.EventSinkV2;
+        const worker = yield* EffectWorker.OrchestrationEffectWorkerV2;
+        yield* orchestrator.dispatch({
+          type: "thread.create",
+          createdBy: "user",
+          creationSource: "web",
+          commandId: CommandId.make("command:queued-handoff-rejection:create"),
+          threadId: rejectedThreadId,
+          projectId: ProjectId.make("project:queued-handoff-rejection"),
+          title: "Queued handoff rejection",
+          modelSelection: CODEX_MODEL_SELECTION,
+          runtimeMode: "full-access",
+          interactionMode: "default",
+          branch: null,
+          worktreePath: cwd,
+        });
+        yield* orchestrator.dispatch({
+          type: "message.dispatch",
+          createdBy: "user",
+          creationSource: "web",
+          commandId: CommandId.make("command:queued-handoff-rejection:first"),
+          threadId: rejectedThreadId,
+          messageId: MessageId.make("message:queued-handoff-rejection:first"),
+          text: "First Codex turn",
+          attachments: [],
+          modelSelection: CODEX_MODEL_SELECTION,
+          dispatchMode: { type: "start_immediately" },
+        });
+        yield* Deferred.await(started);
+        const active = yield* orchestrator.getThreadProjection(rejectedThreadId);
+        const now = yield* DateTime.now;
+        yield* eventSink.write({
+          events: [
+            {
+              id: EventId.make("event:queued-handoff-rejection:existing-item"),
+              type: "turn-item.updated",
+              threadId: rejectedThreadId,
+              runId: active.runs[0]!.id,
+              nodeId: active.runs[0]!.rootNodeId!,
+              providerInstanceId: CODEX_MODEL_SELECTION.instanceId,
+              occurredAt: now,
+              payload: {
+                id: TurnItemId.make("turn-item:queued-handoff-rejection:existing-item"),
+                threadId: rejectedThreadId,
+                runId: active.runs[0]!.id,
+                nodeId: active.runs[0]!.rootNodeId!,
+                providerThreadId: active.runs[0]!.providerThreadId,
+                providerTurnId: null,
+                nativeItemRef: null,
+                parentItemId: null,
+                ordinal: 150,
+                status: "completed",
+                title: null,
+                inputIntent: "turn_start",
+                startedAt: now,
+                completedAt: now,
+                updatedAt: now,
+                type: "user_message",
+                messageId: rejectedMessageId,
+                text: "Unsupported Claude turn",
+                attachments: [],
+                createdBy: "user",
+                creationSource: "web",
+              },
+            },
+          ],
+        });
+        yield* orchestrator.dispatch({
+          type: "message.dispatch",
+          createdBy: "user",
+          creationSource: "web",
+          commandId: CommandId.make("command:queued-handoff-rejection:claude"),
+          threadId: rejectedThreadId,
+          messageId: rejectedMessageId,
+          text: "Unsupported Claude turn",
+          attachments: [],
+          modelSelection: CLAUDE_MODEL_SELECTION,
+          dispatchMode: { type: "queue_after_active" },
+        });
+        yield* orchestrator.dispatch({
+          type: "message.dispatch",
+          createdBy: "user",
+          creationSource: "web",
+          commandId: CommandId.make("command:queued-handoff-rejection:later"),
+          threadId: rejectedThreadId,
+          messageId: MessageId.make("message:queued-handoff-rejection:later"),
+          text: "Later Codex turn",
+          attachments: [],
+          modelSelection: CODEX_MODEL_SELECTION,
+          dispatchMode: { type: "queue_after_active" },
+        });
+        const queued = yield* orchestrator.getThreadProjection(rejectedThreadId);
         assert.deepEqual(
-          projection.runs.map((run) => run.status),
-          ["completed", "failed", "completed"],
-        );
-        assert.equal(projection.runs[1]?.queuePosition, null);
-        assert.equal(
-          projection.attempts.find((attempt) => attempt.runId === projection.runs[1]?.id)?.status,
-          "failed",
+          queued.runs.map((run) => run.status),
+          ["running", "queued", "queued"],
         );
-        assert.equal(
-          projection.nodes.find((node) => node.runId === projection.runs[1]?.id)?.status,
-          "failed",
+        const queuedItem = queued.turnItems.find(
+          (item) => item.type === "user_message" && item.messageId === rejectedMessageId,
         );
-        assert.equal(projection.thread.providerInstanceId, CODEX_MODEL_SELECTION.instanceId);
-        assert.lengthOf(projection.contextHandoffs, 1);
-        assert.include((yield* Ref.get(capturedTurns)).at(-1)!.text, "Unsupported Claude turn");
-        const failureItem = projection.turnItems.find(
-          (item) => item.type === "error" && item.runId === projection.runs[1]?.id,
+        assert.equal(queuedItem?.runId, queued.runs[1]?.id);
+        assert.equal(queuedItem?.providerThreadId, queued.runs[1]?.providerThreadId);
+        assert.equal(queuedItem?.status, "pending");
+        assert.isNull(queuedItem?.startedAt);
+        assert.isNull(queuedItem?.completedAt);
+        assert.isFalse(queued.visibleTurnItems.some((row) => row.item.id === queuedItem?.id));
+        const queuedSequence = yield* eventSink.latestSequence({ threadId: rejectedThreadId });
+        yield* eventSink.write({
+          events: [
+            {
+              id: EventId.make("event:queued-handoff-rejection:first-complete"),
+              type: "run.updated",
+              threadId: rejectedThreadId,
+              runId: queued.runs[0]!.id,
+              providerInstanceId: CODEX_MODEL_SELECTION.instanceId,
+              occurredAt: now,
+              payload: { ...queued.runs[0]!, status: "completed", completedAt: now },
+            },
+          ],
+        });
+        yield* orchestrator.resumeQueuedRuns;
+        yield* orchestrator.streamStoredEvents.pipe(
+          Stream.filter(
+            (event) =>
+              event.event.type === "run.updated" &&
+              event.event.runId === queued.runs[2]?.id &&
+              event.event.payload.status === "completed",
+          ),
+          Stream.runHead,
         );
-        assert.equal(
-          failureItem?.type === "error" ? failureItem.failure.code : null,
-          "context_handoff_unsupported",
+        yield* worker.drain();
+        // Clients whose bounded snapshot omitted the hidden queued item must
+        // receive it while the run is still queued, before it fails.
+        const throughSequence = yield* eventSink.latestSequence({ threadId: rejectedThreadId });
+        const failureEvents = yield* eventSink
+          .stream({ threadId: rejectedThreadId, afterSequence: queuedSequence })
+          .pipe(
+            Stream.takeUntil((stored) => stored.sequence === throughSequence),
+            Stream.map(({ event }) => event),
+            Stream.filter((event) => event.runId === queued.runs[1]!.id),
+            Stream.runCollect,
+          );
+        const republished = failureEvents.findIndex(
+          (event) =>
+            event.type === "turn-item.updated" &&
+            event.payload.type === "user_message" &&
+            event.payload.messageId === rejectedMessageId,
         );
-        assert.deepEqual(
-          (yield* Ref.get(capturedTurns)).map((turn) => turn.driver),
-          [CODEX_DRIVER, CODEX_DRIVER],
+        assert.isAtLeast(republished, 0);
+        const restored = failureEvents[republished];
+        assert.equal(restored?.type, "turn-item.updated");
+        if (restored?.type === "turn-item.updated") {
+          assert.deepEqual(restored.payload, {
+            ...queuedItem,
+            status: "failed",
+            completedAt: restored.occurredAt,
+            updatedAt: restored.occurredAt,
+          });
+        }
+        assert.isBelow(
+          republished,
+          failureEvents.findIndex(
+            (event) => event.type === "run.updated" && event.payload.status === "failed",
+          ),
         );
-      }),
-    ),
+        return yield* orchestrator.getThreadProjection(rejectedThreadId);
+      }).pipe(
+        Effect.provide(
+          ProviderReplayHarness.layerWithRegistry(
+            {
+              name: "queued-handoff-rejection",
+              runtimePolicyOverride: {
+                cwd,
+                approvalPolicy: "never",
+                sandboxPolicy: {
+                  type: "readOnly",
+                  access: { type: "fullAccess" },
+                  networkAccess: false,
+                },
+              },
+            },
+            layerRegistry,
+          ),
+        ),
+      );
+      assert.deepEqual(
+        projection.runs.map((run) => run.status),
+        ["completed", "failed", "completed"],
+      );
+      assert.equal(projection.runs[1]?.queuePosition, null);
+      assert.equal(
+        projection.attempts.find((attempt) => attempt.runId === projection.runs[1]?.id)?.status,
+        "failed",
+      );
+      assert.equal(
+        projection.nodes.find((node) => node.runId === projection.runs[1]?.id)?.status,
+        "failed",
+      );
+      assert.equal(projection.thread.providerInstanceId, CODEX_MODEL_SELECTION.instanceId);
+      assert.lengthOf(projection.contextHandoffs, 1);
+      assert.include((yield* Ref.get(capturedTurns)).at(-1)!.text, "Unsupported Claude turn");
+      const failureItem = projection.turnItems.find(
+        (item) => item.type === "error" && item.runId === projection.runs[1]?.id,
+      );
+      assert.equal(
+        failureItem?.type === "error" ? failureItem.failure.code : null,
+        "context_handoff_unsupported",
+      );
+      assert.isTrue(
+        projection.visibleTurnItems.some(
+          ({ item }) => item.type === "user_message" && item.messageId === rejectedMessageId,
+        ),
+      );
+      assert.deepEqual(
+        (yield* Ref.get(capturedTurns)).map((turn) => turn.driver),
+        [CODEX_DRIVER, CODEX_DRIVER],
+      );
+    }),
   );
 
   const importedFailureScenario = (queueBeforeFailure: boolean) =>
diff --git a/apps/server/src/orchestration-v2/testkit/ReplayRuntimeInstructions.ts b/apps/server/src/orchestration-v2/testkit/ReplayRuntimeInstructions.ts
index 0c3d59e93398..e594a5ab5003 100644
--- a/apps/server/src/orchestration-v2/testkit/ReplayRuntimeInstructions.ts
+++ b/apps/server/src/orchestration-v2/testkit/ReplayRuntimeInstructions.ts
@@ -20,10 +20,102 @@ export function materializeReplayTranscriptRuntimeInstructions(
               : undefined;
   if (harness === undefined) return transcript;
   const instructions = buildRuntimeInstructions({ harness, model: runtime.model });
+  // The notes name the model, so each prompt expects the ones for its session's current model.
+  const sessionModels = new Map<unknown, string>();
+  const notesFor = (sessionId: unknown) => {
+    const model = sessionModels.get(sessionId) ?? runtime.model;
+    return model === runtime.model ? instructions : buildRuntimeInstructions({ harness, model });
+  };
+  // Grok's flavor sets `supportsCompaction`; Kiro compacts through its own request instead.
+  const compactsThroughPrompt = runtime.driver === "grok";
+  // Like the adapter: notes go out until a prompt carrying that text succeeds, and a new runtime
+  // or compaction resets that. Not mirrored, as no recording has them: Copilot compaction events,
+  // child-session compactions, and ACP v2 prompts that settle through an idle `state_update`.
+  const deliveredNotes = new Map<unknown, string>();
+  // A prompt's success records delivery only if no compaction completed after it was sent.
+  const compactionCounts = new Map<unknown, number>();
+  const completedCompactionIds = new Set<string>();
+  // A turn that completes with a compaction still open projects it as completed.
+  const openCompactions = new Map<unknown, Set<unknown>>();
+  const markCompacted = (sessionId: unknown, compactionId?: unknown) => {
+    if (typeof compactionId === "string") {
+      const key = `${String(sessionId)}\u0000${compactionId}`;
+      if (completedCompactionIds.has(key)) return;
+      completedCompactionIds.add(key);
+    }
+    deliveredNotes.delete(sessionId);
+    compactionCounts.set(sessionId, (compactionCounts.get(sessionId) ?? 0) + 1);
+  };
+  let pendingPrompt:
+    | {
+        readonly sessionId: unknown;
+        /** The runtime notes the prompt carried, if any. */
+        readonly notes: string | undefined;
+        readonly compact: boolean;
+        readonly compactionsAtSend: number;
+      }
+    | undefined;
+  let pendingKiroCompact: { readonly sessionId: unknown } | undefined;
 
   return {
     ...transcript,
     entries: transcript.entries.map((entry) => {
+      if (entry.type === "emit_inbound") {
+        const frame = asFrame(entry.frame);
+        if (frame?.kind === "response" && frame.method === "session/prompt" && pendingPrompt) {
+          const stopReason = isRecord(frame.result) ? frame.result.stopReason : undefined;
+          const delivered =
+            frame.error === undefined &&
+            stopReason !== "cancelled" &&
+            stopReason !== "refusal" &&
+            stopReason !== "error";
+          const open = openCompactions.get(pendingPrompt.sessionId);
+          if (delivered && open !== undefined && open.size > 0) {
+            openCompactions.delete(pendingPrompt.sessionId);
+            markCompacted(pendingPrompt.sessionId);
+          }
+          if (delivered && pendingPrompt.compact) {
+            markCompacted(pendingPrompt.sessionId);
+          } else if (
+            delivered &&
+            pendingPrompt.notes !== undefined &&
+            (compactionCounts.get(pendingPrompt.sessionId) ?? 0) === pendingPrompt.compactionsAtSend
+          ) {
+            deliveredNotes.set(pendingPrompt.sessionId, pendingPrompt.notes);
+          }
+          pendingPrompt = undefined;
+        }
+        if (
+          frame?.kind === "response" &&
+          frame.method === "_kiro/session/compact" &&
+          pendingKiroCompact
+        ) {
+          // Kiro's adapter accepts only `{ success: true }`.
+          if (isRecord(frame.result) && frame.result.success === true) {
+            markCompacted(pendingKiroCompact.sessionId);
+          }
+          pendingKiroCompact = undefined;
+        }
+        const update =
+          frame?.method === "session/update" && isRecord(frame.params)
+            ? frame.params.update
+            : undefined;
+        if (
+          isRecord(update) &&
+          update.sessionUpdate === "compaction_update" &&
+          isRecord(frame?.params)
+        ) {
+          const sessionId = frame.params.sessionId;
+          const open = openCompactions.get(sessionId) ?? new Set<unknown>();
+          if (update.status === "in_progress") {
+            openCompactions.set(sessionId, open.add(update.compactionId));
+          } else {
+            open.delete(update.compactionId);
+          }
+          if (update.status === "completed") markCompacted(sessionId, update.compactionId);
+        }
+        return entry;
+      }
       if (entry.type !== "expect_outbound") return entry;
       const frame = entry.frame;
       if (typeof frame !== "object" || frame === null) return entry;
@@ -38,6 +130,43 @@ export function materializeReplayTranscriptRuntimeInstructions(
           ? entry
           : { ...entry, frame: { ...frame, message: `${frame.message}\n\n${instructions}` } };
       }
+      if (
+        "method" in frame &&
+        (frame.method === "session/close" || frame.method === "initialize")
+      ) {
+        // A closed or restarted session comes back in a new runtime, which resends the instructions.
+        deliveredNotes.clear();
+        completedCompactionIds.clear();
+        openCompactions.clear();
+        pendingPrompt = undefined;
+        pendingKiroCompact = undefined;
+        return entry;
+      }
+      const params = "params" in frame && isRecord(frame.params) ? frame.params : undefined;
+      const selectedModel =
+        "method" in frame && frame.method === "session/set_config_option"
+          ? params?.configId === "model"
+            ? params.value
+            : undefined
+          : "method" in frame && frame.method === "session/set_model"
+            ? params?.modelId
+            : undefined;
+      if (typeof selectedModel === "string") {
+        sessionModels.set(params?.sessionId, selectedModel);
+        return entry;
+      }
+      if (
+        "method" in frame &&
+        frame.method === "_kiro/session/compact" &&
+        "params" in frame &&
+        typeof frame.params === "object" &&
+        frame.params !== null &&
+        "sessionId" in frame.params
+      ) {
+        // Once it succeeds, Kiro's native compaction makes the next prompt resend them.
+        pendingKiroCompact = { sessionId: frame.params.sessionId };
+        return entry;
+      }
       if (
         "method" in frame &&
         frame.method === "session/prompt" &&
@@ -47,26 +176,44 @@ export function materializeReplayTranscriptRuntimeInstructions(
         "prompt" in frame.params &&
         Array.isArray(frame.params.prompt)
       ) {
+        const promptSessionId = "sessionId" in frame.params ? frame.params.sessionId : undefined;
         const prompt: ReadonlyArray<unknown> = frame.params.prompt;
-        const lastPart = prompt.at(-1);
-        if (
-          typeof lastPart === "object" &&
-          lastPart !== null &&
-          "type" in lastPart &&
-          lastPart.type === "text" &&
-          "text" in lastPart &&
-          typeof lastPart.text === "string" &&
-          // A recording that switched models mid-thread already carries the
-          // instructions for the model each prompt ran on.
-          (lastPart.text === instructions || lastPart.text.startsWith("<runtime_info>"))
-        ) {
+        const firstText = promptPartText(prompt[0])?.trim();
+        // Like the adapter, native slash commands go out without instructions. Where the agent
+        // compacts through the prompt, a successful `/compact` makes the next prompt resend them.
+        if (firstText?.startsWith("/") === true) {
+          pendingPrompt = {
+            sessionId: promptSessionId,
+            notes: undefined,
+            compact:
+              compactsThroughPrompt && prompt.length === 1 && /^\/compact(?:\s|$)/.test(firstText),
+            compactionsAtSend: compactionCounts.get(promptSessionId) ?? 0,
+          };
           return entry;
         }
+        const lastText = promptPartText(prompt.at(-1));
+        const expected = notesFor(promptSessionId);
+        // A recording that switched models mid-thread already carries the
+        // instructions for the model each prompt ran on.
+        const recordedNotes =
+          lastText === expected || lastText?.startsWith("<runtime_info>") === true
+            ? lastText
+            : undefined;
+        const resend =
+          recordedNotes === undefined && deliveredNotes.get(promptSessionId) !== expected;
+        pendingPrompt = {
+          sessionId: promptSessionId,
+          // Recorders normalize the notes they keep, so a recorded block stands for this model's.
+          notes: recordedNotes !== undefined || resend ? expected : undefined,
+          compact: false,
+          compactionsAtSend: compactionCounts.get(promptSessionId) ?? 0,
+        };
+        if (!resend) return entry;
         return {
           ...entry,
           frame: {
             ...frame,
-            params: { ...frame.params, prompt: [...prompt, { type: "text", text: instructions }] },
+            params: { ...frame.params, prompt: [...prompt, { type: "text", text: expected }] },
           },
         };
       }
@@ -74,3 +221,30 @@ export function materializeReplayTranscriptRuntimeInstructions(
     }),
   };
 }
+
+function promptPartText(part: unknown): string | undefined {
+  return typeof part === "object" &&
+    part !== null &&
+    "type" in part &&
+    part.type === "text" &&
+    "text" in part &&
+    typeof part.text === "string"
+    ? part.text
+    : undefined;
+}
+
+type ReplayFrame = {
+  readonly kind?: unknown;
+  readonly method?: unknown;
+  readonly params?: unknown;
+  readonly result?: unknown;
+  readonly error?: unknown;
+};
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return typeof value === "object" && value !== null;
+}
+
+function asFrame(value: unknown): ReplayFrame | undefined {
+  return isRecord(value) ? value : undefined;
+}
diff --git a/apps/server/src/orchestration-v2/testkit/fixtures/claude_background_monitor_wake/output.ts b/apps/server/src/orchestration-v2/testkit/fixtures/claude_background_monitor_wake/output.ts
index c1c3d9a171b0..ee17f23075a3 100644
--- a/apps/server/src/orchestration-v2/testkit/fixtures/claude_background_monitor_wake/output.ts
+++ b/apps/server/src/orchestration-v2/testkit/fixtures/claude_background_monitor_wake/output.ts
@@ -40,6 +40,7 @@ export function assertClaudeBackgroundMonitorWakeOutput(
       taskId: MONITOR_TASK_ID,
       description: "Background monitor test",
       kind: "monitor",
+      nativeItemId: "toolu_019b4EUbhEcYP4TS7vZn27N1",
     });
   }
   assert.deepEqual(projection.providerThreads[0]?.pendingBackgroundTasks ?? [], []);
diff --git a/apps/server/src/orchestration-v2/testkit/fixtures/claude_compact_after_resume_wake/input.ts b/apps/server/src/orchestration-v2/testkit/fixtures/claude_compact_after_resume_wake/input.ts
index 5c1ff9ad62ba..bb34f0d2eaf0 100644
--- a/apps/server/src/orchestration-v2/testkit/fixtures/claude_compact_after_resume_wake/input.ts
+++ b/apps/server/src/orchestration-v2/testkit/fixtures/claude_compact_after_resume_wake/input.ts
@@ -5,7 +5,7 @@ export function claudeCompactAfterResumeWakeInput(): OrchestratorFixtureInput {
   return {
     steps: [
       { type: "message", text: CLAUDE_COMPACT_FIRST_PROMPT },
-      { type: "advance_clock", duration: "31 minutes" },
+      { type: "advance_clock", duration: "31 minutes", releasesProviderSession: true },
       { type: "message", text: "/compact" },
     ],
   };
diff --git a/apps/server/src/orchestration-v2/testkit/fixtures/claude_idle_resume/input.ts b/apps/server/src/orchestration-v2/testkit/fixtures/claude_idle_resume/input.ts
index f074584dcd3d..2663b1d6c0ea 100644
--- a/apps/server/src/orchestration-v2/testkit/fixtures/claude_idle_resume/input.ts
+++ b/apps/server/src/orchestration-v2/testkit/fixtures/claude_idle_resume/input.ts
@@ -7,7 +7,7 @@ export function claudeIdleResumeInput(): OrchestratorFixtureInput {
   return {
     steps: [
       { type: "message", text: CLAUDE_IDLE_RESUME_PROMPT_1 },
-      { type: "advance_clock", duration: "31 minutes" },
+      { type: "advance_clock", duration: "31 minutes", releasesProviderSession: true },
       { type: "message", text: CLAUDE_IDLE_RESUME_PROMPT_2 },
     ],
   };
diff --git a/apps/server/src/orchestration-v2/testkit/fixtures/fx_early_stop/fx_transcript.ndjson b/apps/server/src/orchestration-v2/testkit/fixtures/fx_early_stop/fx_transcript.ndjson
index 5c684b21bc32..443a33b13ca3 100644
--- a/apps/server/src/orchestration-v2/testkit/fixtures/fx_early_stop/fx_transcript.ndjson
+++ b/apps/server/src/orchestration-v2/testkit/fixtures/fx_early_stop/fx_transcript.ndjson
@@ -1,5 +1,5 @@
 {"type":"transcript_start","provider":"fx","protocol":"acp.ndjson-jsonrpc","version":"1","scenario":"fx_early_stop","metadata":{"generatedBy":"live-fx-recorder","fxVersion":"0.0.13","normalization":"Session ids are fx-session-NN, the workspace is <workspace>, HOME is /home/fx-replay and the recording user is fx-replay. T3-owned prompt text, MCP servers and initialize params other than clientCapabilities and _meta are <any>. User skill names, emails and token-shaped strings are removed. Timestamps are kept as recorded.","droppedFrames":0}}
-{"type":"expect_outbound","label":"request:initialize","frame":{"kind":"request","method":"initialize","params":{"protocolVersion":2,"info":"<any>","capabilities":"<any>","clientCapabilities":{"fs":{"readTextFile":false,"writeTextFile":false},"terminal":false,"session":{"notices":{}},"elicitation":{"form":{}}},"clientInfo":"<any>"}}}
+{"type":"expect_outbound","label":"request:initialize","frame":{"kind":"request","method":"initialize","params":{"protocolVersion":2,"info":"<any>","capabilities":"<any>","clientCapabilities":{"fs":{"readTextFile":false,"writeTextFile":false},"terminal":false,"session":{"notices":{},"compaction":{}},"elicitation":{"form":{}}},"clientInfo":"<any>"}}}
 {"type":"emit_inbound","label":"response:initialize","frame":{"kind":"response","method":"initialize","result":{"protocolVersion":1,"agentCapabilities":{"loadSession":true,"promptCapabilities":{"image":true,"audio":false,"embeddedContext":true},"mcpCapabilities":{"http":true,"sse":true,"acp":true},"sessionCapabilities":{"list":{},"resume":{},"close":{},"systemPrompt":{}},"_meta":{"fx":{"steering":true}}},"agentInfo":{"name":"fx","title":"fx","version":"0.0.13"},"authMethods":[]}}}
 {"type":"expect_outbound","label":"request:session/new","frame":{"kind":"request","method":"session/new","params":{"cwd":"<workspace>","mcpServers":"<any>"}}}
 {"type":"emit_inbound","label":"response:session/new","frame":{"kind":"response","method":"session/new","result":{"sessionId":"fx-session-01","configOptions":[{"id":"provider","name":"Provider","category":"model","type":"select","currentValue":"gateway","options":[{"value":"gateway","name":"Vercel AI Gateway"},{"value":"codex","name":"Codex subscription"},{"value":"grok","name":"Grok subscription"}]},{"id":"model","name":"Model","category":"model","type":"select","currentValue":"anthropic/claude-opus-5.5","options":[{"value":"anthropic/claude-sonnet-5.5","name":"anthropic/claude-sonnet-5.5"},{"value":"anthropic/claude-opus-5.5","name":"anthropic/claude-opus-5.5"},{"value":"anthropic/claude-opus-5.5-fast","name":"anthropic/claude-opus-5.5-fast"},{"value":"anthropic/claude-opus-5","name":"anthropic/claude-opus-5"},{"value":"anthropic/claude-opus-5-fast","name":"anthropic/claude-opus-5-fast"},{"value":"anthropic/claude-sonnet-5","name":"anthropic/claude-sonnet-5"},{"value":"anthropic/claude-opus-4.8","name":"anthropic/claude-opus-4.8"},{"value":"anthropic/claude-opus-4.8-fast","name":"anthropic/claude-opus-4.8-fast"},{"value":"anthropic/claude-opus-4.7","name":"anthropic/claude-opus-4.7"},{"value":"anthropic/claude-sonnet-4.6","name":"anthropic/claude-sonnet-4.6"},{"value":"anthropic/claude-opus-4.6","name":"anthropic/claude-opus-4.6"},{"value":"anthropic/claude-opus-4.5","name":"anthropic/claude-opus-4.5"},{"value":"anthropic/claude-sonnet-4.5","name":"anthropic/claude-sonnet-4.5"},{"value":"anthropic/claude-opus-4","name":"anthropic/claude-opus-4"},{"value":"anthropic/claude-sonnet-4","name":"anthropic/claude-sonnet-4"},{"value":"openai/gpt-5.6-luna","name":"openai/gpt-5.6-luna"},{"value":"openai/gpt-5.6-luna-fast","name":"openai/gpt-5.6-luna-fast"},{"value":"openai/gpt-5.6-sol","name":"openai/gpt-5.6-sol"},{"value":"openai/gpt-5.6-sol-fast","name":"openai/gpt-5.6-sol-fast"},{"value":"openai/gpt-5.6-terra","name":"openai/gpt-5.6-terra"},{"value":"openai/gpt-5.6-terra-fast","name":"openai/gpt-5.6-terra-fast"},{"value":"openai/gpt-5.5","name":"openai/gpt-5.5"},{"value":"openai/gpt-5.5-fast","name":"openai/gpt-5.5-fast"},{"value":"openai/gpt-5.5-pro","name":"openai/gpt-5.5-pro"},{"value":"openai/gpt-5.4-nano","name":"openai/gpt-5.4-nano"},{"value":"openai/gpt-5.4","name":"openai/gpt-5.4"},{"value":"openai/gpt-5.4-fast","name":"openai/gpt-5.4-fast"},{"value":"openai/gpt-5.4-pro","name":"openai/gpt-5.4-pro"},{"value":"openai/gpt-5.3-codex","name":"openai/gpt-5.3-codex"},{"value":"openai/gpt-5.3-codex-fast","name":"openai/gpt-5.3-codex-fast"},{"value":"openai/gpt-5.2","name":"openai/gpt-5.2"},{"value":"openai/gpt-5.2-fast","name":"openai/gpt-5.2-fast"},{"value":"openai/gpt-5.2-pro","name":"openai/gpt-5.2-pro"},{"value":"openai/gpt-5.1-thinking","name":"openai/gpt-5.1-thinking"},{"value":"openai/gpt-5.1-thinking-fast","name":"openai/gpt-5.1-thinking-fast"},{"value":"openai/gpt-5-pro","name":"openai/gpt-5-pro"},{"value":"openai/gpt-5","name":"openai/gpt-5"},{"value":"openai/gpt-5-fast","name":"openai/gpt-5-fast"},{"value":"openai/gpt-5-nano","name":"openai/gpt-5-nano"},{"value":"openai/o3-pro","name":"openai/o3-pro"},{"value":"openai/o3","name":"openai/o3"},{"value":"openai/o3-fast","name":"openai/o3-fast"},{"value":"openai/o1","name":"openai/o1"},{"value":"deepseek/deepseek-v4-pro-0813","name":"deepseek/deepseek-v4-pro-0813"},{"value":"deepseek/deepseek-v4-pro","name":"deepseek/deepseek-v4-pro"},{"value":"spacexai/grok-4.7","name":"spacexai/grok-4.7"},{"value":"spacexai/grok-4.6","name":"spacexai/grok-4.6"},{"value":"spacexai/grok-4.5","name":"spacexai/grok-4.5"},{"value":"spacexai/grok-4.3","name":"spacexai/grok-4.3"},{"value":"spacexai/grok-4.20-multi-agent","name":"spacexai/grok-4.20-multi-agent"},{"value":"spacexai/grok-4.20-non-reasoning","name":"spacexai/grok-4.20-non-reasoning"},{"value":"spacexai/grok-4.20-reasoning","name":"spacexai/grok-4.20-reasoning"},{"value":"spacexai/grok-4.1-fast-non-reasoning","name":"spacexai/grok-4.1-fast-non-reasoning"},{"value":"spacexai/grok-4.1-fast-reasoning","name":"spacexai/grok-4.1-fast-reasoning"},{"value":"amazon/nova-pro","name":"amazon/nova-pro"},{"value":"anthropic/claude-fable-5.1","name":"anthropic/claude-fable-5.1"},{"value":"anthropic/claude-fable-5","name":"anthropic/claude-fable-5"},{"value":"openai/gpt-6.1-sol","name":"openai/gpt-6.1-sol"},{"value":"openai/gpt-6.1-sol-fast","name":"openai/gpt-6.1-sol-fast"},{"value":"openai/gpt-6-luna","name":"openai/gpt-6-luna"},{"value":"openai/gpt-6-luna-fast","name":"openai/gpt-6-luna-fast"},{"value":"openai/gpt-6-sol","name":"openai/gpt-6-sol"},{"value":"openai/gpt-6-sol-fast","name":"openai/gpt-6-sol-fast"},{"value":"openai/gpt-6-astra","name":"openai/gpt-6-astra"},{"value":"openai/gpt-6-astra-fast","name":"openai/gpt-6-astra-fast"},{"value":"openai/gpt-oss-safeguard-120b","name":"openai/gpt-oss-safeguard-120b"},{"value":"openai/gpt-oss-safeguard-20b","name":"openai/gpt-oss-safeguard-20b"},{"value":"openai/gpt-oss-120b","name":"openai/gpt-oss-120b"},{"value":"openai/gpt-oss-20b","name":"openai/gpt-oss-20b"},{"value":"openai/gpt-4.1","name":"openai/gpt-4.1"},{"value":"openai/gpt-4.1-fast","name":"openai/gpt-4.1-fast"},{"value":"openai/gpt-4.1-nano","name":"openai/gpt-4.1-nano"},{"value":"openai/gpt-4.1-nano-fast","name":"openai/gpt-4.1-nano-fast"},{"value":"openai/gpt-4o","name":"openai/gpt-4o"},{"value":"openai/gpt-4o-fast","name":"openai/gpt-4o-fast"},{"value":"openai/gpt-4-turbo","name":"openai/gpt-4-turbo"},{"value":"openai/gpt-3.5-turbo","name":"openai/gpt-3.5-turbo"},{"value":"google/gemma-4-26b-a4b-it","name":"google/gemma-4-26b-a4b-it"},{"value":"deepseek/deepseek-v3.2","name":"deepseek/deepseek-v3.2"},{"value":"deepseek/deepseek-v3.2-thinking","name":"deepseek/deepseek-v3.2-thinking"},{"value":"deepseek/deepseek-r1","name":"deepseek/deepseek-r1"},{"value":"meta/llama-4-maverick","name":"meta/llama-4-maverick"},{"value":"meta/llama-4-scout","name":"meta/llama-4-scout"},{"value":"meta/llama-3.3-70b","name":"meta/llama-3.3-70b"},{"value":"meta/llama-3.1-70b","name":"meta/llama-3.1-70b"},{"value":"meta/llama-3.1-8b","name":"meta/llama-3.1-8b"},{"value":"alibaba/qwen3.8-2.4t-a95b","name":"alibaba/qwen3.8-2.4t-a95b"},{"value":"alibaba/qwen3.8-max","name":"alibaba/qwen3.8-max"},{"value":"alibaba/qwen3-next-80b-a3b-instruct","name":"alibaba/qwen3-next-80b-a3b-instruct"},{"value":"alibaba/qwen3-next-80b-a3b-thinking","name":"alibaba/qwen3-next-80b-a3b-thinking"},{"value":"alibaba/qwen3-coder-30b-a3b","name":"alibaba/qwen3-coder-30b-a3b"},{"value":"alibaba/qwen3-coder","name":"alibaba/qwen3-coder"},{"value":"alibaba/qwen3-coder-next","name":"alibaba/qwen3-coder-next"},{"value":"alibaba/qwen-3-235b","name":"alibaba/qwen-3-235b"},{"value":"alibaba/qwen-3-32b","name":"alibaba/qwen-3-32b"},{"value":"fireworks/ember-1","name":"fireworks/ember-1"},{"value":"zai/glm-5.3-fast","name":"zai/glm-5.3-fast"},{"value":"zai/glm-5.3","name":"zai/glm-5.3"},{"value":"nvidia/nemotron-3.5-lightning","name":"nvidia/nemotron-3.5-lightning"},{"value":"moonshotai/kimi-k3-fast","name":"moonshotai/kimi-k3-fast"},{"value":"moonshotai/kimi-k3","name":"moonshotai/kimi-k3"},{"value":"zai/glm-5.2-fast","name":"zai/glm-5.2-fast"},{"value":"zai/glm-5.2","name":"zai/glm-5.2"},{"value":"nvidia/nemotron-3-ultra-550b-a55b","name":"nvidia/nemotron-3-ultra-550b-a55b"},{"value":"spacexai/grok-build-0.1","name":"spacexai/grok-build-0.1"},{"value":"nvidia/nemotron-3-super-120b-a12b","name":"nvidia/nemotron-3-super-120b-a12b"},{"value":"zai/glm-5","name":"zai/glm-5"},{"value":"moonshotai/kimi-k2.5","name":"moonshotai/kimi-k2.5"},{"value":"zai/glm-4.7","name":"zai/glm-4.7"},{"value":"nvidia/nemotron-nano-12b-v2-vl","name":"nvidia/nemotron-nano-12b-v2-vl"},{"value":"nvidia/nemotron-nano-9b-v2","name":"nvidia/nemotron-nano-9b-v2"},{"value":"amazon/nova-micro","name":"amazon/nova-micro"},{"value":"deepseek/deepseek-v4.1-flash","name":"deepseek/deepseek-v4.1-flash"},{"value":"deepseek/deepseek-v4-flash","name":"deepseek/deepseek-v4-flash"},{"value":"deepseek/deepseek-v4-flash-0731","name":"deepseek/deepseek-v4-flash-0731"},{"value":"zai/glm-5.3-flash","name":"zai/glm-5.3-flash"},{"value":"zai/glm-4.7-flash","name":"zai/glm-4.7-flash"},{"value":"anthropic/claude-haiku-5.5","name":"anthropic/claude-haiku-5.5"},{"value":"anthropic/claude-haiku-4.5","name":"anthropic/claude-haiku-4.5"},{"value":"anthropic/claude-3-haiku","name":"anthropic/claude-3-haiku"},{"value":"openai/gpt-5.4-mini","name":"openai/gpt-5.4-mini"},{"value":"openai/gpt-5.4-mini-fast","name":"openai/gpt-5.4-mini-fast"},{"value":"openai/gpt-5-mini","name":"openai/gpt-5-mini"},{"value":"openai/gpt-5-mini-fast","name":"openai/gpt-5-mini-fast"},{"value":"openai/gpt-4.1-mini","name":"openai/gpt-4.1-mini"},{"value":"openai/gpt-4.1-mini-fast","name":"openai/gpt-4.1-mini-fast"},{"value":"openai/o4-mini","name":"openai/o4-mini"},{"value":"openai/o4-mini-fast","name":"openai/o4-mini-fast"},{"value":"openai/o3-mini","name":"openai/o3-mini"},{"value":"openai/gpt-4o-mini","name":"openai/gpt-4o-mini"},{"value":"openai/gpt-4o-mini-fast","name":"openai/gpt-4o-mini-fast"},{"value":"google/gemini-3.8-flash","name":"google/gemini-3.8-flash"},{"value":"google/gemini-3.7-flash","name":"google/gemini-3.7-flash"},{"value":"google/gemini-3.5-flash-lite","name":"google/gemini-3.5-flash-lite"},{"value":"google/gemini-3.6-flash","name":"google/gemini-3.6-flash"},{"value":"google/gemini-3.5-flash","name":"google/gemini-3.5-flash"},{"value":"google/gemini-3.1-flash-lite","name":"google/gemini-3.1-flash-lite"},{"value":"google/gemini-3-flash","name":"google/gemini-3-flash"},{"value":"google/gemini-2.5-flash-lite","name":"google/gemini-2.5-flash-lite"},{"value":"google/gemini-2.5-flash","name":"google/gemini-2.5-flash"},{"value":"google/gemini-2.5-pro","name":"google/gemini-2.5-pro"},{"value":"minimax/minimax-m3","name":"minimax/minimax-m3"},{"value":"minimax/minimax-m2.5","name":"minimax/minimax-m2.5"},{"value":"minimax/minimax-m2.1","name":"minimax/minimax-m2.1"},{"value":"amazon/nova-2-lite","name":"amazon/nova-2-lite"},{"value":"amazon/nova-lite","name":"amazon/nova-lite"},{"value":"google/gemini-3.1-pro-preview","name":"google/gemini-3.1-pro-preview"},{"value":"spacexai/grok-4.20-multi-agent-beta","name":"spacexai/grok-4.20-multi-agent-beta"},{"value":"spacexai/grok-4.20-non-reasoning-beta","name":"spacexai/grok-4.20-non-reasoning-beta"},{"value":"spacexai/grok-4.20-reasoning-beta","name":"spacexai/grok-4.20-reasoning-beta"}]},{"id":"mode","name":"Session Mode","description":"Controls how the agent requests permission","category":"mode","type":"select","currentValue":"ask","options":[{"value":"code","name":"Code","description":"Write and modify code with full tool access","permissionMode":"auto"},{"value":"ask","name":"Ask","description":"Request permission before making any changes","permissionMode":"ask"}]},{"id":"effort","name":"Reasoning Effort","description":"Controls how much the model thinks before responding","category":"thought_level","type":"select","currentValue":"xhigh","options":[{"value":"auto","name":"default"},{"value":"low","name":"low"},{"value":"medium","name":"medium"},{"value":"high","name":"high"},{"value":"xhigh","name":"xhigh"},{"value":"max","name":"max"}]}],"modes":{"currentModeId":"ask","availableModes":[{"id":"code","name":"Code","description":"Write and modify code with full tool access"},{"id":"ask","name":"Ask","description":"Request permission before making any changes"}]}}}}
@@ -12,7 +12,7 @@
 {"type":"expect_outbound","label":"notification:session/cancel","frame":{"kind":"notification","method":"session/cancel","params":{"sessionId":"fx-session-01"}}}
 {"type":"emit_inbound","label":"notification:session/update:session_info_update","frame":{"kind":"notification","method":"session/update","params":{"sessionId":"fx-session-01","update":{"sessionUpdate":"session_info_update","title":"Interrupt Fixture Should Not Finish Naturally","updatedAt":"2026-10-11T12:47:36Z"}}}}
 {"type":"emit_inbound","label":"response:session/prompt","frame":{"kind":"response","method":"session/prompt","result":{"stopReason":"cancelled","usage":{}}}}
-{"type":"expect_outbound","label":"request:session/prompt","frame":{"kind":"request","method":"session/prompt","params":{"sessionId":"fx-session-01","prompt":[{"type":"text","text":"Respond with the following text: fixture simple ok"}]}}}
+{"type":"expect_outbound","label":"request:session/prompt","frame":{"kind":"request","method":"session/prompt","params":{"sessionId":"fx-session-01","prompt":[{"type":"text","text":"<t3_code_instructions>\n<any>\n</t3_code_instructions>\n\n<user_request>\nRespond with the following text: fixture simple ok\n</user_request>"},{"type":"text","text":"<runtime_info><any>"}]}}}
 {"type":"emit_inbound","label":"notification:session/update:agent_message_chunk","frame":{"kind":"notification","method":"session/update","params":{"sessionId":"fx-session-01","update":{"sessionUpdate":"agent_message_chunk","messageId":"40d0598a1dc44d74bf44dfcc62d4ab1e","content":{"type":"text","text":"fixture simple ok"}}}}}
 {"type":"emit_inbound","label":"notification:session/update:session_info_update","frame":{"kind":"notification","method":"session/update","params":{"sessionId":"fx-session-01","update":{"sessionUpdate":"session_info_update","title":"Interrupt Fixture Should Not Finish Naturally","updatedAt":"2026-10-11T12:47:39Z"}}}}
 {"type":"emit_inbound","label":"notification:session/update:usage_update","frame":{"kind":"notification","method":"session/update","params":{"sessionId":"fx-session-01","update":{"sessionUpdate":"usage_update","used":20133,"size":1000000}}}}
diff --git a/apps/server/src/orchestration-v2/testkit/fixtures/fx_subagent/fx_transcript.ndjson b/apps/server/src/orchestration-v2/testkit/fixtures/fx_subagent/fx_transcript.ndjson
index e2ddcf46159a..99ce6d8a0b7b 100644
--- a/apps/server/src/orchestration-v2/testkit/fixtures/fx_subagent/fx_transcript.ndjson
+++ b/apps/server/src/orchestration-v2/testkit/fixtures/fx_subagent/fx_transcript.ndjson
@@ -1,5 +1,5 @@
 {"type":"transcript_start","provider":"fx","protocol":"acp.ndjson-jsonrpc","version":"1","scenario":"fx_subagent","metadata":{"generatedBy":"live-fx-recorder","fxVersion":"0.0.14","normalization":"Session ids are fx-session-NN, the workspace is <workspace>, HOME is /home/fx-replay and the recording user is fx-replay. T3-owned prompt text, MCP servers and initialize params other than clientCapabilities and _meta are <any>. User skill names, emails and token-shaped strings are removed. Timestamps are kept as recorded.","droppedFrames":0}}
-{"type":"expect_outbound","label":"request:initialize","frame":{"kind":"request","method":"initialize","params":{"protocolVersion":2,"info":"<any>","capabilities":"<any>","clientCapabilities":{"fs":{"readTextFile":false,"writeTextFile":false},"terminal":false,"session":{"notices":{}},"elicitation":{"form":{}}},"clientInfo":"<any>"}}}
+{"type":"expect_outbound","label":"request:initialize","frame":{"kind":"request","method":"initialize","params":{"protocolVersion":2,"info":"<any>","capabilities":"<any>","clientCapabilities":{"fs":{"readTextFile":false,"writeTextFile":false},"terminal":false,"session":{"notices":{},"compaction":{}},"elicitation":{"form":{}}},"clientInfo":"<any>"}}}
 {"type":"emit_inbound","label":"response:initialize","frame":{"kind":"response","method":"initialize","result":{"protocolVersion":1,"agentCapabilities":{"loadSession":true,"promptCapabilities":{"image":true,"audio":false,"embeddedContext":true},"mcpCapabilities":{"http":true,"sse":true,"acp":true},"sessionCapabilities":{"list":{},"resume":{},"close":{},"systemPrompt":{}},"_meta":{"fx":{"steering":true}}},"agentInfo":{"name":"fx","title":"fx","version":"0.0.14"},"authMethods":[]}}}
 {"type":"expect_outbound","label":"request:session/new","frame":{"kind":"request","method":"session/new","params":{"cwd":"<workspace>","mcpServers":"<any>"}}}
 {"type":"emit_inbound","label":"response:session/new","frame":{"kind":"response","method":"session/new","result":{"sessionId":"fx-session-01","configOptions":[{"id":"provider","name":"Provider","category":"model","type":"select","currentValue":"gateway","options":[{"value":"gateway","name":"Vercel AI Gateway"},{"value":"codex","name":"Codex subscription"},{"value":"grok","name":"Grok subscription"}]},{"id":"model","name":"Model","category":"model","type":"select","currentValue":"openai/gpt-5.2","options":[{"value":"anthropic/claude-sonnet-5.5","name":"anthropic/claude-sonnet-5.5"},{"value":"anthropic/claude-opus-5.5","name":"anthropic/claude-opus-5.5"},{"value":"anthropic/claude-opus-5.5-fast","name":"anthropic/claude-opus-5.5-fast"},{"value":"anthropic/claude-opus-5","name":"anthropic/claude-opus-5"},{"value":"anthropic/claude-opus-5-fast","name":"anthropic/claude-opus-5-fast"},{"value":"anthropic/claude-sonnet-5","name":"anthropic/claude-sonnet-5"},{"value":"anthropic/claude-opus-4.8","name":"anthropic/claude-opus-4.8"},{"value":"anthropic/claude-opus-4.8-fast","name":"anthropic/claude-opus-4.8-fast"},{"value":"anthropic/claude-opus-4.7","name":"anthropic/claude-opus-4.7"},{"value":"anthropic/claude-sonnet-4.6","name":"anthropic/claude-sonnet-4.6"},{"value":"anthropic/claude-opus-4.6","name":"anthropic/claude-opus-4.6"},{"value":"anthropic/claude-opus-4.5","name":"anthropic/claude-opus-4.5"},{"value":"anthropic/claude-sonnet-4.5","name":"anthropic/claude-sonnet-4.5"},{"value":"openai/gpt-5.6-luna","name":"openai/gpt-5.6-luna"},{"value":"openai/gpt-5.6-luna-fast","name":"openai/gpt-5.6-luna-fast"},{"value":"openai/gpt-5.6-sol","name":"openai/gpt-5.6-sol"},{"value":"openai/gpt-5.6-sol-fast","name":"openai/gpt-5.6-sol-fast"},{"value":"openai/gpt-5.6-terra","name":"openai/gpt-5.6-terra"},{"value":"openai/gpt-5.6-terra-fast","name":"openai/gpt-5.6-terra-fast"},{"value":"openai/gpt-5.5","name":"openai/gpt-5.5"},{"value":"openai/gpt-5.5-fast","name":"openai/gpt-5.5-fast"},{"value":"openai/gpt-5.5-pro","name":"openai/gpt-5.5-pro"},{"value":"openai/gpt-5.4-nano","name":"openai/gpt-5.4-nano"},{"value":"openai/gpt-5.4","name":"openai/gpt-5.4"},{"value":"openai/gpt-5.4-fast","name":"openai/gpt-5.4-fast"},{"value":"openai/gpt-5.4-pro","name":"openai/gpt-5.4-pro"},{"value":"openai/gpt-5.3-codex","name":"openai/gpt-5.3-codex"},{"value":"openai/gpt-5.3-codex-fast","name":"openai/gpt-5.3-codex-fast"},{"value":"openai/gpt-5.2-codex","name":"openai/gpt-5.2-codex"},{"value":"openai/gpt-5.2","name":"openai/gpt-5.2"},{"value":"openai/gpt-5.2-fast","name":"openai/gpt-5.2-fast"},{"value":"openai/gpt-5.2-pro","name":"openai/gpt-5.2-pro"},{"value":"openai/gpt-5.1-codex-max","name":"openai/gpt-5.1-codex-max"},{"value":"openai/gpt-5.1-codex","name":"openai/gpt-5.1-codex"},{"value":"openai/gpt-5.1-thinking","name":"openai/gpt-5.1-thinking"},{"value":"openai/gpt-5.1-thinking-fast","name":"openai/gpt-5.1-thinking-fast"},{"value":"openai/gpt-5-pro","name":"openai/gpt-5-pro"},{"value":"openai/gpt-5-codex","name":"openai/gpt-5-codex"},{"value":"openai/gpt-5","name":"openai/gpt-5"},{"value":"openai/gpt-5-fast","name":"openai/gpt-5-fast"},{"value":"openai/gpt-5-nano","name":"openai/gpt-5-nano"},{"value":"openai/o3-pro","name":"openai/o3-pro"},{"value":"openai/o3","name":"openai/o3"},{"value":"openai/o3-fast","name":"openai/o3-fast"},{"value":"openai/o1","name":"openai/o1"},{"value":"deepseek/deepseek-v4-pro-0813","name":"deepseek/deepseek-v4-pro-0813"},{"value":"deepseek/deepseek-v4-pro","name":"deepseek/deepseek-v4-pro"},{"value":"moonshotai/kimi-k3.1-pro","name":"moonshotai/kimi-k3.1-pro"},{"value":"moonshotai/kimi-k3.1-pro-highspeed","name":"moonshotai/kimi-k3.1-pro-highspeed"},{"value":"spacexai/grok-4.7","name":"spacexai/grok-4.7"},{"value":"xiaomi/mimo-v2.6-pro","name":"xiaomi/mimo-v2.6-pro"},{"value":"xiaomi/mimo-v2.6-pro-ultraspeed","name":"xiaomi/mimo-v2.6-pro-ultraspeed"},{"value":"spacexai/grok-4.6","name":"spacexai/grok-4.6"},{"value":"spacexai/grok-4.5","name":"spacexai/grok-4.5"},{"value":"spacexai/grok-4.3","name":"spacexai/grok-4.3"},{"value":"xiaomi/mimo-v2.5-pro","name":"xiaomi/mimo-v2.5-pro"},{"value":"spacexai/grok-4.20-multi-agent","name":"spacexai/grok-4.20-multi-agent"},{"value":"spacexai/grok-4.20-non-reasoning","name":"spacexai/grok-4.20-non-reasoning"},{"value":"spacexai/grok-4.20-reasoning","name":"spacexai/grok-4.20-reasoning"},{"value":"amazon/nova-pro","name":"amazon/nova-pro"},{"value":"anthropic/claude-fable-5.1","name":"anthropic/claude-fable-5.1"},{"value":"anthropic/claude-fable-5","name":"anthropic/claude-fable-5"},{"value":"openai/gpt-6.1-terra","name":"openai/gpt-6.1-terra"},{"value":"openai/gpt-6.1-terra-fast","name":"openai/gpt-6.1-terra-fast"},{"value":"openai/gpt-6.1-sol","name":"openai/gpt-6.1-sol"},{"value":"openai/gpt-6.1-sol-fast","name":"openai/gpt-6.1-sol-fast"},{"value":"openai/gpt-6-luna","name":"openai/gpt-6-luna"},{"value":"openai/gpt-6-luna-fast","name":"openai/gpt-6-luna-fast"},{"value":"openai/gpt-6-sol","name":"openai/gpt-6-sol"},{"value":"openai/gpt-6-sol-fast","name":"openai/gpt-6-sol-fast"},{"value":"openai/gpt-6-astra","name":"openai/gpt-6-astra"},{"value":"openai/gpt-6-astra-fast","name":"openai/gpt-6-astra-fast"},{"value":"openai/gpt-oss-safeguard-120b","name":"openai/gpt-oss-safeguard-120b"},{"value":"openai/gpt-oss-safeguard-20b","name":"openai/gpt-oss-safeguard-20b"},{"value":"openai/gpt-oss-120b","name":"openai/gpt-oss-120b"},{"value":"openai/gpt-oss-20b","name":"openai/gpt-oss-20b"},{"value":"openai/gpt-4.1","name":"openai/gpt-4.1"},{"value":"openai/gpt-4.1-fast","name":"openai/gpt-4.1-fast"},{"value":"openai/gpt-4.1-nano","name":"openai/gpt-4.1-nano"},{"value":"openai/gpt-4o","name":"openai/gpt-4o"},{"value":"openai/gpt-4o-fast","name":"openai/gpt-4o-fast"},{"value":"google/gemma-4-26b-a4b-it","name":"google/gemma-4-26b-a4b-it"},{"value":"google/gemma-4-31b-it","name":"google/gemma-4-31b-it"},{"value":"deepseek/deepseek-v3.2","name":"deepseek/deepseek-v3.2"},{"value":"deepseek/deepseek-v3.2-thinking","name":"deepseek/deepseek-v3.2-thinking"},{"value":"deepseek/deepseek-v3.1","name":"deepseek/deepseek-v3.1"},{"value":"deepseek/deepseek-r1","name":"deepseek/deepseek-r1"},{"value":"meta/muse-spark-open","name":"meta/muse-spark-open"},{"value":"meta/muse-wonder-1.0","name":"meta/muse-wonder-1.0"},{"value":"meta/muse-spark-1.3","name":"meta/muse-spark-1.3"},{"value":"meta/muse-spark-1.3-contributor","name":"meta/muse-spark-1.3-contributor"},{"value":"meta/muse-glimmer-30b","name":"meta/muse-glimmer-30b"},{"value":"meta/muse-spark-1.2","name":"meta/muse-spark-1.2"},{"value":"meta/muse-spark-1.2-contributor","name":"meta/muse-spark-1.2-contributor"},{"value":"meta/muse-spark-1.1","name":"meta/muse-spark-1.1"},{"value":"meta/llama-4-maverick","name":"meta/llama-4-maverick"},{"value":"meta/llama-4-scout","name":"meta/llama-4-scout"},{"value":"meta/llama-3.3-70b","name":"meta/llama-3.3-70b"},{"value":"meta/llama-3.1-70b","name":"meta/llama-3.1-70b"},{"value":"meta/llama-3.1-8b","name":"meta/llama-3.1-8b"},{"value":"mistral/mistral-large-4","name":"mistral/mistral-large-4"},{"value":"mistral/mistral-medium-3.5","name":"mistral/mistral-medium-3.5"},{"value":"mistral/mistral-large-3","name":"mistral/mistral-large-3"},{"value":"mistral/mistral-small","name":"mistral/mistral-small"},{"value":"mistral/mistral-nemo","name":"mistral/mistral-nemo"},{"value":"mistral/codestral","name":"mistral/codestral"},{"value":"alibaba/qwen3.8-max-prime","name":"alibaba/qwen3.8-max-prime"},{"value":"alibaba/qwen3.8-max-0902","name":"alibaba/qwen3.8-max-0902"},{"value":"alibaba/qwen3.8-27b","name":"alibaba/qwen3.8-27b"},{"value":"alibaba/qwen3.8-2.4t-a95b","name":"alibaba/qwen3.8-2.4t-a95b"},{"value":"alibaba/qwen3.8-max","name":"alibaba/qwen3.8-max"},{"value":"alibaba/qwen3.7-plus","name":"alibaba/qwen3.7-plus"},{"value":"alibaba/qwen3.7-max","name":"alibaba/qwen3.7-max"},{"value":"alibaba/qwen3.6-27b","name":"alibaba/qwen3.6-27b"},{"value":"alibaba/qwen3.6-plus","name":"alibaba/qwen3.6-plus"},{"value":"alibaba/qwen3.5-plus","name":"alibaba/qwen3.5-plus"},{"value":"alibaba/qwen3-max-thinking","name":"alibaba/qwen3-max-thinking"},{"value":"alibaba/qwen3-vl-instruct","name":"alibaba/qwen3-vl-instruct"},{"value":"alibaba/qwen3-next-80b-a3b-instruct","name":"alibaba/qwen3-next-80b-a3b-instruct"},{"value":"alibaba/qwen3-next-80b-a3b-thinking","name":"alibaba/qwen3-next-80b-a3b-thinking"},{"value":"alibaba/qwen3-coder-30b-a3b","name":"alibaba/qwen3-coder-30b-a3b"},{"value":"alibaba/qwen3-coder","name":"alibaba/qwen3-coder"},{"value":"alibaba/qwen3-coder-next","name":"alibaba/qwen3-coder-next"},{"value":"alibaba/qwen-3-14b","name":"alibaba/qwen-3-14b"},{"value":"alibaba/qwen-3-235b","name":"alibaba/qwen-3-235b"},{"value":"alibaba/qwen-3-30b","name":"alibaba/qwen-3-30b"},{"value":"alibaba/qwen-3-32b","name":"alibaba/qwen-3-32b"},{"value":"inception/mercury-3","name":"inception/mercury-3"},{"value":"reflection/beam","name":"reflection/beam"},{"value":"reflection/beam-free","name":"reflection/beam-free"},{"value":"nvidia/nemotron-3.5-super-vl","name":"nvidia/nemotron-3.5-super-vl"},{"value":"nvidia/nemotron-3.5-lightning-free","name":"nvidia/nemotron-3.5-lightning-free"},{"value":"liquid/lfm2.5-24b-a2b","name":"liquid/lfm2.5-24b-a2b"},{"value":"callstack/apex","name":"callstack/apex"},{"value":"stealth/glyph-cluster","name":"stealth/glyph-cluster"},{"value":"fireworks/ember-1","name":"fireworks/ember-1"},{"value":"sakana/fugu-max","name":"sakana/fugu-max"},{"value":"sakana/fugu-ultra-v2","name":"sakana/fugu-ultra-v2"},{"value":"inception/mercury-2.5","name":"inception/mercury-2.5"},{"value":"zai/glm-5.3-fast","name":"zai/glm-5.3-fast"},{"value":"zai/glm-5.3","name":"zai/glm-5.3"},{"value":"mixedbread/toast-1","name":"mixedbread/toast-1"},{"value":"nvidia/nemotron-3.5-lightning","name":"nvidia/nemotron-3.5-lightning"},{"value":"sakana/namazu","name":"sakana/namazu"},{"value":"thinkingmachines/inkling-small","name":"thinkingmachines/inkling-small"},{"value":"moonshotai/kimi-k3-fast","name":"moonshotai/kimi-k3-fast"},{"value":"poolside/laguna-s-2.1-free","name":"poolside/laguna-s-2.1-free"},{"value":"poolside/laguna-s-2.1","name":"poolside/laguna-s-2.1"},{"value":"moonshotai/kimi-k3","name":"moonshotai/kimi-k3"},{"value":"thinkingmachines/inkling","name":"thinkingmachines/inkling"},{"value":"tencent/hy3","name":"tencent/hy3"},{"value":"bytedance/seed-2.1-turbo","name":"bytedance/seed-2.1-turbo"},{"value":"zai/glm-5.2-fast","name":"zai/glm-5.2-fast"},{"value":"sakana/fugu-ultra","name":"sakana/fugu-ultra"},{"value":"zai/glm-5.2","name":"zai/glm-5.2"},{"value":"moonshotai/kimi-k2.7-code-highspeed","name":"moonshotai/kimi-k2.7-code-highspeed"},{"value":"moonshotai/kimi-k2.7-code","name":"moonshotai/kimi-k2.7-code"},{"value":"nvidia/nemotron-3-ultra-550b-a55b","name":"nvidia/nemotron-3-ultra-550b-a55b"},{"value":"spacexai/grok-build-0.1","name":"spacexai/grok-build-0.1"},{"value":"xiaomi/mimo-v2.5","name":"xiaomi/mimo-v2.5"},{"value":"moonshotai/kimi-k2.6","name":"moonshotai/kimi-k2.6"},{"value":"zai/glm-5.1","name":"zai/glm-5.1"},{"value":"arcee-ai/trinity-large-thinking","name":"arcee-ai/trinity-large-thinking"},{"value":"zai/glm-5v-turbo","name":"zai/glm-5v-turbo"},{"value":"zai/glm-5-turbo","name":"zai/glm-5-turbo"},{"value":"nvidia/nemotron-3-super-120b-a12b","name":"nvidia/nemotron-3-super-120b-a12b"},{"value":"inception/mercury-2","name":"inception/mercury-2"},{"value":"zai/glm-5","name":"zai/glm-5"},{"value":"moonshotai/kimi-k2.5","name":"moonshotai/kimi-k2.5"},{"value":"zai/glm-4.7","name":"zai/glm-4.7"},{"value":"nvidia/nemotron-3-nano-30b-a3b","name":"nvidia/nemotron-3-nano-30b-a3b"},{"value":"nvidia/nemotron-nano-12b-v2-vl","name":"nvidia/nemotron-nano-12b-v2-vl"},{"value":"zai/glm-4.6","name":"zai/glm-4.6"},{"value":"bytedance/seed-1.6","name":"bytedance/seed-1.6"},{"value":"bytedance/seed-1.8","name":"bytedance/seed-1.8"},{"value":"nvidia/nemotron-nano-9b-v2","name":"nvidia/nemotron-nano-9b-v2"},{"value":"zai/glm-4.5v","name":"zai/glm-4.5v"},{"value":"zai/glm-4.5","name":"zai/glm-4.5"},{"value":"zai/glm-4.5-air","name":"zai/glm-4.5-air"},{"value":"moonshotai/kimi-k2","name":"moonshotai/kimi-k2"},{"value":"cohere/command-a","name":"cohere/command-a"},{"value":"inception/mercury-coder-small","name":"inception/mercury-coder-small"},{"value":"amazon/nova-micro","name":"amazon/nova-micro"},{"value":"deepseek/deepseek-v4.1-flash-1017","name":"deepseek/deepseek-v4.1-flash-1017"},{"value":"deepseek/deepseek-v4.1-flash-1017-fast","name":"deepseek/deepseek-v4.1-flash-1017-fast"},{"value":"deepseek/deepseek-v4.1-flash-fast","name":"deepseek/deepseek-v4.1-flash-fast"},{"value":"deepseek/deepseek-v4.1-flash","name":"deepseek/deepseek-v4.1-flash"},{"value":"deepseek/deepseek-v4-flash-vision-exp","name":"deepseek/deepseek-v4-flash-vision-exp"},{"value":"deepseek/deepseek-v4-flash","name":"deepseek/deepseek-v4-flash"},{"value":"deepseek/deepseek-v4-flash-0731","name":"deepseek/deepseek-v4-flash-0731"},{"value":"alibaba/qwen3.8-omni-flash","name":"alibaba/qwen3.8-omni-flash"},{"value":"alibaba/qwen3.8-flash","name":"alibaba/qwen3.8-flash"},{"value":"alibaba/qwen3.7-flash","name":"alibaba/qwen3.7-flash"},{"value":"alibaba/qwen3.5-flash","name":"alibaba/qwen3.5-flash"},{"value":"inclusionai/ling-3.1-flash","name":"inclusionai/ling-3.1-flash"},{"value":"xiaomi/mimo-v2.6-flash","name":"xiaomi/mimo-v2.6-flash"},{"value":"zai/glm-5.3-flashx","name":"zai/glm-5.3-flashx"},{"value":"inclusionai/ling-3.0-flash-vl","name":"inclusionai/ling-3.0-flash-vl"},{"value":"inclusionai/ling-3.0-flash-sante","name":"inclusionai/ling-3.0-flash-sante"},{"value":"inclusionai/ling-3.0-flash-fin","name":"inclusionai/ling-3.0-flash-fin"},{"value":"zai/glm-5.3-flash","name":"zai/glm-5.3-flash"},{"value":"inclusionai/ling-3.0-flash","name":"inclusionai/ling-3.0-flash"},{"value":"stepfun/step-3.7-flash","name":"stepfun/step-3.7-flash"},{"value":"zai/glm-4.7-flash","name":"zai/glm-4.7-flash"},{"value":"zai/glm-4.7-flashx","name":"zai/glm-4.7-flashx"},{"value":"anthropic/claude-haiku-5.5","name":"anthropic/claude-haiku-5.5"},{"value":"anthropic/claude-haiku-4.5","name":"anthropic/claude-haiku-4.5"},{"value":"openai/gpt-5.4-mini","name":"openai/gpt-5.4-mini"},{"value":"openai/gpt-5.4-mini-fast","name":"openai/gpt-5.4-mini-fast"},{"value":"openai/gpt-5.1-codex-mini","name":"openai/gpt-5.1-codex-mini"},{"value":"openai/gpt-5-mini","name":"openai/gpt-5-mini"},{"value":"openai/gpt-5-mini-fast","name":"openai/gpt-5-mini-fast"},{"value":"openai/gpt-4.1-mini","name":"openai/gpt-4.1-mini"},{"value":"openai/gpt-4.1-mini-fast","name":"openai/gpt-4.1-mini-fast"},{"value":"openai/o4-mini","name":"openai/o4-mini"},{"value":"openai/o3-mini","name":"openai/o3-mini"},{"value":"openai/gpt-4o-mini","name":"openai/gpt-4o-mini"},{"value":"openai/gpt-4o-mini-fast","name":"openai/gpt-4o-mini-fast"},{"value":"google/gemini-4-argon","name":"google/gemini-4-argon"},{"value":"google/gemini-3.8-flash","name":"google/gemini-3.8-flash"},{"value":"google/gemini-3.7-flash","name":"google/gemini-3.7-flash"},{"value":"google/gemini-3.5-flash-lite","name":"google/gemini-3.5-flash-lite"},{"value":"google/gemini-3.6-flash","name":"google/gemini-3.6-flash"},{"value":"google/gemini-3.5-flash","name":"google/gemini-3.5-flash"},{"value":"google/gemini-3.1-flash-lite","name":"google/gemini-3.1-flash-lite"},{"value":"google/gemini-3-flash","name":"google/gemini-3-flash"},{"value":"google/gemini-2.5-flash-lite","name":"google/gemini-2.5-flash-lite"},{"value":"google/gemini-2.5-flash","name":"google/gemini-2.5-flash"},{"value":"google/gemini-2.5-pro","name":"google/gemini-2.5-pro"},{"value":"mistral/ministral-14b","name":"mistral/ministral-14b"},{"value":"mistral/ministral-3b","name":"mistral/ministral-3b"},{"value":"mistral/ministral-8b","name":"mistral/ministral-8b"},{"value":"minimax/minimax-m3.1-flash","name":"minimax/minimax-m3.1-flash"},{"value":"minimax/minimax-m3","name":"minimax/minimax-m3"},{"value":"minimax/minimax-m2.7","name":"minimax/minimax-m2.7"},{"value":"minimax/minimax-m2.7-highspeed","name":"minimax/minimax-m2.7-highspeed"},{"value":"minimax/minimax-m2.5","name":"minimax/minimax-m2.5"},{"value":"minimax/minimax-m2.5-highspeed","name":"minimax/minimax-m2.5-highspeed"},{"value":"minimax/minimax-m2.1","name":"minimax/minimax-m2.1"},{"value":"minimax/minimax-m2.1-lightning","name":"minimax/minimax-m2.1-lightning"},{"value":"amazon/nova-2-lite","name":"amazon/nova-2-lite"},{"value":"minimax/minimax-m2","name":"minimax/minimax-m2"},{"value":"amazon/nova-lite","name":"amazon/nova-lite"},{"value":"google/gemini-3.1-pro-preview","name":"google/gemini-3.1-pro-preview"},{"value":"meituan/longcat-2.5-preview","name":"meituan/longcat-2.5-preview"},{"value":"stepfun/step-5-preview","name":"stepfun/step-5-preview"},{"value":"tencent/hy4-preview","name":"tencent/hy4-preview"},{"value":"spacexai/grok-4.20-multi-agent-beta","name":"spacexai/grok-4.20-multi-agent-beta"},{"value":"spacexai/grok-4.20-non-reasoning-beta","name":"spacexai/grok-4.20-non-reasoning-beta"},{"value":"spacexai/grok-4.20-reasoning-beta","name":"spacexai/grok-4.20-reasoning-beta"},{"value":"interfaze/interfaze-beta","name":"interfaze/interfaze-beta"},{"value":"tencent/hy-mt2-pro","name":"tencent/hy-mt2-pro"},{"value":"scaledown/scaledown-extract-1","name":"scaledown/scaledown-extract-1"},{"value":"scaledown/scaledown-summarize-1","name":"scaledown/scaledown-summarize-1"},{"value":"elorian/glimpse","name":"elorian/glimpse"},{"value":"tencent/hy-mt2-plus","name":"tencent/hy-mt2-plus"},{"value":"inference-net/schematron-v2-small","name":"inference-net/schematron-v2-small"},{"value":"inference-net/schematron-v2-turbo","name":"inference-net/schematron-v2-turbo"},{"value":"morph/morph-v3-fast","name":"morph/morph-v3-fast"},{"value":"morph/morph-v3-large","name":"morph/morph-v3-large"},{"value":"perplexity/sonar","name":"perplexity/sonar"},{"value":"tencent/hy-mt2-lite","name":"tencent/hy-mt2-lite"}]},{"id":"mode","name":"Session Mode","description":"Controls how the agent requests permission","category":"mode","type":"select","currentValue":"ask","options":[{"value":"auto","name":"Auto","description":"Check actions with an automatic safety review instead of asking","_meta":{"fx":{"permissionMode":"auto"}}},{"value":"ask","name":"Ask","description":"Request permission before making any changes","_meta":{"fx":{"permissionMode":"ask"}}},{"value":"full-access","name":"Full access","description":"Run every action without asking, outside the sandbox","_meta":{"fx":{"permissionMode":"yolo"}}}]},{"id":"effort","name":"Reasoning Effort","description":"Controls how much the model thinks before responding","category":"thought_level","type":"select","currentValue":"auto","options":[{"value":"auto","name":"default"},{"value":"none","name":"none"},{"value":"minimal","name":"minimal"},{"value":"low","name":"low"},{"value":"medium","name":"medium"},{"value":"high","name":"high"},{"value":"xhigh","name":"xhigh"}]},{"id":"fast","name":"Fast Mode","description":"Uses the model's fast lane","category":"model","type":"select","currentValue":"false","options":[{"value":"false","name":"off"},{"value":"true","name":"on"}]}],"modes":{"currentModeId":"ask","availableModes":[{"id":"auto","name":"Auto","description":"Check actions with an automatic safety review instead of asking"},{"id":"ask","name":"Ask","description":"Request permission before making any changes"},{"id":"full-access","name":"Full access","description":"Run every action without asking, outside the sandbox"}]}}}}
diff --git a/apps/server/src/orchestration-v2/testkit/fixtures/grok_auto_blocked_command/grok_transcript.ndjson b/apps/server/src/orchestration-v2/testkit/fixtures/grok_auto_blocked_command/grok_transcript.ndjson
index df6aab256644..cf27f37b09ed 100644
--- a/apps/server/src/orchestration-v2/testkit/fixtures/grok_auto_blocked_command/grok_transcript.ndjson
+++ b/apps/server/src/orchestration-v2/testkit/fixtures/grok_auto_blocked_command/grok_transcript.ndjson
@@ -1,5 +1,5 @@
 {"type":"transcript_start","provider":"grok","protocol":"acp.ndjson-jsonrpc","version":"1","scenario":"grok_auto_blocked_command","metadata":{"generatedBy":"live-grok-recorder","grokVersion":"1.0.41","normalization":"Session ids are fixed UUIDs, the workspace is <workspace>, HOME is /home/grok-replay and the recording user is grok-replay. T3-owned prompt text, MCP servers and initialize params other than clientCapabilities and _meta are <any>. Personal skills, machine identity, account settings and announcement broadcasts are removed, as are responses to Grok-internal request ids that T3's protocol drops. Timestamps are kept as recorded.","droppedFrames":5}}
-{"type":"expect_outbound","label":"request:initialize","frame":{"kind":"request","method":"initialize","params":{"protocolVersion":2,"info":"<any>","capabilities":"<any>","_meta":{"clientType":"extension"},"clientCapabilities":{"fs":{"readTextFile":false,"writeTextFile":false},"terminal":false,"session":{"notices":{}},"elicitation":{"form":{}}},"clientInfo":"<any>"}}}
+{"type":"expect_outbound","label":"request:initialize","frame":{"kind":"request","method":"initialize","params":{"protocolVersion":2,"info":"<any>","capabilities":"<any>","_meta":{"clientType":"extension"},"clientCapabilities":{"fs":{"readTextFile":false,"writeTextFile":false},"terminal":false,"session":{"notices":{},"compaction":{}},"elicitation":{"form":{}}},"clientInfo":"<any>"}}}
 {"type":"emit_inbound","label":"response:initialize","frame":{"kind":"response","method":"initialize","result":{"protocolVersion":1,"agentCapabilities":{"loadSession":true,"promptCapabilities":{"image":false,"audio":false,"embeddedContext":true},"mcpCapabilities":{"http":true,"sse":true},"sessionCapabilities":{"list":{},"resume":{},"close":{}},"auth":{},"_meta":{"x.ai/fs_notify":true,"x.ai/hooks":{"blockingEvents":["pre_tool_use","stop","subagent_stop"],"decisions":["deny","block"],"stopSignals":["continue","stopReason","additionalContext"]},"x.ai/capabilities":{"toolOverrides":{"x_keyword_search":true,"x_semantic_search":true,"x_user_search":false,"x_thread_fetch":false}}}},"authMethods":[{"id":"cached_token","name":"cached_token","description":"Cached token from ~/.grok/auth.json"},{"id":"grok.com","name":"Grok","description":"Sign in with Grok"}],"_meta":{"grokShell":true,"defaultAuthMethodId":"cached_token","x.ai/mcp/sdk":true,"x.ai/pluginDirs":true,"currentWorkingDirectory":"<workspace>","agentVersion":"1.0.41","agentId":"00000000-0000-4000-8000-000000000000","agentInstanceId":"00000000-0000-4000-8000-000000000000","hostname":"grok-replay","modelState":{"currentModelId":"grok-4.7","availableModels":[{"modelId":"grok-4.7","name":"Grok 4.7","description":"SpaceXAI's latest frontier model","_meta":{"totalContextTokens":500000,"agentType":"grok-build-plan","supportsReasoningEffort":true,"reasoningEffort":"high","reasoningEfforts":[{"id":"xhigh","value":"xhigh","label":"Extra High","description":"Maximum reasoning for the hardest tasks.","default":false},{"id":"high","value":"high","label":"High","description":"Thorough reasoning and quality. Recommended.","default":true},{"id":"medium","value":"medium","label":"Medium","description":"Strong quality with a faster turnaround.","default":false},{"id":"low","value":"low","label":"Low","description":"Fastest responses. Best for simple tasks.","default":false}]}},{"modelId":"grok-4.7-build-fast","name":"Grok 4.7 Fast","description":"Fast variant. 2x the price.","_meta":{"totalContextTokens":500000,"agentType":"grok-build-plan","supportsReasoningEffort":true,"reasoningEffort":"high","reasoningEfforts":[{"id":"xhigh","value":"xhigh","label":"Extra High","description":"Maximum reasoning for the hardest tasks.","default":false},{"id":"high","value":"high","label":"High","description":"Thorough reasoning and quality. Recommended.","default":true},{"id":"medium","value":"medium","label":"Medium","description":"Strong quality with a faster turnaround.","default":false},{"id":"low","value":"low","label":"Low","description":"Fastest responses. Best for simple tasks.","default":false}]}},{"modelId":"grok-4.6","name":"Grok 4.6","_meta":{"totalContextTokens":500000,"agentType":"grok-build-plan","supportsReasoningEffort":true,"reasoningEffort":"high","reasoningEfforts":[{"id":"xhigh","value":"xhigh","label":"Extra High","description":"Highest effort and reasoning level","default":false},{"id":"high","value":"high","label":"High","description":"Higher implementation quality with extensive reasoning","default":true},{"id":"medium","value":"medium","label":"Medium","description":"Balanced effort with standard implementation and testing","default":false},{"id":"low","value":"low","label":"Low","description":"Quick, fast implementations","default":false}]}},{"modelId":"grok-4.5","name":"Grok 4.5","_meta":{"totalContextTokens":500000,"agentType":"grok-build-plan","supportsReasoningEffort":true,"reasoningEffort":"high","reasoningEfforts":[{"id":"high","value":"high","label":"High","description":"Highest implementation quality with extensive reasoning","default":true},{"id":"medium","value":"medium","label":"Medium","description":"Balanced effort with standard implementation and testing","default":false},{"id":"low","value":"low","label":"Low","description":"Quick, fast implementations","default":false}]}}]},"mcpServers":[],"mcpApps":false,"metadata":null,"availableCommands":[{"name":"compact","description":"Compress conversation history to save context window","input":{"hint":"optional context about what to preserve"}},{"name":"always-approve","description":"Toggle always-approve mode (skip all permission prompts)","input":{"hint":"on|off"}},{"name":"context","description":"Show context window usage and session stats","input":null},{"name":"session-info","description":"Show session details (model, turns, context usage)","input":null},{"name":"deep-research","description":"Research with bounded parallel agents, cross-check evidence, and write a cited report","input":{"hint":"<query>"}},{"name":"workflow","description":"Launch a saved workflow, list runs, or manage a run (pause, resume, stop, save)","input":{"hint":"<name> [--agent-budget N] [--effort LEVEL] [args] | runs | pause|resume|stop|save [name]"}},{"name":"goal","description":"Set, manage, or check an autonomous goal","input":{"hint":"<objective> [--budget <tokens>] | status | pause | resume | clear"}}],"cancelRewind":true,"sessionRecap":true,"feedbackTraceOffer":false,"voiceMode":true}}}}
 {"type":"expect_outbound","label":"request:session/new","frame":{"kind":"request","method":"session/new","params":{"cwd":"<workspace>","mcpServers":"<any>"}}}
 {"type":"emit_inbound","label":"notification:_x.ai/mcp/servers_updated","frame":{"kind":"notification","method":"_x.ai/mcp/servers_updated","params":{"mcpServers":[]}}}
diff --git a/apps/server/src/orchestration-v2/testkit/fixtures/grok_background_bash/grok_transcript.ndjson b/apps/server/src/orchestration-v2/testkit/fixtures/grok_background_bash/grok_transcript.ndjson
index d8ecb1438f14..3509ee229698 100644
--- a/apps/server/src/orchestration-v2/testkit/fixtures/grok_background_bash/grok_transcript.ndjson
+++ b/apps/server/src/orchestration-v2/testkit/fixtures/grok_background_bash/grok_transcript.ndjson
@@ -1,5 +1,5 @@
 {"type":"transcript_start","provider":"grok","protocol":"acp.ndjson-jsonrpc","version":"1","scenario":"grok_background_bash","metadata":{"generatedBy":"live-grok-recorder","grokVersion":"1.0.41","normalization":"Session ids are fixed UUIDs, the workspace is <workspace>, HOME is /home/grok-replay and the recording user is grok-replay. T3-owned prompt text, MCP servers and initialize params other than clientCapabilities and _meta are <any>. Personal skills, machine identity, account settings and announcement broadcasts are removed, as are responses to Grok-internal request ids that T3's protocol drops. Timestamps are kept as recorded.","droppedFrames":5}}
-{"type":"expect_outbound","label":"request:initialize","frame":{"kind":"request","method":"initialize","params":{"protocolVersion":2,"info":"<any>","capabilities":"<any>","_meta":{"clientType":"extension"},"clientCapabilities":{"fs":{"readTextFile":false,"writeTextFile":false},"terminal":false,"session":{"notices":{}},"elicitation":{"form":{}}},"clientInfo":"<any>"}}}
+{"type":"expect_outbound","label":"request:initialize","frame":{"kind":"request","method":"initialize","params":{"protocolVersion":2,"info":"<any>","capabilities":"<any>","_meta":{"clientType":"extension"},"clientCapabilities":{"fs":{"readTextFile":false,"writeTextFile":false},"terminal":false,"session":{"notices":{},"compaction":{}},"elicitation":{"form":{}}},"clientInfo":"<any>"}}}
 {"type":"emit_inbound","label":"response:initialize","frame":{"kind":"response","method":"initialize","result":{"protocolVersion":1,"agentCapabilities":{"loadSession":true,"promptCapabilities":{"image":false,"audio":false,"embeddedContext":true},"mcpCapabilities":{"http":true,"sse":true},"sessionCapabilities":{"list":{},"resume":{},"close":{}},"auth":{},"_meta":{"x.ai/fs_notify":true,"x.ai/hooks":{"blockingEvents":["pre_tool_use","stop","subagent_stop"],"decisions":["deny","block"],"stopSignals":["continue","stopReason","additionalContext"]},"x.ai/capabilities":{"toolOverrides":{"x_keyword_search":true,"x_semantic_search":true,"x_user_search":false,"x_thread_fetch":false}}}},"authMethods":[{"id":"cached_token","name":"cached_token","description":"Cached token from ~/.grok/auth.json"},{"id":"grok.com","name":"Grok","description":"Sign in with Grok"}],"_meta":{"grokShell":true,"defaultAuthMethodId":"cached_token","x.ai/mcp/sdk":true,"x.ai/pluginDirs":true,"currentWorkingDirectory":"<workspace>","agentVersion":"1.0.41","agentId":"00000000-0000-4000-8000-000000000000","agentInstanceId":"00000000-0000-4000-8000-000000000000","hostname":"grok-replay","modelState":{"currentModelId":"grok-4.7","availableModels":[{"modelId":"grok-4.7","name":"Grok 4.7","description":"SpaceXAI's latest frontier model","_meta":{"totalContextTokens":500000,"agentType":"grok-build-plan","supportsReasoningEffort":true,"reasoningEffort":"high","reasoningEfforts":[{"id":"xhigh","value":"xhigh","label":"Extra High","description":"Maximum reasoning for the hardest tasks.","default":false},{"id":"high","value":"high","label":"High","description":"Thorough reasoning and quality. Recommended.","default":true},{"id":"medium","value":"medium","label":"Medium","description":"Strong quality with a faster turnaround.","default":false},{"id":"low","value":"low","label":"Low","description":"Fastest responses. Best for simple tasks.","default":false}]}},{"modelId":"grok-4.7-build-fast","name":"Grok 4.7 Fast","description":"Fast variant. 2x the price.","_meta":{"totalContextTokens":500000,"agentType":"grok-build-plan","supportsReasoningEffort":true,"reasoningEffort":"high","reasoningEfforts":[{"id":"xhigh","value":"xhigh","label":"Extra High","description":"Maximum reasoning for the hardest tasks.","default":false},{"id":"high","value":"high","label":"High","description":"Thorough reasoning and quality. Recommended.","default":true},{"id":"medium","value":"medium","label":"Medium","description":"Strong quality with a faster turnaround.","default":false},{"id":"low","value":"low","label":"Low","description":"Fastest responses. Best for simple tasks.","default":false}]}},{"modelId":"grok-4.6","name":"Grok 4.6","_meta":{"totalContextTokens":500000,"agentType":"grok-build-plan","supportsReasoningEffort":true,"reasoningEffort":"high","reasoningEfforts":[{"id":"xhigh","value":"xhigh","label":"Extra High","description":"Highest effort and reasoning level","default":false},{"id":"high","value":"high","label":"High","description":"Higher implementation quality with extensive reasoning","default":true},{"id":"medium","value":"medium","label":"Medium","description":"Balanced effort with standard implementation and testing","default":false},{"id":"low","value":"low","label":"Low","description":"Quick, fast implementations","default":false}]}},{"modelId":"grok-4.5","name":"Grok 4.5","_meta":{"totalContextTokens":500000,"agentType":"grok-build-plan","supportsReasoningEffort":true,"reasoningEffort":"high","reasoningEfforts":[{"id":"high","value":"high","label":"High","description":"Highest implementation quality with extensive reasoning","default":true},{"id":"medium","value":"medium","label":"Medium","description":"Balanced effort with standard implementation and testing","default":false},{"id":"low","value":"low","label":"Low","description":"Quick, fast implementations","default":false}]}}]},"mcpServers":[],"mcpApps":false,"metadata":null,"availableCommands":[{"name":"compact","description":"Compress conversation history to save context window","input":{"hint":"optional context about what to preserve"}},{"name":"always-approve","description":"Toggle always-approve mode (skip all permission prompts)","input":{"hint":"on|off"}},{"name":"context","description":"Show context window usage and session stats","input":null},{"name":"session-info","description":"Show session details (model, turns, context usage)","input":null},{"name":"deep-research","description":"Research with bounded parallel agents, cross-check evidence, and write a cited report","input":{"hint":"<query>"}},{"name":"workflow","description":"Launch a saved workflow, list runs, or manage a run (pause, resume, stop, save)","input":{"hint":"<name> [--agent-budget N] [--effort LEVEL] [args] | runs | pause|resume|stop|save [name]"}},{"name":"goal","description":"Set, manage, or check an autonomous goal","input":{"hint":"<objective> [--budget <tokens>] | status | pause | resume | clear"}}],"cancelRewind":true,"sessionRecap":true,"feedbackTraceOffer":false,"voiceMode":true}}}}
 {"type":"expect_outbound","label":"request:session/new","frame":{"kind":"request","method":"session/new","params":{"cwd":"<workspace>","mcpServers":"<any>"}}}
 {"type":"emit_inbound","label":"notification:_x.ai/mcp/servers_updated","frame":{"kind":"notification","method":"_x.ai/mcp/servers_updated","params":{"mcpServers":[]}}}
diff --git a/apps/server/src/orchestration-v2/testkit/fixtures/grok_background_bash_fast_wake/grok_transcript.ndjson b/apps/server/src/orchestration-v2/testkit/fixtures/grok_background_bash_fast_wake/grok_transcript.ndjson
index 816301f66a9a..d321f2e60a10 100644
--- a/apps/server/src/orchestration-v2/testkit/fixtures/grok_background_bash_fast_wake/grok_transcript.ndjson
+++ b/apps/server/src/orchestration-v2/testkit/fixtures/grok_background_bash_fast_wake/grok_transcript.ndjson
@@ -1,5 +1,5 @@
 {"type":"transcript_start","provider":"grok","protocol":"acp.ndjson-jsonrpc","version":"1","scenario":"grok_background_bash_fast_wake","metadata":{"generatedBy":"live-grok-recorder","grokVersion":"1.0.44","normalization":"Session ids are fixed UUIDs, the workspace is <workspace>, HOME is /home/grok-replay and the recording user is grok-replay. T3-owned prompt text, MCP servers and initialize params other than clientCapabilities and _meta are <any>. Personal skills, machine identity, account settings and announcement broadcasts are removed, as are responses to Grok-internal request ids that T3's protocol drops. Timestamps are kept as recorded.","droppedFrames":5}}
-{"type":"expect_outbound","label":"request:initialize","frame":{"kind":"request","method":"initialize","params":{"protocolVersion":2,"info":"<any>","capabilities":"<any>","_meta":{"clientType":"extension"},"clientCapabilities":{"fs":{"readTextFile":false,"writeTextFile":false},"terminal":false,"session":{"notices":{}},"elicitation":{"form":{}}},"clientInfo":"<any>"}}}
+{"type":"expect_outbound","label":"request:initialize","frame":{"kind":"request","method":"initialize","params":{"protocolVersion":2,"info":"<any>","capabilities":"<any>","_meta":{"clientType":"extension"},"clientCapabilities":{"fs":{"readTextFile":false,"writeTextFile":false},"terminal":false,"session":{"notices":{},"compaction":{}},"elicitation":{"form":{}}},"clientInfo":"<any>"}}}
 {"type":"emit_inbound","label":"response:initialize","frame":{"kind":"response","method":"initialize","result":{"protocolVersion":1,"agentCapabilities":{"loadSession":true,"promptCapabilities":{"image":false,"audio":false,"embeddedContext":true},"mcpCapabilities":{"http":true,"sse":true},"sessionCapabilities":{"list":{},"resume":{},"close":{}},"auth":{},"_meta":{"x.ai/fs_notify":true,"x.ai/hooks":{"blockingEvents":["pre_tool_use","stop","subagent_stop"],"decisions":["deny","block"],"stopSignals":["continue","stopReason","additionalContext"]},"x.ai/capabilities":{"toolOverrides":{"x_keyword_search":true,"x_semantic_search":true,"x_user_search":false,"x_thread_fetch":false}}}},"authMethods":[{"id":"cached_token","name":"cached_token","description":"Cached token from ~/.grok/auth.json"},{"id":"grok.com","name":"Grok","description":"Sign in with Grok"}],"_meta":{"grokShell":true,"defaultAuthMethodId":"cached_token","x.ai/mcp/sdk":true,"x.ai/pluginDirs":true,"currentWorkingDirectory":"<workspace>","agentVersion":"1.0.44","agentId":"00000000-0000-4000-8000-000000000000","agentInstanceId":"00000000-0000-4000-8000-000000000000","hostname":"grok-replay","modelState":{"currentModelId":"grok-4.7","availableModels":[{"modelId":"grok-4.7","name":"Grok 4.7","description":"SpaceXAI's latest frontier model","_meta":{"totalContextTokens":256000,"agentType":"grok-build-plan","supportsReasoningEffort":true,"reasoningEffort":"high","reasoningEfforts":[{"id":"xhigh","value":"xhigh","label":"Extra High","description":"Maximum reasoning for the hardest tasks.","default":false},{"id":"high","value":"high","label":"High","description":"Thorough reasoning and quality. Recommended.","default":true},{"id":"medium","value":"medium","label":"Medium","description":"Strong quality with a faster turnaround.","default":false},{"id":"low","value":"low","label":"Low","description":"Fastest responses. Best for simple tasks.","default":false}],"contextWindows":[256000,500000]}},{"modelId":"grok-4.7-build-fast","name":"Grok 4.7 Fast","description":"Fast variant. 2x the price.","_meta":{"totalContextTokens":256000,"agentType":"grok-build-plan","supportsReasoningEffort":true,"reasoningEffort":"high","reasoningEfforts":[{"id":"xhigh","value":"xhigh","label":"Extra High","description":"Maximum reasoning for the hardest tasks.","default":false},{"id":"high","value":"high","label":"High","description":"Thorough reasoning and quality. Recommended.","default":true},{"id":"medium","value":"medium","label":"Medium","description":"Strong quality with a faster turnaround.","default":false},{"id":"low","value":"low","label":"Low","description":"Fastest responses. Best for simple tasks.","default":false}],"contextWindows":[256000,500000]}},{"modelId":"grok-4.6","name":"Grok 4.6","_meta":{"totalContextTokens":256000,"agentType":"grok-build-plan","supportsReasoningEffort":true,"reasoningEffort":"high","reasoningEfforts":[{"id":"xhigh","value":"xhigh","label":"Extra High","description":"Highest effort and reasoning level","default":false},{"id":"high","value":"high","label":"High","description":"Higher implementation quality with extensive reasoning","default":true},{"id":"medium","value":"medium","label":"Medium","description":"Balanced effort with standard implementation and testing","default":false},{"id":"low","value":"low","label":"Low","description":"Quick, fast implementations","default":false}],"contextWindows":[256000,500000]}},{"modelId":"grok-4.5","name":"Grok 4.5","_meta":{"totalContextTokens":256000,"agentType":"grok-build-plan","supportsReasoningEffort":true,"reasoningEffort":"high","reasoningEfforts":[{"id":"high","value":"high","label":"High","description":"Highest implementation quality with extensive reasoning","default":true},{"id":"medium","value":"medium","label":"Medium","description":"Balanced effort with standard implementation and testing","default":false},{"id":"low","value":"low","label":"Low","description":"Quick, fast implementations","default":false}],"contextWindows":[256000,500000]}}]},"mcpServers":[],"mcpApps":false,"metadata":null,"availableCommands":[{"name":"compact","description":"Compress conversation history to save context window","input":null},{"name":"always-approve","description":"Toggle always-approve mode (skip all permission prompts)","input":{"hint":"on|off"}},{"name":"context","description":"Show context window usage and session stats","input":null},{"name":"session-info","description":"Show session details (model, turns, context usage)","input":null},{"name":"deep-research","description":"Research with bounded parallel agents, cross-check evidence, and write a cited report","input":{"hint":"<query>"}},{"name":"workflow","description":"Launch a saved workflow, list runs, or manage a run (pause, resume, stop, save)","input":{"hint":"<name> [--agent-budget N] [--effort LEVEL] [args] | runs | pause|resume|stop|save [name]"}},{"name":"goal","description":"Set, manage, or check an autonomous goal","input":{"hint":"<objective> [--budget <tokens>] | status | pause | resume | clear"}}],"cancelRewind":true,"sessionRecap":true,"feedbackTraceOffer":false,"voiceMode":true}}}}
 {"type":"expect_outbound","label":"request:session/new","frame":{"kind":"request","method":"session/new","params":{"cwd":"<workspace>","mcpServers":"<any>"}}}
 {"type":"emit_inbound","label":"notification:_x.ai/session/setup","frame":{"kind":"notification","method":"_x.ai/session/setup","params":{"method":"session/new","phase":"auth","sessionId":null}}}
diff --git a/apps/server/src/orchestration-v2/testkit/fixtures/grok_prompt_error/grok_transcript.ndjson b/apps/server/src/orchestration-v2/testkit/fixtures/grok_prompt_error/grok_transcript.ndjson
index 9fa307acc195..8ed6a2537ab3 100644
--- a/apps/server/src/orchestration-v2/testkit/fixtures/grok_prompt_error/grok_transcript.ndjson
+++ b/apps/server/src/orchestration-v2/testkit/fixtures/grok_prompt_error/grok_transcript.ndjson
@@ -1,5 +1,5 @@
 {"type":"transcript_start","provider":"grok","protocol":"acp.ndjson-jsonrpc","version":"1","scenario":"grok_prompt_error","metadata":{"generatedBy":"live-grok-recorder","grokVersion":"1.0.44","normalization":"Session ids are fixed UUIDs, the workspace is <workspace>, HOME is /home/grok-replay and the recording user is grok-replay. T3-owned prompt text, MCP servers and initialize params other than clientCapabilities and _meta are <any>. Personal skills, machine identity, account settings and announcement broadcasts are removed, as are responses to Grok-internal request ids that T3's protocol drops. Timestamps are kept as recorded.","droppedFrames":5}}
-{"type":"expect_outbound","label":"request:initialize","frame":{"kind":"request","method":"initialize","params":{"protocolVersion":2,"info":"<any>","capabilities":"<any>","_meta":{"clientType":"extension"},"clientCapabilities":{"fs":{"readTextFile":false,"writeTextFile":false},"terminal":false,"session":{"notices":{}},"elicitation":{"form":{}}},"clientInfo":"<any>"}}}
+{"type":"expect_outbound","label":"request:initialize","frame":{"kind":"request","method":"initialize","params":{"protocolVersion":2,"info":"<any>","capabilities":"<any>","_meta":{"clientType":"extension"},"clientCapabilities":{"fs":{"readTextFile":false,"writeTextFile":false},"terminal":false,"session":{"notices":{},"compaction":{}},"elicitation":{"form":{}}},"clientInfo":"<any>"}}}
 {"type":"emit_inbound","label":"response:initialize","frame":{"kind":"response","method":"initialize","result":{"protocolVersion":1,"agentCapabilities":{"loadSession":true,"promptCapabilities":{"image":false,"audio":false,"embeddedContext":true},"mcpCapabilities":{"http":true,"sse":true},"sessionCapabilities":{"list":{},"resume":{},"close":{}},"auth":{},"_meta":{"x.ai/fs_notify":true,"x.ai/hooks":{"blockingEvents":["pre_tool_use","stop","subagent_stop"],"decisions":["deny","block"],"stopSignals":["continue","stopReason","additionalContext"]},"x.ai/capabilities":{"toolOverrides":{"x_keyword_search":true,"x_semantic_search":true,"x_user_search":false,"x_thread_fetch":false}}}},"authMethods":[{"id":"cached_token","name":"cached_token","description":"Cached token from ~/.grok/auth.json"},{"id":"grok.com","name":"Grok","description":"Sign in with Grok"}],"_meta":{"grokShell":true,"defaultAuthMethodId":"cached_token","x.ai/mcp/sdk":true,"x.ai/pluginDirs":true,"currentWorkingDirectory":"<workspace>","agentVersion":"1.0.44","agentId":"00000000-0000-4000-8000-000000000000","agentInstanceId":"00000000-0000-4000-8000-000000000000","hostname":"grok-replay","modelState":{"currentModelId":"grok-4.7","availableModels":[{"modelId":"grok-4.7","name":"Grok 4.7","description":"SpaceXAI's latest frontier model","_meta":{"totalContextTokens":256000,"agentType":"grok-build-plan","supportsReasoningEffort":true,"reasoningEffort":"high","reasoningEfforts":[{"id":"xhigh","value":"xhigh","label":"Extra High","description":"Maximum reasoning for the hardest tasks.","default":false},{"id":"high","value":"high","label":"High","description":"Thorough reasoning and quality. Recommended.","default":true},{"id":"medium","value":"medium","label":"Medium","description":"Strong quality with a faster turnaround.","default":false},{"id":"low","value":"low","label":"Low","description":"Fastest responses. Best for simple tasks.","default":false}],"contextWindows":[256000,500000]}},{"modelId":"grok-4.7-build-fast","name":"Grok 4.7 Fast","description":"Fast variant. 2x the price.","_meta":{"totalContextTokens":256000,"agentType":"grok-build-plan","supportsReasoningEffort":true,"reasoningEffort":"high","reasoningEfforts":[{"id":"xhigh","value":"xhigh","label":"Extra High","description":"Maximum reasoning for the hardest tasks.","default":false},{"id":"high","value":"high","label":"High","description":"Thorough reasoning and quality. Recommended.","default":true},{"id":"medium","value":"medium","label":"Medium","description":"Strong quality with a faster turnaround.","default":false},{"id":"low","value":"low","label":"Low","description":"Fastest responses. Best for simple tasks.","default":false}],"contextWindows":[256000,500000]}},{"modelId":"grok-4.6","name":"Grok 4.6","_meta":{"totalContextTokens":256000,"agentType":"grok-build-plan","supportsReasoningEffort":true,"reasoningEffort":"high","reasoningEfforts":[{"id":"xhigh","value":"xhigh","label":"Extra High","description":"Highest effort and reasoning level","default":false},{"id":"high","value":"high","label":"High","description":"Higher implementation quality with extensive reasoning","default":true},{"id":"medium","value":"medium","label":"Medium","description":"Balanced effort with standard implementation and testing","default":false},{"id":"low","value":"low","label":"Low","description":"Quick, fast implementations","default":false}],"contextWindows":[256000,500000]}},{"modelId":"grok-4.5","name":"Grok 4.5","_meta":{"totalContextTokens":256000,"agentType":"grok-build-plan","supportsReasoningEffort":true,"reasoningEffort":"high","reasoningEfforts":[{"id":"high","value":"high","label":"High","description":"Highest implementation quality with extensive reasoning","default":true},{"id":"medium","value":"medium","label":"Medium","description":"Balanced effort with standard implementation and testing","default":false},{"id":"low","value":"low","label":"Low","description":"Quick, fast implementations","default":false}],"contextWindows":[256000,500000]}}]},"mcpServers":[],"mcpApps":false,"metadata":null,"availableCommands":[{"name":"compact","description":"Compress conversation history to save context window","input":null},{"name":"always-approve","description":"Toggle always-approve mode (skip all permission prompts)","input":{"hint":"on|off"}},{"name":"context","description":"Show context window usage and session stats","input":null},{"name":"session-info","description":"Show session details (model, turns, context usage)","input":null},{"name":"deep-research","description":"Research with bounded parallel agents, cross-check evidence, and write a cited report","input":{"hint":"<query>"}},{"name":"workflow","description":"Launch a saved workflow, list runs, or manage a run (pause, resume, stop, save)","input":{"hint":"<name> [--agent-budget N] [--effort LEVEL] [args] | runs | pause|resume|stop|save [name]"}},{"name":"goal","description":"Set, manage, or check an autonomous goal","input":{"hint":"<objective> [--budget <tokens>] | status | pause | resume | clear"}}],"cancelRewind":true,"sessionRecap":true,"feedbackTraceOffer":false,"voiceMode":true}}}}
 {"type":"expect_outbound","label":"request:session/new","frame":{"kind":"request","method":"session/new","params":{"cwd":"<workspace>","mcpServers":"<any>"}}}
 {"type":"emit_inbound","label":"notification:_x.ai/session/setup","frame":{"kind":"notification","method":"_x.ai/session/setup","params":{"method":"session/new","phase":"auth","sessionId":null}}}
diff --git a/apps/server/src/orchestration-v2/testkit/fixtures/index.ts b/apps/server/src/orchestration-v2/testkit/fixtures/index.ts
index 8ee31f2b1446..ce6d739b1cdd 100644
--- a/apps/server/src/orchestration-v2/testkit/fixtures/index.ts
+++ b/apps/server/src/orchestration-v2/testkit/fixtures/index.ts
@@ -90,7 +90,6 @@ import { assertMuseTurnInterruptOutput } from "./turn_interrupt/muse_output.ts";
 import { piCompactionInput } from "./pi_compaction/input.ts";
 import { assertPiCompactionOutput } from "./pi_compaction/output.ts";
 import { providerThreadResumeInput } from "./provider_thread_resume/input.ts";
-import { assertKiroProviderThreadResumeOutput } from "./provider_thread_resume/kiro_output.ts";
 import { assertPiProviderThreadResumeOutput } from "./provider_thread_resume/pi_output.ts";
 import { assertMultiTurnClaudeOutput } from "./multi_turn/claude_output.ts";
 import { assertMultiTurnOutput } from "./multi_turn/codex_output.ts";
@@ -1585,12 +1584,6 @@ export const ORCHESTRATOR_REPLAY_FIXTURES: ReadonlyArray<OrchestratorReplayFixtu
         modelSelection: PI_MODEL_SELECTION,
         assertOutput: assertPiProviderThreadResumeOutput,
       },
-      {
-        driver: ProviderDriverKind.make("kiro"),
-        transcriptFile: new URL("./provider_thread_resume/kiro_transcript.ndjson", import.meta.url),
-        modelSelection: KIRO_MODEL_SELECTION,
-        assertOutput: assertKiroProviderThreadResumeOutput,
-      },
     ],
   },
   {
diff --git a/apps/server/src/orchestration-v2/testkit/fixtures/kiro_cloud_config/kiro_transcript.ndjson b/apps/server/src/orchestration-v2/testkit/fixtures/kiro_cloud_config/kiro_transcript.ndjson
index e4b6ab19b2f3..f633b0f8b934 100644
--- a/apps/server/src/orchestration-v2/testkit/fixtures/kiro_cloud_config/kiro_transcript.ndjson
+++ b/apps/server/src/orchestration-v2/testkit/fixtures/kiro_cloud_config/kiro_transcript.ndjson
@@ -1,5 +1,5 @@
 {"type":"transcript_start","provider":"kiro","protocol":"acp.ndjson-jsonrpc","version":"1","scenario":"kiro_cloud_config","metadata":{"generatedBy":"live-kiro-recorder","kiroVersion":"2.32.0","normalization":"Session ids are fixed sess_ UUIDs and other UUIDs (message and request ids) are numbered in first-seen order, the workspace is <workspace>, HOME is /home/kiro-replay and the recording user is kiro-replay. T3-owned prompt text, MCP servers and initialize params other than clientCapabilities and _meta are <any>. Kiro's log directory, user-scoped commands and agents, and the _kiro/* broadcasts T3 ignores (governance, steering documents, powers, tools, hooks, MCP status, session roster) are removed. Timestamps are kept as recorded.","droppedFrames":13,"editedFrames":"Copied from turn_interrupt/kiro_transcript.ndjson. Added by hand: the background `fetch_cloud_config` tool call and its completion, as @hstern recorded them from kiro-cli 2.31.0 with an Identity Center login, in an order that failed there: the call before `session/prompt`, its completion after the `user_message_id_assigned` echo. The tool call id is invented; the reported frames omitted it."}}
-{"type":"expect_outbound","label":"request:initialize","frame":{"kind":"request","method":"initialize","params":{"protocolVersion":2,"info":"<any>","capabilities":"<any>","clientCapabilities":{"fs":{"readTextFile":false,"writeTextFile":false},"terminal":false,"session":{"notices":{}},"elicitation":{"form":{}},"_meta":{"kiro":{"hooks":{"enabled":true,"v2":true}}}},"clientInfo":"<any>"}}}
+{"type":"expect_outbound","label":"request:initialize","frame":{"kind":"request","method":"initialize","params":{"protocolVersion":2,"info":"<any>","capabilities":"<any>","clientCapabilities":{"fs":{"readTextFile":false,"writeTextFile":false},"terminal":false,"session":{"notices":{},"compaction":{}},"elicitation":{"form":{}},"_meta":{"kiro":{"hooks":{"enabled":true,"v2":true}}}},"clientInfo":"<any>"}}}
 {"type":"emit_inbound","label":"response:initialize","frame":{"kind":"response","method":"initialize","result":{"protocolVersion":2,"agentCapabilities":{"loadSession":true,"promptCapabilities":{"image":true,"embeddedContext":true},"mcpCapabilities":{"http":true,"sse":true},"sessionCapabilities":{"list":{},"close":{},"delete":{},"fork":{"_meta":{"kiro":{"messageId":true}}}},"_meta":{"kiro":{"checkpoints":true,"sessionList":true,"policyNotifications":true,"extensionMethods":["_kiro/knowledge","_kiro/memory/list","_kiro/memory/get","_kiro/memory/create","_kiro/memory/update","_kiro/memory/delete","_kiro/codeIntelligence","_kiro/session/context","_kiro/session/compact","_kiro/session/export","_kiro/session/history","_kiro/config/template","_kiro/workflow/new","_kiro/workflow/invoke","_kiro/workflow/load","_kiro/workflow/inspect","_kiro/workflow/list","_kiro/workflow/pause","_kiro/workflow/cancel","_kiro/workflow/delete","_kiro/workflow/listRecipes","_kiro/workflow/listWatchHandlers","_kiro/workflow/resumeAll","_kiro/workflow/retry","_kiro/workflow/update","_kiro/workflow/resume","_kiro/sourceProviders/list","_kiro/sourceProviders/listResources"],"sessionSources":["local","remote"],"sessionListScopes":["workspace","user"],"executionTargets":["local","cloud-sandbox"],"sourceProviders":true,"replayMarking":true}}},"authMethods":[{"id":"aws-builder-id","name":"AWS Builder ID"},{"id":"aws-iam-identity-center","name":"AWS IAM Identity Center"}]}}}
 {"type":"expect_outbound","label":"request:session/new","frame":{"kind":"request","method":"session/new","params":{"cwd":"<workspace>","mcpServers":"<any>"}}}
 {"type":"emit_inbound","label":"notification:session/update:available_commands_update","frame":{"kind":"notification","method":"session/update","params":{"sessionId":"sess_00000000-0000-4000-8000-000000000001","update":{"sessionUpdate":"available_commands_update","availableCommands":[{"name":"architecture-selection","description":"Steering: architecture-selection","input":{"hint":"optional context"},"_meta":{"kiro":{"type":"steering","contextQuery":"global:architecture-selection","commandId":"architecture-selection","resource":{"resourceType":"steering","source":{"origin":"bundled"}},"originalName":"architecture-selection"}}},{"name":"quick-spec","description":"Steering: quick-spec","input":{"hint":"optional context"},"_meta":{"kiro":{"type":"steering","contextQuery":"global:quick-spec","commandId":"quick-spec","resource":{"resourceType":"steering","source":{"origin":"bundled"}},"originalName":"quick-spec"}}},{"name":"bug-fix","description":"Steering: bug-fix","input":{"hint":"optional context"},"_meta":{"kiro":{"type":"steering","contextQuery":"global:bug-fix","commandId":"bug-fix","resource":{"resourceType":"steering","source":{"origin":"bundled"}},"originalName":"bug-fix"}}},{"name":"general-task-execution","description":"General-purpose sub-agent with access to all tools for executing arbitrary tasks","input":{"hint":"task to delegate"},"_meta":{"kiro":{"type":"custom-agent","commandId":"general-task-execution","resource":{"resourceType":"agent","source":{"origin":"bundled"}},"originalName":"general-task-execution"}}},{"name":"context-gatherer","description":"Investigates the codebase to answer a specific question about it. Deeply analyzes existing code by tracing execution paths, mapping architecture and abstraction layers, understanding patterns, and documenting dependencies, returning a thorough, direct written analysis that explains how the relevant code works and points to the specific files and lines involved. Use it to understand code before you change it: before designing or implementing a change to code you don't already fully understand, start with context-gatherer so your edits are grounded in how the code actually works. When a task requires understanding code you don't already know, dispatch context-gatherer to do that exploration before running your own searches or reads. Rules: 1. Provide a clear, specific prompt that includes your intent: a detailed task description of the context you need and what you're trying to accomplish. 2. The subagent explores the codebase and returns an analysis of your query 3. Trust the returned results. You may still inspect additional code yourself when you need context beyond what was returned. 4. Reuse existing context-gatherer output for related follow-up questions; do not re-invoke on the same question with different phrasing. 5. For multiple distinct questions, dispatch several context-gatherers in parallel, each targeting a different aspect of the codebase.","input":{"hint":"task to delegate"},"_meta":{"kiro":{"type":"custom-agent","commandId":"context-gatherer","resource":{"resourceType":"agent","source":{"origin":"bundled"}},"originalName":"context-gatherer"}}}]}}}}
diff --git a/apps/server/src/orchestration-v2/testkit/fixtures/kiro_compaction/kiro_transcript.ndjson b/apps/server/src/orchestration-v2/testkit/fixtures/kiro_compaction/kiro_transcript.ndjson
index 6dce2f2ccb9f..436e2790e36c 100644
--- a/apps/server/src/orchestration-v2/testkit/fixtures/kiro_compaction/kiro_transcript.ndjson
+++ b/apps/server/src/orchestration-v2/testkit/fixtures/kiro_compaction/kiro_transcript.ndjson
@@ -1,5 +1,5 @@
 {"type":"transcript_start","provider":"kiro","protocol":"acp.ndjson-jsonrpc","version":"1","scenario":"kiro_compaction","metadata":{"generatedBy":"live-kiro-recorder","kiroVersion":"2.33.1","normalization":"Session ids are fixed sess_ UUIDs and other UUIDs (message and request ids) are numbered in first-seen order, the workspace is <workspace>, HOME is /home/kiro-replay and the recording user is kiro-replay. T3-owned prompt text, MCP servers and initialize params other than clientCapabilities and _meta are <any>. Kiro's log directory, user-scoped commands and agents, and the _kiro/* broadcasts T3 ignores (governance, steering documents, powers, tools, hooks, MCP status, session roster) are removed. Timestamps are kept as recorded.","droppedFrames":15}}
-{"type":"expect_outbound","label":"request:initialize","frame":{"kind":"request","method":"initialize","params":{"protocolVersion":2,"info":"<any>","capabilities":"<any>","clientCapabilities":{"fs":{"readTextFile":false,"writeTextFile":false},"terminal":false,"session":{"notices":{}},"elicitation":{"form":{}},"_meta":{"kiro":{"hooks":{"enabled":true,"v2":true}}}},"clientInfo":"<any>"}}}
+{"type":"expect_outbound","label":"request:initialize","frame":{"kind":"request","method":"initialize","params":{"protocolVersion":2,"info":"<any>","capabilities":"<any>","clientCapabilities":{"fs":{"readTextFile":false,"writeTextFile":false},"terminal":false,"session":{"notices":{},"compaction":{}},"elicitation":{"form":{}},"_meta":{"kiro":{"hooks":{"enabled":true,"v2":true}}}},"clientInfo":"<any>"}}}
 {"type":"emit_inbound","label":"response:initialize","frame":{"kind":"response","method":"initialize","result":{"protocolVersion":2,"agentCapabilities":{"loadSession":true,"promptCapabilities":{"image":true,"embeddedContext":true},"mcpCapabilities":{"http":true,"sse":true},"sessionCapabilities":{"list":{},"close":{},"delete":{},"fork":{"_meta":{"kiro":{"messageId":true}}}},"_meta":{"kiro":{"checkpoints":true,"sessionList":true,"policyNotifications":true,"extensionMethods":["_kiro/knowledge","_kiro/memory/list","_kiro/memory/get","_kiro/memory/create","_kiro/memory/update","_kiro/memory/delete","_kiro/codeIntelligence","_kiro/session/context","_kiro/session/compact","_kiro/session/export","_kiro/session/history","_kiro/config/template","_kiro/workflow/new","_kiro/workflow/invoke","_kiro/workflow/load","_kiro/workflow/inspect","_kiro/workflow/list","_kiro/workflow/pause","_kiro/workflow/cancel","_kiro/workflow/delete","_kiro/workflow/listRecipes","_kiro/workflow/listWatchHandlers","_kiro/workflow/resumeAll","_kiro/workflow/retry","_kiro/workflow/update","_kiro/workflow/resume","_kiro/sourceProviders/list","_kiro/sourceProviders/listResources"],"sessionSources":["local","remote"],"sessionListScopes":["workspace","user"],"executionTargets":["local","cloud-sandbox"],"sourceProviders":true,"replayMarking":true}}},"authMethods":[{"id":"aws-builder-id","name":"AWS Builder ID"},{"id":"aws-iam-identity-center","name":"AWS IAM Identity Center"}]}}}
 {"type":"expect_outbound","label":"request:session/new","frame":{"kind":"request","method":"session/new","params":{"cwd":"<workspace>","mcpServers":"<any>"}}}
 {"type":"emit_inbound","label":"notification:session/update:available_commands_update","frame":{"kind":"notification","method":"session/update","params":{"sessionId":"sess_00000000-0000-4000-8000-000000000001","update":{"sessionUpdate":"available_commands_update","availableCommands":[{"name":"architecture-selection","description":"Steering: architecture-selection","input":{"hint":"optional context"},"_meta":{"kiro":{"type":"steering","contextQuery":"global:architecture-selection","commandId":"architecture-selection","resource":{"resourceType":"steering","source":{"origin":"bundled"}},"originalName":"architecture-selection"}}},{"name":"quick-spec","description":"Steering: quick-spec","input":{"hint":"optional context"},"_meta":{"kiro":{"type":"steering","contextQuery":"global:quick-spec","commandId":"quick-spec","resource":{"resourceType":"steering","source":{"origin":"bundled"}},"originalName":"quick-spec"}}},{"name":"bug-fix","description":"Steering: bug-fix","input":{"hint":"optional context"},"_meta":{"kiro":{"type":"steering","contextQuery":"global:bug-fix","commandId":"bug-fix","resource":{"resourceType":"steering","source":{"origin":"bundled"}},"originalName":"bug-fix"}}},{"name":"general-task-execution","description":"General-purpose sub-agent with access to all tools for executing arbitrary tasks","input":{"hint":"task to delegate"},"_meta":{"kiro":{"type":"custom-agent","commandId":"general-task-execution","resource":{"resourceType":"agent","source":{"origin":"bundled"}},"originalName":"general-task-execution"}}},{"name":"context-gatherer","description":"Investigates the codebase to answer a specific question about it. Deeply analyzes existing code by tracing execution paths, mapping architecture and abstraction layers, understanding patterns, and documenting dependencies, returning a thorough, direct written analysis that explains how the relevant code works and points to the specific files and lines involved. Use it to understand code before you change it: before designing or implementing a change to code you don't already fully understand, start with context-gatherer so your edits are grounded in how the code actually works. When a task requires understanding code you don't already know, dispatch context-gatherer to do that exploration before running your own searches or reads. Rules: 1. Provide a clear, specific prompt that includes your intent: a detailed task description of the context you need and what you're trying to accomplish. 2. The subagent explores the codebase and returns an analysis of your query 3. Trust the returned results. You may still inspect additional code yourself when you need context beyond what was returned. 4. Reuse existing context-gatherer output for related follow-up questions; do not re-invoke on the same question with different phrasing. 5. For multiple distinct questions, dispatch several context-gatherers in parallel, each targeting a different aspect of the codebase.","input":{"hint":"task to delegate"},"_meta":{"kiro":{"type":"custom-agent","commandId":"context-gatherer","resource":{"resourceType":"agent","source":{"origin":"bundled"}},"originalName":"context-gatherer"}}}]}}}}
diff --git a/apps/server/src/orchestration-v2/testkit/fixtures/kiro_effort/kiro_transcript.ndjson b/apps/server/src/orchestration-v2/testkit/fixtures/kiro_effort/kiro_transcript.ndjson
index 2b613ee1100f..d6b9a290c47e 100644
--- a/apps/server/src/orchestration-v2/testkit/fixtures/kiro_effort/kiro_transcript.ndjson
+++ b/apps/server/src/orchestration-v2/testkit/fixtures/kiro_effort/kiro_transcript.ndjson
@@ -1,5 +1,5 @@
 {"type":"transcript_start","provider":"kiro","protocol":"acp.ndjson-jsonrpc","version":"1","scenario":"kiro_effort","metadata":{"generatedBy":"live-kiro-recorder","kiroVersion":"2.32.0","normalization":"Session ids are fixed sess_ UUIDs and other UUIDs (message and request ids) are numbered in first-seen order, the workspace is <workspace>, HOME is /home/kiro-replay and the recording user is kiro-replay. T3-owned prompt text, MCP servers and initialize params other than clientCapabilities and _meta are <any>. Kiro's log directory, user-scoped commands and agents, and the _kiro/* broadcasts T3 ignores (governance, steering documents, powers, tools, hooks, MCP status, session roster) are removed. Timestamps are kept as recorded.","droppedFrames":13}}
-{"type":"expect_outbound","label":"request:initialize","frame":{"kind":"request","method":"initialize","params":{"protocolVersion":2,"info":"<any>","capabilities":"<any>","clientCapabilities":{"fs":{"readTextFile":false,"writeTextFile":false},"terminal":false,"session":{"notices":{}},"elicitation":{"form":{}},"_meta":{"kiro":{"hooks":{"enabled":true,"v2":true}}}},"clientInfo":"<any>"}}}
+{"type":"expect_outbound","label":"request:initialize","frame":{"kind":"request","method":"initialize","params":{"protocolVersion":2,"info":"<any>","capabilities":"<any>","clientCapabilities":{"fs":{"readTextFile":false,"writeTextFile":false},"terminal":false,"session":{"notices":{},"compaction":{}},"elicitation":{"form":{}},"_meta":{"kiro":{"hooks":{"enabled":true,"v2":true}}}},"clientInfo":"<any>"}}}
 {"type":"emit_inbound","label":"response:initialize","frame":{"kind":"response","method":"initialize","result":{"protocolVersion":2,"agentCapabilities":{"loadSession":true,"promptCapabilities":{"image":true,"embeddedContext":true},"mcpCapabilities":{"http":true,"sse":true},"sessionCapabilities":{"list":{},"close":{},"delete":{},"fork":{"_meta":{"kiro":{"messageId":true}}}},"_meta":{"kiro":{"checkpoints":true,"sessionList":true,"policyNotifications":true,"extensionMethods":["_kiro/knowledge","_kiro/memory/list","_kiro/memory/get","_kiro/memory/create","_kiro/memory/update","_kiro/memory/delete","_kiro/codeIntelligence","_kiro/session/context","_kiro/session/compact","_kiro/session/export","_kiro/session/history","_kiro/config/template","_kiro/workflow/new","_kiro/workflow/invoke","_kiro/workflow/load","_kiro/workflow/inspect","_kiro/workflow/list","_kiro/workflow/pause","_kiro/workflow/cancel","_kiro/workflow/delete","_kiro/workflow/listRecipes","_kiro/workflow/listWatchHandlers","_kiro/workflow/resumeAll","_kiro/workflow/retry","_kiro/workflow/update","_kiro/workflow/resume","_kiro/sourceProviders/list","_kiro/sourceProviders/listResources"],"sessionSources":["local","remote"],"sessionListScopes":["workspace","user"],"executionTargets":["local","cloud-sandbox"],"sourceProviders":true,"replayMarking":true}}},"authMethods":[{"id":"aws-builder-id","name":"AWS Builder ID"},{"id":"aws-iam-identity-center","name":"AWS IAM Identity Center"}]}}}
 {"type":"expect_outbound","label":"request:session/new","frame":{"kind":"request","method":"session/new","params":{"cwd":"<workspace>","mcpServers":"<any>"}}}
 {"type":"emit_inbound","label":"notification:session/update:available_commands_update","frame":{"kind":"notification","method":"session/update","params":{"sessionId":"sess_00000000-0000-4000-8000-000000000001","update":{"sessionUpdate":"available_commands_update","availableCommands":[{"name":"architecture-selection","description":"Steering: architecture-selection","input":{"hint":"optional context"},"_meta":{"kiro":{"type":"steering","contextQuery":"global:architecture-selection","commandId":"architecture-selection","resource":{"resourceType":"steering","source":{"origin":"bundled"}},"originalName":"architecture-selection"}}},{"name":"quick-spec","description":"Steering: quick-spec","input":{"hint":"optional context"},"_meta":{"kiro":{"type":"steering","contextQuery":"global:quick-spec","commandId":"quick-spec","resource":{"resourceType":"steering","source":{"origin":"bundled"}},"originalName":"quick-spec"}}},{"name":"bug-fix","description":"Steering: bug-fix","input":{"hint":"optional context"},"_meta":{"kiro":{"type":"steering","contextQuery":"global:bug-fix","commandId":"bug-fix","resource":{"resourceType":"steering","source":{"origin":"bundled"}},"originalName":"bug-fix"}}},{"name":"general-task-execution","description":"General-purpose sub-agent with access to all tools for executing arbitrary tasks","input":{"hint":"task to delegate"},"_meta":{"kiro":{"type":"custom-agent","commandId":"general-task-execution","resource":{"resourceType":"agent","source":{"origin":"bundled"}},"originalName":"general-task-execution"}}},{"name":"context-gatherer","description":"Investigates the codebase to answer a specific question about it. Deeply analyzes existing code by tracing execution paths, mapping architecture and abstraction layers, understanding patterns, and documenting dependencies, returning a thorough, direct written analysis that explains how the relevant code works and points to the specific files and lines involved. Use it to understand code before you change it: before designing or implementing a change to code you don't already fully understand, start with context-gatherer so your edits are grounded in how the code actually works. When a task requires understanding code you don't already know, dispatch context-gatherer to do that exploration before running your own searches or reads. Rules: 1. Provide a clear, specific prompt that includes your intent: a detailed task description of the context you need and what you're trying to accomplish. 2. The subagent explores the codebase and returns an analysis of your query 3. Trust the returned results. You may still inspect additional code yourself when you need context beyond what was returned. 4. Reuse existing context-gatherer output for related follow-up questions; do not re-invoke on the same question with different phrasing. 5. For multiple distinct questions, dispatch several context-gatherers in parallel, each targeting a different aspect of the codebase.","input":{"hint":"task to delegate"},"_meta":{"kiro":{"type":"custom-agent","commandId":"context-gatherer","resource":{"resourceType":"agent","source":{"origin":"bundled"}},"originalName":"context-gatherer"}}}]}}}}
diff --git a/apps/server/src/orchestration-v2/testkit/fixtures/kiro_fork_from_turn/kiro_transcript.ndjson b/apps/server/src/orchestration-v2/testkit/fixtures/kiro_fork_from_turn/kiro_transcript.ndjson
index aac368e4d483..a9dd2d3c4a24 100644
--- a/apps/server/src/orchestration-v2/testkit/fixtures/kiro_fork_from_turn/kiro_transcript.ndjson
+++ b/apps/server/src/orchestration-v2/testkit/fixtures/kiro_fork_from_turn/kiro_transcript.ndjson
@@ -1,5 +1,5 @@
 {"type":"transcript_start","provider":"kiro","protocol":"acp.ndjson-jsonrpc","version":"1","scenario":"kiro_fork_from_turn","metadata":{"generatedBy":"live-kiro-recorder","kiroVersion":"2.33.1","normalization":"Session ids are fixed sess_ UUIDs and other UUIDs (message and request ids) are numbered in first-seen order, the workspace is <workspace>, HOME is /home/kiro-replay and the recording user is kiro-replay. T3-owned prompt text, MCP servers and initialize params other than clientCapabilities and _meta are <any>. Kiro's log directory, user-scoped commands and agents, and the _kiro/* broadcasts T3 ignores (governance, steering documents, powers, tools, hooks, MCP status, session roster) are removed. Timestamps are kept as recorded.","droppedFrames":39}}
-{"type":"expect_outbound","label":"request:initialize","frame":{"kind":"request","method":"initialize","params":{"protocolVersion":2,"info":"<any>","capabilities":"<any>","clientCapabilities":{"fs":{"readTextFile":false,"writeTextFile":false},"terminal":false,"session":{"notices":{}},"elicitation":{"form":{}},"_meta":{"kiro":{"hooks":{"enabled":true,"v2":true}}}},"clientInfo":"<any>"}}}
+{"type":"expect_outbound","label":"request:initialize","frame":{"kind":"request","method":"initialize","params":{"protocolVersion":2,"info":"<any>","capabilities":"<any>","clientCapabilities":{"fs":{"readTextFile":false,"writeTextFile":false},"terminal":false,"session":{"notices":{},"compaction":{}},"elicitation":{"form":{}},"_meta":{"kiro":{"hooks":{"enabled":true,"v2":true}}}},"clientInfo":"<any>"}}}
 {"type":"emit_inbound","label":"response:initialize","frame":{"kind":"response","method":"initialize","result":{"protocolVersion":2,"agentCapabilities":{"loadSession":true,"promptCapabilities":{"image":true,"embeddedContext":true},"mcpCapabilities":{"http":true,"sse":true},"sessionCapabilities":{"list":{},"close":{},"delete":{},"fork":{"_meta":{"kiro":{"messageId":true}}}},"_meta":{"kiro":{"checkpoints":true,"sessionList":true,"policyNotifications":true,"extensionMethods":["_kiro/knowledge","_kiro/memory/list","_kiro/memory/get","_kiro/memory/create","_kiro/memory/update","_kiro/memory/delete","_kiro/codeIntelligence","_kiro/session/context","_kiro/session/compact","_kiro/session/export","_kiro/session/history","_kiro/config/template","_kiro/workflow/new","_kiro/workflow/invoke","_kiro/workflow/load","_kiro/workflow/inspect","_kiro/workflow/list","_kiro/workflow/pause","_kiro/workflow/cancel","_kiro/workflow/delete","_kiro/workflow/listRecipes","_kiro/workflow/listWatchHandlers","_kiro/workflow/resumeAll","_kiro/workflow/retry","_kiro/workflow/update","_kiro/workflow/resume","_kiro/sourceProviders/list","_kiro/sourceProviders/listResources"],"sessionSources":["local","remote"],"sessionListScopes":["workspace","user"],"executionTargets":["local","cloud-sandbox"],"sourceProviders":true,"replayMarking":true}}},"authMethods":[{"id":"aws-builder-id","name":"AWS Builder ID"},{"id":"aws-iam-identity-center","name":"AWS IAM Identity Center"}]}}}
 {"type":"expect_outbound","label":"request:session/new","frame":{"kind":"request","method":"session/new","params":{"cwd":"<workspace>","mcpServers":"<any>"}}}
 {"type":"emit_inbound","label":"notification:session/update:available_commands_update","frame":{"kind":"notification","method":"session/update","params":{"sessionId":"sess_00000000-0000-4000-8000-000000000001","update":{"sessionUpdate":"available_commands_update","availableCommands":[{"name":"architecture-selection","description":"Steering: architecture-selection","input":{"hint":"optional context"},"_meta":{"kiro":{"type":"steering","contextQuery":"global:architecture-selection","commandId":"architecture-selection","resource":{"resourceType":"steering","source":{"origin":"bundled"}},"originalName":"architecture-selection"}}},{"name":"quick-spec","description":"Steering: quick-spec","input":{"hint":"optional context"},"_meta":{"kiro":{"type":"steering","contextQuery":"global:quick-spec","commandId":"quick-spec","resource":{"resourceType":"steering","source":{"origin":"bundled"}},"originalName":"quick-spec"}}},{"name":"bug-fix","description":"Steering: bug-fix","input":{"hint":"optional context"},"_meta":{"kiro":{"type":"steering","contextQuery":"global:bug-fix","commandId":"bug-fix","resource":{"resourceType":"steering","source":{"origin":"bundled"}},"originalName":"bug-fix"}}},{"name":"general-task-execution","description":"General-purpose sub-agent with access to all tools for executing arbitrary tasks","input":{"hint":"task to delegate"},"_meta":{"kiro":{"type":"custom-agent","commandId":"general-task-execution","resource":{"resourceType":"agent","source":{"origin":"bundled"}},"originalName":"general-task-execution"}}},{"name":"context-gatherer","description":"Investigates the codebase to answer a specific question about it. Deeply analyzes existing code by tracing execution paths, mapping architecture and abstraction layers, understanding patterns, and documenting dependencies, returning a thorough, direct written analysis that explains how the relevant code works and points to the specific files and lines involved. Use it to understand code before you change it: before designing or implementing a change to code you don't already fully understand, start with context-gatherer so your edits are grounded in how the code actually works. When a task requires understanding code you don't already know, dispatch context-gatherer to do that exploration before running your own searches or reads. Rules: 1. Provide a clear, specific prompt that includes your intent: a detailed task description of the context you need and what you're trying to accomplish. 2. The subagent explores the codebase and returns an analysis of your query 3. Trust the returned results. You may still inspect additional code yourself when you need context beyond what was returned. 4. Reuse existing context-gatherer output for related follow-up questions; do not re-invoke on the same question with different phrasing. 5. For multiple distinct questions, dispatch several context-gatherers in parallel, each targeting a different aspect of the codebase.","input":{"hint":"task to delegate"},"_meta":{"kiro":{"type":"custom-agent","commandId":"context-gatherer","resource":{"resourceType":"agent","source":{"origin":"bundled"}},"originalName":"context-gatherer"}}}]}}}}
@@ -39,7 +39,7 @@
 {"type":"emit_inbound","label":"response:session/prompt","frame":{"kind":"response","method":"session/prompt","result":{"stopReason":"end_turn"}}}
 {"type":"emit_inbound","label":"notification:session/update:session_info_update","frame":{"kind":"notification","method":"session/update","params":{"sessionId":"sess_00000000-0000-4000-8000-000000000001","update":{"sessionUpdate":"session_info_update","_meta":{"kiro":{"contextUsage":{"usagePercentage":9.52649974822998},"breakdown":{"contextFiles":{"tokens":0,"percent":0,"items":[]},"tools":{"tokens":5481,"percent":0.5,"mcp":{"tokens":0,"percent":0},"builtin":{"tokens":5481,"percent":0.5}},"memory":{"tokens":0,"percent":0},"kiroResponses":{"tokens":10,"percent":0.1},"yourPrompts":{"tokens":778,"percent":8.9},"sessionFiles":{"tokens":0,"percent":0,"items":[]}},"kind":"context_usage","usagePercentage":9.52649974822998}}}}}}
 {"type":"runtime_exit","status":"success"}
-{"type":"expect_outbound","label":"request:initialize","frame":{"kind":"request","method":"initialize","params":{"protocolVersion":2,"info":"<any>","capabilities":"<any>","clientCapabilities":{"fs":{"readTextFile":false,"writeTextFile":false},"terminal":false,"session":{"notices":{}},"elicitation":{"form":{}},"_meta":{"kiro":{"hooks":{"enabled":true,"v2":true}}}},"clientInfo":"<any>"}}}
+{"type":"expect_outbound","label":"request:initialize","frame":{"kind":"request","method":"initialize","params":{"protocolVersion":2,"info":"<any>","capabilities":"<any>","clientCapabilities":{"fs":{"readTextFile":false,"writeTextFile":false},"terminal":false,"session":{"notices":{},"compaction":{}},"elicitation":{"form":{}},"_meta":{"kiro":{"hooks":{"enabled":true,"v2":true}}}},"clientInfo":"<any>"}}}
 {"type":"emit_inbound","label":"response:initialize","frame":{"kind":"response","method":"initialize","result":{"protocolVersion":2,"agentCapabilities":{"loadSession":true,"promptCapabilities":{"image":true,"embeddedContext":true},"mcpCapabilities":{"http":true,"sse":true},"sessionCapabilities":{"list":{},"close":{},"delete":{},"fork":{"_meta":{"kiro":{"messageId":true}}}},"_meta":{"kiro":{"checkpoints":true,"sessionList":true,"policyNotifications":true,"extensionMethods":["_kiro/knowledge","_kiro/memory/list","_kiro/memory/get","_kiro/memory/create","_kiro/memory/update","_kiro/memory/delete","_kiro/codeIntelligence","_kiro/session/context","_kiro/session/compact","_kiro/session/export","_kiro/session/history","_kiro/config/template","_kiro/workflow/new","_kiro/workflow/invoke","_kiro/workflow/load","_kiro/workflow/inspect","_kiro/workflow/list","_kiro/workflow/pause","_kiro/workflow/cancel","_kiro/workflow/delete","_kiro/workflow/listRecipes","_kiro/workflow/listWatchHandlers","_kiro/workflow/resumeAll","_kiro/workflow/retry","_kiro/workflow/update","_kiro/workflow/resume","_kiro/sourceProviders/list","_kiro/sourceProviders/listResources"],"sessionSources":["local","remote"],"sessionListScopes":["workspace","user"],"executionTargets":["local","cloud-sandbox"],"sourceProviders":true,"replayMarking":true}}},"authMethods":[{"id":"aws-builder-id","name":"AWS Builder ID"},{"id":"aws-iam-identity-center","name":"AWS IAM Identity Center"}]}}}
 {"type":"expect_outbound","label":"request:session/new","frame":{"kind":"request","method":"session/new","params":{"cwd":"<workspace>","mcpServers":"<any>"}}}
 {"type":"emit_inbound","label":"notification:session/update:available_commands_update","frame":{"kind":"notification","method":"session/update","params":{"sessionId":"sess_00000000-0000-4000-8000-000000000002","update":{"sessionUpdate":"available_commands_update","availableCommands":[{"name":"architecture-selection","description":"Steering: architecture-selection","input":{"hint":"optional context"},"_meta":{"kiro":{"type":"steering","contextQuery":"global:architecture-selection","commandId":"architecture-selection","resource":{"resourceType":"steering","source":{"origin":"bundled"}},"originalName":"architecture-selection"}}},{"name":"quick-spec","description":"Steering: quick-spec","input":{"hint":"optional context"},"_meta":{"kiro":{"type":"steering","contextQuery":"global:quick-spec","commandId":"quick-spec","resource":{"resourceType":"steering","source":{"origin":"bundled"}},"originalName":"quick-spec"}}},{"name":"bug-fix","description":"Steering: bug-fix","input":{"hint":"optional context"},"_meta":{"kiro":{"type":"steering","contextQuery":"global:bug-fix","commandId":"bug-fix","resource":{"resourceType":"steering","source":{"origin":"bundled"}},"originalName":"bug-fix"}}},{"name":"general-task-execution","description":"General-purpose sub-agent with access to all tools for executing arbitrary tasks","input":{"hint":"task to delegate"},"_meta":{"kiro":{"type":"custom-agent","commandId":"general-task-execution","resource":{"resourceType":"agent","source":{"origin":"bundled"}},"originalName":"general-task-execution"}}},{"name":"context-gatherer","description":"Investigates the codebase to answer a specific question about it. Deeply analyzes existing code by tracing execution paths, mapping architecture and abstraction layers, understanding patterns, and documenting dependencies, returning a thorough, direct written analysis that explains how the relevant code works and points to the specific files and lines involved. Use it to understand code before you change it: before designing or implementing a change to code you don't already fully understand, start with context-gatherer so your edits are grounded in how the code actually works. When a task requires understanding code you don't already know, dispatch context-gatherer to do that exploration before running your own searches or reads. Rules: 1. Provide a clear, specific prompt that includes your intent: a detailed task description of the context you need and what you're trying to accomplish. 2. The subagent explores the codebase and returns an analysis of your query 3. Trust the returned results. You may still inspect additional code yourself when you need context beyond what was returned. 4. Reuse existing context-gatherer output for related follow-up questions; do not re-invoke on the same question with different phrasing. 5. For multiple distinct questions, dispatch several context-gatherers in parallel, each targeting a different aspect of the codebase.","input":{"hint":"task to delegate"},"_meta":{"kiro":{"type":"custom-agent","commandId":"context-gatherer","resource":{"resourceType":"agent","source":{"origin":"bundled"}},"originalName":"context-gatherer"}}}]}}}}
diff --git a/apps/server/src/orchestration-v2/testkit/fixtures/kiro_message_steering/kiro_transcript.ndjson b/apps/server/src/orchestration-v2/testkit/fixtures/kiro_message_steering/kiro_transcript.ndjson
index 519feac99d2c..ab8f2487d5cd 100644
--- a/apps/server/src/orchestration-v2/testkit/fixtures/kiro_message_steering/kiro_transcript.ndjson
+++ b/apps/server/src/orchestration-v2/testkit/fixtures/kiro_message_steering/kiro_transcript.ndjson
@@ -1,5 +1,5 @@
 {"type":"transcript_start","provider":"kiro","protocol":"acp.ndjson-jsonrpc","version":"1","scenario":"kiro_message_steering","metadata":{"generatedBy":"live-kiro-recorder","kiroVersion":"2.33.1","normalization":"Session ids are fixed sess_ UUIDs and other UUIDs (message and request ids) are numbered in first-seen order, the workspace is <workspace>, HOME is /home/kiro-replay and the recording user is kiro-replay. T3-owned prompt text, MCP servers and initialize params other than clientCapabilities and _meta are <any>. Kiro's log directory, user-scoped commands and agents, and the _kiro/* broadcasts T3 ignores (governance, steering documents, powers, tools, hooks, MCP status, session roster) are removed. Timestamps are kept as recorded.","droppedFrames":13}}
-{"type":"expect_outbound","label":"request:initialize","frame":{"kind":"request","method":"initialize","params":{"protocolVersion":2,"info":"<any>","capabilities":"<any>","clientCapabilities":{"fs":{"readTextFile":false,"writeTextFile":false},"terminal":false,"session":{"notices":{}},"elicitation":{"form":{}},"_meta":{"kiro":{"hooks":{"enabled":true,"v2":true}}}},"clientInfo":"<any>"}}}
+{"type":"expect_outbound","label":"request:initialize","frame":{"kind":"request","method":"initialize","params":{"protocolVersion":2,"info":"<any>","capabilities":"<any>","clientCapabilities":{"fs":{"readTextFile":false,"writeTextFile":false},"terminal":false,"session":{"notices":{},"compaction":{}},"elicitation":{"form":{}},"_meta":{"kiro":{"hooks":{"enabled":true,"v2":true}}}},"clientInfo":"<any>"}}}
 {"type":"emit_inbound","label":"response:initialize","frame":{"kind":"response","method":"initialize","result":{"protocolVersion":2,"agentCapabilities":{"loadSession":true,"promptCapabilities":{"image":true,"embeddedContext":true},"mcpCapabilities":{"http":true,"sse":true},"sessionCapabilities":{"list":{},"close":{},"delete":{},"fork":{"_meta":{"kiro":{"messageId":true}}}},"_meta":{"kiro":{"checkpoints":true,"sessionList":true,"policyNotifications":true,"extensionMethods":["_kiro/knowledge","_kiro/memory/list","_kiro/memory/get","_kiro/memory/create","_kiro/memory/update","_kiro/memory/delete","_kiro/codeIntelligence","_kiro/session/context","_kiro/session/compact","_kiro/session/export","_kiro/session/history","_kiro/config/template","_kiro/workflow/new","_kiro/workflow/invoke","_kiro/workflow/load","_kiro/workflow/inspect","_kiro/workflow/list","_kiro/workflow/pause","_kiro/workflow/cancel","_kiro/workflow/delete","_kiro/workflow/listRecipes","_kiro/workflow/listWatchHandlers","_kiro/workflow/resumeAll","_kiro/workflow/retry","_kiro/workflow/update","_kiro/workflow/resume","_kiro/sourceProviders/list","_kiro/sourceProviders/listResources"],"sessionSources":["local","remote"],"sessionListScopes":["workspace","user"],"executionTargets":["local","cloud-sandbox"],"sourceProviders":true,"replayMarking":true}}},"authMethods":[{"id":"aws-builder-id","name":"AWS Builder ID"},{"id":"aws-iam-identity-center","name":"AWS IAM Identity Center"}]}}}
 {"type":"expect_outbound","label":"request:session/new","frame":{"kind":"request","method":"session/new","params":{"cwd":"<workspace>","mcpServers":"<any>"}}}
 {"type":"emit_inbound","label":"notification:session/update:available_commands_update","frame":{"kind":"notification","method":"session/update","params":{"sessionId":"sess_00000000-0000-4000-8000-000000000001","update":{"sessionUpdate":"available_commands_update","availableCommands":[{"name":"architecture-selection","description":"Steering: architecture-selection","input":{"hint":"optional context"},"_meta":{"kiro":{"type":"steering","contextQuery":"global:architecture-selection","commandId":"architecture-selection","resource":{"resourceType":"steering","source":{"origin":"bundled"}},"originalName":"architecture-selection"}}},{"name":"quick-spec","description":"Steering: quick-spec","input":{"hint":"optional context"},"_meta":{"kiro":{"type":"steering","contextQuery":"global:quick-spec","commandId":"quick-spec","resource":{"resourceType":"steering","source":{"origin":"bundled"}},"originalName":"quick-spec"}}},{"name":"bug-fix","description":"Steering: bug-fix","input":{"hint":"optional context"},"_meta":{"kiro":{"type":"steering","contextQuery":"global:bug-fix","commandId":"bug-fix","resource":{"resourceType":"steering","source":{"origin":"bundled"}},"originalName":"bug-fix"}}},{"name":"general-task-execution","description":"General-purpose sub-agent with access to all tools for executing arbitrary tasks","input":{"hint":"task to delegate"},"_meta":{"kiro":{"type":"custom-agent","commandId":"general-task-execution","resource":{"resourceType":"agent","source":{"origin":"bundled"}},"originalName":"general-task-execution"}}},{"name":"context-gatherer","description":"Investigates the codebase to answer a specific question about it. Deeply analyzes existing code by tracing execution paths, mapping architecture and abstraction layers, understanding patterns, and documenting dependencies, returning a thorough, direct written analysis that explains how the relevant code works and points to the specific files and lines involved. Use it to understand code before you change it: before designing or implementing a change to code you don't already fully understand, start with context-gatherer so your edits are grounded in how the code actually works. When a task requires understanding code you don't already know, dispatch context-gatherer to do that exploration before running your own searches or reads. Rules: 1. Provide a clear, specific prompt that includes your intent: a detailed task description of the context you need and what you're trying to accomplish. 2. The subagent explores the codebase and returns an analysis of your query 3. Trust the returned results. You may still inspect additional code yourself when you need context beyond what was returned. 4. Reuse existing context-gatherer output for related follow-up questions; do not re-invoke on the same question with different phrasing. 5. For multiple distinct questions, dispatch several context-gatherers in parallel, each targeting a different aspect of the codebase.","input":{"hint":"task to delegate"},"_meta":{"kiro":{"type":"custom-agent","commandId":"context-gatherer","resource":{"resourceType":"agent","source":{"origin":"bundled"}},"originalName":"context-gatherer"}}}]}}}}
diff --git a/apps/server/src/orchestration-v2/testkit/fixtures/kiro_model_switch/kiro_transcript.ndjson b/apps/server/src/orchestration-v2/testkit/fixtures/kiro_model_switch/kiro_transcript.ndjson
index da3fd0222295..4e2ee42e7fcb 100644
--- a/apps/server/src/orchestration-v2/testkit/fixtures/kiro_model_switch/kiro_transcript.ndjson
+++ b/apps/server/src/orchestration-v2/testkit/fixtures/kiro_model_switch/kiro_transcript.ndjson
@@ -1,5 +1,5 @@
 {"type":"transcript_start","provider":"kiro","protocol":"acp.ndjson-jsonrpc","version":"1","scenario":"kiro_model_switch","metadata":{"generatedBy":"live-kiro-recorder","kiroVersion":"2.32.0","normalization":"Session ids are fixed sess_ UUIDs and other UUIDs (message and request ids) are numbered in first-seen order, the workspace is <workspace>, HOME is /home/kiro-replay and the recording user is kiro-replay. T3-owned prompt text, MCP servers and initialize params other than clientCapabilities and _meta are <any>. Kiro's log directory, user-scoped commands and agents, and the _kiro/* broadcasts T3 ignores (governance, steering documents, powers, tools, hooks, MCP status, session roster) are removed. Timestamps are kept as recorded.","droppedFrames":15}}
-{"type":"expect_outbound","label":"request:initialize","frame":{"kind":"request","method":"initialize","params":{"protocolVersion":2,"info":"<any>","capabilities":"<any>","clientCapabilities":{"fs":{"readTextFile":false,"writeTextFile":false},"terminal":false,"session":{"notices":{}},"elicitation":{"form":{}},"_meta":{"kiro":{"hooks":{"enabled":true,"v2":true}}}},"clientInfo":"<any>"}}}
+{"type":"expect_outbound","label":"request:initialize","frame":{"kind":"request","method":"initialize","params":{"protocolVersion":2,"info":"<any>","capabilities":"<any>","clientCapabilities":{"fs":{"readTextFile":false,"writeTextFile":false},"terminal":false,"session":{"notices":{},"compaction":{}},"elicitation":{"form":{}},"_meta":{"kiro":{"hooks":{"enabled":true,"v2":true}}}},"clientInfo":"<any>"}}}
 {"type":"emit_inbound","label":"response:initialize","frame":{"kind":"response","method":"initialize","result":{"protocolVersion":2,"agentCapabilities":{"loadSession":true,"promptCapabilities":{"image":true,"embeddedContext":true},"mcpCapabilities":{"http":true,"sse":true},"sessionCapabilities":{"list":{},"close":{},"delete":{},"fork":{"_meta":{"kiro":{"messageId":true}}}},"_meta":{"kiro":{"checkpoints":true,"sessionList":true,"policyNotifications":true,"extensionMethods":["_kiro/knowledge","_kiro/memory/list","_kiro/memory/get","_kiro/memory/create","_kiro/memory/update","_kiro/memory/delete","_kiro/codeIntelligence","_kiro/session/context","_kiro/session/compact","_kiro/session/export","_kiro/session/history","_kiro/config/template","_kiro/workflow/new","_kiro/workflow/invoke","_kiro/workflow/load","_kiro/workflow/inspect","_kiro/workflow/list","_kiro/workflow/pause","_kiro/workflow/cancel","_kiro/workflow/delete","_kiro/workflow/listRecipes","_kiro/workflow/listWatchHandlers","_kiro/workflow/resumeAll","_kiro/workflow/retry","_kiro/workflow/update","_kiro/workflow/resume","_kiro/sourceProviders/list","_kiro/sourceProviders/listResources"],"sessionSources":["local","remote"],"sessionListScopes":["workspace","user"],"executionTargets":["local","cloud-sandbox"],"sourceProviders":true,"replayMarking":true}}},"authMethods":[{"id":"aws-builder-id","name":"AWS Builder ID"},{"id":"aws-iam-identity-center","name":"AWS IAM Identity Center"}]}}}
 {"type":"expect_outbound","label":"request:session/new","frame":{"kind":"request","method":"session/new","params":{"cwd":"<workspace>","mcpServers":"<any>"}}}
 {"type":"emit_inbound","label":"notification:session/update:available_commands_update","frame":{"kind":"notification","method":"session/update","params":{"sessionId":"sess_00000000-0000-4000-8000-000000000001","update":{"sessionUpdate":"available_commands_update","availableCommands":[{"name":"architecture-selection","description":"Steering: architecture-selection","input":{"hint":"optional context"},"_meta":{"kiro":{"type":"steering","contextQuery":"global:architecture-selection","commandId":"architecture-selection","resource":{"resourceType":"steering","source":{"origin":"bundled"}},"originalName":"architecture-selection"}}},{"name":"quick-spec","description":"Steering: quick-spec","input":{"hint":"optional context"},"_meta":{"kiro":{"type":"steering","contextQuery":"global:quick-spec","commandId":"quick-spec","resource":{"resourceType":"steering","source":{"origin":"bundled"}},"originalName":"quick-spec"}}},{"name":"bug-fix","description":"Steering: bug-fix","input":{"hint":"optional context"},"_meta":{"kiro":{"type":"steering","contextQuery":"global:bug-fix","commandId":"bug-fix","resource":{"resourceType":"steering","source":{"origin":"bundled"}},"originalName":"bug-fix"}}},{"name":"general-task-execution","description":"General-purpose sub-agent with access to all tools for executing arbitrary tasks","input":{"hint":"task to delegate"},"_meta":{"kiro":{"type":"custom-agent","commandId":"general-task-execution","resource":{"resourceType":"agent","source":{"origin":"bundled"}},"originalName":"general-task-execution"}}},{"name":"context-gatherer","description":"Investigates the codebase to answer a specific question about it. Deeply analyzes existing code by tracing execution paths, mapping architecture and abstraction layers, understanding patterns, and documenting dependencies, returning a thorough, direct written analysis that explains how the relevant code works and points to the specific files and lines involved. Use it to understand code before you change it: before designing or implementing a change to code you don't already fully understand, start with context-gatherer so your edits are grounded in how the code actually works. When a task requires understanding code you don't already know, dispatch context-gatherer to do that exploration before running your own searches or reads. Rules: 1. Provide a clear, specific prompt that includes your intent: a detailed task description of the context you need and what you're trying to accomplish. 2. The subagent explores the codebase and returns an analysis of your query 3. Trust the returned results. You may still inspect additional code yourself when you need context beyond what was returned. 4. Reuse existing context-gatherer output for related follow-up questions; do not re-invoke on the same question with different phrasing. 5. For multiple distinct questions, dispatch several context-gatherers in parallel, each targeting a different aspect of the codebase.","input":{"hint":"task to delegate"},"_meta":{"kiro":{"type":"custom-agent","commandId":"context-gatherer","resource":{"resourceType":"agent","source":{"origin":"bundled"}},"originalName":"context-gatherer"}}}]}}}}
diff --git a/apps/server/src/orchestration-v2/testkit/fixtures/kiro_permission_modes/kiro_full_access_transcript.ndjson b/apps/server/src/orchestration-v2/testkit/fixtures/kiro_permission_modes/kiro_full_access_transcript.ndjson
index 05a5adb1f805..bfd39789b803 100644
--- a/apps/server/src/orchestration-v2/testkit/fixtures/kiro_permission_modes/kiro_full_access_transcript.ndjson
+++ b/apps/server/src/orchestration-v2/testkit/fixtures/kiro_permission_modes/kiro_full_access_transcript.ndjson
@@ -1,5 +1,5 @@
 {"type":"transcript_start","provider":"kiro","protocol":"acp.ndjson-jsonrpc","version":"1","scenario":"kiro_full_access_write","metadata":{"generatedBy":"live-kiro-recorder","kiroVersion":"2.32.0","normalization":"Session ids are fixed sess_ UUIDs and other UUIDs (message and request ids) are numbered in first-seen order, the workspace is <workspace>, HOME is /home/kiro-replay and the recording user is kiro-replay. T3-owned prompt text, MCP servers and initialize params other than clientCapabilities and _meta are <any>. Kiro's log directory, user-scoped commands and agents, and the _kiro/* broadcasts T3 ignores (governance, steering documents, powers, tools, hooks, MCP status, session roster) are removed. Timestamps are kept as recorded.","droppedFrames":13}}
-{"type":"expect_outbound","label":"request:initialize","frame":{"kind":"request","method":"initialize","params":{"protocolVersion":2,"info":"<any>","capabilities":"<any>","clientCapabilities":{"fs":{"readTextFile":false,"writeTextFile":false},"terminal":false,"session":{"notices":{}},"elicitation":{"form":{}},"_meta":{"kiro":{"hooks":{"enabled":true,"v2":true}}}},"clientInfo":"<any>"}}}
+{"type":"expect_outbound","label":"request:initialize","frame":{"kind":"request","method":"initialize","params":{"protocolVersion":2,"info":"<any>","capabilities":"<any>","clientCapabilities":{"fs":{"readTextFile":false,"writeTextFile":false},"terminal":false,"session":{"notices":{},"compaction":{}},"elicitation":{"form":{}},"_meta":{"kiro":{"hooks":{"enabled":true,"v2":true}}}},"clientInfo":"<any>"}}}
 {"type":"emit_inbound","label":"response:initialize","frame":{"kind":"response","method":"initialize","result":{"protocolVersion":2,"agentCapabilities":{"loadSession":true,"promptCapabilities":{"image":true,"embeddedContext":true},"mcpCapabilities":{"http":true,"sse":true},"sessionCapabilities":{"list":{},"close":{},"delete":{},"fork":{"_meta":{"kiro":{"messageId":true}}}},"_meta":{"kiro":{"checkpoints":true,"sessionList":true,"policyNotifications":true,"extensionMethods":["_kiro/knowledge","_kiro/memory/list","_kiro/memory/get","_kiro/memory/create","_kiro/memory/update","_kiro/memory/delete","_kiro/codeIntelligence","_kiro/session/context","_kiro/session/compact","_kiro/session/export","_kiro/session/history","_kiro/config/template","_kiro/workflow/new","_kiro/workflow/invoke","_kiro/workflow/load","_kiro/workflow/inspect","_kiro/workflow/list","_kiro/workflow/pause","_kiro/workflow/cancel","_kiro/workflow/delete","_kiro/workflow/listRecipes","_kiro/workflow/listWatchHandlers","_kiro/workflow/resumeAll","_kiro/workflow/retry","_kiro/workflow/update","_kiro/workflow/resume","_kiro/sourceProviders/list","_kiro/sourceProviders/listResources"],"sessionSources":["local","remote"],"sessionListScopes":["workspace","user"],"executionTargets":["local","cloud-sandbox"],"sourceProviders":true,"replayMarking":true}}},"authMethods":[{"id":"aws-builder-id","name":"AWS Builder ID"},{"id":"aws-iam-identity-center","name":"AWS IAM Identity Center"}]}}}
 {"type":"expect_outbound","label":"request:session/new","frame":{"kind":"request","method":"session/new","params":{"cwd":"<workspace>","mcpServers":"<any>"}}}
 {"type":"emit_inbound","label":"notification:session/update:available_commands_update","frame":{"kind":"notification","method":"session/update","params":{"sessionId":"sess_00000000-0000-4000-8000-000000000001","update":{"sessionUpdate":"available_commands_update","availableCommands":[{"name":"architecture-selection","description":"Steering: architecture-selection","input":{"hint":"optional context"},"_meta":{"kiro":{"type":"steering","contextQuery":"global:architecture-selection","commandId":"architecture-selection","resource":{"resourceType":"steering","source":{"origin":"bundled"}},"originalName":"architecture-selection"}}},{"name":"quick-spec","description":"Steering: quick-spec","input":{"hint":"optional context"},"_meta":{"kiro":{"type":"steering","contextQuery":"global:quick-spec","commandId":"quick-spec","resource":{"resourceType":"steering","source":{"origin":"bundled"}},"originalName":"quick-spec"}}},{"name":"bug-fix","description":"Steering: bug-fix","input":{"hint":"optional context"},"_meta":{"kiro":{"type":"steering","contextQuery":"global:bug-fix","commandId":"bug-fix","resource":{"resourceType":"steering","source":{"origin":"bundled"}},"originalName":"bug-fix"}}},{"name":"general-task-execution","description":"General-purpose sub-agent with access to all tools for executing arbitrary tasks","input":{"hint":"task to delegate"},"_meta":{"kiro":{"type":"custom-agent","commandId":"general-task-execution","resource":{"resourceType":"agent","source":{"origin":"bundled"}},"originalName":"general-task-execution"}}},{"name":"context-gatherer","description":"Investigates the codebase to answer a specific question about it. Deeply analyzes existing code by tracing execution paths, mapping architecture and abstraction layers, understanding patterns, and documenting dependencies, returning a thorough, direct written analysis that explains how the relevant code works and points to the specific files and lines involved. Use it to understand code before you change it: before designing or implementing a change to code you don't already fully understand, start with context-gatherer so your edits are grounded in how the code actually works. When a task requires understanding code you don't already know, dispatch context-gatherer to do that exploration before running your own searches or reads. Rules: 1. Provide a clear, specific prompt that includes your intent: a detailed task description of the context you need and what you're trying to accomplish. 2. The subagent explores the codebase and returns an analysis of your query 3. Trust the returned results. You may still inspect additional code yourself when you need context beyond what was returned. 4. Reuse existing context-gatherer output for related follow-up questions; do not re-invoke on the same question with different phrasing. 5. For multiple distinct questions, dispatch several context-gatherers in parallel, each targeting a different aspect of the codebase.","input":{"hint":"task to delegate"},"_meta":{"kiro":{"type":"custom-agent","commandId":"context-gatherer","resource":{"resourceType":"agent","source":{"origin":"bundled"}},"originalName":"context-gatherer"}}}]}}}}
diff --git a/apps/server/src/orchestration-v2/testkit/fixtures/kiro_permission_modes/kiro_supervised_transcript.ndjson b/apps/server/src/orchestration-v2/testkit/fixtures/kiro_permission_modes/kiro_supervised_transcript.ndjson
index fa569a6db304..2fa2801971cc 100644
--- a/apps/server/src/orchestration-v2/testkit/fixtures/kiro_permission_modes/kiro_supervised_transcript.ndjson
+++ b/apps/server/src/orchestration-v2/testkit/fixtures/kiro_permission_modes/kiro_supervised_transcript.ndjson
@@ -1,5 +1,5 @@
 {"type":"transcript_start","provider":"kiro","protocol":"acp.ndjson-jsonrpc","version":"1","scenario":"kiro_supervised_write","metadata":{"generatedBy":"live-kiro-recorder","kiroVersion":"2.32.0","normalization":"Session ids are fixed sess_ UUIDs and other UUIDs (message and request ids) are numbered in first-seen order, the workspace is <workspace>, HOME is /home/kiro-replay and the recording user is kiro-replay. T3-owned prompt text, MCP servers and initialize params other than clientCapabilities and _meta are <any>. Kiro's log directory, user-scoped commands and agents, and the _kiro/* broadcasts T3 ignores (governance, steering documents, powers, tools, hooks, MCP status, session roster) are removed. Timestamps are kept as recorded.","droppedFrames":13}}
-{"type":"expect_outbound","label":"request:initialize","frame":{"kind":"request","method":"initialize","params":{"protocolVersion":2,"info":"<any>","capabilities":"<any>","clientCapabilities":{"fs":{"readTextFile":false,"writeTextFile":false},"terminal":false,"session":{"notices":{}},"elicitation":{"form":{}},"_meta":{"kiro":{"hooks":{"enabled":true,"v2":true}}}},"clientInfo":"<any>"}}}
+{"type":"expect_outbound","label":"request:initialize","frame":{"kind":"request","method":"initialize","params":{"protocolVersion":2,"info":"<any>","capabilities":"<any>","clientCapabilities":{"fs":{"readTextFile":false,"writeTextFile":false},"terminal":false,"session":{"notices":{},"compaction":{}},"elicitation":{"form":{}},"_meta":{"kiro":{"hooks":{"enabled":true,"v2":true}}}},"clientInfo":"<any>"}}}
 {"type":"emit_inbound","label":"response:initialize","frame":{"kind":"response","method":"initialize","result":{"protocolVersion":2,"agentCapabilities":{"loadSession":true,"promptCapabilities":{"image":true,"embeddedContext":true},"mcpCapabilities":{"http":true,"sse":true},"sessionCapabilities":{"list":{},"close":{},"delete":{},"fork":{"_meta":{"kiro":{"messageId":true}}}},"_meta":{"kiro":{"checkpoints":true,"sessionList":true,"policyNotifications":true,"extensionMethods":["_kiro/knowledge","_kiro/memory/list","_kiro/memory/get","_kiro/memory/create","_kiro/memory/update","_kiro/memory/delete","_kiro/codeIntelligence","_kiro/session/context","_kiro/session/compact","_kiro/session/export","_kiro/session/history","_kiro/config/template","_kiro/workflow/new","_kiro/workflow/invoke","_kiro/workflow/load","_kiro/workflow/inspect","_kiro/workflow/list","_kiro/workflow/pause","_kiro/workflow/cancel","_kiro/workflow/delete","_kiro/workflow/listRecipes","_kiro/workflow/listWatchHandlers","_kiro/workflow/resumeAll","_kiro/workflow/retry","_kiro/workflow/update","_kiro/workflow/resume","_kiro/sourceProviders/list","_kiro/sourceProviders/listResources"],"sessionSources":["local","remote"],"sessionListScopes":["workspace","user"],"executionTargets":["local","cloud-sandbox"],"sourceProviders":true,"replayMarking":true}}},"authMethods":[{"id":"aws-builder-id","name":"AWS Builder ID"},{"id":"aws-iam-identity-center","name":"AWS IAM Identity Center"}]}}}
 {"type":"expect_outbound","label":"request:session/new","frame":{"kind":"request","method":"session/new","params":{"cwd":"<workspace>","mcpServers":"<any>"}}}
 {"type":"emit_inbound","label":"notification:session/update:available_commands_update","frame":{"kind":"notification","method":"session/update","params":{"sessionId":"sess_00000000-0000-4000-8000-000000000001","update":{"sessionUpdate":"available_commands_update","availableCommands":[{"name":"architecture-selection","description":"Steering: architecture-selection","input":{"hint":"optional context"},"_meta":{"kiro":{"type":"steering","contextQuery":"global:architecture-selection","commandId":"architecture-selection","resource":{"resourceType":"steering","source":{"origin":"bundled"}},"originalName":"architecture-selection"}}},{"name":"quick-spec","description":"Steering: quick-spec","input":{"hint":"optional context"},"_meta":{"kiro":{"type":"steering","contextQuery":"global:quick-spec","commandId":"quick-spec","resource":{"resourceType":"steering","source":{"origin":"bundled"}},"originalName":"quick-spec"}}},{"name":"bug-fix","description":"Steering: bug-fix","input":{"hint":"optional context"},"_meta":{"kiro":{"type":"steering","contextQuery":"global:bug-fix","commandId":"bug-fix","resource":{"resourceType":"steering","source":{"origin":"bundled"}},"originalName":"bug-fix"}}},{"name":"general-task-execution","description":"General-purpose sub-agent with access to all tools for executing arbitrary tasks","input":{"hint":"task to delegate"},"_meta":{"kiro":{"type":"custom-agent","commandId":"general-task-execution","resource":{"resourceType":"agent","source":{"origin":"bundled"}},"originalName":"general-task-execution"}}},{"name":"context-gatherer","description":"Investigates the codebase to answer a specific question about it. Deeply analyzes existing code by tracing execution paths, mapping architecture and abstraction layers, understanding patterns, and documenting dependencies, returning a thorough, direct written analysis that explains how the relevant code works and points to the specific files and lines involved. Use it to understand code before you change it: before designing or implementing a change to code you don't already fully understand, start with context-gatherer so your edits are grounded in how the code actually works. When a task requires understanding code you don't already know, dispatch context-gatherer to do that exploration before running your own searches or reads. Rules: 1. Provide a clear, specific prompt that includes your intent: a detailed task description of the context you need and what you're trying to accomplish. 2. The subagent explores the codebase and returns an analysis of your query 3. Trust the returned results. You may still inspect additional code yourself when you need context beyond what was returned. 4. Reuse existing context-gatherer output for related follow-up questions; do not re-invoke on the same question with different phrasing. 5. For multiple distinct questions, dispatch several context-gatherers in parallel, each targeting a different aspect of the codebase.","input":{"hint":"task to delegate"},"_meta":{"kiro":{"type":"custom-agent","commandId":"context-gatherer","resource":{"resourceType":"agent","source":{"origin":"bundled"}},"originalName":"context-gatherer"}}}]}}}}
diff --git a/apps/server/src/orchestration-v2/testkit/fixtures/kiro_subagent_interrupt/kiro_transcript.ndjson b/apps/server/src/orchestration-v2/testkit/fixtures/kiro_subagent_interrupt/kiro_transcript.ndjson
index 65151441473e..668ea320bfe3 100644
--- a/apps/server/src/orchestration-v2/testkit/fixtures/kiro_subagent_interrupt/kiro_transcript.ndjson
+++ b/apps/server/src/orchestration-v2/testkit/fixtures/kiro_subagent_interrupt/kiro_transcript.ndjson
@@ -1,5 +1,5 @@
 {"type":"transcript_start","provider":"kiro","protocol":"acp.ndjson-jsonrpc","version":"1","scenario":"kiro_subagent_interrupt","metadata":{"generatedBy":"live-kiro-recorder","kiroVersion":"2.33.1","normalization":"Session ids are fixed sess_ UUIDs and other UUIDs (message and request ids) are numbered in first-seen order, the workspace is <workspace>, HOME is /home/kiro-replay and the recording user is kiro-replay. T3-owned prompt text, MCP servers and initialize params other than clientCapabilities and _meta are <any>. Kiro's log directory, user-scoped commands and agents, and the _kiro/* broadcasts T3 ignores (governance, steering documents, powers, tools, hooks, MCP status, session roster) are removed. Timestamps are kept as recorded.","droppedFrames":13}}
-{"type":"expect_outbound","label":"request:initialize","frame":{"kind":"request","method":"initialize","params":{"protocolVersion":2,"info":"<any>","capabilities":"<any>","clientCapabilities":{"fs":{"readTextFile":false,"writeTextFile":false},"terminal":false,"session":{"notices":{}},"elicitation":{"form":{}},"_meta":{"kiro":{"hooks":{"enabled":true,"v2":true}}}},"clientInfo":"<any>"}}}
+{"type":"expect_outbound","label":"request:initialize","frame":{"kind":"request","method":"initialize","params":{"protocolVersion":2,"info":"<any>","capabilities":"<any>","clientCapabilities":{"fs":{"readTextFile":false,"writeTextFile":false},"terminal":false,"session":{"notices":{},"compaction":{}},"elicitation":{"form":{}},"_meta":{"kiro":{"hooks":{"enabled":true,"v2":true}}}},"clientInfo":"<any>"}}}
 {"type":"emit_inbound","label":"response:initialize","frame":{"kind":"response","method":"initialize","result":{"protocolVersion":2,"agentCapabilities":{"loadSession":true,"promptCapabilities":{"image":true,"embeddedContext":true},"mcpCapabilities":{"http":true,"sse":true},"sessionCapabilities":{"list":{},"close":{},"delete":{},"fork":{"_meta":{"kiro":{"messageId":true}}}},"_meta":{"kiro":{"checkpoints":true,"sessionList":true,"policyNotifications":true,"extensionMethods":["_kiro/knowledge","_kiro/memory/list","_kiro/memory/get","_kiro/memory/create","_kiro/memory/update","_kiro/memory/delete","_kiro/codeIntelligence","_kiro/session/context","_kiro/session/compact","_kiro/session/export","_kiro/session/history","_kiro/config/template","_kiro/workflow/new","_kiro/workflow/invoke","_kiro/workflow/load","_kiro/workflow/inspect","_kiro/workflow/list","_kiro/workflow/pause","_kiro/workflow/cancel","_kiro/workflow/delete","_kiro/workflow/listRecipes","_kiro/workflow/listWatchHandlers","_kiro/workflow/resumeAll","_kiro/workflow/retry","_kiro/workflow/update","_kiro/workflow/resume","_kiro/sourceProviders/list","_kiro/sourceProviders/listResources"],"sessionSources":["local","remote"],"sessionListScopes":["workspace","user"],"executionTargets":["local","cloud-sandbox"],"sourceProviders":true,"replayMarking":true}}},"authMethods":[{"id":"aws-builder-id","name":"AWS Builder ID"},{"id":"aws-iam-identity-center","name":"AWS IAM Identity Center"}]}}}
 {"type":"expect_outbound","label":"request:session/new","frame":{"kind":"request","method":"session/new","params":{"cwd":"<workspace>","mcpServers":"<any>"}}}
 {"type":"emit_inbound","label":"notification:session/update:available_commands_update","frame":{"kind":"notification","method":"session/update","params":{"sessionId":"sess_00000000-0000-4000-8000-000000000001","update":{"sessionUpdate":"available_commands_update","availableCommands":[{"name":"architecture-selection","description":"Steering: architecture-selection","input":{"hint":"optional context"},"_meta":{"kiro":{"type":"steering","contextQuery":"global:architecture-selection","commandId":"architecture-selection","resource":{"resourceType":"steering","source":{"origin":"bundled"}},"originalName":"architecture-selection"}}},{"name":"quick-spec","description":"Steering: quick-spec","input":{"hint":"optional context"},"_meta":{"kiro":{"type":"steering","contextQuery":"global:quick-spec","commandId":"quick-spec","resource":{"resourceType":"steering","source":{"origin":"bundled"}},"originalName":"quick-spec"}}},{"name":"bug-fix","description":"Steering: bug-fix","input":{"hint":"optional context"},"_meta":{"kiro":{"type":"steering","contextQuery":"global:bug-fix","commandId":"bug-fix","resource":{"resourceType":"steering","source":{"origin":"bundled"}},"originalName":"bug-fix"}}},{"name":"general-task-execution","description":"General-purpose sub-agent with access to all tools for executing arbitrary tasks","input":{"hint":"task to delegate"},"_meta":{"kiro":{"type":"custom-agent","commandId":"general-task-execution","resource":{"resourceType":"agent","source":{"origin":"bundled"}},"originalName":"general-task-execution"}}},{"name":"context-gatherer","description":"Investigates the codebase to answer a specific question about it. Deeply analyzes existing code by tracing execution paths, mapping architecture and abstraction layers, understanding patterns, and documenting dependencies, returning a thorough, direct written analysis that explains how the relevant code works and points to the specific files and lines involved. Use it to understand code before you change it: before designing or implementing a change to code you don't already fully understand, start with context-gatherer so your edits are grounded in how the code actually works. When a task requires understanding code you don't already know, dispatch context-gatherer to do that exploration before running your own searches or reads. Rules: 1. Provide a clear, specific prompt that includes your intent: a detailed task description of the context you need and what you're trying to accomplish. 2. The subagent explores the codebase and returns an analysis of your query 3. Trust the returned results. You may still inspect additional code yourself when you need context beyond what was returned. 4. Reuse existing context-gatherer output for related follow-up questions; do not re-invoke on the same question with different phrasing. 5. For multiple distinct questions, dispatch several context-gatherers in parallel, each targeting a different aspect of the codebase.","input":{"hint":"task to delegate"},"_meta":{"kiro":{"type":"custom-agent","commandId":"context-gatherer","resource":{"resourceType":"agent","source":{"origin":"bundled"}},"originalName":"context-gatherer"}}}]}}}}
diff --git a/apps/server/src/orchestration-v2/testkit/fixtures/kiro_unknown_model/kiro_transcript.ndjson b/apps/server/src/orchestration-v2/testkit/fixtures/kiro_unknown_model/kiro_transcript.ndjson
index 0ec466156adf..2391a749b7e8 100644
--- a/apps/server/src/orchestration-v2/testkit/fixtures/kiro_unknown_model/kiro_transcript.ndjson
+++ b/apps/server/src/orchestration-v2/testkit/fixtures/kiro_unknown_model/kiro_transcript.ndjson
@@ -1,5 +1,5 @@
 {"type":"transcript_start","provider":"kiro","protocol":"acp.ndjson-jsonrpc","version":"1","scenario":"kiro_unknown_model","metadata":{"generatedBy":"live-kiro-recorder","kiroVersion":"2.27.0","normalization":"Session ids are fixed sess_ UUIDs and other UUIDs (message and request ids) are numbered in first-seen order, the workspace is <workspace>, HOME is /home/kiro-replay and the recording user is kiro-replay. T3-owned prompt text, MCP servers and initialize params other than clientCapabilities and _meta are <any>. Kiro's log directory, user-scoped commands and agents, and the _kiro/* broadcasts T3 ignores (governance, steering documents, powers, tools, MCP status, session roster) are removed. Timestamps are kept as recorded.","droppedFrames":14}}
-{"type":"expect_outbound","label":"request:initialize","frame":{"kind":"request","method":"initialize","params":{"protocolVersion":2,"info":"<any>","capabilities":"<any>","clientCapabilities":{"fs":{"readTextFile":false,"writeTextFile":false},"terminal":false,"session":{"notices":{}},"elicitation":{"form":{}},"_meta":{"kiro":{"hooks":{"enabled":true,"v2":true}}}},"clientInfo":"<any>"}}}
+{"type":"expect_outbound","label":"request:initialize","frame":{"kind":"request","method":"initialize","params":{"protocolVersion":2,"info":"<any>","capabilities":"<any>","clientCapabilities":{"fs":{"readTextFile":false,"writeTextFile":false},"terminal":false,"session":{"notices":{},"compaction":{}},"elicitation":{"form":{}},"_meta":{"kiro":{"hooks":{"enabled":true,"v2":true}}}},"clientInfo":"<any>"}}}
 {"type":"emit_inbound","label":"response:initialize","frame":{"kind":"response","method":"initialize","result":{"protocolVersion":2,"agentCapabilities":{"loadSession":true,"promptCapabilities":{"image":true,"embeddedContext":true},"mcpCapabilities":{"http":true,"sse":true},"sessionCapabilities":{"list":{},"close":{},"delete":{},"fork":{"_meta":{"kiro":{"messageId":true}}}},"_meta":{"kiro":{"checkpoints":true,"sessionList":true,"policyNotifications":true,"extensionMethods":["_kiro/knowledge","_kiro/memory/list","_kiro/memory/get","_kiro/memory/create","_kiro/memory/update","_kiro/memory/delete","_kiro/codeIntelligence","_kiro/session/context","_kiro/session/compact","_kiro/session/export","_kiro/session/history","_kiro/config/template","_kiro/workflow/new","_kiro/workflow/invoke","_kiro/workflow/load","_kiro/workflow/inspect","_kiro/workflow/list","_kiro/workflow/pause","_kiro/workflow/cancel","_kiro/workflow/delete","_kiro/workflow/listRecipes","_kiro/workflow/listWatchHandlers","_kiro/workflow/resumeAll","_kiro/workflow/retry","_kiro/workflow/update","_kiro/workflow/resume","_kiro/sourceProviders/list","_kiro/sourceProviders/listResources"],"sessionSources":["local","remote"],"sessionListScopes":["workspace","user"],"executionTargets":["local","cloud-sandbox"],"sourceProviders":true,"replayMarking":true}}},"authMethods":[{"id":"aws-builder-id","name":"AWS Builder ID"},{"id":"aws-iam-identity-center","name":"AWS IAM Identity Center"}]}}}
 {"type":"expect_outbound","label":"request:session/new","frame":{"kind":"request","method":"session/new","params":{"cwd":"<workspace>","mcpServers":"<any>"}}}
 {"type":"emit_inbound","label":"notification:session/update:available_commands_update","frame":{"kind":"notification","method":"session/update","params":{"sessionId":"sess_00000000-0000-4000-8000-000000000001","update":{"sessionUpdate":"available_commands_update","availableCommands":[{"name":"architecture-selection","description":"Steering: architecture-selection","input":{"hint":"optional context"},"_meta":{"kiro":{"type":"steering","contextQuery":"global:architecture-selection","commandId":"architecture-selection","resource":{"resourceType":"steering","source":{"origin":"bundled"}},"originalName":"architecture-selection"}}},{"name":"quick-spec","description":"Steering: quick-spec","input":{"hint":"optional context"},"_meta":{"kiro":{"type":"steering","contextQuery":"global:quick-spec","commandId":"quick-spec","resource":{"resourceType":"steering","source":{"origin":"bundled"}},"originalName":"quick-spec"}}},{"name":"bug-fix","description":"Steering: bug-fix","input":{"hint":"optional context"},"_meta":{"kiro":{"type":"steering","contextQuery":"global:bug-fix","commandId":"bug-fix","resource":{"resourceType":"steering","source":{"origin":"bundled"}},"originalName":"bug-fix"}}},{"name":"general-task-execution","description":"General-purpose sub-agent with access to all tools for executing arbitrary tasks","input":{"hint":"task to delegate"},"_meta":{"kiro":{"type":"custom-agent","commandId":"general-task-execution","resource":{"resourceType":"agent","source":{"origin":"bundled"}},"originalName":"general-task-execution"}}},{"name":"context-gatherer","description":"Investigates the codebase to answer a specific question about it. Deeply analyzes existing code by tracing execution paths, mapping architecture and abstraction layers, understanding patterns, and documenting dependencies, returning a thorough, direct written analysis that explains how the relevant code works and points to the specific files and lines involved. Use it to understand code before you change it: before designing or implementing a change to code you don't already fully understand, start with context-gatherer so your edits are grounded in how the code actually works. When a task requires understanding code you don't already know, dispatch context-gatherer to do that exploration before running your own searches or reads. Rules: 1. Provide a clear, specific prompt that includes your intent: a detailed task description of the context you need and what you're trying to accomplish. 2. The subagent explores the codebase and returns an analysis of your query 3. Trust the returned results. You may still inspect additional code yourself when you need context beyond what was returned. 4. Reuse existing context-gatherer output for related follow-up questions; do not re-invoke on the same question with different phrasing. 5. For multiple distinct questions, dispatch several context-gatherers in parallel, each targeting a different aspect of the codebase.","input":{"hint":"task to delegate"},"_meta":{"kiro":{"type":"custom-agent","commandId":"context-gatherer","resource":{"resourceType":"agent","source":{"origin":"bundled"}},"originalName":"context-gatherer"}}}]}}}}
diff --git a/apps/server/src/orchestration-v2/testkit/fixtures/message_steering/fx_transcript.ndjson b/apps/server/src/orchestration-v2/testkit/fixtures/message_steering/fx_transcript.ndjson
index 75ed31f7fdb3..86c9b5d36e00 100644
--- a/apps/server/src/orchestration-v2/testkit/fixtures/message_steering/fx_transcript.ndjson
+++ b/apps/server/src/orchestration-v2/testkit/fixtures/message_steering/fx_transcript.ndjson
@@ -1,5 +1,5 @@
 {"type":"transcript_start","provider":"fx","protocol":"acp.ndjson-jsonrpc","version":"1","scenario":"message_steering","metadata":{"generatedBy":"live-fx-recorder","fxVersion":"0.0.13","normalization":"Session ids are fx-session-NN, the workspace is <workspace>, HOME is /home/fx-replay and the recording user is fx-replay. T3-owned prompt text, MCP servers and initialize params other than clientCapabilities and _meta are <any>. User skill names, emails and token-shaped strings are removed. Timestamps are kept as recorded.","droppedFrames":0}}
-{"type":"expect_outbound","label":"request:initialize","frame":{"kind":"request","method":"initialize","params":{"protocolVersion":2,"info":"<any>","capabilities":"<any>","clientCapabilities":{"fs":{"readTextFile":false,"writeTextFile":false},"terminal":false,"session":{"notices":{}},"elicitation":{"form":{}}},"clientInfo":"<any>"}}}
+{"type":"expect_outbound","label":"request:initialize","frame":{"kind":"request","method":"initialize","params":{"protocolVersion":2,"info":"<any>","capabilities":"<any>","clientCapabilities":{"fs":{"readTextFile":false,"writeTextFile":false},"terminal":false,"session":{"notices":{},"compaction":{}},"elicitation":{"form":{}}},"clientInfo":"<any>"}}}
 {"type":"emit_inbound","label":"response:initialize","frame":{"kind":"response","method":"initialize","result":{"protocolVersion":1,"agentCapabilities":{"loadSession":true,"promptCapabilities":{"image":true,"audio":false,"embeddedContext":true},"mcpCapabilities":{"http":true,"sse":true,"acp":true},"sessionCapabilities":{"list":{},"resume":{},"close":{},"systemPrompt":{}},"_meta":{"fx":{"steering":true}}},"agentInfo":{"name":"fx","title":"fx","version":"0.0.13"},"authMethods":[]}}}
 {"type":"expect_outbound","label":"request:session/new","frame":{"kind":"request","method":"session/new","params":{"cwd":"<workspace>","mcpServers":"<any>"}}}
 {"type":"emit_inbound","label":"response:session/new","frame":{"kind":"response","method":"session/new","result":{"sessionId":"fx-session-01","configOptions":[{"id":"provider","name":"Provider","category":"model","type":"select","currentValue":"gateway","options":[{"value":"gateway","name":"Vercel AI Gateway"},{"value":"codex","name":"Codex subscription"},{"value":"grok","name":"Grok subscription"}]},{"id":"model","name":"Model","category":"model","type":"select","currentValue":"anthropic/claude-opus-5.5","options":[{"value":"anthropic/claude-sonnet-5.5","name":"anthropic/claude-sonnet-5.5"},{"value":"anthropic/claude-opus-5.5","name":"anthropic/claude-opus-5.5"},{"value":"anthropic/claude-opus-5.5-fast","name":"anthropic/claude-opus-5.5-fast"},{"value":"anthropic/claude-opus-5","name":"anthropic/claude-opus-5"},{"value":"anthropic/claude-opus-5-fast","name":"anthropic/claude-opus-5-fast"},{"value":"anthropic/claude-sonnet-5","name":"anthropic/claude-sonnet-5"},{"value":"anthropic/claude-opus-4.8","name":"anthropic/claude-opus-4.8"},{"value":"anthropic/claude-opus-4.8-fast","name":"anthropic/claude-opus-4.8-fast"},{"value":"anthropic/claude-opus-4.7","name":"anthropic/claude-opus-4.7"},{"value":"anthropic/claude-sonnet-4.6","name":"anthropic/claude-sonnet-4.6"},{"value":"anthropic/claude-opus-4.6","name":"anthropic/claude-opus-4.6"},{"value":"anthropic/claude-opus-4.5","name":"anthropic/claude-opus-4.5"},{"value":"anthropic/claude-sonnet-4.5","name":"anthropic/claude-sonnet-4.5"},{"value":"anthropic/claude-opus-4","name":"anthropic/claude-opus-4"},{"value":"anthropic/claude-sonnet-4","name":"anthropic/claude-sonnet-4"},{"value":"openai/gpt-5.6-luna","name":"openai/gpt-5.6-luna"},{"value":"openai/gpt-5.6-luna-fast","name":"openai/gpt-5.6-luna-fast"},{"value":"openai/gpt-5.6-sol","name":"openai/gpt-5.6-sol"},{"value":"openai/gpt-5.6-sol-fast","name":"openai/gpt-5.6-sol-fast"},{"value":"openai/gpt-5.6-terra","name":"openai/gpt-5.6-terra"},{"value":"openai/gpt-5.6-terra-fast","name":"openai/gpt-5.6-terra-fast"},{"value":"openai/gpt-5.5","name":"openai/gpt-5.5"},{"value":"openai/gpt-5.5-fast","name":"openai/gpt-5.5-fast"},{"value":"openai/gpt-5.5-pro","name":"openai/gpt-5.5-pro"},{"value":"openai/gpt-5.4-nano","name":"openai/gpt-5.4-nano"},{"value":"openai/gpt-5.4","name":"openai/gpt-5.4"},{"value":"openai/gpt-5.4-fast","name":"openai/gpt-5.4-fast"},{"value":"openai/gpt-5.4-pro","name":"openai/gpt-5.4-pro"},{"value":"openai/gpt-5.3-codex","name":"openai/gpt-5.3-codex"},{"value":"openai/gpt-5.3-codex-fast","name":"openai/gpt-5.3-codex-fast"},{"value":"openai/gpt-5.2","name":"openai/gpt-5.2"},{"value":"openai/gpt-5.2-fast","name":"openai/gpt-5.2-fast"},{"value":"openai/gpt-5.2-pro","name":"openai/gpt-5.2-pro"},{"value":"openai/gpt-5.1-thinking","name":"openai/gpt-5.1-thinking"},{"value":"openai/gpt-5.1-thinking-fast","name":"openai/gpt-5.1-thinking-fast"},{"value":"openai/gpt-5-pro","name":"openai/gpt-5-pro"},{"value":"openai/gpt-5","name":"openai/gpt-5"},{"value":"openai/gpt-5-fast","name":"openai/gpt-5-fast"},{"value":"openai/gpt-5-nano","name":"openai/gpt-5-nano"},{"value":"openai/o3-pro","name":"openai/o3-pro"},{"value":"openai/o3","name":"openai/o3"},{"value":"openai/o3-fast","name":"openai/o3-fast"},{"value":"openai/o1","name":"openai/o1"},{"value":"deepseek/deepseek-v4-pro-0813","name":"deepseek/deepseek-v4-pro-0813"},{"value":"deepseek/deepseek-v4-pro","name":"deepseek/deepseek-v4-pro"},{"value":"spacexai/grok-4.7","name":"spacexai/grok-4.7"},{"value":"spacexai/grok-4.6","name":"spacexai/grok-4.6"},{"value":"spacexai/grok-4.5","name":"spacexai/grok-4.5"},{"value":"spacexai/grok-4.3","name":"spacexai/grok-4.3"},{"value":"spacexai/grok-4.20-multi-agent","name":"spacexai/grok-4.20-multi-agent"},{"value":"spacexai/grok-4.20-non-reasoning","name":"spacexai/grok-4.20-non-reasoning"},{"value":"spacexai/grok-4.20-reasoning","name":"spacexai/grok-4.20-reasoning"},{"value":"spacexai/grok-4.1-fast-non-reasoning","name":"spacexai/grok-4.1-fast-non-reasoning"},{"value":"spacexai/grok-4.1-fast-reasoning","name":"spacexai/grok-4.1-fast-reasoning"},{"value":"amazon/nova-pro","name":"amazon/nova-pro"},{"value":"anthropic/claude-fable-5.1","name":"anthropic/claude-fable-5.1"},{"value":"anthropic/claude-fable-5","name":"anthropic/claude-fable-5"},{"value":"openai/gpt-6.1-sol","name":"openai/gpt-6.1-sol"},{"value":"openai/gpt-6.1-sol-fast","name":"openai/gpt-6.1-sol-fast"},{"value":"openai/gpt-6-luna","name":"openai/gpt-6-luna"},{"value":"openai/gpt-6-luna-fast","name":"openai/gpt-6-luna-fast"},{"value":"openai/gpt-6-sol","name":"openai/gpt-6-sol"},{"value":"openai/gpt-6-sol-fast","name":"openai/gpt-6-sol-fast"},{"value":"openai/gpt-6-astra","name":"openai/gpt-6-astra"},{"value":"openai/gpt-6-astra-fast","name":"openai/gpt-6-astra-fast"},{"value":"openai/gpt-oss-safeguard-120b","name":"openai/gpt-oss-safeguard-120b"},{"value":"openai/gpt-oss-safeguard-20b","name":"openai/gpt-oss-safeguard-20b"},{"value":"openai/gpt-oss-120b","name":"openai/gpt-oss-120b"},{"value":"openai/gpt-oss-20b","name":"openai/gpt-oss-20b"},{"value":"openai/gpt-4.1","name":"openai/gpt-4.1"},{"value":"openai/gpt-4.1-fast","name":"openai/gpt-4.1-fast"},{"value":"openai/gpt-4.1-nano","name":"openai/gpt-4.1-nano"},{"value":"openai/gpt-4.1-nano-fast","name":"openai/gpt-4.1-nano-fast"},{"value":"openai/gpt-4o","name":"openai/gpt-4o"},{"value":"openai/gpt-4o-fast","name":"openai/gpt-4o-fast"},{"value":"openai/gpt-4-turbo","name":"openai/gpt-4-turbo"},{"value":"openai/gpt-3.5-turbo","name":"openai/gpt-3.5-turbo"},{"value":"google/gemma-4-26b-a4b-it","name":"google/gemma-4-26b-a4b-it"},{"value":"deepseek/deepseek-v3.2","name":"deepseek/deepseek-v3.2"},{"value":"deepseek/deepseek-v3.2-thinking","name":"deepseek/deepseek-v3.2-thinking"},{"value":"deepseek/deepseek-r1","name":"deepseek/deepseek-r1"},{"value":"meta/llama-4-maverick","name":"meta/llama-4-maverick"},{"value":"meta/llama-4-scout","name":"meta/llama-4-scout"},{"value":"meta/llama-3.3-70b","name":"meta/llama-3.3-70b"},{"value":"meta/llama-3.1-70b","name":"meta/llama-3.1-70b"},{"value":"meta/llama-3.1-8b","name":"meta/llama-3.1-8b"},{"value":"alibaba/qwen3.8-2.4t-a95b","name":"alibaba/qwen3.8-2.4t-a95b"},{"value":"alibaba/qwen3.8-max","name":"alibaba/qwen3.8-max"},{"value":"alibaba/qwen3-next-80b-a3b-instruct","name":"alibaba/qwen3-next-80b-a3b-instruct"},{"value":"alibaba/qwen3-next-80b-a3b-thinking","name":"alibaba/qwen3-next-80b-a3b-thinking"},{"value":"alibaba/qwen3-coder-30b-a3b","name":"alibaba/qwen3-coder-30b-a3b"},{"value":"alibaba/qwen3-coder","name":"alibaba/qwen3-coder"},{"value":"alibaba/qwen3-coder-next","name":"alibaba/qwen3-coder-next"},{"value":"alibaba/qwen-3-235b","name":"alibaba/qwen-3-235b"},{"value":"alibaba/qwen-3-32b","name":"alibaba/qwen-3-32b"},{"value":"fireworks/ember-1","name":"fireworks/ember-1"},{"value":"zai/glm-5.3-fast","name":"zai/glm-5.3-fast"},{"value":"zai/glm-5.3","name":"zai/glm-5.3"},{"value":"nvidia/nemotron-3.5-lightning","name":"nvidia/nemotron-3.5-lightning"},{"value":"moonshotai/kimi-k3-fast","name":"moonshotai/kimi-k3-fast"},{"value":"moonshotai/kimi-k3","name":"moonshotai/kimi-k3"},{"value":"zai/glm-5.2-fast","name":"zai/glm-5.2-fast"},{"value":"zai/glm-5.2","name":"zai/glm-5.2"},{"value":"nvidia/nemotron-3-ultra-550b-a55b","name":"nvidia/nemotron-3-ultra-550b-a55b"},{"value":"spacexai/grok-build-0.1","name":"spacexai/grok-build-0.1"},{"value":"nvidia/nemotron-3-super-120b-a12b","name":"nvidia/nemotron-3-super-120b-a12b"},{"value":"zai/glm-5","name":"zai/glm-5"},{"value":"moonshotai/kimi-k2.5","name":"moonshotai/kimi-k2.5"},{"value":"zai/glm-4.7","name":"zai/glm-4.7"},{"value":"nvidia/nemotron-nano-12b-v2-vl","name":"nvidia/nemotron-nano-12b-v2-vl"},{"value":"nvidia/nemotron-nano-9b-v2","name":"nvidia/nemotron-nano-9b-v2"},{"value":"amazon/nova-micro","name":"amazon/nova-micro"},{"value":"deepseek/deepseek-v4.1-flash","name":"deepseek/deepseek-v4.1-flash"},{"value":"deepseek/deepseek-v4-flash","name":"deepseek/deepseek-v4-flash"},{"value":"deepseek/deepseek-v4-flash-0731","name":"deepseek/deepseek-v4-flash-0731"},{"value":"zai/glm-5.3-flash","name":"zai/glm-5.3-flash"},{"value":"zai/glm-4.7-flash","name":"zai/glm-4.7-flash"},{"value":"anthropic/claude-haiku-5.5","name":"anthropic/claude-haiku-5.5"},{"value":"anthropic/claude-haiku-4.5","name":"anthropic/claude-haiku-4.5"},{"value":"anthropic/claude-3-haiku","name":"anthropic/claude-3-haiku"},{"value":"openai/gpt-5.4-mini","name":"openai/gpt-5.4-mini"},{"value":"openai/gpt-5.4-mini-fast","name":"openai/gpt-5.4-mini-fast"},{"value":"openai/gpt-5-mini","name":"openai/gpt-5-mini"},{"value":"openai/gpt-5-mini-fast","name":"openai/gpt-5-mini-fast"},{"value":"openai/gpt-4.1-mini","name":"openai/gpt-4.1-mini"},{"value":"openai/gpt-4.1-mini-fast","name":"openai/gpt-4.1-mini-fast"},{"value":"openai/o4-mini","name":"openai/o4-mini"},{"value":"openai/o4-mini-fast","name":"openai/o4-mini-fast"},{"value":"openai/o3-mini","name":"openai/o3-mini"},{"value":"openai/gpt-4o-mini","name":"openai/gpt-4o-mini"},{"value":"openai/gpt-4o-mini-fast","name":"openai/gpt-4o-mini-fast"},{"value":"google/gemini-3.8-flash","name":"google/gemini-3.8-flash"},{"value":"google/gemini-3.7-flash","name":"google/gemini-3.7-flash"},{"value":"google/gemini-3.5-flash-lite","name":"google/gemini-3.5-flash-lite"},{"value":"google/gemini-3.6-flash","name":"google/gemini-3.6-flash"},{"value":"google/gemini-3.5-flash","name":"google/gemini-3.5-flash"},{"value":"google/gemini-3.1-flash-lite","name":"google/gemini-3.1-flash-lite"},{"value":"google/gemini-3-flash","name":"google/gemini-3-flash"},{"value":"google/gemini-2.5-flash-lite","name":"google/gemini-2.5-flash-lite"},{"value":"google/gemini-2.5-flash","name":"google/gemini-2.5-flash"},{"value":"google/gemini-2.5-pro","name":"google/gemini-2.5-pro"},{"value":"minimax/minimax-m3","name":"minimax/minimax-m3"},{"value":"minimax/minimax-m2.5","name":"minimax/minimax-m2.5"},{"value":"minimax/minimax-m2.1","name":"minimax/minimax-m2.1"},{"value":"amazon/nova-2-lite","name":"amazon/nova-2-lite"},{"value":"amazon/nova-lite","name":"amazon/nova-lite"},{"value":"google/gemini-3.1-pro-preview","name":"google/gemini-3.1-pro-preview"},{"value":"spacexai/grok-4.20-multi-agent-beta","name":"spacexai/grok-4.20-multi-agent-beta"},{"value":"spacexai/grok-4.20-non-reasoning-beta","name":"spacexai/grok-4.20-non-reasoning-beta"},{"value":"spacexai/grok-4.20-reasoning-beta","name":"spacexai/grok-4.20-reasoning-beta"}]},{"id":"mode","name":"Session Mode","description":"Controls how the agent requests permission","category":"mode","type":"select","currentValue":"ask","options":[{"value":"code","name":"Code","description":"Write and modify code with full tool access","permissionMode":"auto"},{"value":"ask","name":"Ask","description":"Request permission before making any changes","permissionMode":"ask"}]},{"id":"effort","name":"Reasoning Effort","description":"Controls how much the model thinks before responding","category":"thought_level","type":"select","currentValue":"xhigh","options":[{"value":"auto","name":"default"},{"value":"low","name":"low"},{"value":"medium","name":"medium"},{"value":"high","name":"high"},{"value":"xhigh","name":"xhigh"},{"value":"max","name":"max"}]}],"modes":{"currentModeId":"ask","availableModes":[{"id":"code","name":"Code","description":"Write and modify code with full tool access"},{"id":"ask","name":"Ask","description":"Request permission before making any changes"}]}}}}
@@ -12,7 +12,7 @@
 {"type":"expect_outbound","label":"notification:session/cancel","frame":{"kind":"notification","method":"session/cancel","params":{"sessionId":"fx-session-01"}}}
 {"type":"emit_inbound","label":"notification:session/update:session_info_update","frame":{"kind":"notification","method":"session/update","params":{"sessionId":"fx-session-01","update":{"sessionUpdate":"session_info_update","title":"Steering Fixture Initial Response","updatedAt":"2026-10-11T13:54:11Z"}}}}
 {"type":"emit_inbound","label":"response:session/prompt","frame":{"kind":"response","method":"session/prompt","result":{"stopReason":"cancelled","usage":{}}}}
-{"type":"expect_outbound","label":"request:session/prompt","frame":{"kind":"request","method":"session/prompt","params":{"sessionId":"fx-session-01","prompt":[{"type":"text","text":"Actually, respond with exactly: steering fixture observed"}]}}}
+{"type":"expect_outbound","label":"request:session/prompt","frame":{"kind":"request","method":"session/prompt","params":{"sessionId":"fx-session-01","prompt":[{"type":"text","text":"<t3_code_instructions>\n<any>\n</t3_code_instructions>\n\n<user_request>\nActually, respond with exactly: steering fixture observed\n</user_request>"},{"type":"text","text":"<runtime_info><any>"}]}}}
 {"type":"emit_inbound","label":"notification:session/update:agent_message_chunk","frame":{"kind":"notification","method":"session/update","params":{"sessionId":"fx-session-01","update":{"sessionUpdate":"agent_message_chunk","messageId":"10c63c6eb70c5fb1cb62ee14ceec92ac","content":{"type":"text","text":"steering fixture observed"}}}}}
 {"type":"emit_inbound","label":"notification:session/update:session_info_update","frame":{"kind":"notification","method":"session/update","params":{"sessionId":"fx-session-01","update":{"sessionUpdate":"session_info_update","title":"Steering Fixture Initial Response","updatedAt":"2026-10-11T13:54:14Z"}}}}
 {"type":"emit_inbound","label":"notification:session/update:usage_update","frame":{"kind":"notification","method":"session/update","params":{"sessionId":"fx-session-01","update":{"sessionUpdate":"usage_update","used":20096,"size":1000000}}}}
diff --git a/apps/server/src/orchestration-v2/testkit/fixtures/message_steering/grok_transcript.ndjson b/apps/server/src/orchestration-v2/testkit/fixtures/message_steering/grok_transcript.ndjson
index a7f4f9fbbd8c..da8314feb536 100644
--- a/apps/server/src/orchestration-v2/testkit/fixtures/message_steering/grok_transcript.ndjson
+++ b/apps/server/src/orchestration-v2/testkit/fixtures/message_steering/grok_transcript.ndjson
@@ -30,7 +30,7 @@
 {"type":"emit_inbound","label":"notification:_x.ai/session/prompt_complete","frame":{"kind":"notification","method":"_x.ai/session/prompt_complete","params":{"sessionId":"00000000-0000-4000-8000-000000000001","promptId":"t3-xai-prompt-1","stopReason":"cancelled","agentResult":null,"cancelTrigger":"ctrl_c","cancellationCategory":"MidTurnAbort","cancellationContext":{"trigger":"ctrl_c"}}}}
 {"type":"emit_inbound","label":"notification:_x.ai/sessions/changed","frame":{"kind":"notification","method":"_x.ai/sessions/changed","params":{"upserted":[{"sessionId":"00000000-0000-4000-8000-000000000001","title":null,"cwd":"<workspace>","isWorktree":false,"modelId":"grok-4.7","reasoningEffort":"high","yolo":false,"activity":"idle","resident":true,"lastChangeUnixMs":1790300235649,"origin":{"kind":"local"}}],"removed":[]}}}
 {"type":"emit_inbound","label":"response:session/prompt","frame":{"kind":"response","method":"session/prompt","result":{"stopReason":"cancelled","_meta":{"sessionId":"00000000-0000-4000-8000-000000000001","requestId":"t3-xai-prompt-1","promptId":"t3-xai-prompt-1","totalTokens":2263,"modelId":"grok-4.7","cancellationCategory":"MidTurnAbort","cancellationContext":{"trigger":"ctrl_c"},"cancelTrigger":"ctrl_c"}}}}
-{"type":"expect_outbound","label":"request:session/prompt","frame":{"kind":"request","method":"session/prompt","params":{"sessionId":"00000000-0000-4000-8000-000000000001","prompt":[{"type":"text","text":"Actually, respond with exactly: steering fixture observed"}],"_meta":{"promptId":"t3-xai-prompt-2","requestId":"t3-xai-prompt-2"}}}}
+{"type":"expect_outbound","label":"request:session/prompt","frame":{"kind":"request","method":"session/prompt","params":{"sessionId":"00000000-0000-4000-8000-000000000001","prompt":[{"type":"text","text":"<t3_code_instructions>\n<any>\n</t3_code_instructions>\n\n<user_request>\nActually, respond with exactly: steering fixture observed\n</user_request>"},{"type":"text","text":"<runtime_info><any>"}],"_meta":{"promptId":"t3-xai-prompt-2","requestId":"t3-xai-prompt-2"}}}}
 {"type":"emit_inbound","label":"notification:_x.ai/sessions/changed","frame":{"kind":"notification","method":"_x.ai/sessions/changed","params":{"upserted":[{"sessionId":"00000000-0000-4000-8000-000000000001","title":null,"cwd":"<workspace>","isWorktree":false,"modelId":"grok-4.7","reasoningEffort":"high","yolo":false,"activity":"working","resident":true,"lastChangeUnixMs":1790300235729,"origin":{"kind":"local"}}],"removed":[]}}}
 {"type":"emit_inbound","label":"notification:_x.ai/queue/changed","frame":{"kind":"notification","method":"_x.ai/queue/changed","params":{"sessionId":"00000000-0000-4000-8000-000000000001","entries":[{"id":"t3-xai-prompt-2","version":0,"kind":"prompt","text":"Actually, respond with exactly: steering fixture observed\n\n<runtime_info>In case you're asked: you are running in T3 Code through the Grok harness, as grok-build. No need to mention this otherwise. You can embed images and videos in your response using Markdown with absolute file paths.</runtime_info>\n\n<pull_request_linking>\nWhen the t3-code MCP server exposes link_pull_request, you must use it to register every pull request you create or work on for this thread. Call link_pull_request with the full PR URL immediately after creating a PR or starting work on an existing PR. For a stack, call it for every layer, not just the current branch or the top PR. This applies when creating or updating PRs through your host's CLI (including its stack commands) or its API: those operations do not register the PRs with this thread. Linking an already-linked PR is safe. Before finishing PR work, call list_thread_pull_requests and link any PR from your work that is missing. Do not link unrelated PRs mentioned only as background. If a linking call fails, report that failure instead of claiming the PR is linked.\n</pull_request_linking>","position":0}]}}}
 {"type":"emit_inbound","label":"notification:_x.ai/queue/changed","frame":{"kind":"notification","method":"_x.ai/queue/changed","params":{"sessionId":"00000000-0000-4000-8000-000000000001","entries":[],"runningPromptId":"t3-xai-prompt-2","runningText":"Actually, respond with exactly: steering fixture observed\n\n<runtime_info>In case you're asked: you are running in T3 Code through the Grok harness, as grok-build. No need to mention this otherwise. You can embed images and videos in your response using Markdown with absolute file paths.</runtime_info>\n\n<pull_request_linking>\nWhen the t3-code MCP server exposes link_pull_request, you must use it to register every pull request you create or work on for this thread. Call link_pull_request with the full PR URL immediately after creating a PR or starting work on an existing PR. For a stack, call it for every layer, not just the current branch or the top PR. This applies when creating or updating PRs through your host's CLI (including its stack commands) or its API: those operations do not register the PRs with this thread. Linking an already-linked PR is safe. Before finishing PR work, call list_thread_pull_requests and link any PR from your work that is missing. Do not link unrelated PRs mentioned only as background. If a linking call fails, report that failure instead of claiming the PR is linked.\n</pull_request_linking>","runningKind":"prompt"}}}
diff --git a/apps/server/src/orchestration-v2/testkit/fixtures/message_steering/registry_transcript.ndjson b/apps/server/src/orchestration-v2/testkit/fixtures/message_steering/registry_transcript.ndjson
index 0ffbf65d3f37..c644f675c550 100644
--- a/apps/server/src/orchestration-v2/testkit/fixtures/message_steering/registry_transcript.ndjson
+++ b/apps/server/src/orchestration-v2/testkit/fixtures/message_steering/registry_transcript.ndjson
@@ -7,7 +7,7 @@
 {"type":"emit_inbound","label":"assistant.partial","frame":{"kind":"notification","method":"session/update","params":{"sessionId":"grok-replay-session-1","update":{"sessionUpdate":"agent_message_chunk","content":{"type":"text","text":"ste"}}}}}
 {"type":"expect_outbound","label":"session.cancel","frame":{"kind":"notification","method":"session/cancel","params":{"sessionId":"grok-replay-session-1"}}}
 {"type":"emit_inbound","label":"prompt.cancelled","frame":{"kind":"response","method":"session/prompt","result":{"stopReason":"cancelled"}}}
-{"type":"expect_outbound","label":"session.prompt.2","frame":{"kind":"request","method":"session/prompt","params":{"sessionId":"grok-replay-session-1","prompt":[{"type":"text","text":"Actually, respond with exactly: steering fixture observed"}]}}}
+{"type":"expect_outbound","label":"session.prompt.2","frame":{"kind":"request","method":"session/prompt","params":{"sessionId":"grok-replay-session-1","prompt":[{"type":"text","text":"<t3_code_instructions>\n<any>\n</t3_code_instructions>\n\n<user_request>\nActually, respond with exactly: steering fixture observed\n</user_request>"},{"type":"text","text":"<runtime_info><any>"}]}}}
 {"type":"emit_inbound","label":"assistant.1","frame":{"kind":"notification","method":"session/update","params":{"sessionId":"grok-replay-session-1","update":{"sessionUpdate":"agent_message_chunk","content":{"type":"text","text":"steering fixture "}}}}}
 {"type":"emit_inbound","label":"assistant.2","frame":{"kind":"notification","method":"session/update","params":{"sessionId":"grok-replay-session-1","update":{"sessionUpdate":"agent_message_chunk","content":{"type":"text","text":"observed"}}}}}
 {"type":"emit_inbound","label":"prompt.completed","frame":{"kind":"response","method":"session/prompt","result":{"stopReason":"end_turn"}}}
diff --git a/apps/server/src/orchestration-v2/testkit/fixtures/multi_turn/fx_transcript.ndjson b/apps/server/src/orchestration-v2/testkit/fixtures/multi_turn/fx_transcript.ndjson
index d394fdf4c778..d7c5cd808504 100644
--- a/apps/server/src/orchestration-v2/testkit/fixtures/multi_turn/fx_transcript.ndjson
+++ b/apps/server/src/orchestration-v2/testkit/fixtures/multi_turn/fx_transcript.ndjson
@@ -1,5 +1,5 @@
 {"type":"transcript_start","provider":"fx","protocol":"acp.ndjson-jsonrpc","version":"1","scenario":"multi_turn","metadata":{"generatedBy":"live-fx-recorder","fxVersion":"0.0.13","normalization":"Session ids are fx-session-NN, the workspace is <workspace>, HOME is /home/fx-replay and the recording user is fx-replay. T3-owned prompt text, MCP servers and initialize params other than clientCapabilities and _meta are <any>. User skill names, emails and token-shaped strings are removed. Timestamps are kept as recorded.","droppedFrames":0}}
-{"type":"expect_outbound","label":"request:initialize","frame":{"kind":"request","method":"initialize","params":{"protocolVersion":2,"info":"<any>","capabilities":"<any>","clientCapabilities":{"fs":{"readTextFile":false,"writeTextFile":false},"terminal":false,"session":{"notices":{}},"elicitation":{"form":{}}},"clientInfo":"<any>"}}}
+{"type":"expect_outbound","label":"request:initialize","frame":{"kind":"request","method":"initialize","params":{"protocolVersion":2,"info":"<any>","capabilities":"<any>","clientCapabilities":{"fs":{"readTextFile":false,"writeTextFile":false},"terminal":false,"session":{"notices":{},"compaction":{}},"elicitation":{"form":{}}},"clientInfo":"<any>"}}}
 {"type":"emit_inbound","label":"response:initialize","frame":{"kind":"response","method":"initialize","result":{"protocolVersion":1,"agentCapabilities":{"loadSession":true,"promptCapabilities":{"image":true,"audio":false,"embeddedContext":true},"mcpCapabilities":{"http":true,"sse":true,"acp":true},"sessionCapabilities":{"list":{},"resume":{},"close":{},"systemPrompt":{}},"_meta":{"fx":{"steering":true}}},"agentInfo":{"name":"fx","title":"fx","version":"0.0.13"},"authMethods":[]}}}
 {"type":"expect_outbound","label":"request:session/new","frame":{"kind":"request","method":"session/new","params":{"cwd":"<workspace>","mcpServers":"<any>"}}}
 {"type":"emit_inbound","label":"response:session/new","frame":{"kind":"response","method":"session/new","result":{"sessionId":"fx-session-01","configOptions":[{"id":"provider","name":"Provider","category":"model","type":"select","currentValue":"gateway","options":[{"value":"gateway","name":"Vercel AI Gateway"},{"value":"codex","name":"Codex subscription"},{"value":"grok","name":"Grok subscription"}]},{"id":"model","name":"Model","category":"model","type":"select","currentValue":"anthropic/claude-opus-5.5","options":[{"value":"anthropic/claude-sonnet-5.5","name":"anthropic/claude-sonnet-5.5"},{"value":"anthropic/claude-opus-5.5","name":"anthropic/claude-opus-5.5"},{"value":"anthropic/claude-opus-5.5-fast","name":"anthropic/claude-opus-5.5-fast"},{"value":"anthropic/claude-opus-5","name":"anthropic/claude-opus-5"},{"value":"anthropic/claude-opus-5-fast","name":"anthropic/claude-opus-5-fast"},{"value":"anthropic/claude-sonnet-5","name":"anthropic/claude-sonnet-5"},{"value":"anthropic/claude-opus-4.8","name":"anthropic/claude-opus-4.8"},{"value":"anthropic/claude-opus-4.8-fast","name":"anthropic/claude-opus-4.8-fast"},{"value":"anthropic/claude-opus-4.7","name":"anthropic/claude-opus-4.7"},{"value":"anthropic/claude-sonnet-4.6","name":"anthropic/claude-sonnet-4.6"},{"value":"anthropic/claude-opus-4.6","name":"anthropic/claude-opus-4.6"},{"value":"anthropic/claude-opus-4.5","name":"anthropic/claude-opus-4.5"},{"value":"anthropic/claude-sonnet-4.5","name":"anthropic/claude-sonnet-4.5"},{"value":"anthropic/claude-opus-4","name":"anthropic/claude-opus-4"},{"value":"anthropic/claude-sonnet-4","name":"anthropic/claude-sonnet-4"},{"value":"openai/gpt-5.6-luna","name":"openai/gpt-5.6-luna"},{"value":"openai/gpt-5.6-luna-fast","name":"openai/gpt-5.6-luna-fast"},{"value":"openai/gpt-5.6-sol","name":"openai/gpt-5.6-sol"},{"value":"openai/gpt-5.6-sol-fast","name":"openai/gpt-5.6-sol-fast"},{"value":"openai/gpt-5.6-terra","name":"openai/gpt-5.6-terra"},{"value":"openai/gpt-5.6-terra-fast","name":"openai/gpt-5.6-terra-fast"},{"value":"openai/gpt-5.5","name":"openai/gpt-5.5"},{"value":"openai/gpt-5.5-fast","name":"openai/gpt-5.5-fast"},{"value":"openai/gpt-5.5-pro","name":"openai/gpt-5.5-pro"},{"value":"openai/gpt-5.4-nano","name":"openai/gpt-5.4-nano"},{"value":"openai/gpt-5.4","name":"openai/gpt-5.4"},{"value":"openai/gpt-5.4-fast","name":"openai/gpt-5.4-fast"},{"value":"openai/gpt-5.4-pro","name":"openai/gpt-5.4-pro"},{"value":"openai/gpt-5.3-codex","name":"openai/gpt-5.3-codex"},{"value":"openai/gpt-5.3-codex-fast","name":"openai/gpt-5.3-codex-fast"},{"value":"openai/gpt-5.2","name":"openai/gpt-5.2"},{"value":"openai/gpt-5.2-fast","name":"openai/gpt-5.2-fast"},{"value":"openai/gpt-5.2-pro","name":"openai/gpt-5.2-pro"},{"value":"openai/gpt-5.1-thinking","name":"openai/gpt-5.1-thinking"},{"value":"openai/gpt-5.1-thinking-fast","name":"openai/gpt-5.1-thinking-fast"},{"value":"openai/gpt-5-pro","name":"openai/gpt-5-pro"},{"value":"openai/gpt-5","name":"openai/gpt-5"},{"value":"openai/gpt-5-fast","name":"openai/gpt-5-fast"},{"value":"openai/gpt-5-nano","name":"openai/gpt-5-nano"},{"value":"openai/o3-pro","name":"openai/o3-pro"},{"value":"openai/o3","name":"openai/o3"},{"value":"openai/o3-fast","name":"openai/o3-fast"},{"value":"openai/o1","name":"openai/o1"},{"value":"deepseek/deepseek-v4-pro-0813","name":"deepseek/deepseek-v4-pro-0813"},{"value":"deepseek/deepseek-v4-pro","name":"deepseek/deepseek-v4-pro"},{"value":"spacexai/grok-4.7","name":"spacexai/grok-4.7"},{"value":"spacexai/grok-4.6","name":"spacexai/grok-4.6"},{"value":"spacexai/grok-4.5","name":"spacexai/grok-4.5"},{"value":"spacexai/grok-4.3","name":"spacexai/grok-4.3"},{"value":"spacexai/grok-4.20-multi-agent","name":"spacexai/grok-4.20-multi-agent"},{"value":"spacexai/grok-4.20-non-reasoning","name":"spacexai/grok-4.20-non-reasoning"},{"value":"spacexai/grok-4.20-reasoning","name":"spacexai/grok-4.20-reasoning"},{"value":"spacexai/grok-4.1-fast-non-reasoning","name":"spacexai/grok-4.1-fast-non-reasoning"},{"value":"spacexai/grok-4.1-fast-reasoning","name":"spacexai/grok-4.1-fast-reasoning"},{"value":"amazon/nova-pro","name":"amazon/nova-pro"},{"value":"anthropic/claude-fable-5.1","name":"anthropic/claude-fable-5.1"},{"value":"anthropic/claude-fable-5","name":"anthropic/claude-fable-5"},{"value":"openai/gpt-6.1-sol","name":"openai/gpt-6.1-sol"},{"value":"openai/gpt-6.1-sol-fast","name":"openai/gpt-6.1-sol-fast"},{"value":"openai/gpt-6-luna","name":"openai/gpt-6-luna"},{"value":"openai/gpt-6-luna-fast","name":"openai/gpt-6-luna-fast"},{"value":"openai/gpt-6-sol","name":"openai/gpt-6-sol"},{"value":"openai/gpt-6-sol-fast","name":"openai/gpt-6-sol-fast"},{"value":"openai/gpt-6-astra","name":"openai/gpt-6-astra"},{"value":"openai/gpt-6-astra-fast","name":"openai/gpt-6-astra-fast"},{"value":"openai/gpt-oss-safeguard-120b","name":"openai/gpt-oss-safeguard-120b"},{"value":"openai/gpt-oss-safeguard-20b","name":"openai/gpt-oss-safeguard-20b"},{"value":"openai/gpt-oss-120b","name":"openai/gpt-oss-120b"},{"value":"openai/gpt-oss-20b","name":"openai/gpt-oss-20b"},{"value":"openai/gpt-4.1","name":"openai/gpt-4.1"},{"value":"openai/gpt-4.1-fast","name":"openai/gpt-4.1-fast"},{"value":"openai/gpt-4.1-nano","name":"openai/gpt-4.1-nano"},{"value":"openai/gpt-4.1-nano-fast","name":"openai/gpt-4.1-nano-fast"},{"value":"openai/gpt-4o","name":"openai/gpt-4o"},{"value":"openai/gpt-4o-fast","name":"openai/gpt-4o-fast"},{"value":"openai/gpt-4-turbo","name":"openai/gpt-4-turbo"},{"value":"openai/gpt-3.5-turbo","name":"openai/gpt-3.5-turbo"},{"value":"google/gemma-4-26b-a4b-it","name":"google/gemma-4-26b-a4b-it"},{"value":"deepseek/deepseek-v3.2","name":"deepseek/deepseek-v3.2"},{"value":"deepseek/deepseek-v3.2-thinking","name":"deepseek/deepseek-v3.2-thinking"},{"value":"deepseek/deepseek-r1","name":"deepseek/deepseek-r1"},{"value":"meta/llama-4-maverick","name":"meta/llama-4-maverick"},{"value":"meta/llama-4-scout","name":"meta/llama-4-scout"},{"value":"meta/llama-3.3-70b","name":"meta/llama-3.3-70b"},{"value":"meta/llama-3.1-70b","name":"meta/llama-3.1-70b"},{"value":"meta/llama-3.1-8b","name":"meta/llama-3.1-8b"},{"value":"alibaba/qwen3.8-2.4t-a95b","name":"alibaba/qwen3.8-2.4t-a95b"},{"value":"alibaba/qwen3.8-max","name":"alibaba/qwen3.8-max"},{"value":"alibaba/qwen3-next-80b-a3b-instruct","name":"alibaba/qwen3-next-80b-a3b-instruct"},{"value":"alibaba/qwen3-next-80b-a3b-thinking","name":"alibaba/qwen3-next-80b-a3b-thinking"},{"value":"alibaba/qwen3-coder-30b-a3b","name":"alibaba/qwen3-coder-30b-a3b"},{"value":"alibaba/qwen3-coder","name":"alibaba/qwen3-coder"},{"value":"alibaba/qwen3-coder-next","name":"alibaba/qwen3-coder-next"},{"value":"alibaba/qwen-3-235b","name":"alibaba/qwen-3-235b"},{"value":"alibaba/qwen-3-32b","name":"alibaba/qwen-3-32b"},{"value":"fireworks/ember-1","name":"fireworks/ember-1"},{"value":"zai/glm-5.3-fast","name":"zai/glm-5.3-fast"},{"value":"zai/glm-5.3","name":"zai/glm-5.3"},{"value":"nvidia/nemotron-3.5-lightning","name":"nvidia/nemotron-3.5-lightning"},{"value":"moonshotai/kimi-k3-fast","name":"moonshotai/kimi-k3-fast"},{"value":"moonshotai/kimi-k3","name":"moonshotai/kimi-k3"},{"value":"zai/glm-5.2-fast","name":"zai/glm-5.2-fast"},{"value":"zai/glm-5.2","name":"zai/glm-5.2"},{"value":"nvidia/nemotron-3-ultra-550b-a55b","name":"nvidia/nemotron-3-ultra-550b-a55b"},{"value":"spacexai/grok-build-0.1","name":"spacexai/grok-build-0.1"},{"value":"nvidia/nemotron-3-super-120b-a12b","name":"nvidia/nemotron-3-super-120b-a12b"},{"value":"zai/glm-5","name":"zai/glm-5"},{"value":"moonshotai/kimi-k2.5","name":"moonshotai/kimi-k2.5"},{"value":"zai/glm-4.7","name":"zai/glm-4.7"},{"value":"nvidia/nemotron-nano-12b-v2-vl","name":"nvidia/nemotron-nano-12b-v2-vl"},{"value":"nvidia/nemotron-nano-9b-v2","name":"nvidia/nemotron-nano-9b-v2"},{"value":"amazon/nova-micro","name":"amazon/nova-micro"},{"value":"deepseek/deepseek-v4.1-flash","name":"deepseek/deepseek-v4.1-flash"},{"value":"deepseek/deepseek-v4-flash","name":"deepseek/deepseek-v4-flash"},{"value":"deepseek/deepseek-v4-flash-0731","name":"deepseek/deepseek-v4-flash-0731"},{"value":"zai/glm-5.3-flash","name":"zai/glm-5.3-flash"},{"value":"zai/glm-4.7-flash","name":"zai/glm-4.7-flash"},{"value":"anthropic/claude-haiku-5.5","name":"anthropic/claude-haiku-5.5"},{"value":"anthropic/claude-haiku-4.5","name":"anthropic/claude-haiku-4.5"},{"value":"anthropic/claude-3-haiku","name":"anthropic/claude-3-haiku"},{"value":"openai/gpt-5.4-mini","name":"openai/gpt-5.4-mini"},{"value":"openai/gpt-5.4-mini-fast","name":"openai/gpt-5.4-mini-fast"},{"value":"openai/gpt-5-mini","name":"openai/gpt-5-mini"},{"value":"openai/gpt-5-mini-fast","name":"openai/gpt-5-mini-fast"},{"value":"openai/gpt-4.1-mini","name":"openai/gpt-4.1-mini"},{"value":"openai/gpt-4.1-mini-fast","name":"openai/gpt-4.1-mini-fast"},{"value":"openai/o4-mini","name":"openai/o4-mini"},{"value":"openai/o4-mini-fast","name":"openai/o4-mini-fast"},{"value":"openai/o3-mini","name":"openai/o3-mini"},{"value":"openai/gpt-4o-mini","name":"openai/gpt-4o-mini"},{"value":"openai/gpt-4o-mini-fast","name":"openai/gpt-4o-mini-fast"},{"value":"google/gemini-3.8-flash","name":"google/gemini-3.8-flash"},{"value":"google/gemini-3.7-flash","name":"google/gemini-3.7-flash"},{"value":"google/gemini-3.5-flash-lite","name":"google/gemini-3.5-flash-lite"},{"value":"google/gemini-3.6-flash","name":"google/gemini-3.6-flash"},{"value":"google/gemini-3.5-flash","name":"google/gemini-3.5-flash"},{"value":"google/gemini-3.1-flash-lite","name":"google/gemini-3.1-flash-lite"},{"value":"google/gemini-3-flash","name":"google/gemini-3-flash"},{"value":"google/gemini-2.5-flash-lite","name":"google/gemini-2.5-flash-lite"},{"value":"google/gemini-2.5-flash","name":"google/gemini-2.5-flash"},{"value":"google/gemini-2.5-pro","name":"google/gemini-2.5-pro"},{"value":"minimax/minimax-m3","name":"minimax/minimax-m3"},{"value":"minimax/minimax-m2.5","name":"minimax/minimax-m2.5"},{"value":"minimax/minimax-m2.1","name":"minimax/minimax-m2.1"},{"value":"amazon/nova-2-lite","name":"amazon/nova-2-lite"},{"value":"amazon/nova-lite","name":"amazon/nova-lite"},{"value":"google/gemini-3.1-pro-preview","name":"google/gemini-3.1-pro-preview"},{"value":"spacexai/grok-4.20-multi-agent-beta","name":"spacexai/grok-4.20-multi-agent-beta"},{"value":"spacexai/grok-4.20-non-reasoning-beta","name":"spacexai/grok-4.20-non-reasoning-beta"},{"value":"spacexai/grok-4.20-reasoning-beta","name":"spacexai/grok-4.20-reasoning-beta"}]},{"id":"mode","name":"Session Mode","description":"Controls how the agent requests permission","category":"mode","type":"select","currentValue":"ask","options":[{"value":"code","name":"Code","description":"Write and modify code with full tool access","permissionMode":"auto"},{"value":"ask","name":"Ask","description":"Request permission before making any changes","permissionMode":"ask"}]},{"id":"effort","name":"Reasoning Effort","description":"Controls how much the model thinks before responding","category":"thought_level","type":"select","currentValue":"xhigh","options":[{"value":"auto","name":"default"},{"value":"low","name":"low"},{"value":"medium","name":"medium"},{"value":"high","name":"high"},{"value":"xhigh","name":"xhigh"},{"value":"max","name":"max"}]}],"modes":{"currentModeId":"ask","availableModes":[{"id":"code","name":"Code","description":"Write and modify code with full tool access"},{"id":"ask","name":"Ask","description":"Request permission before making any changes"}]}}}}
diff --git a/apps/server/src/orchestration-v2/testkit/fixtures/multi_turn/kiro_transcript.ndjson b/apps/server/src/orchestration-v2/testkit/fixtures/multi_turn/kiro_transcript.ndjson
index 0ca4d283e87a..adaf9a2d9dc0 100644
--- a/apps/server/src/orchestration-v2/testkit/fixtures/multi_turn/kiro_transcript.ndjson
+++ b/apps/server/src/orchestration-v2/testkit/fixtures/multi_turn/kiro_transcript.ndjson
@@ -1,5 +1,5 @@
 {"type":"transcript_start","provider":"kiro","protocol":"acp.ndjson-jsonrpc","version":"1","scenario":"multi_turn","metadata":{"generatedBy":"live-kiro-recorder","kiroVersion":"2.32.0","normalization":"Session ids are fixed sess_ UUIDs and other UUIDs (message and request ids) are numbered in first-seen order, the workspace is <workspace>, HOME is /home/kiro-replay and the recording user is kiro-replay. T3-owned prompt text, MCP servers and initialize params other than clientCapabilities and _meta are <any>. Kiro's log directory, user-scoped commands and agents, and the _kiro/* broadcasts T3 ignores (governance, steering documents, powers, tools, hooks, MCP status, session roster) are removed. Timestamps are kept as recorded.","droppedFrames":15}}
-{"type":"expect_outbound","label":"request:initialize","frame":{"kind":"request","method":"initialize","params":{"protocolVersion":2,"info":"<any>","capabilities":"<any>","clientCapabilities":{"fs":{"readTextFile":false,"writeTextFile":false},"terminal":false,"session":{"notices":{}},"elicitation":{"form":{}},"_meta":{"kiro":{"hooks":{"enabled":true,"v2":true}}}},"clientInfo":"<any>"}}}
+{"type":"expect_outbound","label":"request:initialize","frame":{"kind":"request","method":"initialize","params":{"protocolVersion":2,"info":"<any>","capabilities":"<any>","clientCapabilities":{"fs":{"readTextFile":false,"writeTextFile":false},"terminal":false,"session":{"notices":{},"compaction":{}},"elicitation":{"form":{}},"_meta":{"kiro":{"hooks":{"enabled":true,"v2":true}}}},"clientInfo":"<any>"}}}
 {"type":"emit_inbound","label":"response:initialize","frame":{"kind":"response","method":"initialize","result":{"protocolVersion":2,"agentCapabilities":{"loadSession":true,"promptCapabilities":{"image":true,"embeddedContext":true},"mcpCapabilities":{"http":true,"sse":true},"sessionCapabilities":{"list":{},"close":{},"delete":{},"fork":{"_meta":{"kiro":{"messageId":true}}}},"_meta":{"kiro":{"checkpoints":true,"sessionList":true,"policyNotifications":true,"extensionMethods":["_kiro/knowledge","_kiro/memory/list","_kiro/memory/get","_kiro/memory/create","_kiro/memory/update","_kiro/memory/delete","_kiro/codeIntelligence","_kiro/session/context","_kiro/session/compact","_kiro/session/export","_kiro/session/history","_kiro/config/template","_kiro/workflow/new","_kiro/workflow/invoke","_kiro/workflow/load","_kiro/workflow/inspect","_kiro/workflow/list","_kiro/workflow/pause","_kiro/workflow/cancel","_kiro/workflow/delete","_kiro/workflow/listRecipes","_kiro/workflow/listWatchHandlers","_kiro/workflow/resumeAll","_kiro/workflow/retry","_kiro/workflow/update","_kiro/workflow/resume","_kiro/sourceProviders/list","_kiro/sourceProviders/listResources"],"sessionSources":["local","remote"],"sessionListScopes":["workspace","user"],"executionTargets":["local","cloud-sandbox"],"sourceProviders":true,"replayMarking":true}}},"authMethods":[{"id":"aws-builder-id","name":"AWS Builder ID"},{"id":"aws-iam-identity-center","name":"AWS IAM Identity Center"}]}}}
 {"type":"expect_outbound","label":"request:session/new","frame":{"kind":"request","method":"session/new","params":{"cwd":"<workspace>","mcpServers":"<any>"}}}
 {"type":"emit_inbound","label":"notification:session/update:available_commands_update","frame":{"kind":"notification","method":"session/update","params":{"sessionId":"sess_00000000-0000-4000-8000-000000000001","update":{"sessionUpdate":"available_commands_update","availableCommands":[{"name":"architecture-selection","description":"Steering: architecture-selection","input":{"hint":"optional context"},"_meta":{"kiro":{"type":"steering","contextQuery":"global:architecture-selection","commandId":"architecture-selection","resource":{"resourceType":"steering","source":{"origin":"bundled"}},"originalName":"architecture-selection"}}},{"name":"quick-spec","description":"Steering: quick-spec","input":{"hint":"optional context"},"_meta":{"kiro":{"type":"steering","contextQuery":"global:quick-spec","commandId":"quick-spec","resource":{"resourceType":"steering","source":{"origin":"bundled"}},"originalName":"quick-spec"}}},{"name":"bug-fix","description":"Steering: bug-fix","input":{"hint":"optional context"},"_meta":{"kiro":{"type":"steering","contextQuery":"global:bug-fix","commandId":"bug-fix","resource":{"resourceType":"steering","source":{"origin":"bundled"}},"originalName":"bug-fix"}}},{"name":"general-task-execution","description":"General-purpose sub-agent with access to all tools for executing arbitrary tasks","input":{"hint":"task to delegate"},"_meta":{"kiro":{"type":"custom-agent","commandId":"general-task-execution","resource":{"resourceType":"agent","source":{"origin":"bundled"}},"originalName":"general-task-execution"}}},{"name":"context-gatherer","description":"Investigates the codebase to answer a specific question about it. Deeply analyzes existing code by tracing execution paths, mapping architecture and abstraction layers, understanding patterns, and documenting dependencies, returning a thorough, direct written analysis that explains how the relevant code works and points to the specific files and lines involved. Use it to understand code before you change it: before designing or implementing a change to code you don't already fully understand, start with context-gatherer so your edits are grounded in how the code actually works. When a task requires understanding code you don't already know, dispatch context-gatherer to do that exploration before running your own searches or reads. Rules: 1. Provide a clear, specific prompt that includes your intent: a detailed task description of the context you need and what you're trying to accomplish. 2. The subagent explores the codebase and returns an analysis of your query 3. Trust the returned results. You may still inspect additional code yourself when you need context beyond what was returned. 4. Reuse existing context-gatherer output for related follow-up questions; do not re-invoke on the same question with different phrasing. 5. For multiple distinct questions, dispatch several context-gatherers in parallel, each targeting a different aspect of the codebase.","input":{"hint":"task to delegate"},"_meta":{"kiro":{"type":"custom-agent","commandId":"context-gatherer","resource":{"resourceType":"agent","source":{"origin":"bundled"}},"originalName":"context-gatherer"}}}]}}}}
diff --git a/apps/server/src/orchestration-v2/testkit/fixtures/provider_thread_resume/input.ts b/apps/server/src/orchestration-v2/testkit/fixtures/provider_thread_resume/input.ts
index 50625a832ce2..d4ae2dc064f9 100644
--- a/apps/server/src/orchestration-v2/testkit/fixtures/provider_thread_resume/input.ts
+++ b/apps/server/src/orchestration-v2/testkit/fixtures/provider_thread_resume/input.ts
@@ -9,7 +9,7 @@ export function providerThreadResumeInput(): OrchestratorFixtureInput {
   return {
     steps: [
       { type: "message", text: PROVIDER_THREAD_RESUME_FIRST_PROMPT },
-      { type: "advance_clock", duration: "31 minutes" },
+      { type: "advance_clock", duration: "31 minutes", releasesProviderSession: true },
       { type: "message", text: PROVIDER_THREAD_RESUME_SECOND_PROMPT },
     ],
   };
diff --git a/apps/server/src/orchestration-v2/testkit/fixtures/provider_thread_resume/kiro_output.ts b/apps/server/src/orchestration-v2/testkit/fixtures/provider_thread_resume/kiro_output.ts
deleted file mode 100644
index fc6ed73ca013..000000000000
--- a/apps/server/src/orchestration-v2/testkit/fixtures/provider_thread_resume/kiro_output.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import { assert } from "@effect/vitest";
-import type { ProviderReplayTranscript } from "@t3tools/contracts";
-
-import type { OrchestratorV2ScenarioResult } from "../../OrchestratorScenario.ts";
-import {
-  assertBaseProjection,
-  assertSemanticProjectionIntegrity,
-  assertUserMessagesInclude,
-  projectionFor,
-  PROVIDER_THREAD_RESUME_FIRST_PROMPT,
-  PROVIDER_THREAD_RESUME_SECOND_PROMPT,
-} from "../shared.ts";
-
-const FIRST_FINAL = "provider thread resume fixture first turn complete";
-
-function field(value: unknown, key: string): unknown {
-  return typeof value === "object" && value !== null ? Reflect.get(value, key) : undefined;
-}
-
-/**
- * After the idle release a fresh `kiro-cli acp` process must `session/load`
- * the first session, and the resumed model still sees the first exchange.
- */
-export function assertKiroProviderThreadResumeOutput(
-  result: OrchestratorV2ScenarioResult,
-  transcript: ProviderReplayTranscript,
-) {
-  const requests = transcript.entries.flatMap((entry) =>
-    entry.type === "expect_outbound" && field(entry.frame, "kind") === "request"
-      ? [field(entry.frame, "method")]
-      : [],
-  );
-  assert.equal(
-    requests.filter((method) => method === "initialize").length,
-    2,
-    "the idle release must retire the first Kiro process",
-  );
-  assert.deepEqual(
-    requests.filter((method) => method === "session/new" || method === "session/load"),
-    ["session/new", "session/load"],
-    "the respawned process must load the first session, not start another",
-  );
-
-  assertBaseProjection({
-    result,
-    transcript,
-    runCount: 2,
-    runStatuses: ["completed", "completed"],
-  });
-  const projection = projectionFor(result, transcript.scenario);
-  assertSemanticProjectionIntegrity(projection);
-  assertUserMessagesInclude(projection, [
-    PROVIDER_THREAD_RESUME_FIRST_PROMPT,
-    PROVIDER_THREAD_RESUME_SECOND_PROMPT,
-  ]);
-  assert.lengthOf(projection.providerThreads, 1, "resume must keep one provider thread");
-  const answers = projection.turnItems.flatMap((item) =>
-    item.type === "assistant_message" ? [item.text] : [],
-  );
-  assert.include(answers.at(-1), FIRST_FINAL, "the resumed session must remember the first answer");
-}
diff --git a/apps/server/src/orchestration-v2/testkit/fixtures/provider_thread_resume/kiro_transcript.ndjson b/apps/server/src/orchestration-v2/testkit/fixtures/provider_thread_resume/kiro_transcript.ndjson
deleted file mode 100644
index 2f5d9833e73c..000000000000
--- a/apps/server/src/orchestration-v2/testkit/fixtures/provider_thread_resume/kiro_transcript.ndjson
+++ /dev/null
@@ -1,65 +0,0 @@
-{"type":"transcript_start","provider":"kiro","protocol":"acp.ndjson-jsonrpc","version":"1","scenario":"provider_thread_resume","metadata":{"generatedBy":"live-kiro-recorder","kiroVersion":"2.32.0","normalization":"Session ids are fixed sess_ UUIDs and other UUIDs (message and request ids) are numbered in first-seen order, the workspace is <workspace>, HOME is /home/kiro-replay and the recording user is kiro-replay. T3-owned prompt text, MCP servers and initialize params other than clientCapabilities and _meta are <any>. Kiro's log directory, user-scoped commands and agents, and the _kiro/* broadcasts T3 ignores (governance, steering documents, powers, tools, hooks, MCP status, session roster) are removed. Timestamps are kept as recorded.","droppedFrames":26}}
-{"type":"expect_outbound","label":"request:initialize","frame":{"kind":"request","method":"initialize","params":{"protocolVersion":2,"info":"<any>","capabilities":"<any>","clientCapabilities":{"fs":{"readTextFile":false,"writeTextFile":false},"terminal":false,"session":{"notices":{}},"elicitation":{"form":{}},"_meta":{"kiro":{"hooks":{"enabled":true,"v2":true}}}},"clientInfo":"<any>"}}}
-{"type":"emit_inbound","label":"response:initialize","frame":{"kind":"response","method":"initialize","result":{"protocolVersion":2,"agentCapabilities":{"loadSession":true,"promptCapabilities":{"image":true,"embeddedContext":true},"mcpCapabilities":{"http":true,"sse":true},"sessionCapabilities":{"list":{},"close":{},"delete":{},"fork":{"_meta":{"kiro":{"messageId":true}}}},"_meta":{"kiro":{"checkpoints":true,"sessionList":true,"policyNotifications":true,"extensionMethods":["_kiro/knowledge","_kiro/memory/list","_kiro/memory/get","_kiro/memory/create","_kiro/memory/update","_kiro/memory/delete","_kiro/codeIntelligence","_kiro/session/context","_kiro/session/compact","_kiro/session/export","_kiro/session/history","_kiro/config/template","_kiro/workflow/new","_kiro/workflow/invoke","_kiro/workflow/load","_kiro/workflow/inspect","_kiro/workflow/list","_kiro/workflow/pause","_kiro/workflow/cancel","_kiro/workflow/delete","_kiro/workflow/listRecipes","_kiro/workflow/listWatchHandlers","_kiro/workflow/resumeAll","_kiro/workflow/retry","_kiro/workflow/update","_kiro/workflow/resume","_kiro/sourceProviders/list","_kiro/sourceProviders/listResources"],"sessionSources":["local","remote"],"sessionListScopes":["workspace","user"],"executionTargets":["local","cloud-sandbox"],"sourceProviders":true,"replayMarking":true}}},"authMethods":[{"id":"aws-builder-id","name":"AWS Builder ID"},{"id":"aws-iam-identity-center","name":"AWS IAM Identity Center"}]}}}
-{"type":"expect_outbound","label":"request:session/new","frame":{"kind":"request","method":"session/new","params":{"cwd":"<workspace>","mcpServers":"<any>"}}}
-{"type":"emit_inbound","label":"notification:session/update:available_commands_update","frame":{"kind":"notification","method":"session/update","params":{"sessionId":"sess_00000000-0000-4000-8000-000000000001","update":{"sessionUpdate":"available_commands_update","availableCommands":[{"name":"architecture-selection","description":"Steering: architecture-selection","input":{"hint":"optional context"},"_meta":{"kiro":{"type":"steering","contextQuery":"global:architecture-selection","commandId":"architecture-selection","resource":{"resourceType":"steering","source":{"origin":"bundled"}},"originalName":"architecture-selection"}}},{"name":"quick-spec","description":"Steering: quick-spec","input":{"hint":"optional context"},"_meta":{"kiro":{"type":"steering","contextQuery":"global:quick-spec","commandId":"quick-spec","resource":{"resourceType":"steering","source":{"origin":"bundled"}},"originalName":"quick-spec"}}},{"name":"bug-fix","description":"Steering: bug-fix","input":{"hint":"optional context"},"_meta":{"kiro":{"type":"steering","contextQuery":"global:bug-fix","commandId":"bug-fix","resource":{"resourceType":"steering","source":{"origin":"bundled"}},"originalName":"bug-fix"}}},{"name":"general-task-execution","description":"General-purpose sub-agent with access to all tools for executing arbitrary tasks","input":{"hint":"task to delegate"},"_meta":{"kiro":{"type":"custom-agent","commandId":"general-task-execution","resource":{"resourceType":"agent","source":{"origin":"bundled"}},"originalName":"general-task-execution"}}},{"name":"context-gatherer","description":"Investigates the codebase to answer a specific question about it. Deeply analyzes existing code by tracing execution paths, mapping architecture and abstraction layers, understanding patterns, and documenting dependencies, returning a thorough, direct written analysis that explains how the relevant code works and points to the specific files and lines involved. Use it to understand code before you change it: before designing or implementing a change to code you don't already fully understand, start with context-gatherer so your edits are grounded in how the code actually works. When a task requires understanding code you don't already know, dispatch context-gatherer to do that exploration before running your own searches or reads. Rules: 1. Provide a clear, specific prompt that includes your intent: a detailed task description of the context you need and what you're trying to accomplish. 2. The subagent explores the codebase and returns an analysis of your query 3. Trust the returned results. You may still inspect additional code yourself when you need context beyond what was returned. 4. Reuse existing context-gatherer output for related follow-up questions; do not re-invoke on the same question with different phrasing. 5. For multiple distinct questions, dispatch several context-gatherers in parallel, each targeting a different aspect of the codebase.","input":{"hint":"task to delegate"},"_meta":{"kiro":{"type":"custom-agent","commandId":"context-gatherer","resource":{"resourceType":"agent","source":{"origin":"bundled"}},"originalName":"context-gatherer"}}}]}}}}
-{"type":"emit_inbound","label":"response:session/new","frame":{"kind":"response","method":"session/new","result":{"_meta":{"schemaVersion":"1.0.0","id":"sess_00000000-0000-4000-8000-000000000001","title":"New Session","agentMode":"vibe","workspacePaths":["<workspace>"],"createdAt":"2026-10-19T20:48:11.040Z","lastModifiedAt":"2026-10-19T20:48:11.040Z","semanticReviewEnabled":true,"memoryConfig":{"mode":"read_write","reflection":true},"disableAutoCompaction":false,"ftaEnabled":false,"workflowsEnabled":false,"specPlanEnabled":false,"specWorkflow":"quick","specSkipClarificationEnabled":true,"source":"local"},"sessionId":"sess_00000000-0000-4000-8000-000000000001","modes":{"availableModes":[{"id":"vibe","name":"Default","description":"General coding assistance","_meta":{"kiro":{"source":"bundled","resource":{"resourceType":"agent","source":{"origin":"bundled"}}}}},{"id":"spec","name":"Spec","description":"Structured feature development","_meta":{"kiro":{"source":"bundled","resource":{"resourceType":"agent","source":{"origin":"bundled"}}}}},{"id":"quick-spec","name":"Quick Spec","description":"Fast spec workflow: clarify, then auto-generate requirements, design, and tasks","_meta":{"kiro":{"source":"bundled","resource":{"resourceType":"agent","source":{"origin":"bundled"}}}}},{"id":"bug-fix","name":"Bug Fix","description":"Structured bug-fix workflow: investigate, diagnose, and resolve bugs","_meta":{"kiro":{"source":"bundled","resource":{"resourceType":"agent","source":{"origin":"bundled"}}}}},{"id":"plan","name":"Plan","description":"Plan-only mode that helps break ideas down into an implementation plan without making any changes","_meta":{"kiro":{"welcomeMessage":"Transform any idea into fully working code. What do you want to build today?","source":"bundled","resource":{"resourceType":"agent","source":{"origin":"bundled"}}}}},{"id":"autonomous","name":"Autonomous","description":"Autonomous agent execution","_meta":{"kiro":{"source":"bundled","resource":{"resourceType":"agent","source":{"origin":"bundled"}}}}},{"id":"semantic_reviewer","name":"semantic_reviewer","description":"Behavioral, narrative code review of a local or PR diff. Writes a review document and a verdict.","_meta":{"kiro":{"source":"bundled","resource":{"resourceType":"agent","source":{"origin":"bundled"}}}}}],"currentModeId":"vibe"},"configOptions":[{"type":"select","id":"mode","name":"Mode","category":"mode","currentValue":"vibe","options":[{"value":"vibe","name":"Default","description":"General coding assistance","_meta":{"kiro":{"source":"bundled","resource":{"resourceType":"agent","source":{"origin":"bundled"}}}}},{"value":"spec","name":"Spec","description":"Structured feature development","_meta":{"kiro":{"source":"bundled","resource":{"resourceType":"agent","source":{"origin":"bundled"}}}}},{"value":"quick-spec","name":"Quick Spec","description":"Fast spec workflow: clarify, then auto-generate requirements, design, and tasks","_meta":{"kiro":{"source":"bundled","resource":{"resourceType":"agent","source":{"origin":"bundled"}}}}},{"value":"bug-fix","name":"Bug Fix","description":"Structured bug-fix workflow: investigate, diagnose, and resolve bugs","_meta":{"kiro":{"source":"bundled","resource":{"resourceType":"agent","source":{"origin":"bundled"}}}}},{"value":"plan","name":"Plan","description":"Plan-only mode that helps break ideas down into an implementation plan without making any changes","_meta":{"kiro":{"welcomeMessage":"Transform any idea into fully working code. What do you want to build today?","source":"bundled","resource":{"resourceType":"agent","source":{"origin":"bundled"}}}}},{"value":"autonomous","name":"Autonomous","description":"Autonomous agent execution","_meta":{"kiro":{"source":"bundled","resource":{"resourceType":"agent","source":{"origin":"bundled"}}}}},{"value":"semantic_reviewer","name":"semantic_reviewer","description":"Behavioral, narrative code review of a local or PR diff. Writes a review document and a verdict.","_meta":{"kiro":{"source":"bundled","resource":{"resourceType":"agent","source":{"origin":"bundled"}}}}}]},{"type":"select","id":"memoryReflection","name":"Memory reflection","description":"Allow this session to reflect on new memory","currentValue":"on","options":[{"value":"on","name":"On"},{"value":"off","name":"Off"}]},{"type":"select","id":"autopilot","name":"Autopilot","currentValue":"on","options":[{"value":"on","name":"Autopilot","description":"Agent executes tools without confirmation"},{"value":"off","name":"Supervised","description":"Agent asks for approval before file changes"}]},{"type":"select","id":"contentCollection","name":"Content Collection","currentValue":"enabled","options":[{"value":"enabled","name":"Enabled","description":"Allow content to be used for service improvement"},{"value":"disabled","name":"Disabled","description":"Opt out of content collection"}]}]}}}
-{"type":"expect_outbound","label":"request:session/set_config_option","frame":{"kind":"request","method":"session/set_config_option","params":{"sessionId":"sess_00000000-0000-4000-8000-000000000001","configId":"model","value":"claude-haiku-4.5"}}}
-{"type":"emit_inbound","label":"notification:session/update:session_info_update","frame":{"kind":"notification","method":"session/update","params":{"sessionId":"sess_00000000-0000-4000-8000-000000000001","update":{"sessionUpdate":"session_info_update","_meta":{"kiro":{"contextUsage":{"usagePercentage":0.9},"breakdown":{"contextFiles":{"tokens":0,"percent":0,"items":[]},"tools":{"tokens":5481,"percent":0.5,"mcp":{"tokens":0,"percent":0},"builtin":{"tokens":5481,"percent":0.5}},"memory":{"tokens":0,"percent":0},"kiroResponses":{"tokens":0,"percent":0},"yourPrompts":{"tokens":4305,"percent":0.4},"sessionFiles":{"tokens":0,"percent":0,"items":[]}},"kind":"context_usage","usagePercentage":0.9}}}}}}
-{"type":"emit_inbound","label":"notification:session/update:available_commands_update","frame":{"kind":"notification","method":"session/update","params":{"sessionId":"sess_00000000-0000-4000-8000-000000000001","update":{"sessionUpdate":"available_commands_update","availableCommands":[{"name":"architecture-selection","description":"Steering: architecture-selection","input":{"hint":"optional context"},"_meta":{"kiro":{"type":"steering","contextQuery":"global:architecture-selection","commandId":"architecture-selection","resource":{"resourceType":"steering","source":{"origin":"bundled"}},"originalName":"architecture-selection"}}},{"name":"quick-spec","description":"Steering: quick-spec","input":{"hint":"optional context"},"_meta":{"kiro":{"type":"steering","contextQuery":"global:quick-spec","commandId":"quick-spec","resource":{"resourceType":"steering","source":{"origin":"bundled"}},"originalName":"quick-spec"}}},{"name":"bug-fix","description":"Steering: bug-fix","input":{"hint":"optional context"},"_meta":{"kiro":{"type":"steering","contextQuery":"global:bug-fix","commandId":"bug-fix","resource":{"resourceType":"steering","source":{"origin":"bundled"}},"originalName":"bug-fix"}}},{"name":"general-task-execution","description":"General-purpose sub-agent with access to all tools for executing arbitrary tasks","input":{"hint":"task to delegate"},"_meta":{"kiro":{"type":"custom-agent","commandId":"general-task-execution","resource":{"resourceType":"agent","source":{"origin":"bundled"}},"originalName":"general-task-execution"}}},{"name":"context-gatherer","description":"Investigates the codebase to answer a specific question about it. Deeply analyzes existing code by tracing execution paths, mapping architecture and abstraction layers, understanding patterns, and documenting dependencies, returning a thorough, direct written analysis that explains how the relevant code works and points to the specific files and lines involved. Use it to understand code before you change it: before designing or implementing a change to code you don't already fully understand, start with context-gatherer so your edits are grounded in how the code actually works. When a task requires understanding code you don't already know, dispatch context-gatherer to do that exploration before running your own searches or reads. Rules: 1. Provide a clear, specific prompt that includes your intent: a detailed task description of the context you need and what you're trying to accomplish. 2. The subagent explores the codebase and returns an analysis of your query 3. Trust the returned results. You may still inspect additional code yourself when you need context beyond what was returned. 4. Reuse existing context-gatherer output for related follow-up questions; do not re-invoke on the same question with different phrasing. 5. For multiple distinct questions, dispatch several context-gatherers in parallel, each targeting a different aspect of the codebase.","input":{"hint":"task to delegate"},"_meta":{"kiro":{"type":"custom-agent","commandId":"context-gatherer","resource":{"resourceType":"agent","source":{"origin":"bundled"}},"originalName":"context-gatherer"}}}]}}}}
-{"type":"emit_inbound","label":"response:session/set_config_option","frame":{"kind":"response","method":"session/set_config_option","result":{"configOptions":[{"type":"select","id":"mode","name":"Mode","category":"mode","currentValue":"vibe","options":[{"value":"vibe","name":"Default","description":"General coding assistance","_meta":{"kiro":{"source":"bundled","resource":{"resourceType":"agent","source":{"origin":"bundled"}}}}},{"value":"spec","name":"Spec","description":"Structured feature development","_meta":{"kiro":{"source":"bundled","resource":{"resourceType":"agent","source":{"origin":"bundled"}}}}},{"value":"quick-spec","name":"Quick Spec","description":"Fast spec workflow: clarify, then auto-generate requirements, design, and tasks","_meta":{"kiro":{"source":"bundled","resource":{"resourceType":"agent","source":{"origin":"bundled"}}}}},{"value":"bug-fix","name":"Bug Fix","description":"Structured bug-fix workflow: investigate, diagnose, and resolve bugs","_meta":{"kiro":{"source":"bundled","resource":{"resourceType":"agent","source":{"origin":"bundled"}}}}},{"value":"plan","name":"Plan","description":"Plan-only mode that helps break ideas down into an implementation plan without making any changes","_meta":{"kiro":{"welcomeMessage":"Transform any idea into fully working code. What do you want to build today?","source":"bundled","resource":{"resourceType":"agent","source":{"origin":"bundled"}}}}},{"value":"autonomous","name":"Autonomous","description":"Autonomous agent execution","_meta":{"kiro":{"source":"bundled","resource":{"resourceType":"agent","source":{"origin":"bundled"}}}}},{"value":"semantic_reviewer","name":"semantic_reviewer","description":"Behavioral, narrative code review of a local or PR diff. Writes a review document and a verdict.","_meta":{"kiro":{"source":"bundled","resource":{"resourceType":"agent","source":{"origin":"bundled"}}}}}]},{"type":"select","id":"memoryReflection","name":"Memory reflection","description":"Allow this session to reflect on new memory","currentValue":"on","options":[{"value":"on","name":"On"},{"value":"off","name":"Off"}]},{"type":"select","id":"autopilot","name":"Autopilot","currentValue":"on","options":[{"value":"on","name":"Autopilot","description":"Agent executes tools without confirmation"},{"value":"off","name":"Supervised","description":"Agent asks for approval before file changes"}]},{"type":"select","id":"contentCollection","name":"Content Collection","currentValue":"enabled","options":[{"value":"enabled","name":"Enabled","description":"Allow content to be used for service improvement"},{"value":"disabled","name":"Disabled","description":"Opt out of content collection"}]}]}}}
-{"type":"emit_inbound","label":"notification:session/update:config_option_update","frame":{"kind":"notification","method":"session/update","params":{"sessionId":"sess_00000000-0000-4000-8000-000000000001","update":{"sessionUpdate":"config_option_update","configOptions":[{"type":"select","id":"mode","name":"Mode","category":"mode","currentValue":"vibe","options":[{"value":"vibe","name":"Default","description":"General coding assistance","_meta":{"kiro":{"source":"bundled","resource":{"resourceType":"agent","source":{"origin":"bundled"}}}}},{"value":"spec","name":"Spec","description":"Structured feature development","_meta":{"kiro":{"source":"bundled","resource":{"resourceType":"agent","source":{"origin":"bundled"}}}}},{"value":"quick-spec","name":"Quick Spec","description":"Fast spec workflow: clarify, then auto-generate requirements, design, and tasks","_meta":{"kiro":{"source":"bundled","resource":{"resourceType":"agent","source":{"origin":"bundled"}}}}},{"value":"bug-fix","name":"Bug Fix","description":"Structured bug-fix workflow: investigate, diagnose, and resolve bugs","_meta":{"kiro":{"source":"bundled","resource":{"resourceType":"agent","source":{"origin":"bundled"}}}}},{"value":"plan","name":"Plan","description":"Plan-only mode that helps break ideas down into an implementation plan without making any changes","_meta":{"kiro":{"welcomeMessage":"Transform any idea into fully working code. What do you want to build today?","source":"bundled","resource":{"resourceType":"agent","source":{"origin":"bundled"}}}}},{"value":"autonomous","name":"Autonomous","description":"Autonomous agent execution","_meta":{"kiro":{"source":"bundled","resource":{"resourceType":"agent","source":{"origin":"bundled"}}}}},{"value":"semantic_reviewer","name":"semantic_reviewer","description":"Behavioral, narrative code review of a local or PR diff. Writes a review document and a verdict.","_meta":{"kiro":{"source":"bundled","resource":{"resourceType":"agent","source":{"origin":"bundled"}}}}}]},{"type":"select","id":"model","name":"Model","category":"model","currentValue":"claude-haiku-4.5","options":[{"value":"auto","name":"Auto","description":"Models chosen by task for optimal usage and consistent quality","_meta":{"kiro":{"rateMultiplier":1,"rateUnit":"Credit","hasEffort":false,"thinkingToggleable":false}}},{"value":"claude-opus-5.5","name":"Claude Opus 5.5","description":"Experimental preview of Claude Opus 5.5 model with 1M context window","_meta":{"kiro":{"rateMultiplier":2,"rateUnit":"Credit","hasEffort":true,"effortSchemaPath":"output_config","effortLevels":["low","medium","high","xhigh","max"],"defaultEffortLevel":"medium","thinkingToggleable":false}}},{"value":"claude-sonnet-5.5","name":"Claude Sonnet 5.5","description":"Claude Sonnet 5.5 model with 1M context window","_meta":{"kiro":{"rateMultiplier":1.3,"rateUnit":"Credit","hasEffort":true,"effortSchemaPath":"output_config","effortLevels":["low","medium","high","xhigh","max"],"defaultEffortLevel":"high","thinkingToggleable":false}}},{"value":"claude-opus-5","name":"Claude Opus 5","description":"Claude Opus 5 model with 1M context window","_meta":{"kiro":{"rateMultiplier":2.2,"rateUnit":"Credit","hasEffort":true,"effortSchemaPath":"output_config","effortLevels":["low","medium","high","xhigh","max"],"defaultEffortLevel":"high","thinkingToggleable":true,"defaultThinkingEnabled":true}}},{"value":"claude-sonnet-5","name":"Claude Sonnet 5","description":"Claude Sonnet 5 model with 1M context window","_meta":{"kiro":{"rateMultiplier":1.3,"rateUnit":"Credit","hasEffort":true,"effortSchemaPath":"output_config","effortLevels":["low","medium","high","xhigh","max"],"defaultEffortLevel":"high","thinkingToggleable":true,"defaultThinkingEnabled":true}}},{"value":"claude-opus-4.8","name":"Claude Opus 4.8","description":"Claude Opus 4.8 model with 1M context window","_meta":{"kiro":{"rateMultiplier":2.2,"rateUnit":"Credit","hasEffort":true,"effortSchemaPath":"output_config","effortLevels":["low","medium","high","xhigh","max"],"defaultEffortLevel":"high","thinkingToggleable":true,"defaultThinkingEnabled":true}}},{"value":"gpt-5.6-sol","name":"GPT 5.6 Sol","description":"Experimental preview of OpenAI GPT 5.6 Sol with 1M context window","_meta":{"kiro":{"rateMultiplier":4.4,"rateUnit":"Credit","hasEffort":true,"effortSchemaPath":"reasoning","effortLevels":["none","low","medium","high","xhigh","max"],"defaultEffortLevel":"high","thinkingToggleable":false}}},{"value":"gpt-5.6-terra","name":"GPT 5.6 Terra","description":"Experimental preview of OpenAI GPT 5.6 Terra with 1M context window","_meta":{"kiro":{"rateMultiplier":2.2,"rateUnit":"Credit","hasEffort":true,"effortSchemaPath":"reasoning","effortLevels":["none","low","medium","high","xhigh","max"],"defaultEffortLevel":"high","thinkingToggleable":false}}},{"value":"gpt-5.6-luna","name":"GPT 5.6 Luna","description":"Experimental preview of OpenAI GPT 5.6 Luna with 1M context window","_meta":{"kiro":{"rateMultiplier":0.6,"rateUnit":"Credit","hasEffort":true,"effortSchemaPath":"reasoning","effortLevels":["none","low","medium","high","xhigh","max"],"defaultEffortLevel":"high","thinkingToggleable":false}}},{"value":"claude-opus-4.7","name":"Claude Opus 4.7","description":"Claude Opus 4.7 model with 1M context window","_meta":{"kiro":{"rateMultiplier":2.2,"rateUnit":"Credit","hasEffort":true,"effortSchemaPath":"output_config","effortLevels":["low","medium","high","xhigh","max"],"defaultEffortLevel":"xhigh","thinkingToggleable":true,"defaultThinkingEnabled":true}}},{"value":"claude-opus-4.6","name":"Claude Opus 4.6","description":"Claude Opus 4.6 model with 1M context window","_meta":{"kiro":{"rateMultiplier":2.2,"rateUnit":"Credit","hasEffort":true,"effortSchemaPath":"output_config","effortLevels":["low","medium","high","max"],"defaultEffortLevel":"high","thinkingToggleable":true,"defaultThinkingEnabled":true}}},{"value":"claude-sonnet-4.6","name":"Claude Sonnet 4.6","description":"Claude Sonnet 4.6 model with 1M context window","_meta":{"kiro":{"rateMultiplier":1.3,"rateUnit":"Credit","hasEffort":true,"effortSchemaPath":"output_config","effortLevels":["low","medium","high","max"],"defaultEffortLevel":"high","thinkingToggleable":true,"defaultThinkingEnabled":true}}},{"value":"claude-opus-4.5","name":"Claude Opus 4.5","description":"Claude Opus 4.5 model","_meta":{"kiro":{"rateMultiplier":2.2,"rateUnit":"Credit","hasEffort":false,"thinkingToggleable":false}}},{"value":"claude-sonnet-4.5","name":"Claude Sonnet 4.5","description":"Claude Sonnet 4.5 model","_meta":{"kiro":{"rateMultiplier":1.3,"rateUnit":"Credit","hasEffort":false,"thinkingToggleable":false}}},{"value":"claude-haiku-4.5","name":"Claude Haiku 4.5","description":"The latest Claude Haiku model","_meta":{"kiro":{"rateMultiplier":0.4,"rateUnit":"Credit","hasEffort":false,"thinkingToggleable":false}}},{"value":"deepseek-3.2","name":"Deepseek v3.2","description":"Experimental preview of DeepSeek V3.2","_meta":{"kiro":{"rateMultiplier":0.25,"rateUnit":"Credit","hasEffort":false,"thinkingToggleable":false}}},{"value":"minimax-m2.5","name":"MiniMax M2.5","description":"MiniMax M2.5 model","_meta":{"kiro":{"rateMultiplier":0.25,"rateUnit":"Credit","hasEffort":false,"thinkingToggleable":false}}},{"value":"minimax-m2.1","name":"MiniMax M2.1","description":"Experimental preview of MiniMax M2.1","_meta":{"kiro":{"rateMultiplier":0.15,"rateUnit":"Credit","hasEffort":false,"thinkingToggleable":false}}},{"value":"glm-5","name":"GLM 5","description":"GLM-5 model","_meta":{"kiro":{"rateMultiplier":0.5,"rateUnit":"Credit","hasEffort":false,"thinkingToggleable":false}}},{"value":"qwen3-coder-next","name":"Qwen3 Coder Next","description":"Experimental preview of Qwen3 Coder Next","_meta":{"kiro":{"rateMultiplier":0.05,"rateUnit":"Credit","hasEffort":false,"thinkingToggleable":false}}},{"value":"kimi-k3","name":"Kimi K3","description":"Experimental preview of Kimi K3. Kimi K3 is a Kiro Excluded Model. For more info, see documentation.","_meta":{"kiro":{"rateMultiplier":2.4,"rateUnit":"Credit","hasEffort":true,"effortSchemaPath":"reasoning","effortLevels":["low","high","max"],"defaultEffortLevel":"max","thinkingToggleable":false}}}]},{"type":"select","id":"memoryReflection","name":"Memory reflection","description":"Allow this session to reflect on new memory","currentValue":"on","options":[{"value":"on","name":"On"},{"value":"off","name":"Off"}]},{"type":"select","id":"autopilot","name":"Autopilot","currentValue":"on","options":[{"value":"on","name":"Autopilot","description":"Agent executes tools without confirmation"},{"value":"off","name":"Supervised","description":"Agent asks for approval before file changes"}]},{"type":"select","id":"contentCollection","name":"Content Collection","currentValue":"enabled","options":[{"value":"enabled","name":"Enabled","description":"Allow content to be used for service improvement"},{"value":"disabled","name":"Disabled","description":"Opt out of content collection"}]}]}}}}
-{"type":"expect_outbound","label":"request:session/prompt","frame":{"kind":"request","method":"session/prompt","params":{"sessionId":"sess_00000000-0000-4000-8000-000000000001","prompt":[{"type":"text","text":"<t3_code_instructions>\n<any>\n</t3_code_instructions>\n\n<user_request>\nRespond with exactly: provider thread resume fixture first turn complete\n</user_request>"}]}}}
-{"type":"emit_inbound","label":"notification:session/update:session_info_update","frame":{"kind":"notification","method":"session/update","params":{"sessionId":"sess_00000000-0000-4000-8000-000000000001","update":{"sessionUpdate":"session_info_update","_meta":{"kiro":{"userMessageId":"00000000-0000-4000-9000-000000000001","kind":"user_message_id_assigned"}}}}}}
-{"type":"emit_inbound","label":"notification:session/update:session_info_update","frame":{"kind":"notification","method":"session/update","params":{"sessionId":"sess_00000000-0000-4000-8000-000000000001","update":{"sessionUpdate":"session_info_update","title":"<t3_code_instructions>","_meta":{"kiro":{"focus":{"title":"<t3_code_instructions>"},"kind":"focus_update","title":"<t3_code_instructions>"}}}}}}
-{"type":"emit_inbound","label":"notification:session/update:session_info_update","frame":{"kind":"notification","method":"session/update","params":{"sessionId":"sess_00000000-0000-4000-8000-000000000001","update":{"sessionUpdate":"session_info_update","_meta":{"kiro":{"focus":{"status":"in_progress"},"kind":"focus_update","status":"in_progress","activity":{"turnActive":true,"runningWorkflows":0,"pausedWorkflows":0}}}}}}}
-{"type":"emit_inbound","label":"notification:session/update:session_info_update","frame":{"kind":"notification","method":"session/update","params":{"sessionId":"sess_00000000-0000-4000-8000-000000000001","update":{"sessionUpdate":"session_info_update","_meta":{"kiro":{"turnStart":true,"kind":"turn_start","messageId":"00000000-0000-4000-9000-000000000002-turn-start"}}}}}}
-{"type":"emit_inbound","label":"notification:session/update:session_info_update","frame":{"kind":"notification","method":"session/update","params":{"sessionId":"sess_00000000-0000-4000-8000-000000000001","update":{"sessionUpdate":"session_info_update","title":"provider thread resume fixture first turn complete","_meta":{"kiro":{"focus":{"title":"provider thread resume fixture first turn complete"},"kind":"focus_update","title":"provider thread resume fixture first turn complete"}}}}}}
-{"type":"emit_inbound","label":"notification:session/update:agent_message_chunk","frame":{"kind":"notification","method":"session/update","params":{"sessionId":"sess_00000000-0000-4000-8000-000000000001","update":{"sessionUpdate":"agent_message_chunk","content":{"type":"text","text":"provider"},"_meta":{"kiro":{"replayId":"00000000-0000-4000-9000-000000000003-say"}}}}}}
-{"type":"emit_inbound","label":"notification:session/update:agent_message_chunk","frame":{"kind":"notification","method":"session/update","params":{"sessionId":"sess_00000000-0000-4000-8000-000000000001","update":{"sessionUpdate":"agent_message_chunk","content":{"type":"text","text":" thread resume fixture first turn complete"},"_meta":{"kiro":{"replayId":"00000000-0000-4000-9000-000000000003-say"}}}}}}
-{"type":"emit_inbound","label":"notification:session/update:session_info_update","frame":{"kind":"notification","method":"session/update","params":{"sessionId":"sess_00000000-0000-4000-8000-000000000001","update":{"sessionUpdate":"session_info_update","_meta":{"kiro":{"contextUsage":{"usagePercentage":9.29900074005127},"kind":"context_usage","usagePercentage":9.29900074005127}}}}}}
-{"type":"emit_inbound","label":"notification:session/update:session_info_update","frame":{"kind":"notification","method":"session/update","params":{"sessionId":"sess_00000000-0000-4000-8000-000000000001","update":{"sessionUpdate":"session_info_update","_meta":{"kiro":{"contextUsage":{"usagePercentage":9.29900074005127},"breakdown":{"contextFiles":{"tokens":0,"percent":0,"items":[]},"tools":{"tokens":5481,"percent":0.5,"mcp":{"tokens":0,"percent":0},"builtin":{"tokens":5481,"percent":0.5}},"memory":{"tokens":0,"percent":0},"kiroResponses":{"tokens":0,"percent":0},"yourPrompts":{"tokens":0,"percent":8.8},"sessionFiles":{"tokens":0,"percent":0,"items":[]}},"kind":"context_usage","usagePercentage":9.29900074005127}}}}}}
-{"type":"emit_inbound","label":"notification:session/update:session_info_update","frame":{"kind":"notification","method":"session/update","params":{"sessionId":"sess_00000000-0000-4000-8000-000000000001","update":{"sessionUpdate":"session_info_update","_meta":{"kiro":{"promptTurnSummaries":[{"unit":"credit","unitPlural":"credits","usage":0.023869583416252074}],"elapsedTime":1347,"status":"success","kind":"turn_completion","requestIds":["00000000-0000-4000-9000-000000000004"]}}}}}}
-{"type":"emit_inbound","label":"notification:session/update:session_info_update","frame":{"kind":"notification","method":"session/update","params":{"sessionId":"sess_00000000-0000-4000-8000-000000000001","update":{"sessionUpdate":"session_info_update","_meta":{"kiro":{"turnEnd":{"stopReason":"end_turn"},"kind":"turn_end","stopReason":"end_turn","messageId":"00000000-0000-4000-9000-000000000002-turn-end"}}}}}}
-{"type":"emit_inbound","label":"notification:session/update:session_info_update","frame":{"kind":"notification","method":"session/update","params":{"sessionId":"sess_00000000-0000-4000-8000-000000000001","update":{"sessionUpdate":"session_info_update","_meta":{"kiro":{"focus":{"status":"idle"},"kind":"focus_update","status":"idle","activity":{"turnActive":false,"runningWorkflows":0,"pausedWorkflows":0}}}}}}}
-{"type":"emit_inbound","label":"response:session/prompt","frame":{"kind":"response","method":"session/prompt","result":{"stopReason":"end_turn"}}}
-{"type":"emit_inbound","label":"notification:session/update:session_info_update","frame":{"kind":"notification","method":"session/update","params":{"sessionId":"sess_00000000-0000-4000-8000-000000000001","update":{"sessionUpdate":"session_info_update","_meta":{"kiro":{"contextUsage":{"usagePercentage":9.29900074005127},"breakdown":{"contextFiles":{"tokens":0,"percent":0,"items":[]},"tools":{"tokens":5481,"percent":0.5,"mcp":{"tokens":0,"percent":0},"builtin":{"tokens":5481,"percent":0.5}},"memory":{"tokens":0,"percent":0},"kiroResponses":{"tokens":13,"percent":0.2},"yourPrompts":{"tokens":466,"percent":8.6},"sessionFiles":{"tokens":0,"percent":0,"items":[]}},"kind":"context_usage","usagePercentage":9.29900074005127}}}}}}
-{"type":"expect_outbound","label":"request:session/close","frame":{"kind":"request","method":"session/close","params":{"sessionId":"sess_00000000-0000-4000-8000-000000000001"}}}
-{"type":"emit_inbound","label":"response:session/close","frame":{"kind":"response","method":"session/close","result":{}}}
-{"type":"runtime_exit","status":"success"}
-{"type":"expect_outbound","label":"request:initialize","frame":{"kind":"request","method":"initialize","params":{"protocolVersion":2,"info":"<any>","capabilities":"<any>","clientCapabilities":{"fs":{"readTextFile":false,"writeTextFile":false},"terminal":false,"session":{"notices":{}},"elicitation":{"form":{}},"_meta":{"kiro":{"hooks":{"enabled":true,"v2":true}}}},"clientInfo":"<any>"}}}
-{"type":"emit_inbound","label":"response:initialize","frame":{"kind":"response","method":"initialize","result":{"protocolVersion":2,"agentCapabilities":{"loadSession":true,"promptCapabilities":{"image":true,"embeddedContext":true},"mcpCapabilities":{"http":true,"sse":true},"sessionCapabilities":{"list":{},"close":{},"delete":{},"fork":{"_meta":{"kiro":{"messageId":true}}}},"_meta":{"kiro":{"checkpoints":true,"sessionList":true,"policyNotifications":true,"extensionMethods":["_kiro/knowledge","_kiro/memory/list","_kiro/memory/get","_kiro/memory/create","_kiro/memory/update","_kiro/memory/delete","_kiro/codeIntelligence","_kiro/session/context","_kiro/session/compact","_kiro/session/export","_kiro/session/history","_kiro/config/template","_kiro/workflow/new","_kiro/workflow/invoke","_kiro/workflow/load","_kiro/workflow/inspect","_kiro/workflow/list","_kiro/workflow/pause","_kiro/workflow/cancel","_kiro/workflow/delete","_kiro/workflow/listRecipes","_kiro/workflow/listWatchHandlers","_kiro/workflow/resumeAll","_kiro/workflow/retry","_kiro/workflow/update","_kiro/workflow/resume","_kiro/sourceProviders/list","_kiro/sourceProviders/listResources"],"sessionSources":["local","remote"],"sessionListScopes":["workspace","user"],"executionTargets":["local","cloud-sandbox"],"sourceProviders":true,"replayMarking":true}}},"authMethods":[{"id":"aws-builder-id","name":"AWS Builder ID"},{"id":"aws-iam-identity-center","name":"AWS IAM Identity Center"}]}}}
-{"type":"expect_outbound","label":"request:session/load","frame":{"kind":"request","method":"session/load","params":{"mcpServers":"<any>","cwd":"<workspace>","sessionId":"sess_00000000-0000-4000-8000-000000000001"}}}
-{"type":"emit_inbound","label":"notification:session/update:user_message_chunk","frame":{"kind":"notification","method":"session/update","params":{"sessionId":"sess_00000000-0000-4000-8000-000000000001","update":{"sessionUpdate":"user_message_chunk","content":{"type":"text","text":"<t3_code_instructions>\n## T3 Code interaction mode: Default\n\nPrefer making reasonable assumptions and carrying out the user's request. Ask a concise question only when a missing user decision would materially change the result. Treat this mode as active until T3 Code supplies a different interaction-mode instruction.\n</t3_code_instructions>\n\n<user_request>\nRespond with exactly: provider thread resume fixture first turn complete\n</user_request>\n<runtime_info>In case you're asked: you are running in T3 Code through the Kiro harness, as claude-haiku-4.5. No need to mention this otherwise. You can embed images and videos in your response using Markdown with absolute file paths.</runtime_info>\n\n<pull_request_linking>\nWhen the t3-code MCP server exposes link_pull_request, you must use it to register every pull request you create or work on for this thread. Call link_pull_request with the full PR URL immediately after creating a PR or starting work on an existing PR. For a stack, call it for every layer, not just the current branch or the top PR. This applies when creating or updating PRs through gh, gh stack, another CLI, or the host API: those operations do not register the PRs with this thread. Linking an already-linked PR is safe. Before finishing PR work, call list_thread_pull_requests and link any PR from your work that is missing. Do not link unrelated PRs mentioned only as background. If a linking call fails, report that failure instead of claiming the PR is linked. When asked to monitor, watch, or babysit a PR and watch_pull_request is available, call it and end your turn: T3 Code wakes you when checks finish, someone else comments, or the branch conflicts, so do not poll or run your own watcher. When you hand the work back to the user, call unwatch_pull_request first so the thread returns to their inbox.\n</pull_request_linking>"},"_meta":{"kiro":{"userMessageTag":"prompt_00000000-0000-4000-9000-000000000005","messageId":"00000000-0000-4000-9000-000000000001","timestamp":"2026-10-19T20:48:11.510Z","replay":true}}}}}}
-{"type":"emit_inbound","label":"notification:session/update:session_info_update","frame":{"kind":"notification","method":"session/update","params":{"sessionId":"sess_00000000-0000-4000-8000-000000000001","update":{"sessionUpdate":"session_info_update","_meta":{"kiro":{"turnStart":true,"kind":"turn_start","messageId":"00000000-0000-4000-9000-000000000002-turn-start","replay":true}}}}}}
-{"type":"emit_inbound","label":"notification:session/update:agent_message_chunk","frame":{"kind":"notification","method":"session/update","params":{"sessionId":"sess_00000000-0000-4000-8000-000000000001","update":{"sessionUpdate":"agent_message_chunk","content":{"type":"text","text":"provider thread resume fixture first turn complete"},"_meta":{"kiro":{"agentMode":"vibe","messageId":"00000000-0000-4000-9000-000000000003-say","timestamp":"2026-10-19T20:48:12.853Z","replay":true}}}}}}
-{"type":"emit_inbound","label":"notification:session/update:session_info_update","frame":{"kind":"notification","method":"session/update","params":{"sessionId":"sess_00000000-0000-4000-8000-000000000001","update":{"sessionUpdate":"session_info_update","_meta":{"kiro":{"contextUsage":{"usagePercentage":9.29900074005127},"kind":"context_usage","usagePercentage":9.29900074005127,"replay":true}}}}}}
-{"type":"emit_inbound","label":"notification:session/update:session_info_update","frame":{"kind":"notification","method":"session/update","params":{"sessionId":"sess_00000000-0000-4000-8000-000000000001","update":{"sessionUpdate":"session_info_update","_meta":{"kiro":{"promptTurnSummaries":[{"unit":"credit","unitPlural":"credits","usage":0.023869583416252074}],"elapsedTime":1347,"status":"success","kind":"turn_completion","requestIds":["00000000-0000-4000-9000-000000000004"],"replay":true}}}}}}
-{"type":"emit_inbound","label":"notification:session/update:session_info_update","frame":{"kind":"notification","method":"session/update","params":{"sessionId":"sess_00000000-0000-4000-8000-000000000001","update":{"sessionUpdate":"session_info_update","_meta":{"kiro":{"turnEnd":{"stopReason":"end_turn"},"kind":"turn_end","stopReason":"end_turn","messageId":"00000000-0000-4000-9000-000000000002-turn-end","replay":true}}}}}}
-{"type":"emit_inbound","label":"response:session/load","frame":{"kind":"response","method":"session/load","result":{"_meta":{"agentMode":"vibe","memoryConfig":{"mode":"read_write","reflection":true},"contextUsage":{"summarizationThreshold":80,"truncationThreshold":95,"usagePercentage":9.29900074005127},"createdAt":"2026-10-19T20:48:11.040Z","id":"sess_00000000-0000-4000-8000-000000000001","lastModifiedAt":"2026-10-19T20:48:12.888Z","title":"provider thread resume fixture first turn complete","workspacePaths":["<workspace>"],"source":"local","executionTarget":{"kind":"local"},"kiro":{"loadTiming":{"schema":1,"totalMs":331,"startedAt":1792442894443,"phases":[{"id":"init-wait","label":"Wait for agent init","startMs":0,"endMs":0},{"id":"read-session","label":"Read session record","startMs":1,"endMs":14},{"id":"shell-type","label":"Resolve shell type","startMs":15,"endMs":15},{"id":"hooks","label":"Load hooks","startMs":17,"endMs":20},{"id":"agent-registry","label":"Load agent profiles","startMs":20,"endMs":50},{"id":"policy","label":"Load and compile policy","startMs":50,"endMs":54},{"id":"knowledge","label":"Init knowledge registry","startMs":55,"endMs":66},{"id":"sandbox","label":"Create session sandbox","startMs":66,"endMs":66},{"id":"memory","label":"Load memory learnings","startMs":66,"endMs":66},{"id":"workspace-connection","label":"Build workspace connection","startMs":66,"endMs":68},{"id":"governance","label":"Refresh governance","startMs":72,"endMs":72},{"id":"user-agent-gate","label":"Wait for user-agent experiment","startMs":77,"endMs":320},{"id":"read-messages","label":"Read transcript","startMs":320,"endMs":323},{"id":"replay","label":"Replay history to client","startMs":323,"endMs":326},{"id":"build-context","label":"Rebuild model context","startMs":328,"endMs":329},{"id":"tools","label":"Build tool list","startMs":329,"endMs":331}],"counts":{"events":6}}}},"modes":{"availableModes":[{"id":"vibe","name":"Default","description":"General coding assistance","_meta":{"kiro":{"source":"bundled","resource":{"resourceType":"agent","source":{"origin":"bundled"}}}}},{"id":"spec","name":"Spec","description":"Structured feature development","_meta":{"kiro":{"source":"bundled","resource":{"resourceType":"agent","source":{"origin":"bundled"}}}}},{"id":"quick-spec","name":"Quick Spec","description":"Fast spec workflow: clarify, then auto-generate requirements, design, and tasks","_meta":{"kiro":{"source":"bundled","resource":{"resourceType":"agent","source":{"origin":"bundled"}}}}},{"id":"bug-fix","name":"Bug Fix","description":"Structured bug-fix workflow: investigate, diagnose, and resolve bugs","_meta":{"kiro":{"source":"bundled","resource":{"resourceType":"agent","source":{"origin":"bundled"}}}}},{"id":"plan","name":"Plan","description":"Plan-only mode that helps break ideas down into an implementation plan without making any changes","_meta":{"kiro":{"welcomeMessage":"Transform any idea into fully working code. What do you want to build today?","source":"bundled","resource":{"resourceType":"agent","source":{"origin":"bundled"}}}}},{"id":"autonomous","name":"Autonomous","description":"Autonomous agent execution","_meta":{"kiro":{"source":"bundled","resource":{"resourceType":"agent","source":{"origin":"bundled"}}}}},{"id":"semantic_reviewer","name":"semantic_reviewer","description":"Behavioral, narrative code review of a local or PR diff. Writes a review document and a verdict.","_meta":{"kiro":{"source":"bundled","resource":{"resourceType":"agent","source":{"origin":"bundled"}}}}}],"currentModeId":"vibe"},"configOptions":[{"type":"select","id":"mode","name":"Mode","category":"mode","currentValue":"vibe","options":[{"value":"vibe","name":"Default","description":"General coding assistance","_meta":{"kiro":{"source":"bundled","resource":{"resourceType":"agent","source":{"origin":"bundled"}}}}},{"value":"spec","name":"Spec","description":"Structured feature development","_meta":{"kiro":{"source":"bundled","resource":{"resourceType":"agent","source":{"origin":"bundled"}}}}},{"value":"quick-spec","name":"Quick Spec","description":"Fast spec workflow: clarify, then auto-generate requirements, design, and tasks","_meta":{"kiro":{"source":"bundled","resource":{"resourceType":"agent","source":{"origin":"bundled"}}}}},{"value":"bug-fix","name":"Bug Fix","description":"Structured bug-fix workflow: investigate, diagnose, and resolve bugs","_meta":{"kiro":{"source":"bundled","resource":{"resourceType":"agent","source":{"origin":"bundled"}}}}},{"value":"plan","name":"Plan","description":"Plan-only mode that helps break ideas down into an implementation plan without making any changes","_meta":{"kiro":{"welcomeMessage":"Transform any idea into fully working code. What do you want to build today?","source":"bundled","resource":{"resourceType":"agent","source":{"origin":"bundled"}}}}},{"value":"autonomous","name":"Autonomous","description":"Autonomous agent execution","_meta":{"kiro":{"source":"bundled","resource":{"resourceType":"agent","source":{"origin":"bundled"}}}}},{"value":"semantic_reviewer","name":"semantic_reviewer","description":"Behavioral, narrative code review of a local or PR diff. Writes a review document and a verdict.","_meta":{"kiro":{"source":"bundled","resource":{"resourceType":"agent","source":{"origin":"bundled"}}}}}]},{"type":"select","id":"memoryReflection","name":"Memory reflection","description":"Allow this session to reflect on new memory","currentValue":"on","options":[{"value":"on","name":"On"},{"value":"off","name":"Off"}]},{"type":"select","id":"autopilot","name":"Autopilot","currentValue":"on","options":[{"value":"on","name":"Autopilot","description":"Agent executes tools without confirmation"},{"value":"off","name":"Supervised","description":"Agent asks for approval before file changes"}]},{"type":"select","id":"contentCollection","name":"Content Collection","currentValue":"enabled","options":[{"value":"enabled","name":"Enabled","description":"Allow content to be used for service improvement"},{"value":"disabled","name":"Disabled","description":"Opt out of content collection"}]}]}}}
-{"type":"expect_outbound","label":"request:session/set_config_option","frame":{"kind":"request","method":"session/set_config_option","params":{"sessionId":"sess_00000000-0000-4000-8000-000000000001","configId":"model","value":"claude-haiku-4.5"}}}
-{"type":"emit_inbound","label":"notification:session/update:session_info_update","frame":{"kind":"notification","method":"session/update","params":{"sessionId":"sess_00000000-0000-4000-8000-000000000001","update":{"sessionUpdate":"session_info_update","_meta":{"kiro":{"focus":{"status":"idle"},"kind":"focus_update","status":"idle","activity":{"turnActive":false,"runningWorkflows":0,"pausedWorkflows":0}}}}}}}
-{"type":"emit_inbound","label":"notification:session/update:session_info_update","frame":{"kind":"notification","method":"session/update","params":{"sessionId":"sess_00000000-0000-4000-8000-000000000001","update":{"sessionUpdate":"session_info_update","_meta":{"kiro":{"contextUsage":{"usagePercentage":9.29900074005127},"breakdown":{"contextFiles":{"tokens":0,"percent":0,"items":[]},"tools":{"tokens":5481,"percent":0.5,"mcp":{"tokens":0,"percent":0},"builtin":{"tokens":5481,"percent":0.5}},"memory":{"tokens":0,"percent":0},"kiroResponses":{"tokens":13,"percent":0.2},"yourPrompts":{"tokens":466,"percent":8.6},"sessionFiles":{"tokens":0,"percent":0,"items":[]}},"kind":"context_usage","usagePercentage":9.29900074005127}}}}}}
-{"type":"emit_inbound","label":"notification:session/update:available_commands_update","frame":{"kind":"notification","method":"session/update","params":{"sessionId":"sess_00000000-0000-4000-8000-000000000001","update":{"sessionUpdate":"available_commands_update","availableCommands":[{"name":"architecture-selection","description":"Steering: architecture-selection","input":{"hint":"optional context"},"_meta":{"kiro":{"type":"steering","contextQuery":"global:architecture-selection","commandId":"architecture-selection","resource":{"resourceType":"steering","source":{"origin":"bundled"}},"originalName":"architecture-selection"}}},{"name":"quick-spec","description":"Steering: quick-spec","input":{"hint":"optional context"},"_meta":{"kiro":{"type":"steering","contextQuery":"global:quick-spec","commandId":"quick-spec","resource":{"resourceType":"steering","source":{"origin":"bundled"}},"originalName":"quick-spec"}}},{"name":"bug-fix","description":"Steering: bug-fix","input":{"hint":"optional context"},"_meta":{"kiro":{"type":"steering","contextQuery":"global:bug-fix","commandId":"bug-fix","resource":{"resourceType":"steering","source":{"origin":"bundled"}},"originalName":"bug-fix"}}},{"name":"general-task-execution","description":"General-purpose sub-agent with access to all tools for executing arbitrary tasks","input":{"hint":"task to delegate"},"_meta":{"kiro":{"type":"custom-agent","commandId":"general-task-execution","resource":{"resourceType":"agent","source":{"origin":"bundled"}},"originalName":"general-task-execution"}}},{"name":"context-gatherer","description":"Investigates the codebase to answer a specific question about it. Deeply analyzes existing code by tracing execution paths, mapping architecture and abstraction layers, understanding patterns, and documenting dependencies, returning a thorough, direct written analysis that explains how the relevant code works and points to the specific files and lines involved. Use it to understand code before you change it: before designing or implementing a change to code you don't already fully understand, start with context-gatherer so your edits are grounded in how the code actually works. When a task requires understanding code you don't already know, dispatch context-gatherer to do that exploration before running your own searches or reads. Rules: 1. Provide a clear, specific prompt that includes your intent: a detailed task description of the context you need and what you're trying to accomplish. 2. The subagent explores the codebase and returns an analysis of your query 3. Trust the returned results. You may still inspect additional code yourself when you need context beyond what was returned. 4. Reuse existing context-gatherer output for related follow-up questions; do not re-invoke on the same question with different phrasing. 5. For multiple distinct questions, dispatch several context-gatherers in parallel, each targeting a different aspect of the codebase.","input":{"hint":"task to delegate"},"_meta":{"kiro":{"type":"custom-agent","commandId":"context-gatherer","resource":{"resourceType":"agent","source":{"origin":"bundled"}},"originalName":"context-gatherer"}}}]}}}}
-{"type":"emit_inbound","label":"notification:session/update:available_commands_update","frame":{"kind":"notification","method":"session/update","params":{"sessionId":"sess_00000000-0000-4000-8000-000000000001","update":{"sessionUpdate":"available_commands_update","availableCommands":[{"name":"architecture-selection","description":"Steering: architecture-selection","input":{"hint":"optional context"},"_meta":{"kiro":{"type":"steering","contextQuery":"global:architecture-selection","commandId":"architecture-selection","resource":{"resourceType":"steering","source":{"origin":"bundled"}},"originalName":"architecture-selection"}}},{"name":"quick-spec","description":"Steering: quick-spec","input":{"hint":"optional context"},"_meta":{"kiro":{"type":"steering","contextQuery":"global:quick-spec","commandId":"quick-spec","resource":{"resourceType":"steering","source":{"origin":"bundled"}},"originalName":"quick-spec"}}},{"name":"bug-fix","description":"Steering: bug-fix","input":{"hint":"optional context"},"_meta":{"kiro":{"type":"steering","contextQuery":"global:bug-fix","commandId":"bug-fix","resource":{"resourceType":"steering","source":{"origin":"bundled"}},"originalName":"bug-fix"}}},{"name":"general-task-execution","description":"General-purpose sub-agent with access to all tools for executing arbitrary tasks","input":{"hint":"task to delegate"},"_meta":{"kiro":{"type":"custom-agent","commandId":"general-task-execution","resource":{"resourceType":"agent","source":{"origin":"bundled"}},"originalName":"general-task-execution"}}},{"name":"context-gatherer","description":"Investigates the codebase to answer a specific question about it. Deeply analyzes existing code by tracing execution paths, mapping architecture and abstraction layers, understanding patterns, and documenting dependencies, returning a thorough, direct written analysis that explains how the relevant code works and points to the specific files and lines involved. Use it to understand code before you change it: before designing or implementing a change to code you don't already fully understand, start with context-gatherer so your edits are grounded in how the code actually works. When a task requires understanding code you don't already know, dispatch context-gatherer to do that exploration before running your own searches or reads. Rules: 1. Provide a clear, specific prompt that includes your intent: a detailed task description of the context you need and what you're trying to accomplish. 2. The subagent explores the codebase and returns an analysis of your query 3. Trust the returned results. You may still inspect additional code yourself when you need context beyond what was returned. 4. Reuse existing context-gatherer output for related follow-up questions; do not re-invoke on the same question with different phrasing. 5. For multiple distinct questions, dispatch several context-gatherers in parallel, each targeting a different aspect of the codebase.","input":{"hint":"task to delegate"},"_meta":{"kiro":{"type":"custom-agent","commandId":"context-gatherer","resource":{"resourceType":"agent","source":{"origin":"bundled"}},"originalName":"context-gatherer"}}}]}}}}
-{"type":"emit_inbound","label":"response:session/set_config_option","frame":{"kind":"response","method":"session/set_config_option","result":{"configOptions":[{"type":"select","id":"mode","name":"Mode","category":"mode","currentValue":"vibe","options":[{"value":"vibe","name":"Default","description":"General coding assistance","_meta":{"kiro":{"source":"bundled","resource":{"resourceType":"agent","source":{"origin":"bundled"}}}}},{"value":"spec","name":"Spec","description":"Structured feature development","_meta":{"kiro":{"source":"bundled","resource":{"resourceType":"agent","source":{"origin":"bundled"}}}}},{"value":"quick-spec","name":"Quick Spec","description":"Fast spec workflow: clarify, then auto-generate requirements, design, and tasks","_meta":{"kiro":{"source":"bundled","resource":{"resourceType":"agent","source":{"origin":"bundled"}}}}},{"value":"bug-fix","name":"Bug Fix","description":"Structured bug-fix workflow: investigate, diagnose, and resolve bugs","_meta":{"kiro":{"source":"bundled","resource":{"resourceType":"agent","source":{"origin":"bundled"}}}}},{"value":"plan","name":"Plan","description":"Plan-only mode that helps break ideas down into an implementation plan without making any changes","_meta":{"kiro":{"welcomeMessage":"Transform any idea into fully working code. What do you want to build today?","source":"bundled","resource":{"resourceType":"agent","source":{"origin":"bundled"}}}}},{"value":"autonomous","name":"Autonomous","description":"Autonomous agent execution","_meta":{"kiro":{"source":"bundled","resource":{"resourceType":"agent","source":{"origin":"bundled"}}}}},{"value":"semantic_reviewer","name":"semantic_reviewer","description":"Behavioral, narrative code review of a local or PR diff. Writes a review document and a verdict.","_meta":{"kiro":{"source":"bundled","resource":{"resourceType":"agent","source":{"origin":"bundled"}}}}}]},{"type":"select","id":"memoryReflection","name":"Memory reflection","description":"Allow this session to reflect on new memory","currentValue":"on","options":[{"value":"on","name":"On"},{"value":"off","name":"Off"}]},{"type":"select","id":"autopilot","name":"Autopilot","currentValue":"on","options":[{"value":"on","name":"Autopilot","description":"Agent executes tools without confirmation"},{"value":"off","name":"Supervised","description":"Agent asks for approval before file changes"}]},{"type":"select","id":"contentCollection","name":"Content Collection","currentValue":"enabled","options":[{"value":"enabled","name":"Enabled","description":"Allow content to be used for service improvement"},{"value":"disabled","name":"Disabled","description":"Opt out of content collection"}]}]}}}
-{"type":"emit_inbound","label":"notification:session/update:config_option_update","frame":{"kind":"notification","method":"session/update","params":{"sessionId":"sess_00000000-0000-4000-8000-000000000001","update":{"sessionUpdate":"config_option_update","configOptions":[{"type":"select","id":"mode","name":"Mode","category":"mode","currentValue":"vibe","options":[{"value":"vibe","name":"Default","description":"General coding assistance","_meta":{"kiro":{"source":"bundled","resource":{"resourceType":"agent","source":{"origin":"bundled"}}}}},{"value":"spec","name":"Spec","description":"Structured feature development","_meta":{"kiro":{"source":"bundled","resource":{"resourceType":"agent","source":{"origin":"bundled"}}}}},{"value":"quick-spec","name":"Quick Spec","description":"Fast spec workflow: clarify, then auto-generate requirements, design, and tasks","_meta":{"kiro":{"source":"bundled","resource":{"resourceType":"agent","source":{"origin":"bundled"}}}}},{"value":"bug-fix","name":"Bug Fix","description":"Structured bug-fix workflow: investigate, diagnose, and resolve bugs","_meta":{"kiro":{"source":"bundled","resource":{"resourceType":"agent","source":{"origin":"bundled"}}}}},{"value":"plan","name":"Plan","description":"Plan-only mode that helps break ideas down into an implementation plan without making any changes","_meta":{"kiro":{"welcomeMessage":"Transform any idea into fully working code. What do you want to build today?","source":"bundled","resource":{"resourceType":"agent","source":{"origin":"bundled"}}}}},{"value":"autonomous","name":"Autonomous","description":"Autonomous agent execution","_meta":{"kiro":{"source":"bundled","resource":{"resourceType":"agent","source":{"origin":"bundled"}}}}},{"value":"semantic_reviewer","name":"semantic_reviewer","description":"Behavioral, narrative code review of a local or PR diff. Writes a review document and a verdict.","_meta":{"kiro":{"source":"bundled","resource":{"resourceType":"agent","source":{"origin":"bundled"}}}}}]},{"type":"select","id":"model","name":"Model","category":"model","currentValue":"claude-haiku-4.5","options":[{"value":"auto","name":"Auto","description":"Models chosen by task for optimal usage and consistent quality","_meta":{"kiro":{"rateMultiplier":1,"rateUnit":"Credit","hasEffort":false,"thinkingToggleable":false}}},{"value":"claude-opus-5.5","name":"Claude Opus 5.5","description":"Experimental preview of Claude Opus 5.5 model with 1M context window","_meta":{"kiro":{"rateMultiplier":2,"rateUnit":"Credit","hasEffort":true,"effortSchemaPath":"output_config","effortLevels":["low","medium","high","xhigh","max"],"defaultEffortLevel":"medium","thinkingToggleable":false}}},{"value":"claude-sonnet-5.5","name":"Claude Sonnet 5.5","description":"Claude Sonnet 5.5 model with 1M context window","_meta":{"kiro":{"rateMultiplier":1.3,"rateUnit":"Credit","hasEffort":true,"effortSchemaPath":"output_config","effortLevels":["low","medium","high","xhigh","max"],"defaultEffortLevel":"high","thinkingToggleable":false}}},{"value":"claude-opus-5","name":"Claude Opus 5","description":"Claude Opus 5 model with 1M context window","_meta":{"kiro":{"rateMultiplier":2.2,"rateUnit":"Credit","hasEffort":true,"effortSchemaPath":"output_config","effortLevels":["low","medium","high","xhigh","max"],"defaultEffortLevel":"high","thinkingToggleable":true,"defaultThinkingEnabled":true}}},{"value":"claude-sonnet-5","name":"Claude Sonnet 5","description":"Claude Sonnet 5 model with 1M context window","_meta":{"kiro":{"rateMultiplier":1.3,"rateUnit":"Credit","hasEffort":true,"effortSchemaPath":"output_config","effortLevels":["low","medium","high","xhigh","max"],"defaultEffortLevel":"high","thinkingToggleable":true,"defaultThinkingEnabled":true}}},{"value":"claude-opus-4.8","name":"Claude Opus 4.8","description":"Claude Opus 4.8 model with 1M context window","_meta":{"kiro":{"rateMultiplier":2.2,"rateUnit":"Credit","hasEffort":true,"effortSchemaPath":"output_config","effortLevels":["low","medium","high","xhigh","max"],"defaultEffortLevel":"high","thinkingToggleable":true,"defaultThinkingEnabled":true}}},{"value":"gpt-5.6-sol","name":"GPT 5.6 Sol","description":"Experimental preview of OpenAI GPT 5.6 Sol with 1M context window","_meta":{"kiro":{"rateMultiplier":4.4,"rateUnit":"Credit","hasEffort":true,"effortSchemaPath":"reasoning","effortLevels":["none","low","medium","high","xhigh","max"],"defaultEffortLevel":"high","thinkingToggleable":false}}},{"value":"gpt-5.6-terra","name":"GPT 5.6 Terra","description":"Experimental preview of OpenAI GPT 5.6 Terra with 1M context window","_meta":{"kiro":{"rateMultiplier":2.2,"rateUnit":"Credit","hasEffort":true,"effortSchemaPath":"reasoning","effortLevels":["none","low","medium","high","xhigh","max"],"defaultEffortLevel":"high","thinkingToggleable":false}}},{"value":"gpt-5.6-luna","name":"GPT 5.6 Luna","description":"Experimental preview of OpenAI GPT 5.6 Luna with 1M context window","_meta":{"kiro":{"rateMultiplier":0.6,"rateUnit":"Credit","hasEffort":true,"effortSchemaPath":"reasoning","effortLevels":["none","low","medium","high","xhigh","max"],"defaultEffortLevel":"high","thinkingToggleable":false}}},{"value":"claude-opus-4.7","name":"Claude Opus 4.7","description":"Claude Opus 4.7 model with 1M context window","_meta":{"kiro":{"rateMultiplier":2.2,"rateUnit":"Credit","hasEffort":true,"effortSchemaPath":"output_config","effortLevels":["low","medium","high","xhigh","max"],"defaultEffortLevel":"xhigh","thinkingToggleable":true,"defaultThinkingEnabled":true}}},{"value":"claude-opus-4.6","name":"Claude Opus 4.6","description":"Claude Opus 4.6 model with 1M context window","_meta":{"kiro":{"rateMultiplier":2.2,"rateUnit":"Credit","hasEffort":true,"effortSchemaPath":"output_config","effortLevels":["low","medium","high","max"],"defaultEffortLevel":"high","thinkingToggleable":true,"defaultThinkingEnabled":true}}},{"value":"claude-sonnet-4.6","name":"Claude Sonnet 4.6","description":"Claude Sonnet 4.6 model with 1M context window","_meta":{"kiro":{"rateMultiplier":1.3,"rateUnit":"Credit","hasEffort":true,"effortSchemaPath":"output_config","effortLevels":["low","medium","high","max"],"defaultEffortLevel":"high","thinkingToggleable":true,"defaultThinkingEnabled":true}}},{"value":"claude-opus-4.5","name":"Claude Opus 4.5","description":"Claude Opus 4.5 model","_meta":{"kiro":{"rateMultiplier":2.2,"rateUnit":"Credit","hasEffort":false,"thinkingToggleable":false}}},{"value":"claude-sonnet-4.5","name":"Claude Sonnet 4.5","description":"Claude Sonnet 4.5 model","_meta":{"kiro":{"rateMultiplier":1.3,"rateUnit":"Credit","hasEffort":false,"thinkingToggleable":false}}},{"value":"claude-haiku-4.5","name":"Claude Haiku 4.5","description":"The latest Claude Haiku model","_meta":{"kiro":{"rateMultiplier":0.4,"rateUnit":"Credit","hasEffort":false,"thinkingToggleable":false}}},{"value":"deepseek-3.2","name":"Deepseek v3.2","description":"Experimental preview of DeepSeek V3.2","_meta":{"kiro":{"rateMultiplier":0.25,"rateUnit":"Credit","hasEffort":false,"thinkingToggleable":false}}},{"value":"minimax-m2.5","name":"MiniMax M2.5","description":"MiniMax M2.5 model","_meta":{"kiro":{"rateMultiplier":0.25,"rateUnit":"Credit","hasEffort":false,"thinkingToggleable":false}}},{"value":"minimax-m2.1","name":"MiniMax M2.1","description":"Experimental preview of MiniMax M2.1","_meta":{"kiro":{"rateMultiplier":0.15,"rateUnit":"Credit","hasEffort":false,"thinkingToggleable":false}}},{"value":"glm-5","name":"GLM 5","description":"GLM-5 model","_meta":{"kiro":{"rateMultiplier":0.5,"rateUnit":"Credit","hasEffort":false,"thinkingToggleable":false}}},{"value":"qwen3-coder-next","name":"Qwen3 Coder Next","description":"Experimental preview of Qwen3 Coder Next","_meta":{"kiro":{"rateMultiplier":0.05,"rateUnit":"Credit","hasEffort":false,"thinkingToggleable":false}}},{"value":"kimi-k3","name":"Kimi K3","description":"Experimental preview of Kimi K3. Kimi K3 is a Kiro Excluded Model. For more info, see documentation.","_meta":{"kiro":{"rateMultiplier":2.4,"rateUnit":"Credit","hasEffort":true,"effortSchemaPath":"reasoning","effortLevels":["low","high","max"],"defaultEffortLevel":"max","thinkingToggleable":false}}}]},{"type":"select","id":"memoryReflection","name":"Memory reflection","description":"Allow this session to reflect on new memory","currentValue":"on","options":[{"value":"on","name":"On"},{"value":"off","name":"Off"}]},{"type":"select","id":"autopilot","name":"Autopilot","currentValue":"on","options":[{"value":"on","name":"Autopilot","description":"Agent executes tools without confirmation"},{"value":"off","name":"Supervised","description":"Agent asks for approval before file changes"}]},{"type":"select","id":"contentCollection","name":"Content Collection","currentValue":"enabled","options":[{"value":"enabled","name":"Enabled","description":"Allow content to be used for service improvement"},{"value":"disabled","name":"Disabled","description":"Opt out of content collection"}]}]}}}}
-{"type":"expect_outbound","label":"request:session/prompt","frame":{"kind":"request","method":"session/prompt","params":{"sessionId":"sess_00000000-0000-4000-8000-000000000001","prompt":[{"type":"text","text":"<t3_code_instructions>\n<any>\n</t3_code_instructions>\n\n<user_request>\nUsing the conversation history available in this resumed thread, first repeat the exact final answer you gave in the previous turn. Then on a new line write exactly: provider thread resume fixture second turn complete\n</user_request>"}]}}}
-{"type":"emit_inbound","label":"notification:session/update:session_info_update","frame":{"kind":"notification","method":"session/update","params":{"sessionId":"sess_00000000-0000-4000-8000-000000000001","update":{"sessionUpdate":"session_info_update","_meta":{"kiro":{"userMessageId":"00000000-0000-4000-9000-000000000006","kind":"user_message_id_assigned"}}}}}}
-{"type":"emit_inbound","label":"notification:session/update:session_info_update","frame":{"kind":"notification","method":"session/update","params":{"sessionId":"sess_00000000-0000-4000-8000-000000000001","update":{"sessionUpdate":"session_info_update","_meta":{"kiro":{"focus":{"status":"in_progress"},"kind":"focus_update","status":"in_progress","activity":{"turnActive":true,"runningWorkflows":0,"pausedWorkflows":0}}}}}}}
-{"type":"emit_inbound","label":"notification:session/update:session_info_update","frame":{"kind":"notification","method":"session/update","params":{"sessionId":"sess_00000000-0000-4000-8000-000000000001","update":{"sessionUpdate":"session_info_update","_meta":{"kiro":{"turnStart":true,"kind":"turn_start","messageId":"00000000-0000-4000-9000-000000000007-turn-start"}}}}}}
-{"type":"emit_inbound","label":"notification:session/update:agent_message_chunk","frame":{"kind":"notification","method":"session/update","params":{"sessionId":"sess_00000000-0000-4000-8000-000000000001","update":{"sessionUpdate":"agent_message_chunk","content":{"type":"text","text":"provider"},"_meta":{"kiro":{"replayId":"00000000-0000-4000-9000-000000000008-say"}}}}}}
-{"type":"emit_inbound","label":"notification:session/update:agent_message_chunk","frame":{"kind":"notification","method":"session/update","params":{"sessionId":"sess_00000000-0000-4000-8000-000000000001","update":{"sessionUpdate":"agent_message_chunk","content":{"type":"text","text":" thread resume fixture first"},"_meta":{"kiro":{"replayId":"00000000-0000-4000-9000-000000000008-say"}}}}}}
-{"type":"emit_inbound","label":"notification:session/update:agent_message_chunk","frame":{"kind":"notification","method":"session/update","params":{"sessionId":"sess_00000000-0000-4000-8000-000000000001","update":{"sessionUpdate":"agent_message_chunk","content":{"type":"text","text":" turn complete"},"_meta":{"kiro":{"replayId":"00000000-0000-4000-9000-000000000008-say"}}}}}}
-{"type":"emit_inbound","label":"notification:session/update:agent_message_chunk","frame":{"kind":"notification","method":"session/update","params":{"sessionId":"sess_00000000-0000-4000-8000-000000000001","update":{"sessionUpdate":"agent_message_chunk","content":{"type":"text","text":"\nprovider"},"_meta":{"kiro":{"replayId":"00000000-0000-4000-9000-000000000008-say"}}}}}}
-{"type":"emit_inbound","label":"notification:session/update:agent_message_chunk","frame":{"kind":"notification","method":"session/update","params":{"sessionId":"sess_00000000-0000-4000-8000-000000000001","update":{"sessionUpdate":"agent_message_chunk","content":{"type":"text","text":" thread resume fixture second turn complete"},"_meta":{"kiro":{"replayId":"00000000-0000-4000-9000-000000000008-say"}}}}}}
-{"type":"emit_inbound","label":"notification:session/update:session_info_update","frame":{"kind":"notification","method":"session/update","params":{"sessionId":"sess_00000000-0000-4000-8000-000000000001","update":{"sessionUpdate":"session_info_update","_meta":{"kiro":{"contextUsage":{"usagePercentage":9.546499252319336},"kind":"context_usage","usagePercentage":9.546499252319336}}}}}}
-{"type":"emit_inbound","label":"notification:session/update:session_info_update","frame":{"kind":"notification","method":"session/update","params":{"sessionId":"sess_00000000-0000-4000-8000-000000000001","update":{"sessionUpdate":"session_info_update","_meta":{"kiro":{"contextUsage":{"usagePercentage":9.546499252319336},"breakdown":{"contextFiles":{"tokens":0,"percent":0,"items":[]},"tools":{"tokens":5481,"percent":0.5,"mcp":{"tokens":0,"percent":0},"builtin":{"tokens":5481,"percent":0.5}},"memory":{"tokens":0,"percent":0},"kiroResponses":{"tokens":13,"percent":0.2},"yourPrompts":{"tokens":466,"percent":8.8},"sessionFiles":{"tokens":0,"percent":0,"items":[]}},"kind":"context_usage","usagePercentage":9.546499252319336}}}}}}
-{"type":"emit_inbound","label":"notification:session/update:session_info_update","frame":{"kind":"notification","method":"session/update","params":{"sessionId":"sess_00000000-0000-4000-8000-000000000001","update":{"sessionUpdate":"session_info_update","_meta":{"kiro":{"promptTurnSummaries":[{"unit":"credit","unitPlural":"credits","usage":0.0199145304145937}],"elapsedTime":1180,"status":"success","kind":"turn_completion","requestIds":["00000000-0000-4000-9000-000000000009"]}}}}}}
-{"type":"emit_inbound","label":"notification:session/update:session_info_update","frame":{"kind":"notification","method":"session/update","params":{"sessionId":"sess_00000000-0000-4000-8000-000000000001","update":{"sessionUpdate":"session_info_update","_meta":{"kiro":{"turnEnd":{"stopReason":"end_turn"},"kind":"turn_end","stopReason":"end_turn","messageId":"00000000-0000-4000-9000-000000000007-turn-end"}}}}}}
-{"type":"emit_inbound","label":"notification:session/update:session_info_update","frame":{"kind":"notification","method":"session/update","params":{"sessionId":"sess_00000000-0000-4000-8000-000000000001","update":{"sessionUpdate":"session_info_update","_meta":{"kiro":{"focus":{"status":"idle"},"kind":"focus_update","status":"idle","activity":{"turnActive":false,"runningWorkflows":0,"pausedWorkflows":0}}}}}}}
-{"type":"emit_inbound","label":"response:session/prompt","frame":{"kind":"response","method":"session/prompt","result":{"stopReason":"end_turn"}}}
-{"type":"emit_inbound","label":"notification:session/update:session_info_update","frame":{"kind":"notification","method":"session/update","params":{"sessionId":"sess_00000000-0000-4000-8000-000000000001","update":{"sessionUpdate":"session_info_update","_meta":{"kiro":{"contextUsage":{"usagePercentage":9.546499252319336},"breakdown":{"contextFiles":{"tokens":0,"percent":0,"items":[]},"tools":{"tokens":5481,"percent":0.5,"mcp":{"tokens":0,"percent":0},"builtin":{"tokens":5481,"percent":0.5}},"memory":{"tokens":0,"percent":0},"kiroResponses":{"tokens":39,"percent":0.4},"yourPrompts":{"tokens":968,"percent":8.6},"sessionFiles":{"tokens":0,"percent":0,"items":[]}},"kind":"context_usage","usagePercentage":9.546499252319336}}}}}}
-{"type":"expect_outbound","label":"request:session/close","frame":{"kind":"request","method":"session/close","params":{"sessionId":"sess_00000000-0000-4000-8000-000000000001"}}}
-{"type":"emit_inbound","label":"response:session/close","frame":{"kind":"response","method":"session/close","result":{}}}
-{"type":"runtime_exit","status":"success"}
diff --git a/apps/server/src/orchestration-v2/testkit/fixtures/queued_cancelled_while_active/codex_output.ts b/apps/server/src/orchestration-v2/testkit/fixtures/queued_cancelled_while_active/codex_output.ts
index b0d6a44ef45e..7ab76f9e5a7d 100644
--- a/apps/server/src/orchestration-v2/testkit/fixtures/queued_cancelled_while_active/codex_output.ts
+++ b/apps/server/src/orchestration-v2/testkit/fixtures/queued_cancelled_while_active/codex_output.ts
@@ -34,8 +34,9 @@ export function assertQueuedCancelledWhileActiveOutput(
     .get(ACTIVE_RUN_SHELL_SNAPSHOT_KEY)
     ?.threads.find((thread) => thread.id === projection.thread.id);
   assert.isDefined(capturedShell);
-  assert.equal(capturedShell.latestRunId, cancelledRun.id);
-  assert.equal(capturedShell.status, "cancelled");
+  // The cancelled queued run never started, so the active run presents as the latest.
+  assert.equal(capturedShell.latestRunId, activeRun.id);
+  assert.equal(capturedShell.status, "running");
   assert.equal(capturedShell.activeRunId, activeRun.id);
   assert.equal(capturedShell.activityRunStatus, "running");
   assert.deepEqual(
diff --git a/apps/server/src/orchestration-v2/testkit/fixtures/queued_turn/fx_transcript.ndjson b/apps/server/src/orchestration-v2/testkit/fixtures/queued_turn/fx_transcript.ndjson
index 6780dd2a3ad4..28d92260dcec 100644
--- a/apps/server/src/orchestration-v2/testkit/fixtures/queued_turn/fx_transcript.ndjson
+++ b/apps/server/src/orchestration-v2/testkit/fixtures/queued_turn/fx_transcript.ndjson
@@ -1,5 +1,5 @@
 {"type":"transcript_start","provider":"fx","protocol":"acp.ndjson-jsonrpc","version":"1","scenario":"queued_turn","metadata":{"generatedBy":"live-fx-recorder","fxVersion":"0.0.13","normalization":"Session ids are fx-session-NN, the workspace is <workspace>, HOME is /home/fx-replay and the recording user is fx-replay. T3-owned prompt text, MCP servers and initialize params other than clientCapabilities and _meta are <any>. User skill names, emails and token-shaped strings are removed. Timestamps are kept as recorded.","droppedFrames":0}}
-{"type":"expect_outbound","label":"request:initialize","frame":{"kind":"request","method":"initialize","params":{"protocolVersion":2,"info":"<any>","capabilities":"<any>","clientCapabilities":{"fs":{"readTextFile":false,"writeTextFile":false},"terminal":false,"session":{"notices":{}},"elicitation":{"form":{}}},"clientInfo":"<any>"}}}
+{"type":"expect_outbound","label":"request:initialize","frame":{"kind":"request","method":"initialize","params":{"protocolVersion":2,"info":"<any>","capabilities":"<any>","clientCapabilities":{"fs":{"readTextFile":false,"writeTextFile":false},"terminal":false,"session":{"notices":{},"compaction":{}},"elicitation":{"form":{}}},"clientInfo":"<any>"}}}
 {"type":"emit_inbound","label":"response:initialize","frame":{"kind":"response","method":"initialize","result":{"protocolVersion":1,"agentCapabilities":{"loadSession":true,"promptCapabilities":{"image":true,"audio":false,"embeddedContext":true},"mcpCapabilities":{"http":true,"sse":true,"acp":true},"sessionCapabilities":{"list":{},"resume":{},"close":{},"systemPrompt":{}},"_meta":{"fx":{"steering":true}}},"agentInfo":{"name":"fx","title":"fx","version":"0.0.13"},"authMethods":[]}}}
 {"type":"expect_outbound","label":"request:session/new","frame":{"kind":"request","method":"session/new","params":{"cwd":"<workspace>","mcpServers":"<any>"}}}
 {"type":"emit_inbound","label":"response:session/new","frame":{"kind":"response","method":"session/new","result":{"sessionId":"fx-session-01","configOptions":[{"id":"provider","name":"Provider","category":"model","type":"select","currentValue":"gateway","options":[{"value":"gateway","name":"Vercel AI Gateway"},{"value":"codex","name":"Codex subscription"},{"value":"grok","name":"Grok subscription"}]},{"id":"model","name":"Model","category":"model","type":"select","currentValue":"anthropic/claude-opus-5.5","options":[{"value":"anthropic/claude-sonnet-5.5","name":"anthropic/claude-sonnet-5.5"},{"value":"anthropic/claude-opus-5.5","name":"anthropic/claude-opus-5.5"},{"value":"anthropic/claude-opus-5.5-fast","name":"anthropic/claude-opus-5.5-fast"},{"value":"anthropic/claude-opus-5","name":"anthropic/claude-opus-5"},{"value":"anthropic/claude-opus-5-fast","name":"anthropic/claude-opus-5-fast"},{"value":"anthropic/claude-sonnet-5","name":"anthropic/claude-sonnet-5"},{"value":"anthropic/claude-opus-4.8","name":"anthropic/claude-opus-4.8"},{"value":"anthropic/claude-opus-4.8-fast","name":"anthropic/claude-opus-4.8-fast"},{"value":"anthropic/claude-opus-4.7","name":"anthropic/claude-opus-4.7"},{"value":"anthropic/claude-sonnet-4.6","name":"anthropic/claude-sonnet-4.6"},{"value":"anthropic/claude-opus-4.6","name":"anthropic/claude-opus-4.6"},{"value":"anthropic/claude-opus-4.5","name":"anthropic/claude-opus-4.5"},{"value":"anthropic/claude-sonnet-4.5","name":"anthropic/claude-sonnet-4.5"},{"value":"anthropic/claude-opus-4","name":"anthropic/claude-opus-4"},{"value":"anthropic/claude-sonnet-4","name":"anthropic/claude-sonnet-4"},{"value":"openai/gpt-5.6-luna","name":"openai/gpt-5.6-luna"},{"value":"openai/gpt-5.6-luna-fast","name":"openai/gpt-5.6-luna-fast"},{"value":"openai/gpt-5.6-sol","name":"openai/gpt-5.6-sol"},{"value":"openai/gpt-5.6-sol-fast","name":"openai/gpt-5.6-sol-fast"},{"value":"openai/gpt-5.6-terra","name":"openai/gpt-5.6-terra"},{"value":"openai/gpt-5.6-terra-fast","name":"openai/gpt-5.6-terra-fast"},{"value":"openai/gpt-5.5","name":"openai/gpt-5.5"},{"value":"openai/gpt-5.5-fast","name":"openai/gpt-5.5-fast"},{"value":"openai/gpt-5.5-pro","name":"openai/gpt-5.5-pro"},{"value":"openai/gpt-5.4-nano","name":"openai/gpt-5.4-nano"},{"value":"openai/gpt-5.4","name":"openai/gpt-5.4"},{"value":"openai/gpt-5.4-fast","name":"openai/gpt-5.4-fast"},{"value":"openai/gpt-5.4-pro","name":"openai/gpt-5.4-pro"},{"value":"openai/gpt-5.3-codex","name":"openai/gpt-5.3-codex"},{"value":"openai/gpt-5.3-codex-fast","name":"openai/gpt-5.3-codex-fast"},{"value":"openai/gpt-5.2","name":"openai/gpt-5.2"},{"value":"openai/gpt-5.2-fast","name":"openai/gpt-5.2-fast"},{"value":"openai/gpt-5.2-pro","name":"openai/gpt-5.2-pro"},{"value":"openai/gpt-5.1-thinking","name":"openai/gpt-5.1-thinking"},{"value":"openai/gpt-5.1-thinking-fast","name":"openai/gpt-5.1-thinking-fast"},{"value":"openai/gpt-5-pro","name":"openai/gpt-5-pro"},{"value":"openai/gpt-5","name":"openai/gpt-5"},{"value":"openai/gpt-5-fast","name":"openai/gpt-5-fast"},{"value":"openai/gpt-5-nano","name":"openai/gpt-5-nano"},{"value":"openai/o3-pro","name":"openai/o3-pro"},{"value":"openai/o3","name":"openai/o3"},{"value":"openai/o3-fast","name":"openai/o3-fast"},{"value":"openai/o1","name":"openai/o1"},{"value":"deepseek/deepseek-v4-pro-0813","name":"deepseek/deepseek-v4-pro-0813"},{"value":"deepseek/deepseek-v4-pro","name":"deepseek/deepseek-v4-pro"},{"value":"spacexai/grok-4.7","name":"spacexai/grok-4.7"},{"value":"spacexai/grok-4.6","name":"spacexai/grok-4.6"},{"value":"spacexai/grok-4.5","name":"spacexai/grok-4.5"},{"value":"spacexai/grok-4.3","name":"spacexai/grok-4.3"},{"value":"spacexai/grok-4.20-multi-agent","name":"spacexai/grok-4.20-multi-agent"},{"value":"spacexai/grok-4.20-non-reasoning","name":"spacexai/grok-4.20-non-reasoning"},{"value":"spacexai/grok-4.20-reasoning","name":"spacexai/grok-4.20-reasoning"},{"value":"spacexai/grok-4.1-fast-non-reasoning","name":"spacexai/grok-4.1-fast-non-reasoning"},{"value":"spacexai/grok-4.1-fast-reasoning","name":"spacexai/grok-4.1-fast-reasoning"},{"value":"amazon/nova-pro","name":"amazon/nova-pro"},{"value":"anthropic/claude-fable-5.1","name":"anthropic/claude-fable-5.1"},{"value":"anthropic/claude-fable-5","name":"anthropic/claude-fable-5"},{"value":"openai/gpt-6.1-sol","name":"openai/gpt-6.1-sol"},{"value":"openai/gpt-6.1-sol-fast","name":"openai/gpt-6.1-sol-fast"},{"value":"openai/gpt-6-luna","name":"openai/gpt-6-luna"},{"value":"openai/gpt-6-luna-fast","name":"openai/gpt-6-luna-fast"},{"value":"openai/gpt-6-sol","name":"openai/gpt-6-sol"},{"value":"openai/gpt-6-sol-fast","name":"openai/gpt-6-sol-fast"},{"value":"openai/gpt-6-astra","name":"openai/gpt-6-astra"},{"value":"openai/gpt-6-astra-fast","name":"openai/gpt-6-astra-fast"},{"value":"openai/gpt-oss-safeguard-120b","name":"openai/gpt-oss-safeguard-120b"},{"value":"openai/gpt-oss-safeguard-20b","name":"openai/gpt-oss-safeguard-20b"},{"value":"openai/gpt-oss-120b","name":"openai/gpt-oss-120b"},{"value":"openai/gpt-oss-20b","name":"openai/gpt-oss-20b"},{"value":"openai/gpt-4.1","name":"openai/gpt-4.1"},{"value":"openai/gpt-4.1-fast","name":"openai/gpt-4.1-fast"},{"value":"openai/gpt-4.1-nano","name":"openai/gpt-4.1-nano"},{"value":"openai/gpt-4.1-nano-fast","name":"openai/gpt-4.1-nano-fast"},{"value":"openai/gpt-4o","name":"openai/gpt-4o"},{"value":"openai/gpt-4o-fast","name":"openai/gpt-4o-fast"},{"value":"openai/gpt-4-turbo","name":"openai/gpt-4-turbo"},{"value":"openai/gpt-3.5-turbo","name":"openai/gpt-3.5-turbo"},{"value":"google/gemma-4-26b-a4b-it","name":"google/gemma-4-26b-a4b-it"},{"value":"deepseek/deepseek-v3.2","name":"deepseek/deepseek-v3.2"},{"value":"deepseek/deepseek-v3.2-thinking","name":"deepseek/deepseek-v3.2-thinking"},{"value":"deepseek/deepseek-r1","name":"deepseek/deepseek-r1"},{"value":"meta/llama-4-maverick","name":"meta/llama-4-maverick"},{"value":"meta/llama-4-scout","name":"meta/llama-4-scout"},{"value":"meta/llama-3.3-70b","name":"meta/llama-3.3-70b"},{"value":"meta/llama-3.1-70b","name":"meta/llama-3.1-70b"},{"value":"meta/llama-3.1-8b","name":"meta/llama-3.1-8b"},{"value":"alibaba/qwen3.8-2.4t-a95b","name":"alibaba/qwen3.8-2.4t-a95b"},{"value":"alibaba/qwen3.8-max","name":"alibaba/qwen3.8-max"},{"value":"alibaba/qwen3-next-80b-a3b-instruct","name":"alibaba/qwen3-next-80b-a3b-instruct"},{"value":"alibaba/qwen3-next-80b-a3b-thinking","name":"alibaba/qwen3-next-80b-a3b-thinking"},{"value":"alibaba/qwen3-coder-30b-a3b","name":"alibaba/qwen3-coder-30b-a3b"},{"value":"alibaba/qwen3-coder","name":"alibaba/qwen3-coder"},{"value":"alibaba/qwen3-coder-next","name":"alibaba/qwen3-coder-next"},{"value":"alibaba/qwen-3-235b","name":"alibaba/qwen-3-235b"},{"value":"alibaba/qwen-3-32b","name":"alibaba/qwen-3-32b"},{"value":"fireworks/ember-1","name":"fireworks/ember-1"},{"value":"zai/glm-5.3-fast","name":"zai/glm-5.3-fast"},{"value":"zai/glm-5.3","name":"zai/glm-5.3"},{"value":"nvidia/nemotron-3.5-lightning","name":"nvidia/nemotron-3.5-lightning"},{"value":"moonshotai/kimi-k3-fast","name":"moonshotai/kimi-k3-fast"},{"value":"moonshotai/kimi-k3","name":"moonshotai/kimi-k3"},{"value":"zai/glm-5.2-fast","name":"zai/glm-5.2-fast"},{"value":"zai/glm-5.2","name":"zai/glm-5.2"},{"value":"nvidia/nemotron-3-ultra-550b-a55b","name":"nvidia/nemotron-3-ultra-550b-a55b"},{"value":"spacexai/grok-build-0.1","name":"spacexai/grok-build-0.1"},{"value":"nvidia/nemotron-3-super-120b-a12b","name":"nvidia/nemotron-3-super-120b-a12b"},{"value":"zai/glm-5","name":"zai/glm-5"},{"value":"moonshotai/kimi-k2.5","name":"moonshotai/kimi-k2.5"},{"value":"zai/glm-4.7","name":"zai/glm-4.7"},{"value":"nvidia/nemotron-nano-12b-v2-vl","name":"nvidia/nemotron-nano-12b-v2-vl"},{"value":"nvidia/nemotron-nano-9b-v2","name":"nvidia/nemotron-nano-9b-v2"},{"value":"amazon/nova-micro","name":"amazon/nova-micro"},{"value":"deepseek/deepseek-v4.1-flash","name":"deepseek/deepseek-v4.1-flash"},{"value":"deepseek/deepseek-v4-flash","name":"deepseek/deepseek-v4-flash"},{"value":"deepseek/deepseek-v4-flash-0731","name":"deepseek/deepseek-v4-flash-0731"},{"value":"zai/glm-5.3-flash","name":"zai/glm-5.3-flash"},{"value":"zai/glm-4.7-flash","name":"zai/glm-4.7-flash"},{"value":"anthropic/claude-haiku-5.5","name":"anthropic/claude-haiku-5.5"},{"value":"anthropic/claude-haiku-4.5","name":"anthropic/claude-haiku-4.5"},{"value":"anthropic/claude-3-haiku","name":"anthropic/claude-3-haiku"},{"value":"openai/gpt-5.4-mini","name":"openai/gpt-5.4-mini"},{"value":"openai/gpt-5.4-mini-fast","name":"openai/gpt-5.4-mini-fast"},{"value":"openai/gpt-5-mini","name":"openai/gpt-5-mini"},{"value":"openai/gpt-5-mini-fast","name":"openai/gpt-5-mini-fast"},{"value":"openai/gpt-4.1-mini","name":"openai/gpt-4.1-mini"},{"value":"openai/gpt-4.1-mini-fast","name":"openai/gpt-4.1-mini-fast"},{"value":"openai/o4-mini","name":"openai/o4-mini"},{"value":"openai/o4-mini-fast","name":"openai/o4-mini-fast"},{"value":"openai/o3-mini","name":"openai/o3-mini"},{"value":"openai/gpt-4o-mini","name":"openai/gpt-4o-mini"},{"value":"openai/gpt-4o-mini-fast","name":"openai/gpt-4o-mini-fast"},{"value":"google/gemini-3.8-flash","name":"google/gemini-3.8-flash"},{"value":"google/gemini-3.7-flash","name":"google/gemini-3.7-flash"},{"value":"google/gemini-3.5-flash-lite","name":"google/gemini-3.5-flash-lite"},{"value":"google/gemini-3.6-flash","name":"google/gemini-3.6-flash"},{"value":"google/gemini-3.5-flash","name":"google/gemini-3.5-flash"},{"value":"google/gemini-3.1-flash-lite","name":"google/gemini-3.1-flash-lite"},{"value":"google/gemini-3-flash","name":"google/gemini-3-flash"},{"value":"google/gemini-2.5-flash-lite","name":"google/gemini-2.5-flash-lite"},{"value":"google/gemini-2.5-flash","name":"google/gemini-2.5-flash"},{"value":"google/gemini-2.5-pro","name":"google/gemini-2.5-pro"},{"value":"minimax/minimax-m3","name":"minimax/minimax-m3"},{"value":"minimax/minimax-m2.5","name":"minimax/minimax-m2.5"},{"value":"minimax/minimax-m2.1","name":"minimax/minimax-m2.1"},{"value":"amazon/nova-2-lite","name":"amazon/nova-2-lite"},{"value":"amazon/nova-lite","name":"amazon/nova-lite"},{"value":"google/gemini-3.1-pro-preview","name":"google/gemini-3.1-pro-preview"},{"value":"spacexai/grok-4.20-multi-agent-beta","name":"spacexai/grok-4.20-multi-agent-beta"},{"value":"spacexai/grok-4.20-non-reasoning-beta","name":"spacexai/grok-4.20-non-reasoning-beta"},{"value":"spacexai/grok-4.20-reasoning-beta","name":"spacexai/grok-4.20-reasoning-beta"}]},{"id":"mode","name":"Session Mode","description":"Controls how the agent requests permission","category":"mode","type":"select","currentValue":"ask","options":[{"value":"code","name":"Code","description":"Write and modify code with full tool access","permissionMode":"auto"},{"value":"ask","name":"Ask","description":"Request permission before making any changes","permissionMode":"ask"}]},{"id":"effort","name":"Reasoning Effort","description":"Controls how much the model thinks before responding","category":"thought_level","type":"select","currentValue":"xhigh","options":[{"value":"auto","name":"default"},{"value":"low","name":"low"},{"value":"medium","name":"medium"},{"value":"high","name":"high"},{"value":"xhigh","name":"xhigh"},{"value":"max","name":"max"}]}],"modes":{"currentModeId":"ask","availableModes":[{"id":"code","name":"Code","description":"Write and modify code with full tool access"},{"id":"ask","name":"Ask","description":"Request permission before making any changes"}]}}}}
diff --git a/apps/server/src/orchestration-v2/testkit/fixtures/queued_turn/kiro_transcript.ndjson b/apps/server/src/orchestration-v2/testkit/fixtures/queued_turn/kiro_transcript.ndjson
index 73a21b301051..0f0d2ece41b9 100644
--- a/apps/server/src/orchestration-v2/testkit/fixtures/queued_turn/kiro_transcript.ndjson
+++ b/apps/server/src/orchestration-v2/testkit/fixtures/queued_turn/kiro_transcript.ndjson
@@ -1,5 +1,5 @@
 {"type":"transcript_start","provider":"kiro","protocol":"acp.ndjson-jsonrpc","version":"1","scenario":"queued_turn","metadata":{"generatedBy":"live-kiro-recorder","kiroVersion":"2.32.0","normalization":"Session ids are fixed sess_ UUIDs and other UUIDs (message and request ids) are numbered in first-seen order, the workspace is <workspace>, HOME is /home/kiro-replay and the recording user is kiro-replay. T3-owned prompt text, MCP servers and initialize params other than clientCapabilities and _meta are <any>. Kiro's log directory, user-scoped commands and agents, and the _kiro/* broadcasts T3 ignores (governance, steering documents, powers, tools, hooks, MCP status, session roster) are removed. Timestamps are kept as recorded.","droppedFrames":15}}
-{"type":"expect_outbound","label":"request:initialize","frame":{"kind":"request","method":"initialize","params":{"protocolVersion":2,"info":"<any>","capabilities":"<any>","clientCapabilities":{"fs":{"readTextFile":false,"writeTextFile":false},"terminal":false,"session":{"notices":{}},"elicitation":{"form":{}},"_meta":{"kiro":{"hooks":{"enabled":true,"v2":true}}}},"clientInfo":"<any>"}}}
+{"type":"expect_outbound","label":"request:initialize","frame":{"kind":"request","method":"initialize","params":{"protocolVersion":2,"info":"<any>","capabilities":"<any>","clientCapabilities":{"fs":{"readTextFile":false,"writeTextFile":false},"terminal":false,"session":{"notices":{},"compaction":{}},"elicitation":{"form":{}},"_meta":{"kiro":{"hooks":{"enabled":true,"v2":true}}}},"clientInfo":"<any>"}}}
 {"type":"emit_inbound","label":"response:initialize","frame":{"kind":"response","method":"initialize","result":{"protocolVersion":2,"agentCapabilities":{"loadSession":true,"promptCapabilities":{"image":true,"embeddedContext":true},"mcpCapabilities":{"http":true,"sse":true},"sessionCapabilities":{"list":{},"close":{},"delete":{},"fork":{"_meta":{"kiro":{"messageId":true}}}},"_meta":{"kiro":{"checkpoints":true,"sessionList":true,"policyNotifications":true,"extensionMethods":["_kiro/knowledge","_kiro/memory/list","_kiro/memory/get","_kiro/memory/create","_kiro/memory/update","_kiro/memory/delete","_kiro/codeIntelligence","_kiro/session/context","_kiro/session/compact","_kiro/session/export","_kiro/session/history","_kiro/config/template","_kiro/workflow/new","_kiro/workflow/invoke","_kiro/workflow/load","_kiro/workflow/inspect","_kiro/workflow/list","_kiro/workflow/pause","_kiro/workflow/cancel","_kiro/workflow/delete","_kiro/workflow/listRecipes","_kiro/workflow/listWatchHandlers","_kiro/workflow/resumeAll","_kiro/workflow/retry","_kiro/workflow/update","_kiro/workflow/resume","_kiro/sourceProviders/list","_kiro/sourceProviders/listResources"],"sessionSources":["local","remote"],"sessionListScopes":["workspace","user"],"executionTargets":["local","cloud-sandbox"],"sourceProviders":true,"replayMarking":true}}},"authMethods":[{"id":"aws-builder-id","name":"AWS Builder ID"},{"id":"aws-iam-identity-center","name":"AWS IAM Identity Center"}]}}}
 {"type":"expect_outbound","label":"request:session/new","frame":{"kind":"request","method":"session/new","params":{"cwd":"<workspace>","mcpServers":"<any>"}}}
 {"type":"emit_inbound","label":"notification:session/update:available_commands_update","frame":{"kind":"notification","method":"session/update","params":{"sessionId":"sess_00000000-0000-4000-8000-000000000001","update":{"sessionUpdate":"available_commands_update","availableCommands":[{"name":"architecture-selection","description":"Steering: architecture-selection","input":{"hint":"optional context"},"_meta":{"kiro":{"type":"steering","contextQuery":"global:architecture-selection","commandId":"architecture-selection","resource":{"resourceType":"steering","source":{"origin":"bundled"}},"originalName":"architecture-selection"}}},{"name":"quick-spec","description":"Steering: quick-spec","input":{"hint":"optional context"},"_meta":{"kiro":{"type":"steering","contextQuery":"global:quick-spec","commandId":"quick-spec","resource":{"resourceType":"steering","source":{"origin":"bundled"}},"originalName":"quick-spec"}}},{"name":"bug-fix","description":"Steering: bug-fix","input":{"hint":"optional context"},"_meta":{"kiro":{"type":"steering","contextQuery":"global:bug-fix","commandId":"bug-fix","resource":{"resourceType":"steering","source":{"origin":"bundled"}},"originalName":"bug-fix"}}},{"name":"general-task-execution","description":"General-purpose sub-agent with access to all tools for executing arbitrary tasks","input":{"hint":"task to delegate"},"_meta":{"kiro":{"type":"custom-agent","commandId":"general-task-execution","resource":{"resourceType":"agent","source":{"origin":"bundled"}},"originalName":"general-task-execution"}}},{"name":"context-gatherer","description":"Investigates the codebase to answer a specific question about it. Deeply analyzes existing code by tracing execution paths, mapping architecture and abstraction layers, understanding patterns, and documenting dependencies, returning a thorough, direct written analysis that explains how the relevant code works and points to the specific files and lines involved. Use it to understand code before you change it: before designing or implementing a change to code you don't already fully understand, start with context-gatherer so your edits are grounded in how the code actually works. When a task requires understanding code you don't already know, dispatch context-gatherer to do that exploration before running your own searches or reads. Rules: 1. Provide a clear, specific prompt that includes your intent: a detailed task description of the context you need and what you're trying to accomplish. 2. The subagent explores the codebase and returns an analysis of your query 3. Trust the returned results. You may still inspect additional code yourself when you need context beyond what was returned. 4. Reuse existing context-gatherer output for related follow-up questions; do not re-invoke on the same question with different phrasing. 5. For multiple distinct questions, dispatch several context-gatherers in parallel, each targeting a different aspect of the codebase.","input":{"hint":"task to delegate"},"_meta":{"kiro":{"type":"custom-agent","commandId":"context-gatherer","resource":{"resourceType":"agent","source":{"origin":"bundled"}},"originalName":"context-gatherer"}}}]}}}}
diff --git a/apps/server/src/orchestration-v2/testkit/fixtures/shared.ts b/apps/server/src/orchestration-v2/testkit/fixtures/shared.ts
index 1a550cd6786d..63f85819acba 100644
--- a/apps/server/src/orchestration-v2/testkit/fixtures/shared.ts
+++ b/apps/server/src/orchestration-v2/testkit/fixtures/shared.ts
@@ -268,6 +268,8 @@ export type OrchestratorFixtureInputStep =
   | {
       readonly type: "advance_clock";
       readonly duration: Duration.Input;
+      /** The jump idle-releases the provider session; later steps wait for that release. */
+      readonly releasesProviderSession?: boolean;
     }
   | {
       /** Picks another model of the same provider instance; later messages use it. */
@@ -883,7 +885,13 @@ export function materializeFixtureInput(input: {
           });
           break;
         case "advance_clock":
-          steps.push({ type: "advance_clock", duration: step.duration });
+          steps.push({
+            type: "advance_clock",
+            duration: step.duration,
+            ...(step.releasesProviderSession === true
+              ? { awaitProviderSessionRelease: ids.threadId }
+              : {}),
+          });
           break;
         case "set_model":
           modelSelection = { ...input.modelSelection, model: step.model };
diff --git a/apps/server/src/orchestration-v2/testkit/fixtures/simple/fx_transcript.ndjson b/apps/server/src/orchestration-v2/testkit/fixtures/simple/fx_transcript.ndjson
index 84d694c6a157..923aa3d611f4 100644
--- a/apps/server/src/orchestration-v2/testkit/fixtures/simple/fx_transcript.ndjson
+++ b/apps/server/src/orchestration-v2/testkit/fixtures/simple/fx_transcript.ndjson
@@ -1,5 +1,5 @@
 {"type":"transcript_start","provider":"fx","protocol":"acp.ndjson-jsonrpc","version":"1","scenario":"simple","metadata":{"generatedBy":"live-fx-recorder","fxVersion":"0.0.13","normalization":"Session ids are fx-session-NN, the workspace is <workspace>, HOME is /home/fx-replay and the recording user is fx-replay. T3-owned prompt text, MCP servers and initialize params other than clientCapabilities and _meta are <any>. User skill names, emails and token-shaped strings are removed. Timestamps are kept as recorded.","droppedFrames":0}}
-{"type":"expect_outbound","label":"request:initialize","frame":{"kind":"request","method":"initialize","params":{"protocolVersion":2,"info":"<any>","capabilities":"<any>","clientCapabilities":{"fs":{"readTextFile":false,"writeTextFile":false},"terminal":false,"session":{"notices":{}},"elicitation":{"form":{}}},"clientInfo":"<any>"}}}
+{"type":"expect_outbound","label":"request:initialize","frame":{"kind":"request","method":"initialize","params":{"protocolVersion":2,"info":"<any>","capabilities":"<any>","clientCapabilities":{"fs":{"readTextFile":false,"writeTextFile":false},"terminal":false,"session":{"notices":{},"compaction":{}},"elicitation":{"form":{}}},"clientInfo":"<any>"}}}
 {"type":"emit_inbound","label":"response:initialize","frame":{"kind":"response","method":"initialize","result":{"protocolVersion":1,"agentCapabilities":{"loadSession":true,"promptCapabilities":{"image":true,"audio":false,"embeddedContext":true},"mcpCapabilities":{"http":true,"sse":true,"acp":true},"sessionCapabilities":{"list":{},"resume":{},"close":{},"systemPrompt":{}},"_meta":{"fx":{"steering":true}}},"agentInfo":{"name":"fx","title":"fx","version":"0.0.13"},"authMethods":[]}}}
 {"type":"expect_outbound","label":"request:session/new","frame":{"kind":"request","method":"session/new","params":{"cwd":"<workspace>","mcpServers":"<any>"}}}
 {"type":"emit_inbound","label":"response:session/new","frame":{"kind":"response","method":"session/new","result":{"sessionId":"fx-session-01","configOptions":[{"id":"provider","name":"Provider","category":"model","type":"select","currentValue":"gateway","options":[{"value":"gateway","name":"Vercel AI Gateway"},{"value":"codex","name":"Codex subscription"},{"value":"grok","name":"Grok subscription"}]},{"id":"model","name":"Model","category":"model","type":"select","currentValue":"anthropic/claude-opus-5.5","options":[{"value":"anthropic/claude-sonnet-5.5","name":"anthropic/claude-sonnet-5.5"},{"value":"anthropic/claude-opus-5.5","name":"anthropic/claude-opus-5.5"},{"value":"anthropic/claude-opus-5.5-fast","name":"anthropic/claude-opus-5.5-fast"},{"value":"anthropic/claude-opus-5","name":"anthropic/claude-opus-5"},{"value":"anthropic/claude-opus-5-fast","name":"anthropic/claude-opus-5-fast"},{"value":"anthropic/claude-sonnet-5","name":"anthropic/claude-sonnet-5"},{"value":"anthropic/claude-opus-4.8","name":"anthropic/claude-opus-4.8"},{"value":"anthropic/claude-opus-4.8-fast","name":"anthropic/claude-opus-4.8-fast"},{"value":"anthropic/claude-opus-4.7","name":"anthropic/claude-opus-4.7"},{"value":"anthropic/claude-sonnet-4.6","name":"anthropic/claude-sonnet-4.6"},{"value":"anthropic/claude-opus-4.6","name":"anthropic/claude-opus-4.6"},{"value":"anthropic/claude-opus-4.5","name":"anthropic/claude-opus-4.5"},{"value":"anthropic/claude-sonnet-4.5","name":"anthropic/claude-sonnet-4.5"},{"value":"anthropic/claude-opus-4","name":"anthropic/claude-opus-4"},{"value":"anthropic/claude-sonnet-4","name":"anthropic/claude-sonnet-4"},{"value":"openai/gpt-5.6-luna","name":"openai/gpt-5.6-luna"},{"value":"openai/gpt-5.6-luna-fast","name":"openai/gpt-5.6-luna-fast"},{"value":"openai/gpt-5.6-sol","name":"openai/gpt-5.6-sol"},{"value":"openai/gpt-5.6-sol-fast","name":"openai/gpt-5.6-sol-fast"},{"value":"openai/gpt-5.6-terra","name":"openai/gpt-5.6-terra"},{"value":"openai/gpt-5.6-terra-fast","name":"openai/gpt-5.6-terra-fast"},{"value":"openai/gpt-5.5","name":"openai/gpt-5.5"},{"value":"openai/gpt-5.5-fast","name":"openai/gpt-5.5-fast"},{"value":"openai/gpt-5.5-pro","name":"openai/gpt-5.5-pro"},{"value":"openai/gpt-5.4-nano","name":"openai/gpt-5.4-nano"},{"value":"openai/gpt-5.4","name":"openai/gpt-5.4"},{"value":"openai/gpt-5.4-fast","name":"openai/gpt-5.4-fast"},{"value":"openai/gpt-5.4-pro","name":"openai/gpt-5.4-pro"},{"value":"openai/gpt-5.3-codex","name":"openai/gpt-5.3-codex"},{"value":"openai/gpt-5.3-codex-fast","name":"openai/gpt-5.3-codex-fast"},{"value":"openai/gpt-5.2","name":"openai/gpt-5.2"},{"value":"openai/gpt-5.2-fast","name":"openai/gpt-5.2-fast"},{"value":"openai/gpt-5.2-pro","name":"openai/gpt-5.2-pro"},{"value":"openai/gpt-5.1-thinking","name":"openai/gpt-5.1-thinking"},{"value":"openai/gpt-5.1-thinking-fast","name":"openai/gpt-5.1-thinking-fast"},{"value":"openai/gpt-5-pro","name":"openai/gpt-5-pro"},{"value":"openai/gpt-5","name":"openai/gpt-5"},{"value":"openai/gpt-5-fast","name":"openai/gpt-5-fast"},{"value":"openai/gpt-5-nano","name":"openai/gpt-5-nano"},{"value":"openai/o3-pro","name":"openai/o3-pro"},{"value":"openai/o3","name":"openai/o3"},{"value":"openai/o3-fast","name":"openai/o3-fast"},{"value":"openai/o1","name":"openai/o1"},{"value":"deepseek/deepseek-v4-pro-0813","name":"deepseek/deepseek-v4-pro-0813"},{"value":"deepseek/deepseek-v4-pro","name":"deepseek/deepseek-v4-pro"},{"value":"spacexai/grok-4.7","name":"spacexai/grok-4.7"},{"value":"spacexai/grok-4.6","name":"spacexai/grok-4.6"},{"value":"spacexai/grok-4.5","name":"spacexai/grok-4.5"},{"value":"spacexai/grok-4.3","name":"spacexai/grok-4.3"},{"value":"spacexai/grok-4.20-multi-agent","name":"spacexai/grok-4.20-multi-agent"},{"value":"spacexai/grok-4.20-non-reasoning","name":"spacexai/grok-4.20-non-reasoning"},{"value":"spacexai/grok-4.20-reasoning","name":"spacexai/grok-4.20-reasoning"},{"value":"spacexai/grok-4.1-fast-non-reasoning","name":"spacexai/grok-4.1-fast-non-reasoning"},{"value":"spacexai/grok-4.1-fast-reasoning","name":"spacexai/grok-4.1-fast-reasoning"},{"value":"amazon/nova-pro","name":"amazon/nova-pro"},{"value":"anthropic/claude-fable-5.1","name":"anthropic/claude-fable-5.1"},{"value":"anthropic/claude-fable-5","name":"anthropic/claude-fable-5"},{"value":"openai/gpt-6.1-sol","name":"openai/gpt-6.1-sol"},{"value":"openai/gpt-6.1-sol-fast","name":"openai/gpt-6.1-sol-fast"},{"value":"openai/gpt-6-luna","name":"openai/gpt-6-luna"},{"value":"openai/gpt-6-luna-fast","name":"openai/gpt-6-luna-fast"},{"value":"openai/gpt-6-sol","name":"openai/gpt-6-sol"},{"value":"openai/gpt-6-sol-fast","name":"openai/gpt-6-sol-fast"},{"value":"openai/gpt-6-astra","name":"openai/gpt-6-astra"},{"value":"openai/gpt-6-astra-fast","name":"openai/gpt-6-astra-fast"},{"value":"openai/gpt-oss-safeguard-120b","name":"openai/gpt-oss-safeguard-120b"},{"value":"openai/gpt-oss-safeguard-20b","name":"openai/gpt-oss-safeguard-20b"},{"value":"openai/gpt-oss-120b","name":"openai/gpt-oss-120b"},{"value":"openai/gpt-oss-20b","name":"openai/gpt-oss-20b"},{"value":"openai/gpt-4.1","name":"openai/gpt-4.1"},{"value":"openai/gpt-4.1-fast","name":"openai/gpt-4.1-fast"},{"value":"openai/gpt-4.1-nano","name":"openai/gpt-4.1-nano"},{"value":"openai/gpt-4.1-nano-fast","name":"openai/gpt-4.1-nano-fast"},{"value":"openai/gpt-4o","name":"openai/gpt-4o"},{"value":"openai/gpt-4o-fast","name":"openai/gpt-4o-fast"},{"value":"openai/gpt-4-turbo","name":"openai/gpt-4-turbo"},{"value":"openai/gpt-3.5-turbo","name":"openai/gpt-3.5-turbo"},{"value":"google/gemma-4-26b-a4b-it","name":"google/gemma-4-26b-a4b-it"},{"value":"deepseek/deepseek-v3.2","name":"deepseek/deepseek-v3.2"},{"value":"deepseek/deepseek-v3.2-thinking","name":"deepseek/deepseek-v3.2-thinking"},{"value":"deepseek/deepseek-r1","name":"deepseek/deepseek-r1"},{"value":"meta/llama-4-maverick","name":"meta/llama-4-maverick"},{"value":"meta/llama-4-scout","name":"meta/llama-4-scout"},{"value":"meta/llama-3.3-70b","name":"meta/llama-3.3-70b"},{"value":"meta/llama-3.1-70b","name":"meta/llama-3.1-70b"},{"value":"meta/llama-3.1-8b","name":"meta/llama-3.1-8b"},{"value":"alibaba/qwen3.8-2.4t-a95b","name":"alibaba/qwen3.8-2.4t-a95b"},{"value":"alibaba/qwen3.8-max","name":"alibaba/qwen3.8-max"},{"value":"alibaba/qwen3-next-80b-a3b-instruct","name":"alibaba/qwen3-next-80b-a3b-instruct"},{"value":"alibaba/qwen3-next-80b-a3b-thinking","name":"alibaba/qwen3-next-80b-a3b-thinking"},{"value":"alibaba/qwen3-coder-30b-a3b","name":"alibaba/qwen3-coder-30b-a3b"},{"value":"alibaba/qwen3-coder","name":"alibaba/qwen3-coder"},{"value":"alibaba/qwen3-coder-next","name":"alibaba/qwen3-coder-next"},{"value":"alibaba/qwen-3-235b","name":"alibaba/qwen-3-235b"},{"value":"alibaba/qwen-3-32b","name":"alibaba/qwen-3-32b"},{"value":"fireworks/ember-1","name":"fireworks/ember-1"},{"value":"zai/glm-5.3-fast","name":"zai/glm-5.3-fast"},{"value":"zai/glm-5.3","name":"zai/glm-5.3"},{"value":"nvidia/nemotron-3.5-lightning","name":"nvidia/nemotron-3.5-lightning"},{"value":"moonshotai/kimi-k3-fast","name":"moonshotai/kimi-k3-fast"},{"value":"moonshotai/kimi-k3","name":"moonshotai/kimi-k3"},{"value":"zai/glm-5.2-fast","name":"zai/glm-5.2-fast"},{"value":"zai/glm-5.2","name":"zai/glm-5.2"},{"value":"nvidia/nemotron-3-ultra-550b-a55b","name":"nvidia/nemotron-3-ultra-550b-a55b"},{"value":"spacexai/grok-build-0.1","name":"spacexai/grok-build-0.1"},{"value":"nvidia/nemotron-3-super-120b-a12b","name":"nvidia/nemotron-3-super-120b-a12b"},{"value":"zai/glm-5","name":"zai/glm-5"},{"value":"moonshotai/kimi-k2.5","name":"moonshotai/kimi-k2.5"},{"value":"zai/glm-4.7","name":"zai/glm-4.7"},{"value":"nvidia/nemotron-nano-12b-v2-vl","name":"nvidia/nemotron-nano-12b-v2-vl"},{"value":"nvidia/nemotron-nano-9b-v2","name":"nvidia/nemotron-nano-9b-v2"},{"value":"amazon/nova-micro","name":"amazon/nova-micro"},{"value":"deepseek/deepseek-v4.1-flash","name":"deepseek/deepseek-v4.1-flash"},{"value":"deepseek/deepseek-v4-flash","name":"deepseek/deepseek-v4-flash"},{"value":"deepseek/deepseek-v4-flash-0731","name":"deepseek/deepseek-v4-flash-0731"},{"value":"zai/glm-5.3-flash","name":"zai/glm-5.3-flash"},{"value":"zai/glm-4.7-flash","name":"zai/glm-4.7-flash"},{"value":"anthropic/claude-haiku-5.5","name":"anthropic/claude-haiku-5.5"},{"value":"anthropic/claude-haiku-4.5","name":"anthropic/claude-haiku-4.5"},{"value":"anthropic/claude-3-haiku","name":"anthropic/claude-3-haiku"},{"value":"openai/gpt-5.4-mini","name":"openai/gpt-5.4-mini"},{"value":"openai/gpt-5.4-mini-fast","name":"openai/gpt-5.4-mini-fast"},{"value":"openai/gpt-5-mini","name":"openai/gpt-5-mini"},{"value":"openai/gpt-5-mini-fast","name":"openai/gpt-5-mini-fast"},{"value":"openai/gpt-4.1-mini","name":"openai/gpt-4.1-mini"},{"value":"openai/gpt-4.1-mini-fast","name":"openai/gpt-4.1-mini-fast"},{"value":"openai/o4-mini","name":"openai/o4-mini"},{"value":"openai/o4-mini-fast","name":"openai/o4-mini-fast"},{"value":"openai/o3-mini","name":"openai/o3-mini"},{"value":"openai/gpt-4o-mini","name":"openai/gpt-4o-mini"},{"value":"openai/gpt-4o-mini-fast","name":"openai/gpt-4o-mini-fast"},{"value":"google/gemini-3.8-flash","name":"google/gemini-3.8-flash"},{"value":"google/gemini-3.7-flash","name":"google/gemini-3.7-flash"},{"value":"google/gemini-3.5-flash-lite","name":"google/gemini-3.5-flash-lite"},{"value":"google/gemini-3.6-flash","name":"google/gemini-3.6-flash"},{"value":"google/gemini-3.5-flash","name":"google/gemini-3.5-flash"},{"value":"google/gemini-3.1-flash-lite","name":"google/gemini-3.1-flash-lite"},{"value":"google/gemini-3-flash","name":"google/gemini-3-flash"},{"value":"google/gemini-2.5-flash-lite","name":"google/gemini-2.5-flash-lite"},{"value":"google/gemini-2.5-flash","name":"google/gemini-2.5-flash"},{"value":"google/gemini-2.5-pro","name":"google/gemini-2.5-pro"},{"value":"minimax/minimax-m3","name":"minimax/minimax-m3"},{"value":"minimax/minimax-m2.5","name":"minimax/minimax-m2.5"},{"value":"minimax/minimax-m2.1","name":"minimax/minimax-m2.1"},{"value":"amazon/nova-2-lite","name":"amazon/nova-2-lite"},{"value":"amazon/nova-lite","name":"amazon/nova-lite"},{"value":"google/gemini-3.1-pro-preview","name":"google/gemini-3.1-pro-preview"},{"value":"spacexai/grok-4.20-multi-agent-beta","name":"spacexai/grok-4.20-multi-agent-beta"},{"value":"spacexai/grok-4.20-non-reasoning-beta","name":"spacexai/grok-4.20-non-reasoning-beta"},{"value":"spacexai/grok-4.20-reasoning-beta","name":"spacexai/grok-4.20-reasoning-beta"}]},{"id":"mode","name":"Session Mode","description":"Controls how the agent requests permission","category":"mode","type":"select","currentValue":"ask","options":[{"value":"code","name":"Code","description":"Write and modify code with full tool access","permissionMode":"auto"},{"value":"ask","name":"Ask","description":"Request permission before making any changes","permissionMode":"ask"}]},{"id":"effort","name":"Reasoning Effort","description":"Controls how much the model thinks before responding","category":"thought_level","type":"select","currentValue":"xhigh","options":[{"value":"auto","name":"default"},{"value":"low","name":"low"},{"value":"medium","name":"medium"},{"value":"high","name":"high"},{"value":"xhigh","name":"xhigh"},{"value":"max","name":"max"}]}],"modes":{"currentModeId":"ask","availableModes":[{"id":"code","name":"Code","description":"Write and modify code with full tool access"},{"id":"ask","name":"Ask","description":"Request permission before making any changes"}]}}}}
diff --git a/apps/server/src/orchestration-v2/testkit/fixtures/simple/kiro_transcript.ndjson b/apps/server/src/orchestration-v2/testkit/fixtures/simple/kiro_transcript.ndjson
index 1e9a0c041244..343017b1b5b0 100644
--- a/apps/server/src/orchestration-v2/testkit/fixtures/simple/kiro_transcript.ndjson
+++ b/apps/server/src/orchestration-v2/testkit/fixtures/simple/kiro_transcript.ndjson
@@ -1,5 +1,5 @@
 {"type":"transcript_start","provider":"kiro","protocol":"acp.ndjson-jsonrpc","version":"1","scenario":"simple","metadata":{"generatedBy":"live-kiro-recorder","kiroVersion":"2.32.0","normalization":"Session ids are fixed sess_ UUIDs and other UUIDs (message and request ids) are numbered in first-seen order, the workspace is <workspace>, HOME is /home/kiro-replay and the recording user is kiro-replay. T3-owned prompt text, MCP servers and initialize params other than clientCapabilities and _meta are <any>. Kiro's log directory, user-scoped commands and agents, and the _kiro/* broadcasts T3 ignores (governance, steering documents, powers, tools, hooks, MCP status, session roster) are removed. Timestamps are kept as recorded.","droppedFrames":13}}
-{"type":"expect_outbound","label":"request:initialize","frame":{"kind":"request","method":"initialize","params":{"protocolVersion":2,"info":"<any>","capabilities":"<any>","clientCapabilities":{"fs":{"readTextFile":false,"writeTextFile":false},"terminal":false,"session":{"notices":{}},"elicitation":{"form":{}},"_meta":{"kiro":{"hooks":{"enabled":true,"v2":true}}}},"clientInfo":"<any>"}}}
+{"type":"expect_outbound","label":"request:initialize","frame":{"kind":"request","method":"initialize","params":{"protocolVersion":2,"info":"<any>","capabilities":"<any>","clientCapabilities":{"fs":{"readTextFile":false,"writeTextFile":false},"terminal":false,"session":{"notices":{},"compaction":{}},"elicitation":{"form":{}},"_meta":{"kiro":{"hooks":{"enabled":true,"v2":true}}}},"clientInfo":"<any>"}}}
 {"type":"emit_inbound","label":"response:initialize","frame":{"kind":"response","method":"initialize","result":{"protocolVersion":2,"agentCapabilities":{"loadSession":true,"promptCapabilities":{"image":true,"embeddedContext":true},"mcpCapabilities":{"http":true,"sse":true},"sessionCapabilities":{"list":{},"close":{},"delete":{},"fork":{"_meta":{"kiro":{"messageId":true}}}},"_meta":{"kiro":{"checkpoints":true,"sessionList":true,"policyNotifications":true,"extensionMethods":["_kiro/knowledge","_kiro/memory/list","_kiro/memory/get","_kiro/memory/create","_kiro/memory/update","_kiro/memory/delete","_kiro/codeIntelligence","_kiro/session/context","_kiro/session/compact","_kiro/session/export","_kiro/session/history","_kiro/config/template","_kiro/workflow/new","_kiro/workflow/invoke","_kiro/workflow/load","_kiro/workflow/inspect","_kiro/workflow/list","_kiro/workflow/pause","_kiro/workflow/cancel","_kiro/workflow/delete","_kiro/workflow/listRecipes","_kiro/workflow/listWatchHandlers","_kiro/workflow/resumeAll","_kiro/workflow/retry","_kiro/workflow/update","_kiro/workflow/resume","_kiro/sourceProviders/list","_kiro/sourceProviders/listResources"],"sessionSources":["local","remote"],"sessionListScopes":["workspace","user"],"executionTargets":["local","cloud-sandbox"],"sourceProviders":true,"replayMarking":true}}},"authMethods":[{"id":"aws-builder-id","name":"AWS Builder ID"},{"id":"aws-iam-identity-center","name":"AWS IAM Identity Center"}]}}}
 {"type":"expect_outbound","label":"request:session/new","frame":{"kind":"request","method":"session/new","params":{"cwd":"<workspace>","mcpServers":"<any>"}}}
 {"type":"emit_inbound","label":"notification:session/update:available_commands_update","frame":{"kind":"notification","method":"session/update","params":{"sessionId":"sess_00000000-0000-4000-8000-000000000001","update":{"sessionUpdate":"available_commands_update","availableCommands":[{"name":"architecture-selection","description":"Steering: architecture-selection","input":{"hint":"optional context"},"_meta":{"kiro":{"type":"steering","contextQuery":"global:architecture-selection","commandId":"architecture-selection","resource":{"resourceType":"steering","source":{"origin":"bundled"}},"originalName":"architecture-selection"}}},{"name":"quick-spec","description":"Steering: quick-spec","input":{"hint":"optional context"},"_meta":{"kiro":{"type":"steering","contextQuery":"global:quick-spec","commandId":"quick-spec","resource":{"resourceType":"steering","source":{"origin":"bundled"}},"originalName":"quick-spec"}}},{"name":"bug-fix","description":"Steering: bug-fix","input":{"hint":"optional context"},"_meta":{"kiro":{"type":"steering","contextQuery":"global:bug-fix","commandId":"bug-fix","resource":{"resourceType":"steering","source":{"origin":"bundled"}},"originalName":"bug-fix"}}},{"name":"general-task-execution","description":"General-purpose sub-agent with access to all tools for executing arbitrary tasks","input":{"hint":"task to delegate"},"_meta":{"kiro":{"type":"custom-agent","commandId":"general-task-execution","resource":{"resourceType":"agent","source":{"origin":"bundled"}},"originalName":"general-task-execution"}}},{"name":"context-gatherer","description":"Investigates the codebase to answer a specific question about it. Deeply analyzes existing code by tracing execution paths, mapping architecture and abstraction layers, understanding patterns, and documenting dependencies, returning a thorough, direct written analysis that explains how the relevant code works and points to the specific files and lines involved. Use it to understand code before you change it: before designing or implementing a change to code you don't already fully understand, start with context-gatherer so your edits are grounded in how the code actually works. When a task requires understanding code you don't already know, dispatch context-gatherer to do that exploration before running your own searches or reads. Rules: 1. Provide a clear, specific prompt that includes your intent: a detailed task description of the context you need and what you're trying to accomplish. 2. The subagent explores the codebase and returns an analysis of your query 3. Trust the returned results. You may still inspect additional code yourself when you need context beyond what was returned. 4. Reuse existing context-gatherer output for related follow-up questions; do not re-invoke on the same question with different phrasing. 5. For multiple distinct questions, dispatch several context-gatherers in parallel, each targeting a different aspect of the codebase.","input":{"hint":"task to delegate"},"_meta":{"kiro":{"type":"custom-agent","commandId":"context-gatherer","resource":{"resourceType":"agent","source":{"origin":"bundled"}},"originalName":"context-gatherer"}}}]}}}}
diff --git a/apps/server/src/orchestration-v2/testkit/fixtures/stop_background_work_after_failed_turn/input.ts b/apps/server/src/orchestration-v2/testkit/fixtures/stop_background_work_after_failed_turn/input.ts
index aba2f3f305f0..4faf0bef550e 100644
--- a/apps/server/src/orchestration-v2/testkit/fixtures/stop_background_work_after_failed_turn/input.ts
+++ b/apps/server/src/orchestration-v2/testkit/fixtures/stop_background_work_after_failed_turn/input.ts
@@ -16,7 +16,7 @@ export function stopBackgroundWorkAfterReleaseInput(): OrchestratorFixtureInput
   return {
     steps: [
       { type: "message", text: STOP_BACKGROUND_WORK_AFTER_FAILED_TURN_PROMPT },
-      { type: "advance_clock", duration: "31 minutes" },
+      { type: "advance_clock", duration: "31 minutes", releasesProviderSession: true },
       { type: "stop_background_work", targetRunIndex: 1 },
     ],
   };
diff --git a/apps/server/src/orchestration-v2/testkit/fixtures/subagent/kiro_transcript.ndjson b/apps/server/src/orchestration-v2/testkit/fixtures/subagent/kiro_transcript.ndjson
index 5f26257d395f..eee1096fa21a 100644
--- a/apps/server/src/orchestration-v2/testkit/fixtures/subagent/kiro_transcript.ndjson
+++ b/apps/server/src/orchestration-v2/testkit/fixtures/subagent/kiro_transcript.ndjson
@@ -1,5 +1,5 @@
 {"type":"transcript_start","provider":"kiro","protocol":"acp.ndjson-jsonrpc","version":"1","scenario":"subagent","metadata":{"generatedBy":"live-kiro-recorder","kiroVersion":"2.33.1","normalization":"Session ids are fixed sess_ UUIDs and other UUIDs (message and request ids) are numbered in first-seen order, the workspace is <workspace>, HOME is /home/kiro-replay and the recording user is kiro-replay. T3-owned prompt text, MCP servers and initialize params other than clientCapabilities and _meta are <any>. Kiro's log directory, user-scoped commands and agents, and the _kiro/* broadcasts T3 ignores (governance, steering documents, powers, tools, hooks, MCP status, session roster) are removed. Timestamps are kept as recorded.","droppedFrames":13}}
-{"type":"expect_outbound","label":"request:initialize","frame":{"kind":"request","method":"initialize","params":{"protocolVersion":2,"info":"<any>","capabilities":"<any>","clientCapabilities":{"fs":{"readTextFile":false,"writeTextFile":false},"terminal":false,"session":{"notices":{}},"elicitation":{"form":{}},"_meta":{"kiro":{"hooks":{"enabled":true,"v2":true}}}},"clientInfo":"<any>"}}}
+{"type":"expect_outbound","label":"request:initialize","frame":{"kind":"request","method":"initialize","params":{"protocolVersion":2,"info":"<any>","capabilities":"<any>","clientCapabilities":{"fs":{"readTextFile":false,"writeTextFile":false},"terminal":false,"session":{"notices":{},"compaction":{}},"elicitation":{"form":{}},"_meta":{"kiro":{"hooks":{"enabled":true,"v2":true}}}},"clientInfo":"<any>"}}}
 {"type":"emit_inbound","label":"response:initialize","frame":{"kind":"response","method":"initialize","result":{"protocolVersion":2,"agentCapabilities":{"loadSession":true,"promptCapabilities":{"image":true,"embeddedContext":true},"mcpCapabilities":{"http":true,"sse":true},"sessionCapabilities":{"list":{},"close":{},"delete":{},"fork":{"_meta":{"kiro":{"messageId":true}}}},"_meta":{"kiro":{"checkpoints":true,"sessionList":true,"policyNotifications":true,"extensionMethods":["_kiro/knowledge","_kiro/memory/list","_kiro/memory/get","_kiro/memory/create","_kiro/memory/update","_kiro/memory/delete","_kiro/codeIntelligence","_kiro/session/context","_kiro/session/compact","_kiro/session/export","_kiro/session/history","_kiro/config/template","_kiro/workflow/new","_kiro/workflow/invoke","_kiro/workflow/load","_kiro/workflow/inspect","_kiro/workflow/list","_kiro/workflow/pause","_kiro/workflow/cancel","_kiro/workflow/delete","_kiro/workflow/listRecipes","_kiro/workflow/listWatchHandlers","_kiro/workflow/resumeAll","_kiro/workflow/retry","_kiro/workflow/update","_kiro/workflow/resume","_kiro/sourceProviders/list","_kiro/sourceProviders/listResources"],"sessionSources":["local","remote"],"sessionListScopes":["workspace","user"],"executionTargets":["local","cloud-sandbox"],"sourceProviders":true,"replayMarking":true}}},"authMethods":[{"id":"aws-builder-id","name":"AWS Builder ID"},{"id":"aws-iam-identity-center","name":"AWS IAM Identity Center"}]}}}
 {"type":"expect_outbound","label":"request:session/new","frame":{"kind":"request","method":"session/new","params":{"cwd":"<workspace>","mcpServers":"<any>"}}}
 {"type":"emit_inbound","label":"notification:session/update:available_commands_update","frame":{"kind":"notification","method":"session/update","params":{"sessionId":"sess_00000000-0000-4000-8000-000000000001","update":{"sessionUpdate":"available_commands_update","availableCommands":[{"name":"architecture-selection","description":"Steering: architecture-selection","input":{"hint":"optional context"},"_meta":{"kiro":{"type":"steering","contextQuery":"global:architecture-selection","commandId":"architecture-selection","resource":{"resourceType":"steering","source":{"origin":"bundled"}},"originalName":"architecture-selection"}}},{"name":"quick-spec","description":"Steering: quick-spec","input":{"hint":"optional context"},"_meta":{"kiro":{"type":"steering","contextQuery":"global:quick-spec","commandId":"quick-spec","resource":{"resourceType":"steering","source":{"origin":"bundled"}},"originalName":"quick-spec"}}},{"name":"bug-fix","description":"Steering: bug-fix","input":{"hint":"optional context"},"_meta":{"kiro":{"type":"steering","contextQuery":"global:bug-fix","commandId":"bug-fix","resource":{"resourceType":"steering","source":{"origin":"bundled"}},"originalName":"bug-fix"}}},{"name":"general-task-execution","description":"General-purpose sub-agent with access to all tools for executing arbitrary tasks","input":{"hint":"task to delegate"},"_meta":{"kiro":{"type":"custom-agent","commandId":"general-task-execution","resource":{"resourceType":"agent","source":{"origin":"bundled"}},"originalName":"general-task-execution"}}},{"name":"context-gatherer","description":"Investigates the codebase to answer a specific question about it. Deeply analyzes existing code by tracing execution paths, mapping architecture and abstraction layers, understanding patterns, and documenting dependencies, returning a thorough, direct written analysis that explains how the relevant code works and points to the specific files and lines involved. Use it to understand code before you change it: before designing or implementing a change to code you don't already fully understand, start with context-gatherer so your edits are grounded in how the code actually works. When a task requires understanding code you don't already know, dispatch context-gatherer to do that exploration before running your own searches or reads. Rules: 1. Provide a clear, specific prompt that includes your intent: a detailed task description of the context you need and what you're trying to accomplish. 2. The subagent explores the codebase and returns an analysis of your query 3. Trust the returned results. You may still inspect additional code yourself when you need context beyond what was returned. 4. Reuse existing context-gatherer output for related follow-up questions; do not re-invoke on the same question with different phrasing. 5. For multiple distinct questions, dispatch several context-gatherers in parallel, each targeting a different aspect of the codebase.","input":{"hint":"task to delegate"},"_meta":{"kiro":{"type":"custom-agent","commandId":"context-gatherer","resource":{"resourceType":"agent","source":{"origin":"bundled"}},"originalName":"context-gatherer"}}}]}}}}
diff --git a/apps/server/src/orchestration-v2/testkit/fixtures/todo_list/grok_transcript.ndjson b/apps/server/src/orchestration-v2/testkit/fixtures/todo_list/grok_transcript.ndjson
index ae5bb950d93c..4c842c100944 100644
--- a/apps/server/src/orchestration-v2/testkit/fixtures/todo_list/grok_transcript.ndjson
+++ b/apps/server/src/orchestration-v2/testkit/fixtures/todo_list/grok_transcript.ndjson
@@ -1,5 +1,5 @@
 {"type":"transcript_start","provider":"grok","protocol":"acp.ndjson-jsonrpc","version":"1","scenario":"todo_list","metadata":{"generatedBy":"live-grok-recorder","grokVersion":"1.0.41","normalization":"Session ids are fixed UUIDs, the workspace is <workspace>, HOME is /home/grok-replay and the recording user is grok-replay. T3-owned prompt text, MCP servers and initialize params other than clientCapabilities are <any>. Personal skills, machine identity, account settings and announcement broadcasts are removed, as are responses to Grok-internal request ids that T3's protocol drops. Timestamps are kept as recorded.","droppedFrames":5}}
-{"type":"expect_outbound","label":"request:initialize","frame":{"kind":"request","method":"initialize","params":{"protocolVersion":2,"info":"<any>","capabilities":"<any>","clientCapabilities":{"fs":{"readTextFile":false,"writeTextFile":false},"terminal":false,"session":{"notices":{}},"elicitation":{"form":{}}},"clientInfo":"<any>","_meta":{"clientType":"extension"}}}}
+{"type":"expect_outbound","label":"request:initialize","frame":{"kind":"request","method":"initialize","params":{"protocolVersion":2,"info":"<any>","capabilities":"<any>","clientCapabilities":{"fs":{"readTextFile":false,"writeTextFile":false},"terminal":false,"session":{"notices":{},"compaction":{}},"elicitation":{"form":{}}},"clientInfo":"<any>","_meta":{"clientType":"extension"}}}}
 {"type":"emit_inbound","label":"response:initialize","frame":{"kind":"response","method":"initialize","result":{"protocolVersion":1,"agentCapabilities":{"loadSession":true,"promptCapabilities":{"image":false,"audio":false,"embeddedContext":true},"mcpCapabilities":{"http":true,"sse":true},"sessionCapabilities":{"list":{},"resume":{},"close":{}},"auth":{},"_meta":{"x.ai/fs_notify":true,"x.ai/hooks":{"blockingEvents":["pre_tool_use","stop","subagent_stop"],"decisions":["deny","block"],"stopSignals":["continue","stopReason","additionalContext"]},"x.ai/capabilities":{"toolOverrides":{"x_keyword_search":true,"x_semantic_search":true,"x_user_search":false,"x_thread_fetch":false}}}},"authMethods":[{"id":"cached_token","name":"cached_token","description":"Cached token from ~/.grok/auth.json"},{"id":"grok.com","name":"Grok","description":"Sign in with Grok"}],"_meta":{"grokShell":true,"defaultAuthMethodId":"cached_token","x.ai/mcp/sdk":true,"x.ai/pluginDirs":true,"currentWorkingDirectory":"<workspace>","agentVersion":"1.0.41","agentId":"00000000-0000-4000-8000-000000000000","agentInstanceId":"00000000-0000-4000-8000-000000000000","hostname":"grok-replay","modelState":{"currentModelId":"grok-4.7","availableModels":[{"modelId":"grok-4.7","name":"Grok 4.7","description":"SpaceXAI's latest frontier model","_meta":{"totalContextTokens":500000,"agentType":"grok-build-plan","supportsReasoningEffort":true,"reasoningEffort":"high","reasoningEfforts":[{"id":"xhigh","value":"xhigh","label":"Extra High","description":"Maximum reasoning for the hardest tasks.","default":false},{"id":"high","value":"high","label":"High","description":"Thorough reasoning and quality. Recommended.","default":true},{"id":"medium","value":"medium","label":"Medium","description":"Strong quality with a faster turnaround.","default":false},{"id":"low","value":"low","label":"Low","description":"Fastest responses. Best for simple tasks.","default":false}]}},{"modelId":"grok-4.7-build-fast","name":"Grok 4.7 Fast","description":"Fast variant. 2x the price.","_meta":{"totalContextTokens":500000,"agentType":"grok-build-plan","supportsReasoningEffort":true,"reasoningEffort":"high","reasoningEfforts":[{"id":"xhigh","value":"xhigh","label":"Extra High","description":"Maximum reasoning for the hardest tasks.","default":false},{"id":"high","value":"high","label":"High","description":"Thorough reasoning and quality. Recommended.","default":true},{"id":"medium","value":"medium","label":"Medium","description":"Strong quality with a faster turnaround.","default":false},{"id":"low","value":"low","label":"Low","description":"Fastest responses. Best for simple tasks.","default":false}]}},{"modelId":"grok-4.6","name":"Grok 4.6","_meta":{"totalContextTokens":500000,"agentType":"grok-build-plan","supportsReasoningEffort":true,"reasoningEffort":"high","reasoningEfforts":[{"id":"xhigh","value":"xhigh","label":"Extra High","description":"Highest effort and reasoning level","default":false},{"id":"high","value":"high","label":"High","description":"Higher implementation quality with extensive reasoning","default":true},{"id":"medium","value":"medium","label":"Medium","description":"Balanced effort with standard implementation and testing","default":false},{"id":"low","value":"low","label":"Low","description":"Quick, fast implementations","default":false}]}},{"modelId":"grok-4.5","name":"Grok 4.5","_meta":{"totalContextTokens":500000,"agentType":"grok-build-plan","supportsReasoningEffort":true,"reasoningEffort":"high","reasoningEfforts":[{"id":"high","value":"high","label":"High","description":"Highest implementation quality with extensive reasoning","default":true},{"id":"medium","value":"medium","label":"Medium","description":"Balanced effort with standard implementation and testing","default":false},{"id":"low","value":"low","label":"Low","description":"Quick, fast implementations","default":false}]}}]},"mcpServers":[],"mcpApps":false,"metadata":null,"availableCommands":[{"name":"compact","description":"Compress conversation history to save context window","input":{"hint":"optional context about what to preserve"}},{"name":"always-approve","description":"Toggle always-approve mode (skip all permission prompts)","input":{"hint":"on|off"}},{"name":"context","description":"Show context window usage and session stats","input":null},{"name":"session-info","description":"Show session details (model, turns, context usage)","input":null},{"name":"deep-research","description":"Research with bounded parallel agents, cross-check evidence, and write a cited report","input":{"hint":"<query>"}},{"name":"workflow","description":"Launch a saved workflow, list runs, or manage a run (pause, resume, stop, save)","input":{"hint":"<name> [--agent-budget N] [--effort LEVEL] [args] | runs | pause|resume|stop|save [name]"}},{"name":"goal","description":"Set, manage, or check an autonomous goal","input":{"hint":"<objective> [--budget <tokens>] | status | pause | resume | clear"}}],"cancelRewind":true,"sessionRecap":true,"feedbackTraceOffer":false,"voiceMode":true}}}}
 {"type":"expect_outbound","label":"request:session/new","frame":{"kind":"request","method":"session/new","params":{"cwd":"<workspace>","mcpServers":"<any>"}}}
 {"type":"emit_inbound","label":"notification:_x.ai/mcp/servers_updated","frame":{"kind":"notification","method":"_x.ai/mcp/servers_updated","params":{"mcpServers":[]}}}
diff --git a/apps/server/src/orchestration-v2/testkit/fixtures/tool_call_denied_write/fx_transcript.ndjson b/apps/server/src/orchestration-v2/testkit/fixtures/tool_call_denied_write/fx_transcript.ndjson
index 6a1c048f6aff..5a643d4df438 100644
--- a/apps/server/src/orchestration-v2/testkit/fixtures/tool_call_denied_write/fx_transcript.ndjson
+++ b/apps/server/src/orchestration-v2/testkit/fixtures/tool_call_denied_write/fx_transcript.ndjson
@@ -1,5 +1,5 @@
 {"type":"transcript_start","provider":"fx","protocol":"acp.ndjson-jsonrpc","version":"1","scenario":"tool_call_denied_write","metadata":{"generatedBy":"live-fx-recorder","fxVersion":"0.0.13","normalization":"Session ids are fx-session-NN, the workspace is <workspace>, HOME is /home/fx-replay and the recording user is fx-replay. T3-owned prompt text, MCP servers and initialize params other than clientCapabilities and _meta are <any>. User skill names, emails and token-shaped strings are removed. Timestamps are kept as recorded.","droppedFrames":0}}
-{"type":"expect_outbound","label":"request:initialize","frame":{"kind":"request","method":"initialize","params":{"protocolVersion":2,"info":"<any>","capabilities":"<any>","clientCapabilities":{"fs":{"readTextFile":false,"writeTextFile":false},"terminal":false,"session":{"notices":{}},"elicitation":{"form":{}}},"clientInfo":"<any>"}}}
+{"type":"expect_outbound","label":"request:initialize","frame":{"kind":"request","method":"initialize","params":{"protocolVersion":2,"info":"<any>","capabilities":"<any>","clientCapabilities":{"fs":{"readTextFile":false,"writeTextFile":false},"terminal":false,"session":{"notices":{},"compaction":{}},"elicitation":{"form":{}}},"clientInfo":"<any>"}}}
 {"type":"emit_inbound","label":"response:initialize","frame":{"kind":"response","method":"initialize","result":{"protocolVersion":1,"agentCapabilities":{"loadSession":true,"promptCapabilities":{"image":true,"audio":false,"embeddedContext":true},"mcpCapabilities":{"http":true,"sse":true,"acp":true},"sessionCapabilities":{"list":{},"resume":{},"close":{},"systemPrompt":{}},"_meta":{"fx":{"steering":true}}},"agentInfo":{"name":"fx","title":"fx","version":"0.0.13"},"authMethods":[]}}}
 {"type":"expect_outbound","label":"request:session/new","frame":{"kind":"request","method":"session/new","params":{"cwd":"<workspace>","mcpServers":"<any>"}}}
 {"type":"emit_inbound","label":"response:session/new","frame":{"kind":"response","method":"session/new","result":{"sessionId":"fx-session-01","configOptions":[{"id":"provider","name":"Provider","category":"model","type":"select","currentValue":"gateway","options":[{"value":"gateway","name":"Vercel AI Gateway"},{"value":"codex","name":"Codex subscription"},{"value":"grok","name":"Grok subscription"}]},{"id":"model","name":"Model","category":"model","type":"select","currentValue":"anthropic/claude-opus-5.5","options":[{"value":"anthropic/claude-sonnet-5.5","name":"anthropic/claude-sonnet-5.5"},{"value":"anthropic/claude-opus-5.5","name":"anthropic/claude-opus-5.5"},{"value":"anthropic/claude-opus-5.5-fast","name":"anthropic/claude-opus-5.5-fast"},{"value":"anthropic/claude-opus-5","name":"anthropic/claude-opus-5"},{"value":"anthropic/claude-opus-5-fast","name":"anthropic/claude-opus-5-fast"},{"value":"anthropic/claude-sonnet-5","name":"anthropic/claude-sonnet-5"},{"value":"anthropic/claude-opus-4.8","name":"anthropic/claude-opus-4.8"},{"value":"anthropic/claude-opus-4.8-fast","name":"anthropic/claude-opus-4.8-fast"},{"value":"anthropic/claude-opus-4.7","name":"anthropic/claude-opus-4.7"},{"value":"anthropic/claude-sonnet-4.6","name":"anthropic/claude-sonnet-4.6"},{"value":"anthropic/claude-opus-4.6","name":"anthropic/claude-opus-4.6"},{"value":"anthropic/claude-opus-4.5","name":"anthropic/claude-opus-4.5"},{"value":"anthropic/claude-sonnet-4.5","name":"anthropic/claude-sonnet-4.5"},{"value":"anthropic/claude-opus-4","name":"anthropic/claude-opus-4"},{"value":"anthropic/claude-sonnet-4","name":"anthropic/claude-sonnet-4"},{"value":"openai/gpt-5.6-luna","name":"openai/gpt-5.6-luna"},{"value":"openai/gpt-5.6-luna-fast","name":"openai/gpt-5.6-luna-fast"},{"value":"openai/gpt-5.6-sol","name":"openai/gpt-5.6-sol"},{"value":"openai/gpt-5.6-sol-fast","name":"openai/gpt-5.6-sol-fast"},{"value":"openai/gpt-5.6-terra","name":"openai/gpt-5.6-terra"},{"value":"openai/gpt-5.6-terra-fast","name":"openai/gpt-5.6-terra-fast"},{"value":"openai/gpt-5.5","name":"openai/gpt-5.5"},{"value":"openai/gpt-5.5-fast","name":"openai/gpt-5.5-fast"},{"value":"openai/gpt-5.5-pro","name":"openai/gpt-5.5-pro"},{"value":"openai/gpt-5.4-nano","name":"openai/gpt-5.4-nano"},{"value":"openai/gpt-5.4","name":"openai/gpt-5.4"},{"value":"openai/gpt-5.4-fast","name":"openai/gpt-5.4-fast"},{"value":"openai/gpt-5.4-pro","name":"openai/gpt-5.4-pro"},{"value":"openai/gpt-5.3-codex","name":"openai/gpt-5.3-codex"},{"value":"openai/gpt-5.3-codex-fast","name":"openai/gpt-5.3-codex-fast"},{"value":"openai/gpt-5.2","name":"openai/gpt-5.2"},{"value":"openai/gpt-5.2-fast","name":"openai/gpt-5.2-fast"},{"value":"openai/gpt-5.2-pro","name":"openai/gpt-5.2-pro"},{"value":"openai/gpt-5.1-thinking","name":"openai/gpt-5.1-thinking"},{"value":"openai/gpt-5.1-thinking-fast","name":"openai/gpt-5.1-thinking-fast"},{"value":"openai/gpt-5-pro","name":"openai/gpt-5-pro"},{"value":"openai/gpt-5","name":"openai/gpt-5"},{"value":"openai/gpt-5-fast","name":"openai/gpt-5-fast"},{"value":"openai/gpt-5-nano","name":"openai/gpt-5-nano"},{"value":"openai/o3-pro","name":"openai/o3-pro"},{"value":"openai/o3","name":"openai/o3"},{"value":"openai/o3-fast","name":"openai/o3-fast"},{"value":"openai/o1","name":"openai/o1"},{"value":"deepseek/deepseek-v4-pro-0813","name":"deepseek/deepseek-v4-pro-0813"},{"value":"deepseek/deepseek-v4-pro","name":"deepseek/deepseek-v4-pro"},{"value":"spacexai/grok-4.7","name":"spacexai/grok-4.7"},{"value":"spacexai/grok-4.6","name":"spacexai/grok-4.6"},{"value":"spacexai/grok-4.5","name":"spacexai/grok-4.5"},{"value":"spacexai/grok-4.3","name":"spacexai/grok-4.3"},{"value":"spacexai/grok-4.20-multi-agent","name":"spacexai/grok-4.20-multi-agent"},{"value":"spacexai/grok-4.20-non-reasoning","name":"spacexai/grok-4.20-non-reasoning"},{"value":"spacexai/grok-4.20-reasoning","name":"spacexai/grok-4.20-reasoning"},{"value":"spacexai/grok-4.1-fast-non-reasoning","name":"spacexai/grok-4.1-fast-non-reasoning"},{"value":"spacexai/grok-4.1-fast-reasoning","name":"spacexai/grok-4.1-fast-reasoning"},{"value":"amazon/nova-pro","name":"amazon/nova-pro"},{"value":"anthropic/claude-fable-5.1","name":"anthropic/claude-fable-5.1"},{"value":"anthropic/claude-fable-5","name":"anthropic/claude-fable-5"},{"value":"openai/gpt-6.1-sol","name":"openai/gpt-6.1-sol"},{"value":"openai/gpt-6.1-sol-fast","name":"openai/gpt-6.1-sol-fast"},{"value":"openai/gpt-6-luna","name":"openai/gpt-6-luna"},{"value":"openai/gpt-6-luna-fast","name":"openai/gpt-6-luna-fast"},{"value":"openai/gpt-6-sol","name":"openai/gpt-6-sol"},{"value":"openai/gpt-6-sol-fast","name":"openai/gpt-6-sol-fast"},{"value":"openai/gpt-6-astra","name":"openai/gpt-6-astra"},{"value":"openai/gpt-6-astra-fast","name":"openai/gpt-6-astra-fast"},{"value":"openai/gpt-oss-safeguard-120b","name":"openai/gpt-oss-safeguard-120b"},{"value":"openai/gpt-oss-safeguard-20b","name":"openai/gpt-oss-safeguard-20b"},{"value":"openai/gpt-oss-120b","name":"openai/gpt-oss-120b"},{"value":"openai/gpt-oss-20b","name":"openai/gpt-oss-20b"},{"value":"openai/gpt-4.1","name":"openai/gpt-4.1"},{"value":"openai/gpt-4.1-fast","name":"openai/gpt-4.1-fast"},{"value":"openai/gpt-4.1-nano","name":"openai/gpt-4.1-nano"},{"value":"openai/gpt-4.1-nano-fast","name":"openai/gpt-4.1-nano-fast"},{"value":"openai/gpt-4o","name":"openai/gpt-4o"},{"value":"openai/gpt-4o-fast","name":"openai/gpt-4o-fast"},{"value":"openai/gpt-4-turbo","name":"openai/gpt-4-turbo"},{"value":"openai/gpt-3.5-turbo","name":"openai/gpt-3.5-turbo"},{"value":"google/gemma-4-26b-a4b-it","name":"google/gemma-4-26b-a4b-it"},{"value":"deepseek/deepseek-v3.2","name":"deepseek/deepseek-v3.2"},{"value":"deepseek/deepseek-v3.2-thinking","name":"deepseek/deepseek-v3.2-thinking"},{"value":"deepseek/deepseek-r1","name":"deepseek/deepseek-r1"},{"value":"meta/llama-4-maverick","name":"meta/llama-4-maverick"},{"value":"meta/llama-4-scout","name":"meta/llama-4-scout"},{"value":"meta/llama-3.3-70b","name":"meta/llama-3.3-70b"},{"value":"meta/llama-3.1-70b","name":"meta/llama-3.1-70b"},{"value":"meta/llama-3.1-8b","name":"meta/llama-3.1-8b"},{"value":"alibaba/qwen3.8-2.4t-a95b","name":"alibaba/qwen3.8-2.4t-a95b"},{"value":"alibaba/qwen3.8-max","name":"alibaba/qwen3.8-max"},{"value":"alibaba/qwen3-next-80b-a3b-instruct","name":"alibaba/qwen3-next-80b-a3b-instruct"},{"value":"alibaba/qwen3-next-80b-a3b-thinking","name":"alibaba/qwen3-next-80b-a3b-thinking"},{"value":"alibaba/qwen3-coder-30b-a3b","name":"alibaba/qwen3-coder-30b-a3b"},{"value":"alibaba/qwen3-coder","name":"alibaba/qwen3-coder"},{"value":"alibaba/qwen3-coder-next","name":"alibaba/qwen3-coder-next"},{"value":"alibaba/qwen-3-235b","name":"alibaba/qwen-3-235b"},{"value":"alibaba/qwen-3-32b","name":"alibaba/qwen-3-32b"},{"value":"fireworks/ember-1","name":"fireworks/ember-1"},{"value":"zai/glm-5.3-fast","name":"zai/glm-5.3-fast"},{"value":"zai/glm-5.3","name":"zai/glm-5.3"},{"value":"nvidia/nemotron-3.5-lightning","name":"nvidia/nemotron-3.5-lightning"},{"value":"moonshotai/kimi-k3-fast","name":"moonshotai/kimi-k3-fast"},{"value":"moonshotai/kimi-k3","name":"moonshotai/kimi-k3"},{"value":"zai/glm-5.2-fast","name":"zai/glm-5.2-fast"},{"value":"zai/glm-5.2","name":"zai/glm-5.2"},{"value":"nvidia/nemotron-3-ultra-550b-a55b","name":"nvidia/nemotron-3-ultra-550b-a55b"},{"value":"spacexai/grok-build-0.1","name":"spacexai/grok-build-0.1"},{"value":"nvidia/nemotron-3-super-120b-a12b","name":"nvidia/nemotron-3-super-120b-a12b"},{"value":"zai/glm-5","name":"zai/glm-5"},{"value":"moonshotai/kimi-k2.5","name":"moonshotai/kimi-k2.5"},{"value":"zai/glm-4.7","name":"zai/glm-4.7"},{"value":"nvidia/nemotron-nano-12b-v2-vl","name":"nvidia/nemotron-nano-12b-v2-vl"},{"value":"nvidia/nemotron-nano-9b-v2","name":"nvidia/nemotron-nano-9b-v2"},{"value":"amazon/nova-micro","name":"amazon/nova-micro"},{"value":"deepseek/deepseek-v4.1-flash","name":"deepseek/deepseek-v4.1-flash"},{"value":"deepseek/deepseek-v4-flash","name":"deepseek/deepseek-v4-flash"},{"value":"deepseek/deepseek-v4-flash-0731","name":"deepseek/deepseek-v4-flash-0731"},{"value":"zai/glm-5.3-flash","name":"zai/glm-5.3-flash"},{"value":"zai/glm-4.7-flash","name":"zai/glm-4.7-flash"},{"value":"anthropic/claude-haiku-5.5","name":"anthropic/claude-haiku-5.5"},{"value":"anthropic/claude-haiku-4.5","name":"anthropic/claude-haiku-4.5"},{"value":"anthropic/claude-3-haiku","name":"anthropic/claude-3-haiku"},{"value":"openai/gpt-5.4-mini","name":"openai/gpt-5.4-mini"},{"value":"openai/gpt-5.4-mini-fast","name":"openai/gpt-5.4-mini-fast"},{"value":"openai/gpt-5-mini","name":"openai/gpt-5-mini"},{"value":"openai/gpt-5-mini-fast","name":"openai/gpt-5-mini-fast"},{"value":"openai/gpt-4.1-mini","name":"openai/gpt-4.1-mini"},{"value":"openai/gpt-4.1-mini-fast","name":"openai/gpt-4.1-mini-fast"},{"value":"openai/o4-mini","name":"openai/o4-mini"},{"value":"openai/o4-mini-fast","name":"openai/o4-mini-fast"},{"value":"openai/o3-mini","name":"openai/o3-mini"},{"value":"openai/gpt-4o-mini","name":"openai/gpt-4o-mini"},{"value":"openai/gpt-4o-mini-fast","name":"openai/gpt-4o-mini-fast"},{"value":"google/gemini-3.8-flash","name":"google/gemini-3.8-flash"},{"value":"google/gemini-3.7-flash","name":"google/gemini-3.7-flash"},{"value":"google/gemini-3.5-flash-lite","name":"google/gemini-3.5-flash-lite"},{"value":"google/gemini-3.6-flash","name":"google/gemini-3.6-flash"},{"value":"google/gemini-3.5-flash","name":"google/gemini-3.5-flash"},{"value":"google/gemini-3.1-flash-lite","name":"google/gemini-3.1-flash-lite"},{"value":"google/gemini-3-flash","name":"google/gemini-3-flash"},{"value":"google/gemini-2.5-flash-lite","name":"google/gemini-2.5-flash-lite"},{"value":"google/gemini-2.5-flash","name":"google/gemini-2.5-flash"},{"value":"google/gemini-2.5-pro","name":"google/gemini-2.5-pro"},{"value":"minimax/minimax-m3","name":"minimax/minimax-m3"},{"value":"minimax/minimax-m2.5","name":"minimax/minimax-m2.5"},{"value":"minimax/minimax-m2.1","name":"minimax/minimax-m2.1"},{"value":"amazon/nova-2-lite","name":"amazon/nova-2-lite"},{"value":"amazon/nova-lite","name":"amazon/nova-lite"},{"value":"google/gemini-3.1-pro-preview","name":"google/gemini-3.1-pro-preview"},{"value":"spacexai/grok-4.20-multi-agent-beta","name":"spacexai/grok-4.20-multi-agent-beta"},{"value":"spacexai/grok-4.20-non-reasoning-beta","name":"spacexai/grok-4.20-non-reasoning-beta"},{"value":"spacexai/grok-4.20-reasoning-beta","name":"spacexai/grok-4.20-reasoning-beta"}]},{"id":"mode","name":"Session Mode","description":"Controls how the agent requests permission","category":"mode","type":"select","currentValue":"ask","options":[{"value":"code","name":"Code","description":"Write and modify code with full tool access","permissionMode":"auto"},{"value":"ask","name":"Ask","description":"Request permission before making any changes","permissionMode":"ask"}]},{"id":"effort","name":"Reasoning Effort","description":"Controls how much the model thinks before responding","category":"thought_level","type":"select","currentValue":"xhigh","options":[{"value":"auto","name":"default"},{"value":"low","name":"low"},{"value":"medium","name":"medium"},{"value":"high","name":"high"},{"value":"xhigh","name":"xhigh"},{"value":"max","name":"max"}]}],"modes":{"currentModeId":"ask","availableModes":[{"id":"code","name":"Code","description":"Write and modify code with full tool access"},{"id":"ask","name":"Ask","description":"Request permission before making any changes"}]}}}}
diff --git a/apps/server/src/orchestration-v2/testkit/fixtures/tool_call_read_only_on_request/fx_transcript.ndjson b/apps/server/src/orchestration-v2/testkit/fixtures/tool_call_read_only_on_request/fx_transcript.ndjson
index 34f26d8efb33..1f9c4cd5e1cf 100644
--- a/apps/server/src/orchestration-v2/testkit/fixtures/tool_call_read_only_on_request/fx_transcript.ndjson
+++ b/apps/server/src/orchestration-v2/testkit/fixtures/tool_call_read_only_on_request/fx_transcript.ndjson
@@ -1,5 +1,5 @@
 {"type":"transcript_start","provider":"fx","protocol":"acp.ndjson-jsonrpc","version":"1","scenario":"tool_call_read_only_on_request","metadata":{"generatedBy":"live-fx-recorder","fxVersion":"0.0.13","normalization":"Session ids are fx-session-NN, the workspace is <workspace>, HOME is /home/fx-replay and the recording user is fx-replay. T3-owned prompt text, MCP servers and initialize params other than clientCapabilities and _meta are <any>. User skill names, emails and token-shaped strings are removed. Timestamps are kept as recorded.","droppedFrames":0}}
-{"type":"expect_outbound","label":"request:initialize","frame":{"kind":"request","method":"initialize","params":{"protocolVersion":2,"info":"<any>","capabilities":"<any>","clientCapabilities":{"fs":{"readTextFile":false,"writeTextFile":false},"terminal":false,"session":{"notices":{}},"elicitation":{"form":{}}},"clientInfo":"<any>"}}}
+{"type":"expect_outbound","label":"request:initialize","frame":{"kind":"request","method":"initialize","params":{"protocolVersion":2,"info":"<any>","capabilities":"<any>","clientCapabilities":{"fs":{"readTextFile":false,"writeTextFile":false},"terminal":false,"session":{"notices":{},"compaction":{}},"elicitation":{"form":{}}},"clientInfo":"<any>"}}}
 {"type":"emit_inbound","label":"response:initialize","frame":{"kind":"response","method":"initialize","result":{"protocolVersion":1,"agentCapabilities":{"loadSession":true,"promptCapabilities":{"image":true,"audio":false,"embeddedContext":true},"mcpCapabilities":{"http":true,"sse":true,"acp":true},"sessionCapabilities":{"list":{},"resume":{},"close":{},"systemPrompt":{}},"_meta":{"fx":{"steering":true}}},"agentInfo":{"name":"fx","title":"fx","version":"0.0.13"},"authMethods":[]}}}
 {"type":"expect_outbound","label":"request:session/new","frame":{"kind":"request","method":"session/new","params":{"cwd":"<workspace>","mcpServers":"<any>"}}}
 {"type":"emit_inbound","label":"response:session/new","frame":{"kind":"response","method":"session/new","result":{"sessionId":"fx-session-01","configOptions":[{"id":"provider","name":"Provider","category":"model","type":"select","currentValue":"gateway","options":[{"value":"gateway","name":"Vercel AI Gateway"},{"value":"codex","name":"Codex subscription"},{"value":"grok","name":"Grok subscription"}]},{"id":"model","name":"Model","category":"model","type":"select","currentValue":"anthropic/claude-opus-5.5","options":[{"value":"anthropic/claude-sonnet-5.5","name":"anthropic/claude-sonnet-5.5"},{"value":"anthropic/claude-opus-5.5","name":"anthropic/claude-opus-5.5"},{"value":"anthropic/claude-opus-5.5-fast","name":"anthropic/claude-opus-5.5-fast"},{"value":"anthropic/claude-opus-5","name":"anthropic/claude-opus-5"},{"value":"anthropic/claude-opus-5-fast","name":"anthropic/claude-opus-5-fast"},{"value":"anthropic/claude-sonnet-5","name":"anthropic/claude-sonnet-5"},{"value":"anthropic/claude-opus-4.8","name":"anthropic/claude-opus-4.8"},{"value":"anthropic/claude-opus-4.8-fast","name":"anthropic/claude-opus-4.8-fast"},{"value":"anthropic/claude-opus-4.7","name":"anthropic/claude-opus-4.7"},{"value":"anthropic/claude-sonnet-4.6","name":"anthropic/claude-sonnet-4.6"},{"value":"anthropic/claude-opus-4.6","name":"anthropic/claude-opus-4.6"},{"value":"anthropic/claude-opus-4.5","name":"anthropic/claude-opus-4.5"},{"value":"anthropic/claude-sonnet-4.5","name":"anthropic/claude-sonnet-4.5"},{"value":"anthropic/claude-opus-4","name":"anthropic/claude-opus-4"},{"value":"anthropic/claude-sonnet-4","name":"anthropic/claude-sonnet-4"},{"value":"openai/gpt-5.6-luna","name":"openai/gpt-5.6-luna"},{"value":"openai/gpt-5.6-luna-fast","name":"openai/gpt-5.6-luna-fast"},{"value":"openai/gpt-5.6-sol","name":"openai/gpt-5.6-sol"},{"value":"openai/gpt-5.6-sol-fast","name":"openai/gpt-5.6-sol-fast"},{"value":"openai/gpt-5.6-terra","name":"openai/gpt-5.6-terra"},{"value":"openai/gpt-5.6-terra-fast","name":"openai/gpt-5.6-terra-fast"},{"value":"openai/gpt-5.5","name":"openai/gpt-5.5"},{"value":"openai/gpt-5.5-fast","name":"openai/gpt-5.5-fast"},{"value":"openai/gpt-5.5-pro","name":"openai/gpt-5.5-pro"},{"value":"openai/gpt-5.4-nano","name":"openai/gpt-5.4-nano"},{"value":"openai/gpt-5.4","name":"openai/gpt-5.4"},{"value":"openai/gpt-5.4-fast","name":"openai/gpt-5.4-fast"},{"value":"openai/gpt-5.4-pro","name":"openai/gpt-5.4-pro"},{"value":"openai/gpt-5.3-codex","name":"openai/gpt-5.3-codex"},{"value":"openai/gpt-5.3-codex-fast","name":"openai/gpt-5.3-codex-fast"},{"value":"openai/gpt-5.2","name":"openai/gpt-5.2"},{"value":"openai/gpt-5.2-fast","name":"openai/gpt-5.2-fast"},{"value":"openai/gpt-5.2-pro","name":"openai/gpt-5.2-pro"},{"value":"openai/gpt-5.1-thinking","name":"openai/gpt-5.1-thinking"},{"value":"openai/gpt-5.1-thinking-fast","name":"openai/gpt-5.1-thinking-fast"},{"value":"openai/gpt-5-pro","name":"openai/gpt-5-pro"},{"value":"openai/gpt-5","name":"openai/gpt-5"},{"value":"openai/gpt-5-fast","name":"openai/gpt-5-fast"},{"value":"openai/gpt-5-nano","name":"openai/gpt-5-nano"},{"value":"openai/o3-pro","name":"openai/o3-pro"},{"value":"openai/o3","name":"openai/o3"},{"value":"openai/o3-fast","name":"openai/o3-fast"},{"value":"openai/o1","name":"openai/o1"},{"value":"deepseek/deepseek-v4-pro-0813","name":"deepseek/deepseek-v4-pro-0813"},{"value":"deepseek/deepseek-v4-pro","name":"deepseek/deepseek-v4-pro"},{"value":"spacexai/grok-4.7","name":"spacexai/grok-4.7"},{"value":"spacexai/grok-4.6","name":"spacexai/grok-4.6"},{"value":"spacexai/grok-4.5","name":"spacexai/grok-4.5"},{"value":"spacexai/grok-4.3","name":"spacexai/grok-4.3"},{"value":"spacexai/grok-4.20-multi-agent","name":"spacexai/grok-4.20-multi-agent"},{"value":"spacexai/grok-4.20-non-reasoning","name":"spacexai/grok-4.20-non-reasoning"},{"value":"spacexai/grok-4.20-reasoning","name":"spacexai/grok-4.20-reasoning"},{"value":"spacexai/grok-4.1-fast-non-reasoning","name":"spacexai/grok-4.1-fast-non-reasoning"},{"value":"spacexai/grok-4.1-fast-reasoning","name":"spacexai/grok-4.1-fast-reasoning"},{"value":"amazon/nova-pro","name":"amazon/nova-pro"},{"value":"anthropic/claude-fable-5.1","name":"anthropic/claude-fable-5.1"},{"value":"anthropic/claude-fable-5","name":"anthropic/claude-fable-5"},{"value":"openai/gpt-6.1-sol","name":"openai/gpt-6.1-sol"},{"value":"openai/gpt-6.1-sol-fast","name":"openai/gpt-6.1-sol-fast"},{"value":"openai/gpt-6-luna","name":"openai/gpt-6-luna"},{"value":"openai/gpt-6-luna-fast","name":"openai/gpt-6-luna-fast"},{"value":"openai/gpt-6-sol","name":"openai/gpt-6-sol"},{"value":"openai/gpt-6-sol-fast","name":"openai/gpt-6-sol-fast"},{"value":"openai/gpt-6-astra","name":"openai/gpt-6-astra"},{"value":"openai/gpt-6-astra-fast","name":"openai/gpt-6-astra-fast"},{"value":"openai/gpt-oss-safeguard-120b","name":"openai/gpt-oss-safeguard-120b"},{"value":"openai/gpt-oss-safeguard-20b","name":"openai/gpt-oss-safeguard-20b"},{"value":"openai/gpt-oss-120b","name":"openai/gpt-oss-120b"},{"value":"openai/gpt-oss-20b","name":"openai/gpt-oss-20b"},{"value":"openai/gpt-4.1","name":"openai/gpt-4.1"},{"value":"openai/gpt-4.1-fast","name":"openai/gpt-4.1-fast"},{"value":"openai/gpt-4.1-nano","name":"openai/gpt-4.1-nano"},{"value":"openai/gpt-4.1-nano-fast","name":"openai/gpt-4.1-nano-fast"},{"value":"openai/gpt-4o","name":"openai/gpt-4o"},{"value":"openai/gpt-4o-fast","name":"openai/gpt-4o-fast"},{"value":"openai/gpt-4-turbo","name":"openai/gpt-4-turbo"},{"value":"openai/gpt-3.5-turbo","name":"openai/gpt-3.5-turbo"},{"value":"google/gemma-4-26b-a4b-it","name":"google/gemma-4-26b-a4b-it"},{"value":"deepseek/deepseek-v3.2","name":"deepseek/deepseek-v3.2"},{"value":"deepseek/deepseek-v3.2-thinking","name":"deepseek/deepseek-v3.2-thinking"},{"value":"deepseek/deepseek-r1","name":"deepseek/deepseek-r1"},{"value":"meta/llama-4-maverick","name":"meta/llama-4-maverick"},{"value":"meta/llama-4-scout","name":"meta/llama-4-scout"},{"value":"meta/llama-3.3-70b","name":"meta/llama-3.3-70b"},{"value":"meta/llama-3.1-70b","name":"meta/llama-3.1-70b"},{"value":"meta/llama-3.1-8b","name":"meta/llama-3.1-8b"},{"value":"alibaba/qwen3.8-2.4t-a95b","name":"alibaba/qwen3.8-2.4t-a95b"},{"value":"alibaba/qwen3.8-max","name":"alibaba/qwen3.8-max"},{"value":"alibaba/qwen3-next-80b-a3b-instruct","name":"alibaba/qwen3-next-80b-a3b-instruct"},{"value":"alibaba/qwen3-next-80b-a3b-thinking","name":"alibaba/qwen3-next-80b-a3b-thinking"},{"value":"alibaba/qwen3-coder-30b-a3b","name":"alibaba/qwen3-coder-30b-a3b"},{"value":"alibaba/qwen3-coder","name":"alibaba/qwen3-coder"},{"value":"alibaba/qwen3-coder-next","name":"alibaba/qwen3-coder-next"},{"value":"alibaba/qwen-3-235b","name":"alibaba/qwen-3-235b"},{"value":"alibaba/qwen-3-32b","name":"alibaba/qwen-3-32b"},{"value":"fireworks/ember-1","name":"fireworks/ember-1"},{"value":"zai/glm-5.3-fast","name":"zai/glm-5.3-fast"},{"value":"zai/glm-5.3","name":"zai/glm-5.3"},{"value":"nvidia/nemotron-3.5-lightning","name":"nvidia/nemotron-3.5-lightning"},{"value":"moonshotai/kimi-k3-fast","name":"moonshotai/kimi-k3-fast"},{"value":"moonshotai/kimi-k3","name":"moonshotai/kimi-k3"},{"value":"zai/glm-5.2-fast","name":"zai/glm-5.2-fast"},{"value":"zai/glm-5.2","name":"zai/glm-5.2"},{"value":"nvidia/nemotron-3-ultra-550b-a55b","name":"nvidia/nemotron-3-ultra-550b-a55b"},{"value":"spacexai/grok-build-0.1","name":"spacexai/grok-build-0.1"},{"value":"nvidia/nemotron-3-super-120b-a12b","name":"nvidia/nemotron-3-super-120b-a12b"},{"value":"zai/glm-5","name":"zai/glm-5"},{"value":"moonshotai/kimi-k2.5","name":"moonshotai/kimi-k2.5"},{"value":"zai/glm-4.7","name":"zai/glm-4.7"},{"value":"nvidia/nemotron-nano-12b-v2-vl","name":"nvidia/nemotron-nano-12b-v2-vl"},{"value":"nvidia/nemotron-nano-9b-v2","name":"nvidia/nemotron-nano-9b-v2"},{"value":"amazon/nova-micro","name":"amazon/nova-micro"},{"value":"deepseek/deepseek-v4.1-flash","name":"deepseek/deepseek-v4.1-flash"},{"value":"deepseek/deepseek-v4-flash","name":"deepseek/deepseek-v4-flash"},{"value":"deepseek/deepseek-v4-flash-0731","name":"deepseek/deepseek-v4-flash-0731"},{"value":"zai/glm-5.3-flash","name":"zai/glm-5.3-flash"},{"value":"zai/glm-4.7-flash","name":"zai/glm-4.7-flash"},{"value":"anthropic/claude-haiku-5.5","name":"anthropic/claude-haiku-5.5"},{"value":"anthropic/claude-haiku-4.5","name":"anthropic/claude-haiku-4.5"},{"value":"anthropic/claude-3-haiku","name":"anthropic/claude-3-haiku"},{"value":"openai/gpt-5.4-mini","name":"openai/gpt-5.4-mini"},{"value":"openai/gpt-5.4-mini-fast","name":"openai/gpt-5.4-mini-fast"},{"value":"openai/gpt-5-mini","name":"openai/gpt-5-mini"},{"value":"openai/gpt-5-mini-fast","name":"openai/gpt-5-mini-fast"},{"value":"openai/gpt-4.1-mini","name":"openai/gpt-4.1-mini"},{"value":"openai/gpt-4.1-mini-fast","name":"openai/gpt-4.1-mini-fast"},{"value":"openai/o4-mini","name":"openai/o4-mini"},{"value":"openai/o4-mini-fast","name":"openai/o4-mini-fast"},{"value":"openai/o3-mini","name":"openai/o3-mini"},{"value":"openai/gpt-4o-mini","name":"openai/gpt-4o-mini"},{"value":"openai/gpt-4o-mini-fast","name":"openai/gpt-4o-mini-fast"},{"value":"google/gemini-3.8-flash","name":"google/gemini-3.8-flash"},{"value":"google/gemini-3.7-flash","name":"google/gemini-3.7-flash"},{"value":"google/gemini-3.5-flash-lite","name":"google/gemini-3.5-flash-lite"},{"value":"google/gemini-3.6-flash","name":"google/gemini-3.6-flash"},{"value":"google/gemini-3.5-flash","name":"google/gemini-3.5-flash"},{"value":"google/gemini-3.1-flash-lite","name":"google/gemini-3.1-flash-lite"},{"value":"google/gemini-3-flash","name":"google/gemini-3-flash"},{"value":"google/gemini-2.5-flash-lite","name":"google/gemini-2.5-flash-lite"},{"value":"google/gemini-2.5-flash","name":"google/gemini-2.5-flash"},{"value":"google/gemini-2.5-pro","name":"google/gemini-2.5-pro"},{"value":"minimax/minimax-m3","name":"minimax/minimax-m3"},{"value":"minimax/minimax-m2.5","name":"minimax/minimax-m2.5"},{"value":"minimax/minimax-m2.1","name":"minimax/minimax-m2.1"},{"value":"amazon/nova-2-lite","name":"amazon/nova-2-lite"},{"value":"amazon/nova-lite","name":"amazon/nova-lite"},{"value":"google/gemini-3.1-pro-preview","name":"google/gemini-3.1-pro-preview"},{"value":"spacexai/grok-4.20-multi-agent-beta","name":"spacexai/grok-4.20-multi-agent-beta"},{"value":"spacexai/grok-4.20-non-reasoning-beta","name":"spacexai/grok-4.20-non-reasoning-beta"},{"value":"spacexai/grok-4.20-reasoning-beta","name":"spacexai/grok-4.20-reasoning-beta"}]},{"id":"mode","name":"Session Mode","description":"Controls how the agent requests permission","category":"mode","type":"select","currentValue":"ask","options":[{"value":"code","name":"Code","description":"Write and modify code with full tool access","permissionMode":"auto"},{"value":"ask","name":"Ask","description":"Request permission before making any changes","permissionMode":"ask"}]},{"id":"effort","name":"Reasoning Effort","description":"Controls how much the model thinks before responding","category":"thought_level","type":"select","currentValue":"xhigh","options":[{"value":"auto","name":"default"},{"value":"low","name":"low"},{"value":"medium","name":"medium"},{"value":"high","name":"high"},{"value":"xhigh","name":"xhigh"},{"value":"max","name":"max"}]}],"modes":{"currentModeId":"ask","availableModes":[{"id":"code","name":"Code","description":"Write and modify code with full tool access"},{"id":"ask","name":"Ask","description":"Request permission before making any changes"}]}}}}
diff --git a/apps/server/src/orchestration-v2/testkit/fixtures/tool_call_read_only_on_request/grok_transcript.ndjson b/apps/server/src/orchestration-v2/testkit/fixtures/tool_call_read_only_on_request/grok_transcript.ndjson
index 7d11fc4746fb..c3de2afdf4ce 100644
--- a/apps/server/src/orchestration-v2/testkit/fixtures/tool_call_read_only_on_request/grok_transcript.ndjson
+++ b/apps/server/src/orchestration-v2/testkit/fixtures/tool_call_read_only_on_request/grok_transcript.ndjson
@@ -1,5 +1,5 @@
 {"type":"transcript_start","provider":"grok","protocol":"acp.ndjson-jsonrpc","version":"1","scenario":"tool_call_read_only_on_request","metadata":{"generatedBy":"live-grok-recorder","grokVersion":"1.0.41","normalization":"Session ids are fixed UUIDs, the workspace is <workspace>, HOME is /home/grok-replay and the recording user is grok-replay. T3-owned prompt text, MCP servers and initialize params other than clientCapabilities are <any>. Personal skills, machine identity, account settings and announcement broadcasts are removed, as are responses to Grok-internal request ids that T3's protocol drops. Timestamps are kept as recorded.","droppedFrames":5}}
-{"type":"expect_outbound","label":"request:initialize","frame":{"kind":"request","method":"initialize","params":{"protocolVersion":2,"info":"<any>","capabilities":"<any>","clientCapabilities":{"fs":{"readTextFile":false,"writeTextFile":false},"terminal":false,"session":{"notices":{}},"elicitation":{"form":{}}},"clientInfo":"<any>","_meta":{"clientType":"extension"}}}}
+{"type":"expect_outbound","label":"request:initialize","frame":{"kind":"request","method":"initialize","params":{"protocolVersion":2,"info":"<any>","capabilities":"<any>","clientCapabilities":{"fs":{"readTextFile":false,"writeTextFile":false},"terminal":false,"session":{"notices":{},"compaction":{}},"elicitation":{"form":{}}},"clientInfo":"<any>","_meta":{"clientType":"extension"}}}}
 {"type":"emit_inbound","label":"response:initialize","frame":{"kind":"response","method":"initialize","result":{"protocolVersion":1,"agentCapabilities":{"loadSession":true,"promptCapabilities":{"image":false,"audio":false,"embeddedContext":true},"mcpCapabilities":{"http":true,"sse":true},"sessionCapabilities":{"list":{},"resume":{},"close":{}},"auth":{},"_meta":{"x.ai/fs_notify":true,"x.ai/hooks":{"blockingEvents":["pre_tool_use","stop","subagent_stop"],"decisions":["deny","block"],"stopSignals":["continue","stopReason","additionalContext"]},"x.ai/capabilities":{"toolOverrides":{"x_keyword_search":true,"x_semantic_search":true,"x_user_search":false,"x_thread_fetch":false}}}},"authMethods":[{"id":"cached_token","name":"cached_token","description":"Cached token from ~/.grok/auth.json"},{"id":"grok.com","name":"Grok","description":"Sign in with Grok"}],"_meta":{"grokShell":true,"defaultAuthMethodId":"cached_token","x.ai/mcp/sdk":true,"x.ai/pluginDirs":true,"currentWorkingDirectory":"<workspace>","agentVersion":"1.0.41","agentId":"00000000-0000-4000-8000-000000000000","agentInstanceId":"00000000-0000-4000-8000-000000000000","hostname":"grok-replay","modelState":{"currentModelId":"grok-4.7","availableModels":[{"modelId":"grok-4.7","name":"Grok 4.7","description":"SpaceXAI's latest frontier model","_meta":{"totalContextTokens":500000,"agentType":"grok-build-plan","supportsReasoningEffort":true,"reasoningEffort":"high","reasoningEfforts":[{"id":"xhigh","value":"xhigh","label":"Extra High","description":"Maximum reasoning for the hardest tasks.","default":false},{"id":"high","value":"high","label":"High","description":"Thorough reasoning and quality. Recommended.","default":true},{"id":"medium","value":"medium","label":"Medium","description":"Strong quality with a faster turnaround.","default":false},{"id":"low","value":"low","label":"Low","description":"Fastest responses. Best for simple tasks.","default":false}]}},{"modelId":"grok-4.7-build-fast","name":"Grok 4.7 Fast","description":"Fast variant. 2x the price.","_meta":{"totalContextTokens":500000,"agentType":"grok-build-plan","supportsReasoningEffort":true,"reasoningEffort":"high","reasoningEfforts":[{"id":"xhigh","value":"xhigh","label":"Extra High","description":"Maximum reasoning for the hardest tasks.","default":false},{"id":"high","value":"high","label":"High","description":"Thorough reasoning and quality. Recommended.","default":true},{"id":"medium","value":"medium","label":"Medium","description":"Strong quality with a faster turnaround.","default":false},{"id":"low","value":"low","label":"Low","description":"Fastest responses. Best for simple tasks.","default":false}]}},{"modelId":"grok-4.6","name":"Grok 4.6","_meta":{"totalContextTokens":500000,"agentType":"grok-build-plan","supportsReasoningEffort":true,"reasoningEffort":"high","reasoningEfforts":[{"id":"xhigh","value":"xhigh","label":"Extra High","description":"Highest effort and reasoning level","default":false},{"id":"high","value":"high","label":"High","description":"Higher implementation quality with extensive reasoning","default":true},{"id":"medium","value":"medium","label":"Medium","description":"Balanced effort with standard implementation and testing","default":false},{"id":"low","value":"low","label":"Low","description":"Quick, fast implementations","default":false}]}},{"modelId":"grok-4.5","name":"Grok 4.5","_meta":{"totalContextTokens":500000,"agentType":"grok-build-plan","supportsReasoningEffort":true,"reasoningEffort":"high","reasoningEfforts":[{"id":"high","value":"high","label":"High","description":"Highest implementation quality with extensive reasoning","default":true},{"id":"medium","value":"medium","label":"Medium","description":"Balanced effort with standard implementation and testing","default":false},{"id":"low","value":"low","label":"Low","description":"Quick, fast implementations","default":false}]}}]},"mcpServers":[],"mcpApps":false,"metadata":null,"availableCommands":[{"name":"compact","description":"Compress conversation history to save context window","input":{"hint":"optional context about what to preserve"}},{"name":"always-approve","description":"Toggle always-approve mode (skip all permission prompts)","input":{"hint":"on|off"}},{"name":"context","description":"Show context window usage and session stats","input":null},{"name":"session-info","description":"Show session details (model, turns, context usage)","input":null},{"name":"deep-research","description":"Research with bounded parallel agents, cross-check evidence, and write a cited report","input":{"hint":"<query>"}},{"name":"workflow","description":"Launch a saved workflow, list runs, or manage a run (pause, resume, stop, save)","input":{"hint":"<name> [--agent-budget N] [--effort LEVEL] [args] | runs | pause|resume|stop|save [name]"}},{"name":"goal","description":"Set, manage, or check an autonomous goal","input":{"hint":"<objective> [--budget <tokens>] | status | pause | resume | clear"}}],"cancelRewind":true,"sessionRecap":true,"feedbackTraceOffer":false,"voiceMode":true}}}}
 {"type":"emit_inbound","label":"notification:_x.ai/mcp/servers_updated","frame":{"kind":"notification","method":"_x.ai/mcp/servers_updated","params":{"mcpServers":[]}}}
 {"type":"expect_outbound","label":"request:session/new","frame":{"kind":"request","method":"session/new","params":{"cwd":"<workspace>","mcpServers":"<any>"}}}
diff --git a/apps/server/src/orchestration-v2/testkit/fixtures/tool_call_read_only_on_request/kiro_transcript.ndjson b/apps/server/src/orchestration-v2/testkit/fixtures/tool_call_read_only_on_request/kiro_transcript.ndjson
index cd6d095d1a91..754bc6142d79 100644
--- a/apps/server/src/orchestration-v2/testkit/fixtures/tool_call_read_only_on_request/kiro_transcript.ndjson
+++ b/apps/server/src/orchestration-v2/testkit/fixtures/tool_call_read_only_on_request/kiro_transcript.ndjson
@@ -1,5 +1,5 @@
 {"type":"transcript_start","provider":"kiro","protocol":"acp.ndjson-jsonrpc","version":"1","scenario":"kiro_tool_call_read_only_on_request","metadata":{"generatedBy":"live-kiro-recorder","kiroVersion":"2.32.0","normalization":"Session ids are fixed sess_ UUIDs and other UUIDs (message and request ids) are numbered in first-seen order, the workspace is <workspace>, HOME is /home/kiro-replay and the recording user is kiro-replay. T3-owned prompt text, MCP servers and initialize params other than clientCapabilities and _meta are <any>. Kiro's log directory, user-scoped commands and agents, and the _kiro/* broadcasts T3 ignores (governance, steering documents, powers, tools, hooks, MCP status, session roster) are removed. Timestamps are kept as recorded.","droppedFrames":13}}
-{"type":"expect_outbound","label":"request:initialize","frame":{"kind":"request","method":"initialize","params":{"protocolVersion":2,"info":"<any>","capabilities":"<any>","clientCapabilities":{"fs":{"readTextFile":false,"writeTextFile":false},"terminal":false,"session":{"notices":{}},"elicitation":{"form":{}},"_meta":{"kiro":{"hooks":{"enabled":true,"v2":true}}}},"clientInfo":"<any>"}}}
+{"type":"expect_outbound","label":"request:initialize","frame":{"kind":"request","method":"initialize","params":{"protocolVersion":2,"info":"<any>","capabilities":"<any>","clientCapabilities":{"fs":{"readTextFile":false,"writeTextFile":false},"terminal":false,"session":{"notices":{},"compaction":{}},"elicitation":{"form":{}},"_meta":{"kiro":{"hooks":{"enabled":true,"v2":true}}}},"clientInfo":"<any>"}}}
 {"type":"emit_inbound","label":"response:initialize","frame":{"kind":"response","method":"initialize","result":{"protocolVersion":2,"agentCapabilities":{"loadSession":true,"promptCapabilities":{"image":true,"embeddedContext":true},"mcpCapabilities":{"http":true,"sse":true},"sessionCapabilities":{"list":{},"close":{},"delete":{},"fork":{"_meta":{"kiro":{"messageId":true}}}},"_meta":{"kiro":{"checkpoints":true,"sessionList":true,"policyNotifications":true,"extensionMethods":["_kiro/knowledge","_kiro/memory/list","_kiro/memory/get","_kiro/memory/create","_kiro/memory/update","_kiro/memory/delete","_kiro/codeIntelligence","_kiro/session/context","_kiro/session/compact","_kiro/session/export","_kiro/session/history","_kiro/config/template","_kiro/workflow/new","_kiro/workflow/invoke","_kiro/workflow/load","_kiro/workflow/inspect","_kiro/workflow/list","_kiro/workflow/pause","_kiro/workflow/cancel","_kiro/workflow/delete","_kiro/workflow/listRecipes","_kiro/workflow/listWatchHandlers","_kiro/workflow/resumeAll","_kiro/workflow/retry","_kiro/workflow/update","_kiro/workflow/resume","_kiro/sourceProviders/list","_kiro/sourceProviders/listResources"],"sessionSources":["local","remote"],"sessionListScopes":["workspace","user"],"executionTargets":["local","cloud-sandbox"],"sourceProviders":true,"replayMarking":true}}},"authMethods":[{"id":"aws-builder-id","name":"AWS Builder ID"},{"id":"aws-iam-identity-center","name":"AWS IAM Identity Center"}]}}}
 {"type":"expect_outbound","label":"request:session/new","frame":{"kind":"request","method":"session/new","params":{"cwd":"<workspace>","mcpServers":"<any>"}}}
 {"type":"emit_inbound","label":"notification:session/update:available_commands_update","frame":{"kind":"notification","method":"session/update","params":{"sessionId":"sess_00000000-0000-4000-8000-000000000001","update":{"sessionUpdate":"available_commands_update","availableCommands":[{"name":"architecture-selection","description":"Steering: architecture-selection","input":{"hint":"optional context"},"_meta":{"kiro":{"type":"steering","contextQuery":"global:architecture-selection","commandId":"architecture-selection","resource":{"resourceType":"steering","source":{"origin":"bundled"}},"originalName":"architecture-selection"}}},{"name":"quick-spec","description":"Steering: quick-spec","input":{"hint":"optional context"},"_meta":{"kiro":{"type":"steering","contextQuery":"global:quick-spec","commandId":"quick-spec","resource":{"resourceType":"steering","source":{"origin":"bundled"}},"originalName":"quick-spec"}}},{"name":"bug-fix","description":"Steering: bug-fix","input":{"hint":"optional context"},"_meta":{"kiro":{"type":"steering","contextQuery":"global:bug-fix","commandId":"bug-fix","resource":{"resourceType":"steering","source":{"origin":"bundled"}},"originalName":"bug-fix"}}},{"name":"general-task-execution","description":"General-purpose sub-agent with access to all tools for executing arbitrary tasks","input":{"hint":"task to delegate"},"_meta":{"kiro":{"type":"custom-agent","commandId":"general-task-execution","resource":{"resourceType":"agent","source":{"origin":"bundled"}},"originalName":"general-task-execution"}}},{"name":"context-gatherer","description":"Investigates the codebase to answer a specific question about it. Deeply analyzes existing code by tracing execution paths, mapping architecture and abstraction layers, understanding patterns, and documenting dependencies, returning a thorough, direct written analysis that explains how the relevant code works and points to the specific files and lines involved. Use it to understand code before you change it: before designing or implementing a change to code you don't already fully understand, start with context-gatherer so your edits are grounded in how the code actually works. When a task requires understanding code you don't already know, dispatch context-gatherer to do that exploration before running your own searches or reads. Rules: 1. Provide a clear, specific prompt that includes your intent: a detailed task description of the context you need and what you're trying to accomplish. 2. The subagent explores the codebase and returns an analysis of your query 3. Trust the returned results. You may still inspect additional code yourself when you need context beyond what was returned. 4. Reuse existing context-gatherer output for related follow-up questions; do not re-invoke on the same question with different phrasing. 5. For multiple distinct questions, dispatch several context-gatherers in parallel, each targeting a different aspect of the codebase.","input":{"hint":"task to delegate"},"_meta":{"kiro":{"type":"custom-agent","commandId":"context-gatherer","resource":{"resourceType":"agent","source":{"origin":"bundled"}},"originalName":"context-gatherer"}}}]}}}}
diff --git a/apps/server/src/orchestration-v2/testkit/fixtures/turn_interrupt/fx_transcript.ndjson b/apps/server/src/orchestration-v2/testkit/fixtures/turn_interrupt/fx_transcript.ndjson
index c0e0b356fdd8..23191a20397d 100644
--- a/apps/server/src/orchestration-v2/testkit/fixtures/turn_interrupt/fx_transcript.ndjson
+++ b/apps/server/src/orchestration-v2/testkit/fixtures/turn_interrupt/fx_transcript.ndjson
@@ -1,5 +1,5 @@
 {"type":"transcript_start","provider":"fx","protocol":"acp.ndjson-jsonrpc","version":"1","scenario":"turn_interrupt","metadata":{"generatedBy":"live-fx-recorder","fxVersion":"0.0.13","normalization":"Session ids are fx-session-NN, the workspace is <workspace>, HOME is /home/fx-replay and the recording user is fx-replay. T3-owned prompt text, MCP servers and initialize params other than clientCapabilities and _meta are <any>. User skill names, emails and token-shaped strings are removed. Timestamps are kept as recorded.","droppedFrames":0}}
-{"type":"expect_outbound","label":"request:initialize","frame":{"kind":"request","method":"initialize","params":{"protocolVersion":2,"info":"<any>","capabilities":"<any>","clientCapabilities":{"fs":{"readTextFile":false,"writeTextFile":false},"terminal":false,"session":{"notices":{}},"elicitation":{"form":{}}},"clientInfo":"<any>"}}}
+{"type":"expect_outbound","label":"request:initialize","frame":{"kind":"request","method":"initialize","params":{"protocolVersion":2,"info":"<any>","capabilities":"<any>","clientCapabilities":{"fs":{"readTextFile":false,"writeTextFile":false},"terminal":false,"session":{"notices":{},"compaction":{}},"elicitation":{"form":{}}},"clientInfo":"<any>"}}}
 {"type":"emit_inbound","label":"response:initialize","frame":{"kind":"response","method":"initialize","result":{"protocolVersion":1,"agentCapabilities":{"loadSession":true,"promptCapabilities":{"image":true,"audio":false,"embeddedContext":true},"mcpCapabilities":{"http":true,"sse":true,"acp":true},"sessionCapabilities":{"list":{},"resume":{},"close":{},"systemPrompt":{}},"_meta":{"fx":{"steering":true}}},"agentInfo":{"name":"fx","title":"fx","version":"0.0.13"},"authMethods":[]}}}
 {"type":"expect_outbound","label":"request:session/new","frame":{"kind":"request","method":"session/new","params":{"cwd":"<workspace>","mcpServers":"<any>"}}}
 {"type":"emit_inbound","label":"response:session/new","frame":{"kind":"response","method":"session/new","result":{"sessionId":"fx-session-01","configOptions":[{"id":"provider","name":"Provider","category":"model","type":"select","currentValue":"gateway","options":[{"value":"gateway","name":"Vercel AI Gateway"},{"value":"codex","name":"Codex subscription"},{"value":"grok","name":"Grok subscription"}]},{"id":"model","name":"Model","category":"model","type":"select","currentValue":"anthropic/claude-opus-5.5","options":[{"value":"anthropic/claude-sonnet-5.5","name":"anthropic/claude-sonnet-5.5"},{"value":"anthropic/claude-opus-5.5","name":"anthropic/claude-opus-5.5"},{"value":"anthropic/claude-opus-5.5-fast","name":"anthropic/claude-opus-5.5-fast"},{"value":"anthropic/claude-opus-5","name":"anthropic/claude-opus-5"},{"value":"anthropic/claude-opus-5-fast","name":"anthropic/claude-opus-5-fast"},{"value":"anthropic/claude-sonnet-5","name":"anthropic/claude-sonnet-5"},{"value":"anthropic/claude-opus-4.8","name":"anthropic/claude-opus-4.8"},{"value":"anthropic/claude-opus-4.8-fast","name":"anthropic/claude-opus-4.8-fast"},{"value":"anthropic/claude-opus-4.7","name":"anthropic/claude-opus-4.7"},{"value":"anthropic/claude-sonnet-4.6","name":"anthropic/claude-sonnet-4.6"},{"value":"anthropic/claude-opus-4.6","name":"anthropic/claude-opus-4.6"},{"value":"anthropic/claude-opus-4.5","name":"anthropic/claude-opus-4.5"},{"value":"anthropic/claude-sonnet-4.5","name":"anthropic/claude-sonnet-4.5"},{"value":"anthropic/claude-opus-4","name":"anthropic/claude-opus-4"},{"value":"anthropic/claude-sonnet-4","name":"anthropic/claude-sonnet-4"},{"value":"openai/gpt-5.6-luna","name":"openai/gpt-5.6-luna"},{"value":"openai/gpt-5.6-luna-fast","name":"openai/gpt-5.6-luna-fast"},{"value":"openai/gpt-5.6-sol","name":"openai/gpt-5.6-sol"},{"value":"openai/gpt-5.6-sol-fast","name":"openai/gpt-5.6-sol-fast"},{"value":"openai/gpt-5.6-terra","name":"openai/gpt-5.6-terra"},{"value":"openai/gpt-5.6-terra-fast","name":"openai/gpt-5.6-terra-fast"},{"value":"openai/gpt-5.5","name":"openai/gpt-5.5"},{"value":"openai/gpt-5.5-fast","name":"openai/gpt-5.5-fast"},{"value":"openai/gpt-5.5-pro","name":"openai/gpt-5.5-pro"},{"value":"openai/gpt-5.4-nano","name":"openai/gpt-5.4-nano"},{"value":"openai/gpt-5.4","name":"openai/gpt-5.4"},{"value":"openai/gpt-5.4-fast","name":"openai/gpt-5.4-fast"},{"value":"openai/gpt-5.4-pro","name":"openai/gpt-5.4-pro"},{"value":"openai/gpt-5.3-codex","name":"openai/gpt-5.3-codex"},{"value":"openai/gpt-5.3-codex-fast","name":"openai/gpt-5.3-codex-fast"},{"value":"openai/gpt-5.2","name":"openai/gpt-5.2"},{"value":"openai/gpt-5.2-fast","name":"openai/gpt-5.2-fast"},{"value":"openai/gpt-5.2-pro","name":"openai/gpt-5.2-pro"},{"value":"openai/gpt-5.1-thinking","name":"openai/gpt-5.1-thinking"},{"value":"openai/gpt-5.1-thinking-fast","name":"openai/gpt-5.1-thinking-fast"},{"value":"openai/gpt-5-pro","name":"openai/gpt-5-pro"},{"value":"openai/gpt-5","name":"openai/gpt-5"},{"value":"openai/gpt-5-fast","name":"openai/gpt-5-fast"},{"value":"openai/gpt-5-nano","name":"openai/gpt-5-nano"},{"value":"openai/o3-pro","name":"openai/o3-pro"},{"value":"openai/o3","name":"openai/o3"},{"value":"openai/o3-fast","name":"openai/o3-fast"},{"value":"openai/o1","name":"openai/o1"},{"value":"deepseek/deepseek-v4-pro-0813","name":"deepseek/deepseek-v4-pro-0813"},{"value":"deepseek/deepseek-v4-pro","name":"deepseek/deepseek-v4-pro"},{"value":"spacexai/grok-4.7","name":"spacexai/grok-4.7"},{"value":"spacexai/grok-4.6","name":"spacexai/grok-4.6"},{"value":"spacexai/grok-4.5","name":"spacexai/grok-4.5"},{"value":"spacexai/grok-4.3","name":"spacexai/grok-4.3"},{"value":"spacexai/grok-4.20-multi-agent","name":"spacexai/grok-4.20-multi-agent"},{"value":"spacexai/grok-4.20-non-reasoning","name":"spacexai/grok-4.20-non-reasoning"},{"value":"spacexai/grok-4.20-reasoning","name":"spacexai/grok-4.20-reasoning"},{"value":"spacexai/grok-4.1-fast-non-reasoning","name":"spacexai/grok-4.1-fast-non-reasoning"},{"value":"spacexai/grok-4.1-fast-reasoning","name":"spacexai/grok-4.1-fast-reasoning"},{"value":"amazon/nova-pro","name":"amazon/nova-pro"},{"value":"anthropic/claude-fable-5.1","name":"anthropic/claude-fable-5.1"},{"value":"anthropic/claude-fable-5","name":"anthropic/claude-fable-5"},{"value":"openai/gpt-6.1-sol","name":"openai/gpt-6.1-sol"},{"value":"openai/gpt-6.1-sol-fast","name":"openai/gpt-6.1-sol-fast"},{"value":"openai/gpt-6-luna","name":"openai/gpt-6-luna"},{"value":"openai/gpt-6-luna-fast","name":"openai/gpt-6-luna-fast"},{"value":"openai/gpt-6-sol","name":"openai/gpt-6-sol"},{"value":"openai/gpt-6-sol-fast","name":"openai/gpt-6-sol-fast"},{"value":"openai/gpt-6-astra","name":"openai/gpt-6-astra"},{"value":"openai/gpt-6-astra-fast","name":"openai/gpt-6-astra-fast"},{"value":"openai/gpt-oss-safeguard-120b","name":"openai/gpt-oss-safeguard-120b"},{"value":"openai/gpt-oss-safeguard-20b","name":"openai/gpt-oss-safeguard-20b"},{"value":"openai/gpt-oss-120b","name":"openai/gpt-oss-120b"},{"value":"openai/gpt-oss-20b","name":"openai/gpt-oss-20b"},{"value":"openai/gpt-4.1","name":"openai/gpt-4.1"},{"value":"openai/gpt-4.1-fast","name":"openai/gpt-4.1-fast"},{"value":"openai/gpt-4.1-nano","name":"openai/gpt-4.1-nano"},{"value":"openai/gpt-4.1-nano-fast","name":"openai/gpt-4.1-nano-fast"},{"value":"openai/gpt-4o","name":"openai/gpt-4o"},{"value":"openai/gpt-4o-fast","name":"openai/gpt-4o-fast"},{"value":"openai/gpt-4-turbo","name":"openai/gpt-4-turbo"},{"value":"openai/gpt-3.5-turbo","name":"openai/gpt-3.5-turbo"},{"value":"google/gemma-4-26b-a4b-it","name":"google/gemma-4-26b-a4b-it"},{"value":"deepseek/deepseek-v3.2","name":"deepseek/deepseek-v3.2"},{"value":"deepseek/deepseek-v3.2-thinking","name":"deepseek/deepseek-v3.2-thinking"},{"value":"deepseek/deepseek-r1","name":"deepseek/deepseek-r1"},{"value":"meta/llama-4-maverick","name":"meta/llama-4-maverick"},{"value":"meta/llama-4-scout","name":"meta/llama-4-scout"},{"value":"meta/llama-3.3-70b","name":"meta/llama-3.3-70b"},{"value":"meta/llama-3.1-70b","name":"meta/llama-3.1-70b"},{"value":"meta/llama-3.1-8b","name":"meta/llama-3.1-8b"},{"value":"alibaba/qwen3.8-2.4t-a95b","name":"alibaba/qwen3.8-2.4t-a95b"},{"value":"alibaba/qwen3.8-max","name":"alibaba/qwen3.8-max"},{"value":"alibaba/qwen3-next-80b-a3b-instruct","name":"alibaba/qwen3-next-80b-a3b-instruct"},{"value":"alibaba/qwen3-next-80b-a3b-thinking","name":"alibaba/qwen3-next-80b-a3b-thinking"},{"value":"alibaba/qwen3-coder-30b-a3b","name":"alibaba/qwen3-coder-30b-a3b"},{"value":"alibaba/qwen3-coder","name":"alibaba/qwen3-coder"},{"value":"alibaba/qwen3-coder-next","name":"alibaba/qwen3-coder-next"},{"value":"alibaba/qwen-3-235b","name":"alibaba/qwen-3-235b"},{"value":"alibaba/qwen-3-32b","name":"alibaba/qwen-3-32b"},{"value":"fireworks/ember-1","name":"fireworks/ember-1"},{"value":"zai/glm-5.3-fast","name":"zai/glm-5.3-fast"},{"value":"zai/glm-5.3","name":"zai/glm-5.3"},{"value":"nvidia/nemotron-3.5-lightning","name":"nvidia/nemotron-3.5-lightning"},{"value":"moonshotai/kimi-k3-fast","name":"moonshotai/kimi-k3-fast"},{"value":"moonshotai/kimi-k3","name":"moonshotai/kimi-k3"},{"value":"zai/glm-5.2-fast","name":"zai/glm-5.2-fast"},{"value":"zai/glm-5.2","name":"zai/glm-5.2"},{"value":"nvidia/nemotron-3-ultra-550b-a55b","name":"nvidia/nemotron-3-ultra-550b-a55b"},{"value":"spacexai/grok-build-0.1","name":"spacexai/grok-build-0.1"},{"value":"nvidia/nemotron-3-super-120b-a12b","name":"nvidia/nemotron-3-super-120b-a12b"},{"value":"zai/glm-5","name":"zai/glm-5"},{"value":"moonshotai/kimi-k2.5","name":"moonshotai/kimi-k2.5"},{"value":"zai/glm-4.7","name":"zai/glm-4.7"},{"value":"nvidia/nemotron-nano-12b-v2-vl","name":"nvidia/nemotron-nano-12b-v2-vl"},{"value":"nvidia/nemotron-nano-9b-v2","name":"nvidia/nemotron-nano-9b-v2"},{"value":"amazon/nova-micro","name":"amazon/nova-micro"},{"value":"deepseek/deepseek-v4.1-flash","name":"deepseek/deepseek-v4.1-flash"},{"value":"deepseek/deepseek-v4-flash","name":"deepseek/deepseek-v4-flash"},{"value":"deepseek/deepseek-v4-flash-0731","name":"deepseek/deepseek-v4-flash-0731"},{"value":"zai/glm-5.3-flash","name":"zai/glm-5.3-flash"},{"value":"zai/glm-4.7-flash","name":"zai/glm-4.7-flash"},{"value":"anthropic/claude-haiku-5.5","name":"anthropic/claude-haiku-5.5"},{"value":"anthropic/claude-haiku-4.5","name":"anthropic/claude-haiku-4.5"},{"value":"anthropic/claude-3-haiku","name":"anthropic/claude-3-haiku"},{"value":"openai/gpt-5.4-mini","name":"openai/gpt-5.4-mini"},{"value":"openai/gpt-5.4-mini-fast","name":"openai/gpt-5.4-mini-fast"},{"value":"openai/gpt-5-mini","name":"openai/gpt-5-mini"},{"value":"openai/gpt-5-mini-fast","name":"openai/gpt-5-mini-fast"},{"value":"openai/gpt-4.1-mini","name":"openai/gpt-4.1-mini"},{"value":"openai/gpt-4.1-mini-fast","name":"openai/gpt-4.1-mini-fast"},{"value":"openai/o4-mini","name":"openai/o4-mini"},{"value":"openai/o4-mini-fast","name":"openai/o4-mini-fast"},{"value":"openai/o3-mini","name":"openai/o3-mini"},{"value":"openai/gpt-4o-mini","name":"openai/gpt-4o-mini"},{"value":"openai/gpt-4o-mini-fast","name":"openai/gpt-4o-mini-fast"},{"value":"google/gemini-3.8-flash","name":"google/gemini-3.8-flash"},{"value":"google/gemini-3.7-flash","name":"google/gemini-3.7-flash"},{"value":"google/gemini-3.5-flash-lite","name":"google/gemini-3.5-flash-lite"},{"value":"google/gemini-3.6-flash","name":"google/gemini-3.6-flash"},{"value":"google/gemini-3.5-flash","name":"google/gemini-3.5-flash"},{"value":"google/gemini-3.1-flash-lite","name":"google/gemini-3.1-flash-lite"},{"value":"google/gemini-3-flash","name":"google/gemini-3-flash"},{"value":"google/gemini-2.5-flash-lite","name":"google/gemini-2.5-flash-lite"},{"value":"google/gemini-2.5-flash","name":"google/gemini-2.5-flash"},{"value":"google/gemini-2.5-pro","name":"google/gemini-2.5-pro"},{"value":"minimax/minimax-m3","name":"minimax/minimax-m3"},{"value":"minimax/minimax-m2.5","name":"minimax/minimax-m2.5"},{"value":"minimax/minimax-m2.1","name":"minimax/minimax-m2.1"},{"value":"amazon/nova-2-lite","name":"amazon/nova-2-lite"},{"value":"amazon/nova-lite","name":"amazon/nova-lite"},{"value":"google/gemini-3.1-pro-preview","name":"google/gemini-3.1-pro-preview"},{"value":"spacexai/grok-4.20-multi-agent-beta","name":"spacexai/grok-4.20-multi-agent-beta"},{"value":"spacexai/grok-4.20-non-reasoning-beta","name":"spacexai/grok-4.20-non-reasoning-beta"},{"value":"spacexai/grok-4.20-reasoning-beta","name":"spacexai/grok-4.20-reasoning-beta"}]},{"id":"mode","name":"Session Mode","description":"Controls how the agent requests permission","category":"mode","type":"select","currentValue":"ask","options":[{"value":"code","name":"Code","description":"Write and modify code with full tool access","permissionMode":"auto"},{"value":"ask","name":"Ask","description":"Request permission before making any changes","permissionMode":"ask"}]},{"id":"effort","name":"Reasoning Effort","description":"Controls how much the model thinks before responding","category":"thought_level","type":"select","currentValue":"xhigh","options":[{"value":"auto","name":"default"},{"value":"low","name":"low"},{"value":"medium","name":"medium"},{"value":"high","name":"high"},{"value":"xhigh","name":"xhigh"},{"value":"max","name":"max"}]}],"modes":{"currentModeId":"ask","availableModes":[{"id":"code","name":"Code","description":"Write and modify code with full tool access"},{"id":"ask","name":"Ask","description":"Request permission before making any changes"}]}}}}
diff --git a/apps/server/src/orchestration-v2/testkit/fixtures/turn_interrupt/kiro_transcript.ndjson b/apps/server/src/orchestration-v2/testkit/fixtures/turn_interrupt/kiro_transcript.ndjson
index 46a0f9ca5db4..f21daa7b0aa8 100644
--- a/apps/server/src/orchestration-v2/testkit/fixtures/turn_interrupt/kiro_transcript.ndjson
+++ b/apps/server/src/orchestration-v2/testkit/fixtures/turn_interrupt/kiro_transcript.ndjson
@@ -1,5 +1,5 @@
 {"type":"transcript_start","provider":"kiro","protocol":"acp.ndjson-jsonrpc","version":"1","scenario":"turn_interrupt","metadata":{"generatedBy":"live-kiro-recorder","kiroVersion":"2.32.0","normalization":"Session ids are fixed sess_ UUIDs and other UUIDs (message and request ids) are numbered in first-seen order, the workspace is <workspace>, HOME is /home/kiro-replay and the recording user is kiro-replay. T3-owned prompt text, MCP servers and initialize params other than clientCapabilities and _meta are <any>. Kiro's log directory, user-scoped commands and agents, and the _kiro/* broadcasts T3 ignores (governance, steering documents, powers, tools, hooks, MCP status, session roster) are removed. Timestamps are kept as recorded.","droppedFrames":13}}
-{"type":"expect_outbound","label":"request:initialize","frame":{"kind":"request","method":"initialize","params":{"protocolVersion":2,"info":"<any>","capabilities":"<any>","clientCapabilities":{"fs":{"readTextFile":false,"writeTextFile":false},"terminal":false,"session":{"notices":{}},"elicitation":{"form":{}},"_meta":{"kiro":{"hooks":{"enabled":true,"v2":true}}}},"clientInfo":"<any>"}}}
+{"type":"expect_outbound","label":"request:initialize","frame":{"kind":"request","method":"initialize","params":{"protocolVersion":2,"info":"<any>","capabilities":"<any>","clientCapabilities":{"fs":{"readTextFile":false,"writeTextFile":false},"terminal":false,"session":{"notices":{},"compaction":{}},"elicitation":{"form":{}},"_meta":{"kiro":{"hooks":{"enabled":true,"v2":true}}}},"clientInfo":"<any>"}}}
 {"type":"emit_inbound","label":"response:initialize","frame":{"kind":"response","method":"initialize","result":{"protocolVersion":2,"agentCapabilities":{"loadSession":true,"promptCapabilities":{"image":true,"embeddedContext":true},"mcpCapabilities":{"http":true,"sse":true},"sessionCapabilities":{"list":{},"close":{},"delete":{},"fork":{"_meta":{"kiro":{"messageId":true}}}},"_meta":{"kiro":{"checkpoints":true,"sessionList":true,"policyNotifications":true,"extensionMethods":["_kiro/knowledge","_kiro/memory/list","_kiro/memory/get","_kiro/memory/create","_kiro/memory/update","_kiro/memory/delete","_kiro/codeIntelligence","_kiro/session/context","_kiro/session/compact","_kiro/session/export","_kiro/session/history","_kiro/config/template","_kiro/workflow/new","_kiro/workflow/invoke","_kiro/workflow/load","_kiro/workflow/inspect","_kiro/workflow/list","_kiro/workflow/pause","_kiro/workflow/cancel","_kiro/workflow/delete","_kiro/workflow/listRecipes","_kiro/workflow/listWatchHandlers","_kiro/workflow/resumeAll","_kiro/workflow/retry","_kiro/workflow/update","_kiro/workflow/resume","_kiro/sourceProviders/list","_kiro/sourceProviders/listResources"],"sessionSources":["local","remote"],"sessionListScopes":["workspace","user"],"executionTargets":["local","cloud-sandbox"],"sourceProviders":true,"replayMarking":true}}},"authMethods":[{"id":"aws-builder-id","name":"AWS Builder ID"},{"id":"aws-iam-identity-center","name":"AWS IAM Identity Center"}]}}}
 {"type":"expect_outbound","label":"request:session/new","frame":{"kind":"request","method":"session/new","params":{"cwd":"<workspace>","mcpServers":"<any>"}}}
 {"type":"emit_inbound","label":"notification:session/update:available_commands_update","frame":{"kind":"notification","method":"session/update","params":{"sessionId":"sess_00000000-0000-4000-8000-000000000001","update":{"sessionUpdate":"available_commands_update","availableCommands":[{"name":"architecture-selection","description":"Steering: architecture-selection","input":{"hint":"optional context"},"_meta":{"kiro":{"type":"steering","contextQuery":"global:architecture-selection","commandId":"architecture-selection","resource":{"resourceType":"steering","source":{"origin":"bundled"}},"originalName":"architecture-selection"}}},{"name":"quick-spec","description":"Steering: quick-spec","input":{"hint":"optional context"},"_meta":{"kiro":{"type":"steering","contextQuery":"global:quick-spec","commandId":"quick-spec","resource":{"resourceType":"steering","source":{"origin":"bundled"}},"originalName":"quick-spec"}}},{"name":"bug-fix","description":"Steering: bug-fix","input":{"hint":"optional context"},"_meta":{"kiro":{"type":"steering","contextQuery":"global:bug-fix","commandId":"bug-fix","resource":{"resourceType":"steering","source":{"origin":"bundled"}},"originalName":"bug-fix"}}},{"name":"general-task-execution","description":"General-purpose sub-agent with access to all tools for executing arbitrary tasks","input":{"hint":"task to delegate"},"_meta":{"kiro":{"type":"custom-agent","commandId":"general-task-execution","resource":{"resourceType":"agent","source":{"origin":"bundled"}},"originalName":"general-task-execution"}}},{"name":"context-gatherer","description":"Investigates the codebase to answer a specific question about it. Deeply analyzes existing code by tracing execution paths, mapping architecture and abstraction layers, understanding patterns, and documenting dependencies, returning a thorough, direct written analysis that explains how the relevant code works and points to the specific files and lines involved. Use it to understand code before you change it: before designing or implementing a change to code you don't already fully understand, start with context-gatherer so your edits are grounded in how the code actually works. When a task requires understanding code you don't already know, dispatch context-gatherer to do that exploration before running your own searches or reads. Rules: 1. Provide a clear, specific prompt that includes your intent: a detailed task description of the context you need and what you're trying to accomplish. 2. The subagent explores the codebase and returns an analysis of your query 3. Trust the returned results. You may still inspect additional code yourself when you need context beyond what was returned. 4. Reuse existing context-gatherer output for related follow-up questions; do not re-invoke on the same question with different phrasing. 5. For multiple distinct questions, dispatch several context-gatherers in parallel, each targeting a different aspect of the codebase.","input":{"hint":"task to delegate"},"_meta":{"kiro":{"type":"custom-agent","commandId":"context-gatherer","resource":{"resourceType":"agent","source":{"origin":"bundled"}},"originalName":"context-gatherer"}}}]}}}}
diff --git a/apps/server/src/orchestration-v2/testkit/fixtures/turn_interrupt_mid_tool/kiro_transcript.ndjson b/apps/server/src/orchestration-v2/testkit/fixtures/turn_interrupt_mid_tool/kiro_transcript.ndjson
index 14887375f172..2f62e729977c 100644
--- a/apps/server/src/orchestration-v2/testkit/fixtures/turn_interrupt_mid_tool/kiro_transcript.ndjson
+++ b/apps/server/src/orchestration-v2/testkit/fixtures/turn_interrupt_mid_tool/kiro_transcript.ndjson
@@ -1,5 +1,5 @@
 {"type":"transcript_start","provider":"kiro","protocol":"acp.ndjson-jsonrpc","version":"1","scenario":"kiro_turn_interrupt_mid_tool","metadata":{"generatedBy":"live-kiro-recorder","kiroVersion":"2.33.1","normalization":"Session ids are fixed sess_ UUIDs and other UUIDs (message and request ids) are numbered in first-seen order, the workspace is <workspace>, HOME is /home/kiro-replay and the recording user is kiro-replay. T3-owned prompt text, MCP servers and initialize params other than clientCapabilities and _meta are <any>. Kiro's log directory, user-scoped commands and agents, and the _kiro/* broadcasts T3 ignores (governance, steering documents, powers, tools, hooks, MCP status, session roster) are removed. Timestamps are kept as recorded.","droppedFrames":13}}
-{"type":"expect_outbound","label":"request:initialize","frame":{"kind":"request","method":"initialize","params":{"protocolVersion":2,"info":"<any>","capabilities":"<any>","clientCapabilities":{"fs":{"readTextFile":false,"writeTextFile":false},"terminal":false,"session":{"notices":{}},"elicitation":{"form":{}},"_meta":{"kiro":{"hooks":{"enabled":true,"v2":true}}}},"clientInfo":"<any>"}}}
+{"type":"expect_outbound","label":"request:initialize","frame":{"kind":"request","method":"initialize","params":{"protocolVersion":2,"info":"<any>","capabilities":"<any>","clientCapabilities":{"fs":{"readTextFile":false,"writeTextFile":false},"terminal":false,"session":{"notices":{},"compaction":{}},"elicitation":{"form":{}},"_meta":{"kiro":{"hooks":{"enabled":true,"v2":true}}}},"clientInfo":"<any>"}}}
 {"type":"emit_inbound","label":"response:initialize","frame":{"kind":"response","method":"initialize","result":{"protocolVersion":2,"agentCapabilities":{"loadSession":true,"promptCapabilities":{"image":true,"embeddedContext":true},"mcpCapabilities":{"http":true,"sse":true},"sessionCapabilities":{"list":{},"close":{},"delete":{},"fork":{"_meta":{"kiro":{"messageId":true}}}},"_meta":{"kiro":{"checkpoints":true,"sessionList":true,"policyNotifications":true,"extensionMethods":["_kiro/knowledge","_kiro/memory/list","_kiro/memory/get","_kiro/memory/create","_kiro/memory/update","_kiro/memory/delete","_kiro/codeIntelligence","_kiro/session/context","_kiro/session/compact","_kiro/session/export","_kiro/session/history","_kiro/config/template","_kiro/workflow/new","_kiro/workflow/invoke","_kiro/workflow/load","_kiro/workflow/inspect","_kiro/workflow/list","_kiro/workflow/pause","_kiro/workflow/cancel","_kiro/workflow/delete","_kiro/workflow/listRecipes","_kiro/workflow/listWatchHandlers","_kiro/workflow/resumeAll","_kiro/workflow/retry","_kiro/workflow/update","_kiro/workflow/resume","_kiro/sourceProviders/list","_kiro/sourceProviders/listResources"],"sessionSources":["local","remote"],"sessionListScopes":["workspace","user"],"executionTargets":["local","cloud-sandbox"],"sourceProviders":true,"replayMarking":true}}},"authMethods":[{"id":"aws-builder-id","name":"AWS Builder ID"},{"id":"aws-iam-identity-center","name":"AWS IAM Identity Center"}]}}}
 {"type":"expect_outbound","label":"request:session/new","frame":{"kind":"request","method":"session/new","params":{"cwd":"<workspace>","mcpServers":"<any>"}}}
 {"type":"emit_inbound","label":"notification:session/update:available_commands_update","frame":{"kind":"notification","method":"session/update","params":{"sessionId":"sess_00000000-0000-4000-8000-000000000001","update":{"sessionUpdate":"available_commands_update","availableCommands":[{"name":"architecture-selection","description":"Steering: architecture-selection","input":{"hint":"optional context"},"_meta":{"kiro":{"type":"steering","contextQuery":"global:architecture-selection","commandId":"architecture-selection","resource":{"resourceType":"steering","source":{"origin":"bundled"}},"originalName":"architecture-selection"}}},{"name":"quick-spec","description":"Steering: quick-spec","input":{"hint":"optional context"},"_meta":{"kiro":{"type":"steering","contextQuery":"global:quick-spec","commandId":"quick-spec","resource":{"resourceType":"steering","source":{"origin":"bundled"}},"originalName":"quick-spec"}}},{"name":"bug-fix","description":"Steering: bug-fix","input":{"hint":"optional context"},"_meta":{"kiro":{"type":"steering","contextQuery":"global:bug-fix","commandId":"bug-fix","resource":{"resourceType":"steering","source":{"origin":"bundled"}},"originalName":"bug-fix"}}},{"name":"general-task-execution","description":"General-purpose sub-agent with access to all tools for executing arbitrary tasks","input":{"hint":"task to delegate"},"_meta":{"kiro":{"type":"custom-agent","commandId":"general-task-execution","resource":{"resourceType":"agent","source":{"origin":"bundled"}},"originalName":"general-task-execution"}}},{"name":"context-gatherer","description":"Investigates the codebase to answer a specific question about it. Deeply analyzes existing code by tracing execution paths, mapping architecture and abstraction layers, understanding patterns, and documenting dependencies, returning a thorough, direct written analysis that explains how the relevant code works and points to the specific files and lines involved. Use it to understand code before you change it: before designing or implementing a change to code you don't already fully understand, start with context-gatherer so your edits are grounded in how the code actually works. When a task requires understanding code you don't already know, dispatch context-gatherer to do that exploration before running your own searches or reads. Rules: 1. Provide a clear, specific prompt that includes your intent: a detailed task description of the context you need and what you're trying to accomplish. 2. The subagent explores the codebase and returns an analysis of your query 3. Trust the returned results. You may still inspect additional code yourself when you need context beyond what was returned. 4. Reuse existing context-gatherer output for related follow-up questions; do not re-invoke on the same question with different phrasing. 5. For multiple distinct questions, dispatch several context-gatherers in parallel, each targeting a different aspect of the codebase.","input":{"hint":"task to delegate"},"_meta":{"kiro":{"type":"custom-agent","commandId":"context-gatherer","resource":{"resourceType":"agent","source":{"origin":"bundled"}},"originalName":"context-gatherer"}}}]}}}}
diff --git a/apps/server/src/orchestration-v2/threadHistoryPaging.ts b/apps/server/src/orchestration-v2/threadHistoryPaging.ts
index f088d389fdd5..cf9a101bba44 100644
--- a/apps/server/src/orchestration-v2/threadHistoryPaging.ts
+++ b/apps/server/src/orchestration-v2/threadHistoryPaging.ts
@@ -485,13 +485,15 @@ export function selectHistoryPageFromCursor<Row extends HistoryRow>(input: {
   readonly policy?: ThreadHistoryPagePolicy | undefined;
   readonly rowEncodedBytes?: ((row: Row) => number) | undefined;
   readonly throughEntryId?: string | undefined;
+  /** Where the page ends in `items`. Set when `items` can lack the cursor's row. */
+  readonly exclusiveEndIndex?: number | undefined;
   /** Set when `items` holds only the newest part of the history. */
   readonly prefix?: ThreadHistoryPrefix | undefined;
 }): SelectTimelinePageResult<Row> {
   const decoded = decodeThreadHistoryCursor(input.cursor);
   return selectOlderTimelinePage({
     items: input.items,
-    exclusiveEndIndex: findCursorEndIndex(input.items, decoded),
+    exclusiveEndIndex: input.exclusiveEndIndex ?? findCursorEndIndex(input.items, decoded),
     snapshotSequence: input.snapshotSequence,
     ...(input.rowEncodedBytes === undefined ? {} : { rowEncodedBytes: input.rowEncodedBytes }),
     policy: olderHistoryPagePolicy(input),
diff --git a/apps/server/src/orchestration-v2/workflowAgentTranscript.test.ts b/apps/server/src/orchestration-v2/workflowAgentTranscript.test.ts
index e6fd24582c3c..af3302bc7564 100644
--- a/apps/server/src/orchestration-v2/workflowAgentTranscript.test.ts
+++ b/apps/server/src/orchestration-v2/workflowAgentTranscript.test.ts
@@ -60,6 +60,6 @@ it.layer(NodeServices.layer)("readWorkflowAgentTranscript", (it) => {
       assert.equal(NodeFS.statSync(file).ino, replaced.cursor.identity?.ino);
       const shrunk = yield* read(replaced.cursor);
       assert.deepEqual(uuids(shrunk.lines), ["d"], "a shrunk file reads from 0");
-    }).pipe(Effect.scoped),
+    }),
   );
 });
diff --git a/apps/server/src/peer/PeerLinks.test.ts b/apps/server/src/peer/PeerLinks.test.ts
index f35e760bea4d..fcb682ab03fa 100644
--- a/apps/server/src/peer/PeerLinks.test.ts
+++ b/apps/server/src/peer/PeerLinks.test.ts
@@ -123,16 +123,15 @@ const serveApart = (descriptor: ExecutionEnvironmentDescriptor) =>
   );
 
 it.effect("routes peer reads to readers and sees uncommitted link updates", () =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      const context = yield* layerLinkingEnvironment(
-        laptop,
-        ServerSecretStore.layer,
-        layerReaderDatabase,
-      ).pipe(Layer.build);
-      const links = Context.get(context, PeerLinks.PeerLinks);
-      const sql = Context.get(context, SqlClient.SqlClient);
-      yield* sql`
+  Effect.gen(function* () {
+    const context = yield* layerLinkingEnvironment(
+      laptop,
+      ServerSecretStore.layer,
+      layerReaderDatabase,
+    ).pipe(Layer.build);
+    const links = Context.get(context, PeerLinks.PeerLinks);
+    const sql = Context.get(context, SqlClient.SqlClient);
+    yield* sql`
       INSERT INTO peer_environment_links (
         environment_id, secret_name, label, urls_json, access, linked_at, expires_at, fenced
       ) VALUES (
@@ -140,27 +139,26 @@ it.effect("routes peer reads to readers and sees uncommitted link updates", () =
         '2026-01-01T00:00:00.000Z', '2026-01-02T00:00:00.000Z', 1
       )
     `;
-      const { queries, trace } = traceSqlRouting();
-      yield* links.list.pipe(trace);
-      expect(Option.getOrThrow(yield* links.get(box.environmentId).pipe(trace)).label).toBe("Box");
-      const reads = queries.filter(({ query }) =>
-        query.includes("SELECT * FROM peer_environment_links"),
-      );
-      expect(reads).toHaveLength(2);
-      expect(reads.map((row) => row.connection)).toEqual(["reader", "reader"]);
-      yield* sql.withTransaction(
-        Effect.gen(function* () {
-          yield* sql`UPDATE peer_environment_links SET label = 'Uncommitted box'`;
-          expect(Option.getOrThrow(yield* links.get(box.environmentId)).label).toBe(
-            "Uncommitted box",
-          );
-          expect((yield* links.list)[0]?.label).toBe("Uncommitted box");
-        }),
-      );
-      expect(yield* links.unlink(box.environmentId)).toBe(true);
-      expect(yield* links.list).toEqual([]);
-    }),
-  ),
+    const { queries, trace } = traceSqlRouting();
+    yield* links.list.pipe(trace);
+    expect(Option.getOrThrow(yield* links.get(box.environmentId).pipe(trace)).label).toBe("Box");
+    const reads = queries.filter(({ query }) =>
+      query.includes("SELECT * FROM peer_environment_links"),
+    );
+    expect(reads).toHaveLength(2);
+    expect(reads.map((row) => row.connection)).toEqual(["reader", "reader"]);
+    yield* sql.withTransaction(
+      Effect.gen(function* () {
+        yield* sql`UPDATE peer_environment_links SET label = 'Uncommitted box'`;
+        expect(Option.getOrThrow(yield* links.get(box.environmentId)).label).toBe(
+          "Uncommitted box",
+        );
+        expect((yield* links.list)[0]?.label).toBe("Uncommitted box");
+      }),
+    );
+    expect(yield* links.unlink(box.environmentId)).toBe(true);
+    expect(yield* links.list).toEqual([]);
+  }),
 );
 
 it.effect("links with a pairing code, and the peer holds its agents to the limits they carry", () =>
@@ -567,6 +565,37 @@ it.effect("a linked peer that is renamed shows its new name", () =>
   ).pipe(Effect.provide(NodeHttpServer.layerTest)),
 );
 
+it.effect(
+  "a link forgotten while it resolves says it is not linked, not that it lost its credential",
+  () =>
+    Effect.scoped(
+      Effect.gen(function* () {
+        const b = yield* serveB(box);
+        const beforeGet = yield* Ref.make<Effect.Effect<void>>(Effect.void);
+        const racing = Layer.effect(
+          ServerSecretStore.ServerSecretStore,
+          Effect.map(ServerSecretStore.make, (store) =>
+            ServerSecretStore.ServerSecretStore.of({
+              ...store,
+              get: (name) =>
+                Ref.getAndSet(beforeGet, Effect.void).pipe(
+                  Effect.flatten,
+                  Effect.andThen(store.get(name)),
+                ),
+            }),
+          ),
+        );
+        const a = yield* makeA(laptop, racing);
+        const pairing = yield* b.auth.issuePairingCredential();
+        yield* a.links.link({ url: b.url, pairingCode: pairing.credential, access: "auto" });
+
+        yield* Ref.set(beforeGet, Effect.orDie(Effect.asVoid(a.links.unlink(box.environmentId))));
+        const forgotten = yield* probe(a).pipe(Effect.flip);
+        expect(forgotten.message).toContain("not linked to");
+      }),
+    ).pipe(Effect.provide(NodeHttpServer.layerTest)),
+);
+
 it.effect("tells the agent to link again once the peer revokes the link or it expires", () =>
   Effect.scoped(
     Effect.gen(function* () {
@@ -742,7 +771,7 @@ it.effect("linking a picked machine that answers nowhere names it and links noth
         .pipe(Effect.flip);
       expect(failed.reason).toBe("unreachable");
       expect(failed.message).toBe(
-        `This environment could not reach Box at ${impostor.url}, http://192.168.1.20:3773.`,
+        `This environment could not reach Box: ${new URL(impostor.url).origin} answered as another environment, Impostor. http://192.168.1.20:3773 is plain http, which would send the link's credentials unencrypted. Use its https address, or its Tailscale address.`,
       );
       expect(yield* a.links.list).toEqual([]);
       expect(yield* linkedSessions(impostor)).toEqual([]);
@@ -763,6 +792,29 @@ it.effect("linking a picked machine that answers nowhere names it and links noth
   ).pipe(Effect.provide(NodeHttpServer.layerTest)),
 );
 
+it.live("linking an address with nothing listening says so, unlike one that is not T3 Code", () =>
+  Effect.scoped(
+    Effect.gen(function* () {
+      const closed = yield* Effect.scoped(
+        serveRaw(() => Effect.succeed(HttpServerResponse.empty({ status: 404 }))),
+      );
+      const notT3 = yield* serveRaw(() =>
+        Effect.succeed(
+          HttpServerResponse.text("<h1>Not Found</h1>", { status: 404, contentType: "text/html" }),
+        ),
+      );
+      const a = yield* makeA(laptop);
+      const linking = (url: string) =>
+        a.links.link({ url, pairingCode: "unused", access: "auto" }).pipe(Effect.flip);
+      expect((yield* linking(closed)).message).toBe(`${closed} did not answer (ECONNREFUSED).`);
+      expect((yield* linking(notT3)).message).toBe(
+        `${notT3} answered, but not as a T3 Code environment this version understands.`,
+      );
+      expect(yield* a.links.list).toEqual([]);
+    }),
+  ).pipe(Effect.provide(NodeHttpServer.layerTest)),
+);
+
 /** An https listener whose certificate this machine does not trust. */
 const serveUntrusted = Layer.build(
   Layer.fresh(
diff --git a/apps/server/src/peer/PeerLinks.ts b/apps/server/src/peer/PeerLinks.ts
index 48f61e6554a1..2fa08d5b4367 100644
--- a/apps/server/src/peer/PeerLinks.ts
+++ b/apps/server/src/peer/PeerLinks.ts
@@ -5,7 +5,6 @@ import {
   EnvironmentHttpApi,
   EnvironmentId,
   type ExecutionEnvironmentCapabilities,
-  type ExecutionEnvironmentDescriptor,
   MCP_PEER_LINK_SOFTWARE_ID,
   type PeerLink,
   type PeerLinkCreateInput,
@@ -13,6 +12,7 @@ import {
   type PeerLinkSummary,
 } from "@t3tools/contracts";
 import * as NodeSqliteClient from "@t3tools/shared/nodeSqliteClient";
+import * as Cause from "effect/Cause";
 import * as Context from "effect/Context";
 import * as Digest from "effect/crypto/Digest";
 import * as SecureRandom from "effect/crypto/SecureRandom";
@@ -31,6 +31,7 @@ import * as Schema from "effect/Schema";
 import * as SqlClient from "effect/sql/SqlClient";
 import * as FetchHttpClient from "effect/http/FetchHttpClient";
 import * as HttpClient from "effect/http/HttpClient";
+import * as HttpClientError from "effect/http/HttpClientError";
 import * as HttpApi from "effect/http-api/HttpApi";
 import * as HttpApiClient from "effect/http-api/HttpApiClient";
 import { isLocalLoopbackHost, isTailnetHost } from "@t3tools/shared/hostClassification";
@@ -47,10 +48,10 @@ const PeerHttpApi = HttpApi.make(EnvironmentHttpApi.identifier)
 /** The redirect registered for a link. Nothing ever listens there: the code comes back in the response. */
 const LINK_REDIRECT_URI = "http://127.0.0.1/t3code-peer-link";
 /**
- * How long a peer's descriptor may take before a route counts as unreachable.
- * A tailnet or relayed route to a machine that is waking up takes longer.
+ * How long a peer's descriptor or MCP handshake may take before a route counts
+ * as unreachable. A tailnet or relayed route to a machine that is waking up takes longer.
  */
-const probeTimeout = (origin: string) =>
+export const probeTimeout = (origin: string) =>
   isLocalLoopbackHost(new URL(origin).hostname) ? Duration.seconds(3) : Duration.seconds(10);
 /** How long a listing waits on a link's addresses; a real call still gives a waking peer `probeTimeout`. */
 const LIST_PROBE_TIMEOUT = Duration.seconds(3);
@@ -176,6 +177,38 @@ const peerOrigin = (url: string) => {
   return Effect.succeed(parsed.origin);
 };
 
+/** The system error under a failed connection, such as ECONNREFUSED or ENOTFOUND. */
+const connectionCode = (cause: unknown) =>
+  [cause, Predicate.hasProperty(cause, "cause") ? cause.cause : undefined]
+    .map((error) => (Predicate.hasProperty(error, "code") ? error.code : undefined))
+    .find(Predicate.isString);
+
+/** Why `origin` did not answer as T3 Code, short enough for a toast. Never echoes a body. */
+const probeFailure = (
+  origin: string,
+  error: HttpClientError.HttpClientError | Schema.SchemaError | Cause.TimeoutError,
+  timeout: Duration.Duration,
+) => {
+  const unreachable = (message: string) => new PeerLinkError({ reason: "unreachable", message });
+  const certificate = certificateErrorCode(error);
+  if (certificate !== undefined) {
+    return unreachable(`${origin} presented a certificate this machine rejected (${certificate}).`);
+  }
+  if (Cause.isTimeoutError(error)) {
+    return unreachable(`${origin} did not answer within ${Duration.toSeconds(timeout)} seconds.`);
+  }
+  if (HttpClientError.isHttpClientError(error) && error.reason._tag === "TransportError") {
+    const code = connectionCode(error.reason.cause);
+    return unreachable(
+      code === undefined ? `${origin} did not answer.` : `${origin} did not answer (${code}).`,
+    );
+  }
+  return new PeerLinkError({
+    reason: "not_a_t3_environment",
+    message: `${origin} answered, but not as a T3 Code environment this version understands.`,
+  });
+};
+
 /** Whether a host is this machine's own loopback. Tests serve their peers there, so they narrow it. */
 export const LoopbackHost = Context.Reference<(host: string) => boolean>(
   "t3/peer/PeerLinks/LoopbackHost",
@@ -217,13 +250,10 @@ const make = Effect.gen(function* () {
       Effect.provideService(HttpClient.HttpClient, peerHttpClient),
     );
 
-  /**
-   * The environment answering at `origin`, or nothing when it does not answer
-   * as T3 Code. A certificate this machine rejects fails instead, since
-   * the peer may well be there.
-   */
-  const describe = (origin: string) =>
-    clientFor(origin).pipe(
+  /** The environment answering at `origin`, or why nothing there answers as T3 Code. */
+  const probe = (origin: string) => {
+    const timeout = probeTimeout(origin);
+    return clientFor(origin).pipe(
       Effect.flatMap((client) => client.metadata.descriptor()),
       // A brief network drop must not list a live peer as down; the timeout still bounds both tries.
       Effect.retry({
@@ -231,27 +261,18 @@ const make = Effect.gen(function* () {
         schedule: Schedule.spaced("1 second"),
         while: (error) => certificateErrorCode(error) === undefined,
       }),
-      Effect.timeout(probeTimeout(origin)),
-      Effect.asSome,
-      Effect.catch((error) => {
-        const code = certificateErrorCode(error);
-        return code === undefined
-          ? Effect.succeed(Option.none<ExecutionEnvironmentDescriptor>())
-          : Effect.fail(
-              new PeerLinkError({
-                reason: "unreachable",
-                message: `${origin} presented a certificate this machine rejected (${code}).`,
-              }),
-            );
-      }),
+      Effect.timeout(timeout),
+      // No cause: a decode error can carry the response body to the client.
+      Effect.mapError((error) => probeFailure(origin, error, timeout)),
     );
+  };
 
-  /** Whether `url` answers as `environmentId`, counting an untrusted certificate as no. */
+  /** Whether `url` answers as `environmentId`, counting any failure as no. */
   const answersAs = Effect.fn("PeerLinks.answersAs")(function* (
     url: string,
     environmentId: EnvironmentId,
   ) {
-    const found = yield* describe(url).pipe(Effect.orElseSucceed(() => Option.none()));
+    const found = yield* probe(url).pipe(Effect.option);
     return Option.filter(found, (peer) => peer.environmentId === environmentId);
   });
 
@@ -404,7 +425,8 @@ const make = Effect.gen(function* () {
   /**
    * The addresses that answer as `environmentId`, in the order given, with
    * what the first one answered. Addresses this environment would not send
-   * credentials to are skipped; when every one is, the failure says why.
+   * credentials to are skipped; when none answers as it, the failure says why
+   * for each.
    */
   const answeringAs = Effect.fn("PeerLinks.answeringAs")(function* (
     urls: ReadonlyArray<string>,
@@ -423,28 +445,28 @@ const make = Effect.gen(function* () {
               message: `${origin} is this machine, not ${name}.`,
             });
           }
-          return { origin, descriptor: yield* describe(origin) };
+          const descriptor = yield* probe(origin);
+          if (descriptor.environmentId !== environmentId) {
+            return yield* new PeerLinkError({
+              reason: "unreachable",
+              message: `${origin} answered as another environment, ${descriptor.label}.`,
+            });
+          }
+          return { origin, descriptor };
         }).pipe(Effect.result),
       { concurrency: "unbounded" },
     );
     const matching = checked.flatMap((result) =>
-      Result.isSuccess(result) &&
-      Option.isSome(result.success.descriptor) &&
-      result.success.descriptor.value.environmentId === environmentId
-        ? [{ origin: result.success.origin, descriptor: result.success.descriptor.value }]
-        : [],
+      Result.isSuccess(result) ? [result.success] : [],
     );
     const first = matching[0];
     if (first === undefined) {
-      const refusals = checked.flatMap((result) =>
+      const reasons = checked.flatMap((result) =>
         Result.isFailure(result) ? [result.failure.message] : [],
       );
       return yield* new PeerLinkError({
         reason: "unreachable",
-        message:
-          refusals.length === checked.length
-            ? `This environment could not reach ${name}: ${refusals.join(" ")}`
-            : `This environment could not reach ${name} at ${urls.join(", ")}.`,
+        message: `This environment could not reach ${name}: ${reasons.join(" ")}`,
       });
     }
     // Each address is kept once, even when two spellings share an origin.
@@ -456,14 +478,7 @@ const make = Effect.gen(function* () {
   const answeringAt = Effect.fn("PeerLinks.answeringAt")(function* (urls: ReadonlyArray<string>) {
     const origins = yield* Effect.forEach(urls, peerOrigin);
     const primary = origins[0]!;
-    const descriptor = yield* describe(primary);
-    if (Option.isNone(descriptor)) {
-      return yield* new PeerLinkError({
-        reason: "not_a_t3_environment",
-        message: `Nothing at ${primary} answered as a T3 Code environment.`,
-      });
-    }
-    return { primary, peer: descriptor.value, origins };
+    return { primary, peer: yield* probe(primary), origins };
   });
 
   const link: PeerLinks["Service"]["link"] = Effect.fn("PeerLinks.link")(function* (input) {
@@ -620,13 +635,12 @@ const make = Effect.gen(function* () {
 
   const resolve: PeerLinks["Service"]["resolve"] = Effect.fn("PeerLinks.resolve")(
     function* (environmentId) {
+      const notLinked = new PeerLinkError({
+        reason: "unknown_link",
+        message: `This environment is not linked to ${environmentId}. t3_environment_links lists the linked ones.`,
+      });
       const row = yield* readRow(environmentId);
-      if (Option.isNone(row)) {
-        return yield* new PeerLinkError({
-          reason: "unknown_link",
-          message: `This environment is not linked to ${environmentId}. t3_environment_links lists the linked ones.`,
-        });
-      }
+      if (Option.isNone(row)) return yield* notLinked;
       const link = yield* toLink(row.value);
       if (DateTime.isLessThanOrEqualTo(link.expiresAt, yield* DateTime.now)) {
         return yield* new PeerLinkError({
@@ -636,6 +650,8 @@ const make = Effect.gen(function* () {
       }
       const stored = yield* secrets.get(row.value.secret_name).pipe(Effect.catch(failStorage));
       if (Option.isNone(stored)) {
+        // An unlink between the two reads removes the row before its secret.
+        if (Option.isNone(yield* readRow(environmentId))) return yield* notLinked;
         return yield* new PeerLinkError({
           reason: "unknown_link",
           message: `The link to ${link.label} lost its credential. Link it again.`,
diff --git a/apps/server/src/peer/PeerMcpClient.test.ts b/apps/server/src/peer/PeerMcpClient.test.ts
index ef8a3aeff6a6..8fd65e7e2d79 100644
--- a/apps/server/src/peer/PeerMcpClient.test.ts
+++ b/apps/server/src/peer/PeerMcpClient.test.ts
@@ -9,12 +9,15 @@ import {
 import * as Context from "effect/Context";
 import * as DateTime from "effect/DateTime";
 import * as Deferred from "effect/Deferred";
+import * as Duration from "effect/Duration";
 import * as Effect from "effect/Effect";
 import * as Fiber from "effect/Fiber";
 import * as Layer from "effect/Layer";
+import * as Queue from "effect/Queue";
 import * as Ref from "effect/Ref";
 import * as Schema from "effect/Schema";
 import { Tool, Toolkit } from "effect/ai";
+import * as TestClock from "effect/testing/TestClock";
 import { HttpClient, HttpClientResponse } from "effect/http";
 
 import * as McpHttpServer from "../mcp/McpHttpServer.ts";
@@ -44,6 +47,49 @@ const toolkit = Toolkit.make(
   }),
 );
 
+/** One `probe` call to a linked peer at a remote address, answered by `http`. */
+const probeThrough = Effect.fn(function* (http: HttpClient.HttpClient) {
+  const box = descriptorOf("environment-box", "Box");
+  const context = yield* Layer.build(
+    PeerMcpClient.layer.pipe(
+      Layer.provide(
+        Layer.mergeAll(
+          Layer.succeed(HttpClient.HttpClient, http),
+          Layer.mock(PeerLinks.PeerLinks)({
+            resolve: () =>
+              Effect.succeed({
+                link: {
+                  environmentId: box.environmentId,
+                  label: box.label,
+                  urls: ["https://peer.example"],
+                  access: "auto",
+                  linkedAt: DateTime.makeUnsafe(0),
+                  expiresAt: DateTime.makeUnsafe(1),
+                  lastReachedAt: null,
+                  lastError: null,
+                },
+                url: "https://peer.example",
+                token: "fixture",
+              }),
+            recordOutcome: () => Effect.void,
+          }),
+        ),
+      ),
+    ),
+  );
+  return Context.get(context, PeerMcpClient.PeerMcpClient).call({
+    environmentId: box.environmentId,
+    tool: "probe",
+    arguments: {},
+    limits: { runtimeMode: "approval-required", interactionMode: "plan" },
+    success: Result,
+  });
+});
+
+const probeResult = JSON.stringify({
+  result: { content: [{ type: "text", text: '{"modes":"approval-required/plan"}' }] },
+});
+
 const refusal = new OrchestratorMcpFailure({
   code: "thread_not_found",
   message: "Thread thread-gone was not found.",
@@ -293,5 +339,47 @@ it.effect("renews a missing peer session once and reuses its replacement", () =>
       "renewed",
       "renewed",
     ]);
-  }).pipe(Effect.scoped),
+  }),
+);
+
+it.effect("bounds the session handshake, not a tool call that waits longer", () =>
+  Effect.gen(function* () {
+    const arrived = yield* Queue.unbounded<number>();
+    const answer = yield* Deferred.make<void>();
+    let requests = 0;
+    const http = HttpClient.make((request) =>
+      Effect.gen(function* () {
+        const index = requests++;
+        yield* Queue.offer(arrived, index);
+        // The first initialize, then the next initialized notification, never answer;
+        // the third session's tool call answers late.
+        if (index === 0 || index === 2) return yield* Effect.never;
+        if (index === 5) yield* Deferred.await(answer);
+        return HttpClientResponse.fromWeb(
+          request,
+          new Response(index === 5 ? probeResult : "", {
+            status: index === 4 ? 202 : 200,
+            headers: { "mcp-session-id": "session" },
+          }),
+        );
+      }),
+    );
+    const probe = yield* probeThrough(http);
+
+    for (const requestsBeforeStall of [1, 2]) {
+      const stalled = yield* probe.pipe(Effect.flip, Effect.forkScoped);
+      yield* Queue.takeN(arrived, requestsBeforeStall);
+      yield* TestClock.adjust(Duration.seconds(10));
+      expect(yield* Fiber.join(stalled)).toMatchObject({
+        code: "orchestration_error",
+        message: "The linked environment stopped answering.",
+      });
+    }
+
+    const waiting = yield* Effect.forkScoped(probe);
+    yield* Queue.takeN(arrived, 3);
+    yield* TestClock.adjust(Duration.minutes(1));
+    yield* Deferred.succeed(answer, undefined);
+    expect(yield* Fiber.join(waiting)).toEqual({ modes: "approval-required/plan" });
+  }),
 );
diff --git a/apps/server/src/peer/PeerMcpClient.ts b/apps/server/src/peer/PeerMcpClient.ts
index e800333fb1e0..8c438ad702b5 100644
--- a/apps/server/src/peer/PeerMcpClient.ts
+++ b/apps/server/src/peer/PeerMcpClient.ts
@@ -90,6 +90,11 @@ const linkedEnvironmentsOffThere = new OrchestratorMcpFailure({
     "The linked environment has Linked environments turned off. Turn it on in its Settings → Labs.",
 });
 
+const stoppedAnswering = new OrchestratorMcpFailure({
+  code: "orchestration_error",
+  message: "The linked environment stopped answering.",
+});
+
 /** The body of an MCP response: JSON, or a single server-sent event carrying JSON. */
 const responseJson = (contentType: string | undefined, text: string) =>
   contentType?.includes("text/event-stream") === true
@@ -119,45 +124,45 @@ const make = Effect.gen(function* () {
       ),
     );
 
-  const openSession = Effect.fn("PeerMcpClient.openSession")(function* (
-    url: string,
-    token: string,
-    limitHeader: Record<string, string>,
-  ) {
-    const initialized = yield* post(
-      url,
-      token,
-      {
-        jsonrpc: "2.0",
-        id: 0,
-        method: "initialize",
-        params: {
-          protocolVersion: PROTOCOL_VERSION,
-          capabilities: {},
-          clientInfo: { name: "t3code-peer", version: "1" },
+  const openSession = Effect.fn("PeerMcpClient.openSession")(
+    function* (url: string, token: string, limitHeader: Record<string, string>) {
+      const initialized = yield* post(
+        url,
+        token,
+        {
+          jsonrpc: "2.0",
+          id: 0,
+          method: "initialize",
+          params: {
+            protocolVersion: PROTOCOL_VERSION,
+            capabilities: {},
+            clientInfo: { name: "t3code-peer", version: "1" },
+          },
         },
-      },
-      limitHeader,
-    );
-    const sessionId = initialized.headers["mcp-session-id"];
-    if (initialized.status === 403) return yield* linkedEnvironmentsOffThere;
-    if (initialized.status !== 200 || sessionId === undefined) {
-      return yield* new OrchestratorMcpFailure({
-        code: initialized.status === 401 ? "capability_denied" : "orchestration_error",
-        message:
-          initialized.status === 401
-            ? "The linked environment no longer accepts this link. It may have been revoked there; link it again."
-            : `The linked environment refused to start an MCP session (HTTP ${initialized.status}).`,
-      });
-    }
-    yield* post(
-      url,
-      token,
-      { jsonrpc: "2.0", method: "notifications/initialized" },
-      { ...limitHeader, "mcp-session-id": sessionId, "mcp-protocol-version": PROTOCOL_VERSION },
-    );
-    return sessionId;
-  });
+        limitHeader,
+      );
+      const sessionId = initialized.headers["mcp-session-id"];
+      if (initialized.status === 403) return yield* linkedEnvironmentsOffThere;
+      if (initialized.status !== 200 || sessionId === undefined) {
+        return yield* new OrchestratorMcpFailure({
+          code: initialized.status === 401 ? "capability_denied" : "orchestration_error",
+          message:
+            initialized.status === 401
+              ? "The linked environment no longer accepts this link. It may have been revoked there; link it again."
+              : `The linked environment refused to start an MCP session (HTTP ${initialized.status}).`,
+        });
+      }
+      yield* post(
+        url,
+        token,
+        { jsonrpc: "2.0", method: "notifications/initialized" },
+        { ...limitHeader, "mcp-session-id": sessionId, "mcp-protocol-version": PROTOCOL_VERSION },
+      );
+      return sessionId;
+    },
+    // Only the handshake is bounded: a forwarded tool call may wait for minutes.
+    (effect, url) => Effect.timeout(effect, PeerLinks.probeTimeout(url)),
+  );
 
   const call: PeerMcpClient["Service"]["call"] = Effect.fn("PeerMcpClient.call")(
     function* (input) {
@@ -285,13 +290,8 @@ const make = Effect.gen(function* () {
         Effect.tap(() => links.recordOutcome(input.environmentId, { error: null })),
         // Recorded above with the transport's own message; the agent hears it plainly.
         Effect.catchTags({
-          HttpClientError: () =>
-            Effect.fail(
-              new OrchestratorMcpFailure({
-                code: "orchestration_error",
-                message: "The linked environment stopped answering.",
-              }),
-            ),
+          HttpClientError: () => Effect.fail(stoppedAnswering),
+          TimeoutError: () => Effect.fail(stoppedAnswering),
         }),
         Effect.flatMap(Effect.fromResult),
       ),
diff --git a/apps/server/src/peer/RemoteDelegation.test.ts b/apps/server/src/peer/RemoteDelegation.test.ts
index 8cad52282978..6d09b6b1b3a6 100644
--- a/apps/server/src/peer/RemoteDelegation.test.ts
+++ b/apps/server/src/peer/RemoteDelegation.test.ts
@@ -6,6 +6,7 @@ import {
   CommandId,
   EventId,
   MessageId,
+  type ModelSelection,
   NodeId,
   type OrchestrationV2Run,
   ProjectId,
@@ -468,6 +469,7 @@ const boxToolkitLayer = (thread: BoxThread) => {
             options.itemId === undefined &&
             matching.length > 0 &&
             visible.some((entry) => entry.position > matching.at(-1)!.position),
+          hasEarlier: false,
         };
       }),
     interruptThread: (input) =>
@@ -744,7 +746,10 @@ const parentScope: McpInvocationContext.McpInvocationScope = {
 };
 
 /** The laptop's parent thread, mid-turn when its agent delegates. */
-const seedParent = (laptopEnv: Effect.Success<ReturnType<typeof makeLaptop>>) =>
+const seedParent = (
+  laptopEnv: Effect.Success<ReturnType<typeof makeLaptop>>,
+  parentModelSelection: ModelSelection = modelSelection,
+) =>
   Effect.gen(function* () {
     const now = yield* DateTime.now;
     const providerThreadId = ProviderThreadId.make("provider-thread:laptop-parent");
@@ -756,7 +761,7 @@ const seedParent = (laptopEnv: Effect.Success<ReturnType<typeof makeLaptop>>) =>
       threadId: parentThreadId,
       projectId: ProjectId.make("project:laptop"),
       title: "Laptop parent",
-      modelSelection,
+      modelSelection: parentModelSelection,
       runtimeMode: "full-access",
       interactionMode: "default",
       branch: null,
@@ -830,7 +835,7 @@ const seedParent = (laptopEnv: Effect.Success<ReturnType<typeof makeLaptop>>) =>
             threadId: parentThreadId,
             ordinal: 1,
             providerInstanceId: instanceId,
-            modelSelection,
+            modelSelection: parentModelSelection,
             providerThreadId,
             userMessageId: MessageId.make("message:seed-user:laptop-parent"),
             rootNodeId: parentRootNode,
@@ -1191,16 +1196,24 @@ it.effect("a task named only by environment inherits the parent's model, within
       const a = yield* makeLaptop(database, offers);
       // The parent runs with full access; the link allows less.
       yield* linkTo(a.links, b, "auto-accept-edits");
-      yield* seedParent(a);
+      // An explicit Standard must survive, or a Daybreak default there would replace it.
+      const parentModelSelection = {
+        ...modelSelection,
+        options: [
+          { id: "reasoningEffort", value: "high" },
+          { id: "cyberAccessProgram", value: "standard" },
+        ],
+      };
+      yield* seedParent(a, parentModelSelection);
 
       const result = yield* a.call("delegate_task", {
         task: "Run the suite on the box.",
         target: { environmentId: box.environmentId },
       });
       expect(result.isError, JSON.stringify(result.content)).toBe(false);
-      // The parent's model, and the link's modes rather than the parent's.
+      // The parent's model and options, and the link's modes rather than the parent's.
       expect(yield* Ref.get(thread.launchedWith)).toEqual({
-        modelSelection,
+        modelSelection: parentModelSelection,
         runtimeMode: "auto-accept-edits",
         interactionMode: "default",
       });
diff --git a/apps/server/src/peer/RemoteDelegation.ts b/apps/server/src/peer/RemoteDelegation.ts
index a5790332ebc6..3b01c48b01db 100644
--- a/apps/server/src/peer/RemoteDelegation.ts
+++ b/apps/server/src/peer/RemoteDelegation.ts
@@ -613,6 +613,7 @@ const make = Effect.gen(function* () {
         view: failed ? "activity" : "messages",
         limit: 100,
         runLimit: 50,
+        maxCharsPerItem: 20_000,
         ...(afterPosition === undefined ? {} : { afterPosition }),
       });
       run ??= read.recentRuns.find((candidate) => candidate.runId === runId);
@@ -638,7 +639,7 @@ const make = Effect.gen(function* () {
         threadId: remote.threadId,
         itemId: reply.itemId,
         textOffset,
-        maxCharsPerItem: 50_000,
+        maxCharsPerItem: 20_000,
       });
       const part = rest.items[0];
       if (part === undefined) break;
diff --git a/apps/server/src/persistence/DatabaseMaintenance.test.ts b/apps/server/src/persistence/DatabaseMaintenance.test.ts
index 533a31b40446..2621d366c04a 100644
--- a/apps/server/src/persistence/DatabaseMaintenance.test.ts
+++ b/apps/server/src/persistence/DatabaseMaintenance.test.ts
@@ -28,7 +28,7 @@ it.layer(DatabaseMaintenance.layer.pipe(Layer.provideMerge(NodeServices.layer)))
         yield* fs.writeFileString(dbPath, "not a database");
         const failure = yield* Effect.flip(maintenance.inspect(dbPath));
         assert.equal(failure._tag, "DatabaseInspectError");
-      }).pipe(Effect.scoped),
+      }),
     );
 
     it.effect("reports and deletes only the database from before 0.1.0", () =>
@@ -98,7 +98,7 @@ it.layer(DatabaseMaintenance.layer.pipe(Layer.provideMerge(NodeServices.layer)))
           assert.deepEqual(yield* sql`SELECT value FROM retained_data`, [{ value: "keep" }]);
         }).pipe(Effect.provide(NodeSqliteClient.layer({ filename: dbPath, readonly: true })));
         assert.isNull((yield* maintenance.inspect(dbPath)).legacyDatabaseBytes);
-      }).pipe(Effect.scoped),
+      }),
     );
 
     it.effect("runs a repair requested from Settings once and keeps its failure for Settings", () =>
@@ -153,7 +153,7 @@ it.layer(DatabaseMaintenance.layer.pipe(Layer.provideMerge(NodeServices.layer)))
           yield* fs.readFileString(broken.failure),
           new DatabaseMaintenance.DatabaseCompactError({ path: brokenPath, cause: null }).message,
         );
-      }).pipe(Effect.scoped),
+      }),
     );
 
     it.effect("refuses a repair whose copies would not fit on disk", () =>
@@ -169,7 +169,7 @@ it.layer(DatabaseMaintenance.layer.pipe(Layer.provideMerge(NodeServices.layer)))
         const shortfall = yield* DatabaseMaintenance.reclaimSpaceShortfall(dbPath, huge);
         assert.isAtLeast(shortfall?.neededBytes ?? 0, huge);
         assert.isBelow(shortfall?.freeBytes ?? Infinity, huge);
-      }).pipe(Effect.scoped),
+      }),
     );
 
     it.effect("compacts an existing database offline only once its server has stopped", () =>
@@ -260,7 +260,7 @@ it.layer(DatabaseMaintenance.layer.pipe(Layer.provideMerge(NodeServices.layer)))
             [{ messageId: "message-1" }],
           );
         }).pipe(Effect.provide(NodeSqliteClient.layer({ filename: dbPath, readonly: true })));
-      }).pipe(Effect.scoped),
+      }),
     );
   },
 );
diff --git a/apps/server/src/persistence/DatabaseMaintenance.ts b/apps/server/src/persistence/DatabaseMaintenance.ts
index 79580761090d..07f2bdeecec6 100644
--- a/apps/server/src/persistence/DatabaseMaintenance.ts
+++ b/apps/server/src/persistence/DatabaseMaintenance.ts
@@ -28,9 +28,17 @@ export class DatabaseMissingError extends Schema.TaggedError<DatabaseMissingErro
 
 export class DatabaseInUseError extends Schema.TaggedError<DatabaseInUseError>()(
   "DatabaseInUseError",
-  { path: Schema.String, cause: Schema.Defect() },
+  {
+    path: Schema.String,
+    cause: Schema.Defect(),
+    pid: Schema.optional(Schema.Int),
+    serviceManaged: Schema.optional(Schema.Boolean),
+  },
 ) {
   override get message() {
+    if (this.pid !== undefined) {
+      return `Stop T3 Code server process ${this.pid}${this.serviceManaged ? "" : ", which the background service did not start,"} before repairing the database.`;
+    }
     return "Stop the T3 Code server and desktop app, including any version before 0.1.0, before repairing the database.";
   }
 }
diff --git a/apps/server/src/persistence/Migrations.test.ts b/apps/server/src/persistence/Migrations.test.ts
index 4ab9c86aa10b..64705e4bbb8f 100644
--- a/apps/server/src/persistence/Migrations.test.ts
+++ b/apps/server/src/persistence/Migrations.test.ts
@@ -151,6 +151,22 @@ describe("runMigrations", () => {
     }).pipe(Effect.provide(NodeSqliteClient.layer({ filename: ":memory:" }))),
   );
 
+  it.effect("keeps the migrations that finished before a later one failed", () =>
+    Effect.gen(function* () {
+      const sql = yield* SqlClient.SqlClient;
+      yield* runMigrations({ toMigrationInclusive: 81 });
+      yield* sql`CREATE TABLE orchestration_v2_projection_turn_item_counts (thread_id TEXT)`;
+
+      const exit = yield* Effect.exit(runMigrations());
+
+      assert.isTrue(Exit.isFailure(exit));
+      assert.deepStrictEqual(
+        yield* history,
+        migrationManifest.filter(([id]) => id <= 84),
+      );
+    }).pipe(Effect.provide(NodeSqliteClient.layer({ filename: ":memory:" }))),
+  );
+
   it.effect("reapplies peer link migrations whose ledger rows are missing", () =>
     Effect.gen(function* () {
       const sql = yield* SqlClient.SqlClient;
diff --git a/apps/server/src/persistence/Migrations.ts b/apps/server/src/persistence/Migrations.ts
index 37b74d5c6db0..c076c0119d2f 100644
--- a/apps/server/src/persistence/Migrations.ts
+++ b/apps/server/src/persistence/Migrations.ts
@@ -1,6 +1,11 @@
 import * as Migrator from "effect/sql/Migrator";
 import * as Effect from "effect/Effect";
 import * as SqlClient from "effect/sql/SqlClient";
+import {
+  DATABASE_MIGRATION_PROGRESS_MESSAGE,
+  DATABASE_MIGRATIONS_FINISHED_MESSAGE,
+  DATABASE_MIGRATIONS_STARTED_MESSAGE,
+} from "@t3tools/shared/databaseMigrationLog";
 import { reconcileV2PreviewMigration } from "./reconcileV2PreviewMigration.ts";
 
 import Migration0001 from "./Migrations/001_OrchestrationEvents.ts";
@@ -88,6 +93,10 @@ import Migration0082 from "./Migrations/082_TurnItemConversationIndex.ts";
 import Migration0083 from "./Migrations/083_CommandReadIndexes.ts";
 import Migration0084 from "./Migrations/084_LastExecutedRunIndex.ts";
 import Migration0085 from "./Migrations/085_TurnItemCounts.ts";
+import Migration0086 from "./Migrations/086_QueuedTurnInputIndex.ts";
+import Migration0087 from "./Migrations/087_ProjectionProjectsCustomTitle.ts";
+import Migration0088 from "./Migrations/088_TurnItemTypeStatusIndex.ts";
+import Migration0089 from "./Migrations/089_ShellThreadReadIndexes.ts";
 
 const migrationEntries = [
   [1, "OrchestrationEvents", Migration0001],
@@ -176,6 +185,10 @@ const migrationEntries = [
   [83, "CommandReadIndexes", Migration0083],
   [84, "LastExecutedRunIndex", Migration0084],
   [85, "TurnItemCounts", Migration0085],
+  [86, "QueuedTurnInputIndex", Migration0086],
+  [87, "ProjectionProjectsCustomTitle", Migration0087],
+  [88, "TurnItemTypeStatusIndex", Migration0088],
+  [89, "ShellThreadReadIndexes", Migration0089],
 ] as const;
 
 export const migrationManifest = migrationEntries.map(([id, name]) => [id, name] as const);
@@ -262,22 +275,48 @@ export interface RunMigrationsOptions {
 export const runMigrations = Effect.fn("runMigrations")(function* ({
   toMigrationInclusive,
 }: RunMigrationsOptions = {}) {
+  // The desktop waits past its readiness budget until the finished line follows this one.
+  if (yield* hasPendingMigrations()) yield* Effect.log(DATABASE_MIGRATIONS_STARTED_MESSAGE);
   const includesV2 =
     toMigrationInclusive === undefined || toMigrationInclusive >= FIRST_V2_MIGRATION_ID;
   const previewMigrations = includesV2 ? yield* reconcileV2PreviewMigration() : [];
   if (includesV2) {
     yield* assertV2MigrationsCanRun(toMigrationInclusive);
   }
-  const executedMigrations = [
-    ...previewMigrations,
-    ...(yield* run({ loader: makeMigrationLoader(toMigrationInclusive) })),
-  ];
+  const sql = yield* SqlClient.SqlClient;
+  const ledger = yield* sql`
+    SELECT name FROM sqlite_master WHERE type = 'table' AND name = 'effect_sql_migrations'
+  `;
+  const [latest] =
+    ledger.length === 0
+      ? []
+      : yield* sql<{
+          readonly id: number | null;
+        }>`SELECT MAX(migration_id) AS id FROM effect_sql_migrations`;
+  const latestRecordedId = latest?.id ?? 0;
+  const pending = migrationEntries.filter(
+    ([id]) =>
+      id > latestRecordedId && (toMigrationInclusive === undefined || id <= toMigrationInclusive),
+  );
+  // One transaction per migration: an index build on a large database can take minutes, and a
+  // restart then resumes after the last finished migration instead of rolling all of them back.
+  const executedMigrations: Array<readonly [id: number, name: string]> = [...previewMigrations];
+  for (const [index, [id, name]] of pending.entries()) {
+    if (latestRecordedId > 0) {
+      yield* Effect.log(DATABASE_MIGRATION_PROGRESS_MESSAGE).pipe(
+        Effect.annotateLogs({
+          migration: `${id}_${name}`,
+          progress: `${index + 1} of ${pending.length}`,
+        }),
+      );
+    }
+    executedMigrations.push(...(yield* run({ loader: makeMigrationLoader(id) })));
+  }
   const migrations = executedMigrations.map(([id, name]) => `${id}_${name}`);
   yield* migrations.length === 0
     ? Effect.logDebug("Database schema is current")
-    : Effect.log("Migrations ran successfully").pipe(Effect.annotateLogs({ migrations }));
+    : Effect.log(DATABASE_MIGRATIONS_FINISHED_MESSAGE).pipe(Effect.annotateLogs({ migrations }));
 
-  const sql = yield* SqlClient.SqlClient;
   const recorded = yield* sql<{
     readonly migration_id: number;
     readonly name: string;
diff --git a/apps/server/src/persistence/Migrations/064_CanonicalizeThreadPullRequestLinks.test.ts b/apps/server/src/persistence/Migrations/064_CanonicalizeThreadPullRequestLinks.test.ts
index b53309c187ed..3bdb3159213d 100644
--- a/apps/server/src/persistence/Migrations/064_CanonicalizeThreadPullRequestLinks.test.ts
+++ b/apps/server/src/persistence/Migrations/064_CanonicalizeThreadPullRequestLinks.test.ts
@@ -123,9 +123,36 @@ layer("064_CanonicalizeThreadPullRequestLinks", (it) => {
           'user', ${v1Payload}, '{}', 1)
       `;
 
+      yield* sql`
+        INSERT INTO orchestration_v2_projection_threads (
+          thread_id, project_id, title, default_provider, runtime_mode, interaction_mode,
+          created_at, updated_at, payload_json
+        ) VALUES (
+          'damaged', 'project-1', 'damaged', 'codex', 'full-access', 'default',
+          ${updatedAt}, ${updatedAt}, ''
+        )
+      `;
+      yield* sql`
+        INSERT INTO orchestration_events (
+          event_id, aggregate_kind, stream_id, stream_version, event_type, occurred_at,
+          actor_kind, payload_json, metadata_json, application_event_version
+        ) VALUES ('event:damaged', 'thread', 'damaged', 0, 'thread.created', ${updatedAt},
+          'user', '', '{}', 2)
+      `;
+
       assert.deepEqual(yield* runMigrations({ toMigrationInclusive: 64 }), [
         [64, "CanonicalizeThreadPullRequestLinks"],
       ]);
+      const [damagedThread] = yield* sql<{ readonly payload_json: string }>`
+        SELECT payload_json FROM orchestration_v2_projection_threads WHERE thread_id = 'damaged'
+      `;
+      const [damagedEvent] = yield* sql<{ readonly payload_json: string }>`
+        SELECT payload_json FROM orchestration_events WHERE event_id = 'event:damaged'
+      `;
+      assert.equal(damagedThread?.payload_json, "");
+      assert.equal(damagedEvent?.payload_json, "");
+      yield* sql`DELETE FROM orchestration_v2_projection_threads WHERE thread_id = 'damaged'`;
+      yield* sql`DELETE FROM orchestration_events WHERE event_id = 'event:damaged'`;
       assert.deepEqual(yield* runMigrations({ toMigrationInclusive: 64 }), []);
       const rows = yield* sql<{ readonly thread_id: string; readonly payload_json: string }>`
         SELECT thread_id, payload_json FROM orchestration_v2_projection_threads
diff --git a/apps/server/src/persistence/Migrations/064_CanonicalizeThreadPullRequestLinks.ts b/apps/server/src/persistence/Migrations/064_CanonicalizeThreadPullRequestLinks.ts
index 9364a8d817c4..a4d8fb9e7a01 100644
--- a/apps/server/src/persistence/Migrations/064_CanonicalizeThreadPullRequestLinks.ts
+++ b/apps/server/src/persistence/Migrations/064_CanonicalizeThreadPullRequestLinks.ts
@@ -34,6 +34,7 @@ export default Effect.gen(function* () {
         updated_at
       FROM orchestration_v2_projection_threads
       WHERE thread_id > ${afterThreadId}
+        AND json_valid(payload_json)
         AND json_type(payload_json, '$.pullRequests') IS NULL
         AND json_type(payload_json, '$.linkedPullRequest') = 'object'
       ORDER BY thread_id
@@ -65,6 +66,7 @@ export default Effect.gen(function* () {
       WHERE sequence > ${afterSequence}
         AND application_event_version = 2 AND aggregate_kind = 'thread'
         AND event_type LIKE 'thread.%'
+        AND json_valid(payload_json)
         AND json_type(payload_json, '$.pullRequests') IS NULL
         AND json_type(payload_json, '$.linkedPullRequest') = 'object'
       ORDER BY sequence
diff --git a/apps/server/src/persistence/Migrations/086_QueuedTurnInputIndex.ts b/apps/server/src/persistence/Migrations/086_QueuedTurnInputIndex.ts
new file mode 100644
index 000000000000..55480532949c
--- /dev/null
+++ b/apps/server/src/persistence/Migrations/086_QueuedTurnInputIndex.ts
@@ -0,0 +1,13 @@
+import * as Effect from "effect/Effect";
+import * as SqlClient from "effect/sql/SqlClient";
+
+export default Effect.gen(function* () {
+  const sql = yield* SqlClient.SqlClient;
+
+  // Shell counts subtract held input without reading a run's tool history or item payloads.
+  yield* sql`
+    CREATE INDEX orchestration_v2_projection_turn_items_queued_input_idx
+    ON orchestration_v2_projection_turn_items(run_id)
+    WHERE type = 'user_message' AND json_extract(payload_json, '$.inputIntent') = 'queued_turn'
+  `;
+});
diff --git a/apps/server/src/persistence/Migrations/087_ProjectionProjectsCustomTitle.test.ts b/apps/server/src/persistence/Migrations/087_ProjectionProjectsCustomTitle.test.ts
new file mode 100644
index 000000000000..ca3d887a6cd1
--- /dev/null
+++ b/apps/server/src/persistence/Migrations/087_ProjectionProjectsCustomTitle.test.ts
@@ -0,0 +1,41 @@
+import { assert, it } from "@effect/vitest";
+import * as NodeSqliteClient from "@t3tools/shared/nodeSqliteClient";
+import * as Effect from "effect/Effect";
+import * as SqlClient from "effect/sql/SqlClient";
+
+import { runMigrations } from "../Migrations.ts";
+
+const layer = it.layer(NodeSqliteClient.layer({ filename: ":memory:" }));
+
+layer("087_ProjectionProjectsCustomTitle", (it) => {
+  it.effect("marks projects with a recorded title update as renamed", () =>
+    Effect.gen(function* () {
+      const sql = yield* SqlClient.SqlClient;
+      yield* runMigrations({ toMigrationInclusive: 86 });
+      for (const projectId of ["renamed", "untouched"]) {
+        yield* sql`
+          INSERT INTO projection_projects
+            (project_id, title, workspace_root, scripts_json, created_at, updated_at)
+          VALUES (${projectId}, 'repo', ${"/tmp/" + projectId}, '[]', '2026-10-01', '2026-10-01')
+        `;
+        yield* sql`
+          INSERT INTO orchestration_events
+            (event_id, aggregate_kind, stream_id, stream_version, event_type, occurred_at,
+             actor_kind, payload_json, metadata_json, application_event_version)
+          VALUES (${projectId}, 'project', ${projectId}, 1, 'project.meta-updated', '2026-10-01',
+            'client', ${JSON.stringify(projectId === "renamed" ? { title: "repo" } : { autoPull: true })}, '{}', 2)
+        `;
+      }
+      // Builds of this change before renumbering already added the column.
+      yield* sql`ALTER TABLE projection_projects ADD COLUMN has_custom_title INTEGER NOT NULL DEFAULT 0`;
+      yield* runMigrations();
+      assert.deepStrictEqual(
+        yield* sql`SELECT project_id, has_custom_title FROM projection_projects ORDER BY project_id`,
+        [
+          { project_id: "renamed", has_custom_title: 1 },
+          { project_id: "untouched", has_custom_title: 0 },
+        ],
+      );
+    }),
+  );
+});
diff --git a/apps/server/src/persistence/Migrations/087_ProjectionProjectsCustomTitle.ts b/apps/server/src/persistence/Migrations/087_ProjectionProjectsCustomTitle.ts
new file mode 100644
index 000000000000..c193137e79c3
--- /dev/null
+++ b/apps/server/src/persistence/Migrations/087_ProjectionProjectsCustomTitle.ts
@@ -0,0 +1,26 @@
+import * as Effect from "effect/Effect";
+import * as SqlClient from "effect/sql/SqlClient";
+
+export default Effect.gen(function* () {
+  const sql = yield* SqlClient.SqlClient;
+  // Earlier builds of this change shipped the column under another migration id.
+  const columns = yield* sql<{ readonly name: string }>`
+    PRAGMA table_info(projection_projects)
+  `;
+  if (!columns.some((column) => column.name === "has_custom_title")) {
+    yield* sql`
+      ALTER TABLE projection_projects
+      ADD COLUMN has_custom_title INTEGER NOT NULL DEFAULT 0
+    `;
+  }
+  yield* sql`
+    UPDATE projection_projects
+    SET has_custom_title = 1
+    WHERE project_id IN (
+      SELECT stream_id FROM orchestration_events
+      WHERE aggregate_kind = 'project'
+        AND event_type = 'project.meta-updated'
+        AND json_type(payload_json, '$.title') = 'text'
+    )
+  `;
+});
diff --git a/apps/server/src/persistence/Migrations/088_TurnItemTypeStatusIndex.ts b/apps/server/src/persistence/Migrations/088_TurnItemTypeStatusIndex.ts
new file mode 100644
index 000000000000..09e0b3273d6c
--- /dev/null
+++ b/apps/server/src/persistence/Migrations/088_TurnItemTypeStatusIndex.ts
@@ -0,0 +1,13 @@
+import * as Effect from "effect/Effect";
+import * as SqlClient from "effect/sql/SqlClient";
+
+export default Effect.gen(function* () {
+  const sql = yield* SqlClient.SqlClient;
+
+  // Typed reads of tool items (Stop's active-item read) otherwise walk every item of the thread.
+  // Status keeps an active-item read from fetching every settled row to reject it.
+  yield* sql`
+    CREATE INDEX IF NOT EXISTS orchestration_v2_projection_turn_items_thread_type_idx
+    ON orchestration_v2_projection_turn_items(thread_id, type, status)
+  `;
+});
diff --git a/apps/server/src/persistence/Migrations/089_ShellThreadReadIndexes.ts b/apps/server/src/persistence/Migrations/089_ShellThreadReadIndexes.ts
new file mode 100644
index 000000000000..25133aa84be6
--- /dev/null
+++ b/apps/server/src/persistence/Migrations/089_ShellThreadReadIndexes.ts
@@ -0,0 +1,26 @@
+import * as Effect from "effect/Effect";
+import * as SqlClient from "effect/sql/SqlClient";
+
+export default Effect.gen(function* () {
+  const sql = yield* SqlClient.SqlClient;
+
+  // Keep these expressions identical to ProjectionStore's shell worktree and family filters.
+  // json_valid keeps a malformed payload writable, as the other payload indexes do.
+  yield* sql`
+    CREATE INDEX IF NOT EXISTS orchestration_v2_projection_threads_worktree_path_idx
+    ON orchestration_v2_projection_threads(
+      CASE WHEN json_valid(payload_json) THEN json_extract(payload_json, '$.worktreePath') END
+    )
+  `;
+  yield* sql`
+    CREATE INDEX IF NOT EXISTS orchestration_v2_projection_threads_root_thread_idx
+    ON orchestration_v2_projection_threads(
+      CASE WHEN json_valid(payload_json) THEN json_extract(payload_json, '$.lineage.rootThreadId') END
+    )
+  `;
+  // Shell item counts read only a run's status; the primary key would load the whole row.
+  yield* sql`
+    CREATE INDEX IF NOT EXISTS orchestration_v2_projection_runs_run_status_idx
+    ON orchestration_v2_projection_runs(run_id, status)
+  `;
+});
diff --git a/apps/server/src/persistence/OrchestrationEventStore.test.ts b/apps/server/src/persistence/OrchestrationEventStore.test.ts
index baad3d5c52a0..df6382a8b4f8 100644
--- a/apps/server/src/persistence/OrchestrationEventStore.test.ts
+++ b/apps/server/src/persistence/OrchestrationEventStore.test.ts
@@ -38,69 +38,67 @@ const layer = it.layer(layerTest);
 
 layer("OrchestrationEventStore", (it) => {
   it.effect("retains only shell metadata from oversized replay and live application events", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const store = yield* OrchestrationEventStore.OrchestrationEventStore;
-        const afterSequence = yield* store.latestApplicationSequence;
-        const now = yield* DateTime.now;
-        const threadId = ThreadId.make("thread:large-shell-body");
-        const input = "x".repeat(9 * 1024 * 1024);
-        const event: OrchestrationV2DomainEvent = {
-          id: EventId.make("event:large-shell-body:replay"),
-          type: "turn-item.updated",
+    Effect.gen(function* () {
+      const store = yield* OrchestrationEventStore.OrchestrationEventStore;
+      const afterSequence = yield* store.latestApplicationSequence;
+      const now = yield* DateTime.now;
+      const threadId = ThreadId.make("thread:large-shell-body");
+      const input = "x".repeat(9 * 1024 * 1024);
+      const event: OrchestrationV2DomainEvent = {
+        id: EventId.make("event:large-shell-body:replay"),
+        type: "turn-item.updated",
+        threadId,
+        occurredAt: now,
+        payload: {
+          id: TurnItemId.make("tool:large-shell-body"),
+          type: "command_execution",
           threadId,
-          occurredAt: now,
-          payload: {
-            id: TurnItemId.make("tool:large-shell-body"),
-            type: "command_execution",
-            threadId,
-            runId: null,
-            nodeId: null,
-            providerThreadId: null,
-            providerTurnId: null,
-            nativeItemRef: null,
-            parentItemId: null,
-            ordinal: 1,
-            status: "running",
-            title: "Large command",
-            input,
-            startedAt: now,
-            completedAt: null,
-            updatedAt: now,
+          runId: null,
+          nodeId: null,
+          providerThreadId: null,
+          providerTurnId: null,
+          nativeItemRef: null,
+          parentItemId: null,
+          ordinal: 1,
+          status: "running",
+          title: "Large command",
+          input,
+          startedAt: now,
+          completedAt: null,
+          updatedAt: now,
+        },
+      };
+      const [replayed] = yield* store.appendAgentEvents({ events: [event] });
+      const pull = yield* Stream.toPull(
+        store.streamProjectedApplicationEvents({
+          afterSequence,
+          project: toShellApplicationEvent,
+        }),
+      );
+      assert.deepEqual(yield* pull, [{ sequence: replayed!.sequence, event: { threadId } }]);
+      const [live] = yield* store.appendAgentEvents({
+        events: [
+          {
+            ...event,
+            id: EventId.make("event:large-shell-body:live"),
+            payload: { ...event.payload, status: "completed", completedAt: now },
           },
-        };
-        const [replayed] = yield* store.appendAgentEvents({ events: [event] });
-        const pull = yield* Stream.toPull(
-          store.streamProjectedApplicationEvents({
-            afterSequence,
-            project: toShellApplicationEvent,
-          }),
-        );
-        assert.deepEqual(yield* pull, [{ sequence: replayed!.sequence, event: { threadId } }]);
-        const [live] = yield* store.appendAgentEvents({
-          events: [
-            {
-              ...event,
-              id: EventId.make("event:large-shell-body:live"),
-              payload: { ...event.payload, status: "completed", completedAt: now },
-            },
-          ],
-        });
-        yield* store.publishCommitted([live!]);
-        assert.deepEqual(yield* pull, [{ sequence: live!.sequence, event: { threadId } }]);
-        const durable = yield* store
-          .readAgentEvents({ threadId, afterSequence })
-          .pipe(Stream.runCollect);
-        assert.lengthOf(durable, 2);
-        for (const stored of durable) {
-          assert.equal(stored.event.type, "turn-item.updated");
-          if (stored.event.type !== "turn-item.updated") return;
-          assert.equal(stored.event.payload.type, "command_execution");
-          if (stored.event.payload.type !== "command_execution") return;
-          assert.equal(stored.event.payload.input, input);
-        }
-      }),
-    ),
+        ],
+      });
+      yield* store.publishCommitted([live!]);
+      assert.deepEqual(yield* pull, [{ sequence: live!.sequence, event: { threadId } }]);
+      const durable = yield* store
+        .readAgentEvents({ threadId, afterSequence })
+        .pipe(Stream.runCollect);
+      assert.lengthOf(durable, 2);
+      for (const stored of durable) {
+        assert.equal(stored.event.type, "turn-item.updated");
+        if (stored.event.type !== "turn-item.updated") return;
+        assert.equal(stored.event.payload.type, "command_execution");
+        if (stored.event.payload.type !== "command_execution") return;
+        assert.equal(stored.event.payload.input, input);
+      }
+    }),
   );
 
   it.effect("stores an unchanged subagent prompt once and replays it on every update", () =>
diff --git a/apps/server/src/persistence/Sqlite.test.ts b/apps/server/src/persistence/Sqlite.test.ts
index c042ea9afa7a..b413f02d83f6 100644
--- a/apps/server/src/persistence/Sqlite.test.ts
+++ b/apps/server/src/persistence/Sqlite.test.ts
@@ -2,7 +2,6 @@
 import * as NodeFS from "node:fs";
 import * as NodeOS from "node:os";
 import * as NodePath from "node:path";
-import * as NodeSqlite from "node:sqlite";
 import type * as NodeWorkerThreads from "node:worker_threads";
 
 import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
@@ -23,90 +22,19 @@ import * as ServerOwnership from "../serverOwnership.ts";
 import { migrationManifest, runMigrations } from "./Migrations.ts";
 import * as SqlitePersistence from "./Sqlite.ts";
 
-const workers = vi.hoisted((): Array<NodeWorkerThreads.Worker> => []);
+const workerData = vi.hoisted((): Array<unknown> => []);
 
 vi.mock("node:worker_threads", async (importOriginal) => {
   const actual = await importOriginal<typeof NodeWorkerThreads>();
   class RecordedWorker extends actual.Worker {
     constructor(...args: ConstructorParameters<typeof actual.Worker>) {
       super(...args);
-      workers.push(this);
+      workerData.push(args[1]?.workerData);
     }
   }
   return { ...actual, Worker: RecordedWorker };
 });
 
-it.effect("keeps writes moving past a 48 MiB WAL while a reader retains its snapshot", () => {
-  const tempDir = NodeFS.mkdtempSync(NodePath.join(NodeOS.tmpdir(), "t3-sqlite-burst-"));
-  const dbPath = NodePath.join(tempDir, "state.sqlite");
-  const persistence = SqlitePersistence.layerFromPath(dbPath).pipe(
-    Layer.provide(NodeServices.layer),
-  );
-
-  return Effect.gen(function* () {
-    const sql = yield* SqlClient.SqlClient;
-    const checkpointWorker = workers.at(-1)!;
-    yield* sql`CREATE TABLE burst_probe(id INTEGER PRIMARY KEY, payload BLOB)`;
-    yield* sql`INSERT INTO burst_probe VALUES (1, NULL)`;
-    yield* sql`PRAGMA wal_checkpoint(TRUNCATE)`;
-    const reader = yield* Effect.acquireRelease(
-      Effect.sync(() => new NodeSqlite.DatabaseSync(dbPath, { readOnly: true })),
-      (database) => Effect.sync(() => database.close()),
-    );
-    reader.exec("BEGIN");
-    assert.equal(reader.prepare("SELECT COUNT(*) AS count FROM burst_probe").get()?.count, 1);
-
-    yield* sql.withTransaction(
-      sql`INSERT INTO burst_probe VALUES (2, zeroblob(${48 * 1024 * 1024}))`,
-    );
-    const state = yield* Effect.callback<{
-      readonly log: number;
-      readonly checkpointed: number;
-      readonly blocked: boolean;
-    }>((resume) => {
-      const onMessage = (message: {
-        readonly type?: string;
-        readonly log?: number;
-        readonly checkpointed?: number;
-        readonly blocked?: boolean;
-      }) => {
-        if (
-          message.type === "checkpoint" &&
-          typeof message.log === "number" &&
-          message.log > 10_000 &&
-          typeof message.checkpointed === "number" &&
-          typeof message.blocked === "boolean"
-        ) {
-          checkpointWorker.off("message", onMessage);
-          resume(
-            Effect.succeed({
-              log: message.log,
-              checkpointed: message.checkpointed,
-              blocked: message.blocked,
-            }),
-          );
-        }
-      };
-      checkpointWorker.on("message", onMessage);
-      checkpointWorker.ref();
-      // oxlint-disable-next-line unicorn/require-post-message-target-origin -- Node workers do not accept a target origin.
-      checkpointWorker.postMessage("barrier");
-      return Effect.sync(() => checkpointWorker.off("message", onMessage));
-    });
-    assert.isBelow(state.checkpointed, state.log);
-    assert.isFalse(state.blocked);
-
-    yield* sql.withTransaction(sql`INSERT INTO burst_probe VALUES (3, NULL)`);
-    assert.equal(reader.prepare("SELECT COUNT(*) AS count FROM burst_probe").get()?.count, 1);
-    reader.exec("COMMIT");
-    assert.equal(reader.prepare("SELECT COUNT(*) AS count FROM burst_probe").get()?.count, 3);
-  }).pipe(
-    Effect.scoped,
-    Effect.provide(persistence),
-    Effect.ensuring(Effect.sync(() => NodeFS.rmSync(tempDir, { recursive: true, force: true }))),
-  );
-});
-
 // Linux names an open, already-deleted file "<path> (deleted)" in /proc/self/fd.
 // SQLite names its temp files "etilqs_*" and, without TMPDIR, puts them in
 // /var/tmp while os.tmpdir() is /tmp, so match the name, not the directory.
@@ -192,6 +120,44 @@ it.effect("drops planner statistics a database already has", () => {
   );
 });
 
+it.effect("upgrades an existing database on a read-write worker connection", () => {
+  const tempDir = NodeFS.mkdtempSync(NodePath.join(NodeOS.tmpdir(), "t3-sqlite-upgrade-"));
+  const dbPath = NodePath.join(tempDir, "state.sqlite");
+
+  return Effect.gen(function* () {
+    yield* Effect.gen(function* () {
+      const sql = yield* SqlClient.SqlClient;
+      yield* sql`PRAGMA journal_mode = WAL;`;
+      yield* runMigrations({ toMigrationInclusive: 81 });
+    }).pipe(Effect.provide(NodeSqliteClient.layer({ filename: dbPath })));
+    const startedBefore = workerData.length;
+
+    yield* Effect.gen(function* () {
+      const sql = yield* SqlClient.SqlClient;
+      const rows = yield* sql<{ readonly migration_id: number; readonly name: string }>`
+        SELECT migration_id, name FROM effect_sql_migrations ORDER BY migration_id
+      `;
+      assert.deepStrictEqual(
+        rows.map((row) => [row.migration_id, row.name] as const),
+        migrationManifest,
+      );
+    }).pipe(
+      Effect.provide(
+        SqlitePersistence.layerFromPath(dbPath).pipe(Layer.provide(NodeServices.layer)),
+      ),
+    );
+    assert.deepInclude(workerData.slice(startedBefore), {
+      filename: dbPath,
+      readOnly: false,
+      requireWal: false,
+      allowExtension: false,
+      prepareCacheSize: 200,
+    });
+  }).pipe(
+    Effect.ensuring(Effect.sync(() => NodeFS.rmSync(tempDir, { recursive: true, force: true }))),
+  );
+});
+
 it.effect("names a database file that is not SQLite", () => {
   const tempDir = NodeFS.mkdtempSync(NodePath.join(NodeOS.tmpdir(), "t3-sqlite-notadb-"));
   const dbPath = NodePath.join(tempDir, "state.sqlite");
diff --git a/apps/server/src/persistence/Sqlite.ts b/apps/server/src/persistence/Sqlite.ts
index e8471f3f5989..d9506e31154f 100644
--- a/apps/server/src/persistence/Sqlite.ts
+++ b/apps/server/src/persistence/Sqlite.ts
@@ -77,12 +77,12 @@ const makeLayerSetup = <E, R>(migrate: Effect.Effect<unknown, E, R>) =>
       }>`SELECT COUNT(*) AS count FROM sqlite_schema WHERE type = 'table'`;
       if (tables[0]?.count === 0) yield* sql`PRAGMA auto_vacuum = INCREMENTAL;`;
       yield* sql`PRAGMA journal_mode = WAL;`;
-      // FULL fsyncs every event commit on the main thread; NORMAL syncs only at WAL checkpoints.
+      // FULL fsyncs every event commit; NORMAL syncs only at WAL checkpoints.
       // App crashes lose nothing; OS crashes or power loss can roll back post-checkpoint commits without corruption.
       yield* sql`PRAGMA synchronous = NORMAL;`;
       // macOS fsync misses drive caches; F_FULLFSYNC flushes them at checkpoints and is ignored elsewhere.
       yield* sql`PRAGMA checkpoint_fullfsync = ON;`;
-      // Keep statement journals and sort spills off the main thread's disk path.
+      // Keep statement journals and sort spills off the disk.
       // Large statements and open savepoints can increase peak memory use.
       yield* sql`PRAGMA temp_store = MEMORY;`;
       // PASSIVE checkpoints retain peak WAL size until the last connection closes.
@@ -100,19 +100,19 @@ const makeLayerSetup = <E, R>(migrate: Effect.Effect<unknown, E, R>) =>
 
 const layerSetup = makeLayerSetup(runMigrations());
 
-const makeLayerFromPath = <E, R>(setup: Layer.Layer<never, E, R>) =>
+const makeLayerFromPath = <E, R>(makeSetup: (dbPath: string) => Layer.Layer<never, E, R>) =>
   Effect.fn("makeSqlitePersistenceLive")(function* (dbPath: string) {
     const fs = yield* FileSystem.FileSystem;
     const path = yield* Path.Path;
     yield* fs.makeDirectory(path.dirname(dbPath), { recursive: true });
 
     return Layer.provideMerge(
-      setup,
+      makeSetup(dbPath),
       NodeSqliteClient.layer({
         filename: dbPath,
         readerWorker: true,
-        // Run checkpoint fsyncs off the event loop so slow disk flushes cannot stall clients.
-        checkpointWorker: true,
+        // A slow disk then delays writes instead of freezing every client.
+        writerWorker: true,
         spanAttributes: {
           "db.name": path.basename(dbPath),
           "service.name": "t3code-server",
@@ -132,7 +132,7 @@ const makeLayerFromPath = <E, R>(setup: Layer.Layer<never, E, R>) =>
     );
   }, Layer.unwrap);
 
-export const layerFromPath = makeLayerFromPath(layerSetup);
+export const layerFromPath = makeLayerFromPath(() => layerSetup);
 
 export const layerMemory = Layer.provideMerge(
   layerSetup,
@@ -154,5 +154,5 @@ export const layerConfig = makeLayerConfig(layerFromPath);
 
 /** For CLI commands: pending migrations run only while no server owns the T3 home. */
 export const layerCliConfig = makeLayerConfig(
-  makeLayerFromPath(makeLayerSetup(runMigrationsAsOwner())),
+  makeLayerFromPath(() => makeLayerSetup(runMigrationsAsOwner())),
 );
diff --git a/apps/server/src/persistence/reconcileV2PreviewMigration.test.ts b/apps/server/src/persistence/reconcileV2PreviewMigration.test.ts
index 3c2cb075cfab..d1158a15e2cb 100644
--- a/apps/server/src/persistence/reconcileV2PreviewMigration.test.ts
+++ b/apps/server/src/persistence/reconcileV2PreviewMigration.test.ts
@@ -65,6 +65,10 @@ describe("V2 preview upgrade", () => {
         [83, "CommandReadIndexes"],
         [84, "LastExecutedRunIndex"],
         [85, "TurnItemCounts"],
+        [86, "QueuedTurnInputIndex"],
+        [87, "ProjectionProjectsCustomTitle"],
+        [88, "TurnItemTypeStatusIndex"],
+        [89, "ShellThreadReadIndexes"],
       ]);
       assert.deepStrictEqual(yield* runMigrations(), []);
       assert.deepStrictEqual(yield* sql`SELECT * FROM orchestration_v2_legacy_imports`, imports);
@@ -173,6 +177,10 @@ describe("V2 preview upgrade", () => {
         [83, "CommandReadIndexes"],
         [84, "LastExecutedRunIndex"],
         [85, "TurnItemCounts"],
+        [86, "QueuedTurnInputIndex"],
+        [87, "ProjectionProjectsCustomTitle"],
+        [88, "TurnItemTypeStatusIndex"],
+        [89, "ShellThreadReadIndexes"],
       ]);
     }).pipe(Effect.provide(NodeSqliteClient.layer({ filename: ":memory:" }))),
   );
diff --git a/apps/server/src/preview/PreviewBrowser.ts b/apps/server/src/preview/PreviewBrowser.ts
index 50ba7b91c56f..203ec112cccb 100644
--- a/apps/server/src/preview/PreviewBrowser.ts
+++ b/apps/server/src/preview/PreviewBrowser.ts
@@ -25,31 +25,31 @@ import { openZipArchive } from "../zipArchive.ts";
 // https://googlechromelabs.github.io/chrome-for-testing/known-good-versions-with-downloads.json
 // Never pin below 156.0.8078.70: the shell has no CRLSet and older SPKI blocklists trust
 // compromised eMudhra intermediates (crrev.com/c/8627687).
-const VERSION = "157.0.8103.38";
+const VERSION = "157.0.8103.78";
 const ARCHIVES = {
   linux64: {
-    bytes: 128_168_542,
-    sha256: "deafffa74660b34853a4119c361fd427ac8c9fcb62db51ddb8a797cd83a4ba2d",
+    bytes: 127_965_683,
+    sha256: "f90329720fb61e5a76da9b6b509b6ad12a484c9c5df0359403e935177c6d153a",
   },
   "linux-arm64": {
-    bytes: 128_171_139,
-    sha256: "b9b910a57b2a15eb3e55000a2339f93a973934a413ebfc6e585a50ec6c42fd6c",
+    bytes: 128_047_138,
+    sha256: "912fbf877e53de34d7b3cca5104f3b95607d41bd35412ccc6cd2a599ff0c0dbf",
   },
   "mac-arm64": {
-    bytes: 104_773_711,
-    sha256: "e6a6b13551aa12f951d0891d79282606b13742837c8fa0505e1272bae116ce82",
+    bytes: 104_822_985,
+    sha256: "17bf66d53c1b1104dcb641c5b331cd4ac5d200c778f5feed0934a0b92deaf8d6",
   },
   "mac-x64": {
-    bytes: 110_442_262,
-    sha256: "79821745d0a72d2ba752d981284ed0a9e6fa320dad133596941a17dba6186de3",
+    bytes: 110_132_547,
+    sha256: "f1a6a9561eaf1f409849538de663695d36d72fbf1ebca4d42e47c7b5f2a157f3",
   },
   win32: {
-    bytes: 120_390_416,
-    sha256: "35e0d45c0136448f7b587f6fb7195a0686127a4dfdc23ef3b0e04b5e9ffe16cd",
+    bytes: 120_403_126,
+    sha256: "d9829c59dcc79d9e6e920f8ab841f2a9a055dcf54229d756ac0b42dfec303910",
   },
   win64: {
-    bytes: 126_513_060,
-    sha256: "1ff4540855478ba0848e03f1ef8d455f77d058b38285df91bc34273788a73446",
+    bytes: 126_047_001,
+    sha256: "2138c1583d25d6f3abec5269943b2f430207d87a539895aa9e90cc4697ec0e1f",
   },
 } as const;
 
diff --git a/apps/server/src/preview/ServerBrowser.test.ts b/apps/server/src/preview/ServerBrowser.test.ts
index a86dcc415c10..d0d8879656c9 100644
--- a/apps/server/src/preview/ServerBrowser.test.ts
+++ b/apps/server/src/preview/ServerBrowser.test.ts
@@ -14,15 +14,18 @@ import {
   ProviderInstanceId,
   ThreadId,
   type PreviewAutomationLoadError,
+  type PreviewAutomationResizeResult,
   type PreviewAutomationSnapshot,
   type PreviewAutomationStatus,
 } from "@t3tools/contracts";
+import * as Deferred from "effect/Deferred";
 import * as Effect from "effect/Effect";
 import * as Exit from "effect/Exit";
 import * as Scope from "effect/Scope";
 import * as Fiber from "effect/Fiber";
 import * as FileSystem from "effect/FileSystem";
 import * as Layer from "effect/Layer";
+import * as Logger from "effect/Logger";
 import * as Option from "effect/Option";
 import * as Path from "effect/Path";
 import * as PubSub from "effect/PubSub";
@@ -63,7 +66,7 @@ vi.mock("./ServerBrowserContexts.ts", () => ({
       return context as unknown as BrowserContext;
     }
     async scratchPage() {
-      return makeEncoderPage() as unknown as Page;
+      return encoderPageOverride ?? (makeEncoderPage() as unknown as Page);
     }
     async connectDesktopPage(endpoint: string) {
       const context = makeContext(undefined, desktopPageUrl);
@@ -111,6 +114,7 @@ function makeSession(
       if (method === "Page.getNavigationHistory") return { currentIndex: 0, entries: [{}] };
       if (method === "Page.getLayoutMetrics") return { cssVisualViewport: { pageX: 0, pageY: 0 } };
       if (method === "Page.captureScreenshot") {
+        if ((input as { format: string }).format === "jpeg" && heldStill) await heldStill();
         // A snapshot sizes its screenshot from the PNG header; viewers get JPEG frames as-is.
         return { data: (input as { format: string }).format === "png" ? PNG_HEADER : "ZnJhbWU=" };
       }
@@ -200,23 +204,26 @@ function makeContext(onClose?: (context: BrowserContext) => void, initialUrl = "
     mainFrame: () => page,
     frames: () => [page],
     url: () => url,
+    commit: (next: string) => {
+      url = next;
+    },
     title: vi.fn(async () => "test page"),
     viewportSize: vi.fn(() => viewport),
     setViewportSize: vi.fn(async (size: typeof viewport) => {
       viewport = size;
     }),
-    goto: vi.fn(async (next: string) => {
-      url = next;
-      events.emit("load");
+    goto: vi.fn(async (next: string, _options?: { timeout?: number; waitUntil?: string }) => {
       const pending = initialNavigation;
       initialNavigation = null;
       await pending?.();
+      url = next;
+      events.emit("load");
     }),
     goBack: vi.fn(async () => {}),
     goForward: vi.fn(async () => {}),
     reload: vi.fn(async () => {}),
     emulateMedia: vi.fn(async () => {}),
-    waitForLoadState: vi.fn(async () => {}),
+    waitForLoadState: vi.fn(async (_state?: string, _options?: { timeout?: number }) => {}),
     evaluate: vi.fn(async () => ({
       url,
       title: "test page",
@@ -353,12 +360,10 @@ function makeEncoderPage() {
     document: { createElement: (tag: string) => (tag === "video" ? video : canvas) },
     Path2D: function Path2D() {},
     MediaRecorder: FakeMediaRecorder,
-    createImageBitmap: async (blob: Blob) => ({
-      width: 1280,
-      height: 800,
-      pixels: await blob.text(),
-      close() {},
-    }),
+    createImageBitmap: async (blob: Blob) => {
+      await decodeGate?.promise;
+      return { width: 1280, height: 800, pixels: await blob.text(), close() {} };
+    },
     atob,
     btoa,
     Blob,
@@ -377,9 +382,12 @@ function makeEncoderPage() {
 }
 
 const contexts: ReturnType<typeof makeContext>[] = [];
+let encoderPageOverride: Page | undefined;
 const encoderStreams: Array<{ frameRate: number | undefined; bitsPerSecond: number }> = [];
+let decodeGate: PromiseWithResolvers<void> | null = null;
 const contextRequests: Array<{ profileId: string; isolated: boolean }> = [];
 let contextGate: PromiseWithResolvers<void> | null = null;
+let heldStill: (() => Promise<void>) | null = null;
 let pageCopy = "";
 let keyCopy = "";
 let focusedFrame: ReturnType<typeof makeFrame> | null = null;
@@ -560,9 +568,12 @@ const openDesktopViewer = Effect.gen(function* () {
 
 beforeEach(() => {
   contexts.length = 0;
+  encoderPageOverride = undefined;
   encoderStreams.length = 0;
+  decodeGate = null;
   contextRequests.length = 0;
   contextGate = null;
+  heldStill = null;
   contextFailure = null;
   pageSetupFailure = null;
   initialNavigation = null;
@@ -583,7 +594,7 @@ beforeEach(() => {
   desktopConnections.length = 0;
 });
 
-it.live("tells the desktop once per thread when its agent turns start and end", () =>
+it.effect("tells the desktop once per thread when its agent turns start and end", () =>
   Effect.gen(function* () {
     yield* ServerBrowser.ServerBrowser;
     const activity = yield* PreviewAgentActivity.PreviewAgentActivity;
@@ -605,7 +616,7 @@ it.live("tells the desktop once per thread when its agent turns start and end",
   }).pipe(Effect.scoped, Effect.provide(layer)),
 );
 
-it.live("preview_open reports its navigation timeout instead of the request budget", () =>
+it.effect("preview_open reports its navigation timeout instead of the request budget", () =>
   Effect.scoped(
     Effect.gen(function* () {
       const { broker, tabId } = yield* ready;
@@ -641,51 +652,181 @@ it.live("preview_open reports its navigation timeout instead of the request budg
   ).pipe(Effect.provide(layer)),
 );
 
-it.live("an initial download stays available after preview_open reports the navigation error", () =>
+it.effect(
+  "an initial download stays available after preview_open reports the navigation error",
+  () =>
+    Effect.scoped(
+      Effect.gen(function* () {
+        const { broker, tabId } = yield* ready;
+        const manager = yield* Manager.PreviewManager;
+        const released = Promise.withResolvers<void>();
+        initialNavigation = async () => {
+          contexts[1]!.page.emit("download", {
+            failure: async () => null,
+            delete: async () => released.resolve(),
+            saveAs: (path: string) => NodeFSP.writeFile(path, "a,b"),
+            suggestedFilename: () => "report.csv",
+            url: () => "http://localhost:1337/report.csv",
+          });
+          throw new Error("page.goto: Download is starting");
+        };
+        const error = yield* broker
+          .invoke<PreviewAutomationStatus>({
+            scope,
+            operation: "open",
+            input: {
+              url: "http://localhost:1337/report.csv",
+              reuseExistingTab: false,
+              open: false,
+            },
+          })
+          .pipe(Effect.flip);
+        expect(error.message).toContain("Download is starting");
+        yield* Effect.promise(() => released.promise);
+        const { sessions } = yield* manager.list({ threadId: scope.thread.threadId });
+        expect(sessions).toHaveLength(2);
+        const downloadTabId = PreviewTabId.make(sessions.find((tab) => tab.tabId !== tabId)!.tabId);
+        const status = yield* broker.invoke<PreviewAutomationStatus>({
+          scope,
+          tabId: downloadTabId,
+          operation: "status",
+          input: {},
+        });
+        expect(status.downloads).toEqual([
+          expect.objectContaining({ fileName: "report.csv", sizeBytes: 3 }),
+        ]);
+        expect(
+          yield* (yield* FileSystem.FileSystem).readFileString(status.downloads![0]!.path),
+        ).toBe("a,b");
+      }),
+    ).pipe(Effect.provide(layer)),
+);
+
+it.effect.each([
+  { renderer: "idle", title: "Heavy page" },
+  { renderer: "busy", title: null },
+])(
+  "navigate returns the committed page while its load event is still pending ($renderer renderer)",
+  ({ renderer, title }) =>
+    Effect.scoped(
+      Effect.gen(function* () {
+        const { broker, tabId } = yield* ready;
+        const page = contexts[0]!.page;
+        const titleRequested = Promise.withResolvers<void>();
+        // A busy main thread never answers title(); drive its native deadline explicitly.
+        page.title.mockImplementation(() => {
+          titleRequested.resolve();
+          return renderer === "busy"
+            ? new Promise<string>(() => {})
+            : Promise.resolve("Heavy page");
+        });
+        const heavy = "http://localhost:5173/heavy";
+        const timedOut = (method: string, timeout: number | undefined) =>
+          Object.assign(new Error(`${method}: Timeout ${timeout}ms exceeded.`), {
+            name: "TimeoutError",
+          });
+        // The document commits and parses, but a stalled subresource holds back `load`.
+        page.goto.mockImplementation(async (next, options) => {
+          page.commit(next);
+          page.emit("request", {
+            url: () => next,
+            isNavigationRequest: () => true,
+            frame: () => page,
+          });
+          if (options?.waitUntil === "load") throw timedOut("page.goto", options.timeout);
+        });
+        page.waitForLoadState.mockImplementation(async (state, options) => {
+          if (state === undefined || state === "load") {
+            throw timedOut("page.waitForLoadState", options?.timeout);
+          }
+        });
+
+        vi.useFakeTimers({ toFake: ["setTimeout", "clearTimeout"] });
+        const result = yield* broker
+          .invoke<PreviewAutomationStatus>({
+            scope,
+            tabId,
+            operation: "navigate",
+            input: { url: heavy, timeoutMs: 4_000 },
+          })
+          .pipe(Effect.forkScoped);
+        const titleRead = yield* Effect.raceFirst(
+          Effect.promise(() => titleRequested.promise).pipe(Effect.as(true)),
+          Fiber.await(result).pipe(Effect.as(false)),
+        );
+        if (titleRead && renderer === "busy") {
+          yield* Effect.promise(() => vi.advanceTimersByTimeAsync(250));
+        }
+        const status = yield* Fiber.join(result);
+
+        expect(status).toMatchObject({ url: heavy, title, loading: true });
+      }),
+    ).pipe(Effect.ensuring(Effect.sync(() => vi.useRealTimers())), Effect.provide(layer)),
+);
+
+it.effect("a desktop status answers with the last viewport while the renderer cannot measure", () =>
+  Effect.scoped(
+    Effect.gen(function* () {
+      const { broker } = yield* ready;
+      desktopRendersNext = true;
+      const opened = yield* broker.invoke<PreviewAutomationStatus>({
+        scope,
+        operation: "open",
+        input: { url: "https://example.com/", reuseExistingTab: false, show: false },
+      });
+      const measuring = Promise.withResolvers<void>();
+      desktopSizeAnswer = () => {
+        measuring.resolve();
+        return new Promise(() => {});
+      };
+      // A resize makes the next status measure again.
+      yield* Effect.promise(() =>
+        desktopConnections[0]!.context.sessions[0]!.emitAsync("Page.frameResized"),
+      );
+
+      vi.useFakeTimers({ toFake: ["setTimeout", "clearTimeout"] });
+      const result = yield* broker
+        .invoke<PreviewAutomationStatus>({
+          scope,
+          tabId: opened.tabId!,
+          operation: "status",
+          input: {},
+        })
+        .pipe(Effect.forkScoped);
+      yield* Effect.promise(() => measuring.promise);
+      yield* Effect.promise(() => vi.advanceTimersByTimeAsync(250));
+      const status = yield* Fiber.join(result);
+
+      expect(status.viewport).toEqual({ width: 1920, height: 1080 });
+    }),
+  ).pipe(Effect.ensuring(Effect.sync(() => vi.useRealTimers())), Effect.provide(layer)),
+);
+
+it.live("navigate fails when the page never commits within its timeout", () =>
   Effect.scoped(
     Effect.gen(function* () {
       const { broker, tabId } = yield* ready;
-      const manager = yield* Manager.PreviewManager;
-      const released = Promise.withResolvers<void>();
-      initialNavigation = async () => {
-        contexts[1]!.page.emit("download", {
-          failure: async () => null,
-          delete: async () => released.resolve(),
-          saveAs: (path: string) => NodeFSP.writeFile(path, "a,b"),
-          suggestedFilename: () => "report.csv",
-          url: () => "http://localhost:1337/report.csv",
+      contexts[0]!.page.goto.mockImplementation(async () => {
+        throw Object.assign(new Error("page.goto: Timeout 4000ms exceeded."), {
+          name: "TimeoutError",
         });
-        throw new Error("page.goto: Download is starting");
-      };
+      });
+
       const error = yield* broker
         .invoke<PreviewAutomationStatus>({
           scope,
-          operation: "open",
-          input: { url: "http://localhost:1337/report.csv", reuseExistingTab: false, open: false },
+          tabId,
+          operation: "navigate",
+          input: { url: "http://10.255.255.1/", timeoutMs: 4_000 },
         })
         .pipe(Effect.flip);
-      expect(error.message).toContain("Download is starting");
-      yield* Effect.promise(() => released.promise);
-      const { sessions } = yield* manager.list({ threadId: scope.thread.threadId });
-      expect(sessions).toHaveLength(2);
-      const downloadTabId = PreviewTabId.make(sessions.find((tab) => tab.tabId !== tabId)!.tabId);
-      const status = yield* broker.invoke<PreviewAutomationStatus>({
-        scope,
-        tabId: downloadTabId,
-        operation: "status",
-        input: {},
-      });
-      expect(status.downloads).toEqual([
-        expect.objectContaining({ fileName: "report.csv", sizeBytes: 3 }),
-      ]);
-      expect(yield* (yield* FileSystem.FileSystem).readFileString(status.downloads![0]!.path)).toBe(
-        "a,b",
-      );
+
+      expect(error).toMatchObject({ _tag: "PreviewAutomationTimeoutError", timeoutMs: 4_000 });
     }),
   ).pipe(Effect.provide(layer)),
 );
 
-it.live.each(["desktop" as const, undefined])(
+it.effect.each(["desktop" as const, undefined])(
   "explicit desktop targets ($0 runtime) fail without creating a server tab",
   (runtime) =>
     Effect.scoped(
@@ -742,6 +883,26 @@ it.effect("a tab the desktop does not draw is marked headless, so the desktop st
   ).pipe(Effect.provide(layer)),
 );
 
+it.effect("a server started without the desktop browser channel marks its tabs headless", () =>
+  Effect.scoped(
+    Effect.gen(function* () {
+      const { tabId } = yield* ready;
+      const manager = yield* Manager.PreviewManager;
+      const { sessions } = yield* manager.list({ threadId: scope.thread.threadId });
+
+      expect(sessions.find((session) => session.tabId === tabId)?.headless).toBe(true);
+    }),
+  ).pipe(
+    // A WSL-only desktop starts its backend without the browser fds.
+    Effect.provide(
+      ServerBrowser.layer.pipe(
+        Layer.provide(DesktopChannel.layer),
+        Layer.provideMerge(dependencies),
+      ),
+    ),
+  ),
+);
+
 it.effect("an agent's tab the reloaded desktop dropped goes back to the desktop", () =>
   Effect.scoped(
     Effect.gen(function* () {
@@ -837,15 +998,117 @@ it.effect("a desktop page that loaded before the server attached reports its loa
   ).pipe(Effect.provide(layer)),
 );
 
-it.live.each([
-  { method: "goto" as const, message: { type: "navigate", url: "http://10.255.255.1/" } },
-  { method: "goBack" as const, message: { type: "history", delta: -1 } },
-  { method: "goForward" as const, message: { type: "history", delta: 1 } },
-  { method: "reload" as const, message: { type: "reload" } },
-])("a pending viewer $method allows a corrected URL and text input", ({ method, message }) =>
+it.effect.each(["none", "during", "after-fragment", "same-url"])(
+  "Stop settles an initial navigation with its request event $0",
+  (requestTiming) =>
+    Effect.scoped(
+      Effect.gen(function* () {
+        const { browser, broker } = yield* ready;
+        const manager = yield* Manager.PreviewManager;
+        const events = yield* manager.subscribeEvents;
+        const started = Promise.withResolvers<void>();
+        const committed = Promise.withResolvers<void>();
+        initialNavigation = () => {
+          started.resolve();
+          return committed.promise;
+        };
+        yield* Effect.addFinalizer(() => Effect.sync(() => committed.resolve()));
+        const { tabId } = yield* manager.open({
+          threadId: scope.thread.threadId,
+          runtime: "server",
+          url:
+            requestTiming === "after-fragment"
+              ? "https://example.com/pending#section"
+              : "https://example.com/pending",
+        });
+        const viewer = yield* browser.attachViewer(viewerInput(tabId, true));
+        yield* Effect.promise(() => started.promise);
+        const page = contexts.at(-1)!.page;
+        const request = {
+          url: () => "https://example.com/pending",
+          method: () => "GET",
+          isNavigationRequest: () => true,
+          frame: () => page,
+          failure: () => ({ errorText: "net::ERR_ABORTED" }),
+        };
+        const cdp = contexts.at(-1)!.sessions.at(-1)!;
+        const send = cdp.send.getMockImplementation()!;
+        cdp.send.mockImplementation(async (operation, input) => {
+          if (operation === "Page.stopLoading") {
+            committed.reject(new Error("net::ERR_ABORTED"));
+            if (requestTiming === "during") page.emit("request", request);
+          }
+          return send(operation, input);
+        });
+        yield* viewer.input({ type: "stopLoading" });
+        const stopped = yield* broker.invoke<PreviewAutomationStatus>({
+          scope,
+          tabId,
+          operation: "status",
+          input: {},
+        });
+        expect(stopped.loading).toBe(false);
+        let settled = yield* PubSub.take(events);
+        while (
+          settled.type !== "navigated" ||
+          settled.tabId !== tabId ||
+          settled.snapshot.navStatus._tag !== "Idle"
+        ) {
+          settled = yield* PubSub.take(events);
+        }
+        const corrected = requestTiming === "same-url";
+        using timeout = vi.spyOn(globalThis, "setTimeout");
+        if (corrected) {
+          page.goto.mockImplementationOnce(async () => {
+            page.emit("request", request);
+          });
+          yield* viewer.input({ type: "navigate", url: request.url() });
+        } else if (requestTiming !== "none") {
+          if (requestTiming === "after-fragment") page.emit("request", request);
+          page.emit("requestfailed", request);
+        }
+        const status = yield* broker.invoke<PreviewAutomationStatus>({
+          scope,
+          tabId,
+          operation: "status",
+          input: {},
+        });
+        expect(status.loading).toBe(corrected);
+        expect(timeout).not.toHaveBeenCalledWith(expect.any(Function), 5_000);
+        if (!corrected) {
+          const { sessions } = yield* manager.list({ threadId: scope.thread.threadId });
+          expect(sessions.find((session) => session.tabId === tabId)?.navStatus).toEqual({
+            _tag: "Idle",
+          });
+        }
+      }),
+    ).pipe(Effect.provide(layer)),
+);
+
+it.effect.each([
+  {
+    method: "goto" as const,
+    message: { type: "navigate", url: "http://10.255.255.1/" },
+    abortEvent: "before",
+  },
+  { method: "goBack" as const, message: { type: "history", delta: -1 }, abortEvent: "before" },
+  { method: "goForward" as const, message: { type: "history", delta: 1 }, abortEvent: "before" },
+  { method: "reload" as const, message: { type: "reload" }, abortEvent: "after" },
+  { method: "reload" as const, message: { type: "reload" }, abortEvent: "none" },
+  ...["before", "after", "none"].map((abortEvent) => ({
+    method: "goto" as const,
+    message: { type: "navigate", url: "http://10.255.255.1/" },
+    abortEvent,
+    blank: true,
+  })),
+])("viewer $method Stop settles ($abortEvent, blank=$blank)", (testCase) =>
   Effect.scoped(
     Effect.gen(function* () {
-      const { browser, tabId } = yield* ready;
+      const { method, message, abortEvent } = testCase;
+      const blank = "blank" in testCase;
+      const { browser, broker, tabId } = yield* ready;
+      const manager = yield* Manager.PreviewManager;
+      const events = yield* manager.subscribeEvents;
       const viewer = yield* browser.attachViewer(viewerInput(tabId, true));
       yield* viewer.input({ type: "takeControl" });
       const started = Promise.withResolvers<void>();
@@ -859,26 +1122,77 @@ it.live.each([
       yield* Effect.promise(() => started.promise);
       const cdp = contexts[0]!.sessions.at(-1)!;
       const send = cdp.send.getMockImplementation()!;
+      const request = {
+        url: () => "https://example.com/pending",
+        method: () => "GET",
+        isNavigationRequest: () => true,
+        frame: () => page,
+        failure: () => ({ errorText: "net::ERR_ABORTED" }),
+      };
       const typed = Promise.withResolvers<void>();
+      let cancelled = false;
       cdp.send.mockImplementation(async (operation, input) => {
         if (operation === "Input.insertText") typed.resolve();
+        if (operation === "Page.stopLoading") {
+          cancelled = true;
+          committed.reject(new Error("net::ERR_ABORTED"));
+          if (abortEvent === "before") page.emit("requestfailed", request);
+        }
         return send(operation, input);
       });
       const correction = yield* Effect.gen(function* () {
-        yield* viewer.input({ type: "navigate", url: "http://localhost:5173/fixed" });
+        if (!blank) yield* viewer.input({ type: "navigate", url: "http://localhost:5173/fixed" });
         yield* viewer.input({ type: "text", text: "hello" });
       }).pipe(Effect.forkScoped);
       yield* Effect.addFinalizer(() => Effect.sync(() => committed.resolve()));
       // The text reaches the page while the first navigation is still uncommitted.
       yield* Effect.promise(() => typed.promise);
       expect(page.goto).toHaveBeenLastCalledWith(
-        "http://localhost:5173/fixed",
+        blank ? "http://10.255.255.1/" : "http://localhost:5173/fixed",
         expect.objectContaining({ waitUntil: "commit" }),
       );
       expect(contexts[0]!.sessions.at(-1)!.send).toHaveBeenCalledWith("Input.insertText", {
         text: "hello",
       });
-      committed.resolve();
+      page.emit("request", request);
+      let loadingEvent = yield* PubSub.take(events);
+      while (
+        loadingEvent.type !== "navigated" ||
+        loadingEvent.snapshot.navStatus._tag !== "Loading"
+      ) {
+        loadingEvent = yield* PubSub.take(events);
+      }
+      const reader = yield* browser.attachViewer(viewerInput(tabId, false));
+      yield* reader.input({ type: "stopLoading" });
+      expect(cancelled).toBe(false);
+      if (abortEvent === "none" && !blank) committed.resolve();
+      yield* viewer.input({ type: "stopLoading" });
+      expect(cancelled).toBe(true);
+      using timeout = vi.spyOn(globalThis, "setTimeout");
+      if (abortEvent === "after") page.emit("requestfailed", request);
+      expect(timeout).not.toHaveBeenCalledWith(expect.any(Function), 5_000);
+      const status = yield* broker.invoke<PreviewAutomationStatus>({
+        scope,
+        tabId,
+        operation: "status",
+        input: {},
+      });
+      expect(status.loading).toBe(false);
+      const expectedStatus = blank ? "Idle" : "Success";
+      let settled = yield* PubSub.take(events);
+      while (settled.type !== "navigated" || settled.snapshot.navStatus._tag !== expectedStatus) {
+        settled = yield* PubSub.take(events);
+      }
+      if (blank) {
+        const { sessions } = yield* manager.list({ threadId: scope.thread.threadId });
+        expect(sessions.find((session) => session.tabId === tabId)?.navStatus).toEqual({
+          _tag: "Idle",
+        });
+      }
+      if (settled.snapshot.navStatus._tag === "Success")
+        expect(settled.snapshot.navStatus.url).toBe("http://localhost:5173/fixed");
+      expect(page[method]).toHaveBeenCalledTimes(method === "goto" && !blank ? 2 : 1);
+      yield* viewer.input({ type: "releaseControl" });
       yield* Fiber.join(navigation);
       yield* Fiber.join(correction);
     }),
@@ -886,7 +1200,7 @@ it.live.each([
 );
 
 // The fake encoder decodes every frame at 1280x800, so 30 fps hits the bitrate floor.
-it.live.each([
+it.effect.each([
   { reports: [], frameRate: 30, bitsPerSecond: 2.5e6 },
   { reports: [30], frameRate: 30, bitsPerSecond: 2.5e6 },
   { reports: [60], frameRate: 60, bitsPerSecond: 1280 * 800 * 60 * 0.05 },
@@ -916,7 +1230,91 @@ it.live.each([
     ).pipe(Effect.provide(layer)),
 );
 
-it.live.each([
+// Chrome stops sending screencast frames while too many are unacked.
+it.effect("recordings ack screencast frames without waiting for the encoder to decode them", () =>
+  Effect.scoped(
+    Effect.gen(function* () {
+      const { broker, tabId } = yield* ready;
+      yield* broker.invoke({ scope, tabId, operation: "recordingStart", input: {} });
+      const session = contexts[0]!.sessions.find((candidate) =>
+        candidate.send.mock.calls.some(([method]) => method === "Page.startScreencast"),
+      )!;
+      const gate = Promise.withResolvers<void>();
+      decodeGate = gate;
+      yield* Effect.addFinalizer(() => Effect.sync(() => gate.resolve()));
+      for (const sessionId of [1, 2, 3]) {
+        session.emit("Page.screencastFrame", {
+          data: Buffer.from(`frame ${sessionId}`).toString("base64"),
+          sessionId,
+          metadata: { deviceWidth: 1280 },
+        });
+      }
+      expect(
+        session.send.mock.calls.filter(([method]) => method === "Page.screencastFrameAck"),
+      ).toHaveLength(3);
+    }),
+  ).pipe(Effect.provide(layer)),
+);
+
+it.effect.each([{ truncated: false }, { truncated: true }])(
+  "saves a large recording as a binary download and removes its staged file (truncated: $truncated)",
+  ({ truncated }) =>
+    Effect.scoped(
+      Effect.gen(function* () {
+        const { broker, tabId } = yield* ready;
+        const fs = yield* FileSystem.FileSystem;
+        const bytes = 8 * 1024 * 1024;
+        const payload = Buffer.alloc(bytes, 0x5a);
+        let stagedPath: string | undefined;
+        const download = Promise.withResolvers<{ saveAs: (path: string) => Promise<void> }>();
+        const sandbox = NodeVM.createContext({
+          __t3Recorder: {
+            frame: async () => true,
+            stop: async () => ({ mimeType: "video/webm", count: 1, bytes }),
+            chunk: async () => {
+              throw new Error("Large recording used Base64 export");
+            },
+            download: () =>
+              download.resolve({
+                saveAs: async (path) => {
+                  stagedPath = path;
+                  await NodeFSP.writeFile(path, truncated ? payload.subarray(1) : payload);
+                },
+              }),
+          },
+        });
+        encoderPageOverride = {
+          ...makeContext().page,
+          evaluate: async (script: string | ((arg: unknown) => unknown), arg?: unknown) =>
+            typeof script === "function"
+              ? NodeVM.runInContext(`(${script.toString()})`, sandbox)(arg)
+              : undefined,
+          waitForEvent: () => download.promise,
+        } as unknown as Page;
+
+        yield* broker.invoke({ scope, tabId, operation: "recordingStart", input: {} });
+        const stop = broker.invoke<{ path: string; sizeBytes: number }>({
+          scope,
+          tabId,
+          operation: "recordingStop",
+          input: {},
+        });
+        if (truncated) {
+          expect(yield* stop.pipe(Effect.flip)).toMatchObject({
+            _tag: "PreviewAutomationExecutionError",
+          });
+        } else {
+          const artifact = yield* stop;
+          expect(artifact.sizeBytes).toBe(bytes);
+          expect(Buffer.from(yield* fs.readFile(artifact.path)).equals(payload)).toBe(true);
+        }
+        expect(stagedPath).toBeDefined();
+        expect(yield* fs.exists(stagedPath!)).toBe(false);
+      }),
+    ).pipe(Effect.provide(layer)),
+);
+
+it.effect.each([
   { refreshFails: false, expected: "final frame" },
   { refreshFails: true, expected: "frame" },
 ])(
@@ -947,7 +1345,7 @@ it.live.each([
     ).pipe(Effect.provide(layer)),
 );
 
-it.live("enforces provider ownership and explicit targets when a session has multiple tabs", () =>
+it.effect("enforces provider ownership and explicit targets when a session has multiple tabs", () =>
   Effect.scoped(
     Effect.gen(function* () {
       const { broker, tabId } = yield* ready;
@@ -1019,50 +1417,111 @@ it.live("enforces provider ownership and explicit targets when a session has mul
       });
       expect(result).toBe("evaluated");
       expect(contexts).toHaveLength(2);
+
+      const manager = yield* Manager.PreviewManager;
+      const unclaimed = yield* manager.open({
+        threadId: scope.thread.threadId,
+        runtime: "server",
+      });
+      const closeUnclaimed = yield* broker
+        .invoke<void>({
+          scope,
+          tabId: PreviewTabId.make(unclaimed.tabId),
+          operation: "close",
+          input: {},
+        })
+        .pipe(Effect.flip);
+      expect(closeUnclaimed).toMatchObject({
+        _tag: "PreviewAutomationControlInterruptedError",
+        reason: "unclaimedTab",
+      });
+      expect(closeUnclaimed.message).toBe(
+        "This tab has no agent owner. Ask the user to close it in the browser panel.",
+      );
+      expect((yield* manager.list({ threadId: scope.thread.threadId })).sessions).toContainEqual(
+        expect.objectContaining({ tabId: unclaimed.tabId }),
+      );
     }),
   ).pipe(Effect.provide(layer)),
 );
 
-it.live("streams to a read-only viewer without allowing takeover, input, or viewport changes", () =>
+it.effect("a first still that never returns does not stall the tab's later captures", () =>
   Effect.scoped(
     Effect.gen(function* () {
-      const { browser, tabId } = yield* ready;
-      const viewer = yield* browser.attachViewer(viewerInput(tabId, false));
-      const page = contexts[0]!.page;
-      page.setViewportSize.mockClear();
-      const session = contexts[0]!.sessions.at(-1)!;
-      session.send.mockClear();
-      for (const message of [
-        { type: "takeControl" },
-        { type: "key", action: "down", key: "a", text: "a" },
-        { type: "resize", width: 390, height: 844 },
-        { type: "viewport", setting: { _tag: "freeform", width: 390, height: 844 } },
-      ])
-        yield* viewer.input(message);
-      expect(page.setViewportSize).not.toHaveBeenCalled();
-      expect(session.send.mock.calls.some(([method]) => method.startsWith("Input."))).toBe(false);
-      const outputs = yield* Queue.takeAll(viewer.output);
-      expect(outputs).toContainEqual(
-        expect.objectContaining({ _tag: "frame", data: Buffer.from("frame") }),
-      );
-      expect(outputs).toContainEqual(expect.objectContaining({ _tag: "viewport" }));
-      expect(outputs).toContainEqual(
-        expect.objectContaining({ _tag: "control", canOperate: false, controller: "agent" }),
+      const { browser, broker, tabId } = yield* ready;
+      vi.useFakeTimers({ toFake: ["setTimeout", "clearTimeout"] });
+      yield* Effect.addFinalizer(() => Effect.sync(() => vi.useRealTimers()));
+      const capturing = Promise.withResolvers<void>();
+      const stuck = Promise.withResolvers<void>();
+      heldStill = () => {
+        heldStill = null;
+        capturing.resolve();
+        return stuck.promise;
+      };
+      yield* Effect.addFinalizer(() => Effect.sync(() => stuck.resolve()));
+      yield* browser.attachViewer(viewerInput(tabId, true));
+      yield* Effect.promise(() => capturing.promise);
+      const snapshotting = yield* broker
+        .invoke<PreviewAutomationSnapshot>({ scope, tabId, operation: "snapshot", input: {} })
+        .pipe(Effect.forkScoped);
+      yield* Effect.promise(() => vi.advanceTimersByTimeAsync(2_000));
+      const snapshot = yield* Fiber.join(snapshotting);
+      expect(snapshot.accessibilityTree).toContain("delete");
+      const second = yield* browser.attachViewer(viewerInput(tabId, false));
+      const frame = yield* Stream.fromQueue(second.output).pipe(
+        Stream.filter((output) => output._tag === "frame"),
+        Stream.runHead,
       );
-      const operator = yield* browser.attachViewer(viewerInput(tabId, true));
-      yield* operator.input({ type: "takeControl" });
-      yield* operator.input({ type: "text", text: "typed" });
-      yield* operator.input({ type: "resize", width: 390, height: 844 });
-      expect(contexts[0]!.sessions.at(-1)!.send).toHaveBeenCalledWith("Input.insertText", {
-        text: "typed",
-      });
-      expect(page.setViewportSize).toHaveBeenCalledWith({ width: 390, height: 844 });
-      yield* operator.input({ type: "releaseControl" });
+      expect(Option.isSome(frame)).toBe(true);
     }),
   ).pipe(Effect.provide(layer)),
 );
 
-it.live(
+it.effect(
+  "streams to a read-only viewer without allowing takeover, input, or viewport changes",
+  () =>
+    Effect.scoped(
+      Effect.gen(function* () {
+        const { browser, tabId } = yield* ready;
+        const viewer = yield* browser.attachViewer(viewerInput(tabId, false));
+        const page = contexts[0]!.page;
+        page.setViewportSize.mockClear();
+        const session = contexts[0]!.sessions.at(-1)!;
+        session.send.mockClear();
+        for (const message of [
+          { type: "takeControl" },
+          { type: "key", action: "down", key: "a", text: "a" },
+          { type: "resize", width: 390, height: 844 },
+          { type: "viewport", setting: { _tag: "freeform", width: 390, height: 844 } },
+        ])
+          yield* viewer.input(message);
+        expect(page.setViewportSize).not.toHaveBeenCalled();
+        expect(session.send.mock.calls.some(([method]) => method.startsWith("Input."))).toBe(false);
+        const outputs = yield* Stream.fromQueue(viewer.output).pipe(
+          Stream.takeUntil((output) => output._tag === "frame"),
+          Stream.runCollect,
+        );
+        expect(outputs).toContainEqual(
+          expect.objectContaining({ _tag: "frame", data: Buffer.from("frame") }),
+        );
+        expect(outputs).toContainEqual(expect.objectContaining({ _tag: "viewport" }));
+        expect(outputs).toContainEqual(
+          expect.objectContaining({ _tag: "control", canOperate: false, controller: "agent" }),
+        );
+        const operator = yield* browser.attachViewer(viewerInput(tabId, true));
+        yield* operator.input({ type: "takeControl" });
+        yield* operator.input({ type: "text", text: "typed" });
+        yield* operator.input({ type: "resize", width: 390, height: 844 });
+        expect(contexts[0]!.sessions.at(-1)!.send).toHaveBeenCalledWith("Input.insertText", {
+          text: "typed",
+        });
+        expect(page.setViewportSize).toHaveBeenCalledWith({ width: 390, height: 844 });
+        yield* operator.input({ type: "releaseControl" });
+      }),
+    ).pipe(Effect.provide(layer)),
+);
+
+it.effect(
   "takeover waits for the running agent and revokes snapshot refs before returning control",
   () =>
     Effect.scoped(
@@ -1123,7 +1582,7 @@ it.live(
     ).pipe(Effect.provide(layer)),
 );
 
-it.live(
+it.effect(
   "reports a valid CSS selector that matches several elements as ambiguous, not invalid",
   () =>
     Effect.scoped(
@@ -1157,7 +1616,7 @@ it.live(
     ).pipe(Effect.provide(layer)),
 );
 
-it.live("reports a pending dialog without evaluating the page and resolves it explicitly", () =>
+it.effect("reports a pending dialog without evaluating the page and resolves it explicitly", () =>
   Effect.scoped(
     Effect.gen(function* () {
       const { broker, tabId } = yield* ready;
@@ -1236,7 +1695,7 @@ it.live("reports a pending dialog without evaluating the page and resolves it ex
   ).pipe(Effect.provide(layer)),
 );
 
-it.live("closing an isolated tab closes its context only after the page closes", () =>
+it.effect("closing an isolated tab closes its context only after the page closes", () =>
   Effect.scoped(
     Effect.gen(function* () {
       const { broker, tabId } = yield* ready;
@@ -1255,7 +1714,7 @@ it.live("closing an isolated tab closes its context only after the page closes",
   ).pipe(Effect.provide(layer)),
 );
 
-it.live("closing a tab force-closes a page that never finishes unloading", () =>
+it.effect("closing a tab force-closes a page that never finishes unloading", () =>
   Effect.scoped(
     Effect.gen(function* () {
       const { broker, tabId } = yield* ready;
@@ -1276,7 +1735,7 @@ it.live("closing a tab force-closes a page that never finishes unloading", () =>
   ).pipe(Effect.provide(layer)),
 );
 
-it.live("closing a desktop tab waits for its page to unload before the desktop removes it", () =>
+it.effect("closing a desktop tab waits for its page to unload before the desktop removes it", () =>
   Effect.scoped(
     Effect.gen(function* () {
       const { broker } = yield* ready;
@@ -1316,7 +1775,7 @@ it.live("closing a desktop tab waits for its page to unload before the desktop r
   ).pipe(Effect.provide(layer)),
 );
 
-it.live("closing a tab with an unsaved-changes guard still closes it", () =>
+it.effect("closing a tab with an unsaved-changes guard still closes it", () =>
   Effect.scoped(
     Effect.gen(function* () {
       const browser = yield* ServerBrowser.ServerBrowser;
@@ -1347,7 +1806,7 @@ it.live("closing a tab with an unsaved-changes guard still closes it", () =>
   ).pipe(Effect.provide(layer)),
 );
 
-it.live("a tab opened to a file the browser cannot show reports the file to download", () =>
+it.effect("a tab opened to a file the browser cannot show reports the file to download", () =>
   Effect.scoped(
     Effect.gen(function* () {
       const browser = yield* ServerBrowser.ServerBrowser;
@@ -1411,7 +1870,7 @@ it.live("a tab opened to a file the browser cannot show reports the file to down
   ).pipe(Effect.provide(layer)),
 );
 
-it.live(
+it.effect(
   "a late failure from a request that predates tracking leaves a newer navigation loading",
   () =>
     Effect.scoped(
@@ -1646,7 +2105,7 @@ it.effect.each([
   ).pipe(Effect.provide(layer)),
 );
 
-it.live("only the controlling viewer's copy and cut keys reach its clipboard", () =>
+it.effect("only the controlling viewer's copy and cut keys reach its clipboard", () =>
   Effect.scoped(
     Effect.gen(function* () {
       const { browser, tabId } = yield* ready;
@@ -1683,7 +2142,7 @@ it.live("only the controlling viewer's copy and cut keys reach its clipboard", (
   ).pipe(Effect.provide(layer)),
 );
 
-it.live("a busy embedded frame does not hold a copy key back from the page", () =>
+it.effect("a busy embedded frame does not hold a copy key back from the page", () =>
   Effect.scoped(
     Effect.gen(function* () {
       const { browser, tabId } = yield* ready;
@@ -1731,7 +2190,7 @@ it.live("a busy embedded frame does not hold a copy key back from the page", ()
   ).pipe(Effect.provide(layer)),
 );
 
-it.live.each([false, true])(
+it.effect.each([false, true])(
   "a page download is saved, offered to the controller, and listed for the agent (delete fails: %s)",
   (deleteFails) =>
     Effect.scoped(
@@ -1853,7 +2312,7 @@ it.effect("a tab showing a data: page reports its URL without the content", () =
   ).pipe(Effect.provide(layer)),
 );
 
-it.live.each(["save failed", "oversized"])(
+it.effect.each(["save failed", "oversized"])(
   "a rejected download releases the original and keeps no saved copy (%s)",
   (outcome) =>
     Effect.scoped(
@@ -1894,7 +2353,7 @@ it.live.each(["save failed", "oversized"])(
     ).pipe(Effect.provide(layer)),
 );
 
-it.live("a restarted server removes the previous run's downloads and keeps its profiles", () =>
+it.effect("a restarted server removes the previous run's downloads and keeps its profiles", () =>
   Effect.scoped(
     Effect.gen(function* () {
       const { stateDir } = yield* ServerConfig.ServerConfig;
@@ -1915,7 +2374,7 @@ it.live("a restarted server removes the previous run's downloads and keeps its p
   ).pipe(Effect.provide(dependencies)),
 );
 
-it.live("a page's file picker goes to the controller and takes its uploaded files", () =>
+it.effect("a page's file picker goes to the controller and takes its uploaded files", () =>
   Effect.scoped(
     Effect.gen(function* () {
       const { browser, tabId } = yield* ready;
@@ -1950,7 +2409,7 @@ it.live("a page's file picker goes to the controller and takes its uploaded file
   ).pipe(Effect.provide(layer)),
 );
 
-it.live("overlapping file pickers keep the newer offer answerable", () =>
+it.effect("overlapping file pickers keep the newer offer answerable", () =>
   Effect.scoped(
     Effect.gen(function* () {
       const { browser, tabId } = yield* ready;
@@ -1990,7 +2449,7 @@ it.live("overlapping file pickers keep the newer offer answerable", () =>
   ).pipe(Effect.provide(layer)),
 );
 
-it.live("a detached file picker stays open across same-document navigation", () =>
+it.effect("a detached file picker stays open across same-document navigation", () =>
   Effect.scoped(
     Effect.gen(function* () {
       const { browser, tabId } = yield* ready;
@@ -2055,7 +2514,7 @@ it.live("a detached file picker stays open across same-document navigation", ()
   ).pipe(Effect.provide(layer)),
 );
 
-it.live.each(["main", "iframe"])(
+it.effect.each(["main", "iframe"])(
   "a file picker closes at %s document commit before DOMContentLoaded",
   (frame) =>
     Effect.scoped(
@@ -2105,7 +2564,7 @@ it.live.each(["main", "iframe"])(
     ).pipe(Effect.provide(layer)),
 );
 
-it.live("a file picker closes when its page is replaced while control changes hands", () =>
+it.effect("a file picker closes when its page is replaced while control changes hands", () =>
   Effect.scoped(
     Effect.gen(function* () {
       const { broker, browser, tabId } = yield* ready;
@@ -2153,7 +2612,7 @@ it.live("a file picker closes when its page is replaced while control changes ha
   ).pipe(Effect.provide(layer)),
 );
 
-it.live("a file picker is not offered after its document changes while reading accept", () =>
+it.effect("a file picker is not offered after its document changes while reading accept", () =>
   Effect.scoped(
     Effect.gen(function* () {
       const { broker, browser, tabId } = yield* ready;
@@ -2197,7 +2656,7 @@ it.live("a file picker is not offered after its document changes while reading a
   ).pipe(Effect.provide(layer)),
 );
 
-it.live("only the current controller can answer a file picker", () =>
+it.effect("only the current controller can answer a file picker", () =>
   Effect.scoped(
     Effect.gen(function* () {
       const { browser, tabId } = yield* ready;
@@ -2299,6 +2758,134 @@ it.effect(
     ).pipe(Effect.provide(layer)),
 );
 
+it.effect("a desktop tab reports the size the desktop draws after a resize", () =>
+  Effect.scoped(
+    Effect.gen(function* () {
+      const { broker } = yield* ready;
+      const manager = yield* Manager.PreviewManager;
+      const failReads = () => Promise.reject(new Error("Cannot find context with specified id"));
+      desktopSizeAnswer = failReads;
+      desktopRendersNext = true;
+      const opened = yield* broker.invoke<PreviewAutomationStatus>({
+        scope,
+        operation: "open",
+        input: { reuseExistingTab: false, show: false },
+      });
+      const tabId = PreviewTabId.make(opened.tabId!);
+      const { context } = desktopConnections.at(-1)!;
+      const cdp = context.sessions[0]!;
+      const events = yield* manager.subscribeEvents;
+      const status = broker
+        .invoke<PreviewAutomationStatus>({ scope, tabId, operation: "status", input: {} })
+        .pipe(Effect.map((result) => result.viewport));
+      // The desktop draws the new size once the session update reaches it.
+      const resize = (input: Record<string, unknown>, width: number, height: number) =>
+        Effect.gen(function* () {
+          const result = yield* broker
+            .invoke<PreviewAutomationResizeResult>({ scope, tabId, operation: "resize", input })
+            .pipe(Effect.forkScoped);
+          let event = yield* PubSub.take(events);
+          while (event.type !== "resized" || event.tabId !== tabId) {
+            event = yield* PubSub.take(events);
+          }
+          Object.assign(context.cssViewport, { width, height });
+          yield* Effect.promise(() => cdp.emitAsync("Page.frameResized"));
+          return (yield* Fiber.join(result)).viewport;
+        });
+
+      // A size no read measured after the resize is unknown, never a default or the last one.
+      expect(
+        yield* resize({ mode: "freeform", width: 900, height: 600 }, 900, 600),
+      ).toBeUndefined();
+      desktopSizeAnswer = null;
+      expect(yield* resize({ mode: "freeform", width: 1280, height: 760 }, 1280, 760)).toEqual({
+        width: 1280,
+        height: 760,
+      });
+      desktopSizeAnswer = failReads;
+      expect(yield* status).toEqual({ width: 1280, height: 760 });
+      expect(
+        yield* resize({ mode: "freeform", width: 1000, height: 700 }, 1000, 700),
+      ).toBeUndefined();
+      desktopSizeAnswer = null;
+      // A page can keep another size than the fixed one asked for; both report the page's.
+      expect(yield* resize({ mode: "freeform", width: 844, height: 390 }, 560, 760)).toEqual({
+        width: 560,
+        height: 760,
+      });
+      expect(yield* status).toEqual({ width: 560, height: 760 });
+      expect(yield* resize({ mode: "fill" }, 1234, 700)).toEqual({ width: 1234, height: 700 });
+      // No page resize or load since that read, so status answers without reading again.
+      let reads = 0;
+      desktopSizeAnswer = async () => {
+        reads += 1;
+        return { result: { value: { width: 1, height: 1 } } };
+      };
+      expect(yield* status).toEqual({ width: 1234, height: 700 });
+      expect(reads).toBe(0);
+      // A status during a read waits for it rather than answer the size before it.
+      const pending = yield* Queue.unbounded<PromiseWithResolvers<Record<string, unknown>>>();
+      const heldAnswer = () => {
+        const read = Promise.withResolvers<Record<string, unknown>>();
+        Queue.offerUnsafe(pending, read);
+        return read.promise;
+      };
+      desktopSizeAnswer = heldAnswer;
+      const answer = (width: number, height: number) => ({ result: { value: { width, height } } });
+      const refill = broker
+        .invoke<PreviewAutomationResizeResult>({
+          scope,
+          tabId,
+          operation: "resize",
+          input: { mode: "fill" },
+        })
+        .pipe(
+          Effect.map((result) => result.viewport),
+          Effect.forkScoped,
+        );
+      // Status reads the URL just before it picks the size.
+      const url = context.page.url();
+      using urlRead = vi.spyOn(context.page, "url");
+      const startStatus = Effect.gen(function* () {
+        const started = Promise.withResolvers<void>();
+        urlRead.mockImplementationOnce(() => {
+          started.resolve();
+          return url;
+        });
+        const fiber = yield* Effect.forkScoped(status);
+        yield* Effect.promise(() => started.promise);
+        return fiber;
+      });
+      const filled = yield* refill;
+      const read = yield* Queue.take(pending);
+      const during = yield* startStatus;
+      read.resolve(answer(1100, 650));
+      expect(yield* Fiber.join(during)).toEqual({ width: 1100, height: 650 });
+      expect(yield* Fiber.join(filled)).toEqual({ width: 1100, height: 650 });
+      // A page resize during that read makes its answer old: status reads again, and the
+      // resize result has no size.
+      const outdated = yield* refill;
+      const oldRead = yield* Queue.take(pending);
+      const later = yield* startStatus;
+      yield* Effect.promise(() => cdp.emitAsync("Page.frameResized"));
+      desktopSizeAnswer = async () => answer(1000, 600);
+      oldRead.resolve(answer(1100, 650));
+      expect(yield* Fiber.join(later)).toEqual({ width: 1000, height: 600 });
+      expect(yield* Fiber.join(outdated)).toBeUndefined();
+      // So does a load during that read, which may have measured the page before it.
+      desktopSizeAnswer = heldAnswer;
+      const reloaded = yield* refill;
+      const pageRead = yield* Queue.take(pending);
+      const navigated = yield* startStatus;
+      yield* Effect.promise(() => cdp.emitAsync("Page.loadEventFired"));
+      desktopSizeAnswer = async () => answer(900, 560);
+      pageRead.resolve(answer(1000, 600));
+      expect(yield* Fiber.join(navigated)).toEqual({ width: 900, height: 560 });
+      expect(yield* Fiber.join(reloaded)).toBeUndefined();
+    }),
+  ).pipe(Effect.provide(layer)),
+);
+
 it.effect("a stalled desktop viewer still gets its size, control and reconnect", () =>
   Effect.scoped(
     Effect.gen(function* () {
@@ -2368,7 +2955,7 @@ it.effect("a stalled desktop viewer still gets its size, control and reconnect",
   ).pipe(Effect.provide(layer)),
 );
 
-it.live("the tab the desktop shows is visible and picked for agents without a tab", () =>
+it.effect("the tab the desktop shows is visible and picked for agents without a tab", () =>
   Effect.scoped(
     Effect.gen(function* () {
       const broker = yield* Broker.PreviewAutomationBroker;
@@ -2409,85 +2996,87 @@ it.live("the tab the desktop shows is visible and picked for agents without a ta
   ).pipe(Effect.provide(layer)),
 );
 
-it.live("agents read a human's tab with no arguments and act on it only while nobody drives", () =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      const browser = yield* ServerBrowser.ServerBrowser;
-      const broker = yield* Broker.PreviewAutomationBroker;
-      const manager = yield* Manager.PreviewManager;
-      yield* Effect.yieldNow;
-      const opened = yield* manager.open({
-        threadId: scope.thread.threadId,
-        url: "http://localhost:5173/mine",
-        runtime: "server",
-      });
-      const tabId = PreviewTabId.make(opened.tabId);
-      const viewer = yield* browser.attachViewer(viewerInput(tabId, true));
-      const status = yield* broker.invoke<PreviewAutomationStatus>({
-        scope,
-        operation: "status",
-        input: {},
-      });
-      expect(status).toMatchObject({
-        tabId,
-        control: { owner: "human", ownedByCaller: false },
-      });
-      expect(status.tabs).toEqual([
-        expect.objectContaining({ tabId, owner: "human", ownedByCaller: false, visible: true }),
-      ]);
-      const evaluated = yield* broker
-        .invoke<void>({ scope, operation: "evaluate", input: { expression: "read()" } })
-        .pipe(Effect.flip);
-      expect(evaluated).toMatchObject({
-        _tag: "PreviewAutomationControlInterruptedError",
-        reason: "humanControl",
-      });
-      yield* broker.invoke<PreviewAutomationSnapshot>({
-        scope,
-        tabId,
-        operation: "snapshot",
-        input: {},
-      });
-      const refused = yield* broker
-        .invoke<void>({
+it.effect(
+  "agents read a human's tab with no arguments and act on it only while nobody drives",
+  () =>
+    Effect.scoped(
+      Effect.gen(function* () {
+        const browser = yield* ServerBrowser.ServerBrowser;
+        const broker = yield* Broker.PreviewAutomationBroker;
+        const manager = yield* Manager.PreviewManager;
+        yield* Effect.yieldNow;
+        const opened = yield* manager.open({
+          threadId: scope.thread.threadId,
+          url: "http://localhost:5173/mine",
+          runtime: "server",
+        });
+        const tabId = PreviewTabId.make(opened.tabId);
+        const viewer = yield* browser.attachViewer(viewerInput(tabId, true));
+        const status = yield* broker.invoke<PreviewAutomationStatus>({
+          scope,
+          operation: "status",
+          input: {},
+        });
+        expect(status).toMatchObject({
+          tabId,
+          control: { owner: "human", ownedByCaller: false },
+        });
+        expect(status.tabs).toEqual([
+          expect.objectContaining({ tabId, owner: "human", ownedByCaller: false, visible: true }),
+        ]);
+        const evaluated = yield* broker
+          .invoke<void>({ scope, operation: "evaluate", input: { expression: "read()" } })
+          .pipe(Effect.flip);
+        expect(evaluated).toMatchObject({
+          _tag: "PreviewAutomationControlInterruptedError",
+          reason: "humanControl",
+        });
+        yield* broker.invoke<PreviewAutomationSnapshot>({
+          scope,
+          tabId,
+          operation: "snapshot",
+          input: {},
+        });
+        const refused = yield* broker
+          .invoke<void>({
+            scope,
+            tabId,
+            operation: "navigate",
+            input: { url: "http://localhost:5173/agent" },
+          })
+          .pipe(Effect.flip);
+        expect(refused).toMatchObject({
+          _tag: "PreviewAutomationControlInterruptedError",
+          reason: "humanControl",
+        });
+        yield* viewer.input({ type: "releaseControl" });
+        const released = yield* broker.invoke<PreviewAutomationStatus>({
+          scope,
+          tabId,
+          operation: "status",
+          input: {},
+        });
+        expect(released.control).toMatchObject({ owner: "unclaimed", ownedByCaller: false });
+        yield* broker.invoke({
           scope,
           tabId,
           operation: "navigate",
           input: { url: "http://localhost:5173/agent" },
-        })
-        .pipe(Effect.flip);
-      expect(refused).toMatchObject({
-        _tag: "PreviewAutomationControlInterruptedError",
-        reason: "humanControl",
-      });
-      yield* viewer.input({ type: "releaseControl" });
-      const released = yield* broker.invoke<PreviewAutomationStatus>({
-        scope,
-        tabId,
-        operation: "status",
-        input: {},
-      });
-      expect(released.control).toMatchObject({ owner: "unclaimed", ownedByCaller: false });
-      yield* broker.invoke({
-        scope,
-        tabId,
-        operation: "navigate",
-        input: { url: "http://localhost:5173/agent" },
-      });
-      expect(contexts[0]!.page.goto).toHaveBeenCalledWith(
-        "http://localhost:5173/agent",
-        expect.anything(),
-      );
-      yield* viewer.input({ type: "takeControl" });
-      const retaken = yield* broker
-        .invoke<void>({ scope, tabId, operation: "press", input: { key: "Enter" } })
-        .pipe(Effect.flip);
-      expect(retaken).toMatchObject({ reason: "humanControl" });
-    }),
-  ).pipe(Effect.provide(layer)),
+        });
+        expect(contexts[0]!.page.goto).toHaveBeenCalledWith(
+          "http://localhost:5173/agent",
+          expect.anything(),
+        );
+        yield* viewer.input({ type: "takeControl" });
+        const retaken = yield* broker
+          .invoke<void>({ scope, tabId, operation: "press", input: { key: "Enter" } })
+          .pipe(Effect.flip);
+        expect(retaken).toMatchObject({ reason: "humanControl" });
+      }),
+    ).pipe(Effect.provide(layer)),
 );
 
-it.live("preview_open reports a tab it shows as visible once the client attaches", () =>
+it.effect("preview_open reports a tab it shows as visible once the client attaches", () =>
   Effect.scoped(
     Effect.gen(function* () {
       const browser = yield* ServerBrowser.ServerBrowser;
@@ -2514,7 +3103,7 @@ it.live("preview_open reports a tab it shows as visible once the client attaches
   ).pipe(Effect.provide(layer)),
 );
 
-it.live("a session's own tab stays its default while other sessions' tabs are listed", () =>
+it.effect("a session's own tab stays its default while other sessions' tabs are listed", () =>
   Effect.scoped(
     Effect.gen(function* () {
       const { broker, tabId } = yield* ready;
@@ -2539,7 +3128,7 @@ it.live("a session's own tab stays its default while other sessions' tabs are li
   ).pipe(Effect.provide(layer)),
 );
 
-it.live(
+it.effect(
   "preview_open picks a reported profile by id or name and defaults to the reported one",
   () =>
     Effect.scoped(
@@ -2595,7 +3184,205 @@ it.live(
     ).pipe(Effect.provide(layer)),
 );
 
-it.live("profiles reported by one client survive another client's report", () =>
+// Holds the next profile save at its temp-file cleanup, after the rename, until released.
+const gateSaveCleanup = Effect.gen(function* () {
+  const fs = yield* FileSystem.FileSystem;
+  const cleanupStarted = yield* Deferred.make<void>();
+  const releaseCleanup = yield* Deferred.make<void>();
+  let paused = false;
+  return {
+    cleanupStarted,
+    releaseCleanup,
+    pauseNext: () => {
+      paused = true;
+    },
+    fs: FileSystem.FileSystem.of({
+      ...fs,
+      remove: (target, options) =>
+        fs.remove(target, options).pipe(
+          Effect.tap(() => {
+            if (!paused) return Effect.void;
+            paused = false;
+            return Deferred.succeed(cleanupStarted, undefined).pipe(
+              Effect.andThen(Deferred.await(releaseCleanup)),
+            );
+          }),
+        ),
+    }),
+  };
+});
+
+it.effect(
+  "an agent opens a reported profile after a restart, before any client reports again",
+  () =>
+    Effect.gen(function* () {
+      const gate = yield* gateSaveCleanup;
+      const persistent = (name: string) =>
+        ({ id: `profile-${name.toLowerCase()}`, name, kind: "persistent" }) as const;
+      // Together the two clients report more profiles than one report may hold.
+      const fromA = [
+        persistent("Work"),
+        ...Array.from({ length: 12 }, (_, n) => persistent(`A${n}`)),
+      ];
+      const fromB = [
+        persistent("Shared"),
+        ...Array.from({ length: 12 }, (_, n) => persistent(`B${n}`)),
+      ];
+      yield* Effect.gen(function* () {
+        const browser = yield* ServerBrowser.ServerBrowser;
+        const clientA = yield* Scope.make();
+        const reportFromA = yield* browser.profileReporter.pipe(
+          Effect.provideService(Scope.Scope, clientA),
+        );
+        const reportFromB = yield* browser.profileReporter;
+        const reportFromC = yield* browser.profileReporter;
+        yield* reportFromA({ profiles: fromA, defaultProfileId: "profile-work" });
+        gate.pauseNext();
+        const savingB = yield* reportFromB({
+          profiles: fromB,
+          defaultProfileId: "profile-shared",
+        }).pipe(Effect.forkScoped({ startImmediately: true }));
+        // A save that ends without reaching the gate fails the test instead of hanging it.
+        yield* Effect.raceFirst(
+          Deferred.await(gate.cleanupStarted),
+          Fiber.join(savingB).pipe(
+            Effect.andThen(Effect.die("save finished before the cleanup gate")),
+          ),
+        );
+        // C's save waits behind B's while the client that reported Work disconnects, as at shutdown.
+        const savingC = yield* reportFromC({
+          profiles: [],
+          defaultProfileId: "profile-shared",
+        }).pipe(Effect.forkScoped({ startImmediately: true }));
+        yield* Scope.close(clientA, Exit.void);
+        yield* Deferred.succeed(gate.releaseCleanup, undefined);
+        yield* Fiber.join(savingB);
+        yield* Fiber.join(savingC);
+      }).pipe(
+        Effect.scoped,
+        Effect.provide(
+          Layer.fresh(ServerBrowser.layer).pipe(
+            Layer.provide(Layer.succeed(FileSystem.FileSystem, gate.fs)),
+          ),
+        ),
+      );
+
+      const restarted = yield* Effect.gen(function* () {
+        const broker = yield* Broker.PreviewAutomationBroker;
+        yield* ServerBrowser.ServerBrowser;
+        yield* Effect.yieldNow;
+        return yield* broker.invoke<PreviewAutomationStatus>({
+          scope,
+          operation: "open",
+          input: { reuseExistingTab: false, show: false, profileId: "Work" },
+        });
+      }).pipe(Effect.provide(Layer.fresh(ServerBrowser.layer)));
+
+      expect(contextRequests).toEqual([{ profileId: "profile-work", isolated: false }]);
+      expect(restarted.tabs).toMatchObject([{ profileId: "profile-work" }]);
+      expect(restarted).toMatchObject({
+        defaultProfileId: "profile-shared",
+        profiles: [
+          { id: "default", name: "Default" },
+          { id: "incognito", name: "Incognito", incognito: true },
+          ...[...fromA, ...fromB].map(({ id, name }) => ({ id, name })),
+        ],
+      });
+    }).pipe(Effect.provide(dependencies)),
+);
+
+it.effect("warns at startup about a saved profile catalog it cannot read or decode", () =>
+  Effect.gen(function* () {
+    const fs = yield* FileSystem.FileSystem;
+    const path = yield* Path.Path;
+    const { stateDir } = yield* ServerConfig.ServerConfig;
+    const savedPath = path.join(stateDir, "server-browser", "reported-profiles.json");
+    const startupWarnings = (saved: "missing" | "empty" | "invalid" | "unreadable") =>
+      Effect.gen(function* () {
+        const messages: string[] = [];
+        yield* fs.remove(savedPath, { recursive: true, force: true });
+        yield* fs.makeDirectory(path.dirname(savedPath), { recursive: true });
+        if (saved === "empty") yield* fs.writeFileString(savedPath, "");
+        if (saved === "invalid") yield* fs.writeFileString(savedPath, "{");
+        if (saved === "unreadable") yield* fs.makeDirectory(savedPath);
+        const logger = Logger.make(({ message }) => {
+          messages.push(String(message));
+        });
+        yield* ServerBrowser.ServerBrowser.pipe(
+          Effect.provide(
+            Layer.fresh(ServerBrowser.layer).pipe(
+              Layer.provide(Logger.layer([logger], { mergeWithExisting: false })),
+            ),
+          ),
+        );
+        return messages.filter((message) => message.includes("saved browser profiles"));
+      });
+
+    expect(yield* startupWarnings("missing")).toEqual([]);
+    expect(yield* startupWarnings("empty")).toEqual([]);
+    expect(yield* startupWarnings("invalid")).toEqual([
+      expect.stringContaining("ignoring invalid saved browser profiles"),
+    ]);
+    expect(yield* startupWarnings("unreadable")).toEqual([
+      expect.stringContaining("failed to read saved browser profiles"),
+    ]);
+  }).pipe(Effect.provide(dependencies)),
+);
+
+it.effect("a report interrupted while an earlier save holds the lock is still saved", () =>
+  Effect.gen(function* () {
+    const gate = yield* gateSaveCleanup;
+    const work = { id: "profile-work", name: "Work", kind: "persistent" } as const;
+    const late = { id: "profile-late", name: "Late", kind: "persistent" } as const;
+    yield* Effect.gen(function* () {
+      const report = yield* (yield* ServerBrowser.ServerBrowser).profileReporter;
+      gate.pauseNext();
+      const saving = yield* report({ profiles: [work], defaultProfileId: "profile-work" }).pipe(
+        Effect.forkScoped({ startImmediately: true }),
+      );
+      yield* Effect.raceFirst(
+        Deferred.await(gate.cleanupStarted),
+        Fiber.join(saving).pipe(
+          Effect.andThen(Effect.die("save finished before the cleanup gate")),
+        ),
+      );
+      // The client disconnects while its report waits for the save in progress.
+      const waiting = yield* report({
+        profiles: [work, late],
+        defaultProfileId: "profile-late",
+      }).pipe(Effect.forkScoped({ startImmediately: true }));
+      waiting.interruptUnsafe();
+      yield* Deferred.succeed(gate.releaseCleanup, undefined);
+      yield* Fiber.join(saving);
+      yield* Fiber.await(waiting);
+    }).pipe(
+      Effect.scoped,
+      Effect.provide(
+        Layer.fresh(ServerBrowser.layer).pipe(
+          Layer.provide(Layer.succeed(FileSystem.FileSystem, gate.fs)),
+        ),
+      ),
+    );
+
+    const restarted = yield* Effect.gen(function* () {
+      const broker = yield* Broker.PreviewAutomationBroker;
+      yield* ServerBrowser.ServerBrowser;
+      yield* Effect.yieldNow;
+      return yield* broker.invoke<PreviewAutomationStatus>({
+        scope,
+        operation: "open",
+        input: { reuseExistingTab: false, show: false, profileId: "Late" },
+      });
+    }).pipe(Effect.provide(Layer.fresh(ServerBrowser.layer)));
+
+    expect(restarted).toMatchObject({
+      defaultProfileId: "profile-late",
+      tabs: [{ profileId: "profile-late" }],
+    });
+  }).pipe(Effect.provide(dependencies)),
+);
+
+it.effect("profiles reported by one client survive another client's report", () =>
   Effect.scoped(
     Effect.gen(function* () {
       const { browser, broker } = yield* ready;
@@ -2638,7 +3425,7 @@ it.live("profiles reported by one client survive another client's report", () =>
   ).pipe(Effect.provide(layer)),
 );
 
-it.live.each([
+it.effect.each([
   { budget: "agent", limit: 8 },
   { budget: "server", limit: 32 },
 ])("opens and popups reserve the $budget budget before session creation", ({ budget, limit }) =>
@@ -2746,7 +3533,7 @@ it.live.each([
   ).pipe(Effect.provide(layer)),
 );
 
-it.live("failed session and browser launches release capacity, as does closing a tab", () =>
+it.effect("failed session and browser launches release capacity, as does closing a tab", () =>
   Effect.scoped(
     Effect.gen(function* () {
       const { broker, tabId } = yield* ready;
@@ -2806,7 +3593,7 @@ it.live("failed session and browser launches release capacity, as does closing a
   ).pipe(Effect.provide(layer)),
 );
 
-it.live("a full server takes back the slot of the longest idle agent tab nobody views", () =>
+it.effect("a full server takes back the slot of the longest idle agent tab nobody views", () =>
   Effect.scoped(
     Effect.gen(function* () {
       const broker = yield* Broker.PreviewAutomationBroker;
@@ -2882,7 +3669,7 @@ const certificateError = {
 };
 const dataUrl = `data:text/html,${"PAYLOAD".repeat(300)}`;
 
-it.live("reports why a page failed to load while the tab shows the error page", () =>
+it.effect("reports why a page failed to load while the tab shows the error page", () =>
   Effect.scoped(
     Effect.gen(function* () {
       const { broker, tabId } = yield* ready;
@@ -2989,7 +3776,7 @@ it.effect("preview_open rejects a desktop navigation that failed before automati
   ).pipe(Effect.provide(layer)),
 );
 
-it.live("reports a desktop tab's load failure from before the server connected", () =>
+it.effect("reports a desktop tab's load failure from before the server connected", () =>
   Effect.scoped(
     Effect.gen(function* () {
       const browser = yield* ServerBrowser.ServerBrowser;
diff --git a/apps/server/src/preview/ServerBrowser.ts b/apps/server/src/preview/ServerBrowser.ts
index ecb3184b0997..ad9e20ef11b3 100644
--- a/apps/server/src/preview/ServerBrowser.ts
+++ b/apps/server/src/preview/ServerBrowser.ts
@@ -2,14 +2,16 @@
 // Screencasts ignore emulated device scale; real 2x keeps captures sharp.
 // --disable-gpu uses cheaper software compositing while preserving SwiftShader WebGL.
 import {
+  BrowserProfile,
+  BrowserProfileId,
   BUILT_IN_BROWSER_PROFILES,
   DEFAULT_BROWSER_PROFILE_ID,
   DEFAULT_BROWSER_RECORDING_FRAME_RATE,
   FILL_PREVIEW_VIEWPORT,
   findBrowserProfile,
   INCOGNITO_BROWSER_PROFILE_ID,
+  isBuiltInBrowserProfileId,
   resolveBrowserProfiles,
-  type BrowserProfile,
   type PreviewReportProfilesInput,
   PREVIEW_AUTOMATION_SERVER_OPERATIONS,
   PreviewViewportSetting as PreviewViewportSettingSchema,
@@ -46,6 +48,7 @@ import {
   type PreviewAppearancePreference,
 } from "@t3tools/contracts";
 import { AgentScope, agentScopeLauncherScript } from "@t3tools/shared/AgentScope";
+import { writeFileStringAtomically } from "@t3tools/shared/atomicWrite";
 import * as HostProcess from "@t3tools/shared/HostProcess";
 import { normalizePreviewUrl } from "@t3tools/shared/preview";
 import { resolvePreviewViewport } from "@t3tools/shared/previewViewport";
@@ -54,12 +57,15 @@ import * as NodeFSP from "node:fs/promises";
 import * as NodePath from "node:path";
 import * as Context from "effect/Context";
 import * as Effect from "effect/Effect";
+import * as FileSystem from "effect/FileSystem";
 import { constVoid } from "effect/Function";
 import * as Layer from "effect/Layer";
 import * as Option from "effect/Option";
+import type * as Path from "effect/Path";
 import * as Queue from "effect/Queue";
 import * as Schedule from "effect/Schedule";
 import * as Schema from "effect/Schema";
+import * as Semaphore from "effect/Semaphore";
 import * as Exit from "effect/Exit";
 import * as Scope from "effect/Scope";
 import * as Stream from "effect/Stream";
@@ -90,6 +96,12 @@ import { BrowserControlInterrupted, SessionControl } from "./SessionControl.ts";
 import { installPdfDocumentNavigation, isPdfAssetUrl } from "./PdfDocumentNavigation.ts";
 
 const SERVER_HOST_CLIENT_ID = SERVER_BROWSER_AUTOMATION_CLIENT_ID;
+// Each client's report is capped, but the saved catalog is their union, so it has no cap.
+const SavedProfilesJson = Schema.fromJsonString(
+  Schema.Struct({ profiles: Schema.Array(BrowserProfile), defaultProfileId: BrowserProfileId }),
+);
+const decodeSavedProfiles = Schema.decodeUnknownEffect(SavedProfilesJson);
+const encodeSavedProfiles = Schema.encodeSync(SavedProfilesJson);
 const RENDER_SCALE = 2;
 // Chromium allows three unacked frames, so 100 ms pacing caps viewers near 30 fps.
 const SCREENCAST_ACK_PACE_MS = 100;
@@ -99,13 +111,19 @@ const SCREENCAST_MOTION_WINDOW_MS = 300;
 const SCREENCAST_MOTION_QUALITY = 50;
 const HOST_RECONNECT_DELAY = "1 second";
 const DESKTOP_ATTACH_TIMEOUT = "10 seconds";
+// A viewer still is best-effort; a capture Chromium never answers must not hold the capture lock.
+const VIEWER_STILL_TIMEOUT_MS = 2_000;
 const VIEWER_OUTPUT_LIMIT = 64;
 const RECORDING_SCREENCAST = { format: "jpeg", quality: 90, everyNthFrame: 1 } as const;
+const RECORDING_BINARY_EXPORT_MIN_BYTES = 8 * 1024 * 1024;
+const RECORDING_DOWNLOAD_TIMEOUT_MS = 5_000;
 const decodeViewportSetting = Schema.decodeUnknownSync(PreviewViewportSettingSchema);
 const AGENT_CURSOR_MOVE_MS = 160;
 const AGENT_CURSOR_CLICK_LEAD_MS = 40;
 /** A dialog blocks page script, so a desktop size read gives up after this. */
 const DESKTOP_VIEWPORT_READ_TIMEOUT = "1 second";
+/** A desktop page that keeps its size draws nothing on a resize, so the wait gives up. */
+const DESKTOP_RESIZE_WAIT_MS = 1000;
 // A revealed tab's client opens the panel and attaches its stream a few round trips later, remote ones included.
 const REVEAL_VIEWER_WAIT_MS = 1000;
 
@@ -142,6 +160,8 @@ const EDITABLE_AT_POINT_SCRIPT = `(x, y) => {
 }`;
 const UNATTACHED_FILL_VIEWPORT = { width: 1280, height: 800 } as const;
 const NAVIGATION_TIMEOUT_MS = 15_000;
+// Status reads run in the renderer; a busy page must not hold a status past the broker's grace.
+const STATUS_READ_MS = 250;
 const VIEWER_NAVIGATION_OPTIONS = { waitUntil: "commit", timeout: NAVIGATION_TIMEOUT_MS } as const;
 const ACTION_TIMELINE_LIMIT = 50;
 
@@ -294,6 +314,7 @@ interface EncoderWindow {
     frame(data: string, width: number): Promise<boolean>;
     stop(): Promise<{ mimeType: string | null; count: number; bytes: number }>;
     chunk(index: number): Promise<string>;
+    download(): void;
   };
 }
 
@@ -348,12 +369,20 @@ interface ServerTab {
   desktopViewportRead: Promise<ServerTab["desktopViewport"]>;
   /** A read queued behind `desktopViewportRead`, shared by every caller that waits for it. */
   desktopViewportNext: Promise<ServerTab["desktopViewport"]> | null;
+  /** A page resize or load since the last read started; status measures again. */
+  desktopViewportStale: boolean;
+  /** Counts page resizes, loads and dialog closes, so a caller can tell one landed during a read. */
+  desktopViewportChanges: number;
+  /** Settles at the desktop page's next main-frame resize. */
+  desktopResize: PromiseWithResolvers<void>;
   loading: boolean;
   loadError: PreviewAutomationLoadError | undefined;
   closing: boolean;
   recording: Recording | null;
   initialNavigation: Promise<void> | null;
+  pendingInitialRequestUrl: string | null;
   navigationGeneration: number;
+  stoppedGeneration: number | null;
 
   abortedNavigation: {
     readonly url: string;
@@ -664,7 +693,7 @@ const make = Effect.gen(function* () {
   };
 
   // Desktop pages have no Playwright viewport; an isolated world keeps page script
-  // from overriding the CSS size, and failed reads preserve the last usable size.
+  // from overriding the CSS size. A failed read answers null and keeps the last usable size.
   const readDesktopViewport = async (tab: ServerTab) => {
     const readSize = async () => {
       const { frameTree } = await tab.cdp.send("Page.getFrameTree");
@@ -689,20 +718,26 @@ const make = Effect.gen(function* () {
     const width = size?.width;
     const height = size?.height;
     if (typeof width === "number" && width > 0 && typeof height === "number" && height > 0)
-      tab.desktopViewport = { width, height };
-    return tab.desktopViewport;
+      return (tab.desktopViewport = { width, height });
+    tab.desktopViewportStale = true;
+    return null;
   };
 
   // Reads run one at a time, and callers that arrive during a read share the next one.
   const measureDesktopViewport = (tab: ServerTab) =>
     (tab.desktopViewportNext ??= tab.desktopViewportRead.then(() => {
       tab.desktopViewportNext = null;
+      tab.desktopViewportStale = false;
       return (tab.desktopViewportRead = readDesktopViewport(tab));
     }));
 
   const layoutSize = async (tab: ServerTab) => {
     // A dialog blocks page script; its close measures again.
-    if (tab.desktop) return tab.dialog ? tab.desktopViewport : measureDesktopViewport(tab);
+    if (tab.desktop) {
+      return tab.dialog
+        ? tab.desktopViewport
+        : ((await measureDesktopViewport(tab)) ?? tab.desktopViewport);
+    }
     const size = tab.page.viewportSize();
     if (!size) return size;
     return {
@@ -711,6 +746,15 @@ const make = Effect.gen(function* () {
     };
   };
 
+  // Page resizes and loads mark the size stale; only then does status read the page. One
+  // during the read it waits for can leave that answer old, so it reads once more.
+  const desktopStatusViewport = async (tab: ServerTab) => {
+    const changes = tab.desktopViewportChanges;
+    await (tab.desktopViewportStale || tab.dialog ? layoutSize(tab) : tab.desktopViewportRead);
+    if (tab.desktopViewportChanges !== changes) await layoutSize(tab);
+    return tab.desktopViewport;
+  };
+
   const applyZoom = async (tab: ServerTab) => {
     if (tab.desktop) return;
     const size = tab.page.viewportSize();
@@ -887,8 +931,8 @@ const make = Effect.gen(function* () {
     if (desktop) opened.push(desktop.close);
     // Attaching over CDP emulates a light scheme; a tab on System follows the desktop's.
     if (desktop) await desktop.page.emulateMedia({ colorScheme: null });
-    // Otherwise a desktop that attaches late shows its own page, and the agent drives another.
-    if (!desktop && desktopChannel.available) {
+    // Otherwise a desktop that attaches late, or has no channel to draw it, shows its own page.
+    if (!desktop) {
       await runPromise(
         manager
           .markHeadless({ threadId: ThreadId.make(snapshot.threadId), tabId: snapshot.tabId })
@@ -960,13 +1004,18 @@ const make = Effect.gen(function* () {
       desktopViewport: null,
       desktopViewportRead: Promise.resolve(null),
       desktopViewportNext: null,
+      desktopViewportStale: true,
+      desktopViewportChanges: 0,
+      desktopResize: Promise.withResolvers<void>(),
       loading: false,
       loadError: undefined,
       closing: false,
       recording: null,
       recordingStart: null,
       initialNavigation: null,
+      pendingInitialRequestUrl: null,
       navigationGeneration: 0,
+      stoppedGeneration: null,
       abortedNavigation: null,
       captureLock: Promise.resolve(),
       capturing: 0,
@@ -978,9 +1027,16 @@ const make = Effect.gen(function* () {
     if (desktop) {
       // The desktop resizes and zooms its webview itself; viewers map input with the new size.
       const remeasure = () => {
+        tab.desktopViewportStale = true;
+        tab.desktopViewportChanges += 1;
         if (tab.viewers.size > 0) return broadcastViewport(tab).catch(constVoid);
       };
-      cdp.on("Page.frameResized", remeasure);
+      cdp.on("Page.frameResized", () => {
+        const drawn = tab.desktopResize;
+        tab.desktopResize = Promise.withResolvers();
+        drawn.resolve();
+        return remeasure();
+      });
       // A read a navigation broke has a fresh page to measure.
       cdp.on("Page.loadEventFired", remeasure);
       // Closing a dialog resizes nothing, and the host can close it without us.
@@ -995,10 +1051,20 @@ const make = Effect.gen(function* () {
     const navigationGenerations = new WeakMap<object, number>();
     page.on("request", (request) => {
       if (!isMainNavigation(request)) return;
+      // Playwright can deliver the first request after Stop has already settled its navigation.
+      const stoppedInitialRequest =
+        request.url() === tab.pendingInitialRequestUrl &&
+        tab.stoppedGeneration === tab.navigationGeneration;
+      tab.pendingInitialRequestUrl = null;
       navigationGenerations.set(request, ++tab.navigationGeneration);
       clearAbortedNavigation(tab);
       tab.loading = true;
       tab.loadError = undefined;
+      if (stoppedInitialRequest) {
+        tab.stoppedGeneration = tab.navigationGeneration;
+        settleStoppedNavigation(tab, tab.navigationGeneration);
+        return;
+      }
       report(tab, {
         _tag: "Loading",
         url: ServerBrowserPage.withoutDataPayload(request.url()).slice(0, 2048),
@@ -1006,6 +1072,7 @@ const make = Effect.gen(function* () {
       });
     });
     page.on("load", () => {
+      tab.pendingInitialRequestUrl = null;
       tab.loading = false;
       void reportLoaded(tab);
     });
@@ -1038,6 +1105,10 @@ const make = Effect.gen(function* () {
       if (generation !== tab.navigationGeneration) return;
       // An aborted navigation is usually a download; its `download` event settles the status.
       if (errorText.includes("ERR_ABORTED")) {
+        if (tab.stoppedGeneration === generation) {
+          settleStoppedNavigation(tab, generation);
+          return;
+        }
         const url = request.url();
         const navigationGeneration = tab.navigationGeneration;
         clearAbortedNavigation(tab);
@@ -1104,6 +1175,10 @@ const make = Effect.gen(function* () {
       snapshot.navStatus._tag === "Loading" &&
       ((!adopted && !desktop) || isPdfAssetUrl(snapshot.navStatus.url))
     ) {
+      tab.loading = true;
+      const initialUrl = URL.parse(snapshot.navStatus.url);
+      if (initialUrl) initialUrl.hash = "";
+      tab.pendingInitialRequestUrl = initialUrl?.href ?? null;
       const options = { waitUntil: "commit", timeout: NAVIGATION_TIMEOUT_MS } as const;
       tab.initialNavigation = (
         (desktop || adopted) && page.url() === snapshot.navStatus.url
@@ -1141,6 +1216,14 @@ const make = Effect.gen(function* () {
     tab.abortedNavigation = null;
   };
 
+  const settleStoppedNavigation = (tab: ServerTab, generation: number) => {
+    if (tab.navigationGeneration !== generation || !tab.loading) return;
+    clearAbortedNavigation(tab);
+    tab.loading = false;
+    if (tab.page.url() === "about:blank") report(tab, { _tag: "Idle" });
+    else void reportLoaded(tab);
+  };
+
   const settleAbortedNavigation = (
     tab: ServerTab,
     generation: number,
@@ -1599,12 +1682,55 @@ const make = Effect.gen(function* () {
         ? ("agent" as const)
         : ("unclaimed" as const);
 
+  const resolveReportedProfiles = (input: PreviewReportProfilesInput) => {
+    const profiles = resolveBrowserProfiles(input.profiles);
+    return {
+      profiles,
+      defaultProfileId:
+        findBrowserProfile(profiles, input.defaultProfileId)?.id ?? DEFAULT_BROWSER_PROFILE_ID,
+    };
+  };
+
+  // Clients report profiles only when they connect, so the catalog at the last report is
+  // kept on disk for agents and scheduled tasks that open a profile after a restart.
+  const savedProfilesPath = NodePath.join(
+    config.stateDir,
+    "server-browser",
+    "reported-profiles.json",
+  );
+  const fileServices = yield* Effect.context<FileSystem.FileSystem | Path.Path>();
+  const saveProfilesLock = yield* Semaphore.make(1);
+  let savedProfiles = yield* (yield* FileSystem.FileSystem).readFileString(savedProfilesPath).pipe(
+    Effect.tapError((cause) =>
+      cause.reason._tag === "NotFound"
+        ? Effect.void
+        : Effect.logWarning("failed to read saved browser profiles", {
+            path: savedProfilesPath,
+            cause,
+          }),
+    ),
+    Effect.orElseSucceed(() => ""),
+  );
   const reportsByClient = new Map<number, PreviewReportProfilesInput>();
   let nextClient = 0;
   let reportedProfiles: {
     readonly profiles: ReadonlyArray<BrowserProfile>;
     readonly defaultProfileId: string;
-  } | null = null;
+  } | null = yield* decodeSavedProfiles(savedProfiles).pipe(
+    Effect.map(resolveReportedProfiles),
+    Effect.tapError((cause) =>
+      savedProfiles === ""
+        ? Effect.void
+        : Effect.logWarning("ignoring invalid saved browser profiles", {
+            path: savedProfilesPath,
+            cause,
+          }),
+    ),
+    Effect.orElseSucceed(() => null),
+  );
+  // Only reports change what is saved, so the order clients disconnect in at shutdown,
+  // even while a save waits for the lock, cannot shrink the saved catalog.
+  let catalogToSave = reportedProfiles;
   // Agent recordings encode here, so they need the client's Browser recording frame rate. The
   // last report outlives the client, which lets agents record while no client is connected.
   let recordingFrameRate = DEFAULT_BROWSER_RECORDING_FRAME_RATE;
@@ -1620,14 +1746,32 @@ const make = Effect.gen(function* () {
       latest = report;
     }
     if (latest === undefined) return;
-    const profiles = resolveBrowserProfiles([...byId.values()]);
-    reportedProfiles = {
-      profiles,
-      defaultProfileId:
-        findBrowserProfile(profiles, latest.defaultProfileId)?.id ?? DEFAULT_BROWSER_PROFILE_ID,
-    };
+    reportedProfiles = resolveReportedProfiles({
+      profiles: [...byId.values()],
+      defaultProfileId: latest.defaultProfileId,
+    });
   };
 
+  const saveReportedProfiles = Effect.fn("ServerBrowser.saveReportedProfiles")(function* () {
+    if (catalogToSave === null) return;
+    const contents = encodeSavedProfiles({
+      profiles: catalogToSave.profiles.filter((profile) => !isBuiltInBrowserProfileId(profile.id)),
+      defaultProfileId: catalogToSave.defaultProfileId,
+    });
+    if (contents === savedProfiles) return;
+    yield* writeFileStringAtomically({ filePath: savedProfilesPath, contents }).pipe(
+      Effect.provideContext(fileServices),
+      Effect.tap(() =>
+        Effect.sync(() => {
+          savedProfiles = contents;
+        }),
+      ),
+      Effect.catch((cause) =>
+        Effect.logWarning("failed to save reported browser profiles", { cause }),
+      ),
+    );
+  }, saveProfilesLock.withPermits(1));
+
   const profileReporter: ServerBrowser["Service"]["profileReporter"] = Effect.acquireRelease(
     Effect.sync(() => nextClient++),
     (client) =>
@@ -1645,7 +1789,13 @@ const make = Effect.gen(function* () {
             reportsByClient.delete(client);
             reportsByClient.set(client, input);
             rebuildReportedProfiles();
-          }),
+            catalogToSave = reportedProfiles;
+          }).pipe(
+            Effect.andThen(saveReportedProfiles),
+            // A disconnect, even while an earlier save holds the lock, must not drop this
+            // report's save or leave the saved-content cache stale.
+            Effect.uninterruptible,
+          ),
     ),
   );
 
@@ -1706,6 +1856,14 @@ const make = Effect.gen(function* () {
     }
   };
 
+  const withinStatusDeadline = <A>(read: Promise<A>, late: () => A): Promise<A> => {
+    let timer: ReturnType<typeof setTimeout> | undefined;
+    const deadline = new Promise<A>((resolve) => {
+      timer = setTimeout(() => resolve(late()), STATUS_READ_MS);
+    });
+    return Promise.race([read, deadline]).finally(() => clearTimeout(timer));
+  };
+
   const statusWithTitle = async (
     tab: ServerTab | undefined,
     agentSessionId?: string,
@@ -1722,14 +1880,26 @@ const make = Effect.gen(function* () {
       };
     }
     const url = ServerBrowserPage.withoutDataPayload(tab.page.url());
-    const viewport = tab.desktop ? await layoutSize(tab) : tab.page.viewportSize();
     const loadError = loadErrorOf(tab);
-    const status = {
+    const statusUrl = loadError?.url ?? (url === "about:blank" ? null : url);
+    const [viewport, title] = await Promise.all([
+      // A late measurement still lands in desktopViewport for the next status.
+      tab.desktop
+        ? withinStatusDeadline(desktopStatusViewport(tab), () => tab.desktopViewport)
+        : tab.page.viewportSize(),
+      statusUrl === null || tab.dialog
+        ? null
+        : withinStatusDeadline(
+            tab.page.title().catch(() => ""),
+            () => "",
+          ).then((title) => title || null),
+    ]);
+    return {
       available: true,
       visible: isVisible(tab),
       tabId: tab.tabId,
-      url: loadError?.url ?? (url === "about:blank" ? null : url),
-      title: null,
+      url: statusUrl,
+      title,
       loading: tab.loading,
       ...(loadError ? { loadError } : {}),
       control: {
@@ -1767,8 +1937,6 @@ const make = Effect.gen(function* () {
         completedAt,
       })),
     };
-    if (status.url === null || tab.dialog) return status;
-    return { ...status, title: (await tab.page.title().catch(() => "")) || null };
   };
 
   const resolveNavigationUrl = (input: PreviewAutomationNavigateInput) => {
@@ -1786,20 +1954,23 @@ const make = Effect.gen(function* () {
     readiness: "load" | "domContentLoaded" | "none",
     timeout: number,
   ) => {
-    const navigation = tab.page.goto(url, {
-      timeout,
-      waitUntil:
-        readiness === "domContentLoaded"
-          ? "domcontentloaded"
-          : readiness === "none"
-            ? "commit"
-            : "load",
-    });
+    tab.pendingInitialRequestUrl = null;
+    const startedAt = performance.now();
+    const navigation = tab.page.goto(url, { timeout, waitUntil: "commit" });
     if (readiness === "none") {
       tab.control.track(navigation);
       return;
     }
-    await navigation.catch((cause: unknown) => {
+    // Once the target commits, a stalled subresource only delays readiness; report the loading tab.
+    const ready = () =>
+      tab.page
+        .waitForLoadState(readiness === "domContentLoaded" ? "domcontentloaded" : "load", {
+          timeout: Math.max(1, timeout - (performance.now() - startedAt)),
+        })
+        .catch((cause: unknown) => {
+          if (!(cause instanceof Error && cause.name === "TimeoutError")) throw cause;
+        });
+    await navigation.then(ready).catch((cause: unknown) => {
       const message = cause instanceof Error ? cause.message : String(cause);
       if (message.includes("Download is starting")) {
         throw new ServerBrowserPage.ServerBrowserOperationError({
@@ -1847,24 +2018,37 @@ const make = Effect.gen(function* () {
         const opened = await tab.page.context().newCDPSession(tab.page);
         session = opened;
         const framesInFlight = new Set<Promise<void>>();
+        // Chrome withholds frames while acks are outstanding, so ack on arrival and let a
+        // slow encoder skip to the newest frame instead of throttling the capture.
+        let pendingFrame: readonly [string, number] | null = null;
+        const deliverPending = async () => {
+          while (pendingFrame) {
+            const next = pendingFrame;
+            pendingFrame = null;
+            const accepted = await encoder
+              .evaluate(
+                ([data, width]) =>
+                  (globalThis as unknown as EncoderWindow).__t3Recorder.frame(data, width),
+                next,
+              )
+              .catch(() => true);
+            if (!accepted) {
+              pendingFrame = null;
+              await opened.send("Page.stopScreencast").catch(constVoid);
+            }
+          }
+        };
         opened.on("Page.screencastFrame", (frame) => {
+          void opened
+            .send("Page.screencastFrameAck", { sessionId: frame.sessionId })
+            .catch(constVoid);
           const cssWidth = tab.page.viewportSize()?.width ?? frame.metadata.deviceWidth;
-          const delivered: Promise<void> = encoder
-            .evaluate(
-              ([data, width]) =>
-                (globalThis as unknown as EncoderWindow).__t3Recorder.frame(data, width),
-              [frame.data, cssWidth] as const,
-            )
-            .then(async (accepted) => {
-              if (!accepted) await opened.send("Page.stopScreencast");
-            })
-            .catch(constVoid)
-            .finally(() => {
-              framesInFlight.delete(delivered);
-              void opened
-                .send("Page.screencastFrameAck", { sessionId: frame.sessionId })
-                .catch(constVoid);
-            });
+          const delivering = framesInFlight.size > 0;
+          pendingFrame = [frame.data, cssWidth];
+          if (delivering) return;
+          const delivered: Promise<void> = deliverPending().finally(() =>
+            framesInFlight.delete(delivered),
+          );
           framesInFlight.add(delivered);
         });
         await opened.send("Page.startScreencast", RECORDING_SCREENCAST);
@@ -1920,8 +2104,6 @@ const make = Effect.gen(function* () {
           message: "No recording is active for this tab.",
         });
       }
-      let mimeType: string | null;
-      const chunks: Array<Buffer> = [];
       try {
         await recording.session.send("Page.stopScreencast").catch(constVoid);
         await Promise.all(recording.framesInFlight);
@@ -1945,50 +2127,72 @@ const make = Effect.gen(function* () {
               .catch(constVoid);
           }
         }
-        const stopped = await recording.encoder.evaluate(() =>
+        const { mimeType, count, bytes } = await recording.encoder.evaluate(() =>
           (globalThis as unknown as EncoderWindow).__t3Recorder.stop(),
         );
-        mimeType = stopped.mimeType;
         // Checked before the transfer so an oversized video never lands in this process.
-        if (stopped.bytes > PROVIDER_SEND_TURN_MAX_FILE_BYTES) {
+        if (bytes > PROVIDER_SEND_TURN_MAX_FILE_BYTES) {
           throw new ServerBrowserPage.ServerBrowserOperationError({
             tag: "PreviewAutomationRecordingTooLargeError",
             message: "The recording is larger than the attachment limit.",
           });
         }
-        for (let index = 0; index < stopped.count; index += 1) {
-          const chunk = await recording.encoder.evaluate(
-            (chunkIndex) => (globalThis as unknown as EncoderWindow).__t3Recorder.chunk(chunkIndex),
-            index,
-          );
-          chunks.push(Buffer.from(chunk, "base64"));
+        if (!mimeType || bytes === 0) {
+          throw new ServerBrowserPage.ServerBrowserOperationError({
+            tag: "PreviewAutomationExecutionError",
+            message: "The recording captured no frames.",
+          });
+        }
+        const extension = mimeType.startsWith("video/mp4") ? "mp4" : "webm";
+        const pendingId = `${PENDING_ATTACHMENT_THREAD_SEGMENT}-${NodeCrypto.randomUUID()}-${extension}`;
+        const path = NodePath.join(config.attachmentsDir, `${pendingId}.${extension}`);
+        await NodeFSP.mkdir(config.attachmentsDir, { recursive: true });
+        if (bytes >= RECORDING_BINARY_EXPORT_MIN_BYTES) {
+          const stagedPath = `${path}.partial`;
+          try {
+            const [download] = await Promise.all([
+              recording.encoder.waitForEvent("download", {
+                timeout: RECORDING_DOWNLOAD_TIMEOUT_MS,
+              }),
+              recording.encoder.evaluate(() =>
+                (globalThis as unknown as EncoderWindow).__t3Recorder.download(),
+              ),
+            ]);
+            await download.saveAs(stagedPath);
+            if ((await NodeFSP.stat(stagedPath)).size !== bytes) {
+              throw new Error("The recording download is incomplete.");
+            }
+            await NodeFSP.rename(stagedPath, path);
+          } finally {
+            await NodeFSP.rm(stagedPath, { force: true }).catch(constVoid);
+          }
+        } else {
+          const chunks: Array<Buffer> = [];
+          for (let index = 0; index < count; index += 1) {
+            const chunk = await recording.encoder.evaluate(
+              (chunkIndex) =>
+                (globalThis as unknown as EncoderWindow).__t3Recorder.chunk(chunkIndex),
+              index,
+            );
+            chunks.push(Buffer.from(chunk, "base64"));
+          }
+          const data = Buffer.concat(chunks);
+          if (data.byteLength !== bytes) throw new Error("The recording transfer is incomplete.");
+          await NodeFSP.writeFile(path, data);
         }
+        return {
+          id: pendingId,
+          tabId: tab.tabId,
+          path,
+          mimeType: mimeType.split(";")[0]!,
+          sizeBytes: bytes,
+          createdAt: new Date().toISOString(),
+          uploadedAttachmentId: pendingId,
+        };
       } finally {
         await recording.encoder.close().catch(constVoid);
         tab.recording = null;
       }
-      const data = Buffer.concat(chunks);
-      if (!mimeType || data.byteLength === 0) {
-        throw new ServerBrowserPage.ServerBrowserOperationError({
-          tag: "PreviewAutomationExecutionError",
-          message: "The recording captured no frames.",
-        });
-      }
-
-      const extension = mimeType.startsWith("video/mp4") ? "mp4" : "webm";
-      const pendingId = `${PENDING_ATTACHMENT_THREAD_SEGMENT}-${NodeCrypto.randomUUID()}-${extension}`;
-      const path = NodePath.join(config.attachmentsDir, `${pendingId}.${extension}`);
-      await NodeFSP.mkdir(config.attachmentsDir, { recursive: true });
-      await NodeFSP.writeFile(path, data);
-      return {
-        id: pendingId,
-        tabId: tab.tabId,
-        path,
-        mimeType: mimeType.split(";")[0]!,
-        sizeBytes: data.byteLength,
-        createdAt: new Date().toISOString(),
-        uploadedAttachmentId: pendingId,
-      };
     });
 
   let pointerSequence = 0;
@@ -2276,10 +2480,10 @@ const make = Effect.gen(function* () {
     const tab = await requireTab(request);
     // Closing must unblock an action waiting on a dialog, without queueing behind it.
     if (request.operation === "close") {
-      if (tab.control.agentId !== request.agentSessionId)
+      if (tab.control.agentId === null)
         throw new BrowserControlInterrupted({
-          message: "Only the agent session that opened this tab can close it.",
-          reason: "agentMismatch",
+          message: "This tab has no agent owner. Ask the user to close it in the browser panel.",
+          reason: "unclaimedTab",
         });
       if (tab.control.controller !== null)
         throw new BrowserControlInterrupted({
@@ -2318,7 +2522,7 @@ const make = Effect.gen(function* () {
             message: "A browser dialog is pending. Read preview_status.",
             reason: "dialogPending",
           });
-        return executeTabOperation(tab, request);
+        return executeTabOperation(tab, request, deadlineMs);
       });
     }
     return tab.control.agent(
@@ -2334,7 +2538,7 @@ const make = Effect.gen(function* () {
         tab.agentOperating = !READ_OPERATIONS.has(request.operation);
         updateFileChooserInterception(tab);
         try {
-          return await executeTabOperation(tab, request);
+          return await executeTabOperation(tab, request, deadlineMs);
         } finally {
           tab.agentOperating = false;
           updateFileChooserInterception(tab);
@@ -2345,7 +2549,11 @@ const make = Effect.gen(function* () {
     );
   };
 
-  const executeTabOperation = async (tab: ServerTab, request: PreviewAutomationRequest) => {
+  const executeTabOperation = async (
+    tab: ServerTab,
+    request: PreviewAutomationRequest,
+    deadlineMs: number,
+  ) => {
     const input = request.input;
     switch (request.operation) {
       case "navigate": {
@@ -2362,14 +2570,40 @@ const make = Effect.gen(function* () {
       }
       case "resize": {
         const setting = resolvePreviewViewport(input as PreviewAutomationResizeInput);
+        const from = fixedViewportSize(tab.setting);
+        const to = fixedViewportSize(setting);
+        const drawn = tab.desktopResize.promise;
         await runPromise(
           manager.resize({ threadId: tab.threadId, tabId: tab.tabId, viewport: setting }),
         );
         await applySetting(tab, setting);
+        if (!tab.desktop) {
+          return {
+            tabId: tab.tabId,
+            setting,
+            viewport: tab.page.viewportSize() ?? UNATTACHED_FILL_VIEWPORT,
+          };
+        }
+        const changed = from?.width !== to?.width || from?.height !== to?.height;
+        const remainingMs = () => Math.max(0, deadlineMs - performance.now());
+        const within = <A>(promise: Promise<A>, ms: number) =>
+          runPromise(
+            Effect.promise(() => promise).pipe(
+              Effect.timeoutOption(ms),
+              Effect.map(Option.getOrNull),
+            ),
+          );
+        // The desktop draws the new size after the session update; its page resize says it has.
+        // Half the time left keeps room for the read, which runs even if nothing was drawn,
+        // because a page can keep another size than the one asked for.
+        if (changed) await within(drawn, Math.min(DESKTOP_RESIZE_WAIT_MS, remainingMs() / 2));
+        const changes = tab.desktopViewportChanges;
+        const measured = await within(measureDesktopViewport(tab), remainingMs());
+        // Only a read after the draw, with no page resize or load during it, measures this resize.
         return {
           tabId: tab.tabId,
           setting,
-          viewport: tab.page.viewportSize() ?? UNATTACHED_FILL_VIEWPORT,
+          ...(measured && tab.desktopViewportChanges === changes ? { viewport: measured } : {}),
         };
       }
       case "setColorScheme": {
@@ -2490,6 +2724,8 @@ const make = Effect.gen(function* () {
         return;
       }
       if (event.type === "resized") {
+        // Desktop tabs only record the setting, so status need not wait behind an agent action.
+        if (tab.desktop) tab.setting = event.snapshot.viewport ?? FILL_PREVIEW_VIEWPORT;
         await tab.control
           .system(async () => {
             if (
@@ -2501,7 +2737,10 @@ const make = Effect.gen(function* () {
             const request = event.request;
             if (request?.clear === "cookies") await tab.cdp.send("Network.clearBrowserCookies");
             if (request?.clear === "cache") await tab.cdp.send("Network.clearBrowserCache");
-            if (request?.hardReload) await tab.cdp.send("Page.reload", { ignoreCache: true });
+            if (request?.hardReload) {
+              tab.pendingInitialRequestUrl = null;
+              await tab.cdp.send("Page.reload", { ignoreCache: true });
+            }
           })
           .catch((cause: unknown) =>
             runFork(Effect.logWarning("server preview could not apply a tab setting", { cause })),
@@ -2643,17 +2882,28 @@ const make = Effect.gen(function* () {
       case "navigate":
         if (typeof message.url === "string") {
           const url = normalizePreviewUrl(message.url);
+          tab.pendingInitialRequestUrl = null;
           tab.control.trackUntilHandoff(tab.page.goto(url, VIEWER_NAVIGATION_OPTIONS));
         }
         return;
       case "history":
+        tab.pendingInitialRequestUrl = null;
         tab.control.trackUntilHandoff(
           num(message.delta) < 0
             ? tab.page.goBack(VIEWER_NAVIGATION_OPTIONS)
             : tab.page.goForward(VIEWER_NAVIGATION_OPTIONS),
         );
         return;
+      case "stopLoading": {
+        const generation = tab.navigationGeneration;
+        tab.stoppedGeneration = generation;
+        await session.send("Page.stopLoading");
+        // Stopping a committed document need not emit Playwright's load or requestfailed events.
+        settleStoppedNavigation(tab, generation);
+        return;
+      }
       case "reload":
+        tab.pendingInitialRequestUrl = null;
         if (message.ignoreCache === true) {
           await session.send("Page.reload", { ignoreCache: true });
           return;
@@ -2778,9 +3028,19 @@ const make = Effect.gen(function* () {
     broadcastControl(tab);
     pushFileChooser(tab);
     const pushStill = async () => {
-      const data = await withCaptureLock(tab, () =>
-        ServerBrowserPage.captureViewport(session, { format: "jpeg", quality }),
-      ).catch(() => null);
+      const data = await withCaptureLock(tab, async () => {
+        let timer: ReturnType<typeof setTimeout> | undefined;
+        try {
+          return await Promise.race([
+            ServerBrowserPage.captureViewport(session, { format: "jpeg", quality }),
+            new Promise<null>((resolve) => {
+              timer = setTimeout(() => resolve(null), VIEWER_STILL_TIMEOUT_MS);
+            }),
+          ]);
+        } finally {
+          clearTimeout(timer);
+        }
+      }).catch(() => null);
       if (data) viewer.push({ _tag: "frame", data: Buffer.from(data, "base64"), ack: Effect.void });
     };
     let settleTimer: ReturnType<typeof setTimeout> | null = null;
@@ -2838,7 +3098,7 @@ const make = Effect.gen(function* () {
     yield* Effect.promise(() => startScreencast(1));
     // An idle page does not repaint for a new screencast, so the viewer
     // starts from a still unless a live frame beat it.
-    if (!screencastStarted) yield* Effect.promise(pushStill);
+    if (!screencastStarted) yield* Effect.forkScoped(Effect.promise(pushStill));
     return {
       output,
       input: (raw: unknown) =>
diff --git a/apps/server/src/preview/ServerBrowserPage.test.ts b/apps/server/src/preview/ServerBrowserPage.test.ts
index dd1895c9b736..74da1e382571 100644
--- a/apps/server/src/preview/ServerBrowserPage.test.ts
+++ b/apps/server/src/preview/ServerBrowserPage.test.ts
@@ -19,9 +19,54 @@ import {
 } from "vite-plus/test";
 
 import * as ServerBrowserPage from "./ServerBrowserPage.ts";
+import { SessionControl } from "./SessionControl.ts";
 
 const decodeEvaluateInput = Schema.decodeUnknownSync(PreviewAutomationEvaluateInput);
 
+describe("server browser capture deadlines", () => {
+  it("releases control after an unanswered capture and ignores its late reply", async () => {
+    vi.useFakeTimers({ toFake: ["setTimeout", "clearTimeout"] });
+    try {
+      const captured = Promise.withResolvers<{ data: string }>();
+      const send = vi.fn(async (method: string) =>
+        method === "Page.captureScreenshot"
+          ? captured.promise
+          : { result: { value: "still responsive" } },
+      );
+      const cdp = { send } as unknown as CDPSession;
+      const control = new SessionControl("agent");
+      let outcome: unknown;
+      const capture = control
+        .agent("agent", () => ServerBrowserPage.captureViewport(cdp, { format: "png" }))
+        .catch((cause: unknown) => {
+          outcome = cause;
+        });
+      const evaluation = control.agent("agent", () =>
+        ServerBrowserPage.evaluate(cdp, { expression: "document.title" }, 1_000),
+      );
+
+      await vi.advanceTimersByTimeAsync(3_000);
+      expect(outcome).toMatchObject({
+        tag: "PreviewAutomationExecutionError",
+        message: expect.stringContaining("not producing screenshot frames"),
+      });
+      await capture;
+      expect(await evaluation).toBe("still responsive");
+      expect(vi.getTimerCount()).toBe(0);
+
+      captured.resolve({ data: "late-frame" });
+      await captured.promise;
+      expect(outcome).toBeInstanceOf(ServerBrowserPage.ServerBrowserOperationError);
+      expect(send.mock.calls.map(([method]) => method)).toEqual([
+        "Page.captureScreenshot",
+        "Runtime.evaluate",
+      ]);
+    } finally {
+      vi.useRealTimers();
+    }
+  });
+});
+
 describe("server browser element refs", () => {
   let browser: Browser;
   let context: BrowserContext;
@@ -532,6 +577,98 @@ describe("server browser drag", () => {
       process.off("unhandledRejection", onUnhandled);
     }
   });
+
+  it("moves the mouse after dragstart, so pages that track a drag with mousemove see it", async () => {
+    const browser = await chromium.launch({ headless: true });
+    try {
+      const page = await browser.newPage();
+      await page.setContent(`
+        <div style="display:flex;gap:40px">
+          <div id="source" draggable="true" style="width:200px;height:120px">source</div>
+          <div id="target" style="width:200px;height:120px">target</div>
+        </div>
+        <script>
+          window.events = [];
+          let dragging = false;
+          source.addEventListener("dragstart", (event) => {
+            event.preventDefault();
+            dragging = true;
+            events.push("dragstart");
+          });
+          addEventListener("mousemove", () => dragging && events.push("mousemove"));
+          addEventListener("mouseup", () => events.push("mouseup"));
+        </script>`);
+
+      await ServerBrowserPage.drag(page, { source: "#source", target: "#target" });
+
+      const events = (await page.evaluate("window.events")) as Array<string>;
+      expect(events.slice(0, 2)).toEqual(["dragstart", "mousemove"]);
+      expect(events.at(-1)).toBe("mouseup");
+    } finally {
+      await browser.close();
+    }
+  });
+});
+
+describe("server browser click", () => {
+  it("clicks a target the page replaced while it was being scrolled into view", async () => {
+    let scrolls = 0;
+    const clicks: Array<unknown> = [];
+    const page = {
+      locator: () => ({
+        // Playwright resolves the node once; a page re-rendering it detaches that node.
+        scrollIntoViewIfNeeded: async () => {
+          if (scrolls++ === 0) {
+            throw new Error("locator.scrollIntoViewIfNeeded: Element is not attached to the DOM");
+          }
+        },
+        boundingBox: async () => ({ x: 0, y: 0, width: 20, height: 20 }),
+        click: async (options: unknown) => {
+          clicks.push(options);
+        },
+        count: async () => 1,
+      }),
+      once: () => {},
+      off: () => {},
+    } as unknown as Page;
+
+    await expect(ServerBrowserPage.click(page, { selector: "#save" })).resolves.toEqual({
+      x: 10,
+      y: 10,
+    });
+    expect(clicks).toHaveLength(1);
+  });
+
+  it("retries a replaced target only within the action's timeout", async () => {
+    vi.useFakeTimers();
+    try {
+      const timeouts: Array<number | undefined> = [];
+      const clicks: Array<unknown> = [];
+      const detached = new Error(
+        "locator.scrollIntoViewIfNeeded: Element is not attached to the DOM",
+      );
+      const page = {
+        locator: () => ({
+          scrollIntoViewIfNeeded: async (options?: { timeout?: number }) => {
+            timeouts.push(options?.timeout);
+            vi.advanceTimersByTime(60);
+            throw detached;
+          },
+          click: async (options: unknown) => {
+            clicks.push(options);
+          },
+        }),
+      } as unknown as Page;
+
+      await expect(
+        ServerBrowserPage.click(page, { selector: "#save", timeoutMs: 100 }),
+      ).rejects.toBe(detached);
+      expect(timeouts).toEqual([100, 40]);
+      expect(clicks).toHaveLength(0);
+    } finally {
+      vi.useRealTimers();
+    }
+  });
 });
 
 describe("server browser evaluate", () => {
diff --git a/apps/server/src/preview/ServerBrowserPage.ts b/apps/server/src/preview/ServerBrowserPage.ts
index 29ba05c21b7e..20df4457643e 100644
--- a/apps/server/src/preview/ServerBrowserPage.ts
+++ b/apps/server/src/preview/ServerBrowserPage.ts
@@ -29,6 +29,8 @@ const isBrowserControlInterrupted = Schema.is(BrowserControlInterrupted);
 const MAX_EVALUATION_BYTES = 64_000;
 const MAX_VISIBLE_TEXT_LENGTH = 20_000;
 const MAX_SCREENSHOT_WIDTH = 1280;
+// Two attempts must fit in a snapshot's 10-second deadline.
+const SCREENSHOT_TIMEOUT_MS = 3_000;
 const WAIT_POLL_MS = 100;
 export const DIAGNOSTIC_BUFFER_LIMIT = 200;
 
@@ -145,6 +147,23 @@ export type PointerReporter = (
 ) => Promise<void>;
 const noPointer: PointerReporter = async () => {};
 
+// Locator.scrollIntoViewIfNeeded resolves its node once and fails when the page replaces it; the
+// input actions after it re-resolve, so the scroll does too, within the same timeout.
+const DETACHED = /^locator\.scrollIntoViewIfNeeded: Element is not attached to the DOM(?:\n|$)/;
+
+const scrollIntoView = async (locator: Locator, timeout: number) => {
+  const deadline = Date.now() + timeout;
+  for (;;) {
+    try {
+      return await locator.scrollIntoViewIfNeeded({ timeout: Math.max(1, deadline - Date.now()) });
+    } catch (cause) {
+      if (!(cause instanceof Error && DETACHED.test(cause.message)) || Date.now() >= deadline) {
+        throw cause;
+      }
+    }
+  }
+};
+
 const targetPoint = async (
   page: Page,
   locator: Locator | null,
@@ -152,7 +171,7 @@ const targetPoint = async (
   timeout: number,
 ) => {
   if (locator === null) return { x: input.x ?? 0, y: input.y ?? 0 };
-  await locator.scrollIntoViewIfNeeded({ timeout });
+  await scrollIntoView(locator, timeout);
   const box = await locator.boundingBox({ timeout });
   if (box) return { x: box.x + box.width / 2, y: box.y + box.height / 2 };
   const viewport = page.viewportSize();
@@ -468,10 +487,27 @@ export const captureViewport = async (
   cdp: CDPSession,
   options: { readonly format: "png" | "jpeg"; readonly quality?: number },
 ) => {
-  const { data } = await cdp.send("Page.captureScreenshot", {
+  const capture = cdp.send("Page.captureScreenshot", {
     format: options.format,
     ...(options.quality === undefined ? {} : { quality: options.quality }),
   });
+  let timer: ReturnType<typeof setTimeout> | undefined;
+  const expired = new Promise<never>((_, reject) => {
+    timer = setTimeout(
+      () =>
+        reject(
+          new ServerBrowserOperationError({
+            tag: "PreviewAutomationExecutionError",
+            message:
+              "The browser is not producing screenshot frames. For a desktop tab, show or restore the T3 Code window and try again.",
+          }),
+        ),
+      SCREENSHOT_TIMEOUT_MS,
+    );
+  });
+  // Hidden native guests can leave CDP captures pending forever. This deadline also
+  // releases a viewer's still-capture lock, which an agent snapshot may be waiting for.
+  const { data } = await Promise.race([capture, expired]).finally(() => clearTimeout(timer));
   return data;
 };
 
@@ -869,7 +905,8 @@ export const drag = async (
   const target = targetLocator(page, { locator: input.target })!;
   await pointer(await targetPoint(page, source, {}, timeout), "move");
   // Observe drag rejection immediately; an unhandled rejection during cursor movement exits the server.
-  const dragFailure = source.dragTo(target, { timeout }).then(
+  // Chromium delivers a single move before dragstart; steps give the page mousemoves during the drag.
+  const dragFailure = source.dragTo(target, { timeout, steps: 5 }).then(
     () => null,
     (error: unknown) => ({ error }),
   );
@@ -1083,7 +1120,8 @@ export const recordingEncoderScript = (frameRate: BrowserRecordingFrameRate) =>
   window.__t3Recorder = {
     async frame(base64, cssWidth) {
       if (tooLarge) return false;
-      const bytes = Uint8Array.from(atob(base64), (char) => char.charCodeAt(0));
+      // A per-character atob copy costs ~30 ms on a 3200x1800 frame and throttles recordings.
+      const bytes = Uint8Array.fromBase64(base64);
       const bitmap = await createImageBitmap(new Blob([bytes], { type: "image/jpeg" }));
       if (tooLarge) { bitmap.close(); return false; }
       if (!recorder) {
@@ -1165,11 +1203,18 @@ export const recordingEncoderScript = (frameRate: BrowserRecordingFrameRate) =>
     },
     async chunk(index) {
       const bytes = new Uint8Array(await chunks[index].arrayBuffer());
+      if (typeof bytes.toBase64 === "function") return bytes.toBase64();
       let binary = "";
       for (let offset = 0; offset < bytes.length; offset += 0x8000) {
         binary += String.fromCharCode(...bytes.subarray(offset, offset + 0x8000));
       }
       return btoa(binary);
     },
+    download() {
+      const link = document.createElement("a");
+      link.href = URL.createObjectURL(new Blob(chunks, { type: recorder.mimeType }));
+      link.download = "recording";
+      link.click();
+    },
   };
 })()`;
diff --git a/apps/server/src/preview/ServerBrowserStream.test.ts b/apps/server/src/preview/ServerBrowserStream.test.ts
index c4a709ed8acc..c0a9fbc923ff 100644
--- a/apps/server/src/preview/ServerBrowserStream.test.ts
+++ b/apps/server/src/preview/ServerBrowserStream.test.ts
@@ -57,6 +57,7 @@ const mutations = [
   { type: "navigate", url: "https://example.com" },
   { type: "history", delta: -1 },
   { type: "reload" },
+  { type: "stopLoading" },
   { type: "probe", x: 10, y: 10 },
   { type: "takeControl" },
   { type: "releaseControl" },
@@ -149,7 +150,7 @@ it.effect.each([
       },
     ]);
     expect(auth.requests).toEqual([resource]);
-  }).pipe(Effect.scoped),
+  }),
 );
 
 it.effect("sends replies ahead of stale frames and only the newest frame after an ack", () =>
@@ -221,7 +222,7 @@ it.effect("sends replies ahead of stale frames and only the newest frame after a
     yield* Effect.promise(() => next.promise);
     expect(received).toEqual([1, "probe", 4]);
     expect(released).toEqual([2, 3, 1]);
-  }).pipe(Effect.scoped),
+  }),
 );
 
 it.effect.each([
@@ -264,7 +265,7 @@ it.effect.each([
     );
     expect(response.status).toBe(testCase.status);
     expect(attachments).toBe(0);
-  }).pipe(Effect.scoped),
+  }),
 );
 
 it.effect("serves a tab's download only to an authorized session", () =>
@@ -369,7 +370,7 @@ it.effect("passes uploaded files to the page's open picker and needs operate sco
       { chooserId: "chooser-1", files: [{ name: "notes.txt", text: "hello" }] },
     ]);
     expect((yield* upload([AuthPreviewOperateScope], "stale")).status).toBe(409);
-  }).pipe(Effect.scoped),
+  }),
 );
 
 const decodeHostSetup = Schema.decodeUnknownEffect(Schema.fromJsonString(PreviewStreamHostSetup));
@@ -430,5 +431,5 @@ it.effect.each([
       need,
       command: "sudo t3 browser setup",
     });
-  }).pipe(Effect.scoped),
+  }),
 );
diff --git a/apps/server/src/process/agentScope.test.ts b/apps/server/src/process/agentScope.test.ts
index 0095146a3021..a44ff15359f3 100644
--- a/apps/server/src/process/agentScope.test.ts
+++ b/apps/server/src/process/agentScope.test.ts
@@ -16,6 +16,7 @@ import { ChildProcess, ChildProcessSpawner } from "effect/process";
 import * as ServerConfig from "../config.ts";
 import { makeCodexAppServerSpawnCommand } from "../orchestration-v2/Adapters/CodexAdapterV2.ts";
 import * as ProcessRunner from "../processRunner.ts";
+import * as ProviderProcesses from "./providerProcesses.ts";
 import { classifyScope, make, ownedAgentSlice, type ScopeState } from "./agentScope.ts";
 
 const running: ScopeState = {
@@ -55,7 +56,14 @@ const withFakeSystemd = <A, E>(
   {
     oomPolicy = true,
     stopFails = false,
-  }: { readonly oomPolicy?: boolean; readonly stopFails?: boolean } = {},
+    leftovers = false,
+    liveOwner = false,
+  }: {
+    readonly oomPolicy?: boolean;
+    readonly stopFails?: boolean;
+    readonly leftovers?: boolean;
+    readonly liveOwner?: boolean;
+  } = {},
 ) =>
   Effect.gen(function* () {
     const bin = NodeFS.mkdtempSync(NodePath.join(NodeOS.tmpdir(), "t3-agent-scope-"));
@@ -102,7 +110,12 @@ const withFakeSystemd = <A, E>(
         }),
     });
     const fileSystem = yield* FileSystem.FileSystem;
+    const { stateDir } = yield* ServerConfig.ServerConfig;
+    if (leftovers) {
+      units.set(ownedAgentSlice(stateDir), { activeState: "active", result: "success" });
+    }
     const scope = yield* make.pipe(
+      Effect.provideService(ProviderProcesses.ProviderProcesses, { hasOtherLiveOwner: liveOwner }),
       Effect.provideService(ProcessRunner.ProcessRunner, runner),
       Effect.provideService(HostProcess.Platform, "linux"),
       Effect.provideService(HostProcess.Environment, { PATH: bin, XDG_RUNTIME_DIR: "/run/user/1" }),
@@ -114,7 +127,6 @@ const withFakeSystemd = <A, E>(
           fileSystem.writeFileString(path.replace("/sys/fs/cgroup", cgroupRoot), data, options),
       }),
     );
-    const { stateDir } = yield* ServerConfig.ServerConfig;
     return yield* body({ scope, units, calls, stateDir, cgroupRoot }).pipe(
       Effect.ensuring(Effect.sync(() => NodeFS.rmSync(bin, { recursive: true, force: true }))),
     );
@@ -308,27 +320,34 @@ describe("AgentScope service", () => {
     ),
   );
 
-  it.effect("stops agents a killed server left before the first launch", () =>
-    withFakeSystemd(({ scope, units, calls, stateDir }) =>
-      Effect.gen(function* () {
-        units.set(ownedAgentSlice(stateDir), { activeState: "active", result: "success" });
-        const agent = yield* scope.wrap({ command: "agent", args: [], name: "t", threadId: "a" });
-        const stops = calls.filter(([, verb]) => verb === "stop");
-        expect(stops).toEqual([["--user", "stop", ownedAgentSlice(stateDir)]]);
-        expect(sliceOf(agent)).toBe(ownedAgentSlice(stateDir));
-        expect(agent.args).toContain("--property=TimeoutStopSec=10s");
-        const terminal = yield* scope.wrap({
-          command: "agent",
-          args: [],
-          name: "terminal",
-          survivesRestart: true,
-        });
-        expect(sliceOf(terminal)).toBe("app-t3code-agents.slice");
-        expect(calls.filter(([, verb]) => verb === "stop")).toHaveLength(1);
-      }),
+  it.effect("stops agents a killed server left before startup completes", () =>
+    withFakeSystemd(
+      ({ scope, calls, stateDir }) =>
+        Effect.gen(function* () {
+          expect(stopsOf(calls)).toEqual([["--user", "stop", ownedAgentSlice(stateDir)]]);
+          const agent = yield* scope.wrap({ command: "agent", args: [], name: "t", threadId: "a" });
+          expect(sliceOf(agent)).toBe(ownedAgentSlice(stateDir));
+          expect(agent.args).toContain("--property=TimeoutStopSec=10s");
+          const terminal = yield* scope.wrap({
+            command: "agent",
+            args: [],
+            name: "terminal",
+            survivesRestart: true,
+          });
+          expect(sliceOf(terminal)).toBe("app-t3code-agents.slice");
+          expect(stopsOf(calls)).toHaveLength(1);
+        }),
+      { leftovers: true },
     ),
   );
 
+  it.effect("leaves the slice to another live server sharing this home", () =>
+    withFakeSystemd(({ calls }) => Effect.sync(() => expect(stopsOf(calls)).toEqual([])), {
+      leftovers: true,
+      liveOwner: true,
+    }),
+  );
+
   it.effect("stops leftover processes only in an active agent scope", () =>
     withFakeSystemd(({ scope, units, calls, cgroupRoot }) =>
       Effect.gen(function* () {
diff --git a/apps/server/src/process/agentScope.ts b/apps/server/src/process/agentScope.ts
index b9b6b56acb14..7adc4c453be0 100644
--- a/apps/server/src/process/agentScope.ts
+++ b/apps/server/src/process/agentScope.ts
@@ -17,6 +17,7 @@ import * as Path from "effect/Path";
 
 import * as ServerConfig from "../config.ts";
 import * as ProcessRunner from "../processRunner.ts";
+import * as ProviderProcesses from "./providerProcesses.ts";
 
 const AGENT_SLICE = "app-t3code-agents.slice";
 // Owns every agent slice and competes with the server's unit or scope under app.slice.
@@ -106,6 +107,7 @@ export const make = Effect.gen(function* () {
   const path = yield* Path.Path;
   const hostEnvironment = yield* HostProcess.Environment;
   const { stateDir } = yield* ServerConfig.ServerConfig;
+  const { hasOtherLiveOwner } = yield* ProviderProcesses.ProviderProcesses;
   const ownedSlice = ownedAgentSlice(stateDir);
   const layerScope = yield* Effect.scope;
 
@@ -130,6 +132,7 @@ export const make = Effect.gen(function* () {
   const stopLeftoverAgents = Effect.fn("agentScope.stopLeftoverAgents")(function* (
     systemctl: string,
   ) {
+    if (hasOtherLiveOwner) return;
     const shown = yield* run(systemctl, [
       "--user",
       "show",
@@ -215,6 +218,10 @@ export const make = Effect.gen(function* () {
     }),
   );
 
+  // Layer acquisition is the startup barrier: recovery must not terminalize or
+  // continue old runs while a previous server's providers can still execute.
+  yield* systemd;
+
   // `shared` scopes serve other threads too: tracked only for OOM diagnosis on old systemd.
   const scopeByThread = new Map<string, { unit: string; oomKilled: boolean; shared: boolean }>();
 
@@ -427,4 +434,7 @@ export const make = Effect.gen(function* () {
   } satisfies AgentScopeShape;
 });
 
-export const layer = Layer.effect(AgentScope, make).pipe(Layer.provide(ProcessRunner.layer));
+export const layer = Layer.effect(AgentScope, make).pipe(
+  Layer.provide(ProcessRunner.layer),
+  Layer.provideMerge(ProviderProcesses.layer),
+);
diff --git a/apps/server/src/process/externalLauncher.test.ts b/apps/server/src/process/externalLauncher.test.ts
index ed3dc623af3d..0f73ab4fb9c5 100644
--- a/apps/server/src/process/externalLauncher.test.ts
+++ b/apps/server/src/process/externalLauncher.test.ts
@@ -687,7 +687,11 @@ it.effect.each([
       yield* Effect.gen(function* () {
         const launcher = yield* ExternalLauncher.ExternalLauncher;
         assert.include(yield* launcher.resolveAvailableEditors(), editor);
-        yield* launcher.launchEditor({ editor, cwd: "/workspace with spaces/file.ts:12:4" });
+        yield* launcher.launchEditor({
+          editor,
+          cwd: "/workspace with spaces/file.ts:12:4",
+          projectRoot: "/workspace with spaces",
+        });
       }).pipe(
         Effect.provide(
           layerTest({
@@ -703,6 +707,7 @@ it.effect.each([
       assert.ok(spawned);
       assert.equal(spawned.command, executable);
       assert.deepEqual(spawned.args, [
+        "/workspace with spaces",
         "--line",
         "12",
         "--column",
diff --git a/apps/server/src/process/externalLauncher.ts b/apps/server/src/process/externalLauncher.ts
index 9b1a6971a98c..aea3e2d1472f 100644
--- a/apps/server/src/process/externalLauncher.ts
+++ b/apps/server/src/process/externalLauncher.ts
@@ -140,6 +140,7 @@ function resolveCommandEditorArgs(
   editor: (typeof EDITORS)[number],
   target: string,
   isDirectory: boolean,
+  projectRoot: string | undefined,
 ): ReadonlyArray<string> {
   const parsedTarget = parseTargetPathAndPosition(target);
 
@@ -154,6 +155,8 @@ function resolveCommandEditorArgs(
       return Option.match(parsedTarget, {
         onNone: () => [target],
         onSome: ({ path, line, column }) => [
+          // Only positioned targets get the root: a folder target would open as a second project.
+          ...(projectRoot === undefined ? [] : [projectRoot]),
           "--line",
           line,
           // JetBrains IDEs count `--column` from 0; targets count columns from 1.
@@ -498,7 +501,10 @@ const resolveEditorLaunch = Effect.fn("resolveEditorLaunch")(function* (
       editor: editorDef.id,
       target: input.cwd,
       command,
-      args: [...baseArgs, ...resolveCommandEditorArgs(editorDef, input.cwd, isDirectory)],
+      args: [
+        ...baseArgs,
+        ...resolveCommandEditorArgs(editorDef, input.cwd, isDirectory, input.projectRoot),
+      ],
     };
   }
 
diff --git a/apps/server/src/process/providerProcesses.test.ts b/apps/server/src/process/providerProcesses.test.ts
new file mode 100644
index 000000000000..26bad1cec9ac
--- /dev/null
+++ b/apps/server/src/process/providerProcesses.test.ts
@@ -0,0 +1,127 @@
+// @effect-diagnostics nodeBuiltinImport:off -- real processes stand in for servers and CLIs.
+import * as NodeChildProcess from "node:child_process";
+import * as NodeCrypto from "node:crypto";
+import * as NodeFS from "node:fs";
+import * as NodeOS from "node:os";
+import * as NodePath from "node:path";
+
+import * as NodeServices from "@effect/platform-node/NodeServices";
+import { assert, describe, expect, it } from "@effect/vitest";
+import * as AcpSessionRuntime from "@t3tools/provider-acp/server/AcpSessionRuntime";
+import * as HostProcess from "@t3tools/shared/HostProcess";
+import * as Context from "effect/Context";
+import * as Deferred from "effect/Deferred";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+
+import * as ServerConfig from "../config.ts";
+import * as ProviderProcesses from "./providerProcesses.ts";
+
+// Real child processes stand in for servers and CLIs; only PIDs captured at spawn are signalled.
+const ownedProcess = Effect.gen(function* () {
+  const ready = yield* Deferred.make<void>();
+  const exited = yield* Deferred.make<void>();
+  const child = yield* Effect.acquireRelease(
+    Effect.sync(() => {
+      const child = NodeChildProcess.spawn(
+        process.execPath,
+        ["-e", 'process.stdin.resume(); process.send("ready");'],
+        { stdio: ["pipe", "ignore", "ignore", "ipc"] },
+      );
+      child.once("message", () => Deferred.doneUnsafe(ready, Effect.void));
+      child.once("error", (error) => Deferred.doneUnsafe(ready, Effect.die(error)));
+      child.once("exit", () => Deferred.doneUnsafe(exited, Effect.void));
+      return child;
+    }),
+    (child) =>
+      Effect.sync(() => child.kill("SIGKILL")).pipe(Effect.andThen(Deferred.await(exited))),
+  );
+  yield* Deferred.await(ready);
+  const pid = child.pid;
+  assert(pid !== undefined);
+  const controller = AcpSessionRuntime.makePosixProcessTreeController("linux");
+  const identity = controller.identity(pid);
+  assert(identity !== undefined);
+  const boot = NodeFS.readFileSync("/proc/sys/kernel/random/boot_id", "utf8").trim();
+  return {
+    pid,
+    startTime: `${boot}:${identity.startTime}`,
+    pgid: 0,
+    running: () => {
+      const observed = controller.identity(pid);
+      return observed !== undefined && !AcpSessionRuntime.posixProcessIsZombie(observed);
+    },
+    stop: Effect.sync(() => child.kill("SIGKILL")).pipe(Effect.andThen(Deferred.await(exited))),
+  };
+});
+
+describe.runIf(HostProcess.Platform.defaultValue() === "linux")("ProviderProcesses", () => {
+  it.live("reaps only recorded CLIs of dead servers before startup completes", () =>
+    Effect.gen(function* () {
+      const config = yield* ServerConfig.ServerConfig;
+      const directory = NodePath.join(config.stateDir, "provider-processes");
+      NodeFS.mkdirSync(directory, { recursive: true });
+      type Identity = { readonly pid: number; readonly startTime: string };
+      const record = (owner: Identity, processes: ReadonlyArray<Identity>) => {
+        const instanceId = NodeCrypto.randomUUID();
+        NodeFS.writeFileSync(
+          NodePath.join(directory, `${instanceId}.json`),
+          JSON.stringify({
+            version: 1,
+            instanceId,
+            hostname: NodeOS.hostname(),
+            stateDir: config.stateDir,
+            owner: { pid: owner.pid, startTime: owner.startTime },
+            processes: processes.map(({ pid, startTime }) => ({ pid, startTime, pgid: 0 })),
+          }),
+        );
+      };
+      const reused = (identity: Identity) => ({
+        ...identity,
+        startTime: identity.startTime.replace(/:\d+$/, ":1"),
+      });
+      const deadOwner = yield* ownedProcess;
+      const liveOwner = yield* ownedProcess;
+      const reusedOwner = yield* ownedProcess;
+      const liveProvider = yield* ownedProcess;
+      const reusedProvider = yield* ownedProcess;
+      const orphan = yield* ownedProcess;
+      const orphanOfReusedOwner = yield* ownedProcess;
+      const unrecorded = yield* ownedProcess;
+      record(liveOwner, [liveProvider]);
+      record(deadOwner, [reused(reusedProvider)]);
+      record(deadOwner, [orphan]);
+      record(reused(reusedOwner), [orphanOfReusedOwner]);
+      yield* deadOwner.stop;
+
+      const context = yield* Layer.build(ProviderProcesses.layer);
+      expect(Context.get(context, ProviderProcesses.ProviderProcesses).hasOtherLiveOwner).toBe(
+        true,
+      );
+
+      expect({
+        orphan: orphan.running(),
+        orphanOfReusedOwner: orphanOfReusedOwner.running(),
+        liveProvider: liveProvider.running(),
+        reusedProvider: reusedProvider.running(),
+        reusedOwner: reusedOwner.running(),
+        unrecorded: unrecorded.running(),
+      }).toEqual({
+        orphan: false,
+        orphanOfReusedOwner: false,
+        liveProvider: true,
+        reusedProvider: true,
+        reusedOwner: true,
+        unrecorded: true,
+      });
+    }).pipe(
+      Effect.scoped,
+      Effect.provideService(HostProcess.Platform, "linux"),
+      Effect.provide(
+        ServerConfig.layerTest(process.cwd(), { prefix: "t3-restart-ownership-" }).pipe(
+          Layer.provideMerge(NodeServices.layer),
+        ),
+      ),
+    ),
+  );
+});
diff --git a/apps/server/src/process/providerProcesses.ts b/apps/server/src/process/providerProcesses.ts
new file mode 100644
index 000000000000..4fe9a47637a0
--- /dev/null
+++ b/apps/server/src/process/providerProcesses.ts
@@ -0,0 +1,140 @@
+// @effect-diagnostics nodeBuiltinImport:off -- the SDK's synchronous spawn callback must record ownership before releasing the child.
+import * as NodeCrypto from "node:crypto";
+import * as NodeFS from "node:fs";
+import * as NodeOS from "node:os";
+import * as NodePath from "node:path";
+
+import * as AcpSessionRuntime from "@t3tools/provider-acp/server/AcpSessionRuntime";
+import * as HostProcess from "@t3tools/shared/HostProcess";
+import * as Context from "effect/Context";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as Schema from "effect/Schema";
+
+import * as ServerConfig from "../config.ts";
+
+const ProcessIdentity = Schema.Struct({
+  pid: Schema.Int.check(Schema.isBetween({ minimum: 2, maximum: Number.MAX_SAFE_INTEGER })),
+  startTime: Schema.String,
+});
+const OwnershipRecord = Schema.Struct({
+  version: Schema.Literal(1),
+  instanceId: Schema.String,
+  hostname: Schema.String,
+  stateDir: Schema.String,
+  owner: ProcessIdentity,
+  processes: Schema.Array(Schema.Struct({ ...ProcessIdentity.fields, pgid: Schema.Int })),
+});
+const decodeRecord = Schema.decodeUnknownSync(Schema.fromJsonString(OwnershipRecord));
+
+// A concurrent exit can remove the record. Incomplete/unknown records never authorize a signal.
+const readRecord = (recordPath: string) => {
+  try {
+    return decodeRecord(NodeFS.readFileSync(recordPath, "utf8"));
+  } catch {
+    return undefined;
+  }
+};
+
+export const ProviderProcesses = Context.Reference<{
+  readonly register?: (pid: number) => () => void;
+  readonly hasOtherLiveOwner: boolean;
+}>("t3/process/ProviderProcesses", { defaultValue: () => ({ hasOtherLiveOwner: false }) });
+
+const make = Effect.gen(function* () {
+  const platform = yield* HostProcess.Platform;
+  if (platform !== "linux") return { hasOtherLiveOwner: false };
+  const { stateDir } = yield* ServerConfig.ServerConfig;
+  const directory = NodePath.join(stateDir, "provider-processes");
+  const hostname = NodeOS.hostname();
+  const boot = NodeFS.readFileSync("/proc/sys/kernel/random/boot_id", "utf8").trim();
+  const controller = AcpSessionRuntime.makePosixProcessTreeController(platform);
+  const identity = (pid: number) => {
+    const observed = controller.identity(pid);
+    if (observed === undefined || AcpSessionRuntime.posixProcessIsZombie(observed))
+      return undefined;
+    return { ...observed, startTime: `${boot}:${observed.startTime}` };
+  };
+  const matches = (expected: typeof ProcessIdentity.Type) =>
+    identity(expected.pid)?.startTime === expected.startTime;
+  const kill = (survivor: typeof ProcessIdentity.Type) => {
+    try {
+      controller.signalProcess(survivor.pid, "SIGKILL");
+    } catch {}
+  };
+  const owner = identity(process.pid);
+  if (owner === undefined) return yield* Effect.die(new Error("Cannot identify provider owner"));
+  NodeFS.mkdirSync(directory, { recursive: true });
+
+  const writeRecord = (processes: (typeof OwnershipRecord.Type)["processes"]) => {
+    const instanceId = NodeCrypto.randomUUID();
+    const recordPath = NodePath.join(directory, `${instanceId}.json`);
+    const pendingPath = `${recordPath}.pending`;
+    NodeFS.writeFileSync(
+      pendingPath,
+      JSON.stringify({
+        version: 1,
+        instanceId,
+        hostname,
+        stateDir,
+        owner: { pid: owner.pid, startTime: owner.startTime },
+        processes,
+      } satisfies typeof OwnershipRecord.Type),
+    );
+    NodeFS.renameSync(pendingPath, recordPath);
+    return () => NodeFS.rmSync(recordPath, { force: true });
+  };
+  // Publish the server identity even before its first provider. Another server
+  // using this home must not stop the shared systemd slice while we are alive.
+  const forgetOwner = writeRecord([]);
+  yield* Effect.addFinalizer(() => Effect.sync(forgetOwner));
+  let hasOtherLiveOwner = false;
+
+  // Only immutable per-launch records are shared between server instances. A
+  // live owner's records belong to that server, even when it uses this home.
+  for (const file of NodeFS.readdirSync(directory)) {
+    if (!file.endsWith(".json")) continue;
+    const recordPath = NodePath.join(directory, file);
+    const record = readRecord(recordPath);
+    if (record === undefined) continue;
+    if (record.hostname !== hostname || record.stateDir !== stateDir) continue;
+    if (matches(record.owner)) {
+      if (record.owner.pid !== process.pid) hasOtherLiveOwner = true;
+      continue;
+    }
+    let survived = false;
+    for (const survivor of record.processes) {
+      if (survivor.pid === process.pid || !matches(survivor)) continue;
+      // Never infer ownership from argv, executable names, or group membership.
+      // As in the ACP controller, starttime blocks reuse between observations.
+      // Node has no pidfd_send_signal, so the final read-to-signal race remains.
+      kill(survivor);
+      for (let attempt = 0; matches(survivor) && !survived; attempt++) {
+        survived = attempt === 100;
+        if (!survived) yield* Effect.sleep("10 millis");
+      }
+    }
+    // Like a failed slice stop, an unkillable CLI must not keep the server down;
+    // its record stays so the next start retries.
+    if (survived) {
+      yield* Effect.logWarning("Could not stop a provider left by a previous server", { file });
+      continue;
+    }
+    NodeFS.rmSync(recordPath, { force: true });
+  }
+
+  return {
+    hasOtherLiveOwner,
+    register: (pid: number) => {
+      const provider = identity(pid);
+      if (provider === undefined || provider.ppid !== process.pid) {
+        throw new Error("Cannot identify spawned provider");
+      }
+      // A rename keeps startup from seeing a partial write. The child is gated
+      // until this returns, so an abrupt death cannot leave an unrecorded CLI.
+      return writeRecord([{ pid, startTime: provider.startTime, pgid: provider.pgid }]);
+    },
+  };
+});
+
+export const layer = Layer.effect(ProviderProcesses, make);
diff --git a/apps/server/src/project/AgentSessionScanner.test.ts b/apps/server/src/project/AgentSessionScanner.test.ts
index df8ef8aaf427..48b52d97ad13 100644
--- a/apps/server/src/project/AgentSessionScanner.test.ts
+++ b/apps/server/src/project/AgentSessionScanner.test.ts
@@ -5,6 +5,7 @@ import * as NodeChildProcess from "node:child_process";
 import * as NodeFS from "node:fs";
 import * as NodeOS from "node:os";
 import * as NodeSqlite from "node:sqlite";
+import * as NodeZlib from "node:zlib";
 import { describe, expect, it } from "@effect/vitest";
 import {
   AgentSessionImportSource,
@@ -174,6 +175,21 @@ const writeTranscript = Effect.fn("AgentSessionScanner.test.writeTranscript")(fu
   yield* fileSystem.utimes(input.filePath, seconds, seconds);
 });
 
+const writeCompressedTranscript = Effect.fn("AgentSessionScanner.test.writeCompressedTranscript")(
+  function* (input: {
+    readonly filePath: string;
+    readonly contents: string;
+    readonly mtimeMs: number;
+  }) {
+    const fileSystem = yield* FileSystem.FileSystem;
+    const path = yield* Path.Path;
+    yield* fileSystem.makeDirectory(path.dirname(input.filePath), { recursive: true });
+    yield* fileSystem.writeFile(input.filePath, NodeZlib.zstdCompressSync(input.contents));
+    const seconds = input.mtimeMs / 1000;
+    yield* fileSystem.utimes(input.filePath, seconds, seconds);
+  },
+);
+
 const claudeSessionLine = (cwd: string) =>
   `${JSON.stringify({ type: "user", cwd, sessionId: "s1" })}\n${JSON.stringify({ type: "assistant" })}\n`;
 
@@ -326,6 +342,30 @@ const awaitGateReader = (gatePath: string) =>
     (handle) => Effect.promise(() => handle.close()),
   );
 
+/**
+ * Offers each of `filePaths` to `finished` once its `cat` child has exited. A
+ * deadline fires for every read still in flight, so a test must wait for the
+ * unblocked reads before it moves the clock.
+ */
+const layerReportingProcessRunner = (
+  filePaths: ReadonlySet<string>,
+  finished: Queue.Queue<string>,
+) =>
+  Layer.effect(
+    ProcessRunner.ProcessRunner,
+    Effect.gen(function* () {
+      const runner = yield* ProcessRunner.ProcessRunner;
+      return ProcessRunner.ProcessRunner.of({
+        run: (input) => {
+          const filePath = input.args.at(-1) ?? "";
+          return filePaths.has(filePath)
+            ? runner.run(input).pipe(Effect.ensuring(Queue.offer(finished, filePath)))
+            : runner.run(input);
+        },
+      });
+    }),
+  ).pipe(Layer.provide(ProcessRunner.layer), Layer.provide(NodeServices.layer));
+
 it.layer(NodeServices.layer)("AgentSessionScanner", (it) => {
   describe("scan", () => {
     it.effect("reads Claude project cwds from transcripts, newest first", () =>
@@ -869,7 +909,7 @@ it.layer(NodeServices.layer)("AgentSessionScanner", (it) => {
       }),
     );
 
-    it.effect("skips linked git worktrees and reports the origin of real checkouts", () =>
+    it.effect("folds linked git worktrees into their checkout and reports real origins", () =>
       Effect.gen(function* () {
         const path = yield* Path.Path;
         const fileSystem = yield* FileSystem.FileSystem;
@@ -905,8 +945,56 @@ it.layer(NodeServices.layer)("AgentSessionScanner", (it) => {
           path.join(submodule, ".git"),
           `gitdir: ${submoduleGitDir}\n`,
         );
+        // A repository whose sessions all ran in a linked worktree is still offered.
+        const worktreeOnly = yield* makeTempDir("t3code-workspace-worktree-only-");
+        const worktreeOnlyCheckout = yield* makeTempDir("t3code-workspace-worktree-only-wt-");
+        const worktreeOnlyGitDir = path.join(worktreeOnly, ".git", "worktrees", "wt");
+        yield* fileSystem.makeDirectory(worktreeOnlyGitDir, { recursive: true });
+        yield* fileSystem.writeFileString(
+          path.join(worktreeOnly, ".git", "config"),
+          '[remote "origin"]\n\turl = git@github.com:pingdotgg/other.git\n',
+        );
+        yield* fileSystem.writeFileString(path.join(worktreeOnlyGitDir, "commondir"), "../..\n");
+        yield* fileSystem.writeFileString(
+          path.join(worktreeOnlyCheckout, ".git"),
+          `gitdir: ${worktreeOnlyGitDir}\n`,
+        );
+
+        // Not offered: the config is unreadable, so the repository could be bare; and
+        // the main checkout is reached through a symlink into T3's own state.
+        const configBaseDir = yield* fileSystem.realPath(
+          yield* makeTempDir("t3code-scanner-base-"),
+        );
+        const links = yield* makeTempDir("t3code-workspace-links-");
+        const unknown = yield* makeTempDir("t3code-workspace-unknown-");
+        yield* fileSystem.makeDirectory(path.join(configBaseDir, "state-repo"));
+        yield* fileSystem.symlink(path.join(configBaseDir, "state-repo"), path.join(links, "repo"));
+        const hiddenCheckouts: Array<string> = [];
+        for (const [main, config] of [
+          [unknown, null],
+          [path.join(links, "repo"), "[core]\n"],
+        ] as const) {
+          const gitDir = path.join(main, ".git", "worktrees", "wt");
+          yield* fileSystem.makeDirectory(gitDir, { recursive: true });
+          if (config !== null) {
+            yield* fileSystem.writeFileString(path.join(main, ".git", "config"), config);
+          }
+          yield* fileSystem.writeFileString(path.join(gitDir, "commondir"), "../..\n");
+          const checkout = yield* makeTempDir("t3code-workspace-hidden-wt-");
+          yield* fileSystem.writeFileString(path.join(checkout, ".git"), `gitdir: ${gitDir}\n`);
+          hiddenCheckouts.push(checkout);
+        }
 
-        for (const [index, cwd] of [repo, worktree, plain, noRemote, submodule].entries()) {
+        const sessionDirectories = [
+          repo,
+          worktree,
+          plain,
+          noRemote,
+          submodule,
+          worktreeOnlyCheckout,
+          ...hiddenCheckouts,
+        ];
+        for (const [index, cwd] of sessionDirectories.entries()) {
           yield* writeTranscript({
             filePath: path.join(claudeHomePath, "projects", `-slug-${index}`, "a.jsonl"),
             contents: claudeSessionLine(cwd),
@@ -914,23 +1002,34 @@ it.layer(NodeServices.layer)("AgentSessionScanner", (it) => {
           });
         }
 
-        const result = yield* runScan({ claudeHomePath, codexHomePath });
+        const result = yield* runScan({ claudeHomePath, codexHomePath, configBaseDir });
 
         expect(
-          result.candidates.map((candidate) => ({ path: candidate.path, git: candidate.git })),
+          result.candidates.map((candidate) => ({
+            path: candidate.path,
+            git: candidate.git,
+            threadCount: candidate.threadCount,
+          })),
         ).toEqual([
+          {
+            path: worktreeOnly,
+            git: { remoteKey: "github.com/pingdotgg/other", repository: "pingdotgg/other" },
+            threadCount: 1,
+          },
           {
             path: submodule,
             git: {
               remoteKey: "gitlab.com/pingdotgg/libs/vendor",
               repository: "pingdotgg/libs/vendor",
             },
+            threadCount: 1,
           },
-          { path: noRemote, git: { remoteKey: null, repository: null } },
-          { path: plain, git: null },
+          { path: noRemote, git: { remoteKey: null, repository: null }, threadCount: 1 },
+          { path: plain, git: null, threadCount: 1 },
           {
             path: repo,
             git: { remoteKey: "github.com/pingdotgg/t3code", repository: "pingdotgg/t3code" },
+            threadCount: 2,
           },
         ]);
       }),
@@ -1161,6 +1260,32 @@ it.layer(NodeServices.layer)("AgentSessionScanner", (it) => {
 
         const result = yield* runScan({ claudeHomePath, codexHomePath });
 
+        expect(result.candidates.map(({ path, threadCount }) => ({ path, threadCount }))).toEqual([
+          { path: workspace, threadCount: 1 },
+        ]);
+      }),
+    );
+    it.effect("discovers projects whose Codex rollouts are zstd-compressed", () =>
+      Effect.gen(function* () {
+        const path = yield* Path.Path;
+        const claudeHomePath = yield* makeTempDir("t3code-claude-home-");
+        const codexHomePath = yield* makeTempDir("t3code-codex-home-");
+        const workspace = yield* makeTempDir("t3code-workspace-");
+        yield* writeCompressedTranscript({
+          filePath: path.join(
+            codexHomePath,
+            "sessions",
+            "2026",
+            "05",
+            "03",
+            "rollout-2026-05-03T00-00-00-019a5f00-0000-7000-8000-00000000000b.jsonl.zst",
+          ),
+          contents: codexRolloutLine(workspace),
+          mtimeMs: Date.parse("2026-05-03T00:00:00.000Z"),
+        });
+
+        const result = yield* runScan({ claudeHomePath, codexHomePath });
+
         expect(result.candidates.map(({ path, threadCount }) => ({ path, threadCount }))).toEqual([
           { path: workspace, threadCount: 1 },
         ]);
@@ -1169,6 +1294,66 @@ it.layer(NodeServices.layer)("AgentSessionScanner", (it) => {
   });
 
   describe("recentThreads", () => {
+    it.effect("imports Codex conversations stored only as zstd-compressed rollouts", () =>
+      Effect.gen(function* () {
+        const path = yield* Path.Path;
+        const nowMs = Date.parse("2026-08-24T12:00:00.000Z");
+        yield* TestClock.setTime(nowMs);
+        const claudeHomePath = yield* makeTempDir("t3code-claude-home-");
+        const codexHomePath = yield* makeTempDir("t3code-codex-home-");
+        const workspace = yield* makeTempDir("t3code-workspace-");
+        yield* writeCompressedTranscript({
+          filePath: path.join(
+            codexHomePath,
+            "sessions",
+            "2026",
+            "08",
+            "20",
+            "rollout-2026-08-20T10-00-00-019a5f00-0000-7000-8000-00000000000c.jsonl.zst",
+          ),
+          contents: [
+            encodeTranscriptRecord({
+              type: "session_meta",
+              payload: { id: "019a5f00-0000-7000-8000-00000000000c", cwd: workspace },
+            }),
+            encodeTranscriptRecord({
+              type: "event_msg",
+              timestamp: "2026-08-20T10:00:00.000Z",
+              payload: { type: "user_message", message: "Compressed prompt" },
+            }),
+            encodeTranscriptRecord({
+              type: "response_item",
+              timestamp: "2026-08-20T10:01:00.000Z",
+              payload: {
+                type: "message",
+                role: "assistant",
+                content: [{ type: "output_text", text: "Compressed answer" }],
+              },
+            }),
+          ].join("\n"),
+          mtimeMs: nowMs - 4 * 24 * 60 * 60 * 1000,
+        });
+
+        const threads = yield* runRecentThreads({
+          claudeHomePath,
+          codexHomePath,
+          workspaceRoot: workspace,
+        });
+
+        expect(
+          threads.map((thread) => ({
+            id: thread.providerSessionId,
+            messages: thread.messages.map((message) => message.text),
+          })),
+        ).toEqual([
+          {
+            id: "019a5f00-0000-7000-8000-00000000000c",
+            messages: ["Compressed prompt", "Compressed answer"],
+          },
+        ]);
+      }),
+    );
+
     it.effect("imports recent Claude, Codex, and Pi sessions for the selected project only", () =>
       Effect.gen(function* () {
         const path = yield* Path.Path;
@@ -2498,28 +2683,11 @@ describe.skipIf(HostProcess.Platform.defaultValue() === "win32")(
           });
         }
 
-        // The deadline fires for every read still in flight, so on a slow runner the
-        // neighbours' `cat` children must have exited before the clock moves.
-        const neighbourConfigs = new Set(
-          [repos[0], repos[2]].map((repo) => path.join(repo, ".git", "config")),
-        );
         const finishedNeighbourReads = yield* Queue.unbounded<string>();
-        const processRunner = Layer.effect(
-          ProcessRunner.ProcessRunner,
-          Effect.gen(function* () {
-            const runner = yield* ProcessRunner.ProcessRunner;
-            return ProcessRunner.ProcessRunner.of({
-              run: (input) => {
-                const filePath = input.args.at(-1) ?? "";
-                return neighbourConfigs.has(filePath)
-                  ? runner
-                      .run(input)
-                      .pipe(Effect.ensuring(Queue.offer(finishedNeighbourReads, filePath)))
-                  : runner.run(input);
-              },
-            });
-          }),
-        ).pipe(Layer.provide(ProcessRunner.layer), Layer.provide(NodeServices.layer));
+        const processRunner = layerReportingProcessRunner(
+          new Set([repos[0], repos[2]].map((repo) => path.join(repo, ".git", "config"))),
+          finishedNeighbourReads,
+        );
 
         for (let attempt = 1; attempt <= 2; attempt++) {
           const scan = yield* Effect.forkChild(
@@ -2628,6 +2796,12 @@ describe.skipIf(HostProcess.Platform.defaultValue() === "win32")(
           });
         }
 
+        const finishedPointerReads = yield* Queue.unbounded<string>();
+        const processRunner = layerReportingProcessRunner(
+          new Set([path.join(worktree, ".git")]),
+          finishedPointerReads,
+        );
+
         // One scanner across scans: later scans skip the files that blocked.
         yield* Effect.gen(function* () {
           const scanner = yield* AgentSessionScanner.AgentSessionScanner;
@@ -2636,22 +2810,24 @@ describe.skipIf(HostProcess.Platform.defaultValue() === "win32")(
           );
           const first = yield* Effect.forkChild(scanPaths);
           // Pointer files are read first, then the commondir files they lead to.
-          for (const gatePath of [
-            path.join(pointerCheckout, ".git"),
-            path.join(worktreeGitDir, "commondir"),
-          ]) {
-            yield* Effect.scoped(
-              Effect.gen(function* () {
-                yield* awaitGateReader(gatePath);
-                yield* TestClock.adjust("2 seconds");
-              }),
-            );
-          }
+          yield* Effect.scoped(
+            Effect.gen(function* () {
+              yield* awaitGateReader(path.join(pointerCheckout, ".git"));
+              yield* Queue.take(finishedPointerReads);
+              yield* TestClock.adjust("2 seconds");
+            }),
+          );
+          yield* Effect.scoped(
+            Effect.gen(function* () {
+              yield* awaitGateReader(path.join(worktreeGitDir, "commondir"));
+              yield* TestClock.adjust("2 seconds");
+            }),
+          );
           expect(yield* Fiber.join(first)).toEqual([pointerCheckout]);
           for (let attempt = 2; attempt <= LIBUV_POOL_SIZE + 1; attempt++) {
             expect(yield* scanPaths, `scan ${attempt}`).toEqual([pointerCheckout]);
           }
-        }).pipe(Effect.provide(layerScannerTest({ claudeHomePath, codexHomePath })));
+        }).pipe(Effect.provide(layerScannerTest({ claudeHomePath, codexHomePath, processRunner })));
         // Hangs if the scans left libuv pool threads stuck in open().
         yield* fileSystem.readFileString(path.join(worktree, ".git"));
       }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
diff --git a/apps/server/src/project/AgentSessionScanner.ts b/apps/server/src/project/AgentSessionScanner.ts
index ee3f2d2b3ab3..b47cef441c92 100644
--- a/apps/server/src/project/AgentSessionScanner.ts
+++ b/apps/server/src/project/AgentSessionScanner.ts
@@ -1,5 +1,6 @@
 import * as NodeOS from "node:os";
 import * as NodeSqlite from "node:sqlite";
+import * as NodeZlib from "node:zlib";
 
 import {
   AgentSessionImportSource,
@@ -17,11 +18,13 @@ import {
 import * as Clock from "effect/Clock";
 import * as Context from "effect/Context";
 import * as DateTime from "effect/DateTime";
+import * as NodeStream from "@effect/platform-node/NodeStream";
 import * as Effect from "effect/Effect";
 import * as FileSystem from "effect/FileSystem";
 import * as Layer from "effect/Layer";
 import * as Option from "effect/Option";
 import * as Path from "effect/Path";
+import * as Pull from "effect/Pull";
 import * as Schema from "effect/Schema";
 import * as Semaphore from "effect/Semaphore";
 import * as Stream from "effect/Stream";
@@ -177,7 +180,11 @@ const decodeCodexHistoryBase = Schema.decodeUnknownOption(
 );
 // Original rollouts end in their thread ID, rewound ones in `<thread ID>_<rollout ID>`.
 const CODEX_ROLLOUT_ID_PATTERN =
-  /-([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})(?:_([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}))?\.jsonl$/i;
+  /-([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})(?:_([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}))?\.jsonl(?:\.zst)?$/i;
+// Codex zstd-compresses older rollouts; their byte limits and offsets count decompressed bytes.
+const COMPRESSED_TRANSCRIPT_SUFFIX = ".jsonl.zst";
+const isCompressedTranscript = (filePath: string) =>
+  filePath.endsWith(COMPRESSED_TRANSCRIPT_SUFFIX);
 // Codex records a chat's project only here; moving a chat leaves its rollout cwd unchanged.
 const CODEX_STATE_DATABASE = "state_5.sqlite";
 const decodeCodexSessionIndexEntry = Schema.decodeUnknownOption(
@@ -861,6 +868,33 @@ export const make = Effect.gen(function* () {
   const statOption = (target: string) =>
     fileSystem.stat(target).pipe(Effect.asSome, Effect.orElseSucceed(Option.none));
 
+  const transcriptChunkReader = Effect.fn("AgentSessionScanner.transcriptChunkReader")(function* (
+    file: FileSystem.File,
+    filePath: string,
+  ) {
+    if (!isCompressedTranscript(filePath)) return (size: number) => file.readAlloc(size);
+    const pull = yield* Stream.toPull(
+      fileSystem
+        .stream(filePath)
+        .pipe(NodeStream.pipeThroughSimple(() => NodeZlib.createZstdDecompress())),
+    );
+    let pending: Array<Uint8Array> = [];
+    let done = false;
+    // Untraced: called once per chunk inside the caller's traced read.
+    return Effect.fnUntraced(function* (size: number) {
+      while (pending.length === 0) {
+        if (done) return Option.none<Uint8Array>();
+        const next = yield* pull.pipe(Pull.catchDone(() => Effect.undefined));
+        if (next === undefined) done = true;
+        else pending = [...next];
+      }
+      const chunk = pending.shift();
+      if (chunk === undefined) return Option.none<Uint8Array>();
+      if (chunk.byteLength > size) pending.unshift(chunk.subarray(size));
+      return Option.some(chunk.subarray(0, size));
+    });
+  });
+
   const directoryIdentity = Effect.fn("AgentSessionScanner.directoryIdentity")(function* (
     target: string,
     knownStats?: FileSystem.File.Info,
@@ -876,6 +910,20 @@ export const make = Effect.gen(function* () {
     return `path:${normalizeProjectPathForComparison(realPath)}`;
   });
 
+  /** Stats a directory that may be offered as a project, or none when it is missing or excluded. */
+  const projectDirectoryStats = Effect.fn("AgentSessionScanner.projectDirectoryStats")(function* (
+    directory: string,
+  ) {
+    if (isExcludedProjectPath(directory)) return Option.none<FileSystem.File.Info>();
+    const stats = yield* statOption(directory);
+    if (Option.isNone(stats) || stats.value.type !== "Directory") return Option.none();
+    const realPath = yield* fileSystem
+      .realPath(directory)
+      .pipe(Effect.orElseSucceed(() => directory));
+    // Symlinks can disguise excluded worktree paths; re-check their targets.
+    return isExcludedProjectPath(realPath) ? Option.none() : stats;
+  });
+
   // Paths whose own read outlived the deadline, mapped to when they may be read
   // again. Without this every later scan would wait out the deadline again for
   // each phase that touches them.
@@ -929,7 +977,11 @@ export const make = Effect.gen(function* () {
   ) {
     type GitIdentity =
       | { readonly _tag: "Repository"; readonly git: AgentSessionProjectGit | null }
-      | { readonly _tag: "Worktree" }
+      | {
+          readonly _tag: "Worktree";
+          readonly mainCheckout: string | null;
+          readonly git: AgentSessionProjectGit | null;
+        }
       | { readonly _tag: "NotGit" };
     const identities = new Map<string, GitIdentity>();
     const repositories: Array<{ directory: string; gitDir: string; linkedWorktree: boolean }> = [];
@@ -962,8 +1014,9 @@ export const make = Effect.gen(function* () {
     );
     for (const { directory, gitDir } of linkedWorktrees) {
       const commonDir = (commonDirTexts.get(path.join(gitDir, "commondir")) ?? "").trim();
-      if (commonDir.length === 0) identities.set(directory, { _tag: "Worktree" });
-      else
+      if (commonDir.length === 0) {
+        identities.set(directory, { _tag: "Worktree", mainCheckout: null, git: null });
+      } else
         repositories.push({
           directory,
           gitDir: path.resolve(gitDir, commonDir),
@@ -976,20 +1029,25 @@ export const make = Effect.gen(function* () {
     );
     for (const { directory, gitDir, linkedWorktree } of repositories) {
       const configText = configTexts.get(path.join(gitDir, "config")) ?? "";
+      const originUrl = parseOriginUrlFromGitConfig(configText);
+      const git: AgentSessionProjectGit = {
+        remoteKey:
+          originUrl === null ? null : sourceControlDefinitions.repositoryKeyFromRemote(originUrl),
+        repository: repositoryPathFromRemoteUrl(originUrl),
+      };
       // Bare repositories have no main checkout, so offer their linked worktrees independently.
       if (linkedWorktree && !isBareGitConfig(configText)) {
-        identities.set(directory, { _tag: "Worktree" });
+        identities.set(directory, {
+          _tag: "Worktree",
+          // Only a common dir named .git sits inside its main checkout, and an
+          // unreadable config can't rule out a bare repository.
+          mainCheckout:
+            configText.length > 0 && path.basename(gitDir) === ".git" ? path.dirname(gitDir) : null,
+          git,
+        });
         continue;
       }
-      const originUrl = parseOriginUrlFromGitConfig(configText);
-      identities.set(directory, {
-        _tag: "Repository",
-        git: {
-          remoteKey:
-            originUrl === null ? null : sourceControlDefinitions.repositoryKeyFromRemote(originUrl),
-          repository: repositoryPathFromRemoteUrl(originUrl),
-        },
-      });
+      identities.set(directory, { _tag: "Repository", git });
     }
     return identities;
   });
@@ -1013,11 +1071,15 @@ export const make = Effect.gen(function* () {
       fileSystem.open(transcript.filePath, { flag: "r" }).pipe(
         Effect.flatMap((file) =>
           Effect.gen(function* () {
+            const readChunk = yield* transcriptChunkReader(file, transcript.filePath);
+            const size = isCompressedTranscript(transcript.filePath)
+              ? Number.POSITIVE_INFINITY
+              : transcript.identity.size;
             const decoder = new TextDecoder();
             let remaining = "";
             let bytesRead = 0;
             let recordsRead = 0;
-            const maxBytes = Math.min(MAX_TRANSCRIPT_SCAN_BYTES, transcript.identity.size);
+            const maxBytes = Math.min(MAX_TRANSCRIPT_SCAN_BYTES, size);
             const reserveRecord = () => {
               if (
                 recordsRead === MAX_METADATA_RECORDS_PER_TRANSCRIPT ||
@@ -1049,7 +1111,7 @@ export const make = Effect.gen(function* () {
               );
               budget.operationsRemaining -= 1;
               budget.bytesRemaining -= readSize;
-              const next = yield* file.readAlloc(readSize);
+              const next = yield* readChunk(readSize);
               if (Option.isNone(next)) {
                 return readLastRecord();
               }
@@ -1066,7 +1128,7 @@ export const make = Effect.gen(function* () {
               }
             }
 
-            if (bytesRead < transcript.identity.size) {
+            if (bytesRead < size) {
               budget.truncated = true;
               return null;
             }
@@ -1083,8 +1145,12 @@ export const make = Effect.gen(function* () {
     source: AgentSessionSource,
     prefix?: { readonly endByteOffset: number; readonly historyBytes: number },
   ) {
-    const readBytes = prefix?.endByteOffset ?? expected.size;
-    if (readBytes > expected.size || readBytes > MAX_IMPORTED_TRANSCRIPT_BYTES) return null;
+    const compressed = isCompressedTranscript(filePath);
+    const readBytes =
+      prefix?.endByteOffset ?? (compressed ? MAX_IMPORTED_TRANSCRIPT_BYTES : expected.size);
+    if ((!compressed && readBytes > expected.size) || readBytes > MAX_IMPORTED_TRANSCRIPT_BYTES) {
+      return null;
+    }
 
     return yield* Effect.scoped(
       fileSystem.open(filePath, { flag: "r" }).pipe(
@@ -1093,6 +1159,7 @@ export const make = Effect.gen(function* () {
             if (!sameTranscriptIdentity(expected, transcriptIdentity(filePath, yield* file.stat))) {
               return null;
             }
+            const readChunk = yield* transcriptChunkReader(file, filePath);
             const records: Array<DecodedTranscriptRecord> = [];
             const claudeHistory = createClaudeHistoryWindow();
             let cwd = Option.none<string>();
@@ -1153,10 +1220,12 @@ export const make = Effect.gen(function* () {
             };
 
             while (bytesRead < readBytes) {
-              const next = yield* file.readAlloc(
+              const next = yield* readChunk(
                 Math.min(TRANSCRIPT_PREFIX_BYTES, readBytes - bytesRead),
               );
               if (Option.isNone(next)) {
+                // A compressed rollout's decompressed length is only known at its end.
+                if (compressed && prefix === undefined) break;
                 return null;
               }
 
@@ -1374,7 +1443,12 @@ export const make = Effect.gen(function* () {
             }
             const directory = path.join(sessionsDir, year, month, day);
             for (const entry of (yield* readDirectory(directory)).toSorted().toReversed()) {
-              if (!entry.startsWith("rollout-") || !entry.endsWith(".jsonl")) continue;
+              if (
+                !entry.startsWith("rollout-") ||
+                !(entry.endsWith(".jsonl") || isCompressedTranscript(entry))
+              ) {
+                continue;
+              }
               if (operationsRemaining <= 0) {
                 truncated = true;
                 break;
@@ -1701,17 +1775,8 @@ export const make = Effect.gen(function* () {
       const expanded = expandHomePath(candidate.cwd.trim(), homeDir);
       if (!path.isAbsolute(expanded)) continue;
       const resolved = path.resolve(expanded);
-      if (directories.has(resolved) || isExcludedProjectPath(resolved)) continue;
-      const stats = yield* statOption(resolved);
-      if (Option.isNone(stats) || stats.value.type !== "Directory") {
-        directories.set(resolved, Option.none());
-        continue;
-      }
-      const realPath = yield* fileSystem
-        .realPath(resolved)
-        .pipe(Effect.orElseSucceed(() => resolved));
-      // Symlinks can disguise excluded worktree paths; re-check their targets.
-      directories.set(resolved, isExcludedProjectPath(realPath) ? Option.none() : stats);
+      if (directories.has(resolved)) continue;
+      directories.set(resolved, yield* projectDirectoryStats(resolved));
     }
     const directoryGitIdentities = yield* readGitIdentities(
       Array.from(directories).flatMap(([directory, stats]) =>
@@ -1719,8 +1784,14 @@ export const make = Effect.gen(function* () {
       ),
     );
 
-    const directoryKeys = new Map<string, string>();
-    const gitIdentities = new Map<string, AgentSessionProjectGit | null>();
+    const directoryProjects = new Map<
+      string,
+      {
+        readonly key: string;
+        readonly path: string;
+        readonly git: AgentSessionProjectGit | null;
+      } | null
+    >();
 
     for (const candidate of raw) {
       const expanded = expandHomePath(candidate.cwd.trim(), homeDir);
@@ -1728,27 +1799,43 @@ export const make = Effect.gen(function* () {
       const resolved = path.resolve(expanded);
       const stats = directories.get(resolved);
       if (stats === undefined || Option.isNone(stats)) continue;
-      let key = directoryKeys.get(resolved);
-      if (key === undefined) {
+      let project = directoryProjects.get(resolved);
+      if (project === undefined) {
         const gitIdentity = directoryGitIdentities.get(resolved);
-        if (gitIdentity === undefined || gitIdentity._tag === "Worktree") {
-          key = "";
+        if (gitIdentity === undefined) {
+          project = null;
+        } else if (gitIdentity._tag === "Worktree") {
+          // A linked worktree's sessions count toward its main checkout's project.
+          const { mainCheckout } = gitIdentity;
+          const mainStats =
+            mainCheckout === null ? Option.none() : yield* projectDirectoryStats(mainCheckout);
+          project =
+            mainCheckout !== null && Option.isSome(mainStats)
+              ? {
+                  key: yield* directoryIdentity(mainCheckout, mainStats.value),
+                  path: mainCheckout,
+                  git: gitIdentity.git,
+                }
+              : null;
         } else {
-          key = yield* directoryIdentity(resolved, stats.value);
-          gitIdentities.set(key, gitIdentity._tag === "Repository" ? gitIdentity.git : null);
+          project = {
+            key: yield* directoryIdentity(resolved, stats.value),
+            path: resolved,
+            git: gitIdentity._tag === "Repository" ? gitIdentity.git : null,
+          };
         }
-        directoryKeys.set(resolved, key);
+        directoryProjects.set(resolved, project);
       }
-      if (key === "") continue;
+      if (project === null) continue;
 
-      const existing = merged.get(key);
+      const existing = merged.get(project.key);
       if (!existing) {
-        merged.set(key, {
-          path: resolved,
+        merged.set(project.key, {
+          path: project.path,
           sources: [candidate.source],
           threadCount: candidate.threadCount,
           lastActiveAtMs: candidate.lastActiveAtMs,
-          git: gitIdentities.get(key) ?? null,
+          git: project.git,
         });
         continue;
       }
@@ -1987,7 +2074,12 @@ export const make = Effect.gen(function* () {
             {
               source: candidate.source,
               providerInstanceId: candidate.providerInstanceId,
-              fallbackSessionId: path.basename(transcript.filePath, ".jsonl"),
+              fallbackSessionId: path.basename(
+                transcript.filePath,
+                isCompressedTranscript(transcript.filePath)
+                  ? COMPRESSED_TRANSCRIPT_SUFFIX
+                  : ".jsonl",
+              ),
               lastActiveAtMs: transcript.mtimeMs,
             },
             inheritedRecords === null
diff --git a/apps/server/src/project/ProjectCloneTracker.test.ts b/apps/server/src/project/ProjectCloneTracker.test.ts
index 0d0a614e467a..77abcf87a81d 100644
--- a/apps/server/src/project/ProjectCloneTracker.test.ts
+++ b/apps/server/src/project/ProjectCloneTracker.test.ts
@@ -343,6 +343,9 @@ describe("parseGitCloneProgressLine", () => {
     expect(
       parseGitCloneProgressLine("Receiving objects:  45% (4500/10000), 12.30 MiB | 5.00 MiB/s"),
     ).toEqual({ stage: "receiving", percent: 45, detail: "12.30 MiB | 5.00 MiB/s" });
+    expect(
+      parseGitCloneProgressLine("Receiving objects: 100% (5/5), 40.00 MiB | 1.40 MiB/s, done."),
+    ).toEqual({ stage: "receiving", percent: 100, detail: "40.00 MiB | 1.40 MiB/s" });
     expect(parseGitCloneProgressLine("Resolving deltas: 100% (700/700), done.")).toEqual({
       stage: "resolving",
       percent: 100,
diff --git a/apps/server/src/project/ProjectFaviconResolver.test.ts b/apps/server/src/project/ProjectFaviconResolver.test.ts
index ec548db308b7..143db2a86629 100644
--- a/apps/server/src/project/ProjectFaviconResolver.test.ts
+++ b/apps/server/src/project/ProjectFaviconResolver.test.ts
@@ -201,6 +201,17 @@ it.layer(layerTest)("ProjectFaviconResolverLive", (it) => {
 
         expect(resolved).not.toBeNull();
         expect(resolved).toBe((yield* Path.Path).join(cwd, "public", "brand", "logo.svg"));
+
+        const paddedCwd = yield* makeTempDir;
+        yield* writeTextFile(
+          paddedCwd,
+          "index.html",
+          '<link rel="icon" href=" brand/custom.svg ">',
+        );
+        yield* writeTextFile(paddedCwd, "brand/custom.svg", "<svg>custom</svg>");
+        expect(yield* resolver.resolvePath(paddedCwd)).toBe(
+          (yield* Path.Path).join(paddedCwd, "brand", "custom.svg"),
+        );
       }),
     );
 
diff --git a/apps/server/src/project/ProjectFaviconResolver.ts b/apps/server/src/project/ProjectFaviconResolver.ts
index c63fac30595f..e09d4aad362a 100644
--- a/apps/server/src/project/ProjectFaviconResolver.ts
+++ b/apps/server/src/project/ProjectFaviconResolver.ts
@@ -144,7 +144,8 @@ export const make = Effect.gen(function* () {
   const projectFileLoader = yield* T3ProjectFileLoader.T3ProjectFileLoader;
 
   const resolveIconHref = (href: string): ReadonlyArray<string> => {
-    const clean = href.replace(/^\//, "");
+    // Browsers strip surrounding whitespace from URL attributes; file paths keep theirs.
+    const clean = href.trim().replace(/^\//, "");
     return [path.join("public", clean), clean];
   };
 
diff --git a/apps/server/src/project/ProjectService.test.ts b/apps/server/src/project/ProjectService.test.ts
index 1517bed31ba2..9a2e36b43bc2 100644
--- a/apps/server/src/project/ProjectService.test.ts
+++ b/apps/server/src/project/ProjectService.test.ts
@@ -9,6 +9,7 @@ import { CommandId, type Project, ProjectId, ProviderInstanceId } from "@t3tools
 import * as Deferred from "effect/Deferred";
 import * as Effect from "effect/Effect";
 import * as Fiber from "effect/Fiber";
+import * as FileSystem from "effect/FileSystem";
 import * as Layer from "effect/Layer";
 import * as Metric from "effect/Metric";
 import * as Option from "effect/Option";
@@ -36,6 +37,7 @@ import * as ProjectEnrichmentService from "./ProjectEnrichmentService.ts";
 import * as ProjectFaviconResolver from "./ProjectFaviconResolver.ts";
 import * as ProjectService from "./ProjectService.ts";
 import * as RepositoryIdentityResolver from "./RepositoryIdentityResolver.ts";
+import * as T3ProjectFileLoader from "./T3ProjectFileLoader.ts";
 
 const layerWorkspacePaths = Layer.succeed(WorkspacePaths.WorkspacePaths, {
   normalizeWorkspaceRoot: (workspaceRoot) => Effect.succeed(workspaceRoot.replace(/\/$/, "")),
@@ -300,7 +302,14 @@ it.layer(layerTest)("ProjectService", (it) => {
       });
       assert.isFalse(reset.autoPull);
       assert.isNull(reset.projectIcon);
-      assert.equal(reset.faviconPath, hydratedCreated.faviconPath);
+      assert.equal(
+        (yield* waitForProject(
+          service,
+          projectId,
+          (project) => project.faviconPath === hydratedCreated.faviconPath,
+        )).faviconPath,
+        hydratedCreated.faviconPath,
+      );
       assert.isNull(reset.defaultThreadEnvMode);
       assert.deepEqual(
         (yield* service.snapshot).projects.map((project) => project.id),
@@ -543,6 +552,12 @@ it.layer(layerTest)("ProjectService", (it) => {
         title: "Delete retry",
         workspaceRoot: "/work/delete-retry",
       });
+      // Enrichment landing between the two deletes would change the project the retry reads.
+      yield* waitForProject(
+        service,
+        projectId,
+        (project) => project.faviconPath !== null && project.repositoryIdentity !== null,
+      );
       const input = { commandId: CommandId.make("command:delete-retry:delete"), projectId };
       const deleted = yield* service.delete(input);
       assert.deepEqual(yield* service.delete(input), deleted);
@@ -725,6 +740,49 @@ it.effect("invalidates workspace-derived metadata when a project moves", () =>
   }),
 );
 
+it.effect("resolves a restored icon immediately after reselecting its saved path", () =>
+  Effect.gen(function* () {
+    const fileSystem = yield* FileSystem.FileSystem;
+    const cwd = yield* fileSystem.makeTempDirectoryScoped({ prefix: "project-icon-reselect-" });
+    const iconPath = `${cwd}/icon.svg`;
+    const metadata = Layer.merge(
+      Layer.succeed(RepositoryIdentityResolver.RepositoryIdentityResolver, {
+        resolve: () => Effect.succeed(null),
+      }),
+      ProjectFaviconResolver.layer.pipe(
+        Layer.provide(layerWorkspacePaths),
+        Layer.provide(T3ProjectFileLoader.layer),
+        Layer.provide(NodeServices.layer),
+      ),
+    );
+    yield* Effect.gen(function* () {
+      const service = yield* ProjectService.ProjectService;
+      const resolver = yield* ProjectFaviconResolver.ProjectFaviconResolver;
+      const projectId = ProjectId.make("project:icon-reselect");
+      yield* service.create({
+        commandId: CommandId.make("command:icon-reselect:create"),
+        projectId,
+        title: "Icon reselection",
+        workspaceRoot: cwd,
+      });
+      yield* service.update({
+        commandId: CommandId.make("command:icon-reselect:missing"),
+        projectId,
+        faviconPath: "icon.svg",
+      });
+      assert.isNull(yield* resolver.resolvePath(cwd, "icon.svg"));
+      yield* fileSystem.writeFileString(iconPath, '<svg xmlns="http://www.w3.org/2000/svg"/>');
+      assert.isNull(yield* resolver.resolvePath(cwd, "icon.svg"));
+      yield* service.update({
+        commandId: CommandId.make("command:icon-reselect:restored"),
+        projectId,
+        faviconPath: "icon.svg",
+      });
+      assert.equal(yield* resolver.resolvePath(cwd, "icon.svg"), iconPath);
+    }).pipe(Effect.provide(layerTestFor(metadata)));
+  }).pipe(Effect.provide(NodeServices.layer)),
+);
+
 it.effect("serializes two projects claiming the same workspace root", () =>
   Effect.gen(function* () {
     const eventSink = yield* EventSink.EventSinkV2;
diff --git a/apps/server/src/project/ProjectService.ts b/apps/server/src/project/ProjectService.ts
index 7080a9ff2bdf..464454ebba76 100644
--- a/apps/server/src/project/ProjectService.ts
+++ b/apps/server/src/project/ProjectService.ts
@@ -429,7 +429,7 @@ export const make = Effect.gen(function* () {
         ...(input.pinned === undefined ? {} : { pinned: input.pinned }),
         ...(input.archived === undefined ? {} : { archived: input.archived }),
       });
-      if (workspaceRoot !== previousRoot) {
+      if (workspaceRoot !== previousRoot || input.faviconPath !== undefined) {
         yield* projectEnrichment.invalidate([previousRoot, workspaceRoot]);
       }
       return yield* readCommitted(input.projectId);
diff --git a/apps/server/src/project/ProjectSetupScriptRunner.test.ts b/apps/server/src/project/ProjectSetupScriptRunner.test.ts
index 4eb466200bc9..034b168e52c7 100644
--- a/apps/server/src/project/ProjectSetupScriptRunner.test.ts
+++ b/apps/server/src/project/ProjectSetupScriptRunner.test.ts
@@ -38,6 +38,7 @@ const openSnapshot = (history: string): TerminalSessionSnapshot => ({
 });
 
 const makeHarness = Effect.fn(function* (options: {
+  readonly command?: string;
   readonly history?: string;
   readonly opening?: Deferred.Deferred<void>;
   readonly shell?: string | null;
@@ -88,7 +89,7 @@ const makeHarness = Effect.fn(function* (options: {
         {
           id: "setup",
           name: "Setup",
-          command: "vp i",
+          command: options.command ?? "vp i",
           icon: "configure",
           runOnWorktreeCreate: true,
         },
@@ -102,6 +103,7 @@ const makeHarness = Effect.fn(function* (options: {
 
 const setup = Effect.fn(function* (
   options: {
+    readonly command?: string;
     readonly history?: string;
     readonly shell?: string | null;
   } = {},
@@ -123,6 +125,32 @@ describe("ProjectSetupScriptRunner", () => {
     }),
   );
 
+  it.effect("types an escaped Nushell wrapper once its line editor starts", () =>
+    Effect.gen(function* () {
+      const command =
+        'print "quoted"; print \'C:\\tools\'; print "$env.PATH"\nexit 7 # comment\r\n\t';
+      const escaped =
+        'print \\"quoted\\"; print \'C:\\\\tools\'; print \\"$env.PATH\\"\\u{a}exit 7 # comment\\u{d}\\u{a}\\u{9}';
+      const { writes, emit } = yield* setup({ shell: "/opt/homebrew/bin/nu", command });
+      yield* TestClock.adjust("1 second");
+      expect(yield* Queue.size(writes)).toBe(0);
+      yield* emit({ ...event, type: "output", data: "> \x1b[?2004h" });
+      const written = yield* Queue.take(writes);
+      const sentinel = written.match(/__T3_SETUP_DONE___[0-9a-f]{32}:/)?.[0];
+      expect(sentinel).toBeDefined();
+      expect(written).toBe(
+        ` ${[
+          "$env.LAST_EXIT_CODE = 0",
+          "let __t3f = try { mktemp --tmpdir-path $env.T3CODE_WORKTREE_PATH --suffix .nu .t3-setup-XXXXXXXX } catch {|e| print -e $e.msg; null }",
+          `if $__t3f == null { $env.LAST_EXIT_CODE = 1 } else { try { [$"rm --permanent ($__t3f | to nuon)" "${escaped}"] | str join (char newline) | save --force --raw $__t3f; ^$nu.current-exe --login --commands $"cd $env.T3CODE_WORKTREE_PATH; source ($__t3f | to nuon)" } catch {|e| if $e != null and $e.exit_code? == null { print -e $e.msg }; if $env.LAST_EXIT_CODE == 0 { $env.LAST_EXIT_CODE = 1 } } }`,
+          "let __t3c = $env.LAST_EXIT_CODE",
+          "try { if $__t3f != null and ($__t3f | path exists) { rm --permanent $__t3f } } catch {|e| print -e $e.msg }",
+          `print $"\\n${sentinel}($__t3c)"`,
+        ].join("; ")}\r`,
+      );
+    }),
+  );
+
   it.effect("shows a startup prompt and types only once the line editor starts", () =>
     Effect.gen(function* () {
       const { result, writes, outputLines, emit } = yield* setup();
diff --git a/apps/server/src/project/ProjectSetupScriptRunner.ts b/apps/server/src/project/ProjectSetupScriptRunner.ts
index 8e7c3105b36b..a049bc89b01a 100644
--- a/apps/server/src/project/ProjectSetupScriptRunner.ts
+++ b/apps/server/src/project/ProjectSetupScriptRunner.ts
@@ -154,7 +154,7 @@ function stripTerminalControl(text: string): string {
     .replace(/[\x00-\x08\x0b\x0c\x0e-\x1f\x7f]/g, "");
 }
 
-// Line editors (zsh, fish, bash 5.1+) enable bracketed paste when they start reading a command.
+// Line editors (zsh, fish, nu, bash 5.1+) enable bracketed paste when they start reading a command.
 const BRACKETED_PASTE_ON = "\x1b[?2004h";
 const BRACKETED_PASTE_OFF = "\x1b[?2004l";
 // Longer than one subprocess poll plus its ps timeout, so a startup prompt is seen as busy first.
@@ -166,12 +166,13 @@ function lineEditorReading(text: string, previous: boolean): boolean {
   return on === off ? previous : on > off;
 }
 
-type CompletionShell = "posix" | "fish" | "powershell";
+type CompletionShell = "posix" | "fish" | "nushell" | "powershell";
 
 function resolveCompletionShell(shell: string): CompletionShell | null {
   const name = (shell.split(/[/\\]/).at(-1) ?? shell).toLowerCase().replace(/\.exe$/, "");
   if (name === "cmd") return null;
   if (name === "fish") return "fish";
+  if (name === "nu") return "nushell";
   if (name === "pwsh" || name === "powershell") return "powershell";
   return "posix";
 }
@@ -188,6 +189,20 @@ function wrapCommandForCompletion(
       return `$global:LASTEXITCODE = $null; & {\r${body}\r}; if ($null -ne $LASTEXITCODE) { $__t3c = $LASTEXITCODE } elseif ($?) { $__t3c = 0 } else { $__t3c = 1 }; Write-Host "${sentinel}$__t3c"`;
     case "fish":
       return `begin\r${body}\rend; printf '\\n${sentinel}%s\\n' $status`;
+    case "nushell": {
+      const escaped = command.replace(/["\\\x00-\x1f]/g, (char) =>
+        char === '"' || char === "\\" ? `\\${char}` : `\\u{${char.charCodeAt(0).toString(16)}}`,
+      );
+      // Nu resolves imports before running cd; source a file rooted in the worktree.
+      return [
+        "$env.LAST_EXIT_CODE = 0",
+        "let __t3f = try { mktemp --tmpdir-path $env.T3CODE_WORKTREE_PATH --suffix .nu .t3-setup-XXXXXXXX } catch {|e| print -e $e.msg; null }",
+        `if $__t3f == null { $env.LAST_EXIT_CODE = 1 } else { try { [$"rm --permanent ($__t3f | to nuon)" "${escaped}"] | str join (char newline) | save --force --raw $__t3f; ^$nu.current-exe --login --commands $"cd $env.T3CODE_WORKTREE_PATH; source ($__t3f | to nuon)" } catch {|e| if $e != null and $e.exit_code? == null { print -e $e.msg }; if $env.LAST_EXIT_CODE == 0 { $env.LAST_EXIT_CODE = 1 } } }`,
+        "let __t3c = $env.LAST_EXIT_CODE",
+        "try { if $__t3f != null and ($__t3f | path exists) { rm --permanent $__t3f } } catch {|e| print -e $e.msg }",
+        `print $"\\n${sentinel}($__t3c)"`,
+      ].join("; ");
+    }
     case "posix":
       return `( ${body}\r); printf '\\n${sentinel}%s\\n' "$?"`;
   }
@@ -517,9 +532,9 @@ export const make = Effect.gen(function* () {
     // Return once the terminal exists so callers can show it while a startup prompt waits.
     // PowerShell and cmd have no line-editor signal.
     yield* (
-      completionShell === "posix" || completionShell === "fish"
-        ? readiness.wait
-        : Effect.succeed("ready" as const)
+      completionShell === "powershell" || completionShell === null
+        ? Effect.succeed("ready" as const)
+        : readiness.wait
     ).pipe(
       Effect.flatMap((shell) =>
         shell === "exited" || commandLine === null
diff --git a/apps/server/src/project/RepositoryIdentityResolver.test.ts b/apps/server/src/project/RepositoryIdentityResolver.test.ts
index 2953d0dcbf09..4377caf55c52 100644
--- a/apps/server/src/project/RepositoryIdentityResolver.test.ts
+++ b/apps/server/src/project/RepositoryIdentityResolver.test.ts
@@ -5,6 +5,7 @@ import { expect, it } from "@effect/vitest";
 import * as Effect from "effect/Effect";
 import * as FileSystem from "effect/FileSystem";
 import * as Path from "effect/Path";
+import { vi } from "vite-plus/test";
 
 import * as ProcessRunner from "../processRunner.ts";
 import * as RepositoryIdentityResolver from "./RepositoryIdentityResolver.ts";
@@ -111,31 +112,34 @@ it.layer(NodeServices.layer)("RepositoryIdentityResolverLive", (it) => {
     }).pipe(Effect.provide(RepositoryIdentityResolver.layer)),
   );
 
-  it.effect("returns the git top-level root path when resolving from a nested workspace", () =>
-    Effect.gen(function* () {
-      const fileSystem = yield* FileSystem.FileSystem;
-      const path = yield* Path.Path;
-      const repoRoot = yield* fileSystem.makeTempDirectoryScoped({
-        prefix: "t3-repository-identity-nested-root-test-",
-      });
-      const nestedWorkspace = path.join(repoRoot, "packages", "web");
+  it.effect.each(["repo", "repo "] as const)(
+    "returns the git top-level root path when resolving from a nested workspace in %j",
+    (rootName) =>
+      Effect.gen(function* () {
+        const fileSystem = yield* FileSystem.FileSystem;
+        const path = yield* Path.Path;
+        const tempDir = yield* fileSystem.makeTempDirectoryScoped({
+          prefix: "t3-repository-identity-nested-root-test-",
+        });
+        const repoRoot = path.join(tempDir, rootName);
+        const nestedWorkspace = path.join(repoRoot, "packages", "web");
 
-      yield* fileSystem.makeDirectory(nestedWorkspace, { recursive: true });
-      yield* git(repoRoot, ["init"]);
-      yield* git(repoRoot, ["remote", "add", "origin", "git@github.com:T3Tools/t3code.git"]);
+        yield* fileSystem.makeDirectory(nestedWorkspace, { recursive: true });
+        yield* git(repoRoot, ["init"]);
+        yield* git(repoRoot, ["remote", "add", "origin", "git@github.com:T3Tools/t3code.git"]);
 
-      const resolver = yield* RepositoryIdentityResolver.RepositoryIdentityResolver;
-      const identity = yield* resolver.resolve(nestedWorkspace);
-      const resolvedIdentityRoot =
-        identity?.rootPath === undefined ? "" : NodeFS.realpathSync.native(identity.rootPath);
-      const resolvedRepoRoot = NodeFS.realpathSync.native(repoRoot);
+        const resolver = yield* RepositoryIdentityResolver.RepositoryIdentityResolver;
+        const identity = yield* resolver.resolve(nestedWorkspace);
+        const resolvedIdentityRoot =
+          identity?.rootPath === undefined ? "" : NodeFS.realpathSync.native(identity.rootPath);
+        const resolvedRepoRoot = NodeFS.realpathSync.native(repoRoot);
 
-      expect(identity).not.toBeNull();
-      expect(identity?.canonicalKey).toBe("github.com/t3tools/t3code");
-      expect(normalizeResolvedPath(resolvedIdentityRoot)).toBe(
-        normalizeResolvedPath(resolvedRepoRoot),
-      );
-    }).pipe(Effect.provide(RepositoryIdentityResolver.layer)),
+        expect(identity).not.toBeNull();
+        expect(identity?.canonicalKey).toBe("github.com/t3tools/t3code");
+        expect(normalizeResolvedPath(resolvedIdentityRoot)).toBe(
+          normalizeResolvedPath(resolvedRepoRoot),
+        );
+      }).pipe(Effect.provide(RepositoryIdentityResolver.layer)),
   );
 
   it.effect.each(["bare clone", "dot-bare"] as const)(
@@ -340,6 +344,75 @@ it.layer(NodeServices.layer)("RepositoryIdentityResolverLive", (it) => {
     }).pipe(Effect.provide(RepositoryIdentityResolver.layer)),
   );
 
+  it.effect("follows an OWNER/REPO mark only to a remote that fetches that repository", () =>
+    Effect.gen(function* () {
+      const fileSystem = yield* FileSystem.FileSystem;
+      const cwd = yield* fileSystem.makeTempDirectoryScoped({
+        prefix: "t3-repository-identity-gh-parent-test-",
+      });
+      const resolver = yield* RepositoryIdentityResolver.RepositoryIdentityResolver;
+      const resolveFresh = () => resolver.resolve(cwd, { refresh: true });
+
+      yield* git(cwd, ["init"]);
+      yield* git(cwd, ["remote", "add", "fork", "https://github.com/julius/t3code-fork.git"]);
+      yield* git(cwd, ["remote", "add", "main", "https://github.com/T3Tools/t3code.git"]);
+      yield* git(cwd, ["remote", "add", "upstream", "https://github.com/other/t3code.git"]);
+      yield* git(cwd, ["config", "remote.fork.gh-resolved", "t3tools/t3code"]);
+      const parent = yield* resolveFresh();
+      expect(parent?.canonicalKey).toBe("github.com/t3tools/t3code");
+      expect(parent?.locator).toEqual({
+        source: "git-remote",
+        remoteName: "main",
+        remoteUrl: "https://github.com/T3Tools/t3code.git",
+      });
+
+      // No remote fetches the marked repository, and several marks leave gh's choice unknown.
+      yield* git(cwd, ["config", "remote.fork.gh-resolved", "someone/else"]);
+      expect((yield* resolveFresh())?.locator.remoteName).toBe("upstream");
+      yield* git(cwd, ["config", "remote.fork.gh-resolved", "base"]);
+      yield* git(cwd, ["config", "remote.main.gh-resolved", "base"]);
+      expect((yield* resolveFresh())?.locator.remoteName).toBe("upstream");
+
+      // The same path on another HTTPS port is a different server.
+      yield* git(cwd, ["config", "--unset", "remote.fork.gh-resolved"]);
+      yield* git(cwd, ["config", "--unset", "remote.main.gh-resolved"]);
+      yield* git(cwd, ["remote", "add", "backup", "https://ghe.example.com:9443/acme/web.git"]);
+      yield* git(cwd, ["remote", "add", "ghe-fork", "https://ghe.example.com:8443/me/web.git"]);
+      yield* git(cwd, ["remote", "add", "ghe-parent", "https://ghe.example.com:8443/acme/web.git"]);
+      yield* git(cwd, ["config", "remote.ghe-fork.gh-resolved", "acme/web"]);
+      expect((yield* resolveFresh())?.locator.remoteName).toBe("ghe-parent");
+    }).pipe(Effect.provide(RepositoryIdentityResolver.layer)),
+  );
+
+  it.effect("reads the project's gh default when the server inherited GIT_DIR", () =>
+    Effect.gen(function* () {
+      const fileSystem = yield* FileSystem.FileSystem;
+      const path = yield* Path.Path;
+      const cwd = yield* fileSystem.makeTempDirectoryScoped({
+        prefix: "t3-repository-identity-gh-default-git-dir-",
+      });
+      const other = yield* fileSystem.makeTempDirectoryScoped({
+        prefix: "t3-repository-identity-inherited-git-dir-",
+      });
+
+      yield* git(cwd, ["init"]);
+      yield* git(cwd, ["remote", "add", "origin", "git@github.com:julius/t3code-fork.git"]);
+      yield* git(cwd, ["remote", "add", "upstream", "git@github.com:T3Tools/t3code.git"]);
+      yield* git(cwd, ["config", "remote.origin.gh-resolved", "base"]);
+      yield* git(other, ["init"]);
+      yield* git(other, ["config", "remote.upstream.gh-resolved", "base"]);
+
+      vi.stubEnv("GIT_DIR", path.join(other, ".git"));
+      yield* Effect.addFinalizer(() => Effect.sync(() => vi.unstubAllEnvs()));
+
+      const resolver = yield* RepositoryIdentityResolver.RepositoryIdentityResolver;
+      const identity = yield* resolver.resolve(cwd);
+
+      expect(identity?.canonicalKey).toBe("github.com/julius/t3code-fork");
+      expect(identity?.locator.remoteName).toBe("origin");
+    }).pipe(Effect.provide(RepositoryIdentityResolver.layer)),
+  );
+
   it.effect("uses the last remote path segment as the repository name for nested groups", () =>
     Effect.gen(function* () {
       const fileSystem = yield* FileSystem.FileSystem;
diff --git a/apps/server/src/project/RepositoryIdentityResolver.ts b/apps/server/src/project/RepositoryIdentityResolver.ts
index a1cf97d4a839..ebd63a957d5b 100644
--- a/apps/server/src/project/RepositoryIdentityResolver.ts
+++ b/apps/server/src/project/RepositoryIdentityResolver.ts
@@ -1,5 +1,7 @@
 import type { RepositoryIdentity, SourceControlProviderError } from "@t3tools/contracts";
+import { parseGitRemoteHost } from "@t3tools/source-control-core/shared/definition";
 import { repositoryPathFromRemoteUrl } from "@t3tools/source-control-core/server/SourceControlProvider";
+import { normalizeGitRemoteUrl } from "@t3tools/shared/git";
 import * as Cache from "effect/Cache";
 import * as Context from "effect/Context";
 import * as Data from "effect/Data";
@@ -69,21 +71,44 @@ function parseRemoteFetchUrls(stdout: string): Map<string, string> {
   return remotes;
 }
 
-// `gh repo set-default` marks the chosen remote with `remote.<name>.gh-resolved base`.
-function parseGhDefaultRemoteName(stdout: string): string | null {
-  const marked = stdout
-    .split("\n")
-    .map((line) => /^remote\.(.+)\.gh-resolved\s+base$/.exec(line.trim())?.[1])
-    .filter((name): name is string => name !== undefined);
-  return marked.length === 1 ? marked[0]! : null;
+// `gh repo set-default` marks one remote with `base`, or with OWNER/REPO when it picked a
+// parent repository. gh reads PRs from that repository, so the identity follows the mark when
+// a remote fetches it. The locator must name a real remote: review checkouts fetch through it.
+function pickMarkedRemote(
+  remotes: ReadonlyMap<string, string>,
+  resolved: string,
+): { readonly remoteName: string; readonly remoteUrl: string } | null {
+  const marks = resolved.split("\n").flatMap((line) => {
+    const match = /^remote\.(.+)\.gh-resolved\s+(\S+)$/u.exec(line.trim());
+    const remoteUrl = match?.[1] === undefined ? undefined : remotes.get(match[1]);
+    return match?.[1] && match[2] && remoteUrl
+      ? [{ remoteName: match[1], remoteUrl, value: match[2] }]
+      : [];
+  });
+  // gh's choice is ambiguous with several marks; GitHubSourceControlProvider ignores them too.
+  const [mark, ...others] = marks;
+  if (!mark || others.length > 0) return null;
+  if (mark.value === "base") return { remoteName: mark.remoteName, remoteUrl: mark.remoteUrl };
+  // Compare hosts with HTTP ports kept: one hostname can serve separate forges on two ports.
+  const host = parseGitRemoteHost(mark.remoteUrl)?.host;
+  const markedPath = mark.value.toLowerCase();
+  const [remoteName, remoteUrl] =
+    [...remotes.entries()].find(
+      ([, url]) =>
+        parseGitRemoteHost(url)?.host === host &&
+        normalizeGitRemoteUrl(url).split("/").slice(1).join("/") === markedPath,
+    ) ?? [];
+  return remoteName && remoteUrl ? { remoteName, remoteUrl } : null;
 }
 
 function pickPrimaryRemote(
   remotes: ReadonlyMap<string, string>,
-  ghDefaultRemoteName: string | null,
+  resolved: string,
 ): { readonly remoteName: string; readonly remoteUrl: string } | null {
-  for (const preferredRemoteName of [ghDefaultRemoteName, "upstream", "origin"]) {
-    if (preferredRemoteName === null) continue;
+  const marked = pickMarkedRemote(remotes, resolved);
+  if (marked) return marked;
+
+  for (const preferredRemoteName of ["upstream", "origin"] as const) {
     const remoteUrl = remotes.get(preferredRemoteName);
     if (remoteUrl) {
       return { remoteName: preferredRemoteName, remoteUrl };
@@ -180,7 +205,8 @@ const resolveRepositoryIdentityCacheKey = Effect.fn("RepositoryIdentityResolver.
       return null;
     }
     if (topLevelResult.value.code === 0) {
-      const rootPath = topLevelResult.value.stdout.trim();
+      // Paths may end in spaces, so strip only git's line terminator.
+      const rootPath = topLevelResult.value.stdout.replace(/\r?\n$/, "");
       return rootPath.length > 0
         ? new RepositoryIdentityCacheKey({ rootPath, isBare: false })
         : null;
@@ -224,9 +250,7 @@ const resolveRepositoryIdentityCacheKey = Effect.fn("RepositoryIdentityResolver.
       if (bareResult._tag === "None" || bareResult.value.timedOut) return null;
       if (bareResult.value.code !== 0) continue;
 
-      const [isBare, rootPath = ""] = bareResult.value.stdout
-        .split("\n")
-        .map((line) => line.trim());
+      const [isBare, rootPath = ""] = bareResult.value.stdout.split(/\r?\n/);
       // A checkout's .git directory contains remotes but is not a project root.
       return isBare === "true" && rootPath.length > 0
         ? new RepositoryIdentityCacheKey({ rootPath, isBare: true })
@@ -242,40 +266,31 @@ const resolveRepositoryIdentityFromCacheKey = Effect.fn(
   cacheKey: RepositoryIdentityCacheKey,
 ): Effect.fn.Return<RepositoryIdentity | null, never, ProcessRunner.ProcessRunner> {
   const processRunner = yield* ProcessRunner.ProcessRunner;
-  const remoteResult = yield* processRunner
-    .run({
-      command: "git",
-      args: ["-C", cacheKey.rootPath, ...(cacheKey.isBare ? ["--git-dir=."] : []), "remote", "-v"],
-      env: gitEnv(yield* HostProcess.Platform),
-      timeoutBehavior: "timedOutResult",
-    })
-    .pipe(Effect.option);
+  const env = gitEnv(yield* HostProcess.Platform);
+  const runGit = (args: ReadonlyArray<string>) =>
+    processRunner
+      .run({
+        command: "git",
+        args: ["-C", cacheKey.rootPath, ...(cacheKey.isBare ? ["--git-dir=."] : []), ...args],
+        env,
+        timeoutBehavior: "timedOutResult",
+      })
+      .pipe(Effect.option);
+  const [remoteResult, resolvedResult] = yield* Effect.all(
+    [runGit(["remote", "-v"]), runGit(["config", "--get-regexp", "^remote\\..*\\.gh-resolved$"])],
+    { concurrency: "unbounded" },
+  );
   if (remoteResult._tag === "None" || remoteResult.value.code !== 0) {
     return null;
   }
 
-  const ghResolvedResult = yield* processRunner
-    .run({
-      command: "git",
-      args: [
-        "-C",
-        cacheKey.rootPath,
-        ...(cacheKey.isBare ? ["--git-dir=."] : []),
-        "config",
-        "--get-regexp",
-        "^remote\\..*\\.gh-resolved$",
-      ],
-      env: explicitBareRepositoryEnv(process.env, yield* HostProcess.Platform),
-      timeoutBehavior: "timedOutResult",
-    })
-    .pipe(Effect.option);
-  const ghDefaultRemoteName =
-    ghResolvedResult._tag === "Some" && ghResolvedResult.value.code === 0
-      ? parseGhDefaultRemoteName(ghResolvedResult.value.stdout)
-      : null;
-
   const remotes = parseRemoteFetchUrls(remoteResult.value.stdout);
-  const remote = pickPrimaryRemote(remotes, ghDefaultRemoteName);
+  // Exits 1 when no remote has a mark.
+  const resolved =
+    resolvedResult._tag === "Some" && resolvedResult.value.code === 0
+      ? resolvedResult.value.stdout
+      : "";
+  const remote = pickPrimaryRemote(remotes, resolved);
   return remote
     ? buildRepositoryIdentity({
         ...remote,
diff --git a/apps/server/src/project/gitCloneProgress.ts b/apps/server/src/project/gitCloneProgress.ts
index f1d75b532bc7..b74ecf6da84e 100644
--- a/apps/server/src/project/gitCloneProgress.ts
+++ b/apps/server/src/project/gitCloneProgress.ts
@@ -16,7 +16,10 @@ const STAGE_PREFIXES: ReadonlyArray<readonly [RegExp, ProjectCloneStage]> = [
   [/^Checking out files/, "checkout"],
 ];
 
-const PERCENT = /:\s+(\d+)%\s+\((\d+)\/(\d+)\)(?:,\s*(.*?))?\s*(?:,\s*done\.)?\s*$/;
+// Linear on hostile remote output: the tail is trimmed in code (optional `\s*`/`.*?` groups backtrack
+// cubically), and `s` lets it span U+2028 so a failed `$` cannot retry at every later counter.
+const PERCENT = /:\s+(\d+)%\s+\((\d+)\/(\d+)\)(.*)$/s;
+const DONE_SUFFIX = ", done.";
 
 /** Pass each bare-CR progress redraw as a separate line. */
 export function parseGitCloneProgressLine(line: string): GitCloneProgressLine | null {
@@ -26,8 +29,11 @@ export function parseGitCloneProgressLine(line: string): GitCloneProgressLine |
   const stage = stageEntry[1];
   const match = PERCENT.exec(trimmed);
   if (!match) return { stage, percent: null, detail: null };
+  let tail = (match[4] ?? "").trimEnd();
+  if (tail.endsWith(DONE_SUFFIX)) tail = tail.slice(0, -DONE_SUFFIX.length).trimEnd();
+  if (tail.length > 0 && !tail.startsWith(",")) return { stage, percent: null, detail: null };
   const percent = Number(match[1]);
-  const rawDetail = match[4]?.trim() ?? "";
+  const rawDetail = tail.slice(1).trim();
   const detail = rawDetail.length > 0 && rawDetail !== "done." ? rawDetail : null;
   return {
     stage,
diff --git a/apps/server/src/provider/AcpRegistryProbe.test.ts b/apps/server/src/provider/AcpRegistryProbe.test.ts
index 77f2a1ae31d4..30915b31d474 100644
--- a/apps/server/src/provider/AcpRegistryProbe.test.ts
+++ b/apps/server/src/provider/AcpRegistryProbe.test.ts
@@ -66,6 +66,22 @@ describe("ACP Registry probe", () => {
               { value: "gpt-5.4", name: "Duplicate" },
             ],
           },
+          {
+            id: "effort",
+            name: "Effort",
+            category: "thought_level",
+            type: "select",
+            currentValue: "high",
+            options: [{ value: "high", name: "High" }],
+          },
+          {
+            id: "mode",
+            name: "Mode",
+            category: "mode",
+            type: "select",
+            currentValue: "ask",
+            options: [{ value: "ask", name: "Ask" }],
+          },
         ],
       },
       modelConfigId: "model",
@@ -88,7 +104,24 @@ describe("ACP Registry probe", () => {
       ],
       models: [{ id: "gpt-5.4", name: "GPT-5.4", description: null }],
       currentModelId: "gpt-5.4",
-      configOptions: [],
+      configOptions: [
+        {
+          id: "effort",
+          label: "Effort",
+          type: "select",
+          options: [{ id: "high", label: "High" }],
+          currentValue: "high",
+          role: "reasoning",
+        },
+        {
+          id: "mode",
+          label: "Mode",
+          type: "select",
+          options: [{ id: "ask", label: "Ask" }],
+          currentValue: "ask",
+        },
+      ],
+      modelOptionIds: ["effort"],
       sessionManagement: {
         canList: true,
         canLoad: true,
@@ -377,7 +410,6 @@ describe("ACP Registry probe", () => {
     }).pipe(
       Effect.provideService(AcpRegistrySupport.AcpRegistryCatalog, catalog),
       Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
-      Effect.scoped,
     );
   });
 
diff --git a/apps/server/src/provider/AgentContextBudget.test.ts b/apps/server/src/provider/AgentContextBudget.test.ts
index 8cdd52d202f1..7e380189ee6c 100644
--- a/apps/server/src/provider/AgentContextBudget.test.ts
+++ b/apps/server/src/provider/AgentContextBudget.test.ts
@@ -35,6 +35,7 @@ import { ProjectCloneTracker } from "../project/ProjectCloneTracker.ts";
 import { ProjectService } from "../project/ProjectService.ts";
 import { ProjectSetupScriptRunner } from "../project/ProjectSetupScriptRunner.ts";
 import { PullRequestReviewGuideService } from "../pullRequest/PullRequestReviewGuideService.ts";
+import { PullRequestService } from "../pullRequest/PullRequestService.ts";
 import { ScheduledTaskService } from "../scheduledTasks/ScheduledTaskService.ts";
 import { SecretRequests } from "../secrets/SecretRequests.ts";
 import { ServerSettingsService } from "../serverSettings.ts";
@@ -68,6 +69,7 @@ const toolHandlerServices = Layer.mergeAll(
   Layer.mock(ProviderAdapterRegistryV2)({}),
   Layer.mock(ProviderRegistry)({}),
   Layer.mock(PullRequestReviewGuideService)({}),
+  Layer.mock(PullRequestService)({}),
   Layer.mock(RemoteDelegation)({}),
   Layer.mock(ScheduledTaskService)({}),
   Layer.mock(SecretRequests)({}),
diff --git a/apps/server/src/provider/AntigravityInstallation.test.ts b/apps/server/src/provider/AntigravityInstallation.test.ts
index f8e6636f8067..dcd3e4003009 100644
--- a/apps/server/src/provider/AntigravityInstallation.test.ts
+++ b/apps/server/src/provider/AntigravityInstallation.test.ts
@@ -22,6 +22,7 @@ import * as ChildProcess from "effect/process/ChildProcess";
 import * as ChildProcessSpawner from "effect/process/ChildProcessSpawner";
 
 import * as AntigravityInstallation from "./AntigravityInstallation.ts";
+import * as ModelManifest from "./ModelManifest.ts";
 import { type AntigravityReleaseAsset } from "./antigravityRelease.ts";
 
 const serverContents = "antigravity runtime\n";
@@ -127,6 +128,12 @@ interface HarnessOptions {
   readonly validate?: AntigravityInstallation.AntigravityInstallationOptions["validate"];
   readonly useDefaultValidation?: boolean;
   readonly connectTimeout?: boolean;
+  readonly manifest?: Effect.Effect<ModelManifest.ModelManifestData>;
+  readonly native?: boolean;
+  readonly nativeVersion?: string;
+  readonly nativeManifest?: (manifest: { version: string; url: string; sha512: string }) => unknown;
+  readonly beforeManifest?: Effect.Effect<void>;
+  readonly updateChecksEnabled?: Effect.Effect<boolean>;
 }
 
 const makeHarness = Effect.fn("test.makeAntigravityInstallation")(function* (
@@ -134,6 +141,7 @@ const makeHarness = Effect.fn("test.makeAntigravityInstallation")(function* (
 ) {
   const fs = yield* FileSystem.FileSystem;
   const path = yield* Path.Path;
+  const digest = yield* Digest.Digest;
   const baseDir =
     options.baseDir ?? (yield* fs.makeTempDirectoryScoped({ prefix: "t3-agy-test-" }));
   const platform = options.platform ?? hostPlatform;
@@ -169,7 +177,10 @@ const makeHarness = Effect.fn("test.makeAntigravityInstallation")(function* (
   });
   const installation = yield* AntigravityInstallation.makeAntigravityInstallation({
     baseDir,
-    releaseAsset: asset,
+    ...(options.native ? {} : { releaseAsset: asset }),
+    ...(options.updateChecksEnabled === undefined
+      ? {}
+      : { updateChecksEnabled: options.updateChecksEnabled }),
     ...(options.useDefaultValidation
       ? {}
       : {
@@ -186,11 +197,34 @@ const makeHarness = Effect.fn("test.makeAntigravityInstallation")(function* (
     Effect.provideService(HostProcess.Platform, platform),
     Effect.provideService(HostProcess.Architecture, arch),
     Effect.provideService(HostProcess.Environment, { PATH: options.path ?? "" }),
+    Effect.provideService(ModelManifest.ModelManifest, {
+      current: options.manifest ?? Effect.succeed(ModelManifest.BUNDLED_MODEL_MANIFEST),
+      refresh: Effect.succeed(ModelManifest.BUNDLED_MODEL_MANIFEST),
+      forceRefresh: Effect.succeed(ModelManifest.BUNDLED_MODEL_MANIFEST),
+      refreshOnDemand: Effect.succeed(ModelManifest.BUNDLED_MODEL_MANIFEST),
+      refreshInBackground: Effect.void,
+    }),
     Effect.provideService(
       HttpClient.HttpClient,
       HttpClient.make((request) =>
         Effect.suspend(() => {
           requests.push(request.url);
+          if (request.url.includes("/manifests/")) {
+            return Effect.gen(function* () {
+              yield* options.beforeManifest ?? Effect.void;
+              const version = options.nativeVersion ?? "1.5.7";
+              const folder = platform === "win32" ? "windows-x64" : "linux-x64";
+              const manifest = {
+                version,
+                url: `https://storage.googleapis.com/antigravity-public/antigravity-cli/${version}-123/${folder}/cli_${platform === "win32" ? "windows_x64.exe" : "linux_x64.tar.gz"}`,
+                sha512: Hex.encode(yield* digest.digest(Digest.sha512, archive).pipe(Effect.orDie)),
+              };
+              return HttpClientResponse.fromWeb(
+                request,
+                new Response(JSON.stringify(options.nativeManifest?.(manifest) ?? manifest)),
+              );
+            });
+          }
           if (options.connectTimeout) {
             return Effect.fail(
               new HttpClientError.HttpClientError({
@@ -255,6 +289,256 @@ const expectPreviousRelease = Effect.fn("test.expectPreviousAntigravityRelease")
 });
 
 it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))("Antigravity installation", (it) => {
+  it.effect.each([...new Set(["win32", hostPlatform])] as NodeJS.Platform[])(
+    "migrates the legacy managed runtime to the native CLI on %s and retains the old release",
+    (platform) =>
+      Effect.gen(function* () {
+        const archive =
+          platform === "win32"
+            ? Buffer.from(serverContents)
+            : Buffer.from(
+                "H4sIAAAAAAACE+3RMQ7CQAwEQNe8Ik8wgYj3XIFQCiiOCxK/56CJRA9CYqZZrxsXLpc2n2q5ze0en5LdYZpe2b1n5rhf5+d+m+MuY8j4guXaSu3n4z+V9f9DXXo5HzcBAAAAAAAAAADAz3sA56lbdQAoAAA=",
+                "base64",
+              );
+        const { installation, validations, requests, fs, baseDir, stagingReleased } =
+          yield* makeHarness({ native: true, archive, platform, previous: true });
+        yield* installation.start;
+        expect(yield* terminalState(installation)).toMatchObject({
+          phase: "succeeded",
+          installedVersion: "1.5.7",
+        });
+        yield* Deferred.await(stagingReleased);
+        const resolved = yield* installation.resolve();
+        expect(resolved).toMatchObject({ source: "managed", version: "1.5.7", harnessPath: null });
+        expect(validations[0]?.executable.harnessPath).toBeNull();
+        expect(yield* fs.readFileString(resolved.executablePath)).toBe(serverContents);
+        expect(requests.some((url) => url.includes("/manifests/"))).toBe(true);
+        const restarted = yield* makeHarness({
+          baseDir,
+          native: true,
+          archive,
+          platform,
+          nativeVersion: "1.5.6",
+        });
+        expect(yield* restarted.installation.start).toMatchObject({
+          phase: "verifying",
+          message: "Checking the installed runtime.",
+        });
+        expect(yield* terminalState(restarted.installation)).toMatchObject({
+          phase: "succeeded",
+          installedVersion: "1.5.7",
+        });
+        expect(restarted.requests.filter((url) => url.includes("storage.googleapis.com"))).toEqual(
+          [],
+        );
+        expect((yield* restarted.installation.resolve()).executablePath).toBe(
+          resolved.executablePath,
+        );
+      }),
+  );
+
+  // These tar fixtures exercise the POSIX extraction path; Windows downloads one executable.
+  it.effect.skipIf(hostPlatform === "win32")(
+    "rejects unsafe native tar members before activation",
+    () =>
+      Effect.gen(function* () {
+        for (const archive of [
+          "H4sIAAAAAAACE+3OMQqDQBAFUI/iCYxZJPdZMIRtFHQN5PYOKbW2EN5j4P9iYCZPtXyW/C3111ylD69h+Gc45rk/U4r1NnXdI2be6lrG90XPbWvNS5xvAAAAAAAAAAAA4D523kNDtgAoAAA=",
+          "H4sIAAAAAAACE+3RMQ7CMBAEQNe8Ii8IBhzxHhcIpYDCcSLxewwNiJ4IiZlmb6+54vp+m691PJe8jPUWviI2x2F4ZvOZMe7Ta37sdzGlQ+hiWME81Vza+fCf3p7flbmVy2kTAAAAAAAAAAAA+Hl3jhn2/wAoAAA=",
+          "H4sIAAAAAAACE+3TPQrCQBAG0K09RY4wRoPn2UJCClOsG8Hbu6YJ2CtI3mvmp5li+PJcp7Hkx1Sf6VuiuQzDWpvPGtGft/69P0Z/itRF+oHlXnNp59M+5e3/XVnacLseEnv8v/zLv/wDAAAAAAAAAPyZF/c+VksAKAAA",
+        ]) {
+          const { installation, validations } = yield* makeHarness({
+            native: true,
+            archive: Buffer.from(archive, "base64"),
+            platform: "linux",
+            previous: true,
+          });
+          yield* installation.start;
+          expect((yield* terminalState(installation)).phase).toBe("failed");
+          expect(validations).toEqual([]);
+          yield* expectPreviousRelease(installation);
+        }
+      }),
+  );
+
+  it.effect.each([true, false])(
+    "respects background update checks (%s) while allowing explicit installation",
+    (enabled) =>
+      Effect.gen(function* () {
+        const { installation, requests } = yield* makeHarness({
+          native: true,
+          archive: Buffer.from(serverContents),
+          platform: "win32",
+          updateChecksEnabled: Effect.succeed(enabled),
+        });
+        yield* installation.checkForUpdate;
+        if (enabled) {
+          yield* installation.changes.pipe(
+            Stream.filter((value) => value.version === "1.5.7"),
+            Stream.runHead,
+          );
+          yield* installation.state;
+          expect(requests).toHaveLength(1);
+        } else {
+          yield* installation.changes.pipe(Stream.runHead);
+          expect(requests).toEqual([]);
+        }
+        yield* installation.start;
+        expect((yield* terminalState(installation)).phase).toBe("succeeded");
+      }),
+  );
+
+  it.effect("keeps withdrawn native releases from activating or launching", () =>
+    Effect.gen(function* () {
+      let withdrawn = false;
+      const manifest = Effect.sync(() =>
+        withdrawn
+          ? ({
+              ...ModelManifest.BUNDLED_MODEL_MANIFEST,
+              compatibility: [
+                {
+                  driver: "antigravity",
+                  t3CodeRange: ">=0.0.42",
+                  ranges: [{ range: ">=1.5.7", status: "broken" }],
+                },
+              ],
+            } satisfies ModelManifest.ModelManifestData)
+          : ModelManifest.BUNDLED_MODEL_MANIFEST,
+      );
+      const first = yield* makeHarness({
+        native: true,
+        archive: Buffer.from(serverContents),
+        platform: "win32",
+        previous: true,
+        manifest,
+        validate: () =>
+          Effect.sync(() => {
+            withdrawn = true;
+          }),
+      });
+      yield* first.installation.start;
+      expect((yield* terminalState(first.installation)).phase).toBe("failed");
+      yield* expectPreviousRelease(first.installation);
+      withdrawn = false;
+      const retry = yield* makeHarness({
+        baseDir: first.baseDir,
+        native: true,
+        archive: Buffer.from(serverContents),
+        platform: "win32",
+        manifest,
+      });
+      yield* retry.installation.start;
+      expect((yield* terminalState(retry.installation)).phase).toBe("succeeded");
+      withdrawn = true;
+      expect(yield* retry.installation.resolve().pipe(Effect.flip)).toMatchObject({
+        operation: "resolve",
+      });
+      expect(yield* retry.installation.start.pipe(Effect.flip)).toMatchObject({
+        operation: "start",
+      });
+      const recovery = yield* makeHarness({
+        baseDir: first.baseDir,
+        native: true,
+        nativeVersion: "1.5.6",
+        archive: Buffer.from("recovery runtime"),
+        platform: "win32",
+        manifest,
+      });
+      yield* recovery.installation.checkForUpdate;
+      expect(yield* recovery.installation.state).toMatchObject({
+        installedVersion: "1.5.7",
+        version: "1.5.6",
+      });
+      yield* recovery.installation.start;
+      expect(yield* terminalState(recovery.installation)).toMatchObject({
+        phase: "succeeded",
+        installedVersion: "1.5.6",
+      });
+    }),
+  );
+
+  it.effect("discovers subsequent native releases from Google's CLI channel", () =>
+    Effect.gen(function* () {
+      const first = yield* makeHarness({
+        native: true,
+        archive: Buffer.from(serverContents),
+        platform: "win32",
+      });
+      yield* first.installation.start;
+      expect((yield* terminalState(first.installation)).phase).toBe("succeeded");
+      const initialPath = (yield* first.installation.resolve()).executablePath;
+      const next = yield* makeHarness({
+        baseDir: first.baseDir,
+        native: true,
+        nativeVersion: "1.5.8",
+        archive: Buffer.from("next runtime"),
+        platform: "win32",
+      });
+      yield* next.installation.start;
+      expect(yield* terminalState(next.installation)).toMatchObject({
+        phase: "succeeded",
+        installedVersion: "1.5.8",
+      });
+      const nextPath = (yield* next.installation.resolve()).executablePath;
+      expect(nextPath).not.toBe(initialPath);
+      const republished = yield* makeHarness({
+        baseDir: first.baseDir,
+        native: true,
+        nativeVersion: "1.5.8",
+        archive: Buffer.from("republished runtime"),
+        platform: "win32",
+      });
+      yield* republished.installation.start;
+      expect((yield* terminalState(republished.installation)).phase).toBe("succeeded");
+      expect((yield* republished.installation.resolve()).executablePath).not.toBe(nextPath);
+      const offline = yield* makeHarness({
+        baseDir: first.baseDir,
+        native: true,
+        nativeManifest: () => ({}),
+        archive: Buffer.from("unused"),
+        platform: "win32",
+      });
+      yield* offline.installation.start;
+      expect(yield* terminalState(offline.installation)).toMatchObject({
+        phase: "succeeded",
+        installedVersion: "1.5.8",
+      });
+      expect(offline.requests.filter((url) => url.includes("storage.googleapis.com"))).toEqual([]);
+    }),
+  );
+
+  it.effect.each([
+    {
+      name: "invalid checksum",
+      change: (manifest: { version: string; url: string; sha512: string }) => ({
+        ...manifest,
+        sha512: "0".repeat(128),
+      }),
+    },
+    {
+      name: "foreign download",
+      change: (manifest: { version: string; url: string; sha512: string }) => ({
+        ...manifest,
+        url: "https://example.com/agy.exe",
+      }),
+    },
+  ])("rejects a native $name and preserves the legacy release", ({ change }) =>
+    Effect.gen(function* () {
+      const { installation, validations } = yield* makeHarness({
+        native: true,
+        nativeManifest: change,
+        archive: Buffer.from(serverContents),
+        platform: "win32",
+        previous: true,
+      });
+      const result = yield* Effect.result(installation.start);
+      if (result._tag === "Success")
+        expect((yield* terminalState(installation)).phase).toBe("failed");
+      expect(validations).toEqual([]);
+      yield* expectPreviousRelease(installation);
+    }),
+  );
+
   it.effect("reports missing Node before downloading the standalone provider runtime", () =>
     Effect.gen(function* () {
       const { installation, requests, validations } = yield* makeHarness();
@@ -768,10 +1052,11 @@ it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))("Antigravity inst
           const windowsDirectory = path.join(baseDir, `windows-${name}`);
           yield* fs.makeDirectory(windowsDirectory);
           yield* fs.writeFileString(path.join(windowsDirectory, name), "cli");
-          expect(yield* windows.resolve("agy", { PATH: windowsDirectory })).toMatchObject({
-            executablePath: path.join(windowsDirectory, name),
-            harnessPath: null,
-          });
+          const selected = yield* windows.resolve("agy", { PATH: windowsDirectory });
+          expect(selected.harnessPath).toBeNull();
+          expect((yield* fs.realPath(selected.executablePath)).toLowerCase()).toBe(
+            (yield* fs.realPath(path.join(windowsDirectory, name))).toLowerCase(),
+          );
         }
       }),
   );
@@ -864,14 +1149,29 @@ it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))("Antigravity inst
 
   it.effect("keeps leased releases available while new sessions resolve the new release", () =>
     Effect.gen(function* () {
-      const { installation, fs, stagingReleased } = yield* makeHarness({ previous: true });
+      const manifestEntered = yield* Deferred.make<void>();
+      const releaseManifest = yield* Deferred.make<void>();
+      const { installation, fs, stagingReleased } = yield* makeHarness({
+        native: true,
+        platform: "win32",
+        archive: Buffer.from(serverContents),
+        previous: true,
+        beforeManifest: Deferred.succeed(manifestEntered, undefined).pipe(
+          Effect.andThen(Deferred.await(releaseManifest)),
+        ),
+      });
       const processScope = yield* Scope.make();
       const oldExecutable = yield* installation.acquire().pipe(Scope.provide(processScope));
-      yield* installation.start;
+      const starting = yield* installation.start.pipe(Effect.forkScoped);
+      yield* Deferred.await(manifestEntered);
+      const concurrent = yield* installation.acquire().pipe(Scope.provide(processScope));
+      expect(concurrent.executablePath).toBe(oldExecutable.executablePath);
+      yield* Deferred.succeed(releaseManifest, undefined);
+      yield* Fiber.join(starting);
       expect((yield* terminalState(installation)).phase).toBe("succeeded");
       yield* Deferred.await(stagingReleased);
       const current = yield* installation.resolve();
-      expect(current.version).toBe("fixture-new");
+      expect(current.version).toBe("1.5.7");
       expect(current.executablePath).not.toBe(oldExecutable.executablePath);
       expect(yield* fs.readFileString(oldExecutable.executablePath)).toBe(serverContents);
       expect(yield* installation.remove().pipe(Effect.flip)).toMatchObject({ operation: "remove" });
diff --git a/apps/server/src/provider/AntigravityInstallation.ts b/apps/server/src/provider/AntigravityInstallation.ts
index 6f78dc15e842..feb412867f2e 100644
--- a/apps/server/src/provider/AntigravityInstallation.ts
+++ b/apps/server/src/provider/AntigravityInstallation.ts
@@ -1,7 +1,11 @@
 // @effect-diagnostics nodeBuiltinImport:off - Effect has no incremental digest or free-space query.
+import { expandHomePath } from "@t3tools/provider-core/server/pathExpansion";
+import * as ModelManifest from "./ModelManifest.ts";
+import { resolveProviderCompatibility } from "./providerCompatibility.ts";
+import { cliArchiveTarCommand } from "@t3tools/shared/cliRelease";
+import { compareSemverVersions } from "@t3tools/shared/semver";
 import * as EffectNodeStream from "@effect/platform-node/NodeStream";
 import { ProviderDriverKind, type ProviderInstallState } from "@t3tools/contracts";
-import { expandHomePath } from "@t3tools/provider-core/server/pathExpansion";
 import * as HostProcess from "@t3tools/shared/HostProcess";
 import { resolveNodeExecutable, nodeRuntimeUnavailableMessage } from "@t3tools/shared/nodeRuntime";
 import { resolveCommandPath } from "@t3tools/shared/shell";
@@ -30,20 +34,27 @@ import * as NodeFSP from "node:fs/promises";
 import * as EffectAcpErrors from "effect-acp/errors";
 
 import * as ServerConfig from "../config.ts";
+import * as ServerSettings from "../serverSettings.ts";
+import {
+  ANTIGRAVITY_CLI_MANIFEST_BASE,
+  antigravityCliTarget,
+  parseAntigravityCliRelease,
+  type AntigravityCliReleaseAsset,
+} from "./antigravityCliRelease.ts";
 import { openZipArchive } from "../zipArchive.ts";
 import { makeAntigravityAcpRuntime } from "./acp/AntigravityAcpSupport.ts";
 import {
   buildAntigravityAcpSpawnInput,
   prepareAntigravityProfile,
 } from "./antigravityAuthSupport.ts";
-import {
-  resolveAntigravityReleaseAsset,
-  type AntigravityReleaseAsset,
-} from "./antigravityRelease.ts";
+import { type AntigravityReleaseAsset } from "./antigravityRelease.ts";
 
 const DRIVER = ProviderDriverKind.make("antigravity");
 const DOWNLOAD_TIMEOUT = "45 minutes";
 const VALIDATION_TIMEOUT = "90 seconds";
+const MAX_DOWNLOAD_BYTES = 512 * 1024 * 1024;
+const MAX_EXECUTABLE_BYTES = 512 * 1024 * 1024;
+const UPDATE_CHECK_INTERVAL = 60 * 60 * 1000;
 const FREE_SPACE_MARGIN = 256 * 1024 * 1024;
 const RECORD_MAX_BYTES = 8 * 1024;
 const RELEASE_RECORD = ".install-complete.json";
@@ -56,7 +67,7 @@ const InstalledRelease = Schema.Struct({
   releaseId: ReleaseId,
   version: Schema.String,
   executable: Schema.Struct({ name: Schema.String, bytes: Schema.Number }),
-  harness: Schema.Struct({ name: Schema.String, bytes: Schema.Number }),
+  harness: Schema.NullOr(Schema.Struct({ name: Schema.String, bytes: Schema.Number })),
 });
 type InstalledRelease = typeof InstalledRelease.Type;
 const encodeActiveRelease = Schema.encodeEffect(Schema.fromJsonString(ActiveRelease));
@@ -103,6 +114,7 @@ interface AntigravityInstallationService {
   ) => Effect.Effect<ProviderInstallState, AntigravityInstallationError>;
   readonly state: Effect.Effect<ProviderInstallState>;
   readonly changes: Stream.Stream<ProviderInstallState>;
+  readonly checkForUpdate: Effect.Effect<void>;
   readonly remove: (
     protectedBinaryPaths?: ReadonlyArray<string>,
   ) => Effect.Effect<void, AntigravityInstallationError>;
@@ -116,14 +128,22 @@ export class AntigravityInstallation extends Context.Service<
     AntigravityInstallation,
     Effect.gen(function* () {
       const config = yield* ServerConfig.ServerConfig;
-      return yield* makeAntigravityInstallation({ baseDir: config.baseDir });
+      const settings = yield* ServerSettings.ServerSettingsService;
+      return yield* makeAntigravityInstallation({
+        baseDir: config.baseDir,
+        updateChecksEnabled: settings.getSettings.pipe(
+          Effect.map((value) => value.enableProviderUpdateChecks),
+          Effect.orElseSucceed(() => false),
+        ),
+      });
     }),
   );
 }
 
 export interface AntigravityInstallationOptions {
   readonly baseDir: string;
-  readonly releaseAsset?: AntigravityReleaseAsset | null;
+  readonly releaseAsset?: AntigravityReleaseAsset | AntigravityCliReleaseAsset | null;
+  readonly updateChecksEnabled?: Effect.Effect<boolean>;
   readonly validate?: (
     executable: AntigravityExecutable,
     expectedVersion: string,
@@ -162,6 +182,7 @@ function isRunning(state: ProviderInstallState) {
 export const makeAntigravityInstallation = Effect.fn("AntigravityInstallation.make")(function* (
   options: AntigravityInstallationOptions,
 ) {
+  const manifestService = yield* ModelManifest.ModelManifest;
   const fs = yield* FileSystem.FileSystem;
   const path = yield* Path.Path;
   const random = yield* SecureRandom.SecureRandom;
@@ -171,10 +192,11 @@ export const makeAntigravityInstallation = Effect.fn("AntigravityInstallation.ma
   const platform = yield* HostProcess.Platform;
   const arch = yield* HostProcess.Architecture;
   const environment = yield* HostProcess.Environment;
-  const releaseAsset =
+  let releaseAsset = options.releaseAsset ?? null;
+  const supported =
     options.releaseAsset === undefined
-      ? resolveAntigravityReleaseAsset(platform, arch)
-      : options.releaseAsset;
+      ? antigravityCliTarget(platform, arch) !== null
+      : options.releaseAsset !== null;
   const names = executableNames(platform);
   const managedDirectory = path.join(
     options.baseDir,
@@ -192,13 +214,36 @@ export const makeAntigravityInstallation = Effect.fn("AntigravityInstallation.ma
     operationId: null,
     phase: "idle",
     downloadedBytes: 0,
-    totalBytes: releaseAsset?.archiveBytes ?? null,
+    totalBytes:
+      releaseAsset !== null && "archiveBytes" in releaseAsset ? releaseAsset.archiveBytes : null,
     version: releaseAsset?.version ?? null,
     installedVersion: null,
     canRemove: false,
     message: null,
   });
 
+  const isWithdrawn = Effect.fn("AntigravityInstallation.isWithdrawn")(function* (version: string) {
+    const manifest = yield* manifestService.current;
+    const status = (
+      resolveProviderCompatibility(manifest.compatibility, DRIVER, version) ??
+      resolveProviderCompatibility(
+        ModelManifest.BUNDLED_MODEL_MANIFEST.compatibility,
+        DRIVER,
+        version,
+      )
+    )?.status;
+    return status === "broken" || status === "unsupported";
+  });
+  const ensureEligible = Effect.fn("AntigravityInstallation.ensureEligible")(function* (
+    version: string,
+  ) {
+    if (yield* isWithdrawn(version))
+      return yield* installationError(
+        "verify",
+        "This Antigravity release was withdrawn. Check for updates and try again.",
+      );
+  });
+
   const readRecord = Effect.fn("AntigravityInstallation.readRecord")(function* <A>(
     filePath: string,
     schema: Schema.Codec<A>,
@@ -234,15 +279,20 @@ export const makeAntigravityInstallation = Effect.fn("AntigravityInstallation.ma
     const record = yield* readRecord(path.join(directory, RELEASE_RECORD), InstalledRelease);
     if (
       record.releaseId !== releaseId ||
-      record.executable.name !== names.executable ||
-      record.harness.name !== names.harness ||
+      (record.harness === null
+        ? record.executable.name !== (platform === "win32" ? "agy.exe" : "antigravity")
+        : record.executable.name !== names.executable || record.harness.name !== names.harness) ||
       !Number.isSafeInteger(record.executable.bytes) ||
       record.executable.bytes <= 0 ||
-      !Number.isSafeInteger(record.harness.bytes) ||
-      record.harness.bytes <= 0 ||
+      (record.harness !== null &&
+        (!Number.isSafeInteger(record.harness.bytes) || record.harness.bytes <= 0)) ||
       !record.version.trim() ||
-      !(yield* executableFile(path.join(directory, names.executable), record.executable.bytes)) ||
-      !(yield* executableFile(path.join(directory, names.harness), record.harness.bytes))
+      !(yield* executableFile(
+        path.join(directory, record.executable.name),
+        record.executable.bytes,
+      )) ||
+      (record.harness !== null &&
+        !(yield* executableFile(path.join(directory, record.harness.name), record.harness.bytes)))
     ) {
       return yield* installationError(
         "resolve",
@@ -250,8 +300,8 @@ export const makeAntigravityInstallation = Effect.fn("AntigravityInstallation.ma
       );
     }
     return {
-      executablePath: path.join(directory, names.executable),
-      harnessPath: path.join(directory, names.harness),
+      executablePath: path.join(directory, record.executable.name),
+      harnessPath: record.harness === null ? null : path.join(directory, record.harness.name),
       source: "managed",
       version: record.version,
       managedVersionDirectory: directory,
@@ -264,6 +314,16 @@ export const makeAntigravityInstallation = Effect.fn("AntigravityInstallation.ma
   ) {
     if (!(yield* executableFile(candidate))) return null;
     const executablePath = yield* fs.realPath(candidate);
+    const realVersions = yield* fs.realPath(versionsDirectory).pipe(Effect.option);
+    const directory = path.dirname(executablePath);
+    if (
+      Option.isSome(realVersions) &&
+      path.dirname(directory) === realVersions.value &&
+      /^[a-f0-9]{64}$/u.test(path.basename(directory))
+    ) {
+      const installed = yield* completedRelease(path.basename(directory));
+      return { ...installed, source };
+    }
     // Keep launcher symlinks intact: version-manager shims dispatch by their invoked name.
     if (isAntigravityCli(candidate, executablePath)) {
       return {
@@ -274,18 +334,8 @@ export const makeAntigravityInstallation = Effect.fn("AntigravityInstallation.ma
         managedVersionDirectory: null,
       } satisfies AntigravityExecutable;
     }
-    const directory = path.dirname(executablePath);
     const harnessPath = path.join(directory, names.harness);
     if (!(yield* executableFile(harnessPath))) return null;
-    const realVersions = yield* fs.realPath(versionsDirectory).pipe(Effect.option);
-    if (
-      Option.isSome(realVersions) &&
-      path.dirname(directory) === realVersions.value &&
-      /^[a-f0-9]{64}$/u.test(path.basename(directory))
-    ) {
-      const installed = yield* completedRelease(path.basename(directory));
-      return { ...installed, executablePath, harnessPath, source } satisfies AntigravityExecutable;
-    }
     return {
       executablePath,
       harnessPath,
@@ -343,7 +393,13 @@ export const makeAntigravityInstallation = Effect.fn("AntigravityInstallation.ma
       }
       if (yield* fs.exists(activePath)) {
         const active = yield* readRecord(activePath, ActiveRelease);
-        return yield* completedRelease(active.releaseId);
+        const installed = yield* completedRelease(active.releaseId);
+        if (yield* isWithdrawn(installed.version))
+          return yield* installationError(
+            "resolve",
+            `Antigravity ${installed.version} no longer works with this T3 Code release. Update it in Antigravity setup.`,
+          );
+        return installed;
       }
       for (const candidate of yield* commandCandidates(names.executable, processEnvironment)) {
         const selected = yield* fromExternal(candidate, "path");
@@ -351,7 +407,7 @@ export const makeAntigravityInstallation = Effect.fn("AntigravityInstallation.ma
       }
       return yield* installationError(
         "resolve",
-        releaseAsset
+        supported
           ? "Antigravity ACP runtime is not installed. Install it in this environment's provider settings or set a custom ACP executable path. The Antigravity app, IDE, and CLI are separate installations."
           : `Google does not publish an Antigravity runtime for ${platform}-${arch}. Use a supported environment or a custom executable.`,
       );
@@ -440,8 +496,10 @@ export const makeAntigravityInstallation = Effect.fn("AntigravityInstallation.ma
         });
         const initialized = yield* runtime.initialize();
         if (
-          initialized.agentInfo?.name !== "antigravity-acp" ||
-          initialized.agentInfo.version !== expectedVersion ||
+          (executable.harnessPath === null
+            ? initialized.agentInfo?.name !== "Antigravity ACP Server"
+            : initialized.agentInfo?.name !== "antigravity-acp") ||
+          initialized.agentInfo?.version !== expectedVersion ||
           // Antigravity 1.1.1 may report protocol 2 with legacy ACP; choose wire format from the response shape.
           (initialized.protocolVersion !== 1 && initialized.protocolVersion !== 2) ||
           initialized.agentCapabilities?.loadSession !== true ||
@@ -472,7 +530,12 @@ export const makeAntigravityInstallation = Effect.fn("AntigravityInstallation.ma
     );
 
   const install = Effect.fn("AntigravityInstallation.install")(
-    function* (asset: AntigravityReleaseAsset) {
+    function* (asset: AntigravityReleaseAsset | AntigravityCliReleaseAsset) {
+      yield* ensureEligible(asset.version);
+      const cli = "sha512" in asset;
+      // Existing installation records use 64-character IDs, including native SHA-512 prefixes.
+      const releaseId = cli ? asset.sha512.slice(0, 64) : asset.sha256;
+      const archiveBytes = cli ? null : asset.archiveBytes;
       yield* resolveNodeExecutable("Antigravity", environment).pipe(
         Effect.provideService(FileSystem.FileSystem, fs),
         Effect.provideService(Path.Path, path),
@@ -481,7 +544,7 @@ export const makeAntigravityInstallation = Effect.fn("AntigravityInstallation.ma
           installationError("verify", nodeRuntimeUnavailableMessage("Antigravity"), cause),
         ),
       );
-      if (platform === "linux" && arch === "arm64") {
+      if (!cli && platform === "linux" && arch === "arm64") {
         const pageSize = yield* spawner
           .string(ChildProcess.make("getconf", ["PAGESIZE"], { stdin: "ignore", stderr: "ignore" }))
           .pipe(
@@ -497,19 +560,19 @@ export const makeAntigravityInstallation = Effect.fn("AntigravityInstallation.ma
         SubscriptionRef.update(state, (current) => ({ ...current, phase, message }));
       yield* fs.makeDirectory(versionsDirectory, { recursive: true });
       yield* SubscriptionRef.update(state, (current) => ({ ...current, canRemove: true }));
-      const destination = path.join(versionsDirectory, asset.sha256);
+      const destination = path.join(versionsDirectory, releaseId);
       const activate = Effect.fn("AntigravityInstallation.activate")(
         function* () {
+          yield* ensureEligible(asset.version);
           const pointerDirectory = yield* fs.makeTempDirectoryScoped({
             directory: managedDirectory,
             prefix: "active.json.",
           });
           const pointerPath = path.join(pointerDirectory, "contents.tmp");
-          yield* fs.writeFileString(
-            pointerPath,
-            yield* encodeActiveRelease({ releaseId: asset.sha256 }),
-            { flag: "wx", mode: 0o600 },
-          );
+          yield* fs.writeFileString(pointerPath, yield* encodeActiveRelease({ releaseId }), {
+            flag: "wx",
+            mode: 0o600,
+          });
           yield* fs.rename(pointerPath, activePath);
           yield* SubscriptionRef.update(
             state,
@@ -533,7 +596,7 @@ export const makeAntigravityInstallation = Effect.fn("AntigravityInstallation.ma
       );
 
       if (yield* fs.exists(destination)) {
-        const existing = yield* completedRelease(asset.sha256);
+        const existing = yield* completedRelease(releaseId);
         if (existing.version !== asset.version) {
           return yield* installationError(
             "verify",
@@ -553,8 +616,9 @@ export const makeAntigravityInstallation = Effect.fn("AntigravityInstallation.ma
         try: () => NodeFSP.statfs(versionsDirectory, { bigint: true }),
         catch: (cause) => installationError("download", "Could not check free disk space.", cause),
       }).pipe(Effect.option);
-      const required =
-        asset.archiveBytes + asset.executable.bytes + asset.harness.bytes + FREE_SPACE_MARGIN;
+      const required = cli
+        ? MAX_DOWNLOAD_BYTES + MAX_EXECUTABLE_BYTES + FREE_SPACE_MARGIN
+        : asset.archiveBytes + asset.executable.bytes + asset.harness.bytes + FREE_SPACE_MARGIN;
       if (
         Option.isSome(available) &&
         available.value.bavail * available.value.bsize < BigInt(required)
@@ -571,7 +635,7 @@ export const makeAntigravityInstallation = Effect.fn("AntigravityInstallation.ma
       const archivePath = path.join(staging, "download.zip");
       const pairDirectory = path.join(staging, "runtime");
       yield* fs.makeDirectory(pairDirectory);
-      const hash = NodeCrypto.createHash("sha256");
+      const hash = NodeCrypto.createHash(cli ? "sha512" : "sha256");
       let downloadedBytes = 0;
       let lastProgressAt = yield* Clock.currentTimeMillis;
       yield* Effect.gen(function* () {
@@ -585,7 +649,8 @@ export const makeAntigravityInstallation = Effect.fn("AntigravityInstallation.ma
         if (
           identityBody &&
           contentLength !== undefined &&
-          Number(contentLength) !== asset.archiveBytes
+          archiveBytes !== null &&
+          Number(contentLength) !== archiveBytes
         ) {
           return yield* installationError(
             "download",
@@ -596,15 +661,15 @@ export const makeAntigravityInstallation = Effect.fn("AntigravityInstallation.ma
           Stream.tap((chunk) =>
             Effect.gen(function* () {
               downloadedBytes += chunk.byteLength;
-              if (downloadedBytes > asset.archiveBytes) {
+              if (downloadedBytes > (archiveBytes ?? MAX_DOWNLOAD_BYTES)) {
                 return yield* installationError(
                   "download",
-                  "The Antigravity download exceeded the pinned release size.",
+                  "The Antigravity download exceeded its allowed size.",
                 );
               }
               hash.update(chunk);
               const now = yield* Clock.currentTimeMillis;
-              if (now - lastProgressAt >= 250 || downloadedBytes === asset.archiveBytes) {
+              if (now - lastProgressAt >= 250 || downloadedBytes === archiveBytes) {
                 lastProgressAt = now;
                 yield* SubscriptionRef.update(state, (current) => ({
                   ...current,
@@ -627,98 +692,154 @@ export const makeAntigravityInstallation = Effect.fn("AntigravityInstallation.ma
             : cause,
         ),
       );
-      if (downloadedBytes !== asset.archiveBytes || hash.digest("hex") !== asset.sha256) {
+      if (
+        (archiveBytes !== null && downloadedBytes !== archiveBytes) ||
+        hash.digest("hex") !== (cli ? asset.sha512 : asset.sha256)
+      ) {
         return yield* installationError(
           "download",
-          "The Antigravity download failed its size or SHA-256 check. Nothing was installed.",
+          "The Antigravity download failed its size or checksum check. Nothing was installed.",
         );
       }
 
       yield* report("extracting", "Extracting the verified runtime.");
-      yield* Effect.gen(function* () {
-        const archive = yield* openZipArchive(archivePath, (detail, cause) =>
-          installationError("extract", detail, cause),
-        );
-        if (archive.entryCount !== 2) {
-          return yield* installationError(
-            "extract",
-            "The archive must contain exactly the Antigravity executable and its harness.",
-          );
-        }
-        const seen = new Set<string>();
-        for (;;) {
-          const entry = yield* archive.next;
-          if (!entry) break;
-          const expected = [asset.executable, asset.harness].find(
-            (file) => file.name === entry.fileName,
-          );
-          const unixType = (entry.externalFileAttributes >>> 16) & 0o170000;
+      if (cli) {
+        const executablePath = path.join(pairDirectory, asset.executable.name);
+        if (asset.format === "executable") {
+          yield* fs.copyFile(archivePath, executablePath);
+        } else {
+          const tar = cliArchiveTarCommand(platform, environment);
+          const list = yield* spawner.string(ChildProcess.make(tar, ["-tzf", archivePath]));
+          const types = yield* spawner.string(ChildProcess.make(tar, ["-tvzf", archivePath]));
           if (
-            !expected ||
-            seen.has(entry.fileName) ||
-            entry.fileName.includes("/") ||
-            entry.fileName.includes("\\") ||
-            (unixType !== 0 && unixType !== 0o100000) ||
-            (entry.externalFileAttributes & 0x10) !== 0 ||
-            (entry.generalPurposeBitFlag & 1) !== 0 ||
-            ![0, 8].includes(entry.compressionMethod) ||
-            entry.uncompressedSize !== expected.bytes
+            list.trim() !== asset.executable.name ||
+            types.trim().split(/\r?\n/u).length !== 1 ||
+            !types.startsWith("-")
           ) {
             return yield* installationError(
               "extract",
-              "The archive contains an unexpected, unsafe, or incorrectly sized member.",
+              "The Antigravity archive must contain one regular executable.",
             );
           }
-          seen.add(entry.fileName);
           yield* Effect.gen(function* () {
-            const readable = yield* archive.streamEntry(entry);
+            const child = yield* spawner.spawn(
+              ChildProcess.make(tar, ["-xOzf", archivePath, asset.executable.name], {
+                stdout: "pipe",
+                stderr: "pipe",
+              }),
+            );
             let extractedBytes = 0;
-            yield* EffectNodeStream.fromReadable<Uint8Array, AntigravityInstallationError>({
-              evaluate: () => readable,
-              onError: wrapFailure("extract", "Could not extract the Antigravity runtime."),
-            }).pipe(
+            yield* child.stdout.pipe(
               Stream.tap((chunk) =>
                 Effect.gen(function* () {
                   extractedBytes += chunk.byteLength;
-                  if (extractedBytes > expected.bytes) {
+                  if (extractedBytes > MAX_EXECUTABLE_BYTES)
                     return yield* installationError(
                       "extract",
-                      "An archive member exceeded its pinned size.",
+                      "The Antigravity executable exceeded its size limit.",
                     );
-                  }
                 }),
               ),
-              Stream.run(
-                fs.sink(path.join(pairDirectory, entry.fileName), { flag: "wx", mode: 0o700 }),
-              ),
+              Stream.run(fs.sink(executablePath, { flag: "wx", mode: 0o700 })),
             );
-            if (extractedBytes !== expected.bytes) {
-              return yield* installationError("extract", "An archive member was truncated.");
-            }
+            if ((yield* child.exitCode) !== 0 || extractedBytes === 0)
+              return yield* installationError(
+                "extract",
+                "Could not extract the Antigravity executable.",
+              );
           }).pipe(Effect.scoped);
         }
-        if (!seen.has(asset.executable.name) || !seen.has(asset.harness.name)) {
-          return yield* installationError(
-            "extract",
-            "The archive is missing the Antigravity executable or its harness.",
+      } else
+        yield* Effect.gen(function* () {
+          const archive = yield* openZipArchive(archivePath, (detail, cause) =>
+            installationError("extract", detail, cause),
           );
-        }
-      }).pipe(Effect.scoped);
+          if (archive.entryCount !== 2) {
+            return yield* installationError(
+              "extract",
+              "The archive must contain exactly the Antigravity executable and its harness.",
+            );
+          }
+          const seen = new Set<string>();
+          for (;;) {
+            const entry = yield* archive.next;
+            if (!entry) break;
+            const expected = [asset.executable, asset.harness].find(
+              (file) => file.name === entry.fileName,
+            );
+            const unixType = (entry.externalFileAttributes >>> 16) & 0o170000;
+            if (
+              !expected ||
+              seen.has(entry.fileName) ||
+              entry.fileName.includes("/") ||
+              entry.fileName.includes("\\") ||
+              (unixType !== 0 && unixType !== 0o100000) ||
+              (entry.externalFileAttributes & 0x10) !== 0 ||
+              (entry.generalPurposeBitFlag & 1) !== 0 ||
+              ![0, 8].includes(entry.compressionMethod) ||
+              entry.uncompressedSize !== expected.bytes
+            ) {
+              return yield* installationError(
+                "extract",
+                "The archive contains an unexpected, unsafe, or incorrectly sized member.",
+              );
+            }
+            seen.add(entry.fileName);
+            yield* Effect.gen(function* () {
+              const readable = yield* archive.streamEntry(entry);
+              let extractedBytes = 0;
+              yield* EffectNodeStream.fromReadable<Uint8Array, AntigravityInstallationError>({
+                evaluate: () => readable,
+                onError: wrapFailure("extract", "Could not extract the Antigravity runtime."),
+              }).pipe(
+                Stream.tap((chunk) =>
+                  Effect.gen(function* () {
+                    extractedBytes += chunk.byteLength;
+                    if (extractedBytes > expected.bytes) {
+                      return yield* installationError(
+                        "extract",
+                        "An archive member exceeded its pinned size.",
+                      );
+                    }
+                  }),
+                ),
+                Stream.run(
+                  fs.sink(path.join(pairDirectory, entry.fileName), { flag: "wx", mode: 0o700 }),
+                ),
+              );
+              if (extractedBytes !== expected.bytes) {
+                return yield* installationError("extract", "An archive member was truncated.");
+              }
+            }).pipe(Effect.scoped);
+          }
+          if (!seen.has(asset.executable.name) || !seen.has(asset.harness.name)) {
+            return yield* installationError(
+              "extract",
+              "The archive is missing the Antigravity executable or its harness.",
+            );
+          }
+        }).pipe(Effect.scoped);
       yield* fs.remove(archivePath);
       const executablePath = path.join(pairDirectory, asset.executable.name);
-      const harnessPath = path.join(pairDirectory, asset.harness.name);
+      const harnessPath = cli ? null : path.join(pairDirectory, asset.harness.name);
       if (platform !== "win32") {
         yield* fs.chmod(executablePath, 0o755);
-        yield* fs.chmod(harnessPath, 0o755);
+        if (harnessPath !== null) yield* fs.chmod(harnessPath, 0o755);
       }
-      if (platform === "darwin" && arch === "x64") {
+      if (!cli && platform === "darwin" && arch === "x64") {
         // Google signs the Intel build with the hardened runtime but no JIT entitlement, so
         // libffi's writable+executable trampolines spin forever. Re-sign ad hoc after the hash check.
         const exitCode = yield* spawner
           .spawn(
             ChildProcess.make(
               "/usr/bin/codesign",
-              ["--force", "--sign", "-", executablePath, harnessPath],
+              [
+                "--force",
+                "--sign",
+                "-",
+                executablePath,
+                ...(harnessPath === null ? [] : [harnessPath]),
+              ],
               { stdout: "ignore", stderr: "ignore" },
             ),
           )
@@ -745,13 +866,16 @@ export const makeAntigravityInstallation = Effect.fn("AntigravityInstallation.ma
         asset.version,
       ).pipe(Effect.scoped, Effect.timeout(VALIDATION_TIMEOUT));
       const record: InstalledRelease = {
-        releaseId: asset.sha256,
+        releaseId,
         version: asset.version,
         executable: {
           name: asset.executable.name,
           bytes: Number((yield* fs.stat(executablePath)).size),
         },
-        harness: { name: asset.harness.name, bytes: Number((yield* fs.stat(harnessPath)).size) },
+        harness:
+          cli || harnessPath === null
+            ? null
+            : { name: asset.harness.name, bytes: Number((yield* fs.stat(harnessPath)).size) },
       };
       yield* fs.writeFileString(
         path.join(pairDirectory, RELEASE_RECORD),
@@ -760,7 +884,7 @@ export const makeAntigravityInstallation = Effect.fn("AntigravityInstallation.ma
       );
       yield* fs.rename(pairDirectory, destination).pipe(
         Effect.catch((cause) =>
-          completedRelease(asset.sha256).pipe(
+          completedRelease(releaseId).pipe(
             Effect.flatMap((existing) =>
               existing.version === asset.version
                 ? validate(existing, asset.version).pipe(
@@ -795,31 +919,119 @@ export const makeAntigravityInstallation = Effect.fn("AntigravityInstallation.ma
     ),
   );
 
-  const start = gate
-    .withPermit(
+  let lastUpdateCheck: number | undefined;
+  const refreshRelease = Effect.fn("AntigravityInstallation.refreshRelease")(function* (
+    explicit = false,
+  ) {
+    if (options.releaseAsset !== undefined || !supported) return;
+    if (!explicit && !(yield* options.updateChecksEnabled ?? Effect.succeed(true))) return;
+    const now = yield* Clock.currentTimeMillis;
+    if (!explicit && lastUpdateCheck !== undefined && now - lastUpdateCheck < UPDATE_CHECK_INTERVAL)
+      return;
+    lastUpdateCheck = now;
+    const musl =
+      platform === "linux" &&
+      (yield* fs.exists(
+        arch === "arm64" ? "/lib/libc.musl-aarch64.so.1" : "/lib/libc.musl-x86_64.so.1",
+      ));
+    const target = antigravityCliTarget(platform, arch, musl);
+    const latest = yield* http.get(`${ANTIGRAVITY_CLI_MANIFEST_BASE}/${target}.json`).pipe(
+      Effect.flatMap(HttpClientResponse.filterStatusOk),
+      Effect.flatMap((response) => response.json),
+      Effect.map((json) => parseAntigravityCliRelease(json, platform, arch, musl)),
+      Effect.timeout("10 seconds"),
+      Effect.orElseSucceed(() => null),
+    );
+    if (latest === null) return;
+    if (yield* isWithdrawn(latest.version)) {
+      releaseAsset = null;
+      return;
+    }
+    releaseAsset = latest;
+    yield* SubscriptionRef.updateEffect(state, (value) =>
+      isRunning(value)
+        ? Effect.succeed(value)
+        : Effect.gen(function* () {
+            const keepInstalled =
+              value.installedVersion !== null &&
+              compareSemverVersions(value.installedVersion, latest.version) > 0 &&
+              !(yield* isWithdrawn(value.installedVersion));
+            return {
+              ...value,
+              version: keepInstalled ? value.installedVersion : latest.version,
+              totalBytes: null,
+            };
+          }),
+    );
+  });
+
+  const start = Effect.gen(function* () {
+    const current = yield* SubscriptionRef.get(state);
+    if (isRunning(current)) return current;
+    yield* refreshRelease(true);
+    return yield* gate.withPermit(
       Effect.gen(function* () {
         const current = yield* SubscriptionRef.get(state);
         if (isRunning(current)) return current;
-        if (!releaseAsset) {
+        if (!supported) {
           return yield* installationError(
             "start",
             `Google does not publish an Antigravity runtime for ${platform}-${arch}. Use a supported remote environment or a custom executable.`,
           );
         }
+        const asset =
+          releaseAsset !== null && !(yield* isWithdrawn(releaseAsset.version))
+            ? releaseAsset
+            : null;
+        const installed = yield* resolve().pipe(Effect.option);
+        const reuse =
+          Option.isSome(installed) &&
+          installed.value.source === "managed" &&
+          installed.value.harnessPath === null &&
+          (asset === null || compareSemverVersions(installed.value.version!, asset.version) > 0)
+            ? installed.value
+            : undefined;
+        if (asset === null && reuse === undefined)
+          return yield* installationError(
+            "start",
+            "Could not find a native Antigravity CLI release. Check the network connection and try again.",
+          );
         const operationId = yield* random.uuidV4();
         const next: ProviderInstallState = {
           driver: DRIVER,
           operationId,
-          phase: "downloading",
+          phase: reuse === undefined ? "downloading" : "verifying",
           downloadedBytes: 0,
-          totalBytes: releaseAsset.archiveBytes,
-          version: releaseAsset.version,
+          totalBytes: asset !== null && "archiveBytes" in asset ? asset.archiveBytes : null,
+          version: reuse?.version ?? asset?.version ?? null,
           installedVersion: current.installedVersion,
           canRemove: current.canRemove,
-          message: "Downloading Google's official Antigravity runtime.",
+          message:
+            reuse === undefined
+              ? "Downloading Google's official Antigravity runtime."
+              : "Checking the installed runtime.",
         };
         yield* SubscriptionRef.set(state, next);
-        const work = install(releaseAsset).pipe(
+        const work = (
+          reuse === undefined
+            ? install(asset!)
+            : validate(reuse, reuse.version!).pipe(
+                Effect.scoped,
+                Effect.timeout(VALIDATION_TIMEOUT),
+                Effect.andThen(ensureEligible(reuse.version!)),
+                Effect.andThen(
+                  SubscriptionRef.update(state, (value) => ({
+                    ...value,
+                    phase: "succeeded" as const,
+                    installedVersion: reuse.version,
+                    message: null,
+                  })),
+                ),
+              )
+        ).pipe(
+          Effect.mapError(
+            wrapFailure("verify", "Could not verify the installed Antigravity runtime."),
+          ),
           Effect.onExit((exit) =>
             Exit.isFailure(exit)
               ? SubscriptionRef.update(state, (value) => {
@@ -850,8 +1062,8 @@ export const makeAntigravityInstallation = Effect.fn("AntigravityInstallation.ma
         running = { operationId, fiber };
         return next;
       }).pipe(Effect.uninterruptible),
-    )
-    .pipe(Effect.mapError(wrapFailure("start", "Could not start the Antigravity installation.")));
+    );
+  }).pipe(Effect.mapError(wrapFailure("start", "Could not start the Antigravity installation.")));
 
   const cancel = Effect.fn("AntigravityInstallation.cancel")(function* (operationId: string) {
     return yield* gate.withPermit(
@@ -959,6 +1171,7 @@ export const makeAntigravityInstallation = Effect.fn("AntigravityInstallation.ma
     cancel,
     state: SubscriptionRef.get(state),
     changes: SubscriptionRef.changes(state),
+    checkForUpdate: refreshRelease().pipe(Effect.ignore),
     remove,
   });
 });
diff --git a/apps/server/src/provider/AntigravityProvider.test.ts b/apps/server/src/provider/AntigravityProvider.test.ts
index 791ed748de2e..a67627382785 100644
--- a/apps/server/src/provider/AntigravityProvider.test.ts
+++ b/apps/server/src/provider/AntigravityProvider.test.ts
@@ -291,561 +291,519 @@ describe("Antigravity model catalog", () => {
 
 it.layer(layerTest)("Antigravity provider snapshots", (it) => {
   it.effect("does not probe or run helper safety checks while disabled", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const harness = yield* makeHarness({ enabled: false });
-        const snapshot = yield* harness.provider.snapshot.refresh;
-        expect(snapshot).toMatchObject({
-          enabled: false,
+    Effect.gen(function* () {
+      const harness = yield* makeHarness({ enabled: false });
+      const snapshot = yield* harness.provider.snapshot.refresh;
+      expect(snapshot).toMatchObject({
+        enabled: false,
+        installed: false,
+        status: "disabled",
+        auth: { status: "unknown" },
+        models: [],
+        setup: { canAuthenticate: true, canInstall: true },
+        showInteractionModeToggle: false,
+        supportsConversationRollback: false,
+        supportsTextGeneration: false,
+      });
+      expect(yield* Ref.get(harness.probeCalls)).toBe(0);
+      expect(yield* Ref.get(harness.safetyCalls)).toBe(0);
+    }),
+  );
+
+  it.effect("treats initialize as installation proof, not account or model discovery", () =>
+    Effect.gen(function* () {
+      for (const auth of [
+        undefined,
+        { type: "oauth-personal", label: "Google account" },
+        { type: "oauth-business", label: "Gemini Enterprise" },
+        { type: "gemini-api-key", label: "Gemini API key" },
+        { type: "agent-platform", label: "Agent Platform" },
+      ]) {
+        const harness = yield* makeHarness(auth ? { auth } : {});
+        expect(yield* harness.provider.snapshot.getSnapshot).toMatchObject({
           installed: false,
-          status: "disabled",
+          status: "warning",
           auth: { status: "unknown" },
           models: [],
-          setup: { canAuthenticate: true, canInstall: true },
-          showInteractionModeToggle: false,
-          supportsConversationRollback: false,
-          supportsTextGeneration: false,
         });
-        expect(yield* Ref.get(harness.probeCalls)).toBe(0);
-        expect(yield* Ref.get(harness.safetyCalls)).toBe(0);
-      }),
-    ),
-  );
-
-  it.effect("treats initialize as installation proof, not account or model discovery", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        for (const auth of [
-          undefined,
-          { type: "oauth-personal", label: "Google account" },
-          { type: "oauth-business", label: "Gemini Enterprise" },
-          { type: "gemini-api-key", label: "Gemini API key" },
-          { type: "agent-platform", label: "Agent Platform" },
-        ]) {
-          const harness = yield* makeHarness(auth ? { auth } : {});
-          expect(yield* harness.provider.snapshot.getSnapshot).toMatchObject({
-            installed: false,
-            status: "warning",
-            auth: { status: "unknown" },
-            models: [],
-          });
-          yield* harness.initialize;
-          const snapshot = yield* harness.provider.snapshot.getSnapshot;
-          expect(snapshot).toMatchObject({
-            installed: true,
-            status: "warning",
-            version: "agy_acp_server_20260818_01_RC01",
-            auth: { status: "unknown", ...(auth ? { type: auth.type } : {}) },
-            message:
-              auth?.type === "gemini-api-key" || auth?.type === "agent-platform"
-                ? `Antigravity is installed. Connect with ${auth.label} to load models.`
-                : "Antigravity is installed. Google account access is not checked yet.",
-            models: [],
-          });
-          expect(yield* Ref.get(harness.probeCalls)).toBe(1);
-        }
-      }),
-    ),
+        yield* harness.initialize;
+        const snapshot = yield* harness.provider.snapshot.getSnapshot;
+        expect(snapshot).toMatchObject({
+          installed: true,
+          status: "warning",
+          version: "agy_acp_server_20260818_01_RC01",
+          auth: { status: "unknown", ...(auth ? { type: auth.type } : {}) },
+          message:
+            auth?.type === "gemini-api-key" || auth?.type === "agent-platform"
+              ? `Antigravity is installed. Connect with ${auth.label} to load models.`
+              : "Antigravity is installed. Google account access is not checked yet.",
+          models: [],
+        });
+        expect(yield* Ref.get(harness.probeCalls)).toBe(1);
+      }
+    }),
   );
 
   it.effect("does not offer Auto, so Auto threads fall back to Supervised", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const harness = yield* makeHarness();
-        yield* harness.initialize;
-        // Antigravity has no automatic review; the shared ACP policy would approve every request.
-        expect((yield* harness.provider.snapshot.getSnapshot).supportedRuntimeModes).toEqual([
-          "approval-required",
-          "auto-accept-edits",
-          "full-access",
-        ]);
-      }),
-    ),
+    Effect.gen(function* () {
+      const harness = yield* makeHarness();
+      yield* harness.initialize;
+      // Antigravity has no automatic review; the shared ACP policy would approve every request.
+      expect((yield* harness.provider.snapshot.getSnapshot).supportedRuntimeModes).toEqual([
+        "approval-required",
+        "auto-accept-edits",
+        "full-access",
+      ]);
+    }),
   );
 
   it.effect("publishes session metadata and native commands without another health probe", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const harness = yield* makeHarness();
-        yield* harness.initialize;
-        const nextReady = yield* Stream.toPull(
-          harness.provider.snapshot.streamChanges.pipe(
-            Stream.filter(
-              (snapshot) =>
-                snapshot.auth.status === "authenticated" && snapshot.slashCommands.length > 0,
-            ),
+    Effect.gen(function* () {
+      const harness = yield* makeHarness();
+      yield* harness.initialize;
+      const nextReady = yield* Stream.toPull(
+        harness.provider.snapshot.streamChanges.pipe(
+          Stream.filter(
+            (snapshot) =>
+              snapshot.auth.status === "authenticated" && snapshot.slashCommands.length > 0,
           ),
-        );
-        yield* harness.provider.onSessionStarted(started, "/workspace");
-        yield* harness.provider.onAvailableCommands(commands, "/workspace");
-        const [snapshot] = yield* nextReady;
-        expect(snapshot).toMatchObject({
-          status: "ready",
-          auth: { status: "authenticated", type: "oauth-personal" },
-          supportsTextGeneration: true,
-        });
-        expect(snapshot.models).toEqual(buildAntigravityModelsFromSession(sessionSetupResult));
-        expect(snapshot.slashCommands).toEqual(expectedCommands);
-        expect((yield* harness.provider.snapshotForCwd("/workspace")).slashCommands).toEqual(
-          expectedCommands,
-        );
-        expect(yield* Ref.get(harness.probeCalls)).toBe(1);
-      }),
-    ),
+        ),
+      );
+      yield* harness.provider.onSessionStarted(started, "/workspace");
+      yield* harness.provider.onAvailableCommands(commands, "/workspace");
+      const [snapshot] = yield* nextReady;
+      expect(snapshot).toMatchObject({
+        status: "ready",
+        auth: { status: "authenticated", type: "oauth-personal" },
+        supportsTextGeneration: true,
+      });
+      expect(snapshot.models).toEqual(buildAntigravityModelsFromSession(sessionSetupResult));
+      expect(snapshot.slashCommands).toEqual(expectedCommands);
+      expect((yield* harness.provider.snapshotForCwd("/workspace")).slashCommands).toEqual(
+        expectedCommands,
+      );
+      expect(yield* Ref.get(harness.probeCalls)).toBe(1);
+    }),
   );
 
   it.effect("clears all account metadata on sign-out and authentication failure", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const auth = { type: "gemini-api-key", label: "Gemini API key" };
-        const harness = yield* makeHarness({ auth });
-        yield* harness.initialize;
-        for (const clear of [harness.provider.onSignedOut, harness.provider.onAuthRequired]) {
-          yield* harness.provider.onSessionStarted(started, "/workspace");
-          yield* harness.provider.onAvailableCommands(commands, "/workspace");
-          yield* clear;
-          expect(yield* harness.provider.snapshot.getSnapshot).toMatchObject({
-            installed: true,
-            status: "warning",
-            auth: { status: "unauthenticated", type: auth.type, label: auth.label },
-            message: "Connect with Gemini API key to use Antigravity and load models.",
-            models: [],
-            slashCommands: [],
-            skills: [],
-            workspaceSnapshots: [],
-            supportsTextGeneration: false,
-          });
-          yield* harness.provider.onAvailableCommands(commands, "/workspace");
-          yield* harness.provider.onConfigOptionsUpdated([modelConfig]);
-          expect((yield* harness.provider.snapshotForCwd("/workspace")).slashCommands).toEqual([]);
-          expect((yield* harness.provider.snapshot.getSnapshot).models).toEqual([]);
-        }
-        const refreshed = yield* harness.provider.snapshot.refresh;
-        expect(refreshed.auth).toEqual({
-          status: "unauthenticated",
-          type: auth.type,
-          label: auth.label,
-        });
-        expect(refreshed.message).toBe(
-          "Connect with Gemini API key to use Antigravity and load models.",
-        );
-        expect(refreshed.supportsTextGeneration).toBe(false);
-      }),
-    ),
-  );
-
-  it.effect("replaces live model choices and accepts an empty catalog", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const harness = yield* makeHarness();
-        yield* harness.initialize;
+    Effect.gen(function* () {
+      const auth = { type: "gemini-api-key", label: "Gemini API key" };
+      const harness = yield* makeHarness({ auth });
+      yield* harness.initialize;
+      for (const clear of [harness.provider.onSignedOut, harness.provider.onAuthRequired]) {
         yield* harness.provider.onSessionStarted(started, "/workspace");
         yield* harness.provider.onAvailableCommands(commands, "/workspace");
-        const before = yield* harness.provider.snapshot.getSnapshot;
-        const configOptions = [
-          {
-            ...modelConfig,
-            currentValue: "gemini-3.8-flash-high",
-            options: modelOptions.slice(0, 3),
-          },
-        ];
-        const nextSnapshot = yield* Stream.toPull(
-          harness.provider.snapshot.streamChanges.pipe(
-            Stream.filter((snapshot) => snapshot.models.length === 3),
-          ),
-        );
-        yield* harness.provider.onConfigOptionsUpdated(configOptions);
-        expect((yield* nextSnapshot)[0]).toMatchObject({
-          models: buildAntigravityModelsFromSession({ configOptions }),
-          auth: before.auth,
-          workspaceSnapshots: before.workspaceSnapshots,
-          slashCommands: expectedCommands,
+        yield* clear;
+        expect(yield* harness.provider.snapshot.getSnapshot).toMatchObject({
+          installed: true,
+          status: "warning",
+          auth: { status: "unauthenticated", type: auth.type, label: auth.label },
+          message: "Connect with Gemini API key to use Antigravity and load models.",
+          models: [],
+          slashCommands: [],
+          skills: [],
+          workspaceSnapshots: [],
+          supportsTextGeneration: false,
         });
-        yield* harness.provider.onConfigOptionsUpdated([]);
+        yield* harness.provider.onAvailableCommands(commands, "/workspace");
+        yield* harness.provider.onConfigOptionsUpdated([modelConfig]);
+        expect((yield* harness.provider.snapshotForCwd("/workspace")).slashCommands).toEqual([]);
         expect((yield* harness.provider.snapshot.getSnapshot).models).toEqual([]);
-      }),
-    ),
+      }
+      const refreshed = yield* harness.provider.snapshot.refresh;
+      expect(refreshed.auth).toEqual({
+        status: "unauthenticated",
+        type: auth.type,
+        label: auth.label,
+      });
+      expect(refreshed.message).toBe(
+        "Connect with Gemini API key to use Antigravity and load models.",
+      );
+      expect(refreshed.supportsTextGeneration).toBe(false);
+    }),
+  );
+
+  it.effect("replaces live model choices and accepts an empty catalog", () =>
+    Effect.gen(function* () {
+      const harness = yield* makeHarness();
+      yield* harness.initialize;
+      yield* harness.provider.onSessionStarted(started, "/workspace");
+      yield* harness.provider.onAvailableCommands(commands, "/workspace");
+      const before = yield* harness.provider.snapshot.getSnapshot;
+      const configOptions = [
+        {
+          ...modelConfig,
+          currentValue: "gemini-3.8-flash-high",
+          options: modelOptions.slice(0, 3),
+        },
+      ];
+      const nextSnapshot = yield* Stream.toPull(
+        harness.provider.snapshot.streamChanges.pipe(
+          Stream.filter((snapshot) => snapshot.models.length === 3),
+        ),
+      );
+      yield* harness.provider.onConfigOptionsUpdated(configOptions);
+      expect((yield* nextSnapshot)[0]).toMatchObject({
+        models: buildAntigravityModelsFromSession({ configOptions }),
+        auth: before.auth,
+        workspaceSnapshots: before.workspaceSnapshots,
+        slashCommands: expectedCommands,
+      });
+      yield* harness.provider.onConfigOptionsUpdated([]);
+      expect((yield* harness.provider.snapshot.getSnapshot).models).toEqual([]);
+    }),
   );
 
   it.effect("does not guess a version before a custom launcher's first handshake", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const harness = yield* makeHarness();
-        yield* Deferred.succeed(harness.initialProbe, {
-          ...initializeResult,
-          agentInfo: { ...initializeResult.agentInfo, version: "unknown" },
-        });
-        yield* harness.initialUpdate;
-        expect((yield* harness.provider.snapshot.getSnapshot).version).toBeNull();
-      }),
-    ),
+    Effect.gen(function* () {
+      const harness = yield* makeHarness();
+      yield* Deferred.succeed(harness.initialProbe, {
+        ...initializeResult,
+        agentInfo: { ...initializeResult.agentInfo, version: "unknown" },
+      });
+      yield* harness.initialUpdate;
+      expect((yield* harness.provider.snapshot.getSnapshot).version).toBeNull();
+    }),
   );
 
   it.effect("does not replace a handshake version with an unknown custom-launcher probe", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const harness = yield* makeHarness();
-        yield* harness.initialize;
-        yield* harness.provider.onSessionStarted({
-          ...started,
-          initializeResult: {
-            ...initializeResult,
-            agentInfo: { ...initializeResult.agentInfo, version: "1.4.0" },
-          },
-        });
-        yield* Ref.set(
-          harness.probe,
-          Effect.succeed({
-            ...initializeResult,
-            agentInfo: { ...initializeResult.agentInfo, version: "unknown" },
-          }),
-        );
-        expect((yield* harness.provider.snapshot.refresh).version).toBe("1.4.0");
-      }),
-    ),
+    Effect.gen(function* () {
+      const harness = yield* makeHarness();
+      yield* harness.initialize;
+      yield* harness.provider.onSessionStarted({
+        ...started,
+        initializeResult: {
+          ...initializeResult,
+          agentInfo: { ...initializeResult.agentInfo, version: "1.4.0" },
+        },
+      });
+      yield* Ref.set(
+        harness.probe,
+        Effect.succeed({
+          ...initializeResult,
+          agentInfo: { ...initializeResult.agentInfo, version: "unknown" },
+        }),
+      );
+      expect((yield* harness.provider.snapshot.refresh).version).toBe("1.4.0");
+    }),
   );
 
   it.effect("replaces one account's catalog instead of combining accounts", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const harness = yield* makeHarness();
-        yield* harness.initialize;
-        yield* harness.provider.onSessionStarted(started);
-        yield* harness.provider.onSignedOut;
-        yield* harness.provider.onSessionStarted({
-          ...started,
-          sessionSetupResult: {
-            sessionId: "new-account-session",
-            configOptions: [
-              { ...modelConfig, currentValue: "gemini-pro-agent", options: [modelOptions[9]!] },
-            ],
-          },
-        });
-        expect(
-          (yield* harness.provider.snapshot.getSnapshot).models.map((model) => model.slug),
-        ).toEqual(["gemini-pro-agent"]);
-      }),
-    ),
+    Effect.gen(function* () {
+      const harness = yield* makeHarness();
+      yield* harness.initialize;
+      yield* harness.provider.onSessionStarted(started);
+      yield* harness.provider.onSignedOut;
+      yield* harness.provider.onSessionStarted({
+        ...started,
+        sessionSetupResult: {
+          sessionId: "new-account-session",
+          configOptions: [
+            { ...modelConfig, currentValue: "gemini-pro-agent", options: [modelOptions[9]!] },
+          ],
+        },
+      });
+      expect(
+        (yield* harness.provider.snapshot.getSnapshot).models.map((model) => model.slug),
+      ).toEqual(["gemini-pro-agent"]);
+    }),
   );
 
   it.effect("retains known account metadata when a local health check fails", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const harness = yield* makeHarness();
-        yield* harness.initialize;
+    Effect.gen(function* () {
+      const harness = yield* makeHarness();
+      yield* harness.initialize;
+      yield* harness.provider.onSessionStarted(started, "/workspace");
+      yield* harness.provider.onAvailableCommands(commands, "/workspace");
+      yield* Ref.set(
+        harness.probe,
+        Effect.fail(EffectAcpErrors.AcpRequestError.internalError("probe failed")),
+      );
+      const snapshot = yield* harness.provider.snapshot.refresh;
+      expect(snapshot).toMatchObject({
+        installed: true,
+        status: "error",
+        auth: { status: "authenticated" },
+      });
+      expect(snapshot.models).toEqual(buildAntigravityModelsFromSession(sessionSetupResult));
+      expect(snapshot.slashCommands).toEqual(expectedCommands);
+      expect(snapshot.workspaceSnapshots?.[0]?.cwd).toBe("/workspace");
+    }),
+  );
+
+  it.effect("distinguishes missing executables from a failed installed executable", () =>
+    Effect.gen(function* () {
+      const harness = yield* makeHarness();
+      yield* harness.initialize;
+      const failures = [
+        {
+          error: new EffectAcpErrors.AcpSpawnError({ cause: { code: "ENOENT" } }),
+          installed: false,
+        },
+        {
+          error: new EffectAcpErrors.AcpSpawnError({ cause: { code: "EACCES" } }),
+          installed: true,
+        },
+        {
+          error: new ProviderSetupError({
+            instanceId,
+            operation: "resolve",
+            detail: "Antigravity is not installed.",
+          }),
+          installed: false,
+        },
+      ];
+      for (const { error, installed } of failures) {
         yield* harness.provider.onSessionStarted(started, "/workspace");
         yield* harness.provider.onAvailableCommands(commands, "/workspace");
-        yield* Ref.set(
-          harness.probe,
-          Effect.fail(EffectAcpErrors.AcpRequestError.internalError("probe failed")),
-        );
+        yield* Ref.set(harness.probe, Effect.fail(error));
         const snapshot = yield* harness.provider.snapshot.refresh;
         expect(snapshot).toMatchObject({
-          installed: true,
+          installed,
           status: "error",
           auth: { status: "authenticated" },
         });
-        expect(snapshot.models).toEqual(buildAntigravityModelsFromSession(sessionSetupResult));
-        expect(snapshot.slashCommands).toEqual(expectedCommands);
-        expect(snapshot.workspaceSnapshots?.[0]?.cwd).toBe("/workspace");
-      }),
-    ),
-  );
-
-  it.effect("distinguishes missing executables from a failed installed executable", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const harness = yield* makeHarness();
-        yield* harness.initialize;
-        const failures = [
-          {
-            error: new EffectAcpErrors.AcpSpawnError({ cause: { code: "ENOENT" } }),
-            installed: false,
-          },
-          {
-            error: new EffectAcpErrors.AcpSpawnError({ cause: { code: "EACCES" } }),
-            installed: true,
-          },
-          {
-            error: new ProviderSetupError({
-              instanceId,
-              operation: "resolve",
-              detail: "Antigravity is not installed.",
-            }),
-            installed: false,
-          },
-        ];
-        for (const { error, installed } of failures) {
-          yield* harness.provider.onSessionStarted(started, "/workspace");
-          yield* harness.provider.onAvailableCommands(commands, "/workspace");
-          yield* Ref.set(harness.probe, Effect.fail(error));
-          const snapshot = yield* harness.provider.snapshot.refresh;
-          expect(snapshot).toMatchObject({
-            installed,
-            status: "error",
-            auth: { status: "authenticated" },
-          });
-          expect(snapshot.models).toHaveLength(installed ? 11 : 0);
-          expect(snapshot.slashCommands).toHaveLength(installed ? 2 : 0);
-          expect(snapshot.workspaceSnapshots).toHaveLength(installed ? 1 : 0);
-          expect(snapshot.supportsTextGeneration).toBe(installed);
-        }
-      }),
-    ),
+        expect(snapshot.models).toHaveLength(installed ? 11 : 0);
+        expect(snapshot.slashCommands).toHaveLength(installed ? 2 : 0);
+        expect(snapshot.workspaceSnapshots).toHaveLength(installed ? 1 : 0);
+        expect(snapshot.supportsTextGeneration).toBe(installed);
+      }
+    }),
   );
 
   it.effect("does not let an old health result restore a signed-out account", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const harness = yield* makeHarness();
-        yield* harness.initialize;
-        yield* harness.provider.onSessionStarted(started);
-        const releaseProbe = yield* Deferred.make<EffectAcpSchema.InitializeResponse>();
-        const probeEntered = yield* Deferred.make<void>();
-        yield* Ref.set(
-          harness.probe,
-          Deferred.succeed(probeEntered, undefined).pipe(
-            Effect.andThen(Deferred.await(releaseProbe)),
-          ),
-        );
-        const refresh = yield* harness.provider.snapshot.refresh.pipe(Effect.forkChild);
-        yield* Deferred.await(probeEntered);
-        yield* harness.provider.onSignedOut;
-        yield* Deferred.succeed(releaseProbe, initializeResult);
-        const snapshot = yield* Fiber.join(refresh);
-        expect(snapshot).toMatchObject({
-          auth: { status: "unauthenticated" },
-          models: [],
-          supportsTextGeneration: false,
-        });
-      }),
-    ),
+    Effect.gen(function* () {
+      const harness = yield* makeHarness();
+      yield* harness.initialize;
+      yield* harness.provider.onSessionStarted(started);
+      const releaseProbe = yield* Deferred.make<EffectAcpSchema.InitializeResponse>();
+      const probeEntered = yield* Deferred.make<void>();
+      yield* Ref.set(
+        harness.probe,
+        Deferred.succeed(probeEntered, undefined).pipe(
+          Effect.andThen(Deferred.await(releaseProbe)),
+        ),
+      );
+      const refresh = yield* harness.provider.snapshot.refresh.pipe(Effect.forkChild);
+      yield* Deferred.await(probeEntered);
+      yield* harness.provider.onSignedOut;
+      yield* Deferred.succeed(releaseProbe, initializeResult);
+      const snapshot = yield* Fiber.join(refresh);
+      expect(snapshot).toMatchObject({
+        auth: { status: "unauthenticated" },
+        models: [],
+        supportsTextGeneration: false,
+      });
+    }),
   );
 
   it.effect("exposes helper support only when the supplied safety check allows it", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const harness = yield* makeHarness({ safe: false });
-        yield* harness.initialize;
-        yield* harness.provider.onSessionStarted(started);
-        expect((yield* harness.provider.snapshot.getSnapshot).supportsTextGeneration).toBe(false);
-        yield* Ref.set(harness.safety, Effect.succeed(true));
-        yield* harness.provider.snapshot.refresh;
-        expect((yield* harness.provider.snapshot.getSnapshot).supportsTextGeneration).toBe(true);
-      }),
-    ),
+    Effect.gen(function* () {
+      const harness = yield* makeHarness({ safe: false });
+      yield* harness.initialize;
+      yield* harness.provider.onSessionStarted(started);
+      expect((yield* harness.provider.snapshot.getSnapshot).supportsTextGeneration).toBe(false);
+      yield* Ref.set(harness.safety, Effect.succeed(true));
+      yield* harness.provider.snapshot.refresh;
+      expect((yield* harness.provider.snapshot.getSnapshot).supportsTextGeneration).toBe(true);
+    }),
   );
 
   it.effect("keeps discovered workspace skills through session and command updates", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const harness = yield* makeHarness();
-        yield* harness.initialize;
-        const skills = [
-          {
-            name: "deploy",
-            description: "Ship it",
-            path: "/workspace/.agent/skills/deploy",
-            enabled: true,
-          },
-        ];
-        const discovered = yield* harness.provider.snapshotForCwd("/workspace", skills);
-        expect(discovered.skills).toEqual(skills);
-        yield* harness.provider.onSessionStarted(started, "/workspace");
-        yield* harness.provider.onAvailableCommands(commands, "/workspace");
-        const after = yield* harness.provider.snapshot.getSnapshot;
-        expect(
-          after.workspaceSnapshots?.find((entry) => entry.cwd === "/workspace")?.skills,
-        ).toEqual(skills);
-        expect((yield* harness.provider.snapshotForCwd("/workspace")).skills).toEqual(skills);
-
-        const rescanned = [
-          ...skills,
-          { name: "review", path: "/workspace/.agent/skills/review", enabled: true },
-        ];
-        yield* harness.provider.snapshotForCwd("/workspace", rescanned);
-        yield* harness.provider.onSessionStarted(started, "/workspace");
-        expect(
-          (yield* harness.provider.snapshot.getSnapshot).workspaceSnapshots?.find(
-            (entry) => entry.cwd === "/workspace",
-          )?.skills,
-        ).toEqual(rescanned);
-      }),
-    ),
+    Effect.gen(function* () {
+      const harness = yield* makeHarness();
+      yield* harness.initialize;
+      const skills = [
+        {
+          name: "deploy",
+          description: "Ship it",
+          path: "/workspace/.agent/skills/deploy",
+          enabled: true,
+        },
+      ];
+      const discovered = yield* harness.provider.snapshotForCwd("/workspace", skills);
+      expect(discovered.skills).toEqual(skills);
+      yield* harness.provider.onSessionStarted(started, "/workspace");
+      yield* harness.provider.onAvailableCommands(commands, "/workspace");
+      const after = yield* harness.provider.snapshot.getSnapshot;
+      expect(after.workspaceSnapshots?.find((entry) => entry.cwd === "/workspace")?.skills).toEqual(
+        skills,
+      );
+      expect((yield* harness.provider.snapshotForCwd("/workspace")).skills).toEqual(skills);
+
+      const rescanned = [
+        ...skills,
+        { name: "review", path: "/workspace/.agent/skills/review", enabled: true },
+      ];
+      yield* harness.provider.snapshotForCwd("/workspace", rescanned);
+      yield* harness.provider.onSessionStarted(started, "/workspace");
+      expect(
+        (yield* harness.provider.snapshot.getSnapshot).workspaceSnapshots?.find(
+          (entry) => entry.cwd === "/workspace",
+        )?.skills,
+      ).toEqual(rescanned);
+    }),
   );
 
   it.effect("bounds workspace metadata without starting sessions for workspace lookup", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const harness = yield* makeHarness();
-        yield* harness.initialize;
-        yield* harness.provider.onSessionStarted(started);
-        for (let index = 0; index < 35; index++) {
-          yield* harness.provider.onAvailableCommands(commands, `/workspace-${index}`);
-        }
-        const snapshot = yield* harness.provider.snapshotForCwd("/workspace-34");
-        expect(snapshot.workspaceSnapshots).toHaveLength(32);
-        expect(snapshot.workspaceSnapshots?.[0]?.cwd).toBe("/workspace-3");
-        expect(snapshot.slashCommands).toEqual(expectedCommands);
-        expect(yield* Ref.get(harness.probeCalls)).toBe(1);
-      }),
-    ),
+    Effect.gen(function* () {
+      const harness = yield* makeHarness();
+      yield* harness.initialize;
+      yield* harness.provider.onSessionStarted(started);
+      for (let index = 0; index < 35; index++) {
+        yield* harness.provider.onAvailableCommands(commands, `/workspace-${index}`);
+      }
+      const snapshot = yield* harness.provider.snapshotForCwd("/workspace-34");
+      expect(snapshot.workspaceSnapshots).toHaveLength(32);
+      expect(snapshot.workspaceSnapshots?.[0]?.cwd).toBe("/workspace-3");
+      expect(snapshot.slashCommands).toEqual(expectedCommands);
+      expect(yield* Ref.get(harness.probeCalls)).toBe(1);
+    }),
   );
 
   it.effect(
     "publishes limits, retains a successful read on failure, and clears them on sign-out",
     () =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const limits: ServerProviderUsageLimits = {
-            checkedAt: "2026-10-09T12:00:00.000Z",
-            windows: [
-              {
-                id: "3p-weekly",
-                kind: "weekly",
-                label: "Claude & GPT (shared) · Weekly",
-                usedPercent: 75,
-              },
-            ],
-          };
-          const usage = yield* Ref.make(limits);
-          const harness = yield* makeHarness({ probeUsage: Ref.get(usage) });
-          const published = yield* harness.nextPublish((snapshot) => !!snapshot.usageLimits);
-          yield* harness.initialize;
-          expect((yield* published)?.usageLimits).toEqual(limits);
-          // The second health check is the one the failed background read triggers.
-          const checks = yield* Ref.make(0);
-          const failedReadApplied = yield* Deferred.make<void>();
-          yield* Ref.set(
-            harness.probe,
-            Ref.updateAndGet(checks, (count) => count + 1).pipe(
-              Effect.tap((count) =>
-                count === 2 ? Deferred.succeed(failedReadApplied, undefined) : Effect.void,
-              ),
-              Effect.as(initializeResult),
-            ),
-          );
-          yield* Ref.set(usage, {
-            checkedAt: "2026-10-09T12:01:00.000Z",
-            windows: [],
-            unavailable: { reason: "probeFailed" },
-          });
-          yield* harness.provider.snapshot.refresh;
-          yield* Deferred.await(failedReadApplied);
-          expect((yield* harness.provider.snapshot.getSnapshot).usageLimits).toEqual(limits);
-          yield* harness.provider.onSignedOut;
-          expect((yield* harness.provider.snapshot.getSnapshot).usageLimits).toBeUndefined();
-          yield* Ref.set(usage, {
-            checkedAt: "2026-10-09T12:02:00.000Z",
-            windows: [],
-            unavailable: { reason: "unsupported" },
-          });
-          const unsupported = yield* harness.nextPublish(
-            (snapshot) => snapshot.usageLimits?.unavailable?.reason === "unsupported",
-          );
-          yield* harness.provider.snapshot.refresh;
-          expect((yield* unsupported)?.usageLimits?.windows).toEqual([]);
-        }),
-      ),
-  );
-
-  it.effect("a quota read finishing after sign-out cannot restore account limits", () =>
-    Effect.scoped(
       Effect.gen(function* () {
-        const readStarted = yield* Deferred.make<void>();
-        const readResult = yield* Deferred.make<ServerProviderUsageLimits>();
-        const usage = yield* Ref.make<Effect.Effect<ServerProviderUsageLimits>>(
-          Effect.succeed({ checkedAt: "2026-10-09T12:00:00.000Z", windows: [] }),
-        );
-        const harness = yield* makeHarness({ probeUsage: Ref.get(usage).pipe(Effect.flatten) });
+        const limits: ServerProviderUsageLimits = {
+          checkedAt: "2026-10-09T12:00:00.000Z",
+          windows: [
+            {
+              id: "3p-weekly",
+              kind: "weekly",
+              label: "Claude & GPT (shared) · Weekly",
+              usedPercent: 75,
+            },
+          ],
+        };
+        const usage = yield* Ref.make(limits);
+        const harness = yield* makeHarness({ probeUsage: Ref.get(usage) });
+        const published = yield* harness.nextPublish((snapshot) => !!snapshot.usageLimits);
         yield* harness.initialize;
-        yield* Ref.set(harness.probe, Effect.succeed(initializeResult));
+        expect((yield* published)?.usageLimits).toEqual(limits);
+        // The second health check is the one the failed background read triggers.
+        const checks = yield* Ref.make(0);
+        const failedReadApplied = yield* Deferred.make<void>();
         yield* Ref.set(
-          usage,
-          Deferred.succeed(readStarted, undefined).pipe(Effect.andThen(Deferred.await(readResult))),
+          harness.probe,
+          Ref.updateAndGet(checks, (count) => count + 1).pipe(
+            Effect.tap((count) =>
+              count === 2 ? Deferred.succeed(failedReadApplied, undefined) : Effect.void,
+            ),
+            Effect.as(initializeResult),
+          ),
         );
-        const refresh = yield* harness.provider.snapshot.refresh.pipe(Effect.forkChild);
-        yield* Deferred.await(readStarted);
-        yield* harness.provider.onSignedOut;
-        yield* Deferred.succeed(readResult, {
+        yield* Ref.set(usage, {
           checkedAt: "2026-10-09T12:01:00.000Z",
-          windows: [
-            { id: "gemini-5h", kind: "session", label: "Gemini · 5-hour", usedPercent: 10 },
-          ],
+          windows: [],
+          unavailable: { reason: "probeFailed" },
         });
-        yield* Fiber.join(refresh);
+        yield* harness.provider.snapshot.refresh;
+        yield* Deferred.await(failedReadApplied);
+        expect((yield* harness.provider.snapshot.getSnapshot).usageLimits).toEqual(limits);
+        yield* harness.provider.onSignedOut;
         expect((yield* harness.provider.snapshot.getSnapshot).usageLimits).toBeUndefined();
+        yield* Ref.set(usage, {
+          checkedAt: "2026-10-09T12:02:00.000Z",
+          windows: [],
+          unavailable: { reason: "unsupported" },
+        });
+        const unsupported = yield* harness.nextPublish(
+          (snapshot) => snapshot.usageLimits?.unavailable?.reason === "unsupported",
+        );
+        yield* harness.provider.snapshot.refresh;
+        expect((yield* unsupported)?.usageLimits?.windows).toEqual([]);
       }),
-    ),
+  );
+
+  it.effect("a quota read finishing after sign-out cannot restore account limits", () =>
+    Effect.gen(function* () {
+      const readStarted = yield* Deferred.make<void>();
+      const readResult = yield* Deferred.make<ServerProviderUsageLimits>();
+      const usage = yield* Ref.make<Effect.Effect<ServerProviderUsageLimits>>(
+        Effect.succeed({ checkedAt: "2026-10-09T12:00:00.000Z", windows: [] }),
+      );
+      const harness = yield* makeHarness({ probeUsage: Ref.get(usage).pipe(Effect.flatten) });
+      yield* harness.initialize;
+      yield* Ref.set(harness.probe, Effect.succeed(initializeResult));
+      yield* Ref.set(
+        usage,
+        Deferred.succeed(readStarted, undefined).pipe(Effect.andThen(Deferred.await(readResult))),
+      );
+      const refresh = yield* harness.provider.snapshot.refresh.pipe(Effect.forkChild);
+      yield* Deferred.await(readStarted);
+      yield* harness.provider.onSignedOut;
+      yield* Deferred.succeed(readResult, {
+        checkedAt: "2026-10-09T12:01:00.000Z",
+        windows: [{ id: "gemini-5h", kind: "session", label: "Gemini · 5-hour", usedPercent: 10 }],
+      });
+      yield* Fiber.join(refresh);
+      expect((yield* harness.provider.snapshot.getSnapshot).usageLimits).toBeUndefined();
+    }),
   );
 
   it.effect("reports ready and starts sessions while one shared quota read is pending", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const reads = yield* Ref.make(0);
-        const readStarted = yield* Deferred.make<void>();
-        const readResult = yield* Deferred.make<ServerProviderUsageLimits>();
-        const harness = yield* makeHarness({
-          probeUsage: Ref.update(reads, (count) => count + 1).pipe(
-            Effect.andThen(Deferred.succeed(readStarted, undefined)),
-            Effect.andThen(Deferred.await(readResult)),
-          ),
-        });
-        const published = yield* harness.nextPublish((snapshot) => !!snapshot.usageLimits);
-        yield* harness.initialize;
-        yield* Deferred.await(readStarted);
-        yield* harness.provider.onSessionStarted(started, "/workspace");
-        yield* harness.provider.onSessionStarted(started, "/other");
-        const ready = yield* harness.provider.snapshot.getSnapshot;
-        expect(ready).toMatchObject({ status: "ready", auth: { status: "authenticated" } });
-        expect(ready.usageLimits).toBeUndefined();
-        expect(yield* Ref.get(reads)).toBe(1);
-        const limits = {
-          checkedAt: "2026-10-09T12:00:00.000Z",
-          windows: [
-            { id: "gemini-5h", kind: "session", label: "Gemini · 5-hour", usedPercent: 10 },
-          ],
-        } satisfies ServerProviderUsageLimits;
-        yield* Deferred.succeed(readResult, limits);
-        expect((yield* published)?.usageLimits).toEqual(limits);
-      }),
-    ),
+    Effect.gen(function* () {
+      const reads = yield* Ref.make(0);
+      const readStarted = yield* Deferred.make<void>();
+      const readResult = yield* Deferred.make<ServerProviderUsageLimits>();
+      const harness = yield* makeHarness({
+        probeUsage: Ref.update(reads, (count) => count + 1).pipe(
+          Effect.andThen(Deferred.succeed(readStarted, undefined)),
+          Effect.andThen(Deferred.await(readResult)),
+        ),
+      });
+      const published = yield* harness.nextPublish((snapshot) => !!snapshot.usageLimits);
+      yield* harness.initialize;
+      yield* Deferred.await(readStarted);
+      yield* harness.provider.onSessionStarted(started, "/workspace");
+      yield* harness.provider.onSessionStarted(started, "/other");
+      const ready = yield* harness.provider.snapshot.getSnapshot;
+      expect(ready).toMatchObject({ status: "ready", auth: { status: "authenticated" } });
+      expect(ready.usageLimits).toBeUndefined();
+      expect(yield* Ref.get(reads)).toBe(1);
+      const limits = {
+        checkedAt: "2026-10-09T12:00:00.000Z",
+        windows: [{ id: "gemini-5h", kind: "session", label: "Gemini · 5-hour", usedPercent: 10 }],
+      } satisfies ServerProviderUsageLimits;
+      yield* Deferred.succeed(readResult, limits);
+      expect((yield* published)?.usageLimits).toEqual(limits);
+    }),
   );
 
   it.effect("a quota read for the previous account is dropped after a new sign-in", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const oldReadStarted = yield* Deferred.make<void>();
-        const newLimits = {
-          checkedAt: "2026-10-09T12:01:00.000Z",
-          windows: [{ id: "3p-weekly", kind: "weekly", label: "Weekly", usedPercent: 40 }],
-        } satisfies ServerProviderUsageLimits;
-        const usage = yield* Ref.make<Effect.Effect<ServerProviderUsageLimits>>(
-          Deferred.succeed(oldReadStarted, undefined).pipe(Effect.andThen(Effect.never)),
-        );
-        const harness = yield* makeHarness({ probeUsage: Ref.get(usage).pipe(Effect.flatten) });
-        const published = yield* harness.nextPublish((snapshot) => !!snapshot.usageLimits);
-        yield* harness.initialize;
-        yield* Deferred.await(oldReadStarted);
-        yield* Ref.set(usage, Effect.succeed(newLimits));
-        yield* harness.provider.onSignedIn;
-        yield* harness.provider.onSessionStarted(started);
-        expect((yield* published)?.usageLimits).toEqual(newLimits);
-        // Switching again must not republish the previous account's limits, even if the read fails.
-        const failed = {
-          checkedAt: "2026-10-09T12:02:00.000Z",
-          windows: [],
-          unavailable: { reason: "probeFailed" },
-        } satisfies ServerProviderUsageLimits;
-        yield* Ref.set(usage, Effect.succeed(failed));
-        const republished = yield* harness.nextPublish(
-          (snapshot) => snapshot.usageLimits?.unavailable?.reason === "probeFailed",
-        );
-        yield* harness.provider.onSignedIn;
-        expect((yield* harness.provider.snapshot.getSnapshot).usageLimits).toBeUndefined();
-        yield* harness.provider.onSessionStarted(started);
-        expect((yield* republished)?.usageLimits).toEqual(failed);
-      }),
-    ),
+    Effect.gen(function* () {
+      const oldReadStarted = yield* Deferred.make<void>();
+      const newLimits = {
+        checkedAt: "2026-10-09T12:01:00.000Z",
+        windows: [{ id: "3p-weekly", kind: "weekly", label: "Weekly", usedPercent: 40 }],
+      } satisfies ServerProviderUsageLimits;
+      const usage = yield* Ref.make<Effect.Effect<ServerProviderUsageLimits>>(
+        Deferred.succeed(oldReadStarted, undefined).pipe(Effect.andThen(Effect.never)),
+      );
+      const harness = yield* makeHarness({ probeUsage: Ref.get(usage).pipe(Effect.flatten) });
+      const published = yield* harness.nextPublish((snapshot) => !!snapshot.usageLimits);
+      yield* harness.initialize;
+      yield* Deferred.await(oldReadStarted);
+      yield* Ref.set(usage, Effect.succeed(newLimits));
+      yield* harness.provider.onSignedIn;
+      yield* harness.provider.onSessionStarted(started);
+      expect((yield* published)?.usageLimits).toEqual(newLimits);
+      // Switching again must not republish the previous account's limits, even if the read fails.
+      const failed = {
+        checkedAt: "2026-10-09T12:02:00.000Z",
+        windows: [],
+        unavailable: { reason: "probeFailed" },
+      } satisfies ServerProviderUsageLimits;
+      yield* Ref.set(usage, Effect.succeed(failed));
+      const republished = yield* harness.nextPublish(
+        (snapshot) => snapshot.usageLimits?.unavailable?.reason === "probeFailed",
+      );
+      yield* harness.provider.onSignedIn;
+      expect((yield* harness.provider.snapshot.getSnapshot).usageLimits).toBeUndefined();
+      yield* harness.provider.onSessionStarted(started);
+      expect((yield* republished)?.usageLimits).toEqual(failed);
+    }),
   );
 });
diff --git a/apps/server/src/provider/AntigravityProvider.ts b/apps/server/src/provider/AntigravityProvider.ts
index ed047331e73e..b140c7511ca1 100644
--- a/apps/server/src/provider/AntigravityProvider.ts
+++ b/apps/server/src/provider/AntigravityProvider.ts
@@ -1,3 +1,4 @@
+import { resolveProviderProbeTimeoutMs } from "@t3tools/provider-core/server/snapshotProbe";
 import {
   ANTIGRAVITY_DEFAULT_MODEL,
   ProviderDriverKind,
@@ -40,7 +41,7 @@ import { antigravityThinkingConfig } from "./acp/AntigravityAcpSupport.ts";
 
 const EMPTY_MODEL_CAPABILITIES = createModelCapabilities({ optionDescriptors: [] });
 const MAX_WORKSPACE_SNAPSHOTS = 32;
-const HEALTH_CHECK_TIMEOUT = "90 seconds";
+const HEALTH_CHECK_TIMEOUT_MS = 90_000;
 const SIGN_IN_MESSAGE = "Sign in with Google to use Antigravity.";
 const AUTH_UNCHECKED_MESSAGE =
   "Antigravity is installed. Google account access is not checked yet.";
@@ -155,6 +156,7 @@ interface AntigravityProviderState {
 }
 
 interface AntigravityProviderOptions {
+  readonly environment?: NodeJS.ProcessEnv;
   readonly stampIdentity: (snapshot: ServerProviderDraft) => Effect.Effect<ServerProvider>;
   readonly probe: Effect.Effect<
     EffectAcpSchema.InitializeResponse,
@@ -271,10 +273,12 @@ export const makeAntigravityProvider = Effect.fn("makeAntigravityProvider")(func
   const checkProvider = Effect.fn("checkAntigravityProvider")(function* () {
     if (!settings.enabled) return yield* getSnapshot;
     const before = yield* SubscriptionRef.get(metadata);
-    const result = yield* options.probe.pipe(
-      Effect.timeoutOption(HEALTH_CHECK_TIMEOUT),
-      Effect.result,
+    const timeoutMs = resolveProviderProbeTimeoutMs(
+      "antigravity",
+      HEALTH_CHECK_TIMEOUT_MS,
+      options.environment,
     );
+    const result = yield* options.probe.pipe(Effect.timeoutOption(timeoutMs), Effect.result);
     const initialized =
       Result.isSuccess(result) && Option.isSome(result.success) ? result.success.value : undefined;
     const version = initialized?.agentInfo?.version;
@@ -289,7 +293,7 @@ export const makeAntigravityProvider = Effect.fn("makeAntigravityProvider")(func
             ? "Antigravity ACP runtime is not installed or its executable could not be found."
             : failure
               ? "Antigravity could not complete its local health check."
-              : `Antigravity did not respond to its local health check within ${HEALTH_CHECK_TIMEOUT}.`;
+              : `Antigravity did not respond to its local health check within ${timeoutMs / 1_000} seconds.`;
     const supportsTextGeneration =
       initialized !== undefined ? yield* options.supportsTextGeneration : false;
     const updatedAt = DateTime.formatIso(yield* DateTime.now);
diff --git a/apps/server/src/provider/ClaudeProvider.ts b/apps/server/src/provider/ClaudeProvider.ts
index eafd128d610f..f969544fad06 100644
--- a/apps/server/src/provider/ClaudeProvider.ts
+++ b/apps/server/src/provider/ClaudeProvider.ts
@@ -1,3 +1,4 @@
+import { resolveProviderProbeTimeoutMs } from "@t3tools/provider-core/server/snapshotProbe";
 import {
   type ClaudeSettings,
   type ModelCapabilities,
@@ -484,7 +485,9 @@ const probeClaudeCapabilities = (
       catch: (cause) => new ClaudeCapabilitiesProbeSdkError({ operation: "initialize", cause }),
     });
   }).pipe(
-    Effect.timeout(CAPABILITIES_PROBE_TIMEOUT_MS),
+    Effect.timeout(
+      resolveProviderProbeTimeoutMs("claude", CAPABILITIES_PROBE_TIMEOUT_MS, environment),
+    ),
     Effect.flatMap(({ q, init, graceMs }) =>
       Effect.gen(function* () {
         // Usage has its own deadline so a slow optional request cannot discard initialization.
@@ -651,7 +654,12 @@ export const checkClaudeProviderStatus = Effect.fn("checkClaudeProviderStatus")(
     ["--version"],
     providerProbeEnvironment(resolvedEnvironment),
     cwd,
-  ).pipe(Effect.timeoutOption(CLAUDE_VERSION_CHECK_TIMEOUT_MS), Effect.result);
+  ).pipe(
+    Effect.timeoutOption(
+      resolveProviderProbeTimeoutMs("claude", CLAUDE_VERSION_CHECK_TIMEOUT_MS, resolvedEnvironment),
+    ),
+    Effect.result,
+  );
 
   if (Result.isFailure(versionProbe)) {
     const error = versionProbe.failure;
@@ -756,7 +764,7 @@ export const checkClaudeProviderStatus = Effect.fn("checkClaudeProviderStatus")(
         auth: { status: "unknown" },
         message: probeFailure
           ? Cause.isTimeoutError(probeFailure)
-            ? `Timed out after ${CAPABILITIES_PROBE_TIMEOUT_MS / 1_000}s while checking Claude account status.`
+            ? `Timed out after ${resolveProviderProbeTimeoutMs("claude", CAPABILITIES_PROBE_TIMEOUT_MS, resolvedEnvironment) / 1_000}s while checking Claude account status.`
             : "Claude Agent CLI failed while checking account status."
           : "Could not verify Claude authentication status from initialization result.",
       },
diff --git a/apps/server/src/provider/CodexInstallation.test.ts b/apps/server/src/provider/CodexInstallation.test.ts
index 98861629c79f..5536fe7a1704 100644
--- a/apps/server/src/provider/CodexInstallation.test.ts
+++ b/apps/server/src/provider/CodexInstallation.test.ts
@@ -41,6 +41,8 @@ const makeHarness = Effect.fn("test.makeCodexInstallation")(function* (
     platform?: NodeJS.Platform;
     spawner?: ChildProcessSpawner.ChildProcessSpawner["Service"];
     runtimeRenameFailures?: number;
+    /** Served by URL instead of the pinned package. */
+    responses?: Readonly<Record<string, () => Response>>;
   } = {},
 ) {
   const fs = yield* FileSystem.FileSystem;
@@ -110,6 +112,8 @@ const makeHarness = Effect.fn("test.makeCodexInstallation")(function* (
       HttpClient.make((request) =>
         Effect.sync(() => {
           downloads++;
+          const respond = input.responses?.[request.url];
+          if (respond) return HttpClientResponse.fromWeb(request, respond());
           return Object.defineProperty(
             HttpClientResponse.fromWeb(
               request,
@@ -529,4 +533,214 @@ it.effect("keeps an activated runtime when a later update fails verification", (
   }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
 );
 
-// Stands in for Windows' bsdtar: CRLF listings, and extraction writes the Windows layout.
+const upstreamVersion = "0.163.0";
+const upstreamArchive = Buffer.from(
+  "H4sIAAAAAAACA+3WzY7CIBQF4D5Kw1oqtNQmPoh7rKStP9BQdMaYefcBE43T9RQ1nm8B7Q1Jk94cYN3peW026juZDvOqsrzO3nj2yofnUK9KwZKUJREcByet/2TymabuPby29S3/NIz0EIbWDC5u/sXf/PO8EAL5j+G/ew1vuP/TXrp2bpunnf/5KP+syCvkP4bJmg5vlf96JxuVbQej4+efi2qUf17g/h/Hhezl2RzdStmhM5osUz5Lyen+RljGF0XGiK/6H9UoF4pS2rpdCCr7fq/oRtqvTocVSjt77k2nr6vud0vyg6ABAAAAAAAAAAAAAABE8gvVbjvaACgAAA==",
+  "base64",
+);
+const upstreamReleaseUrl = `https://github.com/openai/codex/releases/download/rust-v${upstreamVersion}`;
+const upstreamResponses = (checksum: string) => ({
+  "https://registry.npmjs.org/@openai/codex/latest": () =>
+    Response.json({ version: upstreamVersion }),
+  [`${upstreamReleaseUrl}/codex-package_SHA256SUMS`]: () =>
+    new Response(
+      `${"0".repeat(64)}  codex-package-x86_64-apple-darwin.tar.gz\n${checksum}  codex-package-aarch64-apple-darwin.tar.gz\n`,
+    ),
+  [`${upstreamReleaseUrl}/codex-package-aarch64-apple-darwin.tar.gz`]: () =>
+    new Response(upstreamArchive),
+});
+
+it.effect("updates a managed install to OpenAI's newest release and never downgrades it", () =>
+  Effect.gen(function* () {
+    const digest = yield* Digest.Digest;
+    const checksum = Hex.encode(
+      yield* digest.digest(Digest.sha256, upstreamArchive).pipe(Effect.orDie),
+    );
+    const h = yield* makeHarness({ responses: upstreamResponses(checksum) });
+    yield* h.installation.checkForUpdate;
+    // A fresh install still gets the pinned release.
+    expect((yield* h.installation.state).version).toBe("0.156.1");
+    yield* h.installation.start;
+    expect(yield* terminalState(h.installation)).toMatchObject({
+      phase: "succeeded",
+      installedVersion: "0.156.1",
+      version: upstreamVersion,
+    });
+
+    yield* h.installation.start;
+    expect(yield* terminalState(h.installation)).toMatchObject({
+      phase: "succeeded",
+      installedVersion: upstreamVersion,
+      version: upstreamVersion,
+    });
+    expect((yield* h.installation.resolve()).version).toBe(upstreamVersion);
+
+    // Without upstream information the older pin is not offered as a reinstall.
+    const restarted = yield* makeHarness({ baseDir: h.baseDir });
+    expect(yield* restarted.installation.state).toMatchObject({
+      installedVersion: upstreamVersion,
+      version: upstreamVersion,
+    });
+    yield* restarted.installation.start;
+    expect(yield* terminalState(restarted.installation)).toMatchObject({
+      phase: "succeeded",
+      installedVersion: upstreamVersion,
+    });
+    expect(restarted.downloads()).toBe(0);
+  }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
+);
+
+it.effect("keeps the managed install when an update fails its published checksum", () =>
+  Effect.gen(function* () {
+    const h = yield* makeHarness({ responses: upstreamResponses("f".repeat(64)) });
+    yield* h.installation.start;
+    yield* terminalState(h.installation);
+    yield* h.installation.checkForUpdate;
+    yield* h.installation.start;
+    expect(yield* terminalState(h.installation)).toMatchObject({
+      phase: "failed",
+      installedVersion: "0.156.1",
+      message: expect.stringContaining("SHA-256"),
+    });
+    expect((yield* h.installation.resolve()).version).toBe("0.156.1");
+  }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
+);
+
+it.effect("does not install a cached update the manifest has since withdrawn", () =>
+  Effect.gen(function* () {
+    const digest = yield* Digest.Digest;
+    const checksum = Hex.encode(
+      yield* digest.digest(Digest.sha256, upstreamArchive).pipe(Effect.orDie),
+    );
+    let manifest = ModelManifest.BUNDLED_MODEL_MANIFEST;
+    const h = yield* makeHarness({
+      responses: upstreamResponses(checksum),
+      manifestCurrent: Effect.sync(() => manifest),
+    });
+    yield* h.installation.start;
+    yield* terminalState(h.installation);
+    yield* h.installation.checkForUpdate;
+    expect((yield* h.installation.state).version).toBe(upstreamVersion);
+    manifest = {
+      ...manifest,
+      compatibility: [
+        {
+          driver: "codex",
+          t3CodeRange: ">=0.0.42",
+          ranges: [
+            { range: ">=0.160.0", status: "unsupported" },
+            { range: ">=0.156.0 <0.160.0", status: "supported" },
+          ],
+        },
+      ],
+    };
+    const downloads = h.downloads();
+    yield* h.installation.start;
+    expect(yield* terminalState(h.installation)).toMatchObject({
+      phase: "succeeded",
+      installedVersion: "0.156.1",
+      version: "0.156.1",
+    });
+    expect(h.downloads()).toBe(downloads);
+    expect((yield* h.installation.resolve()).version).toBe("0.156.1");
+  }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
+);
+
+it.effect("returns a managed install the manifest withdraws to the pinned release", () =>
+  Effect.gen(function* () {
+    const digest = yield* Digest.Digest;
+    const checksum = Hex.encode(
+      yield* digest.digest(Digest.sha256, upstreamArchive).pipe(Effect.orDie),
+    );
+    let manifest = ModelManifest.BUNDLED_MODEL_MANIFEST;
+    const h = yield* makeHarness({
+      responses: upstreamResponses(checksum),
+      manifestCurrent: Effect.sync(() => manifest),
+    });
+    yield* h.installation.checkForUpdate;
+    yield* h.installation.start;
+    yield* terminalState(h.installation);
+    yield* h.installation.start;
+    expect(yield* terminalState(h.installation)).toMatchObject({
+      installedVersion: upstreamVersion,
+    });
+
+    manifest = {
+      ...manifest,
+      compatibility: [
+        {
+          driver: "codex",
+          t3CodeRange: ">=0.0.42",
+          ranges: [
+            { range: ">=0.160.0", status: "unsupported" },
+            { range: ">=0.156.0 <0.160.0", status: "supported" },
+          ],
+        },
+      ],
+    };
+    yield* h.installation.checkForUpdate;
+    expect(yield* h.installation.state).toMatchObject({
+      installedVersion: upstreamVersion,
+      version: "0.156.1",
+    });
+    yield* h.installation.start;
+    expect(yield* terminalState(h.installation)).toMatchObject({
+      phase: "succeeded",
+      installedVersion: "0.156.1",
+      version: "0.156.1",
+    });
+    expect((yield* h.installation.resolve()).version).toBe("0.156.1");
+  }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
+);
+
+it.effect.each(["update", "reinstall"] as const)(
+  "rejects withdrawal during $0 validation",
+  (operation) =>
+    Effect.gen(function* () {
+      const digest = yield* Digest.Digest;
+      const checksum = Hex.encode(
+        yield* digest.digest(Digest.sha256, upstreamArchive).pipe(Effect.orDie),
+      );
+      let manifest = ModelManifest.BUNDLED_MODEL_MANIFEST;
+      let withdraw = operation === "update";
+      const h = yield* makeHarness({
+        responses: upstreamResponses(checksum),
+        manifestCurrent: Effect.sync(() => manifest),
+        options: {
+          validate: (_executable, version) =>
+            Effect.sync(() => {
+              if (withdraw && version === upstreamVersion)
+                manifest = {
+                  ...ModelManifest.BUNDLED_MODEL_MANIFEST,
+                  compatibility: [
+                    {
+                      driver: "codex",
+                      t3CodeRange: ">=0.0.42",
+                      ranges: [
+                        { range: ">=0.160.0", status: "unsupported" },
+                        { range: ">=0.156.0 <0.160.0", status: "supported" },
+                      ],
+                    },
+                  ],
+                };
+            }),
+        },
+      });
+      yield* h.installation.start;
+      yield* terminalState(h.installation);
+      yield* h.installation.checkForUpdate;
+      if (operation === "reinstall") {
+        yield* h.installation.start;
+        expect((yield* terminalState(h.installation)).phase).toBe("succeeded");
+        withdraw = true;
+      }
+      yield* h.installation.start;
+      expect((yield* terminalState(h.installation)).phase).toBe("failed");
+      if (operation === "update") {
+        expect((yield* h.installation.resolve()).version).toBe("0.156.1");
+      } else {
+        expect((yield* h.installation.state).version).toBe("0.156.1");
+        yield* Effect.flip(h.installation.resolve());
+      }
+    }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
+);
diff --git a/apps/server/src/provider/CodexInstallation.ts b/apps/server/src/provider/CodexInstallation.ts
index 8fdcfbebb328..c1e489ec0e1e 100644
--- a/apps/server/src/provider/CodexInstallation.ts
+++ b/apps/server/src/provider/CodexInstallation.ts
@@ -4,7 +4,7 @@ import {
   type ProviderInstallState,
   type ServerProviderCompatibilityAdvisory,
 } from "@t3tools/contracts";
-import { cliArchiveTarCommand } from "@t3tools/shared/cliRelease";
+import { cliArchiveTarCommand, parseChecksums } from "@t3tools/shared/cliRelease";
 import { compareSemverVersions } from "@t3tools/shared/semver";
 import * as HostProcess from "@t3tools/shared/HostProcess";
 import { resolveCommandPath, resolveSpawnCommand } from "@t3tools/shared/shell";
@@ -29,11 +29,18 @@ import { HttpClient, HttpClientRequest, HttpClientResponse } from "effect/http";
 import { ChildProcess, ChildProcessSpawner } from "effect/process";
 import * as NodeCrypto from "node:crypto";
 import * as ServerConfig from "../config.ts";
+import { selectManagedRelease } from "./managedRelease.ts";
 import * as ModelManifest from "./ModelManifest.ts";
 import { resolveProviderCompatibility } from "./providerCompatibility.ts";
 
 const DRIVER = ProviderDriverKind.make("codex");
 const STAGING_STALE_AFTER_MS = 24 * 60 * 60_000;
+const UPDATE_CHECK_INTERVAL_MS = 60 * 60_000;
+const UPDATE_CHECK_TIMEOUT = "20 seconds";
+const UPSTREAM_LATEST_URL = "https://registry.npmjs.org/@openai/codex/latest";
+const UPSTREAM_RELEASES_URL = "https://github.com/openai/codex/releases/download";
+// An upstream release has no recorded size; current packages are about 160 MB.
+const UPSTREAM_MAX_ARCHIVE_BYTES = 1024 * 1024 * 1024;
 const Version = Schema.String.check(Schema.isPattern(/^\d+\.\d+\.\d+(?:-[a-zA-Z0-9.-]+)?$/u));
 const ActiveRelease = Schema.Struct({ version: Version });
 const InstalledRelease = Schema.Struct({
@@ -48,6 +55,7 @@ const PackageManifest = Schema.Struct({
   entrypoint: Schema.String,
 });
 const decodeVersion = Schema.decodeUnknownEffect(Version);
+const decodeNpmLatest = Schema.decodeUnknownEffect(Schema.Struct({ version: Version }));
 const encodeRecord = Schema.encodeEffect(Schema.fromJsonString(InstalledRelease));
 const encodeActive = Schema.encodeEffect(Schema.fromJsonString(ActiveRelease));
 export interface CodexReleaseAsset {
@@ -55,7 +63,8 @@ export interface CodexReleaseAsset {
   readonly target: string;
   readonly url: string;
   readonly sha256: string;
-  readonly archiveBytes: number;
+  /** Null for an upstream release, whose package checksum is published without a size. */
+  readonly archiveBytes: number | null;
 }
 const RELEASES: Readonly<Record<string, CodexReleaseAsset>> = {
   "darwin-arm64": {
@@ -139,6 +148,11 @@ interface CodexInstallationService {
   ) => Effect.Effect<ProviderInstallState, CodexInstallationError>;
   readonly state: Effect.Effect<ProviderInstallState>;
   readonly changes: Stream.Stream<ProviderInstallState>;
+  /**
+   * Looks up OpenAI's newest Codex release, at most hourly, and offers it
+   * through `state.version` when it is newer than the managed install.
+   */
+  readonly checkForUpdate: Effect.Effect<void>;
   readonly remove: (
     protectedBinaryPaths?: ReadonlyArray<string>,
   ) => Effect.Effect<void, CodexInstallationError>;
@@ -186,15 +200,31 @@ export const makeCodexInstallation = Effect.fn("makeCodexInstallation")(function
   const activePath = path.join(managedDirectory, "active.json");
   const executableName = platform === "win32" ? "codex.exe" : "codex";
   const gate = yield* Semaphore.make(1);
+  const updateCheckGate = yield* Semaphore.make(1);
   let leases = 0;
   let running: { readonly operationId: string; readonly fiber: Fiber.Fiber<void> } | undefined;
+  let upstream: CodexReleaseAsset | null = null;
+  let upstreamCheckedAt: number | null = null;
+
+  // A local Codex is used as is, so only a managed install is ever updated.
+  const managedVersion = (current: ProviderInstallState) =>
+    current.source === "managed" ? current.installedVersion : null;
+  // What `start` installs next. Clients compare `version` with
+  // `installedVersion` to offer an update.
+  const offer = (installedVersion: string | null) => {
+    const release = selectManagedRelease(installedVersion, asset, upstream);
+    return {
+      version: release?.version ?? installedVersion,
+      totalBytes: release?.archiveBytes ?? null,
+    };
+  };
+
   const state = yield* SubscriptionRef.make<ProviderInstallState>({
     driver: DRIVER,
     operationId: null,
     phase: "idle",
     downloadedBytes: 0,
-    totalBytes: asset?.archiveBytes ?? null,
-    version: asset?.version ?? null,
+    ...offer(null),
     installedVersion: null,
     executablePath: null,
     canRemove: false,
@@ -279,6 +309,70 @@ export const makeCodexInstallation = Effect.fn("makeCodexInstallation")(function
       )
     );
   });
+  const isSupported = (version: string) =>
+    compatibility(version).pipe(Effect.map((advisory) => advisory?.status === "supported"));
+  // Forgets what the manifest withdrew after it was seen. Managed resolution
+  // refuses a withdrawn install, so the pin replaces it rather than a re-check.
+  const keptInstall = Effect.fn("CodexInstallation.keptInstall")(function* (
+    installedVersion: string | null,
+  ) {
+    if (upstream && !(yield* isSupported(upstream.version))) upstream = null;
+    return installedVersion !== null && (yield* isSupported(installedVersion))
+      ? installedVersion
+      : null;
+  });
+  // npm names the latest stable release; its GitHub release lists the package
+  // checksums, so an upstream update stays SHA-256 verified.
+  const lookupUpstream = Effect.gen(function* () {
+    if (!asset) return null;
+    const latest = yield* http
+      .execute(HttpClientRequest.get(UPSTREAM_LATEST_URL))
+      .pipe(Effect.flatMap(HttpClientResponse.filterStatusOk));
+    const { version } = yield* latest.json.pipe(Effect.flatMap(decodeNpmLatest));
+    // Managed resolution refuses anything else, so offering it would break sessions.
+    if (!(yield* isSupported(version))) return null;
+    const releaseUrl = `${UPSTREAM_RELEASES_URL}/rust-v${version}`;
+    const checksums = yield* http
+      .execute(HttpClientRequest.get(`${releaseUrl}/codex-package_SHA256SUMS`))
+      .pipe(
+        Effect.flatMap(HttpClientResponse.filterStatusOk),
+        Effect.flatMap((response) => response.text),
+      );
+    const fileName = `codex-package-${asset.target}.tar.gz`;
+    const sha256 = parseChecksums(checksums).get(fileName);
+    if (!sha256) return null;
+    return {
+      version,
+      target: asset.target,
+      url: `${releaseUrl}/${fileName}`,
+      sha256,
+      archiveBytes: null,
+    } satisfies CodexReleaseAsset;
+  });
+  // A check already in flight covers concurrent subscribers, including when it fails.
+  const checkForUpdate = updateCheckGate
+    .withPermitsIfAvailable(1)(
+      Effect.gen(function* () {
+        const now = yield* Clock.currentTimeMillis;
+        if (upstreamCheckedAt === null || now - upstreamCheckedAt >= UPDATE_CHECK_INTERVAL_MS) {
+          // A failed lookup counts too, and keeps whatever release was offered before.
+          upstreamCheckedAt = now;
+          upstream = yield* lookupUpstream.pipe(
+            Effect.timeout(UPDATE_CHECK_TIMEOUT),
+            Effect.orElseSucceed(() => upstream),
+          );
+        }
+        // A running install already published the release it is installing.
+        yield* SubscriptionRef.updateEffect(state, (current) =>
+          isRunning(current)
+            ? Effect.succeed(current)
+            : keptInstall(managedVersion(current)).pipe(
+                Effect.map((kept) => ({ ...current, ...offer(kept) })),
+              ),
+        );
+      }),
+    )
+    .pipe(Effect.ignore);
   const resolveManaged = Effect.fn("CodexInstallation.resolveManaged")(
     function* () {
       const active = yield* readRecord(activePath, ActiveRelease);
@@ -464,6 +558,14 @@ export const makeCodexInstallation = Effect.fn("makeCodexInstallation")(function
     );
   const install = Effect.fn("CodexInstallation.install")(
     function* (release: CodexReleaseAsset) {
+      const ensureEligible = Effect.fn("CodexInstallation.ensureEligible")(function* () {
+        if (release.version !== asset?.version && !(yield* isSupported(release.version))) {
+          return yield* installationError(
+            "verify",
+            "This Codex release was withdrawn. Check for updates and try again.",
+          );
+        }
+      });
       yield* decodeVersion(release.version);
       yield* fs.makeDirectory(managedDirectory, { recursive: true });
       yield* SubscriptionRef.update(state, (current) => ({ ...current, canRemove: true }));
@@ -480,12 +582,14 @@ export const makeCodexInstallation = Effect.fn("makeCodexInstallation")(function
             mode: 0o600,
             flag: "wx",
           });
+          yield* ensureEligible();
           yield* fs.rename(pointer, activePath);
           yield* SubscriptionRef.update(
             state,
             (current) =>
               ({
                 ...current,
+                ...offer(release.version),
                 phase: "succeeded",
                 source: "managed",
                 installedVersion: release.version,
@@ -508,6 +612,7 @@ export const makeCodexInstallation = Effect.fn("makeCodexInstallation")(function
             "verify",
             "The existing managed Codex release differs from the official package. Remove it and reinstall.",
           );
+        yield* ensureEligible();
         yield* validate(existing, release.version).pipe(
           Effect.scoped,
           Effect.timeout("90 seconds"),
@@ -523,6 +628,7 @@ export const makeCodexInstallation = Effect.fn("makeCodexInstallation")(function
       const runtime = path.join(staging, "runtime");
       yield* fs.makeDirectory(runtime);
       const hash = NodeCrypto.createHash("sha256");
+      const maxArchiveBytes = release.archiveBytes ?? UPSTREAM_MAX_ARCHIVE_BYTES;
       let downloadedBytes = 0;
       let lastProgressAt = yield* Clock.currentTimeMillis;
       const response = yield* http
@@ -532,7 +638,7 @@ export const makeCodexInstallation = Effect.fn("makeCodexInstallation")(function
         Stream.tap((chunk) =>
           Effect.gen(function* () {
             downloadedBytes += chunk.byteLength;
-            if (downloadedBytes > release.archiveBytes)
+            if (downloadedBytes > maxArchiveBytes)
               return yield* installationError(
                 "download",
                 "The Codex download exceeded the expected release size.",
@@ -556,7 +662,10 @@ export const makeCodexInstallation = Effect.fn("makeCodexInstallation")(function
             ),
         }),
       );
-      if (downloadedBytes !== release.archiveBytes || hash.digest("hex") !== release.sha256)
+      if (
+        (release.archiveBytes !== null && downloadedBytes !== release.archiveBytes) ||
+        hash.digest("hex") !== release.sha256
+      )
         return yield* installationError(
           "download",
           "The Codex download failed its size or SHA-256 check. Nothing was installed.",
@@ -600,6 +709,7 @@ export const makeCodexInstallation = Effect.fn("makeCodexInstallation")(function
           }) satisfies ProviderInstallState,
       );
       const executable = yield* fromDirectory(runtime, release.version, release.target);
+      yield* ensureEligible();
       yield* validate(executable, release.version).pipe(
         Effect.scoped,
         Effect.timeout("90 seconds"),
@@ -642,13 +752,54 @@ export const makeCodexInstallation = Effect.fn("makeCodexInstallation")(function
       ),
     ),
   );
+  // Nothing newer is known, so "reinstall" re-checks the active runtime rather
+  // than replacing it with an older pinned release.
+  const reverify = Effect.fn("CodexInstallation.reverify")(
+    function* () {
+      const active = yield* readRecord(activePath, ActiveRelease);
+      const executable = yield* completedRelease(active.version);
+      yield* validate(executable, executable.version).pipe(
+        Effect.scoped,
+        Effect.timeout("90 seconds"),
+      );
+      const kept = yield* keptInstall(executable.version);
+      if (kept === null) {
+        yield* SubscriptionRef.update(state, (current) => ({ ...current, ...offer(kept) }));
+        return yield* installationError(
+          "verify",
+          "This Codex release was withdrawn. Check for updates and try again.",
+        );
+      }
+      yield* SubscriptionRef.update(
+        state,
+        (current) =>
+          ({
+            ...current,
+            ...offer(kept),
+            phase: "succeeded",
+            source: "managed",
+            installedVersion: executable.version,
+            executablePath: executable.executablePath,
+            message: null,
+          }) satisfies ProviderInstallState,
+      );
+    },
+    Effect.mapError(
+      wrapFailure(
+        "verify",
+        "The installed Codex runtime could not start. Remove it and reinstall.",
+      ),
+    ),
+  );
   const start = gate
     .withPermit(
       Effect.gen(function* () {
         const current = yield* SubscriptionRef.get(state);
         if (isRunning(current)) return current;
         if (yield* reuseLocal()) return yield* SubscriptionRef.get(state);
-        if (!asset) {
+        const installedVersion = yield* keptInstall(managedVersion(current));
+        const release = selectManagedRelease(installedVersion, asset, upstream);
+        if (!release && installedVersion === null) {
           return yield* installationError(
             "start",
             `OpenAI does not publish a Codex runtime for ${platform}-${arch}. Use a supported remote environment or a custom executable.`,
@@ -658,14 +809,13 @@ export const makeCodexInstallation = Effect.fn("makeCodexInstallation")(function
         const next: ProviderInstallState = {
           ...current,
           operationId,
-          phase: "downloading",
+          phase: release ? "downloading" : "verifying",
           downloadedBytes: 0,
-          totalBytes: asset.archiveBytes,
-          version: asset.version,
-          message: "Downloading Codex.",
+          ...offer(installedVersion),
+          message: release ? "Downloading Codex." : "Checking Codex.",
         };
         yield* SubscriptionRef.set(state, next);
-        const work = install(asset).pipe(
+        const work = (release ? install(release) : reverify()).pipe(
           Effect.onExit((exit) =>
             Exit.isFailure(exit)
               ? SubscriptionRef.update(state, (value) => {
@@ -745,6 +895,7 @@ export const makeCodexInstallation = Effect.fn("makeCodexInstallation")(function
             (current) =>
               ({
                 ...current,
+                ...offer(null),
                 operationId: null,
                 phase: "idle",
                 downloadedBytes: 0,
@@ -796,11 +947,13 @@ export const makeCodexInstallation = Effect.fn("makeCodexInstallation")(function
     if (!(yield* fs.exists(activePath))) return;
     const active = yield* readRecord(activePath, ActiveRelease);
     const installed = yield* completedRelease(active.version);
+    const kept = yield* keptInstall(installed.version);
     yield* SubscriptionRef.update(
       state,
       (current) =>
         ({
           ...current,
+          ...offer(kept),
           installedVersion: installed.version,
           executablePath: installed.executablePath,
           source: "managed",
@@ -832,6 +985,7 @@ export const makeCodexInstallation = Effect.fn("makeCodexInstallation")(function
     cancel,
     state: SubscriptionRef.get(state),
     changes: SubscriptionRef.changes(state),
+    checkForUpdate,
     remove,
   });
 });
diff --git a/apps/server/src/provider/CodexProvider.test.ts b/apps/server/src/provider/CodexProvider.test.ts
index c9a992bcf516..7eadf550eab2 100644
--- a/apps/server/src/provider/CodexProvider.test.ts
+++ b/apps/server/src/provider/CodexProvider.test.ts
@@ -16,6 +16,7 @@ it("maps current Codex model capability fields", () => {
     id: "gpt-test",
     isDefault: true,
     model: "gpt-test",
+    availableAccessPrograms: { cyber: ["standard", "daybreakBlue"] },
     defaultServiceTier: "flex",
     serviceTiers: [
       {
@@ -65,6 +66,16 @@ it("maps current Codex model capability fields", () => {
       ],
       currentValue: "flex",
     },
+    {
+      id: "cyberAccessProgram",
+      label: "Cyber Access",
+      type: "select",
+      options: [
+        { id: "standard", label: "Standard", isDefault: true },
+        { id: "daybreakBlue", label: "Daybreak Blue" },
+      ],
+      currentValue: "standard",
+    },
   ]);
 });
 
diff --git a/apps/server/src/provider/CodexProvider.ts b/apps/server/src/provider/CodexProvider.ts
index 3fde32add219..f3bbf514a83e 100644
--- a/apps/server/src/provider/CodexProvider.ts
+++ b/apps/server/src/provider/CodexProvider.ts
@@ -1,3 +1,4 @@
+import { resolveProviderProbeTimeoutMs } from "@t3tools/provider-core/server/snapshotProbe";
 import { pipe } from "effect/Function";
 import * as DateTime from "effect/DateTime";
 import * as Duration from "effect/Duration";
@@ -56,7 +57,6 @@ import {
 import * as HostProcess from "@t3tools/shared/HostProcess";
 import packageJson from "../../package.json" with { type: "json" };
 const isCodexAppServerSpawnError = Schema.is(CodexErrors.CodexAppServerSpawnError);
-const RATE_LIMITS_PROBE_TIMEOUT_MS = 3_000;
 
 type CodexRateLimitsProbe =
   | {
@@ -82,6 +82,18 @@ const CodexRoutingConfig = Schema.Struct({
 });
 const decodeCodexRoutingConfig = Schema.decodeUnknownOption(CodexRoutingConfig);
 
+const CodexCyberAccessConfig = Schema.Struct({
+  daybreak: Schema.optionalKey(Schema.NullOr(Schema.Boolean)),
+  features: Schema.optionalKey(
+    Schema.NullOr(
+      Schema.Struct({
+        api_key_cyber_access_programs: Schema.optionalKey(Schema.NullOr(Schema.Boolean)),
+      }),
+    ),
+  ),
+});
+const decodeCodexCyberAccessConfig = Schema.decodeUnknownOption(CodexCyberAccessConfig);
+
 function routesToNativeOpenai(config: unknown): boolean {
   const decoded = decodeCodexRoutingConfig(config);
   if (Option.isNone(decoded)) return false;
@@ -133,6 +145,9 @@ export interface CodexAppServerProviderSnapshot {
   readonly version: string | undefined;
   readonly models: ReadonlyArray<ServerProviderModel> | undefined;
   readonly serviceTier?: string | undefined;
+  /** Undefined when `config/read` failed, so T3 cannot know Codex's default program. */
+  readonly daybreakEnabled?: boolean | undefined;
+  readonly cyberAccessProgramsUnavailable?: boolean | undefined;
   readonly skills: ReadonlyArray<ServerProviderSkill>;
 }
 
@@ -153,6 +168,12 @@ const SERVICE_TIER_DESCRIPTIONS: Readonly<Record<string, string>> = {
   ultrafast: "Even faster, more expensive",
 };
 
+const CYBER_ACCESS_PROGRAM_LABELS: Readonly<Record<string, string>> = {
+  standard: "Standard",
+  daybreakBlue: "Daybreak Blue",
+  daybreakRed: "Daybreak Red",
+};
+
 function reasoningEffortLabel(reasoningEffort: string): string {
   return REASONING_EFFORT_LABELS[reasoningEffort] ?? reasoningEffort;
 }
@@ -281,6 +302,25 @@ export function mapCodexModelCapabilities(
       currentValue: defaultServiceTier,
     });
   }
+  const cyberAccessPrograms = model.availableAccessPrograms?.cyber ?? [];
+  if (cyberAccessPrograms.length > 0) {
+    const hasStandard = cyberAccessPrograms.includes("standard");
+    const defaultProgram = hasStandard ? "standard" : cyberAccessPrograms[0];
+    optionDescriptors.push({
+      id: "cyberAccessProgram",
+      label: "Cyber Access",
+      type: "select",
+      // Standard stays selectable as an opt-out; Codex rejects it visibly when the login cannot use it.
+      options: (hasStandard ? cyberAccessPrograms : ["standard", ...cyberAccessPrograms]).map(
+        (program) => ({
+          id: program,
+          label: CYBER_ACCESS_PROGRAM_LABELS[program] ?? program,
+          ...(program === defaultProgram ? { isDefault: true } : {}),
+        }),
+      ),
+      ...(defaultProgram === undefined ? {} : { currentValue: defaultProgram }),
+    });
+  }
 
   return createModelCapabilities({
     optionDescriptors,
@@ -320,37 +360,95 @@ export function applyPreferredCodexDefaultModel(
   });
 }
 
-function applyConfiguredCodexServiceTier(
+function mapCodexOptionDescriptors(
   models: ReadonlyArray<ServerProviderModel>,
-  serviceTier: string | undefined,
+  update: (
+    descriptors: ReadonlyArray<ProviderOptionDescriptor>,
+    model: ServerProviderModel,
+  ) => ReadonlyArray<ProviderOptionDescriptor>,
 ): ReadonlyArray<ServerProviderModel> {
-  if (!serviceTier) return models;
   return models.map((model) => {
     if (!model.capabilities?.optionDescriptors) return model;
     return {
       ...model,
       capabilities: {
         ...model.capabilities,
-        optionDescriptors: model.capabilities.optionDescriptors.map((descriptor) => {
-          if (descriptor.id !== "serviceTier" || descriptor.type !== "select") return descriptor;
-          const value = descriptor.options.find(
-            (option) =>
-              option.id === serviceTier || (serviceTier === "fast" && option.id === "priority"),
-          )?.id;
-          if (!value) return descriptor;
-          return {
-            ...descriptor,
-            currentValue: value,
-            options: descriptor.options.map(({ isDefault: _isDefault, ...option }) =>
-              option.id === value ? { ...option, isDefault: true } : option,
-            ),
-          };
-        }),
+        optionDescriptors: update(model.capabilities.optionDescriptors, model),
       },
     };
   });
 }
 
+function withConfiguredSelectDefault(
+  models: ReadonlyArray<ServerProviderModel>,
+  descriptorId: string,
+  pick: (options: ReadonlyArray<{ readonly id: string }>) => string | undefined,
+): ReadonlyArray<ServerProviderModel> {
+  return mapCodexOptionDescriptors(models, (descriptors) =>
+    descriptors.map((descriptor) => {
+      if (descriptor.id !== descriptorId || descriptor.type !== "select") return descriptor;
+      const value = pick(descriptor.options);
+      if (!value) return descriptor;
+      return {
+        ...descriptor,
+        currentValue: value,
+        options: descriptor.options.map(({ isDefault: _isDefault, ...option }) =>
+          option.id === value ? { ...option, isDefault: true } : option,
+        ),
+      };
+    }),
+  );
+}
+
+function applyConfiguredCodexServiceTier(
+  models: ReadonlyArray<ServerProviderModel>,
+  serviceTier: string | undefined,
+): ReadonlyArray<ServerProviderModel> {
+  if (!serviceTier) return models;
+  return withConfiguredSelectDefault(
+    models,
+    "serviceTier",
+    (options) =>
+      options.find(
+        (option) =>
+          option.id === serviceTier || (serviceTier === "fast" && option.id === "priority"),
+      )?.id,
+  );
+}
+
+/** Mirrors Codex: `daybreak = true` prefers a Daybreak program, Blue before Red. */
+function applyConfiguredCodexCyberAccess(
+  models: ReadonlyArray<ServerProviderModel>,
+  snapshot: Pick<
+    CodexAppServerProviderSnapshot,
+    "daybreakEnabled" | "cyberAccessProgramsUnavailable"
+  >,
+): ReadonlyArray<ServerProviderModel> {
+  // Without a descriptor no turn sends a program; without a default only an explicit choice goes.
+  const offered = mapCodexOptionDescriptors(models, (descriptors, model) =>
+    descriptors.flatMap((descriptor): ReadonlyArray<ProviderOptionDescriptor> => {
+      if (descriptor.id !== "cyberAccessProgram" || descriptor.type !== "select") {
+        return [descriptor];
+      }
+      if (model.isCustom || snapshot.cyberAccessProgramsUnavailable === true) return [];
+      if (snapshot.daybreakEnabled !== undefined) return [descriptor];
+      const { currentValue: _currentValue, ...withoutDefault } = descriptor;
+      return [
+        {
+          ...withoutDefault,
+          options: descriptor.options.map(({ isDefault: _isDefault, ...option }) => option),
+        },
+      ];
+    }),
+  );
+  if (snapshot.daybreakEnabled !== true) return offered;
+  return withConfiguredSelectDefault(offered, "cyberAccessProgram", (options) =>
+    ["daybreakBlue", "daybreakRed"].find((program) =>
+      options.some((option) => option.id === program),
+    ),
+  );
+}
+
 /**
  * Codex has no static default capability set, so a bare custom slug borrows
  * the first built-in's descriptors; an entry with its own capabilities keeps
@@ -571,11 +669,7 @@ const readCodexRateLimits = (
   client: CodexClient.CodexAppServerClient["Service"],
   deadlineMs: number,
 ) =>
-  withCodexDiscoveryDeadline(
-    client.request("account/rateLimits/read", null),
-    deadlineMs,
-    RATE_LIMITS_PROBE_TIMEOUT_MS,
-  ).pipe(
+  withCodexDiscoveryDeadline(client.request("account/rateLimits/read", null), deadlineMs).pipe(
     Effect.map((response): CodexRateLimitsProbe =>
       response
         ? {
@@ -594,6 +688,7 @@ const readCodexRateLimits = (
   );
 
 const probeCodexAppServerProvider = Effect.fn("probeCodexAppServerProvider")(function* (input: {
+  readonly probeTimeoutMs: number;
   readonly binaryPath: string;
   readonly homePath?: string;
   readonly launchArgs?: string;
@@ -618,8 +713,8 @@ const probeCodexAppServerProvider = Effect.fn("probeCodexAppServerProvider")(fun
   }
 
   // Optional discovery must finish before the outer timeout can discard the account result.
-  const deadlineMs = spawnedAtMs + CODEX_AUTH_PROBE_TIMEOUT_MS - CODEX_DISCOVERY_MARGIN_MS;
-  const [skillsResponse, models, { serviceTier, nativeUsage, rateLimits }] = yield* Effect.all(
+  const deadlineMs = spawnedAtMs + input.probeTimeoutMs - CODEX_DISCOVERY_MARGIN_MS;
+  const [skillsResponse, models, { config, nativeUsage, rateLimits }] = yield* Effect.all(
     [
       withCodexDiscoveryDeadline(client.request("skills/list", { cwds: [input.cwd] }), deadlineMs),
       accountResponse.account?.type === "chatgpt"
@@ -648,7 +743,7 @@ const probeCodexAppServerProvider = Effect.fn("probeCodexAppServerProvider")(fun
             : Effect.undefined;
           return readUsage.pipe(
             Effect.map((rateLimits) => ({
-              serviceTier: config?.config.service_tier ?? undefined,
+              config: config?.config,
               nativeUsage,
               rateLimits,
             })),
@@ -659,13 +754,19 @@ const probeCodexAppServerProvider = Effect.fn("probeCodexAppServerProvider")(fun
     { concurrency: "unbounded" },
   );
 
+  const cyberAccess = Option.getOrUndefined(decodeCodexCyberAccessConfig(config));
   return {
     account: accountResponse,
     nativeUsage,
     ...(rateLimits ? { rateLimits } : {}),
     version,
     models,
-    serviceTier,
+    serviceTier: config?.service_tier ?? undefined,
+    daybreakEnabled: config === undefined ? undefined : cyberAccess?.daybreak === true,
+    // An unread config cannot rule out an API key with the programs turned off.
+    cyberAccessProgramsUnavailable:
+      accountResponse.account?.type === "apiKey" &&
+      (config === undefined || cyberAccess?.features?.api_key_cyber_access_programs === false),
     skills: skillsResponse ? parseCodexSkillsListResponse(skillsResponse, input.cwd) : [],
   } satisfies CodexAppServerProviderSnapshot;
 });
@@ -696,7 +797,12 @@ const probeCodexCliVersion = Effect.fn("probeCodexCliVersion")(
     if (result.code !== 0) return null;
     return CODEX_CLI_VERSION_PATTERN.exec(result.stdout)?.[1] ?? null;
   },
-  Effect.timeoutOption(Duration.millis(DEFAULT_TIMEOUT_MS)),
+  (effect, input) =>
+    effect.pipe(
+      Effect.timeoutOption(
+        resolveProviderProbeTimeoutMs("codex", DEFAULT_TIMEOUT_MS, input.environment),
+      ),
+    ),
   Effect.map(Option.getOrNull),
   Effect.catch((cause) =>
     Effect.logDebug("Codex --version fallback failed.", { cause }).pipe(Effect.as(null)),
@@ -805,6 +911,7 @@ function accountProbeStatus(
 export const checkCodexProviderStatus = Effect.fn("checkCodexProviderStatus")(function* (
   codexSettings: CodexSettings,
   probe: (input: {
+    readonly probeTimeoutMs: number;
     readonly binaryPath: string;
     readonly homePath?: string;
     readonly launchArgs?: string;
@@ -844,7 +951,13 @@ export const checkCodexProviderStatus = Effect.fn("checkCodexProviderStatus")(fu
     });
   }
 
+  const probeTimeoutMs = resolveProviderProbeTimeoutMs(
+    "codex",
+    CODEX_AUTH_PROBE_TIMEOUT_MS,
+    resolvedEnvironment,
+  );
   const probeResult = yield* probe({
+    probeTimeoutMs,
     binaryPath: codexSettings.binaryPath,
     homePath: codexSettings.homePath,
     launchArgs: resolveCodexLaunchArgs(codexSettings.launchArgs, resolvedEnvironment),
@@ -853,7 +966,7 @@ export const checkCodexProviderStatus = Effect.fn("checkCodexProviderStatus")(fu
     ...(managedAuth ? { skipNativeUsage: true } : {}),
   }).pipe(
     // Process teardown can outlast the work budget without discarding a completed snapshot.
-    Effect.timeoutOption(Duration.millis(CODEX_AUTH_PROBE_TIMEOUT_MS)),
+    Effect.timeoutOption(Duration.millis(probeTimeoutMs)),
     Effect.scoped,
     Effect.result,
   );
@@ -942,6 +1055,7 @@ export const checkCodexProviderStatus = Effect.fn("checkCodexProviderStatus")(fu
       appendCustomCodexModels(snapshot.models ?? [], codexSettings.customModels),
       applyPreferredCodexDefaultModel,
       (models) => applyConfiguredCodexServiceTier(models, snapshot.serviceTier),
+      (models) => applyConfiguredCodexCyberAccess(models, snapshot),
     ),
     skills: snapshot.skills,
     slashCommands: [
diff --git a/apps/server/src/provider/CodexThreadRevert.test.ts b/apps/server/src/provider/CodexThreadRevert.test.ts
index e48caf094027..f26871915472 100644
--- a/apps/server/src/provider/CodexThreadRevert.test.ts
+++ b/apps/server/src/provider/CodexThreadRevert.test.ts
@@ -68,7 +68,6 @@ it.effect("finds the revert boundary across pages of newest-first turns", () =>
         ],
       }),
     ),
-    Effect.scoped,
   ),
 );
 
@@ -87,6 +86,5 @@ it.effect("rejects repeated cursors instead of looping or reverting incomplete h
         entries: [...page(1, null, 3, ["newest"], "again"), ...page(2, "again", 2, [], "again")],
       }),
     ),
-    Effect.scoped,
   ),
 );
diff --git a/apps/server/src/provider/DocumentText.ts b/apps/server/src/provider/DocumentText.ts
index 83aa014257ae..d0e53121ae33 100644
--- a/apps/server/src/provider/DocumentText.ts
+++ b/apps/server/src/provider/DocumentText.ts
@@ -1,6 +1,7 @@
 // @effect-diagnostics nodeBuiltinImport:off -- the isolated parser process is an external runtime boundary.
 import * as NodeChildProcess from "node:child_process";
 import * as NodeURL from "node:url";
+import * as Cache from "effect/Cache";
 import * as Clock from "effect/Clock";
 import * as Context from "effect/Context";
 import * as Effect from "effect/Effect";
@@ -48,13 +49,17 @@ const make = Effect.gen(function* () {
   const isExecutable = yield* HostProcess.IsExecutable;
   const environment = yield* HostProcess.Environment;
   const clock = yield* Clock.Clock;
-  const lock = yield* Semaphore.make(1);
+  // A large DOCX worker peaks near 270 MiB RSS, so two slots bound parser memory near 540 MiB.
+  const lock = yield* Semaphore.make(2);
   const failed = new Map<string, number>();
+  // A cancelled extraction can still be publishing while its retry runs in the other slot.
+  let attempt = 0;
   // In a bundle import.meta.url is bin.mjs; development and tests use this source module.
   const entry = NodeURL.fileURLToPath(
     new URL(import.meta.url.endsWith(".ts") ? "../bin.ts" : "./bin.mjs", import.meta.url),
   );
-  const extract = Effect.fn("DocumentText.extract")(function* (path: string, extension: string) {
+  const extract = Effect.fn("DocumentText.extract")(function* (path: string) {
+    const extension = path.split(".").at(-1)!.toLowerCase();
     const sidecar = `${path}.txt`;
     if (yield* fs.exists(sidecar)) return sidecar;
     if ((failed.get(path) ?? 0) > clock.currentTimeMillisUnsafe()) return;
@@ -94,7 +99,7 @@ const make = Effect.gen(function* () {
         return Effect.logWarning("Document text extraction failed.", { extension });
       }),
     );
-    const pending = `${sidecar}.part`;
+    const pending = `${sidecar}.${attempt++}.part`;
     yield* fs
       .writeFileString(pending, content)
       .pipe(
@@ -104,13 +109,14 @@ const make = Effect.gen(function* () {
       );
     return sidecar;
   }, lock.withPermits(1));
+  const extracting = yield* Cache.make({ capacity: Infinity, timeToLive: 0, lookup: extract });
   const ensure = Effect.fn("DocumentText.ensure")(
     function* (path: string) {
       const extension = path.split(".").at(-1)?.toLowerCase();
       if (!extension || !extensions.has(extension)) return;
       const sidecar = `${path}.txt`;
       if (yield* fs.exists(sidecar)) return sidecar;
-      return yield* extract(path, extension);
+      return yield* Cache.get(extracting, path);
     },
     Effect.orElseSucceed(() => undefined),
   );
diff --git a/apps/server/src/provider/Drivers/AntigravityDriver.test.ts b/apps/server/src/provider/Drivers/AntigravityDriver.test.ts
index 3747ff032d29..447745fc673a 100644
--- a/apps/server/src/provider/Drivers/AntigravityDriver.test.ts
+++ b/apps/server/src/provider/Drivers/AntigravityDriver.test.ts
@@ -383,7 +383,7 @@ it.layer(layerTest)("AntigravityDriver", (it) => {
         const helper = {
           fs: { readTextFile: false, writeTextFile: false },
           terminal: false,
-          session: { notices: {} },
+          session: { notices: {}, compaction: {} },
         };
         expect(
           (yield* h.readRequests)
@@ -397,7 +397,7 @@ it.layer(layerTest)("AntigravityDriver", (it) => {
           {
             fs: { readTextFile: true, writeTextFile: false },
             terminal: false,
-            session: { notices: {} },
+            session: { notices: {}, compaction: {} },
             elicitation: { form: {} },
           },
         ]);
@@ -426,7 +426,13 @@ it.layer(layerTest)("AntigravityDriver", (it) => {
             modelSelection,
             runtimePolicy: cliPolicy,
           });
-          expect(h.launches.at(-1)?.args).toEqual(["acp"]);
+          expect(h.launches.at(-1)?.args).toEqual([
+            "acp",
+            "--gemini-dir",
+            h.profileDirectory,
+            "--app-data-dir",
+            "antigravity-acp",
+          ]);
           expect(
             (yield* h.readRequests)
               .slice(requestsBefore)
@@ -438,7 +444,7 @@ it.layer(layerTest)("AntigravityDriver", (it) => {
               .map((request) => request.params?.value),
           ).toEqual(["default"]);
         }
-      }).pipe(Effect.scoped),
+      }),
   );
 
   it.effect.skipIf(windowsHost)(
@@ -458,7 +464,7 @@ it.layer(layerTest)("AntigravityDriver", (it) => {
         expect(h.acquisitions).toHaveLength(2);
         expect(h.releases).toEqual([h.first.version, h.signedOut.version]);
         yield* h.assertClosed;
-      }).pipe(Effect.scoped),
+      }),
   );
 
   it.effect.skipIf(windowsHost)("keeps the previous catalog when executable resolution fails", () =>
@@ -475,7 +481,7 @@ it.layer(layerTest)("AntigravityDriver", (it) => {
       expect(h.acquisitions).toHaveLength(2);
       expect(h.releases).toEqual([h.first.version]);
       yield* h.assertClosed;
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect.skipIf(windowsHost)(
@@ -496,7 +502,7 @@ it.layer(layerTest)("AntigravityDriver", (it) => {
         expect(after.models).toEqual(before.models);
         expect(after.auth).toEqual(before.auth);
         yield* h.assertClosed;
-      }).pipe(Effect.scoped),
+      }),
   );
 
   it.effect.skipIf(windowsHost)(
@@ -533,7 +539,7 @@ it.layer(layerTest)("AntigravityDriver", (it) => {
         expect(after.auth).toEqual(before.auth);
         expect(JSON.stringify(after)).not.toContain("sk-secret-123");
         yield* h.assertClosed;
-      }).pipe(Effect.scoped),
+      }),
   );
 
   it.effect.skipIf(windowsHost)(
@@ -571,6 +577,6 @@ it.layer(layerTest)("AntigravityDriver", (it) => {
         );
         expect(yield* fs.exists(directories.runtimeTemp)).toBe(false);
         expect(yield* fs.exists(legacyRoot)).toBe(false);
-      }).pipe(Effect.scoped),
+      }),
   );
 });
diff --git a/apps/server/src/provider/Drivers/AntigravityDriver.ts b/apps/server/src/provider/Drivers/AntigravityDriver.ts
index 7bb1f25b67ce..75bca5acc87b 100644
--- a/apps/server/src/provider/Drivers/AntigravityDriver.ts
+++ b/apps/server/src/provider/Drivers/AntigravityDriver.ts
@@ -434,6 +434,7 @@ export const AntigravityDriver: ProviderDriver<
       Effect.provideService(HttpClient.HttpClient, httpClient),
     );
     const provider = yield* makeAntigravityProvider(settings, {
+      environment: processEnvironment,
       stampIdentity: classifyModels,
       probe,
       probeUsage: usage.probe,
@@ -462,6 +463,11 @@ export const AntigravityDriver: ProviderDriver<
       makeRuntime,
       withProcess: authFlow.withProcess,
       defaultModel,
+      supportsNativeGoals: provider.snapshot.getSnapshot.pipe(
+        Effect.map(
+          (snapshot) => snapshot.slashCommands?.some((command) => command.name === "goal") === true,
+        ),
+      ),
       profileDirectory,
       onSessionStarted: provider.onSessionStarted,
       onSessionEvent: (event) => {
diff --git a/apps/server/src/provider/Drivers/ClaudeMaintenance.test.ts b/apps/server/src/provider/Drivers/ClaudeMaintenance.test.ts
index 6fdf4c52e2a9..7063df502337 100644
--- a/apps/server/src/provider/Drivers/ClaudeMaintenance.test.ts
+++ b/apps/server/src/provider/Drivers/ClaudeMaintenance.test.ts
@@ -239,7 +239,7 @@ it.layer(NodeServices.layer)("ClaudeMaintenance", (it) => {
       );
       yield* enrich;
       expect(requests).toHaveLength(1);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect.each([
@@ -297,7 +297,7 @@ it.layer(NodeServices.layer)("ClaudeMaintenance", (it) => {
         );
         yield* check;
         expect(requests).toHaveLength(3);
-      }).pipe(Effect.scoped),
+      }),
   );
 
   it.effect.each([
@@ -317,7 +317,7 @@ it.layer(NodeServices.layer)("ClaudeMaintenance", (it) => {
         ),
       );
       expect((yield* resolve()).update?.lockKey).toBe(row.lockKey);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("automatic refresh rereads the native channel while preserving both caches", () =>
@@ -403,7 +403,7 @@ it.layer(NodeServices.layer)("ClaudeMaintenance", (it) => {
         ]);
         expect(f.installationReads()).toBe(1);
       }
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("bounds stalled feed bodies and skips disabled update checks", () =>
@@ -433,6 +433,6 @@ it.layer(NodeServices.layer)("ClaudeMaintenance", (it) => {
       yield* TestClock.adjust("4 seconds");
       expect((yield* Fiber.join(pending)).versionAdvisory?.status).toBe("unknown");
       expect(requests).toBe(1);
-    }).pipe(Effect.scoped),
+    }),
   );
 });
diff --git a/apps/server/src/provider/Drivers/ClaudeSkillDispatch.ts b/apps/server/src/provider/Drivers/ClaudeSkillDispatch.ts
index 6ce141eec733..bdf2ed1cae61 100644
--- a/apps/server/src/provider/Drivers/ClaudeSkillDispatch.ts
+++ b/apps/server/src/provider/Drivers/ClaudeSkillDispatch.ts
@@ -22,12 +22,14 @@ export interface ClaudeSkillDispatch {
 export function planClaudeSkillDispatch(
   prompt: string,
   skills: ReadonlyMap<string, ClaudeSkillTarget>,
+  /** Mentions before this offset, such as inline handoff history, stay plain text. */
+  mentionsFrom = 0,
 ): ClaudeSkillDispatch | undefined {
   const mentions = [...prompt.matchAll(SKILL_MENTION_PATTERN)].flatMap((match) => {
     const name = match[2] ?? "";
     const skill = skills.get(name);
-    if (!skill) return [];
     const start = (match.index ?? 0) + (match[1]?.length ?? 0);
+    if (!skill || start < mentionsFrom) return [];
     return [{ name, skill, start, end: (match.index ?? 0) + match[0].length }];
   });
   const last = mentions.at(-1);
diff --git a/apps/server/src/provider/Drivers/CodexDriver.test.ts b/apps/server/src/provider/Drivers/CodexDriver.test.ts
index 597be8562311..6ce377a74a1e 100644
--- a/apps/server/src/provider/Drivers/CodexDriver.test.ts
+++ b/apps/server/src/provider/Drivers/CodexDriver.test.ts
@@ -374,10 +374,7 @@ it.layer(layerTest)("CodexDriver", (it) => {
           lockKey: "codex-native",
           env: { CODEX_HOME: sharedHome },
         });
-      }).pipe(
-        Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, noSpawn),
-        Effect.scoped,
-      ),
+      }).pipe(Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, noSpawn)),
   );
 
   it.effect.skipIf(windowsHost)(
@@ -431,10 +428,7 @@ it.layer(layerTest)("CodexDriver", (it) => {
             env: { CODEX_HOME: installHome },
           });
         }
-      }).pipe(
-        Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, noSpawn),
-        Effect.scoped,
-      ),
+      }).pipe(Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, noSpawn)),
   );
 
   it.effect.skipIf(windowsHost)("derives the standalone update home from either command path", () =>
@@ -478,7 +472,7 @@ it.layer(layerTest)("CodexDriver", (it) => {
           CODEX_HOME: fixture.home,
         });
       }
-    }).pipe(Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, noSpawn), Effect.scoped),
+    }).pipe(Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, noSpawn)),
   );
 
   // regression: #23937 `codex update` installs the native channel's release, which can lag npm.
@@ -556,10 +550,7 @@ it.layer(layerTest)("CodexDriver", (it) => {
             maintenanceCapabilities: capabilities,
           }).status,
         ).not.toBe("behind_latest");
-      }).pipe(
-        Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, noSpawn),
-        Effect.scoped,
-      ),
+      }).pipe(Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, noSpawn)),
   );
 
   it.effect("uses each instance's environment CODEX_HOME for continuation", () =>
@@ -577,7 +568,36 @@ it.layer(layerTest)("CodexDriver", (it) => {
         });
         expect(instance.continuationIdentity.continuationKey).toBe(`codex:home:${codexHome}`);
       }
-    }).pipe(Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, noSpawn), Effect.scoped),
+    }).pipe(Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, noSpawn)),
+  );
+
+  it.effect.skipIf(windowsHost)(
+    "shares state from the environment CODEX_HOME in a shadow home",
+    () =>
+      Effect.gen(function* () {
+        const fs = yield* FileSystem.FileSystem;
+        const tempDir = yield* fs
+          .makeTempDirectoryScoped({ prefix: "t3-codex-driver-" })
+          .pipe(Effect.flatMap((directory) => fs.realPath(directory)));
+        const codexHome = NodePath.join(tempDir, "custom-codex");
+        const shadowHome = NodePath.join(tempDir, "shadow");
+        yield* fs.makeDirectory(codexHome, { recursive: true });
+        yield* fs.writeFileString(NodePath.join(codexHome, "config.toml"), 'model = "custom"\n');
+        const instance = yield* CodexDriver.create({
+          instanceId: ProviderInstanceId.make("env-shadow"),
+          displayName: "env-shadow",
+          enabled: false,
+          environment: [{ name: "CODEX_HOME", value: codexHome, sensitive: false }],
+          config: { ...CodexDriver.defaultConfig(), shadowHomePath: shadowHome },
+        }).pipe(Effect.provideService(HostProcess.HomeDirectory, NodePath.join(tempDir, "user")));
+        expect(instance.continuationIdentity.continuationKey).toBe(`codex:home:${codexHome}`);
+        expect(yield* fs.readLink(NodePath.join(shadowHome, "config.toml"))).toBe(
+          NodePath.join(codexHome, "config.toml"),
+        );
+        expect(yield* fs.readLink(NodePath.join(shadowHome, "sessions"))).toBe(
+          NodePath.join(codexHome, "sessions"),
+        );
+      }).pipe(Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, noSpawn)),
   );
 
   for (const fixture of [
@@ -653,10 +673,7 @@ it.layer(layerTest)("CodexDriver", (it) => {
         } else {
           expect(update).toBeNull();
         }
-      }).pipe(
-        Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, noSpawn),
-        Effect.scoped,
-      ),
+      }).pipe(Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, noSpawn)),
     );
   }
 
@@ -805,7 +822,7 @@ it.layer(layerTest)("CodexDriver", (it) => {
         } else {
           expect(capabilities.update).toBeNull();
         }
-      }).pipe(Effect.scoped),
+      }),
     { skip: windowsHost },
   );
 
@@ -856,6 +873,6 @@ it.layer(layerTest)("CodexDriver", (it) => {
       yield* TestClock.adjust("250 millis");
 
       yield* Queue.take(probes);
-    }).pipe(Effect.scoped),
+    }),
   );
 });
diff --git a/apps/server/src/provider/Drivers/CodexDriver.ts b/apps/server/src/provider/Drivers/CodexDriver.ts
index c9cbb937c2eb..f8a753169b54 100644
--- a/apps/server/src/provider/Drivers/CodexDriver.ts
+++ b/apps/server/src/provider/Drivers/CodexDriver.ts
@@ -1,3 +1,4 @@
+import { resolveProviderProbeTimeoutMs } from "@t3tools/provider-core/server/snapshotProbe";
 import { CodexSettings, ProviderDriverKind } from "@t3tools/contracts";
 import * as Digest from "effect/crypto/Digest";
 import * as SecureRandom from "effect/crypto/SecureRandom";
@@ -189,11 +190,11 @@ export const CodexDriver: ProviderDriver<
       yield* HostProcess.Environment,
     );
     const environmentHome = processEnv.CODEX_HOME;
-    const homeLayout = yield* resolveCodexHomeLayout(
-      !config.homePath.trim() && !config.shadowHomePath.trim() && environmentHome?.trim()
+    const homeConfig =
+      !config.homePath.trim() && environmentHome?.trim()
         ? { ...config, homePath: environmentHome }
-        : config,
-    );
+        : config;
+    const homeLayout = yield* resolveCodexHomeLayout(homeConfig);
     const continuationIdentity = codexContinuationIdentity(homeLayout);
     const stampIdentity = withInstanceIdentity({
       instanceId,
@@ -244,10 +245,13 @@ export const CodexDriver: ProviderDriver<
         accentColor,
         environment,
         enabled,
-        config,
+        config: homeConfig,
       },
       {
         onUsageLimits: (update) => snapshot.applyUsageLimits(update),
+        models: Effect.suspend(() => snapshot.getSnapshot).pipe(
+          Effect.map((value) => value.models),
+        ),
         compatibility: installation.compatibility,
       },
     ).pipe(
@@ -330,7 +334,7 @@ export const CodexDriver: ProviderDriver<
               environment: processEnv,
             }).pipe(
               Effect.scoped,
-              Effect.timeout("20 seconds"),
+              Effect.timeout(resolveProviderProbeTimeoutMs("codex", 20_000, processEnv)),
               Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, spawner),
             ),
           ]).pipe(
diff --git a/apps/server/src/provider/Drivers/CodexManagedProvider.ts b/apps/server/src/provider/Drivers/CodexManagedProvider.ts
index ab5e7add556a..f182245f8840 100644
--- a/apps/server/src/provider/Drivers/CodexManagedProvider.ts
+++ b/apps/server/src/provider/Drivers/CodexManagedProvider.ts
@@ -242,8 +242,10 @@ export const makeManagedCodexProvider = Effect.fn("makeManagedCodexProvider")(fu
   const resolveRuntime = runtime.auth.controller.withAccess!(runtime.resolve);
   // Launch settings bind the refresh command to the signed-in profile. The registry
   // already wraps openSession in withAccess, so resolve without re-entering it.
+  const models = snapshot.getSnapshot.pipe(Effect.map((value) => value.models));
   const orchestrationAdapter = yield* createCodexAdapterV2(input, {
     onUsageLimits: (update) => snapshot.applyUsageLimits(update),
+    models,
     resolveRuntime: runtime.resolve,
   }).pipe(
     Effect.mapError(
@@ -259,7 +261,7 @@ export const makeManagedCodexProvider = Effect.fn("makeManagedCodexProvider")(fu
   const nativeGeneration = yield* makeCodexTextGeneration(
     config,
     undefined,
-    snapshot.getSnapshot.pipe(Effect.map((value) => value.models)),
+    models,
     resolveRuntime,
   );
   const protect = <A>(operation: string, effect: Effect.Effect<A, TextGenerationError>) =>
diff --git a/apps/server/src/provider/Drivers/claudeUsage.test.ts b/apps/server/src/provider/Drivers/claudeUsage.test.ts
index 6f457f4f4cf2..bc10ba5b7b29 100644
--- a/apps/server/src/provider/Drivers/claudeUsage.test.ts
+++ b/apps/server/src/provider/Drivers/claudeUsage.test.ts
@@ -1,5 +1,6 @@
 import { describe, expect, it } from "@effect/vitest";
 
+import { parseRateTable, priceUsage } from "../../usage/usagePricing.ts";
 import { claudeUsageFormat, parseClaudeLine } from "./claudeUsage.ts";
 
 function claudeLine(overrides: {
@@ -115,7 +116,8 @@ describe("Claude advisor iterations", () => {
             model: "claude-fable-5-1",
             input_tokens: 54204,
             cache_read_input_tokens: 0,
-            cache_creation_input_tokens: 0,
+            cache_creation_input_tokens: 500,
+            cache_creation: { ephemeral_5m_input_tokens: 200, ephemeral_1h_input_tokens: 300 },
             output_tokens: 4229,
           },
           {
@@ -160,10 +162,11 @@ describe("Claude advisor iterations", () => {
         totals: {
           uncachedInputTokens: 54204,
           cachedInputTokens: 0,
-          cacheCreationTokens: 0,
+          cacheCreationTokens: 500,
           outputTokens: 4229,
           reasoningTokens: 0,
         },
+        cacheCreation1hTokens: 300,
         dedupeKey: expect.any(String),
       },
     ];
@@ -216,3 +219,44 @@ describe("Claude advisor iterations", () => {
     expect(parse(unusable).map((record) => record.model)).toEqual(["claude-opus-5-5"]);
   });
 });
+
+describe("Claude cache write pricing", () => {
+  it("prices one-hour cache writes at the one-hour rate and the rest at the five-minute rate", () => {
+    const model = "claude-opus-4-5-20251101";
+    const rates = parseRateTable({
+      [model]: {
+        litellm_provider: "anthropic",
+        input_cost_per_token: 5e-6,
+        output_cost_per_token: 25e-6,
+        cache_read_input_token_cost: 5e-7,
+        cache_creation_input_token_cost: 6.25e-6,
+        cache_creation_input_token_cost_above_1hr: 1e-5,
+      },
+    });
+    const [record] = parseClaudeLine(
+      JSON.stringify({
+        type: "assistant",
+        timestamp: "2026-08-07T04:05:13.944Z",
+        sessionId: "s",
+        message: {
+          id: "msg_ttl",
+          model,
+          usage: {
+            input_tokens: 0,
+            cache_read_input_tokens: 0,
+            cache_creation_input_tokens: 1_000_000,
+            cache_creation: {
+              ephemeral_5m_input_tokens: 400_000,
+              ephemeral_1h_input_tokens: 600_000,
+            },
+            output_tokens: 0,
+          },
+        },
+      }),
+    );
+
+    if (record === undefined) throw new Error("expected a usage record");
+    // 0.4M x $6.25/M + 0.6M x $10/M
+    expect(priceUsage(rates, record).costUsd).toBeCloseTo(8.5, 9);
+  });
+});
diff --git a/apps/server/src/provider/Drivers/claudeUsage.ts b/apps/server/src/provider/Drivers/claudeUsage.ts
index acb697d2941d..713b35884292 100644
--- a/apps/server/src/provider/Drivers/claudeUsage.ts
+++ b/apps/server/src/provider/Drivers/claudeUsage.ts
@@ -30,6 +30,13 @@ export function parseClaudeLine(line: string): readonly UsageRecord[] {
   return parseClaudeRecord(parsed);
 }
 
+function cacheCreation1h(usage: Record<string, unknown>): { cacheCreation1hTokens?: number } {
+  const split = usage["cache_creation"];
+  if (typeof split !== "object" || split === null) return {};
+  const tokens = tokenCount((split as Record<string, unknown>)["ephemeral_1h_input_tokens"]);
+  return tokens > 0 ? { cacheCreation1hTokens: tokens } : {};
+}
+
 function parseClaudeRecord(parsed: unknown): readonly UsageRecord[] {
   if (typeof parsed !== "object" || parsed === null) return [];
 
@@ -70,6 +77,7 @@ function parseClaudeRecord(parsed: unknown): readonly UsageRecord[] {
       // Anthropic folds thinking tokens into output and does not break them out.
       reasoningTokens: 0,
     },
+    ...cacheCreation1h(usageRecord),
     reportedCostUsd: typeof cost === "number" && Number.isFinite(cost) ? cost : null,
     speed: usageRecord["speed"] === "fast" ? "fast" : "standard",
     dedupeKey,
@@ -101,6 +109,7 @@ function parseClaudeRecord(parsed: unknown): readonly UsageRecord[] {
         outputTokens: tokenCount(advisor["output_tokens"]),
         reasoningTokens: 0,
       },
+      ...cacheCreation1h(advisor),
       reportedCostUsd: null,
       speed: executor.speed,
       dedupeKey: dedupeKey === null ? null : `${dedupeKey}:advisor:${index}`,
diff --git a/apps/server/src/provider/Drivers/codexUsage.test.ts b/apps/server/src/provider/Drivers/codexUsage.test.ts
index 74812bafb509..cacfc6c06211 100644
--- a/apps/server/src/provider/Drivers/codexUsage.test.ts
+++ b/apps/server/src/provider/Drivers/codexUsage.test.ts
@@ -450,6 +450,61 @@ describe("parseCodexLine", () => {
     expect(state.malformedRecords).toBe(0);
   });
 
+  it("bills request-ledger usage through resumed context counters and compaction", () => {
+    const state = initialCodexScanState();
+    const request = (response_id: string, usage: unknown) =>
+      JSON.stringify({
+        type: "token_usage_record",
+        timestamp: "2026-08-01T05:17:45.000Z",
+        payload: { response_id, usage },
+      });
+    parseCodexLine(sessionMeta, state);
+    parseCodexLine(turnContext, state);
+    parseCodexLine(counted(counters(100, 20), counters(1000, 200)), state);
+    // Resume restores older context counters, while the request ledger continues.
+    expect(
+      parseCodexLine(request("response-1", counters(80, 10)), state)?.totals.outputTokens,
+    ).toBe(10);
+    expect(parseCodexLine(counted(counters(80, 10), counters(580, 110)), state)).toBeNull();
+    // Rate-limit refreshes repeat the snapshot without another request.
+    expect(parseCodexLine(counted(counters(80, 10), counters(580, 110)), state)).toBeNull();
+    expect(
+      parseCodexLine(request("compaction", counters(90, 15)), state)?.totals.outputTokens,
+    ).toBe(15);
+    parseCodexLine(turnContext, state);
+    expect(
+      parseCodexLine(counted({ ...counters(0, 0), total_tokens: 40 }, counters(580, 110)), state),
+    ).toBeNull();
+    expect(parseCodexLine(request("response-2", counters(30, 5)), state)?.totals.outputTokens).toBe(
+      5,
+    );
+    expect(parseCodexLine(counted(counters(30, 5), counters(610, 115)), state)).toBeNull();
+    expect(state.malformedRecords).toBe(0);
+    // A later turn from an older CLI can still report usage through snapshots alone.
+    parseCodexLine(turnContext, state);
+    expect(
+      parseCodexLine(counted(counters(20, 2), counters(630, 117)), state)?.totals.outputTokens,
+    ).toBe(2);
+    expect(
+      parseCodexLine(request("interrupted", counters(40, 4)), state)?.totals.outputTokens,
+    ).toBe(4);
+    parseCodexLine(turnContext, state);
+    expect(
+      parseCodexLine(counted(counters(10, 1), counters(680, 122)), state)?.totals.outputTokens,
+    ).toBe(1);
+    expect(parseCodexLine(request("", counters(15, 3)), state)).toBeNull();
+    parseCodexLine(turnContext, state);
+    const transition = parseCodexRecords(request("upgraded", counters(25, 5)), state);
+    expect(transition.map((record) => record.totals.outputTokens)).toEqual([3, 5]);
+    expect(parseCodexLine(counted(counters(25, 5), counters(720, 130)), state)).toBeNull();
+    expect(parseCodexLine(request("", counters(10, 1)), state)).toBeNull();
+    expect(
+      parseCodexLine(counted(counters(10, 1), counters(730, 131)), state)?.totals.outputTokens,
+    ).toBe(1);
+    expect(parseCodexLine(counted(counters(10, 1), counters(730, 131)), state)).toBeNull();
+    expect(state.malformedRecords).toBe(0);
+  });
+
   it("does not bill a context-window estimate or lose the following real request", () => {
     const state = initialCodexScanState();
     parseCodexLine(turnContext, state);
@@ -498,6 +553,42 @@ describe("parseCodexLine", () => {
     expect(codexUsageFormat.readMalformedRecords?.(state)).toBe(0);
   });
 
+  const later = (line: string) => line.replace("05:17:49.919Z", "07:17:49.919Z");
+  it.each([
+    {
+      name: "bills a later request that continues from an earlier snapshot",
+      tail: [
+        later(counted(counters(20, 4), counters(130, 26))),
+        later(counted(counters(5, 1), counters(135, 27))),
+      ],
+      processed: [120, 12, 35, 24, 6],
+      skipped: 0,
+    },
+    {
+      name: "does not bill a re-emitted earlier snapshot again",
+      tail: [counted(counters(10, 2), counters(110, 22))],
+      processed: [120, 12, 35, 0],
+      skipped: 1,
+    },
+  ])("$name when cumulative counters rewind", ({ tail, processed, skipped }) => {
+    const state = initialCodexScanState();
+    parseCodexLine(turnContext, state);
+    const billed = [
+      counted(counters(100, 20), counters(100, 20)),
+      counted(counters(10, 2), counters(110, 22)),
+      counted(counters(30, 5), counters(140, 27)),
+      ...tail,
+    ].map((line) => {
+      const record = parseCodexLine(line, state);
+      return record === null ? 0 : totalTokens(record.totals);
+    });
+
+    expect({ processed: billed, skipped: codexUsageFormat.readMalformedRecords?.(state) }).toEqual({
+      processed,
+      skipped,
+    });
+  });
+
   it("ignores a replay of the current sequence's first request without rewinding the baseline", () => {
     const state = initialCodexScanState();
     parseCodexLine(turnContext, state);
diff --git a/apps/server/src/provider/Drivers/codexUsage.ts b/apps/server/src/provider/Drivers/codexUsage.ts
index 90f7c78b849f..7f99d611c3de 100644
--- a/apps/server/src/provider/Drivers/codexUsage.ts
+++ b/apps/server/src/provider/Drivers/codexUsage.ts
@@ -55,8 +55,9 @@ function readCodexTokenUsage(value: unknown): CodexTokenUsage | null {
 }
 
 // A zeroed baseline rebases the counters, so the sequence start measured against it is forgotten.
-function rebaseCodexUsage(state: CodexScanState, cumulative: CodexTokenUsage) {
+function rebaseCodexUsage(state: CodexScanState, cumulative: CodexTokenUsage, timestampMs: number) {
   state.lastCumulativeUsage = cumulative;
+  state.latestCumulativeAtMs = Math.max(state.latestCumulativeAtMs ?? timestampMs, timestampMs);
   delete state.unreportedRequests;
   if (cumulative.input_tokens + cumulative.output_tokens === 0) delete state.sequenceStartSignature;
 }
@@ -121,12 +122,14 @@ export const CodexScanState = Schema.Struct({
   sessionId: Schema.mutableKey(Schema.String),
   lastUsageSignature: Schema.mutableKey(Schema.NullOr(Schema.String)),
   lastCumulativeUsage: Schema.mutableKey(Schema.NullOr(CodexTokenUsage)),
-  // Optional so scan states cached before this field existed stay valid.
+  // Optional so scan states cached before these fields existed stay valid.
   sequenceStartSignature: Schema.mutableKey(Schema.optionalKey(Schema.String)),
+  latestCumulativeAtMs: Schema.mutableKey(Schema.optionalKey(Schema.Finite)),
   // `token_usage_record` usage since the last cumulative snapshot, one entry per record.
   unreportedRequests: Schema.mutableKey(
     Schema.optionalKey(Schema.mutable(Schema.Array(CodexUnreportedRequest))),
   ),
+  requestLedgerActive: Schema.mutableKey(Schema.optionalKey(Schema.Boolean)),
   malformedRecords: Schema.mutableKey(TokenCount),
   sawSessionMeta: Schema.mutableKey(Schema.Boolean),
   modelProvider: Schema.mutableKey(Schema.String),
@@ -181,8 +184,8 @@ function isForkCopy(state: CodexScanState, timestampMs: number): boolean {
 }
 
 /**
- * Cumulative counters validate request deltas. Older events without cumulative counters use
- * normalized consecutive-request deduplication.
+ * Identified request-ledger entries report spending independently of context snapshots.
+ * Legacy snapshots validate request deltas against cumulative counters.
  */
 export function parseCodexLine(line: string, state: CodexScanState): readonly UsageRecord[] {
   let parsed: unknown;
@@ -221,6 +224,7 @@ function parseCodexRecord(parsed: unknown, state: CodexScanState): readonly Usag
   }
 
   if (record["type"] === "turn_context") {
+    state.requestLedgerActive = false;
     if (typeof payloadRecord["model"] === "string") state.model = payloadRecord["model"];
     // Model carry is useful for usage, but history recovery needs this context's own identity.
     state.turnId =
@@ -232,13 +236,31 @@ function parseCodexRecord(parsed: unknown, state: CodexScanState): readonly Usag
     return [];
   }
 
-  // Several of these may sit between two snapshots, so they only explain a gap in the counters.
+  // Request ledgers include spending that context snapshots can omit.
   if (record["type"] === "token_usage_record") {
     const timestampMs = parseTimestampMs(record["timestamp"]);
     const usage = readCodexTokenUsage(payloadRecord["usage"]);
     if (timestampMs === null || usage === null || state.model.length === 0) return [];
     // Copied history is already billed in the parent.
     if (isForkCopy(state, timestampMs)) return [];
+    const responseId = payloadRecord["response_id"];
+    if (typeof responseId === "string" && responseId.length > 0) {
+      const pending = state.unreportedRequests ?? [];
+      state.requestLedgerActive = true;
+      for (const request of pending) {
+        state.lastCumulativeUsage = advanceCodexUsage(state.lastCumulativeUsage, request.usage);
+      }
+      state.lastCumulativeUsage = advanceCodexUsage(state.lastCumulativeUsage, usage);
+      delete state.unreportedRequests;
+      return [
+        ...pending.map((request) => codexRequestRecord(state, request.usage, request)),
+        {
+          ...codexRequestRecord(state, usage, codexAttribution(state, timestampMs)),
+          dedupeKey: JSON.stringify(["codex", state.sessionId, responseId]),
+        },
+      ];
+    }
+    state.requestLedgerActive = false;
     (state.unreportedRequests ??= []).push({ ...codexAttribution(state, timestampMs), usage });
     return [];
   }
@@ -270,7 +292,7 @@ function parseCodexRecord(parsed: unknown, state: CodexScanState): readonly Usag
   if (isForkCopy(state, timestampMs)) {
     // Copied history is already billed in the parent, but establishes the child's baseline.
     const signature = last === null ? null : JSON.stringify(last);
-    if (cumulative !== null) rebaseCodexUsage(state, cumulative);
+    if (cumulative !== null) rebaseCodexUsage(state, cumulative, timestampMs);
     else if (!hasCumulative && last !== null && signature !== state.lastUsageSignature) {
       state.lastCumulativeUsage = advanceCodexUsage(state.lastCumulativeUsage, last);
     }
@@ -278,10 +300,17 @@ function parseCodexRecord(parsed: unknown, state: CodexScanState): readonly Usag
     return [];
   }
 
+  // Context snapshots can rewind on resume and omit compaction spending; identified requests are authoritative.
+  if (state.requestLedgerActive) {
+    if (cumulative !== null) rebaseCodexUsage(state, cumulative, timestampMs);
+    return [];
+  }
+
   const previous = state.lastCumulativeUsage;
+  const latestCumulativeAtMs = state.latestCumulativeAtMs;
   const pending = state.unreportedRequests;
   // A valid snapshot remains the next baseline even when its paired request is malformed.
-  if (cumulative !== null) rebaseCodexUsage(state, cumulative);
+  if (cumulative !== null) rebaseCodexUsage(state, cumulative, timestampMs);
   if (last === null || (hasCumulative && cumulative === null)) {
     state.malformedRecords += 1;
     return [];
@@ -318,10 +347,15 @@ function parseCodexRecord(parsed: unknown, state: CodexScanState): readonly Usag
       state.lastCumulativeUsage = previous;
       return [];
     }
-    // Forks and paginated continuations can inherit totals without copying a counter snapshot.
+    // Forks and paginated continuations can inherit totals without copying a counter snapshot, and
+    // a later request can continue from an earlier snapshot; a re-emitted old snapshot is not later.
     // Only bill the latest request, and require the unseen prefix to be valid usage too.
+    const rewound =
+      previous !== null &&
+      (latestCumulativeAtMs === undefined || timestampMs > latestCumulativeAtMs) &&
+      CODEX_USAGE_FIELDS.some((key) => cumulative[key] < previous[key]);
     const reconciled =
-      previous === null
+      previous === null || rewound
         ? readCodexTokenUsage(
             Object.fromEntries(CODEX_USAGE_FIELDS.map((key) => [key, cumulative[key] - last[key]])),
           ) !== null
@@ -418,6 +452,7 @@ export const codexUsageFormat: TranscriptUsageFormat<CodexScanState> = {
       session_id: true,
       model_provider: true,
       turn_id: true,
+      response_id: true,
       model: true,
       thread_settings: { service_tier: true },
       forked_from_id: true,
@@ -481,10 +516,7 @@ export const codexUsageReader: ProviderUsageReader<
     const path = yield* Path.Path;
     const environmentHome = environment.CODEX_HOME?.trim();
     const layout = yield* resolveCodexHomeLayout(
-      config.setupMode !== "managed" &&
-        !config.homePath.trim() &&
-        !config.shadowHomePath.trim() &&
-        environmentHome
+      config.setupMode !== "managed" && !config.homePath.trim() && environmentHome
         ? { ...config, homePath: environmentHome }
         : config,
     );
diff --git a/apps/server/src/provider/GrokProvider.test.ts b/apps/server/src/provider/GrokProvider.test.ts
index be899ae54003..3f28649f498b 100644
--- a/apps/server/src/provider/GrokProvider.test.ts
+++ b/apps/server/src/provider/GrokProvider.test.ts
@@ -639,7 +639,7 @@ it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))("readGrokAccount"
         ),
       );
       expect(limits.windows[0]?.usedPercent).toBe(37);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect(
@@ -749,7 +749,7 @@ it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))("readGrokAccount"
             message: "Grok could not read usage limits.",
           });
         }
-      }).pipe(Effect.scoped),
+      }),
   );
 
   it.effect("sanitizes HTTP failures and malformed billing responses, keeping the account", () =>
diff --git a/apps/server/src/provider/ModelManifest.test.ts b/apps/server/src/provider/ModelManifest.test.ts
index e94ce85bf533..0b4c4c062dca 100644
--- a/apps/server/src/provider/ModelManifest.test.ts
+++ b/apps/server/src/provider/ModelManifest.test.ts
@@ -266,7 +266,7 @@ const layerService = (input: {
   );
 
 describe("ModelManifest service", () => {
-  it.live("prefers a fetched manifest over the bundle and caches it to disk", () =>
+  it.effect("prefers a fetched manifest over the bundle and caches it to disk", () =>
     Effect.gen(function* () {
       const service = yield* ModelManifest.make;
       const refreshed = yield* service.refresh;
@@ -285,29 +285,32 @@ describe("ModelManifest service", () => {
     ),
   );
 
-  it.live("ignores older remote edits without replacing the current manifest or disk cache", () => {
-    let remote = { ...REMOTE_MANIFEST, updatedAt: "2000-01-01T00:00:00Z" };
-    return Effect.gen(function* () {
-      const service = yield* ModelManifest.make;
-      assert.deepStrictEqual(yield* service.refresh, ModelManifest.BUNDLED_MODEL_MANIFEST);
-      assert.deepStrictEqual(yield* service.current, ModelManifest.BUNDLED_MODEL_MANIFEST);
+  it.effect(
+    "ignores older remote edits without replacing the current manifest or disk cache",
+    () => {
+      let remote = { ...REMOTE_MANIFEST, updatedAt: "2000-01-01T00:00:00Z" };
+      return Effect.gen(function* () {
+        const service = yield* ModelManifest.make;
+        assert.deepStrictEqual(yield* service.refresh, ModelManifest.BUNDLED_MODEL_MANIFEST);
+        assert.deepStrictEqual(yield* service.current, ModelManifest.BUNDLED_MODEL_MANIFEST);
 
-      remote = { ...REMOTE_MANIFEST, updatedAt: REMOTE_UPDATED_AT };
-      assert.deepStrictEqual(yield* service.forceRefresh, REMOTE_MANIFEST);
-      remote = { ...REMOTE_MANIFEST, updatedAt: ModelManifest.BUNDLED_MODEL_MANIFEST.updatedAt! };
-      assert.deepStrictEqual(yield* service.forceRefresh, REMOTE_MANIFEST);
-      const rebooted = yield* ModelManifest.make;
-      assert.deepStrictEqual(yield* rebooted.current, REMOTE_MANIFEST);
-    }).pipe(
-      Effect.scoped,
-      Effect.provide(
-        layerService({
-          prefix: "model-manifest-stale-fetch-test",
-          response: () => Response.json(remote),
-        }),
-      ),
-    );
-  });
+        remote = { ...REMOTE_MANIFEST, updatedAt: REMOTE_UPDATED_AT };
+        assert.deepStrictEqual(yield* service.forceRefresh, REMOTE_MANIFEST);
+        remote = { ...REMOTE_MANIFEST, updatedAt: ModelManifest.BUNDLED_MODEL_MANIFEST.updatedAt! };
+        assert.deepStrictEqual(yield* service.forceRefresh, REMOTE_MANIFEST);
+        const rebooted = yield* ModelManifest.make;
+        assert.deepStrictEqual(yield* rebooted.current, REMOTE_MANIFEST);
+      }).pipe(
+        Effect.scoped,
+        Effect.provide(
+          layerService({
+            prefix: "model-manifest-stale-fetch-test",
+            response: () => Response.json(remote),
+          }),
+        ),
+      );
+    },
+  );
 
   it.effect("preserves the last-good remote cache when later payloads are invalid", () => {
     let responseIndex = 0;
@@ -364,7 +367,7 @@ describe("ModelManifest service", () => {
     );
   });
 
-  it.live("drops a disk cache of a manifest older than the bundled one", () =>
+  it.effect("drops a disk cache of a manifest older than the bundled one", () =>
     Effect.gen(function* () {
       const fs = yield* FileSystem.FileSystem;
       const path = yield* Path.Path;
@@ -400,7 +403,7 @@ describe("ModelManifest service", () => {
     ),
   );
 
-  it.live("does not fetch when provider update checks are disabled", () =>
+  it.effect("does not fetch when provider update checks are disabled", () =>
     Effect.gen(function* () {
       let fetchCount = 0;
       const service = yield* ModelManifest.make.pipe(
diff --git a/apps/server/src/provider/ProviderAuthService.test.ts b/apps/server/src/provider/ProviderAuthService.test.ts
index 5023dc5bf47e..603df5e7e4bc 100644
--- a/apps/server/src/provider/ProviderAuthService.test.ts
+++ b/apps/server/src/provider/ProviderAuthService.test.ts
@@ -743,7 +743,7 @@ it.effect("queued logout prompts resolve the current controller after provider r
     assert.isTrue(yield* Fiber.join(queued));
     assert.isTrue(replacementLoggedOut);
     assert.strictEqual(harness.actions.filter((action) => action === "native-logout").length, 1);
-  }).pipe(Effect.scoped),
+  }),
 );
 
 it.effect.each(["start", "logout", "prompt"] as const)(
@@ -814,7 +814,7 @@ it.effect.each(["start", "logout", "prompt"] as const)(
       const blocked = yield* Effect.flip(harness.service.logout({ instanceId }));
       assert.include(blocked.detail, "shared sign-in");
       assert.equal(replacementMutations, 0);
-    }).pipe(Effect.scoped),
+    }),
 );
 
 it.effect.each(["selection", "drain"] as const)(
@@ -855,5 +855,5 @@ it.effect.each(["selection", "drain"] as const)(
       assert.notInclude(harness.actions, "stop:peer-persisted");
       assert.isFalse(harness.sessions.has(ThreadId.make("target-draining")));
       assert.include(harness.actions, "native-logout");
-    }).pipe(Effect.scoped),
+    }),
 );
diff --git a/apps/server/src/provider/ProviderInstanceRegistry.test.ts b/apps/server/src/provider/ProviderInstanceRegistry.test.ts
index ab35fe4d9ae5..707275afc97d 100644
--- a/apps/server/src/provider/ProviderInstanceRegistry.test.ts
+++ b/apps/server/src/provider/ProviderInstanceRegistry.test.ts
@@ -346,7 +346,7 @@ describe("ProviderInstanceRegistry — multi-instance codex slice", () => {
       }).pipe(Effect.provide(layerTest)),
   );
 
-  it.live("treats an explicit in-config enabled:false as disabling despite the envelope", () =>
+  it.effect("treats an explicit in-config enabled:false as disabling despite the envelope", () =>
     Effect.gen(function* () {
       const staleId = ProviderInstanceId.make("codex_stale");
       const configMap: ProviderInstanceConfigMap = {
@@ -370,7 +370,7 @@ describe("ProviderInstanceRegistry — multi-instance codex slice", () => {
     }).pipe(Effect.provide(layerTest)),
   );
 
-  it.live("lists a blocked driver's instances as unavailable without running them", () =>
+  it.effect("lists a blocked driver's instances as unavailable without running them", () =>
     Effect.gen(function* () {
       const instanceId = ProviderInstanceId.make("codex");
       const reason = "Example Corp's policy does not allow the Codex provider.";
@@ -862,7 +862,7 @@ describe("ProviderInstanceRegistry — multi-instance codex slice", () => {
     );
   }
 
-  it.live(
+  it.effect(
     "shadows instances whose driver is not registered in this build without failing boot",
     () =>
       Effect.gen(function* () {
@@ -990,7 +990,7 @@ describe("ProviderInstanceRegistry secret environment", () => {
           { name: "BASE_URL", value: "https://example.test", sensitive: false },
         ],
       ]);
-    }).pipe(Effect.scoped);
+    });
   });
 
   // An empty secret must not let a driver fall back to a credential the server inherited.
@@ -1013,7 +1013,7 @@ describe("ProviderInstanceRegistry secret environment", () => {
       yield* mutator.reconcile({ ...fixture.configMap });
       expect(fixture.reads).toHaveLength(readsAtStartup);
       expect(yield* registry.listUnavailable).toHaveLength(1);
-    }).pipe(Effect.scoped);
+    });
   });
 
   it.effect("does not read the secrets of an instance its config decodes as disabled", () => {
@@ -1025,7 +1025,7 @@ describe("ProviderInstanceRegistry secret environment", () => {
       expect(fixture.reads).toEqual([]);
       expect(fixture.invalidated).toEqual([]);
       expect(fixture.created).toHaveLength(1);
-    }).pipe(Effect.scoped);
+    });
   });
 
   it.effect("re-reads secrets on reload and rebuilds only when they changed", () => {
@@ -1048,7 +1048,7 @@ describe("ProviderInstanceRegistry secret environment", () => {
         "sk-live",
         "sk-rotated",
       ]);
-    }).pipe(Effect.scoped);
+    });
   });
 
   it.effect("reads a config field typed SettingsSecretValue and rebuilds when it rotates", () => {
@@ -1068,7 +1068,7 @@ describe("ProviderInstanceRegistry secret environment", () => {
         { apiKey: "gw-live", model: "m" },
         { apiKey: "gw-rotated", model: "m" },
       ]);
-    }).pipe(Effect.scoped);
+    });
   });
 
   it.effect.each([
@@ -1084,7 +1084,7 @@ describe("ProviderInstanceRegistry secret environment", () => {
     return Effect.gen(function* () {
       yield* fixture.make;
       expect(fixture.configs).toEqual([expect.objectContaining({ [field]: "provider-live" })]);
-    }).pipe(Effect.scoped);
+    });
   });
 
   it.effect("keeps a working instance live when a reload cannot read its secret", () => {
@@ -1098,7 +1098,7 @@ describe("ProviderInstanceRegistry secret environment", () => {
       expect(yield* registry.getInstance(instanceId)).toBeDefined();
       expect(yield* registry.listUnavailable).toEqual([]);
       expect(fixture.created).toHaveLength(1);
-    }).pipe(Effect.scoped);
+    });
   });
 
   it.effect("starts without waiting for secrets to be read", () => {
@@ -1115,6 +1115,6 @@ describe("ProviderInstanceRegistry secret environment", () => {
       yield* PubSub.take(changes);
       expect(yield* registry.getInstance(instanceId)).toBeDefined();
       expect(yield* registry.listUnavailable).toEqual([]);
-    }).pipe(Effect.scoped);
+    });
   });
 });
diff --git a/apps/server/src/provider/ProviderInstanceRegistry.ts b/apps/server/src/provider/ProviderInstanceRegistry.ts
index 3f4df0eb35d1..ae51e8009645 100644
--- a/apps/server/src/provider/ProviderInstanceRegistry.ts
+++ b/apps/server/src/provider/ProviderInstanceRegistry.ts
@@ -92,9 +92,20 @@ const withoutSecretReferences = (
     typeof variable.value === "string" ? [{ ...variable, value: variable.value }] : [],
   );
 
+interface CheckedSecret {
+  readonly reference: SecretReference;
+  readonly value: string;
+}
+
+const sameReference = (a: SecretReference, b: SecretReference) =>
+  a.provider === b.provider && a.reference === b.reference;
+
+// `checked` supplies its reference's value instead of the resolver, which a concurrent refresh
+// may have re-read since the check.
 const readInstanceSecrets = Effect.fn("ProviderInstanceRegistry.readInstanceSecrets")(function* <R>(
   driver: AnyProviderDriver<R> | undefined,
   entry: ProviderInstanceConfig,
+  checked?: CheckedSecret,
 ) {
   const variables = entry.environment ?? [];
   const configFields = configSecretReferences(driver, entry);
@@ -102,8 +113,15 @@ const readInstanceSecrets = Effect.fn("ProviderInstanceRegistry.readInstanceSecr
     ...secretReferencesIn(variables),
     ...configFields.map(({ reference }) => reference),
   ];
-  const values =
-    references.length === 0 ? [] : yield* (yield* SecretResolver.SecretResolver).read(references);
+  const isChecked = (reference: SecretReference) =>
+    checked !== undefined && sameReference(reference, checked.reference);
+  const toRead = references.filter((reference) => !isChecked(reference));
+  const read =
+    toRead.length === 0 ? [] : yield* (yield* SecretResolver.SecretResolver).read(toRead);
+  let readIndex = 0;
+  const values = references.map((reference) =>
+    isChecked(reference) ? checked?.value : read[readIndex++],
+  );
   const unreadable: Array<string> = [];
   let index = 0;
   // An empty secret reads as unreadable, so a driver cannot fall back to an inherited credential.
@@ -130,6 +148,36 @@ const readInstanceSecrets = Effect.fn("ProviderInstanceRegistry.readInstanceSecr
   return { secrets, unreadable };
 });
 
+// Replaces only the checked reference's value in the secrets a live instance already holds, so
+// another reference whose read failed earlier is not read again and does not park the instance.
+const carryCheckedSecret = <R>(
+  driver: AnyProviderDriver<R> | undefined,
+  entry: ProviderInstanceConfig,
+  current: InstanceSecrets,
+  { reference: checked, value }: CheckedSecret,
+): InstanceSecrets => {
+  const matches = (reference: SecretReference) => sameReference(reference, checked);
+  // A live instance resolved every variable in order, so slots line up with the entry's variables
+  // by position; names may repeat.
+  const variables = entry.environment ?? [];
+  const replacedSlots = configSecretReferences(driver, entry).filter(({ reference }) =>
+    matches(reference),
+  );
+  return {
+    environment: current.environment.map((variable, index) => {
+      const source = variables[index]?.value;
+      return source !== undefined && typeof source !== "string" && matches(source)
+        ? { ...variable, value }
+        : variable;
+    }),
+    config: current.config.map((slot) =>
+      replacedSlots.some(({ field, key }) => field === slot.field && key === slot.key)
+        ? { ...slot, value }
+        : slot,
+    ),
+  };
+};
+
 /** Conflicting saved flags must preserve any explicit disable. */
 const resolveEntryEnabled = (entry: ProviderInstanceConfig, typedConfig: unknown): boolean => {
   const rawConfigEnabled = providerInstanceConfigEnabledFlag(entry.config);
@@ -161,6 +209,7 @@ const buildEntry = Effect.fn("ProviderInstanceRegistry.buildEntry")(function* <R
   readonly rawInstanceId: string;
   readonly entry: ProviderInstanceConfig;
   readonly deferSecrets: boolean;
+  readonly carriedSecrets?: InstanceSecrets | undefined;
 }): Effect.fn.Return<
   | { readonly kind: "live"; readonly live: LiveEntry }
   | {
@@ -171,7 +220,15 @@ const buildEntry = Effect.fn("ProviderInstanceRegistry.buildEntry")(function* <R
   never,
   R | SecretResolver.SecretResolver
 > {
-  const { driversById, parentScope, instanceId, rawInstanceId, entry, deferSecrets } = input;
+  const {
+    driversById,
+    parentScope,
+    instanceId,
+    rawInstanceId,
+    entry,
+    deferSecrets,
+    carriedSecrets,
+  } = input;
   const blocked = input.blockedReason(entry.driver);
   if (blocked !== undefined) {
     return {
@@ -235,12 +292,14 @@ const buildEntry = Effect.fn("ProviderInstanceRegistry.buildEntry")(function* <R
       }),
     };
   }
-  const { secrets, unreadable } = enabled
-    ? yield* readInstanceSecrets(driver, entry)
-    : {
-        secrets: { environment: withoutSecretReferences(entry.environment ?? []), config: [] },
-        unreadable: [],
-      };
+  const { secrets, unreadable } = carriedSecrets
+    ? { secrets: carriedSecrets, unreadable: [] }
+    : enabled
+      ? yield* readInstanceSecrets(driver, entry)
+      : {
+          secrets: { environment: withoutSecretReferences(entry.environment ?? []), config: [] },
+          unreadable: [],
+        };
   // Starting with a blank credential would fail later with a less useful error, or fall back to
   // whatever the server inherited.
   if (unreadable.length > 0) {
@@ -311,9 +370,10 @@ const makeReconcile = <R>(input: {
   configMap: ProviderInstanceConfigMap,
   rebuild?: ReadonlySet<ProviderInstanceId>,
   deferSecrets?: boolean,
+  carried?: ReadonlyMap<ProviderInstanceId, InstanceSecrets>,
 ) => Effect.Effect<void, never, R | SecretResolver.SecretResolver>) => {
   const { state, driversById, blockedReason, parentScope } = input;
-  return (configMap, rebuild = new Set(), deferSecrets = false) =>
+  return (configMap, rebuild = new Set(), deferSecrets = false, carried = new Map()) =>
     Effect.gen(function* () {
       const previousEntries = yield* Ref.get(state.entries);
       const previousUnavailable = yield* Ref.get(state.unavailable);
@@ -365,6 +425,7 @@ const makeReconcile = <R>(input: {
           const instanceId = ProviderInstanceId.make(rawInstanceId);
           const kept = previousEntries.has(instanceId) && !replacedIds.has(instanceId);
           return kept ||
+            carried.has(instanceId) ||
             parkedSnapshot(instanceId, entry) !== undefined ||
             !(yield* isEntryEnabled(driversById, entry))
             ? []
@@ -406,6 +467,7 @@ const makeReconcile = <R>(input: {
           rawInstanceId,
           entry,
           deferSecrets,
+          carriedSecrets: carried.get(instanceId),
         });
         if (result.kind === "live") {
           builtEntries.set(instanceId, result.live);
@@ -503,44 +565,87 @@ export const makeProviderInstanceRegistry = Effect.fn(
       );
 
   // Rebuilds an instance only when it was unavailable or its secrets changed, so a refresh does
-  // not restart providers whose credentials are the same.
-  const reloadSecrets: ProviderInstanceRegistryMutator.ProviderInstanceRegistryMutatorShape["reloadSecrets"] =
-    Effect.fn("ProviderInstanceRegistry.reloadSecrets")(
-      function* (instanceId) {
-        const configMap = yield* Ref.get(configMapRef);
-        const targets = yield* Effect.filter(Object.entries(configMap), ([rawInstanceId, entry]) =>
-          (instanceId === undefined || rawInstanceId === instanceId) &&
-          secretReferencesOf(driversById, entry).length > 0
-            ? isEntryEnabled(driversById, entry)
-            : Effect.succeed(false),
-        );
-        if (targets.length === 0) return;
+  // not restart providers whose credentials are the same. Without `checked` the cached values are
+  // dropped first; with it, only that reference takes the checked value and the rest carry over.
+  const reloadWhere = Effect.fn("ProviderInstanceRegistry.reloadWhere")(
+    function* (
+      select: (rawInstanceId: string, entry: ProviderInstanceConfig) => boolean,
+      checked?: CheckedSecret,
+    ) {
+      const configMap = yield* Ref.get(configMapRef);
+      const targets = yield* Effect.filter(Object.entries(configMap), ([rawInstanceId, entry]) =>
+        select(rawInstanceId, entry) && secretReferencesOf(driversById, entry).length > 0
+          ? isEntryEnabled(driversById, entry)
+          : Effect.succeed(false),
+      );
+      if (targets.length === 0) return [];
+      if (checked === undefined) {
         const resolver = yield* SecretResolver.SecretResolver;
         const references = targets.flatMap(([, entry]) => secretReferencesOf(driversById, entry));
         yield* resolver.invalidate(references);
         yield* resolver.read(references);
-        const live = yield* Ref.get(entries);
-        const rebuild = new Set<ProviderInstanceId>();
-        for (const [rawInstanceId, entry] of targets) {
-          const current = live.get(ProviderInstanceId.make(rawInstanceId));
-          if (current === undefined) {
-            rebuild.add(ProviderInstanceId.make(rawInstanceId));
-            continue;
+      }
+      const live = yield* Ref.get(entries);
+      const rebuild = new Set<ProviderInstanceId>();
+      const carried = new Map<ProviderInstanceId, InstanceSecrets>();
+      for (const [rawInstanceId, entry] of targets) {
+        const instanceId = ProviderInstanceId.make(rawInstanceId);
+        const current = live.get(instanceId);
+        if (current === undefined) {
+          rebuild.add(instanceId);
+          if (checked !== undefined) {
+            const { secrets, unreadable } = yield* readInstanceSecrets(
+              driversById.get(entry.driver),
+              entry,
+              checked,
+            );
+            if (unreadable.length === 0) carried.set(instanceId, secrets);
           }
-          const { secrets, unreadable } = yield* readInstanceSecrets(
+          continue;
+        }
+        if (checked !== undefined) {
+          const secrets = carryCheckedSecret(
             driversById.get(entry.driver),
-            entry,
+            current.entry,
+            current.secrets,
+            checked,
           );
-          // A failed re-read keeps the working instance and the value it already holds.
-          if (unreadable.length === 0 && !Equal.equals(secrets, current.secrets)) {
+          if (!Equal.equals(secrets, current.secrets)) {
             rebuild.add(current.instance.instanceId);
+            carried.set(current.instance.instanceId, secrets);
           }
+          continue;
         }
-        yield* reconcileWithR(configMap, rebuild);
-      },
-      (effect) => semaphore.withPermits(1)(effect),
-      Effect.provideContext(driverContext),
-    );
+        const { secrets, unreadable } = yield* readInstanceSecrets(
+          driversById.get(entry.driver),
+          entry,
+        );
+        // A failed re-read keeps the working instance and the value it already holds.
+        if (unreadable.length === 0 && !Equal.equals(secrets, current.secrets)) {
+          rebuild.add(current.instance.instanceId);
+        }
+      }
+      yield* reconcileWithR(configMap, rebuild, false, carried);
+      return targets.map(([rawInstanceId]) => ProviderInstanceId.make(rawInstanceId));
+    },
+    (effect) => semaphore.withPermits(1)(effect),
+    Effect.provideContext(driverContext),
+  );
+  const reloadSecrets: ProviderInstanceRegistryMutator.ProviderInstanceRegistryMutatorShape["reloadSecrets"] =
+    (instanceId) =>
+      reloadWhere(
+        (rawInstanceId) => instanceId === undefined || rawInstanceId === instanceId,
+        undefined,
+      ).pipe(Effect.asVoid);
+  const applySecret: ProviderInstanceRegistryMutator.ProviderInstanceRegistryMutatorShape["applySecret"] =
+    (reference, value) =>
+      reloadWhere(
+        (_, entry) =>
+          secretReferencesOf(driversById, entry).some((candidate) =>
+            sameReference(candidate, reference),
+          ),
+        { reference, value },
+      );
 
   // Reading secrets can wait on a vault unlock, so the server does not wait for it to start.
   yield* semaphore.withPermits(1)(
@@ -592,6 +697,7 @@ export const makeProviderInstanceRegistry = Effect.fn(
   const mutator: ProviderInstanceRegistryMutator.ProviderInstanceRegistryMutatorShape = {
     reconcile,
     reloadSecrets,
+    applySecret,
   };
 
   return { registry, mutator };
diff --git a/apps/server/src/provider/ProviderInstanceRegistryHydration.test.ts b/apps/server/src/provider/ProviderInstanceRegistryHydration.test.ts
index dc44f0324a6b..02bc92f4b450 100644
--- a/apps/server/src/provider/ProviderInstanceRegistryHydration.test.ts
+++ b/apps/server/src/provider/ProviderInstanceRegistryHydration.test.ts
@@ -165,6 +165,7 @@ describe("layerSettingsWatcher", () => {
       const mutator = Layer.succeed(ProviderInstanceRegistryMutator, {
         reconcile: () => Queue.offer(reconciled, undefined),
         reloadSecrets: () => Effect.sync(() => void reloads++),
+        applySecret: () => Effect.succeed([]),
       });
       yield* Layer.build(
         layerSettingsWatcher(Stream.fromQueue(changes), initial).pipe(Layer.provide(mutator)),
diff --git a/apps/server/src/provider/ProviderInstanceRegistryMutator.ts b/apps/server/src/provider/ProviderInstanceRegistryMutator.ts
index 35eb52d3f290..911a055d7962 100644
--- a/apps/server/src/provider/ProviderInstanceRegistryMutator.ts
+++ b/apps/server/src/provider/ProviderInstanceRegistryMutator.ts
@@ -1,5 +1,9 @@
 /** Reconcile closes removed/replaced scopes before creating replacements: at most one live instance per id. */
-import type { ProviderInstanceConfigMap, ProviderInstanceId } from "@t3tools/contracts";
+import type {
+  ProviderInstanceConfigMap,
+  ProviderInstanceId,
+  SecretReference,
+} from "@t3tools/contracts";
 import * as Context from "effect/Context";
 import type * as Effect from "effect/Effect";
 
@@ -7,6 +11,14 @@ export interface ProviderInstanceRegistryMutatorShape {
   readonly reconcile: (configMap: ProviderInstanceConfigMap) => Effect.Effect<void>;
   /** Re-reads the secrets of every instance, or one, and rebuilds those whose secrets changed. */
   readonly reloadSecrets: (instanceId?: ProviderInstanceId) => Effect.Effect<void>;
+  /**
+   * Rebuilds the instances that read `reference` with `value`, keeping the other secrets a live
+   * instance holds, and returns them. A parked instance reads its other secrets from the resolver.
+   */
+  readonly applySecret: (
+    reference: SecretReference,
+    value: string,
+  ) => Effect.Effect<ReadonlyArray<ProviderInstanceId>>;
 }
 
 export class ProviderInstanceRegistryMutator extends Context.Service<
diff --git a/apps/server/src/provider/ProviderRegistry.test.ts b/apps/server/src/provider/ProviderRegistry.test.ts
index b5501943ca04..564a90f40e6c 100644
--- a/apps/server/src/provider/ProviderRegistry.test.ts
+++ b/apps/server/src/provider/ProviderRegistry.test.ts
@@ -17,6 +17,7 @@ import * as FileSystem from "effect/FileSystem";
 import * as Layer from "effect/Layer";
 import * as Path from "effect/Path";
 import * as PubSub from "effect/PubSub";
+import * as Queue from "effect/Queue";
 import * as Ref from "effect/Ref";
 import * as Schema from "effect/Schema";
 import * as Scope from "effect/Scope";
@@ -35,6 +36,8 @@ import {
   ServerSettingsError,
   ServerProvider,
   type ServerProviderSlashCommand,
+  type ServerProviderUpdateState,
+  type ServerProviderVersionAdvisoryStatus,
   type ServerSettings as ContractServerSettings,
 } from "@t3tools/contracts";
 import { HttpClient, HttpClientResponse } from "effect/http";
@@ -44,7 +47,11 @@ import { deepMerge } from "@t3tools/shared/Struct";
 import { createModelCapabilities } from "@t3tools/shared/model";
 import { applyServerSettingsPatch } from "@t3tools/shared/serverSettings";
 
-import { checkCodexProviderStatus, type CodexAppServerProviderSnapshot } from "./CodexProvider.ts";
+import {
+  checkCodexProviderStatus,
+  mapCodexModelCapabilities,
+  type CodexAppServerProviderSnapshot,
+} from "./CodexProvider.ts";
 import { BUNDLED_CLAUDE_MODEL_CATALOG } from "./ClaudeModelCatalog.ts";
 import { checkClaudeProviderStatus } from "./ClaudeProvider.ts";
 import * as BackgroundPolicy from "../background/BackgroundPolicy.ts";
@@ -334,6 +341,86 @@ const awaitPersistedProvider = (
     Effect.forkScoped,
   );
 
+const codexUpdateSnapshot = (advisory: ServerProviderVersionAdvisoryStatus) =>
+  ({
+    instanceId: ProviderInstanceId.make("codex"),
+    driver: ProviderDriverKind.make("codex"),
+    status: "ready",
+    enabled: true,
+    installed: true,
+    auth: { status: "authenticated" },
+    checkedAt: "2026-06-10T00:00:00.000Z",
+    version: "1.0.0",
+    models: [],
+    slashCommands: [],
+    skills: [],
+    versionAdvisory: {
+      status: advisory,
+      currentVersion: "1.0.0",
+      latestVersion: advisory === "unknown" ? null : advisory === "current" ? "1.0.0" : "2.0.0",
+      updateCommand: null,
+      canUpdate: true,
+      checkedAt: "2026-06-10T00:00:00.000Z",
+      message: null,
+    },
+  }) as const satisfies ServerProvider;
+
+const makeUpdateState = (status: ServerProviderUpdateState["status"]) =>
+  ({
+    status,
+    startedAt: "2026-06-10T00:00:00.000Z",
+    finishedAt: status === "queued" || status === "running" ? null : "2026-06-10T00:01:00.000Z",
+    message: `update ${status}`,
+    output: null,
+  }) satisfies ServerProviderUpdateState;
+
+// One Codex instance whose probe returns whatever `snapshot` currently holds.
+const buildRegistryOverSnapshot = Effect.fn("buildRegistryOverSnapshot")(function* (
+  snapshot: Ref.Ref<ServerProvider>,
+) {
+  const driver = ProviderDriverKind.make("codex");
+  const instance = {
+    instanceId: ProviderInstanceId.make("codex"),
+    driverKind: driver,
+    continuationIdentity: { driverKind: driver, continuationKey: "codex:instance:codex" },
+    displayName: undefined,
+    enabled: true,
+    snapshot: {
+      resolveMaintenance: () =>
+        Effect.succeed(
+          makeManualOnlyProviderMaintenanceCapabilities({ provider: driver, packageName: null }),
+        ),
+      getSnapshot: Ref.get(snapshot),
+      refresh: Ref.get(snapshot),
+      streamChanges: Stream.empty,
+      applyUsageLimits: () => Effect.void,
+    },
+    orchestrationAdapter: {} as ProviderInstance["orchestrationAdapter"],
+    textGeneration: {} as ProviderInstance["textGeneration"],
+  } satisfies ProviderInstance;
+  const layerInstanceRegistry = Layer.succeed(ProviderInstanceRegistry.ProviderInstanceRegistry, {
+    getInstance: (instanceId) =>
+      Effect.succeed(instanceId === instance.instanceId ? instance : undefined),
+    listInstances: Effect.succeed([instance]),
+    listUnavailable: Effect.succeed([]),
+    streamChanges: Stream.empty,
+    subscribeChanges: Effect.flatMap(PubSub.unbounded<void>(), PubSub.subscribe),
+  });
+  const scope = yield* Scope.make();
+  yield* Effect.addFinalizer(() => Scope.close(scope, Exit.void));
+  return yield* Layer.build(
+    ProviderRegistry.layer.pipe(
+      Layer.provide(layerUnusedMutator),
+      Layer.provideMerge(layerInstanceRegistry),
+      Layer.provideMerge(
+        ServerConfig.layerTest(process.cwd(), { prefix: "t3-provider-registry-update-state-" }),
+      ),
+      Layer.provideMerge(layerBackgroundPolicyAlwaysRun),
+      Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
+    ),
+  ).pipe(Scope.provide(scope));
+});
+
 const layerTestNodeServices = Layer.mergeAll(
   ProviderLatestVersions.layer,
   NodeServices.layer,
@@ -418,6 +505,20 @@ it.layer(
       }),
     );
 
+    it.effect("allows a slow successful Codex probe with a configured budget", () =>
+      Effect.gen(function* () {
+        const fiber = yield* checkCodexProviderStatus(
+          defaultCodexSettings,
+          () => Effect.sleep("22 seconds").pipe(Effect.as(makeCodexProbeSnapshot())),
+          { T3CODE_CODEX_PROBE_TIMEOUT_MS: "60000" },
+        ).pipe(Effect.forkChild);
+        yield* TestClock.adjust("22 seconds");
+        const status = yield* Fiber.join(fiber);
+        assert.strictEqual(status.status, "ready");
+        assert.strictEqual(status.auth.status, "authenticated");
+      }),
+    );
+
     it.effect("labels the plan the usage read reports over the cached login plan", () =>
       Effect.gen(function* () {
         const statusWithUsagePlan = (planType: string | null) =>
@@ -503,6 +604,84 @@ it.layer(
       }),
     );
 
+    it.effect("offers cyber access only on catalog models that advertise it", () =>
+      Effect.gen(function* () {
+        const catalogModel = (slug: string, cyber?: Array<"standard" | "daybreakBlue">) => ({
+          slug,
+          name: slug,
+          isCustom: false,
+          capabilities: mapCodexModelCapabilities({
+            additionalSpeedTiers: [],
+            ...(cyber ? { availableAccessPrograms: { cyber } } : {}),
+            defaultReasoningEffort: "medium",
+            description: slug,
+            displayName: slug,
+            hidden: false,
+            id: slug,
+            isDefault: false,
+            model: slug,
+            supportedReasoningEfforts: [],
+          }),
+        });
+        const defaultPrograms = (snapshot: Partial<CodexAppServerProviderSnapshot>) =>
+          checkCodexProviderStatus(decodeCodexSettings({ customModels: ["my-model"] }), () =>
+            Effect.succeed(
+              makeCodexProbeSnapshot({
+                models: [
+                  catalogModel("both", ["standard", "daybreakBlue"]),
+                  catalogModel("daybreak-only", ["daybreakBlue"]),
+                  catalogModel("plain"),
+                ],
+                ...snapshot,
+              }),
+            ),
+          ).pipe(
+            Effect.map((status) =>
+              Object.fromEntries(
+                status.models.map((model) => {
+                  const descriptor = model.capabilities?.optionDescriptors?.find(
+                    (option) => option.id === "cyberAccessProgram",
+                  );
+                  return [
+                    model.slug,
+                    descriptor?.type === "select"
+                      ? (descriptor.currentValue ?? "no default")
+                      : null,
+                  ];
+                }),
+              ),
+            ),
+          );
+
+        assert.deepStrictEqual(yield* defaultPrograms({ daybreakEnabled: false }), {
+          both: "standard",
+          "daybreak-only": "daybreakBlue",
+          plain: null,
+          "my-model": null,
+        });
+        assert.deepStrictEqual(yield* defaultPrograms({ daybreakEnabled: true }), {
+          both: "daybreakBlue",
+          "daybreak-only": "daybreakBlue",
+          plain: null,
+          "my-model": null,
+        });
+        // An unread config keeps the choice but cannot know Codex's default.
+        assert.deepStrictEqual(yield* defaultPrograms({}), {
+          both: "no default",
+          "daybreak-only": "no default",
+          plain: null,
+          "my-model": null,
+        });
+        assert.deepStrictEqual(
+          yield* defaultPrograms({
+            account: { account: { type: "apiKey" }, requiresOpenaiAuth: false },
+            cyberAccessProgramsUnavailable: true,
+          }),
+          { both: null, "daybreak-only": null, plain: null, "my-model": null },
+        );
+      }),
+    );
+
     it.effect("reads the version of a Codex CLI too old to run app-server (#20351)", () =>
       Effect.gen(function* () {
         if ((yield* HostProcess.Platform) === "win32") return;
@@ -610,6 +789,86 @@ it.layer(
       }),
     );
 
+    it.effect("shows Codex usage that answers after three seconds inside the probe budget", () =>
+      Effect.gen(function* () {
+        const usageRequested = yield* Deferred.make<void>();
+        const spawner = ChildProcessSpawner.make(() =>
+          Effect.gen(function* () {
+            const scope = yield* Effect.scope;
+            const output = yield* Queue.unbounded<Uint8Array>();
+            const send = (message: unknown) =>
+              Queue.offer(output, encoder.encode(`${JSON.stringify(message)}\n`));
+            const results: Record<string, unknown> = {
+              initialize: {
+                userAgent: "codex_cli_rs/0.167.0",
+                codexHome: "/nonexistent-codex-home",
+                platformFamily: "unix",
+                platformOs: "linux",
+              },
+              "account/read": {
+                account: { type: "chatgpt", email: "test@example.com", planType: "pro" },
+                requiresOpenaiAuth: true,
+              },
+              "config/read": { config: {}, origins: {} },
+              "skills/list": { data: [] },
+              "model/list": { data: [] },
+            };
+            const answer = (line: string) => {
+              const { id, method } = JSON.parse(line) as { id?: number; method?: string };
+              if (id === undefined || method === undefined) return Effect.void;
+              if (method !== "account/rateLimits/read") {
+                return send({ id, result: results[method] ?? {} });
+              }
+              return Deferred.succeed(usageRequested, undefined).pipe(
+                Effect.andThen(Effect.sleep("4 seconds")),
+                Effect.andThen(
+                  send({
+                    id,
+                    result: {
+                      rateLimits: {
+                        limitId: "codex",
+                        planType: "pro",
+                        primary: { usedPercent: 42, windowDurationMins: 300, resetsAt: 2e9 },
+                      },
+                      rateLimitsByLimitId: null,
+                      rateLimitResetCredits: null,
+                      accountId: null,
+                    },
+                  }),
+                ),
+                Effect.forkIn(scope),
+              );
+            };
+            const decoder = new TextDecoder();
+            let buffered = "";
+            return ChildProcessSpawner.makeHandle({
+              ...mockHandle({ stdout: "", stderr: "", code: 0 }),
+              exitCode: Effect.never,
+              isRunning: Effect.succeed(true),
+              stdin: Sink.forEach((chunk: Uint8Array) => {
+                buffered += decoder.decode(chunk, { stream: true });
+                const lines = buffered.split("\n");
+                buffered = lines.pop() ?? "";
+                return Effect.forEach(lines.filter(Boolean), answer, { discard: true });
+              }),
+              stdout: Stream.fromQueue(output),
+            });
+          }),
+        );
+        const fiber = yield* checkCodexProviderStatus(defaultCodexSettings).pipe(
+          Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, spawner),
+          Effect.forkChild,
+        );
+        yield* Deferred.await(usageRequested);
+        yield* TestClock.adjust("25 seconds");
+        const status = yield* Fiber.join(fiber);
+
+        assert.strictEqual(status.auth.status, "authenticated");
+        assert.isUndefined(status.usageLimits?.unavailable);
+        assert.strictEqual(status.usageLimits?.windows[0]?.usedPercent, 42);
+      }),
+    );
+
     it.effect("does not run --version when the Codex executable cannot start", () =>
       Effect.gen(function* () {
         if ((yield* HostProcess.Platform) === "win32") return;
@@ -3198,6 +3457,67 @@ it.layer(
       }),
     );
 
+    describe("update results across refreshes", () => {
+      const instanceId = ProviderInstanceId.make("codex");
+
+      it.effect.each([
+        { status: "unchanged", advisory: "current", retired: true },
+        { status: "failed", advisory: "current", retired: true },
+        { status: "unchanged", advisory: "behind_latest", retired: false },
+        { status: "failed", advisory: "behind_latest", retired: false },
+        // The probe publishes `unknown` until the latest-version check lands.
+        { status: "unchanged", advisory: "unknown", retired: false },
+        { status: "queued", advisory: "current", retired: false },
+        { status: "running", advisory: "current", retired: false },
+        { status: "succeeded", advisory: "current", retired: false },
+        { status: "failed", advisory: "unknown", retired: false },
+      ] as const)(
+        "a $status update result is retired: $retired when a refresh reports the provider $advisory",
+        ({ status, advisory, retired }) =>
+          Effect.gen(function* () {
+            const snapshot = yield* Ref.make<ServerProvider>(codexUpdateSnapshot("behind_latest"));
+            const runtimeServices = yield* buildRegistryOverSnapshot(snapshot);
+
+            yield* Effect.gen(function* () {
+              const registry = yield* ProviderRegistry.ProviderRegistry;
+              const state = makeUpdateState(status);
+              yield* registry.setProviderMaintenanceActionState({
+                instanceId,
+                action: "update",
+                state,
+              });
+              yield* Ref.set(snapshot, codexUpdateSnapshot(advisory));
+
+              const [refreshed] = yield* registry.refresh(ProviderDriverKind.make("codex"));
+
+              expect(refreshed?.updateState).toEqual(retired ? undefined : state);
+            }).pipe(Effect.provide(runtimeServices));
+          }),
+      );
+
+      it.effect.each(["failed", "unchanged"] as const)(
+        "keeps a %s recommended-version install after a current refresh",
+        (status) =>
+          Effect.gen(function* () {
+            const snapshot = yield* Ref.make<ServerProvider>(codexUpdateSnapshot("current"));
+            const runtimeServices = yield* buildRegistryOverSnapshot(snapshot);
+            yield* Effect.gen(function* () {
+              const registry = yield* ProviderRegistry.ProviderRegistry;
+              const state = makeUpdateState(status);
+              const input = {
+                instanceId,
+                action: "update" as const,
+                state,
+                targetVersion: "0.9.0",
+              };
+              yield* registry.setProviderMaintenanceActionState(input);
+              const [refreshed] = yield* registry.refresh(ProviderDriverKind.make("codex"));
+              expect(refreshed?.updateState).toEqual(state);
+            }).pipe(Effect.provide(runtimeServices));
+          }),
+      );
+    });
+
     it.effect("re-probes when settings change the codex binaryPath", () =>
       Effect.gen(function* () {
         const firstMissing = `t3code_codex_first_`;
diff --git a/apps/server/src/provider/ProviderRegistry.ts b/apps/server/src/provider/ProviderRegistry.ts
index 18456b2397e7..ba9ce9b2b6af 100644
--- a/apps/server/src/provider/ProviderRegistry.ts
+++ b/apps/server/src/provider/ProviderRegistry.ts
@@ -4,6 +4,7 @@ import {
   isProviderWorkspaceSnapshotPending,
   ProviderDriverKind,
   type ProviderInstanceId,
+  type SecretReference,
   type ServerProvider,
   type ServerProviderUpdateState,
 } from "@t3tools/contracts";
@@ -70,6 +71,12 @@ export class ProviderRegistry extends Context.Service<
       instanceId?: ProviderInstanceId,
     ) => Effect.Effect<ReadonlyArray<ServerProvider>>;
 
+    /** Rebuilds and refreshes only the instances that read a secret, with the value the caller just read. */
+    readonly applySecretAndRefresh: (
+      reference: SecretReference,
+      value: string,
+    ) => Effect.Effect<ReadonlyArray<ServerProvider>>;
+
     /** Only refreshed instances can verify an update; the published list still includes every row. */
     readonly refreshAfterUpdate: (
       provider: ProviderDriverKind,
@@ -111,6 +118,7 @@ export class ProviderRegistry extends Context.Service<
       readonly instanceId: ProviderInstanceId;
       readonly action: ProviderMaintenanceActionKind;
       readonly state: ServerProviderUpdateState | null;
+      readonly targetVersion?: string | undefined;
     }) => Effect.Effect<ReadonlyArray<ServerProvider>>;
 
     readonly streamChanges: Stream.Stream<ReadonlyArray<ServerProvider>>;
@@ -472,7 +480,10 @@ export const layer = Layer.effect(
       ReadonlyMap<ProviderInstance, ReadonlyMap<string, Deferred.Deferred<void>>>
     >(new Map());
     const maintenanceActionStatesRef = yield* Ref.make<
-      ReadonlyMap<ProviderInstanceId, { readonly update?: ServerProviderUpdateState | undefined }>
+      ReadonlyMap<
+        ProviderInstanceId,
+        { readonly update?: ServerProviderUpdateState; readonly targetVersion?: string | undefined }
+      >
     >(new Map());
 
     const liveSubsRef = yield* Ref.make<ReadonlyMap<ProviderInstanceId, ProviderInstance>>(
@@ -592,6 +603,21 @@ export const layer = Layer.effect(
         readonly publish?: boolean;
       },
     ) {
+      // Latest-version status cannot resolve a failed recommended-version install.
+      if (provider.versionAdvisory?.status === "current") {
+        yield* Ref.update(maintenanceActionStatesRef, (previous) => {
+          const action = previous.get(provider.instanceId);
+          if (
+            action?.targetVersion !== undefined ||
+            (action?.update?.status !== "unchanged" && action?.update?.status !== "failed")
+          ) {
+            return previous;
+          }
+          const next = new Map(previous);
+          next.delete(provider.instanceId);
+          return next;
+        });
+      }
       const providers = yield* upsertProviders([provider], options);
       yield* refreshCompatibility;
       return providers;
@@ -602,21 +628,14 @@ export const layer = Layer.effect(
         readonly instanceId: ProviderInstanceId;
         readonly action: "update";
         readonly state: ServerProviderUpdateState | null;
+        readonly targetVersion?: string | undefined;
       }) {
         yield* Ref.update(maintenanceActionStatesRef, (previous) => {
-          const previousActions = previous.get(input.instanceId);
-          const nextActions = { ...previousActions };
-          if (input.state === null || input.state.status === "idle") {
-            delete nextActions[input.action];
-          } else {
-            nextActions[input.action] = input.state;
-          }
-
           const next = new Map(previous);
-          if (Object.keys(nextActions).length === 0) {
+          if (input.state === null || input.state.status === "idle") {
             next.delete(input.instanceId);
           } else {
-            next.set(input.instanceId, nextActions);
+            next.set(input.instanceId, { update: input.state, targetVersion: input.targetVersion });
           }
           return next;
         });
@@ -739,6 +758,15 @@ export const layer = Layer.effect(
       return yield* instanceId === undefined ? refresh() : refreshInstance(instanceId);
     });
 
+    const applySecretAndRefresh = Effect.fn("applySecretAndRefresh")(function* (
+      reference: SecretReference,
+      value: string,
+    ) {
+      const instanceIds = yield* instanceRegistryMutator.applySecret(reference, value);
+      yield* Effect.forEach(instanceIds, refreshInstance, { discard: true });
+      return yield* Ref.get(providersRef);
+    });
+
     const refreshAfterUpdate = Effect.fn("refreshAfterUpdate")(function* (
       provider: ProviderDriverKind,
       selectedInstanceId: ProviderInstanceId,
@@ -1176,6 +1204,8 @@ export const layer = Layer.effect(
         refreshInstance(instanceId).pipe(Effect.catchCause(recoverRefreshFailure)),
       reloadSecretsAndRefresh: (instanceId?: ProviderInstanceId) =>
         reloadSecretsAndRefresh(instanceId).pipe(Effect.catchCause(recoverRefreshFailure)),
+      applySecretAndRefresh: (reference: SecretReference, value: string) =>
+        applySecretAndRefresh(reference, value).pipe(Effect.catchCause(recoverRefreshFailure)),
       refreshWorkspaceSnapshot: (input) =>
         refreshWorkspaceSnapshot(input).pipe(Effect.catchCause(recoverRefreshFailure)),
       refreshAfterUpdate,
diff --git a/apps/server/src/provider/acp/AntigravityAcpSupport.test.ts b/apps/server/src/provider/acp/AntigravityAcpSupport.test.ts
index 4996b6377272..dc755d1e7a5a 100644
--- a/apps/server/src/provider/acp/AntigravityAcpSupport.test.ts
+++ b/apps/server/src/provider/acp/AntigravityAcpSupport.test.ts
@@ -60,21 +60,25 @@ function makeModelRuntime(
 
 describe("Antigravity release gates", () => {
   it.each([
-    { version: "1.4.1", filter: false, native: false, ownName: false },
-    { version: "1.4.2", filter: true, native: false, ownName: false },
-    { version: "1.4.4", filter: true, native: false, ownName: false },
-    { version: "1.4.5", filter: true, native: true, ownName: false },
-    { version: "1.4.6", filter: false, native: false, ownName: false },
-    { version: "1.5.0", filter: false, native: false, ownName: false },
-    { version: "1.5.1", filter: false, native: false, ownName: true },
-    { version: "1.3.0", filter: false, native: false, ownName: false },
-    { version: undefined, filter: false, native: false, ownName: false },
-    { version: "unknown", filter: false, native: false, ownName: false },
+    { version: "1.4.1", filter: false, native: false, ownName: false, advertisedAppend: false },
+    { version: "1.4.2", filter: true, native: false, ownName: false, advertisedAppend: false },
+    { version: "1.4.4", filter: true, native: false, ownName: false, advertisedAppend: false },
+    { version: "1.4.5", filter: true, native: true, ownName: false, advertisedAppend: false },
+    { version: "1.4.6", filter: false, native: false, ownName: false, advertisedAppend: false },
+    { version: "1.5.0", filter: false, native: false, ownName: false, advertisedAppend: false },
+    { version: "1.5.1", filter: false, native: false, ownName: true, advertisedAppend: false },
+    { version: "1.5.7", filter: false, native: false, ownName: true, advertisedAppend: true },
+    { version: "1.3.0", filter: false, native: false, ownName: false, advertisedAppend: false },
+    { version: undefined, filter: false, native: false, ownName: false, advertisedAppend: false },
+    { version: "unknown", filter: false, native: false, ownName: false, advertisedAppend: false },
   ])(
-    "$version: workflow filter $filter, native reads and system prompt $native, own client name $ownName",
-    ({ version, filter, native, ownName }) => {
+    "$version: workflow filter $filter, qualified reads $native, advertised system append $advertisedAppend, own client name $ownName",
+    ({ version, filter, native, ownName, advertisedAppend }) => {
       const initialize = {
         protocolVersion: 1,
+        ...(advertisedAppend
+          ? { agentCapabilities: { _meta: { antigravity: { systemPrompt: { append: true } } } } }
+          : {}),
         ...(version === undefined ? {} : { agentInfo: { name: "antigravity-acp", version } }),
       };
       // Helpers send no append, so only the workflow filter can apply.
@@ -83,10 +87,12 @@ describe("Antigravity release gates", () => {
       );
       const antigravity = {
         ...(filter ? { disabledTools: ["run_workflow"] } : {}),
-        ...(native ? { systemPrompt: { append: "<pull_request_linking/>" } } : {}),
+        ...(native || advertisedAppend
+          ? { systemPrompt: { append: "<pull_request_linking/>" } }
+          : {}),
       };
       expect(antigravitySessionMeta(initialize, "<pull_request_linking/>")).toEqual(
-        filter || native ? { antigravity } : undefined,
+        filter || native || advertisedAppend ? { antigravity } : undefined,
       );
       expect(isQualifiedAntigravityRelease(version)).toBe(native);
       expect(antigravityClientInfo(version).name).toBe(ownName ? "t3-code" : "zed");
diff --git a/apps/server/src/provider/acp/AntigravityAcpSupport.ts b/apps/server/src/provider/acp/AntigravityAcpSupport.ts
index 66eab95c9fb3..7fd64e2534fa 100644
--- a/apps/server/src/provider/acp/AntigravityAcpSupport.ts
+++ b/apps/server/src/provider/acp/AntigravityAcpSupport.ts
@@ -12,6 +12,7 @@ import * as Effect from "effect/Effect";
 import * as FileSystem from "effect/FileSystem";
 import * as Layer from "effect/Layer";
 import * as Path from "effect/Path";
+import * as Predicate from "effect/Predicate";
 import * as Scope from "effect/Scope";
 import * as Stream from "effect/Stream";
 import * as ChildProcessSpawner from "effect/process/ChildProcessSpawner";
@@ -94,7 +95,15 @@ const OPEN_MODEL_ACCESS_RELEASE = [1, 5, 1] as const;
  */
 export const antigravityAppendsSystemPrompt = (
   initializeResult: EffectAcpSchema.InitializeResponse,
-) => isQualifiedAntigravityRelease(initializeResult.agentInfo?.version);
+) => {
+  if (isQualifiedAntigravityRelease(initializeResult.agentInfo?.version)) return true;
+  const extension = initializeResult.agentCapabilities?._meta?.antigravity;
+  return (
+    Predicate.isObject(extension) &&
+    Predicate.isObject(extension.systemPrompt) &&
+    extension.systemPrompt.append === true
+  );
+};
 
 export function antigravitySessionMeta(
   initializeResult: EffectAcpSchema.InitializeResponse,
diff --git a/apps/server/src/provider/acp/AntigravitySessionFiles.test.ts b/apps/server/src/provider/acp/AntigravitySessionFiles.test.ts
index 795e80b861e8..81885dc0c89b 100644
--- a/apps/server/src/provider/acp/AntigravitySessionFiles.test.ts
+++ b/apps/server/src/provider/acp/AntigravitySessionFiles.test.ts
@@ -31,7 +31,7 @@ it.layer(NodeServices.layer)("retireAntigravityRuntimeTempDirs", (it) => {
 
       yield* removeRetired;
       expect((yield* fs.readDirectory(parent)).toSorted()).toEqual(["other-instance"]);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect(
diff --git a/apps/server/src/provider/acp/AntigravityTurnOutcome.test.ts b/apps/server/src/provider/acp/AntigravityTurnOutcome.test.ts
index 09b8730bd600..52e96caa08ae 100644
--- a/apps/server/src/provider/acp/AntigravityTurnOutcome.test.ts
+++ b/apps/server/src/provider/acp/AntigravityTurnOutcome.test.ts
@@ -158,7 +158,7 @@ describe("watchAntigravityPromptOutcome", () => {
         code: "QUOTA_EXHAUSTED",
         retryable: true,
       });
-    }).pipe(Effect.provide(NodeServices.layer), Effect.scoped),
+    }).pipe(Effect.provide(NodeServices.layer)),
   );
 
   it.effect("reads only this session's own unlinked log, and keeps a typed refusal", () =>
@@ -206,6 +206,6 @@ describe("watchAntigravityPromptOutcome", () => {
         code: "QUOTA_EXHAUSTED",
         retryable: true,
       });
-    }).pipe(Effect.provide(NodeServices.layer), Effect.scoped),
+    }).pipe(Effect.provide(NodeServices.layer)),
   );
 });
diff --git a/apps/server/src/provider/agentContextBudget.json b/apps/server/src/provider/agentContextBudget.json
index e166af3f7834..e7901a8656eb 100644
--- a/apps/server/src/provider/agentContextBudget.json
+++ b/apps/server/src/provider/agentContextBudget.json
@@ -1,5 +1,5 @@
 {
-  "claudeSystemAppendBytes": 5597,
-  "codexAdditionalContextBytes": 7327,
-  "mcpToolListJsonBytes": 48126
+  "claudeSystemAppendBytes": 5594,
+  "codexAdditionalContextBytes": 7324,
+  "mcpToolListJsonBytes": 48094
 }
diff --git a/apps/server/src/provider/antigravityAuthSupport.test.ts b/apps/server/src/provider/antigravityAuthSupport.test.ts
index 0220f9fd153c..832f2961d836 100644
--- a/apps/server/src/provider/antigravityAuthSupport.test.ts
+++ b/apps/server/src/provider/antigravityAuthSupport.test.ts
@@ -118,7 +118,13 @@ describe("Antigravity process environment", () => {
     });
 
     expect(spawn.command).toBe("/usr/bin/agy");
-    expect(spawn.args).toEqual(["acp"]);
+    expect(spawn.args).toEqual([
+      "acp",
+      "--gemini-dir",
+      profile.geminiHome,
+      "--app-data-dir",
+      "antigravity-acp",
+    ]);
     expect(spawn.env).not.toHaveProperty("ANTIGRAVITY_HARNESS_PATH");
     expect(spawn.env).toMatchObject({ GEMINI_HOME: profile.geminiHome, PATH: "/usr/bin" });
   });
diff --git a/apps/server/src/provider/antigravityAuthSupport.ts b/apps/server/src/provider/antigravityAuthSupport.ts
index 6a926b12f7c9..8d78a504f9fb 100644
--- a/apps/server/src/provider/antigravityAuthSupport.ts
+++ b/apps/server/src/provider/antigravityAuthSupport.ts
@@ -467,7 +467,14 @@ export function buildAntigravityAcpSpawnInput(input: {
     // The agy CLI has no harness sibling and serves ACP through its `acp` subcommand.
     args:
       input.installation.harnessPath === null
-        ? ["acp"]
+        ? [
+            "acp",
+            "--gemini-dir",
+            input.profile.geminiHome,
+            "--app-data-dir",
+            // The CLI joins this beneath gemini-dir, including when the value is absolute.
+            "antigravity-acp",
+          ]
         : input.profile.platform === "linux"
           ? ["--uid="]
           : [],
diff --git a/apps/server/src/provider/antigravityCliRelease.test.ts b/apps/server/src/provider/antigravityCliRelease.test.ts
new file mode 100644
index 000000000000..2e1e0010c22c
--- /dev/null
+++ b/apps/server/src/provider/antigravityCliRelease.test.ts
@@ -0,0 +1,51 @@
+import { describe, expect, it } from "@effect/vitest";
+import { antigravityCliTarget, parseAntigravityCliRelease } from "./antigravityCliRelease.ts";
+
+const manifest = {
+  version: "1.5.7",
+  url: "https://storage.googleapis.com/antigravity-public/antigravity-cli/1.5.7-123/darwin-arm/cli_mac_arm64.tar.gz",
+  sha512: "a".repeat(128),
+};
+
+describe("Antigravity CLI release manifests", () => {
+  it.each([
+    ["darwin", "arm64", false, "darwin_arm64", "darwin-arm/cli_mac_arm64.tar.gz"],
+    ["darwin", "x64", false, "darwin_amd64", "darwin-x64/cli_mac_x64.tar.gz"],
+    ["linux", "arm64", false, "linux_arm64", "linux-arm/cli_linux_arm64.tar.gz"],
+    ["linux", "x64", false, "linux_amd64", "linux-x64/cli_linux_x64.tar.gz"],
+    ["linux", "arm64", true, "linux_arm64_musl", "linux-arm-musl/cli_linux_arm64_musl.tar.gz"],
+    ["linux", "x64", true, "linux_amd64_musl", "linux-x64-musl/cli_linux_x64_musl.tar.gz"],
+    ["win32", "arm64", false, "windows_arm64", "windows-arm/cli_windows_arm64.exe"],
+    ["win32", "x64", false, "windows_amd64", "windows-x64/cli_windows_x64.exe"],
+  ] as const)("selects Google's %s-%s release (musl %s)", (platform, arch, musl, target, file) => {
+    expect(antigravityCliTarget(platform, arch, musl)).toBe(target);
+    expect(
+      parseAntigravityCliRelease(
+        {
+          ...manifest,
+          url: `https://storage.googleapis.com/antigravity-public/antigravity-cli/1.5.7-123/${file}`,
+        },
+        platform,
+        arch,
+        musl,
+      ),
+    ).toMatchObject({
+      version: "1.5.7",
+      format: platform === "win32" ? "executable" : "tar.gz",
+      executable: { name: platform === "win32" ? "agy.exe" : "antigravity" },
+    });
+  });
+
+  it.each([
+    { sha512: "invalid" },
+    { version: "1.4.5" },
+    { url: manifest.url.replace("https:", "http:") },
+    { url: manifest.url.replace("storage.googleapis.com", "storage.googleapis.com.evil.test") },
+    { url: manifest.url.replace("antigravity-public", "another-bucket") },
+    { url: manifest.url.replace("darwin-arm", "linux-arm") },
+    { url: `${manifest.url}?redirect=elsewhere` },
+    { url: manifest.url.replace("1.5.7-123", "1.5.6-123") },
+  ])("rejects invalid or mismatched release metadata: %j", (change) => {
+    expect(parseAntigravityCliRelease({ ...manifest, ...change }, "darwin", "arm64")).toBeNull();
+  });
+});
diff --git a/apps/server/src/provider/antigravityCliRelease.ts b/apps/server/src/provider/antigravityCliRelease.ts
new file mode 100644
index 000000000000..3e033beb37ac
--- /dev/null
+++ b/apps/server/src/provider/antigravityCliRelease.ts
@@ -0,0 +1,60 @@
+import * as Schema from "effect/Schema";
+import { compareSemverVersions } from "@t3tools/shared/semver";
+
+export const ANTIGRAVITY_CLI_MANIFEST_BASE =
+  "https://antigravity-cli-auto-updater-974169037036.us-central1.run.app/manifests";
+
+const Manifest = Schema.Struct({
+  version: Schema.String.check(Schema.isPattern(/^\d+\.\d+\.\d+$/u)),
+  url: Schema.String,
+  sha512: Schema.String.check(Schema.isPattern(/^[a-fA-F0-9]{128}$/u)),
+});
+const decodeManifest = Schema.decodeUnknownOption(Manifest);
+
+export interface AntigravityCliReleaseAsset {
+  readonly version: string;
+  readonly url: string;
+  readonly sha512: string;
+  readonly executable: { readonly name: string };
+  readonly format: "tar.gz" | "executable";
+}
+
+export function antigravityCliTarget(platform: NodeJS.Platform, arch: string, musl = false) {
+  if (!["darwin", "linux", "win32"].includes(platform) || !["x64", "arm64"].includes(arch)) {
+    return null;
+  }
+  const os = platform === "win32" ? "windows" : platform;
+  return `${os}_${arch === "x64" ? "amd64" : arch}${platform === "linux" && musl ? "_musl" : ""}`;
+}
+
+export function parseAntigravityCliRelease(
+  value: unknown,
+  platform: NodeJS.Platform,
+  arch: string,
+  musl = false,
+): AntigravityCliReleaseAsset | null {
+  const decoded = decodeManifest(value);
+  if (decoded._tag === "None" || antigravityCliTarget(platform, arch, musl) === null) return null;
+  const manifest = decoded.value;
+  if (compareSemverVersions(manifest.version, "1.5.0") < 0) return null;
+  const os = platform === "darwin" ? "mac" : platform === "win32" ? "windows" : "linux";
+  const cpu = arch === "x64" ? "x64" : "arm64";
+  const suffix = platform === "linux" && musl ? "_musl" : "";
+  const extension = platform === "win32" ? "exe" : "tar.gz";
+  const folder = `${platform === "win32" ? "windows" : platform}-${arch === "arm64" ? "arm" : "x64"}${suffix ? "-musl" : ""}`;
+  const prefix = `https://storage.googleapis.com/antigravity-public/antigravity-cli/${manifest.version}-`;
+  const rest = manifest.url.startsWith(prefix) ? manifest.url.slice(prefix.length) : "";
+  if (
+    !/^\d+\//u.test(rest) ||
+    rest.replace(/^\d+\//u, "") !== `${folder}/cli_${os}_${cpu}${suffix}.${extension}`
+  ) {
+    return null;
+  }
+  return {
+    version: manifest.version,
+    url: manifest.url,
+    sha512: manifest.sha512.toLowerCase(),
+    executable: { name: platform === "win32" ? "agy.exe" : "antigravity" },
+    format: platform === "win32" ? "executable" : "tar.gz",
+  };
+}
diff --git a/apps/server/src/provider/antigravityRelease.ts b/apps/server/src/provider/antigravityRelease.ts
index 255a92761994..54702d69935f 100644
--- a/apps/server/src/provider/antigravityRelease.ts
+++ b/apps/server/src/provider/antigravityRelease.ts
@@ -1,7 +1,3 @@
-// Hashes and sizes match the official ACP registry release. Like 1.4.2 through 1.4.4, it writes a
-// run-workflow skill into the workspace unless T3 disables the tool (antigravitySessionMeta).
-const ANTIGRAVITY_RELEASE_VERSION = "1.4.5";
-
 export interface AntigravityReleaseAsset {
   readonly version: string;
   readonly url: string;
@@ -16,79 +12,3 @@ export interface AntigravityReleaseAsset {
     readonly bytes: number;
   };
 }
-
-const releaseAssets = new Map<string, AntigravityReleaseAsset>([
-  [
-    "darwin-arm64",
-    {
-      version: ANTIGRAVITY_RELEASE_VERSION,
-      url: "https://dl.google.com/agy-extensions/releases/macos/agy-acp-server-1.4.5-darwin-arm64.zip",
-      sha256: "886fff7767d08994ca39eb02c3d01a7532c7325a94aa33aaf52d52068733284f",
-      archiveBytes: 97_923_855,
-      executable: { name: "agy_acp_server.par", bytes: 178_915_920 },
-      harness: { name: "localharness_external", bytes: 122_957_936 },
-    },
-  ],
-  [
-    "darwin-x64",
-    {
-      version: ANTIGRAVITY_RELEASE_VERSION,
-      url: "https://dl.google.com/agy-extensions/releases/macos/agy-acp-server-1.4.5-darwin-x86_64.zip",
-      sha256: "b39f3573c03b9acb9df028853f647527f1f3133f32bd77e78b796e48a205114a",
-      archiveBytes: 103_577_295,
-      executable: { name: "agy_acp_server.par", bytes: 183_127_600 },
-      harness: { name: "localharness_external", bytes: 127_612_208 },
-    },
-  ],
-  [
-    "linux-x64",
-    {
-      version: ANTIGRAVITY_RELEASE_VERSION,
-      url: "https://dl.google.com/agy-extensions/releases/linux/agy-acp-server-1.4.5-linux-x86_64.zip",
-      sha256: "923923a0d7dc8073f66cc6f78647a3107e3a7ee2b7e1a24df8b3927b5188013b",
-      archiveBytes: 321_783_181,
-      executable: { name: "agy_acp_server.par", bytes: 826_226_766 },
-      harness: { name: "localharness_external", bytes: 133_926_136 },
-    },
-  ],
-  [
-    "linux-arm64",
-    {
-      version: ANTIGRAVITY_RELEASE_VERSION,
-      url: "https://dl.google.com/agy-extensions/releases/linux/agy-acp-server-1.4.5-linux-arm64.zip",
-      sha256: "7d64246633ae094f67e3bbcd2d679e89048f91346d5339313336e7483f40f056",
-      archiveBytes: 307_829_008,
-      executable: { name: "agy_acp_server.par", bytes: 831_194_025 },
-      harness: { name: "localharness_external", bytes: 127_512_832 },
-    },
-  ],
-  [
-    "win32-x64",
-    {
-      version: ANTIGRAVITY_RELEASE_VERSION,
-      url: "https://dl.google.com/agy-extensions/releases/windows/agy-acp-server-1.4.5-windows-x86_64.zip",
-      sha256: "d24f4c73c9f96d4f44384e281c855a56c72d8eaa9c5b0fad7ccb1635c6b63f50",
-      archiveBytes: 100_423_655,
-      executable: { name: "agy_acp_server.exe", bytes: 55_839_864 },
-      harness: { name: "localharness_external.exe", bytes: 147_843_736 },
-    },
-  ],
-  [
-    "win32-arm64",
-    {
-      version: ANTIGRAVITY_RELEASE_VERSION,
-      url: "https://dl.google.com/agy-extensions/releases/windows/agy-acp-server-1.4.5-windows-arm64.zip",
-      sha256: "ab0a9aac8349e08ef289be6d16da8f89e3abe60eba5158032ef78c4a1220261c",
-      archiveBytes: 102_703_121,
-      executable: { name: "agy_acp_server.exe", bytes: 62_293_488 },
-      harness: { name: "localharness_external.exe", bytes: 139_322_008 },
-    },
-  ],
-]);
-
-export function resolveAntigravityReleaseAsset(
-  platform: NodeJS.Platform,
-  arch: string,
-): AntigravityReleaseAsset | null {
-  return releaseAssets.get(`${platform}-${arch}`) ?? null;
-}
diff --git a/apps/server/src/provider/managedRelease.ts b/apps/server/src/provider/managedRelease.ts
new file mode 100644
index 000000000000..ca7c55e43b59
--- /dev/null
+++ b/apps/server/src/provider/managedRelease.ts
@@ -0,0 +1,29 @@
+import { compareSemverVersions, parseSemver } from "@t3tools/shared/semver";
+
+// Older pins recorded non-semver versions such as `agy_acp_server_1.1.1`; any
+// other release is an update from those.
+const isNewer = (candidate: string, current: string) =>
+  parseSemver(candidate) && parseSemver(current)
+    ? compareSemverVersions(candidate, current) > 0
+    : candidate !== current;
+
+/**
+ * Picks the release a managed installation's `start` downloads. A fresh install
+ * gets T3 Code's pinned release; an existing one moves to the newest known
+ * release above it. Null means nothing newer is known, so `start` re-checks the
+ * installed runtime instead of downgrading it.
+ */
+export function selectManagedRelease<Release extends { readonly version: string }>(
+  installedVersion: string | null,
+  pinned: Release | null,
+  upstream: Release | null,
+): Release | null {
+  if (installedVersion === null) return pinned;
+  let selected: Release | null = null;
+  for (const candidate of [pinned, upstream]) {
+    if (candidate && isNewer(candidate.version, selected?.version ?? installedVersion)) {
+      selected = candidate;
+    }
+  }
+  return selected;
+}
diff --git a/apps/server/src/provider/model-manifest.json b/apps/server/src/provider/model-manifest.json
index 678ad71161c3..4906358bab70 100644
--- a/apps/server/src/provider/model-manifest.json
+++ b/apps/server/src/provider/model-manifest.json
@@ -1,6 +1,6 @@
 {
   "version": 1,
-  "updatedAt": "2026-11-10T17:25:47Z",
+  "updatedAt": "2026-11-12T18:25:36Z",
   "compatibility": [
     {
       "driver": "codex",
@@ -75,8 +75,9 @@
     {
       "driver": "antigravity",
       "t3CodeRange": ">=0.0.42",
-      "recommendedRange": "=1.4.5 || =1.4.1",
+      "recommendedRange": ">=1.5.1 <2",
       "ranges": [
+        { "range": ">=1.5.1 <2", "status": "supported" },
         { "range": "=1.4.5", "status": "supported" },
         { "range": "=1.4.1", "status": "supported" },
         { "range": "=1.3.0", "status": "supported" },
diff --git a/apps/server/src/provider/providerCompatibility.test.ts b/apps/server/src/provider/providerCompatibility.test.ts
index 780c2d789731..ed722b7c5351 100644
--- a/apps/server/src/provider/providerCompatibility.test.ts
+++ b/apps/server/src/provider/providerCompatibility.test.ts
@@ -22,7 +22,6 @@ import {
   ProviderCompatibilityPolicy,
   resolveProviderCompatibility,
 } from "./providerCompatibility.ts";
-import { resolveAntigravityReleaseAsset } from "./antigravityRelease.ts";
 import bundledManifest from "./model-manifest.json" with { type: "json" };
 
 const decodeCompatibilityPolicies = Schema.decodeUnknownSync(
@@ -133,19 +132,15 @@ describe("provider compatibility", () => {
     }
   });
 
-  it.each([
-    ["darwin", "arm64"],
-    ["win32", "x64"],
-  ] as const)(
-    "supports the managed Antigravity runtime for %s-%s in the bundled manifest",
-    (platform, arch) => {
+  it.each(["1.4.5", "1.5.7"])(
+    "supports the legacy and native Antigravity runtime %s in the bundled manifest",
+    (version) => {
       const policies = decodeCompatibilityPolicies(bundledManifest.compatibility);
-      const release = resolveAntigravityReleaseAsset(platform, arch);
       assert.strictEqual(
         resolveProviderCompatibility(
           policies,
           ProviderDriverKind.make("antigravity"),
-          `agy_acp_server_${release?.version}`,
+          `agy_acp_server_${version}`,
         )?.status,
         "supported",
       );
@@ -330,5 +325,5 @@ it.effect("a remote policy refresh preserves a newer health result on the regist
         ),
       ),
     );
-  }).pipe(Effect.scoped),
+  }),
 );
diff --git a/apps/server/src/provider/providerInstallation.test.ts b/apps/server/src/provider/providerInstallation.test.ts
index 8a3d3316ac32..d4c7467c62d0 100644
--- a/apps/server/src/provider/providerInstallation.test.ts
+++ b/apps/server/src/provider/providerInstallation.test.ts
@@ -95,6 +95,7 @@ const makeHarness = Effect.fn("providerInstallation.test.makeHarness")(function*
         }),
       state: Effect.succeed({ ...state, driver: ProviderDriverKind.make("codex") }),
       changes: Stream.succeed({ ...state, driver: ProviderDriverKind.make("codex") }),
+      checkForUpdate: Effect.void,
       remove: (paths) =>
         Effect.sync(() => {
           protectedPaths = paths ?? [];
@@ -103,6 +104,7 @@ const makeHarness = Effect.fn("providerInstallation.test.makeHarness")(function*
     }),
     Layer.mock(AntigravityInstallation.AntigravityInstallation)({
       managedDirectory: "/unused-managed-runtime",
+      checkForUpdate: Effect.void,
       start: Effect.sync(() => {
         calls.push("start");
         return { ...state, operationId: "install-1", phase: "downloading" as const };
diff --git a/apps/server/src/provider/providerInstallation.ts b/apps/server/src/provider/providerInstallation.ts
index 7a628dfa5b31..e5e864517ba6 100644
--- a/apps/server/src/provider/providerInstallation.ts
+++ b/apps/server/src/provider/providerInstallation.ts
@@ -186,9 +186,21 @@ const make = Effect.fn("makeProviderInstallation")(function* () {
       .pipe(Effect.mapError(failure(input.instanceId)));
   });
 
+  // Watching an installation is when its owner can act on an update, so the
+  // lookup runs then, in the background, unless update checks are off.
   const subscribe = (input: ProviderSetupInput) =>
     Stream.unwrap(
       requireInstance(input.instanceId, "observe-install").pipe(
+        Effect.tap(({ installation }) =>
+          settings.getSettings.pipe(
+            Effect.flatMap((current) =>
+              current.enableProviderUpdateChecks
+                ? Effect.forkDetach(installation.checkForUpdate)
+                : Effect.void,
+            ),
+            Effect.ignore,
+          ),
+        ),
         Effect.map(({ installation }) => installation.changes),
       ),
     );
diff --git a/apps/server/src/provider/providerMaintenanceRunner.test.ts b/apps/server/src/provider/providerMaintenanceRunner.test.ts
index 32bf49d5861a..985347a66e96 100644
--- a/apps/server/src/provider/providerMaintenanceRunner.test.ts
+++ b/apps/server/src/provider/providerMaintenanceRunner.test.ts
@@ -207,6 +207,7 @@ function makeRegistry(
       refresh: () => Ref.get(providersRef),
       refreshInstance: () => Ref.get(providersRef),
       reloadSecretsAndRefresh: () => Ref.get(providersRef),
+      applySecretAndRefresh: () => Ref.get(providersRef),
       refreshAfterUpdate: () => {
         const version = options?.installedVersionAfterUpdate;
         if (version === undefined) {
diff --git a/apps/server/src/provider/providerMaintenanceRunner.ts b/apps/server/src/provider/providerMaintenanceRunner.ts
index 80248acea577..9ac62dca7041 100644
--- a/apps/server/src/provider/providerMaintenanceRunner.ts
+++ b/apps/server/src/provider/providerMaintenanceRunner.ts
@@ -450,6 +450,7 @@ export const make = Effect.fn("ProviderMaintenanceRunner.make")(function* () {
         instanceId,
         action: "update",
         state,
+        targetVersion,
       });
     const setQueuedState = setUpdateState(
       makeUpdateState({
diff --git a/apps/server/src/provider/testUtils/providerRegistryMock.ts b/apps/server/src/provider/testUtils/providerRegistryMock.ts
index 3ae8079414a9..ccf4979937b3 100644
--- a/apps/server/src/provider/testUtils/providerRegistryMock.ts
+++ b/apps/server/src/provider/testUtils/providerRegistryMock.ts
@@ -12,6 +12,7 @@ const makeProviderRegistryMock = (
   refresh: () => Effect.succeed(providers),
   refreshInstance: () => Effect.succeed(providers),
   reloadSecretsAndRefresh: () => Effect.succeed(providers),
+  applySecretAndRefresh: () => Effect.succeed(providers),
   refreshAfterUpdate: () => Effect.succeed(providers),
   refreshWorkspaceSnapshot: () => Effect.succeed(providers),
   invalidateModelCaches: () => Effect.void,
diff --git a/apps/server/src/provider/userInputAttachments.test.ts b/apps/server/src/provider/userInputAttachments.test.ts
index aacc345b3cfe..056f2b7bd97f 100644
--- a/apps/server/src/provider/userInputAttachments.test.ts
+++ b/apps/server/src/provider/userInputAttachments.test.ts
@@ -7,6 +7,7 @@ import { describe, expect, it } from "@effect/vitest";
 import * as Effect from "effect/Effect";
 import * as Deferred from "effect/Deferred";
 import * as Fiber from "effect/Fiber";
+import * as Queue from "effect/Queue";
 import * as FileSystem from "effect/FileSystem";
 import * as Layer from "effect/Layer";
 import * as TestClock from "effect/testing/TestClock";
@@ -88,6 +89,114 @@ describe("question answer paths", () => {
       }).pipe(Effect.provide(layer)),
   );
 
+  it.effect.each(["interrupted", "failed"])(
+    "extracts two documents at once and frees a slot when one is %s",
+    (outcome) =>
+      Effect.gen(function* () {
+        const config = yield* ServerConfig.ServerConfig;
+        const fs = yield* FileSystem.FileSystem;
+        const [first, second, third] = ["first", "second", "third"].map((name) =>
+          NodePath.join(config.attachmentsDir, `${name}.rtf`),
+        );
+        NodeFS.writeFileSync(first!, String.raw`{\rtf1 First}`);
+        NodeFS.writeFileSync(second!, "invalid document");
+        NodeFS.writeFileSync(third!, String.raw`{\rtf1 Third}`);
+        const started = yield* Queue.unbounded<string>();
+        const releases = new Map<string, Deferred.Deferred<void>>();
+        for (const path of [first!, second!, third!])
+          releases.set(path, yield* Deferred.make<void>());
+        yield* Effect.gen(function* () {
+          const documents = yield* DocumentText.DocumentText;
+          const leaving = yield* documents.ensure(first!).pipe(Effect.forkChild);
+          const staying = yield* documents.ensure(first!).pipe(Effect.forkChild);
+          const freed = yield* documents.ensure(second!).pipe(Effect.forkChild);
+          expect(new Set([yield* Queue.take(started), yield* Queue.take(started)])).toEqual(
+            new Set([first, second]),
+          );
+          const waiting = yield* documents.ensure(third!).pipe(Effect.forkChild);
+          yield* Fiber.interrupt(leaving);
+          if (outcome === "interrupted") yield* Fiber.interrupt(freed);
+          else {
+            yield* Deferred.succeed(releases.get(second!)!, undefined);
+            expect(yield* Fiber.join(freed)).toBeUndefined();
+          }
+          expect(yield* Queue.take(started)).toBe(third);
+          yield* Deferred.succeed(releases.get(first!)!, undefined);
+          yield* Deferred.succeed(releases.get(third!)!, undefined);
+          expect(yield* Fiber.join(staying)).toBe(first + ".txt");
+          expect(yield* Fiber.join(waiting)).toBe(third + ".txt");
+          expect(yield* Queue.size(started)).toBe(0);
+          expect(NodeFS.existsSync(second + ".txt")).toBe(false);
+          expect(
+            NodeFS.readdirSync(config.attachmentsDir).filter((file) => file.endsWith(".part")),
+          ).toEqual([]);
+        }).pipe(
+          Effect.provide(Layer.fresh(DocumentText.layer)),
+          Effect.provideService(FileSystem.FileSystem, {
+            ...fs,
+            stat: (file) =>
+              Effect.gen(function* () {
+                yield* Queue.offer(started, file);
+                yield* Deferred.await(releases.get(file)!);
+                return yield* fs.stat(file);
+              }),
+          }),
+        );
+      }).pipe(Effect.provide(layer)),
+  );
+
+  it.effect("retries a document while its cancelled extraction is still publishing", () =>
+    Effect.gen(function* () {
+      const config = yield* ServerConfig.ServerConfig;
+      const fs = yield* FileSystem.FileSystem;
+      const path = NodePath.join(config.attachmentsDir, "retried.rtf");
+      NodeFS.writeFileSync(path, String.raw`{\rtf1 Retried}`);
+      const writing = yield* Deferred.make<void>();
+      const writeReleased = yield* Deferred.make<void>();
+      const renaming = yield* Deferred.make<void>();
+      const renameReleased = yield* Deferred.make<void>();
+      let writes = 0;
+      let renames = 0;
+      yield* Effect.gen(function* () {
+        const documents = yield* DocumentText.DocumentText;
+        const cancelled = yield* documents.ensure(path).pipe(Effect.forkChild);
+        yield* Deferred.await(writing);
+        const interrupting = yield* Fiber.interrupt(cancelled).pipe(Effect.forkChild);
+        const retry = yield* documents.ensure(path).pipe(Effect.forkChild);
+        yield* Deferred.await(renaming);
+        yield* Deferred.succeed(writeReleased, undefined);
+        yield* Fiber.join(interrupting);
+        yield* Deferred.succeed(renameReleased, undefined);
+        expect(yield* Fiber.join(retry)).toBe(path + ".txt");
+        expect(NodeFS.readFileSync(path + ".txt", "utf8")).toBe("Retried");
+        expect(
+          NodeFS.readdirSync(config.attachmentsDir).filter((file) => file.endsWith(".part")),
+        ).toEqual([]);
+      }).pipe(
+        Effect.provide(Layer.fresh(DocumentText.layer)),
+        Effect.provideService(FileSystem.FileSystem, {
+          ...fs,
+          writeFileString: (file, data) =>
+            Effect.gen(function* () {
+              if (++writes === 1) {
+                yield* Deferred.succeed(writing, undefined);
+                yield* Deferred.await(writeReleased);
+              }
+              return yield* fs.writeFileString(file, data);
+            }),
+          rename: (from, to) =>
+            Effect.gen(function* () {
+              if (++renames === 1) {
+                yield* Deferred.succeed(renaming, undefined);
+                yield* Deferred.await(renameReleased);
+              }
+              return yield* fs.rename(from, to);
+            }),
+        }),
+      );
+    }).pipe(Effect.provide(layer)),
+  );
+
   it.effect.each(["spawn", "read"])("retries after a transient %s failure expires", (failure) =>
     Effect.acquireUseRelease(
       Effect.promise(async () => {
diff --git a/apps/server/src/pullRequest/PullRequestReadCache.test.ts b/apps/server/src/pullRequest/PullRequestReadCache.test.ts
index 071f1d4978a7..99b3cdba22ff 100644
--- a/apps/server/src/pullRequest/PullRequestReadCache.test.ts
+++ b/apps/server/src/pullRequest/PullRequestReadCache.test.ts
@@ -1,5 +1,4 @@
 import * as NodeV8 from "node:v8";
-import * as NodeVM from "node:vm";
 import { assert, it } from "@effect/vitest";
 import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
 import * as NodeServices from "@effect/platform-node/NodeServices";
@@ -16,9 +15,6 @@ import * as KeyValueStore from "effect/persistence/KeyValueStore";
 import * as TestClock from "effect/testing/TestClock";
 import * as PullRequestReadCache from "./PullRequestReadCache.ts";
 
-NodeV8.setFlagsFromString("--expose-gc");
-const collectGarbage = NodeVM.runInNewContext("gc") as () => void;
-
 const cacheLayer = (directory: string) =>
   PullRequestReadCache.make.pipe(Effect.provide(KeyValueStore.layerFileSystem(directory)));
 
@@ -203,13 +199,10 @@ it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))("PR filesystem ca
   it.effect("does not keep a caller's data alive after its reads and invalidations", () =>
     Effect.gen(function* () {
       const cache = yield* PullRequestReadCache.make;
-      const sweeps: Array<WeakRef<object>> = [];
+      class SweepData extends Map<string, number> {}
       // Like a sync sweep: an Effect.fn made per run that closes over that run's data.
       const sweep = Effect.fn("sweep")(function* (index: number) {
-        const groups = new Map<string, number>(
-          Array.from({ length: 1_000 }, (_, id) => [`group-${id}`, id]),
-        );
-        sweeps.push(new WeakRef(groups));
+        const groups = new SweepData(Array.from({ length: 1_000 }, (_, id) => [`group-${id}`, id]));
         const read = Effect.fn("read")(function* (pr: string) {
           const size = groups.size;
           yield* cache.invalidate(pr);
@@ -219,10 +212,8 @@ it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))("PR filesystem ca
         yield* Effect.forEach(["pr-1", "pr-2"], read, { discard: true });
       });
       for (let index = 0; index < 5; index++) yield* sweep(index);
-      // WeakRef targets stay alive until the current job ends, so yield before collecting.
-      yield* Effect.yieldNow;
-      collectGarbage();
-      assert.strictEqual(sweeps.filter((sweepData) => sweepData.deref() !== undefined).length, 0);
+      // Counts after a full GC. A WeakRef would keep its target alive until the job ends.
+      assert.strictEqual(NodeV8.queryObjects(SweepData, { format: "count" }), 0);
     }).pipe(Effect.provide(KeyValueStore.layerMemory)),
   );
 
diff --git a/apps/server/src/pullRequest/PullRequestReviewGuideService.test.ts b/apps/server/src/pullRequest/PullRequestReviewGuideService.test.ts
index 3ee929f923a5..200ea36b7d64 100644
--- a/apps/server/src/pullRequest/PullRequestReviewGuideService.test.ts
+++ b/apps/server/src/pullRequest/PullRequestReviewGuideService.test.ts
@@ -390,208 +390,198 @@ it.layer(layerBase, { excludeTestServices: true })("PullRequestReviewGuideServic
       expected: ["local objects:", "the commit:", "branch feature:", "refs/pull/7/head:"],
     },
   ])("refuses to write a guide for $name", ({ reportedHead, shadow, expected }) =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const run = yield* startSingleBranchRun({
-          repositoryName: "refused-head",
-          reportedHead,
-          refuseCommitFetch: false,
-          prepare: (repositories, workspace) =>
-            git(workspace, ["fetch", "--quiet", "origin", "feature"]).pipe(
-              Effect.andThen(
-                shadow === "none"
-                  ? Effect.void
-                  : git(workspace, [shadow, repositories.headSha.slice(0, 12), "HEAD"]),
-              ),
-              Effect.asVoid,
+    Effect.gen(function* () {
+      const run = yield* startSingleBranchRun({
+        repositoryName: "refused-head",
+        reportedHead,
+        refuseCommitFetch: false,
+        prepare: (repositories, workspace) =>
+          git(workspace, ["fetch", "--quiet", "origin", "feature"]).pipe(
+            Effect.andThen(
+              shadow === "none"
+                ? Effect.void
+                : git(workspace, [shadow, repositories.headSha.slice(0, 12), "HEAD"]),
             ),
-        });
-        const result = yield* run.settled;
-        assert.isFalse(yield* Deferred.isDone(run.stored), "a guide was written");
-        assert.strictEqual(result.run?._tag, "Failed");
-        const detail = result.run?._tag === "Failed" ? result.run.detail : "";
-        for (const part of expected) assert.include(detail, part);
-        // Only the host's own head ref is tried.
-        assert.notInclude(detail, "refs/merge-requests/");
-        assert.deepStrictEqual(run.observed, []);
-        assert.isFalse(run.fetchedRefs.some((ref) => ref.startsWith("-")));
-        const fs = yield* FileSystem.FileSystem;
-        assert.isFalse(yield* fs.exists(`${run.repositories.root}/injected`));
-      }),
-    ),
+            Effect.asVoid,
+          ),
+      });
+      const result = yield* run.settled;
+      assert.isFalse(yield* Deferred.isDone(run.stored), "a guide was written");
+      assert.strictEqual(result.run?._tag, "Failed");
+      const detail = result.run?._tag === "Failed" ? result.run.detail : "";
+      for (const part of expected) assert.include(detail, part);
+      // Only the host's own head ref is tried.
+      assert.notInclude(detail, "refs/merge-requests/");
+      assert.deepStrictEqual(run.observed, []);
+      assert.isFalse(run.fetchedRefs.some((ref) => ref.startsWith("-")));
+      const fs = yield* FileSystem.FileSystem;
+      assert.isFalse(yield* fs.exists(`${run.repositories.root}/injected`));
+    }),
   );
 
   it.effect("measures only the PR change using the renamed verified remote's fetch URL", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const repositories = yield* makeRepositories;
-        const fork = `${repositories.root}/fork`;
-        yield* git(repositories.root, ["clone", "--quiet", repositories.remote, fork]);
-        yield* git(fork, ["branch", "stack-base", "main~1"]);
-        // The cached identity still names origin, which now belongs to the stale fork.
-        yield* git(repositories.workspace, ["remote", "rename", "origin", "upstream"]);
-        yield* git(repositories.workspace, ["remote", "add", "origin", fork]);
-        yield* git(repositories.workspace, [
-          "config",
-          `url.${repositories.remote}.insteadOf`,
-          "review-upstream:",
-        ]);
-        yield* git(repositories.workspace, ["remote", "set-url", "upstream", "review-upstream:"]);
-        const changed = yield* Deferred.make<string>();
-        const driver = yield* GitVcsDriver.GitVcsDriver;
-        const stored = yield* Deferred.make<void>();
-        const context = yield* Layer.build(
-          makeLayer({
-            ...repositories,
-            stored,
-            generate: (input) =>
-              git(input.cwd, ["diff", "--name-only", `${input.baseCommit}...HEAD`]).pipe(
-                Effect.provideService(GitVcsDriver.GitVcsDriver, driver),
-                Effect.orDie,
-                Effect.flatMap((names) => Deferred.succeed(changed, names)),
-                Effect.as({ stops: [] }),
-              ),
-          }),
-        );
-        const service = Context.get(
-          context,
-          PullRequestReviewGuideService.PullRequestReviewGuideService,
-        );
-        yield* service.generate(reference);
-        assert.strictEqual(yield* Deferred.await(changed), "feature.txt");
-        yield* Deferred.await(stored);
-        const result = yield* service.get(reference);
-        assert.strictEqual(result.guide?.headSha, repositories.headSha);
-        assert.deepStrictEqual(result.guide?.stops[0]?.files, [{ path: "feature.txt" }]);
-      }),
-    ),
+    Effect.gen(function* () {
+      const repositories = yield* makeRepositories;
+      const fork = `${repositories.root}/fork`;
+      yield* git(repositories.root, ["clone", "--quiet", repositories.remote, fork]);
+      yield* git(fork, ["branch", "stack-base", "main~1"]);
+      // The cached identity still names origin, which now belongs to the stale fork.
+      yield* git(repositories.workspace, ["remote", "rename", "origin", "upstream"]);
+      yield* git(repositories.workspace, ["remote", "add", "origin", fork]);
+      yield* git(repositories.workspace, [
+        "config",
+        `url.${repositories.remote}.insteadOf`,
+        "review-upstream:",
+      ]);
+      yield* git(repositories.workspace, ["remote", "set-url", "upstream", "review-upstream:"]);
+      const changed = yield* Deferred.make<string>();
+      const driver = yield* GitVcsDriver.GitVcsDriver;
+      const stored = yield* Deferred.make<void>();
+      const context = yield* Layer.build(
+        makeLayer({
+          ...repositories,
+          stored,
+          generate: (input) =>
+            git(input.cwd, ["diff", "--name-only", `${input.baseCommit}...HEAD`]).pipe(
+              Effect.provideService(GitVcsDriver.GitVcsDriver, driver),
+              Effect.orDie,
+              Effect.flatMap((names) => Deferred.succeed(changed, names)),
+              Effect.as({ stops: [] }),
+            ),
+        }),
+      );
+      const service = Context.get(
+        context,
+        PullRequestReviewGuideService.PullRequestReviewGuideService,
+      );
+      yield* service.generate(reference);
+      assert.strictEqual(yield* Deferred.await(changed), "feature.txt");
+      yield* Deferred.await(stored);
+      const result = yield* service.get(reference);
+      assert.strictEqual(result.guide?.headSha, repositories.headSha);
+      assert.deepStrictEqual(result.guide?.stops[0]?.files, [{ path: "feature.txt" }]);
+    }),
   );
 
   it.effect("keeps excerpts despite the checkout's diff driver and a failing hook", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const repositories = yield* makeRepositories;
-        const fs = yield* FileSystem.FileSystem;
-        yield* fs.writeFileString(
-          `${repositories.workspace}/.git/info/attributes`,
-          "feature.txt diff=blank\n",
-        );
-        yield* git(repositories.workspace, ["config", "diff.blank.textconv", "true"]);
-        const hook = `${repositories.workspace}/.git/hooks/post-checkout`;
-        yield* fs.writeFileString(hook, "#!/bin/sh\nexit 1\n");
-        yield* fs.chmod(hook, 0o755);
-        const stored = yield* Deferred.make<void>();
-        const context = yield* Layer.build(
-          makeLayer({
-            ...repositories,
-            stored,
-            generate: () =>
-              Effect.succeed({
-                stops: [
-                  {
-                    title: "The feature",
-                    summary: "The change.",
-                    attention: null,
-                    excerpts: [{ path: "feature.txt", side: "new", start: 1, end: 3, caption: "" }],
-                    files: [],
-                    notes: [],
-                    questions: [],
-                  },
-                ],
-              }),
-          }),
-        );
-        const service = Context.get(
-          context,
-          PullRequestReviewGuideService.PullRequestReviewGuideService,
-        );
-        const runs = yield* watchRuns;
-        yield* runs.generate(service, reference);
-        const result = yield* runs.settled(service, reference);
-        assert.notStrictEqual(result.run?._tag, "Failed", JSON.stringify(result.run));
-        assert.deepStrictEqual(result.guide?.stops[0]?.excerpts, [
-          { path: "feature.txt", side: "new", start: 1, end: 3, caption: "" },
-        ]);
-      }),
-    ),
+    Effect.gen(function* () {
+      const repositories = yield* makeRepositories;
+      const fs = yield* FileSystem.FileSystem;
+      yield* fs.writeFileString(
+        `${repositories.workspace}/.git/info/attributes`,
+        "feature.txt diff=blank\n",
+      );
+      yield* git(repositories.workspace, ["config", "diff.blank.textconv", "true"]);
+      const hook = `${repositories.workspace}/.git/hooks/post-checkout`;
+      yield* fs.writeFileString(hook, "#!/bin/sh\nexit 1\n");
+      yield* fs.chmod(hook, 0o755);
+      const stored = yield* Deferred.make<void>();
+      const context = yield* Layer.build(
+        makeLayer({
+          ...repositories,
+          stored,
+          generate: () =>
+            Effect.succeed({
+              stops: [
+                {
+                  title: "The feature",
+                  summary: "The change.",
+                  attention: null,
+                  excerpts: [{ path: "feature.txt", side: "new", start: 1, end: 3, caption: "" }],
+                  files: [],
+                  notes: [],
+                  questions: [],
+                },
+              ],
+            }),
+        }),
+      );
+      const service = Context.get(
+        context,
+        PullRequestReviewGuideService.PullRequestReviewGuideService,
+      );
+      const runs = yield* watchRuns;
+      yield* runs.generate(service, reference);
+      const result = yield* runs.settled(service, reference);
+      assert.notStrictEqual(result.run?._tag, "Failed", JSON.stringify(result.run));
+      assert.deepStrictEqual(result.guide?.stops[0]?.excerpts, [
+        { path: "feature.txt", side: "new", start: 1, end: 3, caption: "" },
+      ]);
+    }),
   );
 
   it.effect("refuses generation when the verified remote disappeared despite a usable origin", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const repositories = yield* makeRepositories;
-        const fork = `${repositories.root}/fork`;
-        yield* git(repositories.root, ["clone", "--quiet", repositories.remote, fork]);
-        yield* git(fork, ["branch", "stack-base", repositories.lowerSha]);
-        yield* git(repositories.workspace, ["remote", "set-url", "origin", fork]);
-        const started = yield* Deferred.make<Fiber.Fiber<unknown, unknown>>();
-        const stored = yield* Deferred.make<void>();
-        const generated = yield* Ref.make(false);
-        const driver = yield* GitVcsDriver.GitVcsDriver;
-        const context = yield* Layer.build(
-          makeLayer({
-            ...repositories,
-            stored,
-            generate: () => Ref.set(generated, true).pipe(Effect.as({ stops: [] })),
-          }).pipe(
-            Layer.provide(
-              Layer.succeed(GitVcsDriver.GitVcsDriver, {
-                ...driver,
-                execute: (call) =>
-                  Effect.withFiber((fiber) =>
-                    Deferred.succeed(started, fiber).pipe(Effect.andThen(driver.execute(call))),
-                  ),
-              }),
-            ),
+    Effect.gen(function* () {
+      const repositories = yield* makeRepositories;
+      const fork = `${repositories.root}/fork`;
+      yield* git(repositories.root, ["clone", "--quiet", repositories.remote, fork]);
+      yield* git(fork, ["branch", "stack-base", repositories.lowerSha]);
+      yield* git(repositories.workspace, ["remote", "set-url", "origin", fork]);
+      const started = yield* Deferred.make<Fiber.Fiber<unknown, unknown>>();
+      const stored = yield* Deferred.make<void>();
+      const generated = yield* Ref.make(false);
+      const driver = yield* GitVcsDriver.GitVcsDriver;
+      const context = yield* Layer.build(
+        makeLayer({
+          ...repositories,
+          stored,
+          generate: () => Ref.set(generated, true).pipe(Effect.as({ stops: [] })),
+        }).pipe(
+          Layer.provide(
+            Layer.succeed(GitVcsDriver.GitVcsDriver, {
+              ...driver,
+              execute: (call) =>
+                Effect.withFiber((fiber) =>
+                  Deferred.succeed(started, fiber).pipe(Effect.andThen(driver.execute(call))),
+                ),
+            }),
           ),
-        );
-        const service = Context.get(
-          context,
-          PullRequestReviewGuideService.PullRequestReviewGuideService,
-        );
-        const before = yield* service.get(reference);
-        yield* service.generate(reference);
-        // Join the background run so its failure is visible without polling service state.
-        yield* Fiber.await(yield* Deferred.await(started));
-        const result = yield* service.get(reference);
-        assert.strictEqual(result.run?._tag, "Failed");
-        assert.include(
-          result.run?._tag === "Failed" ? result.run.detail : "",
-          "no longer has a remote for the pull request's repository",
-        );
-        assert.deepStrictEqual(result.guide, before.guide);
-        assert.isFalse(yield* Deferred.isDone(stored));
-        assert.isFalse(yield* Ref.get(generated));
-      }),
-    ),
+        ),
+      );
+      const service = Context.get(
+        context,
+        PullRequestReviewGuideService.PullRequestReviewGuideService,
+      );
+      const before = yield* service.get(reference);
+      yield* service.generate(reference);
+      // Join the background run so its failure is visible without polling service state.
+      yield* Fiber.await(yield* Deferred.await(started));
+      const result = yield* service.get(reference);
+      assert.strictEqual(result.run?._tag, "Failed");
+      assert.include(
+        result.run?._tag === "Failed" ? result.run.detail : "",
+        "no longer has a remote for the pull request's repository",
+      );
+      assert.deepStrictEqual(result.guide, before.guide);
+      assert.isFalse(yield* Deferred.isDone(stored));
+      assert.isFalse(yield* Ref.get(generated));
+    }),
   );
 
   it.effect("refuses a pull request from a repository the project is not a checkout of", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const repositories = yield* makeRepositories;
-        const stored = yield* Deferred.make<void>();
-        const context = yield* Layer.build(
-          makeLayer({
-            ...repositories,
-            stored,
-            identity: {
-              ...ACME_APP,
-              canonicalKey: "github.com/acme/other",
-              displayName: "acme/other",
-              name: "other",
-            },
-            generate: () =>
-              Effect.die("a guide must not be written from another repository's checkout"),
-          }),
-        );
-        const service = Context.get(
-          context,
-          PullRequestReviewGuideService.PullRequestReviewGuideService,
-        );
-        const result = yield* Effect.flip(service.generate(reference));
-        assert.include(result.message, "in another repository");
-      }),
-    ),
+    Effect.gen(function* () {
+      const repositories = yield* makeRepositories;
+      const stored = yield* Deferred.make<void>();
+      const context = yield* Layer.build(
+        makeLayer({
+          ...repositories,
+          stored,
+          identity: {
+            ...ACME_APP,
+            canonicalKey: "github.com/acme/other",
+            displayName: "acme/other",
+            name: "other",
+          },
+          generate: () =>
+            Effect.die("a guide must not be written from another repository's checkout"),
+        }),
+      );
+      const service = Context.get(
+        context,
+        PullRequestReviewGuideService.PullRequestReviewGuideService,
+      );
+      const result = yield* Effect.flip(service.generate(reference));
+      assert.include(result.message, "in another repository");
+    }),
   );
 });
diff --git a/apps/server/src/pullRequest/PullRequestService.test.ts b/apps/server/src/pullRequest/PullRequestService.test.ts
index 88bcd219af1f..773d0c6b6ade 100644
--- a/apps/server/src/pullRequest/PullRequestService.test.ts
+++ b/apps/server/src/pullRequest/PullRequestService.test.ts
@@ -1429,174 +1429,160 @@ it.effect(
 );
 
 it.effect("publishes a merge for immediate settlement only after host confirmation", () =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      const mergedAt = "2026-09-03T02:00:00.000Z";
-      let state: "open" | "merged" = "open";
-      let confirmationFails = false;
-      const reference = { projectId: "p1" as ProjectId, repository: "acme/web", number: 1 };
-      const service = yield* makeService({
-        projects: [
-          project({ id: "p1", title: "web", workspaceRoot: "/a", repository: "acme/web" }),
-        ],
-        providers: [
-          fakePullRequestProvider(SourceControlProviderKind.make("github"), {
-            getChangeRequestSummary: () =>
-              confirmationFails
-                ? Effect.fail(
-                    new PullRequestProviderError({
-                      provider: SourceControlProviderKind.make("github"),
-                      operation: "getChangeRequestSummary",
-                      reason: "failed",
-                      detail: "HTTP 504",
-                    }),
-                  )
-                : Effect.succeed({ ...changeRequest(1, mergedAt), state, mergedAt }),
-          }),
-        ],
-      });
-      const merges = yield* service.subscribeMerges;
-      const observedMerge = yield* Stream.runHead(merges).pipe(
-        Effect.forkChild({ startImmediately: true }),
-      );
+  Effect.gen(function* () {
+    const mergedAt = "2026-09-03T02:00:00.000Z";
+    let state: "open" | "merged" = "open";
+    let confirmationFails = false;
+    const reference = { projectId: "p1" as ProjectId, repository: "acme/web", number: 1 };
+    const service = yield* makeService({
+      projects: [project({ id: "p1", title: "web", workspaceRoot: "/a", repository: "acme/web" })],
+      providers: [
+        fakePullRequestProvider(SourceControlProviderKind.make("github"), {
+          getChangeRequestSummary: () =>
+            confirmationFails
+              ? Effect.fail(
+                  new PullRequestProviderError({
+                    provider: SourceControlProviderKind.make("github"),
+                    operation: "getChangeRequestSummary",
+                    reason: "failed",
+                    detail: "HTTP 504",
+                  }),
+                )
+              : Effect.succeed({ ...changeRequest(1, mergedAt), state, mergedAt }),
+        }),
+      ],
+    });
+    const merges = yield* service.subscribeMerges;
+    const observedMerge = yield* Stream.runHead(merges).pipe(
+      Effect.forkChild({ startImmediately: true }),
+    );
 
-      assert.isUndefined(yield* service.runAction({ ...reference, action: "merge" }));
-      const queuedRefresh = Option.getOrThrow(yield* Stream.runHead(service.subscribeRefreshes));
-      confirmationFails = true;
-      yield* service.runAction({ ...reference, action: "merge" });
-      assert.isAbove(
-        Option.getOrThrow(yield* Stream.runHead(service.subscribeRefreshes)),
-        queuedRefresh,
-      );
-      confirmationFails = false;
-      state = "merged";
-      // The event carries the host's merge time, not the moment the confirmation ran.
-      yield* TestClock.setTime(Date.parse(mergedAt) + 60_000);
-      yield* service.runAction({
-        ...reference,
-        repository: " ACME/WEB ",
-        action: "merge",
-        mergeMethod: "merge",
-      });
+    assert.isUndefined(yield* service.runAction({ ...reference, action: "merge" }));
+    const queuedRefresh = Option.getOrThrow(yield* Stream.runHead(service.subscribeRefreshes));
+    confirmationFails = true;
+    yield* service.runAction({ ...reference, action: "merge" });
+    assert.isAbove(
+      Option.getOrThrow(yield* Stream.runHead(service.subscribeRefreshes)),
+      queuedRefresh,
+    );
+    confirmationFails = false;
+    state = "merged";
+    // The event carries the host's merge time, not the moment the confirmation ran.
+    yield* TestClock.setTime(Date.parse(mergedAt) + 60_000);
+    yield* service.runAction({
+      ...reference,
+      repository: " ACME/WEB ",
+      action: "merge",
+      mergeMethod: "merge",
+    });
 
-      assert.deepStrictEqual(Option.getOrThrow(yield* Fiber.join(observedMerge)), {
-        ...reference,
-        mergedAt,
-      });
-    }),
-  ),
+    assert.deepStrictEqual(Option.getOrThrow(yield* Fiber.join(observedMerge)), {
+      ...reference,
+      mergedAt,
+    });
+  }),
 );
 
 it.effect("returns the host's merged reply as a summary and trusts it without another read", () =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      const mergedAt = "2026-09-03T02:00:00.000Z";
-      const merged = {
-        number: 1,
-        title: "Change request 1",
-        url: "https://host/pull/1",
-        headBranch: "feat/1",
-        baseBranch: "main",
-        state: "merged" as const,
-        isDraft: false,
-        updatedAt: mergedAt,
-        mergedAt,
-        headSha: "abc123",
-        autoMergeEnabled: false,
-      };
-      let summaryReads = 0;
-      const reference = { projectId: "p1" as ProjectId, repository: "acme/web", number: 1 };
-      const service = yield* makeService({
-        projects: [
-          project({ id: "p1", title: "web", workspaceRoot: "/a", repository: "acme/web" }),
-        ],
-        providers: [
-          fakePullRequestProvider(SourceControlProviderKind.make("github"), {
-            runAction: () => Effect.succeed(merged),
-            getChangeRequestSummary: () =>
-              Effect.sync(() => {
-                summaryReads++;
-                return { ...changeRequest(1, mergedAt), state: "merged" as const, mergedAt };
-              }),
-          }),
-        ],
-      });
-      const merges = yield* service.subscribeMerges;
-      const observedMerge = yield* Stream.runHead(merges).pipe(
-        Effect.forkChild({ startImmediately: true }),
-      );
-      const observedAt = Date.parse("2026-09-03T02:00:01.000Z");
-      yield* TestClock.setTime(observedAt);
-
-      // Clients that did not ask decode the success as void, so they must get nothing back.
-      assert.isUndefined(yield* service.runAction({ ...reference, action: "merge" }));
-      const result = yield* service.runAction({
-        ...reference,
-        action: "merge",
-        replyWithSummary: true,
-      });
+  Effect.gen(function* () {
+    const mergedAt = "2026-09-03T02:00:00.000Z";
+    const merged = {
+      number: 1,
+      title: "Change request 1",
+      url: "https://host/pull/1",
+      headBranch: "feat/1",
+      baseBranch: "main",
+      state: "merged" as const,
+      isDraft: false,
+      updatedAt: mergedAt,
+      mergedAt,
+      headSha: "abc123",
+      autoMergeEnabled: false,
+    };
+    let summaryReads = 0;
+    const reference = { projectId: "p1" as ProjectId, repository: "acme/web", number: 1 };
+    const service = yield* makeService({
+      projects: [project({ id: "p1", title: "web", workspaceRoot: "/a", repository: "acme/web" })],
+      providers: [
+        fakePullRequestProvider(SourceControlProviderKind.make("github"), {
+          runAction: () => Effect.succeed(merged),
+          getChangeRequestSummary: () =>
+            Effect.sync(() => {
+              summaryReads++;
+              return { ...changeRequest(1, mergedAt), state: "merged" as const, mergedAt };
+            }),
+        }),
+      ],
+    });
+    const merges = yield* service.subscribeMerges;
+    const observedMerge = yield* Stream.runHead(merges).pipe(
+      Effect.forkChild({ startImmediately: true }),
+    );
+    const observedAt = Date.parse("2026-09-03T02:00:01.000Z");
+    yield* TestClock.setTime(observedAt);
 
-      assert.deepStrictEqual(result, {
-        ...merged,
-        provider: SourceControlProviderKind.make("github"),
-        projectId: reference.projectId,
-        repository: reference.repository,
-        observedAt,
-      });
-      assert.strictEqual(summaryReads, 0);
-      assert.deepStrictEqual(Option.getOrThrow(yield* Fiber.join(observedMerge)), {
-        ...reference,
-        mergedAt,
-      });
-    }),
-  ),
+    // Clients that did not ask decode the success as void, so they must get nothing back.
+    assert.isUndefined(yield* service.runAction({ ...reference, action: "merge" }));
+    const result = yield* service.runAction({
+      ...reference,
+      action: "merge",
+      replyWithSummary: true,
+    });
+
+    assert.deepStrictEqual(result, {
+      ...merged,
+      provider: SourceControlProviderKind.make("github"),
+      projectId: reference.projectId,
+      repository: reference.repository,
+      observedAt,
+    });
+    assert.strictEqual(summaryReads, 0);
+    assert.deepStrictEqual(Option.getOrThrow(yield* Fiber.join(observedMerge)), {
+      ...reference,
+      mergedAt,
+    });
+  }),
 );
 
 it.effect("refreshes every reader before a queued merge confirmation finishes", () =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      const confirmationStarted = yield* Deferred.make<void>();
-      const confirm = yield* Deferred.make<void>();
-      const reference = { projectId: "p1" as ProjectId, repository: "acme/web", number: 1 };
-      const service = yield* makeService({
-        projects: [
-          project({ id: "p1", title: "web", workspaceRoot: "/a", repository: "acme/web" }),
-        ],
-        providers: [
-          fakePullRequestProvider(SourceControlProviderKind.make("github"), {
-            getChangeRequestSummary: () =>
-              Effect.gen(function* () {
-                yield* Deferred.succeed(confirmationStarted, undefined);
-                yield* Deferred.await(confirm);
-                return changeRequest(1, "2026-09-16T00:00:00.000Z");
-              }),
-          }),
-        ],
-      });
-      const merges = yield* service.subscribeMerges;
-      const observedMerge = yield* Stream.runHead(merges).pipe(
-        Effect.forkChild({ startImmediately: true }),
-      );
-      const readers = yield* Effect.forEach([0, 1], () =>
-        Stream.runHead(service.subscribeRefreshes).pipe(
-          Effect.forkChild({ startImmediately: true }),
-        ),
-      );
-      const action = yield* service
-        .runAction({ ...reference, action: "merge" })
-        .pipe(Effect.forkChild({ startImmediately: true }));
-      yield* Deferred.await(confirmationStarted);
-      const revisions = yield* Effect.forEach(readers, (reader) =>
-        Fiber.join(reader).pipe(Effect.map(Option.getOrThrow)),
-      );
-      assert.isAbove(revisions[0]!, 0);
-      assert.strictEqual(revisions[0], revisions[1]);
-      assert.isUndefined(action.pollUnsafe());
-      yield* Deferred.succeed(confirm, undefined);
-      yield* Fiber.join(action);
-      assert.isUndefined(observedMerge.pollUnsafe());
-    }),
-  ),
+  Effect.gen(function* () {
+    const confirmationStarted = yield* Deferred.make<void>();
+    const confirm = yield* Deferred.make<void>();
+    const reference = { projectId: "p1" as ProjectId, repository: "acme/web", number: 1 };
+    const service = yield* makeService({
+      projects: [project({ id: "p1", title: "web", workspaceRoot: "/a", repository: "acme/web" })],
+      providers: [
+        fakePullRequestProvider(SourceControlProviderKind.make("github"), {
+          getChangeRequestSummary: () =>
+            Effect.gen(function* () {
+              yield* Deferred.succeed(confirmationStarted, undefined);
+              yield* Deferred.await(confirm);
+              return changeRequest(1, "2026-09-16T00:00:00.000Z");
+            }),
+        }),
+      ],
+    });
+    const merges = yield* service.subscribeMerges;
+    const observedMerge = yield* Stream.runHead(merges).pipe(
+      Effect.forkChild({ startImmediately: true }),
+    );
+    const readers = yield* Effect.forEach([0, 1], () =>
+      Stream.runHead(service.subscribeRefreshes).pipe(Effect.forkChild({ startImmediately: true })),
+    );
+    const action = yield* service
+      .runAction({ ...reference, action: "merge" })
+      .pipe(Effect.forkChild({ startImmediately: true }));
+    yield* Deferred.await(confirmationStarted);
+    const revisions = yield* Effect.forEach(readers, (reader) =>
+      Fiber.join(reader).pipe(Effect.map(Option.getOrThrow)),
+    );
+    assert.isAbove(revisions[0]!, 0);
+    assert.strictEqual(revisions[0], revisions[1]);
+    assert.isUndefined(action.pollUnsafe());
+    yield* Deferred.succeed(confirm, undefined);
+    yield* Fiber.join(action);
+    assert.isUndefined(observedMerge.pollUnsafe());
+  }),
 );
 
 it.effect("runs branch deletion only when the host and viewer support it, never for a stack", () =>
@@ -2215,6 +2201,72 @@ it.effect("routes a hosted reference to another repository through a project on
   }),
 );
 
+it.effect("an uncached summary reaches the host despite a cached read in another project", () =>
+  Effect.gen(function* () {
+    const caller = project({
+      id: "caller",
+      title: "caller",
+      workspaceRoot: "/caller",
+      repository: "acme/other",
+    });
+    const target = project({
+      id: "gitlab",
+      title: "gitlab",
+      workspaceRoot: "/gitlab",
+      repository: "team/project",
+      provider: "gitlab",
+    });
+    let missing = false;
+    let reads = 0;
+    const service = yield* makeService({
+      projects: [caller, target],
+      providers: [
+        fakePullRequestProvider(SourceControlProviderKind.make("github")),
+        fakePullRequestProvider(SourceControlProviderKind.make("gitlab"), {
+          getChangeRequestSummary: (input) =>
+            Effect.suspend(() => {
+              reads++;
+              assert.strictEqual(input.cwd, target.workspaceRoot);
+              assert.strictEqual(input.repository, "team/project");
+              assert.strictEqual(input.host, "gitlab.com");
+              return missing
+                ? Effect.fail(
+                    new PullRequestProviderError({
+                      provider: SourceControlProviderKind.make("gitlab"),
+                      operation: "summary",
+                      reason: "missing-tool",
+                      detail: "The hosting CLI is unavailable.",
+                    }),
+                  )
+                : Effect.succeed(changeRequest(42, "2026-07-02T00:00:00Z"));
+            }),
+        }),
+      ],
+    });
+    const reference = {
+      projectId: caller.id,
+      host: "gitlab.com",
+      repository: "team/project",
+      number: 42,
+      allowStale: false,
+    };
+    yield* service.summary(reference, { recoverTransientFailure: false });
+    missing = true;
+    yield* service.summary(reference, { recoverTransientFailure: false });
+    assert.strictEqual(reads, 1);
+
+    const error = yield* service
+      .summary(reference, { recoverTransientFailure: false, bypassCache: true })
+      .pipe(Effect.flip);
+    expect(error).toMatchObject({
+      _tag: "PullRequestUnavailableError",
+      reason: "cli-missing",
+      provider: "gitlab",
+    });
+    assert.strictEqual(reads, 2);
+  }),
+);
+
 it.effect("routes Azure reads and writes through the requested organization's checkout", () =>
   Effect.gen(function* () {
     const seen: string[] = [];
@@ -2798,56 +2850,52 @@ it.effect("a read during a refresh cannot keep the provider's old change request
 );
 
 it.effect("close and reopen notify subscribed readers after invalidating their cached state", () =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      let hostCalls = 0;
-      let state: "open" | "closed" = "open";
-      const reference = { projectId: "p1" as ProjectId, repository: "acme/web", number: 1 };
-      const service = yield* makeService({
-        projects: [
-          project({ id: "p1", title: "web", workspaceRoot: "/a", repository: "acme/web" }),
-        ],
-        providers: [
-          fakePullRequestProvider(SourceControlProviderKind.make("github"), {
-            getChangeRequestSummary: () =>
-              Effect.succeed({ ...changeRequest(1, "2026-09-16T00:00:00.000Z"), state }),
-            runAction: (input) =>
-              Effect.sync(() => {
-                state = input.action === "close" ? "closed" : "open";
-              }),
-            listChangeRequests: () => {
-              hostCalls += 1;
-              return Effect.succeed({ items: [], truncated: false, continues: false });
-            },
-          }),
-        ],
-      });
-
-      yield* service.refreshAfterTurn(reference.projectId);
-      yield* service.list({ state: "open" });
-      assert.strictEqual((yield* service.summary(reference)).state, "open");
-      for (const action of ["close", "reopen"] as const) {
-        const refreshed = yield* service.subscribeRefreshes.pipe(
-          Stream.drop(1),
-          Stream.take(1),
-          Stream.mapEffect(() =>
-            Effect.gen(function* () {
-              yield* service.list({ state: "open" });
-              return yield* service.summary(reference);
+  Effect.gen(function* () {
+    let hostCalls = 0;
+    let state: "open" | "closed" = "open";
+    const reference = { projectId: "p1" as ProjectId, repository: "acme/web", number: 1 };
+    const service = yield* makeService({
+      projects: [project({ id: "p1", title: "web", workspaceRoot: "/a", repository: "acme/web" })],
+      providers: [
+        fakePullRequestProvider(SourceControlProviderKind.make("github"), {
+          getChangeRequestSummary: () =>
+            Effect.succeed({ ...changeRequest(1, "2026-09-16T00:00:00.000Z"), state }),
+          runAction: (input) =>
+            Effect.sync(() => {
+              state = input.action === "close" ? "closed" : "open";
             }),
-          ),
-          Stream.runHead,
-          Effect.forkChild({ startImmediately: true }),
-        );
-        yield* service.runAction({ ...reference, action });
-        assert.strictEqual(
-          Option.getOrThrow(yield* Fiber.join(refreshed)).state,
-          action === "close" ? "closed" : "open",
-        );
-      }
-      assert.strictEqual(hostCalls, 3);
-    }),
-  ),
+          listChangeRequests: () => {
+            hostCalls += 1;
+            return Effect.succeed({ items: [], truncated: false, continues: false });
+          },
+        }),
+      ],
+    });
+
+    yield* service.refreshAfterTurn(reference.projectId);
+    yield* service.list({ state: "open" });
+    assert.strictEqual((yield* service.summary(reference)).state, "open");
+    for (const action of ["close", "reopen"] as const) {
+      const refreshed = yield* service.subscribeRefreshes.pipe(
+        Stream.drop(1),
+        Stream.take(1),
+        Stream.mapEffect(() =>
+          Effect.gen(function* () {
+            yield* service.list({ state: "open" });
+            return yield* service.summary(reference);
+          }),
+        ),
+        Stream.runHead,
+        Effect.forkChild({ startImmediately: true }),
+      );
+      yield* service.runAction({ ...reference, action });
+      assert.strictEqual(
+        Option.getOrThrow(yield* Fiber.join(refreshed)).state,
+        action === "close" ? "closed" : "open",
+      );
+    }
+    assert.strictEqual(hostCalls, 3);
+  }),
 );
 
 it.effect("reads a host's repositories in one search, and files the rows back under each", () =>
@@ -3431,6 +3479,27 @@ it.effect(
     }),
 );
 
+it.effect("preserves merge queue removal details from the provider", () =>
+  Effect.gen(function* () {
+    const removal = { id: "RMQE_1", removedAt: "2026-07-02T00:00:00Z", reason: "CI failed" };
+    const service = yield* makeService({
+      projects: [project({ id: "p1", title: "web", workspaceRoot: "/a", repository: "acme/web" })],
+      providers: [
+        fakePullRequestProvider(SourceControlProviderKind.make("github"), {
+          getChangeRequest: () =>
+            Effect.succeed({ ...hostedChangeRequest("body"), mergeQueueRemoval: removal }),
+        }),
+      ],
+    });
+    const detail = yield* service.detail({
+      projectId: "p1" as ProjectId,
+      repository: "acme/web",
+      number: 1,
+    });
+    assert.deepStrictEqual(detail.mergeQueueRemoval, removal);
+  }),
+);
+
 it.effect("notifies linked threads when detail changes draft status in either direction", () =>
   Effect.gen(function* () {
     let isDraft = true;
diff --git a/apps/server/src/pullRequest/PullRequestService.ts b/apps/server/src/pullRequest/PullRequestService.ts
index 91ee91b9ab08..2f79c4b524ee 100644
--- a/apps/server/src/pullRequest/PullRequestService.ts
+++ b/apps/server/src/pullRequest/PullRequestService.ts
@@ -198,8 +198,14 @@ export class PullRequestService extends Context.Service<
     ) => Effect.Effect<A, E | PullRequestError, R>;
     readonly summary: (
       input: PullRequestRef,
-      options?: { readonly recoverTransientFailure?: boolean },
+      options?: {
+        readonly recoverTransientFailure?: boolean;
+        /** Registration preflights must reach the provider despite a successful cached read. */
+        readonly bypassCache?: boolean;
+      },
     ) => Effect.Effect<PullRequestSummary, PullRequestError>;
+    /** Whether the reference's host batches summary reads; false when it cannot be resolved. */
+    readonly batchesReads: (input: PullRequestRef) => Effect.Effect<boolean>;
     readonly stack: (
       input: PullRequestRef,
       options?: { readonly includeDetails?: boolean },
@@ -218,6 +224,9 @@ export class PullRequestService extends Context.Service<
       input: PullRequestReportStateInput,
     ) => Effect.Effect<void, PullRequestError>;
     readonly subscribeRefreshes: Stream.Stream<number>;
+    readonly subscribeLinkedThreadRefreshes: Stream.Stream<number>;
+    /** Wakes linked-thread readers only; other pull request reads don't depend on thread links. */
+    readonly notifyLinkedThreadsChanged: Effect.Effect<void>;
     readonly refreshAfterTurn: (
       projectId: ProjectId,
       options?: { readonly pushed?: boolean },
@@ -536,6 +545,7 @@ function withRateLimitBackoff(
     ...(api.readsPublicHostWithoutCheckout === undefined
       ? {}
       : { readsPublicHostWithoutCheckout: api.readsPublicHostWithoutCheckout }),
+    ...(api.batchesReads === undefined ? {} : { batchesReads: api.batchesReads }),
     getViewer:
       options?.viewerAllowsPause === true
         ? interactive("getViewer", api.getViewer)
@@ -731,6 +741,7 @@ export const make = Effect.gen(function* () {
   const mergedPullRequests = yield* PubSub.sliding<PullRequestMergeEvent>(64);
   const stateChanges = yield* PubSub.sliding<ThreadPullRequestKey>(64);
   const pullRequestRefreshes = yield* SubscriptionRef.make(0);
+  const linkedThreadRefreshes = yield* SubscriptionRef.make(0);
   const registry = yield* PullRequestProviderRegistry.PullRequestProviderRegistry;
   const requirementOf: UnavailableRequirementOf = (kind) =>
     registry.get(kind)?.unavailableRequirement;
@@ -1905,6 +1916,9 @@ export const make = Effect.gen(function* () {
             ...(changeRequest.workflowApprovalsRequired === undefined
               ? {}
               : { workflowApprovalsRequired: changeRequest.workflowApprovalsRequired }),
+            ...(changeRequest.mergeQueueRemoval === undefined
+              ? {}
+              : { mergeQueueRemoval: changeRequest.mergeQueueRemoval }),
           })),
         ),
       ),
@@ -3061,19 +3075,33 @@ export const make = Effect.gen(function* () {
 
   const summary: PullRequestService["Service"]["summary"] = (input, options) => {
     const key = refCacheKey(input);
-    const cached = persistedRead(input, "summary", summaryCodec, summaryUncached(input));
+    const read =
+      options?.bypassCache === true
+        ? summaryUncached(input)
+        : persistedRead(input, "summary", summaryCodec, summaryUncached(input));
     const held = lastGoodSummary.peek(key);
-    return held !== undefined &&
+    return options?.bypassCache !== true &&
+      held !== undefined &&
       input.allowStale !== false &&
       (options?.recoverTransientFailure !== false || held.state === "merged")
       ? Effect.succeed(held)
-      : cached.pipe(
+      : read.pipe(
           Effect.tap((value) =>
             shouldReplaceHeldSummary(key, value) ? lastGoodSummary.record(key, value) : Effect.void,
           ),
         );
   };
 
+  const batchesReads: PullRequestService["Service"]["batchesReads"] = Effect.fn(
+    "PullRequestService.batchesReads",
+  )(
+    function* (input) {
+      const project = yield* requireProject(input);
+      return project.api.batchesReads === true;
+    },
+    Effect.orElseSucceed(() => false),
+  );
+
   const stack: PullRequestService["Service"]["stack"] = (input, options) =>
     persistedRead(
       input,
@@ -3663,6 +3691,11 @@ export const make = Effect.gen(function* () {
     yield* SubscriptionRef.set(pullRequestRefreshes, epoch);
   });
 
+  const notifyLinkedThreadsChanged = SubscriptionRef.update(
+    linkedThreadRefreshes,
+    (revision) => revision + 1,
+  );
+
   const invalidatedByMutation =
     <I extends PullRequestRef>(
       method: (input: I) => Effect.Effect<void, PullRequestError>,
@@ -3850,6 +3883,7 @@ export const make = Effect.gen(function* () {
       return yield* listStats({ ...input, refs: refs.flatMap(Option.toArray) });
     }),
     summary: credentialCached(summary),
+    batchesReads,
     stack: credentialCached(stack),
     subscribeMerges: PubSub.subscribe(mergedPullRequests).pipe(
       Effect.map((subscription) => Stream.fromSubscription(subscription)),
@@ -3861,6 +3895,10 @@ export const make = Effect.gen(function* () {
     subscribeRefreshes: SubscriptionRef.changes(pullRequestRefreshes).pipe(
       Stream.filter((revision) => revision > 0),
     ),
+    subscribeLinkedThreadRefreshes: SubscriptionRef.changes(linkedThreadRefreshes).pipe(
+      Stream.filter((revision) => revision > 0),
+    ),
+    notifyLinkedThreadsChanged,
     refreshAfterTurn,
     detail: credentialCached(detail),
     checks: credentialCached((input) => Cache.get(checksCache, refCacheKey(input))),
diff --git a/apps/server/src/pullRequest/PullRequestWatchService.test.ts b/apps/server/src/pullRequest/PullRequestWatchService.test.ts
new file mode 100644
index 000000000000..2c4f4d92e469
--- /dev/null
+++ b/apps/server/src/pullRequest/PullRequestWatchService.test.ts
@@ -0,0 +1,294 @@
+import {
+  ProjectId,
+  ProviderInstanceId,
+  ThreadId,
+  PullRequestOperationError,
+  PullRequestUnavailableError,
+  type PullRequestSummary,
+  type OrchestrationV2ServerCommand as OrchestrationCommand,
+  type OrchestrationProjectShell,
+  type ThreadPullRequestLink,
+  SourceControlProviderKind,
+} from "@t3tools/contracts";
+import { describe, expect, it } from "@effect/vitest";
+import * as SecureRandom from "effect/crypto/SecureRandom";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as Option from "effect/Option";
+import * as Ref from "effect/Ref";
+
+import * as Orchestrator from "../orchestration-v2/Orchestrator.ts";
+import {
+  type PullRequestTestThread,
+  v2PullRequestThread,
+} from "../orchestration-v2/testkit/pullRequestFixtures.ts";
+import * as ProjectService from "../project/ProjectService.ts";
+import * as PullRequestService from "./PullRequestService.ts";
+import * as PullRequestWatchService from "./PullRequestWatchService.ts";
+import type { PullRequestTarget } from "./pullRequestTarget.ts";
+
+const PROJECT_ID = ProjectId.make("project-1");
+const THREAD_ID = ThreadId.make("thread-1");
+const testCrypto = SecureRandom.make((size) => new Uint8Array(size).fill(7));
+
+function makeProject(
+  repositoryIdentity: OrchestrationProjectShell["repositoryIdentity"] = {
+    canonicalKey: "github.com/t3tools/t3code",
+    locator: {
+      source: "git-remote",
+      remoteName: "origin",
+      remoteUrl: "git@github.com:T3Tools/T3Code.git",
+    },
+    provider: SourceControlProviderKind.make("github"),
+    displayName: "T3Tools/T3Code",
+    owner: "T3Tools",
+    name: "T3Code",
+  },
+): OrchestrationProjectShell {
+  return {
+    id: PROJECT_ID,
+    title: "Project",
+    workspaceRoot: "/workspace/project",
+    defaultModelSelection: null,
+    scripts: [],
+    repositoryIdentity,
+    createdAt: "2026-08-01T00:00:00.000Z",
+    updatedAt: "2026-08-01T00:00:00.000Z",
+  };
+}
+
+function makeThread(pullRequests: ReadonlyArray<ThreadPullRequestLink>): PullRequestTestThread {
+  return {
+    id: THREAD_ID,
+    projectId: PROJECT_ID,
+    title: "Thread",
+    modelSelection: { instanceId: ProviderInstanceId.make("codex"), model: "gpt-5" },
+    runtimeMode: "full-access",
+    interactionMode: "default",
+    branch: null,
+    worktreePath: null,
+    pullRequests,
+    createdAt: "2026-08-01T00:00:00.000Z",
+    updatedAt: "2026-08-20T00:00:00.000Z",
+    archivedAt: null,
+    settledOverride: null,
+    settledAt: null,
+    latestUserMessageAt: "2026-08-20T00:00:00.000Z",
+  };
+}
+
+function makeLink(
+  number: number,
+  overrides: Partial<ThreadPullRequestLink> & {
+    readonly headBranch?: string;
+    readonly baseBranch?: string;
+  } = {},
+): ThreadPullRequestLink {
+  const { headBranch, baseBranch, ...rest } = overrides;
+  return {
+    host: "github.com",
+    repository: "t3tools/t3code",
+    number,
+    url: `https://github.com/t3tools/t3code/pull/${number}`,
+    source: "manual",
+    linkedAt: "2026-08-10T00:00:00.000Z",
+    snapshot:
+      headBranch === undefined
+        ? null
+        : {
+            state: "open",
+            title: `PR ${number}`,
+            headBranch,
+            baseBranch: baseBranch ?? "main",
+            isDraft: false,
+            updatedAt: null,
+            syncedAt: "2026-08-27T00:00:00.000Z",
+          },
+    stack: null,
+    ...rest,
+  };
+}
+
+interface HarnessOptions {
+  readonly thread?: PullRequestTestThread | null;
+  readonly project?: OrchestrationProjectShell | null;
+  readonly readFailure?: PullRequestService.PullRequestError;
+  readonly readState?: PullRequestSummary["state"];
+}
+
+const makeHarness = Effect.fn("makePullRequestWatchHarness")(function* (
+  options: HarnessOptions = {},
+) {
+  const commands = yield* Ref.make<ReadonlyArray<OrchestrationCommand>>([]);
+  const thread = options.thread === undefined ? makeThread([]) : options.thread;
+  const project = options.project === undefined ? makeProject() : options.project;
+  const dependencies = Layer.mergeAll(
+    Layer.mock(ProjectService.ProjectService)({
+      getShell: () => Effect.succeed(Option.fromNullishOr(project)),
+    }),
+    Layer.mock(Orchestrator.OrchestratorV2)({
+      getThreadShell: (id) =>
+        Effect.succeed(id === thread?.id ? v2PullRequestThread(thread) : null),
+      dispatch: (command) =>
+        Ref.update(commands, (recorded) => [...recorded, command]).pipe(
+          Effect.as({ sequence: 1, storedEvents: [] }),
+        ),
+    }),
+    Layer.mock(PullRequestService.PullRequestService)({
+      summary: (input) =>
+        options.readFailure !== undefined
+          ? Effect.fail(options.readFailure)
+          : Effect.succeed({
+              ...input,
+              provider: SourceControlProviderKind.make("github"),
+              title: "Pull request",
+              url: `https://github.com/${input.repository}/pull/${input.number}`,
+              state: options.readState ?? "open",
+              headBranch: "feature",
+              baseBranch: "main",
+              updatedAt: "2026-08-20T00:00:00.000Z",
+            }),
+    }),
+    Layer.succeed(SecureRandom.SecureRandom, testCrypto),
+  );
+  const service = yield* PullRequestWatchService.PullRequestWatchService.pipe(
+    Effect.provide(PullRequestWatchService.layer.pipe(Layer.provide(dependencies))),
+  );
+  return {
+    commands,
+    setWatching: (watching: boolean, target: PullRequestTarget) =>
+      service.setWatching({ threadId: THREAD_ID, target, watching }),
+  };
+});
+
+describe("PullRequestWatchService", () => {
+  it.effect("links an unlinked watch even while the host has a transient read failure", () =>
+    Effect.gen(function* () {
+      for (const options of [
+        {},
+        {
+          readFailure: new PullRequestOperationError({
+            operation: "summary",
+            detail: "The host is temporarily unavailable.",
+          }),
+        },
+      ]) {
+        const harness = yield* makeHarness(options);
+        const result = yield* harness.setWatching(true, {
+          url: "https://github.com/t3tools/t3code/pull/9",
+        });
+        expect(result).toMatchObject({ number: 9, wasWatching: false });
+        expect(yield* Ref.get(harness.commands)).toMatchObject([
+          {
+            type: "thread.pull-request.watch",
+            number: 9,
+            watching: true,
+            link: { url: "https://github.com/t3tools/t3code/pull/9", source: "agent" },
+          },
+        ]);
+      }
+    }),
+  );
+
+  it.effect("reports a missing hosting CLI before saving a watch and still allows unwatch", () =>
+    Effect.gen(function* () {
+      const missing = new PullRequestUnavailableError({
+        reason: "cli-missing",
+        provider: SourceControlProviderKind.make("gitlab"),
+        requirement: "Install glab on the T3 server's PATH.",
+      });
+      const harness = yield* makeHarness({ readFailure: missing });
+      const target = { url: "https://gitlab.example.com/team/project/-/merge_requests/42" };
+      const error = yield* harness.setWatching(true, target).pipe(Effect.flip);
+      expect(error).toEqual(missing);
+      expect(yield* Ref.get(harness.commands)).toEqual([]);
+
+      yield* harness.setWatching(false, target);
+      expect(yield* Ref.get(harness.commands)).toMatchObject([
+        { type: "thread.pull-request.watch", watching: false },
+      ]);
+    }),
+  );
+
+  it.effect("rejects merged PRs and keeps an active watch usable without hosting access", () =>
+    Effect.gen(function* () {
+      const freshMerged = yield* makeHarness({ readState: "merged" });
+      const freshError = yield* freshMerged
+        .setWatching(true, { repository: "t3tools/t3code", number: 1 })
+        .pipe(Effect.flip);
+      expect(freshError).toMatchObject({ _tag: "PullRequestNotOpenError", state: "merged" });
+      expect(yield* Ref.get(freshMerged.commands)).toEqual([]);
+
+      const watch = {
+        startedAt: "2026-08-20T00:00:00.000Z",
+        headSha: null,
+        failedChecks: [],
+        passed: false,
+        passedChecks: [],
+        remarksThrough: "2026-08-20T00:00:00.000Z",
+        remarkIds: [],
+        conflicting: false,
+        wakes: 0,
+      };
+      const merged = makeLink(1, { headBranch: "done" });
+      const harness = yield* makeHarness({
+        readFailure: new PullRequestUnavailableError({ reason: "cli-missing" }),
+        thread: makeThread([
+          { ...merged, snapshot: merged.snapshot && { ...merged.snapshot, state: "merged" } },
+          makeLink(2, { headBranch: "idle" }),
+          makeLink(3, { headBranch: "watched", watch }),
+        ]),
+      });
+      const error = yield* harness
+        .setWatching(true, { repository: "t3tools/t3code", number: 1 })
+        .pipe(Effect.flip);
+      expect(error).toMatchObject({ _tag: "PullRequestNotOpenError", state: "merged" });
+      expect(
+        yield* harness.setWatching(true, { repository: "t3tools/t3code", number: 3 }),
+      ).toMatchObject({ watching: true, wasWatching: true });
+      expect(
+        yield* harness.setWatching(false, { repository: "t3tools/t3code", number: 3 }),
+      ).toMatchObject({ wasWatching: true });
+      expect(yield* Ref.get(harness.commands)).toMatchObject([
+        { type: "thread.pull-request.watch", number: 3, watching: true },
+        { type: "thread.pull-request.watch", number: 3, watching: false },
+      ]);
+    }),
+  );
+
+  it.effect("watches a pull request saved as closed, since it may have reopened", () =>
+    Effect.gen(function* () {
+      const closed = makeLink(1, { headBranch: "closed" });
+      const harness = yield* makeHarness({
+        readState: "closed",
+        thread: makeThread([
+          { ...closed, snapshot: closed.snapshot && { ...closed.snapshot, state: "closed" } },
+        ]),
+      });
+      yield* harness.setWatching(true, { repository: "t3tools/t3code", number: 1 });
+      expect(yield* Ref.get(harness.commands)).toMatchObject([
+        { type: "thread.pull-request.watch", number: 1, watching: true },
+      ]);
+    }),
+  );
+
+  it.effect("refuses a watch from a subagent thread, whose parent owns the pull request", () =>
+    Effect.gen(function* () {
+      const harness = yield* makeHarness({
+        thread: {
+          ...makeThread([makeLink(1, { headBranch: "feature" })]),
+          lineage: {
+            rootThreadId: ThreadId.make("parent"),
+            parentThreadId: ThreadId.make("parent"),
+            relationshipToParent: "subagent",
+          },
+        },
+      });
+      const error = yield* harness
+        .setWatching(true, { repository: "t3tools/t3code", number: 1 })
+        .pipe(Effect.flip);
+      expect(error).toMatchObject({ _tag: "PullRequestWatchFromSubagentError" });
+      expect(yield* Ref.get(harness.commands)).toEqual([]);
+    }),
+  );
+});
diff --git a/apps/server/src/pullRequest/PullRequestWatchService.ts b/apps/server/src/pullRequest/PullRequestWatchService.ts
new file mode 100644
index 000000000000..6ed736075c01
--- /dev/null
+++ b/apps/server/src/pullRequest/PullRequestWatchService.ts
@@ -0,0 +1,180 @@
+import {
+  CommandId,
+  ThreadId,
+  type OrchestrationV2ThreadShell,
+  type PullRequestUnavailableError,
+} from "@t3tools/contracts";
+import * as Cause from "effect/Cause";
+import * as Context from "effect/Context";
+import * as SecureRandom from "effect/crypto/SecureRandom";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as Option from "effect/Option";
+import * as Schema from "effect/Schema";
+
+import * as Orchestrator from "../orchestration-v2/Orchestrator.ts";
+import * as ProjectService from "../project/ProjectService.ts";
+import * as PullRequestService from "./PullRequestService.ts";
+import {
+  resolveTarget,
+  type PullRequestTarget,
+  type PullRequestTargetError,
+  type ResolvedTarget,
+} from "./pullRequestTarget.ts";
+import {
+  threadPullRequestKeysEqual,
+  threadPullRequestsOf,
+} from "../sourceControl/threadPullRequests.ts";
+
+export class PullRequestWatchFailedError extends Schema.TaggedError<PullRequestWatchFailedError>()(
+  "PullRequestWatchFailedError",
+  { cause: Schema.Defect() },
+) {
+  override get message(): string {
+    return "Could not change whether the pull request is watched.";
+  }
+}
+
+export class PullRequestNotOpenError extends Schema.TaggedError<PullRequestNotOpenError>()(
+  "PullRequestNotOpenError",
+  { state: Schema.String },
+) {
+  override get message(): string {
+    return `The pull request is ${this.state}, so there is nothing to watch.`;
+  }
+}
+
+export class PullRequestWatchFromSubagentError extends Schema.TaggedError<PullRequestWatchFromSubagentError>()(
+  "PullRequestWatchFromSubagentError",
+  {},
+) {
+  override get message(): string {
+    return "This thread is a subagent, so it cannot watch pull requests. Its parent thread owns the pull request: finish your task and report back instead.";
+  }
+}
+
+export class PullRequestWatchThreadNotFoundError extends Schema.TaggedError<PullRequestWatchThreadNotFoundError>()(
+  "PullRequestWatchThreadNotFoundError",
+  { threadId: ThreadId },
+) {
+  override get message(): string {
+    return `Thread ${this.threadId} was not found.`;
+  }
+}
+
+export class PullRequestWatchService extends Context.Service<
+  PullRequestWatchService,
+  {
+    readonly setWatching: (input: {
+      readonly threadId: ThreadId;
+      readonly target: PullRequestTarget;
+      readonly watching: boolean;
+    }) => Effect.Effect<
+      ResolvedTarget & { readonly watching: boolean; readonly wasWatching: boolean },
+      | PullRequestWatchFailedError
+      | PullRequestNotOpenError
+      | PullRequestWatchFromSubagentError
+      | PullRequestWatchThreadNotFoundError
+      | PullRequestTargetError
+      | PullRequestUnavailableError
+    >;
+  }
+>()("t3/pullRequest/PullRequestWatchService") {}
+
+const make = Effect.gen(function* () {
+  const engine = yield* Orchestrator.OrchestratorV2;
+  const projects = yield* ProjectService.ProjectService;
+  const pullRequests = yield* PullRequestService.PullRequestService;
+  const random = yield* SecureRandom.SecureRandom;
+
+  const requireThread = Effect.fn("PullRequestWatchService.requireThread")(function* (
+    threadId: ThreadId,
+  ) {
+    const thread = yield* engine
+      .getThreadShell(threadId)
+      .pipe(Effect.mapError((cause) => new PullRequestWatchFailedError({ cause })));
+    if (thread === null || thread.deletedAt !== null) {
+      return yield* new PullRequestWatchThreadNotFoundError({ threadId });
+    }
+    return thread;
+  });
+
+  // Keep the registration span stable across the service extraction.
+  const setWatching = Effect.fn("PullRequestsToolkit.setWatching")(function* (input: {
+    readonly threadId: ThreadId;
+    readonly target: PullRequestTarget;
+    readonly watching: boolean;
+  }) {
+    const { watching } = input;
+    const thread = yield* requireThread(input.threadId);
+    const project = yield* projects.getShell(thread.projectId).pipe(
+      Effect.map(Option.getOrUndefined),
+      Effect.mapError((cause) => new PullRequestWatchFailedError({ cause })),
+    );
+    const target = yield* resolveTarget(input.target, project);
+    const watchedLink = (shell: OrchestrationV2ThreadShell) =>
+      threadPullRequestsOf(shell).find(
+        (link) => link.source !== "stack-dismissed" && threadPullRequestKeysEqual(link, target),
+      );
+    if (watching && thread.lineage.relationshipToParent === "subagent") {
+      return yield* new PullRequestWatchFromSubagentError();
+    }
+    const before = watchedLink(thread);
+    if (watching && before?.snapshot?.state === "merged") {
+      return yield* new PullRequestNotOpenError({ state: "merged" });
+    }
+    if (watching && before?.watch === undefined) {
+      yield* pullRequests
+        .summary(
+          {
+            projectId: thread.projectId,
+            host: target.host,
+            repository: target.repository,
+            number: target.number,
+            allowStale: false,
+          },
+          { recoverTransientFailure: false, bypassCache: true },
+        )
+        .pipe(
+          Effect.flatMap((summary) =>
+            summary.state === "merged"
+              ? Effect.fail(new PullRequestNotOpenError({ state: "merged" }))
+              : Effect.void,
+          ),
+          Effect.catchTags({
+            // Host and transport errors can recover while the watch is active.
+            PullRequestOperationError: () => Effect.void,
+          }),
+        );
+    }
+    const uuid = yield* random.uuidV4().pipe(Effect.orDie);
+    yield* engine
+      .dispatch({
+        type: "thread.pull-request.watch",
+        commandId: CommandId.make(`server:mcp-pr-watch:${thread.id}:${uuid}`),
+        threadId: thread.id,
+        host: target.host,
+        repository: target.repository,
+        number: target.number,
+        watching,
+        ...(watching ? { link: { url: target.url, source: "agent" as const } } : {}),
+      })
+      .pipe(
+        Effect.catchCause((cause) =>
+          Cause.hasInterruptsOnly(cause)
+            ? Effect.failCause(cause as Cause.Cause<never>)
+            : Effect.fail(new PullRequestWatchFailedError({ cause })),
+        ),
+      );
+    const after = yield* requireThread(thread.id);
+    return {
+      ...target,
+      watching: watchedLink(after)?.watch !== undefined,
+      wasWatching: before?.watch !== undefined,
+    };
+  });
+
+  return PullRequestWatchService.of({ setWatching });
+});
+
+export const layer = Layer.effect(PullRequestWatchService, make);
diff --git a/apps/server/src/pullRequest/linkedThreads.test.ts b/apps/server/src/pullRequest/linkedThreads.test.ts
index 8992a32ea10c..2dac78864158 100644
--- a/apps/server/src/pullRequest/linkedThreads.test.ts
+++ b/apps/server/src/pullRequest/linkedThreads.test.ts
@@ -1,10 +1,18 @@
+import {
+  ProjectId,
+  ThreadId,
+  type OrchestrationV2AppThread,
+  type OrchestrationV2DomainEvent,
+  type ThreadPullRequestLink,
+} from "@t3tools/contracts";
 import { assert, expect, it } from "@effect/vitest";
+import * as DateTime from "effect/DateTime";
 import * as Effect from "effect/Effect";
 import * as Schema from "effect/Schema";
 import * as SqlClient from "effect/sql/SqlClient";
 
 import * as SqlitePersistence from "../persistence/Sqlite.ts";
-import { listLinkedPullRequestThreads } from "./linkedThreads.ts";
+import { listLinkedPullRequestThreads, makeLinkedThreadsChangeDetector } from "./linkedThreads.ts";
 
 const encodePayload = Schema.encodeEffect(Schema.fromJsonString(Schema.Unknown));
 
@@ -209,3 +217,132 @@ it.effect(
       );
     }).pipe(Effect.provide(SqlitePersistence.layerMemory)),
 );
+
+it("signals linked-thread changes only when a linked answer could change", () => {
+  const now = DateTime.makeUnsafe("2026-11-12T00:00:00.000Z");
+  const threadId = ThreadId.make("thread-a");
+  const link: ThreadPullRequestLink = {
+    host: "github.com",
+    repository: "acme/web",
+    number: 7,
+    url: "https://github.com/acme/web/pull/7",
+    source: "agent",
+    linkedAt: "2026-11-12T00:00:00.000Z",
+    snapshot: null,
+    stack: null,
+  };
+  const base = {
+    id: threadId,
+    projectId: ProjectId.make("project-a"),
+    title: "Thread A",
+    lineage: { parentThreadId: null, relationshipToParent: null, rootThreadId: threadId },
+    archivedAt: null,
+    settledOverride: null,
+    settledAt: null,
+    deletedAt: null,
+    updatedAt: now,
+  } as unknown as OrchestrationV2AppThread;
+  const event = (
+    type: OrchestrationV2DomainEvent["type"],
+    payload: Partial<OrchestrationV2AppThread>,
+  ) => ({ type, threadId, payload: { ...base, ...payload } }) as OrchestrationV2DomainEvent;
+  const changed = makeLinkedThreadsChangeDetector();
+
+  expect(
+    [
+      event("thread.metadata-updated", { title: "Unlinked rename" }),
+      event("thread.pull-request-synced", { pullRequests: [link] }),
+      event("thread.pull-request-synced", {
+        pullRequests: [{ ...link, watch: { since: "2026-11-12T00:00:00.000Z" } as never }],
+      }),
+      event("thread.visited", { pullRequests: [link] }),
+      event("thread.pinned", { pullRequests: [link], settledAt: now }),
+      { type: "thread.pull-request-link-updated", threadId, payload: link } as never,
+      event("thread.metadata-updated", { pullRequests: [link], title: "Renamed" }),
+      event("thread.archived", { pullRequests: [link], title: "Renamed", archivedAt: now }),
+      event("thread.pull-request-synced", {
+        pullRequests: [{ ...link, source: "stack-dismissed" }],
+        title: "Renamed",
+        archivedAt: now,
+      }),
+      event("thread.deleted", { pullRequests: [], deletedAt: now }),
+    ].map(changed),
+  ).toEqual([
+    "changed",
+    "changed",
+    null,
+    null,
+    "changed",
+    null,
+    "changed",
+    "changed",
+    "changed",
+    null,
+  ]);
+
+  const afterRestart = makeLinkedThreadsChangeDetector();
+  expect(afterRestart(event("thread.created", { title: "New" }))).toBe(null);
+  expect(
+    makeLinkedThreadsChangeDetector()(
+      event("thread.deleted", { pullRequests: [], deletedAt: now }),
+    ),
+  ).toBe("changed");
+});
+
+it("signals when activity reorders the threads linked to a pull request", () => {
+  const at = (second: number) => DateTime.makeUnsafe(`2026-11-12T00:00:0${second}.000Z`);
+  const link = {
+    host: "github.com",
+    repository: "acme/web",
+    number: 7,
+    url: "https://github.com/acme/web/pull/7",
+    source: "agent",
+  };
+  const thread = (id: string, second: number, pullRequests: ReadonlyArray<unknown> = [link]) =>
+    ({
+      type: "thread.pull-request-synced",
+      threadId: ThreadId.make(id),
+      payload: {
+        id: ThreadId.make(id),
+        projectId: ProjectId.make("project-a"),
+        title: id,
+        lineage: { rootThreadId: ThreadId.make(id) },
+        pullRequests,
+        archivedAt: null,
+        settledOverride: null,
+        settledAt: null,
+        deletedAt: null,
+        updatedAt: at(second),
+      },
+    }) as unknown as OrchestrationV2DomainEvent;
+  const activity = (id: string, second: number) =>
+    ({
+      type: "message.updated",
+      threadId: ThreadId.make(id),
+      occurredAt: at(second),
+    }) as unknown as OrchestrationV2DomainEvent;
+  const changed = makeLinkedThreadsChangeDetector();
+  changed(thread("a", 1));
+  changed(thread("b", 2));
+
+  expect(
+    [
+      { ...thread("a", 3), type: "thread.pinned" } as OrchestrationV2DomainEvent,
+      activity("a", 4),
+      activity("b", 5),
+      activity("b", 5),
+      // Seen since startup without links, so its activity can't reorder an answer.
+      thread("unlinked", 5, []),
+      activity("unlinked", 6),
+      // Not seen since startup, so it may be linked from before the restart.
+      activity("persisted", 6),
+    ].map(changed),
+  ).toEqual(["reordered", "reordered", "reordered", null, "changed", null, "reordered"]);
+
+  // Other threads linked to the pull request may have had no event since the restart.
+  const afterRestart = makeLinkedThreadsChangeDetector();
+  afterRestart(thread("a", 2));
+  expect(
+    afterRestart({ ...thread("a", 6), type: "thread.pinned" } as OrchestrationV2DomainEvent),
+  ).toBe("reordered");
+});
diff --git a/apps/server/src/pullRequest/linkedThreads.ts b/apps/server/src/pullRequest/linkedThreads.ts
index 87ffae525eb9..1fb6b5f5dfeb 100644
--- a/apps/server/src/pullRequest/linkedThreads.ts
+++ b/apps/server/src/pullRequest/linkedThreads.ts
@@ -1,12 +1,18 @@
 import {
   normalizeThreadPullRequestKey,
+  threadPullRequestKeyOf,
   threadPullRequestKeysEqual,
+  visibleThreadPullRequests,
 } from "../sourceControl/threadPullRequests.ts";
 import {
   PullRequestLinkedThreadsResult,
   PullRequestOperationError,
+  type OrchestrationV2AppThread,
+  type OrchestrationV2DomainEvent,
+  type ThreadId,
   type ThreadPullRequestKey,
 } from "@t3tools/contracts";
+import * as DateTime from "effect/DateTime";
 import * as Effect from "effect/Effect";
 import * as NodeSqliteClient from "@t3tools/shared/nodeSqliteClient";
 import * as Schema from "effect/Schema";
@@ -66,3 +72,67 @@ export const listLinkedPullRequestThreads = Effect.fn("listLinkedPullRequestThre
       }),
   ),
 );
+
+// Mirrors the rows and filters of `listLinkedPullRequestThreads`.
+function linkedKeys(thread: OrchestrationV2AppThread): ReadonlyArray<string> {
+  if (thread.deletedAt !== null || thread.lineage.sideChat === true) return [];
+  return visibleThreadPullRequests(thread.pullRequests ?? [])
+    .map(threadPullRequestKeyOf)
+    .toSorted();
+}
+
+function linkedThreadsView(
+  thread: OrchestrationV2AppThread,
+  keys: ReadonlyArray<string>,
+): string | null {
+  if (keys.length === 0) return null;
+  const settled = thread.settledAt !== null || thread.settledOverride === "settled";
+  return JSON.stringify([
+    keys,
+    thread.title,
+    thread.projectId,
+    thread.archivedAt !== null,
+    settled,
+  ]);
+}
+
+/**
+ * Tells how a domain event changed `pullRequests.linkedThreads` answers, so readers can refresh on
+ * change instead of polling. `reordered` means activity on a linked thread, or on one whose links
+ * are unknown since a restart, which can reorder answers. A thread's first full event after a
+ * restart counts as a change, since its earlier links are unknown.
+ */
+export function makeLinkedThreadsChangeDetector() {
+  const views = new Map<ThreadId, string | null>();
+  // Last activity of each thread with visible links.
+  const activeAt = new Map<ThreadId, number>();
+  const active = (threadId: ThreadId, at: DateTime.Utc): boolean => {
+    const previous = activeAt.get(threadId);
+    if (previous === undefined) return false;
+    const millis = DateTime.toEpochMillis(at);
+    if (millis <= previous) return false;
+    activeAt.set(threadId, millis);
+    return true;
+  };
+  return (event: OrchestrationV2DomainEvent): "changed" | "reordered" | null => {
+    // The projection stamps every non-thread event as the thread's activity. A thread not seen
+    // since startup may be linked already, since history is not replayed.
+    if (!event.type.startsWith("thread.")) {
+      if (!views.has(event.threadId)) return "reordered";
+      return active(event.threadId, event.occurredAt) ? "reordered" : null;
+    }
+    if (!("lineage" in event.payload)) return null;
+    const thread = event.payload;
+    const view = linkedThreadsView(thread, linkedKeys(thread));
+    const known = views.has(event.threadId) || event.type === "thread.created";
+    const previous = views.get(event.threadId) ?? null;
+    if (event.type === "thread.deleted") views.delete(event.threadId);
+    else views.set(event.threadId, view);
+    if (view === null) activeAt.delete(event.threadId);
+    if (!known || view !== previous) {
+      if (view !== null) activeAt.set(event.threadId, DateTime.toEpochMillis(thread.updatedAt));
+      return "changed";
+    }
+    return active(event.threadId, thread.updatedAt) ? "reordered" : null;
+  };
+}
diff --git a/apps/server/src/pullRequest/pullRequestTarget.ts b/apps/server/src/pullRequest/pullRequestTarget.ts
new file mode 100644
index 000000000000..4520b0523a36
--- /dev/null
+++ b/apps/server/src/pullRequest/pullRequestTarget.ts
@@ -0,0 +1,123 @@
+import type { OrchestrationProjectShell, SourceControlProviderKind } from "@t3tools/contracts";
+import { canonicalizeGitCafePullRequestUrl } from "@t3tools/source-control-definitions/registry";
+import * as Effect from "effect/Effect";
+import * as Schema from "effect/Schema";
+
+import { sourceControlDefinitions } from "../sourceControl/sourceControlDefinitions.ts";
+import { normalizeThreadPullRequestKey } from "../sourceControl/threadPullRequests.ts";
+
+export interface PullRequestTarget {
+  readonly url?: string | undefined;
+  readonly repository?: string | undefined;
+  readonly number?: number | undefined;
+  readonly host?: string | undefined;
+}
+
+export class PullRequestUrlInvalidError extends Schema.TaggedError<PullRequestUrlInvalidError>()(
+  "PullRequestUrlInvalidError",
+  {},
+) {
+  override get message(): string {
+    return "This is not a recognised pull request URL. Pass repository and number instead.";
+  }
+}
+
+export class PullRequestTargetIncompleteError extends Schema.TaggedError<PullRequestTargetIncompleteError>()(
+  "PullRequestTargetIncompleteError",
+  {},
+) {
+  override get message(): string {
+    return "Pass either url, or both repository and number.";
+  }
+}
+
+export class PullRequestHostRequiredError extends Schema.TaggedError<PullRequestHostRequiredError>()(
+  "PullRequestHostRequiredError",
+  {},
+) {
+  override get message(): string {
+    return "This thread's project has no recognised remote. Pass host or url.";
+  }
+}
+
+export class PullRequestUrlUnavailableError extends Schema.TaggedError<PullRequestUrlUnavailableError>()(
+  "PullRequestUrlUnavailableError",
+  {},
+) {
+  override get message(): string {
+    return "This thread's project is on a host with no known pull request URL shape. Pass url.";
+  }
+}
+
+export type PullRequestTargetError =
+  | PullRequestUrlInvalidError
+  | PullRequestTargetIncompleteError
+  | PullRequestHostRequiredError
+  | PullRequestUrlUnavailableError;
+
+export interface ResolvedTarget {
+  readonly host: string;
+  readonly repository: string;
+  readonly number: number;
+  readonly url: string;
+}
+
+function projectHostAndProvider(project: OrchestrationProjectShell | undefined): {
+  readonly host: string | null;
+  readonly kind: SourceControlProviderKind | null;
+} {
+  const identity = project?.repositoryIdentity;
+  const kind = identity?.provider ?? null;
+  if (!identity || kind === null) return { host: null, kind: null };
+  return {
+    host: sourceControlDefinitions.changeRequestHost(identity, kind),
+    kind,
+  };
+}
+
+export const resolveTarget = Effect.fn("PullRequestsToolkit.resolveTarget")(function* (
+  input: PullRequestTarget,
+  project: OrchestrationProjectShell | undefined,
+) {
+  if (input.url !== undefined) {
+    const parsed = sourceControlDefinitions.parseChangeRequestUrl(input.url)?.link;
+    if (parsed === undefined) {
+      return yield* new PullRequestUrlInvalidError({});
+    }
+    return {
+      ...normalizeThreadPullRequestKey(parsed),
+      url: canonicalizeGitCafePullRequestUrl(input.url),
+    } satisfies ResolvedTarget;
+  }
+  if (input.repository === undefined || input.number === undefined) {
+    return yield* new PullRequestTargetIncompleteError({});
+  }
+  const projectHost = projectHostAndProvider(project);
+  const host = (input.host ?? projectHost.host)?.toLowerCase();
+  if (host === undefined) {
+    return yield* new PullRequestHostRequiredError({});
+  }
+  const repository = input.repository.toLowerCase();
+  // Without a URL, a public forge host says what shape its change request URLs take;
+  // any other host is taken to run the project's own forge.
+  const recognizedKind = sourceControlDefinitions.recognizeRemote(`https://${host}`)?.kind;
+  const kind =
+    sourceControlDefinitions.findByPublicHost(host)?.kind ??
+    (recognizedKind === "gitcafe" ? recognizedKind : projectHost.kind);
+  const url =
+    kind === null
+      ? null
+      : sourceControlDefinitions.get(kind).changeRequestUrl({
+          host,
+          repository,
+          number: input.number,
+          remoteUrl: project?.repositoryIdentity?.locator.remoteUrl,
+        });
+  if (url === null) {
+    return yield* new PullRequestUrlUnavailableError({});
+  }
+  return {
+    ...normalizeThreadPullRequestKey({ host, repository, number: input.number, url }),
+    url: canonicalizeGitCafePullRequestUrl(url),
+  } satisfies ResolvedTarget;
+});
diff --git a/apps/server/src/relay/AgentAwarenessRelay.test.ts b/apps/server/src/relay/AgentAwarenessRelay.test.ts
index 85b9b44f4daf..68e2289524c0 100644
--- a/apps/server/src/relay/AgentAwarenessRelay.test.ts
+++ b/apps/server/src/relay/AgentAwarenessRelay.test.ts
@@ -238,6 +238,7 @@ const makeTestRelay = Effect.fnUntraced(function* (
     getThreadHistoryPage: () => Effect.die("unused"),
     getTimelinePage: () => Effect.die("Unused timeline read"),
     getMessageCount: () => Effect.die("unused message count"),
+    getMessagesById: () => Effect.die("unused messages by id"),
     getTurnItem: () => Effect.die("unused turn item read"),
     getThreadRecords: () => Effect.die("unused record read"),
     getThreadProjection: unused,
@@ -377,6 +378,160 @@ describe("AgentAwarenessRelay", () => {
     }),
   );
 
+  it.effect("publishes the parent as needing input when its subagent raises a secret card", () =>
+    Effect.gen(function* () {
+      const now = DateTime.makeUnsafe(NOW);
+      const child = waitingChild({
+        pendingRuntimeRequest: {
+          id: RuntimeRequestId.make("child-secret-card"),
+          kind: "user_input",
+          createdAt: now,
+          blocking: true,
+          userOnly: true,
+        },
+      });
+      const parent = shell({ status: "completed" });
+      const events = yield* Queue.unbounded<OrchestrationV2DomainEvent>();
+      const pulls = yield* Queue.unbounded<void>();
+      const { relay, publications } = yield* makeTestRelay({
+        readShell: (threadId) => Effect.succeed(threadId === child.id ? child : parent),
+        domainEvents: Stream.fromEffectRepeat(
+          Queue.offer(pulls, undefined).pipe(Effect.andThen(Queue.take(events))),
+        ),
+      });
+      yield* relay.start();
+      yield* Queue.take(pulls);
+      const runId = RunId.make("run:child-secret-card");
+      // Recording a secret card emits only this event for the child.
+      yield* Queue.offer(events, {
+        id: EventId.make("event:child-secret-card"),
+        type: "turn-item.updated",
+        threadId: CHILD_THREAD_ID,
+        runId,
+        occurredAt: now,
+        payload: {
+          id: TurnItemId.make("child-secret-card"),
+          threadId: CHILD_THREAD_ID,
+          runId,
+          nodeId: NodeId.make("node:child-secret-card"),
+          providerThreadId: null,
+          providerTurnId: null,
+          nativeItemRef: null,
+          parentItemId: null,
+          ordinal: 1,
+          status: "waiting",
+          title: "SMS code",
+          startedAt: now,
+          completedAt: null,
+          updatedAt: now,
+          type: "secret_request",
+          label: "SMS code",
+          reason: "The agent needs the code.",
+          secretStatus: "pending",
+        },
+      });
+      yield* Queue.take(pulls);
+      yield* relay.drain;
+      assert.equal(publications.length, 1);
+      assert.isTrue(publications[0]?.url.includes(`/threads/${THREAD_ID}/`) ?? false);
+      assert.equal(publications[0]?.state?.phase, "waiting_for_input");
+    }),
+  );
+
+  it.effect(
+    "clears the parent's input wait when the user steers its subagent past a link card",
+    () =>
+      Effect.gen(function* () {
+        const now = DateTime.makeUnsafe(NOW);
+        let child = waitingChild({
+          pendingRuntimeRequest: {
+            id: RuntimeRequestId.make("child-link-card"),
+            kind: "user_input",
+            createdAt: now,
+            blocking: true,
+            userOnly: true,
+          },
+        });
+        const parent = shell({ status: "completed" });
+        const events = yield* Queue.unbounded<OrchestrationV2DomainEvent>();
+        const pulls = yield* Queue.unbounded<void>();
+        const { relay, publications } = yield* makeTestRelay({
+          readShell: (threadId) => Effect.succeed(threadId === child.id ? child : parent),
+          domainEvents: Stream.fromEffectRepeat(
+            Queue.offer(pulls, undefined).pipe(Effect.andThen(Queue.take(events))),
+          ),
+        });
+        yield* relay.start();
+        yield* Queue.take(pulls);
+        const runId = RunId.make("run:child-link-card");
+        const item = {
+          threadId: CHILD_THREAD_ID,
+          runId,
+          nodeId: NodeId.make("node:child-link-card"),
+          providerThreadId: null,
+          providerTurnId: null,
+          nativeItemRef: null,
+          parentItemId: null,
+          title: null,
+          startedAt: now,
+          updatedAt: now,
+        } as const;
+        yield* Queue.offer(events, {
+          id: EventId.make("event:child-link-card"),
+          type: "turn-item.updated",
+          threadId: CHILD_THREAD_ID,
+          runId,
+          occurredAt: now,
+          payload: {
+            ...item,
+            id: TurnItemId.make("child-link-card"),
+            ordinal: 1,
+            status: "waiting",
+            completedAt: null,
+            type: "link_request",
+            url: "https://example.com/login",
+            label: "Sign in",
+            reason: "The agent needs you to sign in.",
+            linkStatus: "pending",
+          },
+        });
+        yield* Queue.take(pulls);
+        yield* relay.drain;
+        assert.equal(publications[0]?.state?.phase, "waiting_for_input");
+
+        // Steering a running child records only these events for it; the
+        // projection then stops counting the link card as pending.
+        child = waitingChild({ pendingRuntimeRequest: null });
+        yield* Queue.offer(events, {
+          id: EventId.make("event:child-steer"),
+          type: "turn-item.updated",
+          threadId: CHILD_THREAD_ID,
+          runId,
+          occurredAt: now,
+          payload: {
+            ...item,
+            id: TurnItemId.make("child-steer"),
+            ordinal: 2,
+            status: "completed",
+            completedAt: now,
+            createdBy: "user",
+            creationSource: "web",
+            type: "user_message",
+            messageId: MessageId.make("message:child-steer"),
+            inputIntent: "steer",
+            text: "Skip the login.",
+            attachments: [],
+          },
+        });
+        yield* Queue.take(pulls);
+        // The relay confirms a move into completed before publishing it.
+        yield* TestClock.adjust("5 seconds");
+        yield* relay.drain;
+        assert.equal(publications.length, 2);
+        assert.equal(publications[1]?.state?.phase, "completed");
+      }),
+  );
+
   it.effect("republishes a completed parent for its waiting child after a relink", () =>
     Effect.gen(function* () {
       const parent = shell({ status: "completed" });
@@ -400,7 +555,7 @@ describe("AgentAwarenessRelay", () => {
       yield* relay.drain;
       assert.equal(publications.length, 2);
       assert.equal(publications[1]?.state?.phase, "waiting_for_approval");
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("keeps a child's alert time when the parent's own request comes and goes", () =>
@@ -568,7 +723,7 @@ describe("AgentAwarenessRelay", () => {
         yield* relay.drain;
         assert.equal(publications.length, 3);
         assert.equal(publications[2]?.state, null);
-      }).pipe(Effect.scoped),
+      }),
   );
 
   it.effect("holds a completion through a continuation gap, then publishes it once", () =>
@@ -1016,5 +1171,5 @@ it.effect("catches up after startup without polling after success", () =>
     assert.equal(catchUp.activitySnapshotReads, 3);
     assert.equal(publications.length, 2);
     assert.equal(publications[1]?.state?.threadId, THREAD_ID);
-  }).pipe(Effect.scoped),
+  }),
 );
diff --git a/apps/server/src/relay/AgentAwarenessRelay.ts b/apps/server/src/relay/AgentAwarenessRelay.ts
index c14558762183..76f854548deb 100644
--- a/apps/server/src/relay/AgentAwarenessRelay.ts
+++ b/apps/server/src/relay/AgentAwarenessRelay.ts
@@ -16,7 +16,8 @@ import {
 import {
   type SubagentRequestAwareness,
   projectThreadAwarenessV2,
-  subagentAwaitsApproval,
+  subagentAwaitsUser,
+  turnItemCanChangeUserWait,
 } from "@t3tools/shared/agentAwareness";
 import { turnItemUpdateCanEndBackgroundWork } from "@t3tools/shared/orchestrationV2PendingBackgroundWork";
 import { makeDrainableWorker } from "@t3tools/shared/DrainableWorker";
@@ -116,6 +117,7 @@ function shouldPublishAgentAwarenessEvent(
     case "thread.active-reordered":
     case "thread.tags-updated":
     case "thread.visited":
+    case "thread.visit-recorded":
     case "thread.marked-unread":
     case "thread.runtime-mode-updated":
     case "thread.interaction-mode-updated":
@@ -128,7 +130,11 @@ function shouldPublishAgentAwarenessEvent(
     case "provider-session.detached":
     case "provider-turn.updated":
     case "turn-item.updated":
-      return isTurnItemPayload(event.payload) && turnItemUpdateCanEndBackgroundWork(event.payload);
+      return (
+        isTurnItemPayload(event.payload) &&
+        (turnItemUpdateCanEndBackgroundWork(event.payload) ||
+          turnItemCanChangeUserWait(event.payload))
+      );
     case "message.updated":
     case "plan.updated":
     case "checkpoint-scope.created":
@@ -308,7 +314,7 @@ interface SubagentAlert {
 }
 
 const waitingApprovalId = (thread: AgentAwarenessThread | null) =>
-  thread !== null && thread.archivedAt === null && subagentAwaitsApproval(thread)
+  thread !== null && thread.archivedAt === null && subagentAwaitsUser(thread)
     ? thread.pendingRuntimeRequest?.id
     : undefined;
 
@@ -377,7 +383,7 @@ export function resolveAgentAwarenessRelayActiveThreadIds(input: {
   return input.threads
     .filter((thread) => {
       // Publishing a waiting subagent republishes its top-level thread.
-      if (subagentAwaitsApproval(thread)) return true;
+      if (subagentAwaitsUser(thread)) return true;
       const project = projectById.get(thread.projectId);
       if (!project) {
         return false;
@@ -758,7 +764,11 @@ export const make = Effect.gen(function* () {
       if (requestId !== entry.requestId) subagentRequests.set(childId, { ...entry, requestId });
       // The newest wait is the one to announce.
       if (pending === null || DateTime.isGreaterThan(child.updatedAt, pending.updatedAt)) {
-        pending = { requestId, updatedAt: child.updatedAt };
+        pending = {
+          requestId,
+          updatedAt: child.updatedAt,
+          waitsForInput: child.pendingRuntimeRequest?.kind === "user_input",
+        };
       }
     }
     return pending;
diff --git a/apps/server/src/resourceTelemetry/ResourceTelemetry.test.ts b/apps/server/src/resourceTelemetry/ResourceTelemetry.test.ts
index c12e2e44ed7e..8a3640977ddf 100644
--- a/apps/server/src/resourceTelemetry/ResourceTelemetry.test.ts
+++ b/apps/server/src/resourceTelemetry/ResourceTelemetry.test.ts
@@ -272,131 +272,127 @@ describe("ResourceTelemetry", () => {
   );
 
   it.effect("rejects buffered snapshots from an earlier sidecar generation", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const startedAt = DateTime.toEpochMillis(yield* DateTime.now);
-        const stale = nativeSnapshot({
-          sequence: 100,
-          sampledAtUnixMs: startedAt + 1_000,
-          childCpuTimeMs: 100,
-          childWriteBytes: 1_000,
-        });
-        const current = nativeSnapshot({
-          sequence: 1,
-          sampledAtUnixMs: startedAt + 2_000,
-          childCpuTimeMs: 200,
-          childWriteBytes: 2_000,
-        });
-        const nativeSnapshots =
-          yield* PubSub.unbounded<NativeTelemetryClient.NativeTelemetrySnapshot>();
-        const layerNative = NativeTelemetryClient.layerTest({
-          snapshots: Stream.fromPubSub(nativeSnapshots),
-          sampleNow: Effect.never,
-          health: Effect.succeed({
-            status: "healthy",
-            hello: Option.none(),
-            lastSampleAt: Option.none(),
-            lastError: Option.none(),
-            restartCount: 1,
-            sampleIntervalMs: 1_000,
-          }),
-        });
-        const layerTelemetry = ResourceTelemetry.layer.pipe(
-          Layer.provide(
-            Layer.mergeAll(
-              layerNative,
-              DesktopTelemetryReceiver.layerTest(),
-              ResourceAttribution.layer,
-            ),
+    Effect.gen(function* () {
+      const startedAt = DateTime.toEpochMillis(yield* DateTime.now);
+      const stale = nativeSnapshot({
+        sequence: 100,
+        sampledAtUnixMs: startedAt + 1_000,
+        childCpuTimeMs: 100,
+        childWriteBytes: 1_000,
+      });
+      const current = nativeSnapshot({
+        sequence: 1,
+        sampledAtUnixMs: startedAt + 2_000,
+        childCpuTimeMs: 200,
+        childWriteBytes: 2_000,
+      });
+      const nativeSnapshots =
+        yield* PubSub.unbounded<NativeTelemetryClient.NativeTelemetrySnapshot>();
+      const layerNative = NativeTelemetryClient.layerTest({
+        snapshots: Stream.fromPubSub(nativeSnapshots),
+        sampleNow: Effect.never,
+        health: Effect.succeed({
+          status: "healthy",
+          hello: Option.none(),
+          lastSampleAt: Option.none(),
+          lastError: Option.none(),
+          restartCount: 1,
+          sampleIntervalMs: 1_000,
+        }),
+      });
+      const layerTelemetry = ResourceTelemetry.layer.pipe(
+        Layer.provide(
+          Layer.mergeAll(
+            layerNative,
+            DesktopTelemetryReceiver.layerTest(),
+            ResourceAttribution.layer,
           ),
-        );
+        ),
+      );
 
-        yield* Effect.gen(function* () {
-          const telemetry = yield* ResourceTelemetry.ResourceTelemetry;
-          const subscription = yield* telemetry.subscribe;
-          const nextSnapshot = yield* Stream.runHead(subscription.changes).pipe(Effect.forkChild);
+      yield* Effect.gen(function* () {
+        const telemetry = yield* ResourceTelemetry.ResourceTelemetry;
+        const subscription = yield* telemetry.subscribe;
+        const nextSnapshot = yield* Stream.runHead(subscription.changes).pipe(Effect.forkChild);
 
-          yield* PubSub.publish(nativeSnapshots, nativeGeneration(stale, 0));
-          yield* Effect.yieldNow;
-          expect((yield* telemetry.latest).health.scannedProcessCount).toBe(0);
+        yield* PubSub.publish(nativeSnapshots, nativeGeneration(stale, 0));
+        yield* Effect.yieldNow;
+        expect((yield* telemetry.latest).health.scannedProcessCount).toBe(0);
 
-          yield* PubSub.publish(nativeSnapshots, nativeGeneration(current, 1));
-          const received = yield* Fiber.join(nextSnapshot);
+        yield* PubSub.publish(nativeSnapshots, nativeGeneration(current, 1));
+        const received = yield* Fiber.join(nextSnapshot);
 
-          expect(Option.isSome(received)).toBe(true);
-          expect(DateTime.toEpochMillis(Option.getOrThrow(received).readAt)).toBe(
-            current.sampledAtUnixMs,
-          );
-        }).pipe(Effect.provide(layerTelemetry));
-      }),
-    ),
+        expect(Option.isSome(received)).toBe(true);
+        expect(DateTime.toEpochMillis(Option.getOrThrow(received).readAt)).toBe(
+          current.sampledAtUnixMs,
+        );
+      }).pipe(Effect.provide(layerTelemetry));
+    }),
   );
 
   it.effect("atomically subscribes while a desktop update is being rebuilt", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const startedAt = DateTime.toEpochMillis(yield* DateTime.now);
-        const nextDesktopSnapshot = desktopSnapshot(startedAt + 1_000);
-        const desktopChanges = yield* PubSub.unbounded<DesktopHostTelemetrySnapshot>();
-        const rebuildStarted = yield* Deferred.make<void>();
-        const finishRebuild = yield* Deferred.make<void>();
-        const attributionReads = yield* Ref.make(0);
-        const layerAttribution = Layer.succeed(
-          ResourceAttribution.ResourceAttribution,
-          ResourceAttribution.ResourceAttribution.of({
-            record: () => Effect.void,
-            snapshot: Ref.updateAndGet(attributionReads, (count) => count + 1).pipe(
-              Effect.flatMap((count) =>
-                count === 1
-                  ? Effect.void
-                  : Deferred.succeed(rebuildStarted, undefined).pipe(
-                      Effect.andThen(Deferred.await(finishRebuild)),
-                    ),
-              ),
-              Effect.andThen(
-                Effect.succeed({
-                  readAt: DateTime.makeUnsafe(startedAt),
-                  entries: [],
-                }),
-              ),
+    Effect.gen(function* () {
+      const startedAt = DateTime.toEpochMillis(yield* DateTime.now);
+      const nextDesktopSnapshot = desktopSnapshot(startedAt + 1_000);
+      const desktopChanges = yield* PubSub.unbounded<DesktopHostTelemetrySnapshot>();
+      const rebuildStarted = yield* Deferred.make<void>();
+      const finishRebuild = yield* Deferred.make<void>();
+      const attributionReads = yield* Ref.make(0);
+      const layerAttribution = Layer.succeed(
+        ResourceAttribution.ResourceAttribution,
+        ResourceAttribution.ResourceAttribution.of({
+          record: () => Effect.void,
+          snapshot: Ref.updateAndGet(attributionReads, (count) => count + 1).pipe(
+            Effect.flatMap((count) =>
+              count === 1
+                ? Effect.void
+                : Deferred.succeed(rebuildStarted, undefined).pipe(
+                    Effect.andThen(Deferred.await(finishRebuild)),
+                  ),
             ),
-          }),
-        );
-        const layerNative = NativeTelemetryClient.layerTest({
-          sampleNow: Effect.never,
-          health: Effect.succeed({
-            status: "healthy",
-            hello: Option.none(),
-            lastSampleAt: Option.none(),
-            lastError: Option.none(),
-            restartCount: 0,
-            sampleIntervalMs: 1_000,
-          }),
-        });
-        const layerDesktop = DesktopTelemetryReceiver.layerTest({
-          changes: Stream.fromPubSub(desktopChanges),
-        });
-        const layerTelemetry = ResourceTelemetry.layer.pipe(
-          Layer.provide(Layer.mergeAll(layerNative, layerDesktop, layerAttribution)),
-        );
+            Effect.andThen(
+              Effect.succeed({
+                readAt: DateTime.makeUnsafe(startedAt),
+                entries: [],
+              }),
+            ),
+          ),
+        }),
+      );
+      const layerNative = NativeTelemetryClient.layerTest({
+        sampleNow: Effect.never,
+        health: Effect.succeed({
+          status: "healthy",
+          hello: Option.none(),
+          lastSampleAt: Option.none(),
+          lastError: Option.none(),
+          restartCount: 0,
+          sampleIntervalMs: 1_000,
+        }),
+      });
+      const layerDesktop = DesktopTelemetryReceiver.layerTest({
+        changes: Stream.fromPubSub(desktopChanges),
+      });
+      const layerTelemetry = ResourceTelemetry.layer.pipe(
+        Layer.provide(Layer.mergeAll(layerNative, layerDesktop, layerAttribution)),
+      );
 
-        yield* Effect.gen(function* () {
-          const telemetry = yield* ResourceTelemetry.ResourceTelemetry;
-          yield* Effect.yieldNow;
-          yield* PubSub.publish(desktopChanges, nextDesktopSnapshot);
-          yield* Deferred.await(rebuildStarted);
+      yield* Effect.gen(function* () {
+        const telemetry = yield* ResourceTelemetry.ResourceTelemetry;
+        yield* Effect.yieldNow;
+        yield* PubSub.publish(desktopChanges, nextDesktopSnapshot);
+        yield* Deferred.await(rebuildStarted);
 
-          const subscriptionFiber = yield* telemetry.subscribe.pipe(Effect.forkChild);
-          yield* Effect.yieldNow;
-          yield* Deferred.succeed(finishRebuild, undefined);
-          const subscription = yield* Fiber.join(subscriptionFiber);
+        const subscriptionFiber = yield* telemetry.subscribe.pipe(Effect.forkChild);
+        yield* Effect.yieldNow;
+        yield* Deferred.succeed(finishRebuild, undefined);
+        const subscription = yield* Fiber.join(subscriptionFiber);
 
-          expect(DateTime.toEpochMillis(subscription.latest.readAt)).toBe(
-            nextDesktopSnapshot.sampledAtUnixMs,
-          );
-          expect(subscription.latest.power).toEqual(nextDesktopSnapshot.power);
-        }).pipe(Effect.provide(layerTelemetry));
-      }),
-    ),
+        expect(DateTime.toEpochMillis(subscription.latest.readAt)).toBe(
+          nextDesktopSnapshot.sampledAtUnixMs,
+        );
+        expect(subscription.latest.power).toEqual(nextDesktopSnapshot.power);
+      }).pipe(Effect.provide(layerTelemetry));
+    }),
   );
 });
diff --git a/apps/server/src/secrets/SecretCheck.test.ts b/apps/server/src/secrets/SecretCheck.test.ts
new file mode 100644
index 000000000000..473cab1dfc65
--- /dev/null
+++ b/apps/server/src/secrets/SecretCheck.test.ts
@@ -0,0 +1,363 @@
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
+import * as NodeServices from "@effect/platform-node/NodeServices";
+import { assert, it } from "@effect/vitest";
+import {
+  ProviderDriverKind,
+  ProviderInstanceId,
+  SecretProviderId,
+  SecretProviderKind,
+  type SecretReference,
+  SettingsSecretValue,
+  type ServerProvider,
+} from "@t3tools/contracts";
+import type { AnyProviderDriver, ProviderInstance } from "@t3tools/provider-core/server/driver";
+import { makeManualOnlyProviderMaintenanceCapabilities } from "@t3tools/provider-core/server/maintenanceResolver";
+import * as ProviderLatestVersions from "@t3tools/provider-core/server/ProviderLatestVersions";
+import * as SecretResolver from "@t3tools/secret-provider-core/server/SecretResolver";
+import { defineSecretProviderDriver } from "@t3tools/secret-provider-core/server/driver";
+import { defineSecretProvider } from "@t3tools/secret-provider-core/shared/definition";
+import * as Deferred from "effect/Deferred";
+import * as Effect from "effect/Effect";
+import * as Fiber from "effect/Fiber";
+import { HttpClient, HttpClientResponse } from "effect/http";
+import * as Layer from "effect/Layer";
+import * as PubSub from "effect/PubSub";
+import * as Schema from "effect/Schema";
+import * as Stream from "effect/Stream";
+
+import * as ServerConfig from "../config.ts";
+import * as ModelManifest from "../provider/ModelManifest.ts";
+import * as ProviderInstanceRegistry from "../provider/ProviderInstanceRegistry.ts";
+import * as ProviderInstanceRegistryMutator from "../provider/ProviderInstanceRegistryMutator.ts";
+import * as ProviderRegistry from "../provider/ProviderRegistry.ts";
+import * as SecretCheck from "./SecretCheck.ts";
+
+const FAKE_KIND = SecretProviderKind.make("fake");
+const secretProvider = SecretProviderId.make("personal");
+const wanted: SecretReference = { provider: secretProvider, reference: "fake://wanted" };
+const other: SecretReference = { provider: secretProvider, reference: "fake://other" };
+const locked: SecretReference = { provider: secretProvider, reference: "fake://locked" };
+const driverKind = ProviderDriverKind.make("fake-provider");
+const dependent = ProviderInstanceId.make("dependent");
+const unrelated = ProviderInstanceId.make("unrelated");
+
+const providerSnapshot = (instanceId: ProviderInstanceId): ServerProvider => ({
+  instanceId,
+  driver: driverKind,
+  status: "ready",
+  enabled: true,
+  installed: true,
+  auth: { status: "authenticated" },
+  checkedAt: "2026-10-03T00:00:00.000Z",
+  version: "1.0.0",
+  models: [],
+  slashCommands: [],
+  skills: [],
+});
+
+/**
+ * A server whose `dependent` instance reads `dependentReads` and `unrelated` reads `other`, all
+ * through the real resolver, instance registry and provider registry. `vault` answers each read of
+ * a reference with the next queued value, repeating the last one, after `beforeRead`.
+ */
+const setup = Effect.fn("SecretCheckTest.setup")(function* (
+  vault: Map<string, Array<string | undefined>>,
+  dependentReads: ReadonlyArray<SecretReference> = [wanted],
+  options: {
+    readonly dependentConfig?: unknown;
+    readonly beforeRead?: (reference: string) => Effect.Effect<void>;
+  } = {},
+) {
+  const reads: Array<string> = [];
+  const created: Array<{ instanceId: ProviderInstanceId; secrets: ReadonlyArray<unknown> }> = [];
+  const createdConfigs: Array<unknown> = [];
+  const refreshed: Array<ProviderInstanceId> = [];
+
+  const secretDriver = defineSecretProviderDriver({
+    kind: FAKE_KIND,
+    definition: defineSecretProvider({
+      kind: FAKE_KIND,
+      label: "Fake",
+      configSchema: Schema.Struct({}),
+      isReference: (value) => value.startsWith("fake://"),
+      referencePlaceholder: "fake://item",
+      invalidReferenceMessage: "Use fake://item.",
+    }),
+    read: (_config, references) =>
+      Effect.forEach(references, (reference) =>
+        (options.beforeRead?.(reference) ?? Effect.void).pipe(
+          Effect.andThen(
+            Effect.sync(() => {
+              reads.push(reference);
+              const answers = vault.get(reference) ?? [];
+              return answers.length > 1 ? answers.shift() : answers[0];
+            }),
+          ),
+        ),
+      ),
+  });
+
+  const driver: AnyProviderDriver = {
+    driverKind,
+    metadata: { displayName: "Fake" },
+    configSchema: Schema.Struct({
+      keys: Schema.Record(Schema.String, SettingsSecretValue).pipe(
+        Schema.withDecodingDefault(Effect.succeed({})),
+      ),
+    }),
+    defaultConfig: () => ({}),
+    create: (input) =>
+      Effect.sync(() => {
+        created.push({
+          instanceId: input.instanceId,
+          secrets: input.environment.map((variable) => variable.value),
+        });
+        createdConfigs.push(input.config);
+        const snapshot = providerSnapshot(input.instanceId);
+        return {
+          instanceId: input.instanceId,
+          driverKind,
+          continuationIdentity: { driverKind, continuationKey: `fake:${input.instanceId}` },
+          displayName: undefined,
+          enabled: input.enabled,
+          snapshot: {
+            resolveMaintenance: () =>
+              Effect.succeed(
+                makeManualOnlyProviderMaintenanceCapabilities({
+                  provider: driverKind,
+                  packageName: null,
+                }),
+              ),
+            getSnapshot: Effect.succeed(snapshot),
+            refresh: Effect.sync(() => {
+              refreshed.push(input.instanceId);
+              return snapshot;
+            }),
+            streamChanges: Stream.empty,
+            applyUsageLimits: () => Effect.void,
+          },
+          orchestrationAdapter: {} as ProviderInstance["orchestrationAdapter"],
+          textGeneration: {} as ProviderInstance["textGeneration"],
+        } satisfies ProviderInstance;
+      }),
+  };
+  const instanceConfig = (secrets: ReadonlyArray<SecretReference>, config: unknown = {}) => ({
+    driver: driverKind,
+    config,
+    environment: secrets.map((secret, index) => ({
+      name: `API_KEY_${index}`,
+      value: secret,
+      sensitive: true,
+    })),
+  });
+
+  const resolverContext = yield* Layer.build(
+    SecretResolver.layer({
+      drivers: [secretDriver],
+      secretProviders: Effect.succeed({
+        [secretProvider]: { kind: FAKE_KIND, label: "Personal", config: {} },
+      }),
+    }),
+  );
+  const { registry, mutator } = yield* ProviderInstanceRegistry.makeProviderInstanceRegistry({
+    drivers: [driver],
+    configMap: {
+      [dependent]: instanceConfig(dependentReads, options.dependentConfig),
+      [unrelated]: instanceConfig([other]),
+    },
+  }).pipe(Effect.provide(resolverContext));
+  // Secrets are read after startup, so wait for the change that applies them.
+  const changes = yield* registry.subscribeChanges;
+  yield* PubSub.take(changes);
+
+  const services = yield* Layer.build(
+    SecretCheck.layer.pipe(
+      Layer.provideMerge(ProviderRegistry.layer),
+      Layer.provide(
+        Layer.mergeAll(
+          Layer.succeedContext(resolverContext),
+          Layer.succeed(ProviderInstanceRegistry.ProviderInstanceRegistry, registry),
+          Layer.succeed(ProviderInstanceRegistryMutator.ProviderInstanceRegistryMutator, mutator),
+        ),
+      ),
+    ),
+  );
+  const secretCheck = yield* SecretCheck.SecretCheck.pipe(Effect.provide(services));
+  const resolver = yield* SecretResolver.SecretResolver.pipe(Effect.provide(resolverContext));
+  return { secretCheck, registry, mutator, resolver, reads, created, createdConfigs, refreshed };
+});
+
+const layerTest = Layer.mergeAll(
+  ServerConfig.layerTest(process.cwd(), { prefix: "t3-secret-check-" }),
+  ModelManifest.layerTest,
+  ProviderLatestVersions.layer,
+  Layer.succeed(
+    HttpClient.HttpClient,
+    HttpClient.make((request) =>
+      Effect.succeed(HttpClientResponse.fromWeb(request, Response.json({ version: "0.0.0" }))),
+    ),
+  ),
+).pipe(Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)));
+
+it.layer(layerTest)("SecretCheck", (it) => {
+  it.effect(
+    "a readable secret rebuilds and refreshes only the instances that read it, from that one read",
+    () =>
+      Effect.gen(function* () {
+        const vault = new Map<string, Array<string | undefined>>([
+          [wanted.reference, [undefined]],
+          [other.reference, ["other-key"]],
+        ]);
+        const server = yield* setup(vault);
+        assert.deepStrictEqual(
+          (yield* server.registry.listUnavailable).map((entry) => entry.instanceId),
+          [dependent],
+        );
+        const createdBefore = server.created.length;
+        const readsBefore = server.reads.length;
+
+        // Unlocked for the check's own read only: any second read would fail again.
+        vault.set(wanted.reference, ["wanted-key", undefined]);
+        const result = yield* server.secretCheck.check(wanted);
+
+        assert.deepStrictEqual(result, { _tag: "Resolved" });
+        assert.notInclude(JSON.stringify(result), "wanted-key");
+        assert.deepStrictEqual(server.reads.slice(readsBefore), [wanted.reference]);
+        assert.deepStrictEqual(server.created.slice(createdBefore), [
+          { instanceId: dependent, secrets: ["wanted-key"] },
+        ]);
+        assert.deepStrictEqual(server.refreshed, [dependent]);
+        assert.deepStrictEqual(yield* server.registry.listUnavailable, []);
+      }),
+  );
+
+  it.effect("an unreadable secret fails naming its provider and leaves instances alone", () =>
+    Effect.gen(function* () {
+      const vault = new Map<string, Array<string | undefined>>([
+        [wanted.reference, [undefined]],
+        [other.reference, ["other-key"]],
+      ]);
+      const server = yield* setup(vault);
+      const createdBefore = server.created.length;
+
+      const result = yield* server.secretCheck.check(wanted);
+
+      assert.strictEqual(result._tag, "Failed");
+      if (result._tag === "Failed") assert.include(result.detail, "Personal");
+      assert.deepStrictEqual(server.created.slice(createdBefore), []);
+      assert.deepStrictEqual(server.refreshed, []);
+      assert.deepStrictEqual(
+        (yield* server.registry.listUnavailable).map((entry) => entry.instanceId),
+        [dependent],
+      );
+    }),
+  );
+
+  it.effect("a failed check keeps the value the server already holds", () =>
+    Effect.gen(function* () {
+      const vault = new Map<string, Array<string | undefined>>([
+        [wanted.reference, ["wanted-key"]],
+        [locked.reference, ["locked-key", undefined]],
+        [other.reference, ["other-key"]],
+      ]);
+      const server = yield* setup(vault, [wanted, locked]);
+      const readsBefore = server.reads.length;
+
+      assert.strictEqual((yield* server.secretCheck.check(locked))._tag, "Failed");
+
+      assert.deepStrictEqual(yield* server.resolver.read([locked]), ["locked-key"]);
+      assert.deepStrictEqual(server.reads.slice(readsBefore), [locked.reference]);
+    }),
+  );
+
+  it.effect("a check applies to an instance whose other secret failed a later refresh", () =>
+    Effect.gen(function* () {
+      const vault = new Map<string, Array<string | undefined>>([
+        [wanted.reference, ["wanted-old"]],
+        [locked.reference, ["locked-key", undefined]],
+        [other.reference, ["other-key"]],
+      ]);
+      const server = yield* setup(vault, [wanted, locked]);
+      // A Settings refresh while the vault is locked keeps the live instance and caches the failure.
+      yield* server.mutator.reloadSecrets(dependent);
+      vault.set(wanted.reference, ["wanted-new"]);
+
+      assert.deepStrictEqual(yield* server.secretCheck.check(wanted), { _tag: "Resolved" });
+
+      assert.deepStrictEqual(server.created.at(-1), {
+        instanceId: dependent,
+        secrets: ["wanted-new", "locked-key"],
+      });
+      assert.deepStrictEqual(yield* server.registry.listUnavailable, []);
+    }),
+  );
+
+  it.effect("a check applies the value it read when a refresh re-reads that secret first", () =>
+    Effect.forEach(
+      // A live instance holding the old value, and one parked on a locked vault.
+      ["wanted-old", undefined],
+      (initial) =>
+        Effect.gen(function* () {
+          const vault = new Map<string, Array<string | undefined>>([
+            [wanted.reference, [initial]],
+            [other.reference, ["other-key"]],
+          ]);
+          const readStarted = yield* Deferred.make<void>();
+          const release = yield* Deferred.make<void>();
+          let gate: Effect.Effect<void> = Effect.void;
+          const server = yield* setup(vault, [wanted], {
+            beforeRead: () => {
+              const current = gate;
+              gate = Effect.void;
+              return current;
+            },
+          });
+          // The check reads the rotated value; the refresh's read after it finds the vault locked.
+          vault.set(wanted.reference, ["wanted-new", undefined]);
+          gate = Deferred.succeed(readStarted, undefined).pipe(
+            Effect.andThen(Deferred.await(release)),
+          );
+
+          const check = yield* server.secretCheck
+            .check(wanted)
+            .pipe(Effect.forkChild({ startImmediately: true }));
+          yield* Deferred.await(readStarted);
+          // The refresh takes the registry lock, then waits on the resolver for the check's read.
+          const refresh = yield* server.mutator
+            .reloadSecrets(dependent)
+            .pipe(Effect.forkChild({ startImmediately: true }));
+          yield* Deferred.succeed(release, undefined);
+
+          assert.deepStrictEqual(yield* Fiber.join(check), { _tag: "Resolved" });
+          yield* Fiber.join(refresh);
+          assert.deepStrictEqual(server.created.at(-1), {
+            instanceId: dependent,
+            secrets: ["wanted-new"],
+          });
+          assert.deepStrictEqual(yield* server.registry.listUnavailable, []);
+        }).pipe(Effect.scoped),
+      { discard: true },
+    ),
+  );
+
+  it.effect("a check replaces only its own key of a record-valued config secret", () =>
+    Effect.gen(function* () {
+      const vault = new Map<string, Array<string | undefined>>([
+        [wanted.reference, ["wanted-old"]],
+        [locked.reference, ["locked-key"]],
+        [other.reference, ["other-key"]],
+      ]);
+      const server = yield* setup(vault, [], {
+        dependentConfig: { keys: { a: wanted, b: locked } },
+      });
+      vault.set(wanted.reference, ["wanted-new"]);
+
+      assert.deepStrictEqual(yield* server.secretCheck.check(wanted), { _tag: "Resolved" });
+
+      assert.deepStrictEqual(server.created.at(-1), { instanceId: dependent, secrets: [] });
+      assert.deepStrictEqual(server.createdConfigs.at(-1), {
+        keys: { a: "wanted-new", b: "locked-key" },
+      });
+    }),
+  );
+});
diff --git a/apps/server/src/secrets/SecretCheck.ts b/apps/server/src/secrets/SecretCheck.ts
new file mode 100644
index 000000000000..f2a6241eeb7a
--- /dev/null
+++ b/apps/server/src/secrets/SecretCheck.ts
@@ -0,0 +1,39 @@
+import type { SecretReference, SecretSourceCheckResult } from "@t3tools/contracts";
+import * as SecretResolver from "@t3tools/secret-provider-core/server/SecretResolver";
+import * as Context from "effect/Context";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+
+import * as ProviderRegistry from "../provider/ProviderRegistry.ts";
+
+export class SecretCheck extends Context.Service<
+  SecretCheck,
+  {
+    /**
+     * Reads one secret fresh for the Settings "check" button and never returns the value. A
+     * readable secret also rebuilds the provider instances that read it, from that same read.
+     */
+    readonly check: (reference: SecretReference) => Effect.Effect<SecretSourceCheckResult>;
+  }
+>()("t3/secrets/SecretCheck") {}
+
+const make = Effect.gen(function* () {
+  const resolver = yield* SecretResolver.SecretResolver;
+  const providerRegistry = yield* ProviderRegistry.ProviderRegistry;
+
+  const check = Effect.fn("SecretCheck.check")(function* (reference: SecretReference) {
+    const [value] = yield* resolver.read([reference], { fresh: true });
+    if (value === undefined || value.trim() === "") {
+      return {
+        _tag: "Failed",
+        detail: `Could not read this secret from "${yield* resolver.label(reference.provider)}". Check the provider's settings and that its store is unlocked.`,
+      } as const;
+    }
+    yield* providerRegistry.applySecretAndRefresh(reference, value);
+    return { _tag: "Resolved" } as const;
+  });
+
+  return SecretCheck.of({ check });
+});
+
+export const layer = Layer.effect(SecretCheck, make);
diff --git a/apps/server/src/server.ts b/apps/server/src/server.ts
index f92b3cbaaf63..dae95787afe8 100644
--- a/apps/server/src/server.ts
+++ b/apps/server/src/server.ts
@@ -16,6 +16,7 @@ import * as NodeHttpServer from "@effect/platform-node/NodeHttpServer";
 import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
 import * as NodeServices from "@effect/platform-node/NodeServices";
 import { EnvironmentHttpApi, type RepositoryIdentity } from "@t3tools/contracts";
+import * as HostProcess from "@t3tools/shared/HostProcess";
 import * as Cause from "effect/Cause";
 import * as Duration from "effect/Duration";
 import * as Deferred from "effect/Deferred";
@@ -28,6 +29,7 @@ import * as HttpApiBuilder from "effect/http-api/HttpApiBuilder";
 
 import * as BackgroundPolicy from "./background/BackgroundPolicy.ts";
 import * as HostPowerMonitor from "./background/HostPowerMonitor.ts";
+import * as KeepAwake from "./background/KeepAwake.ts";
 import * as ServerConfig from "./config.ts";
 import { withUntracedRequests } from "./http.ts";
 import * as ServerHttp from "./http.ts";
@@ -36,6 +38,7 @@ import {
   keepIdleConnections,
   rejectRequestsUntilServing,
 } from "./httpResponseErrorGuard.ts";
+import { resolveLauncherPath } from "./cloud/pinnedRuntime.ts";
 import { fixPath } from "./os-jank.ts";
 import * as Ws from "./ws.ts";
 import * as AgentScopeLive from "./process/agentScope.ts";
@@ -74,6 +77,7 @@ import * as SourceControlBuiltInDrivers from "./sourceControl/builtInDrivers.ts"
 import * as SourceControlSignIn from "./sourceControl/SourceControlSignIn.ts";
 import { BUILT_IN_SOURCE_CONTROL_DRIVER_LIST } from "./sourceControl/sourceControlDefinitions.ts";
 import * as TextGeneration from "./textGeneration/TextGeneration.ts";
+import * as SecretCheck from "./secrets/SecretCheck.ts";
 import * as SecretResolver from "./secrets/SecretResolver.ts";
 import * as ProviderInstanceRegistryHydration from "./provider/ProviderInstanceRegistryHydration.ts";
 import * as ProjectSettingsOverrideSweep from "./provider/ProjectSettingsOverrideSweep.ts";
@@ -218,7 +222,7 @@ import * as RelayClient from "@t3tools/shared/relayClient";
 import {
   disableTailscaleServe,
   ensureTailscaleServe,
-  readTailscaleServeRootHolders,
+  readTailscaleServeRootHolder,
   readTailscaleServeRoutesTo,
   readTailscaleStatus,
 } from "@t3tools/tailscale";
@@ -492,7 +496,9 @@ const layerCheckpointStore = CheckpointStore.layer.pipe(Layer.provide(layerVcsDr
 
 const layerPortScanner = PortScanner.layer.pipe(Layer.provide(ProcessRunner.layer));
 
-const layerTerminal = TerminalManager.layer.pipe(
+const layerTerminal = TerminalManager.layer(
+  ProviderInstanceRegistryHydration.deriveProviderInstanceConfigMap,
+).pipe(
   Layer.provide(layerPtyAdapter),
   Layer.provide(layerPortScanner),
   Layer.provide(layerNativeTelemetry),
@@ -655,6 +661,7 @@ const layerRuntimeCoreDependenciesBase = Layer.mergeAll(
     Layer.provide(layerServerRestart),
   ),
   layerThreadPullRequestWorker,
+  KeepAwake.layer,
   DelegatedTaskAnalytics.layer,
   Layer.effectDiscard(
     Effect.gen(function* () {
@@ -691,6 +698,7 @@ const layerRuntimeCoreDependenciesBase = Layer.mergeAll(
   Layer.provideMerge(layerOrchestrationApplication),
   Layer.provideMerge(RuntimeLayer.layerEventInfrastructure),
   Layer.provideMerge(Layer.merge(ProjectStore.layer, ThreadSearch.layer)),
+  Layer.provideMerge(SecretCheck.layer),
   Layer.provideMerge(SecretResolver.layer),
   Layer.provideMerge(layerServerSettings),
   Layer.provideMerge(layerSourceControlProviderRegistry),
@@ -713,7 +721,9 @@ const layerRuntimeCoreDependenciesBase = Layer.mergeAll(
   Layer.provideMerge(layerPortScanner),
   Layer.provideMerge(
     Layer.mergeAll(
-      AntigravityInstallation.AntigravityInstallation.layer,
+      AntigravityInstallation.AntigravityInstallation.layer.pipe(
+        Layer.provide(layerServerSettings),
+      ),
       CodexInstallation.CodexInstallation.layer,
     ),
   ),
@@ -773,7 +783,7 @@ const layerRuntimeDependencies = layerRuntimeCoreDependencies.pipe(
   Layer.provideMerge(AnalyticsService.layer.pipe(Layer.provide(ManagedPolicy.layer))),
   Layer.provideMerge(ExternalLauncher.layer),
   Layer.provideMerge(RemoteOpenTargets.layer),
-  Layer.provideMerge(DirectEndpoints.layer),
+  Layer.provideMerge(DirectEndpoints.layer.pipe(Layer.provide(layerServerEnvironment))),
   Layer.provideMerge(ServerLifecycleEvents.layer),
   Layer.provide(NetService.layer),
 );
@@ -871,6 +881,8 @@ const layerMakeServer = Layer.unwrap(
     const routesReady = yield* Deferred.make<void>();
     const layerLauncher = ServiceLauncherClient.layer;
 
+    // fixPath rewrites PATH, so pin the launcher the shell chose before it does.
+    const invokedAs = (yield* resolveLauncherPath) ?? (yield* HostProcess.InvokedAs);
     yield* fixPath({ shellEnvironmentPrepared: config.shellEnvironmentPrepared });
 
     const layerHttpListening = Layer.effectDiscard(
@@ -906,22 +918,8 @@ const layerMakeServer = Layer.unwrap(
           );
       }),
     );
-    // Who holds the Serve port's root: nobody, this server, only dead loopback ports (an unclean
-    // exit leaves one), or another live server or app, whose route is left alone.
-    const tailscaleServeRootHolder = Effect.fn("server.tailscaleServeRootHolder")(
-      function* (target: { readonly host: string; readonly port: number }) {
-        const net = yield* NetService.NetService;
-        const holders = yield* readTailscaleServeRootHolders(config.tailscaleServePort, target);
-        if (holders.length === 0) return "none" as const;
-        if (holders.some((holder) => holder.ours)) return "ours" as const;
-        const live = yield* Effect.forEach(holders, (holder) =>
-          holder.ours || holder.loopback === undefined
-            ? Effect.succeed(true)
-            : net.hasListenerOnHost(holder.loopback.port, holder.loopback.host),
-        );
-        return live.includes(true) ? ("other" as const) : ("dead" as const);
-      },
-    );
+    const tailscaleServeRootHolder = (target: { readonly host: string; readonly port: number }) =>
+      readTailscaleServeRootHolder(config.tailscaleServePort, target);
     const layerTailscaleServe = config.tailscaleServeEnabled
       ? Layer.effectDiscard(
           Effect.acquireRelease(
@@ -968,11 +966,13 @@ const layerMakeServer = Layer.unwrap(
                   }),
                 ),
                 Effect.catch((cause) =>
-                  Effect.logWarning("Failed to configure Tailscale Serve", {
-                    cause,
-                    localPort,
-                    servePort: config.tailscaleServePort,
-                  }).pipe(Effect.as(null)),
+                  Effect.logWarning(
+                    cause._tag === "TailscaleCommandExitError" &&
+                      cause.stderrDiagnostic === "unsupported-target"
+                      ? `Tailscale Serve left off; this Tailscale install can only proxy to localhost, not ${localHost}. Bind --host 127.0.0.1 or 0.0.0.0 instead`
+                      : "Failed to configure Tailscale Serve",
+                    { cause, localPort, servePort: config.tailscaleServePort },
+                  ).pipe(Effect.as(null)),
                 ),
               );
             }),
@@ -1296,6 +1296,7 @@ const layerMakeServer = Layer.unwrap(
       Layer.provide(VcsProcess.layer),
       Layer.provideMerge(AgentScopeLive.layer),
       Layer.provideMerge(layerPlatformServices),
+      Layer.provide(Layer.succeed(HostProcess.InvokedAs, invokedAs)),
     );
   }),
 ).pipe(Layer.provide(ProcessRunner.layer));
diff --git a/apps/server/src/serverOwnership.ts b/apps/server/src/serverOwnership.ts
index 8644b7fd65c4..193233fa8abe 100644
--- a/apps/server/src/serverOwnership.ts
+++ b/apps/server/src/serverOwnership.ts
@@ -27,6 +27,10 @@ import {
   compareExactServiceVersions,
   serviceStateActiveVersion,
 } from "./cloud/serviceProtocol.ts";
+import {
+  legacyOwnerStartedBeforeRecord,
+  legacyOwnerStartTimeCommand,
+} from "./legacyServerOwner.ts";
 import * as ProcessRunner from "./processRunner.ts";
 import {
   clearPersistedServerRuntimeState,
@@ -80,29 +84,20 @@ const legacyOwnerIsLive = Effect.fn("legacyOwnerIsLive")(function* (
   if (!isProcessAlive(state.pid)) return false;
   const recordedAt = Date.parse(state.startedAt);
   if (!Number.isFinite(recordedAt)) return true;
-  const windows = (yield* HostProcess.Platform) === "win32";
+  const platform = yield* HostProcess.Platform;
   const runner = yield* ProcessRunner.ProcessRunner;
   const result = yield* runner
     .run({
-      command: windows ? "powershell.exe" : "ps",
-      args: windows
-        ? [
-            "-NoProfile",
-            "-NonInteractive",
-            "-Command",
-            `(Get-Process -Id ${state.pid} -ErrorAction Stop).StartTime.ToUniversalTime().ToString('o')`,
-          ]
-        : ["-p", String(state.pid), "-o", "lstart="],
-      env: { LC_ALL: "C", TZ: "UTC" },
+      ...legacyOwnerStartTimeCommand(state.pid, platform),
       timeout: Duration.seconds(2),
       maxOutputBytes: 16_384,
     })
     .pipe(Effect.option);
-  if (Option.isNone(result) || result.value.code !== 0) return true;
-  const output = result.value.stdout.trim();
-  const startedAt = Date.parse(windows ? output : `${output} UTC`);
-  // ps reports whole seconds. Unknown identity stays conservative.
-  return !Number.isFinite(startedAt) || startedAt <= recordedAt + 1_000;
+  return legacyOwnerStartedBeforeRecord(
+    Option.isSome(result) && result.value.code === 0 ? result.value.stdout : undefined,
+    recordedAt,
+    platform,
+  );
 });
 
 // Pre-lock services become invisible when another server replaces their runtime
@@ -193,7 +188,8 @@ const openOwnershipLock = (stateDir: string) =>
       }
       const db = new NodeSqlite.DatabaseSync(lockPath);
       try {
-        db.exec("PRAGMA busy_timeout = 0; BEGIN EXCLUSIVE;");
+        // An idle service launcher probes this lock for a moment; wait out that probe.
+        db.exec("PRAGMA busy_timeout = 250; BEGIN EXCLUSIVE;");
         const identity = NodeFS.statSync(lockPath, { bigint: true });
         return {
           db,
diff --git a/apps/server/src/serverRuntimeStartup.autoPull.test.ts b/apps/server/src/serverRuntimeStartup.autoPull.test.ts
index 2bc8f31c8f8b..563bf47f8ae6 100644
--- a/apps/server/src/serverRuntimeStartup.autoPull.test.ts
+++ b/apps/server/src/serverRuntimeStartup.autoPull.test.ts
@@ -37,166 +37,162 @@ import * as AnalyticsService from "./telemetry/AnalyticsService.ts";
 import * as GitVcsDriver from "./vcs/GitVcsDriver.ts";
 
 it.effect("parks automatic pull until activation without delaying command readiness", () =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      const activation = yield* Deferred.make<void>();
-      const prepared = yield* Deferred.make<void>();
-      const commitTrial = yield* Deferred.make<void>();
-      const statusCalled = yield* Deferred.make<string>();
-      const statusInterrupted = yield* Deferred.make<void>();
-      const cwd = "/auto-pull-project";
-      const updatedAt = "2026-01-01T00:00:00.000Z";
-      const snapshot = {
-        projects: [
-          {
-            id: ProjectId.make("auto-pull-project"),
-            title: "Auto pull project",
-            workspaceRoot: cwd,
-            repositoryIdentity: null,
-            defaultModelSelection: null,
-            scripts: [],
-            createdAt: updatedAt,
-            updatedAt,
-            deletedAt: null,
-          },
-        ],
-        updatedAt,
-      };
-      const recovery = {
-        terminalizedRuns: 0,
-        stoppedSessions: 0,
-        closedRequests: 0,
-        retiredEffects: 0,
-        requeuedEffects: 0,
-      };
-      const importSummary = { importedThreadCount: 0, importedMessageCount: 0 };
-      const dependencies: Layer.Layer<
-        Layer.Services<ReturnType<typeof ServerRuntimeStartup.layerWithOptions>>
-      > = Layer.mergeAll(
-        Layer.mock(ServerConfig.ServerConfig)({
-          ...(yield* ServerConfig.deriveServerPaths(cwd, undefined).pipe(
-            Effect.provide(Path.layer),
-          )),
-          baseDir: cwd,
-          logLevel: "Error",
-          traceMinLevel: "Info",
-          traceTimingEnabled: false,
-          traceBatchWindowMs: 200,
-          traceMaxBytes: 1024,
-          traceMaxFiles: 1,
-          otlpTracesUrl: undefined,
-          otlpMetricsUrl: undefined,
-          otlpLogsUrl: undefined,
-          otlpTracesExport: DEFAULT_SIGNAL_EXPORT,
-          otlpMetricsExport: DEFAULT_SIGNAL_EXPORT,
-          otlpLogsExport: DEFAULT_SIGNAL_EXPORT,
-          otelEnvironment: OtelEnvironment.none,
-          staticDir: undefined,
-          devAllowedOrigins: [],
-          desktopBootstrapToken: undefined,
-          logWebSocketEvents: false,
-          tailscaleServeEnabled: false,
-          tailscaleServePort: 443,
-          mode: "desktop",
-          cwd,
-          host: "localhost",
-          port: 3773,
-          devUrl: undefined,
-          noBrowser: true,
-          startupPresentation: "browser",
-          autoBootstrapProjectFromCwd: false,
+  Effect.gen(function* () {
+    const activation = yield* Deferred.make<void>();
+    const prepared = yield* Deferred.make<void>();
+    const commitTrial = yield* Deferred.make<void>();
+    const statusCalled = yield* Deferred.make<string>();
+    const statusInterrupted = yield* Deferred.make<void>();
+    const cwd = "/auto-pull-project";
+    const updatedAt = "2026-01-01T00:00:00.000Z";
+    const snapshot = {
+      projects: [
+        {
+          id: ProjectId.make("auto-pull-project"),
+          title: "Auto pull project",
+          workspaceRoot: cwd,
+          repositoryIdentity: null,
+          defaultModelSelection: null,
+          scripts: [],
+          createdAt: updatedAt,
+          updatedAt,
+          deletedAt: null,
+        },
+      ],
+      updatedAt,
+    };
+    const recovery = {
+      terminalizedRuns: 0,
+      stoppedSessions: 0,
+      closedRequests: 0,
+      retiredEffects: 0,
+      requeuedEffects: 0,
+    };
+    const importSummary = { importedThreadCount: 0, importedMessageCount: 0 };
+    const dependencies: Layer.Layer<
+      Layer.Services<ReturnType<typeof ServerRuntimeStartup.layerWithOptions>>
+    > = Layer.mergeAll(
+      Layer.mock(ServerConfig.ServerConfig)({
+        ...(yield* ServerConfig.deriveServerPaths(cwd, undefined).pipe(Effect.provide(Path.layer))),
+        baseDir: cwd,
+        logLevel: "Error",
+        traceMinLevel: "Info",
+        traceTimingEnabled: false,
+        traceBatchWindowMs: 200,
+        traceMaxBytes: 1024,
+        traceMaxFiles: 1,
+        otlpTracesUrl: undefined,
+        otlpMetricsUrl: undefined,
+        otlpLogsUrl: undefined,
+        otlpTracesExport: DEFAULT_SIGNAL_EXPORT,
+        otlpMetricsExport: DEFAULT_SIGNAL_EXPORT,
+        otlpLogsExport: DEFAULT_SIGNAL_EXPORT,
+        otelEnvironment: OtelEnvironment.none,
+        staticDir: undefined,
+        devAllowedOrigins: [],
+        desktopBootstrapToken: undefined,
+        logWebSocketEvents: false,
+        tailscaleServeEnabled: false,
+        tailscaleServePort: 443,
+        mode: "desktop",
+        cwd,
+        host: "localhost",
+        port: 3773,
+        devUrl: undefined,
+        noBrowser: true,
+        startupPresentation: "browser",
+        autoBootstrapProjectFromCwd: false,
+      }),
+      Layer.mock(Keybindings.Keybindings)({ start: Effect.void }),
+      Layer.mock(LegacyV1ThreadImporter.LegacyV1ThreadImporter)({
+        pendingThreadCount: Effect.succeed(0),
+        reconcileShells: Effect.succeed(importSummary),
+        importPendingTranscripts: Effect.succeed(importSummary),
+      }),
+      Layer.mock(ProviderRuntimeRecovery.ProviderRuntimeRecoveryService)({
+        recover: Effect.succeed(recovery),
+        prepareForShutdown: Effect.void,
+        reconcile: () => Effect.succeed(recovery),
+      }),
+      Layer.mock(Orchestrator.OrchestratorV2)({ recoverDelegatedTasks: Effect.void }),
+      Layer.mock(ProviderSessionManager.ProviderSessionManagerV2)({ shutdown: Effect.void }),
+      Layer.mock(AgentAwarenessRelay.AgentAwarenessRelay)({ start: () => Effect.void }),
+      Layer.mock(EffectWorker.OrchestrationEffectWorkerV2)({ runOnce: () => Effect.never }),
+      Layer.mock(ServerLifecycleEvents.ServerLifecycleEvents)({
+        publish: (event) => Effect.succeed({ ...event, sequence: 1 }),
+      }),
+      Layer.mock(ServerSettings.ServerSettingsService)({
+        start: Effect.void,
+        getSettings: Effect.succeed({ ...DEFAULT_SERVER_SETTINGS, defaultAutoPull: true }),
+      }),
+      Layer.mock(ServerEnvironment.ServerEnvironment)({
+        getDescriptor: Effect.succeed({
+          environmentId: EnvironmentId.make("auto-pull-environment"),
+          label: "Test environment",
+          platform: { os: "darwin", arch: "arm64" },
+          serverVersion: "0.0.0-test",
+          capabilities: { repositoryIdentity: true },
         }),
-        Layer.mock(Keybindings.Keybindings)({ start: Effect.void }),
-        Layer.mock(LegacyV1ThreadImporter.LegacyV1ThreadImporter)({
-          pendingThreadCount: Effect.succeed(0),
-          reconcileShells: Effect.succeed(importSummary),
-          importPendingTranscripts: Effect.succeed(importSummary),
-        }),
-        Layer.mock(ProviderRuntimeRecovery.ProviderRuntimeRecoveryService)({
-          recover: Effect.succeed(recovery),
-          prepareForShutdown: Effect.void,
-          reconcile: () => Effect.succeed(recovery),
-        }),
-        Layer.mock(Orchestrator.OrchestratorV2)({ recoverDelegatedTasks: Effect.void }),
-        Layer.mock(ProviderSessionManager.ProviderSessionManagerV2)({ shutdown: Effect.void }),
-        Layer.mock(AgentAwarenessRelay.AgentAwarenessRelay)({ start: () => Effect.void }),
-        Layer.mock(EffectWorker.OrchestrationEffectWorkerV2)({ runOnce: () => Effect.never }),
-        Layer.mock(ServerLifecycleEvents.ServerLifecycleEvents)({
-          publish: (event) => Effect.succeed({ ...event, sequence: 1 }),
-        }),
-        Layer.mock(ServerSettings.ServerSettingsService)({
-          start: Effect.void,
-          getSettings: Effect.succeed({ ...DEFAULT_SERVER_SETTINGS, defaultAutoPull: true }),
-        }),
-        Layer.mock(ServerEnvironment.ServerEnvironment)({
-          getDescriptor: Effect.succeed({
-            environmentId: EnvironmentId.make("auto-pull-environment"),
-            label: "Test environment",
-            platform: { os: "darwin", arch: "arm64" },
-            serverVersion: "0.0.0-test",
-            capabilities: { repositoryIdentity: true },
-          }),
-        }),
-        Layer.mock(ProjectStore.ProjectStoreV2)({
-          listShells: () => Effect.succeed(snapshot.projects),
-        }),
-        Layer.mock(ProjectService.ProjectService)({ snapshot: Effect.succeed(snapshot) }),
-        Layer.mock(ThreadManagement.ThreadManagementService)({
-          countThreads: () => Effect.succeed(0),
-        }),
-        Layer.mock(ThreadLaunch.ThreadLaunchService)({}),
-        Layer.mock(ServiceLauncherClient.ServiceLauncherClient)({
-          managed: true,
-          protocol: SERVICE_LAUNCHER_PROTOCOL,
-          prepareTrial: () =>
-            Deferred.succeed(prepared, undefined).pipe(
-              Effect.andThen(Deferred.await(commitTrial)),
-              Effect.as(undefined),
-            ),
-        }),
-        Layer.mock(GitVcsDriver.GitVcsDriver)({
-          statusDetails: (root) =>
-            Deferred.succeed(statusCalled, root).pipe(
-              Effect.andThen(Effect.never),
-              Effect.onInterrupt(() => Deferred.succeed(statusInterrupted, undefined)),
-            ),
-        }),
-        Layer.mock(AnalyticsService.AnalyticsService)({ record: () => Effect.void }),
-        // No provider logins or Connect link, so startup records no owners.
-        FileSystem.layerNoop({}),
-        Layer.mock(ServerSecretStore.ServerSecretStore)({ get: () => Effect.succeedNone }),
-        NodeCrypto.layer,
-        Layer.mock(EnvironmentAuth.EnvironmentAuth)({}),
-        Layer.mock(ExternalLauncher.ExternalLauncher)({}),
-        Layer.mock(HttpServer.HttpServer)({
-          address: NetAddress.inetAddressFromIpStringUnsafe("127.0.0.1", 3773),
-        }),
-        Path.layer,
-      );
+      }),
+      Layer.mock(ProjectStore.ProjectStoreV2)({
+        listShells: () => Effect.succeed(snapshot.projects),
+      }),
+      Layer.mock(ProjectService.ProjectService)({ snapshot: Effect.succeed(snapshot) }),
+      Layer.mock(ThreadManagement.ThreadManagementService)({
+        countThreads: () => Effect.succeed(0),
+      }),
+      Layer.mock(ThreadLaunch.ThreadLaunchService)({}),
+      Layer.mock(ServiceLauncherClient.ServiceLauncherClient)({
+        managed: true,
+        protocol: SERVICE_LAUNCHER_PROTOCOL,
+        prepareTrial: () =>
+          Deferred.succeed(prepared, undefined).pipe(
+            Effect.andThen(Deferred.await(commitTrial)),
+            Effect.as(undefined),
+          ),
+      }),
+      Layer.mock(GitVcsDriver.GitVcsDriver)({
+        statusDetails: (root) =>
+          Deferred.succeed(statusCalled, root).pipe(
+            Effect.andThen(Effect.never),
+            Effect.onInterrupt(() => Deferred.succeed(statusInterrupted, undefined)),
+          ),
+      }),
+      Layer.mock(AnalyticsService.AnalyticsService)({ record: () => Effect.void }),
+      // No provider logins or Connect link, so startup records no owners.
+      FileSystem.layerNoop({}),
+      Layer.mock(ServerSecretStore.ServerSecretStore)({ get: () => Effect.succeedNone }),
+      NodeCrypto.layer,
+      Layer.mock(EnvironmentAuth.EnvironmentAuth)({}),
+      Layer.mock(ExternalLauncher.ExternalLauncher)({}),
+      Layer.mock(HttpServer.HttpServer)({
+        address: NetAddress.inetAddressFromIpStringUnsafe("127.0.0.1", 3773),
+      }),
+      Path.layer,
+    );
 
-      yield* Effect.gen(function* () {
-        const startup = yield* ServerRuntimeStartup.ServerRuntimeStartup;
-        yield* startup.markHttpListening;
+    yield* Effect.gen(function* () {
+      const startup = yield* ServerRuntimeStartup.ServerRuntimeStartup;
+      yield* startup.markHttpListening;
 
-        yield* Effect.raceFirst(Deferred.await(prepared), Deferred.await(statusCalled));
-        expect(yield* Deferred.isDone(activation)).toBe(false);
-        expect(yield* Deferred.isDone(statusCalled)).toBe(false);
-        expect(yield* Deferred.isDone(prepared)).toBe(true);
+      yield* Effect.raceFirst(Deferred.await(prepared), Deferred.await(statusCalled));
+      expect(yield* Deferred.isDone(activation)).toBe(false);
+      expect(yield* Deferred.isDone(statusCalled)).toBe(false);
+      expect(yield* Deferred.isDone(prepared)).toBe(true);
 
-        yield* Deferred.succeed(commitTrial, undefined);
-        yield* Deferred.await(activation);
-        expect(yield* Deferred.await(statusCalled)).toBe(cwd);
-        yield* startup.awaitCommandReady;
-      }).pipe(
-        Effect.provide(
-          ServerRuntimeStartup.layerWithOptions({
-            activate: Deferred.succeed(activation, undefined).pipe(Effect.asVoid),
-            awaitAuxiliaryParked: Effect.void,
-          }).pipe(Layer.provide(dependencies)),
-        ),
-        Effect.provideService(ServerActivation, Deferred.await(activation)),
-      );
-      expect(yield* Deferred.isDone(statusInterrupted)).toBe(true);
-    }),
-  ),
+      yield* Deferred.succeed(commitTrial, undefined);
+      yield* Deferred.await(activation);
+      expect(yield* Deferred.await(statusCalled)).toBe(cwd);
+      yield* startup.awaitCommandReady;
+    }).pipe(
+      Effect.provide(
+        ServerRuntimeStartup.layerWithOptions({
+          activate: Deferred.succeed(activation, undefined).pipe(Effect.asVoid),
+          awaitAuxiliaryParked: Effect.void,
+        }).pipe(Layer.provide(dependencies)),
+      ),
+      Effect.provideService(ServerActivation, Deferred.await(activation)),
+    );
+    expect(yield* Deferred.isDone(statusInterrupted)).toBe(true);
+  }),
 );
diff --git a/apps/server/src/serverRuntimeStartup.test.ts b/apps/server/src/serverRuntimeStartup.test.ts
index 180defacbfcc..7a3c6068a054 100644
--- a/apps/server/src/serverRuntimeStartup.test.ts
+++ b/apps/server/src/serverRuntimeStartup.test.ts
@@ -53,252 +53,242 @@ it.effect.each([
   "launch-failure",
   "project-failure",
 ] as const)("keeps bootstrap launch failures separate from project failures: %s", (scenario) =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      const projectId = ProjectId.make("bootstrap-project");
-      const instanceId = ProviderInstanceId.make(
-        scenario === "disabled-default" ? "custom" : "codex",
-      );
-      const events: ServerLifecycleStreamEvent[] = [];
-      const recovery = {
-        terminalizedRuns: 0,
-        stoppedSessions: 0,
-        closedRequests: 0,
-        retiredEffects: 0,
-        requeuedEffects: 0,
-      };
-      const imports = { importedThreadCount: 0, importedMessageCount: 0 };
-      const dependencies = Layer.mergeAll(
-        NodeCrypto.layer,
-        Path.layer,
-        Layer.mock(ServerConfig.ServerConfig)({
-          ...(yield* ServerConfig.deriveServerPaths("/bootstrap-project", undefined).pipe(
-            Effect.provide(Path.layer),
-          )),
-          baseDir: "/bootstrap-project",
-          logLevel: "Error",
-          traceMinLevel: "Info",
-          traceTimingEnabled: false,
-          traceBatchWindowMs: 200,
-          traceMaxBytes: 1024,
-          traceMaxFiles: 1,
-          otlpTracesUrl: undefined,
-          otlpMetricsUrl: undefined,
-          otlpLogsUrl: undefined,
-          otlpTracesExport: DEFAULT_SIGNAL_EXPORT,
-          otlpMetricsExport: DEFAULT_SIGNAL_EXPORT,
-          otlpLogsExport: DEFAULT_SIGNAL_EXPORT,
-          otelEnvironment: OtelEnvironment.none,
-          staticDir: undefined,
-          devAllowedOrigins: [],
-          desktopBootstrapToken: undefined,
-          logWebSocketEvents: false,
-          tailscaleServeEnabled: false,
-          tailscaleServePort: 443,
-          mode: "web",
-          cwd: "/bootstrap-project",
-          host: "localhost",
-          port: 3773,
-          devUrl: undefined,
-          noBrowser: true,
-          startupPresentation: "browser",
-          autoBootstrapProjectFromCwd: true,
-        }),
-        Layer.mock(Keybindings.Keybindings)({ start: Effect.void }),
-        Layer.mock(LegacyV1ThreadImporter.LegacyV1ThreadImporter)({
-          pendingThreadCount: Effect.succeed(0),
-          reconcileShells: Effect.succeed(imports),
-          importPendingTranscripts: Effect.succeed(imports),
-        }),
-        Layer.mock(ProviderRuntimeRecovery.ProviderRuntimeRecoveryService)({
-          recover: Effect.succeed(recovery),
-          prepareForShutdown: Effect.void,
-          reconcile: () => Effect.succeed(recovery),
-        }),
-        Layer.mock(Orchestrator.OrchestratorV2)({ recoverDelegatedTasks: Effect.void }),
-        Layer.mock(ProviderSessionManager.ProviderSessionManagerV2)({ shutdown: Effect.void }),
-        Layer.mock(AgentAwarenessRelay.AgentAwarenessRelay)({ start: () => Effect.void }),
-        Layer.mock(EffectWorker.OrchestrationEffectWorkerV2)({ runOnce: () => Effect.never }),
-        Layer.mock(ServerLifecycleEvents.ServerLifecycleEvents)({
-          publish: (event) =>
-            Effect.sync(() => {
-              const published = { ...event, sequence: events.length + 1 };
-              events.push(published);
-              return published;
-            }),
-        }),
-        Layer.mock(ServerSettings.ServerSettingsService)({
-          start: Effect.void,
-          getSettings: Effect.succeed({
-            ...DEFAULT_SERVER_SETTINGS,
-            defaultModelSelection:
-              scenario === "disabled-default" ? { instanceId, model: "custom-model" } : null,
-            providerInstances: {
-              [instanceId]: {
-                driver: ProviderDriverKind.make("codex"),
-                enabled: false,
-                config: {},
-              },
-            },
-          }),
-        }),
-        Layer.mock(ServerEnvironment.ServerEnvironment)({
-          getDescriptor: Effect.succeed({
-            environmentId: EnvironmentId.make("bootstrap-environment"),
-            label: "Test environment",
-            platform: { os: "linux", arch: "x64" },
-            serverVersion: "0.0.0-test",
-            capabilities: { repositoryIdentity: true },
+  Effect.gen(function* () {
+    const projectId = ProjectId.make("bootstrap-project");
+    const instanceId = ProviderInstanceId.make(
+      scenario === "disabled-default" ? "custom" : "codex",
+    );
+    const events: ServerLifecycleStreamEvent[] = [];
+    const recovery = {
+      terminalizedRuns: 0,
+      stoppedSessions: 0,
+      closedRequests: 0,
+      retiredEffects: 0,
+      requeuedEffects: 0,
+    };
+    const imports = { importedThreadCount: 0, importedMessageCount: 0 };
+    const dependencies = Layer.mergeAll(
+      NodeCrypto.layer,
+      Path.layer,
+      Layer.mock(ServerConfig.ServerConfig)({
+        ...(yield* ServerConfig.deriveServerPaths("/bootstrap-project", undefined).pipe(
+          Effect.provide(Path.layer),
+        )),
+        baseDir: "/bootstrap-project",
+        logLevel: "Error",
+        traceMinLevel: "Info",
+        traceTimingEnabled: false,
+        traceBatchWindowMs: 200,
+        traceMaxBytes: 1024,
+        traceMaxFiles: 1,
+        otlpTracesUrl: undefined,
+        otlpMetricsUrl: undefined,
+        otlpLogsUrl: undefined,
+        otlpTracesExport: DEFAULT_SIGNAL_EXPORT,
+        otlpMetricsExport: DEFAULT_SIGNAL_EXPORT,
+        otlpLogsExport: DEFAULT_SIGNAL_EXPORT,
+        otelEnvironment: OtelEnvironment.none,
+        staticDir: undefined,
+        devAllowedOrigins: [],
+        desktopBootstrapToken: undefined,
+        logWebSocketEvents: false,
+        tailscaleServeEnabled: false,
+        tailscaleServePort: 443,
+        mode: "web",
+        cwd: "/bootstrap-project",
+        host: "localhost",
+        port: 3773,
+        devUrl: undefined,
+        noBrowser: true,
+        startupPresentation: "browser",
+        autoBootstrapProjectFromCwd: true,
+      }),
+      Layer.mock(Keybindings.Keybindings)({ start: Effect.void }),
+      Layer.mock(LegacyV1ThreadImporter.LegacyV1ThreadImporter)({
+        pendingThreadCount: Effect.succeed(0),
+        reconcileShells: Effect.succeed(imports),
+        importPendingTranscripts: Effect.succeed(imports),
+      }),
+      Layer.mock(ProviderRuntimeRecovery.ProviderRuntimeRecoveryService)({
+        recover: Effect.succeed(recovery),
+        prepareForShutdown: Effect.void,
+        reconcile: () => Effect.succeed(recovery),
+      }),
+      Layer.mock(Orchestrator.OrchestratorV2)({ recoverDelegatedTasks: Effect.void }),
+      Layer.mock(ProviderSessionManager.ProviderSessionManagerV2)({ shutdown: Effect.void }),
+      Layer.mock(AgentAwarenessRelay.AgentAwarenessRelay)({ start: () => Effect.void }),
+      Layer.mock(EffectWorker.OrchestrationEffectWorkerV2)({ runOnce: () => Effect.never }),
+      Layer.mock(ServerLifecycleEvents.ServerLifecycleEvents)({
+        publish: (event) =>
+          Effect.sync(() => {
+            const published = { ...event, sequence: events.length + 1 };
+            events.push(published);
+            return published;
           }),
-        }),
-        Layer.mock(ProjectStore.ProjectStoreV2)({}),
-        Layer.mock(ProjectService.ProjectService)({
-          bootstrap: () =>
-            scenario === "project-failure"
-              ? Effect.die("project bootstrap failed")
-              : Effect.succeed({
-                  created: true,
-                  project: {
-                    id: projectId,
-                    title: "Project",
-                    workspaceRoot: "/bootstrap-project",
-                    repositoryIdentity: null,
-                    faviconPath: null,
-                    scripts: [],
-                    createdAt: "2026-01-01T00:00:00Z",
-                    updatedAt: "2026-01-01T00:00:00Z",
-                    deletedAt: null,
-                    defaultModelSelection:
-                      scenario === "disabled-default"
-                        ? { instanceId, model: "custom-model" }
-                        : null,
-                  },
-                }),
-        }),
-        Layer.mock(ThreadManagement.ThreadManagementService)({
-          countThreads: () => Effect.succeed(0),
-          listActiveShellIndex: () => Effect.succeed([]),
-        }),
-        Layer.mock(ThreadLaunch.ThreadLaunchService)({
-          launch: (input) => {
-            assert.equal(input.modelSelection.instanceId, instanceId);
-            return scenario === "launch-failure"
-              ? Effect.fail(
-                  new ThreadLaunch.ThreadLaunchError({
-                    operation: "create-thread",
-                    commandId: CommandId.make("bootstrap-command"),
-                    projectId,
-                    cause: "test launch failure",
-                  }),
-                )
-              : Effect.fail(
-                  new ThreadManagement.ThreadManagementProviderInstanceDisabledError({
-                    projectId,
-                    instanceId,
-                  }),
-                );
+      }),
+      Layer.mock(ServerSettings.ServerSettingsService)({
+        start: Effect.void,
+        getSettings: Effect.succeed({
+          ...DEFAULT_SERVER_SETTINGS,
+          defaultModelSelection:
+            scenario === "disabled-default" ? { instanceId, model: "custom-model" } : null,
+          providerInstances: {
+            [instanceId]: {
+              driver: ProviderDriverKind.make("codex"),
+              enabled: false,
+              config: {},
+            },
           },
         }),
-        Layer.mock(ServiceLauncherClient.ServiceLauncherClient)({
-          managed: false,
-          protocol: undefined,
-          prepareTrial: () => Effect.undefined,
-        }),
-        Layer.mock(GitVcsDriver.GitVcsDriver)({}),
-        Layer.mock(AnalyticsService.AnalyticsService)({}),
-        // No provider logins or Connect link, so startup records no owners.
-        FileSystem.layerNoop({}),
-        Layer.mock(ServerSecretStore.ServerSecretStore)({ get: () => Effect.succeedNone }),
-        Layer.mock(EnvironmentAuth.EnvironmentAuth)({}),
-        Layer.mock(ExternalLauncher.ExternalLauncher)({}),
-        Layer.mock(HttpServer.HttpServer)({
-          address: NetAddress.inetAddressFromIpStringUnsafe("127.0.0.1", 3773),
+      }),
+      Layer.mock(ServerEnvironment.ServerEnvironment)({
+        getDescriptor: Effect.succeed({
+          environmentId: EnvironmentId.make("bootstrap-environment"),
+          label: "Test environment",
+          platform: { os: "linux", arch: "x64" },
+          serverVersion: "0.0.0-test",
+          capabilities: { repositoryIdentity: true },
         }),
-      );
-      yield* Effect.gen(function* () {
-        const startup = yield* ServerRuntimeStartup.ServerRuntimeStartup;
-        yield* startup.markHttpListening;
-        const ready = yield* Effect.exit(startup.awaitCommandReady);
-        assert.equal(Exit.isSuccess(ready), scenario !== "project-failure");
-        const welcome = events.find((event) => event.type === "welcome");
-        if (scenario === "project-failure") {
-          assert.isUndefined(welcome);
-        } else {
-          assert.isDefined(welcome);
-          if (welcome?.type === "welcome") {
-            assert.equal(welcome.payload.bootstrapProjectId, projectId);
-            assert.isUndefined(welcome.payload.bootstrapThreadId);
-          }
+      }),
+      Layer.mock(ProjectStore.ProjectStoreV2)({}),
+      Layer.mock(ProjectService.ProjectService)({
+        bootstrap: () =>
+          scenario === "project-failure"
+            ? Effect.die("project bootstrap failed")
+            : Effect.succeed({
+                created: true,
+                project: {
+                  id: projectId,
+                  title: "Project",
+                  workspaceRoot: "/bootstrap-project",
+                  repositoryIdentity: null,
+                  faviconPath: null,
+                  scripts: [],
+                  createdAt: "2026-01-01T00:00:00Z",
+                  updatedAt: "2026-01-01T00:00:00Z",
+                  deletedAt: null,
+                  defaultModelSelection:
+                    scenario === "disabled-default" ? { instanceId, model: "custom-model" } : null,
+                },
+              }),
+      }),
+      Layer.mock(ThreadManagement.ThreadManagementService)({
+        countThreads: () => Effect.succeed(0),
+        listActiveShellIndex: () => Effect.succeed([]),
+      }),
+      Layer.mock(ThreadLaunch.ThreadLaunchService)({
+        launch: (input) => {
+          assert.equal(input.modelSelection.instanceId, instanceId);
+          return scenario === "launch-failure"
+            ? Effect.fail(
+                new ThreadLaunch.ThreadLaunchError({
+                  operation: "create-thread",
+                  commandId: CommandId.make("bootstrap-command"),
+                  projectId,
+                  cause: "test launch failure",
+                }),
+              )
+            : Effect.fail(
+                new ThreadManagement.ThreadManagementProviderInstanceDisabledError({
+                  projectId,
+                  instanceId,
+                }),
+              );
+        },
+      }),
+      Layer.mock(ServiceLauncherClient.ServiceLauncherClient)({
+        managed: false,
+        protocol: undefined,
+        prepareTrial: () => Effect.undefined,
+      }),
+      Layer.mock(GitVcsDriver.GitVcsDriver)({}),
+      Layer.mock(AnalyticsService.AnalyticsService)({}),
+      // No provider logins or Connect link, so startup records no owners.
+      FileSystem.layerNoop({}),
+      Layer.mock(ServerSecretStore.ServerSecretStore)({ get: () => Effect.succeedNone }),
+      Layer.mock(EnvironmentAuth.EnvironmentAuth)({}),
+      Layer.mock(ExternalLauncher.ExternalLauncher)({}),
+      Layer.mock(HttpServer.HttpServer)({
+        address: NetAddress.inetAddressFromIpStringUnsafe("127.0.0.1", 3773),
+      }),
+    );
+    yield* Effect.gen(function* () {
+      const startup = yield* ServerRuntimeStartup.ServerRuntimeStartup;
+      yield* startup.markHttpListening;
+      const ready = yield* Effect.exit(startup.awaitCommandReady);
+      assert.equal(Exit.isSuccess(ready), scenario !== "project-failure");
+      const welcome = events.find((event) => event.type === "welcome");
+      if (scenario === "project-failure") {
+        assert.isUndefined(welcome);
+      } else {
+        assert.isDefined(welcome);
+        if (welcome?.type === "welcome") {
+          assert.equal(welcome.payload.bootstrapProjectId, projectId);
+          assert.isUndefined(welcome.payload.bootstrapThreadId);
         }
-      }).pipe(
-        Effect.provide(ServerRuntimeStartup.layerWithOptions().pipe(Layer.provide(dependencies))),
-        Effect.provideService(ServerActivation, Effect.never),
-      );
-    }),
-  ),
+      }
+    }).pipe(
+      Effect.provide(ServerRuntimeStartup.layerWithOptions().pipe(Layer.provide(dependencies))),
+      Effect.provideService(ServerActivation, Effect.never),
+    );
+  }),
 );
 
 it.effect("interrupts the effect worker when awareness relay startup fails", () =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      const workerInterrupted = yield* Ref.make(false);
-      const workerFiberRef = yield* Ref.make<Fiber.Fiber<void, never> | null>(null);
+  Effect.gen(function* () {
+    const workerInterrupted = yield* Ref.make(false);
+    const workerFiberRef = yield* Ref.make<Fiber.Fiber<void, never> | null>(null);
 
-      const exit = yield* ServerRuntimeStartup.startEffectWorkerWithRelay({
-        runWorker: Effect.never.pipe(Effect.ensuring(Ref.set(workerInterrupted, true))),
-        startRelay: Effect.yieldNow.pipe(
-          Effect.andThen(Effect.die("awareness relay startup failed")),
-        ),
-        workerFiberRef,
-      }).pipe(Effect.exit);
+    const exit = yield* ServerRuntimeStartup.startEffectWorkerWithRelay({
+      runWorker: Effect.never.pipe(Effect.ensuring(Ref.set(workerInterrupted, true))),
+      startRelay: Effect.yieldNow.pipe(
+        Effect.andThen(Effect.die("awareness relay startup failed")),
+      ),
+      workerFiberRef,
+    }).pipe(Effect.exit);
 
-      assert.isTrue(Exit.isFailure(exit));
-      assert.isTrue(yield* Ref.get(workerInterrupted));
-      assert.isNull(yield* Ref.get(workerFiberRef));
-    }),
-  ),
+    assert.isTrue(Exit.isFailure(exit));
+    assert.isTrue(yield* Ref.get(workerInterrupted));
+    assert.isNull(yield* Ref.get(workerFiberRef));
+  }),
 );
 
 it.effect("queues commands until startup signals readiness", () =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      const gate = yield* ServerRuntimeStartup.makeCommandGate;
-      const count = yield* Ref.make(0);
-      const queued = yield* gate
-        .enqueueCommand(Ref.updateAndGet(count, (value) => value + 1))
-        .pipe(Effect.forkScoped);
+  Effect.gen(function* () {
+    const gate = yield* ServerRuntimeStartup.makeCommandGate;
+    const count = yield* Ref.make(0);
+    const queued = yield* gate
+      .enqueueCommand(Ref.updateAndGet(count, (value) => value + 1))
+      .pipe(Effect.forkScoped);
 
-      yield* Effect.yieldNow;
-      assert.equal(yield* Ref.get(count), 0);
-      yield* gate.signalCommandReady;
-      assert.equal(yield* Fiber.join(queued), 1);
-    }),
-  ),
+    yield* Effect.yieldNow;
+    assert.equal(yield* Ref.get(count), 0);
+    yield* gate.signalCommandReady;
+    assert.equal(yield* Fiber.join(queued), 1);
+  }),
 );
 
 it.effect("enqueueCommand fails queued work when readiness fails", () =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      const commandGate = yield* ServerRuntimeStartup.makeCommandGate;
-      const failure = yield* Deferred.make<void, never>();
+  Effect.gen(function* () {
+    const commandGate = yield* ServerRuntimeStartup.makeCommandGate;
+    const failure = yield* Deferred.make<void, never>();
 
-      const queuedCommandFiber = yield* commandGate
-        .enqueueCommand(Deferred.await(failure).pipe(Effect.as("should-not-run")))
-        .pipe(Effect.forkScoped);
+    const queuedCommandFiber = yield* commandGate
+      .enqueueCommand(Deferred.await(failure).pipe(Effect.as("should-not-run")))
+      .pipe(Effect.forkScoped);
 
-      yield* commandGate.failCommandReady(
-        new ServerRuntimeStartup.ServerRuntimeStartupError({
-          mode: "web",
-          host: "127.0.0.1",
-          port: 3773,
-          cause: new Error("test startup failure"),
-        }),
-      );
+    yield* commandGate.failCommandReady(
+      new ServerRuntimeStartup.ServerRuntimeStartupError({
+        mode: "web",
+        host: "127.0.0.1",
+        port: 3773,
+        cause: new Error("test startup failure"),
+      }),
+    );
 
-      const error = yield* Effect.flip(Fiber.join(queuedCommandFiber));
-      assert.equal(error.message, "Server runtime startup failed before command readiness.");
-    }),
-  ),
+    const error = yield* Effect.flip(Fiber.join(queuedCommandFiber));
+    assert.equal(error.message, "Server runtime startup failed before command readiness.");
+  }),
 );
 
 it.effect("automatic pull only updates enabled, behind, clean default-branch checkouts", () =>
diff --git a/apps/server/src/serverSettings.test.ts b/apps/server/src/serverSettings.test.ts
index 347b43dd6f44..3ca2d29da7c8 100644
--- a/apps/server/src/serverSettings.test.ts
+++ b/apps/server/src/serverSettings.test.ts
@@ -1,3 +1,4 @@
+import { deriveProviderInstanceConfigMap } from "./provider/ProviderInstanceRegistryHydration.ts";
 import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
 import * as NodeServices from "@effect/platform-node/NodeServices";
 import {
@@ -539,6 +540,17 @@ it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))("server settings"
           (yield* serverSettings.getSettings).providerInstances[instanceId]?.displayName ?? "",
         ),
       );
+
+      // An inherited Object.prototype member is not an instance that already exists.
+      for (const name of ["constructor", "toString", "valueOf"]) {
+        const prototypeNamedId = ProviderInstanceId.make(name);
+        const created = yield* serverSettings.updateProviderInstance({
+          operation: "create",
+          instanceId: prototypeNamedId,
+          instance: { driver: ProviderDriverKind.make("codex") },
+        });
+        assert.isTrue(Object.hasOwn(created.providerInstances, prototypeNamedId));
+      }
     }).pipe(Effect.provide(layerServerSettings())),
   );
 
@@ -2063,6 +2075,7 @@ it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))("server settings"
       });
 
       const environment = yield* resolveProviderInstanceTerminalEnvironment({
+        deriveProviderInstanceConfigMap,
         serverSettings,
         path,
         rawProviderInstanceId: instanceId,
diff --git a/apps/server/src/serverSettings.ts b/apps/server/src/serverSettings.ts
index 251becba12f6..4dc30d29a6cf 100644
--- a/apps/server/src/serverSettings.ts
+++ b/apps/server/src/serverSettings.ts
@@ -237,7 +237,7 @@ function ensureProviderInstanceMutationAllowed(
 ): Effect.Effect<void, ServerSettingsError> {
   if (
     mutation.operation === "create" &&
-    settings.providerInstances[mutation.instanceId] !== undefined
+    Object.hasOwn(settings.providerInstances, mutation.instanceId)
   ) {
     return Effect.fail(
       new ServerSettingsError({
diff --git a/apps/server/src/serviceLauncher.test.ts b/apps/server/src/serviceLauncher.test.ts
index 2ff0a42cb441..ac699b9c7d6c 100644
--- a/apps/server/src/serviceLauncher.test.ts
+++ b/apps/server/src/serviceLauncher.test.ts
@@ -30,6 +30,7 @@ import {
   registerServiceTask,
   serviceLauncherIsRunning,
   serviceLauncherLockPath,
+  stateDirOwned,
   writeServiceState,
 } from "./serviceLauncher.ts";
 import {
@@ -44,12 +45,27 @@ import {
 } from "./cloud/serviceProtocol.ts";
 
 const spawnedChildren = vi.hoisted((): Array<NodeChildProcess.ChildProcess> => []);
+const spawnHook = vi.hoisted(() => ({
+  current: undefined as ((child: NodeChildProcess.ChildProcess) => void) | undefined,
+}));
+
+const failRm = vi.hoisted(() => ({ path: undefined as string | undefined }));
+
+vi.mock("node:fs/promises", async (importOriginal) => {
+  const actual = await importOriginal<typeof NodeFSP>();
+  const rm: typeof actual.rm = (path, options) =>
+    path === failRm.path
+      ? Promise.reject(Object.assign(new Error("EACCES"), { code: "EACCES" }))
+      : actual.rm(path, options);
+  return { ...actual, rm };
+});
 
 vi.mock("node:child_process", async (importOriginal) => {
   const actual = await importOriginal<typeof NodeChildProcess>();
   const spawn = (...args: Parameters<typeof actual.spawn>) => {
     const child = actual.spawn(...args);
     spawnedChildren.push(child);
+    spawnHook.current?.(child);
     return child;
   };
   return { ...actual, spawn: spawn as typeof actual.spawn };
@@ -302,6 +318,70 @@ it.layer(NodeServices.layer)("service state persistence", (it) => {
     }),
   );
 
+  it.effect(
+    "repoints the systemd unit the manager loads when environment.d moves XDG_CONFIG_HOME",
+    () =>
+      Effect.gen(function* () {
+        const fs = yield* FileSystem.FileSystem;
+        const path = yield* Path.Path;
+        const root = yield* fs.makeTempDirectoryScoped({ prefix: "t3-service-launcher-xdg-" });
+        const home = path.join(root, "home");
+        const managerUnitDir = path.join(home, ".config", "systemd", "user");
+        const unitPath = path.join(managerUnitDir, "t3code.service");
+        const render = (version: string) =>
+          renderBootServiceUnit({ ...unitPlan(root, version), unitPath });
+        yield* fs.makeDirectory(managerUnitDir, { recursive: true });
+        yield* fs.writeFileString(unitPath, render("1.0.0"));
+        // Fake manager: busctl reports the unit search path, systemctl reloads.
+        const bin = path.join(root, "bin");
+        yield* fs.makeDirectory(bin, { recursive: true });
+        const unitPathJson = JSON.stringify({
+          type: "as",
+          data: [`${managerUnitDir}.control`, managerUnitDir, "/usr/lib/systemd/user"],
+        });
+        yield* fs.writeFileString(
+          path.join(bin, "busctl"),
+          `#!/bin/sh\nprintf '%s\\n' '${unitPathJson}'\n`,
+        );
+        yield* fs.writeFileString(
+          path.join(bin, "systemctl"),
+          `#!/bin/sh\necho reload >> '${path.join(root, "reloads")}'\n`,
+        );
+        yield* fs.chmod(path.join(bin, "busctl"), 0o755);
+        yield* fs.chmod(path.join(bin, "systemctl"), 0o755);
+        yield* writeFakeRuntime(
+          fs,
+          path,
+          path.join(root, "runtime", "versions", "1.1.0"),
+          "process.exit(0);\n",
+        );
+        yield* Effect.promise(() =>
+          writeServiceState(path.join(root, "runtime", "service-state.json"), {
+            protocol: SERVICE_LAUNCHER_PROTOCOL,
+            activeVersion: "1.1.0",
+            update: {
+              id: "update-1",
+              fromVersion: "1.0.0",
+              targetVersion: "1.1.0",
+              status: "committed",
+            },
+          }),
+        );
+        vi.stubEnv("PATH", bin);
+        vi.stubEnv("HOME", home);
+        // environment.d changes what services inherit, not where the manager reads units.
+        vi.stubEnv("XDG_CONFIG_HOME", path.join(home, "service-config"));
+        vi.stubEnv("T3_BOOT_SERVICE_UNIT", "t3code.service");
+
+        yield* Effect.promise(() =>
+          expect(runLauncher(root)).rejects.toThrow("Active child exited unexpectedly (0)."),
+        );
+
+        assert.equal(yield* fs.readFileString(unitPath), render("1.1.0"));
+        assert.equal(yield* fs.readFileString(path.join(root, "reloads")), "reload\n");
+      }),
+  );
+
   it.effect("keeps the service manager's append log bounded when it starts", () =>
     Effect.gen(function* () {
       const fs = yield* FileSystem.FileSystem;
@@ -376,6 +456,36 @@ process.exit(0);
     }),
   );
 
+  it.effect("starts the runtime in a T3 home whose name ends in a space", () =>
+    Effect.gen(function* () {
+      const fs = yield* FileSystem.FileSystem;
+      const path = yield* Path.Path;
+      const parent = yield* fs.makeTempDirectoryScoped({ prefix: "t3-service-launcher-space-" });
+      const root = path.join(parent, "T3 data ");
+      const versionDir = path.join(root, "runtime", "versions", "1.0.0");
+      yield* writeFakeRuntime(
+        fs,
+        path,
+        versionDir,
+        `
+import { writeFileSync } from "node:fs";
+writeFileSync(new URL("./started", import.meta.url), "");
+process.exit(0);
+`,
+      );
+      yield* fs.writeFileString(
+        path.join(root, "runtime", "service-state.json"),
+        JSON.stringify({ protocol: 4, activeVersion: "1.0.0" }),
+      );
+
+      yield* Effect.promise(() =>
+        expect(runLauncher(root)).rejects.toThrow("Active child exited unexpectedly (0)."),
+      );
+
+      assert.isTrue(yield* fs.exists(path.join(versionDir, "started")));
+    }),
+  );
+
   it.effect("refuses non-install legacy documents without rewriting or spawning", () =>
     Effect.gen(function* () {
       const fs = yield* FileSystem.FileSystem;
@@ -578,17 +688,25 @@ process.exit(0);
       }),
   );
 
-  it.effect("stays idle instead of exiting when another server owns the T3 home", () =>
+  it.effect("waits without exiting and restarts once the other owner releases the T3 home", () =>
     Effect.gen(function* () {
       const fs = yield* FileSystem.FileSystem;
       const path = yield* Path.Path;
-      const root = yield* fs.makeTempDirectoryScoped({ prefix: "t3-service-refused-" });
+      const root = yield* fs.makeTempDirectoryScoped({ prefix: "t3-service-reclaim-" });
       const statePath = path.join(root, "runtime", "service-state.json");
+      const ownerPath = path.join(root, "userdata", "server-owner.sqlite");
+      yield* fs.makeDirectory(path.dirname(ownerPath), { recursive: true });
       yield* writeFakeRuntime(
         fs,
         path,
         path.join(root, "runtime", "versions", "1.0.0"),
-        `process.exit(${SERVER_EXIT_CODE_STATE_DIR_OWNED});\n`,
+        [
+          `const db = new (require("node:sqlite").DatabaseSync)(${JSON.stringify(ownerPath)});`,
+          `try { db.exec("PRAGMA busy_timeout = 0; BEGIN EXCLUSIVE;"); }`,
+          `catch { process.exit(${SERVER_EXIT_CODE_STATE_DIR_OWNED}); }`,
+          'process.send("owner");',
+          "setInterval(() => {}, 1_000);",
+        ].join("\n"),
       );
       yield* Effect.promise(() =>
         writeServiceState(statePath, {
@@ -596,7 +714,10 @@ process.exit(0);
           activeVersion: "1.0.0",
         }),
       );
+      using otherOwner = new NodeSqlite.DatabaseSync(ownerPath);
+      otherOwner.exec("BEGIN EXCLUSIVE;");
       const refused = Promise.withResolvers<void>();
+      const owned = Promise.withResolvers<void>();
       yield* Effect.acquireRelease(
         Effect.sync(() =>
           vi.spyOn(process.stderr, "write").mockImplementation((chunk) => {
@@ -606,15 +727,218 @@ process.exit(0);
         ),
         (spy) => Effect.sync(() => spy.mockRestore()),
       );
-      const launcher = new Launcher(root, yield* Effect.promise(() => readServiceState(statePath)));
+      yield* Effect.acquireRelease(
+        Effect.sync(() => {
+          spawnHook.current = (child) => child.once("message", () => owned.resolve());
+        }),
+        () =>
+          Effect.sync(() => {
+            spawnHook.current = undefined;
+          }),
+      );
+      const spawnsBefore = spawnedChildren.length;
+      const launcher = new Launcher(
+        root,
+        yield* Effect.promise(() => readServiceState(statePath)),
+        { stateDirOwnerPollMs: 10 },
+      );
       let completed = false;
       const running = launcher.run().finally(() => {
         completed = true;
       });
       yield* Effect.promise(() => refused.promise);
       assert.isFalse(completed);
+      otherOwner.close();
+      yield* Effect.promise(() => owned.promise);
       yield* Effect.promise(() => launcher.stop("SIGTERM"));
       yield* Effect.promise(() => running);
+      assert.strictEqual(spawnedChildren.length - spawnsBefore, 2);
+    }),
+  );
+
+  it.effect(
+    "keeps a pending update while owned and rolls a failed resumed trial back to the other owner's writes",
+    () =>
+      Effect.gen(function* () {
+        const fs = yield* FileSystem.FileSystem;
+        const path = yield* Path.Path;
+        const root = yield* fs.makeTempDirectoryScoped({ prefix: "t3-service-reclaim-update-" });
+        const statePath = path.join(root, "runtime", "service-state.json");
+        const ownerPath = path.join(root, "userdata", "server-owner.sqlite");
+        const databasePath = path.join(root, "userdata", "state.sqlite");
+        const startsPath = path.join(root, "starts.log");
+        yield* fs.makeDirectory(path.dirname(ownerPath), { recursive: true });
+        yield* fs.writeFileString(databasePath, "before update");
+        for (const version of ["1.0.0", "1.1.0"]) {
+          yield* writeFakeRuntime(
+            fs,
+            path,
+            path.join(root, "runtime", "versions", version),
+            [
+              `const db = new (require("node:sqlite").DatabaseSync)(${JSON.stringify(ownerPath)});`,
+              `try { db.exec("PRAGMA busy_timeout = 0; BEGIN EXCLUSIVE;"); }`,
+              `catch { process.exit(${SERVER_EXIT_CODE_STATE_DIR_OWNED}); }`,
+              "const context = JSON.parse(process.env.T3_SERVICE_LAUNCHER_CONTEXT);",
+              `require("node:fs").appendFileSync(${JSON.stringify(startsPath)}, context.childVersion + "\\n");`,
+              'if (context.update?.status === "pending") {',
+              `  require("node:fs").writeFileSync(${JSON.stringify(databasePath)}, "migrated by failed trial");`,
+              "  process.exit(1);",
+              "}",
+              'process.send("active");',
+              "setInterval(() => {}, 1_000);",
+            ].join("\n"),
+          );
+        }
+        yield* Effect.promise(() =>
+          writeServiceState(statePath, {
+            protocol: SERVICE_LAUNCHER_PROTOCOL,
+            activeVersion: "1.0.0",
+            update: {
+              id: "update-1",
+              fromVersion: "1.0.0",
+              targetVersion: "1.1.0",
+              dbPath: databasePath,
+              status: "pending",
+            },
+          }),
+        );
+        using otherOwner = new NodeSqlite.DatabaseSync(ownerPath);
+        otherOwner.exec("BEGIN EXCLUSIVE;");
+        const refused = Promise.withResolvers<void>();
+        const active = Promise.withResolvers<void>();
+        yield* Effect.acquireRelease(
+          Effect.sync(() =>
+            vi.spyOn(process.stderr, "write").mockImplementation((chunk) => {
+              if (String(chunk).includes("owns this T3 home")) refused.resolve();
+              return true;
+            }),
+          ),
+          (spy) => Effect.sync(() => spy.mockRestore()),
+        );
+        yield* Effect.acquireRelease(
+          Effect.sync(() => {
+            spawnHook.current = (child) =>
+              child.on("message", (message) => message === "active" && active.resolve());
+          }),
+          () =>
+            Effect.sync(() => {
+              spawnHook.current = undefined;
+            }),
+        );
+        const launcher = new Launcher(
+          root,
+          yield* Effect.promise(() => readServiceState(statePath)),
+          { stateDirOwnerPollMs: 10 },
+        );
+        const running = launcher.run();
+        yield* Effect.promise(() => refused.promise);
+        const idle = yield* Effect.promise(() => readServiceState(statePath));
+        assert.strictEqual(idle.activeVersion, "1.0.0");
+        assert.strictEqual(idle.update?.status, "pending");
+        assert.isFalse(yield* fs.exists(path.join(root, "runtime", "db-backup", "update-1")));
+
+        yield* fs.writeFileString(databasePath, "written by the other owner");
+        otherOwner.close();
+        yield* Effect.promise(() => active.promise);
+        yield* Effect.promise(() => launcher.stop("SIGTERM"));
+        yield* Effect.promise(() => running);
+
+        const state = yield* Effect.promise(() => readServiceState(statePath));
+        assert.strictEqual(state.activeVersion, "1.0.0");
+        assert.strictEqual(state.update?.status, "rolled-back");
+        assert.strictEqual(yield* fs.readFileString(startsPath), "1.1.0\n1.0.0\n");
+        assert.strictEqual(yield* fs.readFileString(databasePath), "written by the other owner");
+      }),
+  );
+
+  it.effect("fails a pending update when its backup cannot be dropped while owned", () =>
+    Effect.gen(function* () {
+      const fs = yield* FileSystem.FileSystem;
+      const path = yield* Path.Path;
+      const root = yield* fs.makeTempDirectoryScoped({ prefix: "t3-service-stale-backup-" });
+      const statePath = path.join(root, "runtime", "service-state.json");
+      const ownerPath = path.join(root, "userdata", "server-owner.sqlite");
+      const databasePath = path.join(root, "userdata", "state.sqlite");
+      yield* fs.makeDirectory(path.dirname(ownerPath), { recursive: true });
+      yield* fs.writeFileString(databasePath, "before update");
+      yield* writeFakeRuntime(
+        fs,
+        path,
+        path.join(root, "runtime", "versions", "1.1.0"),
+        `process.exit(${SERVER_EXIT_CODE_STATE_DIR_OWNED});\n`,
+      );
+      yield* Effect.promise(() =>
+        writeServiceState(statePath, {
+          protocol: SERVICE_LAUNCHER_PROTOCOL,
+          activeVersion: "1.0.0",
+          update: {
+            id: "update-1",
+            fromVersion: "1.0.0",
+            targetVersion: "1.1.0",
+            dbPath: databasePath,
+            status: "pending",
+          },
+        }),
+      );
+      const refused = Promise.withResolvers<void>();
+      yield* Effect.acquireRelease(
+        Effect.sync(() =>
+          vi.spyOn(process.stderr, "write").mockImplementation((chunk) => {
+            if (String(chunk).includes("owns this T3 home")) refused.resolve();
+            return true;
+          }),
+        ),
+        (spy) => Effect.sync(() => spy.mockRestore()),
+      );
+      yield* Effect.acquireRelease(
+        Effect.sync(() => {
+          failRm.path = path.join(root, "runtime", "db-backup", "update-1");
+        }),
+        () =>
+          Effect.sync(() => {
+            failRm.path = undefined;
+          }),
+      );
+      const launcher = new Launcher(root, yield* Effect.promise(() => readServiceState(statePath)));
+      const running = launcher.run();
+      yield* Effect.promise(() => refused.promise);
+      yield* Effect.promise(() => launcher.stop("SIGTERM"));
+      yield* Effect.promise(() => running);
+
+      const state = yield* Effect.promise(() => readServiceState(statePath));
+      assert.strictEqual(state.activeVersion, "1.0.0");
+      assert.strictEqual(state.update?.status, "failed");
+    }),
+  );
+
+  it.effect("treats the T3 home as owned while the lock or a pre-lock server holds it", () =>
+    Effect.gen(function* () {
+      const fs = yield* FileSystem.FileSystem;
+      const path = yield* Path.Path;
+      const root = yield* fs.makeTempDirectoryScoped({ prefix: "t3-service-owned-" });
+      const stateDir = path.join(root, "userdata");
+      const recordPath = path.join(stateDir, "server-runtime.json");
+      yield* fs.makeDirectory(stateDir, { recursive: true });
+      assert.isFalse(yield* Effect.promise(() => stateDirOwned(root)));
+
+      using owner = new NodeSqlite.DatabaseSync(path.join(stateDir, "server-owner.sqlite"));
+      owner.exec("BEGIN EXCLUSIVE;");
+      assert.isTrue(yield* Effect.promise(() => stateDirOwned(root)));
+      owner.close();
+
+      const record = { version: 1, pid: process.pid, port: 1, origin: "", startedAt: "" };
+      yield* fs.writeFileString(recordPath, JSON.stringify(record));
+      assert.isTrue(yield* Effect.promise(() => stateDirOwned(root)));
+      yield* fs.writeFileString(recordPath, JSON.stringify({ ...record, ownerId: "lock-aware" }));
+      assert.isFalse(yield* Effect.promise(() => stateDirOwned(root)));
+      // This process started after 1970, so its PID was reused since that record.
+      yield* fs.writeFileString(
+        recordPath,
+        JSON.stringify({ ...record, startedAt: "1970-01-01T00:00:00Z" }),
+      );
+      assert.isFalse(yield* Effect.promise(() => stateDirOwned(root)));
+      yield* fs.writeFileString(recordPath, JSON.stringify({ ...record, pid: 2 ** 22 + 1 }));
+      assert.isFalse(yield* Effect.promise(() => stateDirOwned(root)));
     }),
   );
 
@@ -1262,6 +1586,56 @@ process.send({ type: "request-update", targetVersion: "1.1.0", dbPath: paths.dat
     }),
   );
 
+  it.effect("starts no trial when stopped during the pre-update backup", () =>
+    Effect.gen(function* () {
+      const fs = yield* FileSystem.FileSystem;
+      const path = yield* Path.Path;
+      const root = yield* fs.makeTempDirectoryScoped({ prefix: "t3-service-backup-stop-" });
+      const statePath = path.join(root, "runtime", "service-state.json");
+      const childSource = "setInterval(() => {}, 1000);\n";
+      for (const version of ["1.0.0", "1.1.0"]) {
+        yield* writeFakeRuntime(
+          fs,
+          path,
+          path.join(root, "runtime", "versions", version),
+          childSource,
+        );
+      }
+      const dbPath = path.join(root, "userdata", "state.sqlite");
+      yield* fs.makeDirectory(path.dirname(dbPath), { recursive: true });
+      yield* fs.writeFileString(dbPath, "database");
+      const pending = {
+        protocol: SERVICE_LAUNCHER_PROTOCOL,
+        activeVersion: "1.0.0",
+        update: {
+          id: "update-1",
+          fromVersion: "1.0.0",
+          targetVersion: "1.1.0",
+          dbPath,
+          status: "pending",
+        },
+      } as const;
+      yield* Effect.promise(() => writeServiceState(statePath, pending));
+      const childCount = spawnedChildren.length;
+      const launcher = new Launcher(root, pending);
+
+      // Recovery is already queued, so this stop lands while the backup runs.
+      const running = launcher.run();
+      yield* Effect.promise(() => launcher.stop("SIGTERM"));
+      yield* Effect.promise(() => running);
+
+      // A trial started here arms its 30-minute prepared timer, which keeps the stopped launcher alive.
+      assert.deepEqual(
+        spawnedChildren.slice(childCount).map((child) => child.spawnargs.join(" ")),
+        [],
+      );
+      assert.deepEqual(yield* Effect.promise(() => readServiceState(statePath)), pending);
+      const backupDir = path.join(root, "runtime", "db-backup", "update-1");
+      assert.isFalse(yield* fs.exists(backupDir));
+      assert.isFalse(yield* fs.exists(`${backupDir}.staging`));
+    }),
+  );
+
   it.effect("records no update when the server exits during the backup check", () =>
     Effect.gen(function* () {
       const fs = yield* FileSystem.FileSystem;
diff --git a/apps/server/src/serviceLauncher.ts b/apps/server/src/serviceLauncher.ts
index e7c02fe00326..1a6c07cf4365 100644
--- a/apps/server/src/serviceLauncher.ts
+++ b/apps/server/src/serviceLauncher.ts
@@ -35,7 +35,12 @@ import {
   SERVICE_RESTART_PENDING_FILE,
   SERVICE_STOP_MARKER_FILE,
   SERVICE_UNIT_ENV,
+  systemdUnitDirectoryOf,
 } from "./cloud/serviceProtocol.ts";
+import {
+  legacyOwnerStartedBeforeRecord,
+  legacyOwnerStartTimeCommand,
+} from "./legacyServerOwner.ts";
 
 const HANDOFF_DELAY_MS = 2_000;
 /**
@@ -49,6 +54,7 @@ const LOCK_RETRY_MS = 500;
 const LOCK_ATTEMPTS = 240;
 // Match contracts' SERVER_EXIT_CODE_STATE_DIR_OWNED without depending on Effect.
 const STATE_DIR_OWNED_EXIT_CODE = 78;
+const STATE_DIR_OWNER_POLL_MS = 30_000;
 
 type TerminalStatus = "committed" | "rolled-back" | "failed";
 type ChildRole = "active" | "trial";
@@ -118,7 +124,34 @@ export async function registerServiceTask(
   }
 }
 
-function serviceUnitFromEnvironment(env: NodeJS.ProcessEnv = process.env): ServiceUnit | undefined {
+// The manager's environment can differ from the one it gives services (environment.d).
+async function readSystemdUnitDirectory(): Promise<string | undefined> {
+  try {
+    const { stdout } = await NodeUtil.promisify(NodeChildProcess.execFile)(
+      "busctl",
+      [
+        "--user",
+        "--json=short",
+        "get-property",
+        "org.freedesktop.systemd1",
+        "/org/freedesktop/systemd1",
+        "org.freedesktop.systemd1.Manager",
+        "UnitPath",
+      ],
+      { timeout: 5_000 },
+    );
+    const { data } = JSON.parse(stdout) as { readonly data?: unknown };
+    return Array.isArray(data) && data.every((entry) => typeof entry === "string")
+      ? systemdUnitDirectoryOf(data)
+      : undefined;
+  } catch {
+    return undefined;
+  }
+}
+
+async function serviceUnitFromEnvironment(
+  env: NodeJS.ProcessEnv = process.env,
+): Promise<ServiceUnit | undefined> {
   const unitName = env[SERVICE_UNIT_ENV]?.trim();
   if (!unitName) return undefined;
   if (unitName.endsWith(".xml")) {
@@ -136,14 +169,18 @@ function serviceUnitFromEnvironment(env: NodeJS.ProcessEnv = process.env): Servi
       reload: () => Promise.resolve(),
     };
   }
-  // The manager's own environment, which decides where it reads user units.
   const xdgConfigHome = env.XDG_CONFIG_HOME?.trim();
-  const configHome =
-    xdgConfigHome && NodePath.isAbsolute(xdgConfigHome)
-      ? xdgConfigHome
-      : NodePath.join(home, ".config");
+  const unitDir =
+    (await readSystemdUnitDirectory()) ??
+    NodePath.join(
+      xdgConfigHome && NodePath.isAbsolute(xdgConfigHome)
+        ? xdgConfigHome
+        : NodePath.join(home, ".config"),
+      "systemd",
+      "user",
+    );
   return {
-    path: NodePath.join(configHome, "systemd", "user", unitName),
+    path: NodePath.join(unitDir, unitName),
     reload: () =>
       new Promise((resolve, reject) => {
         NodeChildProcess.spawn("systemctl", ["--user", "daemon-reload"], {
@@ -289,14 +326,18 @@ async function syncDirectory(directory: string): Promise<void> {
   }
 }
 
-function runCp(args: ReadonlyArray<string>): Promise<boolean> {
+function runCp(args: ReadonlyArray<string>, signal?: AbortSignal): Promise<boolean> {
   return new Promise((resolve) => {
-    NodeChildProcess.execFile("cp", args, (error) => resolve(error === null));
+    NodeChildProcess.execFile("cp", args, { signal }, (error) => resolve(error === null));
   });
 }
 
 // macOS fs.copyFile clone flags fall back to full copies.
-async function copyDatabaseFile(source: string, destination: string): Promise<void> {
+async function copyDatabaseFile(
+  source: string,
+  destination: string,
+  signal?: AbortSignal,
+): Promise<void> {
   // oxlint-disable-next-line t3code/no-global-process-runtime -- Standalone launcher has no Effect runtime.
   const platform = process.platform;
   // cp -c replaces files and breaks hard links; copy into hard-linked destinations instead.
@@ -309,7 +350,9 @@ async function copyDatabaseFile(source: string, destination: string): Promise<vo
       : platform === "linux"
         ? ["--reflink=auto", source, destination]
         : undefined;
-  if (args === undefined || !(await runCp(args))) await NodeFSP.copyFile(source, destination);
+  if (args !== undefined && (await runCp(args, signal))) return;
+  signal?.throwIfAborted();
+  await NodeFSP.copyFile(source, destination);
 }
 
 const GIB = 1024 ** 3;
@@ -488,7 +531,11 @@ async function startOnlineDatabaseBackup(
 }
 
 // Preserve completed backups; restarted trials may already have changed the live database.
-async function backupDatabaseOnce(baseDir: string, pending: PendingServiceUpdate): Promise<void> {
+async function backupDatabaseOnce(
+  baseDir: string,
+  pending: PendingServiceUpdate,
+  signal: AbortSignal,
+): Promise<void> {
   const backupDir = databaseBackupDir(baseDir, pending.id);
   if (await pathExists(backupDir)) return;
 
@@ -497,10 +544,11 @@ async function backupDatabaseOnce(baseDir: string, pending: PendingServiceUpdate
   await NodeFSP.mkdir(stagingDir, { recursive: true, mode: 0o700 });
   try {
     for (const suffix of DB_FILE_SUFFIXES) {
+      signal.throwIfAborted();
       const source = `${pending.dbPath}${suffix}`;
       if (suffix !== "" && !(await pathExists(source))) continue;
       const destination = databaseBackupFile(stagingDir, suffix);
-      await copyDatabaseFile(source, destination);
+      await copyDatabaseFile(source, destination, signal);
       await syncFile(destination);
     }
     await NodeFSP.rename(stagingDir, backupDir);
@@ -703,7 +751,7 @@ export const serviceLauncherLockPath = (baseDir: string) =>
   NodePath.join(baseDir, "runtime", SERVICE_LAUNCHER_LOCK_FILE);
 
 // An exclusive SQLite transaction, like the server's owner lock: the OS drops it when the holder dies.
-async function tryAcquireLauncherLock(
+async function tryAcquireSqliteLock(
   lockPath: string,
 ): Promise<{ readonly close: () => void } | undefined> {
   const { DatabaseSync } = await import("node:sqlite");
@@ -720,7 +768,7 @@ async function tryAcquireLauncherLock(
 
 export async function serviceLauncherIsRunning(lockPath: string): Promise<boolean> {
   if (!NodeFS.existsSync(lockPath)) return false;
-  const lock = await tryAcquireLauncherLock(lockPath);
+  const lock = await tryAcquireSqliteLock(lockPath);
   lock?.close();
   return lock === undefined;
 }
@@ -736,6 +784,50 @@ export async function waitForServiceLauncherExit(
   }
 }
 
+// Mirror acquireServerOwnership: the lock, then a live pre-lock server-runtime.json owner;
+// leave other failures for server startup to report.
+export async function stateDirOwned(baseDir: string): Promise<boolean> {
+  const stateDir = NodePath.join(baseDir, "userdata");
+  const lock = await tryAcquireSqliteLock(NodePath.join(stateDir, "server-owner.sqlite")).catch(
+    () => null,
+  );
+  if (lock === null) return false;
+  if (lock === undefined) return true;
+  lock.close();
+  let record: unknown;
+  try {
+    record = JSON.parse(
+      await NodeFSP.readFile(NodePath.join(stateDir, "server-runtime.json"), "utf8"),
+    );
+  } catch {
+    return false;
+  }
+  if (typeof record !== "object" || record === null || "ownerId" in record) return false;
+  const pid = "pid" in record ? record.pid : undefined;
+  if (typeof pid !== "number" || !Number.isInteger(pid) || pid <= 0) return false;
+  try {
+    process.kill(pid, 0);
+  } catch (error) {
+    if (!(error instanceof Error && "code" in error && error.code === "EPERM")) return false;
+  }
+  const recordedAt = Date.parse(
+    "startedAt" in record && typeof record.startedAt === "string" ? record.startedAt : "",
+  );
+  if (!Number.isFinite(recordedAt)) return true;
+  // oxlint-disable-next-line t3code/no-global-process-runtime -- Standalone launcher has no Effect runtime.
+  const platform = process.platform;
+  const { command, args, env } = legacyOwnerStartTimeCommand(pid, platform);
+  const output = await new Promise<string | undefined>((resolve) =>
+    NodeChildProcess.execFile(
+      command,
+      args,
+      { env: { ...process.env, ...env }, timeout: 2_000, maxBuffer: 16_384 },
+      (error, stdout) => resolve(error === null ? stdout : undefined),
+    ),
+  );
+  return legacyOwnerStartedBeforeRecord(output, recordedAt, platform);
+}
+
 const stopMarkerPath = (baseDir: string) =>
   NodePath.join(baseDir, "runtime", SERVICE_STOP_MARKER_FILE);
 const restartPendingPath = (baseDir: string) =>
@@ -749,12 +841,15 @@ export class Launcher {
   #timer: NodeJS.Timeout | undefined;
   #transitions: Promise<void> = Promise.resolve();
   #stopRequested = false;
+  readonly #stopSignal = new AbortController();
   #stopping = false;
   #done = false;
   readonly #completion = Promise.withResolvers<void>();
   readonly #backupSpaceProbe: Partial<BackupSpaceProbe> | undefined;
   readonly #serviceUnit: ServiceUnit | undefined;
   readonly #environment: Readonly<NodeJS.ProcessEnv>;
+  readonly #stateDirOwnerPollMs: number;
+  #stateDirFreeProbes = 0;
   readonly #output: number | undefined;
   readonly #lockPath: string | undefined;
   readonly #stopChildOverIpc: boolean;
@@ -766,6 +861,7 @@ export class Launcher {
       readonly backupSpaceProbe?: Partial<BackupSpaceProbe>;
       readonly serviceUnit?: ServiceUnit;
       readonly environment?: Readonly<NodeJS.ProcessEnv>;
+      readonly stateDirOwnerPollMs?: number;
       /** Launcher and server output, for managers that cannot redirect it. */
       readonly output?: number;
       /** Makes this the only launcher for its home; a replacement waits for the one stopping. */
@@ -775,6 +871,7 @@ export class Launcher {
     } = {},
   ) {
     this.#baseDir = baseDir;
+    this.#stateDirOwnerPollMs = options.stateDirOwnerPollMs ?? STATE_DIR_OWNER_POLL_MS;
     this.#backupSpaceProbe = options.backupSpaceProbe;
     this.#serviceUnit = options.serviceUnit;
     this.#environment = { ...(options.environment ?? process.env) };
@@ -815,7 +912,7 @@ export class Launcher {
 
   async #acquireLock(lockPath: string): Promise<{ readonly close: () => void } | undefined> {
     for (let attempt = 1; !this.#stopRequested; attempt++) {
-      const lock = await tryAcquireLauncherLock(lockPath);
+      const lock = await tryAcquireSqliteLock(lockPath);
       if (lock !== undefined) return lock;
       if (attempt >= LOCK_ATTEMPTS) {
         throw new Error("Another T3 Code service launcher still runs for this T3 home.");
@@ -863,10 +960,13 @@ export class Launcher {
       return;
     }
     this.#stopRequested = true;
+    this.#stopSignal.abort();
     this.#clearTimer();
     this.#enqueue(async () => {
       // Let in-progress updates start replacements first; replacements observe the marker and own pre-activation tunnel cleanup.
       this.#stopping = true;
+      // An exit-78 transition queued before this one may have started the owner poll.
+      this.#clearTimer();
       const child = this.#child?.process;
       this.#child = null;
       if (child !== undefined) await this.#terminate(child, signal);
@@ -956,11 +1056,14 @@ export class Launcher {
 
   async #startTrial(pending: PendingServiceUpdate): Promise<void> {
     try {
-      await backupDatabaseOnce(this.#baseDir, pending);
+      await backupDatabaseOnce(this.#baseDir, pending, this.#stopSignal.signal);
     } catch {
+      // A stop aborts the copy and leaves the update pending for the next start.
+      if (this.#stopRequested) return;
       await this.#returnToPrevious(pending, "failed", "db-backup-failed");
       return;
     }
+    if (this.#stopRequested) return;
     try {
       await this.#startChild(pending.targetVersion, "trial", pending);
     } catch {
@@ -1115,8 +1218,6 @@ export class Launcher {
     this.#child = null;
     await this.#terminate(child.process);
     await finishOnlineBackup?.();
-    // A stop during a minutes-long copy should not start a trial; restart resumes the pending update.
-    if (this.#stopRequested) return;
     await this.#startTrial(pending);
   }
 
@@ -1233,25 +1334,56 @@ export class Launcher {
     throw new Error(`Active child exited unexpectedly (${String(code ?? signal ?? "unknown")}).`);
   }
 
-  // Stay idle to avoid supervisor restart loops; never restore backups over another owner's possible writes.
+  // Stay idle until the lock frees to avoid supervisor restart loops. A pending update resumes its
+  // trial, since the other owner may have migrated the database past fromVersion. It stays pending
+  // only once its backup is gone, so no later trial, even after a launcher restart, restores it over
+  // the other owner's writes; exit 78 comes before the child opens the database.
   async #idleWhileStateDirOwned(): Promise<void> {
     this.#clearTimer();
     const pending = this.#state.update;
     if (pending?.status === "pending") {
-      const next: ServiceState = {
-        ...this.#state,
-        activeVersion: pending.fromVersion,
-        update: terminalUpdate({ pending, status: "failed", reason: "state-dir-owned" }),
-      };
-      await this.#selectState(next);
-      await discardDatabaseBackup(this.#baseDir, pending.id).catch(() => undefined);
-      await this.#repointServiceUnit(next.activeVersion);
+      const discarded = await discardDatabaseBackup(this.#baseDir, pending.id).then(
+        () => true,
+        () => false,
+      );
+      if (!discarded) {
+        const next: ServiceState = {
+          ...this.#state,
+          activeVersion: pending.fromVersion,
+          update: terminalUpdate({ pending, status: "failed", reason: "state-dir-owned" }),
+        };
+        await this.#selectState(next);
+        await this.#repointServiceUnit(next.activeVersion);
+      }
     }
-    // Signal listeners alone do not keep Node alive.
-    this.#timer = setInterval(() => {}, 2_147_483_647);
     this.#log(
-      "[service-launcher] Another T3 Code server owns this T3 home. Stop it, then restart this service.\n",
+      "[service-launcher] Another T3 Code server owns this T3 home. This service starts again once it stops.\n",
     );
+    this.#stateDirFreeProbes = 0;
+    // The interval also keeps Node alive: signal listeners alone do not.
+    this.#timer = setInterval(
+      () => this.#enqueue(() => this.#reclaimStateDir()),
+      this.#stateDirOwnerPollMs,
+    );
+  }
+
+  async #reclaimStateDir(): Promise<void> {
+    if (this.#stopRequested) {
+      this.#clearTimer();
+      return;
+    }
+    if (this.#timer === undefined || this.#child !== null) return;
+    const owned = await stateDirOwned(this.#baseDir);
+    // A stop during the probe clears the timer.
+    if (this.#timer === undefined) return;
+    // A relaunching desktop app frees the home for a few seconds; leave it that gap.
+    this.#stateDirFreeProbes = owned ? 0 : this.#stateDirFreeProbes + 1;
+    if (this.#stateDirFreeProbes < 2) return;
+    this.#clearTimer();
+    this.#log("[service-launcher] The T3 home is free again. Starting the server.\n");
+    const update = this.#state.update;
+    if (update?.status === "pending") await this.#startTrial(update);
+    else await this.#startChild(this.#state.activeVersion, "active", update);
   }
 
   async #returnToPrevious(
@@ -1289,8 +1421,8 @@ export interface LauncherOptions {
 }
 
 export async function main(options: LauncherOptions = {}): Promise<void> {
-  const baseDir = (options.baseDir ?? process.env.T3CODE_HOME)?.trim();
-  if (baseDir === undefined || baseDir === "") {
+  const baseDir = options.baseDir ?? process.env.T3CODE_HOME;
+  if (baseDir === undefined || baseDir.trim() === "") {
     throw new Error("T3CODE_HOME is required by the T3 Code service launcher.");
   }
   const output =
@@ -1317,7 +1449,7 @@ export async function main(options: LauncherOptions = {}): Promise<void> {
         throw new Error(`Selected t3@${state.activeVersion} runtime is missing or incomplete.`);
       }
     }
-    const serviceUnit = serviceUnitFromEnvironment(managerEnvironment);
+    const serviceUnit = await serviceUnitFromEnvironment(managerEnvironment);
     const logPath = await serviceLogPath(options, serviceUnit);
     if (logPath !== undefined) {
       await boundServiceLog(logPath);
diff --git a/apps/server/src/sourceControl/SourceControlDiscovery.test.ts b/apps/server/src/sourceControl/SourceControlDiscovery.test.ts
index c8644e280db4..990bd7ff6439 100644
--- a/apps/server/src/sourceControl/SourceControlDiscovery.test.ts
+++ b/apps/server/src/sourceControl/SourceControlDiscovery.test.ts
@@ -175,7 +175,7 @@ it.effect("reports every hosting integration in registry order with its sign-in"
   }).pipe(Effect.provide(SourceControlDiscovery.layer.pipe(Layer.provide(layerDiscovery())))),
 );
 
-it.effect("explains a hosting CLI whose version probe failed instead of advising an install", () =>
+it.effect("explains a CLI whose version probe failed instead of advising an install", () =>
   Effect.gen(function* () {
     const discovery = yield* SourceControlDiscovery.SourceControlDiscovery;
     const result = yield* discovery.discover;
@@ -197,15 +197,23 @@ it.effect("explains a hosting CLI whose version probe failed instead of advising
 
     assert.strictEqual(item("absent").installHint, "Install absent.");
     assert.strictEqual(authDetail("absent"), "Install absent.");
+
+    const git = result.versionControlSystems.find((entry) => entry.kind === "git");
+    assert.isDefined(git);
+    assert.notInclude(git.installHint, "Install Git from");
+    assert.include(git.installHint, "`git --version` exited with status 1");
   }).pipe(
     Effect.provide(
       SourceControlDiscovery.layer.pipe(
         Layer.provide(
-          layerDiscovery(run, [
-            cliDiscovery("slow", "slow-cli"),
-            cliDiscovery("broken", "broken-cli"),
-            cliDiscovery("absent", "absent-cli"),
-          ]),
+          layerDiscovery(
+            (input) => run(input.command === "git" ? { ...input, command: "broken-cli" } : input),
+            [
+              cliDiscovery("slow", "slow-cli"),
+              cliDiscovery("broken", "broken-cli"),
+              cliDiscovery("absent", "absent-cli"),
+            ],
+          ),
         ),
       ),
     ),
diff --git a/apps/server/src/sourceControl/SourceControlDiscovery.ts b/apps/server/src/sourceControl/SourceControlDiscovery.ts
index 8311058c9787..e69f0d3761e6 100644
--- a/apps/server/src/sourceControl/SourceControlDiscovery.ts
+++ b/apps/server/src/sourceControl/SourceControlDiscovery.ts
@@ -15,8 +15,8 @@ import { refreshPathFromLoginShell } from "../os-jank.ts";
 import * as VcsProcess from "../vcs/VcsProcess.ts";
 import {
   detailFromCause,
+  failedProbeHint,
   firstNonEmptyLine,
-  unavailableInstallHint,
 } from "@t3tools/source-control-core/server/discovery";
 import * as SourceControlProviderRegistry from "./SourceControlProviderRegistry.ts";
 
@@ -119,7 +119,7 @@ export const make = Effect.gen(function* () {
         ),
         Effect.catch((cause) =>
           Effect.gen(function* () {
-            const installHint = yield* unavailableInstallHint(executable, input.installHint, cause);
+            const installHint = yield* failedProbeHint(input, cause);
             return {
               kind: input.kind,
               label: input.label,
diff --git a/apps/server/src/sourceControl/SourceControlProviderRegistry.test.ts b/apps/server/src/sourceControl/SourceControlProviderRegistry.test.ts
index c532d93e81ad..9d472fe6e77c 100644
--- a/apps/server/src/sourceControl/SourceControlProviderRegistry.test.ts
+++ b/apps/server/src/sourceControl/SourceControlProviderRegistry.test.ts
@@ -283,7 +283,7 @@ it.effect(
           url,
         );
       }
-    }).pipe(Effect.scoped),
+    }),
 );
 
 it.effect("does not refine a context whose server address is empty", () =>
diff --git a/apps/server/src/speech/SpeechService.test.ts b/apps/server/src/speech/SpeechService.test.ts
index c47174e46f1c..2e05132cd6ee 100644
--- a/apps/server/src/speech/SpeechService.test.ts
+++ b/apps/server/src/speech/SpeechService.test.ts
@@ -449,14 +449,15 @@ it.effect("honors exact aliases and phrase boundaries in batch and streamed text
         { term: "GitHub", aliases: [] },
         { term: "McDonald’s", aliases: [] },
         { term: "King’s Cross", aliases: [] },
+        { term: "C#", aliases: [] },
       ],
     };
     const spoken =
       'a test with a i and ay eye. Robert, Roberts. "the publisher" and the publisher. (git hub), git (hub). ' +
-      "git hub's API, git hub’s API, git’s hub, mac donald's menu, king's cross.";
+      "git hub's API, git hub’s API, git’s hub, mac donald's menu, king's cross. vitamin c and plan c.";
     const expected =
       "a test with AI and AI. Bob, Roberts. O'Reilly and the publisher. (GitHub), git (hub). " +
-      "GitHub's API, GitHub’s API, git’s hub, McDonald’s menu, King’s Cross.";
+      "GitHub's API, GitHub’s API, git’s hub, McDonald’s menu, King’s Cross. vitamin c and plan c.";
     native.transcribe.mockResolvedValueOnce({ text: spoken });
     native.finish.mockResolvedValueOnce(spoken);
     expect(yield* speech.transcribe(pcm(), options)).toBe(expected);
diff --git a/apps/server/src/speech/customWords.ts b/apps/server/src/speech/customWords.ts
index e788c9188a09..98c55e883749 100644
--- a/apps/server/src/speech/customWords.ts
+++ b/apps/server/src/speech/customWords.ts
@@ -71,8 +71,14 @@ export function makeSpeechTextCorrector(
 
   const customWordKeys = (words: readonly string[]): CustomWordKey[] =>
     words.flatMap((word) => {
-      const keys = [matchKey(word)];
-      if (word.includes("&")) keys.push(matchKey(word.replaceAll("&", " and ")));
+      const sources = [word];
+      if (word.includes("&")) sources.push(word.replaceAll("&", " and "));
+      const keys = sources.flatMap((source) => {
+        const key = matchKey(source);
+        // A term that loses its symbols to one letter (C# -> c) would claim every standalone letter.
+        const lostSymbols = key !== source.replace(/\s+/gu, "").toLocaleLowerCase();
+        return key.length < 2 && lostSymbols ? [] : [key];
+      });
       return [...new Set(keys)].filter(isAsciiKey).map((key) => ({ word, key }));
     });
 
diff --git a/apps/server/src/speech/http.test.ts b/apps/server/src/speech/http.test.ts
index d86f77fbdbd8..07f2fe6b99d5 100644
--- a/apps/server/src/speech/http.test.ts
+++ b/apps/server/src/speech/http.test.ts
@@ -269,7 +269,7 @@ effectIt.effect(
         handler(new Request("http://localhost/api/voice/models"), context),
       );
       expect(yield* Effect.promise(() => listed.text())).not.toContain("/home/someone");
-    }).pipe(Effect.scoped),
+    }),
 );
 
 effectIt.effect.each([
@@ -361,5 +361,5 @@ effectIt.effect.each([
         code: "invalid_request",
         reason,
       });
-    }).pipe(Effect.scoped),
+    }),
 );
diff --git a/apps/server/src/speech/native.test.ts b/apps/server/src/speech/native.test.ts
index 8712c63ed347..a41f917b2a68 100644
--- a/apps/server/src/speech/native.test.ts
+++ b/apps/server/src/speech/native.test.ts
@@ -1,4 +1,8 @@
 // @effect-diagnostics nodeBuiltinImport:off - verifies isolated native worker processes and their exit events.
+import * as NodeFS from "node:fs";
+import * as NodeOS from "node:os";
+import * as NodePath from "node:path";
+
 import { expect, it } from "vite-plus/test";
 
 import { loadNativeSpeechModel } from "./native.ts";
@@ -155,6 +159,37 @@ it("kills a hung streaming feed without waiting for native cleanup", async () =>
   await model.dispose();
   await rejected;
 });
+
+it("skips process exit teardown when the backend dies during native inference", async () => {
+  const directory = NodeFS.mkdtempSync(NodePath.join(NodeOS.tmpdir(), "t3code-speech-orphan-"));
+  const marker = NodePath.join(directory, "exit-teardown");
+  // The exit hook stands in for native atexit teardown; the interval for the threadpool call.
+  const model = await loadNativeSpeechModel(
+    "unused.gguf",
+    new AbortController().signal,
+    streamingFixture(`async () => {
+      const { writeFileSync } = process.getBuiltinModule("node:fs");
+      process.once("exit", () => writeFileSync(${JSON.stringify(marker)}, "ran"));
+      setInterval(() => {}, 1 << 30);
+      process.disconnect();
+      return await new Promise(() => {});
+    }`),
+  );
+  try {
+    await model.begin({ timestamps: "none" }, false);
+    await expect(model.feed(new Float32Array(512).fill(0.25))).rejects.toThrow(
+      "Speech process exited",
+    );
+    expect(
+      NodeFS.existsSync(marker),
+      "orphaned worker ran exit teardown while native inference was in flight",
+    ).toBe(false);
+  } finally {
+    await model.dispose();
+    NodeFS.rmSync(directory, { recursive: true, force: true });
+  }
+});
+
 const vadFixture = ({
   streaming = false,
   failVad = false,
diff --git a/apps/server/src/speech/native.ts b/apps/server/src/speech/native.ts
index 8331e1b5e0ec..70c5d21c6038 100644
--- a/apps/server/src/speech/native.ts
+++ b/apps/server/src/speech/native.ts
@@ -182,7 +182,8 @@ process.on("message", async (message) => {
       error: error instanceof Error ? error.stack ?? error.message : String(error) });
   }
 });
-process.on("disconnect", () => process.exit(0));
+// Exit teardown under in-flight native inference segfaults, so terminate without it.
+process.on("disconnect", () => process.kill(process.pid, "SIGKILL"));
 `;
 
 type Reply = {
diff --git a/apps/server/src/storageCleanup.test.ts b/apps/server/src/storageCleanup.test.ts
index e7220718f15a..28d66e50bb0b 100644
--- a/apps/server/src/storageCleanup.test.ts
+++ b/apps/server/src/storageCleanup.test.ts
@@ -610,7 +610,53 @@ const runCleanupTest = <A, E>(
     | Path.Path
     | Scope.Scope
   >,
-) => effect.pipe(Effect.provide(cleanupTestLayer), Effect.scoped);
+) => effect.pipe(Effect.provide(cleanupTestLayer));
+
+it.live.each(["repository", "uppercase", "bare"] as const)(
+  "keeps a worktree holding an ignored nested %s",
+  (kind) =>
+    runCleanupTest(
+      Effect.gen(function* () {
+        const { service, fs, repo, worktree, command, setPolicy } = yield* cleanupFixture();
+        setPolicy("tracked-changes");
+        const nested = `${worktree}/dist/nested`;
+        if (kind === "uppercase") {
+          yield* command(repo, ["worktree", "add", "-b", "nested", nested]);
+        } else {
+          yield* command(repo, [
+            "clone",
+            "--no-hardlinks",
+            ...(kind === "bare" ? ["--bare"] : []),
+            repo,
+            nested,
+          ]);
+        }
+        if (kind === "uppercase") yield* fs.rename(`${nested}/.git`, `${nested}/.GIT`);
+        yield* fs.writeFileString(`${nested}/uncommitted.txt`, "irreplaceable work\n");
+        expect((yield* command(worktree, ["status", "--porcelain"])).stdout).toBe("");
+        const report = yield* service.runNow;
+        expect(report.entries.find((entry) => entry.path === worktree)).toMatchObject({
+          outcome: "kept",
+          reason: "Contains a nested Git repository",
+        });
+        expect(yield* fs.readFileString(`${nested}/uncommitted.txt`)).toBe("irreplaceable work\n");
+        expect(
+          (yield* command(nested, [
+            ...(kind === "uppercase"
+              ? [
+                  `--git-dir=${(yield* fs.readFileString(`${nested}/.GIT`)).trim().slice(8)}`,
+                  "--work-tree=.",
+                ]
+              : []),
+            "-c",
+            "safe.bareRepository=all",
+            "rev-parse",
+            "--is-bare-repository",
+          ])).stdout.trim(),
+        ).toBe(String(kind === "bare"));
+      }),
+    ),
+);
 
 const submoduleCleanupFixture = () =>
   Effect.gen(function* () {
@@ -636,6 +682,48 @@ const submoduleCleanupFixture = () =>
     return { ...fixture, submodule, child, recordSubmodules };
   });
 
+it.live("inspects a pnpm store excluded from reclaimed bytes for nested repositories", () =>
+  runCleanupTest(
+    Effect.gen(function* () {
+      const { service, fs, repo, worktree, command, setPolicy } = yield* cleanupFixture();
+      setPolicy("tracked-changes");
+      const storeDir = yield* fs.makeTempDirectoryScoped({ prefix: "cleanup-store-" });
+      const nested = `${worktree}/node_modules/.pnpm/nested`;
+      yield* command(repo, ["clone", "--no-hardlinks", repo, nested]);
+      yield* fs.writeFileString(`${nested}/uncommitted.txt`, "keep me");
+      yield* fs.writeFileString(
+        `${worktree}/node_modules/.modules.yaml`,
+        JSON.stringify({ storeDir, virtualStoreDir: ".pnpm" }),
+      );
+      const report = yield* service.runNow;
+      expect(report.entries.find((entry) => entry.path === worktree)).toMatchObject({
+        outcome: "kept",
+        reason: "Contains a nested Git repository",
+      });
+      expect(yield* fs.readFileString(`${nested}/uncommitted.txt`)).toBe("keep me");
+    }),
+  ),
+);
+
+it.live("keeps an ignored repository inside a registered submodule", () =>
+  runCleanupTest(
+    Effect.gen(function* () {
+      const { service, fs, repo, worktree, submodule, command, setPolicy } =
+        yield* submoduleCleanupFixture();
+      setPolicy("tracked-changes");
+      const nested = `${submodule}/dist/nested`;
+      yield* command(repo, ["clone", "--no-hardlinks", repo, nested]);
+      yield* fs.writeFileString(`${nested}/uncommitted.txt`, "keep me");
+      const report = yield* service.runNow;
+      expect(report.entries.find((entry) => entry.path === worktree)).toMatchObject({
+        outcome: "kept",
+        reason: "Contains a nested Git repository",
+      });
+      expect(yield* fs.readFileString(`${nested}/uncommitted.txt`)).toBe("keep me");
+    }),
+  ),
+);
+
 it.live("removes clean submodules recursively, including deinitialized repositories", () =>
   runCleanupTest(
     Effect.gen(function* () {
@@ -649,6 +737,37 @@ it.live("removes clean submodules recursively, including deinitialized repositor
         repo,
         "stored",
       ]);
+      const legacy = `${worktree}/legacy`;
+      yield* command(repo, ["clone", "--no-hardlinks", repo, legacy]);
+      yield* command(worktree, ["submodule", "add", repo, "legacy"]);
+      expect((yield* fs.stat(`${legacy}/.git`)).type).toBe("Directory");
+      yield* command(legacy, [
+        "-c",
+        "protocol.file.allow=always",
+        "submodule",
+        "add",
+        repo,
+        "child",
+      ]);
+      yield* command(legacy, [
+        "-c",
+        "protocol.file.allow=always",
+        "submodule",
+        "add",
+        repo,
+        "stored",
+      ]);
+      yield* command(legacy, [
+        "-c",
+        "user.name=Cleanup test",
+        "-c",
+        "user.email=cleanup@example.test",
+        "commit",
+        "-am",
+        "record legacy children",
+      ]);
+      yield* command(legacy, ["push", "origin", "HEAD:legacy"]);
+      yield* command(legacy, ["submodule", "deinit", "stored"]);
       yield* recordSubmodules();
       yield* command(submodule, ["submodule", "deinit", "stored"]);
       const admin = (yield* command(worktree, ["rev-parse", "--absolute-git-dir"])).stdout.trim();
@@ -886,10 +1005,10 @@ describe("subagent worktree ownership", () => {
                   ? "Thread is running or has pending work"
                   : "Not settled",
       });
-    }).pipe(Effect.provide(cleanupTestLayer), Effect.scoped),
+    }).pipe(Effect.provide(cleanupTestLayer)),
   );
 
-  it.live.each([
+  it.effect.each([
     "parent-unsettled",
     "parent-resettled",
     "child-unsettled",
@@ -898,6 +1017,7 @@ describe("subagent worktree ownership", () => {
   ] as const)("cancels inherited settlement during measurement (%s)", (change) =>
     runCleanupTest(
       Effect.gen(function* () {
+        yield* TestClock.setTime(NOW_MS);
         const fixture = yield* pausedMeasurementFixture({
           ...DEFAULT_SERVER_SETTINGS.storageCleanup,
           worktreeSettledAfterDays: 0,
@@ -1090,10 +1210,56 @@ describe("subagent worktree ownership", () => {
                       ? "Settled moments ago"
                       : "Not settled",
       });
-    }).pipe(Effect.provide(cleanupTestLayer), Effect.scoped),
+    }).pipe(Effect.provide(cleanupTestLayer)),
   );
 
-  it.live.each([
+  it.effect("keeps a checkout two top-level threads store through a symlinked parent", () =>
+    Effect.gen(function* () {
+      yield* TestClock.setTime(NOW_MS);
+      const fixture = yield* cleanupFixture({
+        ...DEFAULT_SERVER_SETTINGS.storageCleanup,
+        worktreeSettledAfterDays: 8,
+      });
+      const linkedParent = `${yield* fixture.fs.makeTempDirectoryScoped({ prefix: "cleanup-link-" })}/worktrees`;
+      yield* fixture.fs.symlink(fixture.config.worktreesDir, linkedParent);
+      const settled = { branch: "feature", settledAt: at(-20 * DAY_MS) };
+      fixture.setThreads([
+        shell({ ...settled, worktreePath: fixture.worktree }),
+        shell({ ...settled, id: ThreadId.make("other"), worktreePath: `${linkedParent}/feature` }),
+      ]);
+      const report = yield* fixture.service.runNow;
+      expect(report.entries).toEqual([
+        expect.objectContaining({ outcome: "kept", reason: "Shared by 2 threads" }),
+      ]);
+      expect(yield* fixture.fs.exists(fixture.worktree)).toBe(true);
+    }).pipe(Effect.provide(cleanupTestLayer)),
+  );
+
+  it.effect("keeps a checkout two top-level threads store in different case on Windows", () =>
+    Effect.gen(function* () {
+      yield* TestClock.setTime(NOW_MS);
+      const fixture = yield* cleanupFixture({
+        ...DEFAULT_SERVER_SETTINGS.storageCleanup,
+        worktreeSettledAfterDays: 8,
+      }).pipe(Effect.provideService(HostProcess.Platform, "win32"));
+      const settled = { branch: "feature", settledAt: at(-20 * DAY_MS) };
+      fixture.setThreads([
+        shell({ ...settled, worktreePath: fixture.worktree }),
+        shell({
+          ...settled,
+          id: ThreadId.make("other"),
+          worktreePath: fixture.worktree.toUpperCase(),
+        }),
+      ]);
+      const report = yield* fixture.service.runNow;
+      expect(report.entries).toEqual([
+        expect.objectContaining({ outcome: "kept", reason: "Shared by 2 threads" }),
+      ]);
+      expect(yield* fixture.fs.exists(fixture.worktree)).toBe(true);
+    }).pipe(Effect.provide(cleanupTestLayer)),
+  );
+
+  it.effect.each([
     "running",
     "pending",
     "activity",
@@ -1105,6 +1271,7 @@ describe("subagent worktree ownership", () => {
   ] as const)("cancels removal when a child changes during measurement (%s)", (change) =>
     runCleanupTest(
       Effect.gen(function* () {
+        yield* TestClock.setTime(NOW_MS);
         const fixture = yield* pausedMeasurementFixture();
         const root = shell({ branch: "feature", worktreePath: fixture.worktree });
         const child = {
@@ -1194,7 +1361,7 @@ describe("deleted thread worktrees", () => {
           reason: "Thread was deleted",
         });
         expect(yield* fixture.fs.exists(fixture.worktree)).toBe(false);
-      }).pipe(Effect.provide(cleanupTestLayer), Effect.scoped),
+      }).pipe(Effect.provide(cleanupTestLayer)),
   );
 
   it.effect("applies the remaining subagent's rules when deletion cleanup is off", () =>
@@ -1216,7 +1383,7 @@ describe("deleted thread worktrees", () => {
         reason: "Inactive for 30 days",
       });
       expect(yield* fixture.fs.exists(fixture.worktree)).toBe(false);
-    }).pipe(Effect.provide(cleanupTestLayer), Effect.scoped),
+    }).pipe(Effect.provide(cleanupTestLayer)),
   );
 
   // Releases one stopped-session event after the startup sweep and returns the snapshot reads it caused.
@@ -1275,7 +1442,7 @@ describe("deleted thread worktrees", () => {
       const fixture = yield* cleanupFixture();
       const reads = yield* stopSessionAfterStartupSweep(fixture, ThreadId.make("thread-1"));
       expect(reads, "a live thread's stopped session re-read every thread").toBe(0);
-    }).pipe(Effect.provide(cleanupTestLayer), Effect.scoped),
+    }).pipe(Effect.provide(cleanupTestLayer)),
   );
 
   it.effect("removes a deleted thread's worktree once its session stops", () =>
@@ -1297,7 +1464,7 @@ describe("deleted thread worktrees", () => {
       );
       expect(reads).toBeGreaterThan(0);
       expect(yield* fixture.fs.exists(fixture.worktree)).toBe(false);
-    }).pipe(Effect.provide(cleanupTestLayer), Effect.scoped),
+    }).pipe(Effect.provide(cleanupTestLayer)),
   );
 
   it.effect("removes a deleted thread's worktree once a live thread's session in it stops", () =>
@@ -1327,7 +1494,7 @@ describe("deleted thread worktrees", () => {
       );
       expect(reads).toBeGreaterThan(0);
       expect(yield* fixture.fs.exists(fixture.worktree)).toBe(false);
-    }).pipe(Effect.provide(cleanupTestLayer), Effect.scoped),
+    }).pipe(Effect.provide(cleanupTestLayer)),
   );
 
   it.effect(
@@ -1373,7 +1540,7 @@ describe("deleted thread worktrees", () => {
         );
         expect(reads).toBeGreaterThan(0);
         expect(yield* fixture.fs.exists(fixture.worktree)).toBe(false);
-      }).pipe(Effect.provide(cleanupTestLayer), Effect.scoped),
+      }).pipe(Effect.provide(cleanupTestLayer)),
   );
 
   it.effect(
@@ -1406,7 +1573,7 @@ describe("deleted thread worktrees", () => {
         );
         expect(reads).toBeGreaterThan(0);
         expect(yield* fixture.fs.exists(fixture.worktree)).toBe(false);
-      }).pipe(Effect.provide(cleanupTestLayer), Effect.scoped),
+      }).pipe(Effect.provide(cleanupTestLayer)),
   );
 
   it.effect("does not sweep for a kept deleted worktree when a session elsewhere stops", () =>
@@ -1428,7 +1595,7 @@ describe("deleted thread worktrees", () => {
       );
       expect(reads).toBe(0);
       expect(yield* fixture.fs.exists(fixture.worktree)).toBe(true);
-    }).pipe(Effect.provide(cleanupTestLayer), Effect.scoped),
+    }).pipe(Effect.provide(cleanupTestLayer)),
   );
 
   it.effect(
@@ -1458,7 +1625,7 @@ describe("deleted thread worktrees", () => {
           fixture.repo,
         );
         expect(reads).toBe(0);
-      }).pipe(Effect.provide(cleanupTestLayer), Effect.scoped),
+      }).pipe(Effect.provide(cleanupTestLayer)),
   );
 
   it.effect(
@@ -1532,7 +1699,7 @@ describe("deleted thread worktrees", () => {
         yield* Deferred.await(delivered);
         yield* fixture.service.drain;
         expect(yield* fixture.fs.exists(fixture.worktree)).toBe(false);
-      }).pipe(Effect.provide(cleanupTestLayer), Effect.scoped),
+      }).pipe(Effect.provide(cleanupTestLayer)),
   );
 
   it.effect("waits out the settle grace of a subagent that just settled", () =>
@@ -1553,7 +1720,7 @@ describe("deleted thread worktrees", () => {
         reason: "Settled moments ago",
       });
       expect(yield* fixture.fs.exists(fixture.worktree)).toBe(true);
-    }).pipe(Effect.provide(cleanupTestLayer), Effect.scoped),
+    }).pipe(Effect.provide(cleanupTestLayer)),
   );
 });
 
@@ -1762,6 +1929,57 @@ describe("orphan worktree reports", () => {
       ),
   );
 
+  it.live.each([
+    { home: "an installed", worktreeHome: false, customFolderOutcome: "removed" },
+    { home: "a git worktree's dev", worktreeHome: true, customFolderOutcome: "kept" },
+  ] as const)(
+    "on $home home, a custom worktrees folder ends $customFolderOutcome",
+    ({ worktreeHome, customFolderOutcome }) =>
+      runCleanupTest(
+        Effect.gen(function* () {
+          const fs = yield* FileSystem.FileSystem;
+          const config = yield* ServerConfig.ServerConfig;
+          const checkout = yield* fs.makeTempDirectoryScoped({ prefix: "cleanup-dev-checkout-" });
+          yield* fs.writeFileString(`${checkout}/.git`, "gitdir: /repo/.git/worktrees/dev\n");
+          const baseDir = worktreeHome ? `${checkout}/.t3` : config.baseDir;
+          const fixture = yield* cleanupFixture().pipe(
+            Effect.provideService(ServerConfig.ServerConfig, {
+              ...config,
+              baseDir,
+              worktreesDir: `${baseDir}/worktrees`,
+            }),
+          );
+          const customFolder = yield* fs.realPath(
+            yield* fs.makeTempDirectoryScoped({ prefix: "cleanup-real-worktrees-" }),
+          );
+          const realWorktree = `${customFolder}/seeded`;
+          yield* fixture.command(fixture.repo, ["worktree", "add", "-b", "seeded", realWorktree]);
+          fixture.setSettings({ worktreesDirectory: customFolder });
+          fixture.setThreads([
+            shell({ branch: "feature", worktreePath: fixture.worktree }),
+            shell({
+              id: ThreadId.make("seeded"),
+              lineage: {
+                rootThreadId: ThreadId.make("seeded"),
+                parentThreadId: null,
+                relationshipToParent: null,
+              },
+              branch: "seeded",
+              worktreePath: realWorktree,
+            }),
+          ]);
+
+          const { entries } = yield* fixture.service.runNow;
+
+          expect(entries.find((entry) => entry.path === realWorktree)?.outcome).toBe(
+            customFolderOutcome,
+          );
+          expect(yield* fs.exists(realWorktree)).toBe(customFolderOutcome === "kept");
+          expect(yield* fs.exists(fixture.worktree)).toBe(false);
+        }),
+      ),
+  );
+
   it.live("skips symbolic links at both directory levels and disabled cleanup", () =>
     runCleanupTest(
       Effect.gen(function* () {
@@ -2129,18 +2347,30 @@ describe("storage cleanup reports and local file policies", () => {
       }),
     ),
   );
-  it.live.each(["before-check", "while-measuring"] as const)(
-    "keeps a worktree protected by a missing project root (%s)",
-    (timing) =>
+  it.live.each([
+    ["before-check", "stored"],
+    ["while-measuring", "stored"],
+    ["before-check", "symlinked parent"],
+    ["while-measuring", "symlinked parent"],
+  ] as const)(
+    "keeps a worktree protected by a missing project root (%s, %s spelling)",
+    ([timing, spelling]) =>
       runCleanupTest(
         Effect.gen(function* () {
           const fixture = yield* pausedMeasurementFixture();
+          let worktree = fixture.worktree;
+          if (spelling === "symlinked parent") {
+            const linkedParent = `${yield* fixture.fs.makeTempDirectoryScoped({ prefix: "cleanup-link-" })}/worktrees`;
+            yield* fixture.fs.symlink(fixture.config.worktreesDir, linkedParent);
+            worktree = `${linkedParent}/feature`;
+            fixture.setThreads([shell({ branch: "feature", worktreePath: worktree })]);
+          }
           if (timing === "before-check")
-            fixture.setProjectRoots([fixture.repo, `${fixture.worktree}/removed-checkout`]);
+            fixture.setProjectRoots([fixture.repo, `${worktree}/removed-checkout`]);
           const cleanup = yield* fixture.service.runNow.pipe(Effect.forkChild);
           if (timing === "while-measuring") {
             yield* Deferred.await(fixture.measuring);
-            fixture.setProjectRoots([fixture.repo, `${fixture.worktree}/removed-checkout`]);
+            fixture.setProjectRoots([fixture.repo, `${worktree}/removed-checkout`]);
           }
           yield* Deferred.succeed(fixture.resume, undefined);
           const report = yield* Fiber.join(cleanup);
@@ -2190,9 +2420,14 @@ describe("storage cleanup reports and local file policies", () => {
         Effect.gen(function* () {
           const fs = yield* FileSystem.FileSystem;
           const storeDir = yield* fs.makeTempDirectoryScoped({ prefix: "pnpm-store-" });
+          const statted: string[] = [];
           const { service, worktree, setPolicy } = yield* cleanupFixture().pipe(
             Effect.provideService(FileSystem.FileSystem, {
               ...fs,
+              lstat: (target) => {
+                statted.push(target);
+                return fs.lstat(target);
+              },
               stat: (target) =>
                 fs
                   .stat(target)
@@ -2233,6 +2468,9 @@ describe("storage cleanup reports and local file policies", () => {
           );
           const report = yield* service.runNow;
           expect(report.entries[0]).toMatchObject({ outcome: "removed", bytes });
+          expect(statted.includes(`${nodeModules}/.pnpm/pkg@1.0.0/index.js`)).toBe(
+            store !== "same-device",
+          );
         }),
       ),
   );
@@ -2266,12 +2504,13 @@ describe("storage cleanup reports and local file policies", () => {
       }),
     ),
   );
-  it.live.each([
+  it.effect.each([
     { days: 8, reason: "Inactive for 1 of 8 days" },
     { days: null, reason: "No rules apply" },
   ])("keeps an ineligible age/delete-only worktree without Git ($days)", ({ days, reason }) =>
     runCleanupTest(
       Effect.gen(function* () {
+        yield* TestClock.setTime(NOW_MS);
         const fixture = yield* cleanupFixture({
           ...DEFAULT_SERVER_SETTINGS.storageCleanup,
           worktreeAfterDays: days,
@@ -2281,9 +2520,7 @@ describe("storage cleanup reports and local file policies", () => {
           shell({
             branch: "feature",
             worktreePath: fixture.worktree,
-            latestUserMessageAt: DateTime.makeUnsafe(
-              DateTime.toEpochMillis(yield* DateTime.now) - DAY_MS,
-            ),
+            latestUserMessageAt: at(-DAY_MS),
           }),
         ]);
         yield* fixture.fs.writeFileString(`${fixture.worktree}/tracked.txt`, "local edit\n");
@@ -2327,7 +2564,7 @@ describe("storage cleanup reports and local file policies", () => {
       }),
     ),
   );
-  it.live("still removes a worktree when measuring its size fails", () =>
+  it.live("keeps a worktree when the inspection cannot read its directories", () =>
     runCleanupTest(
       Effect.gen(function* () {
         const fs = yield* FileSystem.FileSystem;
@@ -2338,13 +2575,18 @@ describe("storage cleanup reports and local file policies", () => {
           }),
         );
         const report = yield* service.runNow;
-        expect(report.entries[0]).toMatchObject({ outcome: "removed", bytes: null, files: null });
+        expect(report.entries[0]).toMatchObject({
+          outcome: "kept",
+          reason: "Worktree could not be fully inspected",
+          bytes: null,
+          files: null,
+        });
         expect(report.bytesFreed).toBe(0);
-        expect(yield* fs.exists(worktree)).toBe(false);
+        expect(yield* fs.exists(worktree)).toBe(true);
       }),
     ),
   );
-  it.live.each([
+  it.effect.each([
     [
       "its owner's branch is cleared",
       (worktree: string) => [shell({ branch: null, worktreePath: worktree, updatedAt: at(0) })],
@@ -2381,6 +2623,7 @@ describe("storage cleanup reports and local file policies", () => {
   ] as const)("keeps a worktree when %s during size measurement", ([, threadsWhileMeasuring]) =>
     runCleanupTest(
       Effect.gen(function* () {
+        yield* TestClock.setTime(NOW_MS);
         const fixture = yield* pausedMeasurementFixture();
         const { fs, worktree } = fixture;
         fixture.setPolicy("tracked-changes");
@@ -2432,20 +2675,32 @@ describe("storage cleanup reports and local file policies", () => {
       }),
     ),
   );
+  it.live("keeps a worktree for a live session in a missing folder under its stored alias", () =>
+    runCleanupTest(
+      Effect.gen(function* () {
+        const fixture = yield* cleanupFixture();
+        const linkedParent = `${yield* fixture.fs.makeTempDirectoryScoped({ prefix: "cleanup-link-" })}/worktrees`;
+        yield* fixture.fs.symlink(fixture.config.worktreesDir, linkedParent);
+        fixture.setThreads([shell({ branch: "feature", worktreePath: `${linkedParent}/feature` })]);
+        fixture.setOpenSessionCwd(`${linkedParent}/feature/removed-folder`);
+        const report = yield* fixture.service.runNow;
+        expect(report.entries[0]).toMatchObject({
+          outcome: "kept",
+          reason: "Provider session is still open",
+        });
+        expect(yield* fixture.fs.exists(fixture.worktree)).toBe(true);
+      }),
+    ),
+  );
   it.live("compares the checked-out branch without a full status", () =>
     runCleanupTest(
       Effect.gen(function* () {
-        const { service, fs, repo, worktree, command, setThreads, fullStatusCalls } =
-          yield* cleanupFixture();
+        const { service, fs, repo, worktree, command, fullStatusCalls } = yield* cleanupFixture();
         const changed = { outcome: "kept", reason: "Repository or branch changed" };
         yield* command(worktree, ["checkout", "--detach"]);
         expect((yield* service.runNow).entries[0]).toMatchObject(changed);
         yield* command(worktree, ["switch", "--orphan", "other"]);
         expect((yield* service.runNow).entries[0]).toMatchObject(changed);
-        yield* command(worktree, ["switch", "-c", "(feature)", "feature"]);
-        setThreads([shell({ branch: "(feature)", worktreePath: worktree })]);
-        expect((yield* service.runNow).entries[0]).toMatchObject(changed);
-        setThreads([shell({ branch: "feature", worktreePath: worktree })]);
         yield* command(worktree, ["tag", "feature", "feature"]);
         // Newer Git refuses to create a tag named HEAD, but still reads one.
         yield* command(worktree, ["update-ref", "refs/tags/HEAD", "refs/heads/feature"]);
@@ -2516,7 +2771,7 @@ describe("storage cleanup reports and local file policies", () => {
       }),
     ),
   );
-  it.live.each([
+  it.effect.each([
     ["unchanged", "removed", "No commits beyond the project branch"],
     ["unmerged", "kept", "Has commits beyond the project branch"],
     ["detached", "kept", "Project branch is unavailable"],
@@ -2524,6 +2779,7 @@ describe("storage cleanup reports and local file policies", () => {
   ] as const)("cleans archived local-only worktrees: %s", ([state, outcome, reason]) =>
     runCleanupTest(
       Effect.gen(function* () {
+        yield* TestClock.setTime(NOW_MS);
         const { service, fs, repo, worktree, command, setThreads } = yield* cleanupFixture({
           ...DEFAULT_SERVER_SETTINGS.storageCleanup,
           worktreeUnchanged: state !== "merged-only",
@@ -2546,15 +2802,55 @@ describe("storage cleanup reports and local file policies", () => {
       }),
     ),
   );
+  it.live("keeps an unsettled new thread's unchanged worktree after its first turn", () =>
+    runCleanupTest(
+      Effect.gen(function* () {
+        const { service, fs, worktree, setThreads } = yield* cleanupFixture({
+          ...DEFAULT_SERVER_SETTINGS.storageCleanup,
+          worktreeSettledAfterDays: 11,
+          worktreeOnMerge: true,
+          worktreeUnchanged: true,
+        });
+        const now = yield* DateTime.now;
+        const minutesAgo = (minutes: number) => DateTime.subtract(now, { minutes });
+        const thread = shell({
+          branch: "feature",
+          worktreePath: worktree,
+          status: "completed",
+          createdAt: minutesAgo(40),
+          latestUserMessageAt: minutesAgo(40),
+          latestRunRequestedAt: minutesAgo(40),
+          latestRunStartedAt: minutesAgo(40),
+          latestRunCompletedAt: minutesAgo(20),
+          updatedAt: minutesAgo(20),
+        });
+        setThreads([thread]);
+
+        const report = yield* service.runNow;
+        expect(report.entries[0]).toMatchObject({ outcome: "kept" });
+        expect(yield* fs.exists(worktree)).toBe(true);
+
+        setThreads([{ ...thread, settledAt: minutesAgo(10), updatedAt: minutesAgo(10) }]);
+        const settled = yield* service.runNow;
+        expect(settled.entries[0]).toMatchObject({
+          outcome: "removed",
+          reason: "No commits beyond the project branch",
+        });
+      }),
+    ),
+  );
   it.live(
     "discovers trunk without a remote HEAD or tracking ref and removes an integrated worktree",
     () =>
       runCleanupTest(
         Effect.gen(function* () {
-          const { service, fs, repo, worktree, command } = yield* cleanupFixture({
+          const { service, fs, repo, worktree, command, setThreads } = yield* cleanupFixture({
             ...DEFAULT_SERVER_SETTINGS.storageCleanup,
             worktreeUnchanged: true,
           });
+          setThreads([
+            shell({ branch: "feature", worktreePath: worktree, archivedAt: at(-DAY_MS) }),
+          ]);
           const remote = yield* fs.makeTempDirectoryScoped({ prefix: "cleanup-remote-" });
           yield* command(remote, ["init", "--bare", "-b", "trunk"]);
           yield* command(repo, ["remote", "add", "origin", remote]);
@@ -2576,10 +2872,13 @@ describe("storage cleanup reports and local file policies", () => {
     () =>
       runCleanupTest(
         Effect.gen(function* () {
-          const { service, fs, repo, worktree, command } = yield* cleanupFixture({
+          const { service, fs, repo, worktree, command, setThreads } = yield* cleanupFixture({
             ...DEFAULT_SERVER_SETTINGS.storageCleanup,
             worktreeUnchanged: true,
           });
+          setThreads([
+            shell({ branch: "feature", worktreePath: worktree, archivedAt: at(-DAY_MS) }),
+          ]);
           const remote = yield* fs.makeTempDirectoryScoped({ prefix: "cleanup-remote-" });
           yield* command(remote, ["init", "--bare", "-b", "trunk"]);
           yield* command(repo, ["remote", "add", "origin", remote]);
@@ -2604,10 +2903,11 @@ describe("storage cleanup reports and local file policies", () => {
   it.live("keeps the worktree when the remote default is unavailable even if main exists", () =>
     runCleanupTest(
       Effect.gen(function* () {
-        const { service, fs, repo, worktree, command } = yield* cleanupFixture({
+        const { service, fs, repo, worktree, command, setThreads } = yield* cleanupFixture({
           ...DEFAULT_SERVER_SETTINGS.storageCleanup,
           worktreeUnchanged: true,
         });
+        setThreads([shell({ branch: "feature", worktreePath: worktree, archivedAt: at(-DAY_MS) })]);
         const remote = yield* fs.makeTempDirectoryScoped({ prefix: "cleanup-remote-" });
         yield* command(remote, ["init", "--bare", "-b", "trunk"]);
         yield* command(repo, ["remote", "add", "origin", remote]);
@@ -2913,11 +3213,12 @@ describe("storage cleanup reports and local file policies", () => {
 });
 
 describe("settled worktree rechecks", () => {
-  it.live.each(["autoResumeLimitedThreads", "snoozeLimitedThreads"] as const)(
+  it.effect.each(["autoResumeLimitedThreads", "snoozeLimitedThreads"] as const)(
     "keeps a usage-limited checkout when %s is enabled during measurement",
     (preference) =>
       runCleanupTest(
         Effect.gen(function* () {
+          yield* TestClock.setTime(NOW_MS);
           const fixture = yield* pausedMeasurementFixture();
           fixture.setSettings({ autoResumeLimitedThreads: false, snoozeLimitedThreads: false });
           fixture.setThreads([
@@ -2935,16 +3236,20 @@ describe("settled worktree rechecks", () => {
           fixture.setSettings({ [preference]: true });
           yield* Deferred.succeed(fixture.resume, undefined);
           const report = yield* Fiber.join(run);
-          expect(report.entries[0]?.outcome).toBe("kept");
+          expect(report.entries[0]).toMatchObject({
+            outcome: "kept",
+            reason: "Settings changed since check",
+          });
           expect(yield* fixture.fs.exists(fixture.worktree)).toBe(true);
         }),
       ),
   );
-  it.live.each([{ settledAt: null }, { settledAt: at(DAY_MS) }])(
+  it.effect.each([{ settledAt: null }, { settledAt: at(DAY_MS) }])(
     "keeps a checkout changed during measurement (%j)",
     (change) =>
       runCleanupTest(
         Effect.gen(function* () {
+          yield* TestClock.setTime(NOW_MS);
           const fixture = yield* pausedMeasurementFixture();
           const thread = shell({
             branch: "feature",
@@ -2972,9 +3277,10 @@ describe("settled worktree rechecks", () => {
   );
 });
 
-it.live("keeps saved usage data when removing a settled checkout", () =>
+it.effect("keeps saved usage data when removing a settled checkout", () =>
   runCleanupTest(
     Effect.gen(function* () {
+      yield* TestClock.setTime(NOW_MS);
       const fixture = yield* cleanupFixture();
       fixture.setSettings({
         storageCleanup: { ...DEFAULT_SERVER_SETTINGS.storageCleanup, worktreeSettledAfterDays: 0 },
diff --git a/apps/server/src/storageCleanup.ts b/apps/server/src/storageCleanup.ts
index 673c121612c9..0cf5eca0b80d 100644
--- a/apps/server/src/storageCleanup.ts
+++ b/apps/server/src/storageCleanup.ts
@@ -1,3 +1,5 @@
+// @effect-diagnostics nodeBuiltinImport:off
+import * as NodeFSP from "node:fs/promises";
 import {
   GitCommandError,
   OrchestrationV2AppThreadJson,
@@ -17,6 +19,7 @@ import type {
   ThreadId,
 } from "@t3tools/contracts";
 import { resolveWorktreeCleanup } from "@t3tools/shared/projectSettings";
+import { resolveWorktreeT3Home } from "@t3tools/shared/devHome";
 import { makeDrainableWorker } from "@t3tools/shared/DrainableWorker";
 import * as Context from "effect/Context";
 import * as Deferred from "effect/Deferred";
@@ -78,6 +81,15 @@ class PnpmModulesManifestParseError extends Schema.TaggedError<PnpmModulesManife
   }
 }
 
+class WorktreeDirectoryReadError extends Schema.TaggedError<WorktreeDirectoryReadError>()(
+  "WorktreeDirectoryReadError",
+  { cause: Schema.Defect() },
+) {
+  override get message(): string {
+    return "Could not read a worktree directory.";
+  }
+}
+
 const DAY_MS = 86_400_000;
 // Give settle scripts time to open terminals that protect the worktree.
 const SETTLE_SCRIPT_GRACE_MS = 60_000;
@@ -334,20 +346,6 @@ const make = Effect.gen(function* () {
       !path.isAbsolute(relative)
     );
   };
-  const hasTerminal = (worktreePath: string) =>
-    [...liveTerminals.values()]
-      .flatMap((entries) => [...entries.values()])
-      .some((terminal) => {
-        if (terminal.status !== "starting" && terminal.status !== "running") return false;
-        const cwd = path.resolve(terminal.cwd);
-        return (
-          (terminal.worktreePath !== null &&
-            pathKey(terminal.worktreePath) === pathKey(worktreePath)) ||
-          pathKey(cwd) === pathKey(worktreePath) ||
-          inside(worktreePath, cwd)
-        );
-      });
-
   // pnpm imports packages by clone or reflink when its store shares a device
   // with the worktree. Those files have one link but share blocks with the
   // store, so removing them frees almost nothing. A store on another device
@@ -378,9 +376,47 @@ const make = Effect.gen(function* () {
   );
 
   const measureWorktree = Effect.fn("storageCleanup.measureWorktree")(
-    function* (worktreePath: string) {
+    function* (worktreePath: string, inspectRepositories = false) {
       const root = yield* fs.realPath(worktreePath);
       const skipped = yield* sharedPnpmVirtualStore(root);
+      const incomplete = { bytes: null, reason: "worktree could not be fully inspected" };
+      const repositories = new Set([pathKey(root)]);
+      const moduleStores: string[] = [];
+      if (inspectRepositories && (yield* fs.exists(path.join(root, ".gitmodules")))) {
+        const submodules = yield* git.execute({
+          operation: "StorageCleanup.nestedRepositories",
+          cwd: root,
+          args: [
+            "submodule",
+            "foreach",
+            "--recursive",
+            "--quiet",
+            'printf "%s\\0" "$toplevel/$sm_path"',
+          ],
+          maxOutputBytes: 64 * 1024,
+        });
+        if (submodules.stdoutTruncated || submodules.stderrTruncated) return incomplete;
+        for (const submodule of submodules.stdout.split("\0").filter(Boolean)) {
+          repositories.add(pathKey(path.resolve(submodule)));
+          repositories.add(pathKey(path.resolve(submodule, ".git")));
+          moduleStores.push(pathKey(path.resolve(submodule, ".git", "modules")));
+        }
+      }
+      // Git status omits ignored repositories, and worktree remove deletes them.
+      // Registered submodules have their own recursive safety checks.
+      const isNestedRepository = (target: string, names: ReadonlyArray<string>) => {
+        const key = pathKey(target);
+        if (
+          repositories.has(key) ||
+          moduleStores.some((store) => key === store || inside(store, key))
+        )
+          return false;
+        const markers = new Set(names.map((name) => name.toLowerCase()));
+        return (
+          markers.has(".git") ||
+          (markers.has("head") && markers.has("objects") && markers.has("refs"))
+        );
+      };
       const pending = [root];
       let entries = 1;
       let bytes = 0;
@@ -389,39 +425,57 @@ const make = Effect.gen(function* () {
           pending.splice(-8),
           // Untraced: this runs once per entry, and a worktree can hold millions.
           Effect.fnUntraced(function* (target) {
-            if (target === skipped) return { target, bytes: 0, names: [] };
+            const empty = { target, bytes: 0, names: [], children: [] };
+            const inStore = skipped !== null && (target === skipped || inside(skipped, target));
+            if (inStore && !inspectRepositories) return empty;
             const stat = yield* fs.lstat(target);
-            if (stat.type === "SymbolicLink") return { target, bytes: 0, names: [] };
+            if (stat.type === "SymbolicLink") return empty;
             if ((yield* fs.realPath(target)) !== target) return null;
-            if (stat.type === "Directory")
-              return { target, bytes: 0, names: yield* fs.readDirectory(target) };
+            if (stat.type === "Directory") {
+              if (!inStore) {
+                const names = yield* fs.readDirectory(target);
+                return { target, bytes: 0, names, children: names };
+              }
+              // The store is excluded from reclaimed bytes; only walk its directories.
+              const dirents = yield* Effect.tryPromise({
+                try: () => NodeFSP.readdir(target, { withFileTypes: true }),
+                catch: (cause) => new WorktreeDirectoryReadError({ cause }),
+              });
+              return {
+                target,
+                bytes: 0,
+                names: dirents.map((entry) => entry.name),
+                children: dirents.filter((entry) => entry.isDirectory()).map((entry) => entry.name),
+              };
+            }
             // Removing a shared hardlink leaves its blocks allocated.
-            if (stat.type !== "File" || Option.getOrElse(stat.nlink, () => 1n) !== 1n)
-              return { target, bytes: 0, names: [] };
+            if (stat.type !== "File" || Option.getOrElse(stat.nlink, () => 1n) !== 1n) return empty;
             const bytes = Option.match(stat.blocks, {
               onNone: () => Number(stat.size),
               onSome: (blocks) => Number(blocks * 512n),
             });
-            return { target, bytes, names: [] };
+            return { ...empty, bytes };
           }),
           { concurrency: "unbounded" },
         );
         for (const result of inspected) {
-          if (result === null) return null;
+          if (result === null) return incomplete;
+          if (inspectRepositories && isNestedRepository(result.target, result.names))
+            return { bytes: null, reason: "contains a nested Git repository" };
           bytes += result.bytes;
           entries += result.names.length;
-          if (entries > 2_000_000) return null;
-          for (const name of result.names) {
+          if (entries > 2_000_000) return incomplete;
+          for (const name of result.children) {
             const child = path.join(result.target, name);
-            if (!inside(root, child)) return null;
+            if (!inside(root, child)) return incomplete;
             pending.push(child);
           }
         }
       }
-      return bytes;
+      return { bytes, reason: null };
     },
     Effect.timeout("30 seconds"),
-    Effect.orElseSucceed(() => null),
+    Effect.orElseSucceed(() => ({ bytes: null, reason: "worktree could not be fully inspected" })),
   );
 
   // Large snapshots take seconds; use the reader worker instead of blocking the event loop.
@@ -432,18 +486,21 @@ const make = Effect.gen(function* () {
   });
 
   const containsProjectRoot = Effect.fn("StorageCleanup.containsProjectRoot")(function* (
-    worktreePath: string,
+    worktreePaths: ReadonlyArray<string>,
     projects: ReadonlyArray<{ readonly workspaceRoot: string }>,
   ) {
+    const contains = (projectPath: string) =>
+      worktreePaths.some(
+        (worktreePath) =>
+          pathKey(projectPath) === pathKey(worktreePath) || inside(worktreePath, projectPath),
+      );
     for (const project of projects) {
       const projectPath = path.resolve(project.workspaceRoot);
-      if (pathKey(projectPath) === pathKey(worktreePath) || inside(worktreePath, projectPath))
-        return true;
+      if (contains(projectPath)) return true;
       const realPath = yield* fs
         .realPath(projectPath)
         .pipe(Effect.orElseSucceed(() => projectPath));
-      if (pathKey(realPath) === pathKey(worktreePath) || inside(worktreePath, realPath))
-        return true;
+      if (contains(realPath)) return true;
     }
     return false;
   });
@@ -530,7 +587,7 @@ const make = Effect.gen(function* () {
             firstMeasurement ? Effect.asSome : Effect.timeoutOption(remaining),
           );
           firstMeasurement = false;
-          if (Option.isSome(measured)) orphanSizes.set(key, measured.value);
+          if (Option.isSome(measured)) orphanSizes.set(key, measured.value.bytes);
         }
         const bytes = orphanSizes.get(key) ?? null;
         entries.push({
@@ -638,7 +695,7 @@ const make = Effect.gen(function* () {
     if (head === null) return true;
     const ref = head.exitCode === 0 ? head.stdout.trim() : "";
     const name = ref.startsWith("refs/heads/") ? ref.slice("refs/heads/".length).trim() : null;
-    return (name?.startsWith("(") ? null : name) !== branch;
+    return name !== branch;
   });
 
   // Git status and non-forced worktree removal both skip assume-unchanged and skip-worktree files.
@@ -925,12 +982,18 @@ const make = Effect.gen(function* () {
     let waiting = false;
     const kept: string[] = [];
     const roots: Array<string> = [];
-    for (const directory of managedWorktreesDirectories(
-      serverSettings,
-      config.worktreesDir,
-      path,
-      yield* HostProcess.HomeDirectory,
-    )) {
+    // A git worktree's dev home is seeded from real data, so its threads and any
+    // copied settings can point at the developer's real worktrees.
+    const isWorktreeDevHome =
+      (yield* resolveWorktreeT3Home(config.baseDir)) === path.resolve(config.baseDir);
+    for (const directory of isWorktreeDevHome
+      ? [config.worktreesDir]
+      : managedWorktreesDirectories(
+          serverSettings,
+          config.worktreesDir,
+          path,
+          yield* HostProcess.HomeDirectory,
+        )) {
       const root = yield* fs.exists(directory).pipe(
         Effect.flatMap((exists) => (exists ? fs.realPath(directory) : Effect.succeed(null))),
         Effect.orElseSucceed(() => null),
@@ -966,20 +1029,58 @@ const make = Effect.gen(function* () {
     const threadsById = new Map(snapshot.threads.map((thread) => [thread.id, thread]));
     const refreshedDefaultRefs = new Map<string, Set<string>>();
     const defaultBranches = new Map<string, string | null>();
-    const groups = Map.groupBy(
-      snapshot.threads.filter((thread) => thread.worktreePath !== null),
-      (thread) => path.resolve(thread.worktreePath!),
+    // Threads may store one checkout through different symlinked spellings; compare real paths.
+    // Keys are only compared, never opened, so they take pathKey's Windows case folding.
+    const canonicalPaths = new Map<string, string>();
+    const canonical = Effect.fnUntraced(function* (target: string) {
+      const resolved = path.resolve(target);
+      const cached = canonicalPaths.get(resolved);
+      if (cached !== undefined) return cached;
+      const realPath = yield* fs.realPath(resolved).pipe(Effect.orElseSucceed(() => resolved));
+      const key = pathKey(realPath);
+      canonicalPaths.set(resolved, key);
+      return key;
+    });
+    // A cwd in a deleted folder cannot be resolved, so stored spellings are compared too.
+    const occupies = Effect.fnUntraced(function* (
+      worktreePaths: ReadonlyArray<string>,
+      target: string,
+    ) {
+      const targets = [path.resolve(target), yield* canonical(target)];
+      return worktreePaths.some((worktree) =>
+        targets.some((cwd) => pathKey(cwd) === pathKey(worktree) || inside(worktree, cwd)),
+      );
+    });
+    const hasTerminal = Effect.fnUntraced(function* (worktreePaths: ReadonlyArray<string>) {
+      for (const terminal of [...liveTerminals.values()].flatMap((entries) => [
+        ...entries.values(),
+      ])) {
+        if (terminal.status !== "starting" && terminal.status !== "running") continue;
+        if (
+          (terminal.worktreePath !== null &&
+            (yield* occupies(worktreePaths, terminal.worktreePath))) ||
+          (yield* occupies(worktreePaths, terminal.cwd))
+        )
+          return true;
+      }
+      return false;
+    });
+    const liveThreads = snapshot.threads.filter((thread) => thread.worktreePath !== null);
+    const liveKeys = yield* Effect.forEach(liveThreads, (thread) =>
+      canonical(thread.worktreePath!),
     );
-    const deletedByPath = Map.groupBy(deletedThreads, (thread) =>
-      path.resolve(thread.worktreePath!),
+    const groups = Map.groupBy(liveThreads, (_thread, index) => liveKeys[index]!);
+    const deletedKeys = yield* Effect.forEach(deletedThreads, (thread) =>
+      canonical(thread.worktreePath!),
     );
+    const deletedByPath = Map.groupBy(deletedThreads, (_thread, index) => deletedKeys[index]!);
     const candidates = [
       ...[...groups].map(
-        ([worktreePath, group]) =>
+        ([worktreeKey, group]) =>
           // A deleted thread still owns the worktree its remaining subagents share,
           // but only deletion cleanup acts on it; otherwise the live rules apply.
           deletedByPath
-            .get(worktreePath)
+            .get(worktreeKey)
             ?.find(
               (deleted) =>
                 resolveWorktreeCleanup(serverSettings, deleted.projectId).worktreeOnDelete &&
@@ -988,13 +1089,15 @@ const make = Effect.gen(function* () {
           worktreeOwner(group) ??
           group[0]!,
       ),
-      ...deletedThreads.filter((thread) => !groups.has(path.resolve(thread.worktreePath!))),
+      ...deletedThreads.filter((_thread, index) => !groups.has(deletedKeys[index]!)),
     ];
     for (const thread of candidates) {
       const settings = resolveWorktreeCleanup(serverSettings, thread.projectId);
       if (!worktreeCleanupEnabled(settings)) continue;
       const worktreePath = path.resolve(thread.worktreePath!);
-      const group = groups.get(worktreePath) ?? [];
+      const worktreeKey = yield* canonical(worktreePath);
+      const worktreePaths = [worktreePath, worktreeKey];
+      const group = groups.get(worktreeKey) ?? [];
       const activityAt = Math.max(...group.map(storageCleanupActivityAt));
       const deleted = "workspaceRoot" in thread;
       const settlementChain = deleted
@@ -1048,7 +1151,7 @@ const make = Effect.gen(function* () {
           return keep(waitForStop("thread is running or has pending work"));
         if (group.some((member) => member.branch !== thread.branch))
           return keep("a subagent thread's branch differs from this worktree's branch");
-        if (hasTerminal(worktreePath)) return keep(waitForStop("open terminal"));
+        if (yield* hasTerminal(worktreePaths)) return keep(waitForStop("open terminal"));
         if (
           [...group, ...settlementChain.slice(1)].some(
             (member) =>
@@ -1071,6 +1174,9 @@ const make = Effect.gen(function* () {
           settledFor !== null &&
           settings.worktreeSettledAfterDays !== null &&
           settledFor >= settings.worktreeSettledAfterDays * DAY_MS;
+        // A worktree is unchanged before its first commit, so only finished threads qualify.
+        const unchangedApplies =
+          settings.worktreeUnchanged && (settledThread !== undefined || thread.archivedAt !== null);
         let eligible = deleted || old || settled;
         let removalReason = deleted
           ? "thread was deleted"
@@ -1086,15 +1192,16 @@ const make = Effect.gen(function* () {
                 : `settled for ${settledDays} of ${settings.worktreeSettledAfterDays} days`
               : settings.worktreeOnMerge
                 ? "not merged"
-                : settings.worktreeUnchanged
+                : unchangedApplies
                   ? "has commits beyond the default branch"
-                  : "no rules apply";
+                  : settings.worktreeUnchanged
+                    ? "not settled"
+                    : "no rules apply";
         // Only Git-based rules can make a not-yet-due worktree eligible, so skip Git otherwise.
-        if (!eligible && !settings.worktreeUnchanged && !settings.worktreeOnMerge)
-          return keep(notDueReason);
+        if (!eligible && !unchangedApplies && !settings.worktreeOnMerge) return keep(notDueReason);
         const pathReason = yield* worktreePathReason(worktreePath);
         if (pathReason !== null) return keep(pathReason);
-        if (yield* containsProjectRoot(worktreePath, [project, ...snapshot.projects]))
+        if (yield* containsProjectRoot(worktreePaths, [project, ...snapshot.projects]))
           return keep("contains a project checkout");
         if (yield* branchChanged(worktreePath, thread.branch))
           return keep("repository or branch changed");
@@ -1115,8 +1222,12 @@ const make = Effect.gen(function* () {
           let branch: string | null | undefined;
           let defaultRef: string;
           if (remote === null) {
-            if (!settings.worktreeUnchanged)
-              return keep("no remote is configured for merged-worktree cleanup");
+            if (!unchangedApplies)
+              return keep(
+                settings.worktreeUnchanged
+                  ? notDueReason
+                  : "no remote is configured for merged-worktree cleanup",
+              );
             const projectHead = yield* git.execute({
               operation: "StorageCleanup.resolveProjectBranch",
               cwd: repositoryCwd,
@@ -1175,7 +1286,7 @@ const make = Effect.gen(function* () {
             allowNonZeroExit: true,
           });
           const integrated = ancestor.exitCode === 0;
-          eligible = integrated && settings.worktreeUnchanged;
+          eligible = integrated && unchangedApplies;
           if (eligible)
             removalReason =
               remote === null
@@ -1194,18 +1305,21 @@ const make = Effect.gen(function* () {
             });
             if (eligible) removalReason = "pull request was merged";
           }
-          if (!eligible && remote === null) return keep("has commits beyond the project branch");
+          if (!eligible && remote === null)
+            return keep(integrated ? notDueReason : "has commits beyond the project branch");
         }
         if (!eligible) return keep(notDueReason);
         // Re-read this path's threads and sessions so new activity cancels removal; full per-worktree snapshots take seconds.
         const blockedSinceCheck = Effect.fnUntraced(function* () {
           const latestProjects = yield* projectStore.listShells();
-          if (yield* containsProjectRoot(worktreePath, [project, ...latestProjects]))
+          if (yield* containsProjectRoot(worktreePaths, [project, ...latestProjects]))
             return "contains a project checkout";
-          const latest = (yield* projections.getThreadWorktreePaths({
-            includeArchived: true,
-          })).filter((entry) => path.resolve(entry.worktreePath) === worktreePath);
-          if (hasTerminal(worktreePath)) return waitForStop("open terminal");
+          const bindings = yield* projections.getThreadWorktreePaths({ includeArchived: true });
+          const bindingKeys = yield* Effect.forEach(bindings, (binding) =>
+            canonical(binding.worktreePath),
+          );
+          const latest = bindings.filter((_binding, index) => bindingKeys[index] === worktreeKey);
+          if (yield* hasTerminal(worktreePaths)) return waitForStop("open terminal");
           if (deleted) {
             if (
               !resolveWorktreeCleanup(yield* settingsService.getSettings, thread.projectId)
@@ -1226,12 +1340,15 @@ const make = Effect.gen(function* () {
             projections.getThreadShell(entry.threadId),
           );
           const latestGroup = latestShells.filter((shell) => shell !== null);
+          const latestKeys = yield* Effect.forEach(latestGroup, (shell) =>
+            shell.worktreePath === null ? Effect.succeed(null) : canonical(shell.worktreePath),
+          );
           const latestOwner = worktreeOwner(deleted ? [thread, ...latestGroup] : latestGroup);
           if (
             latestGroup.length !== group.length ||
             latestOwner?.id !== thread.id ||
             latestOwner?.branch !== thread.branch ||
-            latestGroup.some((shell) => {
+            latestGroup.some((shell, index) => {
               const previous = group.find((member) => member.id === shell.id);
               return (
                 previous === undefined ||
@@ -1239,7 +1356,7 @@ const make = Effect.gen(function* () {
                 !Equal.equals(shell.settledAt, previous.settledAt) ||
                 (shell.settledAt !== null && !Equal.equals(shell.updatedAt, previous.updatedAt)) ||
                 !storageCleanupThreadIdle(shell, now, serverSettings) ||
-                path.resolve(shell.worktreePath!) !== worktreePath ||
+                latestKeys[index] !== worktreeKey ||
                 storageCleanupActivityAt(shell) !== storageCleanupActivityAt(previous)
               );
             })
@@ -1276,9 +1393,8 @@ const make = Effect.gen(function* () {
           );
           // Ready persisted sessions may have released their runtime; only live sessions protect the path.
           for (const session of sessions) {
-            const cwd = path.resolve(session.cwd);
             if (
-              (pathKey(cwd) === pathKey(worktreePath) || inside(worktreePath, cwd)) &&
+              (yield* occupies(worktreePaths, session.cwd)) &&
               (yield* providerSessions.isLive(session.id))
             )
               return waitForStop("provider session is still open");
@@ -1287,8 +1403,10 @@ const make = Effect.gen(function* () {
         });
         const blocked = yield* blockedSinceCheck();
         if (blocked !== null) return keep(blocked);
-        // Size is an estimate; provider startup must not wait for directory traversal.
-        const bytes = yield* measureWorktree(worktreePath);
+        // Inspect before the lease; provider startup must not wait for directory traversal.
+        const inspection = yield* measureWorktree(worktreePath, true);
+        if (inspection.reason !== null) return keep(inspection.reason);
+        const bytes = inspection.bytes;
         yield* withWorkspaceLease(
           worktreePath,
           Effect.gen(function* () {
diff --git a/apps/server/src/terminal/Manager.test.ts b/apps/server/src/terminal/Manager.test.ts
index 5c65b9d973ba..eb27174d5ed6 100644
--- a/apps/server/src/terminal/Manager.test.ts
+++ b/apps/server/src/terminal/Manager.test.ts
@@ -1,14 +1,18 @@
+import { deriveProviderInstanceConfigMap } from "../provider/ProviderInstanceRegistryHydration.ts";
 import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
 import * as NodeServices from "@effect/platform-node/NodeServices";
 import { assert, it } from "@effect/vitest";
 import {
   DEFAULT_TERMINAL_ID,
+  ProjectId,
+  ThreadId,
+  TerminalCwdNotFoundError,
   type TerminalAttachStreamEvent,
   type TerminalEvent,
   type TerminalOpenInput,
   ProviderDriverKind,
   ProviderInstanceId,
-  ProjectId,
+  retainedTerminalHistory,
   TerminalProviderInstanceNotFoundError,
 } from "@t3tools/contracts";
 import * as HostProcess from "@t3tools/shared/HostProcess";
@@ -26,6 +30,7 @@ import * as PlatformError from "effect/PlatformError";
 import * as Path from "effect/Path";
 import * as ChildProcessSpawner from "effect/process/ChildProcessSpawner";
 import * as Ref from "effect/Ref";
+import * as Queue from "effect/Queue";
 import * as Schema from "effect/Schema";
 import * as Scope from "effect/Scope";
 import * as Stream from "effect/Stream";
@@ -33,12 +38,16 @@ import * as SynchronizedRef from "effect/SynchronizedRef";
 import * as TestClock from "effect/testing/TestClock";
 import { expect, vi } from "vite-plus/test";
 
+import * as ServerConfig from "../config.ts";
 import * as ProjectionStore from "../orchestration-v2/ProjectionStore.ts";
 import * as ProcessRunner from "../processRunner.ts";
 import * as ServerSettings from "../serverSettings.ts";
 import * as ProjectService from "../project/ProjectService.ts";
 import * as ProjectSetupScriptRunner from "../project/ProjectSetupScriptRunner.ts";
 import * as TerminalManager from "./Manager.ts";
+import * as GitWorkflowService from "../git/GitWorkflowService.ts";
+import { makePrepareTerminalLaunch } from "../workspace/restoreMissingWorktree.ts";
+import { withWorkspaceLease } from "../workspace/workspaceLease.ts";
 import { terminalOutputStream } from "./OutputProtocol.ts";
 import * as PtyAdapter from "@t3tools/shared/PtyAdapter";
 import packageJson from "../../package.json" with { type: "json" };
@@ -407,6 +416,41 @@ it("bounds long partial lines and joins surrogate pairs across chunk boundaries"
   }
 });
 
+it("restores bounded history across append compaction, clears and split Unicode", () => {
+  const maxBytes = 64;
+  const history = new TerminalManager.BoundedTerminalHistory(3, "", maxBytes);
+  let cursor: ReturnType<typeof history.persistenceUpdate>["cursor"] | undefined;
+  let persisted = "";
+  let compactions = 0;
+  const flush = () => {
+    const update = history.persistenceUpdate(cursor);
+    if (!update.append) compactions += 1;
+    const encoded = Buffer.from(update.data).toString();
+    persisted = update.append ? persisted + encoded : encoded;
+    cursor = update.cursor;
+    expect(Buffer.byteLength(persisted)).toBeLessThanOrEqual(maxBytes * 2);
+    expect(retainedHistory(persisted, 3, maxBytes)).toBe(Buffer.from(history.value()).toString());
+  };
+  for (let index = 0; index < 100; index += 1) {
+    history.append(`line ${index} 名\n`);
+    flush();
+  }
+  expect(compactions).toBeGreaterThan(1);
+  expect(compactions).toBeLessThan(50);
+  history.clear();
+  flush();
+  expect(persisted).toBe("");
+  history.append("\ud83d");
+  flush();
+  history.append("\ude80");
+  flush();
+  expect(persisted).toBe("🚀");
+  // More output than the retained window between flushes must replace the file.
+  history.append("z".repeat(maxBytes * 3));
+  flush();
+  expect(persisted).toBe("z".repeat(maxBytes));
+});
+
 it.layer(
   Layer.mergeAll(
     NodeServices.layer,
@@ -415,6 +459,91 @@ it.layer(
   ),
   { excludeTestServices: true },
 )("TerminalManager", (it) => {
+  it.effect.each([
+    { method: "open", location: "managed" },
+    { method: "attach", location: "managed" },
+    { method: "open", location: "subdirectory" },
+    { method: "open", location: "unmanaged" },
+    { method: "open", location: "no-worktree" },
+  ] as const)(
+    "recovers $method with a $location cwd without a cleanup gap",
+    ({ method, location }) =>
+      Effect.gen(function* () {
+        const fs = yield* FileSystem.FileSystem;
+        const path = yield* Path.Path;
+        const { manager, ptyAdapter, baseDir } = yield* createManager();
+        const worktreesDir = path.join(baseDir, "worktrees");
+        const worktreePath =
+          location === "unmanaged"
+            ? path.join(baseDir, "missing")
+            : path.join(worktreesDir, "project", "feature");
+        const cwd = location === "subdirectory" ? path.join(worktreePath, "src") : worktreePath;
+        const cleanupQueued = yield* Deferred.make<Fiber.Fiber<void>>();
+        let creations = 0;
+        const prepareLaunch = yield* makePrepareTerminalLaunch(() =>
+          Effect.succeed({
+            id: ThreadId.make("thread-1"),
+            projectId: ProjectId.make("project-1"),
+            worktreePath: location === "no-worktree" ? null : worktreePath,
+            branch: "feature",
+          }),
+        ).pipe(
+          Effect.provide(
+            Layer.mergeAll(
+              Layer.mock(ServerConfig.ServerConfig)({
+                worktreesDir,
+              } as ServerConfig.ServerConfig["Service"]),
+              ServerSettings.layerTest(),
+              Layer.mock(ProjectService.ProjectService)({
+                getById: () => Effect.succeedSome({ workspaceRoot: baseDir } as never),
+              }),
+              Layer.mock(GitWorkflowService.GitWorkflowService)({
+                pruneWorktrees: () => Effect.void,
+                listLocalBranchNames: () => Effect.succeed(["feature"]),
+                createWorktree: () =>
+                  Effect.gen(function* () {
+                    creations++;
+                    yield* fs.makeDirectory(cwd, { recursive: true }).pipe(Effect.orDie);
+                    const cleanup = yield* withWorkspaceLease(
+                      worktreePath,
+                      Effect.sync(() => {
+                        assert.equal(ptyAdapter.spawnInputs.length, 1);
+                      }),
+                    ).pipe(Effect.forkChild({ startImmediately: true }));
+                    yield* Deferred.succeed(cleanupQueued, cleanup);
+                    return {} as never;
+                  }),
+              }),
+            ),
+          ),
+        );
+        const input = openInput({
+          cwd,
+          worktreePath: location === "subdirectory" ? null : worktreePath,
+        });
+        const launch = prepareLaunch(input).pipe(
+          Effect.flatMap(({ input, recover }) =>
+            (method === "attach"
+              ? manager.attachStream(input, () => Effect.void).pipe(Effect.asVoid)
+              : manager.open(input).pipe(Effect.asVoid)
+            ).pipe(Effect.provideService(TerminalManager.TerminalCwdRecovery, recover)),
+          ),
+        );
+        if (location === "unmanaged" || location === "no-worktree") {
+          const error = yield* launch.pipe(Effect.flip);
+          assert.deepEqual(error, new TerminalCwdNotFoundError({ cwd }));
+          assert.equal(creations, 0);
+          assert.equal(ptyAdapter.spawnInputs.length, 0);
+          return;
+        }
+        yield* launch;
+        yield* Fiber.join(yield* Deferred.await(cleanupQueued));
+        assert.equal(creations, 1);
+        assert.equal(ptyAdapter.spawnInputs.length, 1);
+        assert.isTrue(yield* fs.exists(cwd));
+      }),
+  );
+
   it.effect("spawns lazily and reuses running terminal per thread", () =>
     Effect.gen(function* () {
       const { manager, ptyAdapter } = yield* createManager();
@@ -1043,6 +1172,119 @@ it.layer(
     }),
   );
 
+  it.effect("persists small terminal updates without rewriting the retained history", () =>
+    Effect.gen(function* () {
+      const fs = yield* FileSystem.FileSystem;
+      const writes = yield* Queue.unbounded<number>();
+      const maxBytes = 64 * 1024;
+      const { manager, ptyAdapter, logsDir } = yield* createManager(5_000, {
+        historyByteLimit: maxBytes,
+      }).pipe(
+        Effect.provideService(FileSystem.FileSystem, {
+          ...fs,
+          writeFileString: (path, data, options) =>
+            fs
+              .writeFileString(path, data, options)
+              .pipe(
+                Effect.tap(() =>
+                  data.length > 0 ? Queue.offer(writes, Buffer.byteLength(data)) : Effect.void,
+                ),
+              ),
+        }),
+      );
+      yield* manager.open(openInput());
+      const process = ptyAdapter.processes[0]!;
+      process.emitData("a".repeat(maxBytes));
+      let written = yield* Queue.take(writes);
+      for (let index = 0; index < 16; index += 1) {
+        process.emitData("b".repeat(1024));
+        written += yield* Queue.take(writes);
+      }
+      expect(written).toBeLessThan(maxBytes * 2);
+      const expected = "a".repeat(maxBytes - 16 * 1024) + "b".repeat(16 * 1024);
+      const persisted = yield* fs.readFileString(yield* historyLogPath(logsDir));
+      expect(Buffer.byteLength(persisted)).toBe(maxBytes + 16 * 1024);
+      for (const failure of [undefined, "write", "rename"] as const) {
+        let failed = false;
+        const fail = () => {
+          failed = true;
+          return Effect.fail(
+            PlatformError.systemError({
+              _tag: "Unknown",
+              module: "FileSystem",
+              method: failure === "write" ? "writeFileString" : "rename",
+              cause: { code: "ENOSPC" },
+            }),
+          );
+        };
+        const recovered = yield* createManager(5_000, { historyByteLimit: maxBytes }).pipe(
+          Effect.provideService(FileSystem.FileSystem, {
+            ...fs,
+            writeFileString: (file, data, options) =>
+              failure === "write" && !failed && data === expected
+                ? fs.writeFileString(file, "partial", options).pipe(Effect.andThen(fail))
+                : fs.writeFileString(file, data, options),
+            rename: (from, to) => (failure === "rename" && !failed ? fail() : fs.rename(from, to)),
+          }),
+        );
+        const recoveredPath = yield* historyLogPath(recovered.logsDir);
+        yield* fs.makeDirectory(recovered.logsDir, { recursive: true });
+        yield* fs.writeFileString(recoveredPath, persisted);
+        const snapshot = yield* recovered.manager.open(openInput());
+        expect(snapshot.status).toBe("running");
+        expect(snapshot.history).toBe(expected);
+        expect(failed).toBe(failure !== undefined);
+        expect(yield* fs.readFileString(recoveredPath)).toBe(
+          failure === undefined ? expected : persisted,
+        );
+        expect(yield* fs.readDirectory(recovered.logsDir)).toHaveLength(1);
+      }
+      yield* manager.close({ threadId: "thread-1" });
+      expect((yield* manager.open(openInput())).history).toBe(expected);
+      expect(yield* fs.readFileString(yield* historyLogPath(logsDir))).toBe(expected);
+    }),
+  );
+
+  it.effect("rewrites history after an append fails partway through", () =>
+    Effect.gen(function* () {
+      const fs = yield* FileSystem.FileSystem;
+      const writes = yield* Queue.unbounded<void>();
+      let failAppend = false;
+      const { manager, ptyAdapter, logsDir } = yield* createManager().pipe(
+        Effect.provideService(FileSystem.FileSystem, {
+          ...fs,
+          writeFileString: (path, data, options) => {
+            if (options?.flag === "a" && failAppend) {
+              failAppend = false;
+              return fs.writeFileString(path, data.slice(0, 1), options).pipe(
+                // The file cannot also be a parent directory: fail after the partial append.
+                Effect.andThen(fs.writeFileString(`${path}/missing`, data)),
+                Effect.ensuring(Queue.offer(writes, undefined)),
+              );
+            }
+            return fs
+              .writeFileString(path, data, options)
+              .pipe(
+                Effect.tap(() => (data.length > 0 ? Queue.offer(writes, undefined) : Effect.void)),
+              );
+          },
+        }),
+      );
+      yield* manager.open(openInput());
+      const process = ptyAdapter.processes[0]!;
+      process.emitData("start:");
+      yield* Queue.take(writes);
+      failAppend = true;
+      process.emitData("middle");
+      yield* Queue.take(writes);
+      expect(failAppend).toBe(false);
+      process.emitData(":end");
+      yield* Queue.take(writes);
+      expect(yield* fs.readFileString(yield* historyLogPath(logsDir))).toBe("start:middle:end");
+      yield* manager.close({ threadId: "thread-1" });
+    }),
+  );
+
   it.effect("releases delivered output while the process queue stays busy", () =>
     Effect.gen(function* () {
       // Observe retained payloads, since delivery and bounded history alone cannot detect a leak.
@@ -1157,8 +1399,11 @@ it.layer(
 
       process.emitData("prompt ");
       process.emitData("\u001b[?2026$p\u001b[?2026;2$y\u001b[>q\u001b[?u\u001b[?31u");
+      process.emitData("\u001b[=c\u001b[=0c\u001bZ");
       process.emitData("\u001bP$q m\u001b\\\u001bP1$r0m\u001b\\");
       process.emitData("\u001bP+q544e\u001b\\\u001bP1+r544e=1b\u001b\\");
+      // BEL is DCS payload, not a terminator: only ST ends the string.
+      process.emitData("\u001bP$qm\u0007hidden\u001b\\\u001bP+q544e\u0007hidden\u001b\\");
       process.emitData('\u001b[!p\u001b["p\u001b[4 q\u001b[u');
       process.emitData("\u001b]0;x\u001b\u001b[?2026$p");
       process.emitData("done\n");
@@ -1174,6 +1419,28 @@ it.layer(
     }),
   );
 
+  // Ghostty executes 0x00-0x0F inside a CSI and ignores DEL and 0x10-0x1F; none change the query.
+  it.effect.each([
+    { name: "NUL in DA", data: "A\u001b[0\u0000cB", history: "AB" },
+    { name: "DEL in DA", data: "A\u001b[0\u007fcB", history: "AB" },
+    { name: "NUL in DECRQM", data: "A\u001b[?2026\u0000$pB", history: "AB" },
+    { name: "CR in DSR", data: "AB\u001b[5\rnC", history: "AB\rC" },
+    { name: "DLE in DSR", data: "AB\u001b[5\u0010nC", history: "ABC" },
+  ])(
+    "strips a query with an embedded control but keeps what the terminal ran ($name)",
+    ({ data, history }) =>
+      Effect.gen(function* () {
+        const { manager, ptyAdapter } = yield* createManager();
+        yield* manager.open(openInput());
+        ptyAdapter.processes[0]!.emitData(data);
+        yield* manager.close({ threadId: "thread-1" });
+
+        const reopened = yield* manager.open(openInput());
+        const restored = reopened.history.replaceAll("\u0000", "");
+        expect(restored.split("\u001b[?1049h")[0]).toBe(history);
+      }),
+  );
+
   it.effect.each([
     { name: "OSC", sequence: "\u001b]0;unfinished" },
     { name: "DCS", sequence: "\u001bPunfinished" },
@@ -1225,6 +1492,21 @@ it.layer(
     }),
   );
 
+  it.effect("keeps a decoded U+009C inside a stripped OSC query out of history", () =>
+    Effect.gen(function* () {
+      const { manager, ptyAdapter } = yield* createManager();
+      yield* manager.open(openInput());
+      const process = ptyAdapter.processes[0]!;
+      // libghostty receives UTF-8 (c2 9c), which is OSC payload; only ESC \ ends this string.
+      process.emitData("A\u001b]11;?\u009cHIDDEN\u001b\\B\n");
+      // A DCS string does end at U+009C there, so the text after it stays visible.
+      process.emitData("C\u001bP$qm\u009cSHOWN\u001b\\D\n");
+      yield* manager.close({ threadId: "thread-1" });
+
+      expect((yield* manager.open(openInput())).history).toMatch(/^AB\nCSHOWN\u001b\\D\n/);
+    }),
+  );
+
   it.effect("preserves large chunked OSC 52 and DCS strings across reopen", () =>
     Effect.gen(function* () {
       const { manager, ptyAdapter, logsDir } = yield* createManager();
@@ -2053,6 +2335,7 @@ it.layer(
       const path = yield* Path.Path;
       const serverSettings = yield* ServerSettings.ServerSettingsService;
       const environment = yield* TerminalManager.resolveProviderInstanceTerminalEnvironment({
+        deriveProviderInstanceConfigMap,
         serverSettings,
         path,
         rawProviderInstanceId: "configured_home",
@@ -2198,7 +2481,7 @@ it.layer(
         { type: "snapshot", snapshot: { status: "running", pid: ptyAdapter.processes[0]?.pid } },
       ]);
       expect(ptyAdapter.processes).toHaveLength(1);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("resyncs bounded history and follows close/reopen across a stalled stream", () =>
@@ -2272,7 +2555,7 @@ it.layer(
       ptyAdapter.processes.at(-1)!.emitData("new session only\n");
       expect(yield* pull).toMatchObject([{ type: "output", data: "new session only\n" }]);
       expect(ptyAdapter.spawnInputs).toHaveLength(4);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect.each([
@@ -2319,7 +2602,58 @@ it.layer(
 
       yield* Deferred.await(restored);
       expect(process.resizeCalls.at(-1)).toEqual({ cols: 130, rows: 15 });
-    }).pipe(Effect.scoped),
+    }),
+  );
+
+  it.effect("sends bounded attach streams only the history the client retains", () =>
+    Effect.gen(function* () {
+      const { manager, ptyAdapter } = yield* createManager();
+      const maxHistoryBytes = 9;
+      yield* manager.open(openInput());
+      const process = ptyAdapter.processes[0]!;
+      const published = yield* Deferred.make<void>();
+      const unsubscribe = yield* manager.subscribe((event) =>
+        event.type === "output" && event.data === "yz\n"
+          ? Deferred.succeed(published, undefined).pipe(Effect.asVoid)
+          : Effect.void,
+      );
+      process.emitData("aaaa\nx名😀");
+      process.emitData("yz\n");
+      yield* Deferred.await(published);
+      unsubscribe();
+
+      const full = yield* Stream.toPull(manager.attachOutputStream(openInput(), "full"));
+      const bounded = yield* Stream.toPull(
+        manager.attachOutputStream({ ...openInput(), maxHistoryBytes }, "bounded"),
+      );
+      const expectRetained = Effect.fnUntraced(function* () {
+        const [fullEvents, boundedEvents] = [yield* full, yield* bounded];
+        const fullSnapshot = fullEvents.at(-1);
+        if (fullSnapshot?.type !== "snapshot") throw new Error("Expected a full snapshot");
+        expect(boundedEvents.at(-1)).toEqual({
+          ...fullSnapshot,
+          snapshot: {
+            ...fullSnapshot.snapshot,
+            history: retainedTerminalHistory(fullSnapshot.snapshot.history, maxHistoryBytes),
+          },
+        });
+        return fullSnapshot.snapshot.history;
+      });
+
+      expect(yield* expectRetained()).toBe("aaaa\nx名😀yz\n");
+      // The cap starts inside 名, so the tail begins at the next code point.
+      expect(retainedTerminalHistory("aaaa\nx名😀yz\n", maxHistoryBytes)).toBe("😀yz\n");
+      process.emitData("after\n");
+      expect(yield* full).toEqual(yield* bounded);
+
+      yield* publishPastOutputBudget(manager, process);
+      expect(yield* expectRetained()).toMatch(/last\n$/);
+
+      process.emitExit({ exitCode: 0, signal: 0 });
+      expect(yield* full).toEqual(yield* bounded);
+      yield* manager.attachStream({ ...openInput(), restartIfNotRunning: true }, () => Effect.void);
+      yield* expectRetained();
+    }),
   );
 
   it.effect("does not replay in-flight output already included in an observer snapshot", () =>
@@ -2356,7 +2690,7 @@ it.layer(
       expect(observed.filter((event) => event.type === "output")).toMatchObject([
         { data: "after\n" },
       ]);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("observes terminal history and live output without changing the process", () =>
diff --git a/apps/server/src/terminal/Manager.ts b/apps/server/src/terminal/Manager.ts
index 625b678446e1..dd06f5f51695 100644
--- a/apps/server/src/terminal/Manager.ts
+++ b/apps/server/src/terminal/Manager.ts
@@ -5,6 +5,7 @@ import { withWorkspaceLease } from "../workspace/workspaceLease.ts";
 import {
   DEFAULT_TERMINAL_ID,
   DEFAULT_MAX_TERMINAL_BUFFER_BYTES,
+  retainedTerminalHistory,
   TerminalCwdError,
   TerminalCwdNotDirectoryError,
   TerminalCwdNotFoundError,
@@ -67,7 +68,7 @@ import * as ServerConfig from "../config.ts";
 import { mergeProviderInstanceEnvironment } from "@t3tools/provider-core/server/instanceEnvironment";
 import { resolveCodexHomeLayout } from "../provider/Drivers/CodexHomeLayout.ts";
 import { makeClaudeEnvironment } from "../provider/Drivers/ClaudeHome.ts";
-import { deriveProviderInstanceConfigMap } from "../provider/ProviderInstanceRegistryHydration.ts";
+import type { deriveProviderInstanceConfigMap } from "../provider/ProviderInstanceRegistryHydration.ts";
 import * as ServerSettings from "../serverSettings.ts";
 import { increment, terminalSessionsTotal } from "../observability/Metrics.ts";
 import { expandHomeVariable } from "@t3tools/provider-core/server/pathExpansion";
@@ -166,6 +167,10 @@ class TerminalProcessSignalError extends Schema.TaggedError<TerminalProcessSigna
   }
 }
 
+export class TerminalCwdRecovery extends Context.Reference<
+  (error: TerminalCwdNotFoundError) => Effect.Effect<void, TerminalCwdNotFoundError>
+>("t3/terminal/TerminalCwdRecovery", { defaultValue: () => (error) => Effect.fail(error) }) {}
+
 export class TerminalManager extends Context.Service<
   TerminalManager,
   {
@@ -877,6 +882,12 @@ interface TerminalHistoryChunk {
   lineBreaks: number;
 }
 
+interface TerminalHistoryPersistenceCursor {
+  readonly generation: number;
+  readonly offset: number;
+  readonly fileBytes: number;
+}
+
 export class BoundedTerminalHistory {
   private readonly maxLines: number;
   private readonly maxBytes: number;
@@ -887,6 +898,8 @@ export class BoundedTerminalHistory {
   // Reading the old string's tail on each append can force chunk concatenation.
   private lastCodeUnit: number | undefined;
   private cachedValue: string | null = "";
+  private generation = 0;
+  private appendedLength = 0;
 
   constructor(maxLines: number, initial: string, maxBytes = DEFAULT_HISTORY_BYTE_LIMIT) {
     this.maxLines = maxLines;
@@ -896,6 +909,7 @@ export class BoundedTerminalHistory {
 
   append(text: string): void {
     if (text.length === 0) return;
+    this.appendedLength += text.length;
     this.cachedValue = null;
     if (this.maxBytes <= 0 || this.maxLines <= 0) {
       this.clear();
@@ -916,6 +930,8 @@ export class BoundedTerminalHistory {
       firstCode <= 0xdfff
     ) {
       // Joining a split surrogate changes its UTF-8 size from 3 to 4 bytes.
+      // The previous flush may have encoded the lone surrogate as a replacement character.
+      this.generation += 1;
       previous.data += text[0];
       previous.byteLength += 1;
       this.byteLength += 1;
@@ -1034,6 +1050,8 @@ export class BoundedTerminalHistory {
   }
 
   clear(): void {
+    this.generation += 1;
+    this.appendedLength = 0;
     this.chunks = [];
     this.start = 0;
     this.byteLength = 0;
@@ -1042,6 +1060,38 @@ export class BoundedTerminalHistory {
     this.cachedValue = "";
   }
 
+  persistenceUpdate(previous?: TerminalHistoryPersistenceCursor) {
+    const offset = this.appendedLength;
+    let data: string | undefined;
+    if (previous?.generation === this.generation) {
+      let remaining = offset - previous.offset;
+      const tail: string[] = [];
+      for (let index = this.chunks.length - 1; remaining > 0 && index >= this.start; index -= 1) {
+        const chunk = this.chunks[index]!.data;
+        const suffix = chunk.slice(Math.max(0, chunk.length - remaining));
+        tail.push(suffix);
+        remaining -= suffix.length;
+      }
+      if (remaining === 0) data = tail.toReversed().join("");
+    }
+    // Keep the on-disk log bounded while amortizing compaction across new output.
+    // Readers already cap the plain-text tail by bytes and lines.
+    const append =
+      data !== undefined &&
+      previous !== undefined &&
+      previous.fileBytes + Buffer.byteLength(data) <= this.maxBytes * 2;
+    const output = append && data !== undefined ? data : this.value();
+    return {
+      data: output,
+      append,
+      cursor: {
+        generation: this.generation,
+        offset,
+        fileBytes: (append ? previous.fileBytes : 0) + Buffer.byteLength(output),
+      },
+    };
+  }
+
   value(): string {
     if (this.cachedValue !== null) return this.cachedValue;
     this.cachedValue = this.chunks
@@ -1106,7 +1156,7 @@ function shouldStripCsiSequence(body: string, finalByte: string): boolean {
   if (finalByte === "R" && /^[0-9;?]*$/.test(body)) {
     return true;
   }
-  if (finalByte === "c" && /^[>0-9;?]*$/.test(body)) {
+  if (finalByte === "c" && /^[>=0-9;?]*$/.test(body)) {
     return true;
   }
   // Strip DECRQM/DECRPM query traffic to prevent echoed replies during replay; $ guards preserve setters.
@@ -1144,10 +1194,12 @@ function stripStringTerminator(value: string): string {
   return value;
 }
 
-function findStringTerminatorIndex(input: string, start: number): number | null {
+// BEL ends only OSC; inside DCS, PM and APC it is payload. A decoded U+009C is the
+// reverse: libghostty keeps it inside OSC but ends the other strings there.
+function findStringTerminatorIndex(input: string, start: number, isOsc: boolean): number | null {
   for (let index = start; index < input.length; index += 1) {
     const codePoint = input.charCodeAt(index);
-    if (codePoint === 0x07 || codePoint === 0x9c || isControlSequenceCancel(codePoint)) {
+    if ((isOsc ? codePoint === 0x07 : codePoint === 0x9c) || isControlSequenceCancel(codePoint)) {
       return index + 1;
     }
     // Like xterm.js, an ESC that does not start ST ends the string and begins the next sequence.
@@ -1215,17 +1267,30 @@ function sanitizeTerminalHistoryChunk(
 
       if (nextCodePoint === 0x5b) {
         let cursor = index + 2;
+        // Inside a CSI Ghostty executes 0x00-0x0F and ignores DEL and 0x10-0x1F, which it would
+        // print in ground state. None join the parameters; only executed ones survive a strip.
+        let body = "";
+        let executedControls = "";
         while (cursor < input.length) {
-          const cancelled = isControlSequenceCancel(input.charCodeAt(cursor));
-          if (cancelled || isCsiFinalByte(input.charCodeAt(cursor))) {
-            const sequence = input.slice(index, cursor + 1);
-            const body = input.slice(index + 2, cursor);
+          const cursorCodePoint = input.charCodeAt(cursor);
+          const cancelled = isControlSequenceCancel(cursorCodePoint);
+          if (cancelled || isCsiFinalByte(cursorCodePoint)) {
             if (cancelled || !shouldStripCsiSequence(body, input[cursor] ?? "")) {
-              append(sequence);
+              append(input.slice(index, cursor + 1));
+            } else {
+              append(executedControls);
             }
             index = cursor + 1;
             break;
           }
+          if (cursorCodePoint < 0x10) {
+            executedControls += input[cursor];
+          } else if (
+            (cursorCodePoint >= 0x20 || cursorCodePoint === 0x1b) &&
+            cursorCodePoint !== 0x7f
+          ) {
+            body += input[cursor];
+          }
           cursor += 1;
         }
         if (cursor >= input.length) {
@@ -1243,6 +1308,7 @@ function sanitizeTerminalHistoryChunk(
         const terminatorIndex = findStringTerminatorIndex(
           input,
           Math.max(index + 2, pendingScanStart),
+          nextCodePoint === 0x5d,
         );
         if (terminatorIndex === null) {
           return { visibleText, pendingControlSequence: input.slice(index) };
@@ -1263,7 +1329,10 @@ function sanitizeTerminalHistoryChunk(
       if (escapeSequenceEndIndex === null) {
         return { visibleText, pendingControlSequence: input.slice(index) };
       }
-      append(input.slice(index, escapeSequenceEndIndex));
+      // ESC Z (DECID) is the legacy primary device attributes query.
+      if (nextCodePoint !== 0x5a) {
+        append(input.slice(index, escapeSequenceEndIndex));
+      }
       index = escapeSequenceEndIndex;
       continue;
     }
@@ -1451,6 +1520,7 @@ interface TerminalManagerOptions {
 export const resolveProviderInstanceTerminalEnvironment = Effect.fn(
   "terminal.resolveProviderInstanceTerminalEnvironment",
 )(function* (input: {
+  readonly deriveProviderInstanceConfigMap: typeof deriveProviderInstanceConfigMap;
   readonly serverSettings: ServerSettings.ServerSettingsService["Service"];
   readonly path: Path.Path;
   readonly rawProviderInstanceId: string;
@@ -1460,7 +1530,7 @@ export const resolveProviderInstanceTerminalEnvironment = Effect.fn(
   const settings = yield* input.serverSettings.getSettings.pipe(
     Effect.mapError((cause) => new TerminalProviderEnvironmentError({ providerInstanceId, cause })),
   );
-  const instance = deriveProviderInstanceConfigMap(settings)[providerInstanceId];
+  const instance = input.deriveProviderInstanceConfigMap(settings)[providerInstanceId];
   if (instance === undefined) {
     return yield* new TerminalProviderInstanceNotFoundError({ providerInstanceId });
   }
@@ -1490,7 +1560,9 @@ export const resolveProviderInstanceTerminalEnvironment = Effect.fn(
 });
 
 /** @public */
-export const make = Effect.fn("TerminalManager.make")(function* () {
+export const make = Effect.fn("TerminalManager.make")(function* (
+  deriveConfigMap: typeof deriveProviderInstanceConfigMap,
+) {
   const { terminalLogsDir, providerStatusCacheDir, baseDir } = yield* ServerConfig.ServerConfig;
   const ptyAdapter = yield* PtyAdapter.PtyAdapter;
   const portDiscovery = yield* PortScanner.PortDiscovery;
@@ -1501,6 +1573,7 @@ export const make = Effect.fn("TerminalManager.make")(function* () {
     "terminal.resolveProviderInstanceEnvironment",
   )((rawProviderInstanceId: string, env: Record<string, string> | undefined) =>
     resolveProviderInstanceTerminalEnvironment({
+      deriveProviderInstanceConfigMap: deriveConfigMap,
       serverSettings,
       path,
       rawProviderInstanceId,
@@ -1934,6 +2007,7 @@ export const makeWithOptions = Effect.fn("TerminalManager.makeWithOptions")(func
     yield* registerKillFiber(process, fiber);
   });
 
+  const persistedHistory = new WeakMap<BoundedTerminalHistory, TerminalHistoryPersistenceCursor>();
   const persistWorker = yield* makeKeyedCoalescingWorker<
     string,
     PersistHistoryRequest,
@@ -1954,9 +2028,19 @@ export const makeWithOptions = Effect.fn("TerminalManager.makeWithOptions")(func
         return;
       }
 
+      const update = request.history.persistenceUpdate(
+        request.immediate ? undefined : persistedHistory.get(request.history),
+      );
+      if (update.append && update.data.length === 0) return;
+      // An append may partially succeed before failing. Retry from a full snapshot,
+      // never from an uncertain file offset.
+      persistedHistory.delete(request.history);
       yield* fileSystem
-        .writeFileString(historyPath(threadId, terminalId), request.history.value())
+        .writeFileString(historyPath(threadId, terminalId), update.data, {
+          flag: update.append ? "a" : "w",
+        })
         .pipe(
+          Effect.tap(() => Effect.sync(() => persistedHistory.set(request.history, update.cursor))),
           Effect.catch((error) =>
             Effect.logWarning("failed to persist terminal history", {
               threadId,
@@ -2047,17 +2131,15 @@ export const makeWithOptions = Effect.fn("TerminalManager.makeWithOptions")(func
       const history = new BoundedTerminalHistory(historyLineLimit, raw, historyByteLimit);
       const capped = history.value();
       if (migrating || truncated || capped !== raw) {
-        const write = migrating
-          ? Effect.gen(function* () {
-              const temporaryPath = yield* fileSystem.makeTempFileScoped({
-                directory: logsDir,
-                prefix: ".history-",
-              });
-              yield* fileSystem.writeFileString(temporaryPath, capped);
-              yield* fileSystem.rename(temporaryPath, nextPath);
-            }).pipe(Effect.scoped)
-          : fileSystem.writeFileString(nextPath, capped);
-        yield* write.pipe(
+        const write = Effect.gen(function* () {
+          const temporaryPath = yield* fileSystem.makeTempFileScoped({
+            directory: logsDir,
+            prefix: ".history-",
+          });
+          yield* fileSystem.writeFileString(temporaryPath, capped);
+          yield* fileSystem.rename(temporaryPath, nextPath);
+        }).pipe(
+          Effect.scoped,
           Effect.mapError(
             (cause) =>
               new TerminalHistoryError({
@@ -2068,6 +2150,17 @@ export const makeWithOptions = Effect.fn("TerminalManager.makeWithOptions")(func
               }),
           ),
         );
+        yield* migrating
+          ? write
+          : write.pipe(
+              Effect.catch((error) =>
+                Effect.logWarning("failed to compact terminal history", {
+                  threadId,
+                  terminalId,
+                  error,
+                }),
+              ),
+            );
       }
       if (migrating) {
         yield* fileSystem.remove(sourcePath, { force: true }).pipe(
@@ -2136,7 +2229,7 @@ export const makeWithOptions = Effect.fn("TerminalManager.makeWithOptions")(func
   });
 
   const assertValidCwd = Effect.fn("terminal.assertValidCwd")(function* (cwd: string) {
-    const stats = yield* fileSystem.stat(cwd).pipe(
+    const stat = fileSystem.stat(cwd).pipe(
       Effect.catchTags({
         PlatformError: (cause) =>
           cause.reason._tag === "NotFound"
@@ -2144,6 +2237,14 @@ export const makeWithOptions = Effect.fn("TerminalManager.makeWithOptions")(func
             : new TerminalCwdStatError({ cwd, cause }),
       }),
     );
+    const stats = yield* stat.pipe(
+      Effect.catchTags({
+        TerminalCwdNotFoundError: (error) =>
+          Effect.flatMap(TerminalCwdRecovery, (recover) =>
+            recover(error).pipe(Effect.andThen(stat)),
+          ),
+      }),
+    );
     if (stats.type !== "Directory") {
       return yield* new TerminalCwdNotDirectoryError({ cwd });
     }
@@ -3236,20 +3337,41 @@ export const makeWithOptions = Effect.fn("TerminalManager.makeWithOptions")(func
       registerCleanup,
     );
 
-  const attachOutputStream: TerminalManager["Service"]["attachOutputStream"] = (input, viewerId) =>
-    Stream.unwrap(
+  const attachOutputStream: TerminalManager["Service"]["attachOutputStream"] = (
+    input,
+    viewerId,
+  ) => {
+    const { maxHistoryBytes } = input;
+    const retained = (listener: (event: TerminalAttachStreamEvent) => Effect.Effect<void>) =>
+      maxHistoryBytes === undefined
+        ? listener
+        : (event: TerminalAttachStreamEvent) =>
+            listener(
+              "snapshot" in event
+                ? {
+                    ...event,
+                    snapshot: {
+                      ...event.snapshot,
+                      history: retainedTerminalHistory(event.snapshot.history, maxHistoryBytes),
+                    },
+                  }
+                : event,
+            );
+    return Stream.unwrap(
       Effect.acquireRelease(
         Effect.sync(() => retainViewerOnce(input, viewerId, null)),
         (release) => Effect.sync(release),
       ).pipe(
         Effect.as(
           terminalOutputStream(
-            (listener, registerCleanup) => attachStream(input, listener, registerCleanup, viewerId),
-            (listener, registerCleanup) => resyncStream(input, listener, registerCleanup),
+            (listener, registerCleanup) =>
+              attachStream(input, retained(listener), registerCleanup, viewerId),
+            (listener, registerCleanup) => resyncStream(input, retained(listener), registerCleanup),
           ),
         ),
       ),
     );
+  };
 
   const metadataEventFromTerminalEvent = (
     event: TerminalEvent,
@@ -3509,4 +3631,5 @@ export const makeWithOptions = Effect.fn("TerminalManager.makeWithOptions")(func
   });
 });
 
-export const layer = Layer.effect(TerminalManager, make()).pipe(Layer.provide(ProcessRunner.layer));
+export const layer = (deriveConfigMap: typeof deriveProviderInstanceConfigMap) =>
+  Layer.effect(TerminalManager, make(deriveConfigMap)).pipe(Layer.provide(ProcessRunner.layer));
diff --git a/apps/server/src/terminal/OutputProtocol.test.ts b/apps/server/src/terminal/OutputProtocol.test.ts
index 9750f4181520..6d851b93d374 100644
--- a/apps/server/src/terminal/OutputProtocol.test.ts
+++ b/apps/server/src/terminal/OutputProtocol.test.ts
@@ -9,80 +9,99 @@ import * as Deferred from "effect/Deferred";
 import * as Effect from "effect/Effect";
 import * as Fiber from "effect/Fiber";
 import * as Queue from "effect/Queue";
-import * as Schema from "effect/Schema";
 import * as Stream from "effect/Stream";
 import * as TestClock from "effect/testing/TestClock";
 import { Rpc, RpcGroup, RpcMessage, RpcSerialization, RpcServer } from "effect/rpc";
 
 import { terminalOutputStream, withOutputWindow } from "./OutputProtocol.ts";
 
+const eventWith = (
+  field: "data" | "message" | "threadId",
+  text: string,
+): TerminalAttachStreamEvent =>
+  field === "message"
+    ? { threadId: "thread-1", terminalId: "default", type: "error", message: text }
+    : {
+        threadId: field === "threadId" ? text : "thread-1",
+        terminalId: "default",
+        type: "output",
+        data: field === "data" ? text : "x",
+      };
+
 describe("terminal output window", () => {
   it.effect.each([
-    { tag: WS_METHODS.terminalAttach, size: 1, limit: 8 },
-    { tag: WS_METHODS.terminalObserve, size: 1, limit: 8 },
-    { tag: WS_METHODS.terminalAttach, size: 64 * 1024, limit: 1 },
-    { tag: WS_METHODS.terminalObserve, size: 64 * 1024, limit: 1 },
-    { tag: WS_METHODS.subscribeServerConfig, size: 1, limit: 8 },
-    { tag: ORCHESTRATION_V2_WS_METHODS.subscribeShell, size: 1, limit: 8 },
-    { tag: ORCHESTRATION_V2_WS_METHODS.subscribeThread, size: 64 * 1024, limit: 8 },
-    { tag: WS_METHODS.subscribeTerminalMetadata, size: 1, limit: 1 },
-  ])("limits $tag with $size-byte values to $limit pending chunks", ({ tag, size, limit }) =>
-    Effect.gen(function* () {
-      const group = RpcGroup.make(Rpc.make(tag, { success: Schema.String, stream: true }));
-      const output = yield* Queue.unbounded<string>();
-      const responses = yield* Queue.unbounded<RpcMessage.FromServerEncoded>();
-      const receive = yield* Deferred.make<Parameters<RpcServer.Protocol["Service"]["run"]>[0]>();
-      const protocol = yield* RpcServer.Protocol.make((write) =>
-        Effect.gen(function* () {
-          yield* Deferred.succeed(receive, write);
-          const serialization = yield* RpcSerialization.RpcSerialization;
-          return {
-            disconnects: yield* Queue.unbounded<number>(),
-            send: (_clientId, response) => Queue.offer(responses, response),
-            end: () => Effect.void,
-            clientIds: Effect.succeed(new Set([0])),
-            initialMessage: Effect.succeedNone,
-            supportsAck: true,
-            supportsTransferables: false,
-            supportsSpanPropagation: false,
-            supportsNotifications: true,
-            codecFor: serialization.codecFor,
-          };
-        }),
-      );
-      yield* RpcServer.make(group).pipe(
-        Effect.provide(group.toLayerHandler(tag, () => Stream.fromQueue(output))),
-        Effect.provideService(RpcServer.Protocol, withOutputWindow(protocol)),
-        Effect.forkScoped,
-      );
-      const write = yield* Deferred.await(receive);
-      yield* write(0, { _tag: "Request", id: "1", tag, payload: null, headers: [] });
+    { tag: WS_METHODS.terminalAttach, field: "data", size: 1, limit: 8 },
+    { tag: WS_METHODS.terminalObserve, field: "data", size: 1, limit: 8 },
+    { tag: WS_METHODS.terminalAttach, field: "data", size: 64 * 1024, limit: 1 },
+    { tag: WS_METHODS.terminalObserve, field: "data", size: 64 * 1024, limit: 1 },
+    { tag: WS_METHODS.terminalAttach, field: "message", size: 64 * 1024, limit: 1 },
+    { tag: WS_METHODS.terminalAttach, field: "threadId", size: 64 * 1024, limit: 1 },
+    { tag: WS_METHODS.subscribeServerConfig, field: "data", size: 1, limit: 8 },
+    { tag: ORCHESTRATION_V2_WS_METHODS.subscribeShell, field: "data", size: 1, limit: 8 },
+    { tag: ORCHESTRATION_V2_WS_METHODS.subscribeThread, field: "data", size: 64 * 1024, limit: 8 },
+    { tag: WS_METHODS.subscribeTerminalMetadata, field: "data", size: 1, limit: 1 },
+  ] as const)(
+    "limits $tag with $size-byte $field values to $limit pending chunks",
+    ({ tag, field, size, limit }) =>
+      Effect.gen(function* () {
+        const group = RpcGroup.make(
+          Rpc.make(tag, { success: TerminalAttachStreamEventSchema, stream: true }),
+        );
+        const output = yield* Queue.unbounded<TerminalAttachStreamEvent>();
+        const responses = yield* Queue.unbounded<RpcMessage.FromServerEncoded>();
+        const receive = yield* Deferred.make<Parameters<RpcServer.Protocol["Service"]["run"]>[0]>();
+        const protocol = yield* RpcServer.Protocol.make((write) =>
+          Effect.gen(function* () {
+            yield* Deferred.succeed(receive, write);
+            const serialization = yield* RpcSerialization.RpcSerialization;
+            return {
+              disconnects: yield* Queue.unbounded<number>(),
+              send: (_clientId, response) => Queue.offer(responses, response),
+              end: () => Effect.void,
+              clientIds: Effect.succeed(new Set([0])),
+              initialMessage: Effect.succeedNone,
+              supportsAck: true,
+              supportsTransferables: false,
+              supportsSpanPropagation: false,
+              supportsNotifications: true,
+              codecFor: serialization.codecFor,
+            };
+          }),
+        );
+        yield* RpcServer.make(group).pipe(
+          Effect.provide(group.toLayerHandler(tag, () => Stream.fromQueue(output))),
+          Effect.provideService(RpcServer.Protocol, withOutputWindow(protocol)),
+          Effect.forkScoped,
+        );
+        const write = yield* Deferred.await(receive);
+        yield* write(0, { _tag: "Request", id: "1", tag, payload: null, headers: [] });
 
-      for (let index = 0; index < limit; index++) {
-        const value = String(index).repeat(size);
-        yield* Queue.offer(output, value);
+        for (let index = 0; index < limit; index++) {
+          const value = eventWith(field, String(index).repeat(size));
+          yield* Queue.offer(output, value);
+          yield* TestClock.adjust(0);
+          assert.equal(yield* Queue.size(responses), 1);
+          assert.deepEqual(yield* Queue.take(responses), {
+            _tag: "Chunk",
+            requestId: "1",
+            values: [value],
+          });
+        }
+        const resumedValue = eventWith(field, "i".repeat(size));
+        yield* Queue.offer(output, resumedValue);
         yield* TestClock.adjust(0);
-        assert.equal(yield* Queue.size(responses), 1);
-        assert.deepEqual(yield* Queue.take(responses), {
-          _tag: "Chunk",
-          requestId: "1",
-          values: [value],
-        });
-      }
-      yield* Queue.offer(output, "i".repeat(size));
-      yield* TestClock.adjust(0);
-      assert.equal(yield* Queue.size(responses), 0);
-      yield* write(0, { _tag: "Ack", requestId: "1" });
-      const resumed = yield* Queue.take(responses);
-      assert.equal(resumed._tag, "Chunk");
-      if (resumed._tag === "Chunk") assert.deepEqual(resumed.values, ["i".repeat(size)]);
+        assert.equal(yield* Queue.size(responses), 0);
+        yield* write(0, { _tag: "Ack", requestId: "1" });
+        const resumed = yield* Queue.take(responses);
+        assert.equal(resumed._tag, "Chunk");
+        if (resumed._tag === "Chunk") assert.deepEqual(resumed.values, [resumedValue]);
 
-      yield* Queue.offer(output, "j");
-      yield* TestClock.adjust(0);
-      assert.equal(yield* Queue.size(responses), 0);
-      yield* write(0, { _tag: "Interrupt", requestId: "1" });
-      assert.equal((yield* Queue.take(responses))._tag, "Exit");
-    }).pipe(Effect.provide(RpcSerialization.layerJson), Effect.scoped),
+        yield* Queue.offer(output, eventWith(field, "j"));
+        yield* TestClock.adjust(0);
+        assert.equal(yield* Queue.size(responses), 0);
+        yield* write(0, { _tag: "Interrupt", requestId: "1" });
+        assert.equal((yield* Queue.take(responses))._tag, "Exit");
+      }).pipe(Effect.provide(RpcSerialization.layerJson)),
   );
 });
 
@@ -242,7 +261,7 @@ describe("terminal output stream", () => {
         assert.deepEqual(yield* takeChunk(healthy), [after]);
         assert.deepEqual(yield* takeChunk(stalled), [after]);
         assert.equal(yield* Queue.size(stalled), 0);
-      }).pipe(Effect.provide(RpcSerialization.layerJson), Effect.scoped),
+      }).pipe(Effect.provide(RpcSerialization.layerJson)),
   );
 
   it.effect("interrupts recovery while its subscription is still waiting", () =>
@@ -271,7 +290,7 @@ describe("terminal output stream", () => {
       yield* Fiber.interrupt(recovery);
       yield* Deferred.await(interrupted);
       assert.equal(publisher.listeners.size, 0);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("cleans listeners when cancelled during a successful acquisition handoff", () =>
@@ -305,7 +324,7 @@ describe("terminal output stream", () => {
         yield* Fiber.join(cancellation);
         assert.equal(publisher.listeners.size, 0);
       }
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("caps each delivered batch at the output window in UTF-8 bytes", () =>
@@ -330,7 +349,7 @@ describe("terminal output stream", () => {
         delivered += batch.length;
       }
       assert.equal(delivered, 1024);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("charges snapshot history but never overflows on one snapshot", () =>
@@ -348,6 +367,6 @@ describe("terminal output stream", () => {
       assert.equal(publisher.listeners.size, 1);
       yield* publisher.publish(snapshot(history));
       assert.equal(publisher.listeners.size, 0);
-    }).pipe(Effect.scoped),
+    }),
   );
 });
diff --git a/apps/server/src/terminal/OutputProtocol.ts b/apps/server/src/terminal/OutputProtocol.ts
index 11339fc2bfa1..0edb5aff4978 100644
--- a/apps/server/src/terminal/OutputProtocol.ts
+++ b/apps/server/src/terminal/OutputProtocol.ts
@@ -13,6 +13,8 @@ import type { RpcServer } from "effect/rpc";
 
 const MAX_PENDING_CHUNKS = 8;
 const MAX_PENDING_BYTES = 64 * 1024;
+// Charge an envelope so tiny events cannot bypass the byte budget.
+const EVENT_OVERHEAD = 128;
 const isFull = (sizes: number[]) =>
   sizes.length >= MAX_PENDING_CHUNKS ||
   sizes.reduce((total, size) => total + size, 0) >= MAX_PENDING_BYTES;
@@ -29,6 +31,36 @@ const COUNT_WINDOWED_STREAMS: ReadonlySet<string> = new Set([
   ORCHESTRATION_V2_WS_METHODS.subscribeThread,
 ]);
 
+const byteLengthOf = (value: unknown) => (typeof value === "string" ? Buffer.byteLength(value) : 0);
+
+// Charges every variable-size field a terminal event can carry, so the byte
+// budgets below cannot be bypassed by a large payload in an uncharged field.
+const queuedSize = (event: TerminalEvent | TerminalAttachStreamEvent) =>
+  EVENT_OVERHEAD +
+  ("threadId" in event ? byteLengthOf(event.threadId) + byteLengthOf(event.terminalId) : 0) +
+  (event.type === "output"
+    ? byteLengthOf(event.data)
+    : event.type === "error"
+      ? byteLengthOf(event.message)
+      : event.type === "activity"
+        ? byteLengthOf(event.label)
+        : "snapshot" in event
+          ? byteLengthOf(event.snapshot.threadId) +
+            byteLengthOf(event.snapshot.terminalId) +
+            byteLengthOf(event.snapshot.history) +
+            byteLengthOf(event.snapshot.cwd) +
+            byteLengthOf(event.snapshot.worktreePath) +
+            byteLengthOf(event.snapshot.label)
+          : 0);
+
+// Byte-windowed streams carry TerminalAttachStreamEvent, whose encoded form is the
+// event itself, so charge it like the output queue does instead of serializing twice.
+const chunkSize = (values: ReadonlyArray<unknown>) =>
+  values.reduce<number>(
+    (total, value) => total + queuedSize(value as TerminalAttachStreamEvent),
+    EVENT_OVERHEAD,
+  );
+
 interface Window {
   readonly bytes: boolean;
   readonly sizes: number[];
@@ -86,10 +118,7 @@ export function withOutputWindow(
         } else if (response._tag === "Chunk") {
           const window = windowFor(clientId, String(response.requestId));
           if (window) {
-            window.sizes.push(
-              // @effect-diagnostics-next-line globalJsonInEffect:off
-              window.bytes ? Buffer.byteLength(JSON.stringify(response)) : 0,
-            );
+            window.sizes.push(window.bytes ? chunkSize(response.values) : 0);
             if (!isFull(window.sizes)) {
               return send.pipe(
                 Effect.andThen(() =>
@@ -108,8 +137,6 @@ export function withOutputWindow(
 }
 
 const MAX_QUEUED_OUTPUT = 8 * 1024 * 1024;
-// Charge an envelope so tiny events cannot bypass the byte budget.
-const EVENT_OVERHEAD = 128;
 
 type Listener<A> = (event: A) => Effect.Effect<void>;
 // Acquisition must register cleanup synchronously with installing the listener.
@@ -118,14 +145,6 @@ type Subscribe<A, E> = (
   registerCleanup: (stop: () => void) => void,
 ) => Effect.Effect<() => void, E>;
 
-const queuedSize = (event: TerminalEvent | TerminalAttachStreamEvent) =>
-  EVENT_OVERHEAD +
-  (event.type === "output"
-    ? Buffer.byteLength(event.data)
-    : "snapshot" in event
-      ? Buffer.byteLength(event.snapshot.history)
-      : 0);
-
 export function terminalOutputStream<A extends TerminalEvent | TerminalAttachStreamEvent, E>(
   subscribe: Subscribe<A, E>,
   resync?: Subscribe<A, E>,
diff --git a/apps/server/src/textGeneration/AntigravityTextGeneration.test.ts b/apps/server/src/textGeneration/AntigravityTextGeneration.test.ts
index 5cb6a1f8d4d8..783417693c72 100644
--- a/apps/server/src/textGeneration/AntigravityTextGeneration.test.ts
+++ b/apps/server/src/textGeneration/AntigravityTextGeneration.test.ts
@@ -343,7 +343,7 @@ it.layer(NodeServices.layer)("AntigravityTextGeneration", (it) => {
           { type: "text", text: expect.stringContaining("+handleRemoteCallback()") },
         ]);
         yield* fixture.assertCleaned;
-      }).pipe(Effect.scoped),
+      }),
   );
 
   it.effect.each(["tool_call", "tool_call_update"] as const)(
@@ -362,7 +362,7 @@ it.layer(NodeServices.layer)("AntigravityTextGeneration", (it) => {
         expect(error.detail).toContain("tool work");
         expect(fixture.state.cancellations).toBe(1);
         yield* fixture.assertCleaned;
-      }).pipe(Effect.scoped),
+      }),
   );
 
   it.effect("rejects native permission and choice requests instead of answering them", () =>
@@ -387,7 +387,7 @@ it.layer(NodeServices.layer)("AntigravityTextGeneration", (it) => {
       expect(reply).toEqual({ outcome: { outcome: "cancelled" } });
       expect(error.detail).toContain("permission or user input");
       yield* fixture.assertCleaned;
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect.each(["file", "terminal", "extension"] as const)(
@@ -416,7 +416,7 @@ it.layer(NodeServices.layer)("AntigravityTextGeneration", (it) => {
         const error = yield* Fiber.join(child).pipe(Effect.flip);
         expect(error.detail).toContain("tool or user input");
         yield* fixture.assertCleaned;
-      }).pipe(Effect.scoped),
+      }),
   );
 
   it.effect.each([
@@ -432,7 +432,7 @@ it.layer(NodeServices.layer)("AntigravityTextGeneration", (it) => {
         .pipe(Effect.flip);
       expect(error.detail).toContain(detail);
       yield* fixture.assertCleaned;
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("does not return partial JSON after native cancellation", () =>
@@ -449,7 +449,7 @@ it.layer(NodeServices.layer)("AntigravityTextGeneration", (it) => {
         .pipe(Effect.flip);
       expect(error.detail).toContain("cancelled");
       yield* fixture.assertCleaned;
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect.each([
@@ -470,7 +470,7 @@ it.layer(NodeServices.layer)("AntigravityTextGeneration", (it) => {
       expect(error.detail).toBe(detail);
       expect(error.detail).not.toContain("Raw provider failure text.");
       yield* fixture.assertCleaned;
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect.each([
@@ -517,7 +517,7 @@ it.layer(NodeServices.layer)("AntigravityTextGeneration", (it) => {
         expect(error.detail).toContain("wrote files");
         if (target !== undefined) expect(yield* fs.exists(target)).toBe(true);
         yield* fixture.assertCleaned;
-      }).pipe(Effect.scoped),
+      }),
   );
 
   it.effect("uses the native default without sending T3's default selection as a model ID", () =>
@@ -530,7 +530,7 @@ it.layer(NodeServices.layer)("AntigravityTextGeneration", (it) => {
       expect(result).toEqual({ title: "Repair login" });
       expect(fixture.state.selectedModels).toEqual([]);
       yield* fixture.assertCleaned;
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect.each([
@@ -562,7 +562,7 @@ it.layer(NodeServices.layer)("AntigravityTextGeneration", (it) => {
       expect(Exit.isSuccess(result)).toBe(available);
       expect(fixture.state.workspaces.length).toBe(available ? 1 : 0);
       yield* fixture.assertCleaned;
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("does not launch during sign-out or before sign-in", () =>
@@ -575,7 +575,7 @@ it.layer(NodeServices.layer)("AntigravityTextGeneration", (it) => {
       expect(error.detail).toBe("Sign in before starting Antigravity.");
       expect(fixture.state.workspaces).toEqual([]);
       yield* fixture.assertCleaned;
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect.each(["caller", "sign-out"] as const)(
@@ -596,7 +596,7 @@ it.layer(NodeServices.layer)("AntigravityTextGeneration", (it) => {
         }
         expect(fixture.state.cancellations).toBe(1);
         yield* fixture.assertCleaned;
-      }).pipe(Effect.scoped),
+      }),
   );
 
   it.effect("refuses unsafe native session IDs without deleting other files", () =>
@@ -609,7 +609,7 @@ it.layer(NodeServices.layer)("AntigravityTextGeneration", (it) => {
       expect(fixture.state.prompts).toEqual([]);
       expect(yield* fixture.fs.readFileString(`${fixture.sessionBase}.db`)).toBe("helper session");
       expect(fixture.state.closed).toEqual(fixture.state.workspaces);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("keeps native sessions whose metadata belongs to a different workspace", () =>
@@ -627,7 +627,7 @@ it.layer(NodeServices.layer)("AntigravityTextGeneration", (it) => {
         "keep this session",
       );
       expect(yield* fixture.fs.readFileString(`${fixture.sessionBase}.meta`)).toBe(metadata);
-    }).pipe(Effect.scoped),
+    }),
   );
 });
 
@@ -640,5 +640,5 @@ it.effect("retains filesystem services supplied only during construction", () =>
       title: "Repair login",
     });
     yield* fixture.assertCleaned;
-  }).pipe(Effect.scoped),
+  }),
 );
diff --git a/apps/server/src/textGeneration/CodexTextGeneration.test.ts b/apps/server/src/textGeneration/CodexTextGeneration.test.ts
index 389a6458677e..e6e43d606e27 100644
--- a/apps/server/src/textGeneration/CodexTextGeneration.test.ts
+++ b/apps/server/src/textGeneration/CodexTextGeneration.test.ts
@@ -58,6 +58,7 @@ interface FakeCodexInput {
   mcpServers?: ReadonlyArray<{ name: string; enabled: boolean }> | number;
   requiredCwd?: string;
   requireInstructions?: string;
+  requireMcpServersOff?: ReadonlyArray<string>;
 }
 
 function makeFakeCodexBinary(dir: string, input: FakeCodexInput) {
@@ -73,6 +74,7 @@ function makeFakeCodexBinary(dir: string, input: FakeCodexInput) {
     mcpServers: input.mcpServers ?? [],
     requiredCwd: input.requiredCwd ?? null,
     requireInstructions: input.requireInstructions ?? null,
+    requireMcpServersOff: input.requireMcpServersOff ?? [],
     stderr: input.stderr ?? null,
     output: input.output,
     exitCode: input.exitCode ?? 0,
@@ -129,6 +131,33 @@ function makeFakeCodexBinary(dir: string, input: FakeCodexInput) {
         '  process.stderr.write(message + "\\n");',
         "  process.exit(code);",
         "}",
+        "// Like Codex: a later mcp_servers={...} override replaces servers earlier -c flags defined.",
+        "const servers = new Map();",
+        "const offServers = new Set();",
+        "for (let index = 0; index < args.length; index += 1) {",
+        '  if (args[index] !== "-c" && args[index] !== "--config") continue;',
+        '  const value = args[index + 1] ?? "";',
+        '  if (value.startsWith("mcp_servers={")) {',
+        '    const named = [...value.matchAll(/"([^"]+)"=\\{enabled=false\\}/g)].map((match) => match[1]);',
+        "    for (const name of named) offServers.add(name);",
+        "    for (const name of [...servers.keys()]) {",
+        "      if (named.includes(name)) servers.set(name, false);",
+        "      else servers.delete(name);",
+        "    }",
+        '  } else if (value.startsWith("mcp_servers.")) {',
+        '    const [name, key] = value.slice("mcp_servers.".length).split(/[.=]/);',
+        "    if (value === `mcp_servers.${name}.enabled=false`) offServers.add(name);",
+        "    // An enabled flag alone toggles a server another layer (config.toml) defines.",
+        '    if (key === "enabled" && !servers.has(name)) continue;',
+        '    servers.set(name, servers.get(name) === true || key === "url" || key === "command");',
+        "  }",
+        "}",
+        "for (const [name, hasTransport] of servers) {",
+        '  if (!hasTransport) fail("Error loading config.toml: invalid transport in `mcp_servers." + name + "`", 12);',
+        "}",
+        "for (const name of check.requireMcpServersOff) {",
+        '  if (!offServers.has(name)) fail("MCP server left on: " + name, 13);',
+        "}",
         'if (check.requiredCwd !== null && process.cwd() !== check.requiredCwd) fail("cannot inspect checkout", 10);',
         'if (check.requireInstructions !== null && !instructions.includes(check.requireInstructions)) fail("missing writer task", 11);',
         "if (check.requireArg !== null && !originalArgs.includes(` ${check.requireArg} `)) {",
@@ -365,7 +394,7 @@ it.layer(layerCodexTextGenerationTest)("CodexTextGeneration", (it) => {
           { name: "already-off", enabled: false },
         ],
         requireArg:
-          '--config features.plugins=false --config features.apps=false --config mcp_servers={"augmenter"={enabled=false},"my.server"={enabled=false}}',
+          'exec --config mcp_servers={"augmenter"={enabled=false},"my.server"={enabled=false}} --config developer_instructions="Use',
       },
       (textGeneration) =>
         Effect.gen(function* () {
@@ -384,6 +413,52 @@ it.layer(layerCodexTextGenerationTest)("CodexTextGeneration", (it) => {
     ),
   );
 
+  it.effect("turns off an MCP server that launch args define without dropping its transport", () =>
+    withFakeCodexEnv(
+      {
+        output: JSON.stringify({ title: "Remove default shapes" }),
+        launchArgs: `-c 'mcp_servers.t3-code.url="http://127.0.0.1:1/mcp"' -c 'mcp_servers.t3-code.enabled=true'`,
+        mcpServers: [{ name: "t3-code", enabled: true }],
+        requireMcpServersOff: ["t3-code"],
+        requireArg:
+          "--config features.apps=false --config mcp_servers.t3-code.enabled=false --ephemeral",
+      },
+      (textGeneration) =>
+        Effect.gen(function* () {
+          const result = yield* textGeneration.generateThreadTitle({
+            cwd: process.cwd(),
+            message: "Remove default shapes from characters",
+            modelSelection: DEFAULT_TEST_MODEL_SELECTION,
+          });
+          expect(result.title).toBe("Remove default shapes");
+        }),
+    ),
+  );
+
+  it.effect("keeps MCP servers off when launch args set their own mcp_servers table", () =>
+    withFakeCodexEnv(
+      {
+        output: JSON.stringify({ title: "Remove default shapes" }),
+        launchArgs: `-c 'mcp_servers={"my.server"={command="echo",enabled=true}}'`,
+        mcpServers: [
+          { name: "my.server", enabled: true },
+          { name: "my server", enabled: true },
+        ],
+        requireArg:
+          '--config features.apps=false --config mcp_servers={"my.server"={enabled=false},"my server"={enabled=false}} --config mcp_servers.my server.enabled=false --ephemeral',
+      },
+      (textGeneration) =>
+        Effect.gen(function* () {
+          const result = yield* textGeneration.generateThreadTitle({
+            cwd: process.cwd(),
+            message: "Remove default shapes from characters",
+            modelSelection: DEFAULT_TEST_MODEL_SELECTION,
+          });
+          expect(result.title).toBe("Remove default shapes");
+        }),
+    ),
+  );
+
   it.effect("still generates when Codex cannot list its MCP servers", () =>
     withFakeCodexEnv(
       {
@@ -546,6 +621,8 @@ const PREFLIGHT_PRIMARY_STATES = [
   "not installed, fallback disabled for project",
   "signed out",
   "signed out, fallback failed",
+  "cannot generate text",
+  "model cannot generate text",
 ] as const;
 
 it.effect.each(PREFLIGHT_PRIMARY_STATES)("text generation preflight: %s", (primaryState) =>
@@ -590,6 +667,22 @@ it.effect.each(PREFLIGHT_PRIMARY_STATES)("text generation preflight: %s", (prima
         ...(primaryState === "signed out, fallback failed" && instanceId === fallback
           ? { status: "error", auth: { status: "unknown" } }
           : {}),
+        ...(primaryState === "cannot generate text" && instanceId === primary
+          ? { supportsTextGeneration: false }
+          : {}),
+        ...(primaryState === "model cannot generate text" && instanceId === primary
+          ? {
+              models: [
+                {
+                  slug: selection.model,
+                  name: selection.model,
+                  isCustom: false,
+                  supportsTextGeneration: false,
+                  capabilities: null,
+                },
+              ],
+            }
+          : {}),
         ...(primaryState === "exhausted" && instanceId === primary
           ? {
               usageLimits: {
diff --git a/apps/server/src/textGeneration/CodexTextGeneration.ts b/apps/server/src/textGeneration/CodexTextGeneration.ts
index 4de5392502c8..49c60166111b 100644
--- a/apps/server/src/textGeneration/CodexTextGeneration.ts
+++ b/apps/server/src/textGeneration/CodexTextGeneration.ts
@@ -55,6 +55,11 @@ const codexMcpServersOff = (names: ReadonlyArray<string>): string | null =>
   names.length === 0
     ? null
     : `mcp_servers={${names.map((name) => `${JSON.stringify(name)}={enabled=false}`).join(",")}}`;
+// Codex splits -c keys at the first "=" and on every dot, so only those names take a dotted flag.
+const codexMcpServerOffFlags = (names: ReadonlyArray<string>) =>
+  names
+    .filter((name) => !name.includes(".") && !name.includes("="))
+    .flatMap((name) => ["--config", `mcp_servers.${name}.enabled=false`]);
 const encodeJsonString = Schema.encodeEffect(Schema.fromJsonString(Schema.Unknown));
 export const makeCodexTextGeneration = Effect.fn("makeCodexTextGeneration")(function* (
   codexConfig: CodexSettings,
@@ -291,20 +296,28 @@ export const makeCodexTextGeneration = Effect.fn("makeCodexTextGeneration")(func
             }
           : {}),
       };
-      const mcpServersOff = yield* listEnabledMcpServers({
+      const enabledMcpServers = yield* listEnabledMcpServers({
         binary,
         cwd,
         env,
         launchArgs: codexMcpListLaunchArgs(launchArgs),
-      }).pipe(Effect.map(codexMcpServersOff));
+      });
+      const mcpServersOff = codexMcpServersOff(enabledMcpServers);
+      const execLaunchArgs = codexExecLaunchArgs(launchArgs);
+      // A launch-arg mcp_servers={...} table replaces ours and can re-enable dotted names.
+      const launchArgsSetMcpTable = execLaunchArgs.some((arg) => /\bmcp_servers\s*=/.test(arg));
       const spawnCommand = yield* resolveSpawnCommand(
         binary,
         [
           "exec",
-          ...codexExecLaunchArgs(launchArgs),
+          // Before launch args: a later table would replace servers their -c flags define.
+          ...(mcpServersOff ? ["--config", mcpServersOff] : []),
+          ...execLaunchArgs,
           // A user's MCP server could act on the text-generation prompt.
           ...CODEX_NO_PLUGIN_ARGS,
-          ...(mcpServersOff ? ["--config", mcpServersOff] : []),
+          ...(mcpServersOff && launchArgsSetMcpTable ? ["--config", mcpServersOff] : []),
+          // After launch args, so a launch arg's enabled=true cannot turn a server back on.
+          ...codexMcpServerOffFlags(enabledMcpServers),
           "--ephemeral",
           "--skip-git-repo-check",
           "-s",
diff --git a/apps/server/src/textGeneration/OpenCode2TextGeneration.test.ts b/apps/server/src/textGeneration/OpenCode2TextGeneration.test.ts
index 869cd1b4fb5e..6cb1bfad71be 100644
--- a/apps/server/src/textGeneration/OpenCode2TextGeneration.test.ts
+++ b/apps/server/src/textGeneration/OpenCode2TextGeneration.test.ts
@@ -70,7 +70,7 @@ it.layer(layer)("OpenCode2TextGeneration", (it) => {
             files: [{ uri: NodeURL.pathToFileURL(screenshotPath).href, name: "screen.png" }],
           });
         }
-      }).pipe(Effect.scoped),
+      }),
   );
 
   it.effect("keeps a provider's own error message out of the caller-visible detail", () =>
@@ -153,7 +153,7 @@ it.layer(layer)("OpenCode2TextGeneration", (it) => {
         .pipe(Effect.flip);
       assert.equal(failure.detail, "OpenCode could not generate the text.");
       assert.deepEqual(failure.cause, refusal);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("times out when the prompt request and its interrupt never answer", () =>
@@ -219,6 +219,6 @@ it.layer(layer)("OpenCode2TextGeneration", (it) => {
       yield* TestClock.adjust("5 seconds");
       const failure = yield* Fiber.join(generation);
       assert.equal(failure.detail, "OpenCode did not finish generating in time.");
-    }).pipe(Effect.scoped),
+    }),
   );
 });
diff --git a/apps/server/src/textGeneration/TextGeneration.ts b/apps/server/src/textGeneration/TextGeneration.ts
index b89e264db8d5..818afb4fae55 100644
--- a/apps/server/src/textGeneration/TextGeneration.ts
+++ b/apps/server/src/textGeneration/TextGeneration.ts
@@ -108,8 +108,11 @@ export const make = Effect.gen(function* () {
     const unusable =
       textGeneratorCannotRun ||
       (selected?.enabled === true &&
-        selected.status === "error" &&
-        (!selected.installed || selected.auth.status === "unauthenticated"));
+        (!isProviderTextGenerationCapable(selected) ||
+          selected.models.find((model) => model.slug === selection.model)
+            ?.supportsTextGeneration === false ||
+          (selected.status === "error" &&
+            (!selected.installed || selected.auth.status === "unauthenticated"))));
     if (unusable || exhaustedUsageWindow(selected, now, selection.model)) {
       const settings = yield* serverSettings.getSettings.pipe(
         Effect.mapError(
diff --git a/apps/server/src/usage/UsageLimitSources.test.ts b/apps/server/src/usage/UsageLimitSources.test.ts
index 274e63b46c90..ae3e468d099e 100644
--- a/apps/server/src/usage/UsageLimitSources.test.ts
+++ b/apps/server/src/usage/UsageLimitSources.test.ts
@@ -87,7 +87,6 @@ it.effect("keeps malformed source URLs encodable for config subscribers", () =>
       ),
       NodeCrypto.layer,
     ]),
-    Effect.scoped,
   ),
 );
 
@@ -154,6 +153,5 @@ it.effect("reads a management key from its secret provider", () => {
       ),
       NodeCrypto.layer,
     ]),
-    Effect.scoped,
   );
 });
diff --git a/apps/server/src/usage/UsageService.test.ts b/apps/server/src/usage/UsageService.test.ts
index ae0126d43825..81f3d1ec289a 100644
--- a/apps/server/src/usage/UsageService.test.ts
+++ b/apps/server/src/usage/UsageService.test.ts
@@ -249,6 +249,7 @@ const layerService = (input: {
   );
 
 const BEFORE_NARROW_WINDOW = Date.parse("2026-08-01T10:00:00Z") / 1000;
+const NARROW_WINDOW_MTIME = Date.parse("2026-09-01T10:00:00Z") / 1000;
 const NARROW_WINDOW: UsageSummaryInput = {
   timeZone: "UTC",
   sinceDay: UsageDay.make("2026-09-01"),
@@ -520,7 +521,7 @@ describe("Codex usage history", () => {
 });
 
 describe("UsageService", () => {
-  it.live("counts compressed Codex rollouts across refresh, rewrites, and cache restarts", () =>
+  it.effect("counts compressed Codex rollouts across refresh, rewrites, and cache restarts", () =>
     Effect.gen(function* () {
       const { home, settings } = yield* setup;
       const sessions = NodePath.join(home, "codex", "sessions");
@@ -577,17 +578,63 @@ describe("UsageService", () => {
         assert.strictEqual(totalOutputTokens(rewritten), 71);
         assert.deepStrictEqual((yield* service.readSummary(WINDOW)).buckets, rewritten.buckets);
         yield* service.awaitPersisted;
+        const { stateDir } = yield* ServerConfig.ServerConfig;
+        const cachePath = NodePath.join(stateDir, SCAN_CACHE_FILE_NAME);
+        const originalPath = (yield* Effect.promise(() => NodeFSP.realpath(compressedPath))).slice(
+          0,
+          -4,
+        );
+        yield* Effect.promise(async () => {
+          const document = decodeUnknownJsonString(await NodeFSP.readFile(cachePath, "utf8")) as {
+            files: Record<
+              string,
+              { cs: Record<string, unknown>; r: unknown[]; t: unknown[]; mr: number }
+            >;
+          };
+          const archived = document.files[await NodeFSP.realpath(compressedPath)];
+          assert.ok(archived);
+          document.files[originalPath] = {
+            ...archived,
+            r: [],
+            t: [],
+            mr: 1,
+            cs: { ...archived.cs, malformedRecords: 1 },
+          };
+          await NodeFSP.writeFile(cachePath, encodeUnknownJsonString(document));
+        });
         const restarted = yield* UsageService.make;
-        assert.deepStrictEqual((yield* restarted.readSummary(WINDOW)).buckets, rewritten.buckets);
+        const restored = yield* restarted.readSummary(WINDOW);
+        assert.deepStrictEqual(restored.buckets, rewritten.buckets);
+        assert.strictEqual(
+          restored.sources.find((source) => source.fingerprint.provider === "codex")
+            ?.malformedRecords,
+          0,
+        );
         yield* restarted.awaitPersisted;
+        yield* Effect.promise(async () => {
+          const document = decodeUnknownJsonString(await NodeFSP.readFile(cachePath, "utf8")) as {
+            files: Record<string, unknown>;
+          };
+          assert.strictEqual(document.files[originalPath], undefined);
+          await NodeFSP.rm(compressedPath);
+        });
+        const removed = yield* UsageService.make;
+        const retained = yield* removed.readSummary(WINDOW);
+        assert.deepStrictEqual(retained.buckets, rewritten.buckets);
+        assert.strictEqual(
+          retained.sources.find((source) => source.fingerprint.provider === "codex")
+            ?.malformedRecords,
+          0,
+        );
+        yield* removed.awaitPersisted;
       }).pipe(
         Effect.scoped,
         Effect.provide(layerService({ prefix: "usage-compressed-codex", home, settings })),
       );
-    }).pipe(Effect.scoped),
+    }),
   );
 
-  it.live("keeps the first host identity across recreation and explicit override removal", () =>
+  it.effect("keeps the first host identity across recreation and explicit override removal", () =>
     Effect.gen(function* () {
       const { transcript, settings, home } = yield* setup;
       yield* Effect.promise(() => NodeFSP.writeFile(transcript, claudeLine(1, 5)));
@@ -615,10 +662,10 @@ describe("UsageService", () => {
         const source = summary.sources.find((source) => source.fingerprint.provider === "claude");
         assert.strictEqual(source?.fingerprint.hostId, expected);
       }
-    }).pipe(Effect.scoped),
+    }),
   );
 
-  it.live("concurrent initialization keeps one host identity across service recreation", () =>
+  it.effect("concurrent initialization keeps one host identity across service recreation", () =>
     Effect.gen(function* () {
       const { transcript, settings, home } = yield* setup;
       yield* Effect.promise(() => NodeFSP.writeFile(transcript, claudeLine(1, 5)));
@@ -671,10 +718,10 @@ describe("UsageService", () => {
         const source = summary.sources.find((source) => source.fingerprint.provider === "claude");
         assert.strictEqual(source?.fingerprint.hostId, hostId);
       }
-    }).pipe(Effect.scoped),
+    }),
   );
 
-  it.live(
+  it.effect(
     "repairs initial Codex prices after unchanged-file retries, persists evidence and corrections, and honors later native tiers",
     () =>
       Effect.gen(function* () {
@@ -823,10 +870,106 @@ describe("UsageService", () => {
             }),
           ),
         );
-      }).pipe(Effect.scoped),
+      }),
+  );
+
+  it.effect(
+    "keeps resolved Codex tiers when a grown pre-v15 cache entry re-parses without history",
+    () =>
+      Effect.gen(function* () {
+        const { home, settings } = yield* setup;
+        const sessions = NodePath.join(home, "codex", "sessions");
+        const rolloutPath = NodePath.join(sessions, "tier.jsonl");
+        const context = (turn_id: string) => ({
+          type: "turn_context",
+          payload: { model: "gpt-6-astra", turn_id },
+        });
+        const usage = (output_tokens: number, total_output_tokens: number) => ({
+          type: "event_msg",
+          timestamp: "2026-08-01T10:00:00Z",
+          payload: {
+            type: "token_count",
+            info: {
+              last_token_usage: { input_tokens: 0, output_tokens },
+              total_token_usage: { input_tokens: 0, output_tokens: total_output_tokens },
+            },
+          },
+        });
+        const lines = (records: readonly unknown[]) =>
+          records.map((record) => encodeUnknownJsonString(record)).join("\n") + "\n";
+        const verify = (summary: UsageSummary, output: number, cost: number) => {
+          assert.strictEqual(totalOutputTokens(summary), output);
+          assert.strictEqual(
+            summary.buckets.reduce((sum, bucket) => sum + bucket.costUsd, 0),
+            cost,
+          );
+        };
+        yield* Effect.promise(async () => {
+          await NodeFSP.mkdir(sessions, { recursive: true });
+          await NodeFSP.writeFile(
+            rolloutPath,
+            lines([
+              { type: "session_meta", payload: { id: "tier-session", model_provider: "openai" } },
+              context("ultra-turn"),
+              usage(1, 1),
+              // An equal request at the same time, from a turn priced at the standard tier.
+              context("standard-turn"),
+              usage(1, 2),
+            ]),
+          );
+        });
+        yield* Effect.gen(function* () {
+          const { stateDir } = yield* ServerConfig.ServerConfig;
+          yield* seedCodexHistory({
+            id: "ultra-turn",
+            sessionId: "tier-session",
+            options: [{ id: "serviceTier", value: "ultrafast" }],
+          });
+          yield* seedCodexHistory({ id: "standard-turn", sessionId: "tier-session", options: [] });
+          const first = yield* UsageService.make;
+          verify(yield* first.readSummary(WINDOW), 2, 7);
+          yield* first.awaitPersisted;
+
+          // Downgrade the saved cache to v14, whose clean Codex entries cannot resume.
+          yield* Effect.promise(async () => {
+            const cachePath = NodePath.join(stateDir, SCAN_CACHE_FILE_NAME);
+            const document = JSON.parse(await NodeFSP.readFile(cachePath, "utf8"));
+            await NodeFSP.rm(cachePath);
+            await NodeFSP.writeFile(
+              NodePath.join(stateDir, "usage-scan-cache-v14.json"),
+              encodeUnknownJsonString({ ...document, version: 14 }),
+            );
+            await NodeFSP.appendFile(rolloutPath, lines([context("later-turn"), usage(2, 4)]));
+          });
+          const sql = yield* SqlClient.SqlClient;
+          yield* sql`ALTER TABLE orchestration_events RENAME TO unavailable_events`;
+          const upgraded = yield* UsageService.make;
+          verify(yield* upgraded.readSummary(WINDOW), 4, 9);
+          yield* upgraded.awaitPersisted;
+          const restarted = yield* UsageService.make;
+          verify(yield* restarted.readSummary(WINDOW), 4, 9);
+          yield* sql`ALTER TABLE unavailable_events RENAME TO orchestration_events`;
+        }).pipe(
+          Effect.provide(
+            layerService({
+              prefix: "usage-reparse-tier",
+              home,
+              settings,
+              ratesDocument: {
+                "gpt-6-astra": {
+                  input_cost_per_token: 0,
+                  output_cost_per_token: 1,
+                  input_cost_per_token_ultrafast: 0,
+                  output_cost_per_token_ultrafast: 6,
+                },
+              },
+            }),
+          ),
+        );
+      }),
   );
 
-  it.live(
+  it.effect(
     "reads Pi per-model usage and auxiliary costs once across forks and repeated entries",
     () =>
       Effect.gen(function* () {
@@ -1012,10 +1155,10 @@ describe("UsageService", () => {
             }),
           ),
         );
-      }).pipe(Effect.scoped),
+      }),
   );
 
-  it.live(
+  it.effect(
     "reads Muse inference history once, persists appended usage, and reprices unknown models",
     () =>
       Effect.gen(function* () {
@@ -1234,10 +1377,10 @@ describe("UsageService", () => {
             }),
           ),
         );
-      }).pipe(Effect.scoped),
+      }),
   );
 
-  it.live("returns other providers' usage while Muse home discovery is still pending", () =>
+  it.effect("returns other providers' usage while Muse home discovery is still pending", () =>
     Effect.gen(function* () {
       const { transcript, settings, home } = yield* setup;
       yield* Effect.promise(() => NodeFSP.writeFile(transcript, claudeLine(1, 5)));
@@ -1294,73 +1437,75 @@ describe("UsageService", () => {
       assert.deepStrictEqual(museSources(refreshed), [
         [NodePath.join(museHome, "sessions"), "ok", undefined],
       ]);
-    }).pipe(Effect.scoped),
+    }),
   );
 
-  it.live("reports missing Pi history and skips malformed records without losing valid usage", () =>
-    Effect.gen(function* () {
-      const { home, settings } = yield* setup;
-      yield* Effect.gen(function* () {
-        const service = yield* UsageService.make;
-        const missing = yield* service.readSummary(WINDOW);
-        assert.strictEqual(
-          missing.sources.find((source) => source.fingerprint.provider === "pi")?.status,
-          "missing",
-        );
-        const dir = NodePath.join(home, "pi", "sessions");
-        yield* Effect.promise(async () => {
-          await NodeFSP.mkdir(dir, { recursive: true });
-          await NodeFSP.writeFile(
-            NodePath.join(dir, "session.jsonl"),
-            [
-              "{broken",
-              "null",
-              encodeUnknownJsonString({ type: "session", id: "valid" }),
-              encodeUnknownJsonString({
-                type: "message",
-                id: "bad",
-                timestamp: "invalid",
-                message: {
-                  role: "assistant",
-                  provider: "openai",
-                  model: "model",
-                  usage: { input: 100 },
-                },
-              }),
-              encodeUnknownJsonString({
-                type: "message",
-                id: "valid",
-                timestamp: "2026-08-01T10:00:00Z",
-                message: {
-                  role: "assistant",
-                  provider: "openai",
-                  model: "model",
-                  usage: {
-                    input: -1,
-                    cacheRead: "100",
-                    output: 7,
-                    reasoning: 50,
-                    cost: { total: -1 },
-                  },
-                },
-              }),
-            ].join("\n") + "\n",
+  it.effect(
+    "reports missing Pi history and skips malformed records without losing valid usage",
+    () =>
+      Effect.gen(function* () {
+        const { home, settings } = yield* setup;
+        yield* Effect.gen(function* () {
+          const service = yield* UsageService.make;
+          const missing = yield* service.readSummary(WINDOW);
+          assert.strictEqual(
+            missing.sources.find((source) => source.fingerprint.provider === "pi")?.status,
+            "missing",
           );
-        });
-        const summary = yield* service.readSummary(WINDOW);
-        const pi = summary.buckets.filter((bucket) => bucket.provider === "pi");
-        assert.strictEqual(pi.length, 1);
-        assert.strictEqual(pi[0] && totalTokens(pi[0].totals), 7);
-        assert.strictEqual(pi[0]?.totals.reasoningTokens, 7);
-        assert.strictEqual(pi[0]?.costSource, "unpriced");
-      }).pipe(
-        Effect.scoped,
-        Effect.provide(layerService({ prefix: "usage-pi-malformed", home, settings })),
-      );
-    }).pipe(Effect.scoped),
+          const dir = NodePath.join(home, "pi", "sessions");
+          yield* Effect.promise(async () => {
+            await NodeFSP.mkdir(dir, { recursive: true });
+            await NodeFSP.writeFile(
+              NodePath.join(dir, "session.jsonl"),
+              [
+                "{broken",
+                "null",
+                encodeUnknownJsonString({ type: "session", id: "valid" }),
+                encodeUnknownJsonString({
+                  type: "message",
+                  id: "bad",
+                  timestamp: "invalid",
+                  message: {
+                    role: "assistant",
+                    provider: "openai",
+                    model: "model",
+                    usage: { input: 100 },
+                  },
+                }),
+                encodeUnknownJsonString({
+                  type: "message",
+                  id: "valid",
+                  timestamp: "2026-08-01T10:00:00Z",
+                  message: {
+                    role: "assistant",
+                    provider: "openai",
+                    model: "model",
+                    usage: {
+                      input: -1,
+                      cacheRead: "100",
+                      output: 7,
+                      reasoning: 50,
+                      cost: { total: -1 },
+                    },
+                  },
+                }),
+              ].join("\n") + "\n",
+            );
+          });
+          const summary = yield* service.readSummary(WINDOW);
+          const pi = summary.buckets.filter((bucket) => bucket.provider === "pi");
+          assert.strictEqual(pi.length, 1);
+          assert.strictEqual(pi[0] && totalTokens(pi[0].totals), 7);
+          assert.strictEqual(pi[0]?.totals.reasoningTokens, 7);
+          assert.strictEqual(pi[0]?.costSource, "unpriced");
+        }).pipe(
+          Effect.scoped,
+          Effect.provide(layerService({ prefix: "usage-pi-malformed", home, settings })),
+        );
+      }),
   );
 
-  it.live("discovers Pi history in its default home and directory overrides", () =>
+  it.effect("discovers Pi history in its default home and directory overrides", () =>
     Effect.gen(function* () {
       const { home, settings } = yield* setup;
       for (const [agentDir, sessionDir, relativeDir, launchArgs, instanceHome, platform] of [
@@ -1464,10 +1609,10 @@ describe("UsageService", () => {
           Effect.provideService(HostProcess.HomeDirectory, home),
         );
       }
-    }).pipe(Effect.scoped),
+    }),
   );
 
-  it.live("reads shared managed default and disabled extra account history once", () =>
+  it.effect("reads shared managed default and disabled extra account history once", () =>
     Effect.gen(function* () {
       const { home, settings } = yield* setup;
       const summary = yield* Effect.gen(function* () {
@@ -1544,10 +1689,10 @@ describe("UsageService", () => {
         ).length,
         1,
       );
-    }).pipe(Effect.scoped),
+    }),
   );
 
-  it.live("restores the Cursor account cache after a restart", () =>
+  it.effect("restores the Cursor account cache after a restart", () =>
     Effect.gen(function* () {
       const { settings, home } = yield* setup;
       yield* TestClock.setTime(CURSOR_NOW);
@@ -1586,10 +1731,10 @@ describe("UsageService", () => {
           }),
         ),
       );
-    }).pipe(Effect.scoped, Effect.provide(TestClock.layer())),
+    }),
   );
 
-  it.live("reads the Cursor account of an API key or T3 sign-in instead of a CLI login", () =>
+  it.effect("reads the Cursor account of an API key or T3 sign-in instead of a CLI login", () =>
     Effect.gen(function* () {
       const { settings, home } = yield* setup;
       const signIn = new TextEncoder().encode(
@@ -1638,10 +1783,10 @@ describe("UsageService", () => {
         ]);
         assert.strictEqual(cursorSource(summary)?.status, "ok");
       }
-    }).pipe(Effect.scoped),
+    }),
   );
 
-  it.live("does not show a previous Cursor account's history after the API key changes", () =>
+  it.effect("does not show a previous Cursor account's history after the API key changes", () =>
     Effect.gen(function* () {
       const { settings, home } = yield* setup;
       yield* TestClock.setTime(CURSOR_NOW);
@@ -1680,10 +1825,10 @@ describe("UsageService", () => {
           }),
         ),
       );
-    }).pipe(Effect.scoped, Effect.provide(TestClock.layer())),
+    }),
   );
 
-  it.live("keeps a new Cursor key's refresh visible beside a failing key", () =>
+  it.effect("keeps a new Cursor key's refresh visible beside a failing key", () =>
     Effect.gen(function* () {
       const { settings, home } = yield* setup;
       const cursor = makeFakeCursor();
@@ -1765,10 +1910,10 @@ describe("UsageService", () => {
           }),
         ),
       );
-    }).pipe(Effect.scoped),
+    }),
   );
 
-  it.live("reports one Cursor source when two API keys belong to the same account", () =>
+  it.effect("reports one Cursor source when two API keys belong to the same account", () =>
     Effect.gen(function* () {
       const { settings, home } = yield* setup;
       yield* TestClock.setTime(CURSOR_NOW);
@@ -1827,10 +1972,10 @@ describe("UsageService", () => {
           }),
         ),
       );
-    }).pipe(Effect.scoped, Effect.provide(TestClock.layer())),
+    }),
   );
 
-  it.live(
+  it.effect(
     "includes OpenCode history but does not substitute desktop usage for an unavailable Cursor account",
     () =>
       Effect.gen(function* () {
@@ -1884,10 +2029,10 @@ describe("UsageService", () => {
             ?.distinctSessions,
           1,
         );
-      }).pipe(Effect.scoped),
+      }),
   );
 
-  it.live("counts unpriced tokens from the unpriced records of a mixed model", () =>
+  it.effect("counts unpriced tokens from the unpriced records of a mixed model", () =>
     Effect.gen(function* () {
       const { settings, home } = yield* setup;
       const message = (id: string, cost: number, input: number, output: number, minute: number) =>
@@ -1921,10 +2066,10 @@ describe("UsageService", () => {
       assert.strictEqual(model?.costUsd, 1);
       assert.strictEqual(model?.totalTokens, 10_000);
       assert.strictEqual(model?.unpricedTokens, 9_900);
-    }).pipe(Effect.scoped),
+    }),
   );
 
-  it.live("includes host and merged OpenCode instance histories once across list aliases", () =>
+  it.effect("includes host and merged OpenCode instance histories once across list aliases", () =>
     Effect.gen(function* () {
       const { settings, home } = yield* setup;
       const hostRoot = NodePath.join(home, "opencode");
@@ -2000,10 +2145,10 @@ describe("UsageService", () => {
           .sort((a, b) => a - b),
         [5, 7, 11],
       );
-    }).pipe(Effect.scoped),
+    }),
   );
 
-  it.live("counts aliased OpenCode and Antigravity directories once", () =>
+  it.effect("counts aliased OpenCode and Antigravity directories once", () =>
     Effect.gen(function* () {
       const { settings, home } = yield* setup;
       const opencode = NodePath.join(home, "opencode-store");
@@ -2054,10 +2199,10 @@ describe("UsageService", () => {
         sourcesFor("antigravity")[0]?.fingerprint.resolvedHomePath,
         yield* Effect.promise(() => NodeFSP.realpath(conversations)),
       );
-    }).pipe(Effect.scoped),
+    }),
   );
 
-  it.live("reads Antigravity history from each instance's data directory", () =>
+  it.effect("reads Antigravity history from each instance's data directory", () =>
     Effect.gen(function* () {
       const { settings, home } = yield* setup;
       const first = NodePath.join(home, "antigravity-first");
@@ -2125,10 +2270,10 @@ describe("UsageService", () => {
           outputTokens,
         );
       }
-    }).pipe(Effect.scoped),
+    }),
   );
 
-  it.live("reads configured and disabled accounts once across shared and aliased homes", () =>
+  it.effect("reads configured and disabled accounts once across shared and aliased homes", () =>
     Effect.gen(function* () {
       const { transcript, settings, home } = yield* setup;
       const codexHome = NodePath.join(home, "codex-account");
@@ -2194,6 +2339,7 @@ describe("UsageService", () => {
                 },
                 [ProviderInstanceId.make("codex-work")]: {
                   driver: ProviderDriverKind.make("codex"),
+                  config: { shadowHomePath: NodePath.join(home, "work-shadow") },
                   environment: [{ name: "CODEX_HOME", value: codexHome, sensitive: false }],
                 },
                 [ProviderInstanceId.make("codex-alias")]: {
@@ -2243,10 +2389,10 @@ describe("UsageService", () => {
         sources.filter((source) => source.fingerprint.provider === "codex").length,
         1,
       );
-    }).pipe(Effect.scoped),
+    }),
   );
 
-  it.live(
+  it.effect(
     "uses explicit account settings before environment and default homes, then refreshes them",
     () =>
       Effect.gen(function* () {
@@ -2326,10 +2472,10 @@ describe("UsageService", () => {
             }),
           ),
         );
-      }).pipe(Effect.scoped),
+      }),
   );
 
-  it.live(
+  it.effect(
     "uses inherited home variables when explicit default accounts have no home settings",
     () =>
       Effect.gen(function* () {
@@ -2372,10 +2518,10 @@ describe("UsageService", () => {
             .resolvedHomePath,
           NodePath.join(home, "grok", "sessions"),
         );
-      }).pipe(Effect.scoped),
+      }),
   );
 
-  it.live.skipIf(HostProcess.Platform.defaultValue() === "win32" || process.getuid?.() === 0)(
+  it.effect.skipIf(HostProcess.Platform.defaultValue() === "win32" || process.getuid?.() === 0)(
     "reports unreadable transcripts as partial and recovers once they can be read",
     () =>
       Effect.gen(function* () {
@@ -2400,10 +2546,79 @@ describe("UsageService", () => {
         }).pipe(
           Effect.provide(layerService({ prefix: "usage-service-unreadable", home, settings })),
         );
-      }).pipe(Effect.scoped),
+      }),
+  );
+
+  it.effect(
+    "answers a provisional read from the last scan, then the exact read adds what changed",
+    () =>
+      Effect.gen(function* () {
+        const { transcript, settings, home } = yield* setup;
+        yield* Effect.promise(() => NodeFSP.writeFile(transcript, claudeLine(1, 5)));
+        const provisional = { ...WINDOW, provisional: true };
+        const claude = (summary: UsageSummary) =>
+          summary.sources.find((source) => source.fingerprint.provider === "claude");
+        yield* Effect.gen(function* () {
+          // With nothing persisted, the first answer is a full scan.
+          const service = yield* UsageService.make;
+          const loop = NodePath.join(NodePath.dirname(transcript), "loop.jsonl");
+          yield* Effect.promise(() => NodeFSP.symlink(loop, loop, "junction"));
+          assert.strictEqual(claude(yield* service.readSummary(provisional))?.status, "partial");
+          yield* Effect.promise(() => NodeFSP.rm(loop));
+          // A scan that missed a path covers nothing, so this is a full scan too.
+          assert.isUndefined(claude(yield* service.readSummary(provisional))?.refreshing);
+          yield* service.awaitPersisted;
+
+          yield* Effect.promise(() => NodeFSP.appendFile(transcript, claudeLine(2, 7)));
+          const restarted = yield* UsageService.make;
+          const saved = yield* restarted.readSummary(provisional);
+          assert.strictEqual(totalOutputTokens(saved), 5);
+          assert.isTrue(claude(saved)?.refreshing);
+          // A window that starts before the saved scan could only show part of its usage.
+          const wider = yield* restarted.readSummary({
+            ...provisional,
+            sinceDay: UsageDay.make("2026-07-01"),
+          });
+          assert.strictEqual(totalOutputTokens(wider), 12);
+          assert.isUndefined(claude(wider)?.refreshing);
+          const refreshed = yield* restarted.readSummary({ ...WINDOW, awaitRefresh: true });
+          assert.strictEqual(totalOutputTokens(refreshed), 12);
+          assert.isUndefined(claude(refreshed)?.refreshing);
+          // Saved usage with nothing to show marks nothing refreshing, so it must not be the answer.
+          yield* Effect.promise(() =>
+            NodeFSP.appendFile(transcript, claudeLine(3, 11, "claude-other")),
+          );
+          const unseen = yield* restarted.readSummary({
+            ...provisional,
+            modelFilter: { include: [{ model: "claude-other" }] },
+          });
+          assert.strictEqual(totalOutputTokens(unseen), 11);
+          yield* restarted.awaitPersisted;
+
+          // A saved scan with an entry this server cannot read covers nothing.
+          const { stateDir } = yield* ServerConfig.ServerConfig;
+          const cachePath = NodePath.join(stateDir, SCAN_CACHE_FILE_NAME);
+          yield* Effect.promise(async () => {
+            const document = decodeUnknownJsonString(await NodeFSP.readFile(cachePath, "utf8")) as {
+              files: Record<string, Record<string, unknown>>;
+            };
+            const [entry] = Object.values(document.files);
+            document.files[NodePath.join(NodePath.dirname(transcript), "broken.jsonl")] = {
+              ...entry,
+              r: "broken",
+            };
+            await NodeFSP.writeFile(cachePath, JSON.stringify(document));
+          });
+          const reloaded = yield* UsageService.make;
+          assert.isUndefined(claude(yield* reloaded.readSummary(provisional))?.refreshing);
+        }).pipe(
+          Effect.scoped,
+          Effect.provide(layerService({ prefix: "usage-service-provisional", home, settings })),
+        );
+      }),
   );
 
-  it.live("filters original model IDs before aliases, pricing, buckets and session counts", () =>
+  it.effect("filters original model IDs before aliases, pricing, buckets and session counts", () =>
     Effect.gen(function* () {
       const { transcript, settings, home } = yield* setup;
       yield* Effect.promise(() =>
@@ -2505,10 +2720,10 @@ describe("UsageService", () => {
           }),
         ),
       );
-    }).pipe(Effect.scoped),
+    }),
   );
 
-  it.live("reprices unchanged transcripts when custom prices are added, edited, or removed", () =>
+  it.effect("reprices unchanged transcripts when custom prices are added, edited, or removed", () =>
     Effect.gen(function* () {
       const { transcript, settings, home } = yield* setup;
       yield* Effect.promise(() => NodeFSP.writeFile(transcript, claudeLine(1, 5, "example-model")));
@@ -2549,10 +2764,10 @@ describe("UsageService", () => {
           layerService({ prefix: "usage-service-price-overrides-test", home, settings }),
         ),
       );
-    }).pipe(Effect.scoped),
+    }),
   );
 
-  it.live(
+  it.effect(
     "retains Codex reconciliation and partial coverage through persisted restart, append and repair",
     () =>
       Effect.gen(function* () {
@@ -2672,10 +2887,10 @@ describe("UsageService", () => {
             }),
           ),
         );
-      }).pipe(Effect.scoped),
+      }),
   );
 
-  it.live(
+  it.effect(
     "merges partial Claude copies through tail replacement, newline completion and restart",
     () =>
       Effect.gen(function* () {
@@ -2731,10 +2946,10 @@ describe("UsageService", () => {
             }),
           ),
         );
-      }).pipe(Effect.scoped),
+      }),
   );
 
-  it.live(
+  it.effect(
     "keeps large-record totals and costs exact through append, dedupe, restart and cleanup",
     () =>
       Effect.gen(function* () {
@@ -2786,13 +3001,14 @@ describe("UsageService", () => {
             }),
           ),
         );
-      }).pipe(Effect.scoped),
+      }),
   );
 
-  it.live.each([4, 5, 6, 7, 8, 10])(
+  it.effect.each([4, 5, 6, 7, 8, 10, 11, 12, 13, 14])(
     "upgrades a v%s cache: reparses live Codex usage, keeps deleted rollouts, removes the old file",
     (version) =>
       Effect.gen(function* () {
+        yield* TestClock.setTime(Date.parse("2026-08-02T12:00:00Z"));
         const { home, settings } = yield* setup;
         const sessions = NodePath.join(home, "codex", "sessions");
         const rollout = (sessionId: string, outputTokens: number) =>
@@ -2890,7 +3106,7 @@ describe("UsageService", () => {
             60 + 20 * (version === 4 ? 1 : 2),
           );
           yield* upgraded.awaitPersisted;
-          assert.strictEqual(SCAN_CACHE_FILE_NAME, "usage-scan-cache-v12.json");
+          assert.strictEqual(SCAN_CACHE_FILE_NAME, "usage-scan-cache-v15.json");
           assert.deepStrictEqual(
             (yield* Effect.promise(() => NodeFSP.readdir(stateDir)))
               .filter((name) => name.startsWith("usage-scan-cache"))
@@ -2916,10 +3132,10 @@ describe("UsageService", () => {
             }),
           ),
         );
-      }).pipe(Effect.scoped),
+      }),
   );
 
-  it.live("re-parses a clean v10 Codex rollout that grew after an interrupted request", () =>
+  it.effect("re-parses a clean v10 Codex rollout that grew after an interrupted request", () =>
     Effect.gen(function* () {
       const { home, settings } = yield* setup;
       const sessions = NodePath.join(home, "codex", "sessions");
@@ -3016,10 +3232,10 @@ describe("UsageService", () => {
           }),
         ),
       );
-    }).pipe(Effect.scoped),
+    }),
   );
 
-  it.live("preserves saved tokens, costs and sessions after transcript cleanup and restart", () =>
+  it.effect("preserves saved tokens, costs and sessions after transcript cleanup and restart", () =>
     Effect.gen(function* () {
       const { transcript, settings, home } = yield* setup;
       const alias = NodePath.join(home, "claude-alias");
@@ -3117,10 +3333,10 @@ describe("UsageService", () => {
           }),
         ),
       );
-    }).pipe(Effect.scoped),
+    }),
   );
 
-  it.live("credits the same copy of a duplicate after its transcripts are deleted", () =>
+  it.effect("credits the same copy of a duplicate after its transcripts are deleted", () =>
     Effect.gen(function* () {
       const { transcript, settings, home } = yield* setup;
       const dir = NodePath.dirname(transcript);
@@ -3155,10 +3371,68 @@ describe("UsageService", () => {
       }).pipe(
         Effect.provide(layerService({ prefix: "usage-service-copy-order-test", home, settings })),
       );
-    }).pipe(Effect.scoped),
+    }),
   );
 
-  it.live.skipIf(HostProcess.Platform.defaultValue() === "win32")(
+  it.effect("credits the same copy of a duplicate from the last scan as an exact read does", () =>
+    Effect.gen(function* () {
+      yield* TestClock.setTime(Date.parse("2026-08-15T00:00:00Z"));
+      const { transcript, settings, home } = yield* setup;
+      const dir = NodePath.dirname(transcript);
+      const [first = "", second = ""] = yield* Effect.promise(async () => {
+        await NodeFSP.writeFile(NodePath.join(dir, "a.jsonl"), "");
+        await NodeFSP.writeFile(NodePath.join(dir, "b.jsonl"), "");
+        return (await NodeFSP.readdir(dir)).map((name) => NodePath.join(dir, name));
+      });
+      const forked = (line: string) => line.replace('"session-1"', '"session-2"');
+      yield* Effect.promise(async () => {
+        await NodeFSP.writeFile(first, claudeLine(1, 5));
+        await NodeFSP.utimes(first, BEFORE_NARROW_WINDOW, BEFORE_NARROW_WINDOW);
+        await NodeFSP.writeFile(second, forked(claudeLine(1, 5)) + forked(claudeLine(2, 7)));
+      });
+      yield* Effect.gen(function* () {
+        const service = yield* UsageService.make;
+        // The narrow window saves the second copy before the wide one reads the first.
+        yield* service.readSummary(NARROW_WINDOW);
+        const exact = yield* service.readSummary(WINDOW);
+        yield* service.awaitPersisted;
+        const restarted = yield* UsageService.make;
+        const saved = yield* restarted.readSummary({ ...WINDOW, provisional: true });
+        assert.isTrue(saved.sources.some((source) => source.refreshing === true));
+        assert.deepStrictEqual(saved.buckets, exact.buckets);
+      }).pipe(
+        Effect.provide(layerService({ prefix: "usage-service-saved-order-test", home, settings })),
+      );
+
+      // A narrow scan that first saves the earlier copy still puts it before a later file it skipped.
+      yield* Effect.promise(async () => {
+        await NodeFSP.writeFile(first, forked(claudeLine(1, 5)) + forked(claudeLine(2, 7)));
+        await NodeFSP.utimes(
+          first,
+          Date.parse("2026-07-01T00:00:00Z") / 1000,
+          Date.parse("2026-07-01T00:00:00Z") / 1000,
+        );
+        await NodeFSP.writeFile(second, claudeLine(1, 5));
+        await NodeFSP.utimes(second, BEFORE_NARROW_WINDOW, BEFORE_NARROW_WINDOW);
+      });
+      yield* Effect.gen(function* () {
+        const service = yield* UsageService.make;
+        yield* service.readSummary(WINDOW);
+        yield* Effect.promise(() =>
+          NodeFSP.utimes(first, NARROW_WINDOW_MTIME, NARROW_WINDOW_MTIME),
+        );
+        yield* service.readSummary(NARROW_WINDOW);
+        const saved = yield* service.readSummary({ ...WINDOW, provisional: true });
+        assert.isTrue(saved.sources.some((source) => source.refreshing === true));
+        const exact = yield* service.readSummary(WINDOW);
+        assert.deepStrictEqual(saved.buckets, exact.buckets);
+      }).pipe(
+        Effect.provide(layerService({ prefix: "usage-service-narrow-order-test", home, settings })),
+      );
+    }),
+  );
+
+  it.effect.skipIf(HostProcess.Platform.defaultValue() === "win32")(
     "keeps a newer cached read when a slower scan of another window finishes later",
     () =>
       Effect.gen(function* () {
@@ -3185,53 +3459,56 @@ describe("UsageService", () => {
         }).pipe(
           Effect.provide(layerService({ prefix: "usage-service-stale-read-test", home, settings })),
         );
-      }).pipe(Effect.scoped),
+      }),
   );
 
-  it.live("keeps an absent directory missing when its cached files only contain diagnostics", () =>
-    Effect.gen(function* () {
-      const { transcript, settings, home } = yield* setup;
-      yield* Effect.promise(() =>
-        NodeFSP.rm(NodePath.join(home, "claude", "projects"), { recursive: true }),
-      );
-      yield* Effect.gen(function* () {
-        const { stateDir } = yield* ServerConfig.ServerConfig;
-        const mtimeMs = yield* Clock.currentTimeMillis;
-        const cache = makeScanCacheWriter()(
-          new Map([
-            [
-              transcript,
-              {
-                size: 0,
-                mtimeMs,
-                provider: "claude" as const,
-                records: [],
-                tailRecords: [],
-                malformedRecords: 2,
-                position: { resumeOffset: 0, guardLength: 0, guardHash: 0, state: null },
-              },
-            ],
-          ]),
-          {},
+  it.effect(
+    "keeps an absent directory missing when its cached files only contain diagnostics",
+    () =>
+      Effect.gen(function* () {
+        yield* TestClock.setTime(Date.parse("2026-08-02T12:00:00Z"));
+        const { transcript, settings, home } = yield* setup;
+        yield* Effect.promise(() =>
+          NodeFSP.rm(NodePath.join(home, "claude", "projects"), { recursive: true }),
         );
-        yield* Effect.promise(async () => {
-          await NodeFSP.mkdir(stateDir, { recursive: true });
-          await NodeFSP.writeFile(NodePath.join(stateDir, SCAN_CACHE_FILE_NAME), cache);
-        });
-        const summary = yield* (yield* UsageService.make).readSummary(WINDOW);
-        const source = summary.sources.find((source) => source.fingerprint.provider === "claude");
-        assert.strictEqual(source?.status, "missing");
-        assert.strictEqual(source?.scannedFiles, 0);
-        assert.strictEqual(source?.malformedRecords, 2);
-      }).pipe(
-        Effect.provide(
-          layerService({ prefix: "usage-service-missing-diagnostics", home, settings }),
-        ),
-      );
-    }).pipe(Effect.scoped),
+        yield* Effect.gen(function* () {
+          const { stateDir } = yield* ServerConfig.ServerConfig;
+          const mtimeMs = yield* Clock.currentTimeMillis;
+          const cache = makeScanCacheWriter()(
+            new Map([
+              [
+                transcript,
+                {
+                  size: 0,
+                  mtimeMs,
+                  provider: "claude" as const,
+                  records: [],
+                  tailRecords: [],
+                  malformedRecords: 2,
+                  position: { resumeOffset: 0, guardLength: 0, guardHash: 0, state: null },
+                },
+              ],
+            ]),
+            {},
+          );
+          yield* Effect.promise(async () => {
+            await NodeFSP.mkdir(stateDir, { recursive: true });
+            await NodeFSP.writeFile(NodePath.join(stateDir, SCAN_CACHE_FILE_NAME), cache);
+          });
+          const summary = yield* (yield* UsageService.make).readSummary(WINDOW);
+          const source = summary.sources.find((source) => source.fingerprint.provider === "claude");
+          assert.strictEqual(source?.status, "missing");
+          assert.strictEqual(source?.scannedFiles, 0);
+          assert.strictEqual(source?.malformedRecords, 2);
+        }).pipe(
+          Effect.provide(
+            layerService({ prefix: "usage-service-missing-diagnostics", home, settings }),
+          ),
+        );
+      }),
   );
 
-  it.live("reports saved usage of a removed directory only for windows it reaches", () =>
+  it.effect("reports saved usage of a removed directory only for windows it reaches", () =>
     Effect.gen(function* () {
       yield* TestClock.setTime(Date.parse("2026-08-12T00:00:00Z"));
       const { transcript, settings, home } = yield* setup;
@@ -3262,10 +3539,10 @@ describe("UsageService", () => {
       assert.deepStrictEqual(later.buckets, []);
       assert.strictEqual(later.sources[0]?.status, "missing");
       assert.strictEqual(later.sources[0]?.scannedFiles, 0);
-    }).pipe(Effect.scoped, Effect.provide(TestClock.layer())),
+    }),
   );
 
-  it.live("does not share an in-flight scan after custom prices change", () =>
+  it.effect("does not share an in-flight scan after custom prices change", () =>
     Effect.gen(function* () {
       const { transcript, settings, home } = yield* setup;
       yield* Effect.promise(() => NodeFSP.writeFile(transcript, claudeLine(1, 5, "example-model")));
@@ -3299,7 +3576,14 @@ describe("UsageService", () => {
             HttpClient.HttpClient,
             HttpClient.make((request) =>
               Deferred.await(releaseRates).pipe(
-                Effect.as(HttpClientResponse.fromWeb(request, Response.json({}))),
+                Effect.as(
+                  HttpClientResponse.fromWeb(
+                    request,
+                    Response.json({
+                      "example-model": { input_cost_per_token: 1e-6, output_cost_per_token: 1e-5 },
+                    }),
+                  ),
+                ),
               ),
             ),
           ),
@@ -3318,15 +3602,16 @@ describe("UsageService", () => {
 
         const original = yield* Fiber.join(first);
         const updated = yield* Fiber.join(second);
-        assert.strictEqual(original.buckets[0]?.costUsd, 0);
+        // Fetched rates price the first read, so scans must start while the fetch is pending.
+        assert.isAbove(original.buckets[0]?.costUsd ?? 0, 0);
         assert.closeTo(updated.buckets[0]?.costUsd ?? -1, 0.00006, 1e-12);
       }).pipe(
         Effect.provide(layerService({ prefix: "usage-service-price-race-test", home, settings })),
       );
-    }).pipe(Effect.scoped),
+    }),
   );
 
-  it.live.each(["network", "http", "invalidJson", "empty"] as const)(
+  it.effect.each(["network", "http", "invalidJson", "empty"] as const)(
     "recovers pricing through the GitHub API after a %s failure",
     (failure) =>
       Effect.gen(function* () {
@@ -3382,10 +3667,10 @@ describe("UsageService", () => {
         assert.strictEqual(cached.pricing.status, "cached");
         assert.deepStrictEqual(cached.buckets, summary.buckets);
         assert.strictEqual(requests.length, 2);
-      }).pipe(Effect.scoped),
+      }),
   );
 
-  it.live("does not orphan an in-flight scan when its first caller is interrupted", () =>
+  it.effect("does not orphan an in-flight scan when its first caller is interrupted", () =>
     Effect.gen(function* () {
       const { settings, home } = yield* setup;
       const service = yield* UsageService.make.pipe(
@@ -3460,6 +3745,6 @@ describe("UsageService", () => {
         orphanedAt,
         `interruption left the next matching request pending at scheduler check ${orphanedAt}`,
       );
-    }).pipe(Effect.scoped),
+    }),
   );
 });
diff --git a/apps/server/src/usage/UsageService.ts b/apps/server/src/usage/UsageService.ts
index 341b14d8c628..a55532913c3c 100644
--- a/apps/server/src/usage/UsageService.ts
+++ b/apps/server/src/usage/UsageService.ts
@@ -137,7 +137,10 @@ function sharedSessions(
   return shared;
 }
 const decodeCachedSources = Schema.decodeUnknownOption(
-  Schema.Struct({ sources: Schema.Record(Schema.String, CachedSource) }),
+  Schema.Struct({
+    sources: Schema.Record(Schema.String, CachedSource),
+    coveredSince: Schema.optional(Schema.Record(Schema.String, Schema.Number)),
+  }),
 );
 
 export class UsageService extends Context.Service<
@@ -165,7 +168,15 @@ export const make = Effect.gen(function* () {
   const correctedBatch = (records: readonly UsageRecord[]) =>
     records.some((record) => resolvedRecords.has(record)) ? records.map(correctedRecord) : records;
   const sourceCache = new Map<string, typeof CachedSource.Type>();
+  // Earliest window start a complete scan read each transcript directory from.
+  const coveredSince = new Map<string, number>();
+  const coverageKey = (source: TranscriptSource) => `${source.provider}\0${source.dir}`;
   let cacheDirty = false;
+  const cover = (source: TranscriptSource, windowStartMs: number) => {
+    if ((coveredSince.get(coverageKey(source)) ?? Infinity) <= windowStartMs) return;
+    coveredSince.set(coverageKey(source), windowStartMs);
+    cacheDirty = true;
+  };
   const isWithinDirectory = (filePath: string, dir: string) => {
     const relative = path.relative(dir, filePath);
     return relative !== ".." && !relative.startsWith(".." + path.sep) && !path.isAbsolute(relative);
@@ -235,27 +246,26 @@ export const make = Effect.gen(function* () {
       Effect.catchCause(() => Effect.succeed(null)),
     );
 
+  // Outside ratesLock, which a slow fetch holds: a provisional answer prices with these.
+  const loadSavedRates = yield* Effect.cached(
+    fileSystem.readFileString(ratesCachePath).pipe(
+      Effect.flatMap((raw) => decodeRatesCache(raw)),
+      Effect.map((saved) => {
+        const parsed = parseRateTable(saved.document);
+        if (parsed.size === 0) return;
+        rates = parsed;
+        ratesFetchedAtMs = saved.fetchedAtMs;
+        ratesStatus = "cached";
+      }),
+      Effect.ignoreCause,
+    ),
+  );
+
   const loadRates = Effect.fn("UsageService.loadRates")(function* (force: boolean) {
     const now = yield* Clock.currentTimeMillis;
     const maxAgeMs = force ? RATES_REFRESH_FLOOR_MS : RATES_TTL_MS;
+    yield* loadSavedRates;
     if (ratesFetchedAtMs !== null && now - ratesFetchedAtMs < maxAgeMs) return;
-
-    if (ratesFetchedAtMs === null) {
-      const fromDisk = yield* fileSystem.readFileString(ratesCachePath).pipe(
-        Effect.flatMap((raw) => decodeRatesCache(raw)),
-        Effect.catchCause(() => Effect.succeed(null)),
-      );
-      if (fromDisk !== null) {
-        const parsed = parseRateTable(fromDisk.document);
-        if (parsed.size > 0) {
-          rates = parsed;
-          ratesFetchedAtMs = fromDisk.fetchedAtMs;
-          ratesStatus = "cached";
-          if (now - fromDisk.fetchedAtMs < maxAgeMs) return;
-        }
-      }
-    }
-
     if (ratesLastFailedAtMs !== null && now - ratesLastFailedAtMs < RATES_REFRESH_FLOOR_MS) return;
 
     let fetched = yield* fetchRates(LITELLM_RATES_URL);
@@ -396,19 +406,27 @@ export const make = Effect.gen(function* () {
           Effect.catchCause(() => Effect.succeed(null)),
         );
       let document = yield* readDocument(scanCachePath);
+      const current = document !== null;
       for (const fileName of LEGACY_SCAN_CACHE_FILE_NAMES) {
         if (document !== null) break;
         document = yield* readDocument(path.join(config.stateDir, fileName));
         cacheDirty = document !== null;
       }
       if (document === null) return;
-      for (const [path, entry] of decodeScanCache(document, transcriptFormats)) {
-        fileCache.set(path, entry);
-      }
+      const decoded = decodeScanCache(document, transcriptFormats);
+      for (const [path, entry] of decoded) fileCache.set(path, entry);
+      const saved = (document as { readonly files?: unknown }).files;
+      const complete =
+        typeof saved === "object" && saved !== null && Object.keys(saved).length === decoded.size;
       const sources = decodeCachedSources(document);
       if (Option.isSome(sources)) {
         for (const [key, source] of Object.entries(sources.value.sources))
           sourceCache.set(key, source);
+        // Coverage describes the saved files, so it needs every one, in this version's format.
+        if (current && complete && fileCache.size > 0) {
+          for (const [key, since] of Object.entries(sources.value.coveredSince ?? {}))
+            coveredSince.set(key, since);
+        }
       }
     }),
   );
@@ -448,7 +466,10 @@ export const make = Effect.gen(function* () {
     if (cacheDirty) {
       cacheDirty = false;
       yield* Effect.sync(() =>
-        writeScanCache(fileCache, { sources: Object.fromEntries(sourceCache) }),
+        writeScanCache(fileCache, {
+          sources: Object.fromEntries(sourceCache),
+          coveredSince: Object.fromEntries(coveredSince),
+        }),
       ).pipe(
         Effect.flatMap((contents) => writeCacheFile(scanCachePath, contents)),
         Effect.andThen(
@@ -532,21 +553,44 @@ export const make = Effect.gen(function* () {
         failed: true,
       };
 
+    const identity = (record: UsageRecord) =>
+      encodeUsageRecordKey([
+        record.provider,
+        record.sessionId,
+        record.timestampMs,
+        record.model,
+        record.rateModel,
+        record.totals,
+        record.reportedCostUsd,
+        record.dedupeKey,
+      ]);
+    if (!parsed.resumed && cached !== undefined && cached.provider === provider) {
+      // A whole-file re-parse re-emits saved requests unresolved. Keep their saved tier
+      // corrections, since the history that resolved them may no longer be available.
+      // Equal requests keep their own corrections by matching occurrences in order.
+      const saved = new Map<string, UsageRecord[]>();
+      for (const previous of [...cached.records, ...cached.tailRecords]) {
+        const corrected = correctedRecord(previous);
+        const key = identity(corrected);
+        const occurrences = saved.get(key);
+        if (occurrences === undefined) saved.set(key, [corrected]);
+        else occurrences.push(corrected);
+      }
+      for (const record of [...parsed.records, ...parsed.tailRecords]) {
+        const corrected = saved.get(identity(record))?.shift();
+        if (
+          record.unresolvedServiceTierTurnId !== undefined &&
+          corrected !== undefined &&
+          corrected.unresolvedServiceTierTurnId === undefined
+        ) {
+          resolvedRecords.set(record, corrected);
+        }
+      }
+    }
     if (parsed.resumed && cached !== undefined && cached.tailRecords.length > 0) {
       // Completing a tentative line reparses it. Reuse its saved correction only when the
       // same usage is emitted again, without putting inferred tiers in the parser state.
       const reparsed = [...parsed.records, ...parsed.tailRecords];
-      const identity = (record: UsageRecord) =>
-        encodeUsageRecordKey([
-          record.provider,
-          record.sessionId,
-          record.timestampMs,
-          record.model,
-          record.rateModel,
-          record.totals,
-          record.reportedCostUsd,
-          record.dedupeKey,
-        ]);
       for (const [index, previous] of cached.tailRecords.entries()) {
         const record = reparsed[index];
         const corrected = correctedRecord(previous);
@@ -595,19 +639,27 @@ export const make = Effect.gen(function* () {
           readonly malformedRecords: number;
         }[]
       | null;
+    /** Every transcript path the walk listed, in walk order, whatever its mtime. */
+    readonly walked?: readonly string[];
     readonly refreshing?: true;
   }
 
   const scanTranscriptDir = Effect.fn("UsageService.scanTranscriptDir")(function* (
     source: TranscriptSource,
     windowStartMs: number,
+    fromMemory: boolean,
   ) {
     const { provider, format, dir, volumeId, fileName } = source;
     const exists = yield* fileSystem
       .exists(dir)
       .pipe(Effect.catchCause(() => Effect.succeed(false)));
-    if (!exists) return { provider, dir, volumeId, files: null } satisfies ScannedDir;
-    const { files, failedPaths } = yield* Effect.promise(() =>
+    if (!exists) {
+      cover(source, windowStartMs);
+      return { provider, dir, volumeId, files: null } satisfies ScannedDir;
+    }
+    // scanSummary aggregates the saved files, as it does for a deleted directory.
+    if (fromMemory) return { provider, dir, volumeId, files: [] } satisfies ScannedDir;
+    const { files, walked, failedPaths } = yield* Effect.promise(() =>
       listTranscriptFiles(dir, windowStartMs, fileName === undefined ? undefined : { fileName }),
     );
     const read = yield* Effect.forEach(
@@ -638,7 +690,15 @@ export const make = Effect.gen(function* () {
       }
       return { path, records, malformedRecords };
     });
+    const livePaths = new Set(files.map((file) => file.path));
+    for (const file of read) {
+      if (file.failed || !file.path.endsWith(".jsonl.zst")) continue;
+      const originalPath = file.path.slice(0, -4);
+      // A successfully read archive replaces the original's saved records and diagnostics.
+      if (!livePaths.has(originalPath) && fileCache.delete(originalPath)) cacheDirty = true;
+    }
     const unread = failedPaths + read.filter((file) => file.failed).length;
+    if (unread === 0) cover(source, windowStartMs);
     yield* Effect.annotateCurrentSpan({
       "usage.files": files.length,
       "usage.files_parsed": read.filter((file) => file.update !== undefined).length,
@@ -648,6 +708,7 @@ export const make = Effect.gen(function* () {
       dir,
       volumeId,
       files: parsedFiles,
+      walked,
       ...(unread > 0
         ? {
             status: "partial",
@@ -658,17 +719,13 @@ export const make = Effect.gen(function* () {
   });
 
   const collectDirs = Effect.fn("UsageService.collectDirs")(function* (
+    { dirs, pending }: Effect.Success<ReturnType<typeof resolveTranscriptDirs>>,
     windowStartMs: number,
     settings: ServerSettingsValue,
     retentionCutoffMs: number,
     awaitRefresh: boolean,
+    fromMemory: boolean,
   ) {
-    const { dirs, pending } = yield* resolveTranscriptDirs(
-      settings,
-      retentionCutoffMs,
-      awaitRefresh,
-    ).pipe(Effect.provideContext(readerContext));
-
     const scans = Effect.forEach(
       scanReaders,
       ({ driver, reader }) =>
@@ -698,7 +755,7 @@ export const make = Effect.gen(function* () {
 
     // Scan independent sources together, directories sequentially to bound open files; keep order, since the first copy decides a duplicate's bucket.
     const [transcripts, scanDirs] = yield* Effect.all(
-      [Effect.forEach(dirs, (dir) => scanTranscriptDir(dir, windowStartMs)), scans],
+      [Effect.forEach(dirs, (dir) => scanTranscriptDir(dir, windowStartMs, fromMemory)), scans],
       { concurrency: "unbounded" },
     );
     const scanned: readonly ScannedDir[] = [...transcripts, ...pending, ...scanDirs.flat()];
@@ -708,6 +765,7 @@ export const make = Effect.gen(function* () {
   const scanSummary = Effect.fn("UsageService.scanSummary")(function* (
     input: UsageSummaryInput,
     settings: ServerSettingsValue,
+    provisional: boolean,
   ) {
     if (input.sinceDay > input.untilDay) {
       return yield* new UsageReadError({
@@ -755,11 +813,38 @@ export const make = Effect.gen(function* () {
 
     const retentionCutoffMs = startedAtMs - CACHE_RETENTION_DAYS * 24 * 60 * 60 * 1000;
 
-    const [, scannedDirs] = yield* Effect.all(
-      [
-        ensureRates(false),
-        collectDirs(windowStartMs, settings, retentionCutoffMs, input.awaitRefresh === true),
-      ],
+    const awaitRefresh = input.awaitRefresh === true;
+    const collect = Effect.gen(function* () {
+      const resolved = yield* resolveTranscriptDirs(settings, retentionCutoffMs, awaitRefresh).pipe(
+        Effect.provideContext(readerContext),
+      );
+      // A window no complete scan has read would show partial totals, so every directory must cover it.
+      // Saved files are keyed by path, so two providers reading one directory keep only one parse.
+      const fromMemory =
+        provisional &&
+        resolved.dirs.length > 0 &&
+        new Set(resolved.dirs.map((source) => source.dir)).size === resolved.dirs.length &&
+        resolved.dirs.every(
+          (source) => (coveredSince.get(coverageKey(source)) ?? Infinity) <= windowStartMs,
+        );
+      const [, scanned] = yield* Effect.all(
+        [
+          fromMemory ? loadSavedRates : provisional ? ensureRates(false) : Effect.void,
+          collectDirs(
+            resolved,
+            windowStartMs,
+            settings,
+            retentionCutoffMs,
+            awaitRefresh,
+            fromMemory,
+          ),
+        ],
+        { concurrency: 2 },
+      );
+      return { scannedDirs: scanned, fromMemory };
+    });
+    const [{ scannedDirs, fromMemory }] = yield* Effect.all(
+      [collect, provisional ? Effect.void : ensureRates(false)],
       { concurrency: 2 },
     );
 
@@ -779,31 +864,73 @@ export const make = Effect.gen(function* () {
 
     // Deleted transcripts' saved usage still aggregates and deduplicates normally.
     const retainedSinceMs = Math.max(windowStartMs, retentionCutoffMs);
+    // Saved paths are files below a scanned root, so their folder decides; folders repeat thousands of times.
+    const withinDir = (dir: string) => {
+      const foldersWithin = new Map<string, boolean>();
+      return (filePath: string) => {
+        const folder = path.dirname(filePath);
+        let within = foldersWithin.get(folder);
+        if (within === undefined) {
+          within = isWithinDirectory(folder, dir);
+          foldersWithin.set(folder, within);
+        }
+        return within;
+      };
+    };
     const filesByDir = scannedDirs.map(({ provider, dir, files }) => {
       const retainedFiles = [...(files ?? [])];
       const livePaths = new Set(retainedFiles.map((file) => file.path));
+      const isRetained = withinDir(dir);
       for (const [filePath, entry] of fileCache) {
         if (
           entry.provider !== provider ||
           entry.mtimeMs < retainedSinceMs ||
           livePaths.has(filePath) ||
-          !isWithinDirectory(filePath, dir)
+          !isRetained(filePath)
         )
           continue;
         retainedFiles.push({
           path: filePath,
-          records: [...entry.records, ...entry.tailRecords],
+          records:
+            entry.tailRecords.length === 0
+              ? entry.records
+              : [...entry.records, ...entry.tailRecords],
           malformedRecords: entry.malformedRecords,
         });
       }
       return retainedFiles;
     });
+    // Usage two transcripts share counts in the first one, so saved files take the order an exact
+    // scan reads them in: walked files in walk order, then the directory's deleted files.
+    for (const { provider, dir, walked } of fromMemory ? [] : scannedDirs) {
+      if (walked === undefined) continue;
+      const within = withinDir(dir);
+      const saved = [...fileCache.keys()];
+      const members = new Set(
+        saved.filter(
+          (filePath) => fileCache.get(filePath)!.provider === provider && within(filePath),
+        ),
+      );
+      if (members.size < 2) continue;
+      const listed = new Set(walked);
+      const target = [
+        ...walked.filter((filePath) => members.has(filePath)),
+        ...saved.filter((filePath) => members.has(filePath) && !listed.has(filePath)),
+      ];
+      let next = 0;
+      const ordered = saved.map((filePath) => (members.has(filePath) ? target[next++]! : filePath));
+      if (ordered.every((filePath, index) => filePath === saved[index])) continue;
+      const entries = new Map(fileCache);
+      fileCache.clear();
+      for (const filePath of ordered) fileCache.set(filePath, entries.get(filePath)!);
+      cacheDirty = true;
+    }
     const windowEndMs =
       hourlyWindow?.untilTimeMs ??
       Date.parse(`${input.untilDay}T00:00:00Z`) + 86400000 + MTIME_SLACK_MS;
     let resolvedAny = false;
     for (const { reader } of transcriptReaders) {
-      if (reader.resolveServiceTiers === undefined) continue;
+      if (reader.resolveServiceTiers === undefined || fromMemory) continue;
       const pending = new Set<UsageRecord>();
       for (const [index, files] of filesByDir.entries()) {
         if (scannedDirs[index]?.provider !== reader.provider) continue;
@@ -853,6 +980,7 @@ export const make = Effect.gen(function* () {
       // Distinct per directory. Buckets carry per-cell session counts, but a
       // session spans days and models, so clients total this figure instead.
       const sessionIds = new Set<string>();
+      let counted = false;
 
       for (const file of filesByDir[index] ?? []) {
         malformedRecords += file.malformedRecords;
@@ -881,8 +1009,9 @@ export const make = Effect.gen(function* () {
             eventOccurrences.set(key, occurrence);
             usageRecord = { ...record, dedupeKey: key + ":" + occurrence };
           }
-          if (aggregator.add(usageRecord, dir) && record.sessionId.length > 0) {
-            sessionIds.add(record.sessionId);
+          if (aggregator.add(usageRecord, dir)) {
+            counted = true;
+            if (record.sessionId.length > 0) sessionIds.add(record.sessionId);
           }
         }
       }
@@ -909,18 +1038,28 @@ export const make = Effect.gen(function* () {
                 .filter(Boolean)
                 .join(" ")
             : sourceMessage,
-        ...(refreshing ? { refreshing } : {}),
+        // A saved answer misses what changed since its scan, so the client must ask again. An
+        // empty source stays unmarked: it would only flash a loading row.
+        ...(refreshing || (fromMemory && counted && transcriptFormats.has(provider))
+          ? { refreshing: true }
+          : {}),
       });
     }
 
     const pruned = pruneScanCache(fileCache, retentionCutoffMs);
-    if (pruned > 0) cacheDirty = true;
+    if (pruned > 0) {
+      cacheDirty = true;
+      // Pruned files are no longer saved, so nothing before the cutoff stays covered.
+      for (const [key, since] of coveredSince) {
+        if (since < retentionCutoffMs) coveredSince.set(key, retentionCutoffMs);
+      }
+    }
 
     const aggregated = aggregator.finish();
     const readAt = yield* DateTime.now;
     const finishedAtMs = yield* Clock.currentTimeMillis;
 
-    return {
+    const summary = {
       contractVersion: USAGE_CONTRACT_VERSION,
       readAt: DateTime.formatIso(readAt),
       timeZone: input.timeZone,
@@ -932,11 +1071,28 @@ export const make = Effect.gen(function* () {
       scanDurationMs: Math.max(0, finishedAtMs - startedAtMs),
       ...(input.modelFilter === undefined ? {} : { modelFilter: input.modelFilter }),
     } satisfies UsageSummary;
+    return { summary, fromMemory };
+  });
+
+  const readWindow = Effect.fn("UsageService.readWindow")(function* (
+    input: UsageSummaryInput,
+    settings: ServerSettingsValue,
+    provisional: boolean,
+  ) {
+    const { summary, fromMemory } = yield* scanSummary(input, settings, provisional);
+    // With nothing marked refreshing the client would keep a saved answer as final.
+    return fromMemory && !summary.sources.some((source) => source.refreshing === true)
+      ? (yield* scanSummary(input, settings, false)).summary
+      : summary;
   });
 
   const inflightScans = new Map<string, Deferred.Deferred<UsageSummary, UsageReadError>>();
 
-  const scanKey = (input: UsageSummaryInput, settings: ServerSettingsValue): string =>
+  const scanKey = (
+    input: UsageSummaryInput,
+    settings: ServerSettingsValue,
+    provisional: boolean,
+  ): string =>
     JSON.stringify([
       input.timeZone,
       input.sinceDay,
@@ -946,6 +1102,7 @@ export const make = Effect.gen(function* () {
       input.untilTime ?? null,
       settings,
       input.awaitRefresh === true,
+      provisional,
       input.modelFilter ?? null,
     ]);
 
@@ -956,7 +1113,8 @@ export const make = Effect.gen(function* () {
     const modelFilter = canonicalModelFilter(requestedFilter);
     const input = modelFilter === undefined ? unfiltered : { ...unfiltered, modelFilter };
     const settings = yield* readSettings;
-    const key = scanKey(input, settings);
+    const provisional = input.provisional === true && input.awaitRefresh !== true;
+    const key = scanKey(input, settings, provisional);
     const deferred = yield* Effect.uninterruptible(
       Effect.gen(function* () {
         const existing = inflightScans.get(key);
@@ -967,7 +1125,7 @@ export const make = Effect.gen(function* () {
         inflightScans.set(key, created);
         // Detach so caller departure cannot cancel shared scans; finished scans warm the cache.
         // Register writes before releasing waiters, but start writing after delivering their summary.
-        yield* scanSummary(input, settings).pipe(
+        yield* readWindow(input, settings, provisional).pipe(
           Effect.onExit((exit) =>
             Effect.sync(() => inflightScans.delete(key)).pipe(
               Effect.andThen(Exit.isSuccess(exit) ? schedulePersist : Effect.void),
diff --git a/apps/server/src/usage/usageAggregation.test.ts b/apps/server/src/usage/usageAggregation.test.ts
index 625f7a9d63ec..f99615085bd2 100644
--- a/apps/server/src/usage/usageAggregation.test.ts
+++ b/apps/server/src/usage/usageAggregation.test.ts
@@ -12,11 +12,13 @@ const rates: RateTable = new Map([
       outputCostPerToken: 5e-5,
       cacheReadCostPerToken: 1e-6,
       cacheCreationCostPerToken: 1.25e-5,
+      cacheCreation1hCostPerToken: 2e-5,
       fast: {
         inputCostPerToken: 2e-5,
         outputCostPerToken: 1e-4,
         cacheReadCostPerToken: 2e-6,
         cacheCreationCostPerToken: 2.5e-5,
+        cacheCreation1hCostPerToken: 4e-5,
       },
       ultrafast: null,
       contextTiers: [],
diff --git a/apps/server/src/usage/usageAggregation.ts b/apps/server/src/usage/usageAggregation.ts
index 8d1d79985973..9ff9cb936946 100644
--- a/apps/server/src/usage/usageAggregation.ts
+++ b/apps/server/src/usage/usageAggregation.ts
@@ -147,12 +147,18 @@ export function mergeUsageCopies(held: UsageRecord, copy: UsageRecord): UsageRec
     b.cacheCreationTokens <= a.cacheCreationTokens &&
     b.outputTokens <= a.outputTokens &&
     b.reasoningTokens <= a.reasoningTokens &&
+    (copy.cacheCreation1hTokens ?? 0) <= (held.cacheCreation1hTokens ?? 0) &&
     reportedCostUsd === held.reportedCostUsd
   ) {
     return held;
   }
+  const cacheCreation1hTokens = Math.max(
+    held.cacheCreation1hTokens ?? 0,
+    copy.cacheCreation1hTokens ?? 0,
+  );
   return {
     ...held,
+    ...(cacheCreation1hTokens > 0 ? { cacheCreation1hTokens } : {}),
     totals: {
       uncachedInputTokens: Math.max(a.uncachedInputTokens, b.uncachedInputTokens),
       cachedInputTokens: Math.max(a.cachedInputTokens, b.cachedInputTokens),
diff --git a/apps/server/src/usage/usagePricing.ts b/apps/server/src/usage/usagePricing.ts
index 4a04116db2df..21a1bd02bb17 100644
--- a/apps/server/src/usage/usagePricing.ts
+++ b/apps/server/src/usage/usagePricing.ts
@@ -12,6 +12,8 @@ export interface TokenRates {
   readonly outputCostPerToken: number;
   readonly cacheReadCostPerToken: number;
   readonly cacheCreationCostPerToken: number;
+  /** Cache writes with a 1-hour TTL; the 5-minute rate when unpublished. */
+  readonly cacheCreation1hCostPerToken: number;
 }
 
 interface SpeedRates extends TokenRates {
@@ -37,20 +39,24 @@ export function createOverrideRateTable(
   overrides: Readonly<Record<string, UsageModelPriceOverride>>,
 ): RateTable {
   return new Map(
-    Object.entries(overrides).map(([model, prices]) => [
-      model.trim(),
-      {
-        inputCostPerToken: prices.inputCostPerMillionTokens / 1_000_000,
-        outputCostPerToken: prices.outputCostPerMillionTokens / 1_000_000,
-        cacheReadCostPerToken:
-          (prices.cacheReadCostPerMillionTokens ?? prices.inputCostPerMillionTokens) / 1_000_000,
-        cacheCreationCostPerToken:
-          (prices.cacheWriteCostPerMillionTokens ?? prices.inputCostPerMillionTokens) / 1_000_000,
-        fast: null,
-        ultrafast: null,
-        contextTiers: [],
-      },
-    ]),
+    Object.entries(overrides).map(([model, prices]) => {
+      const cacheCreationCostPerToken =
+        (prices.cacheWriteCostPerMillionTokens ?? prices.inputCostPerMillionTokens) / 1_000_000;
+      return [
+        model.trim(),
+        {
+          inputCostPerToken: prices.inputCostPerMillionTokens / 1_000_000,
+          outputCostPerToken: prices.outputCostPerMillionTokens / 1_000_000,
+          cacheReadCostPerToken:
+            (prices.cacheReadCostPerMillionTokens ?? prices.inputCostPerMillionTokens) / 1_000_000,
+          cacheCreationCostPerToken,
+          cacheCreation1hCostPerToken: cacheCreationCostPerToken,
+          fast: null,
+          ultrafast: null,
+          contextTiers: [],
+        },
+      ];
+    }),
   );
 }
 
@@ -60,7 +66,7 @@ function finiteNumber(value: unknown): number | null {
   return typeof value === "number" && Number.isFinite(value) ? value : null;
 }
 
-// Missing cache rates fall back to input pricing; Anthropic normally discounts reads and charges extra for writes.
+// Missing cache rates fall back to input pricing, and a missing 1-hour write rate to the 5-minute one.
 function readTokenRates(
   entry: LiteLlmEntry,
   suffix: string,
@@ -70,18 +76,28 @@ function readTokenRates(
   const input = finiteNumber(entry[`input_cost_per_token${suffix}`]);
   const output = finiteNumber(entry[`output_cost_per_token${suffix}`]) ?? outputFallback ?? null;
   if (input === null || output === null) return null;
-  const cacheRate = (name: string, field: "cacheReadCostPerToken" | "cacheCreationCostPerToken") =>
+  const cacheRate = (
+    name: string,
+    field: "cacheReadCostPerToken" | "cacheCreationCostPerToken" | "cacheCreation1hCostPerToken",
+    fallback = input,
+  ) =>
     finiteNumber(entry[`${name}${suffix}`]) ??
     (standard !== undefined && standard.inputCostPerToken > 0
       ? (standard[field] / standard.inputCostPerToken) * input
-      : input);
+      : fallback);
+  const cacheCreationCostPerToken = cacheRate(
+    "cache_creation_input_token_cost",
+    "cacheCreationCostPerToken",
+  );
   return {
     inputCostPerToken: input,
     outputCostPerToken: output,
     cacheReadCostPerToken: cacheRate("cache_read_input_token_cost", "cacheReadCostPerToken"),
-    cacheCreationCostPerToken: cacheRate(
-      "cache_creation_input_token_cost",
-      "cacheCreationCostPerToken",
+    cacheCreationCostPerToken,
+    cacheCreation1hCostPerToken: cacheRate(
+      "cache_creation_input_token_cost_above_1hr",
+      "cacheCreation1hCostPerToken",
+      cacheCreationCostPerToken,
     ),
   };
 }
@@ -92,6 +108,7 @@ function scaleTokenRates(rates: TokenRates, multiple: number): TokenRates {
     outputCostPerToken: rates.outputCostPerToken * multiple,
     cacheReadCostPerToken: rates.cacheReadCostPerToken * multiple,
     cacheCreationCostPerToken: rates.cacheCreationCostPerToken * multiple,
+    cacheCreation1hCostPerToken: rates.cacheCreation1hCostPerToken * multiple,
   };
 }
 
@@ -192,7 +209,8 @@ function sameTokenRates(a: TokenRates | null, b: TokenRates | null): boolean {
     a.inputCostPerToken === b.inputCostPerToken &&
     a.outputCostPerToken === b.outputCostPerToken &&
     a.cacheReadCostPerToken === b.cacheReadCostPerToken &&
-    a.cacheCreationCostPerToken === b.cacheCreationCostPerToken
+    a.cacheCreationCostPerToken === b.cacheCreationCostPerToken &&
+    a.cacheCreation1hCostPerToken === b.cacheCreation1hCostPerToken
   );
 }
 
@@ -301,7 +319,7 @@ function resolveRate(table: RateTable, model: string): ModelRate | null {
 
 export type PricedRecord = Pick<
   UsageRecord,
-  "model" | "rateModel" | "totals" | "speed" | "reportedCostUsd"
+  "model" | "rateModel" | "totals" | "cacheCreation1hTokens" | "speed" | "reportedCostUsd"
 >;
 
 function recordRate(table: RateTable, record: PricedRecord): ModelRate | null {
@@ -316,11 +334,15 @@ export interface PricedUsage {
   readonly speedPremiumUsd: number;
 }
 
-function costByCategory(totals: UsageTokenTotals, rates: TokenRates): UsageCategoryCost {
+function costByCategory(record: PricedRecord, rates: TokenRates): UsageCategoryCost {
+  const { totals } = record;
+  const oneHour = Math.min(record.cacheCreation1hTokens ?? 0, totals.cacheCreationTokens);
   return {
     input: totals.uncachedInputTokens * rates.inputCostPerToken,
     cacheRead: totals.cachedInputTokens * rates.cacheReadCostPerToken,
-    cacheWrite: totals.cacheCreationTokens * rates.cacheCreationCostPerToken,
+    cacheWrite:
+      (totals.cacheCreationTokens - oneHour) * rates.cacheCreationCostPerToken +
+      oneHour * rates.cacheCreation1hCostPerToken,
     output: totals.outputTokens * rates.outputCostPerToken,
   };
 }
@@ -352,13 +374,13 @@ export function priceUsage(
     return reported === null ? unsplit(0, "unpriced") : unsplit(reported, "providerReported");
   }
 
-  const listCost = costByCategory(totals, ratesAt(rate, record.speed, totals));
+  const listCost = costByCategory(record, ratesAt(rate, record.speed, totals));
   const listCostUsd = sumCategories(listCost);
   if (reported !== null && listCostUsd <= 0) return unsplit(reported, "providerReported");
   const premiumUsd =
     record.speed === "standard"
       ? 0
-      : listCostUsd - sumCategories(costByCategory(totals, ratesAt(rate, "standard", totals)));
+      : listCostUsd - sumCategories(costByCategory(record, ratesAt(rate, "standard", totals)));
   const scale = reported === null ? 1 : reported / listCostUsd;
   return {
     costUsd: reported ?? listCostUsd,
diff --git a/apps/server/src/usage/usageScanCache.test.ts b/apps/server/src/usage/usageScanCache.test.ts
index 2866a295da8f..84291da51a18 100644
--- a/apps/server/src/usage/usageScanCache.test.ts
+++ b/apps/server/src/usage/usageScanCache.test.ts
@@ -65,7 +65,15 @@ describe("scan cache round trip", () => {
       [
         "/a.jsonl",
         100,
-        [record(), record({ dedupeKey: "msg_2:", model: "claude-opus-5-5", speed: "fast" })],
+        [
+          record(),
+          record({
+            dedupeKey: "msg_2:",
+            model: "claude-opus-5-5",
+            speed: "fast",
+            cacheCreation1hTokens: 8,
+          }),
+        ],
       ],
       [
         "/b.jsonl",
@@ -160,7 +168,7 @@ describe("scan cache round trip", () => {
     expect(restored).toEqual(original);
   });
 
-  it.each([5, 6, 7, 8, 10])(
+  it.each([5, 6, 7, 8, 10, 11, 12, 13])(
     "retains v%s history and compatible positions but invalidates obsolete state",
     (version) => {
       const original = cacheWith([["/gone.jsonl", 100, [record({ speed: "fast" })]]]);
@@ -217,11 +225,15 @@ describe("scan cache round trip", () => {
       };
 
       const restored = decodeScanCache(JSON.parse(JSON.stringify(legacy)), TEST_FORMAT_MAP);
-      expect(restored.get("/gone.jsonl")).toEqual({
-        ...original.get("/gone.jsonl"),
-        size: -1,
-        position: { resumeOffset: 0, guardLength: 0, guardHash: 0, state: null },
-      });
+      expect(restored.get("/gone.jsonl")).toEqual(
+        version >= 13
+          ? original.get("/gone.jsonl")
+          : {
+              ...original.get("/gone.jsonl"),
+              size: -1,
+              position: { resumeOffset: 0, guardLength: 0, guardHash: 0, state: null },
+            },
+      );
       expect(restored.get("/gone-codex.jsonl")).toEqual({
         ...original.get("/gone-codex.jsonl"),
         size: -1,
@@ -229,7 +241,7 @@ describe("scan cache round trip", () => {
       });
       expect(restored.get("/clean-codex.jsonl")).toEqual({
         ...cleanCodex,
-        size: version >= 8 ? cleanCodex.size : -1,
+        size: -1,
         position: { resumeOffset: 0, guardLength: 0, guardHash: 0, state: null },
       });
       expect(restored.get("/gone-pi.jsonl")).toEqual(
@@ -244,11 +256,42 @@ describe("scan cache round trip", () => {
     },
   );
 
-  it("re-parses a Claude transcript cached before partial copies were merged", () => {
+  it("re-parses a v14 Codex entry that skipped records and restarts a clean one when it grows", () => {
+    const codex = (malformedRecords: number): CachedFile => ({
+      size: 10,
+      mtimeMs: 100,
+      provider: "codex",
+      records: [record({ provider: "codex", model: "gpt-6-astra", dedupeKey: null })],
+      tailRecords: [],
+      malformedRecords,
+      position: position({
+        state: { ...initialCodexScanState(), model: "gpt-6-astra", sessionId: "session-a" },
+      }),
+    });
+    const original: ScanCache = new Map([
+      ["/skipped-codex.jsonl", codex(1)],
+      ["/clean-codex.jsonl", codex(0)],
+    ]);
+    const v14 = { ...parse(makeScanCacheWriter()(original, {})), version: 14 };
+
+    const restored = decodeScanCache(JSON.parse(JSON.stringify(v14)), TEST_FORMAT_MAP);
+    expect(restored.get("/skipped-codex.jsonl")).toEqual({
+      ...codex(1),
+      size: -1,
+      position: { resumeOffset: 0, guardLength: 0, guardHash: 0, state: null },
+    });
+    // Served while unchanged, but its state predates the latest snapshot time, so it cannot resume.
+    expect(restored.get("/clean-codex.jsonl")).toEqual({
+      ...codex(0),
+      position: { resumeOffset: 0, guardLength: 0, guardHash: 0, state: null },
+    });
+  });
+
+  it("re-parses a Claude transcript cached before 1-hour cache writes were counted", () => {
     const original = cacheWith([["/claude.jsonl", 100, [record()]]]);
-    const v11 = { ...parse(makeScanCacheWriter()(original, {})), version: 11 };
+    const v12 = { ...parse(makeScanCacheWriter()(original, {})), version: 12 };
 
-    const restored = decodeScanCache(JSON.parse(JSON.stringify(v11)), TEST_FORMAT_MAP);
+    const restored = decodeScanCache(JSON.parse(JSON.stringify(v12)), TEST_FORMAT_MAP);
     expect(restored.get("/claude.jsonl")).toEqual({
       ...original.get("/claude.jsonl"),
       size: -1,
diff --git a/apps/server/src/usage/usageScanCache.ts b/apps/server/src/usage/usageScanCache.ts
index 4cd959c75aa2..b571dd3708f6 100644
--- a/apps/server/src/usage/usageScanCache.ts
+++ b/apps/server/src/usage/usageScanCache.ts
@@ -10,7 +10,7 @@ import { CLAUDE_SYNTHETIC_MODEL } from "../provider/Drivers/claudeUsage.ts";
 import { mergeUsageCopies } from "./usageAggregation.ts";
 import { GUARD_LENGTH, type TranscriptParsePosition } from "./usageTranscriptReader.ts";
 
-const USAGE_SCAN_CACHE_VERSION = 12 as const;
+const USAGE_SCAN_CACHE_VERSION = 15 as const;
 const SPEED_COMPATIBLE_SINCE_VERSION = 4;
 
 /**
@@ -18,8 +18,11 @@ const SPEED_COMPATIBLE_SINCE_VERSION = 4;
  * replace it, dropping saved usage for deleted transcripts. Separate files keep
  * the newer one; older files are removed once it is saved.
  */
-export const SCAN_CACHE_FILE_NAME = "usage-scan-cache-v12.json";
+export const SCAN_CACHE_FILE_NAME = "usage-scan-cache-v15.json";
 export const LEGACY_SCAN_CACHE_FILE_NAMES = [
+  "usage-scan-cache-v14.json",
+  "usage-scan-cache-v13.json",
+  "usage-scan-cache-v12.json",
   "usage-scan-cache-v11.json",
   "usage-scan-cache-v10.json",
   "usage-scan-cache-v9.json",
@@ -59,7 +62,8 @@ type SerializedRecord = readonly [
   reportedCostUsd: number | null,
   speed: number,
   rateModelIndex?: number | null,
-  unresolvedServiceTierTurnId?: string,
+  unresolvedServiceTierTurnId?: string | null,
+  cacheCreation1hTokens?: number,
 ];
 
 interface SerializedFile {
@@ -118,9 +122,11 @@ function serializeFile(entry: CachedFile, tables: InternTables): SerializedFile
     record.rateModel === undefined
       ? null
       : intern(tables.models, tables.modelIndex, record.rateModel),
-    ...(record.unresolvedServiceTierTurnId === undefined
-      ? ([] as const)
-      : ([record.unresolvedServiceTierTurnId] as const)),
+    ...(record.cacheCreation1hTokens !== undefined
+      ? ([record.unresolvedServiceTierTurnId ?? null, record.cacheCreation1hTokens] as const)
+      : record.unresolvedServiceTierTurnId !== undefined
+        ? ([record.unresolvedServiceTierTurnId] as const)
+        : ([] as const)),
   ];
   return {
     s: entry.size,
@@ -211,6 +217,7 @@ export function decodeScanCache(
         speedIndex,
         rateModelIndex,
         unresolvedServiceTierTurnId,
+        cacheCreation1h = 0,
       ] = row as SerializedRecord;
       const speed = typeof speedIndex === "number" ? SPEEDS[speedIndex] : undefined;
 
@@ -220,8 +227,8 @@ export function decodeScanCache(
         typeof timestampMs !== "number" ||
         !Number.isFinite(timestampMs) ||
         model === undefined ||
-        (unresolvedServiceTierTurnId !== undefined &&
-          typeof unresolvedServiceTierTurnId !== "string") ||
+        (unresolvedServiceTierTurnId != null && typeof unresolvedServiceTierTurnId !== "string") ||
+        !Number.isFinite(cacheCreation1h) ||
         (rateModelIndex != null && rateModel === undefined) ||
         !Number.isFinite(uncached) ||
         !Number.isFinite(cached) ||
@@ -250,9 +257,10 @@ export function decodeScanCache(
           outputTokens: output,
           reasoningTokens: reasoning,
         },
+        ...(cacheCreation1h > 0 ? { cacheCreation1hTokens: cacheCreation1h } : {}),
         reportedCostUsd: typeof reportedCostUsd === "number" ? reportedCostUsd : null,
         speed,
-        ...(version >= 7 && unresolvedServiceTierTurnId !== undefined
+        ...(version >= 7 && unresolvedServiceTierTurnId != null
           ? { unresolvedServiceTierTurnId }
           : {}),
         dedupeKey: typeof dedupeKey === "string" ? dedupeKey : null,
@@ -290,19 +298,19 @@ export function decodeScanCache(
       continue;
     }
     // Keep history for deleted rollouts, but re-parse incompatible reducer state.
-    // v9 and v11 repair skipped Codex requests; clean v8+ entries stay served while unchanged.
-    // v10 adds Claude advisor calls; before v12 a repeated Claude key kept its first, possibly partial, copy.
+    // v13 adds Claude 1-hour cache writes; v14 uses Codex request ledgers.
+    // v15 repairs skipped Codex requests whose counters rewound; clean v14 entries stay served.
     const legacy =
-      (entry.p === "claude" && version < 12) ||
+      (entry.p === "claude" && version < 13) ||
       (format.state !== undefined &&
         (version < 6 ||
-          (entry.p === "codex" && (version < 8 || (version < 11 && malformedRecords > 0)))));
+          (entry.p === "codex" && (version < 14 || (version < 15 && malformedRecords > 0)))));
     // A corrupt state disqualifies the entry: resuming with it would attach
     // appended usage to the wrong model or replay fork-copied history.
     if (!legacy && !isValidState.get(entry.p)?.(entry.cs)) continue;
-    // Before v11 a clean scan could end past an interrupted request whose usage its state dropped,
-    // so a grown file re-parses whole instead of resuming.
-    const resumable = !legacy && !(entry.p === "codex" && version < 11);
+    // Before v15 the state lacks the latest snapshot time that keeps a re-emitted older snapshot
+    // from billing twice, so a grown file re-parses whole instead of resuming.
+    const resumable = !legacy && !(entry.p === "codex" && version < 15);
 
     const provider = entry.p;
     const records = decodeRecords(entry.r, provider);
diff --git a/apps/server/src/usage/usageTranscriptReader.test.ts b/apps/server/src/usage/usageTranscriptReader.test.ts
index 105884d81ccf..f4cb72ec1e25 100644
--- a/apps/server/src/usage/usageTranscriptReader.test.ts
+++ b/apps/server/src/usage/usageTranscriptReader.test.ts
@@ -99,6 +99,30 @@ describe("compressed transcripts", () => {
     assert.isAbove(listed.files.find((file) => file.path === compressed)?.size ?? 0, 0);
   });
 
+  it("lists files in directory order when more directories wait than it reads at once", async () => {
+    for (let index = 0; index < 40; index += 1) {
+      const nested = NodePath.join(dir, `project-${index}`, "sessions");
+      await NodeFSP.mkdir(nested, { recursive: true });
+      await NodeFSP.writeFile(NodePath.join(nested, "a.jsonl"), "");
+      await NodeFSP.writeFile(NodePath.join(nested, "..", "b.jsonl"), "");
+    }
+    // Usage that two transcripts share counts in the first one listed, so the order is part of the result.
+    const inOrder = async (folder: string): Promise<string[]> => {
+      const paths: string[] = [];
+      for (const entry of await NodeFSP.readdir(folder, { withFileTypes: true })) {
+        const child = NodePath.join(folder, entry.name);
+        if (entry.isDirectory()) paths.push(...(await inOrder(child)));
+        else paths.push(child);
+      }
+      return paths;
+    };
+    const listed = await listTranscriptFiles(dir, 0);
+    assert.deepStrictEqual(
+      listed.files.map((file) => file.path),
+      await inOrder(dir),
+    );
+  });
+
   it.each([
     { parser: "native", streamingThresholdBytes: undefined },
     { parser: "projected", streamingThresholdBytes: 1024 },
diff --git a/apps/server/src/usage/usageTranscriptReader.ts b/apps/server/src/usage/usageTranscriptReader.ts
index 38b80d36c866..a4b10a4df204 100644
--- a/apps/server/src/usage/usageTranscriptReader.ts
+++ b/apps/server/src/usage/usageTranscriptReader.ts
@@ -1,8 +1,10 @@
 // @effect-diagnostics nodeBuiltinImport:off
 // Cold windows span ~1.4 GB/1,500 files; node:fs buffer streaming is ~10x cheaper than materializing files.
+import * as NodeFS from "node:fs";
 import * as NodeFSP from "node:fs/promises";
 import * as NodePath from "node:path";
 import * as NodeStringDecoder from "node:string_decoder";
+import * as NodeUtil from "node:util";
 import * as NodeZlib from "node:zlib";
 
 import type {
@@ -41,8 +43,12 @@ export interface TranscriptParseResult {
 
 export const GUARD_LENGTH = 64;
 const STREAMING_THRESHOLD_BYTES = 8 * 1024 * 1024;
+const READ_CHUNK_BYTES = 256 * 1024;
 const NEWLINE = 0x0a;
 const STAT_CONCURRENCY = 32;
+const WALK_CONCURRENCY = 16;
+// Measured about 3x faster than the promise API's stat across 20,000 transcripts.
+const statFile = NodeUtil.promisify(NodeFS.stat);
 const CARRIAGE_RETURN = 0x0d;
 
 function selectUsageFields(fields: SelectedFields) {
@@ -71,38 +77,54 @@ export async function listTranscriptFiles(
   root: string,
   sinceMs: number,
   options?: { readonly fileName?: string },
-): Promise<{ readonly files: readonly TranscriptFile[]; readonly failedPaths: number }> {
+): Promise<{
+  readonly files: readonly TranscriptFile[];
+  readonly walked: readonly string[];
+  readonly failedPaths: number;
+}> {
   const fileName = options?.fileName;
-  const candidates: string[] = [];
   let failedPaths = 0;
-  const walk = async (dir: string): Promise<void> => {
+  let reading = 0;
+  const waiting: Array<() => void> = [];
+  // Sibling directories read together; each returns its own list so the result keeps readdir order.
+  const walk = async (dir: string): Promise<readonly string[]> => {
+    if (reading < WALK_CONCURRENCY) reading += 1;
+    else await new Promise<void>((resume) => waiting.push(resume));
     let entries;
     try {
       entries = await NodeFSP.readdir(dir, { withFileTypes: true });
     } catch {
       failedPaths += 1;
-      return;
-    }
-    for (const entry of entries) {
-      const child = NodePath.join(dir, entry.name);
-      if (entry.isDirectory()) await walk(child);
-      else if (
-        fileName !== undefined
-          ? entry.name === fileName
-          : entry.name.endsWith(".jsonl") || entry.name.endsWith(".jsonl.zst")
-      ) {
-        candidates.push(child);
-      }
+      return [];
+    } finally {
+      // A waiting directory takes over this slot, so the count only drops when none waits.
+      const next = waiting.shift();
+      if (next === undefined) reading -= 1;
+      else next();
     }
+    const found = await Promise.all(
+      entries.map((entry) => {
+        const child = NodePath.join(dir, entry.name);
+        if (entry.isDirectory()) return walk(child);
+        return (
+          fileName !== undefined
+            ? entry.name === fileName
+            : entry.name.endsWith(".jsonl") || entry.name.endsWith(".jsonl.zst")
+        )
+          ? [child]
+          : [];
+      }),
+    );
+    return found.flat();
   };
-  await walk(root);
+  const candidates = await walk(root);
 
   const found: Array<TranscriptFile | undefined> = Array.from({ length: candidates.length });
   const queue = candidates.entries();
   const statQueued = async (): Promise<void> => {
     for (const [index, path] of queue) {
       try {
-        const stats = await NodeFSP.stat(path);
+        const stats = await statFile(path);
         if (stats.mtimeMs >= sinceMs) {
           found[index] = { path, size: stats.size, mtimeMs: stats.mtimeMs };
         }
@@ -116,7 +138,7 @@ export async function listTranscriptFiles(
   await Promise.all(
     Array.from({ length: Math.min(STAT_CONCURRENCY, candidates.length) }, statQueued),
   );
-  return { files: found.filter((file) => file !== undefined), failedPaths };
+  return { files: found.filter((file) => file !== undefined), walked: candidates, failedPaths };
 }
 
 export async function readDirectoryVolumeId(path: string): Promise<string> {
@@ -147,6 +169,29 @@ async function guardMatches(
   }
 }
 
+/** Plain files reuse one buffer, so a chunk is only valid until the next one is requested. */
+async function* readChunks(
+  handle: NodeFSP.FileHandle,
+  start: number,
+  compressed: boolean,
+): AsyncGenerator<Buffer> {
+  if (compressed) {
+    // Compressed snapshots cache a full parse; decoded byte offsets cannot
+    // resume the compressed input.
+    yield* handle
+      .createReadStream({ start, autoClose: true, highWaterMark: READ_CHUNK_BYTES })
+      .compose(NodeZlib.createZstdDecompress());
+    return;
+  }
+  const buffer = Buffer.allocUnsafe(READ_CHUNK_BYTES);
+  for (let position = start; ;) {
+    const { bytesRead } = await handle.read(buffer, 0, buffer.length, position);
+    if (bytesRead === 0) return;
+    position += bytesRead;
+    yield buffer.subarray(0, bytesRead);
+  }
+}
+
 // Match markers in one latin1 alternation; one character per byte preserves exact ASCII offsets.
 export function transcriptLineGate(markers: readonly [string, ...string[]]) {
   if (markers.length === 1) {
@@ -223,7 +268,8 @@ export async function readTranscriptRecords<State>(
 
     const append = (segment: Buffer) => {
       if (!streaming && pendingBytes + segment.length <= streamingThresholdBytes) {
-        if (segment.length > 0) pendingChunks.push(segment);
+        // Copy: the next read overwrites the chunk this segment points into.
+        if (segment.length > 0) pendingChunks.push(Buffer.from(segment));
         pendingBytes += segment.length;
         return;
       }
@@ -254,15 +300,7 @@ export async function readTranscriptRecords<State>(
       streaming = undefined;
       decoder = undefined;
     };
-    const input = handle.createReadStream({
-      start,
-      autoClose: compressed,
-      highWaterMark: 256 * 1024,
-    });
-    // Compressed snapshots cache a full parse; decoded byte offsets cannot
-    // resume the compressed input.
-    const stream = compressed ? input.compose(NodeZlib.createZstdDecompress()) : input;
-    for await (const chunk of stream) {
+    for await (const chunk of readChunks(handle, start, compressed)) {
       let lineStart = 0;
       while (lineStart < chunk.length) {
         const newlineIndex = chunk.indexOf(NEWLINE, lineStart);
diff --git a/apps/server/src/utils/subscribeBeforeSnapshot.test.ts b/apps/server/src/utils/subscribeBeforeSnapshot.test.ts
index 70f0beda25ce..e37b969a123d 100644
--- a/apps/server/src/utils/subscribeBeforeSnapshot.test.ts
+++ b/apps/server/src/utils/subscribeBeforeSnapshot.test.ts
@@ -15,70 +15,66 @@ import {
 
 describe("subscribeBeforeSnapshot", () => {
   it.effect("atomically reads the initial snapshot before receiving later changes", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const changes = yield* PubSub.sliding<number>(1);
-        const latest = yield* Ref.make(1);
-        const mutex = yield* Semaphore.make(1);
-        const snapshotStarted = yield* Deferred.make<void>();
-        const finishSnapshot = yield* Deferred.make<void>();
-        const subscriptionFiber = yield* subscribeBeforeSnapshot(
-          changes,
-          Deferred.succeed(snapshotStarted, undefined).pipe(
-            Effect.andThen(Deferred.await(finishSnapshot)),
-            Effect.andThen(Ref.get(latest)),
-          ),
-          mutex,
-        ).pipe(Effect.forkChild);
+    Effect.gen(function* () {
+      const changes = yield* PubSub.sliding<number>(1);
+      const latest = yield* Ref.make(1);
+      const mutex = yield* Semaphore.make(1);
+      const snapshotStarted = yield* Deferred.make<void>();
+      const finishSnapshot = yield* Deferred.make<void>();
+      const subscriptionFiber = yield* subscribeBeforeSnapshot(
+        changes,
+        Deferred.succeed(snapshotStarted, undefined).pipe(
+          Effect.andThen(Deferred.await(finishSnapshot)),
+          Effect.andThen(Ref.get(latest)),
+        ),
+        mutex,
+      ).pipe(Effect.forkChild);
 
-        yield* Deferred.await(snapshotStarted);
-        const publishFiber = yield* mutex
-          .withPermits(1)(Ref.set(latest, 2).pipe(Effect.andThen(PubSub.publish(changes, 2))))
-          .pipe(Effect.forkChild);
-        yield* Deferred.succeed(finishSnapshot, undefined);
+      yield* Deferred.await(snapshotStarted);
+      const publishFiber = yield* mutex
+        .withPermits(1)(Ref.set(latest, 2).pipe(Effect.andThen(PubSub.publish(changes, 2))))
+        .pipe(Effect.forkChild);
+      yield* Deferred.succeed(finishSnapshot, undefined);
 
-        const subscription = yield* Fiber.join(subscriptionFiber);
-        yield* Fiber.join(publishFiber);
-        const firstChange = yield* subscription.changes.pipe(
-          Stream.runHead,
-          Effect.timeout("1 second"),
-        );
+      const subscription = yield* Fiber.join(subscriptionFiber);
+      yield* Fiber.join(publishFiber);
+      const firstChange = yield* subscription.changes.pipe(
+        Stream.runHead,
+        Effect.timeout("1 second"),
+      );
 
-        expect(subscription.latest).toBe(1);
-        expect(firstChange).toEqual(Option.some(2));
-      }),
-    ),
+      expect(subscription.latest).toBe(1);
+      expect(firstChange).toEqual(Option.some(2));
+    }),
   );
 
   it.effect("subscribes before an uncoordinated snapshot can change", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const changes = yield* PubSub.sliding<number>(1);
-        const latest = yield* Ref.make(1);
-        const snapshotStarted = yield* Deferred.make<void>();
-        const finishSnapshot = yield* Deferred.make<void>();
-        const subscriptionFiber = yield* subscribeBeforeSnapshotWithoutMutex(
-          changes,
-          Deferred.succeed(snapshotStarted, undefined).pipe(
-            Effect.andThen(Deferred.await(finishSnapshot)),
-            Effect.andThen(Ref.get(latest)),
-          ),
-        ).pipe(Effect.forkChild);
+    Effect.gen(function* () {
+      const changes = yield* PubSub.sliding<number>(1);
+      const latest = yield* Ref.make(1);
+      const snapshotStarted = yield* Deferred.make<void>();
+      const finishSnapshot = yield* Deferred.make<void>();
+      const subscriptionFiber = yield* subscribeBeforeSnapshotWithoutMutex(
+        changes,
+        Deferred.succeed(snapshotStarted, undefined).pipe(
+          Effect.andThen(Deferred.await(finishSnapshot)),
+          Effect.andThen(Ref.get(latest)),
+        ),
+      ).pipe(Effect.forkChild);
 
-        yield* Deferred.await(snapshotStarted);
-        yield* Ref.set(latest, 2);
-        yield* PubSub.publish(changes, 2);
-        yield* Deferred.succeed(finishSnapshot, undefined);
+      yield* Deferred.await(snapshotStarted);
+      yield* Ref.set(latest, 2);
+      yield* PubSub.publish(changes, 2);
+      yield* Deferred.succeed(finishSnapshot, undefined);
 
-        const subscription = yield* Fiber.join(subscriptionFiber);
-        const firstChange = yield* subscription.changes.pipe(
-          Stream.runHead,
-          Effect.timeout("1 second"),
-        );
+      const subscription = yield* Fiber.join(subscriptionFiber);
+      const firstChange = yield* subscription.changes.pipe(
+        Stream.runHead,
+        Effect.timeout("1 second"),
+      );
 
-        expect(subscription.latest).toBe(2);
-        expect(firstChange).toEqual(Option.some(2));
-      }),
-    ),
+      expect(subscription.latest).toBe(2);
+      expect(firstChange).toEqual(Option.some(2));
+    }),
   );
 });
diff --git a/apps/server/src/vcs/GitVcsDriverCore.test.ts b/apps/server/src/vcs/GitVcsDriverCore.test.ts
index 6dec0cf0207b..d46666cb468d 100644
--- a/apps/server/src/vcs/GitVcsDriverCore.test.ts
+++ b/apps/server/src/vcs/GitVcsDriverCore.test.ts
@@ -6,7 +6,7 @@ import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
 import * as NodeServices from "@effect/platform-node/NodeServices";
 import * as HostProcess from "@t3tools/shared/HostProcess";
 import { assert, it, describe } from "@effect/vitest";
-import { vi } from "vite-plus/test";
+import { afterAll, vi } from "vite-plus/test";
 import * as Cause from "effect/Cause";
 import * as Clock from "effect/Clock";
 import * as Deferred from "effect/Deferred";
@@ -342,6 +342,15 @@ const git = (
     return result.stdout.trim();
   });
 
+const gitWithStdin = (
+  cwd: string,
+  args: ReadonlyArray<string>,
+  stdin: string,
+): Effect.Effect<string, GitCommandError, GitVcsDriver.GitVcsDriver> =>
+  Effect.flatMap(GitVcsDriver.GitVcsDriver, (driver) =>
+    driver.execute({ operation: "GitVcsDriver.test.git", cwd, args, stdin, timeoutMs: 10_000 }),
+  ).pipe(Effect.map((result) => result.stdout.trim()));
+
 // Git blocks file submodule transports (CVE-2022-39253) despite repo config; local fixtures need env permission.
 const withGitFileProtocol = <A, E, R>(effect: Effect.Effect<A, E, R>) =>
   Effect.flatMap(HostProcess.Environment, (env) =>
@@ -358,17 +367,48 @@ const initRepoWithCommit = (
   GitVcsDriver.GitVcsDriver | FileSystem.FileSystem | Path.Path
 > =>
   Effect.gen(function* () {
-    const driver = yield* GitVcsDriver.GitVcsDriver;
-    yield* driver.initRepo({ cwd });
-    yield* git(cwd, ["config", "user.email", "test@test.com"]);
-    yield* git(cwd, ["config", "user.name", "Test"]);
+    const fileSystem = yield* FileSystem.FileSystem;
+    const pathService = yield* Path.Path;
+    // Git commits whatever already sits in cwd, so only an empty one can take the shared copy.
+    const empty =
+      !(yield* fileSystem.exists(cwd)) || (yield* fileSystem.readDirectory(cwd)).length === 0;
+    if (empty) {
+      if (!repoTemplate) {
+        const template = yield* fileSystem.makeTempDirectory({
+          prefix: "git-vcs-driver-template-",
+        });
+        yield* commitInitialRepo(template);
+        repoTemplate = template;
+      }
+      yield* fileSystem.copy(repoTemplate, cwd);
+    } else {
+      yield* commitInitialRepo(cwd);
+    }
+    const head = yield* fileSystem.readFileString(pathService.join(cwd, ".git", "HEAD"));
+    return { initialBranch: head.trim().replace(/^ref: refs\/heads\//, "") };
+  });
+
+const commitInitialRepo = (cwd: string) =>
+  Effect.gen(function* () {
+    const fileSystem = yield* FileSystem.FileSystem;
+    const pathService = yield* Path.Path;
+    yield* git(cwd, ["init"]);
+    yield* fileSystem.writeFileString(
+      pathService.join(cwd, ".git", "config"),
+      "[user]\n\temail = test@test.com\n\tname = Test\n",
+      { flag: "a" },
+    );
     yield* writeTextFile(cwd, "README.md", "# test\n");
     yield* git(cwd, ["add", "."]);
     yield* git(cwd, ["commit", "-m", "initial commit"]);
-    const initialBranch = yield* git(cwd, ["branch", "--show-current"]);
-    return { initialBranch };
   });
 
+// Most tests start from the same one-commit repository; they copy it instead of spawning git.
+let repoTemplate: string | undefined;
+afterAll(() => {
+  if (repoTemplate) NodeFS.rmSync(repoTemplate, { recursive: true, force: true });
+});
+
 it.effect.each(["root", "nested", "worktree"] as const)(
   "skips clean filters while the %s index is locked and resumes after unlock",
   (location) =>
@@ -669,6 +709,19 @@ it.effect("reads the project's own repository when the server inherited GIT_DIR"
   ).pipe(Effect.provide(layerTest)),
 );
 
+it.effect("reads a branch whose name starts with a parenthesis as attached", () =>
+  Effect.scoped(
+    Effect.gen(function* () {
+      const cwd = yield* makeTmpDir();
+      yield* initRepoWithCommit(cwd);
+      yield* git(cwd, ["switch", "-c", "(topic"]);
+      const driver = yield* GitVcsDriver.GitVcsDriver;
+      const status = yield* driver.statusDetailsLocal(cwd, { includeDivergence: false });
+      assert.equal(status.branch, "(topic");
+    }),
+  ).pipe(Effect.provide(layerTest)),
+);
+
 it.effect.each(["on a branch", "detached", "unborn"] as const)(
   "reads only the repository root for review requests that ignore the branch when %s",
   (state) =>
@@ -2136,6 +2189,55 @@ it.layer(layerTest)("GitVcsDriver core integration", (it) => {
         }),
     );
 
+    it.effect("explains a non-fast-forward push from a host with a translated Git", () =>
+      Effect.gen(function* () {
+        const cwd = yield* makeTmpDir();
+        const { initialBranch } = yield* initRepoWithCommit(cwd);
+        const remote = yield* makeTmpDir("git-remote-");
+        const other = yield* makeTmpDir("git-other-");
+        yield* git(remote, ["init", "--bare"]);
+        yield* git(cwd, ["remote", "add", "origin", remote]);
+        yield* git(cwd, ["push", "--set-upstream", "origin", initialBranch]);
+        yield* git(other, ["clone", "--branch", initialBranch, remote, "."]);
+        yield* git(other, [
+          "-c",
+          "user.email=t@t",
+          "-c",
+          "user.name=T",
+          "commit",
+          "--allow-empty",
+          "-m",
+          "remote",
+        ]);
+        yield* git(other, ["push", "origin", initialBranch]);
+        yield* git(cwd, ["commit", "--allow-empty", "-m", "local"]);
+        const locales: Array<CommandLine.Word | undefined> = [];
+        const delegate = yield* ChildProcessSpawner.ChildProcessSpawner;
+        const spawner = ChildProcessSpawner.make((command) => {
+          if (ChildProcess.isStandardCommand(command) && command.args.includes("push")) {
+            locales.push(command.options.env?.LANGUAGE);
+          }
+          return delegate.spawn(command);
+        });
+        const driver = yield* makeGitVcsDriverCore().pipe(
+          Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, spawner),
+          Effect.provide(layerServerConfig),
+        );
+        const hostEnv = yield* HostProcess.Environment;
+
+        const error = yield* driver
+          .pushCurrentBranch(cwd, null)
+          .pipe(
+            Effect.provideService(HostProcess.Environment, { ...hostEnv, LANGUAGE: "de" }),
+            Effect.flip,
+          );
+
+        assert.equal(error.reason, "push_rejected_non_fast_forward");
+        assert.isNotEmpty(locales);
+        for (const locale of locales) assert.equal(locale, "C");
+      }),
+    );
+
     it.effect("lets a slow remote branch checkout finish without blocking config writes", () =>
       Effect.gen(function* () {
         const cwd = yield* makeTmpDir();
@@ -2184,6 +2286,31 @@ it.layer(layerTest)("GitVcsDriver core integration", (it) => {
       }),
     );
 
+    it.effect(
+      "switches a remote ref to its tracking branch when a tag shares the branch name",
+      () =>
+        Effect.gen(function* () {
+          const cwd = yield* makeTmpDir();
+          const { initialBranch } = yield* initRepoWithCommit(cwd);
+          const remote = yield* makeTmpDir("git-remote-");
+          yield* git(remote, ["init", "--bare"]);
+          yield* git(cwd, ["remote", "add", "origin", remote]);
+          yield* git(cwd, ["push", "origin", "HEAD:refs/heads/v1.2"]);
+          yield* git(cwd, ["fetch", "origin"]);
+          yield* git(cwd, ["branch", "--track", "v1.2", "origin/v1.2"]);
+          yield* git(cwd, ["tag", "v1.2"]);
+          assert.equal(yield* git(cwd, ["branch", "--show-current"]), initialBranch);
+
+          const result = yield* (yield* GitVcsDriver.GitVcsDriver).switchRef({
+            cwd,
+            refName: "origin/v1.2",
+          });
+
+          assert.equal(result.refName, "v1.2");
+          assert.equal(yield* git(cwd, ["symbolic-ref", "HEAD"]), "refs/heads/v1.2");
+        }),
+    );
+
     it.effect.each([
       // Git cannot tell a missing revision from a missing file in these.
       { label: "an argument that may be a path", args: ["log", "-1", "missing"] },
@@ -2478,9 +2605,22 @@ it.layer(layerTest)("GitVcsDriver core integration", (it) => {
         const { initialBranch } = yield* initRepoWithCommit(cwd);
         const driver = yield* GitVcsDriver.GitVcsDriver;
         yield* git(cwd, ["checkout", "-b", "feature/commits"]);
-        for (let index = 0; index < 102; index++) {
-          yield* git(cwd, ["commit", "--allow-empty", "-m", `feature ${index}`]);
-        }
+        const parent = yield* git(cwd, ["rev-parse", "HEAD"]);
+        yield* gitWithStdin(
+          cwd,
+          ["fast-import", "--quiet"],
+          Array.from({ length: 102 }, (_, index) => {
+            const message = `feature ${index}`;
+            return [
+              "commit refs/heads/feature/commits",
+              `committer Test <test@test.com> ${1_700_000_000 + index} +0000`,
+              `data ${Buffer.byteLength(message)}`,
+              message,
+              ...(index === 0 ? [`from ${parent}`] : []),
+              "",
+            ].join("\n");
+          }).join(""),
+        );
 
         const result = yield* driver.getReviewBranchCommits({ cwd, baseRef: initialBranch });
         assert.strictEqual(result.truncated, true);
@@ -3795,6 +3935,25 @@ it.layer(layerTest)("GitVcsDriver core integration", (it) => {
       }),
     );
 
+    it.effect("reports a local upstream without a slash and its divergence", () =>
+      Effect.gen(function* () {
+        const cwd = yield* makeTmpDir();
+        yield* initRepoWithCommit(cwd);
+        const initialBranch = yield* git(cwd, ["symbolic-ref", "--short", "HEAD"]);
+        yield* git(cwd, ["branch", "feature"]);
+        yield* git(cwd, ["commit", "--allow-empty", "-m", "advance base"]);
+        yield* git(cwd, ["checkout", "feature"]);
+        yield* git(cwd, ["branch", `--set-upstream-to=${initialBranch}`]);
+        const driver = yield* GitVcsDriver.GitVcsDriver;
+
+        const remoteStatus = yield* driver.statusDetailsRemote(cwd, { refreshUpstream: false });
+        assert.equal(remoteStatus.upstreamRef, initialBranch);
+        assert.equal(remoteStatus.hasUpstream, true);
+        assert.equal(remoteStatus.aheadCount, 0);
+        assert.equal(remoteStatus.behindCount, 1);
+      }),
+    );
+
     it.effect("does not open a project folder laid out as a bare repository", () =>
       Effect.gen(function* () {
         const cwd = yield* makeTmpDir();
@@ -3920,6 +4079,29 @@ it.layer(layerTest)("GitVcsDriver core integration", (it) => {
         }),
     );
 
+    it.effect("reads Changes totals without rewriting the real index for stat-dirty files", () =>
+      Effect.gen(function* () {
+        const cwd = yield* makeTmpDir();
+        yield* initRepoWithCommit(cwd);
+        const driver = yield* GitVcsDriver.GitVcsDriver;
+        const fileSystem = yield* FileSystem.FileSystem;
+        const path = yield* Path.Path;
+        yield* writeTextFile(cwd, "tracked.txt", "same content\n");
+        yield* git(cwd, ["add", "tracked.txt"]);
+        yield* git(cwd, ["commit", "-m", "add tracked file"]);
+        yield* fileSystem.utimes(path.join(cwd, "tracked.txt"), 1_000_000_000, 1_000_000_000);
+        const indexPath = path.join(cwd, ".git", "index");
+        const originalIndex = yield* fileSystem.readFile(indexPath);
+
+        const status = yield* driver.statusDetailsLocal(cwd, { includeBranchChanges: true });
+
+        assert.strictEqual(status.branchChanges?.insertions, 0);
+        assert.strictEqual(status.branchChanges?.deletions, 0);
+        // Writing the index takes index.lock, which makes concurrent user Git writes fail.
+        assert.deepStrictEqual(yield* fileSystem.readFile(indexPath), originalIndex);
+      }),
+    );
+
     it.effect("reads Changes totals with untracked files when requested", () =>
       Effect.gen(function* () {
         const cwd = yield* makeTmpDir();
@@ -4391,6 +4573,37 @@ it.layer(layerTest)("GitVcsDriver core integration", (it) => {
       }),
     );
 
+    it.effect("leaves FETCH_HEAD to the user's own pulls in background upstream fetches", () =>
+      Effect.gen(function* () {
+        const cwd = yield* makeTmpDir();
+        const remote = yield* makeTmpDir("git-vcs-driver-remote-");
+        const updater = yield* makeTmpDir("git-vcs-driver-updater-");
+        const { initialBranch } = yield* initRepoWithCommit(cwd);
+        yield* git(remote, ["init", "--bare"]);
+        yield* git(cwd, ["remote", "add", "origin", remote]);
+        yield* git(cwd, ["push", "-u", "origin", initialBranch]);
+
+        yield* git(updater, ["clone", remote, "."]);
+        yield* git(updater, ["config", "user.email", "test@test.com"]);
+        yield* git(updater, ["config", "user.name", "Test"]);
+        yield* writeTextFile(updater, "remote.txt", "remote\n");
+        yield* git(updater, ["add", "remote.txt"]);
+        yield* git(updater, ["commit", "-m", "remote commit"]);
+        yield* git(updater, ["push", "origin", initialBranch]);
+        const fetchHeadPath = (yield* Path.Path).join(cwd, ".git", "FETCH_HEAD");
+        assert.equal(NodeFS.existsSync(fetchHeadPath), false);
+
+        const status = yield* (yield* GitVcsDriver.GitVcsDriver).statusDetailsRemote(cwd);
+
+        assert.equal(status.behindCount, 1);
+        assert.equal(
+          NodeFS.existsSync(fetchHeadPath),
+          false,
+          "background status fetch wrote .git/FETCH_HEAD, which an overlapping `git pull` merges from",
+        );
+      }),
+    );
+
     it.effect("uses origin HEAD for default-branch detection with a non-origin upstream", () =>
       Effect.gen(function* () {
         const cwd = yield* makeTmpDir();
@@ -4424,6 +4637,56 @@ it.layer(layerTest)("GitVcsDriver core integration", (it) => {
       }),
     );
 
+    it.effect.each(["checkout", "bare-backed worktree"] as const)(
+      "uses the only remote's HEAD for default-branch detection without origin in a %s",
+      (layout) =>
+        Effect.gen(function* () {
+          const driver = yield* GitVcsDriver.GitVcsDriver;
+          const path = yield* Path.Path;
+          const source = yield* makeTmpDir();
+          const remote = yield* makeTmpDir("git-vcs-driver-github-");
+          yield* initRepoWithCommit(source);
+          yield* git(remote, ["init", "--bare"]);
+          yield* git(source, ["branch", "-M", "trunk"]);
+          yield* git(source, ["remote", "add", "github", remote]);
+          yield* git(source, ["push", "-u", "github", "trunk"]);
+          let cwd = source;
+          if (layout === "bare-backed worktree") {
+            const container = yield* makeTmpDir("git-vcs-driver-bare-");
+            const gitDirArgs = ["--git-dir", path.join(container, "repo.git")];
+            cwd = path.join(container, "trunk");
+            yield* git(container, ["init", "--bare", "repo.git"]);
+            yield* git(container, [...gitDirArgs, "config", "user.email", "test@test.com"]);
+            yield* git(container, [...gitDirArgs, "config", "user.name", "Test"]);
+            yield* git(container, [...gitDirArgs, "remote", "add", "github", remote]);
+            yield* git(container, [...gitDirArgs, "fetch", "github"]);
+            yield* git(container, [
+              ...gitDirArgs,
+              "worktree",
+              "add",
+              "--track",
+              "-b",
+              "trunk",
+              cwd,
+              "github/trunk",
+            ]);
+          }
+          yield* git(cwd, [
+            "symbolic-ref",
+            "refs/remotes/github/HEAD",
+            "refs/remotes/github/trunk",
+          ]);
+
+          assert.isTrue((yield* driver.statusDetailsLocal(cwd)).isDefaultBranch);
+          const remoteStatus = yield* driver.statusDetailsRemote(cwd);
+          assert.equal(remoteStatus.defaultBranch, "trunk");
+          assert.isTrue(remoteStatus.isDefaultBranch);
+
+          yield* git(cwd, ["remote", "add", "origin", remote]);
+          assert.isNull((yield* driver.statusDetailsRemote(cwd)).defaultBranch);
+        }),
+    );
+
     it.effect("makes background upstream status fetches non-interactive", () =>
       Effect.gen(function* () {
         const cwd = yield* makeTmpDir();
@@ -4701,13 +4964,14 @@ it.layer(layerTest)("GitVcsDriver core integration", (it) => {
         const { initialBranch } = yield* initRepoWithCommit(cwd);
         const driver = yield* GitVcsDriver.GitVcsDriver;
         const oid = yield* git(cwd, ["rev-parse", "HEAD"]);
-        for (let index = 0; index <= 100; index += 1) {
-          yield* git(cwd, [
-            "update-ref",
-            `refs/heads/${index === 0 ? "topic" : `topic-${index}`}`,
-            oid,
-          ]);
-        }
+        yield* gitWithStdin(
+          cwd,
+          ["update-ref", "--stdin"],
+          Array.from(
+            { length: 101 },
+            (_, index) => `create refs/heads/${index === 0 ? "topic" : `topic-${index}`} ${oid}\n`,
+          ).join(""),
+        );
         const result = yield* driver
           .renameBranch({ cwd, oldBranch: initialBranch, newBranch: "topic" })
           .pipe(Effect.result);
@@ -4779,6 +5043,58 @@ it.layer(layerTest)("GitVcsDriver core integration", (it) => {
         }),
     );
 
+    it.effect.each(["untracked", "other-remote"] as const)(
+      "refuses a remote switch that collides with a local branch (%s)",
+      (tracking) =>
+        Effect.gen(function* () {
+          const cwd = yield* makeTmpDir();
+          const { initialBranch } = yield* initRepoWithCommit(cwd);
+          const remote = yield* makeTmpDir("git-remote-");
+          yield* git(remote, ["init", "--bare"]);
+          yield* git(cwd, ["remote", "add", "upstream", remote]);
+          yield* git(cwd, ["push", "upstream", "HEAD:refs/heads/feature"]);
+          yield* git(cwd, ["fetch", "upstream"]);
+          yield* git(cwd, ["checkout", "--no-track", "-b", "feature"]);
+          yield* git(cwd, ["commit", "--allow-empty", "-m", "Local work"]);
+          if (tracking === "other-remote") {
+            yield* git(cwd, ["remote", "add", "origin", remote]);
+            yield* git(cwd, ["fetch", "origin"]);
+            yield* git(cwd, ["branch", "--set-upstream-to=origin/feature", "feature"]);
+          }
+          const featureHead = yield* git(cwd, ["rev-parse", "feature"]);
+          const upstream = yield* git(cwd, [
+            "for-each-ref",
+            "--format=%(upstream)",
+            "refs/heads/feature",
+          ]);
+          yield* git(cwd, ["checkout", initialBranch]);
+          const head = yield* git(cwd, ["rev-parse", "HEAD"]);
+          yield* writeTextFile(cwd, "README.md", "Uncommitted work\n");
+          const driver = yield* GitVcsDriver.GitVcsDriver;
+
+          const result = yield* driver
+            .switchRef({ cwd, refName: "upstream/feature" })
+            .pipe(Effect.result);
+          assert.isTrue(Result.isFailure(result));
+          assert.equal(yield* git(cwd, ["branch", "--show-current"]), initialBranch);
+          assert.equal(yield* git(cwd, ["rev-parse", "HEAD"]), head);
+          assert.equal(yield* git(cwd, ["rev-parse", "feature"]), featureHead);
+          assert.equal(
+            yield* git(cwd, ["for-each-ref", "--format=%(upstream)", "refs/heads/feature"]),
+            upstream,
+          );
+          assert.equal(
+            yield* (yield* FileSystem.FileSystem).readFileString(
+              (yield* Path.Path).join(cwd, "README.md"),
+            ),
+            "Uncommitted work\n",
+          );
+          // Selecting the existing local branch remains an explicit, attached checkout.
+          assert.equal((yield* driver.switchRef({ cwd, refName: "feature" })).refName, "feature");
+          assert.equal(yield* git(cwd, ["symbolic-ref", "HEAD"]), "refs/heads/feature");
+        }),
+    );
+
     it.effect("rejects a missing branch without restoring a matching dirty file", () =>
       Effect.gen(function* () {
         const cwd = yield* makeTmpDir();
@@ -5367,7 +5683,8 @@ it.layer(layerTest)("GitVcsDriver core integration", (it) => {
 
         const cwd = yield* makeTmpDir();
         const { initialBranch } = yield* initRepoWithCommit(cwd);
-        yield* git(cwd, ["submodule", "add", submoduleRepo, "shared"]);
+        // A file URL transfers a pack like a network remote; a plain path hardlinks silently.
+        yield* git(cwd, ["submodule", "add", NodeURL.pathToFileURL(submoduleRepo).href, "shared"]);
         yield* git(cwd, ["commit", "-m", "add submodule"]);
         const recordedHead = yield* git(submoduleRepo, ["rev-parse", "HEAD"]);
         yield* writeTextFile(submoduleRepo, "SHARED.md", "# newer remote default\n");
@@ -5442,7 +5759,11 @@ it.layer(layerTest)("GitVcsDriver core integration", (it) => {
           yield* git(pathService.join(worktreePath, "shared"), ["status", "--porcelain"]),
           "",
         );
-        if (progress) assert.isNotEmpty(yield* Ref.get(lines));
+        if (progress) {
+          assert.isTrue(
+            (yield* Ref.get(lines)).some((line) => line.startsWith("Receiving objects")),
+          );
+        }
       }).pipe(withGitFileProtocol),
     );
 
@@ -6070,39 +6391,82 @@ it.layer(layerTest)("GitVcsDriver core integration", (it) => {
       }),
     );
 
-    it.effect("tracks a remote start point once another process releases the config lock", () =>
-      Effect.gen(function* () {
-        const cwd = yield* makeTmpDir();
-        const { initialBranch } = yield* initRepoWithCommit(cwd);
-        const remote = yield* makeTmpDir("git-remote-");
-        yield* git(remote, ["init", "--bare"]);
-        yield* git(cwd, ["remote", "add", "origin", remote]);
-        yield* git(cwd, ["push", "origin", initialBranch]);
-        const fileSystem = yield* FileSystem.FileSystem;
-        const path = yield* Path.Path;
-        const lockPath = path.join(cwd, ".git", "config.lock");
-        yield* fileSystem.writeFileString(lockPath, "");
-        const { driver, failures } = yield* makeDriverReleasingLock(
-          (args) => args.some((arg) => arg.startsWith("--set-upstream-to")),
-          lockPath,
-        );
+    it.effect.each(["createWorktree", "switchRef"] as const)(
+      "tracks a remote start point once another process releases the config lock: %s",
+      (operation) =>
+        Effect.gen(function* () {
+          const cwd = yield* makeTmpDir();
+          const { initialBranch } = yield* initRepoWithCommit(cwd);
+          const remote = yield* makeTmpDir("git-remote-");
+          yield* git(remote, ["init", "--bare"]);
+          yield* git(cwd, ["remote", "add", "origin", remote]);
+          yield* git(cwd, ["push", "origin", `${initialBranch}:refs/heads/feature/tracked`]);
+          yield* git(cwd, ["fetch", "origin"]);
+          const fileSystem = yield* FileSystem.FileSystem;
+          const path = yield* Path.Path;
+          const lockPath = path.join(cwd, ".git", "config.lock");
+          yield* fileSystem.writeFileString(lockPath, "");
+          const { driver, failures } = yield* makeDriverReleasingLock(
+            (args) => args.some((arg) => arg.startsWith("--set-upstream-to")),
+            lockPath,
+          );
 
-        // The upstream retry waits on the real clock; the lock is already gone by then.
-        yield* TestClock.withLive(
-          driver.createWorktree({
-            cwd,
-            path: path.join(yield* makeTmpDir("git-worktrees-"), "tracked"),
-            refName: `origin/${initialBranch}`,
-            newRefName: "feature/tracked",
-          }),
-        );
+          // The upstream retry waits on the real clock; the lock is already gone by then.
+          if (operation === "createWorktree") {
+            yield* TestClock.withLive(
+              driver.createWorktree({
+                cwd,
+                path: path.join(yield* makeTmpDir("git-worktrees-"), "tracked"),
+                refName: "origin/feature/tracked",
+                newRefName: "feature/tracked",
+              }),
+            );
+          } else {
+            const switched = yield* TestClock.withLive(
+              driver.switchRef({ cwd, refName: "origin/feature/tracked" }),
+            );
+            assert.equal(switched.refName, "feature/tracked");
+          }
 
-        assert.equal(yield* Ref.get(failures), 1);
-        assert.equal(
-          yield* git(cwd, ["rev-parse", "--abbrev-ref", "feature/tracked@{upstream}"]),
-          `origin/${initialBranch}`,
-        );
-      }),
+          assert.equal(yield* Ref.get(failures), 1);
+          assert.equal(
+            yield* git(cwd, ["rev-parse", "--abbrev-ref", "feature/tracked@{upstream}"]),
+            "origin/feature/tracked",
+          );
+        }),
+    );
+
+    it.effect(
+      "leaves no untracked branch behind when the config stays locked during a switch",
+      () =>
+        Effect.gen(function* () {
+          const cwd = yield* makeTmpDir();
+          const { initialBranch } = yield* initRepoWithCommit(cwd);
+          const remote = yield* makeTmpDir("git-remote-");
+          yield* git(remote, ["init", "--bare"]);
+          yield* git(cwd, ["remote", "add", "upstream", remote]);
+          yield* git(cwd, ["push", "upstream", `${initialBranch}:refs/heads/feature`]);
+          yield* git(cwd, ["fetch", "upstream"]);
+          const fileSystem = yield* FileSystem.FileSystem;
+          const lockPath = (yield* Path.Path).join(cwd, ".git", "config.lock");
+          yield* fileSystem.writeFileString(lockPath, "");
+          const driver = yield* GitVcsDriver.GitVcsDriver;
+
+          // The upstream retry waits on the real clock before giving up.
+          yield* TestClock.withLive(driver.switchRef({ cwd, refName: "upstream/feature" })).pipe(
+            Effect.flip,
+          );
+          assert.equal(yield* git(cwd, ["branch", "--show-current"]), initialBranch);
+          assert.equal(yield* git(cwd, ["branch", "--list", "feature"]), "");
+
+          yield* fileSystem.remove(lockPath);
+          const switched = yield* driver.switchRef({ cwd, refName: "upstream/feature" });
+          assert.equal(switched.refName, "feature");
+          assert.equal(
+            yield* git(cwd, ["rev-parse", "--abbrev-ref", "feature@{upstream}"]),
+            "upstream/feature",
+          );
+        }),
     );
 
     it.effect("fetches a remote branch into a tracking branch past another process's lock", () =>
@@ -6548,6 +6912,36 @@ it.layer(layerTest)("GitVcsDriver core integration", (it) => {
         }),
     );
 
+    it.effect("reports a merge resolved to HEAD's tree as committable", () =>
+      Effect.gen(function* () {
+        const cwd = yield* makeTmpDir();
+        const { initialBranch } = yield* initRepoWithCommit(cwd);
+        const driver = yield* GitVcsDriver.GitVcsDriver;
+        // A branch named MERGE_HEAD is not a merge in progress.
+        yield* git(cwd, ["branch", "MERGE_HEAD"]);
+        assert.isNull(yield* driver.prepareCommitContext(cwd, undefined, { includePatch: false }));
+        yield* git(cwd, ["branch", "-D", "MERGE_HEAD"]);
+        yield* git(cwd, ["checkout", "-b", "feature"]);
+        yield* writeTextFile(cwd, "README.md", "feature version\n");
+        yield* git(cwd, ["commit", "-am", "Feature"]);
+        yield* git(cwd, ["checkout", initialBranch]);
+        yield* writeTextFile(cwd, "README.md", "main version\n");
+        yield* git(cwd, ["commit", "-am", "Main"]);
+        const merge = yield* driver.execute({
+          operation: "test.merge",
+          cwd,
+          args: ["merge", "feature"],
+          allowNonZeroExit: true,
+        });
+        assert.equal(merge.exitCode, 1);
+        yield* writeTextFile(cwd, "README.md", "main version\n");
+
+        assert.isNotNull(
+          yield* driver.prepareCommitContext(cwd, undefined, { includePatch: false }),
+        );
+      }),
+    );
+
     it.effect.each([
       { operation: "cherry-pick", head: "CHERRY_PICK_HEAD" },
       { operation: "revert", head: "REVERT_HEAD" },
diff --git a/apps/server/src/vcs/GitVcsDriverCore.ts b/apps/server/src/vcs/GitVcsDriverCore.ts
index 5eae512995d3..32042a0ff5e5 100644
--- a/apps/server/src/vcs/GitVcsDriverCore.ts
+++ b/apps/server/src/vcs/GitVcsDriverCore.ts
@@ -1387,6 +1387,8 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
       "--quiet",
       "--no-tags",
       "--no-auto-gc",
+      // FETCH_HEAD is written without a lock; overlapping a user's `git pull` makes that pull fail.
+      "--no-write-fetch-head",
       "--",
       remoteName,
     ];
@@ -1578,17 +1580,7 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
         const path = yield* Path.Path;
         const fetchCwd =
           path.basename(gitCommonDir) === ".git" ? path.dirname(gitCommonDir) : gitCommonDir;
-        return yield* executeGit(
-          "GitVcsDriver.statusDetails.defaultBranch",
-          fetchCwd,
-          ["--git-dir", gitCommonDir, "symbolic-ref", "refs/remotes/origin/HEAD"],
-          { allowNonZeroExit: true },
-        ).pipe(
-          Effect.map((result) => {
-            if (result.exitCode !== 0) return null;
-            return parseDefaultBranchFromRemoteHeadRef(result.stdout, "origin");
-          }),
-        );
+        return yield* resolvePrimaryDefaultBranchName(fetchCwd, ["--git-dir", gitCommonDir]);
       }),
     {
       capacity: 2_048,
@@ -1724,11 +1716,12 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
   const resolveDefaultBranchName = (
     cwd: string,
     remoteName: string,
+    gitDirArgs: ReadonlyArray<string> = [],
   ): Effect.Effect<string | null, GitCommandError> =>
     executeGit(
       "GitVcsDriver.resolveDefaultBranchName",
       cwd,
-      ["symbolic-ref", `refs/remotes/${remoteName}/HEAD`],
+      [...gitDirArgs, "symbolic-ref", `refs/remotes/${remoteName}/HEAD`],
       { allowNonZeroExit: true },
     ).pipe(
       Effect.map((result) => {
@@ -1762,8 +1755,11 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
   const originRemoteExists = (cwd: string): Effect.Effect<boolean, GitCommandError> =>
     remoteExists({ cwd, remoteName: "origin" });
 
-  const listRemoteNames = (cwd: string): Effect.Effect<ReadonlyArray<string>, GitCommandError> =>
-    runGitStdout("GitVcsDriver.listRemoteNames", cwd, ["remote"]).pipe(
+  const listRemoteNames = (
+    cwd: string,
+    gitDirArgs: ReadonlyArray<string> = [],
+  ): Effect.Effect<ReadonlyArray<string>, GitCommandError> =>
+    runGitStdout("GitVcsDriver.listRemoteNames", cwd, [...gitDirArgs, "remote"]).pipe(
       Effect.map(parseRemoteNamesInGitOrder),
     );
 
@@ -1786,6 +1782,18 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
     return firstRemote ?? null;
   });
 
+  const resolvePrimaryDefaultBranchName = Effect.fn("GitVcsDriver.resolvePrimaryDefaultBranchName")(
+    function* (cwd: string, gitDirArgs: ReadonlyArray<string> = []) {
+      const originDefault = yield* resolveDefaultBranchName(cwd, "origin", gitDirArgs);
+      if (originDefault !== null) return originDefault;
+      const remoteNames = yield* listRemoteNames(cwd, gitDirArgs);
+      const [firstRemote] = remoteNames;
+      return firstRemote === undefined || remoteNames.includes("origin")
+        ? null
+        : yield* resolveDefaultBranchName(cwd, firstRemote, gitDirArgs);
+    },
+  );
+
   const resolvePrimaryRemoteName = (cwd: string) =>
     findPrimaryRemoteName(cwd).pipe(
       Effect.filterOrFail(
@@ -2090,10 +2098,7 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
       branch = branchNameFromHeadRef(branchResult.stdout);
     }
     const currentUpstreamRef = yield* readCurrentUpstreamRef(cwd);
-    let upstreamRef =
-      currentUpstreamRef === null
-        ? null
-        : (parseUpstreamRefByFirstSeparator(currentUpstreamRef)?.upstreamRef ?? null);
+    let upstreamRef = currentUpstreamRef;
     // Trimming a remote that starts with Unicode whitespace can leave a leading slash.
     if (currentUpstreamRef?.startsWith("/")) {
       upstreamRef = (yield* resolveCurrentUpstream(cwd, currentUpstreamRef))?.upstreamRef ?? null;
@@ -2121,7 +2126,7 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
       );
     }
 
-    const defaultBranch = yield* resolveDefaultBranchName(cwd, "origin");
+    const defaultBranch = yield* resolvePrimaryDefaultBranchName(cwd);
     const isDefaultBranch =
       branch !== null &&
       (branch === defaultBranch ||
@@ -2267,7 +2272,7 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
         ),
         statusCacheKey
           ? Cache.get(defaultBranchCache, statusCacheKey).pipe(Effect.orElseSucceed(() => null))
-          : resolveDefaultBranchName(cwd, "origin").pipe(Effect.orElseSucceed(() => null)),
+          : resolvePrimaryDefaultBranchName(cwd).pipe(Effect.orElseSucceed(() => null)),
         statusCacheKey
           ? Cache.get(primaryRemoteExistsCache, statusCacheKey).pipe(
               Effect.orElseSucceed(() => false),
@@ -2317,7 +2322,7 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
       const line = statusRecords[index]!;
       if (line.startsWith("# branch.head ")) {
         const value = line.slice("# branch.head ".length).trim();
-        refName = value.startsWith("(") ? null : value;
+        refName = value === "(detached)" ? null : value;
         continue;
       }
       if (line.startsWith("# branch.upstream ")) {
@@ -2706,7 +2711,15 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
             { env, maxOutputBytes: REVIEW_METADATA_MAX_OUTPUT_BYTES },
           ).pipe(Effect.map((stdout) => stdout.trim()));
           if (stagedSummary.length === 0) {
-            return null;
+            // Like git commit, a merge resolved to HEAD's tree still records its merge commit.
+            const mergeHeadPath = yield* runGitStdout(
+              "GitVcsDriver.prepareCommitContext.mergeHead",
+              cwd,
+              ["rev-parse", "--git-path", "MERGE_HEAD"],
+            );
+            if (!(yield* fileSystem.exists(path.resolve(physicalCwd, mergeHeadPath.trim())))) {
+              return null;
+            }
           }
 
           // A user-supplied message needs change detection, but no patch for generation.
@@ -2899,7 +2912,7 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
     const requestedRemoteName = options?.remoteName?.trim() || null;
     if (requestedRemoteName) {
       const publishBranch = yield* resolvePublishBranchName(cwd, branch);
-      yield* runGit(
+      yield* executeGitWithStableDiagnostics(
         "GitVcsDriver.pushCurrentBranch.pushWithRequestedRemote",
         cwd,
         ["push", "--", requestedRemoteName, `HEAD:refs/heads/${publishBranch}`],
@@ -2993,7 +3006,7 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
           });
         }
       }
-      yield* runGit(
+      yield* executeGitWithStableDiagnostics(
         upstream
           ? "GitVcsDriver.pushCurrentBranch.pushOwnBranch"
           : "GitVcsDriver.pushCurrentBranch.pushWithUpstream",
@@ -3010,7 +3023,7 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
     }
 
     if (destination?.upstream) {
-      yield* runGit(
+      yield* executeGitWithStableDiagnostics(
         "GitVcsDriver.pushCurrentBranch.pushUpstream",
         cwd,
         ["push", "--", destination.remoteName, `HEAD:refs/heads/${destination.branchName}`],
@@ -3024,7 +3037,9 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
       };
     }
 
-    yield* runGit("GitVcsDriver.pushCurrentBranch.push", cwd, ["push"], { timeoutMs: null });
+    yield* executeGitWithStableDiagnostics("GitVcsDriver.pushCurrentBranch.push", cwd, ["push"], {
+      timeoutMs: null,
+    });
     return {
       status: "pushed" as const,
       branch,
@@ -3508,7 +3523,8 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
       executeGit(
         "GitVcsDriver.readBranchChangeTotals",
         cwd,
-        [...REVIEW_DIFF_ARGS, "--numstat", "-z", ref, "--"],
+        // Plumbing: porcelain diff refreshes and rewrites the real index, taking index.lock.
+        ["diff-index", "-M", "--numstat", "-z", ref, "--"],
         {
           allowNonZeroExit: true,
           maxOutputBytes: REVIEW_METADATA_MAX_OUTPUT_BYTES,
@@ -4700,9 +4716,14 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
           runGit(
             "GitVcsDriver.createWorktree.updateSubmodules",
             worktreePath,
-            submoduleMode.value === "recursive"
-              ? ["submodule", "update", "--init", "--recursive"]
-              : ["submodule", "update", "--init"],
+            [
+              "submodule",
+              "update",
+              "--init",
+              ...(submoduleMode.value === "recursive" ? ["--recursive"] : []),
+              // Git reports transfer progress to a pipe only when forced.
+              ...(onSubmoduleLine ? ["--progress"] : []),
+            ],
             {
               // Cloning scales with remote size; let it finish or be cancelled, like worktree add.
               timeoutMs: null,
@@ -4710,6 +4731,9 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
                 ? {
                     env: { LANGUAGE: "C" },
                     progress: { onStdoutLine: onSubmoduleLine, onStderrLine: onSubmoduleLine },
+                    // Progress for many submodules can pass the output cap; truncate instead of failing.
+                    appendTruncationMarker: true,
+                    keepLineCallbacksAfterTruncation: true,
                   }
                 : {}),
             },
@@ -5257,7 +5281,8 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
           ? yield* executeGit(
               "GitVcsDriver.switchRef.localTrackingBranch",
               input.cwd,
-              ["for-each-ref", "--format=%(refname:short)\t%(upstream:short)", "refs/heads"],
+              // `:short` prefixes a name a tag shares with `heads/`, so names are unambiguous here.
+              ["for-each-ref", "--format=%(refname:lstrip=2)\t%(upstream)", "refs/heads"],
               {
                 timeoutMs: 5_000,
                 allowNonZeroExit: true,
@@ -5265,7 +5290,7 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
             ).pipe(
               Effect.map((result) =>
                 result.exitCode === 0
-                  ? parseTrackingBranchByUpstreamRef(result.stdout, input.refName)
+                  ? parseTrackingBranchByUpstreamRef(result.stdout, `refs/remotes/${input.refName}`)
                   : null,
               ),
             )
@@ -5292,30 +5317,42 @@ export const makeGitVcsDriverCore = Effect.fn("makeGitVcsDriverCore")(function*
 
       const checkoutArgs = localInputExists
         ? ["checkout", input.refName]
-        : remoteExists && !localTrackingBranch && localTrackedBranchTargetExists
-          ? ["checkout", input.refName]
-          : newTrackingBranch
-            ? ["checkout", newTrackingBranch]
-            : remoteExists && !localTrackingBranch
-              ? ["checkout", "--track", input.refName]
-              : remoteExists && localTrackingBranch
-                ? ["checkout", localTrackingBranch]
-                : ["checkout", input.refName];
+        : newTrackingBranch
+          ? ["checkout", newTrackingBranch]
+          : remoteExists && !localTrackingBranch
+            ? ["checkout", "--track", input.refName]
+            : remoteExists && localTrackingBranch
+              ? ["checkout", localTrackingBranch]
+              : ["checkout", input.refName];
 
       yield* refuseOptionLikeRefName("GitVcsDriver.switchRef", input.cwd, checkoutArgs.at(-1));
 
       // Created before the checkout so the shared-config lock is not held while files are written.
       // Not rolled back on failure: Git may already have switched HEAD to it (post-checkout hooks).
       if (newTrackingBranch) {
-        yield* executeGit(
+        const startRef = `refs/remotes/${input.refName}`;
+        yield* executeGitWithStableDiagnostics(
           "GitVcsDriver.switchRef.createTrackingBranch",
           input.cwd,
-          ["branch", "--track", "--", newTrackingBranch, input.refName],
-          {
-            timeoutMs: 10_000,
-            fallbackErrorDetail: "git branch create failed",
-            writesSharedConfig: true,
-          },
+          ["branch", "--no-track", "--", newTrackingBranch, startRef],
+          { fallbackErrorDetail: "git branch create failed" },
+        );
+        // An untracked branch of this name would make every later switch to the remote detach.
+        yield* executeGitWithStableDiagnostics(
+          "GitVcsDriver.switchRef.trackRemote",
+          input.cwd,
+          ["branch", `--set-upstream-to=${startRef}`, "--", newTrackingBranch],
+          { writesSharedConfig: true },
+        ).pipe(
+          retryWhileConfigLocked,
+          Effect.tapError(() =>
+            executeGit(
+              "GitVcsDriver.switchRef.removeUntrackedBranch",
+              input.cwd,
+              ["update-ref", "-d", `refs/heads/${newTrackingBranch}`, startRef],
+              { allowNonZeroExit: true },
+            ),
+          ),
         );
       }
 
diff --git a/apps/server/src/vcs/VcsProcess.test.ts b/apps/server/src/vcs/VcsProcess.test.ts
index b87dbf5e7825..18eaebe6e095 100644
--- a/apps/server/src/vcs/VcsProcess.test.ts
+++ b/apps/server/src/vcs/VcsProcess.test.ts
@@ -92,7 +92,7 @@ describe("VcsProcess.run", () => {
       yield* fs.remove(lock);
       yield* git(restore);
       expect(yield* fs.readFileString(file)).toBe("before\n");
-    }).pipe(provideLive, Effect.provide(NodeServices.layer), Effect.scoped),
+    }).pipe(provideLive, Effect.provide(NodeServices.layer)),
   );
 
   it.effect.each([
diff --git a/apps/server/src/vcs/VcsStatusBroadcaster.test.ts b/apps/server/src/vcs/VcsStatusBroadcaster.test.ts
index e70afb2ddde0..73093af6c750 100644
--- a/apps/server/src/vcs/VcsStatusBroadcaster.test.ts
+++ b/apps/server/src/vcs/VcsStatusBroadcaster.test.ts
@@ -71,6 +71,7 @@ const remoteStatusWithPr: VcsStatusRemoteResult = {
 function layerTestFor(state: {
   currentLocalStatus: VcsStatusLocalResult;
   currentRemoteStatus: VcsStatusRemoteResult | null;
+  currentDivergence?: Pick<VcsStatusRemoteResult, "aheadCount" | "behindCount">;
   localStatusCalls: number;
   remoteStatusCalls: number;
   localInvalidationCalls: number;
@@ -133,6 +134,16 @@ function layerTestFor(state: {
             : (state.beforeCurrentBranch ?? Effect.void).pipe(
                 Effect.andThen(Effect.sync(() => state.currentLocalStatus.refName)),
               ),
+        upstreamDivergence: () =>
+          Effect.sync(() =>
+            state.currentRemoteStatus?.hasUpstream && state.currentLocalStatus.refName !== null
+              ? {
+                  refName: state.currentLocalStatus.refName,
+                  aheadCount: (state.currentDivergence ?? state.currentRemoteStatus).aheadCount,
+                  behindCount: (state.currentDivergence ?? state.currentRemoteStatus).behindCount,
+                }
+              : null,
+          ),
         remoteStatus: (_input, options) =>
           Effect.suspend(() => {
             return (state.beforeRemoteStatus ?? Effect.void).pipe(
@@ -239,7 +250,7 @@ describe("VcsStatusBroadcaster", () => {
 
       yield* broadcaster.refreshLocalStatus("/repo");
       assert.strictEqual(state.localStatusCalls, 3);
-    }).pipe(Effect.provide(layerTestFor(state)), Effect.scoped);
+    }).pipe(Effect.provide(layerTestFor(state)));
   });
 
   it.effect(
@@ -334,7 +345,7 @@ describe("VcsStatusBroadcaster", () => {
         ]);
         assert.deepEqual(yield* branches, [{ refName: null, isRepo: false }]);
         assert.equal(state.remoteStatusCalls, 0);
-      }).pipe(Effect.provide(layerTestFor(state)), Effect.scoped);
+      }).pipe(Effect.provide(layerTestFor(state)));
     },
   );
 
@@ -371,7 +382,7 @@ describe("VcsStatusBroadcaster", () => {
         yield* Fiber.join(detailsFiber),
         Option.some({ _tag: "snapshot" as const, local: state.currentLocalStatus, remote: null }),
       );
-    }).pipe(Effect.provide(layerTestFor(state)), Effect.scoped);
+    }).pipe(Effect.provide(layerTestFor(state)));
   });
 
   it.effect("publishes terminal branch switches and validates cached status reads", () => {
@@ -528,6 +539,48 @@ describe("VcsStatusBroadcaster", () => {
     },
   );
 
+  it.effect.each([0, 2])(
+    "refreshes merge divergence while a lookup ends with %s commits behind",
+    (behindAfterLookup) => {
+      const state: Parameters<typeof layerTestFor>[0] = {
+        currentLocalStatus: baseLocalStatus,
+        currentRemoteStatus: { ...baseRemoteStatus, aheadCount: 2, behindCount: 3 },
+        localStatusCalls: 0,
+        remoteStatusCalls: 0,
+        localInvalidationCalls: 0,
+        remoteInvalidationCalls: 0,
+        backgroundWorkEnabled: false,
+      };
+      return Effect.gen(function* () {
+        const broadcaster = yield* VcsStatusBroadcaster.VcsStatusBroadcaster;
+        yield* broadcaster.getStatus({ cwd: "/repo" });
+        const started = yield* Deferred.make<void>();
+        const release = yield* Deferred.make<void>();
+        state.beforeRemoteStatus = Deferred.succeed(started, undefined).pipe(
+          Effect.andThen(Deferred.await(release)),
+        );
+        const lookup = yield* broadcaster.refreshPullRequestStatus("/repo").pipe(Effect.forkScoped);
+        yield* Deferred.await(started);
+        state.currentRemoteStatus = { ...baseRemoteStatus, aheadCount: 4, behindCount: 0 };
+        yield* broadcaster.refreshLocalStatus("/repo");
+        const status = yield* broadcaster.getStatus({ cwd: "/repo" });
+        assert.equal(status.aheadCount, 4);
+        assert.equal(status.behindCount, 0);
+        assert.equal(state.remoteStatusCalls, 1);
+        state.currentDivergence = { aheadCount: 4, behindCount: behindAfterLookup };
+        state.currentRemoteStatus =
+          behindAfterLookup > 0
+            ? { ...baseRemoteStatus, ...state.currentDivergence }
+            : { ...baseRemoteStatus, aheadCount: 2, behindCount: 3 };
+        yield* Deferred.succeed(release, undefined);
+        yield* Fiber.join(lookup);
+        const afterLookup = yield* broadcaster.getStatus({ cwd: "/repo" });
+        assert.equal(afterLookup.aheadCount, 4);
+        assert.equal(afterLookup.behindCount, behindAfterLookup);
+      }).pipe(Effect.provide(layerTestFor(state)));
+    },
+  );
+
   it.effect("a local-only refresh after a branch switch leaves the PR refresh able to read", () => {
     const state: Parameters<typeof layerTestFor>[0] = {
       currentLocalStatus: baseLocalStatus,
@@ -747,7 +800,7 @@ describe("VcsStatusBroadcaster", () => {
       assert.deepStrictEqual(refreshed, remoteStatusWithPr);
       const final = yield* broadcaster.getStatus({ cwd: "/repo" });
       assert.deepStrictEqual(final.pr, remoteStatusWithPr.pr);
-    }).pipe(Effect.provide(layer), Effect.scoped);
+    }).pipe(Effect.provide(layer));
   });
 
   it.effect("an initial status read cannot overwrite an explicit refresh", () => {
@@ -791,7 +844,7 @@ describe("VcsStatusBroadcaster", () => {
         (yield* broadcaster.getStatus({ cwd: "/repo" })).pr,
         remoteStatusWithPr.pr,
       );
-    }).pipe(Effect.provide(layer), Effect.scoped);
+    }).pipe(Effect.provide(layer));
   });
 
   it.effect("keeps the published local snapshot when a refresh remote read fails", () => {
@@ -977,7 +1030,7 @@ describe("VcsStatusBroadcaster", () => {
       yield* Deferred.await(polled);
       const status = yield* broadcaster.getStatus({ cwd: "/repo" });
       assert.deepStrictEqual(status.branchChanges, state.currentLocalStatus.branchChanges);
-    }).pipe(Effect.provide(layerTestFor(state)), Effect.scoped);
+    }).pipe(Effect.provide(layerTestFor(state)));
   });
 
   it.effect("an explicit refresh reads local totals after the fetch", () => {
@@ -1077,7 +1130,7 @@ describe("VcsStatusBroadcaster", () => {
       const status = yield* Fiber.join(refresh);
       assert.isTrue(status.hasWorkingTreeChanges);
       assert.deepStrictEqual(status.pr, remoteStatusWithPr.pr);
-    }).pipe(Effect.provide(layerTestFor(state)), Effect.scoped);
+    }).pipe(Effect.provide(layerTestFor(state)));
   });
 
   it.effect("publishes local changes before a remote error and propagates that error", () => {
@@ -1139,7 +1192,7 @@ describe("VcsStatusBroadcaster", () => {
       assert.isTrue(cached.hasWorkingTreeChanges);
       assert.deepStrictEqual(cached.pr, remoteStatusWithPr.pr);
       assert.deepStrictEqual(yield* Deferred.await(published), state.currentLocalStatus);
-    }).pipe(Effect.provide(layerTestFor(state)), Effect.scoped);
+    }).pipe(Effect.provide(layerTestFor(state)));
   });
 
   it.effect.each(["getStatus", "refreshStatus", "autoPull", "autoPullFailure"] as const)(
@@ -1225,7 +1278,7 @@ describe("VcsStatusBroadcaster", () => {
         assert.isNull(status.pr);
         assert.equal(status.aheadCount, 0);
         assert.equal(status.behindCount, 0);
-      }).pipe(Effect.provide(layerTest), Effect.scoped);
+      }).pipe(Effect.provide(layerTest));
     },
   );
 
@@ -1275,7 +1328,7 @@ describe("VcsStatusBroadcaster", () => {
       assert.deepStrictEqual(cached.pr, state.currentRemoteStatus.pr);
       assert.equal(cached.aheadCount, 2);
       assert.equal(state.remoteStatusCalls, 2);
-    }).pipe(Effect.provide(layerTestFor(state)), Effect.scoped);
+    }).pipe(Effect.provide(layerTestFor(state)));
   });
 
   it.effect("a terminal checkout publishes the new branch without waiting for a poll", () =>
@@ -1307,7 +1360,10 @@ describe("VcsStatusBroadcaster", () => {
             const next = applyGitStatusStreamEvent(clientStates.at(-1) ?? null, event);
             clientStates.push(next);
             yield* Deferred.succeed(subscribed, undefined);
-            if (next.refName === "repro") yield* Deferred.succeed(checkedOut, undefined);
+            // The refresh ends with the new branch's remote, after its local update.
+            if (event._tag === "remoteUpdated" && event.remote && next.refName === "repro") {
+              yield* Deferred.succeed(checkedOut, undefined);
+            }
           }),
         ).pipe(Effect.forkScoped);
         yield* Deferred.await(subscribed);
@@ -1322,12 +1378,12 @@ describe("VcsStatusBroadcaster", () => {
 
         assert.deepStrictEqual(
           clientStates.filter((status) => status.refName === "repro").map((status) => status.pr),
-          [null],
+          [null, null],
         );
         // A checkout must not trigger a network fetch.
         assert.deepStrictEqual(state.remoteStatusRefreshUpstreamValues.slice(1), [false]);
       }).pipe(Effect.provide(layerTestFor(state)), Effect.scoped);
-    }).pipe(Effect.provide(NodeServices.layer), Effect.scoped),
+    }).pipe(Effect.provide(NodeServices.layer)),
   );
 
   it.effect("a terminal checkout updates branch-only subscribers without full status", () =>
@@ -1360,18 +1416,15 @@ describe("VcsStatusBroadcaster", () => {
         assert.deepEqual(yield* branches, [{ refName: "repro", isRepo: true }]);
         assert.equal(state.localStatusCalls, 0);
       }).pipe(Effect.provide(layerTestFor(state)), Effect.scoped);
-    }).pipe(Effect.provide(NodeServices.layer), Effect.scoped),
+    }).pipe(Effect.provide(NodeServices.layer)),
   );
 
   it.effect("a checkout read that fails while index.lock is held retries until it succeeds", () =>
     Effect.gen(function* () {
-      const fs = yield* FileSystem.FileSystem;
-      const path = yield* Path.Path;
-      const gitDir = yield* fs.makeTempDirectoryScoped({ prefix: "vcs-head-watch-" });
-      const headPath = path.join(gitDir, "HEAD");
-      yield* fs.writeFileString(headPath, "ref: refs/heads/main\n");
+      const events = yield* Queue.unbounded<FileSystem.WatchEvent>();
+      const headPath = "/repo/.git/HEAD";
       const failed = yield* Deferred.make<void>();
-      const state = {
+      const state: Parameters<typeof layerTestFor>[0] = {
         currentLocalStatus: { ...baseLocalStatus, isDefaultRef: true, refName: "main" },
         currentRemoteStatus: null,
         localStatusCalls: 0,
@@ -1379,6 +1432,12 @@ describe("VcsStatusBroadcaster", () => {
         localInvalidationCalls: 0,
         remoteInvalidationCalls: 0,
         headPath,
+        fileSystem: FileSystem.makeNoop({
+          realPath: (target) => Effect.succeed(target),
+          exists: () => Effect.succeed(true),
+          watch: (_target, options) =>
+            Stream.fromQueue(events).pipe(Stream.onStart(Effect.sync(() => options?.onReady?.()))),
+        }),
         failLocalStatus: false,
         onLocalStatusFailure: Deferred.succeed(failed, undefined).pipe(Effect.asVoid),
       };
@@ -1402,9 +1461,7 @@ describe("VcsStatusBroadcaster", () => {
         // A terminal commit holds index.lock across the checkout, so the HEAD event's read fails.
         state.failLocalStatus = true;
         state.currentLocalStatus = { ...baseLocalStatus, isDefaultRef: false, refName: "repro" };
-        const lockPath = path.join(gitDir, "HEAD.lock");
-        yield* fs.writeFileString(lockPath, "ref: refs/heads/repro\n");
-        yield* fs.rename(lockPath, headPath);
+        yield* Queue.offer(events, { _tag: "Update", path: "HEAD" });
         yield* Deferred.await(failed);
         const failedCalls = state.localStatusCalls;
 
@@ -1414,7 +1471,7 @@ describe("VcsStatusBroadcaster", () => {
         yield* Deferred.await(checkedOut);
         assert.strictEqual(state.localStatusCalls, failedCalls + 1);
       }).pipe(Effect.provide(layerTestFor(state)), Effect.scoped);
-    }).pipe(Effect.provide(NodeServices.layer), Effect.scoped),
+    }),
   );
 
   it.effect("subscribers share one HEAD watch that ends with the last of them", () =>
@@ -1456,7 +1513,7 @@ describe("VcsStatusBroadcaster", () => {
         yield* subscribe;
         assert.strictEqual(state.headPathCalls, 2);
       }).pipe(Effect.provide(layerTestFor(state)), Effect.scoped);
-    }).pipe(Effect.provide(NodeServices.layer), Effect.scoped),
+    }).pipe(Effect.provide(NodeServices.layer)),
   );
 
   it.effect("a HEAD watch that ended restarts for the next subscriber and keeps earlier ones", () =>
@@ -1524,7 +1581,51 @@ describe("VcsStatusBroadcaster", () => {
         yield* checkout("two");
         yield* Deferred.await(first.sawRef("two"));
       }).pipe(Effect.provide(layerTestFor(state)), Effect.scoped);
-    }).pipe(Effect.provide(NodeServices.layer), Effect.scoped),
+    }).pipe(Effect.provide(NodeServices.layer)),
+  );
+
+  it.effect("a HEAD watch ends when its git directory is removed", () =>
+    Effect.gen(function* () {
+      const gitDir = "/repo/.git/worktrees/feature";
+      const events = yield* Queue.unbounded<FileSystem.WatchEvent>();
+      const closed = yield* Deferred.make<void>();
+      let gitDirExists = true;
+      const state: Parameters<typeof layerTestFor>[0] = {
+        currentLocalStatus: { ...baseLocalStatus, refName: "main" },
+        currentRemoteStatus: null,
+        localStatusCalls: 0,
+        remoteStatusCalls: 0,
+        localInvalidationCalls: 0,
+        remoteInvalidationCalls: 0,
+        headPath: `${gitDir}/HEAD`,
+        fileSystem: FileSystem.makeNoop({
+          realPath: (target) => Effect.succeed(target),
+          exists: (target) => Effect.succeed(target !== gitDir || gitDirExists),
+          watch: (_target, options) =>
+            Stream.fromQueue(events).pipe(
+              Stream.onStart(Effect.sync(() => options?.onReady?.())),
+              Stream.ensuring(Deferred.succeed(closed, undefined)),
+            ),
+        }),
+      };
+
+      yield* Effect.gen(function* () {
+        const broadcaster = yield* VcsStatusBroadcaster.VcsStatusBroadcaster;
+        const branches = yield* Stream.toPull(broadcaster.streamBranchStatus({ cwd: "/repo" }));
+        assert.deepEqual(yield* branches, [{ refName: "main", isRepo: true }]);
+
+        // Every checkout removes HEAD.lock, which leaves the watch running.
+        state.currentLocalStatus = { ...baseLocalStatus, refName: "other" };
+        yield* Queue.offer(events, { _tag: "Remove", path: "HEAD.lock" });
+        yield* Queue.offer(events, { _tag: "Update", path: "HEAD" });
+        assert.deepEqual(yield* branches, [{ refName: "other", isRepo: true }]);
+
+        // `git worktree remove` deletes the watched directory; Windows keeps reporting it.
+        gitDirExists = false;
+        yield* Queue.offer(events, { _tag: "Remove", path: gitDir });
+        yield* Deferred.await(closed);
+      }).pipe(Effect.provide(layerTestFor(state)), Effect.scoped);
+    }),
   );
 
   it.effect("releases remote demand while passive observers remain", () => {
@@ -1664,7 +1765,7 @@ it.effect("detail join during invalidation must get fresh totals", () => {
       yield* Fiber.join(snapshotFiber),
       Option.some({ _tag: "snapshot" as const, local: state.currentLocalStatus, remote: null }),
     );
-  }).pipe(Effect.provide(layerTestFor(state)), Effect.scoped);
+  }).pipe(Effect.provide(layerTestFor(state)));
 });
 it.effect("serializes branch reads with detailed refresh publication", () => {
   const state = newState();
@@ -1690,7 +1791,7 @@ it.effect("serializes branch reads with detailed refresh publication", () => {
     const result = yield* b.getStatus({ cwd: "/repo" });
     assert.equal(result.refName, "new");
     assert.equal(state.localStatusCalls, 1);
-  }).pipe(Effect.provide(layerTestFor(state)), Effect.scoped);
+  }).pipe(Effect.provide(layerTestFor(state)));
 });
 
 it.effect("publishes overlapping branch reads in checkout order", () => {
@@ -1721,7 +1822,7 @@ it.effect("publishes overlapping branch reads in checkout order", () => {
       { refName: "old", isRepo: true },
       { refName: "new", isRepo: true },
     ]);
-  }).pipe(Effect.provide(layerTestFor(state)), Effect.scoped);
+  }).pipe(Effect.provide(layerTestFor(state)));
 });
 
 it.effect("does not replay older queued branches after a new subscriber snapshot", () => {
@@ -1754,5 +1855,5 @@ it.effect("does not replay older queued branches after a new subscriber snapshot
     yield* b.refreshBranchStatus({ cwd: "/repo" });
     assert.deepEqual(yield* Queue.take(values), { refName: "latest", isRepo: true });
     yield* Fiber.join(subscriber);
-  }).pipe(Effect.provide(layerTestFor(state)), Effect.scoped);
+  }).pipe(Effect.provide(layerTestFor(state)));
 });
diff --git a/apps/server/src/vcs/VcsStatusBroadcaster.ts b/apps/server/src/vcs/VcsStatusBroadcaster.ts
index ffe685ef60d5..28daef7d790c 100644
--- a/apps/server/src/vcs/VcsStatusBroadcaster.ts
+++ b/apps/server/src/vcs/VcsStatusBroadcaster.ts
@@ -451,7 +451,30 @@ export const make = Effect.gen(function* () {
     "VcsStatusBroadcaster.refreshLocalStatus",
   )(function* (rawCwd) {
     const cwd = yield* withFileSystem(normalizeCwd(rawCwd));
-    return yield* refreshLocalStatusCore(cwd);
+    const local = yield* refreshLocalStatusCore(cwd);
+    const cached = yield* getCachedStatus(cwd);
+    // Divergence is local Git data; a slow forge lookup must not delay turn-end updates.
+    if (cached?.remote?.value?.hasUpstream) {
+      const divergence = yield* workflow.upstreamDivergence(cwd);
+      const latest = yield* getCachedStatus(cwd);
+      if (divergence && latest?.remote?.value && latest.remote.branch === divergence.refName) {
+        const value = {
+          ...latest.remote.value,
+          aheadCount: divergence.aheadCount,
+          behindCount: divergence.behindCount,
+        };
+        yield* updateCachedRemoteStatus(
+          cwd,
+          {
+            branch: divergence.refName,
+            value,
+            fingerprint: fingerprintStatusPart(value),
+          },
+          { publish: true },
+        );
+      }
+    }
+    return local;
   });
 
   const readRemoteStatus = Effect.fn("VcsStatusBroadcaster.readRemoteStatus")(function* (
@@ -461,7 +484,18 @@ export const make = Effect.gen(function* () {
     const branch = yield* workflow.currentBranch(cwd);
     // GitManager's remote TTL cache is keyed by cwd, not the checked-out branch.
     yield* workflow.invalidateRemoteStatus(cwd);
-    const value = yield* workflow.remoteStatus({ cwd }, options);
+    const previousRemote = (yield* getCachedStatus(cwd))?.remote;
+    const remote = yield* workflow.remoteStatus({ cwd }, options);
+    const latest = yield* getCachedStatus(cwd);
+    // An overlapping turn refresh and fetch can both move divergence during the forge lookup.
+    const refreshed =
+      remote?.hasUpstream && latest?.remote !== previousRemote && latest?.remote?.branch === branch
+        ? yield* workflow.upstreamDivergence(cwd)
+        : null;
+    const value =
+      remote && refreshed?.refName === branch
+        ? { ...remote, aheadCount: refreshed.aheadCount, behindCount: refreshed.behindCount }
+        : remote;
     const currentBranch = yield* workflow.currentBranch(cwd);
     const cached = yield* getCachedStatus(cwd);
     if (branch !== currentBranch || cached?.local?.value.refName !== currentBranch) {
@@ -822,12 +856,19 @@ export const make = Effect.gen(function* () {
   const watchHead = Effect.fnUntraced(function* (cwd: string, ready: Deferred.Deferred<void>) {
     const headPath = yield* workflow.headPath(cwd);
     if (headPath === null) return;
+    const headDirectory = path.dirname(headPath);
     // Git replaces HEAD by renaming HEAD.lock, which a watch on the file itself would lose.
     yield* fs
-      .watch(path.dirname(headPath), {
+      .watch(headDirectory, {
         onReady: () => Deferred.doneUnsafe(ready, Exit.void),
       })
       .pipe(
+        // On Windows a watch outlives its deleted directory and reports it ~150k times a second.
+        Stream.takeUntilEffect((event) =>
+          event._tag === "Remove"
+            ? fs.exists(headDirectory).pipe(Effect.map((exists) => !exists))
+            : Effect.succeed(false),
+        ),
         Stream.filter((event) => path.basename(event.path) === "HEAD"),
         // A rebase moves HEAD many times; refresh once for whatever arrived during a refresh.
         Stream.buffer({ capacity: 1, strategy: "sliding" }),
diff --git a/apps/server/src/workspace/WorkspaceEntries.test.ts b/apps/server/src/workspace/WorkspaceEntries.test.ts
index 87cab4a2c88c..d20e378bae05 100644
--- a/apps/server/src/workspace/WorkspaceEntries.test.ts
+++ b/apps/server/src/workspace/WorkspaceEntries.test.ts
@@ -433,6 +433,20 @@ it.layer(layerTest, { excludeTestServices: true })("WorkspaceEntries", (it) => {
         });
       }),
     );
+
+    it.effect("finds ignored files that sort past the listing limit", () =>
+      Effect.gen(function* () {
+        const cwd = yield* makeTempDir({ git: true });
+        yield* writeTextFile(cwd, ".gitignore", "*.secret\n");
+        for (let index = 1; index <= 205; index += 1) {
+          yield* writeTextFile(cwd, `file-${String(index).padStart(3, "0")}.secret`, "s");
+        }
+
+        const workspaceEntries = yield* WorkspaceEntries.WorkspaceEntries;
+        const listed = yield* workspaceEntries.listIgnoredFiles({ cwd, query: "file-205" });
+        expect(listed.files).toContainEqual({ path: "file-205.secret", byteLength: 1 });
+      }),
+    );
   });
 
   describe("search", () => {
@@ -493,6 +507,11 @@ it.layer(layerTest, { excludeTestServices: true })("WorkspaceEntries", (it) => {
         yield* writeTextFile(cwd, "ignored.txt", "ignore me");
         yield* writeTextFile(cwd, ".convex/local-storage/data.json", "{}");
         yield* writeTextFile(cwd, "convex/UOoS-l/convex_local_storage/modules/data.json", "{}");
+        yield* writeTextFile(cwd, ".git/info/exclude", "info-excluded.txt\n");
+        yield* writeTextFile(cwd, "info-excluded.txt", "ignore me");
+        yield* writeTextFile(cwd, ".git/configured-excludes", "configured-excluded.txt\n");
+        yield* git(cwd, ["config", "core.excludesFile", ".git/configured-excludes"]);
+        yield* writeTextFile(cwd, "configured-excluded.txt", "ignore me");
 
         const result = yield* searchWorkspaceEntries({ cwd, query: "", limit: 100 });
         const paths = result.entries.map((entry) => entry.path);
@@ -500,6 +519,8 @@ it.layer(layerTest, { excludeTestServices: true })("WorkspaceEntries", (it) => {
         expect(paths).toContain("src");
         expect(paths).toContain("src/keep.ts");
         expect(paths).not.toContain("ignored.txt");
+        expect(paths).not.toContain("info-excluded.txt");
+        expect(paths).not.toContain("configured-excluded.txt");
         expect(paths.some((entryPath) => entryPath.startsWith(".convex/"))).toBe(false);
         expect(paths.some((entryPath) => entryPath.startsWith("convex/"))).toBe(false);
       }),
@@ -591,6 +612,8 @@ it.layer(layerTest, { excludeTestServices: true })("WorkspaceEntries", (it) => {
         yield* writeTextFile(cwd, ".gitignore", "ignored.txt\n");
         yield* writeTextFile(cwd, "src/keep.ts", "square\nSquare\n");
         yield* writeTextFile(cwd, "ignored.txt", "Square\n");
+        yield* writeTextFile(cwd, ".git/info/exclude", "info-excluded.txt\n");
+        yield* writeTextFile(cwd, "info-excluded.txt", "Square\n");
 
         const workspaceEntries = yield* WorkspaceEntries.WorkspaceEntries;
         const result = yield* workspaceEntries.searchContents({
@@ -813,10 +836,14 @@ it.layer(layerTest, { excludeTestServices: true })("WorkspaceEntries", (it) => {
           if (created.ok) {
             const finder = created.value;
             finders += 1;
-            const scanFiles = finder.scanFiles.bind(finder);
+            // The synchronous rescan waits on fff's picker lock on the event loop.
             finder.scanFiles = () => {
+              throw new Error("refresh must not rescan on the JS thread");
+            };
+            const scanFilesAsync = finder.scanFilesAsync.bind(finder);
+            finder.scanFilesAsync = () => {
               rescans += 1;
-              return scanFiles();
+              return scanFilesAsync();
             };
             const waitForIndexReady = finder.waitForIndexReady.bind(finder);
             finder.waitForIndexReady = (timeoutMs) =>
diff --git a/apps/server/src/workspace/WorkspaceEntries.ts b/apps/server/src/workspace/WorkspaceEntries.ts
index cac706f7ca4a..43c8fae4dfca 100644
--- a/apps/server/src/workspace/WorkspaceEntries.ts
+++ b/apps/server/src/workspace/WorkspaceEntries.ts
@@ -576,9 +576,13 @@ export const make = Effect.gen(function* () {
       })
       .pipe(Effect.orElseSucceed(() => undefined));
     if (!result || result.exitCode !== 0) return { files: [], truncated: false };
+    // Filter before the cap so files sorting past it stay reachable by search.
+    const query = input.query?.toLowerCase() ?? "";
     const paths = result.stdout
       .split("\0")
-      .filter((entry) => entry.length > 0 && !entry.endsWith("/"))
+      .filter(
+        (entry) => entry.length > 0 && !entry.endsWith("/") && entry.toLowerCase().includes(query),
+      )
       .toSorted();
     const files = yield* Effect.promise(() =>
       Promise.all(
diff --git a/apps/server/src/workspace/WorkspaceFileSystem.test.ts b/apps/server/src/workspace/WorkspaceFileSystem.test.ts
index 26e444c1032d..dffb0701d68a 100644
--- a/apps/server/src/workspace/WorkspaceFileSystem.test.ts
+++ b/apps/server/src/workspace/WorkspaceFileSystem.test.ts
@@ -43,6 +43,11 @@ const injectShortReads = Effect.fn("injectShortReads")(function* (target: string
   yield* Effect.addFinalizer(() => Effect.sync(() => open.mockImplementation(native.open)));
 });
 
+const whitespaceFilePaths =
+  HostProcess.Platform.defaultValue() === "win32"
+    ? [" report.txt"]
+    : [" report.txt", "report.txt ", "\treport.txt\t", " "];
+
 const UNKNOWN_WORKSPACE_PREFIX = "t3code-unknown-workspace-";
 const layerKnownWorkspacesTest = Layer.mock(KnownWorkspaces.KnownWorkspaces)({
   assertContains: (cwd) =>
@@ -196,6 +201,14 @@ it.layer(layerTest, { excludeTestServices: true })("WorkspaceFileSystemLive", (i
           byteLength: 26,
           truncated: false,
         });
+
+        yield* writeTextFile(cwd, "report.txt", "ordinary file");
+        for (const relativePath of whitespaceFilePaths) {
+          yield* writeTextFile(cwd, relativePath, "whitespace file");
+          const read = yield* workspaceFileSystem.readFile({ cwd, relativePath });
+          expect(read.contents).toBe("whitespace file");
+          expect(read.relativePath).toBe(relativePath);
+        }
       }),
     );
 
@@ -250,6 +263,14 @@ it.layer(layerTest, { excludeTestServices: true })("WorkspaceFileSystemLive", (i
           byteLength: 9,
           truncated: false,
         });
+
+        for (const relativePath of whitespaceFilePaths) {
+          yield* writeTextFile(outsideDir, relativePath, "whitespace file");
+          const requestedPath = path.join(outsideDir, relativePath);
+          const read = yield* workspaceFileSystem.readFile({ cwd, relativePath: requestedPath });
+          expect(read.contents).toBe("whitespace file");
+          expect(read.relativePath).toBe(requestedPath);
+        }
       }),
     );
 
@@ -560,6 +581,21 @@ it.layer(layerTest, { excludeTestServices: true })("WorkspaceFileSystemLive", (i
         expect(yield* fileSystem.readFileString(path.join(cwd, "src/main.ts"))).toBe(
           "export const edited = true;\n",
         );
+
+        yield* writeTextFile(cwd, "report.txt", "ordinary file");
+        for (const relativePath of whitespaceFilePaths) {
+          yield* writeTextFile(cwd, relativePath, "whitespace file");
+          const written = yield* workspaceFileSystem.writeFile({
+            cwd,
+            relativePath,
+            contents: "edited",
+          });
+          expect(yield* fileSystem.readFileString(path.join(cwd, "report.txt"))).toBe(
+            "ordinary file",
+          );
+          expect(yield* fileSystem.readFileString(path.join(cwd, relativePath))).toBe("edited");
+          expect(written.relativePath).toBe(relativePath);
+        }
       }).pipe(
         Effect.provide(
           Layer.fresh(WorkspaceFileSystem.layer).pipe(
@@ -582,17 +618,13 @@ it.layer(layerTest, { excludeTestServices: true })("WorkspaceFileSystemLive", (i
         const path = yield* Path.Path;
         const fileSystem = yield* FileSystem.FileSystem;
 
-        const error = yield* workspaceFileSystem
-          .writeFile({
-            cwd,
-            relativePath: "../escape.md",
-            contents: "# nope\n",
-          })
-          .pipe(Effect.flip);
+        for (const relativePath of ["../escape.md", "../escape.md ", " folder/../../escape.md"]) {
+          const error = yield* workspaceFileSystem
+            .writeFile({ cwd, relativePath, contents: "# nope\n" })
+            .pipe(Effect.flip);
 
-        expect(error.message).toContain(
-          "Workspace file path must be relative to the project root: ../escape.md",
-        );
+          expect(error).toBeInstanceOf(WorkspacePaths.WorkspacePathOutsideRootError);
+        }
 
         const escapedPath = path.resolve(cwd, "..", "escape.md");
         const escapedStat = yield* fileSystem
diff --git a/apps/server/src/workspace/WorkspaceFileSystem.ts b/apps/server/src/workspace/WorkspaceFileSystem.ts
index 2f3823f97e47..05409c6616ff 100644
--- a/apps/server/src/workspace/WorkspaceFileSystem.ts
+++ b/apps/server/src/workspace/WorkspaceFileSystem.ts
@@ -227,7 +227,7 @@ export const make = Effect.gen(function* () {
   const resolveReadTarget = Effect.fn("WorkspaceFileSystem.resolveReadTarget")(function* (
     input: ProjectReadFileInput,
   ) {
-    const requestedPath = input.relativePath.trim();
+    const requestedPath = input.relativePath;
     const hostPath = requestedPath.startsWith("~/")
       ? expandHomePath(requestedPath, yield* HostProcess.HomeDirectory)
       : requestedPath;
diff --git a/apps/server/src/workspace/WorkspacePaths.ts b/apps/server/src/workspace/WorkspacePaths.ts
index ea183ed43e1a..e630643c71be 100644
--- a/apps/server/src/workspace/WorkspacePaths.ts
+++ b/apps/server/src/workspace/WorkspacePaths.ts
@@ -175,15 +175,14 @@ const make = Effect.gen(function* () {
 
   const resolveRelativePathWithinRoot: WorkspacePaths["Service"]["resolveRelativePathWithinRoot"] =
     Effect.fn("WorkspacePaths.resolveRelativePathWithinRoot")(function* (input) {
-      const normalizedInputPath = input.relativePath.trim();
-      if (path.isAbsolute(normalizedInputPath)) {
+      if (path.isAbsolute(input.relativePath)) {
         return yield* new WorkspacePathOutsideRootError({
           workspaceRoot: input.workspaceRoot,
           relativePath: input.relativePath,
         });
       }
 
-      const absolutePath = path.resolve(input.workspaceRoot, normalizedInputPath);
+      const absolutePath = path.resolve(input.workspaceRoot, input.relativePath);
       // Only the host separator becomes `/`: on POSIX `\` is a file name character.
       const relativeToRoot = path
         .relative(input.workspaceRoot, absolutePath)
diff --git a/apps/server/src/workspace/WorkspaceSearchIndex.test.ts b/apps/server/src/workspace/WorkspaceSearchIndex.test.ts
index 2f9ac05bf9e3..c01600842f2f 100644
--- a/apps/server/src/workspace/WorkspaceSearchIndex.test.ts
+++ b/apps/server/src/workspace/WorkspaceSearchIndex.test.ts
@@ -10,11 +10,15 @@ import { afterEach, expect, it } from "@effect/vitest";
 import * as HostProcess from "@t3tools/shared/HostProcess";
 import * as Effect from "effect/Effect";
 import * as FileSystem from "effect/FileSystem";
+import * as Layer from "effect/Layer";
 import * as Path from "effect/Path";
 import { vi } from "vite-plus/test";
 
+import * as VcsProcess from "../vcs/VcsProcess.ts";
 import * as WorkspaceSearchIndex from "./WorkspaceSearchIndex.ts";
 
+const testLayer = VcsProcess.layer.pipe(Layer.provideMerge(NodeServices.layer));
+
 afterEach(() => {
   vi.restoreAllMocks();
 });
@@ -64,7 +68,74 @@ it.effect("filters image searches before applying the result limit", () =>
       expect(fileSearch).toHaveBeenCalledTimes(2);
       expect(fileSearch).toHaveBeenCalledWith("", { pageSize: 25_002 });
     }),
-  ),
+  ).pipe(Effect.provide(testLayer)),
+);
+
+it.effect("fetches past a first page of Git-ignored results", () =>
+  Effect.scoped(
+    Effect.gen(function* () {
+      const fs = yield* FileSystem.FileSystem;
+      const path = yield* Path.Path;
+      const cwd = yield* fs.makeTempDirectoryScoped({ prefix: "t3-search-ignored-" });
+      const vcsProcess = yield* VcsProcess.VcsProcess;
+      yield* vcsProcess.run({ operation: "test.gitInit", command: "git", args: ["init"], cwd });
+      yield* fs.writeFileString(path.join(cwd, ".git", "info", "exclude"), "hidden/\n");
+      yield* fs.makeDirectory(path.join(cwd, "hidden"));
+      yield* fs.writeFileString(path.join(cwd, "hidden", "a.ts"), "");
+
+      const items = [
+        fileItem("hidden/a.ts"),
+        fileItem("hidden/b.ts"),
+        fileItem("hidden/c.ts"),
+        fileItem("src/a.ts"),
+      ];
+      const fileSearch = vi.fn((_query: string, options?: { pageSize?: number }) => ({
+        ok: true as const,
+        value: {
+          items: items.slice(0, options?.pageSize),
+          scores: [],
+          totalMatched: items.length,
+          totalFiles: items.length,
+        },
+      }));
+      const finder = {
+        destroy: vi.fn(),
+        waitForIndexReady: vi.fn(async () => ({ ok: true as const, value: true })),
+        fileSearch,
+      } as unknown as FileFinder;
+      vi.spyOn(FileFinder, "create").mockReturnValueOnce({ ok: true, value: finder });
+
+      const searchIndex = yield* WorkspaceSearchIndex.make(cwd);
+      const result = yield* searchIndex.search("a", 1, "file", false);
+
+      expect(result).toEqual({ entries: [{ kind: "file", path: "src/a.ts" }], truncated: false });
+    }),
+  ).pipe(Effect.provide(testLayer)),
+);
+
+// A backslash is a file name character on Linux and macOS, so only Windows may treat it as a separator.
+it.effect.skipIf(HostProcess.Platform.defaultValue() === "win32")(
+  "keeps a backslash in a POSIX folder name as part of the search result path",
+  () =>
+    Effect.scoped(
+      Effect.gen(function* () {
+        const items = [fileItem("dir\\one/report.txt")];
+        const finder = {
+          destroy: vi.fn(),
+          waitForIndexReady: vi.fn(async () => ({ ok: true as const, value: true })),
+          fileSearch: vi.fn(() => ({
+            ok: true as const,
+            value: { items, scores: [], totalMatched: 1, totalFiles: 1 },
+          })),
+        } as unknown as FileFinder;
+        vi.spyOn(FileFinder, "create").mockReturnValueOnce({ ok: true, value: finder });
+
+        const searchIndex = yield* WorkspaceSearchIndex.make("/workspace/project");
+        const result = yield* searchIndex.search("report", 50, "file");
+
+        expect(result.entries).toEqual([{ kind: "file", path: "dir\\one/report.txt" }]);
+      }),
+    ).pipe(Effect.provide(testLayer)),
 );
 
 it.effect("continues whole-word searches after a filtered grep page", () =>
@@ -141,7 +212,7 @@ it.effect("continues whole-word searches after a filtered grep page", () =>
       expect(grep).toHaveBeenCalledTimes(2);
       expect(grep.mock.calls[1]?.[1]?.cursor).toBe(nextCursor);
     }),
-  ),
+  ).pipe(Effect.provide(testLayer)),
 );
 
 // fff reads HOME on Linux and macOS but the user profile on Windows, so a temp HOME cannot stand in there.
@@ -172,5 +243,5 @@ it.effect.skipIf(HostProcess.Platform.defaultValue() === "win32")(
 
         expect(result).toBe("WorkspaceSearchIndexCreateFailed");
       }),
-    ).pipe(Effect.provide(NodeServices.layer)),
+    ).pipe(Effect.provide(testLayer)),
 );
diff --git a/apps/server/src/workspace/WorkspaceSearchIndex.ts b/apps/server/src/workspace/WorkspaceSearchIndex.ts
index 23d17759c9fc..5d5d39bf5561 100644
--- a/apps/server/src/workspace/WorkspaceSearchIndex.ts
+++ b/apps/server/src/workspace/WorkspaceSearchIndex.ts
@@ -2,14 +2,11 @@ import * as NodeModule from "node:module";
 
 import type {
   DirItem,
-  DirSearchResult,
   FileItem,
   FileFinder as FileFinderType,
   GrepCursor,
   MixedItem,
-  MixedSearchResult,
   Result,
-  SearchResult,
 } from "@ff-labs/fff-node";
 import * as Context from "effect/Context";
 import * as Effect from "effect/Effect";
@@ -25,8 +22,11 @@ import type {
   ProjectSearchContentsResult,
   ProjectSearchEntriesResult,
 } from "@t3tools/contracts";
+import * as HostProcess from "@t3tools/shared/HostProcess";
 import { isProjectFaviconPath } from "@t3tools/shared/projectFavicon";
 
+import * as VcsProcess from "../vcs/VcsProcess.ts";
+
 // fff-node's native library stays external; single-executables require disk packages instead of importing them.
 const requireForFff = NodeModule.createRequire(import.meta.url);
 const { FileFinder } = requireForFff("@ff-labs/fff-node") as typeof import("@ff-labs/fff-node");
@@ -121,8 +121,9 @@ export class WorkspaceSearchIndex extends Context.Service<
   }
 >()("t3/workspace/WorkspaceSearchIndex") {}
 
-function toPosixPath(input: string): string {
-  return input.replaceAll("\\", "/");
+// Only the host separator becomes `/`: on POSIX `\` is a file name character.
+function toPosixPath(input: string, hostIsWindows: boolean): string {
+  return hostIsWindows ? input.replaceAll("\\", "/") : input;
 }
 
 function trimDirectorySeparator(input: string): string {
@@ -134,8 +135,8 @@ function parentPathOf(input: string): string | undefined {
   return separatorIndex === -1 ? undefined : input.slice(0, separatorIndex);
 }
 
-function toProjectEntry(item: MixedItem): ProjectEntry | null {
-  const normalizedPath = trimDirectorySeparator(toPosixPath(item.item.relativePath));
+function toProjectEntry(item: MixedItem, hostIsWindows: boolean): ProjectEntry | null {
+  const normalizedPath = trimDirectorySeparator(toPosixPath(item.item.relativePath, hostIsWindows));
   if (!normalizedPath) {
     return null;
   }
@@ -146,23 +147,26 @@ function toProjectEntry(item: MixedItem): ProjectEntry | null {
   };
 }
 
-function toFileEntry(item: FileItem): ProjectEntry | null {
-  const normalizedPath = trimDirectorySeparator(toPosixPath(item.relativePath));
+function toFileEntry(item: FileItem, hostIsWindows: boolean): ProjectEntry | null {
+  const normalizedPath = trimDirectorySeparator(toPosixPath(item.relativePath, hostIsWindows));
   return normalizedPath ? { path: normalizedPath, kind: "file" } : null;
 }
 
-function toDirectoryEntry(item: DirItem): ProjectEntry | null {
-  const normalizedPath = trimDirectorySeparator(toPosixPath(item.relativePath));
+function toDirectoryEntry(item: DirItem, hostIsWindows: boolean): ProjectEntry | null {
+  const normalizedPath = trimDirectorySeparator(toPosixPath(item.relativePath, hostIsWindows));
   return normalizedPath ? { path: normalizedPath, kind: "directory" } : null;
 }
 
+type SearchPage<I> = { readonly items: ReadonlyArray<I>; readonly totalMatched: number };
+
 function mapFileSearchResult(
-  result: SearchResult,
+  result: SearchPage<FileItem>,
   limit: number,
+  hostIsWindows: boolean,
   imageOnly = false,
 ): ProjectSearchEntriesResult {
   const entries = result.items.flatMap((item) => {
-    const entry = toFileEntry(item);
+    const entry = toFileEntry(item, hostIsWindows);
     return entry && (!imageOnly || isProjectFaviconPath(entry.path)) ? [entry] : [];
   });
   return {
@@ -172,11 +176,12 @@ function mapFileSearchResult(
 }
 
 function mapDirectorySearchResult(
-  result: DirSearchResult,
+  result: SearchPage<DirItem>,
   limit: number,
+  hostIsWindows: boolean,
 ): ProjectSearchEntriesResult {
   const entries = result.items.flatMap((item) => {
-    const entry = toDirectoryEntry(item);
+    const entry = toDirectoryEntry(item, hostIsWindows);
     return entry ? [entry] : [];
   });
   const rootDirectoryCount = result.items.some((item) => item.relativePath.length === 0) ? 1 : 0;
@@ -187,12 +192,13 @@ function mapDirectorySearchResult(
 }
 
 function mapMixedSearchResult(
-  result: MixedSearchResult,
+  result: SearchPage<MixedItem>,
   limit: number,
+  hostIsWindows: boolean,
 ): { readonly entries: ProjectEntry[]; readonly truncated: boolean } {
   const entries: ProjectEntry[] = [];
   for (const item of result.items) {
-    const entry = toProjectEntry(item);
+    const entry = toProjectEntry(item, hostIsWindows);
     if (entry) {
       entries.push(entry);
     }
@@ -284,6 +290,61 @@ function withDirectoryAncestors(entries: ReadonlyArray<ProjectEntry>): ProjectEn
   return [...entryByPath.values()];
 }
 
+// fff applies .gitignore files only; Git also ignores paths from .git/info/exclude and the global excludes file.
+const listGitIgnoredPaths = Effect.fn("WorkspaceSearchIndex.listGitIgnoredPaths")(function* (
+  vcsProcess: VcsProcess.VcsProcess["Service"],
+  cwd: string,
+  hostIsWindows: boolean,
+) {
+  const result = yield* vcsProcess
+    .run({
+      operation: "WorkspaceSearchIndex.listGitIgnoredPaths",
+      command: "git",
+      args: [
+        "-c",
+        "core.fsmonitor=false",
+        "ls-files",
+        "--others",
+        "--ignored",
+        "--exclude-standard",
+        "--directory",
+        "-z",
+      ],
+      cwd,
+      allowNonZeroExit: true,
+      timeoutMs: 10_000,
+      maxOutputBytes: 16 * 1024 * 1024,
+    })
+    .pipe(Effect.orElseSucceed(() => undefined));
+  if (!result || result.exitCode !== 0 || result.stdoutTruncated) return new Set<string>();
+  return new Set(
+    result.stdout
+      .split("\0")
+      .filter((entry) => entry.length > 0)
+      .map((entry) => trimDirectorySeparator(toPosixPath(entry, hostIsWindows))),
+  );
+});
+
+function mixedItemPath(item: MixedItem): string {
+  return item.item.relativePath;
+}
+
+function isIgnoredPath(
+  ignoredPaths: ReadonlySet<string>,
+  relativePath: string,
+  hostIsWindows: boolean,
+): boolean {
+  if (ignoredPaths.size === 0) return false;
+  let candidate: string | undefined = trimDirectorySeparator(
+    toPosixPath(relativePath, hostIsWindows),
+  );
+  while (candidate) {
+    if (ignoredPaths.has(candidate)) return true;
+    candidate = parentPathOf(candidate);
+  }
+  return false;
+}
+
 const createFinder = Effect.fn("WorkspaceSearchIndex.createFinder")(function* (
   cwd: string,
   variant: WorkspaceSearchIndexVariant,
@@ -339,6 +400,7 @@ export const make = Effect.fn("WorkspaceSearchIndex.make")(function* (
   cwd: string,
   variant: WorkspaceSearchIndexVariant = "paths",
 ) {
+  const hostIsWindows = yield* HostProcess.isWindows;
   const finder = yield* Effect.acquireRelease(createFinder(cwd, variant), (finder) =>
     Effect.try({
       try: () => finder.destroy(),
@@ -346,6 +408,8 @@ export const make = Effect.fn("WorkspaceSearchIndex.make")(function* (
     }).pipe(Effect.orDie),
   );
   let initialScanTimedOut = false;
+  const vcsProcess = yield* VcsProcess.VcsProcess;
+  let ignoredPaths = yield* listGitIgnoredPaths(vcsProcess, cwd, hostIsWindows);
   yield* waitForIndexReady(
     cwd,
     finder,
@@ -396,15 +460,46 @@ export const make = Effect.fn("WorkspaceSearchIndex.make")(function* (
     return result.value;
   });
 
+  // Grows the first page until hidden entries can no longer crowd visible ones out of it.
+  const searchVisible = Effect.fn("WorkspaceSearchIndex.searchVisible")(function* <I>(
+    query: string,
+    pageSize: number,
+    operation: "directorySearch" | "fileSearch" | "mixedSearch",
+    execute: (pageSize: number) => Result<SearchPage<I>>,
+    pathOf: (item: I) => string,
+  ): Effect.fn.Return<SearchPage<I>, WorkspaceSearchIndexSearchFailed> {
+    let size = pageSize;
+    while (true) {
+      const fetchSize = size;
+      const result = yield* runSearch(query, fetchSize, operation, () => execute(fetchSize));
+      if (ignoredPaths.size === 0) return result;
+      const items = result.items.filter(
+        (item) => !isIgnoredPath(ignoredPaths, pathOf(item), hostIsWindows),
+      );
+      if (
+        items.length >= pageSize ||
+        result.items.length >= result.totalMatched ||
+        fetchSize >= WORKSPACE_INDEX_PAGE_SIZE
+      ) {
+        return {
+          items,
+          totalMatched: result.totalMatched - (result.items.length - items.length),
+        };
+      }
+      size = Math.min(WORKSPACE_INDEX_PAGE_SIZE, fetchSize * 4);
+    }
+  });
+
   const refresh: WorkspaceSearchIndex["Service"]["refresh"] = Effect.fn(
     "WorkspaceSearchIndex.refresh",
   )(function* () {
-    const result = yield* Effect.try({
-      try: () => finder.scanFiles(),
+    // scanFiles waits on fff's picker lock, which its watcher can hold for seconds.
+    const result = yield* Effect.tryPromise({
+      try: () => finder.scanFilesAsync(),
       catch: (cause) =>
         new WorkspaceSearchIndexRefreshFailed({
           cwd,
-          reason: "FileFinder.scanFiles threw unexpectedly.",
+          reason: "FileFinder.scanFilesAsync rejected unexpectedly.",
           cause,
         }),
     });
@@ -426,15 +521,20 @@ export const make = Effect.fn("WorkspaceSearchIndex.make")(function* (
           cause,
         }),
     ).pipe(Effect.catchTags({ WorkspaceSearchIndexScanTimedOut: () => Effect.void }));
+    ignoredPaths = yield* listGitIgnoredPaths(vcsProcess, cwd, hostIsWindows);
   });
 
   const list: WorkspaceSearchIndex["Service"]["list"] = Effect.fn("WorkspaceSearchIndex.list")(
     function* () {
       const incompleteBeforeQuery = hasIncompleteInitialScan();
-      const result = yield* runSearch("", WORKSPACE_INDEX_PAGE_SIZE, "mixedSearch", () =>
-        finder.mixedSearch("", { pageSize: WORKSPACE_INDEX_PAGE_SIZE }),
+      const result = yield* searchVisible(
+        "",
+        WORKSPACE_INDEX_PAGE_SIZE,
+        "mixedSearch",
+        (pageSize) => finder.mixedSearch("", { pageSize }),
+        mixedItemPath,
       );
-      const mapped = mapMixedSearchResult(result, WORKSPACE_INDEX_MAX_ENTRIES);
+      const mapped = mapMixedSearchResult(result, WORKSPACE_INDEX_MAX_ENTRIES, hostIsWindows);
       const sortedEntries = withDirectoryAncestors(mapped.entries).toSorted((left, right) =>
         left.path.localeCompare(right.path),
       );
@@ -455,21 +555,33 @@ export const make = Effect.fn("WorkspaceSearchIndex.make")(function* (
   ) {
     const pageSize = imageOnly ? WORKSPACE_INDEX_PAGE_SIZE : Math.max(1, limit + 1);
     if (kind === "file" || imageOnly) {
-      const result = yield* runSearch(query, pageSize, "fileSearch", () =>
-        finder.fileSearch(query, { pageSize }),
+      const result = yield* searchVisible(
+        query,
+        pageSize,
+        "fileSearch",
+        (size) => finder.fileSearch(query, { pageSize: size }),
+        (item) => item.relativePath,
       );
-      return mapFileSearchResult(result, limit, imageOnly);
+      return mapFileSearchResult(result, limit, hostIsWindows, imageOnly);
     }
     if (kind === "directory") {
-      const result = yield* runSearch(query, pageSize, "directorySearch", () =>
-        finder.directorySearch(query, { pageSize }),
+      const result = yield* searchVisible(
+        query,
+        pageSize,
+        "directorySearch",
+        (size) => finder.directorySearch(query, { pageSize: size }),
+        (item) => item.relativePath,
       );
-      return mapDirectorySearchResult(result, limit);
+      return mapDirectorySearchResult(result, limit, hostIsWindows);
     }
-    const result = yield* runSearch(query, pageSize, "mixedSearch", () =>
-      finder.mixedSearch(query, { pageSize }),
+    const result = yield* searchVisible(
+      query,
+      pageSize,
+      "mixedSearch",
+      (size) => finder.mixedSearch(query, { pageSize: size }),
+      mixedItemPath,
     );
-    return mapMixedSearchResult(result, limit);
+    return mapMixedSearchResult(result, limit, hostIsWindows);
   });
 
   const search: WorkspaceSearchIndex["Service"]["search"] = Effect.fn(
@@ -522,13 +634,14 @@ export const make = Effect.fn("WorkspaceSearchIndex.make")(function* (
       }
 
       for (const match of result.items) {
+        if (isIgnoredPath(ignoredPaths, match.relativePath, hostIsWindows)) continue;
         const matchRanges = mapContentMatchRanges(match.lineContent, match.matchRanges).filter(
           (range) => !input.wholeWord || isWholeWordRange(match.lineContent, range),
         );
         // fff reports hits past its 512-char lineContent cap with no ranges, so whole words can't be verified there.
         if (input.wholeWord && matchRanges.length === 0) continue;
         matches.push({
-          path: toPosixPath(match.relativePath),
+          path: toPosixPath(match.relativePath, hostIsWindows),
           lineNumber: match.lineNumber,
           lineContent: match.lineContent,
           matchRanges,
diff --git a/apps/server/src/workspace/restoreMissingWorktree.ts b/apps/server/src/workspace/restoreMissingWorktree.ts
new file mode 100644
index 000000000000..ee423c47d06a
--- /dev/null
+++ b/apps/server/src/workspace/restoreMissingWorktree.ts
@@ -0,0 +1,179 @@
+import { ThreadId, type ProjectId, type TerminalCwdNotFoundError } from "@t3tools/contracts";
+import * as Effect from "effect/Effect";
+import * as FileSystem from "effect/FileSystem";
+import * as Option from "effect/Option";
+import * as Path from "effect/Path";
+import * as Schema from "effect/Schema";
+
+import * as GitWorkflowService from "../git/GitWorkflowService.ts";
+import * as ProjectService from "../project/ProjectService.ts";
+import { makeIsManagedWorktreePath } from "../worktreesDirectory.ts";
+import { isWithinRoot } from "./KnownWorkspaces.ts";
+import { TerminalCwdRecovery } from "../terminal/Manager.ts";
+
+class WorktreeRecreateError extends Schema.TaggedError<WorktreeRecreateError>()(
+  "WorktreeRecreateError",
+  {
+    worktreePath: Schema.String,
+    branch: Schema.String,
+    cause: Schema.Defect(),
+  },
+) {
+  override get message(): string {
+    return `Could not recreate the worktree for branch '${this.branch}' at ${this.worktreePath}.`;
+  }
+}
+
+class WorktreeRecreateNoBaseError extends Schema.TaggedError<WorktreeRecreateNoBaseError>()(
+  "WorktreeRecreateNoBaseError",
+  { worktreePath: Schema.String, branch: Schema.String },
+) {
+  override get message(): string {
+    return `Could not recreate branch '${this.branch}' at ${this.worktreePath}: the project workspace has no commit to start it from.`;
+  }
+}
+
+interface WorktreeThread {
+  readonly id: ThreadId;
+  readonly projectId: ProjectId;
+  readonly worktreePath: string | null;
+  readonly branch: string | null;
+}
+
+export const makeRestoreMissingWorktree = Effect.gen(function* () {
+  const fileSystem = yield* FileSystem.FileSystem;
+  const gitWorkflow = yield* GitWorkflowService.GitWorkflowService;
+  const projects = yield* ProjectService.ProjectService;
+  const isManagedWorktreePath = yield* makeIsManagedWorktreePath;
+
+  const resolveRecreateBase = Effect.fn("restoreMissingWorktree.resolveRecreateBase")(function* (
+    cwd: string,
+    remoteName: string | null,
+  ) {
+    // Recovery can follow an external checkout, before the status cache expires.
+    yield* gitWorkflow.invalidateLocalStatus(cwd);
+    const { refName: currentBranch } = yield* gitWorkflow.localStatus({ cwd });
+    if (currentBranch !== null) {
+      const refName = `refs/heads/${currentBranch}`;
+      return { refName, baseRefName: refName };
+    }
+    const remoteHead = `refs/remotes/${remoteName}/HEAD`;
+    if (remoteName !== null && (yield* gitWorkflow.hasCommit({ cwd, refName: remoteHead }))) {
+      const { commitSha } = yield* gitWorkflow.resolveRemoteTrackingCommit({
+        cwd,
+        refName: "HEAD",
+        fallbackRemoteName: remoteName,
+      });
+      // Start from the commit so the thread branch does not track the default branch.
+      return { refName: commitSha, baseRefName: remoteHead };
+    }
+    if (yield* gitWorkflow.hasCommit({ cwd, refName: "HEAD" })) {
+      return { refName: "HEAD", baseRefName: undefined };
+    }
+    return null;
+  });
+
+  const recreateMissingWorktree = Effect.fn("restoreMissingWorktree.recreate")(function* (input: {
+    readonly cwd: string;
+    readonly worktreePath: string;
+    readonly branch: string;
+  }) {
+    const { cwd, worktreePath, branch } = input;
+    yield* gitWorkflow.pruneWorktrees({ cwd });
+    const localBranchNames = yield* gitWorkflow.listLocalBranchNames(cwd);
+    if (localBranchNames.includes(branch)) {
+      yield* gitWorkflow.createWorktree({ cwd, refName: branch, path: worktreePath });
+      return;
+    }
+    const remoteName = yield* gitWorkflow
+      .resolvePrimaryRemoteName(cwd)
+      .pipe(Effect.orElseSucceed(() => null));
+    // Push keeps the tracking ref current, so recovery reads it without fetching.
+    const pushedRef = remoteName === null ? null : `refs/remotes/${remoteName}/${branch}`;
+    if (pushedRef !== null && (yield* gitWorkflow.hasCommit({ cwd, refName: pushedRef }))) {
+      yield* gitWorkflow.createWorktree({
+        cwd,
+        refName: pushedRef,
+        newRefName: branch,
+        path: worktreePath,
+      });
+      return;
+    }
+    const base = yield* resolveRecreateBase(cwd, remoteName);
+    if (base === null) {
+      return yield* new WorktreeRecreateNoBaseError({ worktreePath, branch });
+    }
+    yield* gitWorkflow.createWorktree({
+      cwd,
+      refName: base.refName,
+      newRefName: branch,
+      ...(base.baseRefName === undefined ? {} : { baseRefName: base.baseRefName }),
+      path: worktreePath,
+    });
+  });
+
+  return Effect.fn("restoreMissingWorktree")(function* (thread: WorktreeThread) {
+    const { worktreePath, branch } = thread;
+    if (worktreePath === null || branch === null) return;
+    const exists = yield* fileSystem.exists(worktreePath).pipe(Effect.orElseSucceed(() => true));
+    if (exists || !(yield* isManagedWorktreePath(worktreePath))) return;
+    const project = yield* projects.getById(thread.projectId).pipe(
+      Effect.map(Option.getOrUndefined),
+      Effect.orElseSucceed(() => undefined),
+    );
+    if (project === undefined) return;
+    yield* Effect.logWarning("recreating missing worktree", {
+      threadId: thread.id,
+      worktreePath,
+      branch,
+    });
+    yield* recreateMissingWorktree({ cwd: project.workspaceRoot, worktreePath, branch }).pipe(
+      Effect.mapError((cause) =>
+        cause._tag === "WorktreeRecreateNoBaseError"
+          ? cause
+          : new WorktreeRecreateError({ worktreePath, branch, cause }),
+      ),
+    );
+  });
+});
+
+// Worktree setup uses terminals, so recovery must stay outside TerminalManager.
+export const makePrepareTerminalLaunch = Effect.fn(
+  "restoreMissingWorktree.makePrepareTerminalLaunch",
+)(function* <LookupError>(
+  getThreadShell: (threadId: ThreadId) => Effect.Effect<WorktreeThread | null, LookupError>,
+) {
+  const path = yield* Path.Path;
+  const restoreMissingWorktree = yield* makeRestoreMissingWorktree;
+  return Effect.fn("restoreMissingWorktree.prepareTerminalLaunch")(function* <
+    Input extends {
+      readonly threadId: string;
+      readonly cwd?: string | undefined;
+      readonly worktreePath?: string | null | undefined;
+    },
+  >(input: Input) {
+    const thread = yield* getThreadShell(ThreadId.make(input.threadId)).pipe(
+      Effect.orElseSucceed(() => null),
+    );
+    const worktreePath = thread?.worktreePath ?? null;
+    if (
+      thread === null ||
+      worktreePath === null ||
+      !isWithinRoot(path, path.resolve(input.cwd ?? worktreePath), worktreePath)
+    ) {
+      return { input, recover: TerminalCwdRecovery.defaultValue() };
+    }
+    const recover = (error: TerminalCwdNotFoundError) =>
+      restoreMissingWorktree(thread).pipe(
+        Effect.catch((cause) =>
+          Effect.logWarning("failed to recreate missing worktree", {
+            threadId: thread.id,
+            worktreePath,
+            cause,
+          }).pipe(Effect.andThen(Effect.fail(error))),
+        ),
+      );
+    // The lease must cover the worktree root, even when the terminal opens in a subdirectory.
+    return { input: { ...input, worktreePath }, recover };
+  });
+});
diff --git a/apps/server/src/workspace/workspaceLease.ts b/apps/server/src/workspace/workspaceLease.ts
index 8ad6e41b859c..90e6124bb186 100644
--- a/apps/server/src/workspace/workspaceLease.ts
+++ b/apps/server/src/workspace/workspaceLease.ts
@@ -1,4 +1,7 @@
+import * as Deferred from "effect/Deferred";
 import * as Effect from "effect/Effect";
+import type * as FileSystem from "effect/FileSystem";
+import type * as Path from "effect/Path";
 import * as Semaphore from "effect/Semaphore";
 
 const leases = new Map<string, { semaphore: Semaphore.Semaphore; users: number }>();
@@ -20,3 +23,92 @@ export const withWorkspaceLease = <A, E, R>(
       ),
     );
   });
+
+// A restore rewrites files under its directory, so it must exclude provider
+// startup in any overlapping workspace: symlink aliases, parents, and children.
+// Kept apart from withWorkspaceLease because that lease is non-reentrant and
+// restores call Git work that leases the project root.
+interface Reservation {
+  readonly cwd: string;
+  readonly kind: "restore" | "turn-start";
+}
+
+const reservations = new Set<Reservation>();
+let reservationReleased = Deferred.makeUnsafe<void>();
+
+// path.relative folds win32 drive-letter case and treats a POSIX backslash as
+// part of a name, unlike a raw prefix check.
+const contains = (path: Path.Path, parent: string, child: string) => {
+  const relative = path.relative(parent, child);
+  return (
+    relative === "" ||
+    (!path.isAbsolute(relative) && relative !== ".." && !relative.startsWith(`..${path.sep}`))
+  );
+};
+
+const conflicts = (path: Path.Path, a: Reservation, b: Reservation) =>
+  (a.kind === "restore" || b.kind === "restore") &&
+  (contains(path, a.cwd, b.cwd) || contains(path, b.cwd, a.cwd));
+
+const reserve = (path: Path.Path, reservation: Reservation): Effect.Effect<void> =>
+  Effect.suspend(() => {
+    for (const held of reservations) {
+      if (conflicts(path, held, reservation)) {
+        return Deferred.await(reservationReleased).pipe(Effect.andThen(reserve(path, reservation)));
+      }
+    }
+    reservations.add(reservation);
+    return Effect.void;
+  });
+
+const release = (reservation: Reservation) =>
+  Effect.sync(() => {
+    if (!reservations.delete(reservation)) return;
+    const released = reservationReleased;
+    reservationReleased = Deferred.makeUnsafe<void>();
+    Deferred.doneUnsafe(released, Effect.void);
+  });
+
+// A worktree removed by storage cleanup is recreated inside the reserved
+// section, so resolve its nearest existing ancestor: a symlink alias above it
+// must still canonicalize the same on both sides. Walks at most the path depth.
+const canonicalize = (
+  fileSystem: FileSystem.FileSystem,
+  path: Path.Path,
+  target: string,
+): Effect.Effect<string> =>
+  fileSystem.realPath(target).pipe(
+    Effect.catchReason("PlatformError", "NotFound", () => {
+      const parent = path.dirname(target);
+      return parent === target
+        ? Effect.succeed(target)
+        : canonicalize(fileSystem, path, parent).pipe(
+            Effect.map((resolved) => path.join(resolved, path.basename(target))),
+          );
+    }),
+    Effect.orElseSucceed(() => target),
+  );
+
+const withReservation =
+  (kind: Reservation["kind"]) =>
+  <A, E, R>(
+    fileSystem: FileSystem.FileSystem,
+    path: Path.Path,
+    cwd: string,
+    effect: Effect.Effect<A, E, R>,
+  ): Effect.Effect<A, E, R> =>
+    canonicalize(fileSystem, path, cwd).pipe(
+      Effect.flatMap((canonical) => {
+        const reservation: Reservation = { cwd: canonical, kind };
+        return reserve(path, reservation).pipe(
+          Effect.andThen(effect),
+          Effect.ensuring(release(reservation)),
+        );
+      }),
+    );
+
+/** Exclusive over every overlapping workspace while checkpoint files are restored. */
+export const withCheckpointRestoreReservation = withReservation("restore");
+
+/** Waits out overlapping restores; turn startups never wait on each other. */
+export const withTurnStartReservation = withReservation("turn-start");
diff --git a/apps/server/src/ws.test.ts b/apps/server/src/ws.test.ts
index 492b874cc451..c4470e0905c8 100644
--- a/apps/server/src/ws.test.ts
+++ b/apps/server/src/ws.test.ts
@@ -3,6 +3,7 @@ import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
 import * as NodeServices from "@effect/platform-node/NodeServices";
 import { assert, it } from "@effect/vitest";
 import {
+  AuthAccessReadScope,
   AuthOrchestrationOperateScope,
   AuthOrchestrationReadScope,
   AuthSessionId,
@@ -22,6 +23,7 @@ import {
   WsRpcGroup,
   WsServerRefreshProvidersRpc,
   WsSubscribeServerConfigRpc,
+  type AuthAccessStreamEvent,
   type OrchestrationV2AppThread,
   type OrchestrationV2DomainEvent,
   type OrchestrationV2StoredEvent,
@@ -135,6 +137,7 @@ import * as TriageService from "./triage/TriageService.ts";
 import * as TextGenerators from "./textGeneration/TextGenerators.ts";
 import * as WorkspacePaths from "./workspace/WorkspacePaths.ts";
 import * as ServerSecretStore from "./auth/ServerSecretStore.ts";
+import * as SecretCheck from "./secrets/SecretCheck.ts";
 import * as ServerConfigModule from "./config.ts";
 import * as Keybindings from "./keybindings.ts";
 import { USAGE_LIMITS_COMMAND } from "@t3tools/shared/usageLimits";
@@ -234,7 +237,7 @@ it.effect("resends a reveal kind and remote targets that outlast the snapshot ti
       assert.deepEqual(remote.config.remoteOpenTargets, targets);
       assert.equal(remote.config.shellRevealInFileManagerKind, "file-explorer");
     }
-  }).pipe(Effect.scoped),
+  }),
 );
 
 it.effect("runs editor, remote open target and direct endpoint discovery side by side", () =>
@@ -273,25 +276,23 @@ const ReplayTestLayer = OrchestrationEventStore.layer.pipe(
   Layer.provideMerge(SqlitePersistence.layerMemory),
 );
 
-it.live.each(["thread", "shell"] as const)(
-  "%s resume skips unknown types, synchronizes, and receives the live tail",
-  (scope) =>
-    Effect.gen(function* () {
-      const store = yield* OrchestrationEventStore.OrchestrationEventStore;
-      const sql = yield* SqlClient.SqlClient;
-      const now = "2026-01-05T00:00:00.000Z";
-      const threadId = ThreadId.make("thread:replay");
-      const projectId = ProjectId.make("project:replay");
-      const project = {
-        id: projectId,
-        title: "Replay",
-        workspaceRoot: "/tmp/replay",
-        defaultModelSelection: null,
-        scripts: [],
-        createdAt: now,
-        updatedAt: now,
-      } satisfies OrchestrationProjectShell;
-      const insert = (version: number, unknown = false) => sql<{ sequence: number }>`
+const resumeSkipsUnknownTypes = (scope: "thread" | "shell") =>
+  Effect.gen(function* () {
+    const store = yield* OrchestrationEventStore.OrchestrationEventStore;
+    const sql = yield* SqlClient.SqlClient;
+    const now = "2026-01-05T00:00:00.000Z";
+    const threadId = ThreadId.make("thread:replay");
+    const projectId = ProjectId.make("project:replay");
+    const project = {
+      id: projectId,
+      title: "Replay",
+      workspaceRoot: "/tmp/replay",
+      defaultModelSelection: null,
+      scripts: [],
+      createdAt: now,
+      updatedAt: now,
+    } satisfies OrchestrationProjectShell;
+    const insert = (version: number, unknown = false) => sql<{ sequence: number }>`
         INSERT INTO orchestration_events (
           event_id, aggregate_kind, stream_id, stream_version, event_type,
           occurred_at, actor_kind, payload_json, metadata_json, application_event_version
@@ -306,85 +307,91 @@ it.live.each(["thread", "shell"] as const)(
           )}, '{}', 2
         ) RETURNING sequence
       `;
-      const [before] = yield* insert(0);
-      yield* insert(1, true);
-      const [after] = yield* insert(2);
-      const [highWater] = yield* insert(3, true);
-      const updates = yield* PubSub.unbounded();
-      let liveSequence = 0;
-      const consume = <A extends { readonly kind: string; readonly sequence?: number }, E, R>(
-        stream: Stream.Stream<A, E, R>,
-      ) =>
-        stream.pipe(
-          Stream.tap((item) =>
-            Effect.gen(function* () {
-              if (item.kind !== "synchronized") return;
-              const [live] = yield* insert(4);
-              liveSequence = live!.sequence;
-              const events = yield* store
-                .readApplicationEvents({
-                  afterSequence: highWater!.sequence,
-                  throughSequence: liveSequence,
-                })
-                .pipe(Stream.runCollect);
-              yield* store.publishCommitted(events);
-            }),
-          ),
-          Stream.takeUntil((item) => item.sequence === liveSequence),
-          Stream.map((item) => ({ kind: item.kind as string, sequence: item.sequence })),
-          Stream.runCollect,
-        );
-      const subscription = Effect.gen(function* () {
-        return scope === "thread"
-          ? yield* subscribeOrchestrationV2Thread({
-              threadId,
-              afterSequence: before!.sequence,
-              requestCompletionMarker: true,
-            }).pipe(Effect.flatMap(consume))
-          : yield* subscribeOrchestrationV2Shell({
-              afterSequence: before!.sequence,
-              requestCompletionMarker: true,
-            }).pipe(Effect.flatMap(consume));
-      });
-      const items = yield* subscription.pipe(
-        Effect.provideService(ThreadManagement.ThreadManagementService, {
-          ensureLegacyTranscript: () => Effect.void,
-          getShellSnapshot: () => Effect.die("shell resume must not load a full snapshot"),
-          listActiveSubagentThreadIds: () => Effect.succeed([]),
-          streamStoredEventsFrom: (
-            input: Parameters<
-              ThreadManagement.ThreadManagementService["Service"]["streamStoredEventsFrom"]
-            >[0],
-          ) => {
-            assert.equal(input?.afterSequence, highWater!.sequence);
-            return store
-              .streamApplicationEvents({ afterSequence: input?.afterSequence ?? 0 })
-              .pipe(
-                Stream.filter((event): event is OrchestrationV2StoredEvent => "event" in event),
-              );
-          },
-        } as unknown as ThreadManagement.ThreadManagementService["Service"]),
-        Effect.provideService(ProjectStore.ProjectStoreV2, {
-          listShells: () => Effect.succeed([]),
-        } as unknown as ProjectStore.ProjectStoreV2["Service"]),
-        Effect.provideService(ProjectService.ProjectService, {
-          getShell: () => Effect.succeedSome(project),
-        } as unknown as ProjectService.ProjectService["Service"]),
-        Effect.provideService(ProjectEnrichment.ProjectEnrichmentService, {
-          subscribeChanges: PubSub.subscribe(updates),
-        } as ProjectEnrichment.ProjectEnrichmentService["Service"]),
-      );
-      assert.deepEqual(
-        items.map((item) => item.kind),
-        scope === "thread"
-          ? ["event", "synchronized", "event"]
-          : ["project.updated", "synchronized", "project.updated"],
-      );
-      assert.deepEqual(
-        items.flatMap((item) => (item.sequence === undefined ? [] : [item.sequence])),
-        [after!.sequence, liveSequence],
+    const [before] = yield* insert(0);
+    yield* insert(1, true);
+    const [after] = yield* insert(2);
+    const [highWater] = yield* insert(3, true);
+    const updates = yield* PubSub.unbounded();
+    let liveSequence = 0;
+    const consume = <A extends { readonly kind: string; readonly sequence?: number }, E, R>(
+      stream: Stream.Stream<A, E, R>,
+    ) =>
+      stream.pipe(
+        Stream.tap((item) =>
+          Effect.gen(function* () {
+            if (item.kind !== "synchronized") return;
+            const [live] = yield* insert(4);
+            liveSequence = live!.sequence;
+            const events = yield* store
+              .readApplicationEvents({
+                afterSequence: highWater!.sequence,
+                throughSequence: liveSequence,
+              })
+              .pipe(Stream.runCollect);
+            yield* store.publishCommitted(events);
+          }),
+        ),
+        Stream.takeUntil((item) => item.sequence === liveSequence),
+        Stream.map((item) => ({ kind: item.kind as string, sequence: item.sequence })),
+        Stream.runCollect,
       );
-    }).pipe(Effect.scoped, Effect.provide(ReplayTestLayer)),
+    const subscription = Effect.gen(function* () {
+      return scope === "thread"
+        ? yield* subscribeOrchestrationV2Thread({
+            threadId,
+            afterSequence: before!.sequence,
+            requestCompletionMarker: true,
+          }).pipe(Effect.flatMap(consume))
+        : yield* subscribeOrchestrationV2Shell({
+            afterSequence: before!.sequence,
+            requestCompletionMarker: true,
+          }).pipe(Effect.flatMap(consume));
+    });
+    const items = yield* subscription.pipe(
+      Effect.provideService(ThreadManagement.ThreadManagementService, {
+        ensureLegacyTranscript: () => Effect.void,
+        getShellSnapshot: () => Effect.die("shell resume must not load a full snapshot"),
+        listActiveSubagentThreadIds: () => Effect.succeed([]),
+        streamStoredEventsFrom: (
+          input: Parameters<
+            ThreadManagement.ThreadManagementService["Service"]["streamStoredEventsFrom"]
+          >[0],
+        ) => {
+          assert.equal(input?.afterSequence, highWater!.sequence);
+          return store
+            .streamApplicationEvents({ afterSequence: input?.afterSequence ?? 0 })
+            .pipe(Stream.filter((event): event is OrchestrationV2StoredEvent => "event" in event));
+        },
+      } as unknown as ThreadManagement.ThreadManagementService["Service"]),
+      Effect.provideService(ProjectStore.ProjectStoreV2, {
+        listShells: () => Effect.succeed([]),
+      } as unknown as ProjectStore.ProjectStoreV2["Service"]),
+      Effect.provideService(ProjectService.ProjectService, {
+        getShell: () => Effect.succeedSome(project),
+      } as unknown as ProjectService.ProjectService["Service"]),
+      Effect.provideService(ProjectEnrichment.ProjectEnrichmentService, {
+        subscribeChanges: PubSub.subscribe(updates),
+      } as ProjectEnrichment.ProjectEnrichmentService["Service"]),
+    );
+    assert.deepEqual(
+      items.map((item) => item.kind),
+      scope === "thread"
+        ? ["event", "synchronized", "event"]
+        : ["project.updated", "synchronized", "project.updated"],
+    );
+    assert.deepEqual(
+      items.flatMap((item) => (item.sequence === undefined ? [] : [item.sequence])),
+      [after!.sequence, liveSequence],
+    );
+  }).pipe(Effect.scoped, Effect.provide(ReplayTestLayer));
+
+it.effect("thread resume skips unknown types, synchronizes, and receives the live tail", () =>
+  resumeSkipsUnknownTypes("thread"),
+);
+
+// Shell updates batch through `Stream.groupedWithin`, whose window needs real time to close.
+it.live("shell resume skips unknown types, synchronizes, and receives the live tail", () =>
+  resumeSkipsUnknownTypes("shell"),
 );
 
 it.effect("coalesces streaming replay before synchronization and the live tail", () =>
@@ -790,6 +797,7 @@ it.effect("shell snapshots omit idle children and older settled threads only on
 const layerUnusedConfigRpcServices = Layer.mergeAll(
   Layer.mock(DocumentText.DocumentText)({}),
   Layer.mock(ServerSecretStore.ServerSecretStore)({}),
+  Layer.mock(SecretCheck.SecretCheck)({}),
   Layer.mock(WorkspacePaths.WorkspacePaths)({}),
   Layer.mock(TraceDiagnostics.TraceDiagnostics)({}),
   Layer.mock(TriageService.TriageService)({}),
@@ -1136,10 +1144,120 @@ it.effect.each([
           Layer.mock(ServerBrowser.ServerBrowser)({}),
         ),
       ),
-      Effect.scoped,
     ),
 );
 
+it.effect("access changes made while the snapshot loads reach the client after it", () =>
+  Effect.gen(function* () {
+    const pairingChanges = yield* PubSub.unbounded<PairingGrantStore.BootstrapCredentialChange>();
+    const sessionChanges = yield* PubSub.unbounded<SessionStore.SessionCredentialChange>();
+    const subscribed = yield* Queue.unbounded<void>();
+    const subscribe = <A>(changes: PubSub.PubSub<A>) =>
+      Stream.unwrap(
+        PubSub.subscribe(changes).pipe(
+          Effect.tap(() => Queue.offer(subscribed, undefined)),
+          Effect.map(Stream.fromSubscription),
+        ),
+      );
+    const revokedElsewhere = AuthSessionId.make("revoked-elsewhere");
+    const responses = yield* Queue.unbounded<AuthAccessStreamEvent>();
+    const server = yield* RpcServer.makeNoSerialization(WsRpcGroup, {
+      ...WS_RPC_SERVER_OPTIONS,
+      onFromServer: (response) =>
+        response._tag === "Chunk"
+          ? Effect.forEach(
+              response.values,
+              (event) => Queue.offer(responses, event as AuthAccessStreamEvent),
+              {
+                discard: true,
+              },
+            )
+          : Effect.void,
+    }).pipe(
+      Effect.provide(
+        layerWsRpc(
+          {
+            sessionId: AuthSessionId.make("current"),
+            subject: "current",
+            method: "browser-session-cookie",
+            scopes: [],
+          },
+          {},
+          yield* ServerBrowser.ServerBrowser,
+          () => Effect.void,
+          { secretReferences: true },
+        ).pipe(
+          Layer.merge(RpcAuthorization.layer([AuthAccessReadScope])),
+          Layer.provide(
+            Layer.mergeAll(
+              layerUnusedConfigRpcServices,
+              Layer.mock(ExternalLauncher.ExternalLauncher)({}),
+              Layer.mock(ProviderRegistry.ProviderRegistry)({}),
+              Layer.mock(UsageLimitSources.UsageLimitSources)({}),
+              Layer.mock(RemoteOpenTargets.RemoteOpenTargets)({}),
+              Layer.mock(DirectEndpoints.DirectEndpoints)({}),
+              Layer.mock(ManagedProjectFolders.ManagedProjectFolders)({
+                namedProjectsRoot: "/unused",
+              }),
+              Layer.mock(ScratchThreadPromotion.ScratchThreadPromotion)({}),
+              Layer.mock(ServerEnvironment.ServerEnvironment)({}),
+              Layer.mock(EnvironmentAuth.EnvironmentAuth)({
+                listPairingLinks: () => Effect.succeed([]),
+                // Another client revokes a session after the snapshot read it.
+                listClientSessions: () =>
+                  PubSub.publish(sessionChanges, {
+                    type: "clientRemoved",
+                    sessionId: revokedElsewhere,
+                  }).pipe(Effect.as([])),
+              }),
+              Layer.mock(PairingGrantStore.PairingGrantStore)({
+                streamChanges: subscribe(pairingChanges),
+              }),
+              Layer.mock(SessionStore.SessionStore)({
+                cookieName: "auth-access-test",
+                legacyCookieName: undefined,
+                streamChanges: subscribe(sessionChanges),
+              }),
+            ),
+          ),
+        ),
+      ),
+    );
+    const requestId = RpcMessage.RequestId("auth-access");
+    yield* server.write(0, {
+      _tag: "Request",
+      id: requestId,
+      tag: WS_METHODS.subscribeAuthAccess,
+      payload: {},
+      headers: Headers.empty,
+    });
+    const snapshot = yield* Queue.take(responses);
+    assert.equal(snapshot.type, "snapshot");
+    yield* server.write(0, { _tag: "Ack", requestId });
+    yield* Queue.take(subscribed);
+    yield* Queue.take(subscribed);
+
+    // A later change arrives either way, so a dropped revocation fails as a mismatch.
+    yield* PubSub.publish(pairingChanges, { type: "pairingLinkRemoved", id: "later" });
+    const next = yield* Queue.take(responses);
+    assert.deepEqual(next, {
+      version: 1,
+      revision: 2,
+      type: "clientRemoved",
+      payload: { sessionId: revokedElsewhere },
+    });
+    yield* server.write(0, { _tag: "Interrupt", requestId, interruptors: [] });
+  }).pipe(
+    Effect.provide(
+      Layer.mergeAll(
+        Layer.fresh(layerConfigSources),
+        Layer.mock(PreviewAutomationBroker.PreviewAutomationBroker)({}),
+        Layer.mock(ServerBrowser.ServerBrowser)({}),
+      ),
+    ),
+  ),
+);
+
 it.effect("on-demand clients get provider config without workspace snapshots", () =>
   Effect.gen(function* () {
     const instanceId = ProviderInstanceId.make("claudeAgent");
@@ -1491,7 +1609,6 @@ it.effect("on-demand clients get provider config without workspace snapshots", (
         Layer.mock(ServerBrowser.ServerBrowser)({}),
       ),
     ),
-    Effect.scoped,
   ),
 );
 
@@ -1663,7 +1780,6 @@ it.effect("a missing thread worktree gets its project's skills in the cwd snapsh
         Layer.mock(ServerBrowser.ServerBrowser)({}),
       ),
     ),
-    Effect.scoped,
   ),
 );
 
@@ -1737,7 +1853,6 @@ it.effect("a git action that fails partway still refreshes the repository status
         Layer.mock(ServerBrowser.ServerBrowser)({}),
       ),
     ),
-    Effect.scoped,
   ),
 );
 
@@ -1825,7 +1940,6 @@ it.effect("a publish whose push fails still refreshes the new remote", () =>
         Layer.mock(ServerBrowser.ServerBrowser)({}),
       ),
     ),
-    Effect.scoped,
   ),
 );
 
@@ -2329,6 +2443,5 @@ it.effect("ACP session RPCs list a thread missing its history and repair it on i
         Layer.mock(ServerBrowser.ServerBrowser)({}),
       ),
     ),
-    Effect.scoped,
   ),
 );
diff --git a/apps/server/src/ws.ts b/apps/server/src/ws.ts
index 4cfceb4ed800..1f2a148734d4 100644
--- a/apps/server/src/ws.ts
+++ b/apps/server/src/ws.ts
@@ -173,6 +173,7 @@ import * as ThreadSearch from "./orchestration-v2/ThreadSearch.ts";
 import * as OrchestrationEventStore from "./persistence/OrchestrationEventStore.ts";
 import { userFacingDispatchErrorMessage } from "./orchestration-v2/UserFacingErrors.ts";
 import * as ProviderRegistry from "./provider/ProviderRegistry.ts";
+import * as SecretCheck from "./secrets/SecretCheck.ts";
 import * as AcpRegistrySessions from "./provider/AcpRegistrySessions.ts";
 import * as ProviderInstanceRegistry from "./provider/ProviderInstanceRegistry.ts";
 import * as AcpRegistrySupport from "@t3tools/provider-acp-registry/server/AcpRegistrySupport";
@@ -190,6 +191,7 @@ import { invalidateSettingsSecrets } from "./sourceControl/sourceControlHostSecr
 import * as DatabaseStorage from "./persistence/DatabaseStorage.ts";
 import * as StorageCleanup from "./storageCleanup.ts";
 import * as TerminalManager from "./terminal/Manager.ts";
+import { makePrepareTerminalLaunch } from "./workspace/restoreMissingWorktree.ts";
 import { terminalOutputStream, withOutputWindow } from "./terminal/OutputProtocol.ts";
 import * as ServerBrowser from "./preview/ServerBrowser.ts";
 import * as DeviceService from "./device/DeviceService.ts";
@@ -1513,6 +1515,9 @@ export const layerWsRpc = (
       const vcsProvisioning = yield* VcsProvisioningService.VcsProvisioningService;
       const vcsStatusBroadcaster = yield* VcsStatusBroadcaster.VcsStatusBroadcaster;
       const terminalManager = yield* TerminalManager.TerminalManager;
+      const prepareTerminalLaunch = yield* makePrepareTerminalLaunch(
+        threadManagement.getThreadShell,
+      );
       const previewManager = yield* PreviewManager.PreviewManager;
       const portDiscovery = yield* PortScanner.PortDiscovery;
       const providerRegistry = yield* ProviderRegistry.ProviderRegistry;
@@ -1556,6 +1561,7 @@ export const layerWsRpc = (
       );
       const serverAuth = yield* EnvironmentAuth.EnvironmentAuth;
       const sourceControlDiscovery = yield* SourceControlDiscovery.SourceControlDiscovery;
+      const secretCheck = yield* SecretCheck.SecretCheck;
       const otlpEndpointCheck = yield* OtlpEndpointCheck.OtlpEndpointCheck;
       const textGenerators = yield* TextGenerators.TextGenerators;
       const sourceControlRepositories =
@@ -2661,6 +2667,7 @@ export const layerWsRpc = (
             return ServerSettings.redactServerSettingsForClient(settings, settingsClient);
           }),
         [WS_METHODS.serverDiscoverSourceControl]: (_input) => sourceControlDiscovery.discover,
+        [WS_METHODS.serverCheckSecretSource]: (input) => secretCheck.check(input.source),
         [WS_METHODS.serverGetTraceDiagnostics]: (_input) =>
           TraceDiagnostics.readTraceDiagnostics({
             traceFilePath: config.serverTracePath,
@@ -2800,6 +2807,8 @@ export const layerWsRpc = (
               ),
             ),
         [WS_METHODS.pullRequestsSubscribeRefreshes]: () => pullRequests.subscribeRefreshes,
+        [WS_METHODS.pullRequestsSubscribeLinkedThreadRefreshes]: () =>
+          pullRequests.subscribeLinkedThreadRefreshes,
         [WS_METHODS.pullRequestsReviewerCandidates]: (input) =>
           withPullRequestViewer(input, pullRequests.reviewerCandidates(input)),
         [WS_METHODS.pullRequestsRequestReviewers]: (input) =>
@@ -3148,7 +3157,15 @@ export const layerWsRpc = (
         [WS_METHODS.vcsCreateWorktree]: (input) =>
           gitWorkflow.createWorktree(input).pipe(Effect.tap(() => refreshGitStatus(input.cwd))),
         [WS_METHODS.vcsRemoveWorktree]: (input) =>
-          gitWorkflow.removeWorktree(input).pipe(Effect.tap(() => refreshGitStatus(input.cwd))),
+          gitWorkflow.removeWorktree(input).pipe(
+            Effect.tap(() => refreshGitStatus(input.cwd)),
+            // Subscribers of the removed checkout learn it is no longer a repository.
+            Effect.tap(() =>
+              vcsStatusBroadcaster
+                .refreshLocalStatus(input.path)
+                .pipe(Effect.ignoreCause({ log: true }), Effect.forkDetach, Effect.asVoid),
+            ),
+          ),
         [WS_METHODS.vcsCreateRef]: (input) =>
           gitWorkflow.createRef(input).pipe(Effect.tap(() => refreshGitStatus(input.cwd))),
         [WS_METHODS.vcsSwitchRef]: (input) =>
@@ -3158,9 +3175,24 @@ export const layerWsRpc = (
         [WS_METHODS.reviewGetBranchCommits]: (input) => review.getBranchCommits(input),
         [WS_METHODS.reviewGetDiffPreview]: (input) => review.getDiffPreview(input),
         [WS_METHODS.reviewGetDiffFileContents]: (input) => review.getDiffFileContents(input),
-        [WS_METHODS.terminalOpen]: (input) => terminalManager.open(input),
+        [WS_METHODS.terminalOpen]: (input) =>
+          prepareTerminalLaunch(input).pipe(
+            Effect.flatMap((launch) =>
+              terminalManager
+                .open(launch.input)
+                .pipe(Effect.provideService(TerminalManager.TerminalCwdRecovery, launch.recover)),
+            ),
+          ),
         [WS_METHODS.terminalAttach]: (input, metadata) =>
-          terminalManager.attachOutputStream(input, terminalViewerId(metadata)),
+          Stream.unwrap(
+            prepareTerminalLaunch(input).pipe(
+              Effect.map((launch) =>
+                terminalManager
+                  .attachOutputStream(launch.input, terminalViewerId(metadata))
+                  .pipe(Stream.provideService(TerminalManager.TerminalCwdRecovery, launch.recover)),
+              ),
+            ),
+          ),
         [WS_METHODS.terminalWrite]: (input) => terminalManager.write(input),
         [WS_METHODS.terminalResize]: (input, metadata) =>
           terminalManager.resize(input, terminalViewerId(metadata)),
@@ -3421,13 +3453,28 @@ export const layerWsRpc = (
         [WS_METHODS.subscribeAuthAccess]: (_input) =>
           Stream.unwrap(
             Effect.gen(function* () {
+              const liveBuffer = yield* Queue.unbounded<
+                PairingGrantStore.BootstrapCredentialChange | SessionStore.SessionCredentialChange
+              >();
+              // Each store subscribes only when consumed, so start both before the snapshot read.
+              yield* Effect.forkScoped(
+                Stream.runForEach(bootstrapCredentials.streamChanges, (change) =>
+                  Queue.offer(liveBuffer, change),
+                ),
+                { startImmediately: true },
+              );
+              yield* Effect.forkScoped(
+                Stream.runForEach(sessions.streamChanges, (change) =>
+                  Queue.offer(liveBuffer, change),
+                ),
+                { startImmediately: true },
+              );
               const initialSnapshot = yield* loadAuthAccessSnapshot();
               const revisionRef = yield* Ref.make(1);
-              const accessChanges: Stream.Stream<
-                PairingGrantStore.BootstrapCredentialChange | SessionStore.SessionCredentialChange
-              > = Stream.merge(bootstrapCredentials.streamChanges, sessions.streamChanges);
 
-              const liveEvents: Stream.Stream<AuthAccessStreamEvent> = accessChanges.pipe(
+              const liveEvents: Stream.Stream<AuthAccessStreamEvent> = Stream.fromQueue(
+                liveBuffer,
+              ).pipe(
                 Stream.mapEffect((change) =>
                   Ref.updateAndGet(revisionRef, (revision) => revision + 1).pipe(
                     Effect.map((revision) =>
diff --git a/apps/server/vite.config.ts b/apps/server/vite.config.ts
index 02fe582953ab..3291aa304d39 100644
--- a/apps/server/vite.config.ts
+++ b/apps/server/vite.config.ts
@@ -115,6 +115,8 @@ export default mergeConfig(
             },
           }
         : {}),
+      // jsonc-parser's UMD main requires its own files at runtime, which the bundle cannot follow.
+      alias: { "jsonc-parser": "jsonc-parser/lib/esm/main.js" },
       deps: {
         // alwaysBundle=false has no opinion; neverBundle must retain transitive native acceleration.
         alwaysBundle: shouldBundleCliDependency,
diff --git a/apps/web/src/browser/HostedBrowserWebview.tsx b/apps/web/src/browser/HostedBrowserWebview.tsx
index 44de1196b2b7..28edc42d406a 100644
--- a/apps/web/src/browser/HostedBrowserWebview.tsx
+++ b/apps/web/src/browser/HostedBrowserWebview.tsx
@@ -184,16 +184,24 @@ export function HostedBrowserWebview(props: {
         if (!disposed) remountCrashedWebview();
       }, recovery.delayMs);
     };
-    // Guest clicks only emit focus here; replay pointerdown to dismiss host popups.
+    // Guest clicks never reach this document, so replay a pointerdown to dismiss host popups.
+    // The guest preload reports each press, since the guest does not always take focus.
     const dismissHostPopups = () => {
       webview.dispatchEvent(
         new PointerEvent("pointerdown", { bubbles: true, pointerType: "mouse" }),
       );
     };
+    const guestPointerDown = (event: Event) => {
+      // Mirrors POINTER_DOWN_HOST_CHANNEL in apps/desktop/src/preview/GuestProtocol.ts.
+      if ((event as Event & { channel?: string }).channel === "preview:pointer-down") {
+        dismissHostPopups();
+      }
+    };
     webview.addEventListener("did-attach", register);
     webview.addEventListener("dom-ready", register);
     webview.addEventListener("render-process-gone", recoverGuest);
     webview.addEventListener("focus", dismissHostPopups);
+    webview.addEventListener("ipc-message", guestPointerDown);
     register();
     return () => {
       disposed = true;
@@ -202,6 +210,7 @@ export function HostedBrowserWebview(props: {
       webview.removeEventListener("dom-ready", register);
       webview.removeEventListener("render-process-gone", recoverGuest);
       webview.removeEventListener("focus", dismissHostPopups);
+      webview.removeEventListener("ipc-message", guestPointerDown);
     };
   }, [
     clientSettingsHydrated,
diff --git a/apps/web/src/browser/ServerBrowserSurface.tsx b/apps/web/src/browser/ServerBrowserSurface.tsx
index e32e8f76f1a9..a881650f69bc 100644
--- a/apps/web/src/browser/ServerBrowserSurface.tsx
+++ b/apps/web/src/browser/ServerBrowserSurface.tsx
@@ -46,6 +46,7 @@ export interface ServerBrowserHandle {
   readonly navigate: (url: string) => void;
   readonly history: (delta: -1 | 1) => void;
   readonly reload: (options?: { readonly ignoreCache?: boolean }) => void;
+  readonly stopLoading: () => void;
   readonly viewport: (setting: PreviewViewportSetting) => void;
   readonly canvas: () => HTMLCanvasElement | null;
 }
@@ -311,6 +312,7 @@ export function ServerBrowserSurface(props: {
       history: (delta) => send({ type: "history", delta }),
       reload: (options) =>
         send({ type: "reload", ...(options?.ignoreCache ? { ignoreCache: true } : {}) }),
+      stopLoading: () => send({ type: "stopLoading" }),
       viewport: (setting) => send({ type: "viewport", setting }),
       canvas: () => (!pdfUrl && hasFrameRef.current ? canvasRef.current : null),
     }),
diff --git a/apps/web/src/components/AddProjectToMachineDialog.tsx b/apps/web/src/components/AddProjectToMachineDialog.tsx
index 3d9c064cfcb2..3bb70c8b609e 100644
--- a/apps/web/src/components/AddProjectToMachineDialog.tsx
+++ b/apps/web/src/components/AddProjectToMachineDialog.tsx
@@ -26,6 +26,7 @@ import { useAddProjectTargets } from "../hooks/useAddProjectTargets";
 import { useNewThreadHandler } from "../hooks/useHandleNewThread";
 import { useLogicalProjectEnvironments } from "../hooks/useLogicalProjectEnvironments";
 import {
+  COPIED_FILES_MAX_COUNT,
   COPYABLE_FILE_MAX_BYTES,
   addProjectToMachine,
   isDefaultCopiedFile,
@@ -35,6 +36,7 @@ import { newProjectId } from "../lib/utils";
 import { readProject, subscribeProject, useProject } from "../state/entities";
 import { useEnvironments } from "../state/environments";
 import { projectEnvironment } from "../state/projects";
+import { useDebouncedValue } from "../state/queries";
 import { useEnvironmentQuery } from "../state/query";
 import { EnvironmentMachineIcon } from "./EnvironmentMachineIcon";
 import { Button } from "./ui/button";
@@ -121,8 +123,10 @@ function AddProjectToMachineDialog({ request }: { request: AddProjectToMachineRe
   const [pathOverride, setPathOverride] = useState<string | null>(null);
   const destinationPath = pathOverride ?? defaultPath;
 
-  const canListFiles = source?.serverConfig?.environment.capabilities.ignoredFileListing === true;
-  const ignoredFiles = useEnvironmentQuery(
+  const capabilities = source?.serverConfig?.environment.capabilities;
+  const canListFiles = capabilities?.ignoredFileListing === true;
+  const canSearchFiles = canListFiles && capabilities?.ignoredFileSearch === true;
+  const allIgnoredFiles = useEnvironmentQuery(
     project && canListFiles
       ? projectEnvironment.listIgnoredFiles({
           environmentId: project.environmentId,
@@ -130,13 +134,29 @@ function AddProjectToMachineDialog({ request }: { request: AddProjectToMachineRe
         })
       : null,
   );
+  const [fileQuery, setFileQuery] = useState("");
+  const sentFileQuery = useDebouncedValue(fileQuery.trim(), 120);
+  const searching = canSearchFiles && sentFileQuery.length > 0;
+  const searchedFiles = useEnvironmentQuery(
+    project && searching
+      ? projectEnvironment.listIgnoredFiles({
+          environmentId: project.environmentId,
+          input: { cwd: project.workspaceRoot, query: sentFileQuery },
+        })
+      : null,
+  );
+  const ignoredFiles = searching ? searchedFiles : allIgnoredFiles;
   const files = ignoredFiles.data?.files ?? [];
-  const [selected, setSelected] = useState<ReadonlySet<string> | null>(null);
-  const selectedFiles = selected ?? defaultSelection(files);
+  // Keyed by path with the file kept, so picks made under one search survive the next.
+  const [selected, setSelected] = useState<ReadonlyMap<string, ProjectIgnoredFile> | null>(null);
+  const selectedFiles = selected ?? defaultSelection(allIgnoredFiles.data?.files ?? []);
   const copyable = files.filter((file) => file.byteLength <= COPYABLE_FILE_MAX_BYTES);
-  const selectedBytes = files
-    .filter((file) => selectedFiles.has(file.path))
-    .reduce((total, file) => total + file.byteLength, 0);
+  const allCopyableSelected = copyable.every((file) => selectedFiles.has(file.path));
+  const atSelectionLimit = selectedFiles.size >= COPIED_FILES_MAX_COUNT;
+  const selectedBytes = [...selectedFiles.values()].reduce(
+    (total, file) => total + file.byteLength,
+    0,
+  );
 
   const [submitting, setSubmitting] = useState(false);
   const [error, setError] = useState<string | null>(null);
@@ -146,11 +166,19 @@ function AddProjectToMachineDialog({ request }: { request: AddProjectToMachineRe
   const unavailable =
     project === null ||
     target === null ||
-    (canListFiles && ignoredFiles.data === null && ignoredFiles.error === null);
-  const toggleFile = (path: string, checked: boolean) => {
-    const next = new Set(selectedFiles);
-    if (checked) next.add(path);
-    else next.delete(path);
+    (canListFiles && allIgnoredFiles.data === null && allIgnoredFiles.error === null);
+  const toggleFile = (file: ProjectIgnoredFile, checked: boolean) => {
+    const next = new Map(selectedFiles);
+    if (!checked) next.delete(file.path);
+    else if (!atSelectionLimit) next.set(file.path, file);
+    setSelected(next);
+  };
+  const toggleShownFiles = () => {
+    const next = new Map(selectedFiles);
+    for (const file of copyable) {
+      if (allCopyableSelected) next.delete(file.path);
+      else if (next.size < COPIED_FILES_MAX_COUNT) next.set(file.path, file);
+    }
     setSelected(next);
   };
 
@@ -198,7 +226,7 @@ function AddProjectToMachineDialog({ request }: { request: AddProjectToMachineRe
         title: project.title,
         remoteUrl,
         destinationPath: destinationPath.trim(),
-        files: files.filter((file) => selectedFiles.has(file.path)).map((file) => file.path),
+        files: [...selectedFiles.keys()],
       });
       close();
       openClonedProject(scopeProjectRef(target.environmentId, projectId));
@@ -334,33 +362,41 @@ function AddProjectToMachineDialog({ request }: { request: AddProjectToMachineRe
                   {copyable.length > 0 ? (
                     <>
                       <span className="text-muted-foreground text-xs">
-                        {selectedFiles.size} of {files.length}
+                        {selectedFiles.size} of {allIgnoredFiles.data?.files.length ?? 0}
                         {selectedBytes > 0 ? ` · ${formatBytes(selectedBytes)}` : ""}
                       </span>
-                      <Button
-                        type="button"
-                        variant="ghost"
-                        size="xs"
-                        onClick={() =>
-                          setSelected(
-                            selectedFiles.size === copyable.length
-                              ? new Set()
-                              : new Set(copyable.map((file) => file.path)),
-                          )
-                        }
-                      >
-                        {selectedFiles.size === copyable.length ? "None" : "All"}
+                      <Button type="button" variant="ghost" size="xs" onClick={toggleShownFiles}>
+                        {allCopyableSelected ? "None" : "All"}
                       </Button>
                     </>
                   ) : null}
                 </div>
+                {canSearchFiles && (allIgnoredFiles.data?.truncated || fileQuery.length > 0) ? (
+                  <Input
+                    size="sm"
+                    type="search"
+                    aria-label="Search ignored files"
+                    placeholder="Search ignored files"
+                    value={fileQuery}
+                    maxLength={256}
+                    onChange={(event) => setFileQuery(event.target.value)}
+                    // Enter would otherwise submit the clone.
+                    onKeyDown={(event) => {
+                      if (event.key === "Enter") event.preventDefault();
+                    }}
+                    spellCheck={false}
+                    autoComplete="off"
+                  />
+                ) : null}
                 {ignoredFiles.error ? (
                   <p className="text-destructive-foreground text-xs">{ignoredFiles.error}</p>
                 ) : files.length === 0 ? (
                   <p className="text-muted-foreground text-xs">
-                    {ignoredFiles.isSuccess
-                      ? "No ignored files to copy."
-                      : "Finding ignored files…"}
+                    {!ignoredFiles.isSuccess
+                      ? "Finding ignored files…"
+                      : searching
+                        ? "No ignored files match."
+                        : "No ignored files to copy."}
                   </p>
                 ) : (
                   <div className="max-h-52 overflow-y-auto rounded-md border">
@@ -369,7 +405,8 @@ function AddProjectToMachineDialog({ request }: { request: AddProjectToMachineRe
                         key={file.path}
                         file={file}
                         checked={selectedFiles.has(file.path)}
-                        onCheckedChange={(checked) => toggleFile(file.path, checked)}
+                        disabled={atSelectionLimit && !selectedFiles.has(file.path)}
+                        onCheckedChange={(checked) => toggleFile(file, checked)}
                       />
                     ))}
                   </div>
@@ -377,6 +414,7 @@ function AddProjectToMachineDialog({ request }: { request: AddProjectToMachineRe
                 {ignoredFiles.data?.truncated ? (
                   <p className="text-muted-foreground text-xs">
                     Showing the first {files.length} files.
+                    {canSearchFiles ? " Search to find the rest." : ""}
                   </p>
                 ) : null}
                 <p className="text-muted-foreground text-xs">
@@ -415,29 +453,37 @@ function projectSubdirectory(repositoryRoot: string | undefined, workspaceRoot:
     : "";
 }
 
-function defaultSelection(files: readonly ProjectIgnoredFile[]): ReadonlySet<string> {
-  return new Set(
+function defaultSelection(
+  files: readonly ProjectIgnoredFile[],
+): ReadonlyMap<string, ProjectIgnoredFile> {
+  return new Map(
     files
       .filter(
         (file) => file.byteLength <= COPYABLE_FILE_MAX_BYTES && isDefaultCopiedFile(file.path),
       )
-      .map((file) => file.path),
+      .map((file) => [file.path, file]),
   );
 }
 
 function IgnoredFileRow({
   file,
   checked,
+  disabled,
   onCheckedChange,
 }: {
   file: ProjectIgnoredFile;
   checked: boolean;
+  disabled: boolean;
   onCheckedChange: (checked: boolean) => void;
 }) {
   const tooLarge = file.byteLength > COPYABLE_FILE_MAX_BYTES;
   return (
     <label className="flex cursor-pointer items-center gap-2 px-2.5 py-1.5 text-sm not-last:border-b has-disabled:cursor-not-allowed has-disabled:opacity-64">
-      <Checkbox checked={checked} disabled={tooLarge} onCheckedChange={onCheckedChange} />
+      <Checkbox
+        checked={checked}
+        disabled={tooLarge || disabled}
+        onCheckedChange={onCheckedChange}
+      />
       <span className="min-w-0 flex-1 truncate font-mono text-xs">{file.path}</span>
       <span className="shrink-0 text-muted-foreground text-xs tabular-nums">
         {tooLarge ? "Over 1 MB" : formatBytes(file.byteLength)}
diff --git a/apps/web/src/components/BranchToolbarBranchSelector.tsx b/apps/web/src/components/BranchToolbarBranchSelector.tsx
index ac1496b04a5c..2b59c126e2a6 100644
--- a/apps/web/src/components/BranchToolbarBranchSelector.tsx
+++ b/apps/web/src/components/BranchToolbarBranchSelector.tsx
@@ -125,7 +125,7 @@ export function BranchToolbarBranchSelector({
   const switchRef = useAtomCommand(vcsEnvironment.switchRef, {
     reportFailure: false,
   });
-  const refreshStatus = useAtomCommand(vcsEnvironment.refreshStatus, {
+  const refreshLocalStatusForPicker = useAtomCommand(vcsEnvironment.refreshLocalStatusForPicker, {
     reportFailure: false,
   });
   const createRefMutation = useAtomCommand(vcsEnvironment.createRef, {
@@ -562,7 +562,10 @@ export function BranchToolbarBranchSelector({
   const handleOpenChange = (open: boolean) => {
     setIsBranchMenuOpen(open);
     if (open && !isBranchMenuOpen && branchCwd !== null) {
-      void refreshStatus({ environmentId, input: { cwd: branchCwd, localOnly: true } });
+      void refreshLocalStatusForPicker({
+        environmentId,
+        input: { cwd: branchCwd, localOnly: true },
+      });
     }
     if (!open) {
       setBranchQuery("");
diff --git a/apps/web/src/components/ChatMarkdown.browser.test.tsx b/apps/web/src/components/ChatMarkdown.browser.test.tsx
index 24e0b6655ff7..d24b1c9299ac 100644
--- a/apps/web/src/components/ChatMarkdown.browser.test.tsx
+++ b/apps/web/src/components/ChatMarkdown.browser.test.tsx
@@ -120,6 +120,7 @@ vi.mock(import("../hooks/useSettings"), async (original) => {
 });
 
 import ChatMarkdown from "./ChatMarkdown";
+import { chatMarkdownClipboardPayload } from "../markdown-clipboard";
 import { AudioPreview } from "./files/AudioPreview";
 
 it("keeps compact audio playback loaded across signed URL renewals", async () => {
@@ -579,6 +580,66 @@ describe("ChatMarkdown inline code selection", () => {
     await userEvent.dblClick(fenced, { position: { x: 4, y: 4 } });
     expect(window.getSelection()?.toString()).toBe("fenced");
   });
+
+  it("selects the whole line on triple-click beside a favicon link or a file chip", async () => {
+    setup();
+    await using screen = await renderText(
+      "Before [docs](https://example.com/docs) after words\n\nBefore [App.tsx](/tmp/project/src/App.tsx) after words",
+    );
+    const tripleClickWord = async (paragraph: HTMLElement, word: string) => {
+      const text = [...paragraph.childNodes].find((node) => node.textContent?.includes(word))!;
+      const range = document.createRange();
+      range.setStart(text, text.textContent!.indexOf(word));
+      range.setEnd(text, text.textContent!.indexOf(word) + word.length);
+      const wordBox = range.getBoundingClientRect();
+      const paragraphBox = paragraph.getBoundingClientRect();
+      window.getSelection()?.removeAllRanges();
+      await userEvent.tripleClick(paragraph, {
+        position: {
+          x: wordBox.left - paragraphBox.left + wordBox.width / 2,
+          y: wordBox.top - paragraphBox.top + wordBox.height / 2,
+        },
+      });
+      return window.getSelection()?.toString().trim();
+    };
+
+    const paragraphs = screen.container.querySelectorAll("p");
+    expect(paragraphs).toHaveLength(2);
+    const selections = [];
+    const lines = [];
+    for (const paragraph of paragraphs) {
+      lines.push(paragraph.textContent?.trim(), paragraph.textContent?.trim());
+      selections.push(
+        await tripleClickWord(paragraph, "Before"),
+        await tripleClickWord(paragraph, "after"),
+      );
+    }
+    expect(selections).toEqual(lines);
+  });
+});
+
+describe("ChatMarkdown alert copy", () => {
+  it("copies a fully selected callout as alert Markdown and a partial one as text", async () => {
+    setup();
+    await using screen = await renderText("> [!WARNING]\n> Back up first.");
+    const [label, body] = screen.container.querySelectorAll('[role="note"] > p');
+    const select = (startNode: Node, endNode: Node, endOffset: number) => {
+      const range = document.createRange();
+      range.setStart(startNode, 0);
+      range.setEnd(endNode, endOffset);
+      const selection = window.getSelection()!;
+      selection.removeAllRanges();
+      selection.addRange(range);
+      return chatMarkdownClipboardPayload(selection)?.text;
+    };
+    const labelText = label!.lastChild!;
+    const bodyText = body!.firstChild!;
+
+    expect(select(labelText, bodyText, bodyText.textContent!.length)).toBe(
+      "> [!WARNING]\n> Back up first.",
+    );
+    expect(select(labelText, bodyText, "Back up".length)).toBe("Warning\n\nBack up");
+  });
 });
 
 describe("ChatMarkdown file chip tooltips", () => {
diff --git a/apps/web/src/components/ChatMarkdown.tsx b/apps/web/src/components/ChatMarkdown.tsx
index d2248c3af708..b19e815f5a8b 100644
--- a/apps/web/src/components/ChatMarkdown.tsx
+++ b/apps/web/src/components/ChatMarkdown.tsx
@@ -647,7 +647,7 @@ function useChatMarkdownState({
   const projects = useProjects();
   const [preferredEditor] = usePreferredEditor(availableEditors);
   const preferredEditorMenuLabel = openInEditorMenuLabel(preferredEditor);
-  const openInPreferredEditor = useOpenInPreferredEditor(environmentId, availableEditors);
+  const openInPreferredEditor = useOpenInPreferredEditor(environmentId, availableEditors, cwd);
   const openInEditor = useAtomCommand(shellEnvironment.openInEditor, {
     reportFailure: false,
   });
@@ -1055,19 +1055,21 @@ const CHAT_MARKDOWN_COMPONENTS = {
     );
   },
   blockquote: function MarkdownBlockquote({ node: _node, children, ...props }) {
-    const alert =
-      GITHUB_ALERT_PRESENTATIONS[String((props as Record<string, unknown>)["data-alert"] ?? "")];
+    const alertKind = String((props as Record<string, unknown>)["data-alert"] ?? "");
+    const alert = GITHUB_ALERT_PRESENTATIONS[alertKind];
     if (!alert) {
       return <blockquote {...props}>{children}</blockquote>;
     }
     return (
       <div
         role="note"
+        data-markdown-alert={alertKind}
         dir={props.dir}
         className={cn("my-1 border-s-2 ps-3", alert.borderClassName)}
       >
         <p
           data-thread-find-ignore="true"
+          data-markdown-alert-label=""
           className={cn("flex items-center gap-1.5 font-medium", alert.titleClassName)}
         >
           <alert.Icon aria-hidden className="size-3.5 shrink-0" />
diff --git a/apps/web/src/components/ChatView.browser.test.tsx b/apps/web/src/components/ChatView.browser.test.tsx
index 0ee0caa61d48..46557548fec6 100644
--- a/apps/web/src/components/ChatView.browser.test.tsx
+++ b/apps/web/src/components/ChatView.browser.test.tsx
@@ -24,7 +24,7 @@ import {
   threadWithHistory,
   type FakeDriver,
 } from "../../test/fakeEnvironment";
-import { act, render } from "../../test/render";
+import { act, fakeTimers, render } from "../../test/render";
 
 // The socket is the only fake layer; see test/appScenarios.renders.tsx.
 vi.mock("../../../../packages/client-runtime/src/connection/driver.ts", async (importOriginal) => {
@@ -229,3 +229,77 @@ it("a rejected send leaves the timeline when a new draft was typed meanwhile", a
   await expect.element(page.getByText("Failed prompt")).not.toBeInTheDocument();
   expect(editor.element().textContent).toContain("Next draft");
 });
+
+it("Enter on an empty prompt resumes an interrupted thread", async () => {
+  const history = threadWithHistory("interrupted", 1);
+  const interruptedRun = { ...history.runs[0]!, status: "interrupted" as const };
+  const thread = { ...history, runs: [interruptedRun] };
+  using _environment = installFakeEnvironment([thread], { acceptCommands: true });
+  __setClientSettingsForTests({
+    ...DEFAULT_CLIENT_SETTINGS,
+    onboardingCompletedAt: "2026-01-01T00:00:00.000Z",
+  });
+  const router = getRouter(
+    createMemoryHistory({ initialEntries: [`/${ENVIRONMENT_ID}/${thread.id}`] }),
+  );
+  await router.load();
+  await using _app = await render(<AppRoot router={router} />, {
+    // AppRoot brings its own router.
+    router: false,
+  });
+  await expect.element(page.getByRole("button", { name: "Resume thread" })).toBeVisible();
+
+  await userEvent.click(page.getByTestId("composer-editor"));
+  await userEvent.keyboard("{Enter}");
+
+  await vi.waitFor(() =>
+    expect(dispatchedCommands()).toContainEqual(
+      expect.objectContaining({ manualContinuationOfRunId: interruptedRun.id }),
+    ),
+  );
+});
+
+it("opening a thread or returning to the window on a touch tablet does not focus the composer", async () => {
+  const realMatchMedia = window.matchMedia.bind(window);
+  using _touch = vi
+    .spyOn(window, "matchMedia")
+    .mockImplementation((query) => realMatchMedia(query === "(pointer: coarse)" ? "all" : query));
+  const first = threadWithHistory("thread-29469-a", 1);
+  const second = threadWithHistory("thread-29469-b", 1);
+  using _environment = installFakeEnvironment([first, second]);
+  // iPad Pro 11 in landscape: the desktop layout, above max-sm.
+  await page.viewport(1194, 834);
+  __setClientSettingsForTests({
+    ...DEFAULT_CLIENT_SETTINGS,
+    onboardingCompletedAt: "2026-01-01T00:00:00.000Z",
+  });
+  const router = getRouter(
+    createMemoryHistory({ initialEntries: [`/${ENVIRONMENT_ID}/${first.id}`] }),
+  );
+  await router.load();
+  await using _app = await render(<AppRoot router={router} />, {
+    // AppRoot brings its own router.
+    router: false,
+  });
+  const composer = page.getByTestId("composer-editor");
+  await expect.element(page.getByText(`Answer 0 for ${first.id}.`)).toBeVisible();
+
+  // Fake frames hold the next thread entry's focus frame until the test advances it.
+  using _timers = fakeTimers();
+  await act(() =>
+    router.navigate({
+      to: "/$environmentId/$threadId",
+      params: { environmentId: ENVIRONMENT_ID, threadId: second.id },
+    }),
+  );
+  await expect.element(page.getByText(`Answer 0 for ${second.id}.`)).toBeVisible();
+  vi.advanceTimersToNextFrame();
+  // Focusing the editor raises the on-screen keyboard, which shrinks the page on iPadOS.
+  expect(document.activeElement).not.toBe(composer.element());
+
+  // ChatView waits two frames after window focus before refocusing the composer.
+  window.dispatchEvent(new FocusEvent("focus"));
+  vi.advanceTimersToNextFrame();
+  vi.advanceTimersToNextFrame();
+  expect(document.activeElement).not.toBe(composer.element());
+});
diff --git a/apps/web/src/components/ChatView.logic.browser.test.ts b/apps/web/src/components/ChatView.logic.browser.test.ts
index 2d887cb5acc2..880a640cc6e2 100644
--- a/apps/web/src/components/ChatView.logic.browser.test.ts
+++ b/apps/web/src/components/ChatView.logic.browser.test.ts
@@ -28,6 +28,19 @@ it("keeps keyboard focus on a sidebar row on window return, but not a clicked ro
   expect(shouldRefocusComposerOnWindowFocus(document.activeElement)).toBe(false);
 });
 
+it("keeps focus in a region with its own keys on window return", async () => {
+  const region = document.createElement("div");
+  region.tabIndex = -1;
+  region.setAttribute("aria-keyshortcuts", "J K");
+  region.textContent = "Guide prose";
+  document.body.append(region);
+  using _region = { [Symbol.dispose]: () => region.remove() };
+
+  await userEvent.click(region);
+  expect(document.activeElement).toBe(region);
+  expect(shouldRefocusComposerOnWindowFocus(document.activeElement)).toBe(false);
+});
+
 it("refocuses the composer on window return from a clicked area after a bare key press", async () => {
   const controller = createWorkspaceFocusController(document);
   const root = document.createElement("div");
diff --git a/apps/web/src/components/ChatView.logic.test.ts b/apps/web/src/components/ChatView.logic.test.ts
index 8223e0354040..8aa4df4c09ba 100644
--- a/apps/web/src/components/ChatView.logic.test.ts
+++ b/apps/web/src/components/ChatView.logic.test.ts
@@ -9,7 +9,11 @@ import {
   deriveAvailableRevertTurnCounts,
   deriveThreadPendingBackgroundTasks,
 } from "./ChatView.logic";
-import { recallCheckoutIsRepo, rememberCheckoutIsRepo } from "./ChatView.logic";
+import {
+  isThreadEnvironmentLocked,
+  recallCheckoutIsRepo,
+  rememberCheckoutIsRepo,
+} from "./ChatView.logic";
 import { ProviderDriverKind, type ServerProvider } from "@t3tools/contracts";
 import { deriveProviderInstanceEntries } from "../providerInstances";
 import { ensureInlineContextReferences } from "../lib/composerContextReferences";
@@ -133,6 +137,26 @@ describe("deriveComposerSendState", () => {
   });
 });
 
+describe("isThreadEnvironmentLocked", () => {
+  it.each([
+    { name: "an empty unbound thread", providerThread: null, expected: false },
+    {
+      name: "an imported session bound before its first run",
+      providerThread: "imported",
+      expected: true,
+    },
+  ])("locks $name: $expected", ({ providerThread, expected }) => {
+    expect(
+      isThreadEnvironmentLocked({
+        messageCount: 0,
+        hasRuntime: false,
+        activeProviderThreadId:
+          providerThread === null ? null : ProviderThreadId.make(providerThread),
+      }),
+    ).toBe(expected);
+  });
+});
+
 describe("buildExpiredTerminalContextToastCopy", () => {
   it("refers to several expired contexts as them", () => {
     expect(buildExpiredTerminalContextToastCopy(2, "empty")).toEqual({
diff --git a/apps/web/src/components/ChatView.logic.ts b/apps/web/src/components/ChatView.logic.ts
index b1d44d95441c..94fc6a8cad27 100644
--- a/apps/web/src/components/ChatView.logic.ts
+++ b/apps/web/src/components/ChatView.logic.ts
@@ -32,6 +32,7 @@ import {
   type PreviewAnnotationPayload,
   ProviderDriverKind,
   type ProviderInstanceId,
+  type ProviderThreadId,
   type ServerProvider,
   type ScopedProjectRef,
   type ScopedThreadRef,
@@ -1069,10 +1070,10 @@ export function hasServerAcknowledgedLocalDispatch(input: {
   );
 }
 
-// Returning to the window should land the caret in the composer, so the reader can type right
-// away. The exceptions are places where focus is deliberate: another text field, a terminal in
-// the drawer or the right panel, an open dialog, menu, or popup, or a region or sidebar row
-// reached from the keyboard. A plain focused button or a clicked row yields to the composer.
+// Window return puts the caret in the composer unless focus is deliberate: another text field,
+// a terminal, an open dialog, menu, or popup, a region, timeline, or sidebar row reached from the
+// keyboard, or a region with its own keys (aria-keyshortcuts). A plain focused button or a clicked
+// row yields to the composer.
 export function shouldRefocusComposerOnWindowFocus(
   activeElement:
     | (Pick<Element, "tagName" | "closest" | "getAttribute"> & { isContentEditable?: boolean })
@@ -1092,7 +1093,7 @@ export function shouldRefocusComposerOnWindowFocus(
   }
   return (
     activeElement.closest(
-      '[data-workspace-keyboard-focus], [data-sidebar-row]:focus-visible, [role="dialog"], [role="alertdialog"], [role="application"], [role="menu"], [role="listbox"], [data-slot$="-popup"], [data-terminal-owner]',
+      '[data-workspace-keyboard-focus], [data-sidebar-row]:focus-visible, [role="dialog"], [role="alertdialog"], [role="application"], [role="menu"], [role="listbox"], [data-slot$="-popup"], [data-terminal-owner], [aria-keyshortcuts]',
     ) === null
   );
 }
@@ -1541,3 +1542,12 @@ export function deriveAvailableRevertTurnCounts(projection: ThreadStructure | nu
   }
   return available;
 }
+
+/** An imported native session is bound before it has messages or runs, and its cwd is fixed. */
+export function isThreadEnvironmentLocked(input: {
+  readonly messageCount: number;
+  readonly hasRuntime: boolean;
+  readonly activeProviderThreadId: ProviderThreadId | null;
+}): boolean {
+  return input.messageCount > 0 || input.hasRuntime || input.activeProviderThreadId !== null;
+}
diff --git a/apps/web/src/components/ChatView.tsx b/apps/web/src/components/ChatView.tsx
index fdbb91d9073f..4a964ad24dbd 100644
--- a/apps/web/src/components/ChatView.tsx
+++ b/apps/web/src/components/ChatView.tsx
@@ -37,7 +37,7 @@ import { ThreadFind, ThreadFindCanvas } from "./chat/ThreadFindProvider";
 import { closeThreadFind, openThreadFind, useThreadFindOpen } from "./chat/threadFindStore";
 import { THREAD_FIND_BAR_RESERVED_HEIGHT } from "./chat/ThreadFindBar";
 import { usageLimitRecoveryBannerItem } from "./chat/UsageLimitRecoveryBanner";
-import { resolveDraftHeroState } from "./ChatView.logic";
+import { isThreadEnvironmentLocked, resolveDraftHeroState } from "./ChatView.logic";
 import { useQueuedRunEdit } from "./chat/useQueuedRunEdit";
 import { recallCheckoutIsRepo, rememberCheckoutIsRepo } from "./ChatView.logic";
 import { useLogicalProjectEnvironments } from "../hooks/useLogicalProjectEnvironments";
@@ -78,6 +78,7 @@ import {
   RuntimeMode,
 } from "@t3tools/contracts";
 import {
+  canResumeThread,
   deriveProviderSubagentStatus,
   deriveProviderExtensionStatuses,
   deriveReportedModelSelection,
@@ -216,7 +217,7 @@ import { usePanelAnimationSettings, usePanelPresence } from "../panelAnimations"
 import { useNewThreadHandler } from "../hooks/useHandleNewThread";
 import { useOpenPanelPullRequestUrl } from "../hooks/useOpenPanelPullRequestUrl";
 import { isPreviewFocused } from "../lib/previewFocus";
-import { focusTerminalOnThreadEnter, getTerminalFocusOwner } from "../lib/terminalFocus";
+import { getTerminalFocusOwner } from "../lib/terminalFocus";
 import {
   deriveLogicalProjectKeyFromSettings,
   selectProjectGroupingSettings,
@@ -308,8 +309,9 @@ import {
   shouldShowEnvironmentIndicator,
 } from "./BranchToolbar.logic";
 import {
-  getProviderStatusBannerKey,
+  getProviderStatusDismissalKey,
   shouldShowProviderStatusBanner,
+  useProviderStatusBannerDismissed,
 } from "./chat/ProviderStatusBanner";
 import {
   getThreadErrorBannerKey,
@@ -421,6 +423,8 @@ type ChatViewProps =
 
 const DismissedFallbackWindowSchema = Schema.NullOr(Schema.String);
 
+const ignoreComposerFocus = () => {};
+
 export default function ChatView(props: ChatViewProps) {
   const {
     environmentId,
@@ -711,6 +715,8 @@ export default function ChatView(props: ChatViewProps) {
   }, [isWorkspaceFileDragActive]);
   const prefersPlanSidebarSheet = useMediaQuery(RIGHT_PANEL_INLINE_LAYOUT_MEDIA_QUERY);
   const isMobileViewport = useMediaQuery("max-sm");
+  // Focusing the composer without a tap raises the on-screen keyboard on touch devices.
+  const isCoarsePointer = useMediaQuery({ pointer: "coarse" });
   const [workspaceLayoutElement, setWorkspaceLayoutElement] = useState<HTMLDivElement | null>(null);
   const threadPanelPopoverAnchorRef = useRef<HTMLElement | null>(null);
   const [terminalUiLaunchContext, setTerminalUiLaunchContext] =
@@ -840,6 +846,9 @@ export default function ChatView(props: ChatViewProps) {
     !isServerThread || serverProjection === null
       ? null
       : deriveResumableRunId(serverProjection, serverRuntime);
+  const canResume =
+    serverProjection !== null &&
+    canResumeThread(serverProjection, resumableRunId, hasHeldQueuedRuns);
   const parentSubagentThreadId =
     activeThread?.lineage.relationshipToParent === "subagent"
       ? activeThread.lineage.parentThreadId
@@ -1272,7 +1281,13 @@ export default function ChatView(props: ChatViewProps) {
     advertisedFileAttachmentBytes === null
       ? null
       : clampFileAttachmentUploadBytes(advertisedFileAttachmentBytes);
-  const envLocked = Boolean(activeThread && (activeMessageCount > 0 || activeRuntime !== null));
+  const envLocked =
+    Boolean(activeThread) &&
+    isThreadEnvironmentLocked({
+      messageCount: activeMessageCount,
+      hasRuntime: activeRuntime !== null,
+      activeProviderThreadId: serverThread?.activeProviderThreadId ?? null,
+    });
   // onEnvironmentChange only retargets an unsent draft. envLocked alone does not
   // rule out a started thread: one whose machine is offline never loads its
   // messages, so it would otherwise be offered a machine picker that does nothing.
@@ -1703,16 +1718,14 @@ export default function ChatView(props: ChatViewProps) {
     null,
     DismissedFallbackWindowSchema,
   );
-  const providerStatusBannerKey = getProviderStatusBannerKey(activeProviderStatus);
-  const [dismissedProviderStatusBannerKey, setDismissedProviderStatusBannerKey] = useState<
-    string | null
-  >(null);
-  if (providerStatusBannerKey === null && dismissedProviderStatusBannerKey !== null) {
-    setDismissedProviderStatusBannerKey(null);
-  }
+  const providerStatusDismissalKey = getProviderStatusDismissalKey(
+    providerEnvironmentId,
+    activeProviderStatus,
+  );
+  const providerStatusDismissed = useProviderStatusBannerDismissed(providerStatusDismissalKey);
   const visibleProviderStatus = shouldShowProviderStatusBanner(
     activeProviderStatus,
-    dismissedProviderStatusBannerKey,
+    providerStatusDismissed,
   )
     ? activeProviderStatus
     : null;
@@ -1795,6 +1808,7 @@ export default function ChatView(props: ChatViewProps) {
   const {
     needsLoadBalancing,
     loadBalancing,
+    refreshBeforeSend,
     onAutoEnvironmentStable,
     autoEnvironmentLabel,
     isEnvironmentChanging,
@@ -2138,14 +2152,24 @@ export default function ChatView(props: ChatViewProps) {
   });
 
   useFocusComposerOnThreadOpen(
-    activeThread?.id,
-    !embedded && !terminalUiState.terminalOpen,
-    focusComposerStable,
+    activeThreadRef,
+    workspaceLayoutElement,
+    !embedded,
+    terminalUiState.terminalOpen,
+    isCoarsePointer ? ignoreComposerFocus : focusComposerStable,
   );
 
-  // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- window focus listener that refocuses the composer after the window regains focus
+  // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- window focus listener that refocuses the composer after the window regains focus on a fine pointer
   useEffect(() => {
-    if (embedded || !activeThread?.id || terminalUiState.terminalOpen || isMobileViewport) return;
+    if (
+      embedded ||
+      !activeThread?.id ||
+      terminalUiState.terminalOpen ||
+      isMobileViewport ||
+      isCoarsePointer
+    ) {
+      return;
+    }
     let frame: number | null = null;
     const onWindowFocus = () => {
       if (frame !== null) window.cancelAnimationFrame(frame);
@@ -2172,6 +2196,7 @@ export default function ChatView(props: ChatViewProps) {
     activeThread?.id,
     embedded,
     focusComposerStable,
+    isCoarsePointer,
     isMobileViewport,
     terminalUiState.terminalOpen,
   ]);
@@ -2676,14 +2701,6 @@ export default function ChatView(props: ChatViewProps) {
     setTerminalUiLaunchContext(null);
   }
 
-  // Entering a thread with its drawer open focuses the drawer terminal; opening
-  // it from a handler requests focus there. A closed drawer leaves focus to the
-  // composer effect above.
-  // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- focuses the open drawer terminal when entering a thread
-  useEffect(() => {
-    if (activeThreadRef && !embedded) return focusTerminalOnThreadEnter(activeThreadRef);
-  }, [activeThreadRef, embedded]);
-
   const getShortcutContext = (eventTarget: EventTarget | null = document.activeElement) => ({
     terminalFocus: getTerminalFocusOwner() !== null,
     terminalOpen: Boolean(terminalUiState.terminalOpen),
@@ -2882,6 +2899,7 @@ export default function ChatView(props: ChatViewProps) {
     activeThread,
     resumableRunId,
     hasHeldQueuedRuns,
+    canResume,
     isSendBusy,
     isRevertingCheckpoint,
     threadDetailLoading,
@@ -2941,6 +2959,7 @@ export default function ChatView(props: ChatViewProps) {
     clearUsageLimitsFor,
     needsLoadBalancing,
     loadBalancing,
+    refreshBeforeSend,
     readPendingEnvironmentChange,
     pendingApprovals,
     respondingRequestIds,
@@ -3377,8 +3396,7 @@ export default function ChatView(props: ChatViewProps) {
             <ChatBannerLane
               environmentId={activeThread.environmentId}
               providerStatus={visibleProviderStatus}
-              providerStatusBannerKey={providerStatusBannerKey}
-              setDismissedProviderStatusBannerKey={setDismissedProviderStatusBannerKey}
+              providerStatusDismissalKey={providerStatusDismissalKey}
               onOpenProviderSetup={openProviderSetupStable}
               threadId={activeThread.id}
               threadError={timelineThreadError}
@@ -3626,7 +3644,7 @@ export default function ChatView(props: ChatViewProps) {
                                   queuedRunEdit.isSaving ||
                                   isResuming
                                 }
-                                canResume={resumableRunId !== null || hasHeldQueuedRuns}
+                                canResume={canResume}
                                 isRevertingCheckpoint={isRevertingCheckpoint}
                                 sendDisabledReason={
                                   !canOperateThread
diff --git a/apps/web/src/components/CommandPalette.composition.browser.test.tsx b/apps/web/src/components/CommandPalette.composition.browser.test.tsx
index 5a2682df6f65..e1f69d72e3b4 100644
--- a/apps/web/src/components/CommandPalette.composition.browser.test.tsx
+++ b/apps/web/src/components/CommandPalette.composition.browser.test.tsx
@@ -8,9 +8,32 @@ import { CommandPalette } from "./CommandPalette";
 import { openCommandPalette } from "../commandPaletteBus";
 import { primaryServerKeybindingsAtom } from "../state/server";
 
-const scopes = vi.hoisted(() => ({ denied: undefined as string | undefined }));
-const setup = (deniedScope?: string) => {
+const scopes = vi.hoisted(() => ({
+  denied: undefined as string | undefined,
+  sourceControl: undefined as unknown,
+}));
+const setup = (deniedScope?: string, sourceControl?: unknown) => {
   scopes.denied = deniedScope;
+  scopes.sourceControl = sourceControl;
+};
+const githubAvailable = {
+  versionControlSystems: [],
+  sourceControlProviders: [
+    {
+      kind: "github",
+      label: "GitHub",
+      status: "available",
+      version: { _tag: "None" },
+      installHint: "Install GitHub CLI",
+      detail: { _tag: "None" },
+      auth: {
+        status: "authenticated",
+        account: { _tag: "Some", value: "demo" },
+        host: { _tag: "None" },
+        detail: { _tag: "None" },
+      },
+    },
+  ],
 };
 
 vi.mock("@effect/atom-react", async (original) => ({
@@ -101,7 +124,7 @@ vi.mock("../state/filesystem", async (original) => ({
 }));
 vi.mock("../state/query", async (original) => ({
   ...(await original<typeof import("../state/query")>()),
-  useEnvironmentQuery: () => ({ data: undefined, isLoading: false }),
+  useEnvironmentQuery: () => ({ data: scopes.sourceControl, isLoading: false }),
 }));
 vi.mock("./settings/useAvailableSettingsSearchItems", () => ({
   useAvailableSettingsSearchItems: () => [],
@@ -208,3 +231,15 @@ it.each([
   await userEvent.keyboard("{Tab}");
   await expect.element(submit).toHaveFocus();
 });
+
+it("tells screen readers whether a new project will be published", async () => {
+  setup(undefined, githubAvailable);
+  await using _screen = await render(<CommandPalette>{null}</CommandPalette>);
+  await act(() => openCommandPalette({ open: "add-project" }));
+  await page.getByText("New project", { exact: true }).click();
+  await page.getByRole("combobox").fill("demo-project");
+  const option = page.getByRole("option", { name: /Create private repository/ });
+  await expect.element(option).toHaveAttribute("aria-checked", "false");
+  await option.click();
+  await expect.element(option).toHaveAttribute("aria-checked", "true");
+});
diff --git a/apps/web/src/components/CommandPalette.logic.ts b/apps/web/src/components/CommandPalette.logic.ts
index db7ea4895b7c..895995c03e48 100644
--- a/apps/web/src/components/CommandPalette.logic.ts
+++ b/apps/web/src/components/CommandPalette.logic.ts
@@ -213,6 +213,8 @@ export interface CommandPaletteActionItem extends CommandPaletteItem {
   readonly run: () => Promise<void>;
   /** A pin toggle on the row, also reached with the pin shortcut while the row is highlighted. */
   readonly pin?: CommandPaletteItemPin;
+  /** Set on toggle rows; exposed to assistive technology as `aria-checked`. */
+  readonly checked?: boolean;
 }
 
 export interface CommandPaletteItemPin {
diff --git a/apps/web/src/components/CommandPalette.tsx b/apps/web/src/components/CommandPalette.tsx
index 99c87a939dd8..fe21bd2e3a63 100644
--- a/apps/web/src/components/CommandPalette.tsx
+++ b/apps/web/src/components/CommandPalette.tsx
@@ -2427,6 +2427,7 @@ function OpenCommandPaletteDialog(props: {
                 ),
                 ...(isCreatingNewProject ? { disabled: true } : {}),
                 keepOpen: true,
+                checked: newProjectPublishes,
                 run: async () => {
                   setNewProjectPublishes((publishes) => !publishes);
                 },
diff --git a/apps/web/src/components/CommandPaletteContent.tsx b/apps/web/src/components/CommandPaletteContent.tsx
index 25a72d151b6d..cd3f99a0438b 100644
--- a/apps/web/src/components/CommandPaletteContent.tsx
+++ b/apps/web/src/components/CommandPaletteContent.tsx
@@ -91,7 +91,7 @@ export function CommandPaletteContent({
           {children}
         </CommandPanel>
         <CommandFooter className="max-sm:flex-col max-sm:items-start">
-          <div className="flex items-center gap-3">
+          <div className="flex min-w-0 flex-wrap items-center gap-x-3 gap-y-1.5">
             <KbdGroup>
               <Kbd>
                 <ArrowUpIcon />
diff --git a/apps/web/src/components/CommandPaletteResults.tsx b/apps/web/src/components/CommandPaletteResults.tsx
index 864c190b89c5..8c52ad294fb4 100644
--- a/apps/web/src/components/CommandPaletteResults.tsx
+++ b/apps/web/src/components/CommandPaletteResults.tsx
@@ -250,6 +250,9 @@ function CommandPaletteResultRow(props: {
       {...(props.index === undefined ? {} : { index: props.index })}
       value={props.item.value}
       active={props.isActive}
+      {...(props.item.kind === "action" && props.item.checked !== undefined
+        ? { "aria-checked": props.item.checked }
+        : {})}
       onPointerDown={(event) => {
         if (props.item.threadRef) {
           startPaletteThreadDrag(
diff --git a/apps/web/src/components/ComposerPromptEditorTiptap.citationDraft.browser.test.tsx b/apps/web/src/components/ComposerPromptEditorTiptap.citationDraft.browser.test.tsx
index 8da54f5f7214..69c2ac1fd4d5 100644
--- a/apps/web/src/components/ComposerPromptEditorTiptap.citationDraft.browser.test.tsx
+++ b/apps/web/src/components/ComposerPromptEditorTiptap.citationDraft.browser.test.tsx
@@ -31,10 +31,12 @@ const promptBefore = `See ${serializeAssistantCitation(citation)} `;
 function Composer({
   question,
   editorRef,
+  disabled = false,
   send = "clears",
 }: {
   question: boolean;
   editorRef: React.RefObject<ComposerPromptEditorHandle | null>;
+  disabled?: boolean;
   send?: "clears" | "blocked" | "refusedLater";
 }) {
   const [prompt, setPrompt] = useState(promptBefore);
@@ -57,7 +59,7 @@ function Composer({
         cursor={0}
         contextRecords={new Map()}
         skills={[]}
-        disabled={false}
+        disabled={disabled}
         placeholder=""
         onChange={(next) => (question ? setAnswer(next) : setPrompt(next))}
         onCitationDraftSave={(replacedValue, savedValue) => {
@@ -159,3 +161,26 @@ it.each(["blocked", "refusedLater"] as const)(
       .toHaveAttribute("data-prompt", `See ${serializeAssistantCitation(citation)}x `);
   },
 );
+
+it("cancels a new citation while dictation makes the composer read-only", async () => {
+  const editorRef = createRef<ComposerPromptEditorHandle>();
+  await using screen = await render(<Composer question={false} editorRef={editorRef} disabled />);
+
+  const sourceAnchor = findAssistantCitationSourceAnchor(document, citation);
+  if (!sourceAnchor) throw new Error("Citation source did not resolve");
+  await act(async () =>
+    editorRef.current?.requestCitationComment({
+      previousValue: "See ",
+      value: promptBefore,
+      citationStart: "See ".length,
+      sourceAnchor,
+      insertedSpaces: { before: false, after: true },
+    }),
+  );
+  await expect.element(page.getByLabelText("Comment on selected text")).toBeVisible();
+
+  await page.getByRole("button", { name: "Cancel" }).click();
+
+  await expect.element(page.getByLabelText("Comment on selected text")).not.toBeInTheDocument();
+  expect(screen.container.querySelector("output")?.dataset.prompt).toBe("See ");
+});
diff --git a/apps/web/src/components/ComposerPromptEditorTiptap.input.browser.test.tsx b/apps/web/src/components/ComposerPromptEditorTiptap.input.browser.test.tsx
index 6971383b851e..cd01804f8efe 100644
--- a/apps/web/src/components/ComposerPromptEditorTiptap.input.browser.test.tsx
+++ b/apps/web/src/components/ComposerPromptEditorTiptap.input.browser.test.tsx
@@ -26,6 +26,22 @@ import {
   type ComposerPromptEditorProps,
 } from "./ComposerPromptEditorTiptap";
 
+vi.mock(import("../state/server"), async (original) => {
+  const { Atom } = await import("effect/reactivity");
+  const { compileResolvedKeybindingsConfig, DEFAULT_KEYBINDINGS } =
+    await import("@t3tools/shared/keybindings");
+  return {
+    ...(await original()),
+    primaryServerKeybindingsAtom: Atom.make(
+      compileResolvedKeybindingsConfig([
+        ...DEFAULT_KEYBINDINGS,
+        { key: "mod+arrowup", command: "thread.previous" },
+        { key: "mod+arrowdown", command: "thread.next" },
+      ]),
+    ),
+  };
+});
+
 const babysit: ServerProviderSkill = {
   name: "babysit",
   path: "/skills/babysit/SKILL.md",
@@ -195,11 +211,17 @@ it.each([
     await using screen = await mountEditor("ship it **now** done");
     const { editor } = screen;
     const mod = isMacPlatform(navigator.platform) ? "Meta" : "Control";
-    await act(async () => {
-      if (typeof caret === "number") editor.commands.focus(caret);
-      else editor.commands.focus("end");
-    });
-    await vi.waitFor(() => expect(document.activeElement).toBe(editor.view.dom));
+    // ProseMirror rewrites the DOM caret 20ms after focus. Run that now, or it
+    // can undo the first arrow key before ProseMirror reads the native move.
+    {
+      using _timers = fakeTimers();
+      await act(async () => {
+        if (typeof caret === "number") editor.commands.focus(caret);
+        else editor.commands.focus("end");
+      });
+      await vi.waitFor(() => expect(document.activeElement).toBe(editor.view.dom));
+      vi.runOnlyPendingTimers();
+    }
     if (typeof caret === "string") await userEvent.keyboard(caret);
     await userEvent.keyboard(`{${mod}>}${key}{/${mod}}`);
     await userEvent.keyboard("X");
@@ -265,6 +287,29 @@ it.each([
   },
 );
 
+// The mocked server keybindings bind Command-Up and Command-Down to thread navigation.
+it("leaves Command-arrow thread navigation bindings to the app on macOS", async () => {
+  using _platform = vi.spyOn(navigator, "platform", "get").mockReturnValue("MacIntel");
+  await using screen = await mountEditor("first\nsecond");
+  const { editor } = screen;
+  await act(async () => {
+    editor.commands.focus("end");
+  });
+  await vi.waitFor(() => expect(document.activeElement).toBe(editor.view.dom));
+  const reachedApp: string[] = [];
+  const onWindowKeyDown = (event: KeyboardEvent) => {
+    if (!event.defaultPrevented && event.key.startsWith("Arrow")) reachedApp.push(event.key);
+  };
+  window.addEventListener("keydown", onWindowKeyDown);
+  using _listener = {
+    [Symbol.dispose]: () => window.removeEventListener("keydown", onWindowKeyDown),
+  };
+
+  await userEvent.keyboard("{Meta>}{ArrowUp}{ArrowDown}{/Meta}");
+
+  expect(reachedApp).toEqual(["ArrowUp", "ArrowDown"]);
+});
+
 it.each([
   ["e", false, false],
   ["i", false, false],
diff --git a/apps/web/src/components/ComposerPromptEditorTiptap.tsx b/apps/web/src/components/ComposerPromptEditorTiptap.tsx
index 5895b63cbb9a..5a036e34611e 100644
--- a/apps/web/src/components/ComposerPromptEditorTiptap.tsx
+++ b/apps/web/src/components/ComposerPromptEditorTiptap.tsx
@@ -114,6 +114,9 @@ import { collectInlineContextIds } from "~/lib/composerContextReferences";
 import { resolveDiffThemeName } from "~/lib/diffRendering";
 import { isRichTextFormattingShortcut } from "~/keybindings";
 import { cn, isMacPlatform } from "~/lib/utils";
+import { isThreadNavigationShortcut } from "~/keybindings";
+import { appAtomRegistry } from "~/rpc/atomRegistry";
+import { primaryServerKeybindingsAtom } from "~/state/server";
 import { hasCommandForKeyDown } from "~/shortcuts/dispatcher";
 import { basenameOfPath } from "~/pierre-icons";
 import { WorkspaceEntryTooltip } from "./chat/WorkspaceEntryIcon";
@@ -468,7 +471,7 @@ function ComposerCitationNodeView({ node, editor, getPos }: NodeViewProps) {
 
   const removeOnCancel = commentTarget?.removeOnCancel;
   const onRemove = () => {
-    if (!editor.isEditable || !removeOnCancel) return;
+    if (!removeOnCancel) return;
     const pos = nodePos();
     if (pos === null) return;
     const { doc } = editor.state;
@@ -477,7 +480,9 @@ function ComposerCitationNodeView({ node, editor, getPos }: NodeViewProps) {
     const end = pos + current.nodeSize;
     const from = removeOnCancel.before && doc.textBetween(pos - 1, pos) === " " ? pos - 1 : pos;
     const to = removeOnCancel.after && doc.textBetween(end, end + 1) === " " ? end + 1 : end;
-    editor.chain().focus().deleteRange({ from, to }).run();
+    // A read-only composer (dictation) can still receive a new citation, so Cancel must undo it.
+    const chain = editor.chain();
+    (editor.isEditable ? chain.focus() : chain).deleteRange({ from, to }).run();
   };
 
   const sentRef = useRef(false);
@@ -1141,6 +1146,13 @@ function ComposerPromptEditorTiptapInner(
             !event.ctrlKey &&
             !event.isComposing
           ) {
+            if (
+              isThreadNavigationShortcut(event, appAtomRegistry.get(primaryServerKeybindingsAtom), {
+                context: { editableFocus: true },
+              })
+            ) {
+              return false;
+            }
             const selection = window.getSelection();
             if (
               selection?.anchorNode &&
diff --git a/apps/web/src/components/DiffPanel.browser.test.tsx b/apps/web/src/components/DiffPanel.browser.test.tsx
index 5f789469af76..51ba65933dff 100644
--- a/apps/web/src/components/DiffPanel.browser.test.tsx
+++ b/apps/web/src/components/DiffPanel.browser.test.tsx
@@ -4,6 +4,7 @@ import {
   DEFAULT_CLIENT_SETTINGS,
   EnvironmentId,
   ProjectId,
+  RunId,
   ThreadId,
   type ClientSettings,
   type ReviewBranchCommitsResult,
@@ -35,6 +36,8 @@ const state = vi.hoisted(() => ({
   localRefs: null as unknown as ResultAtom<VcsListRefsResult>,
   remoteRefs: null as unknown as ResultAtom<VcsListRefsResult>,
   commits: null as unknown as ResultAtom<ReviewBranchCommitsResult>,
+  checkpoints: [] as unknown[],
+  checkpointDiff: null as { diff: string } | null,
 }));
 
 vi.mock("~/state/server", () => ({
@@ -59,7 +62,7 @@ vi.mock("~/state/vcs", () => ({
 vi.mock("~/state/entities", () => ({
   useQuietThreadShell: () => state.thread,
   useProject: () => ({ workspaceRoot: "/project", repositoryIdentity: null }),
-  useThreadCheckpointSummaries: () => [],
+  useThreadCheckpointSummaries: () => state.checkpoints,
   useQuietThreadVisibleTurnItems: () => [],
 }));
 vi.mock("~/state/filesystem", () => ({
@@ -77,7 +80,7 @@ vi.mock("~/hooks/useTheme", () => ({
   subscribeRenderedAppearance: () => () => {},
 }));
 vi.mock("~/state/queries", () => ({
-  useCheckpointDiff: () => ({ data: null, error: null, isPending: false }),
+  useCheckpointDiff: () => ({ data: state.checkpointDiff, error: null, isPending: false }),
   useTurnItemDetail: () => ({ data: null, error: null, isPending: false }),
   useDebouncedValue: <A,>(value: A) => value,
 }));
@@ -126,6 +129,8 @@ function setup(failedBaseRef: string | null) {
   };
   reset();
   state.diffFilesCollapsed = false;
+  state.checkpoints = [];
+  state.checkpointDiff = null;
   const patch = Atom.make<AsyncResult.AsyncResult<ReviewDiffPreviewSource, Error>>(
     AsyncResult.initial(),
   );
@@ -267,3 +272,33 @@ it.each([false, true])(
     await expect.element(toggle).toHaveAttribute("aria-expanded", "false");
   },
 );
+
+it("says a turn diff cut off at the server's size limit is incomplete", async () => {
+  using context = setup("origin/orphan");
+  state.checkpoints = [
+    {
+      runId: "run",
+      checkpointTurnCount: 1,
+      checkpointRef: "ref",
+      status: "ready",
+      files: [],
+      assistantMessageId: null,
+      completedAt: "2026-01-01T00:00:00Z",
+    },
+  ];
+  state.checkpointDiff = {
+    diff: "diff --git a/first.txt b/first.txt\n--- a/first.txt\n+++ b/first.txt\n@@ -0,0 +1 @@\n+visible\n\n[truncated]",
+  };
+  useDiffPanelStore.getState().selectTurn(context.threadRef, RunId.make("run"));
+  await using screen = await render(
+    <RegistryContext.Provider value={context.registry}>
+      <div style={{ height: 600, display: "flex", flexDirection: "column" }}>
+        <DiffPanel composerDraftTarget={context.threadRef} workspaceMutationId={null} visible />
+      </div>
+    </RegistryContext.Provider>,
+  );
+  await expect.element(screen.getByText("first.txt", { exact: true }).first()).toBeVisible();
+  await expect
+    .element(screen.getByText("This preview exceeds the size limit. Changes shown are incomplete."))
+    .toBeVisible();
+});
diff --git a/apps/web/src/components/DiffPanel.tsx b/apps/web/src/components/DiffPanel.tsx
index 4231b669aa76..2b0a6a78d4ec 100644
--- a/apps/web/src/components/DiffPanel.tsx
+++ b/apps/web/src/components/DiffPanel.tsx
@@ -6,7 +6,12 @@ import {
   squashAtomCommandFailure,
 } from "@t3tools/client-runtime/state/runtime";
 import { safeErrorLogAttributes } from "@t3tools/client-runtime/errors";
-import type { ReviewBranchCommitsResult, ScopedThreadRef, RunId } from "@t3tools/contracts";
+import {
+  CHECKPOINT_DIFF_TRUNCATED_MARKER,
+  type ReviewBranchCommitsResult,
+  type ScopedThreadRef,
+  type RunId,
+} from "@t3tools/contracts";
 import {
   ArrowRightIcon,
   CheckIcon,
@@ -232,7 +237,8 @@ export default function DiffPanel({
     wordWrap: settings.wordWrap,
   }));
   const diffLayout = settings.diffLayout;
-  const [wordWrap, setWordWrap] = useState(settings.wordWrap);
+  const [wordWrapOverride, setWordWrapOverride] = useState<boolean | null>(null);
+  const wordWrap = wordWrapOverride ?? settings.wordWrap;
   const diffIgnoreWhitespace =
     useDiffPanelSessionStore((state) => state.ignoreWhitespace) ?? settings.diffIgnoreWhitespace;
   const [fileTreeOpen, setFileTreeOpen] = useLocalStorage(
@@ -482,7 +488,10 @@ export default function DiffPanel({
       : gitDiff;
   const isSelectedPatchTruncated =
     toolCallPreview?.truncated === true ||
-    (isGitSelection && selectedGitSource?.truncated === true);
+    (isGitSelection && selectedGitSource?.truncated === true) ||
+    (!toolCallSelection &&
+      selectedTurn !== undefined &&
+      selectedPatch?.endsWith(CHECKPOINT_DIFF_TRUNCATED_MARKER) === true);
   const selectedPatchQuery = toolCallSelection
     ? toolCallDetail
     : selectedTurn
@@ -1218,7 +1227,7 @@ export default function DiffPanel({
                 size="sm"
                 pressed={wordWrap}
                 onPressedChange={(pressed) => {
-                  setWordWrap(Boolean(pressed));
+                  setWordWrapOverride(Boolean(pressed));
                 }}
               />
             }
diff --git a/apps/web/src/components/GitActionsControl.tsx b/apps/web/src/components/GitActionsControl.tsx
index bb89514b2f0a..99fa3abceee6 100644
--- a/apps/web/src/components/GitActionsControl.tsx
+++ b/apps/web/src/components/GitActionsControl.tsx
@@ -1238,7 +1238,7 @@ export default function GitActionsControl({
         !isLocalDraftThread &&
         !readEnvironmentScope(activeEnvironmentId, AuthOrchestrationOperateScope))
     )
-      return;
+      return false;
     const actionStatus = statusOverride ?? gitStatusForActions;
     const actionBranch = actionStatus?.refName ?? null;
     const actionIsDefaultBranch = featureBranch ? false : isDefaultRef;
@@ -1258,7 +1258,7 @@ export default function GitActionsControl({
         action !== "commit_push" &&
         action !== "commit_push_pr"
       ) {
-        return;
+        return false;
       }
       setPendingDefaultBranchAction({
         action,
@@ -1268,7 +1268,7 @@ export default function GitActionsControl({
         ...(onConfirmed ? { onConfirmed } : {}),
         ...(filePaths ? { filePaths } : {}),
       });
-      return;
+      return false;
     }
     onConfirmed?.();
     setInlineSuccess(null);
@@ -1288,7 +1288,7 @@ export default function GitActionsControl({
 
     if (result._tag === "Failure") {
       if (isAtomCommandInterrupted(result)) {
-        return;
+        return false;
       }
 
       const error = squashAtomCommandFailure(result);
@@ -1302,7 +1302,7 @@ export default function GitActionsControl({
           ...(scopedToastData !== undefined ? { data: scopedToastData } : {}),
         }),
       );
-      return;
+      return false;
     }
 
     const actionResult = result.value;
@@ -1316,6 +1316,7 @@ export default function GitActionsControl({
       scopeKey: successScopeKey,
       expiresAtMs: inlineSuccessExpiresAt(),
     });
+    return true;
   }
 
   const continuePendingDefaultBranchAction = (featureBranch: boolean) => {
@@ -1334,6 +1335,12 @@ export default function GitActionsControl({
     });
   };
 
+  // Keep a typed message for the retry unless the user already started a new one.
+  const restoreDialogCommitMessageOnFailure = (commitMessage: string) => (committed: boolean) => {
+    if (committed || !commitMessage) return;
+    setDialogCommitMessage((current) => current || commitMessage);
+  };
+
   const runDialogActionOnNewBranch = () => {
     if (!isCommitDialogOpen) return;
     const commitMessage = dialogCommitMessage.trim();
@@ -1349,7 +1356,7 @@ export default function GitActionsControl({
       ...(!allSelected ? { filePaths: selectedFiles.map((f) => f.path) } : {}),
       featureBranch: true,
       skipDefaultBranchPrompt: true,
-    });
+    }).then(restoreDialogCommitMessageOnFailure(commitMessage));
   };
 
   const runQuickAction = () => {
@@ -1434,7 +1441,7 @@ export default function GitActionsControl({
       action: "commit",
       ...(commitMessage ? { commitMessage } : {}),
       ...(!allSelected ? { filePaths: selectedFiles.map((f) => f.path) } : {}),
-    });
+    }).then(restoreDialogCommitMessageOnFailure(commitMessage));
   };
 
   const openChangedFileInEditor = (filePath: string) => {
diff --git a/apps/web/src/components/HistorySwipeNavigation.browser.test.tsx b/apps/web/src/components/HistorySwipeNavigation.browser.test.tsx
index 10bf817b7363..d2a15729b0df 100644
--- a/apps/web/src/components/HistorySwipeNavigation.browser.test.tsx
+++ b/apps/web/src/components/HistorySwipeNavigation.browser.test.tsx
@@ -71,4 +71,36 @@ describe("HistorySwipeNavigation", () => {
 
     expect(navigateHistory).not.toHaveBeenCalled();
   });
+
+  // A vertical scroll 15° off vertical.
+  const drift = Array.from({ length: 30 }, () => [-4, 15] as const);
+  it.each([
+    [
+      "a vertical scroll that starts slightly diagonally keeps the thread",
+      [[-5, 3], ...drift],
+      false,
+    ],
+    [
+      "a swipe that leans diagonally for two events navigates",
+      [
+        [-5, 3],
+        [-2, 2],
+        [-150, 0],
+      ],
+      true,
+    ],
+    ["a single diagonal event past the trigger keeps the thread", [[-130, 100]], false],
+  ] as const)("%s", async (_name, events, navigates) => {
+    navigateHistory.mockReset();
+    using _platform = vi.spyOn(navigator, "platform", "get").mockReturnValue("MacIntel");
+    await using screen = await render(<HistorySwipeNavigation />);
+    const panel = screen.container.appendChild(document.createElement("div"));
+    for (const [deltaX, deltaY] of [...events, [0, 0] as const]) {
+      panel.dispatchEvent(
+        new WheelEvent("wheel", { deltaX, deltaY, bubbles: true, composed: true }),
+      );
+    }
+
+    expect(navigateHistory).toHaveBeenCalledTimes(navigates ? 1 : 0);
+  });
 });
diff --git a/apps/web/src/components/HistorySwipeNavigation.tsx b/apps/web/src/components/HistorySwipeNavigation.tsx
index e1adc04491a9..2924f82cd313 100644
--- a/apps/web/src/components/HistorySwipeNavigation.tsx
+++ b/apps/web/src/components/HistorySwipeNavigation.tsx
@@ -7,6 +7,10 @@ import { canNavigateHistory, navigateHistory, type HistoryDirection } from "../n
 const SWIPE_TRIGGER_DISTANCE = 120;
 // Movement needed before the gesture picks an axis; first events are often diagonal.
 const SWIPE_AXIS_LOCK_DISTANCE = 8;
+// Vertical scrolls drift sideways, so a swipe's horizontal travel must clearly dominate once
+// it has moved far enough for its direction to be more than noise.
+const SWIPE_HORIZONTAL_DOMINANCE = 2;
+const SWIPE_DOMINANCE_DISTANCE = 30;
 const MOMENTUM_SAMPLE_SIZE = 5;
 
 type SwipeBounds = { left: number; top: number; width: number; height: number };
@@ -17,6 +21,8 @@ type SwipeGesture =
       direction: HistoryDirection;
       distance: number;
       deltas: number[];
+      travelX: number;
+      travelY: number;
       y: number;
       bounds: SwipeBounds;
     }
@@ -52,11 +58,19 @@ function canScrollHorizontally(path: readonly EventTarget[], deltaX: number): bo
   return false;
 }
 
+function isVerticalScroll(travelX: number, travelY: number): boolean {
+  return (
+    travelX + travelY >= SWIPE_DOMINANCE_DISTANCE && travelX <= SWIPE_HORIZONTAL_DOMINANCE * travelY
+  );
+}
+
 function lockSwipeAxis(
   pending: Extract<SwipeGesture, { kind: "pending" }>,
 ): Exclude<SwipeGesture, { kind: "pending" }> {
   const { path, sumX, sumY } = pending;
-  if (Math.abs(sumX) <= Math.abs(sumY)) return { kind: "ignored" };
+  if (Math.abs(sumX) <= Math.abs(sumY) || isVerticalScroll(Math.abs(sumX), Math.abs(sumY))) {
+    return { kind: "ignored" };
+  }
   if (path.some((node) => node instanceof Element && node.matches('[role="dialog"]'))) {
     return { kind: "ignored" };
   }
@@ -68,6 +82,8 @@ function lockSwipeAxis(
     direction,
     distance: Math.abs(sumX),
     deltas: [],
+    travelX: Math.abs(sumX),
+    travelY: Math.abs(sumY),
     y: pending.y,
     bounds: readMainContentBounds(),
   };
@@ -134,6 +150,12 @@ export function HistorySwipeNavigation() {
       } else {
         const delta = gesture.direction === "back" ? -event.deltaX : event.deltaX;
         if (event.deltaX === 0 && event.deltaY === 0) return release();
+        gesture.travelX += Math.abs(event.deltaX);
+        gesture.travelY += Math.abs(event.deltaY);
+        if (isVerticalScroll(gesture.travelX, gesture.travelY)) {
+          gesture = { kind: "ignored" };
+          return hideIndicator();
+        }
         gesture.deltas = [...gesture.deltas.slice(1 - MOMENTUM_SAMPLE_SIZE), delta];
         if (isMomentumTail(gesture.deltas)) return release();
         gesture.distance = Math.max(0, gesture.distance + delta);
diff --git a/apps/web/src/components/ReopenClosedViewShortcut.browser.test.tsx b/apps/web/src/components/ReopenClosedViewShortcut.browser.test.tsx
index 5dc65e57f1ca..dd12cedfbdef 100644
--- a/apps/web/src/components/ReopenClosedViewShortcut.browser.test.tsx
+++ b/apps/web/src/components/ReopenClosedViewShortcut.browser.test.tsx
@@ -265,11 +265,15 @@ describe("root reopen shortcut", () => {
       expect(useClosedViewStore.getState().entries).toEqual([]);
     },
   );
-  it("forwards address-bar focus from a focused desktop page", async () => {
+  it("forwards address-bar focus and zoom from a focused desktop page", async () => {
     setup();
     await using _shortcut = await renderShortcut();
     expect(state.setShortcuts).toHaveBeenLastCalledWith(
-      expect.arrayContaining([expect.objectContaining({ command: "preview.focusUrl" })]),
+      expect.arrayContaining(
+        ["preview.focusUrl", "preview.zoomIn", "preview.zoomOut", "preview.resetZoom"].map(
+          (command) => expect.objectContaining({ command }),
+        ),
+      ),
     );
   });
 });
diff --git a/apps/web/src/components/ReopenClosedViewShortcut.tsx b/apps/web/src/components/ReopenClosedViewShortcut.tsx
index 7ecc10110f1f..dfb68fe27e80 100644
--- a/apps/web/src/components/ReopenClosedViewShortcut.tsx
+++ b/apps/web/src/components/ReopenClosedViewShortcut.tsx
@@ -50,6 +50,9 @@ const PREVIEW_FORWARDED_COMMANDS = [
   "rightPanel.toggle",
   "rightPanel.toggleMaximized",
   "preview.focusUrl",
+  "preview.zoomIn",
+  "preview.zoomOut",
+  "preview.resetZoom",
   "preview.find",
 ] as const;
 
diff --git a/apps/web/src/components/RightPanelSheet.browser.test.tsx b/apps/web/src/components/RightPanelSheet.browser.test.tsx
new file mode 100644
index 000000000000..c99e1e218b41
--- /dev/null
+++ b/apps/web/src/components/RightPanelSheet.browser.test.tsx
@@ -0,0 +1,16 @@
+import { expect, it } from "vite-plus/test";
+import { page } from "vite-plus/test/browser";
+
+import { render } from "../../test/render";
+import { RightPanelSheet } from "./RightPanelSheet";
+
+it("names the open right-panel dialog", async () => {
+  await using _screen = await render(
+    <RightPanelSheet open animationDurationMs={0} onClose={() => {}}>
+      <div>Panel content</div>
+    </RightPanelSheet>,
+  );
+  const dialog = page.getByRole("dialog");
+  await expect.element(dialog).toBeVisible();
+  await expect.element(dialog).not.toHaveAccessibleName("");
+});
diff --git a/apps/web/src/components/RightPanelSheet.tsx b/apps/web/src/components/RightPanelSheet.tsx
index 0cad2af5009d..56846307b83d 100644
--- a/apps/web/src/components/RightPanelSheet.tsx
+++ b/apps/web/src/components/RightPanelSheet.tsx
@@ -1,6 +1,6 @@
 import { type ReactNode } from "react";
 
-import { Sheet, SheetPopup } from "./ui/sheet";
+import { Sheet, SheetHeader, SheetPopup, SheetTitle } from "./ui/sheet";
 
 export function RightPanelSheet(props: {
   animationDurationMs: number;
@@ -24,6 +24,9 @@ export function RightPanelSheet(props: {
         keepMounted
         className="w-[min(42vw,28rem)] min-w-80 max-w-[28rem] max-[760px]:w-[min(88vw,24rem)] max-[760px]:min-w-0 wco:mt-(--workspace-topbar-height) wco:h-[calc(100%-var(--workspace-topbar-height))] wco:max-h-[calc(100%-var(--workspace-topbar-height))]"
       >
+        <SheetHeader className="sr-only">
+          <SheetTitle>Workspace panel</SheetTitle>
+        </SheetHeader>
         {props.children}
       </SheetPopup>
     </Sheet>
diff --git a/apps/web/src/components/RightPanelTabs.browser.test.tsx b/apps/web/src/components/RightPanelTabs.browser.test.tsx
index cceb8c22c707..f803cb41520b 100644
--- a/apps/web/src/components/RightPanelTabs.browser.test.tsx
+++ b/apps/web/src/components/RightPanelTabs.browser.test.tsx
@@ -2,6 +2,7 @@ import "~/index.css";
 
 import { EnvironmentId } from "@t3tools/contracts";
 import { describe, expect, it, vi } from "vite-plus/test";
+import { userEvent } from "vite-plus/test/browser";
 
 import { InputGroup, InputGroupAddon, InputGroupInput } from "~/components/ui/input-group";
 import type { RightPanelSurface } from "~/rightPanelStore";
@@ -249,3 +250,41 @@ describe("right panel thumb buttons", () => {
     expect(actions).toEqual(["back", "forward", "back"]);
   });
 });
+
+const DEVICE_SURFACE: RightPanelSurface = {
+  id: "device:host:phone",
+  kind: "device",
+  target: { hostId: "host", deviceId: "phone", platform: "ios", name: "Phone" },
+};
+
+describe("device tab rename", () => {
+  it("keeps the editor open on an Enter that confirms an IME candidate", async () => {
+    const onRenameDevice = vi.fn();
+    const props = panel(DEVICE_SURFACE).props as RightPanelTabsProps;
+    await using screen = await render(
+      <RightPanelTabs {...props} surfaces={[DEVICE_SURFACE]} onRenameDevice={onRenameDevice}>
+        {null}
+      </RightPanelTabs>,
+    );
+    await userEvent.dblClick(screen.getByRole("button", { name: "Phone", exact: true }));
+    const input = screen.getByRole("textbox", { name: "Device tab name" });
+    await userEvent.fill(input, "にほん");
+
+    for (const shape of [
+      { isComposing: true, keyCode: 13 },
+      { isComposing: false, keyCode: 229 },
+    ]) {
+      input
+        .element()
+        .dispatchEvent(
+          new KeyboardEvent("keydown", { key: "Enter", bubbles: true, cancelable: true, ...shape }),
+        );
+    }
+
+    await expect.element(input).toHaveFocus();
+    expect(onRenameDevice).not.toHaveBeenCalled();
+    await userEvent.fill(input, "日本語");
+    await userEvent.keyboard("{Enter}");
+    expect(onRenameDevice).toHaveBeenCalledExactlyOnceWith(DEVICE_SURFACE.id, "日本語");
+  });
+});
diff --git a/apps/web/src/components/RightPanelTabs.tsx b/apps/web/src/components/RightPanelTabs.tsx
index 223799efb26f..d220385e2814 100644
--- a/apps/web/src/components/RightPanelTabs.tsx
+++ b/apps/web/src/components/RightPanelTabs.tsx
@@ -965,6 +965,7 @@ function RightPanelTab(
           onBlur={(event) => onFinishRename(surface.id, event.currentTarget.value)}
           onKeyDown={(event) => {
             event.stopPropagation();
+            if (event.nativeEvent.isComposing || event.keyCode === 229) return;
             if (event.key === "Enter") event.currentTarget.blur();
             if (event.key === "Escape") {
               event.currentTarget.value = title;
diff --git a/apps/web/src/components/ServerUpdateAction.tsx b/apps/web/src/components/ServerUpdateAction.tsx
index 14e0dd3c192c..ef999e5bcdc3 100644
--- a/apps/web/src/components/ServerUpdateAction.tsx
+++ b/apps/web/src/components/ServerUpdateAction.tsx
@@ -276,17 +276,17 @@ export function ServerUpdateAction({
   const canUpdate = useAtomValue(sessionStateAtom, canUpdateServer);
   const updatesDenial = managedUpdatesDenial(useManagedPolicy(environmentId));
   const update = useServerUpdate();
+  const updatesInstall =
+    installation?.kind === "npm-global" || installation?.kind === "t3-launcher";
   const { copyToClipboard } = useCopyToClipboard<{ command: string }>({
-    target: installation?.kind === "npm-global" ? "update command" : "relaunch command",
+    target: updatesInstall ? "update command" : "relaunch command",
     onCopy: ({ command }) => {
       toastManager.add({
         type: "success",
-        title:
-          installation?.kind === "npm-global" ? "Update command copied" : "Relaunch command copied",
-        description:
-          installation?.kind === "npm-global"
-            ? `Run \`${command}\` on ${serverLabel}, then restart t3 with your usual options.`
-            : `Stop t3 on ${serverLabel}, then relaunch with \`${command}\` using the same subcommand and options. This does not update an installed t3 command.`,
+        title: updatesInstall ? "Update command copied" : "Relaunch command copied",
+        description: updatesInstall
+          ? `Run \`${command}\` on ${serverLabel}, then restart t3 with your usual options.`
+          : `Stop t3 on ${serverLabel}, then relaunch with \`${command}\` using the same subcommand and options. This does not update an installed t3 command.`,
       });
     },
     onError: (error) => {
@@ -353,7 +353,7 @@ export function ServerUpdateAction({
     selfUpdate === null ? manualServerUpdateCommand(targetVersion, installation) : null;
   const actionLabel =
     manualCommand !== null
-      ? installation?.kind === "npm-global"
+      ? updatesInstall
         ? "Copy update command"
         : "Copy relaunch command"
       : label;
diff --git a/apps/web/src/components/Sidebar.browser.test.tsx b/apps/web/src/components/Sidebar.browser.test.tsx
index 64bead88b35c..f152cabf0185 100644
--- a/apps/web/src/components/Sidebar.browser.test.tsx
+++ b/apps/web/src/components/Sidebar.browser.test.tsx
@@ -1,3 +1,7 @@
+import appCss from "../index.css?inline";
+import type { EnvironmentServerConfig } from "@t3tools/client-runtime/connection";
+import * as shelfHooks from "../state/olderSettledShelf";
+import { createWorkspaceFocusController, workspaceAreaProps } from "../lib/workspaceFocus";
 import type { EnvironmentThreadShell } from "@t3tools/client-runtime/state/shell";
 import {
   DEFAULT_CLIENT_SETTINGS,
@@ -16,7 +20,7 @@ import { makeThreadFixture } from "../test-fixtures";
 import { useHandleNewThread } from "../hooks/useHandleNewThread";
 import { __setClientSettingsForTests, getClientSettings } from "../hooks/useSettings";
 import { useThreadRouteTarget } from "../hooks/useThreadRouteTarget";
-import { useProjects, useQuietThreadShells } from "../state/entities";
+import { useProjects, useServerConfigs, useQuietThreadShells } from "../state/entities";
 import { readEnvironmentScope, useEnvironmentScope } from "../state/session";
 import { useOrchestrationCommand } from "../state/use-orchestration-command";
 import { useTerminalUiStateStore } from "../terminalUiStateStore";
@@ -26,6 +30,10 @@ import { THREAD_JUMP_HINT_SHOW_DELAY_MS } from "./Sidebar.logic";
 import { SortableThreadRow } from "./sidebar/SidebarThreadRow";
 import { SidebarProvider } from "./ui/sidebar";
 
+vi.mock(import("../state/olderSettledShelf"), async (original) => {
+  const actual = await original();
+  return { ...actual, useOlderSettledShelf: vi.fn(actual.useOlderSettledShelf) };
+});
 vi.mock("../state/entities", { spy: true });
 vi.mock("../hooks/useHandleNewThread", { spy: true });
 vi.mock("../hooks/useThreadRouteTarget", { spy: true });
@@ -135,6 +143,7 @@ describe("sidebar render isolation", () => {
       environmentId: activeProject.environmentId,
       threadId: threads[0]!.id,
     };
+    threads.unshift(threadShell(activeProject.id, 100));
     vi.mocked(useProjects).mockReturnValue([activeProject]);
     vi.mocked(useQuietThreadShells).mockReturnValue(threads);
     vi.mocked(useThreadRouteTarget).mockReturnValue({ kind: "server", threadRef: routeThreadRef });
@@ -247,3 +256,98 @@ describe("sidebar thread rename", () => {
     },
   );
 });
+
+describe("sidebar settled pagination", () => {
+  it("keeps the viewport in place when showing more settled threads", async () => {
+    using stack = new DisposableStack();
+    const style = document.createElement("style");
+    style.textContent = appCss;
+    document.head.append(style);
+    stack.defer(() => style.remove());
+    const focusController = createWorkspaceFocusController(document);
+    stack.defer(() => focusController.dispose());
+    let loading = false;
+    const originalShelf = vi.mocked(shelfHooks.useOlderSettledShelf).getMockImplementation()!;
+    using _shelf = vi.spyOn(shelfHooks, "useOlderSettledShelf").mockImplementation((input) => ({
+      ...originalShelf(input),
+      loading,
+      retry: () => {
+        loading = true;
+      },
+    }));
+    const activeProject = project("active");
+    const threads = Array.from({ length: 70 }, (_, index) =>
+      makeThreadFixture({
+        environmentId: activeProject.environmentId,
+        projectId: activeProject.id,
+        id: ThreadId.make(`settled-${index}`),
+        title: `Settled thread ${index}`,
+        settledOverride: "settled",
+        settledAt: "2026-01-01T00:00:00.000Z",
+      }),
+    );
+    threads.unshift(threadShell(activeProject.id, 100));
+    vi.mocked(useProjects).mockReturnValue([activeProject]);
+    vi.mocked(useQuietThreadShells).mockReturnValue(threads);
+    vi.mocked(useThreadRouteTarget).mockReturnValue({
+      kind: "server",
+      threadRef: { environmentId: activeProject.environmentId, threadId: threads[0]!.id },
+    });
+    vi.mocked(useHandleNewThread).mockReturnValue({
+      activeDraftThread: null,
+      activeThread: null,
+      defaultProjectRef: {
+        environmentId: activeProject.environmentId,
+        projectId: activeProject.id,
+      },
+      defaultProjectFallbackReady: true,
+      handleNewThread: vi.fn().mockResolvedValue(null),
+      routeDraftId: null,
+      routeThreadRef: { environmentId: activeProject.environmentId, threadId: threads[0]!.id },
+    });
+    vi.mocked(useServerConfigs).mockReturnValue(
+      new Map([
+        [
+          activeProject.environmentId,
+          {
+            scratchWorkspaceRoot: null,
+            shellThreadFamilies: false,
+          } as unknown as EnvironmentServerConfig,
+        ],
+      ]),
+    );
+    await using screen = await render(
+      <SidebarProvider
+        {...workspaceAreaProps("sidebar", 0, "Threads")}
+        style={{ height: 400, minHeight: 400 }}
+      >
+        <Sidebar routeReveal={{ observedKey: null, pendingKey: null }} />
+      </SidebarProvider>,
+    );
+    const shelf = screen.container.querySelector<HTMLElement>(
+      '[data-sidebar-row="shelf:settled"]',
+    )!;
+    if (shelf.getAttribute("aria-expanded") === "false") await act(() => shelf.click());
+    const more = screen.getByRole("button", { name: "Show 25 more", exact: true });
+    await expect.element(more).toBeInTheDocument();
+    const moreButton = more.element() as HTMLButtonElement;
+    const viewport = moreButton.closest<HTMLElement>('[data-slot="scroll-area-viewport"]')!;
+    viewport.style.height = "300px";
+    viewport.style.maxHeight = "300px";
+    moreButton.scrollIntoView({ block: "nearest" });
+    const before = viewport.scrollTop;
+    expect(before).toBeGreaterThan(0);
+    moreButton.focus({ preventScroll: true });
+    await act(() => moreButton.click());
+    await expect
+      .element(screen.getByRole("button", { name: "Loading", exact: true }))
+      .toBeInTheDocument();
+    await expect
+      .element(screen.getByRole("button", { name: "Loading", exact: true }))
+      .toHaveFocus();
+    expect(viewport.scrollTop).toBe(before);
+    const loadedRows = screen.container.querySelectorAll("[data-thread-item]").length;
+    await act(() => moreButton.click());
+    expect(screen.container.querySelectorAll("[data-thread-item]")).toHaveLength(loadedRows);
+  });
+});
diff --git a/apps/web/src/components/Sidebar.drag.browser.test.tsx b/apps/web/src/components/Sidebar.drag.browser.test.tsx
index b6494d089ae1..c5811df12b76 100644
--- a/apps/web/src/components/Sidebar.drag.browser.test.tsx
+++ b/apps/web/src/components/Sidebar.drag.browser.test.tsx
@@ -51,8 +51,13 @@ it("keeps the title when dragging a search result from a collapsed folder", asyn
   });
   const folder = page.getByRole("button", { name: /^render/ });
   await expect.element(folder).toHaveAttribute("aria-expanded", "true");
-  await userEvent.click(folder);
-  await expect.element(page.getByText(second.title, { exact: true })).not.toBeInTheDocument();
+  // A removed row fades out as a clone without its test id, so match the live row only.
+  const secondRow = page.getByTestId("sidebar-row-folder").filter({ hasText: second.title });
+  await expect.element(secondRow).toBeInTheDocument();
+  // The shift guard drops pointer presses on a row that appeared under 500ms ago; keys pass.
+  folder.element().focus();
+  await userEvent.keyboard("{Enter}");
+  await expect.element(secondRow).not.toBeInTheDocument();
   await userEvent.fill(page.getByRole("combobox", { name: "Search threads" }), "search-target");
   const result = page.getByRole("option", { name: /Thread search-target/ });
   await expect.element(result).toBeVisible();
diff --git a/apps/web/src/components/Sidebar.shiftGuard.browser.test.ts b/apps/web/src/components/Sidebar.shiftGuard.browser.test.ts
new file mode 100644
index 000000000000..23210bea89cc
--- /dev/null
+++ b/apps/web/src/components/Sidebar.shiftGuard.browser.test.ts
@@ -0,0 +1,180 @@
+import { describe, expect, it, vi } from "vite-plus/test";
+import { userEvent } from "vite-plus/test/browser";
+import { fakeTimers, render } from "../../test/render";
+import { createSidebarShiftGuard } from "./Sidebar.shiftGuard";
+
+function mountList(container: HTMLElement, names: readonly string[]) {
+  const list = document.createElement("ul");
+  list.style.cssText = "position: relative; margin: 0; padding: 0; width: 200px; list-style: none";
+  const pressed: string[] = [];
+  const rows = new Map<string, HTMLLIElement>();
+  const add = (name: string) => {
+    const row = document.createElement("li");
+    row.style.height = "40px";
+    const button = document.createElement("button");
+    button.textContent = name;
+    button.addEventListener("click", () => pressed.push(name));
+    row.append(button);
+    list.append(row);
+    rows.set(name, row);
+  };
+  for (const name of names) add(name);
+  container.append(list);
+  const guard = createSidebarShiftGuard(list);
+  return {
+    pressed,
+    guard,
+    button: (name: string) => rows.get(name)!.querySelector("button")!,
+    add,
+    remove: (name: string) => rows.get(name)!.remove(),
+    [Symbol.dispose]: () => guard.dispose(),
+  };
+}
+
+// userEvent cannot hold the mouse, so `act` runs inside the real press, after the guard saw it.
+function duringPress(act: () => void) {
+  const listener = () => act();
+  window.addEventListener("pointerdown", listener, { capture: true, once: true });
+  return {
+    [Symbol.dispose]: () => window.removeEventListener("pointerdown", listener, { capture: true }),
+  };
+}
+
+describe("sidebar shift guard", () => {
+  it("drops a press on a row that slid up on its own, then accepts it after the delay", async () => {
+    await using screen = await render(null);
+    using list = mountList(screen.container, ["A", "B", "C"]);
+    using _clock = fakeTimers();
+
+    list.remove("A");
+    list.guard.update();
+    await userEvent.click(list.button("B"));
+    expect(list.pressed).toEqual([]);
+
+    vi.advanceTimersByTime(500);
+    await userEvent.click(list.button("B"));
+    expect(list.pressed).toEqual(["B"]);
+  });
+
+  it("keeps rows that did not move, or barely moved, clickable", async () => {
+    await using screen = await render(null);
+    using list = mountList(screen.container, ["A", "B", "C"]);
+    using _clock = fakeTimers();
+
+    list.remove("C");
+    list.button("A").closest("ul")!.style.paddingTop = "2px";
+    list.guard.update();
+    await userEvent.click(list.button("A"));
+    await userEvent.click(list.button("B"));
+    expect(list.pressed).toEqual(["A", "B"]);
+  });
+
+  it("keeps rows clickable when an empty list first fills", async () => {
+    await using screen = await render(null);
+    using list = mountList(screen.container, []);
+    using _clock = fakeTimers();
+
+    list.add("A");
+    list.add("B");
+    list.guard.update();
+    await userEvent.click(list.button("B"));
+    expect(list.pressed).toEqual(["B"]);
+  });
+
+  it("lets the user act on the row their own press moved", async () => {
+    await using screen = await render(null);
+    using list = mountList(screen.container, ["A", "B", "C"]);
+    using _clock = fakeTimers();
+    list.button("A").addEventListener("click", () => {
+      list.remove("A");
+      list.guard.update();
+    });
+
+    await userEvent.click(list.button("A"));
+    await userEvent.click(list.button("B"));
+    expect(list.pressed).toEqual(["A", "B"]);
+  });
+
+  it("clears an earlier mark when the user's own input moves the row again", async () => {
+    await using screen = await render(null);
+    using list = mountList(screen.container, ["A", "B", "C", "D"]);
+    using _clock = fakeTimers();
+
+    list.remove("A");
+    list.guard.update();
+    await userEvent.keyboard("{Escape}");
+    list.remove("B");
+    list.guard.update();
+    await userEvent.click(list.button("C"));
+    expect(list.pressed).toEqual(["C"]);
+  });
+
+  it("still guards a move that lands while the user types into a field", async () => {
+    await using screen = await render(null);
+    const field = document.createElement("input");
+    screen.container.append(field);
+    using list = mountList(screen.container, ["A", "B", "C"]);
+    using _clock = fakeTimers();
+
+    field.focus();
+    await userEvent.keyboard("x");
+    list.remove("A");
+    list.guard.update();
+    await userEvent.click(list.button("B"));
+    expect(list.pressed).toEqual([]);
+  });
+
+  it("keeps a held press dropped until its release, whatever happens before", async () => {
+    await using screen = await render(null);
+    using list = mountList(screen.container, ["A", "B", "C"]);
+    using _clock = fakeTimers();
+
+    list.remove("A");
+    list.guard.update();
+    using _hold = duringPress(() => {
+      window.dispatchEvent(new KeyboardEvent("keydown", { key: "Shift" }));
+      const other = { bubbles: true, pointerId: 9 };
+      screen.container.dispatchEvent(new PointerEvent("pointerdown", other));
+      screen.container.dispatchEvent(new PointerEvent("pointerup", other));
+      vi.advanceTimersByTime(1_000);
+    });
+    await userEvent.click(list.button("B"));
+    expect(list.pressed).toEqual([]);
+  });
+
+  it("lets keyboard activation through while a dropped press is held", async () => {
+    await using screen = await render(null);
+    using list = mountList(screen.container, ["A", "B", "C"]);
+    using _clock = fakeTimers();
+
+    list.remove("A");
+    list.guard.update();
+    list
+      .button("B")
+      .dispatchEvent(new PointerEvent("pointerdown", { bubbles: true, pointerId: 9 }));
+    list.button("C").focus();
+    await userEvent.keyboard("{Enter}");
+    expect(list.pressed).toEqual(["C"]);
+    await userEvent.keyboard("{Shift>}{F10}{/Shift}");
+    expect(
+      list
+        .button("C")
+        .dispatchEvent(new MouseEvent("contextmenu", { bubbles: true, cancelable: true })),
+    ).toBe(true);
+  });
+
+  it("ends a dropped press the browser cancels", async () => {
+    await using screen = await render(null);
+    using list = mountList(screen.container, ["A", "B", "C"]);
+    using _clock = fakeTimers();
+
+    list.remove("A");
+    list.guard.update();
+    const touch = { bubbles: true, pointerId: 9, pointerType: "touch" };
+    list.button("B").dispatchEvent(new PointerEvent("pointerdown", touch));
+    list.button("B").dispatchEvent(new PointerEvent("pointercancel", touch));
+    vi.advanceTimersByTime(500);
+    await userEvent.click(list.button("B"));
+    expect(list.pressed).toEqual(["B"]);
+  });
+});
diff --git a/apps/web/src/components/Sidebar.shiftGuard.ts b/apps/web/src/components/Sidebar.shiftGuard.ts
new file mode 100644
index 000000000000..fc8bec17f1d4
--- /dev/null
+++ b/apps/web/src/components/Sidebar.shiftGuard.ts
@@ -0,0 +1,137 @@
+// How long a row the list just moved ignores presses. A click that was already
+// on its way when the row slid under the pointer lands within this window.
+const MOVED_ROW_PRESS_DELAY_MS = 500;
+// Moves this soon after the user's own press or key are theirs, such as the next
+// row sliding up after Settle. Same window as Cumulative Layout Shift's
+// hadRecentInput.
+const OWN_INPUT_WINDOW_MS = 500;
+
+const PRESS_FOLLOW_UPS = ["click", "auxclick", "dblclick", "contextmenu"] as const;
+
+// Editing text cannot move rows. Enter and modified keys in a field can, such as
+// sending a message or a shortcut.
+function editsText(event: KeyboardEvent) {
+  const target = event.target;
+  const editable =
+    target instanceof HTMLElement &&
+    (target.isContentEditable ||
+      target instanceof HTMLInputElement ||
+      target instanceof HTMLTextAreaElement);
+  return editable && event.key !== "Enter" && !event.ctrlKey && !event.metaKey && !event.altKey;
+}
+
+function readTops(list: HTMLElement) {
+  const tops = new Map<HTMLElement, number>();
+  for (const child of list.children) {
+    if (child instanceof HTMLElement) tops.set(child, child.offsetTop);
+  }
+  return tops;
+}
+
+/**
+ * Drops presses on rows that something other than the user just moved, so a
+ * thread settling, waking or arriving above the pointer cannot hand its click
+ * to the neighbouring row. Call `update` after each commit that can move rows.
+ * The list must be positioned so every direct child's offsetTop shares its origin.
+ */
+export function createSidebarShiftGuard(list: HTMLElement) {
+  const view = list.ownerDocument.defaultView;
+  let tops = readTops(list);
+  const movedAt = new WeakMap<Element, number>();
+  let lastInputAt = Number.NEGATIVE_INFINITY;
+  // Pointers still down on a dropped press. Only their own release or cancel ends the drop, so
+  // a key or another pointer meanwhile cannot hand that press's click to the row.
+  const heldDrops = new Set<number>();
+  let pressDropped = false;
+  let releasedDrop: number | null = null;
+
+  const rowOf = (target: EventTarget | null) => {
+    let node = target instanceof Node ? target : null;
+    while (node !== null && node.parentNode !== list) node = node.parentNode;
+    return node instanceof Element ? node : null;
+  };
+  const swallow = (event: Event) => {
+    event.preventDefault();
+    event.stopPropagation();
+  };
+  const onPointerDown = (event: PointerEvent) => {
+    // A new press from the same pointer means its earlier release was missed.
+    heldDrops.delete(event.pointerId);
+    if (releasedDrop === event.pointerId) releasedDrop = null;
+    const now = performance.now();
+    const row = rowOf(event.target);
+    const moved = row === null ? undefined : movedAt.get(row);
+    if (moved !== undefined && now - moved < MOVED_ROW_PRESS_DELAY_MS) {
+      heldDrops.add(event.pointerId);
+      pressDropped = true;
+      swallow(event);
+      return;
+    }
+    pressDropped = false;
+    lastInputAt = now;
+  };
+  const onPointerUp = (event: PointerEvent) => {
+    const dropped = heldDrops.delete(event.pointerId);
+    releasedDrop = dropped ? event.pointerId : null;
+    pressDropped = dropped;
+    if (dropped) {
+      if (rowOf(event.target) !== null) swallow(event);
+      return;
+    }
+    lastInputAt = performance.now();
+  };
+  const onPointerCancel = (event: PointerEvent) => {
+    heldDrops.delete(event.pointerId);
+  };
+  const onKeyDown = (event: KeyboardEvent) => {
+    pressDropped = false;
+    if (!editsText(event)) lastInputAt = performance.now();
+  };
+  const onPressFollowUp = (event: MouseEvent) => {
+    // Keyboard activation clicks carry no click count; only pointer presses are dropped.
+    if (event.type === "click" && event.detail === 0) return;
+    const dropped =
+      event instanceof PointerEvent && event.pointerId >= 0
+        ? heldDrops.has(event.pointerId) || releasedDrop === event.pointerId
+        : pressDropped;
+    if (dropped && rowOf(event.target) !== null) swallow(event);
+  };
+
+  // Window capture runs before React and dnd-kit see the press.
+  view?.addEventListener("pointerdown", onPointerDown, { capture: true });
+  view?.addEventListener("pointerup", onPointerUp, { capture: true });
+  view?.addEventListener("pointercancel", onPointerCancel, { capture: true });
+  view?.addEventListener("keydown", onKeyDown, { capture: true });
+  for (const type of PRESS_FOLLOW_UPS) {
+    view?.addEventListener(type, onPressFollowUp, { capture: true });
+  }
+
+  return {
+    update() {
+      const next = readTops(list);
+      const now = performance.now();
+      // A list filling from empty slid nothing under the pointer.
+      const ownMove = tops.size === 0 || now - lastInputAt < OWN_INPUT_WINDOW_MS;
+      for (const [row, top] of next) {
+        const previous = tops.get(row);
+        if (previous === top) continue;
+        // A nudge of under half a row, such as a header settling, still leaves the row the pointer
+        // aimed at under it.
+        if (previous !== undefined && Math.abs(top - previous) * 2 < row.offsetHeight) continue;
+        // The latest move decides: one the user caused clears an earlier mark.
+        if (ownMove) movedAt.delete(row);
+        else movedAt.set(row, now);
+      }
+      tops = next;
+    },
+    dispose() {
+      view?.removeEventListener("pointerdown", onPointerDown, { capture: true });
+      view?.removeEventListener("pointerup", onPointerUp, { capture: true });
+      view?.removeEventListener("pointercancel", onPointerCancel, { capture: true });
+      view?.removeEventListener("keydown", onKeyDown, { capture: true });
+      for (const type of PRESS_FOLLOW_UPS) {
+        view?.removeEventListener(type, onPressFollowUp, { capture: true });
+      }
+    },
+  };
+}
diff --git a/apps/web/src/components/Sidebar.tsx b/apps/web/src/components/Sidebar.tsx
index 6cb1e722322b..a94b9e9497c6 100644
--- a/apps/web/src/components/Sidebar.tsx
+++ b/apps/web/src/components/Sidebar.tsx
@@ -217,6 +217,7 @@ import {
 } from "./Sidebar.drag";
 import { SidebarPointerSensor } from "./Sidebar.pointer";
 import { createSidebarListMotion } from "./Sidebar.motion";
+import { createSidebarShiftGuard } from "./Sidebar.shiftGuard";
 import {
   pickSnoozePreset,
   resolveSnoozePresets,
@@ -232,6 +233,7 @@ import {
   useActiveRowReveal,
 } from "./sidebar/routeReveal";
 import { stackedThreadToast, toastManager } from "./ui/toast";
+import { titleRegenerationToast } from "./threadTitleRegenerationToast";
 import { copyThreadReference } from "../lib/copyThreadReference";
 import { threadChipCopyTarget } from "@t3tools/client-runtime/thread-reference";
 import { Button } from "./ui/button";
@@ -256,7 +258,7 @@ import {
   useComposerDraftStore,
   usePromotingDraftThreadKeys,
 } from "../composerDraftStore";
-import { useThreadRouteTarget } from "../hooks/useThreadRouteTarget";
+import { useShownThreadRouteTarget } from "../hooks/useShownThreadRouteTarget";
 import {
   SidebarSearchResultRow,
   SortableThreadRow,
@@ -936,6 +938,9 @@ export default function Sidebar({ routeReveal }: { routeReveal: SidebarRouteReve
   const updateThreadMetadata = useOrchestrationCommand(threadEnvironment.updateMetadata, {
     reportFailure: false,
   });
+  const regenerateThreadTitle = useOrchestrationCommand(threadEnvironment.regenerateTitle, {
+    reportFailure: false,
+  });
   const { copyToClipboard: copyPathToClipboard } = useCopyToClipboard<{ path: string }>({
     onCopy: ({ path }) => {
       toastManager.add({
@@ -1002,10 +1007,14 @@ export default function Sidebar({ routeReveal }: { routeReveal: SidebarRouteReve
   const toggleThreadSelection = useThreadSelectionStore((s) => s.toggleThread);
   const rangeSelectTo = useThreadSelectionStore((s) => s.rangeSelectTo);
   const acknowledgeWoke = useAcknowledgeThreadWoke();
-  const routeTarget = useThreadRouteTarget();
+  // A Settings or Usage modal keeps the thread behind it current.
+  const routeTarget = useShownThreadRouteTarget().shownTarget;
   const routeDraftThread = useComposerDraftStore((store) =>
     routeTarget?.kind === "draft" ? store.getDraftSession(routeTarget.draftId) : null,
   );
+  const routeDraftRedirect = useComposerDraftStore((store) =>
+    routeTarget?.kind === "draft" ? store.getPromotedDraftRedirect(routeTarget.draftId) : null,
+  );
   const environmentMachineById = useEnvironmentMachines();
   const projectGroupsRef = useRef(projectGroups);
   const persistedProjectScopeKeys = useUiStateStore((store) => store.sidebarProjectScopeKeys);
@@ -1048,6 +1057,7 @@ export default function Sidebar({ routeReveal }: { routeReveal: SidebarRouteReve
   const sidebarContentRef = useRef<HTMLDivElement | null>(null);
   const dragLabelOffsetRef = useRef(0);
   const listMotionRef = useRef<ReturnType<typeof createSidebarListMotion> | null>(null);
+  const shiftGuardRef = useRef<ReturnType<typeof createSidebarShiftGuard> | null>(null);
   const [dragState, setDragState] = useState<{
     readonly activeKey: string;
     readonly activeSection: SidebarSection;
@@ -1066,7 +1076,11 @@ export default function Sidebar({ routeReveal }: { routeReveal: SidebarRouteReve
   const snoozingThreadKeysRef = useRef(new Set<string>());
   const removeFromSelection = useThreadSelectionStore((s) => s.removeFromSelection);
   const openAddProjectCommandPalette = () => openCommandPalette({ open: "add-project" });
-  const routeThreadRef = resolveActiveThreadRouteRef(routeTarget, routeDraftThread);
+  const routeThreadRef = resolveActiveThreadRouteRef(
+    routeTarget,
+    routeDraftThread,
+    routeDraftRedirect,
+  );
   const routeThreadKey = routeThreadRef ? scopedThreadKey(routeThreadRef) : null;
 
   // A selection made under one scope can hold threads the next scope hides.
@@ -1701,13 +1715,17 @@ export default function Sidebar({ routeReveal }: { routeReveal: SidebarRouteReve
     const motion = createSidebarListMotion(node);
     listMotionRef.current = motion;
     motion.update(false);
+    const shiftGuard = createSidebarShiftGuard(node);
+    shiftGuardRef.current = shiftGuard;
     return () => {
       // Search replaces this list while the Sidebar stays mounted, and a drag
       // whose rows are gone can never drop. The compiler memoizes this callback
       // with no deps (it reads only refs), so the cleanup runs only on unmount.
       dragSensorRef.current?.cancel();
       motion.dispose();
+      shiftGuard.dispose();
       if (listMotionRef.current === motion) listMotionRef.current = null;
+      if (shiftGuardRef.current === shiftGuard) shiftGuardRef.current = null;
       if (threadListRef.current === node) threadListRef.current = null;
     };
   };
@@ -2013,8 +2031,9 @@ export default function Sidebar({ routeReveal }: { routeReveal: SidebarRouteReve
     ":",
   );
   const previousShelfExpansionKeyRef = useRef(shelfExpansionKey);
-  // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- tells the list motion controller to animate or not after each layout-affecting commit
+  // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- records moved rows and updates list motion after each layout-affecting commit
   useLayoutEffect(() => {
+    shiftGuardRef.current?.update();
     // Shelf rows would travel over stationary headers below the bottom-anchored shelf.
     const shelvesUnchanged = previousShelfExpansionKeyRef.current === shelfExpansionKey;
     previousShelfExpansionKeyRef.current = shelfExpansionKey;
@@ -2453,25 +2472,18 @@ export default function Sidebar({ routeReveal }: { routeReveal: SidebarRouteReve
         return;
       }
       if (clicked.value === "regenerate-title") {
-        for (const thread of regeneratableTitleThreads) {
-          const result = await updateThreadMetadata({
-            environmentId: thread.environmentId,
-            input: { threadId: thread.id, regenerateTitle: true },
-          });
-          if (result._tag === "Success") continue;
-          if (!isAtomCommandInterrupted(result)) {
-            const error = squashAtomCommandFailure(result);
-            toastManager.add(
-              stackedThreadToast({
-                type: "error",
-                title: "Failed to regenerate thread titles",
-                description: error instanceof Error ? error.message : "An error occurred.",
-              }),
-            );
-          }
-          return;
-        }
         clearSelection();
+        const toast = titleRegenerationToast(
+          await Promise.all(
+            regeneratableTitleThreads.map((thread) =>
+              regenerateThreadTitle({
+                environmentId: thread.environmentId,
+                input: { threadId: thread.id },
+              }),
+            ),
+          ),
+        );
+        if (toast) toastManager.add(toast);
         return;
       }
       if (clicked.value === "settle") {
@@ -2784,20 +2796,13 @@ export default function Sidebar({ routeReveal }: { routeReveal: SidebarRouteReve
             return;
           case "regenerate-title": {
             if (isRegeneratingTitle) return;
-            const result = await updateThreadMetadata({
-              environmentId: threadRef.environmentId,
-              input: { threadId: threadRef.threadId, regenerateTitle: true },
-            });
-            if (result._tag === "Failure" && !isAtomCommandInterrupted(result)) {
-              const error = squashAtomCommandFailure(result);
-              toastManager.add(
-                stackedThreadToast({
-                  type: "error",
-                  title: "Failed to regenerate thread title",
-                  description: error instanceof Error ? error.message : "An error occurred.",
-                }),
-              );
-            }
+            const toast = titleRegenerationToast([
+              await regenerateThreadTitle({
+                environmentId: threadRef.environmentId,
+                input: { threadId: threadRef.threadId },
+              }),
+            ]);
+            if (toast) toastManager.add(toast);
             return;
           }
           case "mark-unread":
@@ -3285,6 +3290,51 @@ export default function Sidebar({ routeReveal }: { routeReveal: SidebarRouteReve
               </p>
             )
           ) : null}
+          {/* A scope can hide every active thread; say so even when its project still has settled ones. */}
+          {!isSearchingThreads &&
+          !hasProjectFolders &&
+          visibleDraftSessionCount === 0 &&
+          pinnedThreads.length +
+            activeThreads.length +
+            workingThreads.length +
+            snoozedThreads.length ===
+            0 &&
+          (settledCount === 0 || scopedProjectGroups.length > 0) ? (
+            <div className="flex flex-col items-center gap-2 px-2 py-6 text-center text-xs text-muted-foreground/60">
+              {projects.length === 0 ? (
+                <>
+                  <span>No projects yet</span>
+                  <button
+                    type="button"
+                    onClick={openAddProjectCommandPalette}
+                    className="inline-flex cursor-pointer items-center gap-1.5 rounded-md border border-sidebar-border px-2.5 py-1 text-2xs font-medium text-sidebar-muted-foreground transition-colors hover:bg-sidebar-row-hover hover:text-sidebar-foreground"
+                  >
+                    <PlusIcon className="-mx-0.5 size-3" />
+                    Add project
+                  </button>
+                </>
+              ) : scopedProjectGroups.length > 0 ? (
+                <>
+                  <span>
+                    {`No ${settledCount > 0 ? "active threads" : "threads"} in ${
+                      scopedProjectGroups.length > 1
+                        ? "these projects"
+                        : scopedProjectGroups[0]!.displayName
+                    }${settledCount > 0 ? "" : " yet"}`}
+                  </span>
+                  <button
+                    type="button"
+                    onClick={() => setProjectScopeKeys([])}
+                    className="inline-flex cursor-pointer items-center gap-1.5 rounded-md border border-sidebar-border px-2.5 py-1 text-2xs font-medium text-sidebar-muted-foreground transition-colors hover:bg-sidebar-row-hover hover:text-sidebar-foreground"
+                  >
+                    Show all projects
+                  </button>
+                </>
+              ) : (
+                "No threads yet"
+              )}
+            </div>
+          ) : null}
           {!isSearchingThreads ? (
             <TooltipProvider
               key="sidebar-thread-tooltips-150"
@@ -3599,12 +3649,13 @@ export default function Sidebar({ routeReveal }: { routeReveal: SidebarRouteReve
                           type="button"
                           data-sidebar-row="settled:more"
                           data-sidebar-parent="shelf:settled"
-                          disabled={olderSettledShelf.loading}
+                          aria-disabled={olderSettledShelf.loading}
                           onClick={() => {
+                            if (olderSettledShelf.loading) return;
                             olderSettledShelf.retry();
                             showMoreSettled();
                           }}
-                          className="flex h-9 w-full cursor-pointer items-center gap-2.5 rounded-md px-2.5 text-left text-sm text-sidebar-muted-foreground hover:bg-sidebar-row-hover hover:text-sidebar-foreground disabled:cursor-default"
+                          className="flex h-9 w-full cursor-pointer items-center gap-2.5 rounded-md px-2.5 text-left text-sm text-sidebar-muted-foreground hover:bg-sidebar-row-hover hover:text-sidebar-foreground aria-disabled:cursor-default"
                         >
                           {/* Plus means "add", so revealing more uses a chevron. */}
                           <ChevronDownIcon aria-hidden className="size-4 shrink-0" />
@@ -3621,37 +3672,6 @@ export default function Sidebar({ routeReveal }: { routeReveal: SidebarRouteReve
               </DndContext>
             </TooltipProvider>
           ) : null}
-          {!isSearchingThreads &&
-          !hasProjectFolders &&
-          visibleDraftSessionCount === 0 &&
-          pinnedThreads.length +
-            activeThreads.length +
-            workingThreads.length +
-            snoozedThreads.length +
-            settledCount ===
-            0 ? (
-            <div className="flex flex-col items-center gap-2 px-2 py-6 text-center text-xs text-muted-foreground/60">
-              {projects.length === 0 ? (
-                <>
-                  <span>No projects yet</span>
-                  <button
-                    type="button"
-                    onClick={openAddProjectCommandPalette}
-                    className="inline-flex cursor-pointer items-center gap-1.5 rounded-md border border-sidebar-border px-2.5 py-1 text-2xs font-medium text-sidebar-muted-foreground transition-colors hover:bg-sidebar-row-hover hover:text-sidebar-foreground"
-                  >
-                    <PlusIcon className="-mx-0.5 size-3" />
-                    Add project
-                  </button>
-                </>
-              ) : scopedProjectGroups.length > 1 ? (
-                "No threads in these projects yet"
-              ) : scopedProjectGroups[0] ? (
-                `No threads in ${scopedProjectGroups[0].displayName} yet`
-              ) : (
-                "No threads yet"
-              )}
-            </div>
-          ) : null}
         </SidebarGroup>
       </SidebarContent>
       <SidebarChromeFooter />
diff --git a/apps/web/src/components/ThreadTerminalDrawer.browser.test.tsx b/apps/web/src/components/ThreadTerminalDrawer.browser.test.tsx
index 9fd275874753..850b9cb8174f 100644
--- a/apps/web/src/components/ThreadTerminalDrawer.browser.test.tsx
+++ b/apps/web/src/components/ThreadTerminalDrawer.browser.test.tsx
@@ -4,10 +4,14 @@ import {
   ThreadId,
   type ScopedThreadRef,
   type FilesystemEntryMetadata,
+  type ResolvedKeybindingsConfig,
 } from "@t3tools/contracts";
+import { compileResolvedKeybindingsConfig, DEFAULT_KEYBINDINGS } from "@t3tools/shared/keybindings";
 import { Atom, AsyncResult } from "effect/reactivity";
 import type { GhosttyTerminalSurfaceOptions } from "~/terminal/ghostty/surface";
 import { AppAtomRegistryProvider, appAtomRegistry } from "../rpc/atomRegistry";
+import { useRightPanelStore } from "../rightPanelStore";
+import { useTerminalUiStateStore } from "../terminalUiStateStore";
 import { extractTerminalLinks } from "../terminal-links";
 import { expect, it, vi } from "vite-plus/test";
 import { act, fakeTimers, render } from "../../test/render";
@@ -110,6 +114,7 @@ function Drawer(props: {
   threadRef: ScopedThreadRef;
   cwd?: string;
   onCloseTerminal: (terminalId: string, threadRef?: ScopedThreadRef) => void;
+  keybindings?: ResolvedKeybindingsConfig;
 }) {
   return (
     <ThreadTerminalDrawer
@@ -128,7 +133,7 @@ function Drawer(props: {
       onCloseTerminal={props.onCloseTerminal}
       onHeightChange={() => {}}
       onAddTerminalContext={() => {}}
-      keybindings={[]}
+      keybindings={props.keybindings ?? []}
     />
   );
 }
@@ -149,6 +154,8 @@ function setup() {
   fixture.pendingSurfaces = [];
   fixture.surfaceOptions = [];
   fixture.metadata.clear();
+  useRightPanelStore.setState(useRightPanelStore.getInitialState());
+  useTerminalUiStateStore.setState(useTerminalUiStateStore.getInitialState());
   return { original, other };
 }
 
@@ -170,6 +177,42 @@ it("closes an exited terminal on its own thread after navigating to one reusing
   expect(onCloseTerminal.mock.calls).toEqual([["term-1", original]]);
 });
 
+// Thread navigation defaults have no `!terminalFocus`, so they apply in a focused terminal.
+it("hands thread navigation shortcuts from a focused terminal back to the app", async () => {
+  const { other: threadRef } = setup();
+  using _platform = vi.spyOn(navigator, "platform", "get").mockReturnValue("Linux x86_64");
+  useRightPanelStore.getState().openBrowser(threadRef, null);
+  await using _screen = await render(
+    <Drawer
+      threadRef={threadRef}
+      onCloseTerminal={() => {}}
+      keybindings={compileResolvedKeybindingsConfig([
+        ...DEFAULT_KEYBINDINGS,
+        { key: "ctrl+r", command: "thread.next", when: "!previewOpen" },
+        { key: "ctrl+g", command: "thread.previous", when: "terminalOpen" },
+      ])}
+    />,
+  );
+  await act(async () => {
+    fixture.pendingSurfaces.shift()?.();
+  });
+  const terminalHandles = (key: string, code: string, shiftKey = true) =>
+    fixture.surfaceOptions
+      .at(-1)!
+      .beforeKey(new KeyboardEvent("keydown", { key, code, ctrlKey: true, shiftKey }));
+
+  expect([terminalHandles("{", "BracketLeft"), terminalHandles("}", "BracketRight")]).toEqual([
+    false,
+    false,
+  ]);
+  expect(terminalHandles("C", "KeyC")).toBe(true);
+  // Sidebar sees the open preview and the closed drawer and rejects these, so the shell keeps them.
+  expect([terminalHandles("r", "KeyR", false), terminalHandles("g", "KeyG", false)]).toEqual([
+    true,
+    true,
+  ]);
+});
+
 it("only activates terminal paths confirmed to exist on their environment", async () => {
   const { other: threadRef } = setup();
   const key = (path: string) => JSON.stringify([threadRef.environmentId, path]);
diff --git a/apps/web/src/components/ThreadTerminalDrawer.test.ts b/apps/web/src/components/ThreadTerminalDrawer.test.ts
index 83358c39d826..22270787dcc9 100644
--- a/apps/web/src/components/ThreadTerminalDrawer.test.ts
+++ b/apps/web/src/components/ThreadTerminalDrawer.test.ts
@@ -8,30 +8,12 @@ import {
 } from "@t3tools/client-runtime/state/terminal";
 
 import {
-  shouldClearTerminalSelectionAction,
   shouldHandleTerminalExit,
   synchronizeTerminalOutput,
   synchronizeTerminalSession,
 } from "./ThreadTerminalDrawer";
 
 describe("terminal selection actions", () => {
-  it("does not let an old selection popup cancel its replacement right-click menu", () => {
-    expect(
-      shouldClearTerminalSelectionAction({
-        actionPending: false,
-        openMenuRequestId: 3,
-        currentRequestId: 4,
-      }),
-    ).toBe(false);
-    expect(
-      shouldClearTerminalSelectionAction({
-        actionPending: false,
-        openMenuRequestId: null,
-        currentRequestId: 4,
-      }),
-    ).toBe(false);
-  });
-
   it("handles an exit that lands while the terminal surface is still loading", () => {
     expect(shouldHandleTerminalExit("exited", "running", false, 1)).toBe(true);
     expect(shouldHandleTerminalExit("exited", "exited", false, 1)).toBe(false);
diff --git a/apps/web/src/components/ThreadTerminalDrawer.tsx b/apps/web/src/components/ThreadTerminalDrawer.tsx
index 049589d0b671..2e08462eba47 100644
--- a/apps/web/src/components/ThreadTerminalDrawer.tsx
+++ b/apps/web/src/components/ThreadTerminalDrawer.tsx
@@ -51,19 +51,13 @@ import { stackedThreadToast, toastManager } from "~/components/ui/toast";
 import { readTextFromClipboard, writeTextToClipboard } from "~/hooks/useCopyToClipboard";
 import { cn } from "~/lib/utils";
 import { type TerminalContextSelection } from "~/lib/terminalContext";
-import {
-  observeSelectionActions,
-  resolveSelectionActionPosition,
-  type SelectionActionPoint,
-} from "~/lib/selectionActions";
 import {
   GhosttyTerminalSurface,
   type GhosttyTerminalSurfaceOptions,
 } from "~/terminal/ghostty/surface";
 import { type GhosttyColor, type GhosttyTheme } from "~/terminal/ghostty/core";
 import { useOpenInPreferredEditor } from "../editorPreferences";
-import { resolvePathLinkTarget } from "@t3tools/shared/fileLinks";
-import { isTerminalUrl } from "../terminal-links";
+import { isTerminalUrl, resolveTerminalLinkTarget } from "../terminal-links";
 import {
   isDiffToggleShortcut,
   isTerminalClearShortcut,
@@ -71,6 +65,7 @@ import {
   isTerminalSplitShortcut,
   isTerminalSplitVerticalShortcut,
   isTerminalToggleShortcut,
+  isThreadNavigationShortcut,
   terminalDeleteShortcutData,
   terminalNavigationShortcutData,
 } from "../keybindings";
@@ -96,6 +91,7 @@ import { openTerminalLinkInPreview } from "./preview/openTerminalLinkInPreview";
 import { useAtomCommand } from "../state/use-atom-command";
 import { preventTerminalCloseShortcut } from "../lib/terminalCloseShortcut";
 import { observeResize } from "../lib/observeResize";
+import { threadShortcutContext } from "./Sidebar.logic";
 import {
   consumePendingTerminalFocus,
   focusTerminal,
@@ -433,15 +429,6 @@ function terminalContextMenuItems(options: {
   ];
 }
 
-/** A superseded popup's unsettled promise must not cancel the newer right-click flow. */
-export function shouldClearTerminalSelectionAction(options: {
-  actionPending: boolean;
-  openMenuRequestId: number | null;
-  currentRequestId: number;
-}): boolean {
-  return options.actionPending || options.openMenuRequestId === options.currentRequestId;
-}
-
 /**
  * A writable session's output generation. A new one is a fresh PTY (or a
  * reconnect) that has not seen the surface's grid yet.
@@ -538,7 +525,7 @@ function TerminalSessionViewport({
     linkPath !== null && canOpenHostEditor && canReadFilesystem
       ? getFileMetadataQueryAtom(
           environmentId,
-          resolvePathLinkTarget(linkPath, cwd),
+          resolveTerminalLinkTarget(linkPath, cwd),
           cwd,
           metadataThreadRef,
         )
@@ -559,7 +546,7 @@ function TerminalSessionViewport({
       return false;
     const query = getFileMetadataQueryAtom(
       environmentId,
-      resolvePathLinkTarget(text, cwd),
+      resolveTerminalLinkTarget(text, cwd),
       cwd,
       metadataThreadRef,
     );
@@ -574,6 +561,7 @@ function TerminalSessionViewport({
   const openInPreferredEditor = useOpenInPreferredEditor(
     environmentId,
     serverConfig?.availableEditors ?? [],
+    worktreePath ?? cwd,
   );
   const openTerminalPath = useEffectEvent((target: string) => openInPreferredEditor(target));
   const openPreview = useAtomCommand(previewEnvironment.open, {
@@ -587,8 +575,8 @@ function TerminalSessionViewport({
   });
   const hasHandledExitRef = useRef(false);
   const selectionActionRequestIdRef = useRef(0);
-  const openSelectionMenuRequestIdRef = useRef<number | null>(null);
   const readKeybindings = useEffectEvent(() => keybindings);
+  const readThreadShortcutContext = useEffectEvent(() => threadShortcutContext(threadRef));
   const handleSessionExited = useEffectEvent(() => {
     if (hasTerminalWriteAccess()) onSessionExited();
   });
@@ -716,7 +704,6 @@ function TerminalSessionViewport({
     let teardown: (() => void) | null = null;
     let setupTerminal: GhosttyTerminalSurface | null = null;
     let setupCleanups: Array<() => void> = [];
-    let selectionActions: ReturnType<typeof observeSelectionActions> | null = null;
 
     const setup = async (): Promise<(() => void) | null> => {
       const setupFont = terminalFontRef.current;
@@ -725,7 +712,7 @@ function TerminalSessionViewport({
         font: terminalFontOptions(setupFont.family, setupFont.size),
         onData: (data) => handleData(data),
         onResize: (cols, rows) => void resizeTerminal(cols, rows),
-        onSelectionChange: () => handleSelectionChange(),
+        onSelectionChange: () => {},
         beforeKey: (event) => handleBeforeKey(event),
         onLinkActivate: (text, event) => handleLinkActivate(text, event),
         canActivateLink: (text) => canActivateTerminalLink(text),
@@ -798,28 +785,17 @@ function TerminalSessionViewport({
         terminal.focus();
       }
 
-      const dismissSelectionAction = (supersede = false) => {
-        const ownsMenu =
-          openSelectionMenuRequestIdRef.current === selectionActionRequestIdRef.current;
-        if (supersede || ownsMenu) selectionActionRequestIdRef.current += 1;
-        if (ownsMenu) void localApi?.contextMenu.close();
-      };
       const clearSelectionAction = () => {
-        selectionActions?.cancel();
-        dismissSelectionAction(true);
+        selectionActionRequestIdRef.current += 1;
       };
       setupCleanups.push(clearSelectionAction);
 
-      const readSelectionAction = (
-        pointer: SelectionActionPoint | null = null,
-      ): {
-        position: { x: number; y: number };
+      const readSelectionAction = (): {
         clipboardText: string;
         selection: TerminalContextSelection;
       } | null => {
         const activeTerminal = terminalRef.current;
-        const mountElement = containerRef.current;
-        if (!activeTerminal || !mountElement || !activeTerminal.hasSelection()) {
+        if (!activeTerminal || !activeTerminal.hasSelection()) {
           return null;
         }
         const selectionText = activeTerminal.getSelection();
@@ -829,15 +805,7 @@ function TerminalSessionViewport({
           return null;
         }
         const { lineStart, lineEnd } = terminalSelectionLineRange(selectionPosition);
-        const bounds = mountElement.getBoundingClientRect();
-        const position = resolveSelectionActionPosition({
-          bounds,
-          selectionRect: activeTerminal.getSelectionEndClientRect(),
-          pointer,
-          viewport: { width: window.innerWidth, height: window.innerHeight },
-        });
         return {
-          position,
           clipboardText: selectionText,
           selection: {
             terminalId,
@@ -947,44 +915,6 @@ function TerminalSessionViewport({
         }
       };
 
-      const showSelectionAction = async (pointer: SelectionActionPoint | null) => {
-        if (!localApi) {
-          clearSelectionAction();
-          return;
-        }
-        if (openSelectionMenuRequestIdRef.current === selectionActionRequestIdRef.current) {
-          return;
-        }
-        const nextAction = readSelectionAction(pointer);
-        if (!nextAction) {
-          clearSelectionAction();
-          return;
-        }
-        const requestId = ++selectionActionRequestIdRef.current;
-        openSelectionMenuRequestIdRef.current = requestId;
-        const clicked = await localApi.contextMenu
-          .show(
-            terminalSelectionMenuItems({ canAddToChat: canAddSelectionToChat() }),
-            nextAction.position,
-          )
-          .finally(() => {
-            if (openSelectionMenuRequestIdRef.current === requestId) {
-              openSelectionMenuRequestIdRef.current = null;
-            }
-          });
-        if (requestId !== selectionActionRequestIdRef.current || clicked === null) {
-          return;
-        }
-        switch (clicked) {
-          case "add-to-chat":
-            if (canAddSelectionToChat()) addSelectionToChat(nextAction.clipboardText);
-            return;
-          case "copy":
-            await copySelection(nextAction.clipboardText, requestId);
-            return;
-        }
-      };
-
       const sendTerminalInput = async (data: string, fallbackError: string) => {
         if (!hasTerminalWriteAccess()) return;
         const activeTerminal = terminalRef.current;
@@ -1010,7 +940,11 @@ function TerminalSessionViewport({
           isTerminalSplitShortcut(event, currentKeybindings, options) ||
           isTerminalSplitVerticalShortcut(event, currentKeybindings, options) ||
           isTerminalNewShortcut(event, currentKeybindings, options) ||
-          isDiffToggleShortcut(event, currentKeybindings, options)
+          isDiffToggleShortcut(event, currentKeybindings, options) ||
+          // Match Sidebar's context, or a key it will reject skips the shell.
+          isThreadNavigationShortcut(event, currentKeybindings, {
+            context: { ...readThreadShortcutContext(), terminalFocus: true },
+          })
         ) {
           return false;
         }
@@ -1076,7 +1010,7 @@ function TerminalSessionViewport({
           );
           return;
         }
-        const target = resolvePathLinkTarget(text, cwd);
+        const target = resolveTerminalLinkTarget(text, cwd);
         void (async () => {
           const result = await openTerminalPath(target);
           if (result._tag === "Success" || isAtomCommandInterrupted(result)) {
@@ -1103,28 +1037,6 @@ function TerminalSessionViewport({
         })();
       }
 
-      function handleSelectionChange(): void {
-        if (terminalRef.current?.hasSelection()) {
-          return;
-        }
-        const shouldClear = shouldClearTerminalSelectionAction({
-          actionPending: selectionActions?.pending ?? false,
-          openMenuRequestId: openSelectionMenuRequestIdRef.current,
-          currentRequestId: selectionActionRequestIdRef.current,
-        });
-        if (!shouldClear) return;
-        clearSelectionAction();
-      }
-
-      selectionActions = observeSelectionActions({
-        element: mount,
-        onSelection: (pointer) => {
-          void showSelectionAction(pointer);
-        },
-        onDismiss: (reason) => dismissSelectionAction(reason === "interaction"),
-      });
-      setupCleanups.push(() => selectionActions?.dispose());
-
       const themeObserver = new MutationObserver(() => {
         const activeTerminal = terminalRef.current;
         if (!activeTerminal) return;
@@ -1206,6 +1118,7 @@ function TerminalSessionViewport({
     const unregister = registerTerminalFocusTarget({
       threadRef,
       terminalId,
+      element: mount,
       focus,
     });
     return () => {
diff --git a/apps/web/src/components/chat/ChatBannerLane.tsx b/apps/web/src/components/chat/ChatBannerLane.tsx
index 8d8a6cb01b83..a569834169f8 100644
--- a/apps/web/src/components/chat/ChatBannerLane.tsx
+++ b/apps/web/src/components/chat/ChatBannerLane.tsx
@@ -6,7 +6,10 @@ import type {
   ThreadId,
 } from "@t3tools/contracts";
 import type { Dispatch, SetStateAction } from "react";
-import { ProviderStatusBanner } from "./ProviderStatusBanner";
+import {
+  dismissProviderStatusBannerForSession,
+  ProviderStatusBanner,
+} from "./ProviderStatusBanner";
 import { dismissThreadErrorBannerForSession, ThreadErrorBanner } from "./ThreadErrorBanner";
 
 /**
@@ -16,8 +19,7 @@ import { dismissThreadErrorBannerForSession, ThreadErrorBanner } from "./ThreadE
 export function ChatBannerLane(props: {
   environmentId: EnvironmentId;
   providerStatus: ServerProvider | null;
-  providerStatusBannerKey: string | null;
-  setDismissedProviderStatusBannerKey: Dispatch<SetStateAction<string | null>>;
+  providerStatusDismissalKey: string | null;
   onOpenProviderSetup: (instanceId: ProviderInstanceId) => void;
   threadId: ThreadId;
   threadError: string | null;
@@ -29,8 +31,7 @@ export function ChatBannerLane(props: {
 }) {
   const {
     providerStatus,
-    providerStatusBannerKey,
-    setDismissedProviderStatusBannerKey,
+    providerStatusDismissalKey,
     onOpenProviderSetup,
     threadId,
     threadError,
@@ -45,7 +46,7 @@ export function ChatBannerLane(props: {
       <ProviderStatusBanner
         environmentId={props.environmentId}
         status={providerStatus}
-        onDismiss={() => setDismissedProviderStatusBannerKey(providerStatusBannerKey)}
+        onDismiss={() => dismissProviderStatusBannerForSession(providerStatusDismissalKey)}
         onOpenProviderSetup={onOpenProviderSetup}
       />
       <ThreadErrorBanner
diff --git a/apps/web/src/components/chat/ChatComposer.tsx b/apps/web/src/components/chat/ChatComposer.tsx
index bafafcb9612c..eb01b8242e2d 100644
--- a/apps/web/src/components/chat/ChatComposer.tsx
+++ b/apps/web/src/components/chat/ChatComposer.tsx
@@ -208,7 +208,7 @@ import {
   ComposerQueuedAttachmentRow,
   ComposerRestingImagePreviews,
 } from "./ComposerAttachmentStrip";
-import { ComposerPrimaryActions } from "./ComposerPrimaryActions";
+import { CollapsedComposerStopAction, ComposerPrimaryActions } from "./ComposerPrimaryActions";
 import { ComposerFooterPrimaryActions } from "./ComposerFooterControls";
 import { ComposerPendingUserInputPanel } from "./ComposerPendingUserInputPanel";
 import { resolveComposerMenuActiveItemId } from "./composerMenuHighlight";
@@ -698,7 +698,9 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
     uncommittedSnapShotIds,
     standaloneComposerImages,
   } = useComposerImageGroups(attachmentDraftTarget, composerImages, composerPreviewAnnotations);
-  const preparingComposerImages = usePreparingComposerImages(attachmentTargetKey);
+  const preparingComposerImages = usePreparingComposerImages(attachmentTargetKey).filter(
+    (image) => !image.hidden,
+  );
   const nonPersistedComposerImageIds = attachmentDraft.nonPersistedImageIds;
   const uploadsByImageId = useAttachmentUploadStore((state) => state.uploadsByImageId);
   const openPrLink = useOpenPrLink(routeThreadRef);
@@ -1808,7 +1810,6 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
     projectId: activeProjectId,
     projectName,
     ownerKey: questionAttachmentTarget ?? composerDraftTargetKey,
-    draftText: prompt,
     disabled: dictationDisabled,
     readDraft: () => {
       const snapshot = readComposerSnapshot();
@@ -2142,6 +2143,13 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
       });
       return false;
     }
+    // An empty draft has nothing to send; Enter does what the Resume thread button does.
+    if (showResumeAction && !activePendingProgress) {
+      event?.preventDefault();
+      if (isSendBusy || environmentUnavailable !== null) return false;
+      onResume();
+      return true;
+    }
     const submission = submitComposerDraft({
       prompt: promptRef.current,
       submissionTarget,
@@ -3401,35 +3409,51 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
                   )}
                 </button>
                 {collapsedComposerImagePreviews}
-                <button
-                  type="button"
-                  data-chat-composer-transition-actions="true"
-                  className="flex size-8 shrink-0 items-center justify-center rounded-full bg-message-action text-message-action-foreground hover:bg-message-action-hover disabled:opacity-64"
-                  disabled={collapsedComposerPrimaryActionDisabled}
-                  aria-label={collapsedComposerPrimaryActionLabel}
-                  onPointerDown={(event) => event.preventDefault()}
-                  onClick={(event) => {
-                    event.stopPropagation();
-                    if (showResumeAction) onResume();
-                    else if (props.resumeCompactionTokens !== null && !props.keepFullHistory)
-                      expandMobileComposer();
-                    else submitComposer();
-                  }}
+                <CollapsedComposerStopAction
+                  key={`${environmentId}:${activeThreadId ?? "new"}`}
+                  canOperateThread={canOperateThread}
+                  canInterrupt={canInterrupt}
+                  runId={activeThread?.runtime?.activeRunId ?? null}
+                  hasSendableContent={composerSendState.hasSendableContent}
+                  isEditingQueuedMessage={isEditingQueuedMessage}
+                  onInterrupt={handleInterruptPrimaryActionStable}
                 >
-                  {showResumeAction ? (
-                    <PlayIcon className="size-4 fill-current" aria-hidden="true" />
-                  ) : (
-                    <svg width="16" height="16" viewBox="0 0 16 16" fill="none" aria-hidden="true">
-                      <path
-                        d="M8 3L8 13M8 3L4 7M8 3L12 7"
-                        stroke="currentColor"
-                        strokeWidth="2"
-                        strokeLinecap="round"
-                        strokeLinejoin="round"
-                      />
-                    </svg>
-                  )}
-                </button>
+                  <button
+                    type="button"
+                    data-chat-composer-transition-actions="true"
+                    className="flex size-8 shrink-0 items-center justify-center rounded-full bg-message-action text-message-action-foreground hover:bg-message-action-hover disabled:opacity-64"
+                    disabled={collapsedComposerPrimaryActionDisabled}
+                    aria-label={collapsedComposerPrimaryActionLabel}
+                    onPointerDown={(event) => event.preventDefault()}
+                    onClick={(event) => {
+                      event.stopPropagation();
+                      if (showResumeAction) onResume();
+                      else if (props.resumeCompactionTokens !== null && !props.keepFullHistory)
+                        expandMobileComposer();
+                      else submitComposer();
+                    }}
+                  >
+                    {showResumeAction ? (
+                      <PlayIcon className="size-4 fill-current" aria-hidden="true" />
+                    ) : (
+                      <svg
+                        width="16"
+                        height="16"
+                        viewBox="0 0 16 16"
+                        fill="none"
+                        aria-hidden="true"
+                      >
+                        <path
+                          d="M8 3L8 13M8 3L4 7M8 3L12 7"
+                          stroke="currentColor"
+                          strokeWidth="2"
+                          strokeLinecap="round"
+                          strokeLinejoin="round"
+                        />
+                      </svg>
+                    )}
+                  </button>
+                </CollapsedComposerStopAction>
               </div>
             ) : null}
 
diff --git a/apps/web/src/components/chat/ChatMarkdownMedia.browser.test.tsx b/apps/web/src/components/chat/ChatMarkdownMedia.browser.test.tsx
index 3c49f7a88f45..db4699970804 100644
--- a/apps/web/src/components/chat/ChatMarkdownMedia.browser.test.tsx
+++ b/apps/web/src/components/chat/ChatMarkdownMedia.browser.test.tsx
@@ -1,9 +1,11 @@
 import type { PreparedConnection } from "@t3tools/client-runtime/connection";
 import { EnvironmentId, ThreadId } from "@t3tools/contracts";
+import remarkParse from "remark-parse";
+import { unified } from "unified";
 import { describe, expect, it, vi } from "vite-plus/test";
 
 import { render } from "../../../test/render";
-import { ChatMarkdownAssetImage } from "./ChatMarkdownMedia";
+import { ChatMarkdownAssetImage, markdownImageCopy } from "./ChatMarkdownMedia";
 
 // Every evaluation of the URL query is one mint: the first read, then one per refresh.
 const assetQuery = vi.hoisted(() => ({ mints: 0 }));
@@ -84,3 +86,14 @@ describe("ChatMarkdownAssetImage", () => {
     expect(assetQuery.mints).toBe(2);
   });
 });
+
+describe("markdownImageCopy", () => {
+  it("copies an image whose path has a space as Markdown that is still that image", () => {
+    // Raw HTML <img> and <picture> sources reach the copy with the space unencoded.
+    const copied = markdownImageCopy("Shot", "/work/my shot.png", undefined);
+    const [block] = unified().use(remarkParse).parse(copied).children;
+    const images =
+      block?.type === "paragraph" ? block.children.filter((node) => node.type === "image") : [];
+    expect(images.map((image) => decodeURI(image.url))).toEqual(["/work/my shot.png"]);
+  });
+});
diff --git a/apps/web/src/components/chat/ChatMarkdownMedia.tsx b/apps/web/src/components/chat/ChatMarkdownMedia.tsx
index c810890ebf96..ce1745a6e51f 100644
--- a/apps/web/src/components/chat/ChatMarkdownMedia.tsx
+++ b/apps/web/src/components/chat/ChatMarkdownMedia.tsx
@@ -37,7 +37,19 @@ export function markdownImageCopy(alt: string, src: string, title: string | unde
   const escapedAlt = alt.replaceAll("\\", "\\\\").replaceAll("[", "\\[").replaceAll("]", "\\]");
   const titleSuffix =
     title === undefined ? "" : ` "${title.replaceAll("\\", "\\\\").replaceAll('"', '\\"')}"`;
-  return `![${escapedAlt}](${src}${titleSuffix})`;
+  return `![${escapedAlt}](${markdownDestination(src)}${titleSuffix})`;
+}
+
+// Raw HTML sources keep spaces and parentheses that a bare Markdown destination cannot hold.
+function markdownDestination(src: string): string {
+  if (!/[\s<>()]/.test(src)) return src;
+  const escaped = src
+    .replaceAll("\\", "\\\\")
+    .replaceAll("<", "\\<")
+    .replaceAll(">", "\\>")
+    .replaceAll("\n", "%0A")
+    .replaceAll("\r", "%0D");
+  return `<${escaped}>`;
 }
 
 /**
diff --git a/apps/web/src/components/chat/ComposerCommandMenu.tsx b/apps/web/src/components/chat/ComposerCommandMenu.tsx
index a49966eb2dc6..7d1bbd6121f5 100644
--- a/apps/web/src/components/chat/ComposerCommandMenu.tsx
+++ b/apps/web/src/components/chat/ComposerCommandMenu.tsx
@@ -24,12 +24,13 @@ import {
   UserRoundIcon,
   type LucideIcon,
 } from "lucide-react";
-import { memo, useLayoutEffect, useRef } from "react";
+import { memo, useLayoutEffect, useRef, useState } from "react";
 
 import { type ComposerSlashCommand, type ComposerTriggerKind } from "../../composer-logic";
 import { cn } from "~/lib/utils";
 import { Badge } from "../ui/badge";
 import { Command, CommandGroup, CommandItem, CommandList } from "../ui/command";
+import { Tooltip, TooltipPopup, TooltipTrigger } from "../ui/tooltip";
 import { EnvironmentMachineIcon } from "../EnvironmentMachineIcon";
 import { PierreEntryIcon } from "./PierreEntryIcon";
 import { ProviderInstanceIcon } from "./ProviderInstanceIcon";
@@ -200,6 +201,15 @@ const ComposerCommandMenuItem = memo(function ComposerCommandMenuItem(props: {
     props.triggerKind === "slash-command" && props.item.type === "skill" ? props.item.skill : null;
   const pullRequestPresentation =
     props.item.type === "pull-request" ? resolvePullRequestState(props.item.pullRequest) : null;
+  const descriptionRef = useRef<HTMLSpanElement>(null);
+  const [descriptionTruncated, setDescriptionTruncated] = useState(false);
+  // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- measures the rendered description so only cut-off text gets a tooltip
+  useLayoutEffect(() => {
+    const description = descriptionRef.current;
+    setDescriptionTruncated(
+      props.isActive && !!description && description.scrollWidth > description.clientWidth,
+    );
+  }, [props.isActive]);
 
   return (
     <CommandItem
@@ -263,9 +273,20 @@ const ComposerCommandMenuItem = memo(function ComposerCommandMenuItem(props: {
             props.item.label
           )}
         </span>
-        <span className="min-w-0 flex-1 truncate text-left text-secondary-label text-xs">
-          {props.item.description}
-        </span>
+        <Tooltip open={descriptionTruncated}>
+          <TooltipTrigger
+            tabIndex={-1}
+            render={
+              <span
+                ref={descriptionRef}
+                className="min-w-0 flex-1 truncate text-left text-secondary-label text-xs"
+              />
+            }
+          >
+            {props.item.description}
+          </TooltipTrigger>
+          <TooltipPopup>{props.item.description}</TooltipPopup>
+        </Tooltip>
         {skillSourceKind ? (
           <SkillSourceBadge
             kind={skillSourceKind}
diff --git a/apps/web/src/components/chat/ComposerPendingUserInputPanel.navigation.browser.test.tsx b/apps/web/src/components/chat/ComposerPendingUserInputPanel.navigation.browser.test.tsx
index 06d725f19cdf..d4919fe4a280 100644
--- a/apps/web/src/components/chat/ComposerPendingUserInputPanel.navigation.browser.test.tsx
+++ b/apps/web/src/components/chat/ComposerPendingUserInputPanel.navigation.browser.test.tsx
@@ -17,7 +17,7 @@ vi.mock(import("../ChatMarkdown"), async (importOriginal) => ({
 }));
 
 import { act, fakeTimers, render } from "../../../test/render";
-import { useComposerDraftStore } from "../../composerDraftStore";
+import { DraftId, useComposerDraftStore } from "../../composerDraftStore";
 import { makeThreadProjectionFixture } from "../../test-fixtures";
 import { toastManager } from "../ui/toast";
 import { usePendingThreadRequests } from "./usePendingThreadRequests";
@@ -80,9 +80,10 @@ interface ProbeProps {
   environmentId: EnvironmentId;
   projection: OrchestrationV2ThreadProjection;
   loading?: boolean;
+  draftTarget?: DraftId;
 }
 
-function useProbeRequests({ environmentId, projection, loading = false }: ProbeProps) {
+function useProbeRequests({ environmentId, projection, loading = false, draftTarget }: ProbeProps) {
   const promptRef = useRef("");
   const composerRef = useRef(null);
   return usePendingThreadRequests({
@@ -90,7 +91,7 @@ function useProbeRequests({ environmentId, projection, loading = false }: ProbeP
     activeThreadId: projection.thread.id,
     serverProjection: loading ? null : projection,
     supportsQuestionAttachments: false,
-    composerDraftTarget: { environmentId, threadId: projection.thread.id },
+    composerDraftTarget: draftTarget ?? { environmentId, threadId: projection.thread.id },
     setComposerDraftPrompt: (target, prompt) =>
       useComposerDraftStore.getState().setPrompt(target, prompt),
     promptRef,
@@ -150,12 +151,10 @@ it("tells the user when an option click moves their typed answer into the hidden
   const draftTarget = { environmentId, threadId: threadRef.threadId };
   const draftPrompt = () => useComposerDraftStore.getState().getComposerDraft(draftTarget)?.prompt;
   using toast = vi.spyOn(toastManager, "add");
-  await using _screen = await render(
-    <PendingRequestsProbe
-      environmentId={environmentId}
-      projection={questionProjection(threadRef.threadId)}
-    />,
+  const probe = (threadId: ThreadId) => (
+    <PendingRequestsProbe environmentId={environmentId} projection={questionProjection(threadId)} />
   );
+  await using screen = await render(probe(threadRef.threadId));
 
   await act(() => requests.onSelectActivePendingUserInputOption("question-0", "Incremental"));
   expect(toast).not.toHaveBeenCalled();
@@ -179,6 +178,31 @@ it("tells the user when an option click moves their typed answer into the hidden
     customAnswer: "second try",
   });
   expect(toast).toHaveBeenCalledTimes(1);
+
+  // The hook outlives a thread switch; text set aside in another thread is in another draft.
+  await screen.rerender(probe(ThreadId.make("other-thread")));
+  await act(() => requests.onChangeActivePendingUserInputCustomAnswer("question-0", "elsewhere"));
+  await act(() => requests.onSelectActivePendingUserInputOption("question-0", "Incremental"));
+  await screen.rerender(probe(threadRef.threadId));
+
+  // regression: #35205 undo puts the set-aside text back, so the draft must not keep a copy to resend
+  await act(() => requests.onChangeActivePendingUserInputCustomAnswer("question-0", "first try"));
+  expect(draftPrompt() ?? "").toBe("");
+
+  // Text set aside into a queued-message edit draft never withdraws from the thread draft.
+  await screen.rerender(
+    <PendingRequestsProbe
+      environmentId={environmentId}
+      projection={questionProjection(threadRef.threadId)}
+      draftTarget={DraftId.make("queued-edit")}
+    />,
+  );
+  await act(() => requests.onChangeActivePendingUserInputCustomAnswer("question-0", "foo"));
+  await act(() => requests.onSelectActivePendingUserInputOption("question-0", "Incremental"));
+  await screen.rerender(probe(threadRef.threadId));
+  useComposerDraftStore.getState().setPrompt(draftTarget, "foo");
+  await act(() => requests.onChangeActivePendingUserInputCustomAnswer("question-0", "foo"));
+  expect(draftPrompt()).toBe("foo");
 });
 
 function QuestionPositionProbe(props: ProbeProps) {
diff --git a/apps/web/src/components/chat/ComposerPendingUserInputPanel.tsx b/apps/web/src/components/chat/ComposerPendingUserInputPanel.tsx
index 7cd188fa96bc..4101bed5713a 100644
--- a/apps/web/src/components/chat/ComposerPendingUserInputPanel.tsx
+++ b/apps/web/src/components/chat/ComposerPendingUserInputPanel.tsx
@@ -262,6 +262,7 @@ const ComposerPendingUserInputCard = memo(function ComposerPendingUserInputCard(
               text={activeQuestion.question}
               cwd={cwd}
               threadRef={threadRef}
+              lineBreaks
               className={cn("pt-0.5 text-foreground/85", questionTextAlign)}
             />
             {/* Rows span the header row's width so the radios align with the question text and the shortcut column sits under the dismiss button. */}
diff --git a/apps/web/src/components/chat/ComposerPrimaryActions.browser.test.tsx b/apps/web/src/components/chat/ComposerPrimaryActions.browser.test.tsx
index 8c99608c3f80..7d66a8526d56 100644
--- a/apps/web/src/components/chat/ComposerPrimaryActions.browser.test.tsx
+++ b/apps/web/src/components/chat/ComposerPrimaryActions.browser.test.tsx
@@ -13,7 +13,7 @@ vi.mock("../SidebarStageBackdrop", () => ({
   useSidebarStageBackdropVariant: () => null,
 }));
 
-import { ComposerPrimaryActions } from "./ComposerPrimaryActions";
+import { CollapsedComposerStopAction, ComposerPrimaryActions } from "./ComposerPrimaryActions";
 
 function setup() {
   return {
@@ -35,13 +35,34 @@ function setup() {
   } satisfies ComponentProps<typeof ComposerPrimaryActions>;
 }
 
-it.each([false, true])(
-  "keeps repeat clicks away from Resume and Send (draft: %s)",
-  async (draft) => {
+it.each(["resume", "draft", "question"] as const)(
+  "keeps repeat Stop clicks from reaching the action that replaces it (%s)",
+  async (mode) => {
     const props = setup();
-    const container = document.createElement("div");
-    Object.assign(container.style, { display: "flex", justifyContent: "flex-end", width: "400px" });
-    await using screen = await render(<ComposerPrimaryActions {...props} />, { container });
+    const submit = vi.fn();
+    const pendingAction =
+      mode === "question"
+        ? {
+            questionIndex: 0,
+            isLastQuestion: true,
+            canAdvance: true,
+            isResponding: false,
+            isComplete: true,
+          }
+        : null;
+    const view = (overrides: Partial<ComponentProps<typeof ComposerPrimaryActions>> = {}) => (
+      <form
+        style={{ display: "flex", justifyContent: "flex-end", width: "400px" }}
+        onSubmit={(event) => {
+          event.preventDefault();
+          submit();
+        }}
+      >
+        <ComposerPrimaryActions {...props} pendingAction={pendingAction} {...overrides} />
+      </form>
+    );
+    await using screen = await render(view());
+    using _timers = fakeTimers();
     const stop = screen
       .getByRole("button", { name: "Stop generation" })
       .element() as HTMLButtonElement;
@@ -54,35 +75,34 @@ it.each([false, true])(
         screen.getByRole("button", { name: "Stopping", exact: true }).element() as HTMLButtonElement
       ).click(),
     );
-    await expect
-      .element(screen.getByRole("button", { name: "Stopping", exact: true }))
-      .toBeDisabled();
+    expect(screen.getByRole("button", { name: "Stopping", exact: true }).element()).toBeDisabled();
     expect(props.onInterrupt).toHaveBeenCalledTimes(1);
     await screen.rerender(
-      <ComposerPrimaryActions
-        {...props}
-        isRunning={false}
-        canInterrupt={false}
-        canResume
-        hasSendableContent={draft}
-      />,
+      view({
+        isRunning: false,
+        canInterrupt: false,
+        canResume: true,
+        hasSendableContent: mode === "draft",
+      }),
     );
-    await expect
-      .element(screen.getByRole("button", { name: "Stopped", exact: true }))
-      .toBeDisabled();
-    expect(target()).toHaveAttribute("aria-label", "Stopped");
+    const action = { resume: "Resume thread", draft: "Submit message", question: "Submit" }[mode];
+    expect(screen.getByRole("button", { name: "Stop generation" }).query()).toBeNull();
+    expect(target()).toBe(screen.getByRole("button", { name: action, exact: true }).element());
     await act(() => {
       for (let i = 0; i < 20; i++) target()?.click();
     });
+    await act(() => vi.advanceTimersByTime(499));
+    await act(() => target()?.click());
     expect(props.onResume).not.toHaveBeenCalled();
     expect(props.onSubmitMessage).not.toHaveBeenCalled();
-    const action = screen
-      .getByRole("button", { name: draft ? "Submit message" : "Resume thread" })
-      .element() as HTMLButtonElement;
-    await act(() => action.click());
-    expect(draft ? props.onSubmitMessage : props.onResume).toHaveBeenCalledTimes(1);
-    await screen.rerender(<ComposerPrimaryActions {...props} />);
-    await expect.element(screen.getByRole("button", { name: "Stop generation" })).toBeEnabled();
+    expect(submit).not.toHaveBeenCalled();
+    await act(() => vi.advanceTimersByTime(1));
+    await act(() => target()?.click());
+    expect(
+      { resume: props.onResume, draft: props.onSubmitMessage, question: submit }[mode],
+    ).toHaveBeenCalledTimes(1);
+    await screen.rerender(view());
+    expect(screen.getByRole("button", { name: "Stop generation" }).element()).toBeEnabled();
   },
 );
 
@@ -106,7 +126,9 @@ it("allows retry after ten seconds and protects a late stop", async () => {
   await screen.rerender(
     <ComposerPrimaryActions {...props} isRunning={false} canInterrupt={false} canResume />,
   );
-  expect(screen.getByRole("button", { name: "Stopped", exact: true }).element()).toBeDisabled();
+  await act(() =>
+    (screen.getByRole("button", { name: "Resume thread" }).element() as HTMLButtonElement).click(),
+  );
   expect(props.onInterrupt).toHaveBeenCalledTimes(2);
   expect(props.onResume).not.toHaveBeenCalled();
 });
@@ -142,3 +164,33 @@ it("keeps a pending stop when the run id clears and resets it for a different ru
   await screen.rerender(<ComposerPrimaryActions {...props} runId="second" />);
   expect(screen.getByRole("button", { name: "Stop generation" }).element()).toBeEnabled();
 });
+
+it("swaps the collapsed composer's send button for Stop while a turn can be stopped", async () => {
+  const onInterrupt = vi.fn();
+  const collapsed = (overrides: { canInterrupt?: boolean; hasSendableContent?: boolean } = {}) => (
+    <CollapsedComposerStopAction
+      canOperateThread
+      canInterrupt={overrides.canInterrupt ?? true}
+      runId="run"
+      hasSendableContent={overrides.hasSendableContent ?? false}
+      isEditingQueuedMessage={false}
+      onInterrupt={onInterrupt}
+    >
+      <button type="button">Send message</button>
+    </CollapsedComposerStopAction>
+  );
+  await using screen = await render(collapsed({ hasSendableContent: true }));
+  await expect.element(screen.getByRole("button", { name: "Send message" })).toBeVisible();
+  await screen.rerender(collapsed());
+  await act(() =>
+    (
+      screen.getByRole("button", { name: "Stop generation" }).element() as HTMLButtonElement
+    ).click(),
+  );
+  expect(onInterrupt).toHaveBeenCalledTimes(1);
+  await expect
+    .element(screen.getByRole("button", { name: "Stopping", exact: true }))
+    .toBeDisabled();
+  await screen.rerender(collapsed({ canInterrupt: false }));
+  await expect.element(screen.getByRole("button", { name: "Send message" })).toBeVisible();
+});
diff --git a/apps/web/src/components/chat/ComposerPrimaryActions.tsx b/apps/web/src/components/chat/ComposerPrimaryActions.tsx
index 695ddb0983b9..41e5e3c77191 100644
--- a/apps/web/src/components/chat/ComposerPrimaryActions.tsx
+++ b/apps/web/src/components/chat/ComposerPrimaryActions.tsx
@@ -86,6 +86,8 @@ const formatPendingPrimaryActionLabel = (input: {
 };
 
 const STOP_PENDING_MAX_MS = 10_000;
+// The action that takes Stop's place ignores clicks this long, so repeat Stop clicks can't resume.
+const STOP_LANDED_CLICK_GUARD_MS = 500;
 
 const messageActionPillClassName =
   "inline-flex shrink-0 cursor-pointer items-center justify-center gap-1.5 whitespace-nowrap rounded-full bg-message-action font-medium text-base text-message-action-foreground shadow-xs shadow-message-action/24 outline-none hover:bg-message-action-hover focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-ring focus-visible:ring-offset-1 focus-visible:ring-offset-background disabled:pointer-events-none disabled:opacity-64 disabled:shadow-none sm:text-sm";
@@ -94,6 +96,129 @@ const preventPointerFocus: PointerEventHandler<HTMLElement> = (event) => {
   event.preventDefault();
 };
 
+type StopPhase = "pending" | "timedOut" | "landed" | null;
+
+function useStopPhase(input: {
+  runId: string | null;
+  canInterrupt: boolean;
+  canOperateThread: boolean;
+}) {
+  const { runId, canInterrupt, canOperateThread } = input;
+  const [stopPhase, setStopPhase] = useState<StopPhase>(null);
+  const [stopRunId, setStopRunId] = useState(runId);
+  if (runId !== null && stopRunId !== runId) {
+    setStopRunId(runId);
+    setStopPhase(null);
+  } else if (canOperateThread) {
+    // Losing permission also clears canInterrupt; it does not acknowledge the stop.
+    if ((stopPhase === "pending" || stopPhase === "timedOut") && !canInterrupt)
+      setStopPhase("landed");
+    else if (stopPhase === "landed" && canInterrupt) setStopPhase(null);
+  }
+  // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- timers that re-enable an unsettled Stop and end the landed click guard
+  useEffect(() => {
+    if (stopPhase === "pending") {
+      const timeout = setTimeout(() => setStopPhase("timedOut"), STOP_PENDING_MAX_MS);
+      return () => clearTimeout(timeout);
+    }
+    if (stopPhase === "landed") {
+      const timeout = setTimeout(() => setStopPhase(null), STOP_LANDED_CLICK_GUARD_MS);
+      return () => clearTimeout(timeout);
+    }
+  }, [stopPhase]);
+  return [stopPhase, setStopPhase] as const;
+}
+
+function StopGenerationButton({
+  stopPhase,
+  canOperateThread,
+  insidePendingAction,
+  preserveComposerFocusOnPointerDown,
+  onStopRequested,
+  onInterrupt,
+}: {
+  stopPhase: StopPhase;
+  canOperateThread: boolean;
+  insidePendingAction: boolean;
+  preserveComposerFocusOnPointerDown: boolean;
+  onStopRequested: () => void;
+  onInterrupt: () => void;
+}) {
+  const isStopDisabled = stopPhase === "pending";
+  return (
+    <Tooltip>
+      <TooltipTrigger
+        render={
+          <button
+            type="button"
+            className={cn(
+              "flex shrink-0 cursor-pointer items-center justify-center rounded-full bg-destructive/90 text-white shadow-xs shadow-destructive/24 inset-shadow-control-highlight transition-colors duration-150 hover:bg-destructive active:inset-shadow-control-pressed active:shadow-none disabled:cursor-default disabled:opacity-64 disabled:hover:bg-destructive/90 [&_svg]:pointer-events-none",
+              insidePendingAction ? "size-8 sm:size-7" : "size-8 sm:h-8 sm:w-8",
+            )}
+            onPointerDown={preserveComposerFocusOnPointerDown ? preventPointerFocus : undefined}
+            disabled={!canOperateThread || isStopDisabled}
+            onClick={() => {
+              if (!canOperateThread || isStopDisabled) return;
+              onStopRequested();
+              onInterrupt();
+            }}
+            aria-label={stopPhase === "pending" ? "Stopping" : "Stop generation"}
+          />
+        }
+      >
+        <svg width="12" height="12" viewBox="0 0 12 12" fill="currentColor" aria-hidden="true">
+          <rect x="2" y="2" width="8" height="8" rx="1.5" />
+        </svg>
+      </TooltipTrigger>
+      <TooltipPopup>{stopPhase === "pending" ? "Stopping…" : "Interrupt"}</TooltipPopup>
+    </Tooltip>
+  );
+}
+
+/** The collapsed mobile composer's Stop, shown in place of `children` while a turn can be stopped. */
+export function CollapsedComposerStopAction({
+  children,
+  canOperateThread,
+  canInterrupt,
+  runId,
+  hasSendableContent,
+  isEditingQueuedMessage,
+  onInterrupt,
+}: {
+  children: ReactNode;
+  canOperateThread: boolean;
+  canInterrupt: boolean;
+  runId: string | null;
+  hasSendableContent: boolean;
+  isEditingQueuedMessage: boolean;
+  onInterrupt: () => void;
+}) {
+  const [stopPhase, setStopPhase] = useStopPhase({ runId, canInterrupt, canOperateThread });
+  if (
+    !(canInterrupt || stopPhase === "pending" || stopPhase === "timedOut") ||
+    hasSendableContent ||
+    isEditingQueuedMessage
+  ) {
+    return children;
+  }
+  return (
+    <span
+      data-chat-composer-transition-actions="true"
+      data-chat-composer-collapsed-controls="true"
+      className="flex shrink-0"
+    >
+      <StopGenerationButton
+        stopPhase={stopPhase}
+        canOperateThread={canOperateThread}
+        insidePendingAction={false}
+        preserveComposerFocusOnPointerDown
+        onStopRequested={() => setStopPhase("pending")}
+        onInterrupt={onInterrupt}
+      />
+    </span>
+  );
+}
+
 export const ComposerPrimaryActions = memo(function ComposerPrimaryActions({
   children,
   compact,
@@ -123,26 +248,7 @@ export const ComposerPrimaryActions = memo(function ComposerPrimaryActions({
   keepFullHistory = false,
   onToggleKeepFullHistory,
 }: ComposerPrimaryActionsProps) {
-  const [stopPhase, setStopPhase] = useState<"pending" | "timedOut" | "landed" | null>(null);
-  const [stopRunId, setStopRunId] = useState(runId);
-  if (runId !== null && stopRunId !== runId) {
-    setStopRunId(runId);
-    setStopPhase(null);
-  } else if (canOperateThread) {
-    // Losing permission also clears canInterrupt; it does not acknowledge the stop.
-    if ((stopPhase === "pending" || stopPhase === "timedOut") && !canInterrupt)
-      setStopPhase("landed");
-    else if (stopPhase === "landed" && canInterrupt) setStopPhase(null);
-  }
-  const isStopDisabled = stopPhase === "pending" || stopPhase === "landed";
-  const stopLabel =
-    stopPhase === "landed" ? "Stopped" : stopPhase === "pending" ? "Stopping" : "Stop generation";
-  // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- timer that re-enables Stop if the interrupt never settles
-  useEffect(() => {
-    if (stopPhase !== "pending") return;
-    const timeout = setTimeout(() => setStopPhase("timedOut"), STOP_PENDING_MAX_MS);
-    return () => clearTimeout(timeout);
-  }, [stopPhase]);
+  const [stopPhase, setStopPhase] = useStopPhase({ runId, canInterrupt, canOperateThread });
   const pointerFocusProps = preserveComposerFocusOnPointerDown
     ? { onPointerDown: preventPointerFocus }
     : undefined;
@@ -161,41 +267,24 @@ export const ComposerPrimaryActions = memo(function ComposerPrimaryActions({
   const stageBackdropVariant = useSidebarStageBackdropVariant(environmentIdentificationMode);
 
   const renderStopGenerationButton = (insidePendingAction: boolean) => (
-    <Tooltip key="interrupt">
-      <TooltipTrigger
-        render={
-          <button
-            type="button"
-            className={cn(
-              "flex shrink-0 cursor-pointer items-center justify-center rounded-full bg-destructive/90 text-white shadow-xs shadow-destructive/24 inset-shadow-control-highlight transition-colors duration-150 hover:bg-destructive active:inset-shadow-control-pressed active:shadow-none disabled:cursor-default disabled:opacity-64 disabled:hover:bg-destructive/90 [&_svg]:pointer-events-none",
-              insidePendingAction ? "size-8 sm:size-7" : "size-8 sm:h-8 sm:w-8",
-            )}
-            {...pointerFocusProps}
-            disabled={!canOperateThread || isStopDisabled}
-            onClick={() => {
-              if (!canOperateThread || isStopDisabled) return;
-              setStopPhase("pending");
-              onInterrupt();
-            }}
-            aria-label={stopLabel}
-          />
-        }
-      >
-        <svg width="12" height="12" viewBox="0 0 12 12" fill="currentColor" aria-hidden="true">
-          <rect x="2" y="2" width="8" height="8" rx="1.5" />
-        </svg>
-      </TooltipTrigger>
-      <TooltipPopup>
-        {stopPhase === "pending" ? "Stopping…" : stopPhase === "landed" ? "Stopped" : "Interrupt"}
-      </TooltipPopup>
-    </Tooltip>
+    <StopGenerationButton
+      key="interrupt"
+      stopPhase={stopPhase}
+      canOperateThread={canOperateThread}
+      insidePendingAction={insidePendingAction}
+      preserveComposerFocusOnPointerDown={preserveComposerFocusOnPointerDown}
+      onStopRequested={() => setStopPhase("pending")}
+      onInterrupt={onInterrupt}
+    />
   );
 
   // Keep the clicked target at the right edge even if typing changes the primary action.
   const withStopButton = (action: ReactNode) => (
     <>
       {action}
-      {stopPhase === null ? null : renderStopGenerationButton(false)}
+      {stopPhase === "pending" || stopPhase === "timedOut"
+        ? renderStopGenerationButton(false)
+        : null}
     </>
   );
 
@@ -231,6 +320,9 @@ export const ComposerPrimaryActions = memo(function ComposerPrimaryActions({
           type="submit"
           className={cn(messageActionPillClassName, "h-8 sm:h-7", compact ? "px-3" : "px-4")}
           {...pointerFocusProps}
+          onClick={(event) => {
+            if (stopPhase === "landed") event.preventDefault();
+          }}
           disabled={
             !canOperateThread ||
             isEnvironmentUnavailable ||
@@ -249,7 +341,9 @@ export const ComposerPrimaryActions = memo(function ComposerPrimaryActions({
             questionIndex: pendingAction.questionIndex,
           })}
         </button>
-        {canInterrupt || stopPhase !== null ? renderStopGenerationButton(true) : null}
+        {canInterrupt || stopPhase === "pending" || stopPhase === "timedOut"
+          ? renderStopGenerationButton(true)
+          : null}
       </div>
     );
   }
@@ -314,7 +408,14 @@ export const ComposerPrimaryActions = memo(function ComposerPrimaryActions({
           : "bg-message-action text-message-action-foreground enabled:shadow-message-action/24 hover:bg-message-action-hover disabled:bg-foreground/12 disabled:text-muted-foreground",
       )}
       {...pointerFocusProps}
-      onClick={showResume ? onResume : onSubmitMessage}
+      onClick={(event) => {
+        if (stopPhase === "landed") {
+          event.preventDefault();
+          return;
+        }
+        if (showResume) onResume?.();
+        else onSubmitMessage?.(event);
+      }}
       disabled={
         isSendBusy ||
         isSendDisabled ||
diff --git a/apps/web/src/components/chat/ComposerStashMenu.tsx b/apps/web/src/components/chat/ComposerStashMenu.tsx
index a68bf9159b48..938c42d32c8c 100644
--- a/apps/web/src/components/chat/ComposerStashMenu.tsx
+++ b/apps/web/src/components/chat/ComposerStashMenu.tsx
@@ -124,7 +124,11 @@ export const ComposerStashMenu = memo(function ComposerStashMenu(props: {
   }, []);
 
   return (
-    <ComposerBanner.Root ref={drawerRef} data-composer-stash-drawer="true">
+    <ComposerBanner.Root
+      ref={drawerRef}
+      className="flex min-h-0 flex-col after:shrink-0"
+      data-composer-stash-drawer="true"
+    >
       <ComposerBanner.Row
         render={<button type="button" />}
         aria-label="Close stash"
@@ -141,7 +145,7 @@ export const ComposerStashMenu = memo(function ComposerStashMenu(props: {
           <ComposerBanner.ToggleIcon expanded />
         </ComposerBanner.Actions>
       </ComposerBanner.Row>
-      <ComposerBanner.Scroll>
+      <ComposerBanner.Scroll className="flex flex-col">
         <ComposerBanner.Children render={<ul role="list" />} aria-label="Stashed prompts">
           {entries.length === 0 ? (
             <ComposerBanner.Row render={<li />}>
diff --git a/apps/web/src/components/chat/DraftHeroHeadline.tsx b/apps/web/src/components/chat/DraftHeroHeadline.tsx
index 91bf642fcb32..e621f491527d 100644
--- a/apps/web/src/components/chat/DraftHeroHeadline.tsx
+++ b/apps/web/src/components/chat/DraftHeroHeadline.tsx
@@ -14,7 +14,7 @@ import { useNewThreadHandler } from "~/hooks/useHandleNewThread";
 import { useOrderWhileOpen } from "~/hooks/useOrderWhileOpen";
 import { useProjectPin } from "~/hooks/useProjectGroupUpdate";
 import { useScratchProject } from "~/hooks/useScratchProject";
-import { isTriagePrompt } from "~/hooks/useStartTriage";
+import { isTriagePrompt } from "@t3tools/shared/triagePrompt";
 import { useClientSettings } from "~/hooks/useSettings";
 import { hasExplicitComposerModelSelection } from "~/lib/chatThreadActions";
 import {
diff --git a/apps/web/src/components/chat/LinkRequestCard.tsx b/apps/web/src/components/chat/LinkRequestCard.tsx
index f4a7fbfb7c13..5aeb5c028cde 100644
--- a/apps/web/src/components/chat/LinkRequestCard.tsx
+++ b/apps/web/src/components/chat/LinkRequestCard.tsx
@@ -297,7 +297,7 @@ function LinkRequestDialog(props: {
       <WizardPopup>
         <WizardHeader
           title={pickMachine ? "Link a machine" : `Link ${targetName}`}
-          description="Agents here can then launch, message and wait on threads there. Revoke it in that machine's Connections."
+          description="Agents here can then launch, message and wait on threads there. Revoke it in that machine's Sharing & access."
         >
           {steps.length > 1 && !useExisting ? (
             <WizardSteps
@@ -380,8 +380,8 @@ function LinkRequestDialog(props: {
                           spellCheck={false}
                         />
                         <span className="block text-xs text-muted-foreground">
-                          Create a link on {targetName}: Settings → Connections → Create link, then
-                          paste its code here.
+                          Create a link on {targetName}: Settings → Sharing & access → Authorized
+                          clients → Create link, then paste its code here.
                         </span>
                       </label>
                     )}
@@ -393,7 +393,7 @@ function LinkRequestDialog(props: {
             {useExisting ? (
               <p className="text-xs text-muted-foreground">
                 This environment is already linked to {targetName}. The agent can use that link as
-                it is; change its access in Settings → Connections.
+                it is; change its access in Settings → Environments.
               </p>
             ) : null}
             {error !== null ? (
diff --git a/apps/web/src/components/chat/MarkdownCodeBlock.browser.test.tsx b/apps/web/src/components/chat/MarkdownCodeBlock.browser.test.tsx
new file mode 100644
index 000000000000..903c6346f758
--- /dev/null
+++ b/apps/web/src/components/chat/MarkdownCodeBlock.browser.test.tsx
@@ -0,0 +1,35 @@
+import { expect, it } from "vite-plus/test";
+
+import { act, render } from "../../../test/render";
+import "../../index.css";
+
+import { ensureClientSettingsHydrated, persistClientSettingsPatch } from "../../hooks/useSettings";
+import { MarkdownCodeBlock } from "./MarkdownCodeBlock";
+
+const setWordWrap = (wordWrap: boolean) =>
+  act(() => persistClientSettingsPatch({ wordWrap }, async () => {}));
+
+it("follows a changed word wrap default while mounted", async () => {
+  await ensureClientSettingsHydrated();
+  await setWordWrap(false);
+  await using screen = await render(
+    <MarkdownCodeBlock
+      code="a long line"
+      language="text"
+      fenceTitle={null}
+      theme="light"
+      isStreaming={false}
+    >
+      <pre>
+        <code>a long line</code>
+      </pre>
+    </MarkdownCodeBlock>,
+    { router: false }, // The code block reads no route state.
+  );
+  const block = () => screen.container.querySelector(".chat-markdown-codeblock");
+  expect(block()?.getAttribute("data-wrap")).toBe("false");
+
+  await setWordWrap(true);
+  await expect.element(screen.getByRole("button", { name: "Disable line wrap" })).toBeVisible();
+  expect(block()?.getAttribute("data-wrap")).toBe("true");
+});
diff --git a/apps/web/src/components/chat/MarkdownCodeBlock.logic.ts b/apps/web/src/components/chat/MarkdownCodeBlock.logic.ts
index 328b3fef11b6..fcee475c2886 100644
--- a/apps/web/src/components/chat/MarkdownCodeBlock.logic.ts
+++ b/apps/web/src/components/chat/MarkdownCodeBlock.logic.ts
@@ -7,9 +7,12 @@ const CODE_FENCE_LANGUAGE_REGEX = /(?:^|\s)language-([^\s]+)/;
 
 export function extractFenceLanguage(className: string | undefined): string {
   const match = className?.match(CODE_FENCE_LANGUAGE_REGEX);
-  const raw = match?.[1] ?? "text";
+  return highlighterLanguageOf(match?.[1] ?? "text");
+}
+
+export function highlighterLanguageOf(language: string): string {
   // Shiki doesn't bundle a gitignore grammar; ini is a close match.
-  return raw === "gitignore" ? "ini" : raw;
+  return language === "gitignore" ? "ini" : language;
 }
 
 const FENCE_TITLE_ATTR_REGEX = /(?:^|\s)(?:title|file(?:name)?)=(?:"([^"]+)"|'([^']+)'|(\S+))/i;
diff --git a/apps/web/src/components/chat/MarkdownCodeBlock.tsx b/apps/web/src/components/chat/MarkdownCodeBlock.tsx
index 7992ce2e6f76..24a7d083c702 100644
--- a/apps/web/src/components/chat/MarkdownCodeBlock.tsx
+++ b/apps/web/src/components/chat/MarkdownCodeBlock.tsx
@@ -3,7 +3,7 @@ import { toHtml } from "hast-util-to-html";
 import React, { use, useEffect, useState, type ReactNode } from "react";
 
 import { useCopyToClipboard } from "../../hooks/useCopyToClipboard";
-import { getClientSettings } from "../../hooks/useSettings";
+import { useClientSettings } from "../../hooks/useSettings";
 import type { DiffThemeName } from "../../lib/diffRendering";
 import {
   createIncrementalHighlightedDocument,
@@ -161,7 +161,9 @@ export function MarkdownCodeBlock({
         cause,
       ),
   });
-  const [wrapped, setWrapped] = useState(() => getClientSettings().wordWrap);
+  const defaultWrapped = useClientSettings((settings) => settings.wordWrap);
+  const [wrapOverride, setWrapOverride] = useState<boolean | null>(null);
+  const wrapped = wrapOverride ?? defaultWrapped;
   const wrapLabel = wrapped ? "Disable line wrap" : "Wrap lines";
   const copyLabel = copied ? "Copied" : "Copy code";
   const command = code.trim();
@@ -227,7 +229,7 @@ export function MarkdownCodeBlock({
                     variant={wrapped ? "secondary" : "ghost-muted"}
                     size="icon-xs"
                     aria-pressed={wrapped}
-                    onClick={() => setWrapped((value) => !value)}
+                    onClick={() => setWrapOverride(!wrapped)}
                     aria-label={wrapLabel}
                   />
                 }
diff --git a/apps/web/src/components/chat/MarkdownExternalLink.tsx b/apps/web/src/components/chat/MarkdownExternalLink.tsx
index e1d8f0a06bb5..8370d99b1258 100644
--- a/apps/web/src/components/chat/MarkdownExternalLink.tsx
+++ b/apps/web/src/components/chat/MarkdownExternalLink.tsx
@@ -7,7 +7,8 @@ import { sourceControlClients } from "@t3tools/client-runtime/source-control-cli
 import { cn } from "../../lib/utils";
 import { sourceControlIcon } from "../../sourceControlPresentation";
 
-const MARKDOWN_LINK_FAVICON_CLASS_NAME = "block size-full shrink-0 select-none";
+// Inline-level and selectable: triple-click selection stops at block-level and select-none boxes.
+const MARKDOWN_LINK_FAVICON_CLASS_NAME = "inline-block size-[14px] [vertical-align:-0.125em]";
 
 const failedFaviconHosts = new Set<string>();
 
@@ -23,10 +24,7 @@ const MarkdownLinkFavicon = memo(function MarkdownLinkFavicon({ host }: { host:
   const brandIcon = sourceControlHostIcon(host);
   const faviconUrl = brandIcon ? null : faviconUrlForOrigin(`https://${host}`);
   return (
-    <span
-      className="ms-[0.25em] me-[0.2em] inline-flex size-[14px] [vertical-align:-0.125em]"
-      aria-hidden
-    >
+    <span className="ms-[0.25em] me-[0.2em]" aria-hidden>
       {brandIcon ? (
         brandIcon
       ) : faviconUrl === null || failedHost === host || failedFaviconHosts.has(host) ? (
diff --git a/apps/web/src/components/chat/MathTypeset.logic.test.ts b/apps/web/src/components/chat/MathTypeset.logic.test.ts
new file mode 100644
index 000000000000..634f5146475a
--- /dev/null
+++ b/apps/web/src/components/chat/MathTypeset.logic.test.ts
@@ -0,0 +1,30 @@
+import katex from "katex";
+import { describe, expect, it } from "vite-plus/test";
+
+import { escapeLiteralPercents } from "./MathTypeset.logic";
+
+describe("escapeLiteralPercents", () => {
+  it.each([
+    ["\\text{3.18% yield}", "\\text{3.18\\% yield}"],
+    ["\\text{100%% yield}", "\\text{100\\%\\% yield}"],
+    ["6\\% + 2\\%", "6\\% + 2\\%"],
+    ["x\\\\%", "x\\\\\\%"],
+    ["x % note\n+ 1", "x % note\n+ 1"],
+    ["% note\n\\text{2%}", "% note\n\\text{2\\%}"],
+    ["x &= 1 % +9%\n\\text{2%}", "x &= 1 % +9%\n\\text{2\\%}"],
+    ["\\verb|50%|+\\text{2%}", "\\verb|50%|+\\text{2\\%}"],
+    ["\\verb*%a%b%+c%", "\\verb*%a%b\\%+c\\%"],
+    ["\\verb|50%+\\text{2%}", "\\verb|50%+\\text{2%}"],
+  ])("repairs %j", (tex, expected) => {
+    expect(escapeLiteralPercents(tex)).toBe(expected);
+  });
+
+  it("lets the reported multiline equation typeset", () => {
+    const tex =
+      "R_e=\\underbrace{\\frac{1.0176}{32}}_{\\text{3.18% dividend yield}}\n+\\underbrace{6\\%}_{\\text{growth}}\n=\\boxed{9.18\\%}";
+    expect(() => katex.renderToString(tex, { throwOnError: true })).toThrow();
+    expect(() =>
+      katex.renderToString(escapeLiteralPercents(tex), { throwOnError: true }),
+    ).not.toThrow();
+  });
+});
diff --git a/apps/web/src/components/chat/MathTypeset.logic.ts b/apps/web/src/components/chat/MathTypeset.logic.ts
new file mode 100644
index 000000000000..04111ab4a70b
--- /dev/null
+++ b/apps/web/src/components/chat/MathTypeset.logic.ts
@@ -0,0 +1,39 @@
+/**
+ * Escapes each `%` written right after other text, as in `\text{3.18% yield}`.
+ * A `%` at a line start or after whitespace stays a comment. Skips escapes and
+ * `\verb` like KaTeX's lexer, in one linear pass.
+ */
+export function escapeLiteralPercents(tex: string): string {
+  let repaired = "";
+  let copied = 0;
+  let index = 0;
+  while (index < tex.length) {
+    const char = tex[index];
+    if (char === "\\") {
+      if (tex.startsWith("\\verb", index)) {
+        const starred = tex[index + 5] === "*";
+        const delimiter = tex[index + (starred ? 6 : 5)];
+        if (delimiter !== undefined && (starred || !/[*a-zA-Z]/.test(delimiter))) {
+          const bodyStart = index + (starred ? 7 : 6);
+          let close = bodyStart;
+          while (close < tex.length && ![delimiter, "\n", "\r"].includes(tex[close]!)) close++;
+          // KaTeX rejects a \verb that does not close on its own line.
+          if (tex[close] !== delimiter) return tex;
+          index = close + 1;
+          continue;
+        }
+      }
+      // A control symbol such as `\%` or `\\` is two characters.
+      index += 2;
+    } else if (char === "%" && index > 0 && !/\s/.test(tex[index - 1]!)) {
+      repaired += `${tex.slice(copied, index)}\\%`;
+      copied = ++index;
+    } else if (char === "%") {
+      const newline = tex.indexOf("\n", index);
+      index = newline === -1 ? tex.length : newline + 1;
+    } else {
+      index++;
+    }
+  }
+  return copied === 0 ? tex : repaired + tex.slice(copied);
+}
diff --git a/apps/web/src/components/chat/MathTypeset.tsx b/apps/web/src/components/chat/MathTypeset.tsx
index 9934c1e33932..16d3dba409ee 100644
--- a/apps/web/src/components/chat/MathTypeset.tsx
+++ b/apps/web/src/components/chat/MathTypeset.tsx
@@ -3,6 +3,7 @@ import "katex/dist/katex.min.css";
 import type { ReactNode } from "react";
 
 import { LRUCache } from "../../lib/lruCache";
+import { escapeLiteralPercents } from "./MathTypeset.logic";
 
 // Virtualized threads remount messages while scrolling; cached markup keeps
 // that from typesetting the same formulas again. "" records a parse error.
@@ -12,20 +13,28 @@ function typeset(tex: string, display: boolean): string {
   const key = `${display ? "display" : "inline"}:${tex}`;
   const cached = typesetCache.get(key);
   if (cached !== null) return cached;
+  const options = {
+    displayMode: display,
+    output: "htmlAndMathml" as const,
+    throwOnError: true,
+    // No \href, \url, \htmlClass, or other commands that emit active HTML.
+    trust: false,
+    strict: "ignore" as const,
+    maxSize: 20,
+    maxExpand: 1000,
+  };
   let html = "";
   try {
-    html = katex.renderToString(tex, {
-      displayMode: display,
-      output: "htmlAndMathml",
-      throwOnError: true,
-      // No \href, \url, \htmlClass, or other commands that emit active HTML.
-      trust: false,
-      strict: "ignore",
-      maxSize: 20,
-      maxExpand: 1000,
-    });
+    html = katex.renderToString(tex, options);
   } catch {
-    // Unfinished or unsupported TeX stays readable as its source.
+    const repaired = escapeLiteralPercents(tex);
+    if (repaired !== tex) {
+      try {
+        html = katex.renderToString(repaired, options);
+      } catch {
+        // Unfinished or unsupported TeX stays readable as its source.
+      }
+    }
   }
   typesetCache.set(key, html, (key.length + html.length) * 2);
   return html;
diff --git a/apps/web/src/components/chat/MessagesTimeline.browser.test.tsx b/apps/web/src/components/chat/MessagesTimeline.browser.test.tsx
index 49227eb76ead..77da83deffe2 100644
--- a/apps/web/src/components/chat/MessagesTimeline.browser.test.tsx
+++ b/apps/web/src/components/chat/MessagesTimeline.browser.test.tsx
@@ -2,7 +2,7 @@ import { injectHtmlRenderBootstrap } from "@t3tools/shared/htmlRender";
 import { HtmlRenderDocument } from "../files/BrowserDocumentFrame";
 import { flushSync } from "react-dom";
 import { AudioPreview } from "../files/AudioPreview";
-import { cdp, page } from "vite-plus/test/browser";
+import { cdp, page, userEvent } from "vite-plus/test/browser";
 import {
   ComposerContextId,
   EnvironmentId,
@@ -37,6 +37,7 @@ import { environmentThreadDetails } from "../../state/threads";
 import { act, fakeTimers, render, stubGlobal } from "../../../test/render";
 import { ChangedFilesCard } from "./ChangedFilesTree";
 import { MessagesTimeline } from "./MessagesTimeline";
+import { createWorkspaceFocusController, workspaceAreaProps } from "../../lib/workspaceFocus";
 import { resolveTimelineIsAtEnd } from "./MessagesTimeline.logic";
 import { makeStreamingTimelineFixture } from "../../test-fixtures";
 import {
@@ -565,6 +566,38 @@ describe("MessagesTimeline messages", () => {
     await expectHeadingInView("Last turn", "Turn 118:");
   });
 
+  it("scrolls from the keyboard once F6 moves into the conversation", async () => {
+    setup();
+    const props = baseProps();
+    const entries = Array.from({ length: 40 }, (_, index) =>
+      message(`Turn ${index}:\n\n${"x ".repeat(200)}`, {}, `turn-${index}`),
+    );
+    await using _screen = await renderElement(
+      <>
+        <div
+          {...workspaceAreaProps("conversation", 1, "Conversation")}
+          className="relative flex min-h-0 flex-1 flex-col"
+        >
+          <MessagesTimeline {...props} timelineEntries={entries} />
+        </div>
+        <div {...workspaceAreaProps("composer", 2, "Message input")}>
+          <button type="button">Send</button>
+        </div>
+      </>,
+    );
+    const focus = createWorkspaceFocusController(document);
+    using _focus = { [Symbol.dispose]: focus.dispose };
+    const viewport = props.listRef.current!.getScrollableNode()!;
+    await vi.waitFor(() => expect(viewport.scrollTop).toBeGreaterThan(0));
+    const atEnd = viewport.scrollTop;
+    page.getByRole("button", { name: "Send" }).element().focus();
+    await userEvent.keyboard("{F6}");
+    focus.move(-1);
+    expect(viewport).toHaveAttribute("data-workspace-keyboard-focus");
+    await userEvent.keyboard("{PageUp}");
+    await vi.waitFor(() => expect(viewport.scrollTop).toBeLessThan(atEnd));
+  });
+
   it("disables the minimap's next turn button at the bottom of the thread", async () => {
     setup();
     const props = baseProps();
@@ -763,6 +796,50 @@ describe("MessagesTimeline messages", () => {
     expect(turns).toEqual(turns.toSorted((a, b) => a - b));
   });
 
+  it("steps the minimap's next turn past two adjacent user messages", async () => {
+    const props = baseProps();
+    const reply = (id: string) => message("Reply.\n\n".repeat(120), { role: "assistant" }, id);
+    const userIds = ["turn-0", "turn-1", "turn-2", "pair-a", "pair-b", "turn-3", "turn-4"];
+    const entries = [
+      ...["turn-0", "turn-1", "turn-2"].flatMap((id) => [message(id, {}, id), reply(`${id}-r`)]),
+      message("pair-a", {}, "pair-a"),
+      message("pair-b", {}, "pair-b"),
+      reply("pair-b-r"),
+      ...["turn-3", "turn-4"].flatMap((id) => [message(id, {}, id), reply(`${id}-r`)]),
+    ];
+    const session = cdp();
+    await session.send("Emulation.setEmulatedMedia", {
+      features: [{ name: "prefers-reduced-motion", value: "reduce" }],
+    });
+    try {
+      await using screen = await renderTimeline(entries, props);
+      const viewport = props.listRef.current!.getScrollableNode()!;
+      const strips = () => [...screen.container.querySelectorAll("[data-minimap-strip]")];
+      const turnAtTop = () =>
+        userIds.find((id) => {
+          const row = screen.container.querySelector(`[data-message-id="${id}"]`);
+          if (!row) return false;
+          const offset = row.getBoundingClientRect().top - viewport.getBoundingClientRect().top;
+          return offset >= 0 && offset < 100;
+        });
+      await act(() => {
+        void props.listRef.current!.scrollToIndex({ index: 0, animated: false });
+      });
+      await vi.waitFor(() => expect(strips()[0]?.getAttribute("data-in-view")).toBe("true"));
+
+      // Clicks again while the view has not moved, as a user would.
+      for (const id of userIds.slice(1)) {
+        const from = turnAtTop();
+        await vi.waitFor(async () => {
+          if (turnAtTop() === from) await click(screen.button("Next turn"));
+          expect(turnAtTop(), "turn at the top after Next turn").toBe(id);
+        });
+      }
+    } finally {
+      await session.send("Emulation.setEmulatedMedia", { features: [] });
+    }
+  });
+
   it("preserves XML-like tags and comparisons in user messages as text", async () => {
     const source = [
       'Without reading a file, do you have <global-agent-instructions scope="workspace">',
@@ -784,6 +861,25 @@ describe("MessagesTimeline messages", () => {
     expect((globalThis as { __t3Xss?: number }).__t3Xss).toBeUndefined();
   });
 
+  it("keeps single tildes in user paths literal without changing double tildes or assistant text", async () => {
+    const source =
+      "Install the skill as ~/folder-a/skills/x, then follow the guide (~/folder-a/guide.md).";
+    await using screen = await renderTimeline([
+      message(source),
+      message("Drop ~~the old plan~~", {}, "message-2"),
+      message(source, { role: "assistant" }, "assistant-1"),
+    ]);
+    const [user, doubleTilde, assistant] = screen.container.querySelectorAll<HTMLElement>(
+      "[data-timeline-row-kind=message]",
+    );
+    expect(user?.textContent).toContain(source);
+    expect(user?.querySelector("del")).toBeNull();
+    expect(doubleTilde?.querySelector("del")?.textContent).toBe("the old plan");
+    expect(assistant?.querySelector("del")?.textContent).toBe(
+      "/folder-a/skills/x, then follow the guide (",
+    );
+  });
+
   it("renders sanitized raw HTML in assistant messages", async () => {
     await using screen = await renderTimeline([
       message(
@@ -1801,6 +1897,10 @@ describe("compact reasoning math", () => {
       "line one\r\nline two\r\n\r\nnext  nbsp　wide 😀𝑥
end",
       [["text", "line one line two next nbsp wide 😀𝑥 end"]],
     ],
+    [
+      `${"x".repeat(THOUGHT_PREVIEW_MAX_LENGTH - 1)}😀 tail`,
+      [["text", "x".repeat(THOUGHT_PREVIEW_MAX_LENGTH - 1)]],
+    ],
     ["\\$5 and \\$6, \\*not em\\*", [["text", "$5 and $6, *not em*"]]],
     ["hard  \nbreak\\\nagain", [["text", "hard break again"]]],
     ["<div>only html</div>", [["text", "Reasoning"]]],
diff --git a/apps/web/src/components/chat/MessagesTimeline.logic.test.ts b/apps/web/src/components/chat/MessagesTimeline.logic.test.ts
index 09cbfe4e7775..1bdb26aecfd6 100644
--- a/apps/web/src/components/chat/MessagesTimeline.logic.test.ts
+++ b/apps/web/src/components/chat/MessagesTimeline.logic.test.ts
@@ -18,7 +18,11 @@ import {
   workEntryDisplayIndicatesToolFailure,
   type TimelineEntry,
 } from "../../session-logic";
-import { makeStreamingTimelineFixture } from "../../test-fixtures";
+import {
+  makeStreamingTimelineFixture,
+  makeStreamingWorkTimelineFixture,
+  withStreamedText,
+} from "../../test-fixtures";
 import type { TurnDiffSummary } from "../../types";
 import { describe, expect, it } from "vite-plus/test";
 import { MessageId, RunId } from "@t3tools/contracts";
@@ -3891,6 +3895,220 @@ describe("streaming v2 row projection", () => {
       })),
     });
   });
+
+  it.each(["reasoning", "proposed_plan"] as const)(
+    "keeps every row not holding streaming %s text when it changes",
+    (kind) => {
+      const source = makeStreamingWorkTimelineFixture(kind);
+      const rowsInput = (timelineEntries: ReadonlyArray<TimelineEntry>) => ({
+        timelineEntries,
+        latestRun: {
+          runId: source.runId,
+          status: "running" as const,
+          startedAt: source.time(5),
+          completedAt: null,
+        },
+        runningRunId: source.runId,
+        isWorking: true,
+        activeTurnStartedAt: source.time(5),
+        turnDiffSummaries: [],
+        supportsConversationRollback: true,
+      });
+      let timelineInput = {
+        visibleTurnItems: withStreamedText(
+          source.visibleTurnItems,
+          source.streamingItemId,
+          "Let",
+          source.time(20),
+        ),
+        optimisticMessages: [],
+      };
+      let timeline = deriveTimelineEntriesFromVisibleTurnItemsWithState(timelineInput);
+      let projection = deriveMessagesTimelineRowsWithState(rowsInput(timeline.entries));
+      for (const [step, text] of ["Let me", "Let me check the tests"].entries()) {
+        timelineInput = {
+          visibleTurnItems: withStreamedText(
+            timelineInput.visibleTurnItems,
+            source.streamingItemId,
+            text,
+            source.time(21 + step),
+          ),
+          optimisticMessages: [],
+        };
+        const previous = projection;
+        timeline = deriveTimelineEntriesFromVisibleTurnItemsWithState(timelineInput, timeline);
+        projection = deriveMessagesTimelineRowsWithState(rowsInput(timeline.entries), previous);
+        expect(projection.rows).toEqual(
+          deriveMessagesTimelineRows(
+            rowsInput(deriveTimelineEntriesFromVisibleTurnItems(timelineInput)),
+          ),
+        );
+        expect(projection.rows).toHaveLength(previous.rows.length);
+        for (const [index, row] of previous.rows.entries()) {
+          const holdsItem =
+            row.id === source.streamingItemId ||
+            ((row.kind === "work" || row.kind === "work-live") &&
+              row.groupedEntries.some((entry) => entry.id === source.streamingItemId));
+          if (!holdsItem) expect(projection.rows[index]).toBe(row);
+        }
+      }
+    },
+  );
+
+  it.each(["reasoning", "proposed_plan"] as const)(
+    "matches a full derivation when streaming %s text turns blank or completes",
+    (kind) => {
+      const source = makeStreamingWorkTimelineFixture(kind);
+      const rowsInput = (timelineEntries: ReadonlyArray<TimelineEntry>) => ({
+        timelineEntries,
+        latestRun: {
+          runId: source.runId,
+          status: "running" as const,
+          startedAt: source.time(5),
+          completedAt: null,
+        },
+        runningRunId: source.runId,
+        isWorking: true,
+        activeTurnStartedAt: source.time(5),
+        turnDiffSummaries: [],
+        supportsConversationRollback: true,
+      });
+      let visibleTurnItems = source.visibleTurnItems;
+      let timeline = deriveTimelineEntriesFromVisibleTurnItemsWithState({
+        visibleTurnItems,
+        optimisticMessages: [],
+      });
+      let projection = deriveMessagesTimelineRowsWithState(rowsInput(timeline.entries));
+      const steps = [
+        ...["Let", " ", "Let me"].map(
+          (text, step) => (rows: typeof visibleTurnItems) =>
+            withStreamedText(rows, source.streamingItemId, text, source.time(20 + step)),
+        ),
+        (rows: typeof visibleTurnItems) =>
+          rows.map((row) =>
+            row.item.id === source.streamingItemId &&
+            (row.item.type === "reasoning" || row.item.type === "proposed_plan")
+              ? {
+                  ...row,
+                  item: {
+                    ...row.item,
+                    status: "completed" as const,
+                    streaming: false,
+                    completedAt: DateTime.makeUnsafe(source.time(30)),
+                    updatedAt: DateTime.makeUnsafe(source.time(30)),
+                  },
+                }
+              : row,
+          ),
+      ];
+      for (const step of steps) {
+        visibleTurnItems = step(visibleTurnItems);
+        const timelineInput = { visibleTurnItems, optimisticMessages: [] };
+        timeline = deriveTimelineEntriesFromVisibleTurnItemsWithState(timelineInput, timeline);
+        expect(timeline.entries).toEqual(deriveTimelineEntriesFromVisibleTurnItems(timelineInput));
+        projection = deriveMessagesTimelineRowsWithState(rowsInput(timeline.entries), projection);
+        expect(projection.rows).toEqual(
+          deriveMessagesTimelineRows(
+            rowsInput(deriveTimelineEntriesFromVisibleTurnItems(timelineInput)),
+          ),
+        );
+      }
+    },
+  );
+
+  it.each([
+    "expanded live group",
+    "expanded live group followed by a hidden tool",
+    "thinking superseded by a running tool",
+    "settled turn",
+  ] as const)("matches a full derivation when streaming thinking sits in a %s", (scenario) => {
+    const source = makeStreamingWorkTimelineFixture("reasoning");
+    const running = scenario !== "settled turn";
+    const hiddenTool = scenario === "expanded live group followed by a hidden tool";
+    const rowsInput = (
+      timelineEntries: ReadonlyArray<TimelineEntry>,
+      expandedWorkGroupIds?: ReadonlySet<string>,
+    ) => ({
+      timelineEntries,
+      latestRun: {
+        runId: source.runId,
+        status: running ? ("running" as const) : ("completed" as const),
+        startedAt: source.time(5),
+        completedAt: running ? null : source.time(40),
+      },
+      runningRunId: running ? source.runId : null,
+      isWorking: running,
+      activeTurnStartedAt: source.time(5),
+      turnDiffSummaries: [],
+      supportsConversationRollback: true,
+      ...(expandedWorkGroupIds ? { expandedWorkGroupIds } : {}),
+      ...(running ? {} : { expandedRunIds: new Set([source.runId]) }),
+      ...(hiddenTool ? { toolCallVisibility: "hideAll" as const } : {}),
+    });
+    const tool = source.visibleTurnItems.find((row) => row.item.id === "live-work")!;
+    const laterTool = (status: "running" | "completed") => ({
+      ...tool,
+      position: source.visibleTurnItems.length,
+      sourceItemId: TurnItemId.make("live-later-tool"),
+      item: {
+        ...tool.item,
+        id: TurnItemId.make("live-later-tool"),
+        ordinal: 8,
+        status,
+        ...(status === "running" ? { completedAt: null } : {}),
+      },
+    });
+    let visibleTurnItems =
+      scenario === "thinking superseded by a running tool" || hiddenTool
+        ? [...source.visibleTurnItems, laterTool(hiddenTool ? "completed" : "running")]
+        : // Alone in a settled group, the thought's text becomes the group summary.
+          source.visibleTurnItems.filter((row) => running || row !== tool);
+    visibleTurnItems = withStreamedText(
+      visibleTurnItems,
+      source.streamingItemId,
+      "Let",
+      source.time(20),
+    );
+    let timeline = deriveTimelineEntriesFromVisibleTurnItemsWithState({
+      visibleTurnItems,
+      optimisticMessages: [],
+    });
+    const liveRow = deriveMessagesTimelineRows(rowsInput(timeline.entries)).find(
+      (row) => row.kind === "work-live",
+    );
+    const expanded =
+      scenario.startsWith("expanded live group") && liveRow?.kind === "work-live"
+        ? new Set([liveRow.groupId])
+        : undefined;
+    let projection = deriveMessagesTimelineRowsWithState(rowsInput(timeline.entries, expanded));
+    for (const [step, text] of ["Let me", "Let me check the tests"].entries()) {
+      visibleTurnItems = withStreamedText(
+        visibleTurnItems,
+        source.streamingItemId,
+        text,
+        source.time(21 + step),
+      );
+      const timelineInput = { visibleTurnItems, optimisticMessages: [] };
+      const previous = projection;
+      timeline = deriveTimelineEntriesFromVisibleTurnItemsWithState(timelineInput, timeline);
+      projection = deriveMessagesTimelineRowsWithState(
+        rowsInput(timeline.entries, expanded),
+        previous,
+      );
+      expect(projection.rows).toEqual(
+        deriveMessagesTimelineRows(
+          rowsInput(deriveTimelineEntriesFromVisibleTurnItems(timelineInput), expanded),
+        ),
+      );
+      if (!running) continue;
+      for (const [index, row] of previous.rows.entries()) {
+        const holdsItem =
+          (row.kind === "work" || row.kind === "work-live") &&
+          row.groupedEntries.some((entry) => entry.id === source.streamingItemId);
+        if (!holdsItem) expect(projection.rows[index]).toBe(row);
+      }
+    }
+  });
 });
 
 describe("linked timeline resources", () => {
diff --git a/apps/web/src/components/chat/MessagesTimeline.logic.ts b/apps/web/src/components/chat/MessagesTimeline.logic.ts
index c42265664786..90690dc0810e 100644
--- a/apps/web/src/components/chat/MessagesTimeline.logic.ts
+++ b/apps/web/src/components/chat/MessagesTimeline.logic.ts
@@ -280,6 +280,7 @@ export function workEntryIsVisibleInGroup(
 }
 const TIMELINE_MINIMAP_ITEM_SPACING = 8;
 export const TIMELINE_MINIMAP_MIN_ITEMS = 2;
+export const TIMELINE_MINIMAP_TARGET_OFFSET = 24;
 // Relative to the timeline, not the viewport, so an open terminal shrinks the rail and
 // endpoint previews (centered on their strip) still fit above and below it.
 const TIMELINE_MINIMAP_MAX_HEIGHT_CSS = "max(4rem, calc(100% - 14.75rem))";
@@ -2481,19 +2482,33 @@ function replaceStreamingMessageRows(
     return null;
   }
   const replacements = new Map<ChatMessage, Extract<TimelineEntry, { kind: "message" }>>();
+  const thoughts = new Map<string, WorkLogEntry>();
+  const plans = new Map<string, ProposedPlan>();
   for (let index = 0; index < timelineEntries.length; index += 1) {
     const entry = timelineEntries[index]!;
     const previousEntry = previousEntries[index]!;
     if (entry === previousEntry) continue;
     if (
-      entry.kind !== "message" ||
-      previousEntry.kind !== "message" ||
+      entry.kind !== previousEntry.kind ||
       entry.id !== previousEntry.id ||
       entry.createdAt !== previousEntry.createdAt ||
       entry.attempt !== previousEntry.attempt
     ) {
       return null;
     }
+    if (entry.kind === "work" && previousEntry.kind === "work") {
+      if (!isStreamingThoughtUpdate(previousEntry.entry, entry.entry)) return null;
+      thoughts.set(entry.id, entry.entry);
+      continue;
+    }
+    if (entry.kind === "proposed-plan" && previousEntry.kind === "proposed-plan") {
+      const { planMarkdown: _before, updatedAt: _beforeAt, ...before } = previousEntry.proposedPlan;
+      const { planMarkdown: _after, updatedAt: _afterAt, ...after } = entry.proposedPlan;
+      if (!shallow(before, after)) return null;
+      plans.set(entry.id, entry.proposedPlan);
+      continue;
+    }
+    if (entry.kind !== "message" || previousEntry.kind !== "message") return null;
     if (
       entry.projectedItem !== previousEntry.projectedItem &&
       (entry.projectedItem === undefined ||
@@ -2510,8 +2525,54 @@ function replaceStreamingMessageRows(
     if (!isStreamingMessageTextUpdate(previousEntry.message, entry.message)) return null;
     replacements.set(previousEntry.message, entry);
   }
-  if (replacements.size === 0) return previous.rows;
-  return previous.rows.map((row) => {
+  if (replacements.size === 0 && thoughts.size === 0 && plans.size === 0) return previous.rows;
+  // Rows settle superseded thinking after tool visibility filtering, which these entries
+  // have not seen; the fast path keeps item status, so the row's settled status still holds.
+  const patchedThoughts = new Map<WorkLogEntry, WorkLogEntry>();
+  const patchThought = (entry: WorkLogEntry) => {
+    const thought = thoughts.get(entry.id);
+    if (!thought) return entry;
+    let patched = patchedThoughts.get(entry);
+    if (!patched) {
+      patched =
+        entry.toolLifecycleStatus === thought.toolLifecycleStatus ||
+        entry.toolLifecycleStatus === undefined
+          ? thought
+          : { ...thought, toolLifecycleStatus: entry.toolLifecycleStatus };
+      patchedThoughts.set(entry, patched);
+    }
+    return patched;
+  };
+  const patchedGroups = new Map<WorkLogEntry[], WorkLogEntry[]>();
+  const patchGroup = (group: WorkLogEntry[]) => {
+    if (!group.some((entry) => thoughts.has(entry.id))) return group;
+    const patched = patchedGroups.get(group) ?? group.map(patchThought);
+    patchedGroups.set(group, patched);
+    return patched;
+  };
+  const patchedLiveThoughtIds = new Set<string>();
+  const rows = previous.rows.map((row): MessagesTimelineRow => {
+    if (row.kind === "proposed-plan") {
+      const proposedPlan = plans.get(row.id);
+      return proposedPlan ? { ...row, proposedPlan } : row;
+    }
+    if (row.kind === "work-live") {
+      const groupedEntries = patchGroup(row.groupedEntries);
+      if (groupedEntries === row.groupedEntries) return row;
+      for (const entry of groupedEntries) {
+        if (thoughts.has(entry.id)) patchedLiveThoughtIds.add(entry.id);
+      }
+      return {
+        ...row,
+        entry: patchThought(row.entry),
+        groupedEntries,
+        ...(row.thought ? { thought: patchThought(row.thought) } : {}),
+      };
+    }
+    if (row.kind === "work") {
+      const groupedEntries = patchGroup(row.groupedEntries);
+      return groupedEntries === row.groupedEntries ? row : { ...row, groupedEntries };
+    }
     if (row.kind !== "message" && row.kind !== "assistant-meta") return row;
     const entry = replacements.get(row.message);
     return entry
@@ -2522,6 +2583,39 @@ function replaceStreamingMessageRows(
         }
       : row;
   });
+  // Only a live row holds thinking without deriving a label from its text. Settled
+  // groups, folded turns, and work toggles summarize it, so they need the full rebuild.
+  for (const id of thoughts.keys()) if (!patchedLiveThoughtIds.has(id)) return null;
+  return rows;
+}
+
+/**
+ * Rows read a thought's text only through its blankness (visibility, the live
+ * thought line) and through labels that live rows do not store.
+ */
+function isStreamingThoughtUpdate(previous: WorkLogEntry, next: WorkLogEntry): boolean {
+  if (
+    previous.itemType !== "reasoning" ||
+    previous.projectedItem === undefined ||
+    next.projectedItem === undefined ||
+    !isStreamingTurnItemTextUpdate(previous.projectedItem, next.projectedItem) ||
+    Boolean(previous.detail?.trim()) !== Boolean(next.detail?.trim())
+  ) {
+    return false;
+  }
+  const {
+    detail: _before,
+    structuredPayload: _beforeItem,
+    projectedItem: _beforeRow,
+    ...rest
+  } = previous;
+  const {
+    detail: _after,
+    structuredPayload: _afterItem,
+    projectedItem: _afterRow,
+    ...nextRest
+  } = next;
+  return shallow(rest, nextRest);
 }
 
 export function deriveMessagesTimelineRowsWithState(
diff --git a/apps/web/src/components/chat/MessagesTimeline.tsx b/apps/web/src/components/chat/MessagesTimeline.tsx
index 3bbea6a44eb2..eb4bd6fea6ef 100644
--- a/apps/web/src/components/chat/MessagesTimeline.tsx
+++ b/apps/web/src/components/chat/MessagesTimeline.tsx
@@ -84,6 +84,7 @@ import {
   isTimelineMinimapRowVisible,
   resolveTimelineMinimapVisibleRange,
   resolveTimelineMinimapHitStripWidth,
+  TIMELINE_MINIMAP_TARGET_OFFSET,
   timelineTurnFoldRunIdsByEntryId,
   liveAnswerPreview,
   type MessagesTimelineRow,
@@ -944,9 +945,17 @@ const ConversationTimeline = memo(function ConversationTimeline({
         strip.dataset.inView = next;
       }
     }
+    // Ignore rows ending within the offset minimap navigation leaves above its target, or
+    // Next turn keeps retargeting the same row. 1px absorbs device-pixel scroll rounding.
+    const currentInset = TIMELINE_MINIMAP_TARGET_OFFSET + 1;
+    const currentRange = resolveTimelineMinimapVisibleRange({
+      ...state,
+      scroll: scroll + currentInset,
+      scrollLength: state.scrollLength - currentInset,
+    });
     const nextCurrentIndex = resolveTimelineMinimapCurrentIndex({
-      visibleStart: visibleRange.start,
-      visibleEnd: visibleRange.end,
+      visibleStart: currentRange.start,
+      visibleEnd: currentRange.end,
       rowIndices: minimapRowIndices,
     });
     setMinimapCurrentIndex((current) =>
@@ -1459,6 +1468,9 @@ const ConversationTimeline = memo(function ConversationTimeline({
               onScroll={handleScroll}
               onItemSizeChanged={scheduleMinimapRefresh}
               onMetricsChange={scheduleMinimapRefresh}
+              // Keyboard scrolling only moves the focused element; F6 and clicks land here.
+              tabIndex={-1}
+              data-workspace-focus-default
               className={cn(
                 "messages-timeline-scroll scrollbar-gutter-both h-full min-h-0 overflow-x-hidden overscroll-y-contain [overflow-anchor:none]",
                 topFadeEnabled && "topbar-scroll-fade",
@@ -1479,7 +1491,7 @@ const ConversationTimeline = memo(function ConversationTimeline({
                 void listRef.current?.scrollToIndex({
                   index: item.rowIndex,
                   animated: !window.matchMedia("(prefers-reduced-motion: reduce)").matches,
-                  viewOffset: 24,
+                  viewOffset: TIMELINE_MINIMAP_TARGET_OFFSET,
                 });
               }}
             />
diff --git a/apps/web/src/components/chat/ModelPickerContent.tsx b/apps/web/src/components/chat/ModelPickerContent.tsx
index 8b4bdf0b16e4..f316f60e61f7 100644
--- a/apps/web/src/components/chat/ModelPickerContent.tsx
+++ b/apps/web/src/components/chat/ModelPickerContent.tsx
@@ -113,7 +113,9 @@ function shouldIncludeModelPickerOption(input: {
   if (isProviderInstancePickerReady(input.entry)) return true;
   return (
     input.entry.enabled &&
-    (input.entry.driverKind === "opencode" || input.entry.driverKind === "antigravity") &&
+    (input.entry.driverKind === "opencode" ||
+      input.entry.driverKind === "antigravity" ||
+      input.entry.driverKind === "cursor") &&
     input.entry.instanceId === input.activeInstanceId &&
     input.option.slug === input.activeModel &&
     input.option.isUnavailable === true
diff --git a/apps/web/src/components/chat/ProviderStatusBanner.test.ts b/apps/web/src/components/chat/ProviderStatusBanner.test.ts
index 9a2e8e7f6573..fb9c0732d025 100644
--- a/apps/web/src/components/chat/ProviderStatusBanner.test.ts
+++ b/apps/web/src/components/chat/ProviderStatusBanner.test.ts
@@ -1,8 +1,11 @@
 import { describe, expect, it } from "vite-plus/test";
 import { ProviderDriverKind, ProviderInstanceId, type ServerProvider } from "@t3tools/contracts";
 import {
+  dismissProviderStatusBannerForSession,
   getProviderStatusBannerKey,
+  getProviderStatusDismissalKey,
   getProviderStatusMessage,
+  isProviderStatusBannerDismissedForSession,
   shouldShowProviderStatusBanner,
 } from "./ProviderStatusBanner";
 
@@ -26,18 +29,18 @@ const provider: ServerProvider = {
   },
 };
 
+function shownAfterDismissing(dismissed: ServerProvider, shown: ServerProvider): boolean {
+  return shouldShowProviderStatusBanner(
+    shown,
+    getProviderStatusBannerKey(shown) === getProviderStatusBannerKey(dismissed),
+  );
+}
+
 describe("compatibility banners", () => {
   it("shows and dismisses a warning on a healthy provider, then clears it after policy relaxation", () => {
-    expect(shouldShowProviderStatusBanner(provider, null)).toBe(true);
-    expect(shouldShowProviderStatusBanner(provider, getProviderStatusBannerKey(provider))).toBe(
-      false,
-    );
-    expect(
-      shouldShowProviderStatusBanner(
-        { ...provider, version: "1.0.1" },
-        getProviderStatusBannerKey(provider),
-      ),
-    ).toBe(true);
+    expect(shouldShowProviderStatusBanner(provider, false)).toBe(true);
+    expect(shownAfterDismissing(provider, provider)).toBe(false);
+    expect(shownAfterDismissing(provider, { ...provider, version: "1.0.1" })).toBe(true);
     const relaxed: ServerProvider = {
       ...provider,
       compatibilityAdvisory: {
@@ -72,7 +75,7 @@ describe("compatibility banners", () => {
         recommendedRange: ">=1.14.19 <2.0.0",
       },
     };
-    expect(shouldShowProviderStatusBanner(broken, null)).toBe(true);
+    expect(shouldShowProviderStatusBanner(broken, false)).toBe(true);
     const timeoutOnly: ServerProvider = {
       ...broken,
       compatibilityAdvisory: {
@@ -81,18 +84,13 @@ describe("compatibility banners", () => {
         message: null,
       },
     };
-    expect(shouldShowProviderStatusBanner(broken, getProviderStatusBannerKey(timeoutOnly))).toBe(
-      true,
-    );
-    expect(shouldShowProviderStatusBanner(broken, getProviderStatusBannerKey(broken))).toBe(false);
+    expect(shownAfterDismissing(timeoutOnly, broken)).toBe(true);
+    expect(shownAfterDismissing(broken, broken)).toBe(false);
     expect(
-      shouldShowProviderStatusBanner(
-        {
-          ...broken,
-          compatibilityAdvisory: { ...broken.compatibilityAdvisory!, message: "Use 1.14.20." },
-        },
-        getProviderStatusBannerKey(broken),
-      ),
+      shownAfterDismissing(broken, {
+        ...broken,
+        compatibilityAdvisory: { ...broken.compatibilityAdvisory!, message: "Use 1.14.20." },
+      }),
     ).toBe(true);
     expect(getProviderStatusMessage(broken)).toBe(message);
     expect(
@@ -110,3 +108,41 @@ describe("compatibility banners", () => {
     );
   });
 });
+
+describe("banner dismissal", () => {
+  const { compatibilityAdvisory: _advisory, ...healthy } = provider;
+  const failing: ServerProvider = {
+    ...healthy,
+    instanceId: ProviderInstanceId.make("codex-dismissal"),
+    status: "error",
+    message: "Could not start Codex CLI.",
+  };
+
+  it("keeps a dismissed status hidden in other views until the status changes", () => {
+    const key = getProviderStatusDismissalKey("environment-a", failing);
+    expect(isProviderStatusBannerDismissedForSession(key)).toBe(false);
+
+    dismissProviderStatusBannerForSession(key);
+
+    expect(
+      isProviderStatusBannerDismissedForSession(
+        getProviderStatusDismissalKey("environment-a", failing),
+      ),
+    ).toBe(true);
+    expect(
+      isProviderStatusBannerDismissedForSession(
+        getProviderStatusDismissalKey("environment-a", { ...failing, message: "Codex exited." }),
+      ),
+    ).toBe(false);
+  });
+
+  it("keeps a dismissal to the environment it was taken in", () => {
+    dismissProviderStatusBannerForSession(getProviderStatusDismissalKey("environment-c", failing));
+
+    expect(
+      isProviderStatusBannerDismissedForSession(
+        getProviderStatusDismissalKey("environment-d", failing),
+      ),
+    ).toBe(false);
+  });
+});
diff --git a/apps/web/src/components/chat/ProviderStatusBanner.tsx b/apps/web/src/components/chat/ProviderStatusBanner.tsx
index 64afa55ed0d7..04f8a8a8535a 100644
--- a/apps/web/src/components/chat/ProviderStatusBanner.tsx
+++ b/apps/web/src/components/chat/ProviderStatusBanner.tsx
@@ -4,7 +4,7 @@ import {
   type ServerProvider,
 } from "@t3tools/contracts";
 import { useAtomValue } from "@effect/atom-react";
-import { memo, useRef, useState } from "react";
+import { memo, useRef, useState, useSyncExternalStore } from "react";
 import { InfoIcon, XIcon } from "lucide-react";
 import { Alert, AlertAction, AlertDescription, AlertTitle } from "../ui/alert";
 import { Button, InlineButton } from "../ui/button";
@@ -51,10 +51,43 @@ export function getProviderStatusBannerKey(status: ServerProvider | null): strin
 
 export function shouldShowProviderStatusBanner(
   status: ServerProvider | null,
-  dismissedBannerKey: string | null,
+  isDismissed: boolean,
 ): boolean {
+  return getProviderStatusBannerKey(status) !== null && !isDismissed;
+}
+
+// Built-in instance ids such as `codex` repeat across environments.
+export function getProviderStatusDismissalKey(
+  environmentId: string | undefined,
+  status: ServerProvider | null,
+): string | null {
   const bannerKey = getProviderStatusBannerKey(status);
-  return bannerKey !== null && bannerKey !== dismissedBannerKey;
+  return bannerKey === null ? null : `${environmentId ?? ""}\u0000${bannerKey}`;
+}
+
+// A dismissal lasts the session, not one view, so opening another thread cannot bring it back.
+const sessionDismissedProviderStatusBannerKeys = new Set<string>();
+const dismissalListeners = new Set<() => void>();
+
+export function dismissProviderStatusBannerForSession(bannerKey: string | null): void {
+  if (bannerKey === null || sessionDismissedProviderStatusBannerKeys.has(bannerKey)) return;
+  sessionDismissedProviderStatusBannerKeys.add(bannerKey);
+  for (const listener of dismissalListeners) listener();
+}
+
+export function isProviderStatusBannerDismissedForSession(bannerKey: string | null): boolean {
+  return bannerKey !== null && sessionDismissedProviderStatusBannerKeys.has(bannerKey);
+}
+
+function subscribeToDismissals(listener: () => void) {
+  dismissalListeners.add(listener);
+  return () => dismissalListeners.delete(listener);
+}
+
+export function useProviderStatusBannerDismissed(bannerKey: string | null): boolean {
+  return useSyncExternalStore(subscribeToDismissals, () =>
+    isProviderStatusBannerDismissedForSession(bannerKey),
+  );
 }
 
 export function hasProviderSetup(status: ServerProvider): boolean {
diff --git a/apps/web/src/components/chat/QueuedRunsControl.browser.test.tsx b/apps/web/src/components/chat/QueuedRunsControl.browser.test.tsx
index f2ddde4b72a6..c226a2616077 100644
--- a/apps/web/src/components/chat/QueuedRunsControl.browser.test.tsx
+++ b/apps/web/src/components/chat/QueuedRunsControl.browser.test.tsx
@@ -1,5 +1,9 @@
 import { EnvironmentId, MessageId, ThreadId } from "@t3tools/contracts";
 import { serializeAssistantCitation } from "@t3tools/shared/assistantCitations";
+import {
+  formatComposerContextReference,
+  toComposerContextId,
+} from "@t3tools/shared/composerContextReferences";
 import * as DateTime from "effect/DateTime";
 import type { ComponentProps } from "react";
 import { expect, it, vi } from "vite-plus/test";
@@ -89,6 +93,11 @@ it("previews assistant quotes as readable text and preserves the citation when e
     suffix: "",
   });
   const quoteAndText = `${quote}\n\nWhy per worktree?`;
+  const inlineImage = formatComposerContextReference({
+    kind: "image",
+    contextId: toComposerContextId("header"),
+    label: "header.png",
+  });
   state.projection = { projection: { messages: [] } };
   state.workflow = {
     activeRun: { id: "run:active" },
@@ -104,6 +113,11 @@ it("previews assistant quotes as readable text and preserves the citation when e
         text: quoteAndText,
         attachments: [],
       },
+      {
+        run: { id: "run:inline-image", userMessageId: "message:inline-image" },
+        text: `Make the header look like ${inlineImage} and keep the logo.`,
+        attachments: [{ type: "image", id: "attachment:header", name: "header.png" }],
+      },
     ],
   };
   const onEditQueuedRun = vi.fn();
@@ -113,6 +127,11 @@ it("previews assistant quotes as readable text and preserves the citation when e
   await expect
     .element(page.getByText(`${quotedText} Why per worktree?`, { exact: true }))
     .toBeVisible();
+  await expect
+    .element(
+      page.getByText("Make the header look like header.png and keep the logo.", { exact: true }),
+    )
+    .toBeVisible();
 
   await page.getByRole("button", { name: "Edit queued message", exact: true }).nth(1).click();
   expect(onEditQueuedRun).toHaveBeenCalledExactlyOnceWith(
diff --git a/apps/web/src/components/chat/QueuedRunsControl.tsx b/apps/web/src/components/chat/QueuedRunsControl.tsx
index 66e023a756f6..29a99d385573 100644
--- a/apps/web/src/components/chat/QueuedRunsControl.tsx
+++ b/apps/web/src/components/chat/QueuedRunsControl.tsx
@@ -253,9 +253,7 @@ export function QueuedRunsControl({
           const previewText = isAttachmentOnlyBootstrapPrompt(item.text)
             ? ""
             : assistantCitationsToPlainText(
-                replaceComposerContextReferences(item.text, (reference) =>
-                  reference.kind === "image" && item.thumbnails.length > 0 ? "" : reference.label,
-                ),
+                replaceComposerContextReferences(item.text, (reference) => reference.label),
               ).trim();
           const isEditing = item.runId !== null && item.runId === props.editingRunId;
           return (
diff --git a/apps/web/src/components/chat/ThreadActivityBanners.tsx b/apps/web/src/components/chat/ThreadActivityBanners.tsx
index b12a6d1ae63b..5e3444f7a13a 100644
--- a/apps/web/src/components/chat/ThreadActivityBanners.tsx
+++ b/apps/web/src/components/chat/ThreadActivityBanners.tsx
@@ -182,9 +182,11 @@ export function backgroundWorkNowItem(input: {
   const presentation = presentPendingBackgroundWork(input.tasks);
   if (presentation === null) return null;
   const rows = presentation.items.map((task) => {
+    const itemKey =
+      input.tasks.find((pending) => pending.taskId === task.taskId)?.nativeItemId ?? task.taskId;
     // Same key derivePendingBackgroundWork gives turn-item tasks; subagent items carry progress.
     const item = input.turnItems.findLast(
-      (candidate) => (candidate.nativeItemRef?.nativeId || candidate.id) === task.taskId,
+      (candidate) => (candidate.nativeItemRef?.nativeId || candidate.id) === itemKey,
     );
     const subagent = item?.type === "subagent" ? item : undefined;
     return {
diff --git a/apps/web/src/components/chat/ThreadDetailsPrRow.tsx b/apps/web/src/components/chat/ThreadDetailsPrRow.tsx
index 23f749d8c910..673363895723 100644
--- a/apps/web/src/components/chat/ThreadDetailsPrRow.tsx
+++ b/apps/web/src/components/chat/ThreadDetailsPrRow.tsx
@@ -72,6 +72,7 @@ import {
   AlertDialogTitle,
 } from "../ui/alert-dialog";
 import { Button } from "../ui/button";
+import { Spinner } from "../ui/spinner";
 import { toastManager } from "../ui/toast";
 import { Tooltip, TooltipPopup, TooltipTrigger } from "../ui/tooltip";
 import {
@@ -371,10 +372,15 @@ export function ThreadDetailsPrRow({
         : rowAction === "fix"
           ? {
               label: "Fix",
-              pendingLabel: "Preparing...",
+              pendingLabel: "Fix",
               pending: handoff === "findings",
               destructive: true,
-              suffix: newThreadSuffix,
+              suffix:
+                handoff === "findings" ? (
+                  <Spinner size="xs" aria-label="Preparing fix" />
+                ) : (
+                  newThreadSuffix
+                ),
               tooltip:
                 composerTarget === undefined
                   ? "Fix the failing checks in a new thread"
@@ -478,7 +484,7 @@ export function ThreadDetailsPrRow({
                 checksState={checksRollup}
                 checks={detail.checks}
                 variant="count"
-                render={<ThreadDetailsControl part="meta" />}
+                render={<ThreadDetailsControl part="meta" className="min-w-0 shrink" />}
               />
             ) : null}
             {watchControl("icon")}
diff --git a/apps/web/src/components/chat/ThreadRelationshipsControl.remote-parent.browser.test.tsx b/apps/web/src/components/chat/ThreadRelationshipsControl.remote-parent.browser.test.tsx
new file mode 100644
index 000000000000..08108cd83588
--- /dev/null
+++ b/apps/web/src/components/chat/ThreadRelationshipsControl.remote-parent.browser.test.tsx
@@ -0,0 +1,127 @@
+import { EnvironmentId, ThreadId, type OrchestrationV2ThreadShell } from "@t3tools/contracts";
+import * as Cause from "effect/Cause";
+import { expect, it, vi } from "vite-plus/test";
+
+import { act, render, type Screen } from "../../../test/render";
+
+const { read, toast } = vi.hoisted(() => ({
+  read: vi.fn<(input: unknown) => Promise<unknown>>(),
+  toast: vi.fn(),
+}));
+
+const childEnvironmentId = EnvironmentId.make("child-environment");
+const childThreadId = ThreadId.make("child-thread");
+const parentEnvironmentId = EnvironmentId.make("parent-environment");
+// The panel reads only identity, lineage and delegation from the current thread.
+const child = {
+  id: childThreadId,
+  title: "Child",
+  lineage: { rootThreadId: childThreadId, parentThreadId: null, relationshipToParent: null },
+  forkedFrom: null,
+  delegatedFrom: {
+    environmentId: parentEnvironmentId,
+    threadId: ThreadId.make("parent-thread"),
+    title: "Parent",
+  },
+} as Partial<OrchestrationV2ThreadShell> as OrchestrationV2ThreadShell;
+
+vi.mock(import("../../state/orchestration"), async (original) => ({
+  ...(await original()),
+  threadTitlesRead: {
+    label: "thread-titles-read",
+    run: (_registry: unknown, input: unknown) => read(input),
+  } as never,
+}));
+vi.mock(import("../../state/entities"), async (original) => ({
+  ...(await original()),
+  useThreadProjection: () => null,
+  useThreadRelationshipShells: () => [child],
+  // The parent is absent from this client's shell, as for a parent never loaded here.
+  useQuietThreadShell: () => null,
+}));
+vi.mock(import("../../state/environments"), async (original) => ({
+  ...(await original()),
+  useEnvironment: (() => ({ label: "Linked" })) as never,
+}));
+vi.mock(import("../ui/toast"), async (original) => {
+  const actual = await original();
+  return { ...actual, toastManager: { ...actual.toastManager, add: toast } };
+});
+
+import { ThreadRelationshipsPanel } from "./ThreadRelationshipsControl";
+
+const childPath = `/${childEnvironmentId}/${childThreadId}`;
+const parentPath = `/${parentEnvironmentId}/parent-thread`;
+
+const live = { _tag: "Success", value: { "parent-thread": "Parent" } };
+const deleted = { _tag: "Success", value: {} };
+
+// Renders the child's panel; each read of its parent answers with the next of `replies`.
+function renderChild(...replies: ReadonlyArray<unknown>) {
+  read.mockReset();
+  for (const reply of replies) read.mockImplementationOnce(async () => reply);
+  toast.mockReset();
+  return render(
+    <ThreadRelationshipsPanel
+      environmentId={childEnvironmentId}
+      threadId={childThreadId}
+      showLineage
+      showSideChats={false}
+    />,
+    { router: childPath },
+  );
+}
+
+const parentRow = (screen: Screen) => screen.getByRole("button", { name: /Parent/ });
+
+it.each([
+  {
+    parent: "deleted there",
+    reply: deleted,
+    feedback: { type: "info", title: "The parent thread was deleted" },
+  },
+  {
+    parent: "unreadable",
+    reply: {
+      _tag: "Failure",
+      cause: Cause.fail(new Error("Failed to load orchestration V2 thread")),
+    },
+    feedback: { type: "error", title: "Could not open the parent thread" },
+  },
+])("keeps the child open with feedback when its remote parent is $parent", async (row) => {
+  await using screen = await renderChild(row.reply);
+  await parentRow(screen).click();
+  await vi.waitFor(() => expect(toast).toHaveBeenCalledWith(row.feedback));
+  expect(read).toHaveBeenCalledWith({
+    environmentId: parentEnvironmentId,
+    input: { threadIds: ["parent-thread"] },
+  });
+  expect(screen.router?.state.location.pathname).toBe(childPath);
+});
+
+it("opens a remote parent this client has not loaded", async () => {
+  await using screen = await renderChild(live);
+  await parentRow(screen).click();
+  await vi.waitFor(() => expect(screen.router?.state.location.pathname).toBe(parentPath));
+  expect(toast).not.toHaveBeenCalled();
+});
+
+it("leaves the user where they went when the parent read answers late", async () => {
+  let answerLate!: (reply: unknown) => void;
+  const late = new Promise((resolve) => {
+    answerLate = resolve;
+  });
+  await using screen = await renderChild(late, deleted);
+  await parentRow(screen).click();
+  await screen.router?.navigate({ to: "/new" });
+  await act(async () => {
+    answerLate(live);
+    await late;
+  });
+  expect(toast).not.toHaveBeenCalled();
+  expect(screen.router?.latestLocation.pathname).toBe("/new");
+  await parentRow(screen).click();
+  await vi.waitFor(() => expect(read).toHaveBeenCalledTimes(2));
+  await vi.waitFor(() => expect(toast).toHaveBeenCalledOnce());
+  expect(screen.router?.latestLocation.pathname).toBe("/new");
+});
diff --git a/apps/web/src/components/chat/ThreadRelationshipsControl.tsx b/apps/web/src/components/chat/ThreadRelationshipsControl.tsx
index 102d9734ded9..49c69ff4fade 100644
--- a/apps/web/src/components/chat/ThreadRelationshipsControl.tsx
+++ b/apps/web/src/components/chat/ThreadRelationshipsControl.tsx
@@ -43,7 +43,7 @@ import {
 import { deriveSubagentElapsedMs } from "@t3tools/shared/orchestrationTiming";
 import { groupBy } from "effect/Array";
 import * as DateTime from "effect/DateTime";
-import { useNavigate } from "@tanstack/react-router";
+import { useNavigate, useRouter } from "@tanstack/react-router";
 import {
   ArrowRightIcon,
   BotIcon,
@@ -75,7 +75,7 @@ import {
   deriveProviderInstanceEntries,
 } from "../../providerInstances";
 import { threadEnvironment } from "../../state/threads";
-import { orchestrationEnvironment } from "../../state/orchestration";
+import { orchestrationEnvironment, threadTitlesRead } from "../../state/orchestration";
 import { useAtomCommand } from "../../state/use-atom-command";
 import { useEnvironmentQuery } from "../../state/query";
 import { AgentElapsed } from "./AgentElapsed";
@@ -339,13 +339,43 @@ function DelegatedFromRow(props: {
   readonly fallbackLabel: string | undefined;
 }) {
   const navigate = useNavigate();
+  const router = useRouter();
   const { delegatedFrom } = props;
   const environment = useEnvironment(delegatedFrom.environmentId);
   const parentRef = scopeThreadRef(delegatedFrom.environmentId, delegatedFrom.threadId);
   // The title it had at delegation, until this client sees the parent itself.
   const parent = useQuietThreadShell(parentRef);
+  const readParent = useAtomCommand(threadTitlesRead);
+  const [opening, setOpening] = useState(false);
   const label = environment?.label ?? props.fallbackLabel;
   const title = parent?.title ?? delegatedFrom.title;
+  // The parent may have been deleted there since delegation, and the shell can't
+  // tell a deleted parent from one this client never loaded, so ask its environment.
+  const openParent = async () => {
+    if (opening) return;
+    setOpening(true);
+    const location = router.latestLocation;
+    const result = await readParent({
+      environmentId: delegatedFrom.environmentId,
+      input: { threadIds: [delegatedFrom.threadId] },
+    });
+    setOpening(false);
+    // The read can outlast the user's stay on this thread; a late answer must not pull them back.
+    if (router.latestLocation !== location) return;
+    if (result._tag === "Failure") {
+      toastManager.add({ type: "error", title: "Could not open the parent thread" });
+      return;
+    }
+    // Deleted and unknown threads are absent from the titles.
+    if (result.value[delegatedFrom.threadId] === undefined) {
+      toastManager.add({ type: "info", title: "The parent thread was deleted" });
+      return;
+    }
+    void navigate({
+      to: "/$environmentId/$threadId",
+      params: buildThreadRouteParams(parentRef),
+    });
+  };
   return (
     <li className="group relative flex h-8 items-center rounded-lg">
       <Tooltip>
@@ -359,10 +389,7 @@ function DelegatedFromRow(props: {
               aria-disabled={environment === null || undefined}
               onClick={() => {
                 if (environment === null) return;
-                void navigate({
-                  to: "/$environmentId/$threadId",
-                  params: buildThreadRouteParams(parentRef),
-                });
+                void openParent();
               }}
             />
           }
diff --git a/apps/web/src/components/chat/TimelineUserMessageRow.tsx b/apps/web/src/components/chat/TimelineUserMessageRow.tsx
index 67bf9c2eec90..c4593d2f6c5e 100644
--- a/apps/web/src/components/chat/TimelineUserMessageRow.tsx
+++ b/apps/web/src/components/chat/TimelineUserMessageRow.tsx
@@ -1,6 +1,9 @@
 import { InlineAudioPreview } from "../files/InlineAudioPreview";
 import { filePreviewKind } from "@t3tools/shared/filePreview";
-import { remarkEnableOrderedListNumbers } from "@t3tools/shared/markdownPipeline";
+import {
+  CHAT_USER_MARKDOWN_REMARK_PLUGINS,
+  remarkEnableOrderedListNumbers,
+} from "@t3tools/shared/markdownPipeline";
 import { findRevealRef } from "./markdownFindContext";
 import {
   type EnvironmentId,
@@ -1200,7 +1203,10 @@ const CollapsibleUserMessageBody = memo(function CollapsibleUserMessageBody(prop
   );
 });
 
-const USER_MESSAGE_REMARK_PLUGINS = [remarkEnableOrderedListNumbers];
+const USER_MESSAGE_REMARK_PLUGINS = [
+  ...CHAT_USER_MARKDOWN_REMARK_PLUGINS,
+  remarkEnableOrderedListNumbers,
+];
 
 const UserMessageBody = memo(function UserMessageBody(props: {
   text: string;
@@ -1218,7 +1224,7 @@ const UserMessageBody = memo(function UserMessageBody(props: {
       cwd={props.markdownCwd}
       threadRef={ctx.threadRef ?? undefined}
       skills={props.skills}
-      className="text-foreground user-message-markdown"
+      className="text-message-foreground user-message-markdown"
       lineBreaks
       parseRawHtml={false}
       extraRemarkPlugins={USER_MESSAGE_REMARK_PLUGINS}
diff --git a/apps/web/src/components/chat/TimelineWorkEntryRow.logic.ts b/apps/web/src/components/chat/TimelineWorkEntryRow.logic.ts
index 39bd3e6b3f84..854dd7d21a94 100644
--- a/apps/web/src/components/chat/TimelineWorkEntryRow.logic.ts
+++ b/apps/web/src/components/chat/TimelineWorkEntryRow.logic.ts
@@ -209,17 +209,20 @@ export function remarkThoughtPreview(fallback: string) {
       children.push({ type: "text", value: fragments.join("").replace(/\s+/g, " ") });
       fragments = [];
     };
-    const append = (value: string) => {
+    const take = (value: string) => {
       const text = value.slice(0, remaining);
-      remaining -= text.length;
-      fragments.push(text);
+      remaining = text.length < value.length ? 0 : remaining - text.length;
+      // A cut here or at the source limit must not leave half a surrogate pair.
+      return text.replace(/[\uD800-\uDBFF]$/, "");
+    };
+    const append = (value: string) => {
+      fragments.push(take(value));
     };
     const visit = (node: Root | RootContent) => {
       if (remaining === 0 || node.type === "html" || node.type === "definition") return;
       if (node.type === "math" || node.type === "inlineMath") {
         flush();
-        const value = node.value.slice(0, remaining);
-        remaining -= value.length;
+        const value = take(node.value);
         children.push({
           type: "inlineMath",
           value,
diff --git a/apps/web/src/components/chat/TimelineWorkEntryRow.tsx b/apps/web/src/components/chat/TimelineWorkEntryRow.tsx
index 253c83de3f4d..dfefdedeed52 100644
--- a/apps/web/src/components/chat/TimelineWorkEntryRow.tsx
+++ b/apps/web/src/components/chat/TimelineWorkEntryRow.tsx
@@ -535,21 +535,17 @@ function WorkEntryLogRow(props: WorkEntryRowProps) {
           !toolIconAcceptsTint(entryToolIcon) ? (
             <XIcon aria-hidden className={cn("size-3 shrink-0", failedToolIconClassName)} />
           ) : null}
+          {canExpandProjectedItem ? (
+            <span className="flex size-4 shrink-0 items-center justify-center" aria-hidden>
+              <ChevronRightIcon
+                className={cn(
+                  "size-3 shrink-0 text-icon-muted opacity-70 transition-transform duration-200",
+                  expanded && "rotate-90",
+                )}
+              />
+            </span>
+          ) : null}
           <TimelineRowTimestamp createdAt={workEntry.createdAt} timestampFormat={timestampFormat} />
-          <span
-            className={cn(
-              "flex size-4 shrink-0 items-center justify-center",
-              !canExpandProjectedItem && "invisible",
-            )}
-            aria-hidden
-          >
-            <ChevronRightIcon
-              className={cn(
-                "size-3 shrink-0 text-icon-muted opacity-70 transition-transform duration-200",
-                expanded && "rotate-90",
-              )}
-            />
-          </span>
         </>
       }
     >
diff --git a/apps/web/src/components/chat/TraitsPicker.tsx b/apps/web/src/components/chat/TraitsPicker.tsx
index 5154072a8d12..4cff71c95ca5 100644
--- a/apps/web/src/components/chat/TraitsPicker.tsx
+++ b/apps/web/src/components/chat/TraitsPicker.tsx
@@ -122,7 +122,7 @@ function getSelectedTraits(
 ) {
   const caps = getProviderModelCapabilities(models, model, provider, includePlanAgent);
   const modelIsUnavailable =
-    provider === "opencode" &&
+    (provider === "opencode" || provider === "cursor") &&
     !models.some((candidate) => candidate.slug === normalizeModelSlug(model, provider));
   const descriptors = modelIsUnavailable
     ? buildUnavailableModelOptionDescriptors(
diff --git a/apps/web/src/components/chat/WorktreeSetupCard.tsx b/apps/web/src/components/chat/WorktreeSetupCard.tsx
index 4e4e7c0e3a94..7b33b3a39e02 100644
--- a/apps/web/src/components/chat/WorktreeSetupCard.tsx
+++ b/apps/web/src/components/chat/WorktreeSetupCard.tsx
@@ -201,7 +201,7 @@ function StageRow({
       trailing={
         <>
           {trailing ? (
-            <span className="min-w-0 truncate text-xs text-muted-foreground tabular-nums">
+            <span className="max-w-1/2 min-w-0 truncate text-xs text-muted-foreground tabular-nums">
               {trailing}
             </span>
           ) : null}
diff --git a/apps/web/src/components/chat/composerAttachmentFiles.ts b/apps/web/src/components/chat/composerAttachmentFiles.ts
index 96575d393018..f613b695ffd5 100644
--- a/apps/web/src/components/chat/composerAttachmentFiles.ts
+++ b/apps/web/src/components/chat/composerAttachmentFiles.ts
@@ -61,6 +61,28 @@ export function normalizeComposerImageFileMimeType(file: File): File {
   });
 }
 
+export function composerImageDedupKey(
+  image: Pick<ComposerImageAttachment, "mimeType" | "sizeBytes" | "name">,
+): string {
+  // Hydrated images get fresh lastModified values, so exclude it from dedupe.
+  return `${image.mimeType}\u0000${image.sizeBytes}\u0000${image.name}`;
+}
+
+// Compression changes an image's bytes, so a compressed image answers for the file it came from.
+const composerImageSourceKeys = new WeakMap<File, string>();
+
+/** The draft store's image dedupe key, taken from the file as pasted rather than as compressed. */
+export function composerImageSourceKey(file: File): string {
+  return (
+    composerImageSourceKeys.get(file) ??
+    composerImageDedupKey({ mimeType: file.type, sizeBytes: file.size, name: file.name || "image" })
+  );
+}
+
+export function rememberComposerImageSource(source: File, prepared: File): void {
+  if (prepared !== source) composerImageSourceKeys.set(prepared, composerImageSourceKey(source));
+}
+
 function isDngFile(file: Pick<File, "name" | "type">): boolean {
   const mimeType = file.type.split(";", 1)[0]?.trim().toLowerCase();
   return (
diff --git a/apps/web/src/components/chat/composerFocusRedirect.ts b/apps/web/src/components/chat/composerFocusRedirect.ts
index f7730b367925..cb187e73ea6a 100644
--- a/apps/web/src/components/chat/composerFocusRedirect.ts
+++ b/apps/web/src/components/chat/composerFocusRedirect.ts
@@ -59,6 +59,18 @@ function isSurfaceLauncherKey(event: KeyboardEvent): boolean {
   return key !== null && (launcherKeys?.includes(key) ?? false);
 }
 
+function isKeyClaimedInPath(event: KeyboardEvent): boolean {
+  if (event.shiftKey) return false;
+  const key = event.key.toUpperCase();
+  return event
+    .composedPath()
+    .some(
+      (target) =>
+        target instanceof Element &&
+        (target.getAttribute("aria-keyshortcuts")?.split(/\s+/).includes(key) ?? false),
+    );
+}
+
 export function shouldRedirectInputToComposer(event: Event): boolean {
   if (event.defaultPrevented) return false;
   // Never persist or send secret-request typing through the composer.
@@ -66,6 +78,7 @@ export function shouldRedirectInputToComposer(event: Event): boolean {
   if (eventPathContainsSelector(event, TYPE_TO_FOCUS_EDITABLE_SELECTOR)) return false;
   if (eventPathContainsSelector(event, TYPE_TO_FOCUS_INTERACTIVE_SELECTOR)) return false;
   if (document.querySelector(TYPE_TO_FOCUS_FLOATING_LAYER_SELECTOR)) return false;
+  if (document.querySelector('[data-chat-column-maximized-away="true"]')) return false;
   return true;
 }
 
@@ -75,6 +88,7 @@ export function shouldTypeToFocusComposer(event: KeyboardEvent): boolean {
   if (event.key.length !== 1) return false;
   if (!shouldRedirectInputToComposer(event)) return false;
   if (isSurfaceLauncherKey(event)) return false;
+  if (isKeyClaimedInPath(event)) return false;
 
   return true;
 }
diff --git a/apps/web/src/components/chat/composerProviderState.tsx b/apps/web/src/components/chat/composerProviderState.tsx
index 44f89b9d4422..06b403b08291 100644
--- a/apps/web/src/components/chat/composerProviderState.tsx
+++ b/apps/web/src/components/chat/composerProviderState.tsx
@@ -86,7 +86,7 @@ export function getComposerProviderState(input: ComposerProviderStateInput): Com
     promptInjectionState = "none",
     includePlanAgent,
   } = input;
-  if (provider === "opencode") {
+  if (provider === "opencode" || provider === "cursor") {
     const normalizedModel = normalizeModelSlug(model, provider);
     const modelIsInCatalog = models.some((candidate) => candidate.slug === normalizedModel);
     if (!modelIsInCatalog) {
diff --git a/apps/web/src/components/chat/preparingComposerImages.ts b/apps/web/src/components/chat/preparingComposerImages.ts
index 4ba7696a1789..def7f023e861 100644
--- a/apps/web/src/components/chat/preparingComposerImages.ts
+++ b/apps/web/src/components/chat/preparingComposerImages.ts
@@ -5,6 +5,8 @@ export interface PreparingComposerImage {
   readonly name: string;
   /** The uncompressed source, thumbnailed so the placeholder shows the image itself. */
   readonly file: File;
+  /** Looks like an image the draft already has: it holds its slot but shows no tile. */
+  readonly hidden: boolean;
 }
 
 const NO_PREPARING_IMAGES: ReadonlyArray<PreparingComposerImage> = [];
@@ -24,8 +26,14 @@ export function usePreparingComposerImages(targetKey: string) {
   );
 }
 
+export function getPreparingComposerImages(
+  targetKey: string,
+): ReadonlyArray<PreparingComposerImage> {
+  return usePreparingComposerImageStore.getState().byTargetKey[targetKey] ?? NO_PREPARING_IMAGES;
+}
+
 export function countPreparingComposerImages(targetKey: string): number {
-  return usePreparingComposerImageStore.getState().byTargetKey[targetKey]?.length ?? 0;
+  return getPreparingComposerImages(targetKey).length;
 }
 
 export function addPreparingComposerImages(
diff --git a/apps/web/src/components/chat/turnDetailAnnouncement.test.ts b/apps/web/src/components/chat/turnDetailAnnouncement.test.ts
index c5eaa080ff92..42737043c533 100644
--- a/apps/web/src/components/chat/turnDetailAnnouncement.test.ts
+++ b/apps/web/src/components/chat/turnDetailAnnouncement.test.ts
@@ -116,11 +116,30 @@ describe("turnDetail", () => {
       activity: null,
     },
     {
-      name: "nothing while the context is compacted",
+      name: "the context being compacted",
       entries: [
         prompt,
         command("git"),
-        work("compact", { tone: "info", sourceActivityKind: "context-compaction" }),
+        work("compact", {
+          tone: "info",
+          sourceActivityKind: "context-compaction",
+          label: "Compacting context",
+          toolLifecycleStatus: "inProgress",
+        }),
+      ],
+      activity: "Compacting context",
+    },
+    {
+      name: "nothing once the context is compacted",
+      entries: [
+        prompt,
+        command("git"),
+        work("compact", {
+          tone: "info",
+          sourceActivityKind: "context-compaction",
+          label: "Context compacted",
+          toolLifecycleStatus: "completed",
+        }),
       ],
       activity: null,
     },
@@ -133,6 +152,11 @@ describe("turnDetail", () => {
     expect(turnDetail(entries, undefined, null).activity).toBe(activity);
   });
 
+  it("cuts a long step without splitting an emoji", () => {
+    const edit = work("edit", { itemType: "file_change", changedFiles: [`${"a".repeat(111)}😀z`] });
+    expect(turnDetail([prompt, edit], undefined, null).activity).not.toMatch(/[\uD800-\uDFFF]/u);
+  });
+
   it.each<{
     name: string;
     entries: ReadonlyArray<TimelineEntry>;
@@ -297,6 +321,12 @@ describe("nextTurnDetailAnnouncement", () => {
     ).toEqual(["T3 Code: Tests pass in web. See the docs"]);
   });
 
+  it("cuts a long message without splitting an emoji", () => {
+    const long = { ...said("long", true, true), text: `${"a".repeat(1999)}😀z` };
+    const [spoken] = speak("messages", [frame(null), frame(null, [long])]);
+    expect(spoken).not.toMatch(/[\uD800-\uDFFF]/u);
+  });
+
   it("says a step again after waiting on the user", () => {
     expect(
       speak("everything", [
diff --git a/apps/web/src/components/chat/turnDetailAnnouncement.ts b/apps/web/src/components/chat/turnDetailAnnouncement.ts
index 0728674ad874..593e86e0c3c2 100644
--- a/apps/web/src/components/chat/turnDetailAnnouncement.ts
+++ b/apps/web/src/components/chat/turnDetailAnnouncement.ts
@@ -34,6 +34,13 @@ const ACTIVITY_MAX_LENGTH = 120;
 // Parsing is synchronous, and nobody listens to a longer message through a live region.
 const MESSAGE_MAX_LENGTH = 2_000;
 
+/** The first `maxLength` code points of `text`, or null when it has no more than that. */
+function cutText(text: string, maxLength: number): string | null {
+  if (text.length <= maxLength) return null;
+  const characters = Array.from(text);
+  return characters.length > maxLength ? characters.slice(0, maxLength).join("") : null;
+}
+
 // On screen these labels are a path or a query beside an icon.
 function withVerb(work: WorkLogEntry, label: string) {
   if (work.itemType === "file_change") return `Editing ${label}`;
@@ -66,7 +73,8 @@ function stepLabel(work: WorkLogEntry, workspaceRoot: string | undefined): strin
   const label = liveWorkEntryLabel(work, workspaceRoot, true).replace(/\s+/g, " ").trim();
   if (label === "") return null;
   const spoken = withVerb(work, label);
-  return spoken.length > ACTIVITY_MAX_LENGTH ? `${spoken.slice(0, ACTIVITY_MAX_LENGTH)}…` : spoken;
+  const cut = cutText(spoken, ACTIVITY_MAX_LENGTH);
+  return cut === null ? spoken : `${cut}…`;
 }
 
 /**
@@ -98,7 +106,7 @@ export function turnDetail(
     if (entry.kind === "work") {
       const work = entry.entry;
       if (work.sourceActivityKind === "context-compaction") {
-        activity ??= null;
+        activity ??= work.toolLifecycleStatus === "inProgress" ? work.label : null;
         continue;
       }
       // Notices, todo lists and checkpoints sit beside the turn's steps without being one.
@@ -189,11 +197,12 @@ export function nextTurnDetailAnnouncement(
           previous.messages.get(message.id) !== true &&
           (message.fresh || previous.messages.has(message.id)),
       )
-      .map((message) =>
-        message.text.length > MESSAGE_MAX_LENGTH
-          ? `${markdownPlainText(message.text.slice(0, MESSAGE_MAX_LENGTH))} More in the thread.`
-          : markdownPlainText(message.text),
-      )
+      .map((message) => {
+        const cut = cutText(message.text, MESSAGE_MAX_LENGTH);
+        return cut === null
+          ? markdownPlainText(message.text)
+          : `${markdownPlainText(cut)} More in the thread.`;
+      })
       .filter((text) => text !== "")
       .map((text) => `${MESSAGE_AUTHOR}: ${text}`),
     activity:
diff --git a/apps/web/src/components/chat/useComposerAttachmentIntake.browser.test.tsx b/apps/web/src/components/chat/useComposerAttachmentIntake.browser.test.tsx
new file mode 100644
index 000000000000..cfacb19bc410
--- /dev/null
+++ b/apps/web/src/components/chat/useComposerAttachmentIntake.browser.test.tsx
@@ -0,0 +1,125 @@
+import { useEffect } from "react";
+import { ThreadId } from "@t3tools/contracts";
+import { expect, it, vi } from "vite-plus/test";
+
+import { act, render } from "../../../test/render";
+import {
+  type ComposerImageAttachment,
+  DraftId,
+  useComposerDraftStore,
+} from "../../composerDraftStore";
+import { getPreparingComposerImages } from "./preparingComposerImages";
+import { useComposerAttachmentIntake } from "./useComposerAttachmentIntake";
+
+const compression = vi.hoisted(() => ({ prepare: vi.fn() }));
+vi.mock("../../lib/imageCompression", async (importOriginal) => ({
+  ...(await importOriginal<typeof import("../../lib/imageCompression")>()),
+  prepareImageForAttachment: compression.prepare,
+}));
+
+type IntakeInput = Parameters<typeof useComposerAttachmentIntake>[0];
+type Intake = ReturnType<typeof useComposerAttachmentIntake>;
+
+function Harness({ input, ready }: { input: IntakeInput; ready: (value: Intake) => void }) {
+  const intake = useComposerAttachmentIntake(input);
+  useEffect(() => ready(intake));
+  return null;
+}
+
+function deferred<T>() {
+  let resolve!: (value: T) => void;
+  const promise = new Promise<T>((fulfill) => {
+    resolve = fulfill;
+  });
+  return { promise, resolve };
+}
+
+// A clipboard image arrives as a new File named image.png on every paste.
+const pastedImage = (fill = 0) =>
+  new File([new Uint8Array(100).fill(fill)], "image.png", { type: "image/png" });
+// Compression shrinks an image, so the draft's copy no longer matches the pasted bytes; images
+// with different pixels compress to different sizes.
+const compress = async (source: File) => {
+  const [firstByte = 0] = new Uint8Array(await source.arrayBuffer());
+  return {
+    ok: true as const,
+    file: new File([new Uint8Array(60 + firstByte)], "image.png", { type: "image/png" }),
+    recompressed: true as const,
+  };
+};
+const visiblePreparing = (targetKey: string) =>
+  getPreparingComposerImages(targetKey).filter((image) => !image.hidden);
+
+it("prepares a repeated paste without a tile, and still keeps a different image", async () => {
+  const target = DraftId.make("intake-repeat-paste");
+  const store = useComposerDraftStore.getState();
+  using _draft = { [Symbol.dispose]: () => store.clearComposerContent(target) };
+  const firstCompression = deferred<void>();
+  compression.prepare
+    .mockReset()
+    .mockImplementationOnce(async (file: File) => {
+      await firstCompression.promise;
+      return compress(file);
+    })
+    .mockImplementation(compress);
+  const composerImagesRef = { current: [] as ComposerImageAttachment[] };
+  const addImages = (images: ComposerImageAttachment[]) => {
+    const ids = store.addImages(target, images);
+    composerImagesRef.current =
+      useComposerDraftStore.getState().getComposerDraft(target)?.images ?? [];
+    return ids;
+  };
+  const input = {
+    activeThreadId: ThreadId.make("thread"),
+    activePendingProgress: null,
+    activePendingIsResponding: false,
+    pendingUserInputs: [],
+    supportsQuestionAttachments: false,
+    isLiteralPendingAnswer: false,
+    projectSelectionRequired: false,
+    questionAttachmentTarget: null,
+    attachmentTargetKey: target,
+    fileStagingLimit: null,
+    promptRef: { current: "" },
+    composerImagesRef,
+    composerFilesRef: { current: [] },
+    composerEditorRef: { current: null },
+    isRevertingCheckpointRef: { current: false },
+    setThreadError: () => {},
+    countReservedAttachments: () =>
+      composerImagesRef.current.length + getPreparingComposerImages(target).length,
+    addComposerImage: (image) => addImages([image]),
+    addComposerImagesToDraft: addImages,
+    addComposerFilesToDraft: () => [],
+    removeComposerImageFromDraft: () => {},
+    insertAttachmentReferences: () => false,
+  } satisfies IntakeInput;
+  let intake!: Intake;
+  await using _screen = await render(
+    <Harness
+      input={input}
+      ready={(value) => {
+        intake = value;
+      }}
+    />,
+  );
+
+  const first = intake.addComposerAttachments([pastedImage()]);
+  const whileCompressing = intake.addComposerAttachments([pastedImage()]);
+  expect(visiblePreparing(target)).toHaveLength(1);
+  await act(async () => {
+    firstCompression.resolve();
+    await Promise.all([first, whileCompressing]);
+  });
+
+  const afterCompression = intake.addComposerAttachments([pastedImage()]);
+  expect(visiblePreparing(target)).toHaveLength(0);
+  await act(() => afterCompression);
+  expect(composerImagesRef.current).toHaveLength(1);
+
+  // Same name, type and size, different pixels: it compresses differently and is kept.
+  const different = intake.addComposerAttachments([pastedImage(7)]);
+  expect(visiblePreparing(target)).toHaveLength(0);
+  await act(() => different);
+  expect(composerImagesRef.current).toHaveLength(2);
+});
diff --git a/apps/web/src/components/chat/useComposerAttachmentIntake.ts b/apps/web/src/components/chat/useComposerAttachmentIntake.ts
index fe3a56a39220..a4e542b1cbe6 100644
--- a/apps/web/src/components/chat/useComposerAttachmentIntake.ts
+++ b/apps/web/src/components/chat/useComposerAttachmentIntake.ts
@@ -26,7 +26,9 @@ import {
 import {
   classifyComposerAttachmentFile,
   composerFileAttachmentMimeType,
+  composerImageSourceKey,
   normalizeComposerImageFileMimeType,
+  rememberComposerImageSource,
 } from "./composerAttachmentFiles";
 import {
   fileAttachmentTooLargeMessage,
@@ -48,6 +50,7 @@ import { toastManager } from "../ui/toast";
 import { type RefObject, useRef } from "react";
 import {
   addPreparingComposerImages,
+  getPreparingComposerImages,
   isPreparingComposerImage,
   removePreparingComposerImages,
 } from "./preparingComposerImages";
@@ -241,13 +244,21 @@ export function useComposerAttachmentIntake(input: {
     }
     if (acceptedImages.length === 0) return insertedAny;
 
+    // The store drops a repeated image only after compressing it, so a likely repeat prepares
+    // without a tile instead of flashing one. Only the store decides it is a duplicate.
+    const imageSourceKeys = new Set(
+      [...composerImagesRef.current, ...getPreparingComposerImages(attachmentTargetKey)].map(
+        (image) => composerImageSourceKey(image.file),
+      ),
+    );
     // The draft image reuses its placeholder's id and thumbnail so the strip tile stays exactly
     // as it is when the compressed file replaces it.
-    const preparingImages = acceptedImages.map((file) => ({
-      id: randomUUID(),
-      name: file.name || "image",
-      file,
-    }));
+    const preparingImages = acceptedImages.map((file) => {
+      const sourceKey = composerImageSourceKey(file);
+      const hidden = imageSourceKeys.has(sourceKey);
+      imageSourceKeys.add(sourceKey);
+      return { id: randomUUID(), name: file.name || "image", file, hidden };
+    });
     addPreparingComposerImages(attachmentTargetKey, preparingImages);
     if (questionAttachmentTarget)
       changeQuestionAttachmentPreparation(questionAttachmentTarget, acceptedImages.length);
@@ -272,7 +283,8 @@ export function useComposerAttachmentIntake(input: {
         );
         continue;
       }
-      inheritComposerImageThumbnail(file, result.file);
+      await inheritComposerImageThumbnail(file, result.file);
+      rememberComposerImageSource(file, result.file);
       compressed.push({ id, file: result.file });
     }
     const questionDiscarded =
diff --git a/apps/web/src/components/chat/useComposerMenuItems.ts b/apps/web/src/components/chat/useComposerMenuItems.ts
index 7620bf861102..809015760498 100644
--- a/apps/web/src/components/chat/useComposerMenuItems.ts
+++ b/apps/web/src/components/chat/useComposerMenuItems.ts
@@ -1,3 +1,7 @@
+import {
+  legacyThreadPullRequestKey,
+  threadPullRequestKeyOf,
+} from "@t3tools/client-runtime/thread-pull-requests";
 import {
   matchComposerEnvironmentItems,
   matchComposerThreadItems,
@@ -327,10 +331,17 @@ export function useComposerMenuItems({
     ) {
       const exactPullRequest =
         exactPullRequestLookup.data?.number === pullRequestTriggerNumber
-          ? [exactPullRequestLookup.data]
+          ? [
+              {
+                ...exactPullRequestLookup.data,
+                // Only the host: the URL's full repository path would not match the project's selector.
+                host: legacyThreadPullRequestKey(exactPullRequestLookup.data).host,
+              },
+            ]
           : [];
       const matches = /^\d*$/u.test(composerTrigger.query)
         ? filterComposerPullRequestMatches({
+            keyOf: threadPullRequestKeyOf,
             entries: [...exactPullRequest, ...(pullRequestLookup.data?.entries ?? [])],
             linked: linkedPullRequests,
             projectId: pullRequestProjectId,
@@ -339,6 +350,7 @@ export function useComposerMenuItems({
             limit: COMPOSER_PULL_REQUEST_RESULT_LIMIT,
           })
         : withLinkedComposerPullRequestsFirst({
+            keyOf: threadPullRequestKeyOf,
             matches: rankPullRequestMatches(
               (pullRequestLookup.data?.entries ?? []).filter((entry) => {
                 if (
@@ -363,7 +375,7 @@ export function useComposerMenuItems({
             limit: COMPOSER_PULL_REQUEST_RESULT_LIMIT,
           });
       return matches.map((pullRequest) => ({
-        id: `pull-request:${pullRequest.projectId}:${pullRequest.repository}:${pullRequest.number}`,
+        id: `pull-request:${pullRequest.projectId}:${threadPullRequestKeyOf(pullRequest)}`,
         type: "pull-request",
         pullRequest: {
           number: pullRequest.number,
diff --git a/apps/web/src/components/chat/useComposerResume.browser.test.tsx b/apps/web/src/components/chat/useComposerResume.browser.test.tsx
index 5aeeb5108df9..adcca8da91c4 100644
--- a/apps/web/src/components/chat/useComposerResume.browser.test.tsx
+++ b/apps/web/src/components/chat/useComposerResume.browser.test.tsx
@@ -52,6 +52,7 @@ function ResumeButton(props: {
     activeThread: { id: threadA } as never,
     resumableRunId: RunId.make("run:interrupted"),
     hasHeldQueuedRuns: false,
+    canResume: true,
     isSendBusy: false,
     isRevertingCheckpoint: false,
     threadDetailLoading: false,
diff --git a/apps/web/src/components/chat/useComposerResume.ts b/apps/web/src/components/chat/useComposerResume.ts
index 73e1fb6fca11..d525811e2fac 100644
--- a/apps/web/src/components/chat/useComposerResume.ts
+++ b/apps/web/src/components/chat/useComposerResume.ts
@@ -28,6 +28,7 @@ interface ComposerResumeInput {
   readonly activeThread: EnvironmentThreadShell | undefined;
   readonly resumableRunId: RunId | null;
   readonly hasHeldQueuedRuns: boolean;
+  readonly canResume: boolean;
   readonly isSendBusy: boolean;
   readonly isRevertingCheckpoint: boolean;
   readonly threadDetailLoading: boolean;
@@ -59,6 +60,7 @@ export function useComposerResume(input: ComposerResumeInput) {
     activeThread,
     resumableRunId,
     hasHeldQueuedRuns,
+    canResume,
     isSendBusy,
     isRevertingCheckpoint,
     threadDetailLoading,
@@ -86,7 +88,7 @@ export function useComposerResume(input: ComposerResumeInput) {
   const onResume = async () => {
     if (
       !activeThread ||
-      (resumableRunId === null && !hasHeldQueuedRuns) ||
+      !canResume ||
       isSendBusy ||
       isResuming ||
       isRevertingCheckpoint ||
diff --git a/apps/web/src/components/chat/useComposerSelection.browser.test.tsx b/apps/web/src/components/chat/useComposerSelection.browser.test.tsx
new file mode 100644
index 000000000000..d5fb9496b575
--- /dev/null
+++ b/apps/web/src/components/chat/useComposerSelection.browser.test.tsx
@@ -0,0 +1,177 @@
+import { scopeThreadRef } from "@t3tools/client-runtime/environment";
+import type { AtomCommandResult } from "@t3tools/client-runtime/state/runtime";
+import type { EnvironmentThreadShell } from "@t3tools/client-runtime/state/shell";
+import {
+  EnvironmentId,
+  ProviderDriverKind,
+  ProviderInstanceId,
+  ThreadId,
+  type ServerProvider,
+} from "@t3tools/contracts";
+import { DEFAULT_UNIFIED_SETTINGS } from "@t3tools/contracts/settings";
+import { createModelSelection } from "@t3tools/shared/model";
+import * as Cause from "effect/Cause";
+import { AsyncResult, Atom } from "effect/reactivity";
+import { expect, it, vi } from "vite-plus/test";
+import { page } from "vite-plus/test/browser";
+
+const mocks = vi.hoisted(() => ({
+  setModelSelection: null as ((value: unknown) => Promise<AtomCommandResult<void, unknown>>) | null,
+}));
+
+vi.mock(import("../../state/use-orchestration-command"), async (importOriginal) => ({
+  ...(await importOriginal()),
+  useOrchestrationCommand: (() => (value: unknown) => mocks.setModelSelection?.(value)) as never,
+}));
+
+vi.mock(import("../../state/threads"), async (original) => {
+  const actual = await original();
+  return {
+    ...actual,
+    environmentThreadShells: {
+      ...actual.environmentThreadShells,
+      threadShellAtom: ((ref: { threadId: string }) => shellAtom(ref.threadId)) as never,
+    },
+  };
+});
+
+import { render } from "../../../test/render";
+import { deriveEffectiveComposerModelState, useComposerDraftStore } from "../../composerDraftStore";
+import { AppAtomRegistryProvider, appAtomRegistry } from "../../rpc/atomRegistry";
+import { useComposerSelection } from "./useComposerSelection";
+
+// Kept alive so a shell set before the hook mounts is still there when it saves a pick.
+const shellAtom = Atom.family((_threadId: string) => Atom.make<unknown>(null).pipe(Atom.keepAlive));
+
+function setup() {
+  const setModelSelection = vi.fn<(value: unknown) => Promise<AtomCommandResult<void, unknown>>>();
+  mocks.setModelSelection = setModelSelection;
+  return { setModelSelection };
+}
+
+const environmentId = EnvironmentId.make("environment-local");
+const cursor = ProviderInstanceId.make("cursor");
+const stored = createModelSelection(cursor, "claude-opus-5-5", [{ id: "effort", value: "medium" }]);
+
+const providers: ReadonlyArray<ServerProvider> = [
+  {
+    instanceId: cursor,
+    driver: ProviderDriverKind.make("cursor"),
+    enabled: true,
+    installed: true,
+    version: null,
+    status: "ready",
+    auth: { status: "authenticated" },
+    checkedAt: "2026-01-01T00:00:00.000Z",
+    models: [{ slug: "auto-smart", name: "Auto", isCustom: false, capabilities: {} }],
+    slashCommands: [],
+    skills: [],
+  },
+];
+
+// The hook reads only the thread's identity and stored selection.
+function cursorThread(id: string) {
+  return { environmentId, id: ThreadId.make(id), modelSelection: stored } as EnvironmentThreadShell;
+}
+
+function Picker(props: {
+  thread: EnvironmentThreadShell;
+  runtime: Parameters<typeof useComposerSelection>[0]["activeRuntime"];
+  model?: string;
+}) {
+  const { onProviderModelSelectStable } = useComposerSelection({
+    environmentId,
+    composerDraftTarget: scopeThreadRef(environmentId, props.thread.id),
+    draftThread: null,
+    activeThread: props.thread,
+    activeRuntime: props.runtime,
+    activeProjectSettings: { settings: { newWorktreesStartFromOrigin: false } },
+    settings: DEFAULT_UNIFIED_SETTINGS,
+    providerStatuses: providers,
+    lockedProvider: null,
+    supportsProviderSwitchingViaHandoff: true,
+    multipleModelSelections: null,
+    runtimeMode: "full-access",
+    isLocalDraftThread: false,
+    canOverrideServerThreadEnvMode: false,
+    setPendingServerThreadEnvModeEntry: () => {},
+    setPendingServerThreadStartFromOriginByThreadId: () => {},
+    scheduleComposerFocus: () => {},
+  });
+  return (
+    <button
+      type="button"
+      onClick={() => onProviderModelSelectStable(cursor, props.model ?? stored.model)}
+    >
+      Pick the model
+    </button>
+  );
+}
+
+it("keeps a Cursor thread's stored model and options when the user re-picks its unavailable row", async () => {
+  setup();
+  const thread = cursorThread("thread-cursor");
+  await using _screen = await render(<Picker thread={thread} runtime={null} />);
+  await page.getByRole("button", { name: "Pick the model" }).click();
+
+  await vi.waitFor(() => {
+    const draft = useComposerDraftStore
+      .getState()
+      .getComposerDraft(scopeThreadRef(environmentId, thread.id));
+    expect(draft?.modelSelectionByProvider[cursor] ?? thread.modelSelection).toEqual(stored);
+  });
+});
+
+it("switches back to the thread's stored model while the session runs on another instance", async () => {
+  setup();
+  const thread = cursorThread("thread-cursor-handoff");
+  const runtime = { providerInstanceId: ProviderInstanceId.make("codex") } as Parameters<
+    typeof useComposerSelection
+  >[0]["activeRuntime"];
+  await using _screen = await render(<Picker thread={thread} runtime={runtime} />);
+  await page.getByRole("button", { name: "Pick the model" }).click();
+
+  await vi.waitFor(() => {
+    const draft = useComposerDraftStore
+      .getState()
+      .getComposerDraft(scopeThreadRef(environmentId, thread.id));
+    expect(draft?.activeProvider).toBe(cursor);
+    expect(
+      deriveEffectiveComposerModelState({
+        draft,
+        providers,
+        selectedProvider: ProviderDriverKind.make("cursor"),
+        selectedInstanceId: cursor,
+        threadModelSelection: thread.modelSelection,
+        projectModelSelection: null,
+        settings: DEFAULT_UNIFIED_SETTINGS,
+      }),
+    ).toEqual({ selectedModel: stored.model, modelOptions: { [cursor]: stored.options } });
+  });
+});
+
+it("saves a re-picked model again when its first save failed", async () => {
+  const { setModelSelection } = setup();
+  setModelSelection
+    .mockResolvedValueOnce(AsyncResult.failure(Cause.fail(new Error("offline"))))
+    .mockResolvedValue(AsyncResult.success(undefined));
+  const thread = cursorThread("thread-cursor-retry");
+  appAtomRegistry.set(shellAtom(thread.id), thread);
+  await using _screen = await render(
+    <AppAtomRegistryProvider>
+      <Picker thread={thread} runtime={null} model="auto-smart" />
+    </AppAtomRegistryProvider>,
+  );
+  const pick = page.getByRole("button", { name: "Pick the model" });
+  await pick.click();
+  await vi.waitFor(() => expect(setModelSelection).toHaveBeenCalledTimes(1));
+  await pick.click();
+
+  const autoSave = expect.objectContaining({
+    input: {
+      threadId: thread.id,
+      modelSelection: expect.objectContaining({ instanceId: cursor, model: "auto-smart" }),
+    },
+  });
+  await vi.waitFor(() => expect(setModelSelection.mock.calls).toEqual([[autoSave], [autoSave]]));
+});
diff --git a/apps/web/src/components/chat/useComposerSelection.ts b/apps/web/src/components/chat/useComposerSelection.ts
index 1563c8c56b68..c9bba2ae76bc 100644
--- a/apps/web/src/components/chat/useComposerSelection.ts
+++ b/apps/web/src/components/chat/useComposerSelection.ts
@@ -152,13 +152,30 @@ export function useComposerSelection(input: ComposerSelectionInput) {
         return;
       }
     }
+    // The picker lists an unavailable model only as the active selection, so re-picking keeps it.
     const resolvedModel = resolveAppModelSelectionForInstance(
       instanceId,
       settings,
       providerStatuses,
       model,
+      { preserveUnavailableSelection: true },
     );
-    if (!resolvedModel) {
+    const threadRef = scopeThreadRef(activeThread.environmentId, activeThread.id);
+    const draft = useComposerDraftStore.getState().getComposerDraft(threadRef);
+    const shownInstanceId =
+      draft?.activeProvider ??
+      activeRuntime?.providerInstanceId ??
+      activeThread.modelSelection.instanceId;
+    const shownSelection =
+      draft?.modelSelectionByProvider[shownInstanceId] ?? activeThread.modelSelection;
+    if (
+      !resolvedModel ||
+      (instanceId === shownInstanceId &&
+        shownSelection.instanceId === instanceId &&
+        shownSelection.model === resolvedModel)
+    ) {
+      // Re-picking the shown model keeps its options and saves it again if that save failed.
+      if (resolvedModel && !isLocalDraftThread) applyThreadModelPick(threadRef);
       if (options?.focusComposer !== false) scheduleComposerFocus();
       return;
     }
@@ -184,7 +201,6 @@ export function useComposerSelection(input: ComposerSelectionInput) {
       if (options?.focusComposer !== false) scheduleComposerFocus();
       return;
     }
-    const threadRef = scopeThreadRef(activeThread.environmentId, activeThread.id);
     setComposerDraftModelSelection(threadRef, nextModelSelection, {
       explicit: true,
       replaceOptions: true,
diff --git a/apps/web/src/components/chat/useComposerSend.ts b/apps/web/src/components/chat/useComposerSend.ts
index 648b2fd62bf0..7257dee5ced9 100644
--- a/apps/web/src/components/chat/useComposerSend.ts
+++ b/apps/web/src/components/chat/useComposerSend.ts
@@ -96,6 +96,7 @@ import { environmentServerConfigsAtom } from "../../state/server";
 import { threadEnvironment } from "../../state/threads";
 import { runMobileComposerTransition } from "./draftHeroTransition";
 import { useClientSettingsHydrated } from "../../hooks/useSettings";
+import { useStableCallback } from "../../hooks/useStableCallback";
 import { environmentPresentations } from "../../state/presentation";
 import {
   approvalRedirectNotice,
@@ -216,6 +217,7 @@ interface ComposerSendInput {
   readonly clearUsageLimitsFor: UsageLimitsPanel["clearFor"];
   readonly needsLoadBalancing: boolean;
   readonly loadBalancing: DraftEnvironmentRouting["loadBalancing"];
+  readonly refreshBeforeSend: DraftEnvironmentRouting["refreshBeforeSend"];
   readonly readPendingEnvironmentChange: DraftEnvironmentRouting["readPendingEnvironmentChange"];
   readonly pendingApprovals: PendingThreadRequests["pendingApprovals"];
   readonly respondingRequestIds: PendingThreadRequests["respondingRequestIds"];
@@ -311,6 +313,7 @@ export function useComposerSend(input: ComposerSendInput) {
     clearUsageLimitsFor,
     needsLoadBalancing,
     loadBalancing,
+    refreshBeforeSend,
     readPendingEnvironmentChange,
     pendingApprovals,
     respondingRequestIds,
@@ -1488,5 +1491,19 @@ export function useComposerSend(input: ComposerSendInput) {
     }
   };
 
-  return { onSend };
+  const onSendLatest = useStableCallback(onSend);
+  const onSendWithRouting = async (...args: Parameters<typeof onSend>) => {
+    args[0]?.preventDefault();
+    const refresh =
+      args[3] || sendInFlightRef.current || readPendingEnvironmentChange() !== null
+        ? null
+        : refreshBeforeSend();
+    if (refresh === null) return onSend(...args);
+    sendInFlightRef.current = true;
+    const ready = await refresh.finally(() => {
+      sendInFlightRef.current = false;
+    });
+    if (ready) return onSendLatest(...args);
+  };
+  return { onSend: onSendWithRouting };
 }
diff --git a/apps/web/src/components/chat/useDraftEnvironmentRouting.browser.test.tsx b/apps/web/src/components/chat/useDraftEnvironmentRouting.browser.test.tsx
new file mode 100644
index 000000000000..0dafee816711
--- /dev/null
+++ b/apps/web/src/components/chat/useDraftEnvironmentRouting.browser.test.tsx
@@ -0,0 +1,227 @@
+import { PrimaryConnectionTarget } from "@t3tools/client-runtime/connection";
+import * as Option from "effect/Option";
+import type { EnvironmentPresentation } from "../../state/environments";
+import type { ServerProvider } from "@t3tools/contracts";
+import {
+  scopedThreadKey,
+  scopeProjectRef,
+  scopeThreadRef,
+} from "@t3tools/client-runtime/environment";
+import { createModelSelection } from "@t3tools/shared/model";
+import { DEFAULT_UNIFIED_SETTINGS } from "@t3tools/contracts/settings";
+import {
+  EnvironmentId,
+  ProjectId,
+  ProviderDriverKind,
+  ProviderInstanceId,
+} from "@t3tools/contracts";
+import { expect, it, vi } from "vite-plus/test";
+
+import { act, render } from "../../../test/render";
+import { DraftId, useComposerDraftStore } from "../../composerDraftStore";
+import { useDraftEnvironmentRouting } from "./useDraftEnvironmentRouting";
+import { appAtomRegistry } from "../../rpc/atomRegistry";
+import { draftFanoutSelectionsAtom } from "./chatViewSend";
+
+const resources = vi.hoisted(() => ({
+  refreshSelection: vi.fn<(ids: readonly EnvironmentId[]) => Promise<EnvironmentId | null>>(),
+}));
+vi.mock("../../hooks/useLoadBalancedEnvironment", () => ({
+  useLoadBalancedEnvironment: () => ({
+    pending: false,
+    failed: false,
+    environmentId: null,
+    refresh: () => {},
+    refreshSelection: resources.refreshSelection,
+  }),
+}));
+vi.mock("../../state/entities", () => ({ useProjects: () => [] }));
+vi.mock("../../hooks/useScratchProject", () => ({ useScratchProject: () => ({}) }));
+
+function setup() {
+  resources.refreshSelection.mockReset();
+  const a = EnvironmentId.make("machine-a");
+  const b = EnvironmentId.make("machine-b");
+  const draftId = DraftId.make("fresh-routing-draft");
+  const projectId = ProjectId.make("project");
+  const store = useComposerDraftStore.getState();
+  store.clearDraftThread(draftId);
+  store.setProjectDraftThreadId(scopeProjectRef(a, projectId), draftId, {
+    environmentSelection: "auto",
+    loadBalancedEnvironmentId: a,
+  });
+  store.setPrompt(draftId, "Keep this prompt");
+  const provider: ServerProvider = {
+    instanceId: ProviderInstanceId.make("codex"),
+    driver: ProviderDriverKind.make("codex"),
+    enabled: true,
+    installed: true,
+    status: "ready",
+    auth: { status: "authenticated" },
+    availability: "available",
+    version: null,
+    checkedAt: "2026-11-10T01:00:00.000Z",
+    models: [],
+    slashCommands: [],
+    skills: [],
+  };
+  const input: Parameters<typeof useDraftEnvironmentRouting>[0] = {
+    draftId,
+    draftThread: store.getDraftSession(draftId),
+    envLocked: false,
+    automaticEnvironment: true,
+    logicalProjectEnvironments: [a, b].map((environmentId) => ({
+      environmentId,
+      projectId,
+      label: environmentId,
+      isPrimary: environmentId === a,
+      machine: "desktop",
+    })),
+    environmentById: new Map(
+      [a, b].map((id): [EnvironmentId, EnvironmentPresentation] => [
+        id,
+        {
+          environmentId: id,
+          label: id,
+          displayUrl: null,
+          relayManaged: false,
+          entry: {
+            target: new PrimaryConnectionTarget({
+              environmentId: id,
+              label: id,
+              httpBaseUrl: "http://localhost:3000",
+              wsBaseUrl: "ws://localhost:3000",
+            }),
+            profile: Option.none(),
+            enabled: true,
+          },
+          connection: { phase: "connected", error: null, traceId: null },
+          serverConfig: null,
+        },
+      ]),
+    ),
+    providersByEnvironment: new Map([a, b].map((id) => [id, [provider]])),
+    loadBalancingSettings: { loadBalancingWeights: {} },
+    referencedThreadContexts: [],
+    activeProviderInstanceId: provider.instanceId,
+    selectedProvider: provider.driver,
+    composerHasAttachments: false,
+    activeProjectKey: "project",
+    activeProjectIsScratch: false,
+    projectGroupingSettings: DEFAULT_UNIFIED_SETTINGS,
+    sendInFlightRef: { current: false },
+  };
+  resources.refreshSelection.mockImplementation(async (ids) => (ids.includes(b) ? b : null));
+  return { a, b, draftId, input, store };
+}
+
+function Harness({
+  input,
+  onPrepared,
+}: {
+  input: Parameters<typeof useDraftEnvironmentRouting>[0];
+  onPrepared?: (ready: boolean | null) => void;
+}) {
+  const routing = useDraftEnvironmentRouting(input);
+  const draft = useComposerDraftStore((state) => state.getDraftSession(input.draftId!));
+  return (
+    <>
+      <span>{draft?.environmentId}</span>
+      <button
+        onClick={async () => {
+          const ready = await routing.refreshBeforeSend();
+          onPrepared?.(ready);
+        }}
+      >
+        Send
+      </button>
+    </>
+  );
+}
+
+it("refreshes a stored automatic choice before sending an unsent draft", async () => {
+  const { a, b, draftId, input, store } = setup();
+  const selections = ["model-a", "model-b"].map((model) =>
+    createModelSelection(ProviderInstanceId.make("codex"), model),
+  );
+  const threadId = input.draftThread!.threadId;
+  const destinationSelections = draftFanoutSelectionsAtom(
+    scopedThreadKey(scopeThreadRef(b, threadId)),
+  );
+  appAtomRegistry.set(destinationSelections, null);
+  appAtomRegistry.set(
+    draftFanoutSelectionsAtom(scopedThreadKey(scopeThreadRef(a, threadId))),
+    selections,
+  );
+  store.setDraftThreadContext(draftId, {
+    branch: "main",
+    envMode: "worktree",
+    environmentSelection: "auto",
+  });
+  await using screen = await render(
+    <Harness input={{ ...input, draftThread: store.getDraftSession(draftId) }} />,
+  );
+  await expect.element(screen.getByText(a)).toBeInTheDocument();
+  await screen.getByRole("button", { name: "Send" }).click();
+  await expect.element(screen.getByText(b)).toBeInTheDocument();
+  expect(resources.refreshSelection).toHaveBeenCalledWith([a, b]);
+  expect(store.getDraftSession(draftId)).toMatchObject({
+    loadBalancedEnvironmentId: b,
+    branch: "main",
+    envMode: "worktree",
+  });
+  expect(store.getComposerDraft(draftId)?.prompt).toBe("Keep this prompt");
+  expect(appAtomRegistry.get(destinationSelections)).toEqual(selections);
+});
+
+it.each(["manual", "attachments", "promoted"] as const)(
+  "keeps the machine for %s drafts",
+  async (kind) => {
+    const { a, draftId, input, store } = setup();
+    if (kind === "manual") store.setDraftThreadContext(draftId, { environmentSelection: "manual" });
+    const guardedInput = {
+      ...input,
+      automaticEnvironment: kind !== "manual",
+      composerHasAttachments: kind === "attachments",
+      draftThread:
+        kind === "promoted"
+          ? {
+              ...input.draftThread!,
+              promotedTo: { environmentId: a, threadId: input.draftThread!.threadId },
+            }
+          : input.draftThread,
+    };
+    await using screen = await render(<Harness input={guardedInput} />);
+    await screen.getByRole("button", { name: "Send" }).click();
+    expect(resources.refreshSelection).not.toHaveBeenCalled();
+    expect(store.getDraftSession(draftId)?.environmentId).toBe(a);
+  },
+);
+
+it("does not reuse a stored choice when refreshed resources have no winner", async () => {
+  const { a, input } = setup();
+  resources.refreshSelection.mockResolvedValue(null);
+  const onPrepared = vi.fn();
+  await using screen = await render(<Harness input={input} onPrepared={onPrepared} />);
+  await screen.getByRole("button", { name: "Send" }).click();
+  await expect.element(screen.getByText(a)).toBeInTheDocument();
+  await vi.waitFor(() => expect(onPrepared).toHaveBeenCalledWith(false));
+});
+
+it("abandons a refresh when the draft changes while resources are in flight", async () => {
+  const { a, b, draftId, input, store } = setup();
+  let resolve!: (environmentId: EnvironmentId) => void;
+  resources.refreshSelection.mockReturnValue(
+    new Promise<EnvironmentId>((done) => {
+      resolve = done;
+    }),
+  );
+  await using screen = await render(<Harness input={input} />);
+  await screen.getByRole("button", { name: "Send" }).click();
+  await act(async () => {
+    store.setPrompt(draftId, "Edited while checking");
+    resolve(b);
+  });
+  await expect.element(screen.getByText(a)).toBeInTheDocument();
+  expect(store.getComposerDraft(draftId)?.prompt).toBe("Edited while checking");
+});
diff --git a/apps/web/src/components/chat/useDraftEnvironmentRouting.ts b/apps/web/src/components/chat/useDraftEnvironmentRouting.ts
index 1e991899a553..3f67e8c9c798 100644
--- a/apps/web/src/components/chat/useDraftEnvironmentRouting.ts
+++ b/apps/web/src/components/chat/useDraftEnvironmentRouting.ts
@@ -9,17 +9,33 @@ import {
   resolveProjectProviderInstanceEnabled,
   type ThreadContextRecord,
 } from "@t3tools/contracts";
-import { scopeProjectRef } from "@t3tools/client-runtime/environment";
+import {
+  scopedThreadKey,
+  scopeProjectRef,
+  scopeThreadRef,
+} from "@t3tools/client-runtime/environment";
+import {
+  isAtomCommandInterrupted,
+  squashAtomCommandFailure,
+} from "@t3tools/client-runtime/state/runtime";
+import { isTriagePrompt, replaceTriagePlaybookLink } from "@t3tools/shared/triagePrompt";
 import { useEffect, useLayoutEffect, useRef, useState } from "react";
-import { toastManager } from "../ui/toast";
+import { flushSync } from "react-dom";
+import { stackedThreadToast, toastManager } from "../ui/toast";
 import {
   deriveLogicalProjectKeyFromSettings,
   selectProjectGroupingSettings,
 } from "@t3tools/client-runtime/state/project-grouping";
 import { useComposerDraftStore, DraftId } from "../../composerDraftStore";
 import { type EnvironmentPresentation, useEnvironmentProviders } from "../../state/environments";
+import { currentClientMetadata } from "../../connection/platform";
 import { useProjects } from "../../state/entities";
+import { serverEnvironment } from "../../state/server";
+import { useAtomCommand } from "../../state/use-atom-command";
 import type { DraftSessionState } from "../../composerDraftStore";
+import { loadBalancingSendWarning } from "./composerSend.logic";
+import { appAtomRegistry } from "../../rpc/atomRegistry";
+import { draftFanoutSelectionsAtom } from "./chatViewSend";
 
 interface DraftEnvironmentRoutingInput {
   readonly draftId: DraftId | null;
@@ -45,7 +61,8 @@ interface DraftEnvironmentRoutingInput {
 /**
  * Which machine an unsent draft runs on: automatic load balancing across the
  * project's machines, or a manual switch, which may first open a scratch
- * project on the target machine.
+ * project on the target machine. A triage draft takes its session along: the
+ * target machine prepares one, and the playbook link follows.
  */
 export function useDraftEnvironmentRouting(input: DraftEnvironmentRoutingInput) {
   const {
@@ -68,13 +85,16 @@ export function useDraftEnvironmentRouting(input: DraftEnvironmentRoutingInput)
   } = input;
   const setDraftThreadContext = useComposerDraftStore((store) => store.setDraftThreadContext);
   const getDraftSession = useComposerDraftStore((store) => store.getDraftSession);
+  const getComposerDraft = useComposerDraftStore((store) => store.getComposerDraft);
+  const setPrompt = useComposerDraftStore((store) => store.setPrompt);
+  const prepareTriage = useAtomCommand(serverEnvironment.prepareTriage, { reportFailure: false });
   const setLogicalProjectDraftThreadId = useComposerDraftStore(
     (store) => store.setLogicalProjectDraftThreadId,
   );
   const allProjects = useProjects();
   const { openScratchProject } = useScratchProject();
   const needsLoadBalancing = automaticEnvironment && !draftThread?.loadBalancedEnvironmentId;
-  const loadBalancingCandidates = needsLoadBalancing
+  const loadBalancingCandidates = automaticEnvironment
     ? logicalProjectEnvironments
         .filter((candidate) => {
           const environment = environmentById.get(candidate.environmentId);
@@ -108,9 +128,76 @@ export function useDraftEnvironmentRouting(input: DraftEnvironmentRoutingInput)
         .map((candidate) => candidate.environmentId)
     : [];
   const loadBalancing = useLoadBalancedEnvironment(
-    loadBalancingCandidates,
+    needsLoadBalancing ? loadBalancingCandidates : [],
     loadBalancingSettings.loadBalancingWeights,
   );
+  const readRouting = useStableCallback(() => ({ input, loadBalancingCandidates }));
+  const refreshBeforeSend = () => {
+    if (
+      !automaticEnvironment ||
+      !draftId ||
+      !draftThread?.loadBalancedEnvironmentId ||
+      draftThread.promotedTo ||
+      composerHasAttachments
+    )
+      return null;
+    const originalDraft = getDraftSession(draftId);
+    const composerDraft = useComposerDraftStore.getState().getComposerDraft(draftId);
+    return loadBalancing.refreshSelection(loadBalancingCandidates).then((environmentId) => {
+      const current = readRouting();
+      if (
+        current.input.draftId !== draftId ||
+        !current.input.automaticEnvironment ||
+        current.input.composerHasAttachments ||
+        current.input.activeProjectKey !== activeProjectKey ||
+        current.input.selectedProvider !== selectedProvider ||
+        current.input.activeProviderInstanceId !== activeProviderInstanceId ||
+        current.input.loadBalancingSettings.loadBalancingWeights !==
+          loadBalancingSettings.loadBalancingWeights ||
+        current.loadBalancingCandidates.join("\n") !== loadBalancingCandidates.join("\n") ||
+        getDraftSession(draftId) !== originalDraft ||
+        useComposerDraftStore.getState().getComposerDraft(draftId) !== composerDraft
+      )
+        return false;
+      const target = current.input.logicalProjectEnvironments.find(
+        (candidate) => candidate.environmentId === environmentId,
+      );
+      if (!target?.projectId) {
+        toastManager.add({
+          type: "warning",
+          ...loadBalancingSendWarning({
+            pending: false,
+            threadContexts: referencedThreadContexts,
+            candidateEnvironmentIds: loadBalancingCandidates,
+          }),
+        });
+        return false;
+      }
+      const projectRef = scopeProjectRef(target.environmentId, target.projectId);
+      if (originalDraft && target.environmentId !== originalDraft.environmentId) {
+        appAtomRegistry.set(
+          draftFanoutSelectionsAtom(
+            scopedThreadKey(scopeThreadRef(target.environmentId, originalDraft.threadId)),
+          ),
+          appAtomRegistry.get(
+            draftFanoutSelectionsAtom(
+              scopedThreadKey(scopeThreadRef(originalDraft.environmentId, originalDraft.threadId)),
+            ),
+          ),
+        );
+      }
+      // The send must read the target project's composer and provider context after retargeting.
+      flushSync(() =>
+        setDraftThreadContext(draftId, {
+          projectRef,
+          environmentSelection: "auto",
+          loadBalancedEnvironmentId: target.environmentId,
+          branch: originalDraft?.branch ?? null,
+        }),
+      );
+      return true;
+    });
+  };
   // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- writes the resolved load-balanced environment into the draft store once the async pick settles
   useEffect(() => {
     if (!needsLoadBalancing || loadBalancing.pending || !draftId || sendInFlightRef.current) return;
@@ -133,7 +220,7 @@ export function useDraftEnvironmentRouting(input: DraftEnvironmentRoutingInput)
     setDraftThreadContext,
   ]);
   const onAutoEnvironment = () => {
-    if (envLocked || !draftId) return;
+    if (envLocked || !draftId || sendInFlightRef.current) return;
     if (composerHasAttachments) {
       toastManager.add({
         type: "warning",
@@ -209,7 +296,8 @@ export function useDraftEnvironmentRouting(input: DraftEnvironmentRoutingInput)
     const request = { environmentId: target.environmentId, scope: environmentChangeScope };
     environmentChangeRef.current = request;
     setBusyEnvironmentChange(null);
-    const retarget = (project: (typeof allProjects)[number]) => {
+    // `triagePrompt` is the prompt the target machine prepared for a triage draft.
+    const retarget = (project: (typeof allProjects)[number], triagePrompt?: string) => {
       const currentDraft = getDraftSession(draftId);
       if (
         environmentChangeRef.current !== request ||
@@ -221,6 +309,12 @@ export function useDraftEnvironmentRouting(input: DraftEnvironmentRoutingInput)
         currentDraft.projectId !== originalDraft.projectId
       )
         return;
+      if (triagePrompt !== undefined) {
+        // Read now, so text typed while the machine prepared the session is kept.
+        const prompt = getComposerDraft(draftId)?.prompt ?? "";
+        const nextPrompt = replaceTriagePlaybookLink(prompt, triagePrompt);
+        if (nextPrompt !== prompt) setPrompt(draftId, nextPrompt);
+      }
       const projectRef = scopeProjectRef(target.environmentId, project.id);
       if (activeProjectIsScratch) {
         setLogicalProjectDraftThreadId(
@@ -241,27 +335,52 @@ export function useDraftEnvironmentRouting(input: DraftEnvironmentRoutingInput)
       if (environmentChangeRef.current === request) environmentChangeRef.current = null;
       setBusyEnvironmentChange((busy) => (busy === request ? null : busy));
     };
-    if (target.projectId !== null) {
-      const project = allProjects.find(
-        (project) =>
-          project.environmentId === target.environmentId && project.id === target.projectId,
-      );
-      if (project) retarget(project);
+    const knownProject = allProjects.find(
+      (project) =>
+        project.environmentId === target.environmentId && project.id === target.projectId,
+    );
+    // The playbook and context files exist only on the machine that prepared them.
+    const followsTriage = isTriagePrompt(getComposerDraft(draftId)?.prompt ?? "");
+    if (target.projectId !== null && !(knownProject && followsTriage)) {
+      if (knownProject) retarget(knownProject);
       finish();
       return;
     }
+    const prepareTriagePrompt = async () => {
+      const prepared = await prepareTriage({
+        environmentId: target.environmentId,
+        input: { client: currentClientMetadata() },
+      });
+      if (prepared._tag === "Success") return prepared.value.prompt;
+      if (!isAtomCommandInterrupted(prepared)) {
+        const error = squashAtomCommandFailure(prepared);
+        toastManager.add(
+          stackedThreadToast({
+            type: "error",
+            title: "Could not switch machine",
+            description: error instanceof Error ? error.message : "An error occurred.",
+          }),
+        );
+      }
+      return null;
+    };
+    const switchMachine = async () => {
+      const triagePrompt = followsTriage ? await prepareTriagePrompt() : undefined;
+      if (triagePrompt === null) return;
+      const project =
+        knownProject ??
+        (await openScratchProject(target.environmentId, "Could not switch machine"));
+      if (project) retarget(project, triagePrompt);
+    };
     setBusyEnvironmentChange(request);
-    void openScratchProject(target.environmentId, "Could not switch machine")
-      .then((project) => {
-        if (project) retarget(project);
-      })
-      .finally(finish);
+    void switchMachine().finally(finish);
   };
   const onEnvironmentChangeStable = useStableCallback(onEnvironmentChange);
 
   return {
     needsLoadBalancing,
     loadBalancing,
+    refreshBeforeSend,
     onAutoEnvironmentStable,
     autoEnvironmentLabel,
     isEnvironmentChanging,
diff --git a/apps/web/src/components/chat/useFocusComposerOnThreadOpen.browser.test.tsx b/apps/web/src/components/chat/useFocusComposerOnThreadOpen.browser.test.tsx
index 864f4c707949..8324e96133e7 100644
--- a/apps/web/src/components/chat/useFocusComposerOnThreadOpen.browser.test.tsx
+++ b/apps/web/src/components/chat/useFocusComposerOnThreadOpen.browser.test.tsx
@@ -1,4 +1,6 @@
-import { useRef } from "react";
+import { scopeThreadRef } from "@t3tools/client-runtime/environment";
+import { EnvironmentId, ThreadId } from "@t3tools/contracts";
+import { useRef, useState } from "react";
 import { expect, it, vi } from "vite-plus/test";
 
 import { act, fakeTimers, render } from "../../../test/render";
@@ -6,14 +8,21 @@ import { useFocusComposerOnThreadOpen } from "./useFocusComposerOnThreadOpen";
 
 function ThreadProbe(props: { threadId: string }) {
   const composerRef = useRef<HTMLTextAreaElement>(null);
-  useFocusComposerOnThreadOpen(props.threadId, true, () => composerRef.current?.focus());
+  const [root, setRoot] = useState<HTMLDivElement | null>(null);
+  useFocusComposerOnThreadOpen(
+    scopeThreadRef(EnvironmentId.make("rename"), ThreadId.make(props.threadId)),
+    root,
+    true,
+    false,
+    () => composerRef.current?.focus(),
+  );
   return (
-    <>
+    <div ref={setRoot}>
       <div data-sidebar-row="thread:beta">
         <input aria-label="Thread title" />
       </div>
       <textarea aria-label="Message" ref={composerRef} />
-    </>
+    </div>
   );
 }
 
diff --git a/apps/web/src/components/chat/useFocusComposerOnThreadOpen.ts b/apps/web/src/components/chat/useFocusComposerOnThreadOpen.ts
index 436a9dcaf612..3cb35fbdff5f 100644
--- a/apps/web/src/components/chat/useFocusComposerOnThreadOpen.ts
+++ b/apps/web/src/components/chat/useFocusComposerOnThreadOpen.ts
@@ -1,21 +1,40 @@
+import type { ScopedThreadRef } from "@t3tools/contracts";
 import { useEffect } from "react";
 
-/** Lands the caret in the composer a frame after a thread opens. */
+import { restoreFocusOnThreadEnter } from "../../lib/terminalFocus";
+
+/** Restores thread focus, landing the caret a frame after composer entry. */
 export function useFocusComposerOnThreadOpen(
-  threadId: string | undefined,
+  threadRef: ScopedThreadRef | null,
+  root: HTMLElement | null,
   enabled: boolean,
+  terminalOpen: boolean,
   focusComposer: () => void,
 ) {
-  // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- schedules a frame to focus the composer DOM element when a thread opens with the terminal closed
+  // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- restores DOM focus on thread entry and after the drawer opens or closes
   useEffect(() => {
-    if (!threadId || !enabled) return;
-    const frame = window.requestAnimationFrame(() => {
-      // Double-clicking a sidebar row opens its thread and its rename field in one gesture.
-      if (document.activeElement?.matches("[data-sidebar-row] input")) return;
-      focusComposer();
+    if (!threadRef || !enabled || !root) return;
+    let frame: number | undefined;
+    const leave = restoreFocusOnThreadEnter(threadRef, {
+      root,
+      focusComposer: () => {
+        frame = window.requestAnimationFrame(() => {
+          // Double-clicking a sidebar row opens its thread and its rename field in one gesture.
+          if (document.activeElement?.matches("[data-sidebar-row] input")) return;
+          focusComposer();
+        });
+      },
     });
     return () => {
-      window.cancelAnimationFrame(frame);
+      leave();
+      if (frame !== undefined) window.cancelAnimationFrame(frame);
     };
-  }, [threadId, enabled, focusComposer]);
+  }, [
+    threadRef,
+    root,
+    enabled,
+    // oxlint-disable-next-line react/exhaustive-effect-dependencies -- Drawer visibility changes also restore focus after explicit open/close actions.
+    terminalOpen,
+    focusComposer,
+  ]);
 }
diff --git a/apps/web/src/components/chat/usePendingThreadRequests.ts b/apps/web/src/components/chat/usePendingThreadRequests.ts
index fb73403fdd78..da8d5bf7d32f 100644
--- a/apps/web/src/components/chat/usePendingThreadRequests.ts
+++ b/apps/web/src/components/chat/usePendingThreadRequests.ts
@@ -31,6 +31,7 @@ import {
 } from "@t3tools/client-runtime/state/pending-user-input";
 import {
   carryDisplacedCustomAnswerIntoPrompt,
+  withdrawDisplacedCustomAnswerFromPrompt,
   derivePendingUserInputProgress,
   projectPendingUserInputAnswer,
   threadContextsReferencedByAnswer,
@@ -63,6 +64,7 @@ function makePendingCustomAnswerSetter(input: {
   readonly activePendingUserInput: PendingUserInput | null;
   readonly activePendingRequestKey: string;
   readonly writePrompt: (prompt: string) => void;
+  readonly withdrawRestoredAnswer: (questionId: string, value: string) => void;
   readonly setPendingUserInputAnswersByRequestId: (
     update: SetStateAction<Record<string, Record<string, PendingUserInputDraftAnswer>>>,
   ) => void;
@@ -77,6 +79,7 @@ function makePendingCustomAnswerSetter(input: {
       return;
     }
     input.writePrompt(value);
+    input.withdrawRestoredAnswer(questionId, value);
     input.setPendingUserInputAnswersByRequestId((existing) => ({
       ...existing,
       [activePendingRequestKey]: {
@@ -124,6 +127,15 @@ export function usePendingThreadRequests(input: {
     reportFailure: false,
   });
   const userInputResponsesInFlight = useRef(new Set<string>());
+  // In the order the text went into the thread draft, which is how a copy is found again.
+  const displacedAnswers = useRef<
+    Array<{ readonly draft: string; readonly key: string; readonly text: string }>
+  >([]);
+  // This hook outlives a thread switch, and each thread has its own draft.
+  const displacedDraftKey =
+    typeof composerDraftTarget === "string"
+      ? composerDraftTarget
+      : `${composerDraftTarget.environmentId}:${composerDraftTarget.threadId}`;
   const [respondingRequestIds, setRespondingRequestIds] = useState<RuntimeRequestId[]>([]);
   const [respondingUserInputRequestIds, setRespondingUserInputRequestIds] = useState<
     RuntimeRequestId[]
@@ -389,6 +401,11 @@ export function usePendingThreadRequests(input: {
     const nextPrompt = carryDisplacedCustomAnswerIntoPrompt(currentPrompt, displacedAnswer);
     if (nextPrompt !== currentPrompt) {
       setComposerDraftPrompt(composerDraftTarget, nextPrompt);
+      displacedAnswers.current.push({
+        draft: displacedDraftKey,
+        key: `${activePendingRequestKey}:${questionId}`,
+        text: displacedAnswer ?? "",
+      });
       toastManager.add({
         type: "info",
         title: "Your typed text was set aside",
@@ -444,10 +461,37 @@ export function usePendingThreadRequests(input: {
   const writePrompt = useStableCallback((prompt: string) => {
     promptRef.current = prompt;
   });
+  // Undo can put set-aside text back into the answer; left in the draft too, it is sent twice.
+  const withdrawRestoredAnswer = useStableCallback((questionId: string, value: string) => {
+    const key = `${activePendingRequestKey}:${questionId}`;
+    const entries = displacedAnswers.current;
+    const index = entries.findLastIndex(
+      (entry) =>
+        entry.draft === displacedDraftKey &&
+        entry.key === key &&
+        entry.text.trim() === value.trim(),
+    );
+    const displaced = entries[index];
+    if (displaced === undefined) return;
+    const later = entries
+      .slice(index + 1)
+      .filter((entry) => entry.draft === displaced.draft)
+      .map((entry) => entry.text);
+    displacedAnswers.current = entries.filter((entry) => entry !== displaced);
+    const currentPrompt =
+      useComposerDraftStore.getState().getComposerDraft(composerDraftTarget)?.prompt ?? "";
+    const nextPrompt = withdrawDisplacedCustomAnswerFromPrompt(
+      currentPrompt,
+      displaced.text,
+      later,
+    );
+    if (nextPrompt !== currentPrompt) setComposerDraftPrompt(composerDraftTarget, nextPrompt);
+  });
   const onChangeActivePendingUserInputCustomAnswer = makePendingCustomAnswerSetter({
     activePendingUserInput,
     activePendingRequestKey,
     writePrompt,
+    withdrawRestoredAnswer,
     setPendingUserInputAnswersByRequestId,
   });
 
diff --git a/apps/web/src/components/chat/useQueuedRunEdit.browser.test.tsx b/apps/web/src/components/chat/useQueuedRunEdit.browser.test.tsx
index 0320dd6d6bb1..3118cd3ec710 100644
--- a/apps/web/src/components/chat/useQueuedRunEdit.browser.test.tsx
+++ b/apps/web/src/components/chat/useQueuedRunEdit.browser.test.tsx
@@ -18,6 +18,7 @@ import { toastManager } from "../ui/toast";
 import { act, render } from "../../../test/render";
 import { useComposerDraftStore, useComposerThreadDraft } from "../../composerDraftStore";
 import { formatInlineContextReference } from "../../lib/composerContextReferences";
+import { INLINE_TERMINAL_CONTEXT_PLACEHOLDER } from "../../lib/terminalContext";
 import {
   environmentContextRecord,
   environmentContextReference,
@@ -327,6 +328,32 @@ describe("useQueuedRunEdit", () => {
     );
   });
 
+  it("adds terminal context to the queued message being edited", async () => {
+    const { hook } = setup();
+    await using _screen = await render(view(THREAD_A, "queued", hook));
+    await beginChangedEdit(hook);
+    const target = requireHook(hook).draftTarget;
+    const inserted = useComposerDraftStore.getState().insertTerminalContext(
+      target,
+      `changed${INLINE_TERMINAL_CONTEXT_PLACEHOLDER}`,
+      {
+        id: "terminal-context-1",
+        threadId: THREAD_A.threadId,
+        createdAt: "2026-01-01T00:00:00.000Z",
+        terminalId: "default",
+        terminalLabel: "Terminal 1",
+        lineStart: 3,
+        lineEnd: 3,
+        text: "hello",
+      },
+      0,
+    );
+    expect(inserted).toBe(true);
+    expect(
+      useComposerDraftStore.getState().getComposerDraft(target)?.terminalContexts,
+    ).toHaveLength(1);
+  });
+
   it("keeps an open edit when the user leaves the thread and comes back", async () => {
     const { hook } = setup();
     await using screen = await render(view(THREAD_A, "queued", hook));
diff --git a/apps/web/src/components/chat/useQueuedRunEdit.ts b/apps/web/src/components/chat/useQueuedRunEdit.ts
index e5e5c11dff75..0ed3f9228940 100644
--- a/apps/web/src/components/chat/useQueuedRunEdit.ts
+++ b/apps/web/src/components/chat/useQueuedRunEdit.ts
@@ -28,7 +28,7 @@ import { Atom } from "effect/reactivity";
 import type { RefObject } from "react";
 import { useAssetUrls } from "../../assets/assetUrls";
 import {
-  DraftId,
+  queuedRunEditDraftId,
   useComposerDraftStore,
   type ComposerFileAttachment,
   type ComposerImageAttachment,
@@ -95,10 +95,6 @@ interface QueuedRunEditContent {
 const isDraftOwnedRecord = (record: ComposerContextRecord) =>
   record.kind === "thread" || record.kind === "environment";
 
-function queuedEditDraftTarget(routeThreadRef: ScopedThreadRef, runId: RunId) {
-  return DraftId.make(`queued-edit:${scopedThreadKey(routeThreadRef)}:${runId}`);
-}
-
 async function submitQueuedRunEdit(input: {
   readonly environmentId: EnvironmentId;
   readonly draftTarget: ComposerThreadTarget;
@@ -216,7 +212,7 @@ export function useQueuedRunEdit(input: {
   const editing = activeThreadId === null ? null : storedEdit;
   const isSaving = useAtomValue(queuedRunEdits.savingAtom)[editKey] === true;
   const draftTarget =
-    editing === null ? threadDraftTarget : queuedEditDraftTarget(routeThreadRef, editing.runId);
+    editing === null ? threadDraftTarget : queuedRunEditDraftId(routeThreadRef, editing.runId);
 
   const imageResources = (editing?.existingAttachments ?? [])
     .filter((attachment) => attachment.type === "image")
@@ -239,12 +235,12 @@ export function useQueuedRunEdit(input: {
   const clearEditDraft = (runId: RunId) =>
     useComposerDraftStore
       .getState()
-      .clearComposerContent(queuedEditDraftTarget(routeThreadRef, runId));
+      .clearComposerContent(queuedRunEditDraftId(routeThreadRef, runId));
 
   const beginEdit = useStableCallback((request: EditQueuedRunRequest) => {
     if (activeThreadId === null) return;
     if (editing !== null && editing.runId !== request.runId) clearEditDraft(editing.runId);
-    const target = queuedEditDraftTarget(routeThreadRef, request.runId);
+    const target = queuedRunEditDraftId(routeThreadRef, request.runId);
     const sentText = stripAttachmentOnlyBootstrapPrompt(request.text);
     const context = serverProjection?.messages.find(
       (message) => message.id === request.messageId,
@@ -294,7 +290,7 @@ export function useQueuedRunEdit(input: {
         // unscoped and names the thread: the user may be anywhere by now.
         onRunLeftQueue: (_, edit) => {
           const recovery = recoverQueuedMessageEdit({
-            editTarget: queuedEditDraftTarget(routeThreadRef, edit.runId),
+            editTarget: queuedRunEditDraftId(routeThreadRef, edit.runId),
             threadTarget: threadDraftTarget,
             originalText: edit.originalText,
             removedExistingAttachment: edit.removedExistingAttachment === true,
diff --git a/apps/web/src/components/chat/useThreadLifecycle.tsx b/apps/web/src/components/chat/useThreadLifecycle.tsx
index c0b9baec3111..66b2a9f6b3fd 100644
--- a/apps/web/src/components/chat/useThreadLifecycle.tsx
+++ b/apps/web/src/components/chat/useThreadLifecycle.tsx
@@ -49,6 +49,7 @@ import { useUiStateStore } from "../../uiStateStore";
 import { type ChatMessage, DEFAULT_INTERACTION_MODE } from "../../types";
 import { AlarmClockIcon, CheckCircle2Icon } from "lucide-react";
 import { stackedThreadToast, toastManager } from "../ui/toast";
+import { titleRegenerationToast } from "../threadTitleRegenerationToast";
 import { newMessageId } from "~/lib/utils";
 import { buildThreadRouteParams } from "../../threadRoutes";
 import { composerDraftHasUserContent, useComposerDraftStore } from "../../composerDraftStore";
@@ -186,6 +187,9 @@ export function useThreadLifecycle(input: ThreadLifecycleInput) {
   const updateThreadMetadata = useOrchestrationCommand(threadEnvironment.updateMetadata, {
     reportFailure: false,
   });
+  const regenerateThreadTitle = useOrchestrationCommand(threadEnvironment.regenerateTitle, {
+    reportFailure: false,
+  });
   const startThreadTurn = useOrchestrationCommand(threadEnvironment.startTurn, {
     reportFailure: false,
   });
@@ -688,10 +692,13 @@ export function useThreadLifecycle(input: ThreadLifecycleInput) {
       if (!readEnvironmentScope(environmentId, AuthOrchestrationOperateScope)) return false;
       if (!activeThreadShell || !activeThreadRef || !serverConfigLoaded) return;
       if (activeThreadShell.titleRegeneration != null) return;
-      void updateThreadMetadata({
+      void regenerateThreadTitle({
         environmentId: activeThreadRef.environmentId,
-        input: { threadId: activeThreadRef.threadId, regenerateTitle: true },
-      }).then(toastThreadActionFailure("Failed to regenerate thread title"));
+        input: { threadId: activeThreadRef.threadId },
+      }).then((result) => {
+        const toast = titleRegenerationToast([result]);
+        if (toast) toastManager.add(toast);
+      });
     },
   } satisfies ChatShortcutCommands;
   return {
diff --git a/apps/web/src/components/composerCodeBlockHighlight.test.ts b/apps/web/src/components/composerCodeBlockHighlight.test.ts
index de3236be7ae2..fde9084c2e4d 100644
--- a/apps/web/src/components/composerCodeBlockHighlight.test.ts
+++ b/apps/web/src/components/composerCodeBlockHighlight.test.ts
@@ -45,7 +45,7 @@ describe("highlighting edited fences", () => {
     vi.unstubAllGlobals();
   });
 
-  async function mountFence(text: string, resolveTheme = () => THEME) {
+  async function mountFence(text: string, resolveTheme = () => THEME, language = "ts") {
     vi.useFakeTimers();
     const highlighter = fakeHighlighter((content) =>
       content.startsWith("x") ? "#ff0000" : undefined,
@@ -60,9 +60,7 @@ describe("highlighting edited fences", () => {
       ],
       content: {
         type: "doc",
-        content: [
-          { type: "codeBlock", attrs: { language: "ts" }, content: [{ type: "text", text }] },
-        ],
+        content: [{ type: "codeBlock", attrs: { language }, content: [{ type: "text", text }] }],
       },
     });
     vi.stubGlobal("document", { documentElement: {} });
@@ -134,4 +132,10 @@ describe("highlighting edited fences", () => {
     ]);
     expect(fence.colored()).toEqual(["x".repeat(3_000), "x".repeat(3_000)]);
   });
+
+  it("highlights a gitignore fence with the ini grammar, as chat does", async () => {
+    await mountFence("*.log\n!keep.log", () => THEME, 'gitignore title=".gitignore"');
+
+    expect(vi.mocked(getSyntaxHighlighterPromise)).toHaveBeenLastCalledWith("ini");
+  });
 });
diff --git a/apps/web/src/components/composerCodeBlockHighlight.ts b/apps/web/src/components/composerCodeBlockHighlight.ts
index fb7aeaa177a6..1784a3b006c0 100644
--- a/apps/web/src/components/composerCodeBlockHighlight.ts
+++ b/apps/web/src/components/composerCodeBlockHighlight.ts
@@ -6,6 +6,7 @@ import type { Node as ProseMirrorNode } from "@tiptap/pm/model";
 import type { DiffThemeName } from "~/lib/diffRendering";
 import { languageOfInfoString } from "~/composer-code-languages";
 import { getSyntaxHighlighterPromise } from "~/lib/syntaxHighlighting";
+import { highlighterLanguageOf } from "./chat/MarkdownCodeBlock.logic";
 
 interface HighlightedBlock {
   readonly signature: string;
@@ -119,8 +120,9 @@ export function composerCodeBlockHighlight(options: {
               void Promise.allSettled(
                 pending.map(async ({ node }) => {
                   // Stored info includes metadata after the language; Shiki needs only the name.
-                  const language =
-                    languageOfInfoString(String(node.attrs.language ?? "")) || "text";
+                  const language = highlighterLanguageOf(
+                    languageOfInfoString(String(node.attrs.language ?? "")) || "text",
+                  );
                   const signature = blockSignature(node, theme);
                   // Cache failure as plain text to clear retained colors.
                   const highlighter = await getSyntaxHighlighterPromise(language).catch(() => null);
diff --git a/apps/web/src/components/files/AttachmentFilePreview.browser.test.tsx b/apps/web/src/components/files/AttachmentFilePreview.browser.test.tsx
index a83cea59311e..72683a255e3c 100644
--- a/apps/web/src/components/files/AttachmentFilePreview.browser.test.tsx
+++ b/apps/web/src/components/files/AttachmentFilePreview.browser.test.tsx
@@ -931,10 +931,13 @@ describe("standalone Mermaid previews", () => {
       .spyOn(HTMLImageElement.prototype, "src", "set")
       .mockImplementation(() => {});
     await using screen = await render(<MermaidFilePreview text={`flowchart LR\n${node}`} />);
-    await vi.waitFor(() =>
-      expect(screen.container.querySelector('[role="alert"]')?.textContent).toContain(
-        "Show Mermaid source",
-      ),
+    // The first case loads the Mermaid viewer chunk, which can take over a second on a slow runner.
+    await vi.waitFor(
+      () =>
+        expect(screen.container.querySelector('[role="alert"]')?.textContent).toContain(
+          "Show Mermaid source",
+        ),
+      { timeout: 10_000 },
     );
     expect(imageSource).not.toHaveBeenCalled();
     expect(screen.container.querySelector("svg")).toBeNull();
diff --git a/apps/web/src/components/files/FilePreviewPanel.browser.test.tsx b/apps/web/src/components/files/FilePreviewPanel.browser.test.tsx
index 4ee9011dad47..b36940287c2c 100644
--- a/apps/web/src/components/files/FilePreviewPanel.browser.test.tsx
+++ b/apps/web/src/components/files/FilePreviewPanel.browser.test.tsx
@@ -17,6 +17,8 @@ const state = vi.hoisted(() => ({
   file: null as ProjectReadFileResult | null,
   optimistic: null as ProjectReadFileResult | null,
   writeFile: vi.fn(),
+  assetUrl: { _tag: "Loading" } as import("~/assets/assetUrls").AssetUrlState,
+  mintUrl: vi.fn<() => Promise<string | null>>(),
 }));
 
 vi.mock(import("@t3tools/client-runtime/state/runtime"), async (original) => ({
@@ -58,6 +60,15 @@ vi.mock(import("~/hooks/useTheme"), async (original) => ({
 vi.mock(import("~/hooks/useWorkspaceMutationRefresh"), () => ({
   useWorkspaceMutationRefresh: vi.fn(),
 }));
+vi.mock(import("~/assets/assetUrls"), async (original) => ({
+  ...(await original()),
+  useAssetUrlRefresh: () => state.mintUrl,
+  useAssetUrlState: () => state.assetUrl,
+}));
+// The Word engine compiles a large WebAssembly bundle; these tests only need the URL it loads.
+vi.mock(import("./OfficeFilePreview"), () => ({
+  OfficeFilePreview: ({ src }: { src: string }) => <div data-testid="office-preview">{src}</div>,
+}));
 vi.mock(import("./FileBreadcrumbs"), () => ({ FileBreadcrumbs: () => <></> }));
 vi.mock(import("./FileBrowserPanel"), () => ({
   default: () => (
@@ -109,6 +120,9 @@ function setup() {
   localStorage.setItem(keys[1]!, "true");
   state.file = null;
   state.optimistic = null;
+  state.assetUrl = { _tag: "Loading" };
+  let mints = 0;
+  state.mintUrl.mockReset().mockImplementation(async () => `/assets/report.docx?mint=${++mints}`);
   state.writeFile.mockReset().mockResolvedValue(AsyncResult.success(undefined));
   return {
     [Symbol.dispose]() {
@@ -131,7 +145,7 @@ function markdownPreview(truncated: boolean, contents = "- [ ] Keep the rest of
   return filePreview("tasks.md");
 }
 
-function filePreview(relativePath: string) {
+function filePreview(relativePath: string, workspaceMutationId: string | null = null) {
   return (
     <FilePreviewPanel
       environmentId={environmentId}
@@ -150,11 +164,22 @@ function filePreview(relativePath: string) {
       folderTrail={undefined}
       onPendingChange={vi.fn()}
       selectedFilePending={false}
-      workspaceMutationId={null}
+      workspaceMutationId={workspaceMutationId}
     />
   );
 }
 
+function documentPreview(workspaceMutationId: string, fileRevision: string) {
+  state.file = null;
+  state.assetUrl = {
+    _tag: "Success",
+    url: "/assets/report.docx",
+    expiresAt: Number.MAX_SAFE_INTEGER,
+    fileRevision,
+  };
+  return filePreview("report.docx", workspaceMutationId);
+}
+
 function deepActiveElement() {
   let active = document.activeElement;
   while (active?.shadowRoot?.activeElement) active = active.shadowRoot.activeElement;
@@ -279,6 +304,65 @@ describe("rendered Markdown task saves", () => {
   });
 });
 
+describe("workspace document previews", () => {
+  it("keeps an unchanged document loaded when another workspace change lands", async () => {
+    using _settings = setup();
+    await using screen = await render(documentPreview("mutation-1", "revision-1"));
+    const preview = screen.getByTestId("office-preview");
+    await expect.element(preview).toHaveTextContent("/assets/report.docx?mint=1");
+    const loaded = preview.element();
+
+    await screen.rerender(documentPreview("mutation-2", "revision-1"));
+
+    expect(state.mintUrl, "an unchanged document re-minted its URL").toHaveBeenCalledOnce();
+    expect(screen.container.contains(loaded), "an unchanged document was remounted").toBe(true);
+  });
+
+  it("keeps an unchanged document mounted while its revision check reloads", async () => {
+    using _settings = setup();
+    await using screen = await render(documentPreview("mutation-1", "revision-1"));
+    const preview = screen.getByTestId("office-preview");
+    await expect.element(preview).toHaveTextContent("/assets/report.docx?mint=1");
+    const loaded = preview.element();
+
+    state.assetUrl = { _tag: "Loading" };
+    await screen.rerender(filePreview("report.docx", "mutation-1"));
+    await screen.rerender(documentPreview("mutation-1", "revision-1"));
+
+    expect(
+      state.mintUrl,
+      "a reloading revision check re-minted the document URL",
+    ).toHaveBeenCalledOnce();
+    expect(
+      screen.container.contains(loaded),
+      "a reloading revision check remounted the document",
+    ).toBe(true);
+  });
+
+  it("reloads the document when its URL can no longer be minted", async () => {
+    using _settings = setup();
+    await using screen = await render(documentPreview("mutation-1", "revision-1"));
+    const preview = screen.getByTestId("office-preview");
+    await expect.element(preview).toHaveTextContent("/assets/report.docx?mint=1");
+
+    state.assetUrl = { _tag: "Failure" };
+    await screen.rerender(filePreview("report.docx", "mutation-2"));
+
+    await expect.element(preview).toHaveTextContent("/assets/report.docx?mint=2");
+  });
+
+  it("loads the new bytes when the document itself changes", async () => {
+    using _settings = setup();
+    await using screen = await render(documentPreview("mutation-1", "revision-1"));
+    const preview = screen.getByTestId("office-preview");
+    await expect.element(preview).toHaveTextContent("/assets/report.docx?mint=1");
+
+    await screen.rerender(documentPreview("mutation-2", "revision-2"));
+
+    await expect.element(preview).toHaveTextContent("/assets/report.docx?mint=2");
+  });
+});
+
 describe("rendered Markdown select all", () => {
   it("selects only the rendered file, including after a task toggle", async () => {
     using _settings = setup();
diff --git a/apps/web/src/components/files/FilePreviewPanel.tsx b/apps/web/src/components/files/FilePreviewPanel.tsx
index 0ec8e94facc9..9d842f0d85d4 100644
--- a/apps/web/src/components/files/FilePreviewPanel.tsx
+++ b/apps/web/src/components/files/FilePreviewPanel.tsx
@@ -398,6 +398,64 @@ function WorkspaceAudioPreview(props: {
   );
 }
 
+function WorkspaceDocumentPreview(props: {
+  readonly environmentId: EnvironmentId;
+  readonly threadRef: ScopedThreadRef;
+  readonly draft: boolean;
+  readonly document: boolean;
+  readonly absolutePath: string;
+  readonly workspaceRoot: string;
+  readonly name: string;
+  readonly workspaceMutationId: string | null;
+  readonly refreshRevision: number;
+}) {
+  const resource =
+    props.draft && props.document
+      ? {
+          _tag: "draft-workspace-file" as const,
+          cwd: props.workspaceRoot,
+          path: props.absolutePath,
+        }
+      : {
+          _tag: "media-file" as const,
+          threadId: props.threadRef.threadId,
+          path: props.absolutePath,
+          ...(props.document ? {} : { disposition: "attachment" as const }),
+        };
+  // Drafts keep reloading on every workspace mutation, as before.
+  const revisioned = resource._tag === "media-file";
+  const assetUrl = useAssetUrlState(
+    props.environmentId,
+    revisioned ? resource : null,
+    props.workspaceMutationId ?? undefined,
+  );
+  const resolved =
+    assetUrl._tag === "Success" ? (assetUrl.fileRevision ?? props.workspaceMutationId) : undefined;
+  // A reconnect reports Loading and keeps the last revision, so the open file stays loaded;
+  // a failure (say the file was deleted) remounts so the preview shows its error.
+  const [shown, setShown] = useState(resolved);
+  if (resolved !== undefined && resolved !== shown) setShown(resolved);
+  const revision = !revisioned
+    ? props.workspaceMutationId
+    : assetUrl._tag === "Failure"
+      ? `failure:${props.workspaceMutationId}`
+      : (resolved ?? shown);
+  // Waiting on the first revision keeps the preview from mounting twice when it opens.
+  if (revisioned && revision === undefined && assetUrl._tag === "Loading") {
+    return <FileSurfaceLoading />;
+  }
+  return (
+    <AttachmentFilePreview
+      key={`${revision}:${props.refreshRevision}`}
+      name={props.name}
+      mimeType="application/octet-stream"
+      sizeBytes={0}
+      asset={{ environmentId: props.environmentId, resource }}
+      origin="File"
+    />
+  );
+}
+
 function clampFileLine(contents: string, requestedLine: number): number {
   let lineCount = 1;
   for (let index = 0; index < contents.length; index += 1) {
@@ -1538,24 +1596,17 @@ export default function FilePreviewPanel({
           ) : relativePath &&
             absolutePath &&
             (isDocument || file.readError?.failure === "binary_file") ? (
-            <AttachmentFilePreview
-              key={`${environmentId}:${absolutePath}:${workspaceMutationId}:${fileRefreshRevision}`}
+            <WorkspaceDocumentPreview
+              key={`${environmentId}:${absolutePath}`}
+              environmentId={environmentId}
+              threadRef={threadRef}
+              draft={draft}
+              document={isDocument}
+              absolutePath={absolutePath}
+              workspaceRoot={cwd}
               name={relativePath.split(/[\\/]/).at(-1) || relativePath}
-              mimeType="application/octet-stream"
-              sizeBytes={0}
-              asset={{
-                environmentId,
-                resource:
-                  draft && isDocument
-                    ? { _tag: "draft-workspace-file", cwd, path: absolutePath }
-                    : {
-                        _tag: "media-file",
-                        threadId: threadRef.threadId,
-                        path: absolutePath,
-                        ...(isDocument ? {} : { disposition: "attachment" as const }),
-                      },
-              }}
-              origin="File"
+              workspaceMutationId={workspaceMutationId}
+              refreshRevision={fileRefreshRevision}
             />
           ) : relativePath && file.error && file.data === null ? (
             <div
diff --git a/apps/web/src/components/files/PdfViewer.browser.test.tsx b/apps/web/src/components/files/PdfViewer.browser.test.tsx
index dfffa2c7378e..1b07f89eaf81 100644
--- a/apps/web/src/components/files/PdfViewer.browser.test.tsx
+++ b/apps/web/src/components/files/PdfViewer.browser.test.tsx
@@ -12,24 +12,56 @@ vi.mock(import("pdfjs-dist/build/pdf.worker.min.mjs?url"), async () => {
   };
 });
 
+// Holds one page's Find text until the test opens it, so a scan can be observed mid-flight.
+const findGate = vi.hoisted(() => ({ page: 0, open: () => {}, opened: Promise.resolve() }));
+function setup(page: number) {
+  findGate.page = page;
+  findGate.opened = new Promise((resolve) => (findGate.open = resolve));
+}
+vi.mock(import("./pdfDocument"), async (importOriginal) => {
+  const actual = await importOriginal();
+  return {
+    ...actual,
+    openPdf: (bytes) => {
+      const task = actual.openPdf(bytes);
+      const promise = task.promise.then((document) => {
+        const getPage = document.getPage.bind(document);
+        document.getPage = async (number) => {
+          const page = await getPage(number);
+          const getTextContent = page.getTextContent.bind(page);
+          page.getTextContent = async (params) => {
+            if (number === findGate.page) await findGate.opened;
+            return getTextContent(params);
+          };
+          return page;
+        };
+        return document;
+      });
+      return Object.defineProperty(task, "promise", { value: promise });
+    },
+  };
+});
+
 import PdfViewer from "./PdfViewer";
 
 // Page 1 is a short banner whose title is drawn in two runs with a font change, so pdf.js
 // splits it into two text spans. Page 2 is a letter page rotated a quarter turn.
-function twoPagePdf() {
-  const pages = [
+function testPdf(
+  pages = [
     {
       box: "0 0 612 140",
       rotate: 0,
       text: "BT /F1 24 Tf 30 70 Td (Quarter) Tj /F2 24 Tf (ly outlook) Tj ET",
     },
     { box: "0 0 612 792", rotate: 90, text: "BT /F1 24 Tf 30 700 Td (Budget and risks) Tj ET" },
-  ];
+  ],
+) {
+  const fonts = 3 + pages.length * 2;
   const objects = [
     "<< /Type /Catalog /Pages 2 0 R >>",
-    "<< /Type /Pages /Count 2 /Kids [3 0 R 5 0 R] >>",
+    `<< /Type /Pages /Count ${pages.length} /Kids [${pages.map((_, index) => `${3 + index * 2} 0 R`).join(" ")}] >>`,
     ...pages.flatMap(({ box, rotate, text }, index) => [
-      `<< /Type /Page /Parent 2 0 R /MediaBox [${box}] /Rotate ${rotate} /Resources << /Font << /F1 7 0 R /F2 8 0 R >> >> /Contents ${4 + index * 2} 0 R >>`,
+      `<< /Type /Page /Parent 2 0 R /MediaBox [${box}] /Rotate ${rotate} /Resources << /Font << /F1 ${fonts} 0 R /F2 ${fonts + 1} 0 R >> >> /Contents ${4 + index * 2} 0 R >>`,
       `<< /Length ${text.length} >>\nstream\n${text}\nendstream`,
     ]),
     "<< /Type /Font /Subtype /Type1 /BaseFont /Helvetica >>",
@@ -49,7 +81,7 @@ function twoPagePdf() {
 }
 
 it("fits the width, then finds split and rotated text and jumps to its page", async () => {
-  const url = URL.createObjectURL(twoPagePdf());
+  const url = URL.createObjectURL(testPdf());
   try {
     const container = document.createElement("div");
     container.style.cssText = "display:flex;width:500px;height:600px";
@@ -110,8 +142,40 @@ it("fits the width, then finds split and rotated text and jumps to its page", as
   }
 });
 
+it("jumps to the first hit while still counting and keeps later manual navigation", async () => {
+  setup(4);
+  const page = (text: string) => ({
+    box: "0 0 612 792",
+    rotate: 0,
+    text: `BT /F1 24 Tf 30 700 Td (${text}) Tj ET`,
+  });
+  const url = URL.createObjectURL(
+    testPdf([page("Intro"), page("Needle one"), page("Needle two"), page("Closing")]),
+  );
+  try {
+    await using screen = await render(
+      <div className="flex h-[300px] w-[320px]">
+        <PdfViewer src={url} title="Searched PDF" />
+      </div>,
+    );
+    await expect.element(screen.getByText("1 / 4 pages")).toBeVisible();
+    await screen.getByRole("searchbox", { name: "Find in PDF" }).fill("needle");
+    await expect.element(screen.getByText("2 / 4 pages")).toBeVisible();
+    await expect.element(screen.getByRole("status")).toHaveTextContent("Searching…");
+
+    await screen.getByRole("button", { name: "Next page", exact: true }).click();
+    await expect.element(screen.getByText("3 / 4 pages")).toBeVisible();
+    findGate.open();
+    await expect.element(screen.getByRole("status")).toHaveTextContent("1/2");
+    await expect.element(screen.getByText("3 / 4 pages")).toBeVisible();
+  } finally {
+    findGate.open();
+    URL.revokeObjectURL(url);
+  }
+});
+
 it("restores page, within-page offset and zoom after a remount", async () => {
-  const url = URL.createObjectURL(twoPagePdf());
+  const url = URL.createObjectURL(testPdf());
   const viewer = (mount: number, positionKey: string) => (
     <div className="flex h-[300px] w-[320px]">
       <PdfViewer key={mount} src={url} title="Restored PDF" positionKey={positionKey} />
diff --git a/apps/web/src/components/files/PdfViewer.tsx b/apps/web/src/components/files/PdfViewer.tsx
index 6a01bce2cfe9..63b443d52564 100644
--- a/apps/web/src/components/files/PdfViewer.tsx
+++ b/apps/web/src/components/files/PdfViewer.tsx
@@ -289,10 +289,11 @@ export default function PdfViewer(props: {
     }
     saveView(node, anchor !== null);
   });
+  const firstMatch = matches[0];
   // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- Scroll to the first asynchronous search result after its measured page offsets have committed.
   useLayoutEffect(() => {
-    if (matches.length) jumpToPage(matches[0]!);
-  }, [matches]);
+    if (firstMatch !== undefined) jumpToPage(firstMatch);
+  }, [firstMatch]);
   // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- Debounce pdf.js text extraction and cancel obsolete searches when the query or document changes.
   useEffect(() => {
     if (!pdf || !query.trim()) {
@@ -311,18 +312,23 @@ export default function PdfViewer(props: {
         const sizes: number[] = [];
         let size = 0;
         for (let index = 0; index < pdf.numPages; index++) {
-          if (cancelled) return;
           const page = await pdf.getPage(index + 1);
           const pageSize = page.getViewport({ scale: 1 });
           sizes.push(pageSize.height / pageSize.width);
           const content = await page.getTextContent();
+          if (cancelled) return;
           const text = pdfPageText(content.items);
           size += text.length;
           if (size > MAX_FIND_TEXT)
             throw new Error(
               "This PDF has too much text to search. Save it to search in another app.",
             );
-          if (pdfFindIncludes(text, query)) found.push(index);
+          if (!pdfFindIncludes(text, query)) continue;
+          found.push(index);
+          if (found.length > 1) continue;
+          // Pages up to the first hit are measured, so its jump lands before the scan finishes.
+          setRatios((old) => [...sizes, ...old.slice(sizes.length)]);
+          setMatches([index]);
         }
         if (cancelled) return;
         setRatios(sizes);
diff --git a/apps/web/src/components/files/ReadOnlySourcePreview.browser.test.tsx b/apps/web/src/components/files/ReadOnlySourcePreview.browser.test.tsx
new file mode 100644
index 000000000000..3547540e8d72
--- /dev/null
+++ b/apps/web/src/components/files/ReadOnlySourcePreview.browser.test.tsx
@@ -0,0 +1,67 @@
+import type { ReactNode } from "react";
+import { describe, expect, it, vi } from "vite-plus/test";
+import { userEvent } from "vite-plus/test/browser";
+import "~/index.css";
+
+import { render } from "../../../test/render";
+
+import { getSyntaxHighlighterPromise } from "~/lib/syntaxHighlighting";
+
+// The pool starts its workers before showing any code, which can outlast a cold CI browser.
+vi.mock(import("~/components/DiffWorkerPoolProvider"), () => ({
+  DiffWorkerPoolProvider: ({ children }: { children?: ReactNode }) => <>{children}</>,
+}));
+
+import ReadOnlySourcePreview from "./ReadOnlySourcePreview";
+
+const LINE_COUNT = 301;
+const text = `${Array.from({ length: LINE_COUNT }, (_, index) => `line ${index + 1}`).join("\n")}\n`;
+
+// The browser ignores a copy event's data unless the event is cancelled, and copies the selection itself.
+function copiedText(target: Element) {
+  const clipboardData = new DataTransfer();
+  const handled = !target.dispatchEvent(
+    new ClipboardEvent("copy", { clipboardData, bubbles: true, cancelable: true, composed: true }),
+  );
+  return handled ? clipboardData.getData("text/plain") : null;
+}
+
+describe("ReadOnlySourcePreview", () => {
+  it("copies the whole file after Select All, wherever the preview is scrolled", async () => {
+    // File paints nothing until the shared highlighter has loaded; once it has, mount renders synchronously.
+    await getSyntaxHighlighterPromise("text");
+    await using screen = await render(
+      <div className="flex h-[400px] flex-col">
+        <ReadOnlySourcePreview name="notes.txt" text={text} wordWrap={false} />
+      </div>,
+    );
+    const root = screen.container.querySelector("diffs-container")!.shadowRoot!;
+    const rows = () => root.querySelectorAll("[data-line]");
+    await vi.waitFor(() => expect(rows()[0]?.textContent).toBe("line 1"));
+    // Only rows near the viewport are mounted, so the browser's own copy would stop there.
+    expect(rows().length).toBeLessThan(LINE_COUNT);
+
+    await userEvent.click(rows()[0]!);
+    await userEvent.keyboard("{ControlOrMeta>}a{/ControlOrMeta}");
+    expect(copiedText(rows()[0]!)).toBe(text);
+
+    const scroller = screen.container.querySelector(".file-preview-virtualizer")!;
+    scroller.scrollTop = scroller.scrollHeight;
+    await vi.waitFor(() => expect(rows()[0]?.textContent).not.toBe("line 1"));
+    expect(copiedText(rows()[0]!)).toBe(text);
+
+    document.getSelection()!.removeAllRanges();
+    await userEvent.click(rows()[rows().length - 1]!);
+    await userEvent.keyboard("{ControlOrMeta>}a{/ControlOrMeta}");
+    expect(copiedText(rows()[0]!)).toBe(text);
+
+    // A selection that stops inside the mounted rows at either end stays the browser's to copy.
+    const pre = root.querySelector("pre")!;
+    const firstText = rows()[0]!.querySelector("span")!.firstChild!;
+    const lastText = rows()[rows().length - 1]!.querySelector("span")!.firstChild!;
+    document.getSelection()!.setBaseAndExtent(pre, 0, lastText, 4);
+    expect(copiedText(rows()[0]!)).toBeNull();
+    document.getSelection()!.setBaseAndExtent(firstText, 4, pre, pre.childNodes.length);
+    expect(copiedText(rows()[0]!)).toBeNull();
+  });
+});
diff --git a/apps/web/src/components/files/ReadOnlySourcePreview.tsx b/apps/web/src/components/files/ReadOnlySourcePreview.tsx
index 2fdfe04a238d..453fc26ecc6a 100644
--- a/apps/web/src/components/files/ReadOnlySourcePreview.tsx
+++ b/apps/web/src/components/files/ReadOnlySourcePreview.tsx
@@ -1,4 +1,5 @@
 import { File, type FileOptions, Virtualizer } from "@pierre/diffs/react";
+import type { ClipboardEvent } from "react";
 
 import { DiffWorkerPoolProvider } from "~/components/DiffWorkerPoolProvider";
 import { useClientSettings } from "~/hooks/useSettings";
@@ -8,6 +9,31 @@ import { PREFERRED_HIGHLIGHTER } from "~/lib/syntaxHighlighting";
 
 import { FILE_LINK_REVEAL_UNSAFE_CSS } from "./fileSurfaceChrome";
 
+/** Select All spans the file's shadow tree, where the virtualizer mounts only rows near the viewport. */
+function selectsEveryMountedRow(root: ShadowRoot) {
+  const rows = root.querySelectorAll("[data-line]");
+  const first = rows[0];
+  const last = rows[rows.length - 1];
+  if (!first || !last) return false;
+  try {
+    const selected = document.getSelection()?.getComposedRanges({ shadowRoots: [root] })[0];
+    if (!selected) return false;
+    if (!root.contains(selected.startContainer) || !root.contains(selected.endContainer)) {
+      return false;
+    }
+    const range = document.createRange();
+    range.setStart(selected.startContainer, selected.startOffset);
+    range.setEnd(selected.endContainer, selected.endOffset);
+    // A dragged selection ends inside rows, so it never holds a row's own boundaries.
+    return (
+      range.comparePoint(first, 0) === 0 && range.comparePoint(last, last.childNodes.length) === 0
+    );
+  } catch {
+    // Engines without composed ranges keep their own copy.
+    return false;
+  }
+}
+
 export default function ReadOnlySourcePreview(props: {
   readonly name: string;
   readonly text: string;
@@ -19,31 +45,39 @@ export default function ReadOnlySourcePreview(props: {
   const resolvedTheme = useRenderedAppearance();
   const defaultWordWrap = useClientSettings((settings) => settings.wordWrap);
   const wordWrap = props.wordWrap ?? defaultWordWrap;
+  const copyWholeFile = (event: ClipboardEvent<HTMLDivElement>) => {
+    const root = event.currentTarget.querySelector("diffs-container")?.shadowRoot;
+    if (!root || !selectsEveryMountedRow(root)) return;
+    event.clipboardData.setData("text/plain", props.text);
+    event.preventDefault();
+  };
   return (
     <DiffWorkerPoolProvider>
-      <Virtualizer
-        key={`${props.name}:${resolvedTheme}:${props.text.length}`}
-        className="file-preview-virtualizer min-h-0 flex-1 overflow-auto"
-        config={{ overscrollSize: 600, intersectionObserverMargin: 1200 }}
-      >
-        <File
-          file={{
-            name: props.name,
-            contents: props.text,
-            ...(props.cacheKey ? { cacheKey: props.cacheKey } : {}),
-          }}
-          options={{
-            disableFileHeader: true,
-            overflow: wordWrap ? "wrap" : "scroll",
-            theme: resolveDiffThemeName(resolvedTheme),
-            preferredHighlighter: PREFERRED_HIGHLIGHTER,
-            themeType: resolvedTheme,
-            unsafeCSS: FILE_LINK_REVEAL_UNSAFE_CSS,
-            ...(props.onPostRender ? { onPostRender: props.onPostRender } : {}),
-          }}
-          className="min-h-full"
-        />
-      </Virtualizer>
+      <div className="contents" onCopy={copyWholeFile}>
+        <Virtualizer
+          key={`${props.name}:${resolvedTheme}:${props.text.length}`}
+          className="file-preview-virtualizer min-h-0 flex-1 overflow-auto"
+          config={{ overscrollSize: 600, intersectionObserverMargin: 1200 }}
+        >
+          <File
+            file={{
+              name: props.name,
+              contents: props.text,
+              ...(props.cacheKey ? { cacheKey: props.cacheKey } : {}),
+            }}
+            options={{
+              disableFileHeader: true,
+              overflow: wordWrap ? "wrap" : "scroll",
+              theme: resolveDiffThemeName(resolvedTheme),
+              preferredHighlighter: PREFERRED_HIGHLIGHTER,
+              themeType: resolvedTheme,
+              unsafeCSS: FILE_LINK_REVEAL_UNSAFE_CSS,
+              ...(props.onPostRender ? { onPostRender: props.onPostRender } : {}),
+            }}
+            className="min-h-full"
+          />
+        </Virtualizer>
+      </div>
     </DiffWorkerPoolProvider>
   );
 }
diff --git a/apps/web/src/components/files/office/Spreadsheet.tsx b/apps/web/src/components/files/office/Spreadsheet.tsx
index 88e7d085b6d4..eaae7533b7b5 100644
--- a/apps/web/src/components/files/office/Spreadsheet.tsx
+++ b/apps/web/src/components/files/office/Spreadsheet.tsx
@@ -34,6 +34,7 @@ import {
   type Painted,
 } from "./sheet-paint";
 import { externalUrl } from "./links";
+import { bufferedViewport, cachedViewport, retainCachedViewport } from "./sheet-viewport";
 
 const isSupersededError = Schema.is(SupersededError);
 
@@ -164,6 +165,8 @@ function SpreadsheetGrid(props: {
   const scroller = useRef<HTMLDivElement>(null);
   const canvas = useRef<HTMLCanvasElement>(null);
   const spacer = useRef<HTMLDivElement>(null);
+  const columnHeaderBand = useRef<HTMLDivElement>(null);
+  const rowHeaderBand = useRef<HTMLDivElement>(null);
   const [notice, setNotice] = useState("");
   const [reader, setReader] = useState<{ row: number; col: number; text: string }[]>([]);
   const [active, setActive] = useState({ row: 0, col: 0 });
@@ -177,11 +180,15 @@ function SpreadsheetGrid(props: {
     const root = scroller.current;
     const target = canvas.current;
     const space = spacer.current;
-    if (!root || !target || !space) return;
+    const columns = columnHeaderBand.current;
+    const rows = rowHeaderBand.current;
+    if (!root || !target || !space || !columns || !rows) return;
     const context = target.getContext("2d");
     if (!context) return;
     const controller = new AbortController();
-    const info = layout.info;
+    let info = layout.info;
+    let chartWidth = layout.chartWidth;
+    let chartHeight = layout.chartHeight;
     const sheet = info.activeSheet;
     const frozen = { rows: info.frozenRows, cols: info.frozenCols };
     const headers = { width: 44, height: headerHeight };
@@ -193,11 +200,23 @@ function SpreadsheetGrid(props: {
     let sent = 0;
     let received = 0;
     let drag = false;
+    let resizing:
+      | {
+          axis: "row" | "column";
+          pointerId: number;
+          index: number;
+          start: number;
+          edge: number;
+          delta: number;
+        }
+      | undefined;
+    let resizingPending = false;
     let header: "row" | "column" | "all" | undefined;
     let pressed: { row: number; col: number } | undefined;
     let end: { x: number; y: number } | undefined;
     let left = info.initialScrollX;
     let top = info.initialScrollY;
+    let drawn = { x: left, y: top };
     let reachX = 0;
     let reachY = 0;
     let readController: AbortController | undefined;
@@ -216,12 +235,11 @@ function SpreadsheetGrid(props: {
     const resizeArea = () => {
       const width = Math.min(
         (end?.x ?? Infinity) + (painted?.frame.frozen.width ?? 0),
-        Math.max(info.contentWidth, layout.chartWidth, reachX, left + root.clientWidth) +
-          root.clientWidth,
+        Math.max(info.contentWidth, chartWidth, reachX, left + root.clientWidth) + root.clientWidth,
       );
       const height = Math.min(
         (end?.y ?? Infinity) + (painted?.frame.frozen.height ?? 0),
-        Math.max(info.contentHeight, layout.chartHeight, reachY, top + root.clientHeight) +
+        Math.max(info.contentHeight, chartHeight, reachY, top + root.clientHeight) +
           root.clientHeight,
       );
       space.style.width = `${headers.width + width}px`;
@@ -233,9 +251,13 @@ function SpreadsheetGrid(props: {
       const height = root.clientHeight;
       const size = { width: width - headers.width, height: height - headers.height };
       if (size.width <= 0 || size.height <= 0) return;
+      columns.style.width = `${size.width}px`;
+      rows.style.height = `${size.height}px`;
       left = root.scrollLeft;
       top = root.scrollTop;
       resizeArea();
+      const viewport = { x: left, y: top, ...size };
+      drawn = painted ? cachedViewport(painted.frame.viewport, viewport) : viewport;
       const input: SheetFrameRequest = {
         sheet,
         x: left,
@@ -243,10 +265,18 @@ function SpreadsheetGrid(props: {
         ...size,
         ratio,
         offset: { x: 0, y: 0 },
-        wider: undefined,
+        wider: bufferedViewport(viewport),
       };
       const key = JSON.stringify(input);
-      if (key !== requested) {
+      const needsFrame =
+        !painted ||
+        requested === "" ||
+        drawn.x !== left ||
+        drawn.y !== top ||
+        painted.request.width !== size.width ||
+        painted.request.height !== size.height ||
+        painted.request.ratio !== ratio;
+      if (needsFrame && key !== requested) {
         requested = key;
         sent += 1;
         const order = sent;
@@ -259,9 +289,23 @@ function SpreadsheetGrid(props: {
             }
             received = order;
             if (!reply) {
+              if (requested === key) requested = "";
               setNotice("These cells could not be drawn. Try scrolling to another area.");
               return;
             }
+            if (
+              painted &&
+              retainCachedViewport(painted.frame.viewport, reply.viewport, {
+                x: root.scrollLeft,
+                y: root.scrollTop,
+                width: root.clientWidth - headers.width,
+                height: root.clientHeight - headers.height,
+              })
+            ) {
+              reply.bitmap.close();
+              if (requested === key) requested = JSON.stringify(painted.request);
+              return;
+            }
             setNotice("");
             painted?.frame.bitmap.close();
             painted = { request: input, frame: reply };
@@ -269,8 +313,10 @@ function SpreadsheetGrid(props: {
             schedule();
           })
           .catch((cause: unknown) => {
-            if (!isSupersededError(cause) && !controller.signal.aborted)
+            if (!isSupersededError(cause) && !controller.signal.aborted) {
+              if (requested === key) requested = "";
               setNotice("These cells could not be drawn.");
+            }
           });
       }
       if (
@@ -287,12 +333,12 @@ function SpreadsheetGrid(props: {
         context.fillRect(0, 0, target.width, target.height);
         return;
       }
-      paintCells(context, painted, { ratio, headers, x: left, y: top, ...size });
+      paintCells(context, painted, { ratio, headers, ...drawn, ...size });
       grid =
         painted.frame.grid &&
         shiftGrid(painted.frame.grid, frozen, painted.frame.frozen, {
-          x: painted.frame.viewport.x - left,
-          y: painted.frame.viewport.y - top,
+          x: painted.frame.viewport.x - drawn.x,
+          y: painted.frame.viewport.y - drawn.y,
         });
       if (!grid) return;
       const anchor = selection.anchor;
@@ -308,6 +354,24 @@ function SpreadsheetGrid(props: {
         ),
       });
       paintHeaders(context, { grid, ratio, headers, width, height, selected: range() });
+      if (resizing) {
+        const edge = resizing.edge + resizing.delta;
+        context.save();
+        context.setTransform(ratio, 0, 0, ratio, 0, 0);
+        context.strokeStyle = "#217346";
+        context.lineWidth = 1;
+        context.setLineDash([4, 3]);
+        context.beginPath();
+        if (resizing.axis === "column") {
+          context.moveTo(edge + headers.width, 0);
+          context.lineTo(edge + headers.width, height);
+        } else {
+          context.moveTo(0, edge + headers.height);
+          context.lineTo(width, edge + headers.height);
+        }
+        context.stroke();
+        context.restore();
+      }
     };
     const read = () => {
       const focus = selection.focus;
@@ -382,8 +446,8 @@ function SpreadsheetGrid(props: {
       const frame = painted?.frame;
       if (
         frame &&
-        ((x >= frame.frozen.width && x < frame.frozen.width + frame.viewport.x - left) ||
-          (y >= frame.frozen.height && y < frame.frozen.height + frame.viewport.y - top))
+        ((x >= frame.frozen.width && x < frame.frozen.width + frame.viewport.x - drawn.x) ||
+          (y >= frame.frozen.height && y < frame.frozen.height + frame.viewport.y - drawn.y))
       )
         return;
       const cell = cellAtPoint(
@@ -393,8 +457,44 @@ function SpreadsheetGrid(props: {
       );
       return cell ? { cell, x, y } : undefined;
     };
+    const resizeHit = (event: PointerEvent) => {
+      if (!grid || resizingPending) return;
+      const rect = target.getBoundingClientRect();
+      const x = event.clientX - rect.left - headers.width;
+      const y = event.clientY - rect.top - headers.height;
+      const axis: "row" | "column" | undefined =
+        x >= 0 && y < 0 ? "column" : y >= 0 && x < 0 ? "row" : undefined;
+      if (!axis) return;
+      const offsets = axis === "column" ? grid.colOffsets : grid.rowOffsets;
+      const indices = axis === "column" ? grid.colIndices : grid.rowIndices;
+      const start = axis === "column" ? grid.startCol : grid.startRow;
+      const point = axis === "column" ? x : y;
+      for (let i = 1; i < offsets.length; i++) {
+        const edge = offsets[i]!;
+        const size = edge - offsets[i - 1]!;
+        if (edge > 0 && size > 0 && Math.abs(point - edge) <= 4)
+          return {
+            axis,
+            pointerId: event.pointerId,
+            index: indices?.[i - 1] ?? start + i - 1,
+            start: axis === "column" ? event.clientX : event.clientY,
+            delta: 0,
+            edge,
+          } satisfies NonNullable<typeof resizing>;
+      }
+    };
     const pointerDown = (event: PointerEvent) => {
-      if (event.button !== 0) return;
+      if (event.button !== 0 || resizingPending || resizing) return;
+      const track = resizeHit(event);
+      if (track) {
+        event.preventDefault();
+        root.focus({ preventScroll: true });
+        root.setPointerCapture(event.pointerId);
+        resizing = track;
+        pressed = undefined;
+        schedule();
+        return;
+      }
       const found = hit(event);
       if (!found) return;
       root.focus({ preventScroll: true });
@@ -417,6 +517,15 @@ function SpreadsheetGrid(props: {
       else select(event.shiftKey ? extendTo(selection, found.cell) : at(found.cell));
     };
     const pointerMove = (event: PointerEvent) => {
+      if (resizing) {
+        if (event.pointerId !== resizing.pointerId) return;
+        const point = resizing.axis === "column" ? event.clientX : event.clientY;
+        resizing.delta = Math.round(point - resizing.start);
+        schedule();
+        return;
+      }
+      const hovered = resizeHit(event);
+      root.style.cursor = hovered ? (hovered.axis === "column" ? "col-resize" : "row-resize") : "";
       if (!drag) return;
       const found = hit(event);
       if (found && header !== "all")
@@ -428,6 +537,44 @@ function SpreadsheetGrid(props: {
         );
     };
     const pointerUp = (event: PointerEvent) => {
+      if (resizing) {
+        if (event.pointerId !== resizing.pointerId) return;
+        const track = resizing;
+        resizing = undefined;
+        root.style.cursor = "";
+        root.releasePointerCapture(event.pointerId);
+        schedule();
+        if (track.delta === 0) return;
+        resizingPending = true;
+        setNotice("Resizing preview...");
+        void engine
+          .call(
+            "resize",
+            { sheet, axis: track.axis, index: track.index, delta: track.delta },
+            { signal: controller.signal },
+          )
+          .then((nextLayout) => {
+            if (controller.signal.aborted) return;
+            info = nextLayout.info;
+            chartWidth = nextLayout.chartWidth;
+            chartHeight = nextLayout.chartHeight;
+            painted?.frame.bitmap.close();
+            painted = undefined;
+            grid = undefined;
+            sent += 1;
+            received = sent;
+            requested = "";
+            end = undefined;
+            schedule();
+          })
+          .catch(() => {
+            if (!controller.signal.aborted) setNotice("This row or column could not be resized.");
+          })
+          .finally(() => {
+            resizingPending = false;
+          });
+        return;
+      }
       drag = false;
       const found = hit(event);
       if (!found || !pressed || found.cell.row !== pressed.row || found.cell.col !== pressed.col)
@@ -480,6 +627,13 @@ function SpreadsheetGrid(props: {
         });
     };
     const key = (event: KeyboardEvent) => {
+      if (event.key === "Escape" && resizing) {
+        event.preventDefault();
+        resizing = undefined;
+        root.style.cursor = "";
+        schedule();
+        return;
+      }
       const command = event.ctrlKey || event.metaKey;
       if (command && event.key.toLowerCase() === "c") {
         event.preventDefault();
@@ -503,8 +657,16 @@ function SpreadsheetGrid(props: {
       );
       reveal();
     };
-    const cancel = () => {
+    const cancel = (event: PointerEvent) => {
+      if (resizing && event.pointerId !== resizing.pointerId) return;
       drag = false;
+      pressed = undefined;
+      resizing = undefined;
+      root.style.cursor = "";
+      schedule();
+    };
+    const leave = () => {
+      if (!drag && !resizing) root.style.cursor = "";
     };
     root.addEventListener("scroll", schedule);
     root.addEventListener("keydown", key);
@@ -512,6 +674,8 @@ function SpreadsheetGrid(props: {
     root.addEventListener("pointermove", pointerMove);
     root.addEventListener("pointerup", pointerUp);
     root.addEventListener("pointercancel", cancel);
+    root.addEventListener("lostpointercapture", cancel);
+    root.addEventListener("pointerleave", leave);
     const unobserve = observeResize(root, schedule);
     window.addEventListener("resize", schedule);
     resizeArea();
@@ -535,6 +699,8 @@ function SpreadsheetGrid(props: {
       root.removeEventListener("pointermove", pointerMove);
       root.removeEventListener("pointerup", pointerUp);
       root.removeEventListener("pointercancel", cancel);
+      root.removeEventListener("lostpointercapture", cancel);
+      root.removeEventListener("pointerleave", leave);
     };
   }, [engine, layout, initialCell]);
   return (
@@ -559,6 +725,8 @@ function SpreadsheetGrid(props: {
         />
         <div aria-hidden="true" className="sticky left-0 top-0 h-0 w-0">
           <canvas ref={canvas} className="absolute left-0 top-0 block" />
+          <div ref={columnHeaderBand} className="absolute left-11 top-0 h-5 touch-none" />
+          <div ref={rowHeaderBand} className="absolute left-0 top-5 w-11 touch-none" />
         </div>
         <div className="sr-only">
           {[...new Set(reader.map((cell) => cell.row))].map((row) => (
diff --git a/apps/web/src/components/files/office/sheet-paint.ts b/apps/web/src/components/files/office/sheet-paint.ts
index 89daa57e9cb4..46a553a34ac8 100644
--- a/apps/web/src/components/files/office/sheet-paint.ts
+++ b/apps/web/src/components/files/office/sheet-paint.ts
@@ -104,17 +104,18 @@ export function paintCells(
     columns.forEach((column) => {
       if (row.end <= row.start || column.end <= column.start) return;
 
-      const left = Math.round(origin.x + column.start * ratio);
-      const top = Math.round(origin.y + row.start * ratio);
+      // A shifted bitmap's frozen pixels must never enter a scrolling pane.
+      const left = Math.round(
+        origin.x + Math.max(column.start, column.start + column.shift) * ratio,
+      );
+      const top = Math.round(origin.y + Math.max(row.start, row.start + row.shift) * ratio);
+      const right = Math.round(origin.x + column.end * ratio);
+      const bottom = Math.round(origin.y + row.end * ratio);
+      if (left >= right || top >= bottom) return;
 
       context.save();
       context.beginPath();
-      context.rect(
-        left,
-        top,
-        Math.round(origin.x + column.end * ratio) - left,
-        Math.round(origin.y + row.end * ratio) - top,
-      );
+      context.rect(left, top, right - left, bottom - top);
       context.clip();
       // Whole device pixels, so a frame at its own position lands exactly where the worker painted its cells.
       context.drawImage(
diff --git a/apps/web/src/components/files/office/sheet-protocol.ts b/apps/web/src/components/files/office/sheet-protocol.ts
index fd66ef9f7405..84aaf9461b5a 100644
--- a/apps/web/src/components/files/office/sheet-protocol.ts
+++ b/apps/web/src/components/files/office/sheet-protocol.ts
@@ -76,6 +76,16 @@ export type SheetMethods = {
   >;
   /** Makes a sheet the active one; rejects, leaving the sheet before it active, when it cannot open. */
   readonly show: Method<{ readonly sheet: number }, SheetLayout>;
+  /** Preview-only size changes in CSS pixels; the source file is never saved. */
+  readonly resize: Method<
+    {
+      readonly sheet: number;
+      readonly axis: "row" | "column";
+      readonly index: number;
+      readonly delta: number;
+    },
+    Pick<SheetLayout, "info" | "chartWidth" | "chartHeight">
+  >;
   /** Paints a frame; undefined when even its smallest tiles cannot be drawn. */
   readonly frame: Method<SheetFrameRequest, SheetFrame | undefined>;
   /** Where a cell starts and where the cell past it starts, to scroll it into view. */
diff --git a/apps/web/src/components/files/office/sheet-resize.browser.test.ts b/apps/web/src/components/files/office/sheet-resize.browser.test.ts
new file mode 100644
index 000000000000..6029e888e1c2
--- /dev/null
+++ b/apps/web/src/components/files/office/sheet-resize.browser.test.ts
@@ -0,0 +1,241 @@
+import { createElement } from "react";
+import { expect, it, vi } from "vite-plus/test";
+import JSZip from "jszip";
+import "~/index.css";
+import { act, render } from "../../../../test/render";
+import Spreadsheet from "./Spreadsheet";
+import { createWorkerClient } from "./worker-rpc";
+import type { SheetMethods } from "./sheet-protocol";
+import { maximumTrackSize } from "./sheet-sizing";
+
+it.each([false, true])(
+  "reflows preview tracks through sheet switches, frozen and hidden tracks: %s",
+  async (frozen) => {
+    const archive = new JSZip();
+    archive.file(
+      "xl/workbook.xml",
+      '<workbook xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships"><sheets><sheet name="Budget" sheetId="1" r:id="rId1"/><sheet name="Other" sheetId="2" r:id="rId2"/></sheets></workbook>',
+    );
+    archive.file(
+      "xl/_rels/workbook.xml.rels",
+      '<Relationships><Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet" Target="worksheets/sheet1.xml"/><Relationship Id="rId2" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet" Target="worksheets/sheet2.xml"/></Relationships>',
+    );
+    for (const sheet of [1, 2])
+      archive.file(
+        `xl/worksheets/sheet${sheet}.xml`,
+        `<worksheet>${frozen ? '<sheetViews><sheetView workbookViewId="0"><pane xSplit="1" ySplit="1" state="frozen" topLeftCell="B2"/></sheetView></sheetViews><cols><col min="2" max="2" width="0" hidden="1"/></cols>' : ""}<sheetData><row r="1"><c r="A1"><v>42</v></c></row>${frozen ? '<row r="2" ht="0" hidden="1"/>' : ""}</sheetData>${frozen ? '<mergeCells><mergeCell ref="A1:C1"/></mergeCells>' : ""}</worksheet>`,
+      );
+    const namespace = "http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing";
+    archive.file(
+      "xl/worksheets/_rels/sheet1.xml.rels",
+      '<Relationships><Relationship Id="drawing" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/drawing" Target="../drawings/drawing1.xml"/></Relationships>',
+    );
+    archive.file(
+      "xl/drawings/drawing1.xml",
+      `<xdr:wsDr xmlns:xdr="${namespace}" xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships"><xdr:twoCellAnchor><xdr:from><xdr:col>10</xdr:col><xdr:colOff>0</xdr:colOff><xdr:row>10</xdr:row><xdr:rowOff>0</xdr:rowOff></xdr:from><xdr:to><xdr:col>13</xdr:col><xdr:colOff>0</xdr:colOff><xdr:row>17</xdr:row><xdr:rowOff>0</xdr:rowOff></xdr:to><xdr:graphicFrame><xdr:nvGraphicFramePr><xdr:cNvPr id="2" name="Sample chart"/><xdr:cNvGraphicFramePr/></xdr:nvGraphicFramePr><xdr:xfrm><a:off x="0" y="0"/><a:ext cx="0" cy="0"/></xdr:xfrm><a:graphic><a:graphicData uri="http://schemas.openxmlformats.org/drawingml/2006/chart"><c:chart xmlns:c="http://schemas.openxmlformats.org/drawingml/2006/chart" r:id="chart"/></a:graphicData></a:graphic></xdr:graphicFrame><xdr:clientData/></xdr:twoCellAnchor></xdr:wsDr>`,
+    );
+    archive.file(
+      "xl/drawings/_rels/drawing1.xml.rels",
+      '<Relationships><Relationship Id="chart" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart" Target="../charts/chart1.xml"/></Relationships>',
+    );
+    archive.file(
+      "xl/charts/chart1.xml",
+      '<c:chartSpace xmlns:c="http://schemas.openxmlformats.org/drawingml/2006/chart"><c:chart><c:plotArea><c:barChart><c:barDir val="col"/><c:grouping val="clustered"/><c:ser><c:idx val="0"/><c:order val="0"/><c:cat><c:strLit><c:ptCount val="1"/><c:pt idx="0"><c:v>Sample</c:v></c:pt></c:strLit></c:cat><c:val><c:numLit><c:formatCode>General</c:formatCode><c:ptCount val="1"/><c:pt idx="0"><c:v>42</c:v></c:pt></c:numLit></c:val></c:ser></c:barChart></c:plotArea></c:chart></c:chartSpace>',
+    );
+    const sheetXml = await archive.file("xl/worksheets/sheet1.xml")!.async("string");
+    archive.file(
+      "xl/worksheets/sheet1.xml",
+      sheetXml.replace(
+        "</worksheet>",
+        '<drawing xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" r:id="drawing"/></worksheet>',
+      ),
+    );
+    const bytes = await archive.generateAsync({ type: "arraybuffer" });
+    const client = createWorkerClient<SheetMethods>(
+      new Worker(new URL("./spreadsheet.worker.ts", import.meta.url), { type: "module" }),
+    );
+    try {
+      const opened = await client.call("open", {
+        bytes,
+        view: { hiddenGridlines: [], themeFonts: { major: "Calibri Light", minor: "Calibri" } },
+      });
+      expect(opened!.layout.chartWidth).toBeGreaterThan(0);
+      expect(opened!.layout.chartHeight).toBeGreaterThan(0);
+      if (frozen) {
+        const viewport = {
+          sheet: 0,
+          width: 400,
+          height: 200,
+          ratio: 1,
+          offset: { x: 0, y: 0 },
+          wider: undefined,
+        };
+        const clipped = await client.call("frame", { ...viewport, x: 32, y: 10 });
+        expect(clipped!.grid!.colOffsets[2]! - clipped!.grid!.colOffsets[1]!).toBeCloseTo(32, 0);
+        expect(clipped!.grid!.rowOffsets[2]! - clipped!.grid!.rowOffsets[1]!).toBeCloseTo(10, 0);
+        clipped!.bitmap.close();
+        await client.call("resize", { sheet: 0, axis: "column", index: 2, delta: 1 });
+        await client.call("resize", { sheet: 0, axis: "row", index: 2, delta: 1 });
+        const resized = await client.call("frame", { ...viewport, x: 0, y: 0 });
+        expect(resized!.grid!.colOffsets[2]! - resized!.grid!.colOffsets[1]!).toBeCloseTo(65, 0);
+        expect(resized!.grid!.rowOffsets[2]! - resized!.grid!.rowOffsets[1]!).toBeCloseTo(21, 0);
+        resized!.bitmap.close();
+      }
+      const other = await client.call("position", { sheet: 1, cell: { row: 0, col: 0 } });
+      const widened = await client.call("resize", {
+        sheet: 0,
+        axis: "column",
+        index: 0,
+        delta: 81,
+      });
+      expect(widened.chartWidth - opened!.layout.chartWidth).toBeCloseTo(frozen ? 1 : 81, 0);
+      const taller = await client.call("resize", { sheet: 0, axis: "row", index: 0, delta: 40 });
+      expect(taller.chartHeight - opened!.layout.chartHeight).toBeCloseTo(frozen ? 1 : 40, 0);
+      await expect(
+        client.call("resize", { sheet: 0, axis: "row", index: 0, delta: NaN }),
+      ).rejects.toThrow("Invalid track resize");
+      expect(await client.call("position", { sheet: 1, cell: { row: 0, col: 0 } })).toEqual(other);
+      await client.call("show", { sheet: 1 });
+      await client.call("show", { sheet: 0 });
+      const position = await client.call("position", { sheet: 0, cell: { row: 0, col: 0 } });
+      if (!frozen) {
+        expect(position!.next.x - position!.start.x).toBeCloseTo(145, 0);
+        expect(position!.next.y - position!.start.y).toBeCloseTo(60, 0);
+      }
+      expect(
+        await client.call("cells", { sheet: 0, range: { top: 0, bottom: 0, left: 0, right: 0 } }),
+      ).toEqual([["42"]]);
+      const frame = await client.call("frame", {
+        sheet: 0,
+        x: 0,
+        y: 0,
+        width: 400,
+        height: 200,
+        ratio: 1,
+        offset: { x: 0, y: 0 },
+        wider: undefined,
+      });
+      expect(frame?.grid?.colOffsets[1]).toBeCloseTo(145, 0);
+      expect(frame?.grid?.rowOffsets[1]).toBeCloseTo(60, 0);
+      if (frozen) {
+        expect(frame?.frozen.width).toBeCloseTo(145, 0);
+        expect(frame?.frozen.height).toBeCloseTo(60, 0);
+        expect(frame?.grid?.colIndices).not.toContain(1);
+        expect(frame?.grid?.rowIndices).not.toContain(1);
+      }
+      frame?.bitmap.close();
+      await client.call("resize", { sheet: 0, axis: "column", index: 0, delta: 10_000 });
+      await client.call("resize", { sheet: 0, axis: "row", index: 0, delta: -10_000 });
+      const limited = await client.call("frame", {
+        sheet: 0,
+        x: 0,
+        y: 0,
+        width: 2000,
+        height: 200,
+        ratio: 1,
+        offset: { x: 0, y: 0 },
+        wider: undefined,
+      });
+      expect(limited!.grid!.colOffsets[1]).toBeCloseTo(maximumTrackSize.column, 0);
+      expect(limited!.grid!.rowOffsets[1]).toBeCloseTo(16, 0);
+      limited!.bitmap.close();
+    } finally {
+      client.close();
+    }
+  },
+);
+
+it("requests current dimensions after resizing and scrolling away and back before a frame arrives", async () => {
+  const archive = new JSZip();
+  archive.file(
+    "xl/workbook.xml",
+    '<workbook xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships"><sheets><sheet name="Sample" sheetId="1" r:id="sheet"/></sheets></workbook>',
+  );
+  archive.file(
+    "xl/_rels/workbook.xml.rels",
+    '<Relationships><Relationship Id="sheet" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet" Target="worksheets/sheet1.xml"/></Relationships>',
+  );
+  archive.file(
+    "xl/worksheets/sheet1.xml",
+    '<worksheet><sheetData><row r="1"><c r="A1"><v>42</v></c></row><row r="1000"><c r="A1000"><v>99</v></c></row></sheetData></worksheet>',
+  );
+  const bytes = await archive.generateAsync({ type: "arraybuffer" });
+  const container = document.createElement("div");
+  Object.assign(container.style, { display: "flex", width: "500px", height: "300px" });
+  const onError = vi.fn();
+  await using screen = await render(
+    createElement(Spreadsheet, {
+      bytes,
+      view: { hiddenGridlines: [], themeFonts: { major: "Calibri Light", minor: "Calibri" } },
+      onDetails: vi.fn(),
+      onError,
+    }),
+    { container },
+  );
+  await expect.element(screen.getByRole("grid", { name: "Sample" })).toBeVisible();
+  const root = screen.getByRole("grid", { name: "Sample" }).element();
+  const canvas = root.querySelector("canvas")!;
+  await vi.waitFor(() => {
+    expect(canvas.getContext("2d")!.getImageData(10, 10, 1, 1).data[0]).toBeGreaterThan(0);
+    expect(canvas.getContext("2d")!.getImageData(10, 10, 1, 1).data[0]).toBeLessThan(255);
+  });
+  const postMessage = Worker.prototype.postMessage;
+  const pending: { worker: Worker; message: unknown; options: unknown }[] = [];
+  using _frames = vi.spyOn(Worker.prototype, "postMessage").mockImplementation(function (
+    this: Worker,
+    message: unknown,
+    options?: Transferable[] | StructuredSerializeOptions,
+  ) {
+    if (
+      typeof message === "object" &&
+      message !== null &&
+      "method" in message &&
+      message.method === "frame"
+    ) {
+      pending.push({ worker: this, message, options });
+      return;
+    }
+    Reflect.apply(postMessage, this, [message, options]);
+  });
+  // Synthetic pointer events have no browser pointer to capture.
+  using _capture = vi.spyOn(root, "setPointerCapture").mockImplementation(() => {});
+  using _release = vi.spyOn(root, "releasePointerCapture").mockImplementation(() => {});
+  const rect = canvas.getBoundingClientRect();
+  const pointer = { bubbles: true, pointerId: 1, button: 0, clientY: rect.top + 10 };
+  await act(() => {
+    root.dispatchEvent(new PointerEvent("pointerdown", { ...pointer, clientX: rect.left + 108 }));
+    root.dispatchEvent(new PointerEvent("pointermove", { ...pointer, clientX: rect.left + 148 }));
+    root.dispatchEvent(new PointerEvent("pointerup", { ...pointer, clientX: rect.left + 148 }));
+  });
+  await vi.waitFor(() => expect(pending).toHaveLength(1));
+  await act(() => root.scrollTo({ top: 2000 }));
+  await vi.waitFor(() => expect(pending).toHaveLength(2));
+  await act(() => root.scrollTo({ top: 0 }));
+  await vi.waitFor(() => expect(pending).toHaveLength(3));
+  expect(pending[2]!.message).toMatchObject({ input: { x: 0, y: 0 } });
+  const frame = pending[2]!;
+  if (typeof frame.message !== "object" || frame.message === null || !("id" in frame.message))
+    throw new Error("Missing frame request id");
+  frame.worker.dispatchEvent(
+    new MessageEvent("message", {
+      data: { id: frame.message.id, ok: false, superseded: false, message: "Frame failed" },
+    }),
+  );
+  await expect
+    .element(screen.getByRole("status"))
+    .toHaveTextContent("These cells could not be drawn.");
+  await act(() => root.dispatchEvent(new Event("scroll")));
+  await vi.waitFor(() => expect(pending).toHaveLength(4));
+  const retry = pending[3]!;
+  expect(retry.message).toMatchObject({ input: { x: 0, y: 0 } });
+  Reflect.apply(postMessage, retry.worker, [retry.message, retry.options]);
+  await expect.element(screen.getByRole("status")).not.toBeInTheDocument();
+  const ratio = window.devicePixelRatio || 1;
+  await vi.waitFor(() => {
+    expect([
+      ...canvas.getContext("2d")!.getImageData(Math.round(140 * ratio), Math.round(5 * ratio), 1, 1)
+        .data,
+    ]).toEqual([211, 236, 221, 255]);
+  });
+  expect(onError).not.toHaveBeenCalled();
+});
diff --git a/apps/web/src/components/files/office/sheet-sizing.ts b/apps/web/src/components/files/office/sheet-sizing.ts
new file mode 100644
index 000000000000..ee799d2d9346
--- /dev/null
+++ b/apps/web/src/components/files/office/sheet-sizing.ts
@@ -0,0 +1,3 @@
+// Excel's 255-character column width and 409.5-point row height, in the renderer's CSS pixels.
+export const maximumTrackSize = { column: 255 * 7 + 5, row: (409.5 * 4) / 3 };
+export const minimumTrackSize = 16;
diff --git a/apps/web/src/components/files/office/sheet-viewport.test.ts b/apps/web/src/components/files/office/sheet-viewport.test.ts
new file mode 100644
index 000000000000..80c0b9ce1d4e
--- /dev/null
+++ b/apps/web/src/components/files/office/sheet-viewport.test.ts
@@ -0,0 +1,54 @@
+import { expect, it } from "vite-plus/test";
+import { bufferedViewport, cachedViewport, retainCachedViewport } from "./sheet-viewport";
+
+it.each([
+  { x: 150, y: 400, expected: { x: 150, y: 400 } },
+  { x: 50, y: 100, expected: { x: 100, y: 300 } },
+  { x: 500, y: 1000, expected: { x: 300, y: 700 } },
+])("keeps a viewport at ($x, $y) inside the cached bitmap", ({ x, y, expected }) => {
+  expect(
+    cachedViewport({ x: 100, y: 300, width: 800, height: 1000 }, { x, y, width: 600, height: 600 }),
+  ).toEqual(expected);
+});
+
+it("keeps the cache origin when a resized viewport is larger than the bitmap", () => {
+  expect(
+    cachedViewport(
+      { x: 100, y: 300, width: 400, height: 400 },
+      { x: 50, y: 100, width: 600, height: 600 },
+    ),
+  ).toEqual({ x: 100, y: 300 });
+});
+
+it.each([
+  { x: 0, y: 0 },
+  { x: 50, y: 100 },
+  { x: 1000, y: 2000 },
+])("buffers both scroll directions without going past the sheet origin ($x, $y)", (point) => {
+  const viewport = { ...point, width: 600, height: 600 };
+  const frame = bufferedViewport(viewport);
+  expect(frame.x).toBe(Math.max(0, point.x - 128));
+  expect(frame.y).toBe(Math.max(0, point.y - 200));
+  expect(frame.x + frame.width).toBe(point.x + viewport.width + 128);
+  expect(frame.y + frame.height).toBe(point.y + viewport.height + 200);
+  expect(cachedViewport(frame, viewport)).toEqual(point);
+});
+
+it.each([
+  { cachedX: 0, incomingX: 1000, currentX: 0, expected: true },
+  { cachedX: 0, incomingX: 1000, currentX: 1000, expected: false },
+  { cachedX: 0, incomingX: 1000, currentX: 2000, expected: false },
+  { cachedX: 0, incomingX: 100, currentX: 200, expected: false },
+])(
+  "retains useful cached cells when a distant frame arrives at $currentX",
+  ({ cachedX, incomingX, currentX, expected }) => {
+    const size = { y: 0, width: 800, height: 800 };
+    expect(
+      retainCachedViewport(
+        { ...size, x: cachedX },
+        { ...size, x: incomingX },
+        { ...size, x: currentX, width: 400, height: 400 },
+      ),
+    ).toBe(expected);
+  },
+);
diff --git a/apps/web/src/components/files/office/sheet-viewport.ts b/apps/web/src/components/files/office/sheet-viewport.ts
new file mode 100644
index 000000000000..13c5500246fa
--- /dev/null
+++ b/apps/web/src/components/files/office/sheet-viewport.ts
@@ -0,0 +1,37 @@
+import type { SheetViewport } from "./sheet-protocol";
+
+export function cachedViewport(frame: SheetViewport, viewport: SheetViewport) {
+  return {
+    x: Math.max(frame.x, Math.min(viewport.x, frame.x + Math.max(0, frame.width - viewport.width))),
+    y: Math.max(
+      frame.y,
+      Math.min(viewport.y, frame.y + Math.max(0, frame.height - viewport.height)),
+    ),
+  };
+}
+
+export function bufferedViewport(viewport: SheetViewport): SheetViewport {
+  const marginX = Math.min(128, viewport.width / 4);
+  const marginY = Math.min(256, viewport.height / 3);
+  const x = Math.max(0, viewport.x - marginX);
+  const y = Math.max(0, viewport.y - marginY);
+  return {
+    x,
+    y,
+    width: viewport.width + viewport.x - x + marginX,
+    height: viewport.height + viewport.y - y + marginY,
+  };
+}
+
+export function retainCachedViewport(
+  cached: SheetViewport,
+  incoming: SheetViewport,
+  current: SheetViewport,
+) {
+  const covers = (frame: SheetViewport) =>
+    frame.x <= current.x &&
+    frame.y <= current.y &&
+    frame.x + frame.width >= current.x + current.width &&
+    frame.y + frame.height >= current.y + current.height;
+  return covers(cached) && !covers(incoming);
+}
diff --git a/apps/web/src/components/files/office/spreadsheet.worker.ts b/apps/web/src/components/files/office/spreadsheet.worker.ts
index 466e29b29bff..56a3c7ba4c33 100644
--- a/apps/web/src/components/files/office/spreadsheet.worker.ts
+++ b/apps/web/src/components/files/office/spreadsheet.worker.ts
@@ -12,6 +12,7 @@ import type { CellRange } from "@betteroffice/xlsx/headless";
 import { anchorRange, attempt, lastCell, parseRange, parseSpans } from "./sheet-cells";
 import type { WorkbookView } from "../officePreviewProtocol";
 import { chartFonts, drawFrame, paintFrame, withoutGridlines } from "./sheet-frame";
+import { maximumTrackSize, minimumTrackSize } from "./sheet-sizing";
 import { sheetFonts } from "./sheet-fonts";
 import { frozenSize } from "./sheet-paint";
 import type { SheetLayout, SheetMethods, SheetTab } from "./sheet-protocol";
@@ -78,6 +79,34 @@ serveWorker<SheetMethods>({
 
     throw new Error(`Sheet ${input.sheet} could not open`);
   },
+  resize: (input) => {
+    const opened = active(input.sheet);
+    if (
+      !Number.isInteger(input.index) ||
+      input.index < 0 ||
+      input.index > (input.axis === "row" ? lastCell.row : lastCell.col) ||
+      !Number.isFinite(input.delta)
+    )
+      throw new Error("Invalid track resize");
+    const rect = opened.workbook.cellRect(
+      input.sheet,
+      input.axis === "row" ? input.index : 0,
+      input.axis === "column" ? input.index : 0,
+    );
+    const current = input.axis === "column" ? rect.w : rect.h;
+    const size = Math.max(
+      minimumTrackSize,
+      Math.min(maximumTrackSize[input.axis], current + input.delta),
+    );
+    const operation =
+      input.axis === "column"
+        ? { type: "setColWidth", sheet: input.sheet, col: input.index, width: (size - 5) / 7 }
+        : { type: "setRowHeight", sheet: input.sheet, row: input.index, height: size * 0.75 };
+    opened.info = opened.workbook.applyOps([operation]).sheetInfo;
+    opened.ends.clear();
+    const { chartWidth, chartHeight } = layout(opened.workbook, input.sheet);
+    return { info: opened.info, chartWidth, chartHeight };
+  },
   frame: async (input) => {
     const opened = active(input.sheet);
     const frozen = { rows: opened.info.frozenRows, cols: opened.info.frozenCols };
diff --git a/apps/web/src/components/files/pdfLayout.test.ts b/apps/web/src/components/files/pdfLayout.test.ts
index e06dc188e447..f2500d5b6d5d 100644
--- a/apps/web/src/components/files/pdfLayout.test.ts
+++ b/apps/web/src/components/files/pdfLayout.test.ts
@@ -67,6 +67,8 @@ describe("mixed-height page layout", () => {
     expect(indexes(0, 100)).toEqual([0, 1]);
     expect(indexes(1100, 100)).toEqual([2]);
     expect(indexes(1100, 900)).toEqual([1, 2]);
+    // Page 2 starts 180px (1.8 viewports) below the visible bottom of 800.
+    expect(indexes(700, 100)).toEqual([1, 2]);
     expect(visiblePdfPages(ratios, offsets, 0, 100)[0]).toEqual({ index: 0, ratio: ratios[0] });
   });
 
diff --git a/apps/web/src/components/files/pdfLayout.ts b/apps/web/src/components/files/pdfLayout.ts
index 0ac3832c70bc..c39286a1ef41 100644
--- a/apps/web/src/components/files/pdfLayout.ts
+++ b/apps/web/src/components/files/pdfLayout.ts
@@ -40,7 +40,7 @@ export function visiblePdfPages(
 ) {
   return ratios.flatMap((ratio, index) =>
     offsets[index + 1]! >= scrollTop - viewportHeight &&
-    offsets[index]! <= scrollTop + viewportHeight * 2
+    offsets[index]! <= scrollTop + viewportHeight * 3
       ? [{ index, ratio }]
       : [],
   );
diff --git a/apps/web/src/components/files/projectFilesQueryState.test.tsx b/apps/web/src/components/files/projectFilesQueryState.refresh.test.tsx
similarity index 99%
rename from apps/web/src/components/files/projectFilesQueryState.test.tsx
rename to apps/web/src/components/files/projectFilesQueryState.refresh.test.tsx
index d775d9011857..22acb9bfdab7 100644
--- a/apps/web/src/components/files/projectFilesQueryState.test.tsx
+++ b/apps/web/src/components/files/projectFilesQueryState.refresh.test.tsx
@@ -2,6 +2,7 @@ import {
   AuthFilesystemReadScope,
   EnvironmentId,
   type AuthSessionState,
+  type ProjectFileFailure,
   ProjectReadFileError,
   type ProjectReadFileResult,
 } from "@t3tools/contracts";
@@ -246,7 +247,7 @@ describe("project query refresh", () => {
   it("confirms files from reads and preserves that identity until a definitive folder result", () => {
     const contents = file("# readme");
     const success = AsyncResult.success(contents);
-    const failure = (kind: ProjectReadFileError["failure"], cached = false) =>
+    const failure = (kind: ProjectFileFailure, cached = false) =>
       AsyncResult.failure(
         Cause.fail(
           new ProjectReadFileError({ cwd: "/repo", relativePath: "src/preview.ts", failure: kind }),
diff --git a/apps/web/src/components/mcp/UseInAnotherAppDialog.tsx b/apps/web/src/components/mcp/UseInAnotherAppDialog.tsx
index 8518f75263c8..93666b3d243e 100644
--- a/apps/web/src/components/mcp/UseInAnotherAppDialog.tsx
+++ b/apps/web/src/components/mcp/UseInAnotherAppDialog.tsx
@@ -692,7 +692,7 @@ function PrimaryAction({ app, mcpUrl }: { readonly app: McpApp; readonly mcpUrl:
           ? {}
           : {
               actionProps: {
-                children: appLink === null ? `Open ${app.name}` : `Open ${app.name} on the web`,
+                children: appLink === null ? `Open ${app.name}` : `Get ${app.name}`,
                 onClick: () => openLink(link),
               },
             }),
diff --git a/apps/web/src/components/mcp/mcpApps.test.ts b/apps/web/src/components/mcp/mcpApps.test.ts
index 2e9328cf7878..b452c1ae73cd 100644
--- a/apps/web/src/components/mcp/mcpApps.test.ts
+++ b/apps/web/src/components/mcp/mcpApps.test.ts
@@ -18,12 +18,15 @@ describe("MCP app links", () => {
     expect(claude.searchParams.get("connectorUrl")).toBe(MCP_URL);
   });
 
-  // The desktop app opens only https links and the bare app launch links it lists.
+  // The desktop app opens only https links and the app launch links it lists.
   it.each(MCP_APPS.map((app) => [app.name, app] as const))("%s opens only https", (_, app) => {
     const action = mcpHandoffAction(app, MCP_URL);
     for (const url of [action?.link, app.docs].filter((value) => value != null)) {
       expect(new URL(url).protocol).toBe("https:");
     }
-    expect(action?.appLink ?? null).toBe(app.id === "grok-bot" ? "grokbot://app" : null);
+    // Grok Bot's app link prefills the message it copies.
+    const appLink = action?.appLink == null ? null : new URL(action.appLink);
+    expect(appLink?.protocol ?? null).toBe(app.id === "grok-bot" ? "grokbot:" : null);
+    if (appLink) expect(appLink.searchParams.get("text")).toBe(action?.copy?.text);
   });
 });
diff --git a/apps/web/src/components/mcp/mcpApps.ts b/apps/web/src/components/mcp/mcpApps.ts
index e32dac3e361e..a8408823d4b5 100644
--- a/apps/web/src/components/mcp/mcpApps.ts
+++ b/apps/web/src/components/mcp/mcpApps.ts
@@ -20,7 +20,7 @@ export type McpAppHandoff =
       readonly link: string;
       /**
        * Opens the installed app first, given the message; `link` is the fallback. The desktop
-       * app opens only the link shapes `APP_LAUNCH_URLS` in ElectronShell lists.
+       * app opens only the link shapes `isAppLaunchUrl` in ElectronShell accepts.
        */
       readonly appLink?: (message: string) => string;
       readonly message: (mcpUrl: string) => string;
@@ -88,12 +88,11 @@ export const MCP_APPS: readonly McpApp[] = [
     id: "grok-bot",
     name: "Grok Bot",
     logo: grokBotLogo,
-    // No web chat, and no link that prefills a message yet (Grok Bot plans one), so the app
-    // opens bare and the copied message is pasted in.
+    // No web chat. The app link prefills the message only into an empty box, so it is copied too.
     handoff: {
       kind: "copy-message",
       link: "https://x.ai/bot",
-      appLink: () => "grokbot://app",
+      appLink: (message) => `grokbot://app/v1/prompt?text=${encoded(message)}`,
       message: (url) => `Add the MCP server ${url} and connect it.`,
     },
     steps: ["Send this message to any of your Grok Bots."],
diff --git a/apps/web/src/components/preview/PreviewAnnotationSpeech.tsx b/apps/web/src/components/preview/PreviewAnnotationSpeech.tsx
index 8d52066cd5f7..c76e39a14731 100644
--- a/apps/web/src/components/preview/PreviewAnnotationSpeech.tsx
+++ b/apps/web/src/components/preview/PreviewAnnotationSpeech.tsx
@@ -5,7 +5,7 @@ import type {
   ScopedThreadRef,
 } from "@t3tools/contracts";
 import { useNavigate } from "@tanstack/react-router";
-import { useEffect, useRef, useState } from "react";
+import { useEffect, useRef } from "react";
 
 import { resolveSpeechPresentation } from "~/components/chat/ComposerSpeechButton";
 import { VoiceInputSetup } from "~/components/chat/VoiceInputSetup";
@@ -40,7 +40,6 @@ export function PreviewAnnotationSpeech({
     projectId ? scopeProjectRef(threadRef.environmentId, projectId) : null,
   );
   const draft = useRef({ text: "", cursor: 0, selectionEnd: 0 });
-  const [text, setText] = useState("");
   const keys = useRef<DictationKeyHandlers | null>(null);
   const guestFocused = useRef(false);
   // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- notices focus returning from the preview guest to this window
@@ -60,7 +59,6 @@ export function PreviewAnnotationSpeech({
     projectId,
     projectName: project?.title,
     ownerKey: JSON.stringify(["preview-annotation", threadRef, tabId, config.sessionId]),
-    draftText: text,
     offerSetup: false,
     readDraft: () => ({
       text: draft.current.text,
@@ -68,7 +66,6 @@ export function PreviewAnnotationSpeech({
     }),
     commitDraft: (next, selection) => {
       draft.current = { text: next, cursor: selection.start, selectionEnd: selection.end };
-      setText(next);
       void publish(current.current.voiceState, { text: next, cursor: selection.start });
     },
   });
@@ -136,7 +133,6 @@ export function PreviewAnnotationSpeech({
             cursor: Math.min(event.cursor, event.text.length),
             selectionEnd: Math.min(event.selectionEnd ?? event.cursor, event.text.length),
           };
-          setText(event.text);
           if (event.action === "focus" || event.action === "key" || event.action === "start")
             guestFocused.current = true;
           if (event.action === "blur") guestFocused.current = false;
diff --git a/apps/web/src/components/preview/PreviewChromeRow.tsx b/apps/web/src/components/preview/PreviewChromeRow.tsx
index 90175cd0b425..8008990cd283 100644
--- a/apps/web/src/components/preview/PreviewChromeRow.tsx
+++ b/apps/web/src/components/preview/PreviewChromeRow.tsx
@@ -32,6 +32,7 @@ interface Props {
   onBack: () => void;
   onForward: () => void;
   onRefresh: () => void;
+  onStopLoading: () => void;
   onSubmit: (url: string) => void;
   onOpenInBrowser?: (() => void) | undefined;
   onCapture?: ((record: boolean) => void) | undefined;
@@ -61,6 +62,7 @@ export function PreviewChromeRow({
   onBack,
   onForward,
   onRefresh,
+  onStopLoading,
   onSubmit,
   onOpenInBrowser,
   onCapture,
@@ -135,7 +137,7 @@ export function PreviewChromeRow({
                 <Button
                   variant="ghost"
                   size="icon-xs"
-                  onClick={refreshDisabled ? NOOP : onRefresh}
+                  onClick={refreshDisabled ? NOOP : loading ? onStopLoading : onRefresh}
                   disabled={refreshDisabled}
                   aria-label={loading ? "Stop" : "Refresh"}
                   type="button"
@@ -144,7 +146,7 @@ export function PreviewChromeRow({
             >
               <RefreshIcon refreshing={loading} />
             </TooltipTrigger>
-            <TooltipPopup>{loading ? "Loading…" : "Refresh"}</TooltipPopup>
+            <TooltipPopup>{loading ? "Stop" : "Refresh"}</TooltipPopup>
           </Tooltip>
         </div>
 
diff --git a/apps/web/src/components/preview/PreviewView.browser.test.tsx b/apps/web/src/components/preview/PreviewView.browser.test.tsx
index 9bc3bdcf53cd..2766cf6abf09 100644
--- a/apps/web/src/components/preview/PreviewView.browser.test.tsx
+++ b/apps/web/src/components/preview/PreviewView.browser.test.tsx
@@ -33,6 +33,7 @@ const mocks = vi.hoisted(() => ({
   idleServerTab: false,
   loading: false,
   nativeServerTab: false,
+  streamedServerTab: false,
   serverEpoch: null as string | null,
   servers: [] as PreviewableServer[],
   recordingTabIds: new Set<string>(),
@@ -132,7 +133,7 @@ vi.mock(import("~/previewStateStore"), async (original) => ({
             "tab-1": {
               threadId: "thread-1",
               tabId: "tab-1",
-              runtime: mocks.nativeServerTab ? "server" : "desktop",
+              runtime: mocks.nativeServerTab || mocks.streamedServerTab ? "server" : "desktop",
               navStatus: { _tag: "Success", url: "http://example.com/", title: "Example" },
               canGoBack: false,
               canGoForward: false,
@@ -176,6 +177,8 @@ vi.mock(import("~/browser/ServerBrowserSurface"), async (original) => ({
 }));
 
 import { useComposerDraftStore } from "~/composerDraftStore";
+import { commitBrowserViewportChange } from "~/browser/browserViewportActions";
+import { resolveResponsiveBrowserViewportSize } from "~/browser/browserViewportLayout";
 import { useBrowserPointerStore } from "~/browser/browserPointerStore";
 import { previewRuntimeTabId } from "~/browser/previewRuntimeTabId";
 import { usePreviewMiniPlayerStore } from "~/previewMiniPlayerStore";
@@ -227,6 +230,7 @@ function setup() {
   mocks.idleServerTab = false;
   mocks.loading = false;
   mocks.nativeServerTab = false;
+  mocks.streamedServerTab = false;
   mocks.serverEpoch = null;
   mocks.servers = [];
   mocks.recordingTabIds = new Set();
@@ -359,6 +363,23 @@ describe("PreviewView", () => {
     expect(card.element().contains(hit)).toBe(true);
   });
 
+  it("sizes the first device viewport of a streamed tab to its panel", async () => {
+    setup();
+    mocks.streamedServerTab = true;
+    await using _screen = await render(<ToastProvider timeout={0}>{view()}</ToastProvider>);
+    const surface = page.getByTestId("server-browser-surface");
+    await expect.element(surface).toBeInTheDocument();
+    const rect = surface.element().getBoundingClientRect();
+
+    await userEvent.click(page.getByRole("button", { name: "Preview menu" }));
+    await userEvent.click(page.getByRole("menuitem", { name: "Show device toolbar" }));
+
+    expect(commitBrowserViewportChange).toHaveBeenCalledWith(expect.anything(), {
+      _tag: "freeform",
+      ...resolveResponsiveBrowserViewportSize(rect, 1),
+    });
+  });
+
   it("focuses and selects the address from forwarded desktop actions only while visible", async () => {
     setup();
     using stack = new DisposableStack();
diff --git a/apps/web/src/components/preview/PreviewView.tsx b/apps/web/src/components/preview/PreviewView.tsx
index c5e561a2887c..f7cb3082491e 100644
--- a/apps/web/src/components/preview/PreviewView.tsx
+++ b/apps/web/src/components/preview/PreviewView.tsx
@@ -213,6 +213,7 @@ export function PreviewView({
   const isServerTab = snapshot?.runtime === "server" && !nativeServerTab;
   const serverOwnsRendering = snapshot?.runtime === "server";
   const serverSurfaceRef = useRef<ServerBrowserHandle | null>(null);
+  const serverSurfaceBoxRef = useRef<HTMLDivElement | null>(null);
   const [serverAspectRatioLocked, setServerAspectRatioLocked] = useState(false);
   const [serverToolbarWidth, setServerToolbarWidth] = useState(0);
   const serverToolbarShown =
@@ -333,6 +334,11 @@ export function PreviewView({
     else if (previewBridge && runtimeTabId) void previewBridge.refresh(runtimeTabId);
   };
 
+  const handleStopLoading = () => {
+    if (isServerTab) serverSurfaceRef.current?.stopLoading();
+    else if (previewBridge && runtimeTabId) void previewBridge.stopLoading(runtimeTabId);
+  };
+
   const adjustServerTab = async (change: Omit<PreviewAdjustInput, "threadId" | "tabId">) => {
     if (!tabId) return;
     const result = await adjust({
@@ -414,7 +420,10 @@ export function PreviewView({
       target,
       browserResponsiveViewportForToggle({
         defaults: browserDefaults,
-        panelRect,
+        // Only BrowserSurfaceSlot publishes a store rect; streamed tabs measure their own box.
+        panelRect: isServerTab
+          ? (serverSurfaceBoxRef.current?.getBoundingClientRect() ?? null)
+          : panelRect,
         zoomFactor: isServerTab ? serverZoomFactor : layoutZoomFactor,
       }),
     ).catch(() => undefined);
@@ -944,6 +953,9 @@ export function PreviewView({
     // shortcuts from the guest as menu actions instead.
     const unsubscribeMenu = window.desktopBridge?.onMenuAction((action) => {
       if (action === "preview.focusUrl") onPreviewAction("focus-url");
+      if (action === "preview.zoomIn") onPreviewAction("zoom-in");
+      if (action === "preview.zoomOut") onPreviewAction("zoom-out");
+      if (action === "preview.resetZoom") onPreviewAction("reset-zoom");
       if (action === "preview.find") onPreviewAction("find");
     });
     return () => {
@@ -977,6 +989,7 @@ export function PreviewView({
         onBack={handleBack}
         onForward={handleForward}
         onRefresh={handleRefresh}
+        onStopLoading={handleStopLoading}
         onSubmit={(next) => void handleSubmitUrl(next)}
         onOpenInBrowser={tabId ? handleOpenInBrowser : undefined}
         onCapture={previewBridge && tabId && !isServerTab ? handleCapture : undefined}
@@ -1056,6 +1069,7 @@ export function PreviewView({
               </div>
             ) : null}
             <div
+              ref={serverSurfaceBoxRef}
               className={cn(
                 "absolute inset-x-0 bottom-0",
                 (showEmptyState || isUnreachable) && "invisible",
diff --git a/apps/web/src/components/preview/usePreviewBridge.test.ts b/apps/web/src/components/preview/usePreviewBridge.test.ts
index 736ac7d743c3..be98eebcd91b 100644
--- a/apps/web/src/components/preview/usePreviewBridge.test.ts
+++ b/apps/web/src/components/preview/usePreviewBridge.test.ts
@@ -1,9 +1,9 @@
-import type { DesktopPreviewTabState } from "@t3tools/contracts";
+import { ThreadId, type DesktopPreviewTabState } from "@t3tools/contracts";
 import { describe, expect, it } from "vite-plus/test";
 
 import { useBrowserSurfaceStore } from "~/browser/browserSurfaceStore";
 
-import { createCaptureActivity, projectDesktopState } from "./usePreviewBridge";
+import { buildReportInput, createCaptureActivity, projectDesktopState } from "./usePreviewBridge";
 
 const favicon = {
   dataUrl: "data:image/png;base64,AAAA",
@@ -30,6 +30,41 @@ function state(navStatus: DesktopPreviewTabState["navStatus"]): DesktopPreviewTa
   };
 }
 
+describe("buildReportInput", () => {
+  it("reports title changes at the same URL without repeating unrelated desktop updates", () => {
+    const threadId = ThreadId.make("thread-1");
+    const tabId = "tab-1";
+    const url = "http://localhost:3000/app";
+    let lastReport = {
+      lastReportedUrl: null as string | null,
+      lastReportedKind: null as DesktopPreviewTabState["navStatus"]["kind"] | null,
+      lastReportedTitle: null as string | null,
+    };
+    const report = (nextState: DesktopPreviewTabState) => {
+      const result = buildReportInput({ threadId, tabId, state: nextState, ...lastReport });
+      if (result) {
+        lastReport = result;
+      }
+      return result?.input.navStatus ?? null;
+    };
+
+    const loaded = state({ kind: "Success", url, title: "Original title" });
+    expect(report(loaded)).toEqual({ _tag: "Success", url, title: "Original title" });
+    expect(report(loaded)).toBeNull();
+
+    const retitled = state({ kind: "Success", url, title: "Updated title" });
+    expect(report(retitled)).toEqual({ _tag: "Success", url, title: "Updated title" });
+    expect(
+      report({
+        ...retitled,
+        audible: true,
+        controller: "human",
+        updatedAt: "2026-08-09T00:00:01.000Z",
+      }),
+    ).toBeNull();
+  });
+});
+
 describe("projectDesktopState", () => {
   it("shows a retained icon only while the current document has the captured origin", () => {
     expect(
diff --git a/apps/web/src/components/preview/usePreviewBridge.ts b/apps/web/src/components/preview/usePreviewBridge.ts
index 92bc9b29b35c..6973f22f7dd3 100644
--- a/apps/web/src/components/preview/usePreviewBridge.ts
+++ b/apps/web/src/components/preview/usePreviewBridge.ts
@@ -54,6 +54,7 @@ export function usePreviewBridge(input: {
 
   const lastReportedUrl = useRef<string | null>(null);
   const lastReportedKind = useRef<DesktopPreviewTabState["navStatus"]["kind"] | null>(null);
+  const lastReportedTitle = useRef<string | null>(null);
   const lastDesktopNavStatus = useRef<DesktopPreviewTabState["navStatus"] | null>(null);
   const captureActivity = useRef<ReturnType<typeof createCaptureActivity> | null>(null);
   const handleStateChange = useEffectEvent(
@@ -74,10 +75,12 @@ export function usePreviewBridge(input: {
         state,
         lastReportedUrl: lastReportedUrl.current,
         lastReportedKind: lastReportedKind.current,
+        lastReportedTitle: lastReportedTitle.current,
       });
       if (!reported || serverDriven) return;
       lastReportedUrl.current = reported.lastReportedUrl;
       lastReportedKind.current = reported.lastReportedKind;
+      lastReportedTitle.current = reported.lastReportedTitle;
       void reportStatus({
         environmentId: stableThreadRef.environmentId,
         input: reported.input,
@@ -89,6 +92,7 @@ export function usePreviewBridge(input: {
     if (!previewBridge || typeof window === "undefined") return;
     lastReportedUrl.current = null;
     lastReportedKind.current = null;
+    lastReportedTitle.current = null;
     lastDesktopNavStatus.current = null;
     const activity = createCaptureActivity(runtimeTabId);
     captureActivity.current = activity;
@@ -134,25 +138,28 @@ export function projectDesktopState(state: DesktopPreviewTabState): DesktopPrevi
   };
 }
 
-function buildReportInput(args: {
+export function buildReportInput(args: {
   readonly threadId: ThreadId;
   readonly tabId: string;
   readonly state: DesktopPreviewTabState;
   readonly lastReportedUrl: string | null;
   readonly lastReportedKind: DesktopPreviewTabState["navStatus"]["kind"] | null;
+  readonly lastReportedTitle: string | null;
 }): {
   readonly input: PreviewReportStatusInput;
   readonly lastReportedUrl: string;
   readonly lastReportedKind: DesktopPreviewTabState["navStatus"]["kind"];
+  readonly lastReportedTitle: string;
 } | null {
-  const { threadId, tabId, state, lastReportedUrl, lastReportedKind } = args;
+  const { threadId, tabId, state, lastReportedUrl, lastReportedKind, lastReportedTitle } = args;
   const status = state.navStatus;
   if (status.kind === "Idle") return null;
 
   const sameAsLast =
     status.kind !== "LoadFailed" &&
     status.kind === lastReportedKind &&
-    status.url === lastReportedUrl;
+    status.url === lastReportedUrl &&
+    status.title === lastReportedTitle;
   if (sameAsLast) return null;
 
   const base = {
@@ -175,6 +182,7 @@ function buildReportInput(args: {
       },
       lastReportedUrl: status.url,
       lastReportedKind: "LoadFailed",
+      lastReportedTitle: status.title,
     };
   }
   return {
@@ -184,5 +192,6 @@ function buildReportInput(args: {
     },
     lastReportedUrl: status.url,
     lastReportedKind: status.kind,
+    lastReportedTitle: status.title,
   };
 }
diff --git a/apps/web/src/components/pullRequest/PullRequestChecksPopover.tsx b/apps/web/src/components/pullRequest/PullRequestChecksPopover.tsx
index cfcea204a56e..276dc613272d 100644
--- a/apps/web/src/components/pullRequest/PullRequestChecksPopover.tsx
+++ b/apps/web/src/components/pullRequest/PullRequestChecksPopover.tsx
@@ -182,11 +182,15 @@ export function PullRequestChecksPopover({
         {variant === "count" ? (
           <>
             {checks !== undefined && incompleteCount > 0 ? (
-              <span className="tabular-nums">
-                {checks.length - incompleteCount}/{checks.length} checks
+              // Clip the second line so "checks" disappears whole when the count must shrink.
+              <span className="h-lh min-w-0 overflow-hidden text-left whitespace-normal tabular-nums">
+                <span className="whitespace-nowrap">
+                  {checks.length - incompleteCount}/{checks.length}
+                </span>{" "}
+                checks
               </span>
             ) : failedCount > 0 ? (
-              <span className="tabular-nums">{failedCount} failed</span>
+              <span className="min-w-0 truncate tabular-nums">{failedCount} failed</span>
             ) : null}
           </>
         ) : null}
diff --git a/apps/web/src/components/pullRequest/PullRequestCodeTab.tsx b/apps/web/src/components/pullRequest/PullRequestCodeTab.tsx
index febf82441f51..49eb9063c50c 100644
--- a/apps/web/src/components/pullRequest/PullRequestCodeTab.tsx
+++ b/apps/web/src/components/pullRequest/PullRequestCodeTab.tsx
@@ -7,7 +7,12 @@ import {
   capitalizeTerm,
   sourceControlClients,
 } from "@t3tools/client-runtime/source-control-clients";
-import type { CodeViewItem, DiffLineAnnotation, SelectedLineRange } from "@pierre/diffs";
+import type {
+  CodeViewItem,
+  DiffLineAnnotation,
+  FileDiffMetadata,
+  SelectedLineRange,
+} from "@pierre/diffs";
 import type { CodeViewAnnotationArgs, CodeViewDiffItem } from "@pierre/diffs/react";
 import type {
   EnvironmentId,
@@ -20,6 +25,7 @@ import type {
   PullRequestReviewThread,
   PullRequestThreadCommentsResult,
 } from "@t3tools/contracts";
+import { SOURCE_CONTROL_MEDIA_ASSET } from "@t3tools/contracts";
 import {
   ChevronDownIcon,
   ChevronRightIcon,
@@ -64,6 +70,7 @@ import {
 } from "@t3tools/client-runtime/pull-request-editing";
 import { fileDiffRows } from "@t3tools/client-runtime/review-guide-tour";
 import { isTestChangedFile } from "@t3tools/shared/changedFileKind";
+import { isWorkspaceImagePreviewPath } from "@t3tools/shared/mediaPreview";
 import { orderDiffFiles } from "./pullRequestFileOrder.logic";
 import {
   buildFileDiffRenderKey,
@@ -88,6 +95,7 @@ import { pullRequestEnvironment } from "~/state/pullRequests";
 import { useEnvironmentQuery } from "~/state/query";
 import { useAtomCommand } from "~/state/use-atom-command";
 
+import { ChatMarkdownAssetImage } from "../chat/ChatMarkdownMedia";
 import { DiffPanelLoadingState } from "../DiffPanelShell";
 import { useDiffWorkerPool } from "../DiffWorkerPoolProvider";
 import { DiffCommentAnnotation } from "../diffs/DiffCommentAnnotation";
@@ -144,6 +152,7 @@ interface ReviewAnnotationGroup {
   readonly threads: ReadonlyArray<PullRequestReviewThread>;
   readonly pending: ReadonlyArray<PendingReviewComment>;
   readonly draft: boolean;
+  readonly image?: { readonly url: string; readonly path: string };
 }
 
 type ReviewAnnotation = DiffLineAnnotation<ReviewAnnotationGroup>;
@@ -395,7 +404,8 @@ function PullRequestCodeTab({
   const effectiveFoldOverride =
     foldOverride ?? (settings.diffFilesCollapsed ? "folded" : "expanded");
   const diffLayout = settings.diffLayout;
-  const [wordWrap, setWordWrap] = useState(settings.wordWrap);
+  const [wordWrapOverride, setWordWrapOverride] = useState<boolean | null>(null);
+  const wordWrap = wordWrapOverride ?? settings.wordWrap;
   const [ignoreWhitespace, setIgnoreWhitespace] = useState(settings.diffIgnoreWhitespace);
   const [fileTreeOpen, setFileTreeOpen] = useLocalStorage(
     PULL_REQUEST_FILE_TREE_STORAGE_KEY,
@@ -636,6 +646,20 @@ function PullRequestCodeTab({
     return placed;
   })();
 
+  const imageRevision = commit ?? detail.headSha;
+  const rawFileUrl = sourceControlClients.find(detail.provider)?.rawFileUrl;
+  const repositoryUrl = sourceControlClients.parseChangeRequestUrl(detail.url)?.link.repositoryUrl;
+  // Hosts send no patch for an image, so its expanded row shows the file at this revision.
+  const imagePreviewUrl = (fileDiff: FileDiffMetadata, path: string) =>
+    fileDiff.hunks.length === 0 &&
+    fileDiff.type !== "deleted" &&
+    isWorkspaceImagePreviewPath(path) &&
+    imageRevision !== undefined &&
+    rawFileUrl !== undefined &&
+    repositoryUrl !== undefined
+      ? rawFileUrl({ repositoryUrl, sha: imageRevision, path })
+      : null;
+
   const annotatedFiles = files.map((fileDiff) => {
     const fileKey = buildFileDiffRenderKey(fileDiff);
     const path = resolveFileDiffPath(fileDiff);
@@ -688,6 +712,14 @@ function PullRequestCodeTab({
       lineNumber: group.line,
       metadata: { threads: group.threads, pending: group.pending, draft: group.draft },
     }));
+    const imageUrl = imagePreviewUrl(fileDiff, path);
+    if (imageUrl !== null) {
+      annotations.push({
+        side: "additions",
+        lineNumber: 0,
+        metadata: { threads: [], pending: [], draft: false, image: { url: imageUrl, path } },
+      });
+    }
     return {
       fileKey,
       path,
@@ -698,7 +730,7 @@ function PullRequestCodeTab({
         annotations
           .map(
             ({ side, lineNumber, metadata }) =>
-              `${side}:${lineNumber}:${metadata.draft ? "d" : ""}:${metadata.pending
+              `${side}:${lineNumber}:${metadata.image?.url ?? ""}:${metadata.draft ? "d" : ""}:${metadata.pending
                 .map((comment) => `${comment.id}:${comment.body}`)
                 .join(",")}:${metadata.threads
                 .map(
@@ -1084,6 +1116,20 @@ function PullRequestCodeTab({
   const renderAnnotation = (...[annotation]: CodeViewAnnotationArgs<ReviewAnnotationGroup>) => (
     // Folded resolved conversations alone add no row, so the code reads straight through.
     <div className="relative font-sans text-foreground has-[>:not([data-resolved-threads])]:py-1">
+      {annotation.metadata.image ? (
+        <div className="flex justify-center p-3">
+          <ChatMarkdownAssetImage
+            environmentId={environmentId}
+            resource={{
+              _tag: SOURCE_CONTROL_MEDIA_ASSET,
+              cwd: detail.workspaceRoot,
+              url: annotation.metadata.image.url,
+              repository: detail.repository,
+            }}
+            alt={annotation.metadata.image.path}
+          />
+        </div>
+      ) : null}
       <InlineReviewThreads threads={annotation.metadata.threads} renderThread={renderThreadCard} />
       {annotation.metadata.pending.map((comment) => (
         <PendingReviewCommentCard
@@ -1315,7 +1361,7 @@ function PullRequestCodeTab({
             </DropdownMenuCheckboxItem>
             <DropdownMenuCheckboxItem
               checked={wordWrap}
-              onCheckedChange={(checked) => setWordWrap(checked)}
+              onCheckedChange={(checked) => setWordWrapOverride(checked)}
             >
               Wrap lines
             </DropdownMenuCheckboxItem>
@@ -1386,7 +1432,7 @@ function PullRequestCodeTab({
                   size="sm"
                   pressed={wordWrap}
                   onPressedChange={(pressed) => {
-                    setWordWrap(Boolean(pressed));
+                    setWordWrapOverride(Boolean(pressed));
                   }}
                 />
               }
diff --git a/apps/web/src/components/pullRequest/PullRequestGuideTab.browser.test.tsx b/apps/web/src/components/pullRequest/PullRequestGuideTab.browser.test.tsx
index 127e4b4cc9ca..21fa5afe5e91 100644
--- a/apps/web/src/components/pullRequest/PullRequestGuideTab.browser.test.tsx
+++ b/apps/web/src/components/pullRequest/PullRequestGuideTab.browser.test.tsx
@@ -1,10 +1,20 @@
-import { EnvironmentId, ProjectId, type PullRequestRef } from "@t3tools/contracts";
+import {
+  EnvironmentId,
+  ProjectId,
+  type PullRequestRef,
+  type PullRequestReviewGuide,
+} from "@t3tools/contracts";
 import { expect, it, vi } from "vite-plus/test";
 import { userEvent } from "vite-plus/test/browser";
 
 vi.mock(import("./guide/useReviewGuideWriter"), () => ({ useReviewGuideWriter: vi.fn() }));
+vi.mock(import("./guide/useGuideDiffFiles"), () => ({
+  useGuideDiffFiles: () => ({ files: new Map(), loading: false, error: null, retry: () => {} }),
+}));
 
 import { render } from "../../../test/render";
+import type { ChatComposerHandle } from "../chat/ChatComposer";
+import { useChatShortcuts } from "../chat/useChatShortcuts";
 import { useReviewGuideWriter } from "./guide/useReviewGuideWriter";
 import { PullRequestGuideTab } from "./PullRequestGuideTab";
 
@@ -74,3 +84,105 @@ it("keeps Try again inside a short panel when a failed guide has long diagnostic
   await userEvent.click(retry);
   expect(write).toHaveBeenCalledOnce();
 });
+
+const threeStopGuide: PullRequestReviewGuide = {
+  headSha: "head",
+  generatedAt: "2026-11-07T00:00:00.000Z",
+  modelSelection: { instanceId: "codex", model: "gpt-6.1-sol" } as never,
+  stops: ["First", "Second", "Third"].map((title) => ({
+    title,
+    summary: `Prose for the ${title.toLowerCase()} stop.`,
+    attention: null,
+    excerpts: [],
+    files: [],
+    notes: [],
+    questions: [],
+  })),
+};
+
+function ChatBeside({
+  composerKeys,
+  maximizedAway,
+}: {
+  composerKeys: string[];
+  maximizedAway: boolean;
+}) {
+  useChatShortcuts({
+    enabled: true,
+    keybindings: [],
+    scriptKeybindings: [],
+    getShortcutContext: () => ({
+      terminalFocus: false,
+      terminalOpen: false,
+      previewFocus: false,
+      previewOpen: false,
+      isWeb: true,
+      isDesktop: false,
+      modelPickerOpen: false,
+    }),
+    threadFindActive: false,
+    composerRef: {
+      current: {
+        insertTextAtEnd: (key: string) => {
+          composerKeys.push(key);
+          return true;
+        },
+      } as Partial<ChatComposerHandle> as ChatComposerHandle,
+    },
+    branchToolbarRef: { current: null },
+    closeThreadFind: () => {},
+    commands: {},
+    fallback: () => undefined,
+  });
+  return <div data-chat-column-maximized-away={maximizedAway ? "true" : "false"} />;
+}
+
+it("steps with J and K beside a chat, also after a stop button or while the chat is maximized away", async () => {
+  vi.mocked(useReviewGuideWriter).mockReturnValue({
+    query: { isPending: false, error: null } as never,
+    data: { guide: threeStopGuide, run: null, currentHeadSha: "head" },
+    running: false,
+    canWrite: false,
+    write: async () => {},
+  });
+  const composerKeys: string[] = [];
+
+  const tree = (maximizedAway: boolean) => (
+    <>
+      <ChatBeside composerKeys={composerKeys} maximizedAway={maximizedAway} />
+      <PullRequestGuideTab
+        environmentId={EnvironmentId.make("environment")}
+        reference={reference}
+        title="Test pull request"
+        workspaceRoot="/workspace"
+        active
+        canComment={false}
+        rangeComments={false}
+        completionScope={null}
+        onAskAboutLines={null}
+        onAskAboutStop={null}
+        onFinishReview={null}
+        onOpenFile={() => {}}
+      />
+    </>
+  );
+  await using screen = await render(tree(true));
+
+  await userEvent.keyboard("j");
+  await expect.element(screen.getByText("Prose for the second stop.")).toBeVisible();
+  await screen.rerender(tree(false));
+  await userEvent.click(screen.getByText("Prose for the second stop."));
+  await userEvent.keyboard("k");
+  await expect.element(screen.getByText("Prose for the first stop.")).toBeVisible();
+  await userEvent.click(screen.getByRole("button", { name: "Next stop" }));
+  await userEvent.keyboard("j");
+  await expect.element(screen.getByText("Prose for the third stop.")).toBeVisible();
+  await userEvent.keyboard("k");
+  await expect.element(screen.getByText("Prose for the second stop.")).toBeVisible();
+  (document.activeElement ?? document.body).dispatchEvent(
+    new KeyboardEvent("keydown", { key: "J", bubbles: true, cancelable: true, composed: true }),
+  );
+  await expect.element(screen.getByText("Prose for the third stop.")).toBeVisible();
+  await userEvent.keyboard("a");
+  expect(composerKeys).toEqual(["a"]);
+});
diff --git a/apps/web/src/components/pullRequest/PullRequestSummaryTab.browser.test.tsx b/apps/web/src/components/pullRequest/PullRequestSummaryTab.browser.test.tsx
index 19c6cb75c5ac..8ecb158a8f2d 100644
--- a/apps/web/src/components/pullRequest/PullRequestSummaryTab.browser.test.tsx
+++ b/apps/web/src/components/pullRequest/PullRequestSummaryTab.browser.test.tsx
@@ -1,9 +1,17 @@
-import { SourceControlProviderKind } from "@t3tools/contracts";
+import {
+  DEFAULT_CLIENT_SETTINGS,
+  SourceControlProviderKind,
+  type ClientSettings,
+} from "@t3tools/contracts";
 import { EnvironmentId, ProjectId, type PullRequestDetailView } from "@t3tools/contracts";
 import { expect, it, vi } from "vite-plus/test";
 import { userEvent } from "vite-plus/test/browser";
 
-const state = vi.hoisted(() => ({ update: vi.fn(), canUpdate: true }));
+const state = vi.hoisted(() => ({
+  update: vi.fn(),
+  canUpdate: true,
+  timestampFormat: "locale" as "locale" | "12-hour" | "24-hour",
+}));
 
 vi.mock(import("~/state/use-atom-command"), async (original) => ({
   ...(await original()),
@@ -14,6 +22,13 @@ vi.mock(import("~/state/session"), async (original) => ({
   readEnvironmentScope: () => true,
   useEnvironmentScope: () => true,
 }));
+vi.mock(import("~/hooks/useSettings"), async (original) => ({
+  ...(await original()),
+  useClientSettings: ((select?: (settings: ClientSettings) => unknown) => {
+    const settings = { ...DEFAULT_CLIENT_SETTINGS, timestampFormat: state.timestampFormat };
+    return select ? select(settings) : settings;
+  }) as never,
+}));
 vi.mock(import("~/state/pullRequests"), async (original) => {
   const actual = await original();
   const { Atom } = await import("effect/reactivity");
@@ -35,6 +50,7 @@ function setup() {
   state.update.mockReset();
   state.update.mockResolvedValue({ _tag: "Success", value: undefined });
   state.canUpdate = true;
+  state.timestampFormat = "locale";
 }
 
 import { act, render as renderUi } from "../../../test/render";
@@ -231,3 +247,26 @@ it("fixes an overview thread as its opening remark, since it has no line to atta
   await userEvent.click(screen.getByRole("button", { name: "Fix in a thread" }));
   expect(onFixFinding).toHaveBeenCalledWith({ kind: "comment", comment: remark });
 });
+
+it("shows a comment's exact time in the chosen 24-hour clock", async () => {
+  setup();
+  state.timestampFormat = "24-hour";
+  const createdAt = "2026-09-01T17:30:00Z";
+  const comment = {
+    id: "10",
+    kind: "review-comment" as const,
+    body: "A remark",
+    author: { login: "reviewer", name: null, avatarUrl: null },
+    createdAt,
+    url: null,
+    path: null,
+    reviewState: null,
+  };
+  await using screen = await render({ ...detail, comments: [comment], commentCount: 1 });
+
+  await userEvent.hover(screen.container.querySelector(`time[datetime="${createdAt}"]`)!);
+  const expected = new Date(createdAt).toLocaleString(undefined, { hour12: false });
+  await vi.waitFor(() =>
+    expect(document.querySelector('[data-slot="tooltip-popup"]')?.textContent).toBe(expected),
+  );
+});
diff --git a/apps/web/src/components/pullRequest/PullRequestSummaryTab.tsx b/apps/web/src/components/pullRequest/PullRequestSummaryTab.tsx
index 4b706ef7eafd..3da06db5cd8b 100644
--- a/apps/web/src/components/pullRequest/PullRequestSummaryTab.tsx
+++ b/apps/web/src/components/pullRequest/PullRequestSummaryTab.tsx
@@ -34,6 +34,8 @@ import { useLocalStorage } from "~/hooks/useLocalStorage";
 import { cn } from "~/lib/utils";
 import { useOpenLink } from "~/browser/useOpenLink";
 import { RelativeTime } from "~/components/RelativeTime";
+import { useClientSettings } from "~/hooks/useSettings";
+import { formatFullTimestamp } from "~/timestampFormat";
 
 import { Button } from "../ui/button";
 import { PullRequestEditButton } from "./PullRequestEditButton";
@@ -110,6 +112,7 @@ function CommentIdentity({
   comment: PullRequestComment;
   detail: PullRequestDetailView;
 }) {
+  const timestampFormat = useClientSettings((settings) => settings.timestampFormat);
   const actor = comment.author;
   const profileUrl = actor
     ? sourceControlClients.get(detail.provider).authorProfileUrl(actor.login, detail.url)
@@ -137,7 +140,7 @@ function CommentIdentity({
           </time>
         </TooltipTrigger>
         <TooltipPopup>
-          {new Date(comment.createdAt).toLocaleString()}
+          {formatFullTimestamp(comment.createdAt, timestampFormat)}
           {comment.url ? " · Open comment on host" : ""}
         </TooltipPopup>
       </Tooltip>
diff --git a/apps/web/src/components/pullRequest/guide/GuideTour.tsx b/apps/web/src/components/pullRequest/guide/GuideTour.tsx
index 81074bef9ce2..2014eb16c342 100644
--- a/apps/web/src/components/pullRequest/guide/GuideTour.tsx
+++ b/apps/web/src/components/pullRequest/guide/GuideTour.tsx
@@ -68,7 +68,12 @@ export function GuideTour({
   });
 
   const scrollRef = useRef<HTMLDivElement>(null);
+  const railRef = useRef<HTMLElement>(null);
   const goTo = (next: number) => {
+    const focused = document.activeElement;
+    if (scrollRef.current?.contains(focused) && !railRef.current?.contains(focused)) {
+      scrollRef.current.focus({ preventScroll: true });
+    }
     update((current) => ({
       position: next,
       seen: next > position ? new Set(current.seen).add(position) : current.seen,
@@ -81,10 +86,11 @@ export function GuideTour({
   const stepFromKey = useEffectEvent((event: KeyboardEvent) => {
     if (event.defaultPrevented || event.isComposing || isCommandPaletteOpen()) return;
     if (event.metaKey || event.ctrlKey || event.altKey || event.shiftKey) return;
-    if (event.key !== "j" && event.key !== "k") return;
+    const key = event.key.toLowerCase();
+    if (key !== "j" && key !== "k") return;
     if (isEditableFocused(event.target)) return;
     event.preventDefault();
-    step(event.key === "j" ? 1 : -1);
+    step(key === "j" ? 1 : -1);
   });
   // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- document keydown listener for j/k tour stepping while the guide is active
   useEffect(() => {
@@ -95,9 +101,14 @@ export function GuideTour({
   }, [active]);
 
   return (
-    <div ref={scrollRef} className="@container/guide h-full overflow-y-auto scrollbar-gutter-both">
+    <div
+      ref={scrollRef}
+      tabIndex={-1}
+      aria-keyshortcuts="J K"
+      className="@container/guide h-full overflow-y-auto scrollbar-gutter-both outline-none"
+    >
       <div className="mx-auto grid max-w-[100rem] gap-6 px-4 py-4 @min-[56rem]/guide:grid-cols-[16rem_minmax(0,1fr)] @min-[90rem]/guide:gap-8 @min-[90rem]/guide:px-6">
-        <aside className="sticky top-4 self-start @max-[56rem]/guide:hidden">
+        <aside ref={railRef} className="sticky top-4 self-start @max-[56rem]/guide:hidden">
           <GuideRail stops={guide.stops} position={position} seen={tour.seen} onSelect={goTo} />
         </aside>
         <main className="flex min-w-0 flex-col gap-4">
diff --git a/apps/web/src/components/pullRequest/pullRequestDetail.logic.ts b/apps/web/src/components/pullRequest/pullRequestDetail.logic.ts
index d2326814c9ab..569d987fe308 100644
--- a/apps/web/src/components/pullRequest/pullRequestDetail.logic.ts
+++ b/apps/web/src/components/pullRequest/pullRequestDetail.logic.ts
@@ -54,6 +54,7 @@ export const PULL_REQUEST_MERGE_METHOD_LABELS: Record<PullRequestMergeMethod, st
   merge: "Merge",
   squash: "Squash and merge",
   rebase: "Rebase and merge",
+  "fast-forward": "Fast-forward merge",
 };
 
 export function allowsSinglePullRequestMerge(input: {
diff --git a/apps/web/src/components/settings/AddEnvironmentDialog.tsx b/apps/web/src/components/settings/AddEnvironmentDialog.tsx
index f6ad41584128..ed366c4b03e7 100644
--- a/apps/web/src/components/settings/AddEnvironmentDialog.tsx
+++ b/apps/web/src/components/settings/AddEnvironmentDialog.tsx
@@ -66,6 +66,10 @@ import {
 } from "./ConnectionsSettings.logic";
 
 const EMPTY_DISCOVERED_SSH_HOSTS: ReadonlyArray<DesktopDiscoveredSshHost> = [];
+// known_hosts can list one host on several ports. Its own bracketed form keeps an IPv6
+// host's port separate from the address; no portless known_hosts entry has that form.
+const sshHostSuggestionValue = (target: DesktopDiscoveredSshHost) =>
+  target.port === null ? target.alias : `[${target.alias}]:${target.port}`;
 
 export function AddEnvironmentDialog({
   open,
@@ -294,6 +298,7 @@ export function AddEnvironmentDialog({
       setIsAddingSavedBackend(false);
       return;
     }
+    if (target.port !== null) resolved = { ...resolved, port: target.port };
     setSavedBackendSshUsername(resolved.username ?? "");
     setSavedBackendSshPort(resolved.port === null ? "" : String(resolved.port));
     await connectSavedBackendSshTarget(resolved);
@@ -494,7 +499,7 @@ export function AddEnvironmentDialog({
           </label>
           <Autocomplete
             items={filteredDiscoveredSshHosts}
-            itemToStringValue={(target) => target.alias}
+            itemToStringValue={sshHostSuggestionValue}
             mode="none"
             openOnInputClick
             open={sshHostSuggestionsOpen}
@@ -507,7 +512,9 @@ export function AddEnvironmentDialog({
               setSavedBackendSshHost(value);
               if (eventDetails.reason !== "item-press") return;
 
-              const target = filteredDiscoveredSshHosts.find((host) => host.alias === value);
+              const target = filteredDiscoveredSshHosts.find(
+                (host) => sshHostSuggestionValue(host) === value,
+              );
               if (target) void handleSelectSshHostSuggestion(target);
             }}
           >
diff --git a/apps/web/src/components/settings/AddProviderInstanceDialog.tsx b/apps/web/src/components/settings/AddProviderInstanceDialog.tsx
index e5074e4a9bfd..ea9c72bcc6f2 100644
--- a/apps/web/src/components/settings/AddProviderInstanceDialog.tsx
+++ b/apps/web/src/components/settings/AddProviderInstanceDialog.tsx
@@ -552,6 +552,7 @@ export function AddProviderInstanceDialog({
                                 environment={localEnvironment}
                                 onChange={setLocalEnvironment}
                                 secretSources={secretSources}
+                                environmentId={environmentId}
                               />
                             ) : null}
                           </SettingsGroup>
diff --git a/apps/web/src/components/settings/AddUsageLimitSourceDialog.tsx b/apps/web/src/components/settings/AddUsageLimitSourceDialog.tsx
index 780fba4a7007..2098055289e0 100644
--- a/apps/web/src/components/settings/AddUsageLimitSourceDialog.tsx
+++ b/apps/web/src/components/settings/AddUsageLimitSourceDialog.tsx
@@ -107,6 +107,7 @@ export function AddUsageLimitSourceDialog({
                 aria-label="Management key"
                 value={keyDraft}
                 sources={secretSources}
+                environmentId={environmentId}
                 onChange={(event) => setKeyDraft(event.target.value)}
                 onSecretChange={(secret) => setKeyDraft(secret ?? "")}
                 onValidityChange={setKeyValid}
diff --git a/apps/web/src/components/settings/CloudVoiceConfiguration.browser.test.tsx b/apps/web/src/components/settings/CloudVoiceConfiguration.browser.test.tsx
index 0295603ed203..b5eddbcc10df 100644
--- a/apps/web/src/components/settings/CloudVoiceConfiguration.browser.test.tsx
+++ b/apps/web/src/components/settings/CloudVoiceConfiguration.browser.test.tsx
@@ -40,8 +40,13 @@ vi.mock("../../state/environments", async (importOriginal) => ({
   }),
 }));
 
-it("enables the chosen provider only after a successful setup and keeps its grant when editing the key", async () => {
-  const id = EnvironmentId.make("voice-host");
+const id = EnvironmentId.make("voice-host");
+const grantKey = "t3code:voice-audio-grant:v1";
+
+async function withVoicePanel(
+  route: (url: URL, request: RequestInfo | URL, init?: RequestInit) => Promise<Response> | null,
+  body: (screen: Awaited<ReturnType<typeof render>>) => Promise<void>,
+) {
   const target = new PrimaryConnectionTarget({
     environmentId: id,
     label: "Laptop",
@@ -56,25 +61,10 @@ it("enables the chosen provider only after a successful setup and keeps its gran
   });
   using cleanup = new DisposableStack();
   cleanup.defer(() => chooseAudioDestination(null));
-  chooseAudioDestination({ kind: "environment", environmentId: id });
-  const writes: unknown[] = [];
-  let rejectNextWrite = true;
   const fetch = globalThis.fetch;
   using _network = vi.spyOn(globalThis, "fetch").mockImplementation((request, init) => {
     const url = new URL(request instanceof Request ? request.url : request, window.location.href);
-    if (url.pathname === "/api/voice/cloud/keys")
-      return Promise.resolve(Response.json({ openai: writes.length > 0, xai: true }));
-    if (url.pathname === "/api/voice/cloud/openai/key") {
-      if (rejectNextWrite) {
-        rejectNextWrite = false;
-        return Promise.resolve(new Response(null, { status: 403 }));
-      }
-      return new Request(request, init).json().then((body) => {
-        writes.push(body);
-        return new Response(null, { status: 204 });
-      });
-    }
-    return fetch(request, init);
+    return route(url, request, init) ?? fetch(request, init);
   });
   await vi.mocked(useEnvironmentScope).withImplementation(
     () => true,
@@ -87,141 +77,188 @@ it("enables the chosen provider only after a successful setup and keeps its gran
               <VoiceSettingsPanel />
             </SettingsScopeProvider>,
           );
-          const destination = screen.getByRole("combobox", { name: "Transcribe with" });
-          await expect.element(destination).toHaveTextContent("Laptop");
-          await destination.click();
-          await page.getByRole("option", { name: "OpenAI via Laptop" }).click();
-          const dialog = page.getByRole("dialog");
-          await dialog.getByRole("button", { name: "Cancel" }).click();
-          await expect.element(destination).toHaveTextContent("Laptop");
-          expect(writes).toEqual([]);
-          await destination.click();
-          await page.getByRole("option", { name: "OpenAI via Laptop" }).click();
-          await dialog.getByRole("combobox", { name: "OpenAI API key source" }).click();
-          await page.getByRole("option", { name: "Work vault" }).click();
-          await dialog.getByLabelText("OpenAI API key reference").fill("op://Work/Voice/key");
-          await userEvent.keyboard("{Enter}");
-          await expect.element(dialog.getByRole("alert")).toBeVisible();
-          expect(writes).toEqual([]);
-          await expect
-            .element(dialog.getByRole("button", { name: "Save and enable" }))
-            .toBeEnabled();
-          await dialog.getByLabelText("OpenAI API key reference").click();
-          await userEvent.keyboard("{Enter}");
-          await expect.element(dialog).not.toBeInTheDocument();
-          await expect.element(destination).toHaveTextContent("OpenAI via Laptop");
-          expect(writes).toEqual([{ key: { provider: "work", reference: "op://Work/Voice/key" } }]);
-          const grant = window.localStorage.getItem("t3code:voice-audio-grant:v1");
-          await screen.getByRole("button", { name: "Manage key" }).click();
-          await dialog.getByLabelText("OpenAI API key", { exact: true }).fill("replacement");
-          await userEvent.keyboard("{Enter}");
-          await expect.element(dialog).not.toBeInTheDocument();
-          expect(writes.at(-1)).toEqual({ key: "replacement" });
-          expect(window.localStorage.getItem("t3code:voice-audio-grant:v1")).toBe(grant);
-          await destination.click();
-          await page.getByRole("option", { name: "Grok Voice Transcribe via Laptop" }).click();
-          await dialog.getByRole("button", { name: "Use Grok Voice Transcribe" }).click();
-          await expect.element(destination).toHaveTextContent("Grok Voice Transcribe via Laptop");
-          await destination.click();
-          await page.getByRole("option", { name: "Off", exact: true }).click();
-          await expect.element(destination).toHaveTextContent("Off");
+          await body(screen);
         },
       );
     },
   );
+}
+
+it("cancelling a provider's setup keeps the current destination and writes nothing", async () => {
+  chooseAudioDestination({ kind: "environment", environmentId: id });
+  const writes: unknown[] = [];
+  await withVoicePanel(
+    (url, request, init) => {
+      if (url.pathname === "/api/voice/cloud/keys")
+        return Promise.resolve(Response.json({ openai: false, xai: true }));
+      if (url.pathname !== "/api/voice/cloud/openai/key") return null;
+      return new Request(request, init).json().then((body) => {
+        writes.push(body);
+        return new Response(null, { status: 204 });
+      });
+    },
+    async (screen) => {
+      const destination = screen.getByRole("combobox", { name: "Transcribe with" });
+      await expect.element(destination).toHaveTextContent("Laptop");
+      await destination.click();
+      await page.getByRole("option", { name: "OpenAI via Laptop" }).click();
+      const dialog = page.getByRole("dialog");
+      await dialog.getByRole("button", { name: "Cancel" }).click();
+      await expect.element(dialog).not.toBeInTheDocument();
+      await expect.element(destination).toHaveTextContent("Laptop");
+      expect(writes).toEqual([]);
+    },
+  );
 });
 
-it("OpenRouter needs an exact model, and changing it writes no credential", async () => {
-  const id = EnvironmentId.make("voice-host");
-  const target = new PrimaryConnectionTarget({
-    environmentId: id,
-    label: "Laptop",
-    httpBaseUrl: window.location.origin,
-    wsBaseUrl: "ws://localhost",
-  });
-  const prepared = Option.some({
-    ...target,
-    target,
-    socketUrl: target.wsBaseUrl,
-    httpAuthorization: null,
-  });
-  using cleanup = new DisposableStack();
-  cleanup.defer(() => chooseAudioDestination(null));
-  chooseAudioDestination(null);
+it("enables the chosen provider only after a successful setup", async () => {
+  chooseAudioDestination({ kind: "environment", environmentId: id });
   const writes: unknown[] = [];
-  const fetch = globalThis.fetch;
-  using _network = vi.spyOn(globalThis, "fetch").mockImplementation((request, init) => {
-    const url = new URL(request instanceof Request ? request.url : request, window.location.href);
-    if (url.pathname === "/api/voice/cloud/keys")
-      return Promise.resolve(Response.json({ openai: false, xai: false, openrouter: true }));
-    if (url.pathname === "/api/voice/cloud/openrouter/models")
-      return Promise.resolve(
-        Response.json({
-          models: [
-            { id: "acme/transcribe-1", name: "Acme: Transcribe 1" },
-            { id: "other/listen-2", name: "Other: Listen 2" },
-          ],
-        }),
-      );
-    if (url.pathname === "/api/voice/cloud/openrouter/key")
+  let rejectNextWrite = true;
+  await withVoicePanel(
+    (url, request, init) => {
+      if (url.pathname === "/api/voice/cloud/keys")
+        return Promise.resolve(Response.json({ openai: writes.length > 0, xai: true }));
+      if (url.pathname !== "/api/voice/cloud/openai/key") return null;
+      if (rejectNextWrite) {
+        rejectNextWrite = false;
+        return Promise.resolve(new Response(null, { status: 403 }));
+      }
       return new Request(request, init).json().then((body) => {
         writes.push(body);
         return new Response(null, { status: 204 });
       });
-    return fetch(request, init);
-  });
-  const grantKey = "t3code:voice-audio-grant:v1";
+    },
+    async (screen) => {
+      const destination = screen.getByRole("combobox", { name: "Transcribe with" });
+      await destination.click();
+      await page.getByRole("option", { name: "OpenAI via Laptop" }).click();
+      const dialog = page.getByRole("dialog");
+      await dialog.getByRole("combobox", { name: "OpenAI API key source" }).click();
+      await page.getByRole("option", { name: "Work vault" }).click();
+      await dialog.getByLabelText("OpenAI API key reference").fill("op://Work/Voice/key");
+      await userEvent.keyboard("{Enter}");
+      await expect.element(dialog.getByRole("alert")).toBeVisible();
+      expect(writes).toEqual([]);
+      await expect.element(dialog.getByRole("button", { name: "Save and enable" })).toBeEnabled();
+      await dialog.getByLabelText("OpenAI API key reference").click();
+      await userEvent.keyboard("{Enter}");
+      await expect.element(dialog).not.toBeInTheDocument();
+      await expect.element(destination).toHaveTextContent("OpenAI via Laptop");
+      expect(writes).toEqual([{ key: { provider: "work", reference: "op://Work/Voice/key" } }]);
+    },
+  );
+});
+
+it("keeps the active provider's grant when editing its key", async () => {
+  chooseAudioDestination({ kind: "cloud", provider: "openai", environmentId: id });
+  const grant = window.localStorage.getItem(grantKey);
+  const writes: unknown[] = [];
+  await withVoicePanel(
+    (url, request, init) => {
+      if (url.pathname === "/api/voice/cloud/keys")
+        return Promise.resolve(Response.json({ openai: true, xai: true }));
+      if (url.pathname !== "/api/voice/cloud/openai/key") return null;
+      return new Request(request, init).json().then((body) => {
+        writes.push(body);
+        return new Response(null, { status: 204 });
+      });
+    },
+    async (screen) => {
+      await screen.getByRole("button", { name: "Manage key" }).click();
+      const dialog = page.getByRole("dialog");
+      await dialog.getByLabelText("OpenAI API key", { exact: true }).fill("replacement");
+      await userEvent.keyboard("{Enter}");
+      await expect.element(dialog).not.toBeInTheDocument();
+      expect(writes).toEqual([{ key: "replacement" }]);
+      expect(window.localStorage.getItem(grantKey)).toBe(grant);
+    },
+  );
+});
+
+it("uses a provider's saved key without writing it, and turns dictation off", async () => {
+  chooseAudioDestination({ kind: "environment", environmentId: id });
+  await withVoicePanel(
+    (url) =>
+      url.pathname === "/api/voice/cloud/keys"
+        ? Promise.resolve(Response.json({ openai: false, xai: true }))
+        : null,
+    async (screen) => {
+      const destination = screen.getByRole("combobox", { name: "Transcribe with" });
+      await destination.click();
+      await page.getByRole("option", { name: "Grok Voice Transcribe via Laptop" }).click();
+      await page
+        .getByRole("dialog")
+        .getByRole("button", { name: "Use Grok Voice Transcribe" })
+        .click();
+      await expect.element(destination).toHaveTextContent("Grok Voice Transcribe via Laptop");
+      await destination.click();
+      await page.getByRole("option", { name: "Off", exact: true }).click();
+      await expect.element(destination).toHaveTextContent("Off");
+    },
+  );
+});
+
+it("OpenRouter needs an exact model, and changing it writes no credential", async () => {
+  chooseAudioDestination(null);
+  const writes: unknown[] = [];
   const grantModel = () => {
     const raw = window.localStorage.getItem(grantKey);
     const parsed = raw ? (JSON.parse(raw) as { destination?: { model?: string } }) : null;
     return parsed?.destination?.model ?? null;
   };
-  await vi.mocked(useEnvironmentScope).withImplementation(
-    () => true,
-    async () => {
-      await vi.mocked(usePreparedConnection).withImplementation(
-        () => prepared,
-        async () => {
-          await using screen = await render(
-            <SettingsScopeProvider search={{}} onChange={() => {}}>
-              <VoiceSettingsPanel />
-            </SettingsScopeProvider>,
-          );
-          const destination = screen.getByRole("combobox", { name: "Transcribe with" });
-          await destination.click();
-          await page.getByRole("option", { name: "OpenRouter via Laptop" }).click();
-          const dialog = page.getByRole("dialog");
-          const save = dialog.getByRole("button", { name: "Save and enable" });
-          await expect.element(save).toBeDisabled();
-          const picker = dialog.getByRole("combobox", { name: "OpenRouter model" });
-          await expect.element(picker).toBeVisible();
-          await picker.click();
-          await userEvent.keyboard("listen");
-          await expect.element(page.getByRole("option", { name: /Other: Listen 2/ })).toBeVisible();
-          await page.getByRole("option", { name: /Other: Listen 2/ }).click();
-          await expect.element(save).toBeEnabled();
-          const key = dialog.getByLabelText("OpenRouter API key", { exact: true });
-          await key.fill("op://not-a-literal-key");
-          await expect.element(save).toBeDisabled();
-          await key.fill("");
-          await save.click();
-          await expect.element(dialog).not.toBeInTheDocument();
-          await expect.element(destination).toHaveTextContent("OpenRouter via Laptop");
-          expect(grantModel()).toBe("other/listen-2");
-          expect(writes).toEqual([]);
-          await screen.getByRole("button", { name: "Manage OpenRouter" }).click();
-          const current = dialog.getByRole("combobox", { name: "OpenRouter model" });
-          await expect.element(current).toHaveValue("Other: Listen 2");
-          await userEvent.clear(current);
-          await userEvent.type(current, "acme");
-          await page.getByRole("option", { name: /Acme: Transcribe 1/ }).click();
-          await dialog.getByRole("button", { name: "Save" }).click();
-          await expect.element(dialog).not.toBeInTheDocument();
-          await expect.element(destination).toHaveTextContent("OpenRouter via Laptop");
-          expect(grantModel()).toBe("acme/transcribe-1");
-          expect(writes).toEqual([]);
-        },
-      );
+  await withVoicePanel(
+    (url, request, init) => {
+      if (url.pathname === "/api/voice/cloud/keys")
+        return Promise.resolve(Response.json({ openai: false, xai: false, openrouter: true }));
+      if (url.pathname === "/api/voice/cloud/openrouter/models")
+        return Promise.resolve(
+          Response.json({
+            models: [
+              { id: "acme/transcribe-1", name: "Acme: Transcribe 1" },
+              { id: "other/listen-2", name: "Other: Listen 2" },
+            ],
+          }),
+        );
+      if (url.pathname === "/api/voice/cloud/openrouter/key")
+        return new Request(request, init).json().then((body) => {
+          writes.push(body);
+          return new Response(null, { status: 204 });
+        });
+      return null;
+    },
+    async (screen) => {
+      const destination = screen.getByRole("combobox", { name: "Transcribe with" });
+      await destination.click();
+      await page.getByRole("option", { name: "OpenRouter via Laptop" }).click();
+      const dialog = page.getByRole("dialog");
+      const save = dialog.getByRole("button", { name: "Save and enable" });
+      await expect.element(save).toBeDisabled();
+      const picker = dialog.getByRole("combobox", { name: "OpenRouter model" });
+      await expect.element(picker).toBeVisible();
+      await picker.fill("listen");
+      await expect.element(page.getByRole("option", { name: /Other: Listen 2/ })).toBeVisible();
+      await page.getByRole("option", { name: /Other: Listen 2/ }).click();
+      await expect.element(save).toBeEnabled();
+      const key = dialog.getByLabelText("OpenRouter API key", { exact: true });
+      await key.fill("op://not-a-literal-key");
+      await expect.element(save).toBeDisabled();
+      await key.fill("");
+      await save.click();
+      await expect.element(dialog).not.toBeInTheDocument();
+      await expect.element(destination).toHaveTextContent("OpenRouter via Laptop");
+      expect(grantModel()).toBe("other/listen-2");
+      expect(writes).toEqual([]);
+      await screen.getByRole("button", { name: "Manage OpenRouter" }).click();
+      const current = dialog.getByRole("combobox", { name: "OpenRouter model" });
+      await expect.element(current).toHaveValue("Other: Listen 2");
+      await current.fill("acme");
+      await page.getByRole("option", { name: /Acme: Transcribe 1/ }).click();
+      await dialog.getByRole("button", { name: "Save" }).click();
+      await expect.element(dialog).not.toBeInTheDocument();
+      await expect.element(destination).toHaveTextContent("OpenRouter via Laptop");
+      expect(grantModel()).toBe("acme/transcribe-1");
+      expect(writes).toEqual([]);
     },
   );
 });
diff --git a/apps/web/src/components/settings/CodexSetupSection.tsx b/apps/web/src/components/settings/CodexSetupSection.tsx
index dea5f40dfea3..cbbe3d51a4ed 100644
--- a/apps/web/src/components/settings/CodexSetupSection.tsx
+++ b/apps/web/src/components/settings/CodexSetupSection.tsx
@@ -983,6 +983,18 @@ function ManagedCodexSetup({
               </Button>
             ) : authenticated ? (
               <>
+                {updateAvailable ? (
+                  <Button
+                    size="sm"
+                    variant="outline"
+                    disabled={unavailable || busy}
+                    onClick={() =>
+                      void run(() => startInstall({ environmentId, input: { instanceId } }))
+                    }
+                  >
+                    Update Codex
+                  </Button>
+                ) : null}
                 <Button
                   size="sm"
                   variant="outline"
diff --git a/apps/web/src/components/settings/ConnectionsSettings.logic.test.ts b/apps/web/src/components/settings/ConnectionsSettings.logic.test.ts
index ffd59c5439bc..4cd58ef38af6 100644
--- a/apps/web/src/components/settings/ConnectionsSettings.logic.test.ts
+++ b/apps/web/src/components/settings/ConnectionsSettings.logic.test.ts
@@ -2,6 +2,7 @@ import { type DesktopWslState, EnvironmentId } from "@t3tools/contracts";
 import { describe, expect, it, vi } from "vite-plus/test";
 import {
   applyWslEnableSelection,
+  isServerNetworkAccessible,
   resolveAccessEnvironmentId,
   resolveTailscaleServeBaseUrl,
   selectQrEndpointOption,
@@ -201,3 +202,16 @@ describe("resolveAccessEnvironmentId", () => {
     );
   });
 });
+
+describe("isServerNetworkAccessible", () => {
+  const served = [{ kind: "tailnet", httpBaseUrl: "https://host.example.ts.net:8443/" }] as const;
+  it.each([
+    { authPolicy: "remote-reachable", directEndpoints: undefined, expected: true },
+    { authPolicy: "loopback-browser", directEndpoints: undefined, expected: false },
+    { authPolicy: "loopback-browser", directEndpoints: [], expected: false },
+    { authPolicy: "loopback-browser", directEndpoints: served, expected: true },
+    { authPolicy: null, directEndpoints: served, expected: false },
+  ] as const)("$authPolicy with $directEndpoints.length endpoints", (row) => {
+    expect(isServerNetworkAccessible(row)).toBe(row.expected);
+  });
+});
diff --git a/apps/web/src/components/settings/ConnectionsSettings.logic.ts b/apps/web/src/components/settings/ConnectionsSettings.logic.ts
index e219694351b9..d3716ae993a9 100644
--- a/apps/web/src/components/settings/ConnectionsSettings.logic.ts
+++ b/apps/web/src/components/settings/ConnectionsSettings.logic.ts
@@ -20,6 +20,8 @@ import {
   type DesktopUpdateState,
   type DesktopWslState,
   type EnvironmentId,
+  type ServerAuthPolicy,
+  type ServerDirectEndpoint,
 } from "@t3tools/contracts";
 import {
   getDesktopUpdateDownloadedVersion,
@@ -369,6 +371,15 @@ export function selectPairingEndpoint(
   );
 }
 
+/** A loopback server advertises a direct endpoint only once its Tailscale Serve URL answers. */
+export function isServerNetworkAccessible(input: {
+  readonly authPolicy: ServerAuthPolicy | null;
+  readonly directEndpoints: ReadonlyArray<ServerDirectEndpoint> | undefined;
+}): boolean {
+  if (input.authPolicy === "remote-reachable") return true;
+  return input.authPolicy === "loopback-browser" && (input.directEndpoints?.length ?? 0) > 0;
+}
+
 export function isTailscaleHttpsEndpoint(endpoint: AdvertisedEndpoint): boolean {
   return endpoint.id.startsWith("tailscale-magicdns:");
 }
diff --git a/apps/web/src/components/settings/ConnectionsSettings.tsx b/apps/web/src/components/settings/ConnectionsSettings.tsx
index da46823292ca..da529e44c351 100644
--- a/apps/web/src/components/settings/ConnectionsSettings.tsx
+++ b/apps/web/src/components/settings/ConnectionsSettings.tsx
@@ -122,6 +122,7 @@ import {
   toDesktopPairingLinkRecord,
   toDesktopClientSessionRecord,
   selectPairingEndpoint,
+  isServerNetworkAccessible,
   isTailscaleHttpsEndpoint,
   endpointDefaultPreferenceKey,
 } from "./ConnectionsSettings.logic";
@@ -439,7 +440,10 @@ function ConnectionsSettingsContent({
   })();
   const isLocalBackendNetworkAccessible = desktopBridge
     ? desktopServerExposureState?.mode === "network-accessible"
-    : currentAuthPolicy === "remote-reachable";
+    : isServerNetworkAccessible({
+        authPolicy: currentAuthPolicy,
+        directEndpoints: accessEnvironment?.serverConfig?.directEndpoints,
+      });
   const trimmedTailscaleServePortInput = tailscaleServePortInput.trim();
   const parsedTailscaleServePort = Number(trimmedTailscaleServePortInput);
   const isTailscaleServePortValid =
@@ -1098,7 +1102,7 @@ function ConnectionsSettingsContent({
       description={
         desktopBridge
           ? "This connection cannot view or change network exposure."
-          : currentAuthPolicy === "remote-reachable"
+          : isLocalBackendNetworkAccessible
             ? "Remote access is already configured. Change network exposure where the server starts."
             : currentAuthPolicy === "loopback-browser"
               ? "Only this machine can connect. Restart with a non-loopback host for remote pairing."
diff --git a/apps/web/src/components/settings/EasDeviceHostEditor.tsx b/apps/web/src/components/settings/EasDeviceHostEditor.tsx
index 1223fe09b7d7..e11d9dfa748a 100644
--- a/apps/web/src/components/settings/EasDeviceHostEditor.tsx
+++ b/apps/web/src/components/settings/EasDeviceHostEditor.tsx
@@ -213,6 +213,7 @@ export function EasDeviceHostEditor(props: {
                         : ""
                   }
                   sources={secretSources}
+                  environmentId={props.environmentId}
                   onValidityChange={(valid) => {
                     setTokenValid(valid);
                     resetAccount();
diff --git a/apps/web/src/components/settings/LinkedEnvironmentsSettings.tsx b/apps/web/src/components/settings/LinkedEnvironmentsSettings.tsx
index 4cf6997a571c..2014a1db6e35 100644
--- a/apps/web/src/components/settings/LinkedEnvironmentsSettings.tsx
+++ b/apps/web/src/components/settings/LinkedEnvironmentsSettings.tsx
@@ -103,7 +103,7 @@ function LinkedEnvironmentRow({
   const [busy, setBusy] = useState(false);
   const forget = async () => {
     const confirmed = await (requestConfirmDialog(
-      `Forget ${link.label}? Agents here stop working there. Revoke "T3 Code · …" in ${link.label}'s Connections to end the session there too.`,
+      `Forget ${link.label}? Agents here stop working there. Revoke "T3 Code · …" in ${link.label}'s Sharing & access to end the session there too.`,
       { variant: "destructive" },
     ) ?? Promise.resolve(false));
     if (!confirmed) return;
@@ -273,8 +273,8 @@ function LinkEnvironmentAction({ environmentId }: { readonly environmentId: Envi
         <DialogHeader>
           <DialogTitle>Link an environment</DialogTitle>
           <DialogDescription>
-            Agents here can then launch, message and wait on threads there. It appears in that
-            environment's Connections, where it can be revoked.
+            Agents here can then launch, message and wait on threads there. It appears under
+            Authorized clients in that environment's Sharing & access, where it can be revoked.
           </DialogDescription>
         </DialogHeader>
         <DialogPanel>
@@ -332,9 +332,7 @@ function LinkEnvironmentAction({ environmentId }: { readonly environmentId: Envi
                   value={pairingCode}
                   onChange={(event) => setPairingCode(event.target.value)}
                   placeholder={
-                    machine === null
-                      ? "From that environment's Connections, or t3 pair there"
-                      : "Paste the code"
+                    machine === null ? "From Sharing & access there, or t3 pair" : "Paste the code"
                   }
                   disabled={busy}
                   autoComplete="one-time-code"
@@ -343,8 +341,8 @@ function LinkEnvironmentAction({ environmentId }: { readonly environmentId: Envi
                 />
                 {machine !== null ? (
                   <span className="block text-xs text-muted-foreground">
-                    Create a link on {machine.label}: Settings → Connections → Create link, then
-                    paste its code here.
+                    Create a link on {machine.label}: Settings → Sharing & access → Authorized
+                    clients → Create link, then paste its code here.
                   </span>
                 ) : null}
               </label>
diff --git a/apps/web/src/components/settings/ProjectActionsSettings.tsx b/apps/web/src/components/settings/ProjectActionsSettings.tsx
index b0d10d9df382..b7aa66df4f85 100644
--- a/apps/web/src/components/settings/ProjectActionsSettings.tsx
+++ b/apps/web/src/components/settings/ProjectActionsSettings.tsx
@@ -173,8 +173,8 @@ export function ProjectActionsSettings() {
       />
       {mixed ? (
         <SettingsRow
-          title="Different actions across environments"
-          description="Choose one environment to edit its list. Adding an action here adds it on every selected environment."
+          title="Different actions across checkouts"
+          description="Narrow the selection above to one checkout to edit its list. Adding an action here adds it to every selected checkout."
         />
       ) : (
         <ProjectActionsList
diff --git a/apps/web/src/components/settings/ProjectSettingsPanel.browser.test.tsx b/apps/web/src/components/settings/ProjectSettingsPanel.browser.test.tsx
index 2f7aa1fd8bd0..957682083232 100644
--- a/apps/web/src/components/settings/ProjectSettingsPanel.browser.test.tsx
+++ b/apps/web/src/components/settings/ProjectSettingsPanel.browser.test.tsx
@@ -39,7 +39,7 @@ const state = vi.hoisted(() => ({
       (request: {
         environmentId: EnvironmentId;
         input: UpdateProjectInput;
-      }) => Promise<AsyncResult.Success<void>>
+      }) => Promise<AsyncResult.Success<void> | AsyncResult.Failure<void, Error>>
     >(),
   delete:
     vi.fn<
@@ -134,6 +134,7 @@ vi.mock(import("../files/projectFilesQueryState"), async (original) => ({
 
 import { useComposerDraftStore } from "../../composerDraftStore";
 import { appAtomRegistry } from "../../rpc/atomRegistry";
+import { assetEnvironment } from "../../state/assets";
 import { buildSidebarProjectSnapshots } from "../../sidebarProjectGrouping";
 import { ProjectSettingsPanel } from "./ProjectSettingsPanel";
 import { ProjectsSettings } from "./ProjectsSettings";
@@ -532,6 +533,40 @@ describe("project identity reset", () => {
       },
     ]);
   });
+
+  it("refreshes a saved checkout's icon when a later checkout update fails", async () => {
+    setup();
+    state.projects = state.projects.map((project) => ({ ...project, faviconPath: "logo.png" }));
+    let iconExists = false;
+    const iconUrl = Atom.make(() =>
+      AsyncResult.success({
+        expiresAt: 4_000_000_000_000,
+        relativeUrl: iconExists ? "/restored-icon.svg" : "/project-favicon-missing",
+      }),
+    );
+    using _mount = { [Symbol.dispose]: appAtomRegistry.mount(iconUrl) };
+    const createUrl = assetEnvironment.createUrl;
+    using _createUrl = vi
+      .spyOn(assetEnvironment, "createUrl")
+      .mockImplementation((target) =>
+        target.environmentId === primaryId ? iconUrl : createUrl(target),
+      );
+    state.update
+      .mockResolvedValueOnce(AsyncResult.success(undefined))
+      .mockResolvedValueOnce(AsyncResult.failure(Cause.fail(new Error("Save failed"))));
+    await using screen = await mountPanel();
+    expect(appAtomRegistry.get(iconUrl).value.relativeUrl).toBe("/project-favicon-missing");
+
+    iconExists = true;
+    await userEvent.click(resetButton(screen, "project icon")!);
+
+    await vi.waitFor(() =>
+      expect(appAtomRegistry.get(iconUrl).value.relativeUrl).toBe("/restored-icon.svg"),
+    );
+    expect(state.toast).toHaveBeenCalledWith(
+      expect.objectContaining({ title: "Failed to update project icon on remote" }),
+    );
+  });
 });
 
 it("opens the fallback search target across all environments from a checkout", async () => {
@@ -602,6 +637,36 @@ describe("project settings scope", () => {
     await expect.element(remoteOption()).not.toBeInTheDocument();
   });
 
+  it("reaches each checkout on one environment and returns to all of them", async () => {
+    setup();
+    const [first] = state.projects;
+    state.projects = [
+      { ...first!, id: ProjectId.make("clone-a"), workspaceRoot: "/work/clone-a" },
+      { ...first!, id: ProjectId.make("clone-b"), workspaceRoot: "/work/clone-b" },
+    ];
+    const key = projectKey();
+    await using screen = await mountSettings({ project: key, machine: primaryId });
+
+    await userEvent.click(page.getByRole("button", { name: "Checkout scope: All checkouts" }));
+    await userEvent.click(page.getByRole("menuitemradio", { name: /clone-b/ }));
+
+    await expect
+      .element(page.getByRole("button", { name: "Checkout scope: clone-b" }))
+      .toBeVisible();
+    expect(screen.router.state.location.search).toMatchObject({
+      project: key,
+      machine: primaryId,
+      checkout: expect.stringContaining("clone-b"),
+    });
+
+    await userEvent.click(page.getByRole("button", { name: "Checkout scope: clone-b" }));
+    await userEvent.click(page.getByRole("menuitemradio", { name: "All checkouts" }));
+
+    await vi.waitFor(() =>
+      expect(screen.router.state.location.search).toEqual({ project: key, machine: primaryId }),
+    );
+  });
+
   it("keeps an unknown project recoverable from any environment", async () => {
     setup();
     state.projects = state.projects.filter((project) => project.environmentId === primaryId);
diff --git a/apps/web/src/components/settings/ProjectSettingsPanel.logic.test.ts b/apps/web/src/components/settings/ProjectSettingsPanel.logic.test.ts
index 41e1688d2fe9..c42c375a5e15 100644
--- a/apps/web/src/components/settings/ProjectSettingsPanel.logic.test.ts
+++ b/apps/web/src/components/settings/ProjectSettingsPanel.logic.test.ts
@@ -4,7 +4,10 @@ import { planProjectRemoval } from "@t3tools/client-runtime/state/projects";
 
 import { buildSidebarProjectSnapshots } from "../../sidebarProjectGrouping";
 import type { Project } from "../../types";
-import { scopeProjectSettingsGroup } from "./ProjectSettingsPanel.logic";
+import {
+  projectGroupTitleNeedsUpdate,
+  scopeProjectSettingsGroup,
+} from "./ProjectSettingsPanel.logic";
 
 const localEnvironmentId = EnvironmentId.make("local");
 const remoteEnvironmentId = EnvironmentId.make("remote");
@@ -171,3 +174,20 @@ describe("project removal confirmation", () => {
     );
   });
 });
+
+describe("projectGroupTitleNeedsUpdate", () => {
+  const folderTitle = { title: "repo" };
+  const renamed = { title: "repo", hasCustomTitle: true };
+
+  // regression: #15049 renaming to the default folder title was never saved
+  it("saves a title that matches the folder default so the rename is recorded", () => {
+    expect(projectGroupTitleNeedsUpdate([folderTitle, folderTitle], "repo", true)).toBe(true);
+  });
+
+  it("skips untouched fields and renames every member already carries", () => {
+    expect(projectGroupTitleNeedsUpdate([folderTitle, { title: "other" }], "repo", false)).toBe(
+      false,
+    );
+    expect(projectGroupTitleNeedsUpdate([renamed, renamed], "repo", true)).toBe(false);
+  });
+});
diff --git a/apps/web/src/components/settings/ProjectSettingsPanel.logic.ts b/apps/web/src/components/settings/ProjectSettingsPanel.logic.ts
index 0c93b87ae162..706162be0045 100644
--- a/apps/web/src/components/settings/ProjectSettingsPanel.logic.ts
+++ b/apps/web/src/components/settings/ProjectSettingsPanel.logic.ts
@@ -25,11 +25,14 @@ export function scopeProjectSettingsGroup(
 }
 
 export function projectGroupTitleNeedsUpdate(
-  memberTitles: ReadonlyArray<string>,
+  members: ReadonlyArray<Pick<Project, "title" | "hasCustomTitle">>,
   nextTitle: string,
   wasEdited: boolean,
 ): boolean {
-  return wasEdited && memberTitles.some((title) => title !== nextTitle);
+  return (
+    wasEdited &&
+    members.some((member) => member.title !== nextTitle || member.hasCustomTitle !== true)
+  );
 }
 
 export function defaultProjectIcon(project: Pick<Project, "isScratch">) {
diff --git a/apps/web/src/components/settings/ProjectSettingsPanel.tsx b/apps/web/src/components/settings/ProjectSettingsPanel.tsx
index fe0ac1e4e152..c1e15267234b 100644
--- a/apps/web/src/components/settings/ProjectSettingsPanel.tsx
+++ b/apps/web/src/components/settings/ProjectSettingsPanel.tsx
@@ -29,6 +29,7 @@ import {
 } from "../../sidebarProjectGrouping";
 import { useEnvironments, usePrimaryEnvironmentId } from "../../state/environments";
 import { useThreadShells, waitForProjectRemoval } from "../../state/entities";
+import { refreshProjectFaviconUrl } from "../../state/assets";
 import { projectEnvironment } from "../../state/projects";
 import { ProjectFavicon } from "../ProjectFavicon";
 import { Alert, AlertDescription } from "../ui/alert";
@@ -310,15 +311,7 @@ function ProjectDetail({
       toastManager.add({ type: "warning", title: "Project title cannot be empty" });
       return;
     }
-    if (
-      !projectGroupTitleNeedsUpdate(
-        group.memberProjects.map((member) => member.title),
-        title,
-        wasEdited,
-      )
-    ) {
-      return;
-    }
+    if (!projectGroupTitleNeedsUpdate(group.memberProjects, title, wasEdited)) return;
     await updateAllMembers({ title }, "Failed to rename project");
   };
 
@@ -331,6 +324,15 @@ function ProjectDetail({
     savingFaviconRef.current = true;
     setIsSavingFavicon(true);
     await updateAllMembers(input, "Failed to update project icon");
+    for (const member of group.memberProjects) {
+      const update = typeof input === "function" ? input(member) : input;
+      if (update.faviconPath === undefined || update.projectIcon) continue;
+      refreshProjectFaviconUrl({
+        environmentId: member.environmentId,
+        cwd: member.workspaceRoot,
+        faviconPath: update.faviconPath,
+      });
+    }
     savingFaviconRef.current = false;
     setIsSavingFavicon(false);
   };
diff --git a/apps/web/src/components/settings/ProviderInstanceCard.tsx b/apps/web/src/components/settings/ProviderInstanceCard.tsx
index 36a737959c50..05a7471d44e3 100644
--- a/apps/web/src/components/settings/ProviderInstanceCard.tsx
+++ b/apps/web/src/components/settings/ProviderInstanceCard.tsx
@@ -285,6 +285,7 @@ function ProviderEnvironmentFieldRow(props: {
   readonly onRemove: (field: ProviderEnvironmentField) => void;
   readonly managedReason?: string | undefined;
   readonly secretSources: ReadonlyArray<SecretSource>;
+  readonly environmentId?: EnvironmentId | undefined;
 }) {
   const inputId = `${props.idPrefix}-environment-${props.field.name}`;
   const value = props.variable?.valueRedacted ? "" : (props.variable?.value ?? "");
@@ -319,6 +320,7 @@ function ProviderEnvironmentFieldRow(props: {
               spellCheck={false}
               aria-label={props.field.label}
               sources={props.secretSources}
+              environmentId={props.environmentId}
               onSecretChange={(secret) => props.onSecretChange(props.field, secret)}
             />
           )}
@@ -345,6 +347,7 @@ export function ProviderEnvironmentSection(props: {
   /** Variables an administrator's policy pins: listed by name, never editable or removable. */
   readonly managed?: { readonly names: ReadonlySet<string>; readonly reason: string } | undefined;
   readonly secretSources?: ReadonlyArray<SecretSource>;
+  readonly environmentId?: EnvironmentId | undefined;
 }) {
   const [storedDraft, setDraft] = useState(() =>
     seedRowsDraft(props.environment, toEnvironmentDraftRows),
@@ -546,6 +549,7 @@ export function ProviderEnvironmentSection(props: {
                     spellCheck={false}
                     aria-label={`Environment variable value ${index + 1}`}
                     sources={props.secretSources ?? []}
+                    environmentId={props.environmentId}
                     onSecretChange={(secret) => setVariableSecret(variable.id, secret)}
                   >
                     {(parts) => layout(parts.source, parts.value)}
@@ -1092,13 +1096,13 @@ export function ProviderInstanceCard({
       <div
         data-slot="settings-row"
         className={cn(
-          "group flex min-h-18 items-center gap-3 px-3 py-3 transition-colors sm:px-4",
+          "group relative flex min-h-18 items-center gap-3 px-3 py-3 transition-colors sm:px-4",
           selected ? "bg-foreground/[0.06]" : "hover:bg-muted/25",
         )}
       >
         <div
           className={cn(
-            "pointer-events-none relative flex min-w-0 flex-1 items-start gap-3 rounded-md text-left transition-opacity",
+            "pointer-events-none flex min-w-0 flex-1 items-start gap-3 rounded-md text-left transition-opacity",
             !enabled && !selected && "opacity-60 group-hover:opacity-100",
           )}
         >
@@ -1143,7 +1147,7 @@ export function ProviderInstanceCard({
             </span>
           </span>
         </div>
-        <span className="flex h-5 shrink-0 items-center gap-1">
+        <span className="pointer-events-none relative flex h-5 shrink-0 items-center gap-1 *:pointer-events-auto">
           {projectOverride?.value !== undefined ? (
             <span className="flex items-center">
               <ProjectOverrideInheritance
@@ -1328,6 +1332,7 @@ export function ProviderInstanceCard({
                       : undefined
                   }
                   secretSources={secretSources}
+                  environmentId={environmentId}
                 />
               ))}
             </div>
@@ -1375,6 +1380,7 @@ export function ProviderInstanceCard({
             environment={genericEnvironment}
             onChange={updateGenericEnvironment}
             secretSources={secretSources}
+            environmentId={environmentId}
             managed={
               instanceLocks && {
                 names: instanceLocks.environmentNames,
diff --git a/apps/web/src/components/settings/ProviderSettingsForm.tsx b/apps/web/src/components/settings/ProviderSettingsForm.tsx
index 0c3928fb8d59..94bb498595d4 100644
--- a/apps/web/src/components/settings/ProviderSettingsForm.tsx
+++ b/apps/web/src/components/settings/ProviderSettingsForm.tsx
@@ -383,6 +383,7 @@ function SecretSettingsControl({
         value={reference ?? ""}
         configured={reference === undefined && configured}
         sources={sources}
+        environmentId={environmentId}
         onCommit={(next) => onChange(nextProviderConfigWithFieldValue(value, field, next))}
         onSecretChange={(secret) =>
           onChange(nextProviderConfigWithFieldValue(value, field, secret ?? ""))
diff --git a/apps/web/src/components/settings/ProviderSettingsPanel.environment.browser.test.tsx b/apps/web/src/components/settings/ProviderSettingsPanel.environment.browser.test.tsx
index 3e6cbb5fbf79..a4622152ac35 100644
--- a/apps/web/src/components/settings/ProviderSettingsPanel.environment.browser.test.tsx
+++ b/apps/web/src/components/settings/ProviderSettingsPanel.environment.browser.test.tsx
@@ -369,6 +369,21 @@ describe("EnvironmentProviderSettings routing", () => {
   });
 });
 
+describe("EnvironmentProviderSettings provider list", () => {
+  it("selects a provider when its row is clicked near the edge", async () => {
+    await setup();
+    await setProviders([provider()]);
+    await using _screen = await render(panel());
+    const select = page.getByRole("button", { name: "Select Claude" });
+    await expect.element(select).toHaveAttribute("aria-pressed", "false");
+    const row = page.elementLocator(select.element().closest('[data-slot="settings-row"]')!);
+
+    await userEvent.click(row, { position: { x: 3, y: 3 } });
+
+    await expect.element(select).toHaveAttribute("aria-pressed", "true");
+  });
+});
+
 describe("EnvironmentProviderSettings instance removal", () => {
   it("resets a configured default instance only once the user confirms", async () => {
     await setup();
diff --git a/apps/web/src/components/settings/ScheduledTasksSettings.tsx b/apps/web/src/components/settings/ScheduledTasksSettings.tsx
index 848b88130f48..fd4f7702d68a 100644
--- a/apps/web/src/components/settings/ScheduledTasksSettings.tsx
+++ b/apps/web/src/components/settings/ScheduledTasksSettings.tsx
@@ -145,6 +145,7 @@ import { Switch } from "../ui/switch";
 import { Textarea } from "../ui/textarea";
 import { stackedThreadToast, toastManager } from "../ui/toast";
 import { Tooltip, TooltipPopup, TooltipTrigger } from "../ui/tooltip";
+import { searchableSetting } from "./settingsSearch";
 import {
   SettingsPageContainer,
   SettingsRow,
@@ -435,7 +436,7 @@ export function ScheduledTasksSettings(target: {
   return (
     <SettingsPageContainer>
       <SettingsSection
-        title="Scheduled tasks"
+        {...searchableSetting("scheduled-tasks")}
         variant="plain"
         headerAction={
           <Button
diff --git a/apps/web/src/components/settings/SecretSourceInput.tsx b/apps/web/src/components/settings/SecretSourceInput.tsx
index 56723508c854..98d8e0f9e52e 100644
--- a/apps/web/src/components/settings/SecretSourceInput.tsx
+++ b/apps/web/src/components/settings/SecretSourceInput.tsx
@@ -9,15 +9,19 @@ import { builtInSecretProviderDefinitions } from "@t3tools/secret-provider-defin
 import { useAtomValue } from "@effect/atom-react";
 import * as Option from "effect/Option";
 import * as Schema from "effect/Schema";
-import { KeyRoundIcon, TypeIcon } from "lucide-react";
+import { AlertTriangleIcon, CheckIcon, KeyRoundIcon, RefreshCwIcon, TypeIcon } from "lucide-react";
 import { useState, type ComponentProps, type ComponentType, type ReactNode } from "react";
 
 import { isSecretsFeatureEnabled } from "../../env";
 import { useEnvironmentSettings } from "../../hooks/useSettings";
 import { OnePasswordIcon } from "../Icons";
 import { serverEnvironment } from "../../state/server";
+import { useAtomCommand } from "../../state/use-atom-command";
+import { Button } from "../ui/button";
 import { DraftInput } from "../ui/draft-input";
 import { Select, SelectItem, SelectPopup, SelectTrigger, SelectValue } from "../ui/select";
+import { Spinner } from "../ui/spinner";
+import { Tooltip, TooltipPopup, TooltipTrigger } from "../ui/tooltip";
 import { SecretInput } from "./SecretInput";
 import { classifySecretProvider } from "./SecretProviderDialog.logic";
 
@@ -111,8 +115,97 @@ export function SecretSourceSelect(props: {
   );
 }
 
+type SecretCheck =
+  | { readonly status: "checking" }
+  | { readonly status: "resolved" }
+  | { readonly status: "failed"; readonly detail: string };
+
+/** Asks the server to resolve the committed reference, so a typo shows here and not at provider start. */
+function SecretCheckButton(props: {
+  readonly environmentId: EnvironmentId;
+  readonly secret: SecretReference;
+  readonly label: string;
+  readonly disabled?: boolean | undefined;
+}) {
+  const { environmentId, secret } = props;
+  const supported = useAtomValue(
+    serverEnvironment.configValueAtom(environmentId),
+    (config) => config?.environment.capabilities.secretSourceCheck === true,
+  );
+  const canCheck = useAtomValue(serverEnvironment.checkSecretSource.permissionAtom(environmentId));
+  const checkSecretSource = useAtomCommand(serverEnvironment.checkSecretSource);
+  const secretKey = `${secret.provider}\u0000${secret.reference}`;
+  const [check, setCheck] = useState<{
+    readonly secretKey: string;
+    readonly state: SecretCheck;
+  } | null>(null);
+  const state = check?.secretKey === secretKey ? check.state : undefined;
+
+  const run = async () => {
+    setCheck({ secretKey, state: { status: "checking" } });
+    const response = await checkSecretSource({ environmentId, input: { source: secret } });
+    const next: SecretCheck =
+      response._tag !== "Success"
+        ? { status: "failed", detail: "Could not reach the server" }
+        : response.value._tag === "Resolved"
+          ? { status: "resolved" }
+          : { status: "failed", detail: response.value.detail };
+    setCheck((previous) =>
+      previous?.secretKey === secretKey ? { secretKey, state: next } : previous,
+    );
+  };
+
+  if (!supported) return null;
+  const description = !canCheck
+    ? "You cannot check secrets on this environment"
+    : state === undefined
+      ? "Check that the secret resolves"
+      : state.status === "checking"
+        ? "Checking the secret"
+        : state.status === "resolved"
+          ? "Secret resolved"
+          : state.detail;
+  return (
+    <Tooltip>
+      <TooltipTrigger
+        render={
+          <span className="inline-flex">
+            <Button
+              type="button"
+              size="icon-micro"
+              variant="ghost-muted"
+              disabled={props.disabled === true || !canCheck || state?.status === "checking"}
+              onClick={() => void run()}
+              aria-label={
+                state?.status === "failed"
+                  ? `${props.label} failed: ${state.detail}`
+                  : state?.status === "resolved"
+                    ? `${props.label} resolved`
+                    : props.label
+              }
+            >
+              {state?.status === "checking" ? (
+                <Spinner />
+              ) : state?.status === "resolved" ? (
+                <CheckIcon className="text-success-foreground" />
+              ) : state?.status === "failed" ? (
+                <AlertTriangleIcon className="text-destructive" />
+              ) : (
+                <RefreshCwIcon />
+              )}
+            </Button>
+          </span>
+        }
+      />
+      <TooltipPopup side="top">{description}</TooltipPopup>
+    </Tooltip>
+  );
+}
+
 type SecretSourceInputProps = Omit<ComponentProps<typeof SecretInput>, "value" | "children"> & {
   readonly value: string | SecretReference;
+  /** Offers a check of the committed reference on this environment. */
+  readonly environmentId?: EnvironmentId | undefined;
   readonly sources: ReadonlyArray<SecretSource>;
   readonly onSecretChange: (secret: SecretReference | undefined) => void;
   /** Whether the selected source and committed field can be saved or used. */
@@ -127,6 +220,7 @@ type SecretSourceInputProps = Omit<ComponentProps<typeof SecretInput>, "value" |
 /** A secret entered here, or read from a secret provider when one is configured. */
 export function SecretSourceInput({
   value,
+  environmentId,
   sources,
   onSecretChange,
   onValidityChange,
@@ -168,38 +262,52 @@ export function SecretSourceInput({
       <SecretInput {...input} />
     ) : (
       <div className="flex min-w-0 flex-1 flex-col gap-1">
-        <DraftInput
-          {...(input.id !== undefined ? { id: input.id } : {})}
-          size="sm"
-          font="mono"
-          value={rejectedReference ?? reference}
-          onCommit={(next) => {
-            if (next.trim().length === 0) {
+        <div className="flex min-w-0 items-center gap-1.5">
+          <DraftInput
+            {...(input.id !== undefined ? { id: input.id } : {})}
+            size="sm"
+            font="mono"
+            className="min-w-0 flex-1"
+            value={rejectedReference ?? reference}
+            onCommit={(next) => {
+              if (next.trim().length === 0) {
+                setRejectedReference(null);
+                onValidityChange?.(pendingProvider === null && secret !== undefined);
+                if (pendingProvider === null && secret !== undefined) onSecretChange(undefined);
+                return;
+              }
+              const decoded = decodeSecretReference({ provider, reference: next });
+              if (
+                Option.isNone(decoded) ||
+                definition?.isReference(decoded.value.reference) === false
+              ) {
+                setRejectedReference(next);
+                onValidityChange?.(false);
+                return;
+              }
               setRejectedReference(null);
-              onValidityChange?.(pendingProvider === null && secret !== undefined);
-              if (pendingProvider === null && secret !== undefined) onSecretChange(undefined);
-              return;
-            }
-            const decoded = decodeSecretReference({ provider, reference: next });
-            if (
-              Option.isNone(decoded) ||
-              definition?.isReference(decoded.value.reference) === false
-            ) {
-              setRejectedReference(next);
-              onValidityChange?.(false);
-              return;
-            }
-            setRejectedReference(null);
-            setPendingProvider(null);
-            onValidityChange?.(true);
-            onSecretChange(decoded.value);
-          }}
-          autoComplete="off"
-          placeholder={definition?.referencePlaceholder}
-          spellCheck={false}
-          aria-label={`${label} reference`}
-          aria-invalid={rejectedReference !== null}
-        />
+              setPendingProvider(null);
+              onValidityChange?.(true);
+              onSecretChange(decoded.value);
+            }}
+            autoComplete="off"
+            placeholder={definition?.referencePlaceholder}
+            spellCheck={false}
+            aria-label={`${label} reference`}
+            aria-invalid={rejectedReference !== null}
+          />
+          {environmentId !== undefined &&
+          secret !== undefined &&
+          pendingProvider === null &&
+          rejectedReference === null ? (
+            <SecretCheckButton
+              environmentId={environmentId}
+              secret={secret}
+              label={`Check ${label}`}
+              disabled={input.disabled}
+            />
+          ) : null}
+        </div>
         {rejectedReference !== null ? (
           <p className="text-2xs text-destructive">
             {definition?.invalidReferenceMessage ?? "Enter a valid secret reference."}
diff --git a/apps/web/src/components/settings/SettingsPanels.tsx b/apps/web/src/components/settings/SettingsPanels.tsx
index 82d6a35df681..31234fb6be51 100644
--- a/apps/web/src/components/settings/SettingsPanels.tsx
+++ b/apps/web/src/components/settings/SettingsPanels.tsx
@@ -67,7 +67,7 @@ import { SnoozePresetsRow } from "./SnoozePresetsSettings";
 import { useDesktopUpdateState } from "../../state/desktopUpdate";
 import { managedTelemetryOffMessage, usePrimaryManagedPolicy } from "../../state/managedPolicy";
 import {
-  getCustomModelOptionsByInstance,
+  getTextGenerationModelOptionsByInstance,
   resolveAppModelSelectionState,
   selectsPlanAgent,
 } from "../../modelSelection";
@@ -555,6 +555,9 @@ export function useSettingsRestore(onRestored?: () => void) {
       ? ["Continue threads after restarts"]
       : []),
     ...(isBackgroundActivityDirty ? ["Background activity"] : []),
+    ...(settings.keepAwakeWhileAgentsWork !== DEFAULT_UNIFIED_SETTINGS.keepAwakeWhileAgentsWork
+      ? ["Keep awake while agents work"]
+      : []),
     ...(settings.defaultThreadEnvMode !== DEFAULT_UNIFIED_SETTINGS.defaultThreadEnvMode
       ? ["New thread mode"]
       : []),
@@ -678,6 +681,7 @@ export function useSettingsRestore(onRestored?: () => void) {
       enableProviderUpdateChecks: DEFAULT_UNIFIED_SETTINGS.enableProviderUpdateChecks,
       continueThreadsAfterServerUpdate: DEFAULT_UNIFIED_SETTINGS.continueThreadsAfterServerUpdate,
       backgroundActivity: DEFAULT_UNIFIED_SETTINGS.backgroundActivity,
+      keepAwakeWhileAgentsWork: DEFAULT_UNIFIED_SETTINGS.keepAwakeWhileAgentsWork,
       backgroundActivityProfile: DEFAULT_UNIFIED_SETTINGS.backgroundActivityProfile,
       automaticGitFetchInterval: DEFAULT_UNIFIED_SETTINGS.automaticGitFetchInterval,
       providerHealthRefreshInterval: DEFAULT_UNIFIED_SETTINGS.providerHealthRefreshInterval,
@@ -1743,7 +1747,7 @@ export function ThreadsSettingsPanel() {
   );
   const textGenProvider: ProviderDriverKind =
     textGenInstanceEntry?.driverKind ?? DEFAULT_DRIVER_KIND;
-  const textGenerationModelOptionsByInstance = getCustomModelOptionsByInstance(
+  const textGenerationModelOptionsByInstance = getTextGenerationModelOptionsByInstance(
     settings,
     textGenerationProviders,
     textGenInstanceId,
@@ -1756,6 +1760,7 @@ export function ThreadsSettingsPanel() {
   const textGenerationModelDisabledReason = useScopedModelDisabledReason(
     settings,
     textGenerationModelInstanceEntries,
+    true,
   );
   const mixedAddProjectBaseDirectory = useScopedSettingsMixed(["addProjectBaseDirectory"]);
   const mixedTextGenerationModel = useScopedSettingsMixed(["textGenerationModelSelection"]);
@@ -2205,6 +2210,35 @@ export function MaintenanceSettingsPanel() {
 
       <SettingsSection id="background" title="Background activity">
         <BackgroundActivitySettingsRow />
+        <SettingsRow
+          serverScoped
+          settingKeys={["keepAwakeWhileAgentsWork"]}
+          {...searchableSetting("keep-awake-while-agents-work")}
+          description="Stop the computer from going to sleep while agents are working, and let it sleep once they finish. Closing a laptop lid still puts it to sleep."
+          resetAction={
+            settings.keepAwakeWhileAgentsWork !==
+            DEFAULT_UNIFIED_SETTINGS.keepAwakeWhileAgentsWork ? (
+              <SettingResetButton
+                label="keep awake while agents work"
+                onClick={() =>
+                  updateSettings({
+                    keepAwakeWhileAgentsWork: DEFAULT_UNIFIED_SETTINGS.keepAwakeWhileAgentsWork,
+                  })
+                }
+              />
+            ) : null
+          }
+          control={
+            <ScopedSwitch
+              settingKeys={["keepAwakeWhileAgentsWork"]}
+              checked={settings.keepAwakeWhileAgentsWork}
+              onCheckedChange={(checked) =>
+                updateSettings({ keepAwakeWhileAgentsWork: Boolean(checked) })
+              }
+              aria-label="Keep awake while agents work"
+            />
+          }
+        />
       </SettingsSection>
 
       <StorageCleanupSections />
diff --git a/apps/web/src/components/settings/SettingsScopeSentence.tsx b/apps/web/src/components/settings/SettingsScopeSentence.tsx
index 907cbc0b4bd8..f22844c8abc2 100644
--- a/apps/web/src/components/settings/SettingsScopeSentence.tsx
+++ b/apps/web/src/components/settings/SettingsScopeSentence.tsx
@@ -1,6 +1,7 @@
 import { resolveEnvironmentMachineKind } from "@t3tools/contracts";
+import { fileBasename } from "@t3tools/shared/path";
 import { useLocation } from "@tanstack/react-router";
-import { CheckIcon, ChevronDownIcon, LayersIcon } from "lucide-react";
+import { CheckIcon, ChevronDownIcon, FolderIcon, LayersIcon } from "lucide-react";
 import { Fragment, useState, type ReactNode } from "react";
 
 import type { SidebarProjectSnapshot } from "../../sidebarProjectGrouping";
@@ -29,13 +30,17 @@ import {
 import { useOptionalSettingsScope } from "./SettingsScopeContext";
 import { resolveSettingsScope, type SettingsScopeSearch } from "./settingsScope";
 import {
+  ALL_CHECKOUTS_VALUE,
   ALL_ENVIRONMENTS_VALUE,
   ALL_PROJECTS_VALUE,
   environmentAxisValue,
   projectAxisValue,
   projectScopeMenuGroups,
+  selectCheckoutAxis,
   selectEnvironmentAxis,
   selectProjectAxis,
+  settingsScopeCheckoutChoices,
+  settingsScopeCheckoutLabel,
   settingsScopeEnvironmentAddress,
   settingsScopeEnvironmentLabel,
   settingsScopeEnvironmentLabels,
@@ -86,6 +91,7 @@ export function SettingsScopeSentence() {
         </span>
         <EnvironmentScopeMenu {...props} />
       </span>
+      <CheckoutScopeMenu {...props} />
     </p>
   );
 }
@@ -303,6 +309,45 @@ function EnvironmentScopeMenu({
   );
 }
 
+function CheckoutScopeMenu({ value, groups, onChange }: SettingsScopeMenuProps) {
+  const group = groups.find((candidate) => candidate.projectKey === value.project);
+  const checkouts = group ? settingsScopeCheckoutChoices(group, value) : [];
+  if (checkouts.length === 0) return null;
+  const selected = checkouts.find((member) => member.physicalProjectKey === value.checkout);
+  return (
+    <span className="flex min-w-0 items-center gap-1.5">
+      <span className="shrink-0">in</span>
+      <ScopeMenu
+        ariaLabel="Checkout scope"
+        icon={<FolderIcon aria-hidden className="size-3.5 shrink-0" />}
+        label={
+          selected
+            ? settingsScopeCheckoutLabel(selected, checkouts)
+            : value.checkout
+              ? "Unavailable checkout"
+              : "All checkouts"
+        }
+        value={value.checkout ?? ALL_CHECKOUTS_VALUE}
+        onChange={(next) =>
+          onChange(
+            selectCheckoutAxis(
+              value,
+              checkouts.find((member) => member.physicalProjectKey === next) ?? null,
+            ),
+          )
+        }
+        searchLabel="Search checkouts"
+        allOption={{ value: ALL_CHECKOUTS_VALUE, label: "All checkouts" }}
+        options={checkouts.map((member) => ({
+          value: member.physicalProjectKey,
+          label: fileBasename(member.workspaceRoot),
+          secondary: member.workspaceRoot,
+        }))}
+      />
+    </span>
+  );
+}
+
 function ProjectScopeMenu({ value, groups, environments, onChange }: SettingsScopeMenuProps) {
   const selected = groups.find((group) => group.projectKey === value.project);
   const projects = projectScopeMenuGroups(groups, value).map((group) => ({
diff --git a/apps/web/src/components/settings/SimlockDeviceHostEditor.tsx b/apps/web/src/components/settings/SimlockDeviceHostEditor.tsx
index 9037508b2790..f0614b771ea1 100644
--- a/apps/web/src/components/settings/SimlockDeviceHostEditor.tsx
+++ b/apps/web/src/components/settings/SimlockDeviceHostEditor.tsx
@@ -301,6 +301,7 @@ function SimlockTokenField(props: {
           key={inputKey}
           id={id}
           aria-label="Agent token"
+          environmentId={props.environmentId}
           className="min-w-0 flex-1"
           configured={props.token.kind === "saved" && typeof props.saved === "string"}
           value={
diff --git a/apps/web/src/components/settings/SourceControlTokenSettings.tsx b/apps/web/src/components/settings/SourceControlTokenSettings.tsx
index 5a78b5f28287..f83d0de6e6f7 100644
--- a/apps/web/src/components/settings/SourceControlTokenSettings.tsx
+++ b/apps/web/src/components/settings/SourceControlTokenSettings.tsx
@@ -127,6 +127,7 @@ export function SourceControlTokenSettings({
               id={`${definition.kind}-token-${environmentId}`}
               size="sm"
               aria-label={`${definition.label} token`}
+              environmentId={environmentId}
               configured={isSaved && !isSecretReference(savedToken)}
               value={draft}
               sources={secretSources}
diff --git a/apps/web/src/components/settings/SourceControlWritingSettings.tsx b/apps/web/src/components/settings/SourceControlWritingSettings.tsx
index 9d65ffc83ea0..26cf6eb3dcbb 100644
--- a/apps/web/src/components/settings/SourceControlWritingSettings.tsx
+++ b/apps/web/src/components/settings/SourceControlWritingSettings.tsx
@@ -23,7 +23,7 @@ import { useSettingsScope } from "./SettingsScopeContext";
 import { providerInstanceEntriesFor } from "../../providerInstances";
 import { useTextGenerationTargets } from "../../textGenerators";
 import {
-  getCustomModelOptionsByInstance,
+  getTextGenerationModelOptionsByInstance,
   resolveAppModelSelectionState,
   selectsPlanAgent,
 } from "../../modelSelection";
@@ -151,13 +151,13 @@ export function SourceControlWritingSettingsSection() {
     (entry) =>
       entry.instanceId === defaultModelSelection.instanceId && entry.enabled && entry.isAvailable,
   );
-  const modelOptionsByInstance = getCustomModelOptionsByInstance(
+  const modelOptionsByInstance = getTextGenerationModelOptionsByInstance(
     settings,
     projectEffectiveTextGenerationProviders,
     activeSelection.instanceId,
     activeSelection.model,
   );
-  const writerModelDisabledReason = useScopedModelDisabledReason(settings, writerEntries);
+  const writerModelDisabledReason = useScopedModelDisabledReason(settings, writerEntries, true);
   const writerInstanceEntry = writerEntries.find(
     (entry) => entry.instanceId === activeSelection.instanceId,
   );
@@ -179,7 +179,7 @@ export function SourceControlWritingSettingsSection() {
     },
     projectAgentProviders,
   );
-  const reviewGuideModelOptionsByInstance = getCustomModelOptionsByInstance(
+  const reviewGuideModelOptionsByInstance = getTextGenerationModelOptionsByInstance(
     settings,
     projectAgentProviders,
     reviewGuideSelection.instanceId,
@@ -595,7 +595,21 @@ export function SourceControlWritingSettingsSection() {
                 <Switch
                   checked={usesDedicatedModel}
                   disabled={!usesDedicatedModel && !canEnableDedicatedModel}
-                  onCheckedChange={(checked) =>
+                  onCheckedChange={(checked) => {
+                    if (checked) {
+                      const reason = writerModelDisabledReason(
+                        defaultModelSelection.instanceId,
+                        defaultModelSelection.model,
+                      );
+                      if (reason) {
+                        toastManager.add({
+                          type: "error",
+                          title: "Writer model not saved",
+                          description: reason,
+                        });
+                        return;
+                      }
+                    }
                     updateSettings({
                       sourceControlWriterModelSelection: checked
                         ? createModelSelection(
@@ -604,8 +618,8 @@ export function SourceControlWritingSettingsSection() {
                             defaultModelSelection.options,
                           )
                         : null,
-                    })
-                  }
+                    });
+                  }}
                   aria-label="Use a separate source control writer model"
                 />
               </div>
diff --git a/apps/web/src/components/settings/TextGeneratorsSettings.tsx b/apps/web/src/components/settings/TextGeneratorsSettings.tsx
index 4dd163ae0e7e..ce0e729309bf 100644
--- a/apps/web/src/components/settings/TextGeneratorsSettings.tsx
+++ b/apps/web/src/components/settings/TextGeneratorsSettings.tsx
@@ -28,7 +28,7 @@ import {
   textGeneratorBrand,
   textGeneratorDisplayName,
 } from "../../textGenerators";
-import { getCustomModelOptionsByInstance } from "../../modelSelection";
+import { getTextGenerationModelOptionsByInstance } from "../../modelSelection";
 import { ProviderInstanceIcon } from "../chat/ProviderInstanceIcon";
 import { ProviderModelPicker } from "../chat/ProviderModelPicker";
 import {
@@ -563,7 +563,7 @@ function TextGenerationTaskPicker({
           model={selection.model}
           lockedProvider={null}
           instanceEntries={targets.entries}
-          modelOptionsByInstance={getCustomModelOptionsByInstance(
+          modelOptionsByInstance={getTextGenerationModelOptionsByInstance(
             settings,
             targets.providers,
             selection.instanceId,
diff --git a/apps/web/src/components/settings/VoiceSettingsPanel.browser.test.tsx b/apps/web/src/components/settings/VoiceSettingsPanel.browser.test.tsx
index 93187363198d..98558bc26b4b 100644
--- a/apps/web/src/components/settings/VoiceSettingsPanel.browser.test.tsx
+++ b/apps/web/src/components/settings/VoiceSettingsPanel.browser.test.tsx
@@ -599,6 +599,33 @@ it("keeps punctuation in a saved dictionary term and its alias", async () => {
   ]);
 });
 
+it("keeps a dictionary term and alias draft on the Enter that confirms an IME candidate", async () => {
+  const previous = getClientSettings();
+  using cleanup = new DisposableStack();
+  cleanup.defer(() => __setClientSettingsForTests(previous));
+  __setClientSettingsForTests({
+    ...previous,
+    speechCustomWords: [{ term: "日本語", aliases: [] }],
+  });
+  await using screen = await render(
+    <SettingsScopeProvider search={{}} onChange={() => {}}>
+      <VoiceSettingsPanel />
+    </SettingsScopeProvider>,
+  );
+  const composingEnter = () =>
+    new KeyboardEvent("keydown", { key: "Enter", isComposing: true, bubbles: true });
+  const term = screen.getByRole("textbox", { name: "Add a word or phrase to the dictionary" });
+  await userEvent.fill(term, "にほん");
+  term.element().dispatchEvent(composingEnter());
+  await expect.element(term).toHaveValue("にほん");
+  await userEvent.click(screen.getByRole("button", { name: "Add an alias for 日本語" }));
+  const alias = screen.getByRole("textbox", { name: "Alias for 日本語" });
+  await userEvent.fill(alias, "にほん");
+  alias.element().dispatchEvent(composingEnter());
+  expect(getClientSettings().speechCustomWords).toEqual([{ term: "日本語", aliases: [] }]);
+  await expect.element(alias).toHaveValue("にほん");
+});
+
 it("records from the first connected microphone in the saved order", async () => {
   const previous = getClientSettings();
   using cleanup = new DisposableStack();
diff --git a/apps/web/src/components/settings/VoiceSettingsPanel.tsx b/apps/web/src/components/settings/VoiceSettingsPanel.tsx
index cfddfce72d15..22ae59e55d31 100644
--- a/apps/web/src/components/settings/VoiceSettingsPanel.tsx
+++ b/apps/web/src/components/settings/VoiceSettingsPanel.tsx
@@ -72,7 +72,7 @@ import {
 import { updateClientSettings, useClientSettings } from "../../hooks/useSettings";
 import { runEnvironmentSpeech } from "../../speech/runEnvironmentSpeech";
 import {
-  getCustomModelOptionsByInstance,
+  getTextGenerationModelOptionsByInstance,
   resolveAppModelSelectionState,
 } from "../../modelSelection";
 import { useTextGenerationTargets } from "../../textGenerators";
@@ -391,6 +391,7 @@ function DictionaryEditor(props: {
             aria-label={`Add a word or phrase to the ${label}`}
             onChange={(event) => setTermDraft(event.target.value)}
             onKeyDown={(event) => {
+              if (event.nativeEvent.isComposing || event.keyCode === 229) return;
               if (event.key !== "Enter" || event.shiftKey) return;
               event.preventDefault();
               addTerm();
@@ -427,6 +428,7 @@ function DictionaryEditor(props: {
                   onChange={(event) => setAliasDraft({ term, value: event.target.value })}
                   onBlur={() => setAliasDraft(null)}
                   onKeyDown={(event) => {
+                    if (event.nativeEvent.isComposing || event.keyCode === 229) return;
                     if (event.key === "Escape") setAliasDraft(null);
                     if (event.key !== "Enter") return;
                     event.preventDefault();
@@ -529,14 +531,14 @@ function CleanupModelRow() {
     },
     textGenerationProviders,
   );
-  const modelOptionsByInstance = getCustomModelOptionsByInstance(
+  const modelOptionsByInstance = getTextGenerationModelOptionsByInstance(
     settings,
     textGenerationProviders,
     selection.instanceId,
     selection.model,
   );
   const instanceEntry = instanceEntries.find((entry) => entry.instanceId === selection.instanceId);
-  const modelDisabledReason = useScopedModelDisabledReason(settings, instanceEntries);
+  const modelDisabledReason = useScopedModelDisabledReason(settings, instanceEntries, true);
   const setModel = (next: ReturnType<typeof createModelSelection>) => {
     const reason = modelDisabledReason(next.instanceId, next.model);
     if (reason) {
@@ -1081,7 +1083,6 @@ function TranscriptionTest(props: {
     projectId: props.projectId,
     projectName: props.projectName,
     ownerKey: JSON.stringify([props.environmentId, props.projectId]),
-    draftText: draft,
     cleanup: false,
     readDraft: () => ({
       text: draftRef.current,
diff --git a/apps/web/src/components/settings/settingsScopeAxis.test.ts b/apps/web/src/components/settings/settingsScopeAxis.test.ts
index ab919d7cbe05..9f1866cc220d 100644
--- a/apps/web/src/components/settings/settingsScopeAxis.test.ts
+++ b/apps/web/src/components/settings/settingsScopeAxis.test.ts
@@ -1,6 +1,21 @@
 import { describe, expect, it } from "vite-plus/test";
 
-import { selectEnvironmentAxis, selectProjectAxis } from "./settingsScopeAxis";
+import type { SidebarProjectSnapshot } from "../../sidebarProjectGrouping";
+import {
+  selectEnvironmentAxis,
+  selectProjectAxis,
+  settingsScopeCheckoutChoices,
+  settingsScopeCheckoutLabel,
+} from "./settingsScopeAxis";
+
+const member = (environmentId: string, physicalProjectKey: string, workspaceRoot = "") =>
+  ({
+    environmentId,
+    physicalProjectKey,
+    workspaceRoot,
+  }) as SidebarProjectSnapshot["memberProjects"][number];
+const group = (...memberProjects: SidebarProjectSnapshot["memberProjects"]) =>
+  ({ memberProjects }) as SidebarProjectSnapshot;
 
 describe("settings scope axes", () => {
   it("drops a checkout narrowing from older links when either axis changes", () => {
@@ -11,4 +26,25 @@ describe("settings scope axes", () => {
     });
     expect(selectProjectAxis(checkout, "app")).toEqual({ project: "app", machine: "first" });
   });
+
+  it("offers checkouts only where an environment cannot tell them apart", () => {
+    const a = member("laptop", "a");
+    const b = member("laptop", "b");
+    const c = member("server", "c");
+
+    expect(settingsScopeCheckoutChoices(group(a, b, c), { machine: "laptop" })).toEqual([a, b]);
+    expect(settingsScopeCheckoutChoices(group(a, b), {})).toEqual([a, b]);
+    expect(settingsScopeCheckoutChoices(group(a, b, c), { checkout: "b" })).toEqual([a, b]);
+    expect(settingsScopeCheckoutChoices(group(a, b, c), {})).toEqual([]);
+    expect(settingsScopeCheckoutChoices(group(a, b, c), { machine: "server" })).toEqual([]);
+  });
+
+  it("labels a checkout by its full path only when its folder name repeats", () => {
+    const first = member("laptop", "a", "/work/one/app");
+    const second = member("laptop", "b", "C:\\work\\two\\app");
+    const other = member("laptop", "c", "/work/tools");
+
+    expect(settingsScopeCheckoutLabel(second, [first, second, other])).toBe("C:\\work\\two\\app");
+    expect(settingsScopeCheckoutLabel(other, [first, second, other])).toBe("tools");
+  });
 });
diff --git a/apps/web/src/components/settings/settingsScopeAxis.ts b/apps/web/src/components/settings/settingsScopeAxis.ts
index dea9f0acda57..0c3853906531 100644
--- a/apps/web/src/components/settings/settingsScopeAxis.ts
+++ b/apps/web/src/components/settings/settingsScopeAxis.ts
@@ -1,7 +1,9 @@
+import { fileBasename } from "@t3tools/shared/path";
 import type { SidebarProjectSnapshot } from "../../sidebarProjectGrouping";
 import type { EnvironmentPresentation } from "../../state/environments";
 import type { ResolvedSettingsScope, SettingsScopeSearch } from "./settingsScope";
 
+type ScopeCheckout = SidebarProjectSnapshot["memberProjects"][number];
 type ScopeEnvironment = Pick<EnvironmentPresentation, "environmentId" | "label" | "displayUrl">;
 
 export function settingsScopeEnvironmentAddress(environment: ScopeEnvironment) {
@@ -57,6 +59,7 @@ export function settingsScopeProjectMachines(
 
 export const ALL_ENVIRONMENTS_VALUE = "all";
 export const ALL_PROJECTS_VALUE = "all";
+export const ALL_CHECKOUTS_VALUE = "all";
 
 export function environmentAxisValue(
   search: SettingsScopeSearch,
@@ -97,6 +100,46 @@ export function selectProjectAxis(search: SettingsScopeSearch, value: string): S
   return next;
 }
 
+/** Empty unless the selection spans several checkouts of one environment, which only this axis can split. */
+export function settingsScopeCheckoutChoices(
+  group: SidebarProjectSnapshot,
+  search: Pick<SettingsScopeSearch, "machine" | "checkout">,
+): readonly ScopeCheckout[] {
+  const selected = group.memberProjects.find(
+    (member) => member.physicalProjectKey === search.checkout,
+  );
+  const environmentId = search.machine ?? selected?.environmentId;
+  const members =
+    environmentId === undefined
+      ? group.memberProjects
+      : group.memberProjects.filter((member) => member.environmentId === environmentId);
+  return members.length > 1 &&
+    members.every((member) => member.environmentId === members[0]!.environmentId)
+    ? members
+    : [];
+}
+
+export function selectCheckoutAxis(
+  search: SettingsScopeSearch,
+  checkout: ScopeCheckout | null,
+): SettingsScopeSearch {
+  const { checkout: _previous, ...rest } = search;
+  return checkout
+    ? { ...rest, machine: checkout.environmentId, checkout: checkout.physicalProjectKey }
+    : rest;
+}
+
+/** Repeated folder names fall back to the full path so the closed menu still identifies the checkout. */
+export function settingsScopeCheckoutLabel(
+  checkout: ScopeCheckout,
+  checkouts: readonly ScopeCheckout[],
+) {
+  const name = fileBasename(checkout.workspaceRoot);
+  return checkouts.filter((other) => fileBasename(other.workspaceRoot) === name).length > 1
+    ? checkout.workspaceRoot
+    : name;
+}
+
 export function selectSingleEnvironmentScope(
   search: SettingsScopeSearch,
   scope: ResolvedSettingsScope,
diff --git a/apps/web/src/components/settings/settingsSearch.test.ts b/apps/web/src/components/settings/settingsSearch.test.ts
index cb3b446d6d02..bac40332a277 100644
--- a/apps/web/src/components/settings/settingsSearch.test.ts
+++ b/apps/web/src/components/settings/settingsSearch.test.ts
@@ -80,6 +80,13 @@ describe("searchSettings", () => {
     expect(searchSettings("1password").map((item) => item.to)).not.toContain("/settings/secrets");
   });
 
+  it("finds the Scheduled tasks page", () => {
+    expect(searchSettings("scheduled tasks")[0]).toMatchObject({
+      id: "scheduled-tasks",
+      to: "/settings/scheduled-tasks",
+    });
+  });
+
   it("matches normalized title substrings", () => {
     expect(searchSettings("  WORD   WRAP  ", ITEMS).map((item) => item.id)).toEqual(["word-wrap"]);
     expect(searchSettings("glass").map((item) => item.id)).toEqual(["setting-glass-opacity"]);
diff --git a/apps/web/src/components/settings/settingsSearch.ts b/apps/web/src/components/settings/settingsSearch.ts
index 6a9ce0557ca5..85e4878be73d 100644
--- a/apps/web/src/components/settings/settingsSearch.ts
+++ b/apps/web/src/components/settings/settingsSearch.ts
@@ -777,6 +777,13 @@ export const SETTINGS_SEARCH_ITEMS = [
       "resume running active interrupted work restart reboot machine crash desktop update automatically",
     ],
   },
+  {
+    id: "keep-awake-while-agents-work",
+    title: "Keep awake while agents work",
+    to: "/settings/maintenance",
+    scope: "environment-defaults",
+    searchTerms: ["caffeinate sleep prevent stay awake power laptop lid inhibit"],
+  },
   {
     id: "background-activity",
     title: "Background activity",
@@ -998,6 +1005,11 @@ export const SETTINGS_SEARCH_ITEMS = [
     searchTerms: ["refresh availability versions auth state models background probes seconds off"],
     providerSettingsOnly: true,
   },
+  {
+    id: "scheduled-tasks",
+    title: "Scheduled tasks",
+    to: "/settings/scheduled-tasks",
+  },
   {
     id: "agent-browser-access",
     title: "Agent browser access",
diff --git a/apps/web/src/components/settings/useScopedModelAvailability.ts b/apps/web/src/components/settings/useScopedModelAvailability.ts
index 2471825cb3d1..a5d89813cae4 100644
--- a/apps/web/src/components/settings/useScopedModelAvailability.ts
+++ b/apps/web/src/components/settings/useScopedModelAvailability.ts
@@ -5,7 +5,10 @@ import {
 } from "@t3tools/contracts";
 
 import { mergeEnvironmentSettings } from "../../hooks/useSettings";
-import { getCustomModelOptionsByInstance } from "../../modelSelection";
+import {
+  getCustomModelOptionsByInstance,
+  getTextGenerationModelOptionsByInstance,
+} from "../../modelSelection";
 import {
   applyProviderInstanceSettings,
   deriveProviderInstanceEntries,
@@ -17,6 +20,7 @@ import { useSettingsScope } from "./SettingsScopeContext";
 export function useScopedModelDisabledReason(
   settings: UnifiedSettings,
   entries: readonly ProviderInstanceEntry[],
+  textGeneration = false,
 ) {
   const { targets } = useSettingsScope();
   const { environments } = useEnvironments();
@@ -48,7 +52,10 @@ export function useScopedModelDisabledReason(
         candidate.settings,
         candidate.projectId,
       ).find((option) => option.instanceId === instanceId);
-      const options = getCustomModelOptionsByInstance(
+      const optionsForInstance = textGeneration
+        ? getTextGenerationModelOptionsByInstance
+        : getCustomModelOptionsByInstance;
+      const options = optionsForInstance(
         mergeEnvironmentSettings(candidate.settings, settings),
         providers,
       ).get(instanceId);
diff --git a/apps/web/src/components/sidebar/SidebarDraftBlock.browser.test.tsx b/apps/web/src/components/sidebar/SidebarDraftBlock.browser.test.tsx
index c29932f5757e..41cd795013e4 100644
--- a/apps/web/src/components/sidebar/SidebarDraftBlock.browser.test.tsx
+++ b/apps/web/src/components/sidebar/SidebarDraftBlock.browser.test.tsx
@@ -1,9 +1,10 @@
 import { scopeProjectRef, scopeThreadRef } from "@t3tools/client-runtime/environment";
-import { EnvironmentId, ProjectId, ThreadId } from "@t3tools/contracts";
+import { EnvironmentId, MessageId, ProjectId, ThreadId } from "@t3tools/contracts";
 import { Profiler } from "react";
 import { expect, it, vi } from "vite-plus/test";
 
 import { act, render } from "../../../test/render";
+import { formatAssistantCitationForComposer } from "../../composer-logic";
 import { DraftId, useComposerDraftStore } from "../../composerDraftStore";
 import { SidebarDraftBlock } from "./SidebarDraftBlock";
 
@@ -53,6 +54,21 @@ it("keeps draft previews current through edits, promotion and removal", async ()
   await act(() => initial.setPrompt(draftId, "Updated draft preview"));
   await expect.element(row).toHaveAccessibleName("Updated draft preview, Unsent draft");
 
+  const quote = "Cache the parsed config per worktree.";
+  const citation = formatAssistantCitationForComposer({
+    version: 1,
+    environmentId,
+    threadId: ThreadId.make("source-thread"),
+    messageId: MessageId.make("source-message"),
+    text: quote,
+    start: 0,
+    end: quote.length,
+    prefix: "",
+    suffix: "",
+  });
+  await act(() => initial.setPrompt(draftId, `${citation}Why per worktree?`));
+  await expect.element(row).toHaveAccessibleName(`${quote} Why per worktree?, Unsent draft`);
+
   await act(() => initial.markDraftThreadPromoting(draftId));
   await expect.element(row).not.toBeInTheDocument();
   await act(() => initial.clearDraftThread(draftId));
diff --git a/apps/web/src/components/sidebar/SidebarDraftBlock.tsx b/apps/web/src/components/sidebar/SidebarDraftBlock.tsx
index bc15ca594597..c4868c4776ea 100644
--- a/apps/web/src/components/sidebar/SidebarDraftBlock.tsx
+++ b/apps/web/src/components/sidebar/SidebarDraftBlock.tsx
@@ -1,4 +1,5 @@
 import { discardComposerDraft } from "../../lib/discardComposerDraft";
+import { assistantCitationsToPlainText } from "@t3tools/shared/assistantCitations";
 import { replaceComposerContextReferences } from "@t3tools/shared/composerContextReferences";
 import { SquarePenIcon, XIcon } from "lucide-react";
 import {
@@ -34,7 +35,9 @@ const SidebarDraftRow = memo(function SidebarDraftRow(props: {
 }) {
   const { composer, draftId, onContextMenu, onDiscard, onNavigate } = props;
   const promptPreview =
-    replaceComposerContextReferences(composer.prompt, (occurrence) => occurrence.label)
+    assistantCitationsToPlainText(
+      replaceComposerContextReferences(composer.prompt, (occurrence) => occurrence.label),
+    )
       .trim()
       .split("\n", 1)[0] ?? "";
   // images mirrors persistedAttachments once rehydration finishes; before
diff --git a/apps/web/src/components/sidebar/SidebarProjectFolderHeader.tsx b/apps/web/src/components/sidebar/SidebarProjectFolderHeader.tsx
index 38b1e53bf057..1e6510bbe37e 100644
--- a/apps/web/src/components/sidebar/SidebarProjectFolderHeader.tsx
+++ b/apps/web/src/components/sidebar/SidebarProjectFolderHeader.tsx
@@ -85,7 +85,7 @@ export const SidebarProjectFolderHeader = memo(function SidebarProjectFolderHead
           </span>
         ) : null}
         {collapsed && hiddenThreads.length > 0 ? (
-          <span className="shrink-0 text-xs tabular-nums text-sidebar-muted-foreground group-hover/project-folder:invisible pointer-coarse:invisible">
+          <span className="shrink-0 text-xs tabular-nums text-sidebar-muted-foreground group-hover/project-folder:invisible group-has-[[data-sidebar-action-for]:focus]/project-folder:invisible pointer-coarse:invisible">
             {hiddenThreads.length}
           </span>
         ) : null}
@@ -97,7 +97,7 @@ export const SidebarProjectFolderHeader = memo(function SidebarProjectFolderHead
           )}
         />
       </button>
-      {/* Sits over the count, which hides on hover, and left of the chevron. */}
+      {/* Sits over the count, which hides on hover or focus, and left of the chevron. */}
       <span className="absolute inset-y-0 right-6 flex items-center opacity-0 focus-within:opacity-100 group-hover/project-folder:opacity-100 pointer-coarse:opacity-100">
         <Tooltip>
           <TooltipTrigger
diff --git a/apps/web/src/components/sidebar/mainAppLocation.ts b/apps/web/src/components/sidebar/mainAppLocation.ts
index 8e4267af7389..049ecf3035b4 100644
--- a/apps/web/src/components/sidebar/mainAppLocation.ts
+++ b/apps/web/src/components/sidebar/mainAppLocation.ts
@@ -2,6 +2,7 @@ import { useNavigate, type AnyRouter } from "@tanstack/react-router";
 
 import { GUEST_PAGE_PATH } from "../../guestPage";
 import { withoutAssistantCitationHash } from "../../lib/assistantCitationNavigation";
+import { resolveThreadRouteTarget, type ThreadRouteTarget } from "../../threadRoutes";
 
 /** Settings and Usage open as modals over the last main-app view. */
 export function isAppModalPage(pathname: string) {
@@ -19,6 +20,7 @@ const SHELL_LESS_PATHS = new Set(["/pair", "/connect", "/connect-agent", GUEST_P
 
 let mainAppHref: string | null = null;
 let appModalReturnHref: string | null = null;
+let appModalReturnThreadTarget: ThreadRouteTarget | null = null;
 
 /** Remembers where Settings, Usage, and the utility pages lead back to. */
 export function startMainAppLocationTracking(router: AnyRouter): () => void {
@@ -27,12 +29,20 @@ export function startMainAppLocationTracking(router: AnyRouter): () => void {
     if (isAppModalPage(pathname) || SHELL_LESS_PATHS.has(pathname)) return;
     const href = withoutAssistantCitationHash(router.state.location.href);
     appModalReturnHref = href;
+    appModalReturnThreadTarget = resolveThreadRouteTarget(
+      router.state.matches.at(-1)?.params ?? {},
+    );
     if (!isSidebarUtilityPage(pathname)) mainAppHref = href;
   };
   record();
   return router.subscribe("onResolved", record);
 }
 
+/** The thread Settings or Usage opened over, for views mounted while the modal is open. */
+export function getAppModalReturnThreadTarget() {
+  return appModalReturnThreadTarget;
+}
+
 export function useNavigateToMainApp() {
   const navigate = useNavigate();
   return () => navigate({ href: mainAppHref ?? "/" });
diff --git a/apps/web/src/components/sidebar/updateEverythingRun.test.ts b/apps/web/src/components/sidebar/updateEverythingRun.test.ts
index f451eadc13b2..c06ff106c1c3 100644
--- a/apps/web/src/components/sidebar/updateEverythingRun.test.ts
+++ b/apps/web/src/components/sidebar/updateEverythingRun.test.ts
@@ -1,7 +1,9 @@
+import { AVAILABLE_CONNECTION_STATE } from "@t3tools/client-runtime/connection";
 import { EnvironmentId, type ServerConfig } from "@t3tools/contracts";
-import { Atom } from "effect/reactivity";
+import { AsyncResult, Atom } from "effect/reactivity";
 import { afterEach, describe, expect, it, vi } from "vite-plus/test";
 
+import { environmentCatalog } from "~/connection/catalog";
 import { appAtomRegistry } from "~/rpc/atomRegistry";
 import { serverEnvironment } from "~/state/server";
 import type { ServerUpdateOutcome, ServerUpdateTarget } from "../ServerUpdateAction";
@@ -60,6 +62,28 @@ describe("startDesktopUpdateLaunchNotice", () => {
     }
   });
 
+  it("retries the connection to a restarting server instead of waiting out its backoff", async () => {
+    const environmentId = EnvironmentId.make("backing-off-machine");
+    using _connection = vi
+      .spyOn(environmentCatalog, "stateAtom")
+      .mockReturnValue(
+        Atom.make(
+          AsyncResult.success({ ...AVAILABLE_CONNECTION_STATE, phase: "backoff" as const }),
+        ) as unknown as ReturnType<typeof environmentCatalog.stateAtom>,
+      );
+    using retryNow = vi
+      .spyOn(environmentCatalog.retryNow, "run")
+      .mockResolvedValue(AsyncResult.success(undefined));
+    const stop = relaunchWhileRestarting(environmentId);
+    try {
+      await vi.advanceTimersByTimeAsync(1_000);
+      expect(retryNow).toHaveBeenCalledWith(appAtomRegistry, environmentId);
+    } finally {
+      await vi.advanceTimersByTimeAsync(32 * 60 * 1000);
+      stop();
+    }
+  });
+
   it("clears the restored state when the server never comes back", async () => {
     const environmentId = EnvironmentId.make("lost-machine");
     const stateAtom = serverEnvironment.updateStateAtom(environmentId);
diff --git a/apps/web/src/components/sidebar/updateEverythingRun.tsx b/apps/web/src/components/sidebar/updateEverythingRun.tsx
index ff12f9093571..ac07c82e91b8 100644
--- a/apps/web/src/components/sidebar/updateEverythingRun.tsx
+++ b/apps/web/src/components/sidebar/updateEverythingRun.tsx
@@ -1,11 +1,18 @@
 import { useAtomValue } from "@effect/atom-react";
-import { serverUpdateStateAtom } from "@t3tools/client-runtime/state/server";
+import { AVAILABLE_CONNECTION_STATE } from "@t3tools/client-runtime/connection";
+import {
+  nudgeReconnectDuringUpdateRestart,
+  serverUpdateStateAtom,
+} from "@t3tools/client-runtime/state/server";
 import { EnvironmentId, type ServerConfig } from "@t3tools/contracts";
+import * as Effect from "effect/Effect";
 import * as Option from "effect/Option";
 import * as Schema from "effect/Schema";
-import { AsyncResult, Atom } from "effect/reactivity";
+import * as Stream from "effect/Stream";
+import { AsyncResult, Atom, AtomRegistry } from "effect/reactivity";
 
 import { APP_VERSION } from "~/branding";
+import { environmentCatalog } from "~/connection/catalog";
 import { appAtomRegistry } from "~/rpc/atomRegistry";
 import { desktopUpdateStateAtom } from "~/state/desktopUpdate";
 import { serverEnvironment } from "~/state/server";
@@ -308,6 +315,7 @@ function followHandedOffServers(servers: ReadonlyArray<HandedOffServer>): void {
       if (settled) return;
       settled = true;
       clearTimeout(timer);
+      stopReconnectNudge();
       queueMicrotask(() => unsubscribe());
       appAtomRegistry.set(stateAtom, { status: "idle" });
       releaseState();
@@ -329,6 +337,19 @@ function followHandedOffServers(servers: ReadonlyArray<HandedOffServer>): void {
       () => settle(`Not back after ${HANDOFF_TIMEOUT_MS / 60_000} minutes`),
       server.startedAt + HANDOFF_TIMEOUT_MS - Date.now(),
     );
+    const stopReconnectNudge = Effect.runCallback(
+      nudgeReconnectDuringUpdateRestart({
+        stateChanges: AtomRegistry.toStream(
+          appAtomRegistry,
+          environmentCatalog.stateAtom(server.environmentId),
+        ).pipe(
+          Stream.map((state) => AsyncResult.getOrElse(state, () => AVAILABLE_CONNECTION_STATE)),
+        ),
+        retryNow: Effect.promise(() =>
+          environmentCatalog.retryNow.run(appAtomRegistry, server.environmentId),
+        ).pipe(Effect.asVoid),
+      }),
+    );
     const unsubscribe = appAtomRegistry.subscribe(
       serverEnvironment.configValueAtom(server.environmentId),
       (config) => {
diff --git a/apps/web/src/components/threadTitleRegenerationToast.ts b/apps/web/src/components/threadTitleRegenerationToast.ts
new file mode 100644
index 000000000000..4d420b9521f0
--- /dev/null
+++ b/apps/web/src/components/threadTitleRegenerationToast.ts
@@ -0,0 +1,59 @@
+import type { ThreadTitleRegenerationOutcome } from "@t3tools/contracts";
+import {
+  type AtomCommandResult,
+  isAtomCommandInterrupted,
+  squashAtomCommandFailure,
+} from "@t3tools/client-runtime/state/runtime";
+
+import { stackedThreadToast } from "./ui/toast";
+
+type TitleRegenerationResult = AtomCommandResult<ThreadTitleRegenerationOutcome | null, unknown>;
+
+function failureMessage(result: TitleRegenerationResult): string | null {
+  if (result._tag === "Failure") {
+    if (isAtomCommandInterrupted(result)) return null;
+    const error = squashAtomCommandFailure(result);
+    return error instanceof Error ? error.message : "An error occurred.";
+  }
+  return result.value?.status === "failed"
+    ? (result.value.message ?? "Title generation failed.")
+    : null;
+}
+
+function isKept(result: TitleRegenerationResult): boolean {
+  return result._tag === "Success" && result.value?.status === "unchanged";
+}
+
+export function titleRegenerationToast(results: ReadonlyArray<TitleRegenerationResult>) {
+  const failures = results.flatMap((result) => {
+    const message = failureMessage(result);
+    return message === null ? [] : [message];
+  });
+  if (failures.length > 0) {
+    return stackedThreadToast({
+      type: "error",
+      title:
+        results.length === 1
+          ? "Failed to regenerate thread title"
+          : `Failed to regenerate ${failures.length} of ${results.length} thread titles`,
+      description: failures[0],
+    });
+  }
+  const kept = results.filter(isKept).length;
+  if (kept === 0) return null;
+  if (results.length === 1) {
+    return stackedThreadToast({
+      type: "info",
+      title: "Title kept",
+      description: "The current title already fits this thread.",
+    });
+  }
+  return stackedThreadToast({
+    type: "info",
+    title: kept === results.length ? "Titles kept" : `Kept ${kept} of ${results.length} titles`,
+    description:
+      kept === results.length
+        ? "The current titles already fit these threads."
+        : "Those titles already fit their threads.",
+  });
+}
diff --git a/apps/web/src/components/ui/middle-truncate.browser.test.tsx b/apps/web/src/components/ui/middle-truncate.browser.test.tsx
index 3b9b114d2f9f..3fbf36523254 100644
--- a/apps/web/src/components/ui/middle-truncate.browser.test.tsx
+++ b/apps/web/src/components/ui/middle-truncate.browser.test.tsx
@@ -23,4 +23,29 @@ describe("MiddleTruncate", () => {
     expect(label()).not.toHaveAttribute("data-overflow");
     expect(label()).toHaveStyle({ clipPath: "none" });
   });
+
+  it.each([
+    ["Fix the sidebar", 7],
+    ["report\u2003\u2003draft.txt", 9],
+  ])("renders %j split as wide as whole", async (value, tail) => {
+    await using screen = await render(
+      <div>
+        <MiddleTruncate value={value} tail={tail} data-testid="split" />
+        <span data-testid="whole" className="whitespace-nowrap">
+          {value}
+        </span>
+      </div>,
+    );
+    const width = (id: string) => screen.getByTestId(id).element().getBoundingClientRect().width;
+
+    expect(width("split")).toBeCloseTo(width("whole"), 0);
+  });
+
+  it("keeps the raw value's tail when collapsing its spaces", async () => {
+    await using screen = await render(<MiddleTruncate value={"longprefix a  b.txt"} />);
+
+    expect(screen.container.querySelector("[title] > span:last-child")?.textContent).toBe(
+      "x a b.txt",
+    );
+  });
 });
diff --git a/apps/web/src/components/ui/middle-truncate.tsx b/apps/web/src/components/ui/middle-truncate.tsx
index 62dd3c58ecce..faf8ab6b3f39 100644
--- a/apps/web/src/components/ui/middle-truncate.tsx
+++ b/apps/web/src/components/ui/middle-truncate.tsx
@@ -16,7 +16,8 @@ export function MiddleTruncate({
   showTitle?: boolean;
   variant?: "default" | "cap-aligned";
 }) {
-  const split = splitForMiddleTruncate(value, tail);
+  const raw = splitForMiddleTruncate(value, tail);
+  const split = raw && collapseSegments(raw);
   const headRef = useRef<HTMLSpanElement>(null);
   const head = split?.head;
   // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- fits the head span's DOM text and refits it through a ResizeObserver
@@ -42,10 +43,12 @@ export function MiddleTruncate({
       {split ? (
         <>
           {/* The tail carries the ellipsis so it sits flush; a CSS ellipsis leaves a ragged gap. */}
-          <span ref={headRef} className="peer min-w-0 overflow-hidden">
+          <span ref={headRef} className="peer min-w-0 overflow-hidden whitespace-pre">
             {split.head}
           </span>
-          <span className="shrink-0 peer-data-overflow:before:content-['…']">{split.tail}</span>
+          <span className="shrink-0 whitespace-pre peer-data-overflow:before:content-['…']">
+            {split.tail}
+          </span>
         </>
       ) : (
         // Keyed so React does not reuse the head node and its imperative clip.
@@ -89,6 +92,16 @@ function fitHead(head: HTMLElement) {
   if (tail instanceof HTMLElement) tail.style.translate = slack > 0 ? `-${slack}px 0` : "";
 }
 
+// The segments render pre so the space at the cut survives, so collapse here what CSS
+// would have (not \s: em and no-break spaces are kept). Split first, so the tail length
+// still counts the raw value.
+function collapseSegments(split: { head: string; tail: string }) {
+  const collapse = (text: string) => text.replace(/[ \t\n\r\f]+/g, " ");
+  const head = collapse(split.head).replace(/^ /, "");
+  const tail = collapse(split.tail).replace(/ $/, "");
+  return { head, tail: head.endsWith(" ") ? tail.replace(/^ /, "") : tail };
+}
+
 const DEFAULT_TAIL = 10;
 const MAX_SEGMENT_TAIL = 16;
 const MIN_WORD_TAIL = 4;
diff --git a/apps/web/src/components/ui/sidebar.browser.test.tsx b/apps/web/src/components/ui/sidebar.browser.test.tsx
index 91279001c811..9e1d1ba3282a 100644
--- a/apps/web/src/components/ui/sidebar.browser.test.tsx
+++ b/apps/web/src/components/ui/sidebar.browser.test.tsx
@@ -1,6 +1,8 @@
 import { page, userEvent } from "vite-plus/test/browser";
 import { describe, expect, it, vi } from "vite-plus/test";
 
+import "~/index.css";
+
 import { render } from "../../../test/render";
 import { Sidebar, SidebarProvider, SidebarRail, SidebarTrigger, useSidebar } from "./sidebar";
 
@@ -160,3 +162,22 @@ it("keeps closed mobile sheet contents mounted and reports the sheet only while
   await expect.element(sheetMounted).toHaveTextContent("false");
   expect(document.querySelector('[data-mobile="true"]')?.textContent).toContain("Sheet contents");
 });
+
+it("opens the mobile sheet without a transition while panel animations are off", async () => {
+  await page.viewport(390, 844);
+  await using screen = await render(
+    <div data-panel-animations="false">
+      <SidebarProvider>
+        <Sidebar>
+          <span>Sheet contents</span>
+        </Sidebar>
+        <SidebarTrigger />
+      </SidebarProvider>
+    </div>,
+    { router: false /* no routes involved */ },
+  );
+  await userEvent.click(screen.getByRole("button", { name: "Toggle Sidebar" }));
+  const popup = document.querySelector<HTMLElement>('[data-mobile="true"][data-sidebar="sidebar"]');
+  expect(popup).not.toBeNull();
+  expect(getComputedStyle(popup!).transitionDuration).toBe("0s");
+});
diff --git a/apps/web/src/components/ui/sidebar.tsx b/apps/web/src/components/ui/sidebar.tsx
index e50930bba0e4..5633a57a64bc 100644
--- a/apps/web/src/components/ui/sidebar.tsx
+++ b/apps/web/src/components/ui/sidebar.tsx
@@ -17,6 +17,7 @@ import {
 import { Tooltip, TooltipPopup, TooltipTrigger } from "~/components/ui/tooltip";
 import { useResizeDrag } from "~/hooks/useResizeDrag";
 import { useMediaQuery } from "~/hooks/useMediaQuery";
+import { useClientSettings } from "~/hooks/useSettings";
 import {
   getLocalStorageItem,
   setLocalStorageItem,
@@ -292,6 +293,12 @@ function Sidebar({
   resizable?: boolean | SidebarResizableOptions;
 }) {
   const { isMobile, state, openMobile, setOpenMobile, setMobileSheetMounted } = useSidebar();
+  // Not usePanelAnimationSettings: its navigation suppression would snap the sheet shut mid-exit when an item navigates.
+  const panelAnimationDurationMs = useClientSettings(
+    (settings) => settings.panelAnimationDurationMs,
+  );
+  const prefersReducedMotion = useMediaQuery("(prefers-reduced-motion: reduce)");
+  const panelAnimationsActive = panelAnimationDurationMs > 0 && !prefersReducedMotion;
   const offcanvasCollapsed = !isMobile && collapsible === "offcanvas" && state === "collapsed";
 
   const resolvedResizable = resolveSidebarResizable({ collapsible, isMobile, resizable });
@@ -327,6 +334,7 @@ function Sidebar({
           {/* Children stay mounted while closed so their window shortcuts, like thread jumps, keep working. */}
           <SheetPopup
             keepMounted
+            {...(panelAnimationsActive ? {} : { transitionDurationMs: 0 })}
             className={cn(
               "w-(--sidebar-width) max-w-none bg-sidebar surface-grain p-0 text-sidebar-foreground",
               className,
diff --git a/apps/web/src/composer-logic.test.ts b/apps/web/src/composer-logic.test.ts
index 3a93b2efa201..e7ec86822a54 100644
--- a/apps/web/src/composer-logic.test.ts
+++ b/apps/web/src/composer-logic.test.ts
@@ -1,3 +1,4 @@
+import { threadPullRequestKeyOf } from "@t3tools/client-runtime/thread-pull-requests";
 import { filterComposerPullRequestMatches } from "@t3tools/shared/composerPullRequestMatches";
 import { EnvironmentId, MessageId, ThreadId, type AssistantCitation } from "@t3tools/contracts";
 import {
@@ -331,30 +332,35 @@ describe("detectComposerTrigger", () => {
 describe("filterComposerPullRequestMatches", () => {
   const entries = [
     {
+      host: "github.com",
       number: 7,
       projectId: "project-1",
       repository: "t3tools/t3code",
       updatedAt: "2026-09-01T12:00:00.000Z",
     },
     {
+      host: "github.com",
       number: 8987,
       projectId: "project-1",
       repository: "T3Tools/T3Code",
       updatedAt: "2026-09-03T12:00:00.000Z",
     },
     {
+      host: "github.com",
       number: 27,
       projectId: "project-1",
       repository: "t3tools/t3code",
       updatedAt: "2026-09-02T12:00:00.000Z",
     },
     {
+      host: "github.com",
       number: 27,
       projectId: "project-1",
       repository: "t3tools/t3code",
       updatedAt: "2026-09-01T13:00:00.000Z",
     },
     {
+      host: "github.com",
       number: 70,
       projectId: "project-2",
       repository: "t3tools/other",
@@ -365,6 +371,7 @@ describe("filterComposerPullRequestMatches", () => {
   it("matches and de-duplicates number fragments within one repository, exact match first", () => {
     expect(
       filterComposerPullRequestMatches({
+        keyOf: threadPullRequestKeyOf,
         entries,
         projectId: "project-1",
         repository: "t3tools/t3code",
@@ -376,18 +383,21 @@ describe("filterComposerPullRequestMatches", () => {
 
   it("keeps an older exact match when newer substring matches would fill the limit", () => {
     const exact = {
+      host: "github.com",
       number: 7,
       projectId: "project-1",
       repository: "t3tools/t3code",
       updatedAt: "2020-01-01T00:00:00.000Z",
     };
     const newerSubstringMatches = Array.from({ length: 12 }, (_unused, index) => ({
+      host: "github.com",
       number: 700 + index,
       projectId: "project-1",
       repository: "t3tools/t3code",
       updatedAt: `2026-09-${String(index + 1).padStart(2, "0")}T12:00:00.000Z`,
     }));
     const matches = filterComposerPullRequestMatches({
+      keyOf: threadPullRequestKeyOf,
       entries: [...newerSubstringMatches, exact],
       projectId: "project-1",
       repository: "t3tools/t3code",
diff --git a/apps/web/src/composerDraftStore.ts b/apps/web/src/composerDraftStore.ts
index 783338bc48e2..68fdc2b2bca3 100644
--- a/apps/web/src/composerDraftStore.ts
+++ b/apps/web/src/composerDraftStore.ts
@@ -1,5 +1,8 @@
 import { stripInlineContextReferences } from "./lib/composerContextReferences";
-import { composerFileAttachmentMimeType } from "./components/chat/composerAttachmentFiles";
+import {
+  composerFileAttachmentMimeType,
+  composerImageDedupKey,
+} from "./components/chat/composerAttachmentFiles";
 import { elementContextToPreviewAnnotation } from "./lib/elementContext";
 import {
   ResponseContextRecord,
@@ -907,11 +910,6 @@ function createEmptyThreadDraft(): ComposerThreadDraftState {
   };
 }
 
-function composerImageDedupKey(image: ComposerImageAttachment): string {
-  // Hydrated images get fresh lastModified values, so exclude it from dedupe.
-  return `${image.mimeType}\u0000${image.sizeBytes}\u0000${image.name}`;
-}
-
 export function composerFileDedupKey(
   file: Pick<ComposerFileAttachment, "mimeType" | "sizeBytes" | "name">,
 ): string {
@@ -1547,6 +1545,21 @@ export function resolveComposerDraftKey(
   return threadKey.length > 0 ? threadKey : null;
 }
 
+const QUEUED_RUN_EDIT_DRAFT_PREFIX = "queued-edit:";
+
+// Thread and run ids both contain colons, so the run id is encoded to keep the thread key parseable.
+export function queuedRunEditDraftId(threadRef: ScopedThreadRef, runId: string): DraftId {
+  return DraftId.make(
+    `${QUEUED_RUN_EDIT_DRAFT_PREFIX}${scopedThreadKey(threadRef)}:${encodeURIComponent(runId)}`,
+  );
+}
+
+function queuedRunEditThreadId(draftId: string): ThreadId | null {
+  if (!draftId.startsWith(QUEUED_RUN_EDIT_DRAFT_PREFIX)) return null;
+  const rest = draftId.slice(QUEUED_RUN_EDIT_DRAFT_PREFIX.length);
+  return parseScopedThreadKey(rest.slice(0, rest.lastIndexOf(":")))?.threadId ?? null;
+}
+
 function resolveComposerThreadId(
   state: ComposerThreadLookupState,
   target: ComposerThreadTarget,
@@ -1558,7 +1571,10 @@ function resolveComposerThreadId(
   if (typeof normalizedTarget !== "string") {
     return normalizedTarget.threadId;
   }
-  return state.draftThreadsByThreadKey[normalizedTarget]?.threadId ?? null;
+  return (
+    state.draftThreadsByThreadKey[normalizedTarget]?.threadId ??
+    queuedRunEditThreadId(normalizedTarget)
+  );
 }
 
 function getComposerDraftState(
diff --git a/apps/web/src/connection/storage.browser.test.ts b/apps/web/src/connection/storage.browser.test.ts
index 2b36f9827c84..a107aa902469 100644
--- a/apps/web/src/connection/storage.browser.test.ts
+++ b/apps/web/src/connection/storage.browser.test.ts
@@ -57,7 +57,7 @@ describe("IndexedDB query cache", () => {
       );
       expect(keptBytes).toBeLessThanOrEqual(32 * 1024 * 1024);
       expect(yield* tabs[1]!.load(environmentId, "large-8")).toEqual(Option.some(answer));
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("drops the older copy when an answer grows too large to keep", () =>
diff --git a/apps/web/src/connection/storage.test.ts b/apps/web/src/connection/storage.test.ts
index 7afe2b1e8573..1778111d3f4c 100644
--- a/apps/web/src/connection/storage.test.ts
+++ b/apps/web/src/connection/storage.test.ts
@@ -282,6 +282,6 @@ describe("browser GitHub routing permissions", () => {
         ConnectionTransientError,
       );
       expect(yield* second.get(entry)).toBe("off");
-    }).pipe(Effect.scoped),
+    }),
   );
 });
diff --git a/apps/web/src/editorPreferences.ts b/apps/web/src/editorPreferences.ts
index e6aacd32b02d..8b2d2c098567 100644
--- a/apps/web/src/editorPreferences.ts
+++ b/apps/web/src/editorPreferences.ts
@@ -67,6 +67,7 @@ function resolveAndPersistPreferredEditor(availableEditors: readonly EditorId[])
 export function useOpenInPreferredEditor(
   environmentId: EnvironmentId | null,
   availableEditors: readonly EditorId[],
+  projectRoot?: string,
 ) {
   const openInEditor = useAtomCommand(shellEnvironment.openInEditor, {
     reportFailure: false,
@@ -120,6 +121,7 @@ export function useOpenInPreferredEditor(
       input: {
         cwd: targetPath,
         editor,
+        ...(projectRoot ? { projectRoot } : {}),
       },
     });
     return mapAtomCommandResult(result, () => editor);
diff --git a/apps/web/src/hooks/useLoadBalancedEnvironment.ts b/apps/web/src/hooks/useLoadBalancedEnvironment.ts
index 4824945a086c..d81d23ca3eb9 100644
--- a/apps/web/src/hooks/useLoadBalancedEnvironment.ts
+++ b/apps/web/src/hooks/useLoadBalancedEnvironment.ts
@@ -1,5 +1,6 @@
 import { RegistryContext, useAtomValue } from "@effect/atom-react";
 import { chooseLoadBalancedEnvironment } from "@t3tools/client-runtime/load-balancing";
+import { executeAtomQuery } from "@t3tools/client-runtime/state/runtime";
 import type { EnvironmentId } from "@t3tools/contracts";
 import { Atom } from "effect/reactivity";
 import { useContext } from "react";
@@ -50,6 +51,24 @@ export function useLoadBalancedEnvironment(
       registry.refresh(serverEnvironment.hostResources({ environmentId, input: {} }));
     }
   };
+  const refreshSelection = async (ids: readonly EnvironmentId[]) => {
+    const candidates = await Promise.all(
+      ids.map(async (environmentId) => {
+        const result = await executeAtomQuery(
+          registry,
+          serverEnvironment.hostResources({ environmentId, input: {} }),
+          { refresh: true, reportFailure: false, signal: AbortSignal.timeout(5_000) },
+        );
+        return {
+          environmentId,
+          resources: result._tag === "Success" ? result.value : null,
+          receivedAt: Date.now(),
+          weight: weights[environmentId] ?? 50,
+        };
+      }),
+    );
+    return chooseLoadBalancedEnvironment(candidates, Date.now()) as EnvironmentId | null;
+  };
   const { evaluatedAt, resources } = useAtomValue(hostResourcesAtom(environmentIds.join("\n")));
   const pending = resources.some((resource) => resource.pending);
   const environmentId = chooseLoadBalancedEnvironment(
@@ -61,6 +80,7 @@ export function useLoadBalancedEnvironment(
   ) as EnvironmentId | null;
   return {
     refresh,
+    refreshSelection,
     pending,
     environmentId,
     failed: !pending && environmentId === null && resources.some((resource) => resource.failed),
diff --git a/apps/web/src/hooks/useShownThreadRouteTarget.browser.test.tsx b/apps/web/src/hooks/useShownThreadRouteTarget.browser.test.tsx
new file mode 100644
index 000000000000..84bdd1186628
--- /dev/null
+++ b/apps/web/src/hooks/useShownThreadRouteTarget.browser.test.tsx
@@ -0,0 +1,91 @@
+import {
+  createMemoryHistory,
+  createRootRoute,
+  createRoute,
+  createRouter,
+  Outlet,
+  RouterProvider,
+} from "@tanstack/react-router";
+import { describe, expect, it } from "vite-plus/test";
+
+import { act, render } from "../../test/render";
+import { startMainAppLocationTracking } from "../components/sidebar/mainAppLocation";
+import { useShownThreadRouteTarget } from "./useShownThreadRouteTarget";
+
+function ShownThread() {
+  const { shownTarget } = useShownThreadRouteTarget();
+  const label =
+    shownTarget === null
+      ? "none"
+      : shownTarget.kind === "server"
+        ? shownTarget.threadRef.threadId
+        : shownTarget.draftId;
+  return (
+    <>
+      <output>{label}</output>
+      <Outlet />
+    </>
+  );
+}
+
+function createAppRouter(initialPath: string) {
+  const rootRoute = createRootRoute({ component: ShownThread });
+  const threadRoute = createRoute({
+    getParentRoute: () => rootRoute,
+    path: "$environmentId/$threadId",
+  });
+  const settingsRoute = createRoute({ getParentRoute: () => rootRoute, path: "settings" });
+  const settingsGeneralRoute = createRoute({
+    getParentRoute: () => settingsRoute,
+    path: "general",
+  });
+  const usageRoute = createRoute({ getParentRoute: () => rootRoute, path: "usage" });
+  const newRoute = createRoute({ getParentRoute: () => rootRoute, path: "new" });
+  return createRouter({
+    routeTree: rootRoute.addChildren([
+      threadRoute,
+      settingsRoute.addChildren([settingsGeneralRoute]),
+      usageRoute,
+      newRoute,
+    ]),
+    history: createMemoryHistory({ initialEntries: [initialPath] }),
+  });
+}
+
+describe("useShownThreadRouteTarget", () => {
+  it("keeps the thread that opened Settings or Usage shown until the user leaves for another page", async () => {
+    const router = createAppRouter("/env-1/thread-a");
+    await router.load();
+    // The hook reads thread params and modal paths from real routes, which the default router lacks.
+    await using screen = await render(<RouterProvider router={router} />, { router: false });
+    const shown = screen.getByRole("status");
+    await expect.element(shown).toHaveTextContent("thread-a");
+
+    await act(() => router.navigate({ to: "/settings/general" }));
+    await expect.element(shown).toHaveTextContent("thread-a");
+
+    await act(() => router.navigate({ to: "/usage" }));
+    await expect.element(shown).toHaveTextContent("thread-a");
+
+    await act(() => router.navigate({ href: "/env-1/thread-b" }));
+    await expect.element(shown).toHaveTextContent("thread-b");
+
+    await act(() => router.navigate({ to: "/new" }));
+    await expect.element(shown).toHaveTextContent("none");
+
+    await act(() => router.navigate({ to: "/settings/general" }));
+    await expect.element(shown).toHaveTextContent("none");
+  });
+
+  it("shows the thread behind Settings when it mounts while Settings is already open", async () => {
+    const router = createAppRouter("/env-1/thread-a");
+    await router.load();
+    using _tracking = { [Symbol.dispose]: startMainAppLocationTracking(router) };
+    await router.navigate({ to: "/settings/general" });
+
+    // The hook reads thread params and modal paths from real routes, which the default router lacks.
+    await using screen = await render(<RouterProvider router={router} />, { router: false });
+
+    await expect.element(screen.getByRole("status")).toHaveTextContent("thread-a");
+  });
+});
diff --git a/apps/web/src/hooks/useShownThreadRouteTarget.ts b/apps/web/src/hooks/useShownThreadRouteTarget.ts
new file mode 100644
index 000000000000..754b53f5896e
--- /dev/null
+++ b/apps/web/src/hooks/useShownThreadRouteTarget.ts
@@ -0,0 +1,31 @@
+import { scopedThreadKey } from "@t3tools/client-runtime/environment";
+import { useMatches } from "@tanstack/react-router";
+import { useState } from "react";
+
+import {
+  getAppModalReturnThreadTarget,
+  isAppModalPage,
+} from "../components/sidebar/mainAppLocation";
+import type { ThreadRouteTarget } from "../threadRoutes";
+import { useThreadRouteTarget } from "./useThreadRouteTarget";
+
+function threadRouteTargetKey(target: ThreadRouteTarget | null) {
+  if (!target) return null;
+  return target.kind === "server" ? scopedThreadKey(target.threadRef) : target.draftId;
+}
+
+/** Settings and Usage render over the thread that opened them; that thread stays the shown one. */
+export function useShownThreadRouteTarget() {
+  const routeTarget = useThreadRouteTarget();
+  // Read matches, not location, so this agrees with the params useThreadRouteTarget reads.
+  const modalOpen = useMatches({
+    select: (matches) => matches.some((match) => isAppModalPage(match.pathname)),
+  });
+  const [backgroundTarget, setBackgroundTarget] = useState(() =>
+    modalOpen ? getAppModalReturnThreadTarget() : routeTarget,
+  );
+  if (!modalOpen && threadRouteTargetKey(backgroundTarget) !== threadRouteTargetKey(routeTarget)) {
+    setBackgroundTarget(routeTarget);
+  }
+  return { shownTarget: modalOpen ? backgroundTarget : routeTarget, modalOpen };
+}
diff --git a/apps/web/src/hooks/useStartTriage.ts b/apps/web/src/hooks/useStartTriage.ts
index 7d6671bf3d22..6ddc3904afdf 100644
--- a/apps/web/src/hooks/useStartTriage.ts
+++ b/apps/web/src/hooks/useStartTriage.ts
@@ -4,7 +4,7 @@ import {
   isAtomCommandInterrupted,
   squashAtomCommandFailure,
 } from "@t3tools/client-runtime/state/runtime";
-import { type EnvironmentId, TRIAGE_PROMPT_FILE_NAME } from "@t3tools/contracts";
+import type { EnvironmentId } from "@t3tools/contracts";
 import { useRouter } from "@tanstack/react-router";
 
 import { stackedThreadToast, toastManager } from "~/components/ui/toast";
@@ -26,9 +26,6 @@ const copyTriageCliCommand = () =>
     }),
   );
 
-/** A draft is a triage draft while its message still links the playbook file. */
-export const isTriagePrompt = (prompt: string) => prompt.includes(`[${TRIAGE_PROMPT_FILE_NAME}](`);
-
 /**
  * In-app `t3 triage`: the server writes the session files and starts cloning
  * the matching source, then a No project draft opens with the playbook linked.
diff --git a/apps/web/src/hooks/useThreadActionMenu.ts b/apps/web/src/hooks/useThreadActionMenu.ts
index f2d5509c9488..bf22bd066b9a 100644
--- a/apps/web/src/hooks/useThreadActionMenu.ts
+++ b/apps/web/src/hooks/useThreadActionMenu.ts
@@ -21,6 +21,7 @@ import {
   threadActionRequiresOperate,
   type ThreadActionMenuId,
 } from "../components/threadActionMenu.logic";
+import { titleRegenerationToast } from "../components/threadTitleRegenerationToast";
 import { stackedThreadToast, toastManager } from "../components/ui/toast";
 import { copyThreadReference } from "../lib/copyThreadReference";
 import { threadChipCopyTarget } from "@t3tools/client-runtime/thread-reference";
@@ -88,7 +89,7 @@ export function useThreadActionMenu(input: {
     markThreadUnread,
     turnThreadIntoProject,
   } = useThreadActions();
-  const updateThreadMetadata = useOrchestrationCommand(threadEnvironment.updateMetadata, {
+  const regenerateThreadTitle = useOrchestrationCommand(threadEnvironment.regenerateTitle, {
     reportFailure: false,
   });
   const handleNewThread = useNewThreadHandler();
@@ -250,15 +251,17 @@ export function useThreadActionMenu(input: {
         case "rename":
           onStartRename();
           return;
-        case "regenerate-title":
+        case "regenerate-title": {
           if (isRegeneratingTitle) return;
-          await reportFailure("Failed to regenerate thread title", () =>
-            updateThreadMetadata({
+          const toast = titleRegenerationToast([
+            await regenerateThreadTitle({
               environmentId: threadRef.environmentId,
-              input: { threadId: threadRef.threadId, regenerateTitle: true },
+              input: { threadId: threadRef.threadId },
             }),
-          );
+          ]);
+          if (toast) toastManager.add(toast);
           return;
+        }
         case "mark-unread":
           markThreadUnread(threadRef);
           return;
diff --git a/apps/web/src/hooks/useThreadActions.permissions.test.ts b/apps/web/src/hooks/useThreadActions.permissions.test.ts
index 58bc33cd0d64..649ec0c6bac1 100644
--- a/apps/web/src/hooks/useThreadActions.permissions.test.ts
+++ b/apps/web/src/hooks/useThreadActions.permissions.test.ts
@@ -55,7 +55,11 @@ vi.mock("react", () => ({
   useRef: (current: unknown) => ({ current }),
 }));
 vi.mock("@tanstack/react-router", () => ({
-  useRouter: () => ({ state: { location: { href: "/" }, matches: [] }, navigate: async () => {} }),
+  useRouter: () => ({
+    state: { location: { href: "/" }, matches: [] },
+    history: { subscribe: () => () => {} },
+    navigate: async () => {},
+  }),
 }));
 vi.mock("../state/session", () => ({
   environmentSession: { sessionStateAtom: "session" },
diff --git a/apps/web/src/hooks/useThreadActions.ts b/apps/web/src/hooks/useThreadActions.ts
index a057f0852732..cc9c27770886 100644
--- a/apps/web/src/hooks/useThreadActions.ts
+++ b/apps/web/src/hooks/useThreadActions.ts
@@ -588,10 +588,16 @@ export function useThreadActions() {
       sortOrder: sidebarThreadSortOrder,
       now: new Date().toISOString(),
     });
+    let navigatedDuringDelete = false;
+    // The missing-thread redirect and the index draft replace this entry; any other history
+    // action while the delete is pending is the user's own choice, which must win.
+    const stopWatchingHistory = router.history.subscribe(({ action }) => {
+      if (action.type !== "REPLACE") navigatedDuringDelete = true;
+    });
     const deleteResult = await deleteThreadMutation({
       environmentId: threadRef.environmentId,
       input: { threadId: threadRef.threadId },
-    });
+    }).finally(stopWatchingHistory);
     if (deleteResult._tag === "Failure") {
       return deleteResult;
     }
@@ -615,7 +621,7 @@ export function useThreadActions() {
     clearTerminalUiState(threadRef);
     clearDeletedThreadPanelState(threadRef);
 
-    if (shouldNavigateToFallback) {
+    if (shouldNavigateToFallback && !navigatedDuringDelete) {
       const fallbackThread = fallbackThreadId
         ? readThreadShell(scopeThreadRef(threadRef.environmentId, fallbackThreadId))
         : null;
diff --git a/apps/web/src/hooks/useThreadActions.undo.test.ts b/apps/web/src/hooks/useThreadActions.undo.test.ts
index a2ce4229d9b0..98f69e9de5a0 100644
--- a/apps/web/src/hooks/useThreadActions.undo.test.ts
+++ b/apps/web/src/hooks/useThreadActions.undo.test.ts
@@ -19,10 +19,20 @@ const commands = vi.hoisted(() => ({
   snooze: vi.fn(),
   unsnooze: vi.fn(),
 }));
-const router = vi.hoisted(() => ({
-  navigate: vi.fn(async () => {}),
-  state: { location: { href: "/" }, matches: [{ params: {} as Record<string, string> }] },
-}));
+const router = vi.hoisted(() => {
+  const listeners = new Set<(event: { action: { type: string } }) => void>();
+  return {
+    navigate: vi.fn(async () => {}),
+    state: { location: { href: "/" }, matches: [{ params: {} as Record<string, string> }] },
+    history: {
+      listeners,
+      subscribe: (listener: (event: { action: { type: string } }) => void) => {
+        listeners.add(listener);
+        return () => listeners.delete(listener);
+      },
+    },
+  };
+});
 vi.mock("../state/use-atom-query-runner", () => ({ useAtomQueryRunner: () => vi.fn() }));
 vi.mock("../state/session", async (original) => ({
   ...(await original<typeof import("../state/session")>()),
@@ -251,6 +261,25 @@ describe("archive navigation", () => {
   });
 });
 
+describe("delete navigation", () => {
+  it.each([
+    { type: "REPLACE", by: "the app's missing-thread redirect", fallsBack: true },
+    { type: "PUSH", by: "the user opening another thread", fallsBack: false },
+  ])("falls back: $fallsBack after $by while deleting", async ({ type, fallsBack }) => {
+    router.state.matches[0]!.params = {
+      environmentId: target.environmentId,
+      threadId: target.threadId,
+    };
+    commands.delete.mockImplementation(async () => {
+      for (const listener of router.history.listeners) listener({ action: { type } });
+      return { _tag: "Success", value: undefined };
+    });
+    expect((await useThreadActions().deleteThread(target))._tag).toBe("Success");
+    expect(router.navigate).toHaveBeenCalledTimes(fallsBack ? 1 : 0);
+    expect(router.history.listeners.size).toBe(0);
+  });
+});
+
 describe("settle and snooze Undo", () => {
   it("un-settles from the notice and expires the Undo after a manual un-settle", async () => {
     const add = vi.spyOn(toastManager, "add").mockReturnValue("toast");
diff --git a/apps/web/src/index.css b/apps/web/src/index.css
index 654ef108e8e7..0f9942e3295e 100644
--- a/apps/web/src/index.css
+++ b/apps/web/src/index.css
@@ -2039,6 +2039,25 @@ code {
   text-decoration: none;
 }
 
+/* Triple-click selection stops at block-level boxes, flex items included, so file chips in
+   prose stay inline-level down to the icon and label. */
+.chat-markdown-file-link {
+  display: inline-block;
+  overflow-x: clip;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.chat-markdown-file-link > :is(svg, img) {
+  display: inline;
+  margin-inline-end: 0.2em;
+  vertical-align: -0.125em;
+}
+
+.chat-markdown-file-link > [data-slot="context-chip-label"] {
+  display: inline;
+}
+
 /* File links and context chips own their color and focus ring. */
 .chat-markdown a:not(.chat-markdown-file-link, :has([data-slot="context-chip-label"])) {
   color: var(--info-foreground);
@@ -2138,6 +2157,11 @@ code {
   font-size: 0.85em;
 }
 
+.chat-markdown.user-message-markdown :not(pre) > code {
+  background: color-mix(in srgb, var(--contrast-message-foreground) 10%, transparent);
+  color: var(--contrast-message-foreground);
+}
+
 .chat-markdown strong {
   font-weight: 700;
 }
@@ -2202,6 +2226,18 @@ code {
   }
 }
 
+/* Sent messages color prose with the message foreground, which is not chosen
+   for the code surface, so their plain-text fences keep the global foreground. */
+.chat-markdown.user-message-markdown
+  .chat-markdown-codeblock:is(
+    [data-language="text" i],
+    [data-language="txt" i],
+    [data-language="plain" i],
+    [data-language="plaintext" i]
+  ) {
+  color: var(--contrast-foreground) !important;
+}
+
 /* Paragraphs and code blocks arrive in chunks while a response streams. Fade
    each new block in so the chunk does not pop. @starting-style only applies
    when an element is first inserted, and the rule is gated on data-streaming,
@@ -2588,11 +2624,19 @@ code {
 }
 
 /* A workspace area with no control of its own takes F6 focus itself; keep that visible.
-   workspaceFocus.ts marks those, since :focus-visible also matches a clicked area after a key press. */
+   workspaceFocus.ts marks those, since :focus-visible also matches a clicked area after a key press.
+   The conversation's timeline takes it instead, and its top fade mask would hide its own ring. */
 [data-workspace-area]:focus-visible {
   outline: none;
 }
-[data-workspace-keyboard-focus]:focus {
+[data-workspace-keyboard-focus]:focus,
+[data-workspace-area="conversation"]:has(
+  .messages-timeline-scroll[data-workspace-keyboard-focus]:focus
+) {
   outline: 2px solid var(--ring);
   outline-offset: -2px;
 }
+
+.messages-timeline-scroll:focus-visible {
+  outline: none;
+}
diff --git a/apps/web/src/keybindings.ts b/apps/web/src/keybindings.ts
index d2f6a5e65041..849183b7a1a6 100644
--- a/apps/web/src/keybindings.ts
+++ b/apps/web/src/keybindings.ts
@@ -281,12 +281,24 @@ export function threadTraversalDirectionFromCommand(
   return null;
 }
 
+export function isThreadNavigationShortcut(
+  event: ShortcutEventLike,
+  keybindings: ResolvedKeybindingsConfig,
+  options?: ShortcutMatchOptions,
+): boolean {
+  const command = resolveShortcutCommand(event, keybindings, options);
+  return (
+    threadTraversalDirectionFromCommand(command) !== null ||
+    threadJumpIndexFromCommand(command ?? "") !== null
+  );
+}
+
 export function shouldShowThreadJumpHintsForModifiers(
   modifiers: ShortcutModifierStateLike,
   keybindings: ResolvedKeybindingsConfig,
   options?: ShortcutMatchOptions,
 ): boolean {
-  // Ghostty can write keys to the shell before window shortcuts run, regardless of the when clause.
+  // Holding a modifier is routine in a shell (Ctrl+C, Ctrl+R), so don't flash hints over it.
   if (resolveContext(options).terminalFocus) {
     return false;
   }
diff --git a/apps/web/src/lib/addProjectToMachine.ts b/apps/web/src/lib/addProjectToMachine.ts
index 2d3bdc5259c8..4143498832e5 100644
--- a/apps/web/src/lib/addProjectToMachine.ts
+++ b/apps/web/src/lib/addProjectToMachine.ts
@@ -21,6 +21,9 @@ import { sourceControlEnvironment } from "../state/sourceControl";
 /** Matches the server's read cap: a larger file would arrive truncated. */
 export const COPYABLE_FILE_MAX_BYTES = 1024 * 1024;
 
+/** The server lists at most this many ignored files, so one pick never exceeded it. */
+export const COPIED_FILES_MAX_COUNT = 200;
+
 const DEFAULT_COPIED_FILE_NAME = /^(?:\.env(?:\..+)?|\.envrc|\.dev\.vars)$/;
 
 /** Env files are the ignored files people almost always want on a new machine. */
diff --git a/apps/web/src/lib/backgroundActivityReporter.test.ts b/apps/web/src/lib/backgroundActivityReporter.test.ts
index bbb24ce1b851..210403425bfc 100644
--- a/apps/web/src/lib/backgroundActivityReporter.test.ts
+++ b/apps/web/src/lib/backgroundActivityReporter.test.ts
@@ -109,7 +109,7 @@ describe("layer", () => {
 
       yield* TestClock.adjust("25 seconds");
       expect(calls).toBe(2);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("keeps reporting after a report never settles", () =>
@@ -134,6 +134,6 @@ describe("layer", () => {
 
       yield* TestClock.adjust("25 seconds");
       expect(calls).toBe(2);
-    }).pipe(Effect.scoped),
+    }),
   );
 });
diff --git a/apps/web/src/lib/chunkReloadGuard.test.ts b/apps/web/src/lib/chunkReloadGuard.test.ts
index 632e8ec8cf0d..3a16834abc38 100644
--- a/apps/web/src/lib/chunkReloadGuard.test.ts
+++ b/apps/web/src/lib/chunkReloadGuard.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it, vi } from "vite-plus/test";
 
-import { clearChunkReloadGuard, reloadOnceForChunkLoadError } from "./chunkReloadGuard";
+import { isChunkLoadError, reloadOnceForChunkLoadError } from "./chunkReloadGuard";
 
 function createStorageStub(): Storage {
   const store = new Map<string, string>();
@@ -25,21 +25,20 @@ describe("reloadOnceForChunkLoadError", () => {
     const storage = createStorageStub();
     const reload = vi.fn();
 
-    expect(reloadOnceForChunkLoadError(() => storage, reload)).toBe(true);
+    expect(reloadOnceForChunkLoadError(() => storage, reload, "1.0.0")).toBe(true);
     expect(reload).toHaveBeenCalledTimes(1);
 
-    expect(reloadOnceForChunkLoadError(() => storage, reload)).toBe(false);
+    expect(reloadOnceForChunkLoadError(() => storage, reload, "1.0.0")).toBe(false);
     expect(reload).toHaveBeenCalledTimes(1);
   });
 
-  it("reloads again after a successful boot cleared the guard", () => {
+  it("reloads again once a deploy changed the build", () => {
     const storage = createStorageStub();
     const reload = vi.fn();
 
-    reloadOnceForChunkLoadError(() => storage, reload);
-    clearChunkReloadGuard(() => storage);
+    reloadOnceForChunkLoadError(() => storage, reload, "1.0.0");
 
-    expect(reloadOnceForChunkLoadError(() => storage, reload)).toBe(true);
+    expect(reloadOnceForChunkLoadError(() => storage, reload, "1.0.1")).toBe(true);
     expect(reload).toHaveBeenCalledTimes(2);
   });
 
@@ -51,6 +50,16 @@ describe("reloadOnceForChunkLoadError", () => {
 
     expect(reloadOnceForChunkLoadError(blocked, reload)).toBe(false);
     expect(reload).not.toHaveBeenCalled();
-    expect(() => clearChunkReloadGuard(blocked)).not.toThrow();
+  });
+});
+
+describe("isChunkLoadError", () => {
+  it.each([
+    ["Failed to fetch dynamically imported module: t3code://app/assets/a.js", true],
+    ["error loading dynamically imported module: https://app.t3.codes/assets/a.js", true],
+    ["Importing a module script failed.", true],
+    ["Cannot read properties of undefined", false],
+  ])("%s", (message, expected) => {
+    expect(isChunkLoadError(new TypeError(message))).toBe(expected);
   });
 });
diff --git a/apps/web/src/lib/chunkReloadGuard.ts b/apps/web/src/lib/chunkReloadGuard.ts
index c83e0e71e0f4..10f4dc8be191 100644
--- a/apps/web/src/lib/chunkReloadGuard.ts
+++ b/apps/web/src/lib/chunkReloadGuard.ts
@@ -1,15 +1,17 @@
 // Deploys and desktop server swaps can invalidate lazy chunks; one reload fetches the fresh index.
+// Keyed by build and kept across boots: a chunk loaded after boot can fail on every visit.
 const CHUNK_RELOAD_GUARD_KEY = "t3code:chunk-load-reloaded";
 
 export function reloadOnceForChunkLoadError(
   getStorage: () => Storage = () => window.sessionStorage,
   reload: () => void = () => window.location.reload(),
+  build = import.meta.env.APP_VERSION,
 ): boolean {
   let alreadyReloaded: boolean;
   try {
     const storage = getStorage();
-    alreadyReloaded = storage.getItem(CHUNK_RELOAD_GUARD_KEY) === "1";
-    if (!alreadyReloaded) storage.setItem(CHUNK_RELOAD_GUARD_KEY, "1");
+    alreadyReloaded = storage.getItem(CHUNK_RELOAD_GUARD_KEY) === build;
+    if (!alreadyReloaded) storage.setItem(CHUNK_RELOAD_GUARD_KEY, build);
   } catch {
     // Without storage, the reload guard cannot prevent an infinite loop.
     return false;
@@ -19,8 +21,16 @@ export function reloadOnceForChunkLoadError(
   return true;
 }
 
-export function clearChunkReloadGuard(getStorage: () => Storage = () => window.sessionStorage) {
-  try {
-    getStorage().removeItem(CHUNK_RELOAD_GUARD_KEY);
-  } catch {}
+// Browsers cache a failed dynamic import per document, so only a reload can retry it.
+const CHUNK_LOAD_ERROR_PREFIXES = [
+  "Failed to fetch dynamically imported module", // Chromium
+  "error loading dynamically imported module", // Firefox
+  "Importing a module script failed", // Safari
+];
+
+export function isChunkLoadError(error: unknown): boolean {
+  const message = error instanceof Error ? error.message : undefined;
+  return (
+    message !== undefined && CHUNK_LOAD_ERROR_PREFIXES.some((prefix) => message.startsWith(prefix))
+  );
 }
diff --git a/apps/web/src/lib/diffRendering.ts b/apps/web/src/lib/diffRendering.ts
index 09b4d792b0e5..7c7e9ade2acb 100644
--- a/apps/web/src/lib/diffRendering.ts
+++ b/apps/web/src/lib/diffRendering.ts
@@ -293,37 +293,37 @@ export const DIFF_SURFACE_THEME_UNSAFE_CSS = `
   --diffs-bg-buffer-override: color-mix(in srgb, var(--code-background) 90%, var(--code-foreground));
 
   --diffs-bg-addition-override: light-dark(
-    color-mix(in srgb, var(--code-background) 50%, var(--diff-addition)),
-    color-mix(in srgb, var(--code-background) 70%, var(--diff-addition))
+    color-mix(in srgb, var(--code-background) calc(50% - var(--appearance-contrast-boost, 0%) / 4), var(--diff-addition)),
+    color-mix(in srgb, var(--code-background) calc(70% - var(--appearance-contrast-boost, 0%) / 4), var(--diff-addition))
   );
   --diffs-bg-addition-number-override: light-dark(
-    color-mix(in srgb, var(--code-background) 35%, var(--diff-addition)),
-    color-mix(in srgb, var(--code-background) 60%, var(--diff-addition))
+    color-mix(in srgb, var(--code-background) calc(35% - var(--appearance-contrast-boost, 0%) / 4), var(--diff-addition)),
+    color-mix(in srgb, var(--code-background) calc(60% - var(--appearance-contrast-boost, 0%) / 4), var(--diff-addition))
   );
   --diffs-bg-addition-hover-override: color-mix(in srgb, var(--code-background) 85%, var(--diff-addition));
-  --diffs-bg-addition-emphasis-override: color-mix(
-    in srgb,
-    var(--code-background) 80%,
-    var(--diff-addition)
+  /* Pierre resolves emphasis on the host, before the diff's overrides can inherit. */
+  /* Light emphasis stays above t3-light's readable syntax luminance floor. */
+  --diffs-bg-addition-emphasis: light-dark(
+    rgb(from var(--diffs-addition-base) r g b / 15%),
+    rgb(from var(--diffs-addition-base) r g b / calc(20% + var(--appearance-contrast-boost, 0%) / 4))
   );
 
   --diffs-bg-deletion-override: light-dark(
-    color-mix(in srgb, var(--code-background) 50%, var(--diff-deletion)),
-    color-mix(in srgb, var(--code-background) 70%, var(--diff-deletion))
+    color-mix(in srgb, var(--code-background) calc(50% - var(--appearance-contrast-boost, 0%) / 4), var(--diff-deletion)),
+    color-mix(in srgb, var(--code-background) calc(70% - var(--appearance-contrast-boost, 0%) / 4), var(--diff-deletion))
   );
   --diffs-bg-deletion-number-override: light-dark(
-    color-mix(in srgb, var(--code-background) 35%, var(--diff-deletion)),
-    color-mix(in srgb, var(--code-background) 60%, var(--diff-deletion))
+    color-mix(in srgb, var(--code-background) calc(35% - var(--appearance-contrast-boost, 0%) / 4), var(--diff-deletion)),
+    color-mix(in srgb, var(--code-background) calc(60% - var(--appearance-contrast-boost, 0%) / 4), var(--diff-deletion))
   );
   --diffs-bg-deletion-hover-override: color-mix(
     in srgb,
     var(--code-background) 85%,
     var(--diff-deletion)
   );
-  --diffs-bg-deletion-emphasis-override: color-mix(
-    in srgb,
-    var(--code-background) 80%,
-    var(--diff-deletion)
+  --diffs-bg-deletion-emphasis: light-dark(
+    rgb(from var(--diffs-deletion-base) r g b / 15%),
+    rgb(from var(--diffs-deletion-base) r g b / calc(20% + var(--appearance-contrast-boost, 0%) / 4))
   );
 
   background-color: var(--diffs-bg) !important;
diff --git a/apps/web/src/lib/imageCompression.test.ts b/apps/web/src/lib/imageCompression.test.ts
index a8d4cfcc1d54..e40c3968bc85 100644
--- a/apps/web/src/lib/imageCompression.test.ts
+++ b/apps/web/src/lib/imageCompression.test.ts
@@ -254,11 +254,13 @@ describe("composer image thumbnails", () => {
     stubCanvasPipeline(() => 3);
     const source = makeFile(3);
     const compressed = makeFile(2, "image/webp");
-    const sourceThumbnail = await createComposerImageThumbnail(source);
-    expect(sourceThumbnail).toMatch(/^data:image\/png;base64,/);
+    // Compression can finish before the placeholder's thumbnail does.
+    const pendingThumbnail = createComposerImageThumbnail(source);
 
-    inheritComposerImageThumbnail(source, compressed);
+    await inheritComposerImageThumbnail(source, compressed);
 
+    const sourceThumbnail = await pendingThumbnail;
+    expect(sourceThumbnail).toMatch(/^data:image\/png;base64,/);
     expect(readComposerImageThumbnail(compressed)).toBe(sourceThumbnail);
     expect(await createComposerImageThumbnail(compressed)).toBe(sourceThumbnail);
     expect(createImageBitmap).toHaveBeenCalledTimes(1);
diff --git a/apps/web/src/lib/imageCompression.ts b/apps/web/src/lib/imageCompression.ts
index e174bebf4b9e..53e948e535b7 100644
--- a/apps/web/src/lib/imageCompression.ts
+++ b/apps/web/src/lib/imageCompression.ts
@@ -227,16 +227,18 @@ export function createComposerImageThumbnail(file: File): Promise<string | null>
 /**
  * Pasted images are re-encoded after their placeholder already shows the source's thumbnail.
  * Reusing it keeps the tile from flashing back to its fallback while the new file is decoded.
+ * Resolves once the target's thumbnail is readable, so a tile swapped to it paints at once even
+ * when compression finished before the source's thumbnail did.
  */
-export function inheritComposerImageThumbnail(source: File, target: File): void {
+export async function inheritComposerImageThumbnail(source: File, target: File): Promise<void> {
   const sourceThumbnail = composerThumbnails.get(source);
   if (source === target || !sourceThumbnail || composerThumbnails.has(target)) return;
-  const settled = settledComposerThumbnails.get(source);
-  if (settled) settledComposerThumbnails.set(target, settled);
   cacheComposerImageThumbnail(
     target,
     sourceThumbnail.then((src) => src ?? renderComposerImageThumbnail(target)),
   );
+  const src = await sourceThumbnail;
+  if (src) settledComposerThumbnails.set(target, src);
 }
 
 async function renderComposerImageThumbnail(file: File): Promise<string | null> {
diff --git a/apps/web/src/lib/terminalFocus.browser.test.ts b/apps/web/src/lib/terminalFocus.browser.test.ts
index ac3ed25a3b61..f393a4a7d8cc 100644
--- a/apps/web/src/lib/terminalFocus.browser.test.ts
+++ b/apps/web/src/lib/terminalFocus.browser.test.ts
@@ -2,11 +2,16 @@ import { scopeThreadRef } from "@t3tools/client-runtime/environment";
 import { EnvironmentId, ThreadId } from "@t3tools/contracts";
 import { describe, expect, it } from "vite-plus/test";
 
+import { useRightPanelStore } from "../rightPanelStore";
+import { useTerminalUiStateStore } from "../terminalUiStateStore";
+
 import {
   consumePendingTerminalFocus,
   focusTerminal,
+  focusTerminalOnNavigation,
   focusTerminalViewport,
   registerTerminalFocusTarget,
+  restoreFocusOnThreadEnter,
 } from "./terminalFocus";
 
 // The drawer's collapsed shape: a 0fr grid row that clips the viewport, which
@@ -57,3 +62,143 @@ describe("focusTerminalViewport", () => {
     expect(document.activeElement).toBe(viewport.input);
   });
 });
+
+function enterOtherThread(threadId: string) {
+  restoreFocusOnThreadEnter(scopeThreadRef(EnvironmentId.make("env"), ThreadId.make(threadId)), {
+    root: document.createElement("div"),
+    focusComposer: () => {},
+  })();
+}
+
+function mountThread(threadId: string, environmentId = "env") {
+  const ref = scopeThreadRef(EnvironmentId.make(environmentId), ThreadId.make(threadId));
+  const root = document.createElement("div");
+  const composer = document.createElement("textarea");
+  composer.ariaLabel = "Composer";
+  composer.dataset.workspaceArea = "composer";
+  root.append(composer);
+  document.body.append(root);
+  const drawerState = { visible: true };
+  const mountTerminal = (id: string) => {
+    const input = document.createElement("textarea");
+    input.ariaLabel = id;
+    root.append(input);
+    const unregister = registerTerminalFocusTarget({
+      threadRef: ref,
+      terminalId: id,
+      element: input,
+      focus: () => {
+        if (id === "drawer" && !drawerState.visible) return false;
+        input.focus();
+        return document.activeElement === input;
+      },
+    });
+    return {
+      input,
+      [Symbol.dispose]() {
+        unregister();
+        input.remove();
+      },
+    };
+  };
+  useTerminalUiStateStore.getState().ensureTerminal(ref, "drawer", { open: true, active: true });
+  useRightPanelStore.getState().openTerminal(ref, "panel");
+  return {
+    ref,
+    root,
+    composer,
+    drawerState,
+    mountTerminal,
+    enter: () => restoreFocusOnThreadEnter(ref, { root, focusComposer: () => composer.focus() }),
+    [Symbol.dispose]: () => root.remove(),
+  };
+}
+
+describe("thread focus restoration", () => {
+  it.each(["composer", "drawer", "panel", "remounted composer"] as const)(
+    "restores %s focus when returning to a thread with both terminals open",
+    (control) => {
+      using thread = mountThread(`return-${control}`);
+      using drawer = thread.mountTerminal("drawer");
+      using panel = thread.mountTerminal("panel");
+      const leave = thread.enter();
+      if (control === "panel") document.body.append(panel.input);
+      const remount = control === "remounted composer";
+      const initial =
+        control === "composer" || remount
+          ? thread.composer
+          : control === "drawer"
+            ? drawer.input
+            : panel.input;
+      initial.focus();
+      expect(document.activeElement).toBe(initial);
+      if (remount) focusTerminal(thread.ref, "not-ready");
+      leave();
+      thread.root.hidden = true;
+      if (!remount) enterOtherThread("other-thread");
+      drawer[Symbol.dispose]();
+      panel[Symbol.dispose]();
+      if (remount) thread.root.remove();
+      using remountedThread = remount ? mountThread(`return-${control}`) : undefined;
+      const returnedThread = remountedThread ?? thread;
+      returnedThread.root.hidden = false;
+      using remountedDrawer = returnedThread.mountTerminal("drawer");
+      using remountedPanel = returnedThread.mountTerminal("panel");
+      if (control === "panel") document.body.append(remountedPanel.input);
+      using _leave = { [Symbol.dispose]: returnedThread.enter() };
+      const expected =
+        control === "composer" || remount
+          ? returnedThread.composer
+          : control === "drawer"
+            ? remountedDrawer.input
+            : remountedPanel.input;
+
+      expect(document.activeElement).toBe(expected);
+    },
+  );
+
+  it("keeps an explicit terminal navigation request ahead of remembered composer focus", () => {
+    using thread = mountThread("explicit-reveal");
+    using _drawer = thread.mountTerminal("drawer");
+    using panel = thread.mountTerminal("panel");
+    const leave = thread.enter();
+    thread.composer.focus();
+    leave();
+    enterOtherThread("before-reveal");
+
+    focusTerminalOnNavigation(thread.ref, "panel");
+    using _leave = { [Symbol.dispose]: thread.enter() };
+
+    expect(document.activeElement).toBe(panel.input);
+  });
+
+  it("keeps an explicit drawer-open request while its viewport becomes visible", () => {
+    using thread = mountThread("drawer-open");
+    using drawer = thread.mountTerminal("drawer");
+    const leave = thread.enter();
+    thread.composer.focus();
+    thread.drawerState.visible = false;
+    useTerminalUiStateStore.getState().setTerminalOpen(thread.ref, false);
+    focusTerminal(thread.ref, "drawer");
+    useTerminalUiStateStore.getState().setTerminalOpen(thread.ref, true);
+    leave();
+    using _leave = { [Symbol.dispose]: thread.enter() };
+    thread.drawerState.visible = true;
+    consumePendingTerminalFocus(thread.ref, "drawer");
+
+    expect(document.activeElement).toBe(drawer.input);
+  });
+
+  it("falls back to the composer when the remembered drawer terminal was closed", () => {
+    using thread = mountThread("closed-remembered");
+    using drawer = thread.mountTerminal("drawer");
+    const leave = thread.enter();
+    expect(document.activeElement).toBe(drawer.input);
+    leave();
+    useTerminalUiStateStore.getState().setTerminalOpen(thread.ref, false);
+    thread.drawerState.visible = false;
+    using _leave = { [Symbol.dispose]: thread.enter() };
+
+    expect(document.activeElement).toBe(thread.composer);
+  });
+});
diff --git a/apps/web/src/lib/terminalFocus.test.ts b/apps/web/src/lib/terminalFocus.test.ts
index fe561e70c542..075d13149d36 100644
--- a/apps/web/src/lib/terminalFocus.test.ts
+++ b/apps/web/src/lib/terminalFocus.test.ts
@@ -11,13 +11,22 @@ import {
   focusPanelTerminalAfterClose,
   focusTerminal,
   focusTerminalOnNavigation,
-  focusTerminalOnThreadEnter,
   registerTerminalFocusTarget,
+  restoreFocusOnThreadEnter,
 } from "./terminalFocus";
 
 const threadRef = (threadId: string) =>
   scopeThreadRef(EnvironmentId.make("env"), ThreadId.make(threadId));
 
+// Node has no DOM; entry only listens on the root's document for focus changes.
+const enterThread = (ref: ReturnType<typeof threadRef>) =>
+  restoreFocusOnThreadEnter(ref, {
+    root: {
+      ownerDocument: Object.assign(new EventTarget(), { activeElement: null }),
+    } as unknown as HTMLElement,
+    focusComposer: () => {},
+  });
+
 describe("focusTerminal", () => {
   it("focuses a mounted target right away", () => {
     const ref = threadRef("mounted");
@@ -173,7 +182,7 @@ describe("focusTerminal", () => {
     const focus = vi.fn(() => true);
     const unregister = registerTerminalFocusTarget({ threadRef: ref, terminalId: "a", focus });
 
-    const leave = focusTerminalOnThreadEnter(ref);
+    const leave = enterThread(ref);
 
     expect(focus).toHaveBeenCalledTimes(1);
     leave();
@@ -199,7 +208,7 @@ describe("focusTerminal", () => {
       terminalId: "panel",
       focus: panel,
     });
-    const leave = focusTerminalOnThreadEnter(ref);
+    const leave = enterThread(ref);
 
     expect(drawer).not.toHaveBeenCalled();
     expect(panel).toHaveBeenCalledTimes(1);
@@ -218,12 +227,12 @@ describe("focusTerminal", () => {
       focus: drawer,
     });
 
-    const leaveFirst = focusTerminalOnThreadEnter(ref);
+    const leaveFirst = enterThread(ref);
     focusTerminal(ref, "drawer");
     focusTerminalOnNavigation(ref, "drawer");
     leaveFirst();
     drawer.mockClear();
-    const leaveSecond = focusTerminalOnThreadEnter(ref);
+    const leaveSecond = enterThread(ref);
 
     expect(drawer).toHaveBeenCalledTimes(1);
     leaveSecond();
@@ -234,7 +243,7 @@ describe("focusTerminal", () => {
     const ref = threadRef("revisited");
     useTerminalUiStateStore.getState().ensureTerminal(ref, "drawer", { open: true, active: true });
     focusTerminalOnNavigation(ref, "panel");
-    focusTerminalOnThreadEnter(threadRef("elsewhere"))();
+    enterThread(threadRef("elsewhere"))();
 
     const drawer = vi.fn(() => true);
     const unregisterDrawer = registerTerminalFocusTarget({
@@ -242,7 +251,7 @@ describe("focusTerminal", () => {
       terminalId: "drawer",
       focus: drawer,
     });
-    const leave = focusTerminalOnThreadEnter(ref);
+    const leave = enterThread(ref);
 
     expect(drawer).toHaveBeenCalledTimes(1);
     leave();
diff --git a/apps/web/src/lib/terminalFocus.ts b/apps/web/src/lib/terminalFocus.ts
index b9d11ab68fd6..21bc873b32c3 100644
--- a/apps/web/src/lib/terminalFocus.ts
+++ b/apps/web/src/lib/terminalFocus.ts
@@ -31,11 +31,13 @@ export function subscribeToTerminalFocusChanges(listener: () => void): () => voi
 interface TerminalFocusTarget {
   readonly threadRef: ScopedThreadRef;
   readonly terminalId: string;
+  readonly element?: HTMLElement;
   /** Returns false when the target cannot take focus yet (hidden, or no operate grant). */
   readonly focus: () => boolean;
 }
 
 const focusTargets = new Set<TerminalFocusTarget>();
+const lastThreadFocus = new Map<string, "composer" | { terminalId: string }>();
 // One request at a time: the newest terminal the user asked for wins, so an
 // older request never fires later and steals focus.
 let pendingFocus: { readonly threadKey: string; readonly terminalId: string } | null = null;
@@ -44,6 +46,8 @@ let pendingFocus: { readonly threadKey: string; readonly terminalId: string } |
 // thread's viewports mount and consume the handler's request in the commit's
 // layout phase, before ChatView's thread-enter effect runs.
 let enteredThreadKey: string | null = null;
+// Drawer visibility reruns reuse the root; a remounted chat must not inherit parked requests.
+const lastEnteredThreadByRoot = new WeakMap<HTMLElement, string>();
 let navigationRequestThreadKey: string | null = null;
 
 function isPending(threadKey: string, terminalId: string): boolean {
@@ -122,24 +126,64 @@ export function focusTerminalOnNavigation(threadRef: ScopedThreadRef, terminalId
   focusTerminal(threadRef, terminalId);
 }
 
-/**
- * Entering a thread with its drawer open focuses the drawer terminal, unless a
- * navigating handler already asked for a terminal there. Returns the leave
- * cleanup for ChatView's effect.
- */
-export function focusTerminalOnThreadEnter(threadRef: ScopedThreadRef): () => void {
+/** Restores composer or terminal focus; explicit terminal navigation takes precedence. */
+export function restoreFocusOnThreadEnter(
+  threadRef: ScopedThreadRef,
+  content: { readonly root: HTMLElement; readonly focusComposer: () => void },
+): () => void {
   const threadKey = scopedThreadKey(threadRef);
-  const requestedByHandler = navigationRequestThreadKey === threadKey;
+  const requestedByHandler =
+    navigationRequestThreadKey === threadKey ||
+    (lastEnteredThreadByRoot.get(content.root) === threadKey &&
+      pendingFocus?.threadKey === threadKey);
+  if (!requestedByHandler) pendingFocus = null;
+  lastEnteredThreadByRoot.set(content.root, threadKey);
   navigationRequestThreadKey = null;
   enteredThreadKey = threadKey;
+  const previous = lastThreadFocus.get(threadKey);
+  const remember = () => {
+    const element = content.root.ownerDocument.activeElement;
+    if (!element) return;
+    const terminal = Array.from(focusTargets).find((target) => target.element?.contains(element));
+    if (terminal) {
+      if (scopedThreadKey(terminal.threadRef) === threadKey)
+        lastThreadFocus.set(threadKey, { terminalId: terminal.terminalId });
+    } else if (
+      content.root.contains(element) &&
+      element.closest('[data-workspace-area="composer"]')
+    ) {
+      lastThreadFocus.set(threadKey, "composer");
+    }
+  };
+  content.root.ownerDocument.addEventListener("focusin", remember);
   if (!requestedByHandler) {
-    const { terminalOpen, activeTerminalId } = selectThreadTerminalUiState(
+    const drawer = selectThreadTerminalUiState(
       useTerminalUiStateStore.getState().terminalUiStateByThreadKey,
       threadRef,
     );
-    if (terminalOpen && activeTerminalId) focusTerminal(threadRef, activeTerminalId);
+    const panel = selectThreadRightPanelState(useRightPanelStore.getState().byThreadKey, threadRef);
+    const panelTerminal = panel.isOpen
+      ? panel.surfaces.find((surface) => surface.id === panel.activeSurfaceId)
+      : null;
+    if (previous === "composer") {
+      content.focusComposer();
+    } else if (
+      previous &&
+      ((drawer.terminalOpen &&
+        drawer.terminalGroups
+          .find((group) => group.id === drawer.activeTerminalGroupId)
+          ?.terminalIds.includes(previous.terminalId)) ||
+        (panelTerminal?.kind === "terminal" &&
+          panelTerminal.terminalIds.includes(previous.terminalId)))
+    ) {
+      focusTerminal(threadRef, previous.terminalId);
+    } else if (drawer.terminalOpen && drawer.activeTerminalId) {
+      focusTerminal(threadRef, drawer.activeTerminalId);
+    } else content.focusComposer();
   }
+  if (requestedByHandler) remember();
   return () => {
+    content.root.ownerDocument.removeEventListener("focusin", remember);
     // A handler navigating elsewhere marks its target before this cleanup runs.
     if (enteredThreadKey === threadKey) enteredThreadKey = null;
   };
diff --git a/apps/web/src/lib/workspaceFocus.browser.test.ts b/apps/web/src/lib/workspaceFocus.browser.test.ts
index 4674e02ea61f..769423a512b2 100644
--- a/apps/web/src/lib/workspaceFocus.browser.test.ts
+++ b/apps/web/src/lib/workspaceFocus.browser.test.ts
@@ -33,6 +33,15 @@ function setup() {
   };
 }
 
+/** Mirrors MessagesTimeline's scroller, which takes focus so the keyboard scrolls it. */
+function conversationScroller(height: number) {
+  const timeline = document.createElement("div");
+  timeline.style.cssText = `height: ${height}px; overflow-y: auto`;
+  timeline.tabIndex = -1;
+  timeline.dataset.workspaceFocusDefault = "";
+  return timeline;
+}
+
 describe("workspace area focus", () => {
   it("cycles in workspace order in both directions, independent of DOM order", () => {
     using fixture = setup();
@@ -42,7 +51,7 @@ describe("workspace area focus", () => {
     const composer = fixture.area("composer", 2);
     sidebar.button.focus();
     fixture.controller.move(1);
-    // The conversation is a region; it takes focus itself rather than its first button.
+    // Without a timeline (an empty thread), the region takes focus rather than its first button.
     expect(document.activeElement).toBe(conversation.element);
     fixture.controller.move(1);
     expect(document.activeElement).toBe(composer.button);
@@ -204,8 +213,7 @@ describe("workspace area focus", () => {
   it("does not scroll the conversation to an old control", () => {
     using fixture = setup();
     const conversation = fixture.area("conversation", 1);
-    const timeline = document.createElement("div");
-    timeline.style.cssText = "height: 50px; overflow-y: auto";
+    const timeline = conversationScroller(50);
     const copy = document.createElement("button");
     copy.textContent = "Copy";
     timeline.append(copy, Object.assign(document.createElement("div"), { style: "height: 400px" }));
@@ -217,10 +225,28 @@ describe("workspace area focus", () => {
     // Live follow moved the timeline to the newest output.
     timeline.scrollTop = 300;
     fixture.controller.move(-1);
-    expect(document.activeElement).toBe(conversation.element);
+    expect(document.activeElement).toBe(timeline);
     expect(timeline.scrollTop).toBe(300);
   });
 
+  it("scrolls the conversation with the keyboard once an empty thread gets a timeline", async () => {
+    using fixture = setup();
+    const conversation = fixture.area("conversation", 1);
+    conversation.button.remove();
+    conversation.element.style.height = "200px";
+    const composer = fixture.area("composer", 2);
+    composer.button.focus();
+    fixture.controller.move(-1);
+    expect(document.activeElement).toBe(conversation.element);
+    fixture.controller.move(1);
+    const timeline = conversationScroller(200);
+    timeline.append(Object.assign(document.createElement("div"), { style: "height: 2000px" }));
+    conversation.element.append(timeline);
+    fixture.controller.move(-1);
+    await userEvent.keyboard("{ArrowDown}{PageDown}");
+    await vi.waitFor(() => expect(timeline.scrollTop).toBeGreaterThan(0));
+  });
+
   it.each([
     ["panel", "panel", "removed"],
     ["conversation", "composer", "removed"],
@@ -281,7 +307,9 @@ describe("workspace area focus", () => {
     bringBack.textContent = "Bring back";
     content.append(bringBack);
     panel.element.append(content);
-    fixture.area("conversation", 1, content);
+    const timeline = conversationScroller(50);
+    timeline.append(Object.assign(document.createElement("div"), { style: "height: 400px" }));
+    fixture.area("conversation", 1, content).element.append(timeline);
     const composer = fixture.area("composer", 2, content);
     const editor = document.createElement("div");
     editor.contentEditable = "true";
diff --git a/apps/web/src/lib/workspaceFocus.ts b/apps/web/src/lib/workspaceFocus.ts
index 38abacd9a82a..05dd8281dca0 100644
--- a/apps/web/src/lib/workspaceFocus.ts
+++ b/apps/web/src/lib/workspaceFocus.ts
@@ -100,18 +100,22 @@ function revealInScrollers(target: HTMLElement) {
 export function createWorkspaceFocusController(doc: Document) {
   const lastFocused = new Map<string, HTMLElement>();
   let lastArea: string | undefined;
-  // An area that took focus itself from the keyboard. Chromium's :focus-visible also matches
-  // a clicked area after any later key press, so the ring and window return read this mark.
+  // An area that took focus itself from the keyboard, or the non-tabbable default (the
+  // conversation's scroller) standing in for it. Chromium's :focus-visible also matches a
+  // clicked area after any later key press, so the ring and window return read this mark.
   let keyboardArea: HTMLElement | undefined;
   let previousTarget: EventTarget | null = null;
   const unmarkKeyboardArea = () => {
     keyboardArea?.removeAttribute("data-workspace-keyboard-focus");
     keyboardArea = undefined;
   };
-  const markKeyboardArea = (area: HTMLElement) => {
-    if (!area.matches(":focus-visible")) return;
-    keyboardArea = area;
-    area.setAttribute("data-workspace-keyboard-focus", "");
+  const standsInFor = (element: HTMLElement, area: HTMLElement) =>
+    element === area ||
+    (element.tabIndex < 0 && element.hasAttribute("data-workspace-focus-default"));
+  const markKeyboardArea = (target: HTMLElement) => {
+    if (!target.matches(":focus-visible")) return;
+    keyboardArea = target;
+    target.setAttribute("data-workspace-keyboard-focus", "");
   };
   const remember = (event: FocusEvent) => {
     if (event.target !== keyboardArea) unmarkKeyboardArea();
@@ -121,7 +125,7 @@ export function createWorkspaceFocusController(doc: Document) {
     if (!(event.target instanceof HTMLElement)) return;
     const area = workspaceArea(event.target);
     if (!area?.dataset.workspaceArea) return;
-    if (arrived && event.target === area) markKeyboardArea(area);
+    if (arrived && standsInFor(event.target, area)) markKeyboardArea(event.target);
     lastArea = area.dataset.workspaceArea;
     const key = area.dataset.workspaceFocusKey ?? lastArea;
     lastFocused.delete(key);
@@ -141,11 +145,14 @@ export function createWorkspaceFocusController(doc: Document) {
     const belongs = (element: HTMLElement) => workspaceArea(element) === area && usable(element);
     // A side chat's message input sits in its own area inside the panel. Opening the
     // panel focuses it, but F6 visits that area on its own, so it moves past it here.
+    // A nested timeline stands in only for its own area, never ahead of that input.
     const preferred = Array.from(
       area.querySelectorAll<HTMLElement>(
         '[data-workspace-focus-default], [data-sidebar-row][aria-current="page"], [data-settings-section][aria-current="page"], .xterm-helper-textarea, [contenteditable="true"]',
       ),
-    ).find(nested ? usable : belongs);
+    ).find((element) =>
+      nested && !standsInFor(element, area) ? usable(element) : belongs(element),
+    );
     const fallback = Array.from(area.querySelectorAll<HTMLElement>(FOCUSABLE_SELECTOR)).find(
       (element) => element.tabIndex >= 0 && belongs(element),
     );
@@ -172,10 +179,14 @@ export function createWorkspaceFocusController(doc: Document) {
         )
       : undefined;
     // Moving the timeline to an old control would also stop it following a running turn,
-    // so the conversation reuses a control only while it is still in view.
+    // so the conversation reuses a control only while it is still in view. A remembered
+    // area is only the fallback it was then, so controls mounted since take precedence.
     const isConversation = area.dataset.workspaceArea === "conversation";
     const targets = new Set([
-      previous && belongs(previous) && (!isConversation || isInScrollView(previous))
+      previous &&
+      previous !== area &&
+      belongs(previous) &&
+      (!isConversation || isInScrollView(previous))
         ? previous
         : undefined,
       isConversation ? undefined : restored,
@@ -192,7 +203,7 @@ export function createWorkspaceFocusController(doc: Document) {
       if (active === target || (active && target.contains(active))) {
         if (target !== area && !isConversation) revealInScrollers(target);
         // Focusing the already focused area fires no focusin, as when F6 has nowhere else to go.
-        if (target === area) markKeyboardArea(area);
+        if (standsInFor(target, area)) markKeyboardArea(target);
         return true;
       }
     }
diff --git a/apps/web/src/main.test.ts b/apps/web/src/main.test.ts
new file mode 100644
index 000000000000..56be08671e33
--- /dev/null
+++ b/apps/web/src/main.test.ts
@@ -0,0 +1,37 @@
+import { expect, it, vi } from "vite-plus/test";
+
+vi.mock("./appInit", () => ({ startAppServices: () => ({ load: async () => {} }) }));
+vi.mock("./AppRoot", () => ({ AppRoot: () => null }));
+vi.mock("./i18n/runtime", () => ({ whenLocaleReady: async () => {} }));
+vi.mock("react-dom/client", () => ({ default: { createRoot: () => ({ render: () => {} }) } }));
+
+// Boots main in a fresh page that shares the tab's sessionStorage, as a reload does.
+async function bootThenFailLazyChunk(sessionStorage: Map<string, string>) {
+  vi.resetModules();
+  const reload = vi.fn().mockName("location.reload");
+  const page = Object.assign(new EventTarget(), {
+    sessionStorage: {
+      getItem: (key: string) => sessionStorage.get(key) ?? null,
+      setItem: (key: string, value: string) => sessionStorage.set(key, value),
+      removeItem: (key: string) => sessionStorage.delete(key),
+    },
+    location: { reload },
+  });
+  vi.stubGlobal("window", page);
+  vi.stubGlobal("document", { getElementById: () => ({}) });
+  try {
+    const { startup } = await import("./main");
+    await startup;
+    page.dispatchEvent(new Event("vite:preloadError", { cancelable: true }));
+    return reload;
+  } finally {
+    vi.unstubAllGlobals();
+  }
+}
+
+it("reloads only once when a lazy chunk fails after every boot", async () => {
+  const sessionStorage = new Map<string, string>();
+
+  expect(await bootThenFailLazyChunk(sessionStorage)).toHaveBeenCalledTimes(1);
+  expect(await bootThenFailLazyChunk(sessionStorage)).not.toHaveBeenCalled();
+});
diff --git a/apps/web/src/main.tsx b/apps/web/src/main.tsx
index 4469f9cbf6ba..112de4848170 100644
--- a/apps/web/src/main.tsx
+++ b/apps/web/src/main.tsx
@@ -9,16 +9,14 @@ import { isElectron } from "./env";
 import { startAppServices } from "./appInit";
 import { AppRoot } from "./AppRoot";
 import { whenLocaleReady } from "./i18n/runtime";
-import { clearChunkReloadGuard, reloadOnceForChunkLoadError } from "./lib/chunkReloadGuard";
+import { reloadOnceForChunkLoadError } from "./lib/chunkReloadGuard";
 
 const router = startAppServices();
 
 const clerkPublishableKey = import.meta.env.VITE_CLERK_PUBLISHABLE_KEY as string | undefined;
 
-let chunkLoadFailed = false;
 let reloadScheduled = false;
 window.addEventListener("vite:preloadError", (event) => {
-  chunkLoadFailed = true;
   if (reloadOnceForChunkLoadError()) {
     reloadScheduled = true;
     event.preventDefault();
@@ -43,7 +41,6 @@ export const startup = Promise.all([
   .then(([ManagedAuthShell]) => {
     // Route chunk failures resolve router.load() and surface later through the error boundary.
     if (reloadScheduled) return;
-    if (!chunkLoadFailed) clearChunkReloadGuard();
     ReactDOM.createRoot(document.getElementById("root") as HTMLElement).render(
       <React.StrictMode>
         {ManagedAuthShell && clerkPublishableKey ? (
diff --git a/apps/web/src/markdown-clipboard.test.ts b/apps/web/src/markdown-clipboard.test.ts
index da6d331ef9c0..e85e77b416f2 100644
--- a/apps/web/src/markdown-clipboard.test.ts
+++ b/apps/web/src/markdown-clipboard.test.ts
@@ -198,6 +198,38 @@ describe("serializeRenderedMarkdownFragment", () => {
     expect(serializeRenderedMarkdownFragment(asNode(container))).toBe("first line\nsecond line");
   });
 
+  it("copies alert and insight callouts as their Markdown instead of the rendered label", () => {
+    // The shape ChatMarkdown renders for `> [!WARNING]\n> Back up first.`.
+    const callout = new FakeElement("DIV", [], {
+      role: "note",
+      "data-markdown-alert": "warning",
+    }).append(
+      new FakeElement("P", [], {
+        "data-thread-find-ignore": "true",
+        "data-markdown-alert-label": "",
+      }).append(new FakeElement("SVG", [], { "aria-hidden": "true" }), new FakeText("Warning")),
+      new FakeElement("P").append(new FakeText("Back up first.")),
+    );
+    const container = new FakeElement("DIV").append(callout);
+
+    expect(serializeRenderedMarkdownFragment(asNode(container))).toBe(
+      "> [!WARNING]\n> Back up first.",
+    );
+    const insight = new FakeElement("DIV", [], {
+      role: "note",
+      "data-markdown-alert": "insight",
+    }).append(
+      new FakeElement("P", [], {
+        "data-thread-find-ignore": "true",
+        "data-markdown-alert-label": "",
+      }).append(new FakeText("Insight")),
+      new FakeElement("P").append(new FakeText("Caches are warm.")),
+    );
+    expect(serializeRenderedMarkdownFragment(asNode(new FakeElement("DIV").append(insight)))).toBe(
+      `★ Insight ${"─".repeat(37)}\nCaches are warm.\n${"─".repeat(49)}`,
+    );
+  });
+
   it("preserves explicit ordered-list values and continues from resets when copying", () => {
     const list = new FakeElement("OL", [], { start: "0" }).append(
       new FakeElement("LI").append(new FakeText("A")),
diff --git a/apps/web/src/markdown-clipboard.ts b/apps/web/src/markdown-clipboard.ts
index 10c83bf9a96b..91f16c86535a 100644
--- a/apps/web/src/markdown-clipboard.ts
+++ b/apps/web/src/markdown-clipboard.ts
@@ -10,6 +10,9 @@ const SANITIZED_HTML_SELECTOR = [
   ...SKIPPED_CLASS_NAMES.map((className) => `.${className}`),
 ].join(", ");
 
+const ALERT_ATTRIBUTE = "data-markdown-alert";
+const ALERT_LABEL = "data-markdown-alert-label";
+
 export interface MarkdownClipboardPayload {
   text: string;
   html: string;
@@ -159,10 +162,21 @@ function serializeList(list: Element, ordered: boolean, inTableCell: boolean): s
     .join("\n")}\n\n`;
 }
 
-function serializeBlockquote(quote: Element, inTableCell: boolean): string {
-  const content = outsideCode(serializeChildren(quote, inTableCell), (prose) =>
-    prose.replace(/\n{3,}/g, "\n\n"),
-  ).trim();
+function serializeQuoteBody(quote: Element, inTableCell: boolean): string {
+  let content = "";
+  for (const child of quote.childNodes) {
+    // A callout's rendered label stands for the marker its serializer writes.
+    if (child.nodeType === Node.ELEMENT_NODE && (child as Element).hasAttribute(ALERT_LABEL)) {
+      continue;
+    }
+    content += serializeNode(child, inTableCell);
+  }
+  return outsideCode(content, (prose) => prose.replace(/\n{3,}/g, "\n\n")).trim();
+}
+
+function serializeBlockquote(quote: Element, inTableCell: boolean, marker = ""): string {
+  const body = serializeQuoteBody(quote, inTableCell);
+  const content = marker && body ? `${marker}\n${body}` : marker || body;
   if (!content) return "";
   const quoted = content
     .split("\n")
@@ -171,6 +185,11 @@ function serializeBlockquote(quote: Element, inTableCell: boolean): string {
   return `${quoted}\n\n`;
 }
 
+function serializeInsight(insight: Element, inTableCell: boolean): string {
+  const body = serializeQuoteBody(insight, inTableCell);
+  return `★ Insight ${"─".repeat(37)}\n${body ? `${body}\n` : ""}${"─".repeat(49)}\n\n`;
+}
+
 function serializeDetails(details: Element): string {
   const summary =
     details.querySelector(":scope > [data-markdown-details-summary]")?.textContent?.trim() ??
@@ -231,6 +250,9 @@ function serializeNode(node: Node, inTableCell = false): string {
       : escapeTablePipes(markdownCopy, inTableCell);
   }
   if (isSkippedElement(element)) return "";
+  const alert = element.getAttribute(ALERT_ATTRIBUTE);
+  if (alert === "insight") return serializeInsight(element, inTableCell);
+  if (alert !== null) return serializeBlockquote(element, inTableCell, `[!${alert.toUpperCase()}]`);
 
   const headingLevel = /^H([1-6])$/.exec(element.tagName)?.[1];
   if (headingLevel) {
@@ -478,6 +500,13 @@ export function chatMarkdownClipboardPayload(
       }
       continue;
     }
+    // A range spanning exactly one callout's text clones its contents but not the callout.
+    const callout = ancestorElement?.closest(`[${ALERT_ATTRIBUTE}]`);
+    if (callout && range.toString().trim() === (callout.textContent ?? "").trim()) {
+      const wrapper = callout.cloneNode(false) as Element;
+      wrapper.append(...container.childNodes);
+      container.replaceChildren(wrapper);
+    }
     const text = serializeRenderedMarkdownFragment(container);
     if (!text) continue;
     texts.push(text);
diff --git a/apps/web/src/modelSelection.test.ts b/apps/web/src/modelSelection.test.ts
index 1f112c48e01d..ff5612896023 100644
--- a/apps/web/src/modelSelection.test.ts
+++ b/apps/web/src/modelSelection.test.ts
@@ -25,6 +25,8 @@ import {
 import {
   defaultModelSelectionsAreMixed,
   getAppModelOptionsForInstance,
+  getCustomModelOptionsByInstance,
+  getTextGenerationModelOptionsByInstance,
   resolveAppModelSelectionForInstance,
   resolveAppModelSelectionState,
   resolveEffectiveDefaultModelSelection,
@@ -402,6 +404,11 @@ describe("instance-scoped model selection", () => {
       availableModel: "gemini-3.1-pro",
       missingModel: "gemini-3.1-pro-high",
     },
+    {
+      driverName: "cursor",
+      availableModel: "auto-smart",
+      missingModel: "claude-opus-5-5",
+    },
   ])("$driverName catalog gaps", ({ driverName, availableModel, missingModel }) => {
     it("preserves a selected model when a catalog refresh no longer contains it", () => {
       const providers = [
@@ -508,6 +515,34 @@ describe("instance-scoped model selection", () => {
     expect(dispatch.modelOptionsForDispatch).toBeUndefined();
   });
 
+  it("sends a Cursor thread's stored model and options when the catalog lacks them", () => {
+    const instanceId = ProviderInstanceId.make("cursor");
+    const driver = ProviderDriverKind.make("cursor");
+    const stored = createModelSelection(instanceId, "claude-opus-5-5", [
+      { id: "effort", value: "medium" },
+    ]);
+    const providers = [provider({ provider: driver, instanceId, models: ["auto-smart"] })];
+    const state = deriveEffectiveComposerModelState({
+      draft: null,
+      providers,
+      selectedProvider: driver,
+      selectedInstanceId: instanceId,
+      threadModelSelection: stored,
+      projectModelSelection: null,
+      settings: settingsWithProviderInstances(),
+    });
+    const dispatch = getComposerProviderState({
+      provider: driver,
+      model: state.selectedModel,
+      models: providers[0]!.models,
+      modelOptions: state.modelOptions?.[instanceId],
+    });
+
+    expect(
+      createModelSelection(instanceId, state.selectedModel, dispatch.modelOptionsForDispatch),
+    ).toEqual(stored);
+  });
+
   it("preserves an explicit draft OpenCode selection while the catalog is empty", () => {
     const instanceId = ProviderInstanceId.make("opencode_work");
     const driver = ProviderDriverKind.make("opencode");
@@ -917,6 +952,60 @@ describe("instance-scoped model selection", () => {
       NO_PROVIDER_MODEL_SELECTION,
     );
   });
+
+  it("excludes customized extension models while preserving unknown custom and thread models", () => {
+    const pi = provider({
+      provider: ProviderDriverKind.make("pi"),
+      instanceId: "pi",
+      models: ["default", "demo/demo-model"],
+    });
+    const providers = [
+      {
+        ...pi,
+        models: pi.models.map((model) =>
+          model.slug === "demo/demo-model" ? { ...model, supportsTextGeneration: false } : model,
+        ),
+      },
+    ];
+    const settings: UnifiedSettings = {
+      ...DEFAULT_UNIFIED_SETTINGS,
+      providerInstances: {
+        [pi.instanceId]: {
+          driver: ProviderDriverKind.make("pi"),
+          config: {
+            customModels: [
+              { slug: "demo/demo-model", name: "My extension model" },
+              { slug: "unknown/model", name: "My custom model" },
+            ],
+          },
+        },
+      },
+      textGenerationModelSelection: createModelSelection(pi.instanceId, "demo/demo-model"),
+    };
+    const supported = providers.filter((provider) => provider.supportsTextGeneration !== false);
+    expect(
+      getTextGenerationModelOptionsByInstance(settings, supported, pi.instanceId, "demo/demo-model")
+        .get(pi.instanceId)
+        ?.map((option) => option.slug),
+    ).toEqual(["default", "unknown/model"]);
+    expect(resolveAppModelSelectionState(settings, supported)).toEqual(
+      createModelSelection(pi.instanceId, "default"),
+    );
+    expect(
+      resolveAppModelSelectionState(
+        {
+          ...settings,
+          textGenerationModelSelection: createModelSelection(pi.instanceId, "unknown/model"),
+        },
+        supported,
+      ).model,
+    ).toBe("unknown/model");
+    expect(
+      getCustomModelOptionsByInstance(settings, providers)
+        .get(pi.instanceId)
+        ?.map((option) => option.slug),
+    ).toEqual(["default", "demo/demo-model", "unknown/model"]);
+  });
 });
 
 describe("resolveAppModelSelectionState with the opencode plan agent", () => {
diff --git a/apps/web/src/modelSelection.ts b/apps/web/src/modelSelection.ts
index 61be2ece7632..3f566afe1922 100644
--- a/apps/web/src/modelSelection.ts
+++ b/apps/web/src/modelSelection.ts
@@ -80,7 +80,9 @@ function appendUnavailableDynamicModelSelection(
   selectedModel: string | null | undefined,
   hiddenModels: ReadonlyArray<string>,
 ): AppModelOption[] {
-  if (provider !== "opencode" && provider !== "antigravity") return options;
+  if (provider !== "opencode" && provider !== "antigravity" && provider !== "cursor") {
+    return options;
+  }
   const slug = normalizeCustomModelSlug(selectedModel);
   if (!slug) return options;
   if (provider === "antigravity" && slug === ANTIGRAVITY_DEFAULT_MODEL) return options;
@@ -282,7 +284,9 @@ export function resolveAppModelSelectionForInstance(
   }
   if (
     resolutionOptions?.preserveUnavailableSelection &&
-    (entry.driverKind === "opencode" || entry.driverKind === "antigravity")
+    (entry.driverKind === "opencode" ||
+      entry.driverKind === "antigravity" ||
+      entry.driverKind === "cursor")
   ) {
     const unavailableSelection = normalizeCustomModelSlug(selectedModel);
     const hiddenModels = readInstanceModelPreferences(settings, entry.instanceId).hiddenModels;
@@ -366,6 +370,42 @@ export function getCustomModelOptionsByInstance(
   return out;
 }
 
+function getTextGenerationModelOptionsForInstance(
+  settings: UnifiedSettings,
+  entry: ProviderInstanceEntry,
+  selectedModel?: string | null,
+): AppModelOption[] {
+  const unsupported = new Set(
+    entry.models
+      .filter((model) => model.supportsTextGeneration === false)
+      .map((model) => model.slug),
+  );
+  // Filter after custom entries are rebuilt so a display-name override cannot restore a model.
+  return getAppModelOptionsForInstance(settings, entry, selectedModel).filter(
+    (option) => !unsupported.has(option.slug),
+  );
+}
+
+export function getTextGenerationModelOptionsByInstance(
+  settings: UnifiedSettings,
+  providers: ReadonlyArray<ServerProvider>,
+  selectedInstanceId?: ProviderInstanceId | null,
+  selectedModel?: string | null,
+): ReadonlyMap<ProviderInstanceId, ReadonlyArray<ModelEsque>> {
+  return new Map(
+    deriveProviderInstanceEntries(
+      providers.filter((provider) => provider.supportsTextGeneration !== false),
+    ).map((entry) => [
+      entry.instanceId,
+      getTextGenerationModelOptionsForInstance(
+        settings,
+        entry,
+        entry.instanceId === selectedInstanceId ? selectedModel : null,
+      ),
+    ]),
+  );
+}
+
 export function selectsPlanAgent(options: ModelSelection["options"]): boolean {
   return options?.some((option) => option.id === "agent" && option.value === "plan") ?? false;
 }
@@ -390,7 +430,7 @@ export function resolveAppModelSelectionState(
   if (entry) {
     const selectedModel = selectedEntry ? selection.model : null;
     // Use the cheap generation default; the catalog default is the expensive chat flagship.
-    const options = getAppModelOptionsForInstance(settings, entry);
+    const options = getTextGenerationModelOptionsForInstance(settings, entry);
     const model =
       resolveSelectableModel(entry.driverKind, selectedModel, options) ??
       resolveSelectableModel(
@@ -398,13 +438,9 @@ export function resolveAppModelSelectionState(
         DEFAULT_TEXT_GENERATION_MODEL_BY_PROVIDER[entry.driverKind],
         options,
       ) ??
-      resolveAppModelSelectionForInstance(
-        entry.instanceId,
-        settings,
-        supportedProviders,
-        selectedModel,
-      ) ??
-      entry.models[0]?.slug ??
+      options.find((option) => option.isDefault)?.slug ??
+      options[0]?.slug ??
+      entry.models.find((model) => model.supportsTextGeneration !== false)?.slug ??
       DEFAULT_TEXT_GENERATION_MODEL_BY_PROVIDER[entry.driverKind];
     if (!model) {
       return createModelSelection(entry.instanceId, "", []);
diff --git a/apps/web/src/pendingUserInput.test.ts b/apps/web/src/pendingUserInput.test.ts
index 7f556d6e847b..f57c2d915070 100644
--- a/apps/web/src/pendingUserInput.test.ts
+++ b/apps/web/src/pendingUserInput.test.ts
@@ -9,6 +9,7 @@ import {
   derivePendingUserInputProgress,
   projectPendingUserInputAnswer,
   threadContextsReferencedByAnswer,
+  withdrawDisplacedCustomAnswerFromPrompt,
 } from "./pendingUserInput";
 
 describe("projectPendingUserInputAnswer", () => {
@@ -161,3 +162,40 @@ describe("carryDisplacedCustomAnswerIntoPrompt", () => {
     );
   });
 });
+
+describe("withdrawDisplacedCustomAnswerFromPrompt", () => {
+  // regression: #35205 an answer restored with undo stayed in the thread draft and was sent twice
+  it("takes set-aside text back out of the thread draft and leaves the rest", () => {
+    const setAside = carryDisplacedCustomAnswerIntoPrompt("", "first answer ");
+    expect(withdrawDisplacedCustomAnswerFromPrompt(setAside, "first answer ")).toBe("");
+
+    const afterDraft = carryDisplacedCustomAnswerIntoPrompt("draft", "first answer");
+    expect(withdrawDisplacedCustomAnswerFromPrompt(afterDraft, "first answer")).toBe("draft");
+
+    const beforeSecond = carryDisplacedCustomAnswerIntoPrompt(setAside, "second answer");
+    expect(
+      withdrawDisplacedCustomAnswerFromPrompt(beforeSecond, "first answer", ["second answer"]),
+    ).toBe("second answer");
+
+    const between = carryDisplacedCustomAnswerIntoPrompt(afterDraft, "second answer");
+    expect(
+      withdrawDisplacedCustomAnswerFromPrompt(between, "first answer", ["second answer"]),
+    ).toBe("draft\n\nsecond answer");
+  });
+
+  it("removes its own copy, not equal text inside a later set-aside answer", () => {
+    const first = carryDisplacedCustomAnswerIntoPrompt("", "foo");
+    const both = carryDisplacedCustomAnswerIntoPrompt(first, "bar\n\nfoo");
+    expect(withdrawDisplacedCustomAnswerFromPrompt(both, "foo", ["bar\n\nfoo"])).toBe("bar\n\nfoo");
+  });
+
+  it("leaves a thread draft that no longer holds the set-aside text where it was put", () => {
+    expect(withdrawDisplacedCustomAnswerFromPrompt("first answer, edited", "first answer")).toBe(
+      "first answer, edited",
+    );
+    expect(withdrawDisplacedCustomAnswerFromPrompt("my first answer", "first answer")).toBe(
+      "my first answer",
+    );
+    expect(withdrawDisplacedCustomAnswerFromPrompt("draft", "  ")).toBe("draft");
+  });
+});
diff --git a/apps/web/src/pendingUserInput.ts b/apps/web/src/pendingUserInput.ts
index a9cfef1366da..1afc298ca94a 100644
--- a/apps/web/src/pendingUserInput.ts
+++ b/apps/web/src/pendingUserInput.ts
@@ -72,6 +72,28 @@ export function carryDisplacedCustomAnswerIntoPrompt(
   return `${prompt.trimEnd()}${DISPLACED_ANSWER_SEPARATOR}${displaced}`;
 }
 
+/**
+ * Takes set-aside answer text back out of the thread draft once it is the answer again.
+ * `laterDisplaced` is what was set aside after it, in order: together they locate this copy,
+ * so equal text inside another answer or the user's own draft is never the one removed.
+ */
+export function withdrawDisplacedCustomAnswerFromPrompt(
+  prompt: string,
+  displaced: string,
+  laterDisplaced: ReadonlyArray<string> = [],
+): string {
+  const text = displaced.trim();
+  if (text.length === 0) return prompt;
+  const later = laterDisplaced.map((entry) => entry.trim()).filter((entry) => entry.length > 0);
+  const suffix = [text, ...later].join(DISPLACED_ANSWER_SEPARATOR);
+  if (!prompt.endsWith(suffix)) return prompt;
+  const before = prompt.slice(0, prompt.length - suffix.length);
+  const after = later.join(DISPLACED_ANSWER_SEPARATOR);
+  if (before.length === 0) return after;
+  if (!before.endsWith(DISPLACED_ANSWER_SEPARATOR)) return prompt;
+  return after.length === 0 ? before.slice(0, -DISPLACED_ANSWER_SEPARATOR.length) : before + after;
+}
+
 function countAnsweredPendingUserInputQuestions(
   questions: ReadonlyArray<UserInputQuestion>,
   draftAnswers: Record<string, PendingUserInputDraftAnswer>,
diff --git a/apps/web/src/routes/__root.tsx b/apps/web/src/routes/__root.tsx
index c2e15c4abab3..a59604a63f42 100644
--- a/apps/web/src/routes/__root.tsx
+++ b/apps/web/src/routes/__root.tsx
@@ -57,6 +57,7 @@ import { primaryServerConfigAtom, primaryServerWelcomeAtom } from "../state/serv
 import { readProject } from "../state/entities";
 
 import { getDesktopSnapShotBridge } from "../lib/desktopSnapShot";
+import { isChunkLoadError } from "../lib/chunkReloadGuard";
 import { shouldResumeSnapShotSetupOnStartup } from "../lib/snapShotSetupResume";
 
 export const Route = createRootRoute({
@@ -243,7 +244,12 @@ function RootRouteErrorView({ error }: ErrorComponentProps) {
       <StandalonePageHeader title="Something went wrong." description={message} />
 
       <div className="mt-5 flex flex-wrap gap-2">
-        <Button size="sm" onClick={() => void router.invalidate()}>
+        <Button
+          size="sm"
+          onClick={() =>
+            isChunkLoadError(error) ? window.location.reload() : void router.invalidate()
+          }
+        >
           Try again
         </Button>
         <Button size="sm" variant="outline" onClick={() => window.location.reload()}>
diff --git a/apps/web/src/routes/_chat.tsx b/apps/web/src/routes/_chat.tsx
index 8b5d7af3468a..ad04d04d2949 100644
--- a/apps/web/src/routes/_chat.tsx
+++ b/apps/web/src/routes/_chat.tsx
@@ -1,33 +1,16 @@
-import { scopedThreadKey } from "@t3tools/client-runtime/environment";
-import { Outlet, createFileRoute, redirect, useMatches } from "@tanstack/react-router";
-import { useState } from "react";
+import { Outlet, createFileRoute, redirect } from "@tanstack/react-router";
 
 import { ThreadRouteView } from "../components/ThreadRouteView";
 import { isAppModalPage } from "../components/sidebar/mainAppLocation";
 import { SidebarInset } from "../components/ui/sidebar";
-import { resolveThreadRouteTarget, type ThreadRouteTarget } from "../threadRoutes";
+import { resolveThreadRouteTarget } from "../threadRoutes";
 import { retainThreadFindForRoute } from "../components/chat/threadFindStore";
 import { ThreadLinkPrompt } from "../components/promptLinks/ThreadLinkPrompt";
-import { useThreadRouteTarget } from "../hooks/useThreadRouteTarget";
-
-function threadRouteTargetKey(target: ThreadRouteTarget | null) {
-  if (!target) return null;
-  return target.kind === "server" ? scopedThreadKey(target.threadRef) : target.draftId;
-}
+import { useShownThreadRouteTarget } from "../hooks/useShownThreadRouteTarget";
 
 function ChatRouteLayout() {
   // Render both routes here so draft promotion keeps the same ChatView mounted.
-  const threadTarget = useThreadRouteTarget();
-  // Read matches, not location, so this agrees with the params useThreadRouteTarget reads.
-  const modalOpen = useMatches({
-    select: (matches) => matches.some((match) => isAppModalPage(match.pathname)),
-  });
-  // Settings and Usage render over the thread that opened them, so ChatView never remounts.
-  const [backgroundTarget, setBackgroundTarget] = useState(threadTarget);
-  if (!modalOpen && threadRouteTargetKey(backgroundTarget) !== threadRouteTargetKey(threadTarget)) {
-    setBackgroundTarget(threadTarget);
-  }
-  const shownTarget = modalOpen ? backgroundTarget : threadTarget;
+  const { shownTarget, modalOpen } = useShownThreadRouteTarget();
   return (
     <>
       {shownTarget?.kind === "server" && !modalOpen ? (
diff --git a/apps/web/src/session-logic.test.ts b/apps/web/src/session-logic.test.ts
index 013e38c701ca..73cee1a33bb4 100644
--- a/apps/web/src/session-logic.test.ts
+++ b/apps/web/src/session-logic.test.ts
@@ -12,6 +12,7 @@ import {
   ScheduledTaskId,
   ThreadId,
   TurnItemId,
+  type OrchestrationV2PlanArtifact,
   type OrchestrationV2ProjectedTurnItem,
   type OrchestrationV2ExecutionNode,
   type OrchestrationV2RunAttempt,
@@ -38,9 +39,30 @@ import {
   workEntryDisplayIndicatesToolFailure,
   workEntryIndicatesToolSuccess,
 } from "./session-logic";
-import { makeStreamingTimelineFixture, makeThreadProjectionFixture } from "./test-fixtures";
+import {
+  makeStreamingTimelineFixture,
+  makeStreamingWorkTimelineFixture,
+  makeThreadProjectionFixture,
+  withStreamedText,
+} from "./test-fixtures";
 import type { ChatMessage } from "./types";
 
+function streamingPlanArtifact(
+  fixture: ReturnType<typeof makeStreamingWorkTimelineFixture>,
+  markdown: string,
+  status: "active" | "superseded",
+): OrchestrationV2PlanArtifact {
+  return {
+    id: PlanId.make("live-plan"),
+    threadId: fixture.threadId,
+    runId: fixture.runId,
+    nodeId: NodeId.make("live-node"),
+    kind: "proposed_plan",
+    markdown,
+    status,
+  };
+}
+
 describe("V2 session presentation", () => {
   it("uses run status as the settlement boundary", () => {
     const runId = RunId.make("run-1");
@@ -1369,7 +1391,7 @@ describe("HTML renders in the timeline", () => {
     ]);
   });
 
-  it("hosts a captured MCP app in place, from any provider's tool", () => {
+  it("hosts a captured MCP app after its tool row, from any provider's tool", () => {
     const mcpApp = {
       attachmentId: "render-thread-app-html",
       server: "weather",
@@ -1381,13 +1403,58 @@ describe("HTML renders in the timeline", () => {
       call.type === "dynamic_tool" ? { ...call, toolName: "weather.get_weather" } : call,
     );
     expect(entries.find((entry) => entry.kind === "mcp-app")).toMatchObject({
-      id: "render",
+      id: "mcp-app:render",
       itemId: "render",
       mcpApp,
     });
     expect(rowsFor(entries, false)).toEqual(["message", "turn-fold", "mcp-app", "message"]);
   });
 
+  it("keeps an MCP app call's tool row and output beside its app card", () => {
+    const mcpApp = {
+      attachmentId: "render-thread-app-html",
+      server: "repro",
+      tool: "aggregate_rum_events",
+      resourceUri: "ui://repro/dataviz",
+    };
+    const result = { content: [{ type: "text", text: "Notice\nview\tcount\n/home\t42" }] };
+    const call = renderCall("completed", { t3McpApp: mcpApp, result });
+    const entries = turn(
+      call.type === "dynamic_tool" ? { ...call, toolName: "repro.aggregate_rum_events" } : call,
+    );
+    expect(entries.find((entry) => entry.kind === "mcp-app")).toMatchObject({ mcpApp });
+    const toolRows = entries.flatMap((entry) =>
+      entry.kind === "work" && entry.entry.toolTitle === "repro.aggregate_rum_events"
+        ? [entry.entry]
+        : [],
+    );
+    expect(toolRows).toMatchObject([{ toolData: { output: { result } } }]);
+  });
+
+  it("drops an MCP app card when an update removes the call's app", () => {
+    const mcpApp = {
+      attachmentId: "render-thread-app-html",
+      server: "repro",
+      tool: "aggregate_rum_events",
+      resourceUri: "ui://repro/dataviz",
+    };
+    const call = (output: unknown) => ({
+      ...renderCall("completed", output),
+      toolName: "repro.aggregate_rum_events",
+    });
+    const result = { content: [{ type: "text", text: "rows" }] };
+    const input = (output: unknown) => ({
+      visibleTurnItems: [visible(command("before", 1)), visible(call(output))],
+      optimisticMessages: [],
+    });
+    const previous = deriveTimelineEntriesFromVisibleTurnItemsWithState(
+      input({ t3McpApp: mcpApp, result }),
+    );
+    const nextInput = input({ result });
+    const next = deriveTimelineEntriesFromVisibleTurnItemsWithState(nextInput, previous);
+    expect(next.entries).toEqual(deriveTimelineEntriesFromVisibleTurnItems(nextInput));
+  });
+
   it("hosts an MCP app whose call failed, as a form-deferring write does", () => {
     const mcpApp = {
       attachmentId: "render-thread-app-html",
@@ -1700,6 +1767,66 @@ describe("incremental v2 timeline entries", () => {
       "live-assistant",
     ]);
   });
+
+  it("keeps every other entry when streaming plan text changes", () => {
+    const fixture = makeStreamingWorkTimelineFixture("proposed_plan");
+    // Codex emits `plan.updated` with each delta, so the artifact array is rebuilt too.
+    const plans = (markdown: string) => [streamingPlanArtifact(fixture, markdown, "active")];
+    let input = {
+      visibleTurnItems: withStreamedText(
+        fixture.visibleTurnItems,
+        fixture.streamingItemId,
+        "Let",
+        fixture.time(20),
+      ),
+      optimisticMessages: [],
+      plans: plans("Let"),
+    };
+    let projection = deriveTimelineEntriesFromVisibleTurnItemsWithState(input);
+    for (const [step, text] of ["Let me", "Let me check the tests"].entries()) {
+      input = {
+        visibleTurnItems: withStreamedText(
+          input.visibleTurnItems,
+          fixture.streamingItemId,
+          text,
+          fixture.time(21 + step),
+        ),
+        optimisticMessages: [],
+        plans: plans(text),
+      };
+      const previous = projection;
+      projection = deriveTimelineEntriesFromVisibleTurnItemsWithState(input, previous);
+      expect(projection.entries).toEqual(deriveTimelineEntriesFromVisibleTurnItems(input));
+      for (const [index, entry] of previous.entries.entries()) {
+        if (entry.id !== fixture.streamingItemId) expect(projection.entries[index]).toBe(entry);
+      }
+    }
+  });
+
+  it("rebuilds the plan entry when only its artifact status changes", () => {
+    const fixture = makeStreamingWorkTimelineFixture("proposed_plan");
+    const visibleTurnItems = withStreamedText(
+      fixture.visibleTurnItems,
+      fixture.streamingItemId,
+      "Plan",
+      fixture.time(20),
+    );
+    const previous = deriveTimelineEntriesFromVisibleTurnItemsWithState({
+      visibleTurnItems,
+      optimisticMessages: [],
+      plans: [streamingPlanArtifact(fixture, "Plan", "active")],
+    });
+    const input = {
+      visibleTurnItems,
+      optimisticMessages: [],
+      plans: [streamingPlanArtifact(fixture, "Plan", "superseded")],
+    };
+    const next = deriveTimelineEntriesFromVisibleTurnItemsWithState(input, previous);
+    expect(next.entries).toEqual(deriveTimelineEntriesFromVisibleTurnItems(input));
+    expect(next.entries.find((entry) => entry.kind === "proposed-plan")).toMatchObject({
+      proposedPlan: { status: "superseded" },
+    });
+  });
 });
 
 describe("image asset requests", () => {
diff --git a/apps/web/src/session-logic.ts b/apps/web/src/session-logic.ts
index e77c8354caf4..affe166d6d6c 100644
--- a/apps/web/src/session-logic.ts
+++ b/apps/web/src/session-logic.ts
@@ -652,22 +652,6 @@ export function deriveTimelineEntriesFromVisibleTurnItems(
       continue;
     }
 
-    const mcpApp = item.type === "dynamic_tool" ? mcpAppFromToolItem(item) : undefined;
-    if (mcpApp !== undefined) {
-      entries.push({
-        id: item.id,
-        kind: "mcp-app",
-        createdAt,
-        runId: item.runId,
-        sourceThreadId: row.sourceThreadId,
-        itemId: row.sourceItemId,
-        revision: turnItemDetailRevision(item),
-        mcpApp,
-        ...attemptMetadata,
-      });
-      continue;
-    }
-
     if (STANDALONE_V2_ITEM_TYPES.has(item.type)) {
       entries.push({
         id: item.id,
@@ -686,6 +670,21 @@ export function deriveTimelineEntriesFromVisibleTurnItems(
       entry: projectedWorkEntry(row),
       ...attemptMetadata,
     });
+
+    const mcpApp = item.type === "dynamic_tool" ? mcpAppFromToolItem(item) : undefined;
+    if (mcpApp !== undefined) {
+      entries.push({
+        id: `mcp-app:${item.id}`,
+        kind: "mcp-app",
+        createdAt,
+        runId: item.runId,
+        sourceThreadId: row.sourceThreadId,
+        itemId: row.sourceItemId,
+        revision: turnItemDetailRevision(item),
+        mcpApp,
+        ...attemptMetadata,
+      });
+    }
   }
 
   const retainedMessageIds = new Set([
@@ -822,24 +821,34 @@ export function isStreamingMessageTextUpdate(previous: ChatMessage, next: ChatMe
   return shallow(previousMetadata, nextMetadata);
 }
 
+function streamedTextMetadata(item: OrchestrationV2TurnItem) {
+  if (item.type === "proposed_plan" && item.streaming) {
+    const { markdown: _markdown, updatedAt: _updatedAt, ...metadata } = item;
+    return metadata;
+  }
+  if ((item.type === "assistant_message" || item.type === "reasoning") && item.streaming) {
+    const { text: _text, updatedAt: _updatedAt, ...metadata } = item;
+    return metadata;
+  }
+  return null;
+}
+
 export function isStreamingTurnItemTextUpdate(
   previous: OrchestrationV2ProjectedTurnItem,
   next: OrchestrationV2ProjectedTurnItem,
 ): boolean {
   const { item: previousItem, ...previousSource } = previous;
   const { item: nextItem, ...nextSource } = next;
+  const previousMetadata = streamedTextMetadata(previousItem);
+  const nextMetadata = streamedTextMetadata(nextItem);
   if (
-    previousItem.type !== "assistant_message" ||
-    nextItem.type !== "assistant_message" ||
-    !previousItem.streaming ||
-    !nextItem.streaming ||
+    previousMetadata === null ||
+    nextMetadata === null ||
     !shallow(previousSource, nextSource) ||
     projectedItemCreatedAt(previous) !== projectedItemCreatedAt(next)
   ) {
     return false;
   }
-  const { text: _previousText, updatedAt: _previousUpdatedAt, ...previousMetadata } = previousItem;
-  const { text: _nextText, updatedAt: _nextUpdatedAt, ...nextMetadata } = nextItem;
   // Wire decoding recreates timestamps and attachments; compare only the changed item's metadata.
   return Equal.equals(previousMetadata, nextMetadata);
 }
@@ -860,11 +869,27 @@ function canRederiveInPlace(
     item.item.type !== "user_message" &&
     item.item.type !== "assistant_message" &&
     item.item.type !== "user_input_request" &&
+    // An app call projects two entries; in-place reuse replaces one.
+    (previousItem.item.type !== "dynamic_tool" ||
+      mcpAppFromToolItem(previousItem.item) === undefined) &&
     ((input.anchoredMessages?.length ?? 0) === 0 ||
       projectedItemCreatedAt(item) === projectedItemCreatedAt(previousItem))
   );
 }
 
+/** Entries read only each plan's status; streaming plans rebuild artifacts with every delta. */
+function samePlanStatuses(
+  next: TimelineEntriesInput["plans"],
+  previous: TimelineEntriesInput["plans"],
+): boolean {
+  if (next === previous) return true;
+  if (next === undefined || previous === undefined || next.length !== previous.length) return false;
+  return next.every((plan, index) => {
+    const before = previous[index]!;
+    return plan.id === before.id && plan.kind === before.kind && plan.status === before.status;
+  });
+}
+
 function reuseTimelineEntries(
   input: TimelineEntriesInput,
   previous: TimelineEntriesProjection,
@@ -877,7 +902,7 @@ function reuseTimelineEntries(
     !shallow(input.attachmentUrlById, before.attachmentUrlById) ||
     !shallow(input.attempts, before.attempts) ||
     !shallow(input.nodes, before.nodes) ||
-    !shallow(input.plans, before.plans)
+    !samePlanStatuses(input.plans, before.plans)
   ) {
     return null;
   }
@@ -910,7 +935,11 @@ function reuseTimelineEntries(
     const previousItem = before.visibleTurnItems[index]!;
     const item = input.visibleTurnItems[index]!;
     if (item === previousItem) continue;
-    if (isStreamingTurnItemTextUpdate(previousItem, item)) {
+    // Reasoning and plan text re-derive below; only assistant text patches the message.
+    if (
+      item.item.type === "assistant_message" &&
+      isStreamingTurnItemTextUpdate(previousItem, item)
+    ) {
       replacements.set(previousItem, item);
       continue;
     }
diff --git a/apps/web/src/speech/useDictationShortcut.browser.test.tsx b/apps/web/src/speech/useDictationShortcut.browser.test.tsx
index 8cd17f4f368d..5bbc17b1ecc3 100644
--- a/apps/web/src/speech/useDictationShortcut.browser.test.tsx
+++ b/apps/web/src/speech/useDictationShortcut.browser.test.tsx
@@ -1,17 +1,30 @@
 import { DEFAULT_RESOLVED_KEYBINDINGS } from "@t3tools/shared/keybindings";
+import { createRef, type RefObject } from "react";
 import { expect, it, vi } from "vite-plus/test";
 import { render } from "../../test/render";
-import { useDictationShortcut } from "./useDictationShortcut";
+import { useDictationShortcut, type DictationKeyHandlers } from "./useDictationShortcut";
 
 vi.mock("../hooks/useSettings", () => ({ useClientSettings: () => "hold" }));
 
-function Probe({ speech }: { speech: Parameters<typeof useDictationShortcut>[0]["speech"] }) {
+type ShortcutInput = Parameters<typeof useDictationShortcut>[0];
+
+function Probe({
+  speech,
+  targetRef,
+  subscribeKeys,
+}: {
+  speech: ShortcutInput["speech"];
+  targetRef?: RefObject<HTMLElement | null>;
+  subscribeKeys?: ShortcutInput["subscribeKeys"];
+}) {
   useDictationShortcut({
     keybindings: DEFAULT_RESOLVED_KEYBINDINGS,
     speech,
     disabled: false,
     terminalOpen: false,
     modelPickerOpen: false,
+    ...(targetRef ? { targetRef } : {}),
+    ...(subscribeKeys ? { subscribeKeys, ownsFocus: () => true } : {}),
   });
   return null;
 }
@@ -80,3 +93,120 @@ it("finishes a released hold after startup even if the chord was pressed again w
   expect(speech.start).toHaveBeenCalledOnce();
   expect(speech.stop).toHaveBeenCalledOnce();
 });
+
+const escape = () =>
+  new KeyboardEvent("keydown", { key: "Escape", code: "Escape", bubbles: true, cancelable: true });
+
+const recording = () => ({
+  ...actions(true),
+  state: { phase: "recording" as const, error: null, errorAction: null },
+});
+
+it("lets Escape in another dictation editor reach that editor instead of canceling the recording", async () => {
+  const speech = recording();
+  const commentRef = createRef<HTMLTextAreaElement>();
+  const editorEscape = vi.fn();
+  await using screen = await render(
+    <>
+      <Probe speech={speech} />
+      <Probe speech={actions(true)} targetRef={commentRef} />
+      <div
+        role="dialog"
+        aria-label="Edit citation comment"
+        onKeyDown={(event) => {
+          if (event.key === "Escape") editorEscape();
+        }}
+      >
+        <textarea aria-label="Comment" ref={commentRef} />
+        <button type="button">Cancel</button>
+      </div>
+    </>,
+  );
+  for (const control of [
+    screen.getByRole("textbox", { name: "Comment" }).element(),
+    screen.getByRole("button", { name: "Cancel" }).element(),
+  ]) {
+    if (!(control instanceof HTMLElement)) throw new Error("expected a comment editor control");
+    control.focus();
+    control.dispatchEvent(escape());
+  }
+  expect(speech.cancel).not.toHaveBeenCalled();
+  expect(editorEscape).toHaveBeenCalledTimes(2);
+});
+
+it("lets Escape in another editor of the recording editor's dialog reach that editor", async () => {
+  const speech = recording();
+  const replyRef = createRef<HTMLTextAreaElement>();
+  const otherReplyRef = createRef<HTMLTextAreaElement>();
+  await using screen = await render(
+    <>
+      <Probe speech={speech} targetRef={replyRef} />
+      <Probe speech={actions(true)} targetRef={otherReplyRef} />
+      <div role="dialog" aria-label="Pull request">
+        <textarea aria-label="Reply A" ref={replyRef} />
+        <textarea aria-label="Reply B" ref={otherReplyRef} />
+      </div>
+    </>,
+  );
+  const other = screen.getByRole("textbox", { name: "Reply B" }).element();
+  if (!(other instanceof HTMLElement)) throw new Error("expected a reply editor");
+  other.focus();
+  other.dispatchEvent(escape());
+  expect(speech.cancel).not.toHaveBeenCalled();
+});
+
+it("cancels the recording on Escape outside other shown dictation editors", async () => {
+  const speech = recording();
+  const reviewRef = createRef<HTMLTextAreaElement>();
+  const commentRef = createRef<HTMLTextAreaElement>();
+  await using screen = await render(
+    <>
+      <Probe speech={speech} targetRef={reviewRef} />
+      <Probe speech={actions(true)} targetRef={commentRef} />
+      <input aria-label="Search" />
+      <div role="dialog" aria-label="Pull request">
+        <textarea aria-label="Review" ref={reviewRef} />
+        <div hidden>
+          <textarea aria-label="Comment" ref={commentRef} />
+        </div>
+        <button type="button">Submit</button>
+      </div>
+    </>,
+  );
+  for (const control of [
+    screen.getByRole("textbox", { name: "Search" }).element(),
+    screen.getByRole("button", { name: "Submit" }).element(),
+  ]) {
+    if (!(control instanceof HTMLElement)) throw new Error("expected a focusable control");
+    control.focus();
+    control.dispatchEvent(escape());
+  }
+  expect(speech.cancel).toHaveBeenCalledTimes(2);
+});
+
+it.each([
+  ["another editor is recording", false],
+  ["the preview itself is recording", true],
+])(
+  "routes Escape relayed from the preview guest to the preview when %s",
+  async (_name, previewRecords) => {
+    const composer = previewRecords ? actions(true) : recording();
+    const preview = previewRecords ? recording() : actions(true);
+    let relayed: DictationKeyHandlers | undefined;
+    await using _screen = await render(
+      <>
+        <Probe speech={composer} />
+        <Probe
+          speech={preview}
+          subscribeKeys={(handlers) => {
+            relayed = handlers;
+            return () => {};
+          }}
+        />
+      </>,
+    );
+    relayed?.keydown(escape());
+    expect(composer.cancel).not.toHaveBeenCalled();
+    expect(preview.cancel).toHaveBeenCalledTimes(previewRecords ? 1 : 0);
+  },
+);
diff --git a/apps/web/src/speech/useDictationShortcut.ts b/apps/web/src/speech/useDictationShortcut.ts
index 6acbe5fac1ee..278a4baa6002 100644
--- a/apps/web/src/speech/useDictationShortcut.ts
+++ b/apps/web/src/speech/useDictationShortcut.ts
@@ -60,6 +60,31 @@ function ownsShortcut(id: symbol) {
   return entries.find(([, read]) => !read().targetRef && !read().ownsFocus)?.[0] === id;
 }
 
+const targetScope = (field: HTMLElement | null | undefined) =>
+  field?.closest('[role="dialog"]') ?? field;
+
+// Keys an outside editor (the preview guest) relays arrive on window, so remember their editor.
+const relayedFrom = new WeakMap<Event, symbol>();
+
+// Escape inside another shown dictation editor, or the dialog hosting it, belongs to that editor.
+// The editor itself is checked before dialogs, since one dialog can host several editors.
+function inOtherShortcutTarget(id: symbol, event: Event) {
+  const source = relayedFrom.get(event);
+  if (source) return source !== id;
+  const target = event.target;
+  if (!(target instanceof Node)) return false;
+  const own = shortcutTargets.get(id)?.().targetRef?.current;
+  const others = [...shortcutTargets]
+    .filter(([other]) => other !== id)
+    .map(([, read]) => read().targetRef?.current)
+    .filter((field): field is HTMLElement => !!field?.getClientRects().length);
+  for (const scope of [(field?: HTMLElement | null) => field, targetScope]) {
+    if (scope(own)?.contains(target)) return false;
+    if (others.some((field) => scope(field)?.contains(target))) return true;
+  }
+  return false;
+}
+
 export function useDictationShortcut(input: ShortcutInput) {
   const id = useRef(Symbol("dictation-target"));
   const subscribeKeys = input.subscribeKeys;
@@ -103,7 +128,8 @@ export function useDictationShortcut(input: ShortcutInput) {
       if (
         event.key === "Escape" &&
         (pressed.current !== null ||
-          (speech.state.phase !== "idle" && speech.state.phase !== "error"))
+          (speech.state.phase !== "idle" && speech.state.phase !== "error")) &&
+        !inOtherShortcutTarget(id.current, event)
       ) {
         event.preventDefault();
         event.stopImmediatePropagation();
@@ -146,9 +172,13 @@ export function useDictationShortcut(input: ShortcutInput) {
       };
     };
     const onBlur = () => finish(null);
+    const relay = (event: KeyboardEvent) => {
+      relayedFrom.set(event, id.current);
+      window.dispatchEvent(event);
+    };
     const unsubscribe = subscribeKeys?.({
-      keydown: (event) => window.dispatchEvent(event),
-      keyup: (event) => window.dispatchEvent(event),
+      keydown: relay,
+      keyup: relay,
       blur: onBlur,
     });
     window.addEventListener("keydown", onKeyDown, true);
diff --git a/apps/web/src/speech/useEnvironmentSpeechInput.browser.test.tsx b/apps/web/src/speech/useEnvironmentSpeechInput.browser.test.tsx
index d1f3c36d00f2..b5418bcb409d 100644
--- a/apps/web/src/speech/useEnvironmentSpeechInput.browser.test.tsx
+++ b/apps/web/src/speech/useEnvironmentSpeechInput.browser.test.tsx
@@ -256,7 +256,6 @@ function Probe(props: {
     projectName: props.projectName,
     cleanup: props.cleanup,
     ownerKey: "draft",
-    draftText: mocks.draft,
     readDraft: () => ({
       text: mocks.draft,
       selection: { start: mocks.draft.length, end: mocks.draft.length },
diff --git a/apps/web/src/speech/useEnvironmentSpeechInput.ts b/apps/web/src/speech/useEnvironmentSpeechInput.ts
index 26a6835c3104..94dd7cfb8b4c 100644
--- a/apps/web/src/speech/useEnvironmentSpeechInput.ts
+++ b/apps/web/src/speech/useEnvironmentSpeechInput.ts
@@ -92,7 +92,6 @@ type HookInput = {
   readonly projectId?: ProjectId | null | undefined;
   readonly projectName?: string | null | undefined;
   readonly ownerKey: string;
-  readonly draftText: string;
   readonly disabled?: boolean | undefined;
   /**
    * Until a destination is chosen, voice input is offered and its first gesture opens Voice
@@ -212,19 +211,6 @@ export function useEnvironmentSpeechInput(input: HookInput) {
   useEffect(() => {
     latestRef.current = { input, clientSettings, cleanupPrepared, projectWords };
   });
-  const draftRevisionRef = useRef({ ownerKey: input.ownerKey, text: input.draftText, revision: 0 });
-  // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- tracks committed draft revisions so a late transcript cannot overwrite an edited draft
-  useEffect(() => {
-    const revision = draftRevisionRef.current;
-    if (revision.ownerKey !== input.ownerKey || revision.text !== input.draftText) {
-      draftRevisionRef.current = {
-        ownerKey: input.ownerKey,
-        text: input.draftText,
-        revision: revision.revision + 1,
-      };
-    }
-  }, [input.ownerKey, input.draftText]);
-
   // oxlint-disable-next-line t3code/no-unreasoned-state-sync -- owns the recording controller bound to the consented destination; it is disposed with the consent
   useEffect(() => {
     if (!prepared || !grantId || typeof navigator === "undefined") return;
@@ -242,20 +228,7 @@ export function useEnvironmentSpeechInput(input: HookInput) {
     const readDraft = (): VoiceDraftSnapshot => {
       const current = latestRef.current.input;
       const draft = current.readDraft();
-      const revision = draftRevisionRef.current;
-      if (revision.ownerKey !== current.ownerKey || revision.text !== draft.text) {
-        draftRevisionRef.current = {
-          ownerKey: current.ownerKey,
-          text: draft.text,
-          revision: revision.revision + 1,
-        };
-      }
-      return {
-        ownerKey: current.ownerKey,
-        text: draft.text,
-        selection: draft.selection,
-        revision: draftRevisionRef.current.revision,
-      };
+      return { ownerKey: current.ownerKey, text: draft.text, selection: draft.selection };
     };
     const platform = createBrowserVoiceInputPlatform({
       prepared,
diff --git a/apps/web/src/speech/useTextFieldSpeech.tsx b/apps/web/src/speech/useTextFieldSpeech.tsx
index 575072c71d09..b8ccad995fa0 100644
--- a/apps/web/src/speech/useTextFieldSpeech.tsx
+++ b/apps/web/src/speech/useTextFieldSpeech.tsx
@@ -31,7 +31,6 @@ export function useTextFieldSpeech(input: {
     environmentId: input.environmentId,
     projectId: input.projectId,
     ownerKey: input.ownerKey,
-    draftText: input.text,
     disabled: input.disabled,
     offerSetup: false,
     readDraft: () => {
diff --git a/apps/web/src/state/assets.ts b/apps/web/src/state/assets.ts
index 08c3e3a96407..601a31c5fe2c 100644
--- a/apps/web/src/state/assets.ts
+++ b/apps/web/src/state/assets.ts
@@ -1,10 +1,13 @@
+import type { ProjectFaviconTarget } from "@t3tools/client-runtime/project-favicon-cache";
 import {
   createAssetEnvironmentAtoms,
   createProjectFaviconUrlAtomFamily,
+  projectFaviconResource,
 } from "@t3tools/client-runtime/state/assets";
 import { Atom } from "effect/reactivity";
 
 import { connectionAtomRuntime } from "../connection/runtime";
+import { appAtomRegistry } from "../rpc/atomRegistry";
 import { projectFaviconCache } from "../assets/projectFaviconCache";
 import { isElectron } from "../env";
 import { primaryEnvironmentIdAtom } from "./primaryEnvironment";
@@ -33,3 +36,16 @@ export const projectFaviconUrlAtom = createProjectFaviconUrlAtomFamily({
   preparedConnection: environmentSession.preparedConnectionValueAtom,
   projectClones: environmentProjectClonesAtom,
 });
+
+/**
+ * Asks the server for a project's icon again. Choosing the icon path a project had before would
+ * otherwise reuse that path's cached URL, which says "missing" if the file did not exist then.
+ */
+export function refreshProjectFaviconUrl(target: ProjectFaviconTarget) {
+  appAtomRegistry.refresh(
+    assetEnvironment.createUrl({
+      environmentId: target.environmentId,
+      input: { resource: projectFaviconResource(target.cwd, target.faviconPath) },
+    }),
+  );
+}
diff --git a/apps/web/src/state/orchestration.ts b/apps/web/src/state/orchestration.ts
index 49ba6867143b..e8ff5d1277d2 100644
--- a/apps/web/src/state/orchestration.ts
+++ b/apps/web/src/state/orchestration.ts
@@ -1,4 +1,6 @@
+import { ORCHESTRATION_V2_WS_METHODS } from "@t3tools/contracts";
 import { createOrchestrationEnvironmentAtoms } from "@t3tools/client-runtime/state/orchestration";
+import { createEnvironmentRpcCommand } from "@t3tools/client-runtime/state/runtime";
 
 import { connectionAtomRuntime } from "../connection/runtime";
 import { environmentShell } from "./shell";
@@ -6,3 +8,8 @@ import { environmentShell } from "./shell";
 export const orchestrationEnvironment = createOrchestrationEnvironmentAtoms(connectionAtomRuntime, {
   shellState: environmentShell.stateValueAtom,
 });
+
+export const threadTitlesRead = createEnvironmentRpcCommand(connectionAtomRuntime, {
+  label: "environment-data:orchestration:thread-titles-read",
+  tag: ORCHESTRATION_V2_WS_METHODS.getThreadTitles,
+});
diff --git a/apps/web/src/state/revisionedQuery.test.ts b/apps/web/src/state/revisionedQuery.test.ts
index 7dda15de2300..7b21dd1d29ae 100644
--- a/apps/web/src/state/revisionedQuery.test.ts
+++ b/apps/web/src/state/revisionedQuery.test.ts
@@ -4,7 +4,7 @@ import { describe, expect, it } from "vite-plus/test";
 import { revisionedQuery } from "./revisionedQuery";
 
 // A stand-in query that counts its fetches.
-function setup() {
+function setup(readQuery: (cache: Atom.Atom<number>) => Atom.Atom<number> = (cache) => cache) {
   let fetches = 0;
   // Node removal runs on the registry's scheduler; releasing flushes it so the
   // next mount of the same revision builds a fresh node, as a React remount does.
@@ -15,10 +15,12 @@ function setup() {
       return () => {};
     },
   });
-  const query = Atom.make(() => {
-    fetches += 1;
-    return fetches;
-  }).pipe(Atom.keepAlive);
+  const query = readQuery(
+    Atom.make(() => {
+      fetches += 1;
+      return fetches;
+    }).pipe(Atom.keepAlive),
+  );
   const mount = async (revision: string | null | undefined) => {
     const release = registry.mount(revisionedQuery(query, revision));
     // A stale read refetches in a microtask, after the render that read it.
@@ -77,6 +79,17 @@ describe("revisionedQuery", () => {
     expect(fetches()).toBe(2);
   });
 
+  it("counts a query as cached while the atom it reads through keeps the value", async () => {
+    // Like an environment query: its own node goes with its last reader, the cache stays.
+    const { mount, fetches } = setup((cache) =>
+      Atom.transform(cache, (get) => get(cache), { initialValueTarget: cache }),
+    );
+
+    (await mount(undefined))();
+    (await mount("mutation-1"))();
+    expect(fetches()).toBe(2);
+  });
+
   it("does not refetch a cached query on a first read before any workspace change", async () => {
     const { mount, fetches } = setup();
 
diff --git a/apps/web/src/state/revisionedQuery.ts b/apps/web/src/state/revisionedQuery.ts
index 73e18b36161d..90c147b66474 100644
--- a/apps/web/src/state/revisionedQuery.ts
+++ b/apps/web/src/state/revisionedQuery.ts
@@ -6,8 +6,14 @@ import { Atom, type AtomRegistry } from "effect/reactivity";
 const readRevisions = new WeakMap<AtomRegistry.AtomRegistry, WeakMap<object, string | null>>();
 
 // The registry keys serializable atoms' nodes by their key, not the atom.
-const queryKey = (query: Atom.Atom<unknown>) =>
-  Atom.isSerializable(query) ? query[Atom.SerializableTypeId].key : query;
+const hasNode = (registry: AtomRegistry.AtomRegistry, atom: Atom.Atom<unknown>) =>
+  registry.getNodes().has(Atom.isSerializable(atom) ? atom[Atom.SerializableTypeId].key : atom);
+
+// A query's own node can go with its last reader while the atom it takes its value from
+// (an environment query's cache, on an idle TTL) still holds the value.
+const isCached = (registry: AtomRegistry.AtomRegistry, query: Atom.Atom<unknown>) =>
+  hasNode(registry, query) ||
+  (query.initialValueTarget !== undefined && hasNode(registry, query.initialValueTarget));
 
 const makeRevisionedFamily = (query: Atom.Atom<unknown>) =>
   Atom.family((revision: string | null) =>
@@ -25,14 +31,14 @@ const makeRevisionedFamily = (query: Atom.Atom<unknown>) =>
             ? revisions.get(query) !== revision
             : // A reader without a revision may have cached it before the latest
               // workspace change; a query nobody has read yet fetches fresh anyway.
-              revision !== null && get.registry.getNodes().has(queryKey(query));
+              revision !== null && isCached(get.registry, query);
           // Deferred: this builds while React renders, and a refresh would synchronously
           // re-render the query's other readers, which React rejects.
           if (stale) {
             const registry = get.registry;
             queueMicrotask(() => {
               // No node, as after the registry is disposed: nothing cached to refetch.
-              if (registry.getNodes().has(queryKey(query))) registry.refresh(query);
+              if (isCached(registry, query)) registry.refresh(query);
             });
           }
           revisions.set(query, revision);
diff --git a/apps/web/src/terminal-links.test.ts b/apps/web/src/terminal-links.test.ts
index 130e4d276ef7..4dcd52961425 100644
--- a/apps/web/src/terminal-links.test.ts
+++ b/apps/web/src/terminal-links.test.ts
@@ -5,6 +5,7 @@ import {
   collectWrappedTerminalLinkLine,
   extractTerminalLinks,
   isTerminalUrl,
+  resolveTerminalLinkTarget,
   type TerminalBufferLineLike,
 } from "./terminal-links";
 
@@ -64,6 +65,10 @@ describe("extractTerminalLinks", () => {
     expect(extractTerminalLinks(`see ${quote}${text}${quote}.`)).toEqual([
       { kind: "path", text, start: 5, end: 5 + text.length },
     ]);
+    const atText = "src/my contact@support.vue:12:3";
+    expect(extractTerminalLinks(`see ${quote}${atText}${quote}.`)).toEqual([
+      { kind: "path", text: atText, start: 5, end: 5 + atText.length },
+    ]);
   });
 
   it.each([
@@ -127,6 +132,11 @@ describe("extractTerminalLinks", () => {
     "src/𐐀.ts:12",
     "src/app/[id]/page.tsx:3:10",
     "src/routes/(app)/+page.svelte:12:4",
+    "src/routes/(app)/+page@.svelte:12:3",
+    "src/contact@support.vue:12:3",
+    String.raw`src\contact@support.ts:12:3`,
+    "src/équipe@home.ts:12:3",
+    "src/foo$contact@support.ts:12:3",
     "node_modules/.pnpm/react@18.3.1/node_modules/react/index.js:12:5",
     "app/routes/posts.$id.tsx:5",
   ])("keeps the complete relative path %s", (text) => {
@@ -198,6 +208,8 @@ describe("extractTerminalLinks", () => {
     "    at main (file:///Users/jane/app/src/index.mjs:3:7)",
     "+redis://localhost:6379/0",
     "-redis://localhost:6379/0",
+    "git clone git@github.com:acme/widgets.git",
+    "remote: git@gitlab.com:group/sub/project.git",
   ])("does not turn part of a non-web URL into an editor link: %s", (line) => {
     expect(extractTerminalLinks(line)).toEqual([]);
   });
@@ -286,4 +298,17 @@ describe("resolvePathLinkTarget", () => {
       "/Users/julius/project/main.c:10:5",
     );
   });
+
+  // regression: #36005 OSC 8 file URIs were joined onto the cwd as relative paths
+  it("does not resolve an OSC 8 file URI target against the cwd", () => {
+    expect(resolveTerminalLinkTarget("file:///var/tmp/report.txt", "/workspace/project")).toBe(
+      "/var/tmp/report.txt",
+    );
+    expect(
+      resolveTerminalLinkTarget("file://remote.invalid/var/tmp/report.txt", "/workspace/project"),
+    ).not.toMatch(/^\/workspace\/project\//);
+    expect(resolvePathLinkTarget("file:notes.md", "/workspace/project")).toBe(
+      "/workspace/project/file:notes.md",
+    );
+  });
 });
diff --git a/apps/web/src/terminal-links.ts b/apps/web/src/terminal-links.ts
index 114219e721eb..43ad505337a0 100644
--- a/apps/web/src/terminal-links.ts
+++ b/apps/web/src/terminal-links.ts
@@ -1,3 +1,11 @@
+import {
+  formatFilePathPosition,
+  parseFileUrlHref,
+  resolvePathLinkTarget,
+  splitFilePathPosition,
+} from "@t3tools/shared/fileLinks";
+import { safeDecodeURIComponent } from "@t3tools/shared/markdownLinks";
+import { stripSlashPrefixedWindowsDrive } from "@t3tools/shared/path";
 import { isMacPlatform } from "./lib/utils";
 
 export type TerminalLinkKind = "url" | "path";
@@ -46,6 +54,9 @@ const REQUEST_ROUTE_PATTERN =
 // The tail of `redis://host/0` or `file:///a.mjs` is not a path. One-letter schemes stay drives,
 // a diff's `+` or `-` may lead, and the lookbehind keeps runs from being rescanned at every suffix.
 const SCHEME_URL_PATTERN = /(?<![A-Za-z\d+.-])[+-]?[A-Za-z][A-Za-z\d+.-]+:\/\/[^\s"'`<>]+/gu;
+// Nor is the tail of an SCP-style Git remote such as `git@github.com:acme/widgets.git`. Only a
+// path wholly inside the tail is dropped, so `src/contact@support.vue:12:3` keeps its link.
+const SCP_REMOTE_PATTERN = /(?<![\w.@-])[\w.-]+@[\w.-]+:[^\s"'`<>]+/gu;
 
 function trimClosingDelimiters(value: string, kind: TerminalLinkKind): string {
   let output = value.replace(
@@ -119,6 +130,10 @@ export function extractTerminalLinks(line: string): TerminalLinkMatch[] {
     [...line.matchAll(REQUEST_ROUTE_PATTERN), ...line.matchAll(SCHEME_URL_PATTERN)],
     (match) => ({ start: match.index, end: match.index + match[0].length }),
   );
+  const remoteTails = Array.from(line.matchAll(SCP_REMOTE_PATTERN), (match) => ({
+    start: match.index + match[0].indexOf(":") + 1,
+    end: match.index + match[0].length,
+  }));
   const urlMatches = collectMatches(line, "url", URL_PATTERN, promptMatches);
   const quotedMatches = collectMatches(line, "path", QUOTED_FILE_PATH_PATTERN, [
     ...promptMatches,
@@ -131,7 +146,10 @@ export function extractTerminalLinks(line: string): TerminalLinkMatch[] {
   ]);
   return [...promptMatches, ...urlMatches, ...quotedMatches, ...pathMatches]
     .filter(
-      (match) => match.kind === "url" || !nonPathRanges.some((range) => overlaps(match, range)),
+      (match) =>
+        match.kind === "url" ||
+        (!nonPathRanges.some((range) => overlaps(match, range)) &&
+          !remoteTails.some((tail) => match.start >= tail.start && match.end <= tail.end)),
     )
     .toSorted((a, b) => a.start - b.start);
 }
@@ -140,6 +158,18 @@ export function isTerminalUrl(value: string): boolean {
   return /^https?:\/\//iu.test(value);
 }
 
+/** Explicit OSC 8 targets may be `file://` URIs; everything else is a path relative to `cwd`. */
+export function resolveTerminalLinkTarget(text: string, cwd: string): string {
+  const fileUrl = /^file:\/\//iu.test(text) ? parseFileUrlHref(text) : null;
+  if (!fileUrl) return resolvePathLinkTarget(text, cwd);
+  return formatFilePathPosition(
+    splitFilePathPosition(
+      stripSlashPrefixedWindowsDrive(safeDecodeURIComponent(fileUrl.path)),
+      fileUrl.hash,
+    ),
+  );
+}
+
 export function collectWrappedTerminalLinkLine(
   bufferLineNumber: number,
   getLine: (bufferLineIndex: number) => TerminalBufferLineLike | null | undefined,
diff --git a/apps/web/src/terminal/ghostty/core.test.ts b/apps/web/src/terminal/ghostty/core.test.ts
index d9901763e4ab..c23924e65d15 100644
--- a/apps/web/src/terminal/ghostty/core.test.ts
+++ b/apps/web/src/terminal/ghostty/core.test.ts
@@ -122,6 +122,13 @@ describe("GhosttyTerminalCore snapshots", () => {
     expect(terminalNavigationShortcutData(event, "Win32") ?? core.encodeKey(event)).toBe(expected);
   });
 
+  it("keeps a leading U+FEFF in an unbracketed paste", async () => {
+    const core = await createCore();
+    core.write("\x1b[?2004l");
+
+    expect(core.encodePaste("\ufeffsample")).toBe("\ufeffsample");
+  });
+
   it.each([
     { code: "", key: "Backspace", expected: "\x7f" },
     { code: "Unidentified", key: "Backspace", expected: "\x7f" },
diff --git a/apps/web/src/terminal/ghostty/core.ts b/apps/web/src/terminal/ghostty/core.ts
index 1fba7e00d30b..fa6c932a9657 100644
--- a/apps/web/src/terminal/ghostty/core.ts
+++ b/apps/web/src/terminal/ghostty/core.ts
@@ -162,7 +162,7 @@ export interface GhosttyMouseInput {
   readonly anyButtonPressed: boolean;
 }
 
-const decoder = new TextDecoder();
+const decoder = new TextDecoder("utf-8", { ignoreBOM: true });
 const encoder = new TextEncoder();
 
 function blend(foreground: GhosttyColor, background: GhosttyColor): GhosttyColor {
diff --git a/apps/web/src/terminal/ghostty/surface.ts b/apps/web/src/terminal/ghostty/surface.ts
index c676ef1d7c6d..004bf79a88ca 100644
--- a/apps/web/src/terminal/ghostty/surface.ts
+++ b/apps/web/src/terminal/ghostty/surface.ts
@@ -1030,26 +1030,6 @@ export class GhosttyTerminalSurface {
     return before ? { start, end } : { start: end, end: start };
   }
 
-  getSelectionEndClientRect(): { readonly right: number; readonly bottom: number } | null {
-    const position = this.getSelectionPosition();
-    if (!position) return null;
-    const viewportEnd = this.core.screenPointToViewport(position.end.x, position.end.y);
-    if (
-      !viewportEnd ||
-      viewportEnd.x < 0 ||
-      viewportEnd.x >= this.cols ||
-      viewportEnd.y < 0 ||
-      viewportEnd.y >= this.rows
-    ) {
-      return null;
-    }
-    const bounds = this.canvas.getBoundingClientRect();
-    return {
-      right: bounds.left + CONTENT_PADDING + (viewportEnd.x + 1) * this.metrics.width,
-      bottom: bounds.top + this.originY + (viewportEnd.y + 1) * this.metrics.height,
-    };
-  }
-
   clearSelection({ source = "user" }: { source?: "user" | "output" } = {}): void {
     if (source === "user") this.linkActivationRequestId += 1;
     this.clearPrimedCopy();
diff --git a/apps/web/src/test-fixtures.ts b/apps/web/src/test-fixtures.ts
index 494d95caa8d7..b26da5a1e0a8 100644
--- a/apps/web/src/test-fixtures.ts
+++ b/apps/web/src/test-fixtures.ts
@@ -2,6 +2,7 @@ import { presentThreadShell } from "@t3tools/client-runtime/state/shell";
 import {
   EnvironmentId,
   MessageId,
+  PlanId,
   RunId,
   TurnItemId,
   type OrchestrationV2ProjectedTurnItem,
@@ -219,5 +220,53 @@ export function makeStreamingTimelineFixture(text = "") {
     sourceItemId: item.id,
     item,
   }));
-  return { threadId, runId, historyRunId, visibleTurnItems, time };
+  return { threadId, runId, historyRunId, visibleTurnItems, time, base };
+}
+
+/** The streaming fixture, ending in streaming thinking or a streaming plan instead of assistant text. */
+export function makeStreamingWorkTimelineFixture(kind: "reasoning" | "proposed_plan") {
+  const fixture = makeStreamingTimelineFixture();
+  const live = {
+    ...fixture.base("live-streaming", fixture.runId, 7),
+    status: "running" as const,
+    completedAt: null,
+  };
+  const streamingItem: OrchestrationV2TurnItem =
+    kind === "proposed_plan"
+      ? {
+          ...live,
+          type: "proposed_plan",
+          planId: PlanId.make("live-plan"),
+          markdown: "",
+          streaming: true,
+        }
+      : { ...live, type: "reasoning", text: "", streaming: true };
+  const visibleTurnItems = fixture.visibleTurnItems.map((row) =>
+    row.item.id === "live-assistant-item"
+      ? { ...row, sourceItemId: streamingItem.id, item: streamingItem }
+      : row,
+  );
+  return { ...fixture, visibleTurnItems, streamingItemId: streamingItem.id };
+}
+
+/** One coalesced provider flush: only the streamed text and `updatedAt` change. */
+export function withStreamedText(
+  rows: ReadonlyArray<OrchestrationV2ProjectedTurnItem>,
+  itemId: string,
+  text: string,
+  updatedAt: string,
+): OrchestrationV2ProjectedTurnItem[] {
+  return rows.map((row) => {
+    if (row.item.id !== itemId) return row;
+    const updated = DateTime.makeUnsafe(updatedAt);
+    return {
+      ...row,
+      item:
+        row.item.type === "proposed_plan"
+          ? { ...row.item, markdown: text, updatedAt: updated }
+          : row.item.type === "reasoning"
+            ? { ...row.item, text, updatedAt: updated }
+            : row.item,
+    };
+  });
 }
diff --git a/apps/web/src/threadRoutes.test.ts b/apps/web/src/threadRoutes.test.ts
index fd7e943c4a47..9b321b5d43cb 100644
--- a/apps/web/src/threadRoutes.test.ts
+++ b/apps/web/src/threadRoutes.test.ts
@@ -83,6 +83,13 @@ describe("threadRoutes", () => {
       environmentId: "env-2",
       threadId: "server-thread",
     });
+    expect(
+      resolveActiveThreadRouteRef(
+        target,
+        null,
+        scopeThreadRef("env-2" as never, ThreadId.make("server-thread")),
+      ),
+    ).toEqual({ environmentId: "env-2", threadId: "server-thread" });
   });
 
   it("does not treat a draft's reserved thread ref as an active sidebar thread", () => {
diff --git a/apps/web/src/threadRoutes.ts b/apps/web/src/threadRoutes.ts
index cf120e75c55a..a2047d4fe2e1 100644
--- a/apps/web/src/threadRoutes.ts
+++ b/apps/web/src/threadRoutes.ts
@@ -118,12 +118,13 @@ export function resolveThreadRouteTarget(
 export function resolveActiveThreadRouteRef(
   target: ThreadRouteTarget | null,
   draftThread: DraftThreadRouteState | null,
+  promotedDraftRedirect: ScopedThreadRef | null = null,
 ): ScopedThreadRef | null {
   if (target?.kind === "server") {
     return target.threadRef;
   }
-  if (target?.kind !== "draft" || !draftThread?.promotedTo) {
+  if (target?.kind !== "draft") {
     return null;
   }
-  return draftThread.promotedTo;
+  return draftThread?.promotedTo ?? promotedDraftRedirect;
 }
diff --git a/apps/web/src/timestampFormat.ts b/apps/web/src/timestampFormat.ts
index abad91401ccb..9da2f71e98be 100644
--- a/apps/web/src/timestampFormat.ts
+++ b/apps/web/src/timestampFormat.ts
@@ -131,6 +131,13 @@ export function formatChatTimestampTooltip(
   return `${time}, ${day}${ordinalSuffix(day)} ${month} ${year}`;
 }
 
+export function formatFullTimestamp(isoDate: string, timestampFormat: TimestampFormat): string {
+  return new Date(isoDate).toLocaleString(
+    undefined,
+    timestampFormat === "locale" ? undefined : { hour12: timestampFormat === "12-hour" },
+  );
+}
+
 export function formatShortTimestamp(isoDate: string, timestampFormat: TimestampFormat): string {
   const date = parseTimestampDate(isoDate);
   if (!date) return "";
diff --git a/apps/web/src/uiStateStore.test.ts b/apps/web/src/uiStateStore.test.ts
index dbfb60d15bd2..804757e78307 100644
--- a/apps/web/src/uiStateStore.test.ts
+++ b/apps/web/src/uiStateStore.test.ts
@@ -136,6 +136,12 @@ describe("parsePersistedState", () => {
     });
   });
 
+  it("keeps a persisted fast-forward merge method", () => {
+    expect(
+      parsePersistedState({ pullRequestMergeMethod: "fast-forward" }).pullRequestMergeMethod,
+    ).toBe("fast-forward");
+  });
+
   it.each([undefined, 1])("ignores changed-file expansion version %s", (version) => {
     const parsed = parsePersistedState({
       ...(version === undefined ? {} : { threadChangedFilesExpansionVersion: version }),
@@ -267,6 +273,21 @@ describe("uiStateStore persistence", () => {
     expect(persisted.sidebarProjectScopeKey).toBe("github.com/pingdotgg/t3code");
   });
 
+  it("keeps legacy projects omitted from the expanded list collapsed across a save and reload", () => {
+    const projectAKey = legacyProjectCwdPreferenceKey("/repo/a");
+    const projectBKey = legacyProjectCwdPreferenceKey("/repo/b");
+    const migrated = parsePersistedState({ expandedProjectCwds: ["/repo/a"] });
+    expect(resolveProjectExpanded(migrated.projectExpandedById, [projectBKey])).toBe(false);
+
+    persistState({ ...migrated, pullRequestMergeMethod: "squash" });
+    const reloaded = parsePersistedState(
+      JSON.parse(localStorageStub.getItem(PERSISTED_STATE_KEY) ?? "{}") as PersistedUiState,
+    );
+
+    expect(resolveProjectExpanded(reloaded.projectExpandedById, [projectAKey])).toBe(true);
+    expect(resolveProjectExpanded(reloaded.projectExpandedById, [projectBKey])).toBe(false);
+  });
+
   it("restores a single-project scope saved before multi-project filtering", () => {
     expect(
       parsePersistedState({ sidebarProjectScopeKey: "github.com/pingdotgg/t3code" })
diff --git a/apps/web/src/uiStateStore.ts b/apps/web/src/uiStateStore.ts
index 328e1a647713..b2ac1a508c7a 100644
--- a/apps/web/src/uiStateStore.ts
+++ b/apps/web/src/uiStateStore.ts
@@ -1,5 +1,6 @@
 import { Debouncer } from "@tanstack/react-pacer";
-import type { PullRequestMergeMethod } from "@t3tools/contracts";
+import { PullRequestMergeMethod } from "@t3tools/contracts";
+import * as Schema from "effect/Schema";
 import { create } from "zustand";
 import { normalizeProjectPathForComparison } from "@t3tools/client-runtime/state/projects";
 
@@ -99,6 +100,8 @@ function sanitizeOptionalKey(value: unknown): string | null {
   return typeof value === "string" && value.length > 0 ? value : null;
 }
 
+const isPullRequestMergeMethod = Schema.is(PullRequestMergeMethod);
+
 function sanitizeTimestampRecord(value: unknown): Record<string, string> {
   if (!value || typeof value !== "object") {
     return {};
@@ -114,10 +117,6 @@ function sanitizeTimestampRecord(value: unknown): Record<string, string> {
   );
 }
 
-function isPullRequestMergeMethod(value: unknown): value is PullRequestMergeMethod {
-  return value === "merge" || value === "squash" || value === "rebase";
-}
-
 export function parsePersistedState(parsed: PersistedUiState): UiState {
   const projectExpandedById =
     parsed.projectExpandedById === undefined
@@ -215,15 +214,10 @@ export function persistState(state: UiState): void {
     return;
   }
   try {
-    const projectExpandedById = Object.fromEntries(
-      Object.entries(state.projectExpandedById).filter(
-        ([key]) => key !== LEGACY_PROJECT_EXPANSION_DEFAULT_KEY,
-      ),
-    );
     window.localStorage.setItem(
       PERSISTED_STATE_KEY,
       JSON.stringify({
-        projectExpandedById,
+        projectExpandedById: state.projectExpandedById,
         projectOrder: state.projectOrder,
         threadLastVisitedAtById: state.threadLastVisitedAtById,
         defaultAdvertisedEndpointKey: state.defaultAdvertisedEndpointKey,
diff --git a/apps/web/src/versionSkew.test.ts b/apps/web/src/versionSkew.test.ts
index 627b97417739..2b5f61063d60 100644
--- a/apps/web/src/versionSkew.test.ts
+++ b/apps/web/src/versionSkew.test.ts
@@ -20,13 +20,27 @@ const MISMATCH_HINT =
   "Version mismatch. Try syncing the client and server to the same T3 Code version.";
 
 describe("versionSkew", () => {
-  it("updates only the proven npm prefix and safely quotes its path", () => {
+  it("updates only the proven install and safely quotes its paths", () => {
     expect(manualServerUpdateCommand("0.0.45", { kind: "npm-global", prefix: "/opt/node" })).toBe(
       "npm install --global --prefix '/opt/node' t3@0.0.45",
     );
     expect(
       manualServerUpdateCommand("0.0.45", { kind: "npm-global", prefix: "/opt/maria's node" }),
     ).toBe("npm install --global --prefix '/opt/maria'\\''s node' t3@0.0.45");
+    expect(
+      manualServerUpdateCommand("0.0.45", {
+        kind: "t3-launcher",
+        launcher: "t3",
+        baseDir: "/home/u/.t3",
+      }),
+    ).toBe("'t3' update --base-dir '/home/u/.t3' 0.0.45");
+    expect(
+      manualServerUpdateCommand("0.0.45", {
+        kind: "t3-launcher",
+        launcher: "/opt/maria's bin/t3",
+        baseDir: "/data/t3 home",
+      }),
+    ).toBe("'/opt/maria'\\''s bin/t3' update --base-dir '/data/t3 home' 0.0.45");
   });
   beforeEach(() => {
     branding.APP_VERSION = "0.0.34";
diff --git a/apps/web/src/versionSkew.ts b/apps/web/src/versionSkew.ts
index 321e712f8a12..3b45703fb258 100644
--- a/apps/web/src/versionSkew.ts
+++ b/apps/web/src/versionSkew.ts
@@ -99,9 +99,13 @@ export function manualServerUpdateCommand(
   targetVersion: string,
   installation?: ServerInstallation,
 ): string {
+  const quote = (value: string) => `'${value.replaceAll("'", "'\\''")}'`;
   if (installation?.kind === "npm-global") {
-    const prefix = `'${installation.prefix.replaceAll("'", "'\\''")}'`;
-    return `npm install --global --prefix ${prefix} t3@${targetVersion}`;
+    return `npm install --global --prefix ${quote(installation.prefix)} t3@${targetVersion}`;
+  }
+  if (installation?.kind === "t3-launcher") {
+    // An inherited T3CODE_HOME would otherwise send the update to a home the launcher is not in.
+    return `${quote(installation.launcher)} update --base-dir ${quote(installation.baseDir)} ${targetVersion}`;
   }
   const runner =
     installation?.kind === "pnpm-dlx" ? "pnpm dlx" : installation?.kind === "bunx" ? "bunx" : "npx";
diff --git a/apps/web/vite.config.ts b/apps/web/vite.config.ts
index 89c54e307d96..63f1f1f737eb 100644
--- a/apps/web/vite.config.ts
+++ b/apps/web/vite.config.ts
@@ -73,6 +73,11 @@ const builtDev = process.env.T3CODE_BUILT_DEV === "1";
 const bundledDevEnv = process.env.T3CODE_BUNDLED_DEV?.trim().toLowerCase();
 const bundledDev = bundledDevEnv === "1" || bundledDevEnv === "true";
 
+// Bundled dev and `build --watch` pass Rolldown `exclude` but not Vite's default `ignored`, so
+// they watch node_modules. Those files are pnpm-store hardlinks shared by every worktree, so each
+// `vp i` or worktree removal elsewhere rebuilds every long-running server and leaks native memory.
+const rolldownWatchExclude = [/[\\/]node_modules[\\/]/];
+
 const buildSourcemap: boolean | "hidden" =
   sourcemapEnv === "0" || sourcemapEnv === "false"
     ? false
@@ -247,6 +252,20 @@ function chunkCycleGuardPlugin(): Plugin {
   };
 }
 
+// Bundled dev never evicts emitted files from memory (vitejs/vite#23781), so hashed names keep
+// a copy of every changed chunk from every rebuild. Fixed names overwrite the previous copy.
+function bundledDevStableNamesPlugin(): Plugin {
+  return {
+    name: "t3code:bundled-dev-stable-names",
+    apply: "serve",
+    outputOptions: (options) => ({
+      ...options,
+      chunkFileNames: "assets/[name].js",
+      assetFileNames: "assets/[name][extname]",
+    }),
+  };
+}
+
 // Stamps index.html's title with the name branding.ts resolves once the app
 // loads, so a tab opens on the right channel instead of flashing another's.
 // Desktop swaps in its injected branding from an inline script in index.html.
@@ -307,6 +326,7 @@ export default defineConfig(() => {
       react({ compiler: true }),
       tailwindPlugins(bundledDev),
       warmBundledDevPlugin(),
+      bundledDev ? bundledDevStableNamesPlugin() : undefined,
     ],
     optimizeDeps: {
       include: [
@@ -362,6 +382,7 @@ export default defineConfig(() => {
       warmup: {
         clientFiles: ["./src/main.tsx"],
       },
+      watch: { exclude: rolldownWatchExclude },
       ...(devProxyTarget
         ? {
             // Share prefixes with the backend catch-all so the proxy and 404 lists cannot drift.
@@ -397,6 +418,7 @@ export default defineConfig(() => {
       emptyOutDir: true,
       manifest: true,
       sourcemap: buildSourcemap,
+      ...(builtDev ? { watch: { exclude: rolldownWatchExclude } } : {}),
       rolldownOptions: {
         output: {
           // PDF.js resolves decoder modules and ICC data relative to wasmUrl.
diff --git a/docs/coil/SEAMS.md b/docs/coil/SEAMS.md
index f4668cc4c00f..1cd726c831c1 100644
--- a/docs/coil/SEAMS.md
+++ b/docs/coil/SEAMS.md
@@ -808,6 +808,7 @@ the upstream workflow. The one upstream test that reads a retired workflow is li
 | `.github/workflows/web-preview.yml`                   | +0/-132  | 0     | **0**     | The fork does not deploy upstream Vercel previews or own that project's credentials.                                                                                                               |
 | `.github/workflows/thread-transfer-report.yml`        | +0/-75   | 0     | **0**     | Depends on the retired upstream CI workflow and has never run on the fork.                                                                                                                         |
 | `.github/workflows/issue-labels.yml`                  | +0/-75   | 0     | **0**     | The fork does not use upstream's automatic issue-label setup.                                                                                                                                      |
+| `.github/workflows/issue-vouch.yml`                   | +0/-77   | 0     | **0**     | **New 2026-11-13.** Labels issues by upstream's vouched and denounced authors. Retired with `pr-vouch.yml`.                                                                                        |
 | `.github/workflows/relay-preview-cleanup.yml`         | +0/-203  | 0     | **0**     | **New 2026-10-24.** Tears down upstream's relay preview stages, with a daily sweep on a `blacksmith` runner the fork does not have. Retired with `deploy-relay.yml`.                               |
 | `.github/workflows/relay-preview.yml`                 | +0/-81   | 0     | **0**     | **New 2026-10-24.** Deploys upstream's relay preview stages for labeled PRs; needs upstream's Cloudflare/PlanetScale credentials and `blacksmith` runners.                                         |
 | `.github/workflows/stale-needs-more-info.yml`         | +0/-30   | 0     | **0**     | **New 2026-10-24.** Closes issues carrying upstream's `needs more info` label; the fork's triage label is `needs-info`.                                                                            |
diff --git a/docs/coil/sync-agent-runbook.md b/docs/coil/sync-agent-runbook.md
index 22d9d9c2aa71..ec43a6bf8311 100644
--- a/docs/coil/sync-agent-runbook.md
+++ b/docs/coil/sync-agent-runbook.md
@@ -147,11 +147,13 @@ This is the checklist the workflow prompt mirrors — follow it if you resolve l
    note it in the PR. (The old rebase-era "dropped patch" escalation is gone; nothing can vanish
    on its own any more.)
 6. Verify: `vp run typecheck && vp run lint`, then the tests in two runs with web last and alone,
-   as `scripts/coil/sync-upstream.sh` does:
+   as `scripts/coil/sync-upstream.sh` does. Web is split in two because one headless Chromium
+   running the whole suite can lose its page late in the run:
 
    ```
    vp run --filter '!@t3tools/monorepo' --filter '!@t3tools/web' test --testTimeout=120000 --hookTimeout=120000
-   vp run --filter @t3tools/web test --testTimeout=120000 --hookTimeout=120000
+   vp run --filter @t3tools/web test --shard 1/2 --testTimeout=120000 --hookTimeout=120000
+   vp run --filter @t3tools/web test --shard 2/2 --testTimeout=120000 --hookTimeout=120000
    ```
 
    Fix the fork's code to match upstream's new internals until green.
diff --git a/docs/internals/connection-runtime.md b/docs/internals/connection-runtime.md
index 4ebad4c7056e..58eb388a12a1 100644
--- a/docs/internals/connection-runtime.md
+++ b/docs/internals/connection-runtime.md
@@ -103,7 +103,8 @@ thread's own shell, route checks) keep the live snapshot, where a row the server
 sent must not look missing. The decision reads the snapshot's own sequence: a second
 atom derived from the same shell state can be one update behind the rows. The mobile
 splash screen also waits, for a bounded time, until every enabled environment has
-read its cached shell, so the first frame holds all cached rows.
+read its cached shell and Home's list has laid out those rows, so the first frame
+holds all cached rows.
 
 Shell snapshots can leave rows out when the client asks. Servers that advertise
 `shellThreadFamilies` leave out idle subagent children: a child stays while it
diff --git a/docs/operations/development.md b/docs/operations/development.md
index 68e67e7d0143..d14b2e34a10b 100644
--- a/docs/operations/development.md
+++ b/docs/operations/development.md
@@ -27,38 +27,21 @@ a new browser.
 
 Prefer a container? See [Dev container](../internals/devcontainer.md) for VS Code and Codespaces setup.
 
-## GitCafe mirror (optional)
+## Forge mirror (optional)
 
-GitHub is the source of truth. [git.cafe/pingdotgg/t3code](https://git.cafe/pingdotgg/t3code) is a
-two-way synced mirror with much higher API rate limits, which helps when many agents work at once.
-You never need it to contribute.
-
-Pushes, PRs, comments, reviews, labels, and issue edits made on GitCafe sync to GitHub within
-about a minute, and PR and issue numbers match. CI runs on GitHub, and its checks show up on
-GitCafe.
+GitHub is the source of truth. [source.tanstack.com/@pingdotgg/t3code](https://source.tanstack.com/@pingdotgg/t3code)
+is a two-way synced mirror built for many agents working at once. You never need it to contribute.
 
 ```sh
-git remote set-url origin https://git.cafe/pingdotgg/t3code.git
+git remote set-url origin https://source.tanstack.com/@pingdotgg/t3code.git
 git remote add github https://github.com/pingdotgg/t3code.git
-gh repo set-default pingdotgg/t3code   # `gh` is still used for merging
-bun install -g @gitcafe/cli@latest   # `cafe` needs Bun 1.2 or newer
-cafe auth login && cafe auth http setup
-cafe skills install --global  # optional: cafe-* skills for coding agents
+src auth login --web && src auth setup-git
 ```
 
-With `origin` on git.cafe, work through GitCafe and leave GitHub's API alone:
-
-- Push to `origin`, open PRs with `cafe pr create` (`--head owner/repo:branch` from a fork) or
-  `cafe stack submit`, and use `cafe` for everything after that. Link the git.cafe PR URL, not the
-  github.com one, wherever a tool tracks the PR, so polling stays on GitCafe.
-- Read checks with `cafe pr status <n>`, and GitHub Actions logs with `cafe ci logs <run>` (run ids
-  from `cafe ci list --pr <n>`). `cafe ci rerun <run>` reruns one. These need `cafe` 0.11 or newer.
-- Write closing references as `Fixes pingdotgg/t3code#<n>`. GitCafe turns a bare `#<n>` in text it
-  syncs to GitHub into a git.cafe link, and GitHub does not close issues from those.
-- Merge with `gh pr merge <n> --match-head-commit <sha>`, because `cafe pr merge` cannot pin the
-  commit you reviewed.
-- `cafe` commands differ from `gh`: `cafe issue comments <n>` not `--comments`, `cafe pr status`
-  not `pr checks`.
+With `origin` on the mirror, use `src` (it takes `gh`'s commands and flags) and its `source` agent
+skill for PRs, issues, reviews, and CI, and leave GitHub's API alone. Pull requests into `main`
+merge on GitHub, so GitHub's required checks and reviews still apply. Numbers can differ between
+the two forges; in text that reaches GitHub, use the GitHub number.
 
 ## Choosing a dev process
 
@@ -141,7 +124,7 @@ Leave `VITE_HTTP_URL` and `VITE_WS_URL` unset. Vite proxies the backend through
 origin so the same build works over localhost and remote connections.
 
 Shared runs enable bundled dev to avoid a network round trip for each import level.
-`T3CODE_BUNDLED_DEV=0` opts out when debugging bundler differences. Two reload traps matter
+`T3CODE_BUNDLED_DEV=0` opts out when debugging bundler differences. These traps matter
 when changing this setup:
 
 - The web entry must dynamically import the app so React refresh initializes before application
@@ -151,6 +134,9 @@ when changing this setup:
 - The app and its routes are lazy chunks, built on first request. A plugin pre-bundles the
   startup chain when the server starts. Renaming or moving a startup route or the app entry
   silently drops it from that list.
+- Bundled dev and `--built` hand Rolldown its own watcher, which skips Vite's default
+  `node_modules` ignore. Those files are pnpm-store hardlinks, so another worktree's install or
+  removal rebuilds every long-running server and leaks memory. Keep `node_modules` excluded.
 
 The workarounds live in the [web entry](../../apps/web/src/bootstrap.ts),
 [Tailwind plugin](../../apps/web/vite/tailwind.ts), and
diff --git a/docs/operations/mobile-screens-fork.md b/docs/operations/mobile-screens-fork.md
index b7b7454c9465..63b8effc1d47 100644
--- a/docs/operations/mobile-screens-fork.md
+++ b/docs/operations/mobile-screens-fork.md
@@ -1,7 +1,7 @@
 # Building the mobile Screens dependency
 
 The mobile v5 stack uses a committed tarball from the
-[T3 Screens fork](https://github.com/pingdotgg/react-native-screens/tree/t3-v5.0.0-t3.45).
+[T3 Screens fork](https://github.com/pingdotgg/react-native-screens/tree/t3-v5.0.0-t3.50).
 The fork owns the integration changes; the app does not patch this package.
 Each archive includes compiled JavaScript, declarations, native source and
 `t3-fork.json` recording its version, source commit and upstream base.
diff --git a/docs/operations/observability.md b/docs/operations/observability.md
index 18063b8e9c6e..ed84f1406897 100644
--- a/docs/operations/observability.md
+++ b/docs/operations/observability.md
@@ -57,8 +57,9 @@ The `TraceRecord`, `EffectTraceRecord`, and `OtlpTraceRecord` schemas live in
 `packages/shared/src/observability.ts`.
 
 SQL statement spans (named `sqlite`) and `sql.transaction` spans carry `db.connection` and
-`db.lock_wait_ms`. `db.connection` is `writer` for the main connection, which runs on the event loop,
-or `reader` for the read-only connection in a worker thread. `db.lock_wait_ms` is the part of the
+`db.lock_wait_ms`. `db.connection` is `writer` for the read-write connection or `reader` for a
+read-only one. For a database file both run in worker threads; an in-memory database has only a
+writer, on the event loop. `db.lock_wait_ms` is the part of the
 span spent waiting for that connection, behind other SQL. That wait does not block the event loop,
 so subtract it before you blame a slow span on the query. Statements inside a transaction use its
 connection and do not carry these attributes.
diff --git a/docs/operations/release.md b/docs/operations/release.md
index bd7365d14135..4e98e516e46b 100644
--- a/docs/operations/release.md
+++ b/docs/operations/release.md
@@ -19,7 +19,7 @@ the version.
   - push tag matching `v*.*.*` for a stable release of an explicit commit
   - scheduled nightly check every 30 minutes
   - manual `workflow_dispatch` with `channel=nightly`
-  - manual `workflow_dispatch` with `channel=preview`, the maintainers' test train. It exercises the whole release flow (build, sign, notarize, smoke, publish) for a commit that end users must never receive, which is how an unmerged branch or a risky change gets a real release run before it lands. It builds the triggering commit with nightly's versioning under the `preview` prerelease identifier (`0.0.41-preview.<date>.<run>`) and publishes a GitHub prerelease plus the npm packages under the `preview` dist-tag. Preview is not on the schedule, no default npm dist-tag points at it, its desktop builds carry no update feed, and no updater manifest (`latest*.yml`, `nightly*.yml`, blockmaps) is attached, so a stable or nightly install cannot be offered one. The only ways onto it are downloading the release by hand, `npx t3@preview`, `T3CODE_CHANNEL=preview` for the install scripts, or `t3 update --channel preview` from a terminal; each prints a warning, and the CLI asks for confirmation when the running build is not itself a preview. The release itself is named as a maintainer test build and its body is a warning rather than generated notes: a changelog of unmerged branch history is not a changelog, and nightly and stable notes are unaffected because each series resolves its previous tag within its own channel. The hosted web app, AUR, and Discord announcements are skipped. Keep it; it costs nothing when idle.
+  - manual `workflow_dispatch` with `channel=preview`, the maintainers' test train. It exercises the release flow up to a draft release (build, sign, notarize, smoke) for a commit that end users must never receive, which is how an unmerged branch or a risky change gets a real release run before it lands. It builds the triggering commit with nightly's versioning under the `preview` prerelease identifier (`0.0.41-preview.<date>.<run>`) and leaves its GitHub prerelease as a draft. It publishes nothing to npm. It stays a draft because a draft has no git tag, and published preview tags hide nightlies from the updater (see [Update feed](#update-feed)). Do not publish a preview draft by hand. Preview is not on the schedule, its desktop builds carry no update feed, and no updater manifest (`latest*.yml`, `nightly*.yml`, blockmaps) is attached, so a stable or nightly install cannot be offered one. The only ways onto a new preview are by hand: the draft release, which maintainers can open, and the run's Actions artifacts. A draft's files are not public, so `T3CODE_CHANNEL=preview` and `t3 update --channel preview` see only previews published before this rule, and a fresh `npx t3@preview` fails while npm's `preview` dist-tag names a draft. Rebase a branch onto `main` before dispatching a preview from it. The run uses the branch's own `release.yml`, and an older copy publishes the preview with a tag. The release itself is named as a maintainer test build and its body is a warning rather than generated notes: a changelog of unmerged branch history is not a changelog, and nightly and stable notes are unaffected because each series resolves its previous tag within its own channel. The hosted web app, AUR, and Discord announcements are skipped. Keep it; it costs nothing when idle.
 - A manual stable release builds the commit of the latest published nightly, not `main` HEAD.
   Nightly is the release candidate: verify the nightly, then promote it. Merges to `main` keep
   landing while you verify and never leak into the stable build.
@@ -52,7 +52,7 @@ the version.
 - After the GitHub Release is published, publishes the `t3` npm package with OIDC trusted publishing from the same workflow file. It is only a launcher (`scripts/npm-launcher/t3.mjs`): on first run it downloads its exact version's CLI archive from the GitHub Release, verifies it against `SHA256SUMS`, and unpacks it into `<T3 home>/runtime/versions/<version>`, the layout the install scripts and `t3 update` share. The executables are not on npm. They used to be, as `@t3code/t3-<platform>-<arch>` optional dependencies, but npm's publish-time scanning held those 80-250 MB packages back for up to an hour after the launcher was live, and every install in that window got a launcher with no executable. Those packages stay on npm at their old versions and get no new ones. Because the launcher reads from the release, `publish_cli` runs after `release`, never before.
   - stable releases publish npm dist-tag `latest`
   - nightly releases publish npm dist-tag `nightly`
-  - preview releases publish npm dist-tag `preview`, which nothing resolves unless asked for by name
+  - preview releases publish nothing to npm
   - one-time setup: package `t3` needs a trusted publisher registered for this workflow file (see below).
 - Builds the hosted web app on Vercel while the desktop jobs run, and makes it live only after a release is published:
   - stable releases are aliased to the `latest` hosted app channel
@@ -436,13 +436,13 @@ release archives, and then its npm launcher, available before users can receive
 
 The workflow enforces this ordering:
 
-1. `release` publishes the GitHub Release with the CLI archives and `SHA256SUMS`. Every channel
-   uploads to a draft and publishes only after all assets are attached, so a new version in the
+1. `release` publishes the GitHub Release with the CLI archives and `SHA256SUMS`. Stable and
+   nightly upload to a draft and publish only after all assets are attached, so a new version in the
    desktop update feed already has its archives. **Update everything** relies on this to update
    background-service hosts before npm has the version. Rerunning `release` after publication
    replaces assets in a public release, so service updates can fail until the upload finishes.
-2. `publish_cli` publishes the `t3@<version>` launcher, which downloads from that release, on every
-   channel.
+2. `publish_cli` publishes the `t3@<version>` launcher, which downloads from that release, on
+   stable and nightly. A preview stays a draft and publishes no launcher.
 3. `deploy_web` depends on both before moving the hosted channel to the new client.
    `build_web` builds that client earlier with `vercel deploy --prod --skip-domain`, which
    leaves the custom domains alone but moves the project's own `*.vercel.app` production
@@ -465,6 +465,43 @@ verify that the update stops before restart and run `npx t3@<version> service up
 server machine. Also test the manual or desktop-managed guidance when those environments are
 available.
 
+## Update feed
+
+A nightly install finds the newest nightly in up to three places.
+
+- `releases.atom` lists the 10 newest git tags in the repository, of any kind, and a day's
+  `preview` tags can sort above its `nightly` ones. Every install reads it first and takes its first
+  nightly entry. Nightlies before `0.1.10-nightly.20261112.4603`, and stable `0.1.9` and older
+  switched to the nightly channel, read nothing else. Ten other tags in a row hide every nightly
+  from them.
+- `releases/download/update-feed/nightly.json` names the newest nightly. Installs that know the
+  pointer read it after the feed and take the newer of the two, so their updates do not depend on
+  tag order. The `update-feed` release holds that file. Never delete it.
+- The GitHub REST API, without auth, at 60 requests per hour per IP. Installs from `4603` on scan
+  it when the feed has no nightly. Installs that know the pointer do so only when the pointer also
+  offers nothing new.
+
+The release workflow's `Check the update feed` job runs on every scheduled tick, unless
+`PAUSE_NIGHTLY` is set, and after every nightly. It waits in the same queue as nightlies and
+previews. It rewrites a missing or outdated pointer. Its last step fails when the first nightly
+in the feed is not the newest one. A feed it could not read is only a warning: that says nothing
+about the tags, and the next tick reads it again.
+
+When that step fails, installs that read only the feed cannot reach the newest nightly. If the
+feed still names an older nightly first, installs from `4603` up to the first build with the
+pointer miss it too, because their API scan runs only when the feed has no nightly at all. The job
+log lists the tags in the feed. The usual cause is a preview dispatched from a branch that was not
+rebased onto `main`. Delete the tags nothing needs with `git push origin :refs/tags/<tag>`.
+Converting a release to a draft keeps its tag, so it does not help. To keep this from happening,
+anything users should not be offered stays a draft or uses one rolling tag, like `desktop-preview`.
+
+To pull a bad nightly, delete its release and tag, then run
+`gh release delete-asset update-feed nightly.json`. Installs fall back to the feed until the next
+unpaused tick or manual nightly rewrites the pointer. Without that command, installs that know the
+pointer report an update error until then. If npm's `nightly` dist-tag still names the pulled
+build, also move it to the last good one with `npm dist-tag add t3@<version> nightly`. The channel
+switch in Settings reads that tag and refuses an older desktop build.
+
 ## Desktop auto-update notes
 
 - Updater runtime: `apps/desktop/src/updates/DesktopUpdates.ts`.
@@ -551,7 +588,7 @@ Checklist:
 3. Ensure npm account and org policies allow trusted publishing for the package.
 4. Create release tag `vX.Y.Z` and push; the workflow publishes the GitHub Release and then the
    launcher with npm dist-tag `latest`.
-5. Nightly runs publish with npm dist-tag `nightly`; preview runs with `preview`.
+5. Nightly runs publish with npm dist-tag `nightly`; preview runs do not publish.
 
 ## 1) Release validation and unsigned builds
 
diff --git a/docs/operations/scenarios.md b/docs/operations/scenarios.md
index c49f23a4b206..22b61bf25301 100644
--- a/docs/operations/scenarios.md
+++ b/docs/operations/scenarios.md
@@ -41,8 +41,10 @@ adds one fixture for what e2e cannot know about T3 Code:
 
 - `t3.project(title, files)` creates a git repository and adds it as a project.
 - `t3.thread({ project, title, messages })` starts a thread and plays one replayed turn per
-  message before returning, so the thread has real history. `model` picks the recording.
-- `t3.open(path)` opens the app, already signed in.
+  message before returning, so the thread has real history. `model` picks the recording. It
+  returns the thread, which `t3.open` takes.
+- `t3.open(path)` opens the app, already signed in, at a path. `t3.open(thread)` opens it on a
+  thread.
 
 State is created through the app's own CLI, so it is real events and works on a base commit
 whose schema differs. New threads default to the replay agent's `showcase` recording: type a
@@ -61,6 +63,30 @@ could not run.
 Keep `agent.act` and `agent.assert` out of scenarios: they call a model, and no model is
 configured.
 
+### Getting to the screen
+
+Most scenarios that could not run stopped on the way to the screen the bug is on, not on the
+bug. Three rules avoid that:
+
+- **Open by link, not by sidebar.** `await t3.open(thread)` lands on the thread
+  ([`thread-opens-by-link.e2e.ts`](../../scripts/scenarios/thread-opens-by-link.e2e.ts)), and
+  `await t3.open("/settings/general")` on a settings page. A sidebar row is a button that covers
+  its own title, so a tap on `getByText("Earlier work")` is intercepted. When the sidebar is what
+  the scenario is about, target the row's button: `screen.getByRole("button", "Earlier work")`.
+- **Let `t3.open` do the navigating.** It waits until the pairing page has signed in before it
+  goes anywhere. A second `app.open` straight after the pairing link cancels the sign-in and
+  shows the pairing page again.
+- **Seed before opening.** Create projects and threads first, then call `t3.open`. With no
+  project the app opens its first-run page instead of the one the scenario expects.
+
+The app starts with only `PATH`, `HOME` and the temp directory in its environment, whatever the
+shell that ran the scenario has set. Name what it needs in `T3_SCENARIO_INHERIT_ENV`: exact
+names or prefixes ending in `*`, separated by commas.
+
+```sh
+T3_SCENARIO_INHERIT_ENV='SHELL,MY_FIXTURE_*' vp run scenarios:prove scripts/scenarios/name.e2e.ts --base main
+```
+
 ## Run
 
 ```sh
@@ -102,12 +128,27 @@ commits and compares the two reports. It prints, and writes to `scripts/.e2e/pro
 its commit, ready for a pull request description. `--upload-command` names a command that takes
 the capture paths and prints one URL per line. `--head` defaults to `HEAD`.
 
-It exits 0 only when the scenario fails on base and passes on head, 1 when it ran and did not
-prove the fix, and 2 when it could not run. A scenario that passes on base does not reproduce the
-bug, and the verdict says so.
+It exits 0 only when the scenario fails on base and passes on head, and 1 when it ran and did not
+prove the fix. A scenario that passes on base does not reproduce the bug, and the verdict says so.
+
+Two more codes mean there is no verdict on the behavior, and `couldNotRun` in the proof says
+which:
+
+- **3, `scenario`:** the app ran and the scenario stopped before its assertion, usually on a
+  control it did not find. Read that side's `message` and `steps`, fix the scenario, and run it
+  again.
+- **2, `app`:** the app did not start or no test ran: a bad revision, a failed install, a port in
+  use. `scripts/.e2e/app.log` has the app's output.
+
+Each side's result is also written as it ends, to `scripts/.e2e/prove/base.json` and
+`head.json`, so a run that is cut short keeps the side it finished.
+
+It runs the scenario on one target: iOS when the file imports `t3-mobile.ts`, web otherwise.
+`--target web` or `--target ios` overrides that.
 
 The scenario and e2e always come from your checkout. Only the app comes from the commit under
-test: a temporary worktree beside your checkout, installed with `vp i` and removed afterwards. A
+test: a temporary worktree beside your checkout, installed with `vp i` and removed afterwards (one
+left by a run that was killed is replaced). A
 commit that is your clean `HEAD` runs in place. So a new scenario can prove a fix against a base
 that predates it.
 
diff --git a/docs/orchestration-v2/orchestrator-mcp-server.md b/docs/orchestration-v2/orchestrator-mcp-server.md
index f3ef6ff6ddaf..74700c2d006a 100644
--- a/docs/orchestration-v2/orchestrator-mcp-server.md
+++ b/docs/orchestration-v2/orchestrator-mcp-server.md
@@ -400,8 +400,16 @@ the environment by thread ID. A deleted thread returns `thread_not_found`. The
 default `messages` view returns user messages, assistant
 messages, and proposed plans. The `activity` view also returns summarized tool,
 reasoning, checkpoint, handoff, and runtime-request items. Large item text is
-bounded and reports whether it was truncated. `afterPosition` and
-`nextPosition` support incremental reads.
+bounded and reports whether it was truncated. An agent in a T3 thread that
+reads without a cursor gets the newest items, and `beforePosition=earlierPosition`
+reads older ones. Client callers (the CLI, linked environments, outside MCP
+clients) start at the oldest item instead, because the CLI and linked
+environments on older versions read that way and follow only `hasMore`.
+`afterPosition=-1` starts any read at the oldest item, and
+`afterPosition=nextPosition` reads newer items. The server stops adding items once the result reaches about 30,000 characters and
+reports the rest through `earlierPosition` or `hasMore`. Claude Code saves MCP
+results over its token limit to a file instead of showing them, so a read has
+to fit whatever `limit` an agent asks for.
 
 Thread and message results include required `createdBy` and `creationSource`
 provenance. MCP-created threads and user-role messages use `createdBy: "agent"`
@@ -429,6 +437,12 @@ client's `effectiveSnoozed`, so agents and the sidebar agree: a snoozed thread
 wakes early only when it has a pending request or fails after snoozing. Completed
 runs, background wakes, and delegated completions keep it snoozed.
 
+They also report `blockedOnThreadWait` and `pendingBackgroundTasks`, the shell
+fields behind the sidebar's Waiting label, so an agent can see what a thread
+still waits on after its run completed. A subagent or `background_task` holds
+the thread. A command or monitor holds it only with `awaited: true`, since agents
+often leave a dev server running.
+
 ### `t3_thread_update`
 
 Updates metadata for the calling thread or any other thread in the environment.
diff --git a/docs/user/background-service.md b/docs/user/background-service.md
index 28a68e0dfe4a..1bc41addf8c9 100644
--- a/docs/user/background-service.md
+++ b/docs/user/background-service.md
@@ -182,8 +182,11 @@ pass `--fix` to run the recommended ones without a prompt (for scripts), or
 `--dry-run` to only report. An installed background service for the same data
 directory is stopped for the repair and started again afterwards, also when
 the repair fails. Quit a server you started by hand, or the desktop app, first:
-the repair refuses to touch a database that is in use. Use `--base-dir` for a
-different data directory.
+the repair refuses to touch a database that is in use, and names the server
+process that holds it when it can tell. While the repair runs, a server started
+for the same data directory, for example by a desktop app connecting over SSH,
+is refused until the repair ends. Use `--base-dir` for a different data
+directory.
 
 The repair's time grows with the size of the whole database, not only the
 space it reclaims, and can exceed an hour on a large database or a slow disk;
diff --git a/docs/user/devices.md b/docs/user/devices.md
index ac053b36c081..3d5c66a9a307 100644
--- a/docs/user/devices.md
+++ b/docs/user/devices.md
@@ -110,7 +110,7 @@ the environment’s own machine are skipped, since its devices are already local
 The first device listing installs pinned device tools on the host.
 SSH device hosts currently need macOS or Linux. To use devices on a Windows
 machine, run T3 Code on that machine and connect to its environment.
-Node 22 or newer and npm must be available to non-interactive SSH commands.
+Node 22.12 or newer and npm must be available to non-interactive SSH commands.
 T3 checks common Homebrew and Android SDK locations; custom installations need
 the appropriate PATH and ANDROID_HOME on the host. Android emulator video needs
 `ffmpeg` with libx264 on that host; physical Android devices use scrcpy and do
diff --git a/docs/user/faq.md b/docs/user/faq.md
index 8d34de5e2ea4..5c5b9a8d8368 100644
--- a/docs/user/faq.md
+++ b/docs/user/faq.md
@@ -6,7 +6,7 @@ No. A harness is what turns an LLM into an agent: it gives the model tools, a wa
 
 Chef = LLM. Kitchen = harness. T3 Code = the restaurant that lets you bring whatever kitchen you want. Our MCP is a cookbook we hand the kitchen, but the chef won't open it unless you tell them to :) I wrote the long version here: [What is a harness?](https://t3.gg/blog/post/what-is-a-harness)
 
-Bring your own: Claude Code, Codex, Cursor, Grok Build, OpenCode, Google Antigravity, Pi, or Muse Code. [Provider setup](./install.md#providers)
+Bring your own: Claude Code, Codex, Cursor, Grok Build, OpenCode, Google Antigravity, Kiro, Pi, Muse Code, or fx. [Provider setup](./install.md#providers)
 
 ## Why use T3 Code instead of Claude Code or the Codex app?
 
@@ -33,7 +33,7 @@ Yes. Link your T3 Chat account and T3 Connect raises your limit: up to 10 machin
 
 ## Why is my Claude 5-hour limit draining so fast?
 
-T3 Code drives Claude through Anthropic's Agent SDK. I confirmed it's a real bug on Anthropic's side: all Agent SDK usage will drain your 5h limits faster than using Claude Code directly. To be clear: this does not affect weekly limits. We have reported it to Anthropic and are hoping for a fix soon. [My post on it](https://x.com/theo/status/2114166439813017873)
+It shouldn't anymore. T3 Code drives Claude through Anthropic's Agent SDK, and Anthropic's 5h meter used to charge Agent SDK usage about 1.7x more than using Claude Code directly. Weekly limits were never affected. Since v0.1.7, Claude in T3 Code drains your 5h limit at the same rate as Claude Code. Still seeing it? [Update T3 Code](./updating.md) on the machine that runs your agents. [My post on it](https://x.com/theo/status/2114166439813017873) · [Tracking issue](https://github.com/pingdotgg/t3code/issues/24649)
 
 ## How do I use T3 Code remotely?
 
diff --git a/docs/user/html-renders.md b/docs/user/html-renders.md
index 09e8143caa9c..3a1c3de9474d 100644
--- a/docs/user/html-renders.md
+++ b/docs/user/html-renders.md
@@ -12,7 +12,7 @@ Previews can load public resources such as CDN scripts, but nothing on your loca
 
 ## MCP apps
 
-Some MCP servers return an interactive app with their tool results, following the [MCP Apps](https://github.com/modelcontextprotocol/ext-apps) standard. When an agent calls one of those tools, the app appears in the thread in place of the tool call, on web, desktop, and mobile. Codex and Claude support this today, for any MCP server you have configured for them. Claude needs Claude Code 2.1.301 or newer; older versions and other providers show these calls as ordinary tool calls.
+Some MCP servers return an interactive app with their tool results, following the [MCP Apps](https://github.com/modelcontextprotocol/ext-apps) standard. When an agent calls one of those tools, the app appears in the thread below the tool call, on web, desktop, and mobile. The tool call keeps its input and result, so you can still read them when an app shows nothing. Codex and Claude support this today, for any MCP server you have configured for them. Claude needs Claude Code 2.1.301 or newer; older versions and other providers show these calls as ordinary tool calls.
 
 Apps follow your theme. An app can call tools on its own server and post a message to the thread; T3 Code asks first unless the server marks the tool as read-only, and it asks before every message. On mobile, an app also asks before opening a link, and T3 Code asks before saving a file an app offers. An app stays viewable after its agent stops, but using it needs the agent of the thread that created it running, so send a message in that thread first if the app says it is unavailable. An app that navigates away from its own page is stopped.
 
diff --git a/docs/user/install.md b/docs/user/install.md
index e146c4f9d428..b594894efe37 100644
--- a/docs/user/install.md
+++ b/docs/user/install.md
@@ -233,6 +233,10 @@ Cursor and Antigravity update with T3 Code. Homebrew and Chocolatey installs
 compare against the version their package manager offers, which can trail the
 npm release; update Claude installed with Chocolatey through Chocolatey.
 
+The managed runtimes for Antigravity and for Codex connected through ChatGPT
+first install the release T3 Code tested. When T3 Code finds a newer compatible
+release, their setup in **Settings → Providers** offers an update.
+
 Add another provider instance for a separate account or configuration. Each
 instance can have its own environment variables, such as API keys or a custom
 base URL. Mark secret values as sensitive; after saving, T3 Code does not display
@@ -243,6 +247,47 @@ For provider-specific setup and accounts, see [Codex](./providers-codex.md),
 [Antigravity](./providers-antigravity.md), [Kiro](./providers-kiro.md),
 [Pi](./providers-pi.md), [Muse Code](./providers-muse.md), and [fx](./providers-fx.md).
 
+### Provider check timeouts
+
+If a provider works in its CLI but T3 Code reports a timeout while checking it,
+allow more time in the T3 server's environment. For example, give Codex and
+Claude readiness checks 60 seconds:
+
+```bash
+T3CODE_CODEX_PROBE_TIMEOUT_MS=60000 T3CODE_CLAUDE_PROBE_TIMEOUT_MS=60000 t3 serve
+```
+
+For a remote environment, set these on the machine running the T3 server.
+Keep them in your launcher or service configuration to retain them across
+updates, then restart the server. For systemd, add
+`Environment=T3CODE_CODEX_PROBE_TIMEOUT_MS=60000` under `[Service]` in a service
+override, reload systemd, and restart the service. Provider instances can also
+set their own overrides in Settings → Providers.
+
+Each variable extends that provider's readiness-probe deadlines; a phase whose
+default is already longer keeps its default. Providers with several phases can
+take longer than one deadline in total. Values must be whole milliseconds no
+greater than 2147483647; unset or invalid values keep the defaults.
+
+| Provider            | Environment variable                   |
+| ------------------- | -------------------------------------- |
+| Codex               | `T3CODE_CODEX_PROBE_TIMEOUT_MS`        |
+| Claude              | `T3CODE_CLAUDE_PROBE_TIMEOUT_MS`       |
+| Cursor              | `T3CODE_CURSOR_PROBE_TIMEOUT_MS`       |
+| Antigravity         | `T3CODE_ANTIGRAVITY_PROBE_TIMEOUT_MS`  |
+| Grok                | `T3CODE_GROK_PROBE_TIMEOUT_MS`         |
+| Kiro                | `T3CODE_KIRO_PROBE_TIMEOUT_MS`         |
+| fx                  | `T3CODE_FX_PROBE_TIMEOUT_MS`           |
+| Pi                  | `T3CODE_PI_PROBE_TIMEOUT_MS`           |
+| Muse Code           | `T3CODE_MUSE_PROBE_TIMEOUT_MS`         |
+| OpenCode            | `T3CODE_OPENCODE_PROBE_TIMEOUT_MS`     |
+| ACP Registry agents | `T3CODE_ACP_REGISTRY_PROBE_TIMEOUT_MS` |
+
+Longer deadlines also take longer to report a stalled check. These overrides
+cover readiness and discovery, including OpenCode server startup. Usage and
+config enrichment retain their own shorter limits. Turn execution, package
+installation, update checks, and shutdown limits keep their existing behavior.
+
 ## Next steps
 
 - [Working with threads](./thread-sidebar.md): start tasks and organize parallel work.
diff --git a/docs/user/project-settings.md b/docs/user/project-settings.md
index 8880dcb3e64c..e0377c11938a 100644
--- a/docs/user/project-settings.md
+++ b/docs/user/project-settings.md
@@ -180,7 +180,8 @@ project crumb.
 The Projects category, under Code, holds the project's name, icon, actions,
 checkouts and removal. Actions belong to a project: editing them creates the project's own list
 on each selected environment, and reset returns to the environment's shared list. A project's
-`t3.json` actions can be imported there.
+`t3.json` actions can be imported there. When a project has several checkouts on one environment,
+choose one in the scope line at the top to see or change only that checkout's settings.
 
 Settings a repository can also declare in `t3.json`, such as the workspace for new threads,
 resolve in one order: a project override, then the environment setting, then `t3.json`, then the
@@ -226,8 +227,9 @@ manually. Custom applies separate worktree rules to the selected project or chec
 captures and log retention remain machine-wide.
 
 Worktrees can be removed after a chosen number of inactive days, after a thread settles, after
-merging, or when they have no commits beyond the default branch. Set settled retention to 0 days
-to remove a worktree at the next cleanup after settlement. In repositories without remotes,
+merging, or when they have no commits beyond the default branch and their thread is settled or
+archived. Set settled retention to 0 days to remove a worktree at the next cleanup after
+settlement. In repositories without remotes,
 unchanged-worktree cleanup compares against the branch checked out in the project workspace;
 if that checkout has a detached HEAD, the worktree is kept. Only T3-managed worktrees are eligible.
 Active sessions and shared worktrees prevent removal. **Keep worktrees with local changes** defaults
diff --git a/docs/user/providers-antigravity.md b/docs/user/providers-antigravity.md
index c3177c29a12c..8a284a11e782 100644
--- a/docs/user/providers-antigravity.md
+++ b/docs/user/providers-antigravity.md
@@ -1,7 +1,7 @@
 # Antigravity
 
 T3 Code runs Google's official Antigravity ACP agent on your selected environment.
-It has its own sign-in, separate from the Antigravity IDE or CLI. Google controls
+T3 manages its own CLI installation and sign-in, separate from your terminal or IDE. Google controls
 which models and account access are available through this agent.
 
 ## Set up Antigravity
@@ -51,21 +51,29 @@ account.
 
 ## Runtime installation
 
-Managed installation supports Apple Silicon macOS, Linux x64 or ARM64, and Windows
-x64 or ARM64. Intel Macs can connect to a supported remote environment. Allow
-several GB of free disk space, especially on Linux.
+Managed installation supports Apple Silicon and Intel macOS, Linux x64 or ARM64
+with glibc or musl, and Windows x64 or ARM64. Allow at least 1.25 GiB of free disk
+space for downloading and staging an update.
 
 ### Use a manual installation
 
-Download the archive for your environment from the [official ACP Registry][registry].
-Extract the ACP executable and its `localharness_external` helper into the same
-directory, at the same version. Make both executable on macOS or Linux; Windows
-uses `.exe` files.
-
-Set **Binary path** to the ACP executable on the environment and update it yourself.
+Install [Antigravity CLI](https://antigravity.google/docs/getting-started) on the environment.
+Set **Binary path** to its `agy` executable and update it yourself.
 Leave the field blank to use the managed runtime, or a compatible executable on
 `PATH` if no managed runtime is installed.
 
+## Update the managed runtime
+
+In web or desktop provider settings, choose **Update Antigravity** when an update
+is available. T3 checks Google's CLI release channel while provider update checks
+are enabled. Installing or reinstalling also checks that channel. Updates keep
+your profile and existing runtime available if the new release fails validation.
+
+Updating an older 1.4.5 installation migrates it to the native CLI. You may need to
+sign in again after migration. Threads already running finish with their original
+runtime; new sessions use the updated release. Custom binary paths keep using the
+executable you selected.
+
 ## Models and threads
 
 The model list comes from your Antigravity account, including Claude and GPT models
@@ -135,6 +143,17 @@ Before removing a managed runtime, disable its instances and cancel any active
 installation. Clear any explicit binary path pointing into that runtime. Removal
 is refused while the runtime is in use.
 
+## Run a native goal
+
+When your Antigravity runtime offers `/goal`, send `/goal` followed by a verifiable
+objective. Antigravity keeps working until it completes the goal or you cancel it.
+If you still use the older 1.4.5 runtime, update Antigravity in provider settings,
+then refresh provider status.
+
+Use Stop to interrupt a running goal, then ask Antigravity to stop pursuing it
+before starting more work. Ordinary follow-ups wait until the running turn ends.
+T3 does not support Antigravity goal status, pause, resume, or clear commands.
+
 ## Check access and troubleshoot
 
 Open **Usage > Limits** to see the remaining Gemini and shared Claude/GPT allowances
@@ -152,5 +171,4 @@ If Google reports `SUBSCRIPTION_REQUIRED`, an account restriction, or a usage li
 follow the provider's message and any retry time. See [Google's account plans][plans]
 for eligibility.
 
-[registry]: https://github.com/agentclientprotocol/registry/blob/main/antigravity-acp/agent.json
 [plans]: https://antigravity.google/docs/plans
diff --git a/docs/user/providers-codex.md b/docs/user/providers-codex.md
index 3384831aa87b..f77dff53dabb 100644
--- a/docs/user/providers-codex.md
+++ b/docs/user/providers-codex.md
@@ -33,6 +33,34 @@ Running `codex login` does not change a managed ChatGPT connection. In
 and complete the wizard. Then select that instance from the thread's model
 picker. See [Use multiple accounts](#use-multiple-accounts).
 
+## Allow more time for provider checks
+
+If an authenticated Codex installation reports “Timed out while checking Codex
+app-server provider status,” set `T3CODE_CODEX_PROBE_TIMEOUT_MS=60000` in the
+T3 server's environment and restart it. See [Provider check timeouts](./install.md#provider-check-timeouts)
+for configuration and other providers.
+
+## Generate images
+
+Codex can generate images directly in a T3 Code thread when your Codex version,
+model, and account support native image generation.
+
+If Codex reports that its image tool is unavailable, image generation may be
+disabled in its configuration. In **Settings → Providers**, edit your existing
+Codex provider and add this to **Launch arguments**, keeping any other arguments:
+
+```text
+-c features.image_generation=true
+```
+
+This enables the feature for that T3 Code provider without changing your shared
+Codex configuration. You do not need another provider instance or a separate image
+API key. The flag does not add image support to an unsupported model or account.
+
+Launch arguments apply to Codex sessions started after you save them. Start a new
+thread with the same Codex provider and ask it to generate an image. The completed
+image appears in the thread.
+
 ## Use multiple accounts
 
 Add another ChatGPT account in **Settings → Providers**, then select the account
@@ -100,6 +128,15 @@ in the thread on web, desktop, or mobile. Some tools offer access for one reques
 the current session, or permanently. See [Permission modes](./permission-modes.md)
 for command and file approvals.
 
+## Use Daybreak
+
+Models with cyber access programs show a Cyber Access option in the model
+options. It starts on Standard, or on Daybreak when `config.toml` in your Codex
+home sets `daybreak = true` or the model only runs under Daybreak. Your choice carries
+over to new threads. Custom models do not offer it. If Codex rejects a turn
+because your login lacks the program, switch Cyber Access back to Standard or
+sign in to Codex with an account that has it.
+
 ## Codex says I hit a usage limit
 
 When Codex stops on a usage limit, the thread names the window that ran out and
diff --git a/docs/user/providers-opencode.md b/docs/user/providers-opencode.md
index d57f01c11484..c686fe10a7c8 100644
--- a/docs/user/providers-opencode.md
+++ b/docs/user/providers-opencode.md
@@ -55,7 +55,9 @@ reached through `localhost`. That server can still report the previous version
 until you restart it. For a loopback URL, T3 Code shows that restart requirement
 instead of treating the CLI update as a failure.
 
-After a lost connection, send another prompt to reconnect to the same OpenCode
+T3 Code waits for a local server it started to recover after a lost connection.
+You can stop the turn while it reconnects. If the server exits or an external
+connection cannot be restored, send another prompt to resume the same OpenCode
 session.
 
 ## Approvals
diff --git a/docs/user/secrets.md b/docs/user/secrets.md
index 0e02c81399a2..e7e899f197ae 100644
--- a/docs/user/secrets.md
+++ b/docs/user/secrets.md
@@ -29,6 +29,8 @@ Credential fields in Settings, such as provider environment variables and creden
 control tokens, usage limit keys, and device host tokens, show a source picker next to the field.
 Pick **Value** to save the credential itself, or pick a secret provider and enter a reference such
 as `op://vault/item/field`. Copy the reference from 1Password with **Copy Secret Reference**.
+Select the check button next to a reference to read it now. If it reads, providers that use it
+start using the new value.
 
 T3 Code reads the secret when it needs it, for example when a provider starts. Change the
 credential in 1Password and refresh to use the new value.
diff --git a/docs/user/source-control.md b/docs/user/source-control.md
index 7d874174443f..d8aca272843d 100644
--- a/docs/user/source-control.md
+++ b/docs/user/source-control.md
@@ -336,7 +336,8 @@ review is terminal. An open or unsynced link keeps it active.
 Ask the agent to watch, monitor, or babysit a pull request and it calls `watch_pull_request`. While
 the thread is active, the server checks the pull request every two minutes and wakes the agent when a
 check fails or waits for a maintainer's approval, the required checks pass, someone else comments or reviews, or the branch starts to
-conflict. Threads in a project that watch the same pull request share one check. On GitHub, a check
+conflict. On github.com it also wakes the agent, with GitHub's reason, when the merge queue drops
+the pull request without merging it. Threads in a project that watch the same pull request share one check. On GitHub, a check
 first asks whether anything changed and reads the pull request only when it did, which keeps
 watching inside GitHub's rate limit. Comments from your own account do not wake it. Watching ends
 when the pull request merges or closes, after 10 wakes in a row that bring only comments, after 8
@@ -347,9 +348,12 @@ watch already reported; unlinking the pull request clears that. Subagents cannot
 it yourself, use the row menu in the **Linked pull requests** panel. In the thread details card, a
 watched pull request shows an eye; click it to stop watching.
 
-A watched thread counts as working between wakes, so it stays in the **Working** section and does
-not auto-settle. Agents stop watching when they hand the work back to you, and the thread then
-returns to your inbox.
+A watched thread counts as working while the pull request still has checks running, so it stays in
+the **Working** section, including after the agent pushes a fix. Once every check has finished,
+including review bots that report as checks, the thread returns to your inbox: what happens next is
+up to a person. That includes a workflow waiting for a maintainer to approve it, which runs only
+once someone does. The watch stays on and still wakes the agent on new comments, failed checks or
+conflicts, and a watched thread never auto-settles.
 
 Cross-repository links use a project on the same host. Azure DevOps reviews require a project checked
 out from the matching organization and repository.
diff --git a/docs/user/thread-sidebar.md b/docs/user/thread-sidebar.md
index 09ce63e2a3e6..5dd5a4bf5920 100644
--- a/docs/user/thread-sidebar.md
+++ b/docs/user/thread-sidebar.md
@@ -134,7 +134,7 @@ open.
 
 Threads that are working or waiting on work they will resume from move into a collapsed
 **Working** section below the active list.
-That includes subagents, watched pull requests, and background commands or monitors the agent
+That includes subagents, watched pull requests with checks still running, and background commands or monitors the agent
 says it is waiting on. A dev server or other process an agent leaves running does not keep a thread
 there. A thread returns to the top of the active list when it finishes, fails, or needs an approval or
 answer. The Working section lists the thread you last sent work to first. Pinned threads stay in
@@ -273,6 +273,7 @@ On mobile, open a subagent from its conversation card or **Agents**. On iOS
 layouts with an inspector, its thread opens beside the parent. Maximize it to
 fill the screen; close the full-screen view to return to the parent and inspector.
 Stop on a thread also stops the subagents it delegated to.
+Before archiving the parent, wait for its delegated tasks to finish or cancel them.
 
 Subagent threads started by the agent can't take messages; message the parent
 thread instead. When such a subagent needs an approval or an answer, the parent
diff --git a/docs/user/triage.md b/docs/user/triage.md
index c66bac0738e2..6e159cc7a871 100644
--- a/docs/user/triage.md
+++ b/docs/user/triage.md
@@ -15,7 +15,8 @@ source for the server's version while you write.
 Triage runs on the machine of the thread or draft that you have open. With
 nothing open, it uses your primary machine if that supports triage, or else the
 first connected machine that does. The new thread shows the machine name, and on
-mobile the palette row shows it before you start. The agent runs inside that T3
+mobile the palette row shows it before you start. If you change the machine
+before you send, triage moves to that machine. The agent runs inside that T3
 Code server, so it gives you any restart steps and does not do them itself.
 
 ## In a terminal
diff --git a/docs/user/updating.md b/docs/user/updating.md
index 8f4a72e8856b..5c543dcd0bcc 100644
--- a/docs/user/updating.md
+++ b/docs/user/updating.md
@@ -103,7 +103,7 @@ The offered action depends on how the server runs:
 | -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | **Update server**          | Keep the client open while it installs and reconnects. Supported background services update remotely. For a desktop-hosted server, this also closes and relaunches the desktop app on the host. |
 | **Update the desktop app** | Update the desktop app on the machine running the server, then reopen it if needed.                                                                                                             |
-| **Copy update command**    | Run the command on the named host to update the detected global npm install, then restart the server with your usual options.                                                                   |
+| **Copy update command**    | Run the command on the named host to update the detected global npm install or installed `t3` command, then restart the server with your usual options.                                         |
 | **Copy relaunch command**  | Stop the command-line server on its host and relaunch with the copied command, keeping your usual subcommand and options. This does not update an installed `t3` command.                       |
 
 On the host, run:
diff --git a/docs/user/voice-input.md b/docs/user/voice-input.md
index 95ea15d707d0..592e110c896c 100644
--- a/docs/user/voice-input.md
+++ b/docs/user/voice-input.md
@@ -83,6 +83,8 @@ macOS and Ctrl elsewhere). Press again, or the check mark, to finish; `Esc`
 discards the recording and leaves your draft unchanged. Recordings last up to
 five minutes. Text is inserted at the cursor or replaces the selection you had
 when recording started, and the editor is read-only while dictation runs.
+Changes that reach the draft meanwhile, such as a cited message, are kept;
+the text then goes after your selection instead of replacing it.
 
 Pressing Send while dictating finishes the recording and sends the draft once
 the transcript has been inserted. Cancelling also cancels that queued send. In
diff --git a/docs/user/welcome-page.md b/docs/user/welcome-page.md
index f280ace07914..63fa86b52b98 100644
--- a/docs/user/welcome-page.md
+++ b/docs/user/welcome-page.md
@@ -74,9 +74,10 @@ three conversations, already checked. Projects already in T3 Code are not checke
 again. Uncheck the box to start without them, or
 select **Review all** to pick from everything found, with "Select all" and
 "Select none". Linked worktrees of bare repositories
-can be offered as separate projects. Other linked git worktrees, Codex scratch
-directories under `Documents/Codex`, and anything under `Downloads` are not
-offered.
+can be offered as separate projects. Conversations in other linked git worktrees
+count toward their main checkout, so a repository is offered even if you only
+worked in its worktrees. Codex scratch directories under `Documents/Codex`, and
+anything under `Downloads` are not offered.
 
 A large or malformed history can reach the scan limit. T3 Code keeps the
 projects it found and warns when projects or conversations may be missing.
diff --git a/evals/mcp-tool-use/README.md b/evals/mcp-tool-use/README.md
index 66e5b2c72dea..b70386d67c0a 100644
--- a/evals/mcp-tool-use/README.md
+++ b/evals/mcp-tool-use/README.md
@@ -26,7 +26,7 @@ Cases are JSON lines in `cases/`, one file per area. The case schema in `run.ts`
 
 - `kind`: `bad` reproduces a mistake, `guard` protects correct behavior, `control` is ordinary work.
 - `experience`: the real mistake, in a sentence. `source`: where it happened.
-- `setup`: the fake thread, its `world` (repo, branch, files, PRs, pages), `priorTurns`, and `mocks` for tool results.
+- `setup`: the fake thread, its `world` (repo, branch, files, PRs, pages), `priorTurns`, and `mocks` for tool results. With `world.backgroundTasks`, `t3_background_wait` answers from T3's own handler and ThreadManagementService, so its result and errors are the checkout's; a prior wait with `"result": "default"` gets that result too.
 - `setup.priorTurns[].toolCalls[].resultFile`: load a repository-relative file as the tool result instead of copying its contents into the case. An empty `prompt` resumes a top-level thread after its last prior tool result without adding a user message. Side-chat and subagent setups require a nonempty prompt.
 - `expect`: the checks, such as `calls`, `callsMustNot`, `maxCalls`, `order`, `shellMust`, `textMust`, `finalTextMust` (the last text, once the turn ended), and `linked`. A call's `args` match partially: `~text` is a case-insensitive substring, `"<=N"` / `">=N"` bound a number, `null` matches a missing key, and keys may be dotted paths. Device cases also use `device` to check every child brief, forbid raw UI commands, bound failed device actions per user turn, and require artifact paths in completed final answers. Secrets cases use `secret` (see [Secrets cases](#secrets-cases)).
 
diff --git a/evals/mcp-tool-use/backgroundWait.ts b/evals/mcp-tool-use/backgroundWait.ts
new file mode 100644
index 000000000000..24377c4247f8
--- /dev/null
+++ b/evals/mcp-tool-use/backgroundWait.ts
@@ -0,0 +1,154 @@
+// @effect-diagnostics nodeBuiltinImport:off
+/**
+ * T3's real `t3_background_wait` handler and ThreadManagementService over a Claude session.
+ * Only the adapter is the eval's: like Claude's, it matches task IDs against the session's
+ * running background work, which the case lists in `world.backgroundTasks`.
+ */
+import {
+  EnvironmentId,
+  type OrchestrationV2ProviderThread,
+  type OrchestrationV2ThreadProjection,
+  ProviderDriverKind,
+  ProviderInstanceId,
+  ProviderSessionId,
+  ProviderThreadId,
+  ThreadId,
+} from "@t3tools/contracts";
+import type * as ProviderAdapter from "@t3tools/provider-core/server/ProviderAdapter";
+import * as Context from "effect/Context";
+import * as DateTime from "effect/DateTime";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as References from "effect/References";
+// oxlint-disable-next-line t3code/no-raw-mcp-registration -- the eval calls the tool McpHttpServer registered and registers none.
+import { McpSchema, McpServer } from "effect/ai";
+
+import * as McpHttpServer from "../../apps/server/src/mcp/McpHttpServer.ts";
+import * as McpInvocationContext from "../../apps/server/src/mcp/McpInvocationContext.ts";
+import { liveThreadShell } from "../../apps/server/src/mcp/McpToolAccess.testkit.ts";
+import * as OrchestratorMcpService from "../../apps/server/src/mcp/OrchestratorMcpService.ts";
+import * as ThreadMetadataMcpService from "../../apps/server/src/mcp/ThreadMetadataMcpService.ts";
+import * as OrchestratorHandlers from "../../apps/server/src/mcp/toolkits/orchestrator/handlers.ts";
+import { OrchestratorToolkit } from "../../apps/server/src/mcp/toolkits/orchestrator/tools.ts";
+import * as CommandReceiptStore from "../../apps/server/src/orchestration-v2/CommandReceiptStore.ts";
+import * as Orchestrator from "../../apps/server/src/orchestration-v2/Orchestrator.ts";
+import * as ProviderSessionManager from "../../apps/server/src/orchestration-v2/ProviderSessionManager.ts";
+import * as ThreadManagementService from "../../apps/server/src/orchestration-v2/ThreadManagementService.ts";
+import * as PeerForwarding from "../../apps/server/src/peer/PeerForwarding.ts";
+import * as PeerLinkRequests from "../../apps/server/src/peer/PeerLinkRequests.ts";
+import * as PeerLinks from "../../apps/server/src/peer/PeerLinks.ts";
+import * as RemoteDelegation from "../../apps/server/src/peer/RemoteDelegation.ts";
+import * as SqlitePersistence from "../../apps/server/src/persistence/Sqlite.ts";
+import * as ServerSettings from "../../apps/server/src/serverSettings.ts";
+
+const threadId = ThreadId.make("mcp-tool-use-eval");
+const providerThreadId = ProviderThreadId.make("provider-thread:mcp-tool-use-eval");
+const providerSessionId = ProviderSessionId.make("provider-session:mcp-tool-use-eval");
+const providerInstanceId = ProviderInstanceId.make("claudeAgent");
+const driver = ProviderDriverKind.make("claudeAgent");
+
+/** Calls T3's `t3_background_wait` with `running` as the session's running background task IDs. */
+export const makeBackgroundWait = Effect.fn("evaluateMcpToolUse.makeBackgroundWait")(function* (
+  running: ReadonlyArray<string>,
+) {
+  const now = yield* DateTime.now;
+  const providerThread = {
+    id: providerThreadId,
+    driver,
+    providerInstanceId,
+    providerSessionId,
+    appThreadId: threadId,
+    nativeThreadRef: { driver, nativeId: "native-thread", strength: "strong" },
+    pendingBackgroundTasks: running.map((taskId) => ({ taskId, kind: "command" })),
+    createdAt: now,
+    updatedAt: now,
+  } as unknown as OrchestrationV2ProviderThread;
+  const runtime = {
+    driver,
+    providerSessionId,
+    awaitBackgroundTasks: (input: { readonly taskIds: ReadonlyArray<string> }) =>
+      Effect.succeed({ matched: [...new Set(input.taskIds)].filter((id) => running.includes(id)) }),
+  } as unknown as ProviderAdapter.ProviderAdapterV2SessionRuntime;
+  const real = yield* Layer.build(
+    ThreadManagementService.layer.pipe(
+      Layer.provide(
+        Layer.mergeAll(
+          Layer.mock(Orchestrator.OrchestratorV2)({
+            getThreadRecords: () =>
+              Effect.succeed({
+                thread: { id: threadId, deletedAt: null, activeProviderThreadId: providerThreadId },
+                providerThreads: [providerThread],
+              } as unknown as OrchestrationV2ThreadProjection),
+          }),
+          Layer.mock(ProviderSessionManager.ProviderSessionManagerV2)({
+            get: () => Effect.succeedSome(runtime),
+          }),
+          ServerSettings.layerTest(),
+          CommandReceiptStore.layer.pipe(Layer.provide(SqlitePersistence.layerMemory)),
+        ),
+      ),
+    ),
+    // The receipt store's in-memory migrations log every step.
+  ).pipe(Effect.provideService(References.MinimumLogLevel, "Error"));
+  const service = Context.get(real, ThreadManagementService.ThreadManagementService);
+  // The caller's thread is live on the Claude instance, mid-turn.
+  const threads = Layer.mock(ThreadManagementService.ThreadManagementService)({
+    ...service,
+    getThreadShell: () => Effect.succeed({ ...liveThreadShell(threadId), providerInstanceId }),
+  });
+  const context = yield* Layer.build(
+    McpHttpServer.toolkitRegistration(OrchestratorToolkit, OrchestratorHandlers.layer).pipe(
+      Layer.provideMerge(McpHttpServer.layerInProcessMcpServer),
+      Layer.provide(Layer.mock(OrchestratorMcpService.OrchestratorMcpService)({})),
+      Layer.provide(Layer.mock(ThreadMetadataMcpService.ThreadMetadataMcpService)({})),
+      Layer.provide(threads),
+      Layer.provide(Layer.mock(PeerForwarding.PeerForwarding)({})),
+      Layer.provide(Layer.mock(PeerLinkRequests.PeerLinkRequests)({})),
+      Layer.provide(Layer.mock(PeerLinks.PeerLinks)({})),
+      Layer.provide(Layer.mock(RemoteDelegation.RemoteDelegation)({})),
+    ),
+  );
+  type Entry = Parameters<McpServer.McpServer["Service"]["addTool"]>[0];
+  // The registry keeps each tool's handler; its public type lists only definitions.
+  const tools = Context.get(context, McpServer.McpServer).tools as ReadonlyArray<Entry>;
+  const entry = tools.find((tool) => tool.tool.name === "t3_background_wait");
+  if (entry === undefined) return yield* Effect.die(new Error("T3 has no t3_background_wait."));
+  const scope: McpInvocationContext.McpThreadInvocationScope = {
+    environmentId: EnvironmentId.make("00000000-0000-4000-8000-0000000000e0"),
+    requestNamespace: "mcp-tool-use-eval",
+    thread: { threadId, providerSessionId: "mcp-tool-use-eval", providerInstanceId },
+    client: undefined,
+    capabilities: new Set<McpInvocationContext.McpCapability>(["orchestration"]),
+    issuedAt: 0,
+  };
+  const request = McpSchema.McpRequestContext.of({
+    clientId: 0,
+    protocolVersion: "2025-06-18",
+    clientCapabilities: {},
+  });
+  return Effect.fn("evaluateMcpToolUse.backgroundWait")(function* (input: unknown) {
+    const result = yield* entry.handle(input).pipe(
+      Effect.provideService(McpInvocationContext.McpInvocationContext, scope),
+      Effect.provideService(McpSchema.McpRequestContext, request),
+      // An MCP client shows a protocol error, such as bad parameters, as the tool's error.
+      Effect.catch((error) =>
+        Effect.succeed(
+          new McpSchema.CallToolResult({
+            isError: true,
+            content: [{ type: "text", text: error.message }],
+          }),
+        ),
+      ),
+    );
+    if (!("content" in result))
+      return yield* Effect.die(new Error("Background wait asked for input."));
+    const text = result.content
+      .flatMap((part) => (part.type === "text" ? [part.text] : []))
+      .join("\n");
+    if (text === "Tool execution failed due to an internal server error.") {
+      return yield* Effect.die(new Error("t3_background_wait hit a defect in T3 or the eval."));
+    }
+    return { text, isError: result.isError === true };
+  });
+});
+export type BackgroundWait = Effect.Success<ReturnType<typeof makeBackgroundWait>>;
diff --git a/evals/mcp-tool-use/cases/orchestration.ndjson b/evals/mcp-tool-use/cases/orchestration.ndjson
index 520bd2abf10d..ead48236bd92 100644
--- a/evals/mcp-tool-use/cases/orchestration.ndjson
+++ b/evals/mcp-tool-use/cases/orchestration.ndjson
@@ -34,6 +34,10 @@
 {"id": "two-children-same-model", "area": "orchestration", "kind": "bad", "pattern": "named-model rule read as a cap", "experience": "Asked for two Sol xhigh subagents, an Astra parent started one and refused the second, citing 'One child per named model' (#24967).", "rule": "Before delegate_task ... One child per named model. (intended: every named model gets a child; read as a cap of one child per model)", "privacy": "commit-safe", "setup": {"role": "top", "mocks": {"orchestrator_capabilities": {"parentThreadId": "33333333-3333-4333-8333-333333333333", "inheritedProviderInstanceId": "claudeAgent", "inheritedModel": "claude-sonnet-5-5", "inheritedOptions": [{"id": "effort", "value": "high"}], "runtimeMode": "full-access", "interactionMode": "default", "features": {"appOwnedSubagents": true, "asyncPolling": true, "cancellation": true, "batchThreadCreation": true, "threadManagement": true, "incrementalThreadRead": true, "scheduledTasks": true}, "providers": [{"providerInstanceId": "claudeAgent", "driverKind": "claudeAgent", "displayName": "Claude", "models": [{"id": "claude-opus-5-5", "label": "Claude Opus 5.5", "options": [{"id": "effort", "values": ["low", "medium", "high", "xhigh", "max"], "default": "high"}, {"id": "fastMode", "type": "boolean", "default": false}]}, {"id": "claude-sonnet-5-5", "label": "Claude Sonnet 5.5", "options": [{"id": "effort", "values": ["low", "medium", "high", "xhigh", "max"], "default": "high"}]}, {"id": "claude-haiku-5-5", "label": "Claude Haiku 5.5", "options": [{"id": "effort", "values": ["low", "medium", "high", "xhigh", "max"], "default": "high"}]}]}, {"providerInstanceId": "codex", "driverKind": "codex", "displayName": "Codex", "models": [{"id": "gpt-6.1-sol", "label": "GPT-6.1 Sol", "options": [{"id": "reasoningEffort", "values": ["low", "medium", "high", "xhigh", "max"], "default": "high"}, {"id": "serviceTier", "values": ["default", "priority"], "default": "default"}]}]}, {"providerInstanceId": "muse", "driverKind": "muse", "displayName": "Muse Code", "runtimeModes": ["approval-required", "full-access"], "models": [{"id": "muse-wonder-full", "label": "Muse Wonder Full", "options": [{"id": "reasoningEffort", "values": ["minimal", "low", "medium", "high", "xhigh", "max"], "default": "high"}]}]}, {"providerInstanceId": "grok", "driverKind": "grok", "displayName": "Grok", "models": [{"id": "grok-4.7", "label": "Grok 4.7", "options": []}]}]}, "delegate_task": "default"}}, "prompt": "Launch two Sol xhigh subagents. Give each a trivial task that only replies OK.", "expect": {"calls": [{"tool": "delegate_task", "args": {"target.model": "gpt-6.1-sol", "target.options.reasoningEffort": "xhigh"}}], "minCalls": {"delegate_task": 2}, "callsMustNot": [{"tool": "delegate_task", "args": {"target.model": "~muse"}}, {"tool": "delegate_task", "args": {"target.model": "~claude"}}]}, "notes": "From #24967. One child plus the parent doing the work fails, and so does a second model in place of Sol."}
 {"id": "worker-counts-per-model", "area": "orchestration", "kind": "bad", "pattern": "named-model rule read as a cap", "experience": "Asked for 20 Sol workers and 20 Luna workers, the agent started one worker per model (#25359).", "rule": "Before delegate_task ... One child per named model. (intended: every named model gets a child; read as a cap of one child per model)", "privacy": "commit-safe", "setup": {"role": "top", "mocks": {"orchestrator_capabilities": {"parentThreadId": "33333333-3333-4333-8333-333333333333", "inheritedProviderInstanceId": "claudeAgent", "inheritedModel": "claude-sonnet-5-5", "inheritedOptions": [{"id": "effort", "value": "high"}], "runtimeMode": "full-access", "interactionMode": "default", "features": {"appOwnedSubagents": true, "asyncPolling": true, "cancellation": true, "batchThreadCreation": true, "threadManagement": true, "incrementalThreadRead": true, "scheduledTasks": true}, "providers": [{"providerInstanceId": "claudeAgent", "driverKind": "claudeAgent", "displayName": "Claude", "models": [{"id": "claude-opus-5-5", "label": "Claude Opus 5.5", "options": [{"id": "effort", "values": ["low", "medium", "high", "xhigh", "max"], "default": "high"}, {"id": "fastMode", "type": "boolean", "default": false}]}, {"id": "claude-sonnet-5-5", "label": "Claude Sonnet 5.5", "options": [{"id": "effort", "values": ["low", "medium", "high", "xhigh", "max"], "default": "high"}]}, {"id": "claude-haiku-5-5", "label": "Claude Haiku 5.5", "options": [{"id": "effort", "values": ["low", "medium", "high", "xhigh", "max"], "default": "high"}]}]}, {"providerInstanceId": "codex", "driverKind": "codex", "displayName": "Codex", "models": [{"id": "gpt-6.1-sol", "label": "GPT-6.1 Sol", "options": [{"id": "reasoningEffort", "values": ["low", "medium", "high", "xhigh", "max"], "default": "high"}, {"id": "serviceTier", "values": ["default", "priority"], "default": "default"}]}]}, {"providerInstanceId": "muse", "driverKind": "muse", "displayName": "Muse Code", "runtimeModes": ["approval-required", "full-access"], "models": [{"id": "muse-wonder-full", "label": "Muse Wonder Full", "options": [{"id": "reasoningEffort", "values": ["minimal", "low", "medium", "high", "xhigh", "max"], "default": "high"}]}]}, {"providerInstanceId": "grok", "driverKind": "grok", "displayName": "Grok", "models": [{"id": "grok-4.7", "label": "Grok 4.7", "options": []}]}]}, "delegate_task": "default"}, "world": {"files": {"tests/flaky/retry.test.ts": "it('retry is flaky', async () => { /* fails 1 in 5 runs */ });\n", "tests/flaky/upload.test.ts": "it('upload is flaky', async () => { /* fails 1 in 5 runs */ });\n", "tests/flaky/session.test.ts": "it('session is flaky', async () => { /* fails 1 in 5 runs */ });\n", "tests/flaky/search.test.ts": "it('search is flaky', async () => { /* fails 1 in 5 runs */ });\n", "tests/flaky/billing.test.ts": "it('billing is flaky', async () => { /* fails 1 in 5 runs */ });\n", "tests/flaky/webhook.test.ts": "it('webhook is flaky', async () => { /* fails 1 in 5 runs */ });\n"}}}, "prompt": "Six tests in tests/flaky/ fail now and then. Start 3 Muse Wonder Full workers and 3 Grok workers, one test file each, to find and fix the flake.", "expect": {"calls": [{"tool": "delegate_task", "args": {"target.model": "muse-wonder-full"}}, {"tool": "delegate_task", "args": {"target.model": "grok-4.7"}}], "minCalls": {"delegate_task": 6}}, "notes": "Scaled down from the real 20 Sol + 20 Luna ask. Muse and Grok need delegate_task from every parent, so a native Sol helper cannot pass or fail it."}
 {"id": "linked-thread-chip-reads-there", "area": "orchestration", "kind": "guard", "pattern": "thread chip from a linked machine read on this one", "experience": "A thread chip from a linked machine names its environmentId; an agent that reads it without passing that id reads this machine, where the thread does not exist.", "rule": "The thread chip names its environmentId; t3_thread_read takes it.", "privacy": "commit-safe", "setup": {"role": "top", "linkedEnvironments": true, "mocks": {"t3_environment_links": {"environmentId": "environment-laptop", "links": [{"environmentId": "environment-vps", "label": "Hetzner VPS", "status": "reachable", "access": "auto-accept-edits", "expiresAt": "2026-12-01T00:00:00.000Z", "lastError": null}], "notListed": "Not listed: not linked yet. Call t3_environment_link with a hint from the user's words."}, "t3_thread_read": {"thread": {"threadId": "thread-deploy-api", "title": "Deploy the API", "status": "idle"}, "items": [{"position": 1, "createdBy": "user", "text": "Deploy the API to the VPS and check the health endpoint."}, {"position": 2, "createdBy": "assistant", "text": "Deployed. /health returns 200, but /health/db times out after 5s: the API can't reach Postgres on 10.0.0.5:5432."}], "nextPosition": 3, "hasMore": false}}}, "prompt": "Pick up where [Deploy the API](t3-context://v1/thread/thread_deploy-api) left off. What is still failing?", "promptContext": {"records": [{"version": 1, "kind": "thread", "contextId": "thread_deploy-api", "label": "Deploy the API", "environmentId": "environment-vps", "threadId": "thread-deploy-api", "title": "Deploy the API"}]}, "expect": {"calls": [{"tool": "t3_thread_read", "args": {"threadId": "thread-deploy-api", "environmentId": "environment-vps"}}], "notCalls": ["t3_environment_link"]}, "source": {"request": "akj on #17130: attach a linked machine's thread without dragging"}}
+{"id": "vps-delegate-links-off-names-setting", "area": "orchestration", "kind": "bad", "pattern": "hidden link tools, setting never named", "experience": "With Linked environments off, the default, an agent asked to delegate to the user's VPS searched for t3_environment_link, then said the tool was not in this build and never named the setting that turns it on.", "rule": "The link tools are absent while Settings → Labs → Linked environments is off; the agent tells the user to turn it on there.", "privacy": "commit-safe", "setup": {"role": "top"}, "prompt": "Delegate this to my vps: run `uname -a` there and tell me the result. Do not edit any files here.", "expect": {"textMust": ["Labs", "Linked environments"], "notCalls": ["delegate_task", "t3_environment_links", "t3_environment_link"]}, "source": {"issue": "pingdotgg/t3code#30358"}}
+{"id": "vps-delegate-links-on-calls-link", "area": "orchestration", "kind": "control", "pattern": "unlinked machine with Linked environments on", "experience": "With Linked environments on, a machine the user names that is not linked gets a t3_environment_link card, not advice to turn the setting on.", "rule": "A machine the user names that is not linked: call t3_environment_link with a hint from their words.", "privacy": "commit-safe", "setup": {"role": "top", "linkedEnvironments": true, "mocks": {"t3_environment_links": {"environmentId": "environment-laptop", "links": [], "notListed": "Not listed: not linked yet. Call t3_environment_link with a hint from the user's words."}, "t3_environment_link": {"status": "pending", "turnItemId": "turn-item-link-card-1"}}}, "prompt": "Delegate this to my vps: run `uname -a` there and tell me the result. Do not edit any files here.", "expect": {"calls": [{"tool": "t3_environment_link"}], "textMustNot": ["Labs", "([Tt]urn on|[Ee]nable)[^.\\n]*[Ll]inked environments"]}, "source": {"issue": "pingdotgg/t3code#30358"}}
+{"id": "background-wait-unmatched-id", "area": "orchestration", "kind": "guard", "pattern": "waits on a task ID that matches no background work, then ends the turn as if waiting", "experience": "One agent called t3_background_wait with the literal ID 'placeholder', another with a Claude subagent ID. The tool returned a normal result listing the ID under `unmatched`, so the agent said it would continue when the work came back and ended its turn. Nothing ever woke it.", "rule": "To wait for a background command or Monitor you started (tests, a build), call `t3_background_wait` with its task ID before you end your turn.", "privacy": "commit-safe", "setup": {"role": "top", "harness": "claude", "priorTurns": [{"role": "user", "text": "Run the full test suite in the background and fix whatever fails. It takes about 15 minutes."}, {"role": "assistant", "toolCalls": [{"tool": "Bash", "input": {"command": "vp test run", "description": "Run the full test suite", "run_in_background": true}, "result": "Command running in background with ID: bq7m2x9k. Output is being written to: /tmp/claude/tasks/bq7m2x9k.output"}, {"tool": "t3_background_wait", "input": {"taskIds": ["placeholder"]}, "result": "default"}]}], "world": {"backgroundTasks": ["bq7m2x9k"], "tests": "The suite started a minute ago and runs for about 15 minutes. Until then /tmp/claude/tasks/bq7m2x9k.output lists 38 passing test files and no failures yet."}}, "prompt": "I'm heading out for a bit. Tell me what failed when it's done.", "expect": {"calls": [{"tool": "t3_background_wait", "args": {"taskIds": ["bq7m2x9k"]}}]}, "source": {"issue": "#29772"}, "notes": "The seeded wait gets T3's real result for an ID the session does not know. The tests are still running, so the only way to keep the thread waiting is a wait on bq7m2x9k. In replay, Sonnet 5.5 and Opus 5.5 also recover from main's success result, so this guards the recovery rather than reproducing the incident. Claude only: t3_background_wait is a Claude tool.", "maxSteps": 8}
+{"id": "background-wait-matched-id", "area": "orchestration", "kind": "control", "pattern": "waits on the right task ID, then ends the turn", "experience": "With the background command's own ID registered, ending the turn is correct: T3 keeps the thread working and wakes it when the tests finish.", "rule": "To wait for a background command or Monitor you started (tests, a build), call `t3_background_wait` with its task ID before you end your turn.", "privacy": "commit-safe", "setup": {"role": "top", "harness": "claude", "priorTurns": [{"role": "user", "text": "Run the full test suite in the background and fix whatever fails. It takes about 15 minutes."}, {"role": "assistant", "toolCalls": [{"tool": "Bash", "input": {"command": "vp test run", "description": "Run the full test suite", "run_in_background": true}, "result": "Command running in background with ID: bq7m2x9k. Output is being written to: /tmp/claude/tasks/bq7m2x9k.output"}, {"tool": "t3_background_wait", "input": {"taskIds": ["bq7m2x9k"]}, "result": "default"}]}], "world": {"backgroundTasks": ["bq7m2x9k"], "tests": "The suite started a minute ago and runs for about 15 minutes. Until then /tmp/claude/tasks/bq7m2x9k.output lists 38 passing test files and no failures yet."}}, "prompt": "I'm heading out for a bit. Tell me what failed when it's done.", "expect": {"maxCalls": {"t3_background_wait": 1, "Bash": 3}, "notCalls": ["ScheduleWakeup"]}, "source": {"issue": "#29772"}, "notes": "Same thread as background-wait-unmatched-id, with a wait T3 matched. Guards against a fix that makes agents distrust a good wait and poll; a few looks at the output are ordinary. Claude only.", "maxSteps": 8}
 {"id": "settle-this-thread-after-cleanup", "area": "orchestration", "kind": "bad", "pattern": "settle read as plain English for finish", "experience": "Asked to clean up scratch files and settle this thread, the agent deleted the files and ended the turn without calling t3_thread_organize (#26749).", "rule": "A request to settle this thread calls t3_thread_organize with action settle.", "privacy": "commit-safe", "notes": "From #26749. Claude defers MCP tools, so only the tool's name is visible until ToolSearch loads it; 'settle' appears only in the t3_thread_organize description.", "setup": {"role": "top", "world": {"files": {"scratch/run-1.log": "ok\n", "scratch/run-2.log": "ok\n", "src/index.ts": "export const x = 1;\n"}}, "mocks": {"t3_thread_organize": {"settlesWhenTurnEnds": true}}}, "prompt": "Clean up the scratch files and settle this thread.", "expect": {"calls": [{"tool": "t3_thread_organize", "args": {"action": "settle"}}], "notCalls": ["t3_thread_update"]}}
 {"id": "settle-this-thread-bare", "area": "orchestration", "kind": "bad", "pattern": "settle read as plain English for finish", "experience": "After a finished Q&A, asked only to settle this thread, the agent replied in text and ended the turn without calling t3_thread_organize (#26749).", "rule": "A request to settle this thread calls t3_thread_organize with action settle.", "privacy": "commit-safe", "notes": "From #26749. The prior turn is general knowledge with no claims about the repo, so the only work left is settling.", "setup": {"role": "top", "priorTurns": [{"role": "user", "text": "In general, what's the difference between an HTTP 401 and a 403?"}, {"role": "assistant", "text": "A 401 means the request has no valid credentials, so the client should authenticate and try again. A 403 means the server knows who you are but won't let you do this, so retrying with the same credentials won't help."}], "mocks": {"t3_thread_organize": {"settlesWhenTurnEnds": true}}}, "prompt": "Makes sense, thanks. Settle this thread.", "expect": {"calls": [{"tool": "t3_thread_organize", "args": {"action": "settle"}}], "notCalls": ["t3_thread_update"]}}
 {"id": "settle-on-a-choice-is-not-organize", "area": "orchestration", "kind": "guard", "pattern": "settle read as plain English for finish", "experience": "Guard for the #26749 instruction: 'settle on' a choice is ordinary English and must not settle the thread.", "rule": "Only a request to settle a thread calls t3_thread_organize.", "privacy": "commit-safe", "notes": "Catches over-triggering on the settle bullet in the orchestration instructions.", "setup": {"role": "top", "world": {"files": {"src/db.ts": "export const driver = process.env.DB_DRIVER ?? 'sqlite';\n"}}}, "prompt": "We keep going back and forth on the database for this thread. Let's settle on Postgres: make it the default driver in src/db.ts.", "expect": {"notCalls": ["t3_thread_organize"]}}
diff --git a/evals/mcp-tool-use/run.test.ts b/evals/mcp-tool-use/run.test.ts
index 718cf5e87202..ec1a121fee48 100644
--- a/evals/mcp-tool-use/run.test.ts
+++ b/evals/mcp-tool-use/run.test.ts
@@ -39,6 +39,7 @@ import {
   t3Default,
   t3SystemAppend,
   t3SubagentContext,
+  withBackgroundWait,
   withDevices,
 } from "./run.ts";
 import { briefRoute, gradeDevice, shellInvocations } from "./device-grading.ts";
@@ -1146,6 +1147,42 @@ it.effect("builds device cases from product-backed worlds and synthetic prior tu
   }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
 );
 
+// Models recover from either result, so this keeps the guard case failing on the old success.
+it.effect("seeds T3's error for a prior background wait whose IDs match nothing", () =>
+  Effect.gen(function* () {
+    const cases = NodeFS.readFileSync(
+      new URL("./cases/orchestration.ndjson", import.meta.url),
+      "utf8",
+    )
+      .trim()
+      .split("\n")
+      .map((line) => decodeDeviceCase(line));
+    const base = buildBase(template, { model: "claude-sonnet-5-5", keepUserInstructions: false });
+    for (const [id, isError] of [
+      ["background-wait-unmatched-id", true],
+      ["background-wait-matched-id", false],
+    ] as const) {
+      const testCase = cases.find((c) => c.id === id)!;
+      const [wait] = (testCase.setup.priorTurns ?? [])
+        .flatMap((turn) => turn.toolCalls ?? [])
+        .filter((call) => call.tool === "t3_background_wait");
+      assert.isDefined(wait, id);
+      const sample = makeSample(testCase, base);
+      yield* withBackgroundWait(sample);
+      assert.equal(sample.priorErrors.has(wait), isError, id);
+      const blocks = buildMessages(sample).flatMap((message) => message.content);
+      const waitUse = blocks.find(
+        (block) => block.type === "tool_use" && String(block.name).endsWith("t3_background_wait"),
+      );
+      const replayed = blocks.find(
+        (block) => block.type === "tool_result" && block.tool_use_id === waitUse?.id,
+      );
+      assert.isDefined(replayed, id);
+      assert.equal(replayed?.is_error === true, isError, id);
+    }
+  }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
+);
+
 const secretCases = () =>
   NodeFS.readFileSync(new URL("./cases/secrets.ndjson", import.meta.url), "utf8")
     .trim()
diff --git a/evals/mcp-tool-use/run.ts b/evals/mcp-tool-use/run.ts
index 0ca13fe14fea..764b39b1e4b9 100644
--- a/evals/mcp-tool-use/run.ts
+++ b/evals/mcp-tool-use/run.ts
@@ -72,6 +72,7 @@ import {
 } from "../../apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts";
 import { proxyConfig } from "../shared/proxy.ts";
 import { changeRequestsCreatedBy } from "../../apps/server/src/orchestration-v2/PullRequestSyncReactor.ts";
+import { type BackgroundWait, makeBackgroundWait } from "./backgroundWait.ts";
 import { DeviceExpect, gradeDevice } from "./device-grading.ts";
 import { FileLinksExpect, gradeFileLinks } from "./file-link-grading.ts";
 import {
@@ -168,7 +169,10 @@ const Rest = [Schema.Record(Schema.String, Schema.Unknown)] as const;
 const PriorToolCall = Schema.Struct({
   tool: Schema.String,
   input: Schema.Unknown,
-  /** For a device tool, `"default"` runs the call on the world's devices for T3's result. */
+  /**
+   * For a device tool or t3_background_wait, `"default"` runs the call on the world's devices or
+   * background tasks for T3's result.
+   */
   result: Schema.Unknown,
   /** Repository-relative file whose current contents supply this tool result. */
   resultFile: Schema.optional(Schema.String),
@@ -273,6 +277,11 @@ const McpToolUseWorld = Schema.StructWithRest(
     deviceInvalidCapture: Schema.optional(Schema.Boolean),
     /** Devices another thread's agent-device session holds, by device id: that thread's id. */
     deviceOwners: Schema.optional(Schema.Record(Schema.String, Schema.String)),
+    /**
+     * Task IDs of the background commands and Monitors still running on the agent's Claude
+     * session. With them, T3's own t3_background_wait handler answers from this world.
+     */
+    backgroundTasks: Schema.optional(Schema.Array(Schema.String)),
     /** PRs already linked to the thread, with the state T3 last saw. */
     linkedPullRequests: Schema.optional(
       Schema.Array(
@@ -860,6 +869,10 @@ type Sample = {
   devices?: DeviceTools;
   /** T3's results for prior device calls whose case result is "default". */
   readonly priorResults: Map<unknown, string>;
+  /** Prior calls whose T3 result is an error, so the agent sees it as one. */
+  readonly priorErrors: Set<unknown>;
+  /** T3's t3_background_wait, once `withBackgroundWait` builds it for `world.backgroundTasks`. */
+  backgroundWait?: BackgroundWait;
   /** Calls so far per mocked tool, for mocks that answer in sequence. */
   readonly mockCalls: Map<string, number>;
 };
@@ -906,6 +919,7 @@ export const makeSample = (testCase: McpToolUseCase, base: Base): Sample => {
     secretFiles: [],
     secretRequests: 0,
     priorResults: new Map(),
+    priorErrors: new Set(),
     mockCalls: new Map(),
   };
 };
@@ -937,6 +951,25 @@ export const withDevices = Effect.fn("evaluateMcpToolUse.withDevices")(function*
   }
 });
 
+/**
+ * Builds T3's t3_background_wait for a world with background tasks, and answers prior waits whose
+ * result is "default" with T3's result.
+ */
+export const withBackgroundWait = Effect.fn("evaluateMcpToolUse.withBackgroundWait")(function* (
+  sample: Sample,
+) {
+  const running = sample.testCase.setup.world?.backgroundTasks;
+  if (running === undefined) return;
+  const backgroundWait = yield* makeBackgroundWait(running);
+  sample.backgroundWait = backgroundWait;
+  for (const call of (sample.testCase.setup.priorTurns ?? []).flatMap((t) => t.toolCalls ?? [])) {
+    if (call.result !== "default" || call.tool !== "t3_background_wait") continue;
+    const result = yield* backgroundWait(call.input);
+    sample.priorResults.set(call, result.text);
+    if (result.isError) sample.priorErrors.add(call);
+  }
+});
+
 // Main's history under every case's world.
 const MAIN_COMMITS = [
   { sha: "9f2c1ab", subject: "feat(web): show the model name in the thread header" },
@@ -1024,8 +1057,13 @@ export const buildMessages = (sample: Sample) => {
     const calls = (turn.toolCalls ?? []).map((call) => {
       const tool = findTool(base, call.tool);
       if (tool === undefined) throw new Error(`${testCase.id}: unknown prior tool ${call.tool}.`);
-      if (call.result === "default" && isDeviceTool(call.tool) && !sample.priorResults.has(call)) {
-        throw new Error(`${testCase.id}: prior ${call.tool} needs T3's result; run withDevices.`);
+      const builder = isDeviceTool(call.tool)
+        ? "withDevices"
+        : call.tool === "t3_background_wait"
+          ? "withBackgroundWait"
+          : undefined;
+      if (call.result === "default" && builder && !sample.priorResults.has(call)) {
+        throw new Error(`${testCase.id}: prior ${call.tool} needs T3's result; run ${builder}.`);
       }
       return { ...call, id: `toolu_prior_${nextId++}`, name: tool.name, tool, prior: call };
     });
@@ -1047,7 +1085,8 @@ export const buildMessages = (sample: Sample) => {
         normalizeToolName(tool.name) === "orchestrator_capabilities"
           ? capabilities(sample, result)
           : (sample.priorResults.get(prior) ?? result);
-      push("user", toolResult(id, replayed));
+      const answer = toolResult(id, replayed);
+      push("user", sample.priorErrors.has(prior) ? { ...answer, is_error: true } : answer);
     }
     if (turn.text) push(turn.role, text(turn.text));
   }
@@ -1263,15 +1302,19 @@ export const t3Default = (
       return { ...pr(), watching: true, wasWatching: false };
     case "unwatch_pull_request":
       return { ...pr(), watching: false, wasWatching: true };
-    case "list_thread_pull_requests":
+    case "list_thread_pull_requests": {
+      const states = Array.isArray(input.states) ? input.states : undefined;
+      const matching = [...sample.linked]
+        .map((url) => ({ ...linkedEntry(sample, url), source: "agent", watching: false }))
+        .filter((entry) => states === undefined || states.includes(entry.state));
+      const start = Number(valueText(input.cursor)) || 0;
+      const end = start + 50;
       return {
-        pullRequests: [...sample.linked].map((url) => ({
-          ...linkedEntry(sample, url),
-          source: "agent",
-          watching: false,
-        })),
+        pullRequests: matching.slice(start, end),
         chains: [],
+        nextCursor: end < matching.length ? String(end) : null,
       };
+    }
     case "t3_thread_read": {
       const threadId = valueText(input.threadId);
       const launched = sample.threads.get(threadId);
@@ -1640,6 +1683,10 @@ export const answerToolCall = Effect.fn("evaluateMcpToolUse.answerToolCall")(fun
     const result = yield* sample.devices.call(name, input, failure);
     return result.isError ? failed(result.text) : toolResult(call.id, result.text);
   }
+  if (sample.backgroundWait && isT3Name(call.name) && name === "t3_background_wait" && fromWorld) {
+    const result = yield* sample.backgroundWait(input);
+    return result.isError ? failed(result.text) : toolResult(call.id, result.text);
+  }
   // A pasted secret is saved without a card, so a mocked card outcome does not apply.
   if (mock !== undefined && mock !== "default" && !pastedSecret(name, input)) {
     if (name === "request_secret") savedSecretFile(sample, mock);
@@ -2142,6 +2189,7 @@ const runSample = Effect.fn("evaluateMcpToolUse.runSample")(function* (
 ) {
   const sample = { ...makeSample(testCase, base), shellUsage: spent.shellUsage };
   yield* withDevices(sample);
+  yield* withBackgroundWait(sample);
   const runPromise = Effect.runPromiseWith(yield* Effect.context<HttpClient.HttpClient>());
   const messages = buildMessages(sample);
   const input = base.codex ? codexMessages(messages) : undefined;
@@ -2562,7 +2610,7 @@ const main = Effect.gen(function* () {
     // One JSON line per case. Without --case this also checks that every case builds.
     for (const testCase of selected) {
       const sample = makeSample(testCase, baseFor(testCase));
-      yield* Effect.scoped(withDevices(sample));
+      yield* Effect.scoped(Effect.andThen(withDevices(sample), withBackgroundWait(sample)));
       const messages = buildMessages(sample);
       const body = sample.base.codex
         ? codexRequest(sample.base, codexMessages(messages))
diff --git a/packages/client-runtime/src/device/stream.test.ts b/packages/client-runtime/src/device/stream.test.ts
index 720e6b78b53b..ad930680fbeb 100644
--- a/packages/client-runtime/src/device/stream.test.ts
+++ b/packages/client-runtime/src/device/stream.test.ts
@@ -471,6 +471,21 @@ describe("shared device stream readiness and recovery", () => {
     client.stop();
   });
 
+  it("stops retrying a Simlock lease that ended and keeps its reason", async () => {
+    const { client, events, fetch, sockets, videoBodies } = recoveryFixture("ios", false, true);
+    client.start();
+    await vi.advanceTimersByTimeAsync(0);
+    const reason = [...new TextEncoder().encode('{"reason":"expired"}')];
+    videoBodies[0]!.enqueue(new Uint8Array([...envelope(4, [1]), ...envelope(7, reason)]));
+    videoBodies[0]!.close();
+    sockets[0]!.onclose?.({ code: 4001, reason: "expired" });
+    await vi.advanceTimersByTimeAsync(5_000);
+    expect(fetch.mock.calls.filter(([url]) => url.includes("stream.avcc"))).toHaveLength(1);
+    expect(sockets).toHaveLength(1);
+    expect(events.onStatus).toHaveBeenLastCalledWith("error", expect.stringContaining("expired"));
+    client.stop();
+  });
+
   it("does not repaint a delayed JPEG seed over newer decoded video", async () => {
     const { client, videoBodies, drawImage, decodedFrame } = recoveryFixture("ios", false);
     let resolveBitmap!: (bitmap: ImageBitmap) => void;
diff --git a/packages/client-runtime/src/device/stream.ts b/packages/client-runtime/src/device/stream.ts
index 6269b1df0fd9..8af40437cdd2 100644
--- a/packages/client-runtime/src/device/stream.ts
+++ b/packages/client-runtime/src/device/stream.ts
@@ -74,6 +74,10 @@ const serveSimApiSchema = Schema.Struct({
 const decodeServeSimApi = Schema.decodeUnknownOption(serveSimApiSchema);
 const decodeWebRtcSettings = Schema.decodeUnknownOption(webRtcSettingsSchema);
 type WebRtcSettings = typeof webRtcSettingsSchema.Type;
+const decodeLeaseEnd = Schema.decodeUnknownOption(
+  Schema.fromJsonString(Schema.Struct({ reason: Schema.String })),
+);
+const leaseEnded = (reason: string) => `Device lease ended: ${reason}`;
 const decodeTransportLocked = Schema.decodeUnknownOption(
   Schema.Struct({
     error: Schema.Literal("stream_transport_locked"),
@@ -249,7 +253,7 @@ export function scanAccessUnit(buf: Uint8Array): { isKey: boolean; sps: Uint8Arr
 }
 
 export type AvccChunk = {
-  readonly type: "description" | "keyframe" | "delta" | "seed";
+  readonly type: "description" | "keyframe" | "delta" | "seed" | "end";
   readonly payload: Uint8Array;
 };
 
@@ -258,6 +262,8 @@ const AVCC_TAGS: Record<number, AvccChunk["type"] | undefined> = {
   2: "keyframe",
   3: "delta",
   4: "seed",
+  // Simlock's final frame on a lease that ended, carrying `{ reason }`.
+  7: "end",
 };
 
 export class AvccDemuxer {
@@ -716,6 +722,7 @@ export function createDeviceStreamClient(
       videoGeneration === feedGeneration &&
       controller === videoController;
     let retryDetail: string | undefined;
+    let leaseEnd: string | undefined;
     try {
       const response = await fetch(httpUrl(videoPath), {
         signal: videoController.signal,
@@ -807,6 +814,11 @@ export function createDeviceStreamClient(
             case "delta":
               decode(chunk.type === "keyframe", chunk.payload);
               break;
+            case "end": {
+              const end = decodeLeaseEnd(decoder.decode(chunk.payload));
+              leaseEnd = Option.isSome(end) ? end.value.reason : "ended";
+              break;
+            }
           }
         }
       }
@@ -817,6 +829,7 @@ export function createDeviceStreamClient(
         : (cause as Error).message;
     }
     if (isCurrent()) {
+      if (leaseEnd !== undefined) return fail(leaseEnded(leaseEnd));
       controller = null;
       videoController.abort();
       closeDecoder();
@@ -1164,6 +1177,7 @@ export function createDeviceStreamClient(
       duoControl.clear();
       rotationCursor = null;
       if (stopped) return;
+      if (event.code === 4001) return fail(leaseEnded(event.reason || "ended"));
       events.onInputConnected(
         false,
         event.reason || (event.code === 1006 ? "input socket refused" : `closed ${event.code}`),
diff --git a/packages/client-runtime/src/mcpApps/host.test.ts b/packages/client-runtime/src/mcpApps/host.test.ts
index 3e19e753d43d..4084d2c92ae6 100644
--- a/packages/client-runtime/src/mcpApps/host.test.ts
+++ b/packages/client-runtime/src/mcpApps/host.test.ts
@@ -325,7 +325,7 @@ describe("makeMcpAppHost", () => {
 
   it("forwards model context and download requests, and declares both", async () => {
     const contexts: Array<unknown> = [];
-    const downloads: Array<unknown> = [];
+    const downloads: Array<ReadonlyArray<{ readonly name: string }>> = [];
     const { host, sent } = setup({
       updateModelContext: async (update) => void contexts.push(update),
       downloadFile: async (files) => {
@@ -349,6 +349,7 @@ describe("makeMcpAppHost", () => {
         structuredContent: { overdue: 2, since: undefined },
       },
     });
+    const longName = `${"a".repeat(199)}😀.csv`;
     const embedded = {
       type: "resource",
       resource: { uri: "file:///report.csv", mimeType: "text/csv", text: "a,b" },
@@ -364,7 +365,7 @@ describe("makeMcpAppHost", () => {
       id: 3,
       method: "ui/download-file",
       params: {
-        contents: [embedded, { type: "resource_link", uri: "ui://todos/export", name: "x" }],
+        contents: [embedded, { type: "resource_link", uri: "ui://todos/export", name: longName }],
       },
     });
     host.receive({ jsonrpc: "2.0", id: 4, method: "ui/download-file", params: { contents: [{}] } });
@@ -380,6 +381,9 @@ describe("makeMcpAppHost", () => {
         bytes: new TextEncoder().encode("a,b"),
       },
     ]);
+    const capped = downloads[1]?.[1]?.name ?? "";
+    expect(capped.length).toBeLessThanOrEqual(200);
+    expect(capped.isWellFormed()).toBe(true);
     expect(sent.find((m) => m.id === 2)?.result).toEqual({});
     expect(sent.find((m) => m.id === 3)?.result).toEqual({ isError: true });
     expect(sent.find((m) => m.id === 4)?.error).toMatchObject({ code: -32602 });
diff --git a/packages/client-runtime/src/mcpApps/host.ts b/packages/client-runtime/src/mcpApps/host.ts
index e6bb82f916d1..065508a2ee44 100644
--- a/packages/client-runtime/src/mcpApps/host.ts
+++ b/packages/client-runtime/src/mcpApps/host.ts
@@ -482,10 +482,13 @@ function downloadName(uri: unknown, name: unknown): string {
       : typeof uri === "string"
         ? (uri.split(/[/?#]/).findLast(Boolean) ?? "download")
         : "download";
-  const safe = Array.from(raw, (char) =>
-    /[\\/:*?"<>|]/.test(char) || char.charCodeAt(0) < 32 ? "-" : char,
-  ).join("");
-  return safe.slice(0, MAX_DOWNLOAD_NAME) || "download";
+  let safe = "";
+  for (const char of raw) {
+    const next = /[\\/:*?"<>|]/.test(char) || char.charCodeAt(0) < 32 ? "-" : char;
+    if (safe.length + next.length > MAX_DOWNLOAD_NAME) break;
+    safe += next;
+  }
+  return safe || "download";
 }
 
 function readDownloads(contents: unknown): ReadonlyArray<McpAppDownload> | undefined {
diff --git a/packages/client-runtime/src/preview/serverBrowserStream.ts b/packages/client-runtime/src/preview/serverBrowserStream.ts
index 617c1d18424f..75b45c57e721 100644
--- a/packages/client-runtime/src/preview/serverBrowserStream.ts
+++ b/packages/client-runtime/src/preview/serverBrowserStream.ts
@@ -90,6 +90,7 @@ export type PreviewStreamInput =
   | { readonly type: "navigate"; readonly url: string }
   | { readonly type: "history"; readonly delta: -1 | 1 }
   | { readonly type: "reload"; readonly ignoreCache?: boolean }
+  | { readonly type: "stopLoading" }
   | { readonly type: "probe"; readonly x: number; readonly y: number };
 
 export interface PreviewStreamDownload {
diff --git a/packages/client-runtime/src/relay/discovery.test.ts b/packages/client-runtime/src/relay/discovery.test.ts
index 9332652df39b..2d1f20b79fcb 100644
--- a/packages/client-runtime/src/relay/discovery.test.ts
+++ b/packages/client-runtime/src/relay/discovery.test.ts
@@ -185,48 +185,46 @@ const makeHarness = Effect.fn("RelayDiscoveryTest.makeHarness")(function* () {
 
 describe("RelayEnvironmentDiscovery", () => {
   it.effect("fetches a fresh list after removal while an older refresh is checking statuses", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const harness = yield* makeHarness();
-        yield* Effect.gen(function* () {
-          const discovery = yield* RelayEnvironmentDiscovery.RelayEnvironmentDiscovery;
-          const atoms = createRelayEnvironmentDiscoveryAtoms(
-            Atom.runtime(
-              Layer.succeed(RelayEnvironmentDiscovery.RelayEnvironmentDiscovery, discovery),
-            ),
-          );
-          const registry = AtomRegistry.make();
-          yield* Effect.addFinalizer(() => Effect.sync(() => registry.dispose()));
+    Effect.gen(function* () {
+      const harness = yield* makeHarness();
+      yield* Effect.gen(function* () {
+        const discovery = yield* RelayEnvironmentDiscovery.RelayEnvironmentDiscovery;
+        const atoms = createRelayEnvironmentDiscoveryAtoms(
+          Atom.runtime(
+            Layer.succeed(RelayEnvironmentDiscovery.RelayEnvironmentDiscovery, discovery),
+          ),
+        );
+        const registry = AtomRegistry.make();
+        yield* Effect.addFinalizer(() => Effect.sync(() => registry.dispose()));
 
-          const refresh = atoms.refresh.run(registry, undefined);
-          yield* SubscriptionRef.changes(discovery.state).pipe(
-            Stream.filter((state) => state.environments.size === environments.length),
-            Stream.runHead,
-          );
-          const coalescedRefresh = atoms.refresh.run(registry, undefined);
-          yield* Ref.set(harness.listedEnvironments, [environments[1]!]);
-          const mutationRefresh = atoms.refreshAfterMutation.run(registry, undefined);
+        const refresh = atoms.refresh.run(registry, undefined);
+        yield* SubscriptionRef.changes(discovery.state).pipe(
+          Stream.filter((state) => state.environments.size === environments.length),
+          Stream.runHead,
+        );
+        const coalescedRefresh = atoms.refresh.run(registry, undefined);
+        yield* Ref.set(harness.listedEnvironments, [environments[1]!]);
+        const mutationRefresh = atoms.refreshAfterMutation.run(registry, undefined);
 
-          const requests = yield* Ref.get(harness.statusRequests);
-          for (const environment of environments) {
-            yield* Deferred.succeed(
-              requests.get(environment.environmentId)!,
-              status(environment, "online"),
-            );
-          }
-          const results = yield* Effect.promise(() =>
-            Promise.all([refresh, coalescedRefresh, mutationRefresh]),
+        const requests = yield* Ref.get(harness.statusRequests);
+        for (const environment of environments) {
+          yield* Deferred.succeed(
+            requests.get(environment.environmentId)!,
+            status(environment, "online"),
           );
-          for (const result of results) {
-            expect(result._tag).toBe("Success");
-          }
-          expect(yield* Ref.get(harness.listCalls)).toBe(2);
-          const complete = yield* SubscriptionRef.get(discovery.state);
-          expect([...complete.environments.keys()]).toEqual([environments[1]!.environmentId]);
-          expect(complete.refreshing).toBe(false);
-        }).pipe(Effect.provide(harness.layer));
-      }),
-    ),
+        }
+        const results = yield* Effect.promise(() =>
+          Promise.all([refresh, coalescedRefresh, mutationRefresh]),
+        );
+        for (const result of results) {
+          expect(result._tag).toBe("Success");
+        }
+        expect(yield* Ref.get(harness.listCalls)).toBe(2);
+        const complete = yield* SubscriptionRef.get(discovery.state);
+        expect([...complete.environments.keys()]).toEqual([environments[1]!.environmentId]);
+        expect(complete.refreshing).toBe(false);
+      }).pipe(Effect.provide(harness.layer));
+    }),
   );
 
   it.effect("publishes each environment status as soon as that lookup completes", () =>
diff --git a/packages/client-runtime/src/rpc/client.test.ts b/packages/client-runtime/src/rpc/client.test.ts
index 9207ff1aafd5..de99737a28dd 100644
--- a/packages/client-runtime/src/rpc/client.test.ts
+++ b/packages/client-runtime/src/rpc/client.test.ts
@@ -7,15 +7,17 @@ import {
 } from "@t3tools/contracts";
 import { describe, expect, it } from "@effect/vitest";
 import * as Cause from "effect/Cause";
+import * as Clock from "effect/Clock";
 import * as Deferred from "effect/Deferred";
 import * as Effect from "effect/Effect";
 import * as Fiber from "effect/Fiber";
 import * as Option from "effect/Option";
 import * as Queue from "effect/Queue";
 import * as Ref from "effect/Ref";
+import * as Schema from "effect/Schema";
 import * as Stream from "effect/Stream";
-import * as TestClock from "effect/testing/TestClock";
 import * as SubscriptionRef from "effect/SubscriptionRef";
+import * as TestClock from "effect/testing/TestClock";
 import { RpcClientError } from "effect/rpc";
 
 import {
@@ -45,6 +47,8 @@ const INSTALL_DOWNLOADING: RelayClientInstallProgressEvent = {
   stage: "downloading",
 };
 
+const decodeNumber = Schema.decodeUnknownEffect(Schema.Number);
+
 function session(client: WsRpcProtocolClient): RpcSession.RpcSession {
   return {
     client,
@@ -265,6 +269,8 @@ describe("environment RPC", () => {
       while (subscriptions.length < 2) {
         yield* Queue.take(subscriptionChanges);
       }
+      // The pending same-session retry must not resubscribe the replaced session.
+      yield* TestClock.adjust("1 minute");
       yield* Fiber.interrupt(subscriptionFiber);
 
       expect(subscriptions).toEqual(["first", "second"]);
@@ -272,6 +278,136 @@ describe("environment RPC", () => {
     }),
   );
 
+  // The session stays healthy (`closed` never resolves), as when one stream chunk fails to decode,
+  // so the supervisor will not replace it and only resubscribing restores delivery.
+  const resumesOnTheSameSession = Effect.fn("TestEnvironmentRpc.resumesOnTheSameSession")(
+    function* (streamFailure: Stream.Stream<never, unknown>) {
+      const resumedValue = { source: "resumed" } as unknown as ServerLifecycleStreamEvent;
+      const firstSubscribed = yield* Deferred.make<void>();
+      let subscriptions = 0;
+      const client = {
+        [WS_METHODS.subscribeServerLifecycle]: () => {
+          subscriptions += 1;
+          return subscriptions === 1
+            ? Stream.fromEffect(Deferred.succeed(firstSubscribed, undefined)).pipe(
+                Stream.drain,
+                Stream.concat(streamFailure),
+              )
+            : Stream.make(resumedValue).pipe(Stream.concat(Stream.never));
+        },
+      } as unknown as WsRpcProtocolClient;
+      const { activeSession, retryCount, supervisor } = yield* makeHarness();
+
+      yield* SubscriptionRef.set(activeSession, Option.some(session(client)));
+      const resultFiber = yield* subscribe(WS_METHODS.subscribeServerLifecycle, {}).pipe(
+        Stream.runHead,
+        Effect.timeoutOption("2 seconds"),
+        Effect.provideService(EnvironmentSupervisor.EnvironmentSupervisor, supervisor),
+        Effect.forkChild,
+      );
+      yield* Deferred.await(firstSubscribed);
+      yield* TestClock.adjust("2 seconds");
+
+      expect(
+        yield* Fiber.join(resultFiber),
+        "durable subscription stopped delivering after its stream ended on a healthy session",
+      ).toEqual(Option.some(Option.some(resumedValue)));
+      expect(subscriptions).toBe(2);
+      expect(yield* Ref.get(retryCount)).toBe(0);
+    },
+  );
+
+  it.effect("resubscribes on the same session after a transport failure", () =>
+    resumesOnTheSameSession(
+      Stream.fail(
+        new RpcClientError.RpcClientError({
+          reason: new RpcClientError.RpcClientDefect({
+            message: "stream failed",
+            cause: new Error("stream failed"),
+          }),
+        }),
+      ),
+    ),
+  );
+
+  it.effect("resubscribes on the same session after a stream chunk fails to decode", () =>
+    // Mirrors RpcClient, which decodes each chunk with `Effect.orDie`.
+    resumesOnTheSameSession(
+      Stream.fromEffect(decodeNumber("not a number").pipe(Effect.orDie)).pipe(Stream.drain),
+    ),
+  );
+
+  it.effect(
+    "backs off a same-session stream that keeps failing to decode after its first value",
+    () =>
+      Effect.gen(function* () {
+        // Like the shell stream: a valid value (metadata) arrives, then a chunk fails to decode.
+        const value = { source: "metadata" } as unknown as ServerLifecycleStreamEvent;
+        const decodeDefect = decodeNumber("not a number").pipe(Effect.orDie);
+        const subscriptions = yield* Queue.unbounded<{
+          readonly session: "first" | "second";
+          readonly at: number;
+        }>();
+        let secondSubscriptions = 0;
+        const failingClient = (name: "first" | "second") =>
+          ({
+            [WS_METHODS.subscribeServerLifecycle]: () =>
+              Stream.unwrap(
+                Effect.gen(function* () {
+                  yield* Queue.offer(subscriptions, {
+                    session: name,
+                    at: yield* Clock.currentTimeMillis,
+                  });
+                  if (name === "second" && ++secondSubscriptions > 2) return Stream.never;
+                  return Stream.make(value).pipe(
+                    Stream.concat(Stream.fromEffect(decodeDefect).pipe(Stream.drain)),
+                  );
+                }),
+              ),
+          }) as unknown as WsRpcProtocolClient;
+        const { activeSession, retryCount, supervisor } = yield* makeHarness();
+
+        yield* SubscriptionRef.set(activeSession, Option.some(session(failingClient("first"))));
+        const subscriptionFiber = yield* subscribe(
+          WS_METHODS.subscribeServerLifecycle,
+          {},
+          {
+            onExpectedFailure: () => Effect.void,
+            retryExpectedFailureAfter: "250 millis",
+          },
+        ).pipe(
+          Stream.runDrain,
+          Effect.provideService(EnvironmentSupervisor.EnvironmentSupervisor, supervisor),
+          Effect.forkChild,
+        );
+
+        const expectedFirstSessionDelays = [250, 500, 1_000, 2_000, 4_000, 8_000, 16_000, 30_000];
+        const firstSessionDelays: number[] = [];
+        let previous = yield* Queue.take(subscriptions);
+        for (const delay of expectedFirstSessionDelays) {
+          yield* TestClock.adjust(delay);
+          const next = yield* Queue.take(subscriptions);
+          firstSessionDelays.push(next.at - previous.at);
+          previous = next;
+        }
+
+        // A replacement session starts a fresh backoff.
+        yield* SubscriptionRef.set(activeSession, Option.some(session(failingClient("second"))));
+        const replaced = yield* Queue.take(subscriptions);
+        yield* TestClock.adjust(250);
+        const retried = yield* Queue.take(subscriptions);
+        yield* Fiber.interrupt(subscriptionFiber);
+
+        expect(
+          firstSessionDelays,
+          "same-session decode retries reset to the base delay after every first value",
+        ).toEqual(expectedFirstSessionDelays);
+        expect([replaced.session, retried.session]).toEqual(["second", "second"]);
+        expect(retried.at - replaced.at).toBe(250);
+        expect(yield* Ref.get(retryCount)).toBe(0);
+      }),
+  );
+
   it.effect("surfaces domain subscription failures without reconnecting", () =>
     Effect.gen(function* () {
       const domainError = new Error("terminal subscription rejected");
@@ -445,7 +581,7 @@ it.effect.each([true, false])(
         ),
       ).toBeUndefined();
       expect(inputs).toEqual(supported ? [{ cwd: "/repo" }] : []);
-    }).pipe(Effect.scoped),
+    }),
 );
 
 it.effect("binds branch capability selection and execution to one session", () =>
@@ -481,5 +617,5 @@ it.effect("binds branch capability selection and execution to one session", () =
     } as ServerConfig);
     expect(yield* Fiber.join(refresh)).toBeUndefined();
     yield* Deferred.await(executed);
-  }).pipe(Effect.scoped),
+  }),
 );
diff --git a/packages/client-runtime/src/rpc/client.ts b/packages/client-runtime/src/rpc/client.ts
index 93e3f47121b2..ee70400ca47a 100644
--- a/packages/client-runtime/src/rpc/client.ts
+++ b/packages/client-runtime/src/rpc/client.ts
@@ -68,6 +68,7 @@ export type EnvironmentSubscriptionRpcTag =
   | typeof WS_METHODS.subscribeDeviceState
   | typeof WS_METHODS.subscribeResourceTelemetry
   | typeof WS_METHODS.pullRequestsSubscribeRefreshes
+  | typeof WS_METHODS.pullRequestsSubscribeLinkedThreadRefreshes
   | typeof WS_METHODS.subscribeVcsStatus
   | typeof WS_METHODS.subscribeVcsBranch
   | typeof WS_METHODS.subscribeWorktreeSetup
@@ -113,6 +114,7 @@ export const isAuthorizationFailure = (cause: Cause.Cause<unknown>) =>
   );
 
 const MAX_EXPECTED_FAILURE_RETRY_DELAY_MS = 30_000;
+const STREAM_FAILURE_RETRY_DELAY = Duration.seconds(1);
 
 export const subscriptionRetryDelay = (base: Duration.Input, retries: number) =>
   Duration.millis(
@@ -317,6 +319,8 @@ function subscribeDynamicMapped<TTag extends EnvironmentSubscriptionRpcTag, A>(
                 EnvironmentRpcStreamFailure<TTag>
               >;
               let expectedFailureRetries = 0;
+              // Not reset by a first value: a stream can emit before every chunk failure.
+              let streamFailureRetries = 0;
               const subscribeToSession = (): Stream.Stream<A, EnvironmentRpcStreamFailure<TTag>> =>
                 Stream.suspend(() =>
                   Stream.unwrap(
@@ -353,6 +357,11 @@ function subscribeDynamicMapped<TTag extends EnvironmentSubscriptionRpcTag, A>(
                         : Effect.void,
                     ),
                     Stream.catchCause((cause) => {
+                      const retryAfter = (base: Duration.Input, retries: number) =>
+                        Stream.fromEffect(Effect.sleep(subscriptionRetryDelay(base, retries))).pipe(
+                          Stream.drain,
+                          Stream.concat(subscribeToSession()),
+                        );
                       const hasOnlyExpectedFailures =
                         cause.reasons.length > 0 &&
                         cause.reasons.every((reason) => reason._tag === "Fail");
@@ -361,7 +370,22 @@ function subscribeDynamicMapped<TTag extends EnvironmentSubscriptionRpcTag, A>(
                         cause.reasons.every(
                           (reason) => reason._tag === "Fail" && isRpcClientError(reason.error),
                         );
-                      if (isTransportFailure) {
+                      // The RPC client dies with a SchemaError when one stream chunk fails to
+                      // decode, ending only that request while the socket stays open. A caller
+                      // with `onDefect` owns its defect recovery.
+                      const isChunkDecodeDefect =
+                        options?.onDefect === undefined &&
+                        cause.reasons.length > 0 &&
+                        cause.reasons.every(
+                          (reason) => reason._tag === "Die" && Schema.isSchemaError(reason.defect),
+                        );
+                      // Both end one stream while the session can stay healthy, so nothing else
+                      // would replace it. A dead session is replaced by the supervisor, which
+                      // interrupts this retry through switchMap. A finite search must settle
+                      // rather than restart, so it keeps waiting for the next session.
+                      const resubscribesOnSameSession =
+                        tag !== ORCHESTRATION_V2_WS_METHODS.searchThreadStream;
+                      if (isTransportFailure && !resubscribesOnSameSession) {
                         return Stream.fromEffect(
                           Effect.logWarning(
                             "Durable RPC subscription lost its transport; waiting for the next session.",
@@ -373,6 +397,29 @@ function subscribeDynamicMapped<TTag extends EnvironmentSubscriptionRpcTag, A>(
                           ),
                         ).pipe(Stream.drain);
                       }
+                      if (
+                        resubscribesOnSameSession &&
+                        (isTransportFailure || isChunkDecodeDefect)
+                      ) {
+                        return Stream.fromEffect(
+                          Effect.logWarning(
+                            "Durable RPC subscription stream ended; resubscribing.",
+                            {
+                              cause: Cause.pretty(cause),
+                              method: tag,
+                              environmentId: supervisor.target.environmentId,
+                            },
+                          ),
+                        ).pipe(
+                          Stream.drain,
+                          Stream.concat(
+                            retryAfter(
+                              options?.retryExpectedFailureAfter ?? STREAM_FAILURE_RETRY_DELAY,
+                              streamFailureRetries++,
+                            ),
+                          ),
+                        );
+                      }
                       if (hasOnlyExpectedFailures && options?.onExpectedFailure !== undefined) {
                         const handled = Stream.fromEffect(options.onExpectedFailure(cause)).pipe(
                           Stream.drain,
@@ -383,16 +430,10 @@ function subscribeDynamicMapped<TTag extends EnvironmentSubscriptionRpcTag, A>(
                         ) {
                           return handled;
                         }
-                        const retryDelay = subscriptionRetryDelay(
-                          options.retryExpectedFailureAfter,
-                          expectedFailureRetries,
-                        );
-                        expectedFailureRetries += 1;
                         return handled.pipe(
                           Stream.concat(
-                            Stream.fromEffect(Effect.sleep(retryDelay)).pipe(Stream.drain),
+                            retryAfter(options.retryExpectedFailureAfter, expectedFailureRetries++),
                           ),
-                          Stream.concat(subscribeToSession()),
                         );
                       }
                       // A reported defect parks until the next session or resubscribe. Failing would
diff --git a/packages/client-runtime/src/rpc/session.test.ts b/packages/client-runtime/src/rpc/session.test.ts
index 941b93111a72..cc1932b54ea7 100644
--- a/packages/client-runtime/src/rpc/session.test.ts
+++ b/packages/client-runtime/src/rpc/session.test.ts
@@ -450,544 +450,528 @@ describe("RpcSessionFactory", () => {
   );
 
   it.effect("replays current config and broadcasts updates to every subscriber", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const { factory, sockets } = yield* makeFactory();
-        const session = yield* factory.connect(PREPARED);
-        const readyFiber = yield* Effect.forkChild(session.ready);
-        const socket = yield* awaitSocket(sockets);
-        socket.open();
-        yield* completeInitialConfig(socket);
-        yield* Fiber.join(readyFiber);
-
-        const collectTwo = session
-          .subscribeServerConfig({})
-          .pipe(Stream.take(2), Stream.runCollect);
-        const firstSubscriber = yield* Effect.forkChild(collectTwo);
-        const secondSubscriber = yield* Effect.forkChild(collectTwo);
-        yield* Effect.yieldNow;
-
-        const shortcut = {
-          key: "k",
-          metaKey: false,
-          ctrlKey: false,
-          shiftKey: false,
-          altKey: false,
-          modKey: true,
-        };
-        const request = yield* awaitRequest(socket);
-        socket.serverMessage(
-          encodeJson({
-            _tag: "Chunk",
-            requestId: request.id,
-            values: [
-              {
-                version: 1,
-                type: "keybindingsUpdated",
-                payload: {
-                  keybindings: [{ command: "terminal.toggle", shortcut }],
-                  issues: [],
-                },
+    Effect.gen(function* () {
+      const { factory, sockets } = yield* makeFactory();
+      const session = yield* factory.connect(PREPARED);
+      const readyFiber = yield* Effect.forkChild(session.ready);
+      const socket = yield* awaitSocket(sockets);
+      socket.open();
+      yield* completeInitialConfig(socket);
+      yield* Fiber.join(readyFiber);
+
+      const collectTwo = session.subscribeServerConfig({}).pipe(Stream.take(2), Stream.runCollect);
+      const firstSubscriber = yield* Effect.forkChild(collectTwo);
+      const secondSubscriber = yield* Effect.forkChild(collectTwo);
+      yield* Effect.yieldNow;
+
+      const shortcut = {
+        key: "k",
+        metaKey: false,
+        ctrlKey: false,
+        shiftKey: false,
+        altKey: false,
+        modKey: true,
+      };
+      const request = yield* awaitRequest(socket);
+      socket.serverMessage(
+        encodeJson({
+          _tag: "Chunk",
+          requestId: request.id,
+          values: [
+            {
+              version: 1,
+              type: "keybindingsUpdated",
+              payload: {
+                keybindings: [{ command: "terminal.toggle", shortcut }],
+                issues: [],
               },
-            ],
-          }),
-        );
+            },
+          ],
+        }),
+      );
 
-        const firstEvents = Array.from(yield* Fiber.join(firstSubscriber));
-        const secondEvents = Array.from(yield* Fiber.join(secondSubscriber));
-        expect(firstEvents.map((event) => event.type)).toEqual(["snapshot", "keybindingsUpdated"]);
-        expect(secondEvents).toEqual(firstEvents);
-
-        const replay = yield* session.subscribeServerConfig({}).pipe(Stream.runHead);
-        expect(replay).toMatchObject({
-          _tag: "Some",
-          value: {
-            type: "snapshot",
-            config: { keybindings: [{ command: "terminal.toggle", shortcut }] },
-          },
-        });
-      }),
-    ),
+      const firstEvents = Array.from(yield* Fiber.join(firstSubscriber));
+      const secondEvents = Array.from(yield* Fiber.join(secondSubscriber));
+      expect(firstEvents.map((event) => event.type)).toEqual(["snapshot", "keybindingsUpdated"]);
+      expect(secondEvents).toEqual(firstEvents);
+
+      const replay = yield* session.subscribeServerConfig({}).pipe(Stream.runHead);
+      expect(replay).toMatchObject({
+        _tag: "Some",
+        value: {
+          type: "snapshot",
+          config: { keybindings: [{ command: "terminal.toggle", shortcut }] },
+        },
+      });
+    }),
   );
 
   it.effect.each([
     { usageLimitSources: true },
     { environmentThemes: true, usageLimitSources: true },
   ])("replays usage sources and removal with %j", (options) =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const { factory, sockets } = yield* makeFactory(options);
-        const session = yield* factory.connect(PREPARED);
-        const ready = yield* Effect.forkChild(session.ready);
-        const socket = yield* awaitSocket(sockets);
-        socket.open();
-        yield* completeInitialConfig(socket, encodeServerConfig(SOURCE_SERVER_CONFIG), options);
-        yield* Fiber.join(ready);
-        const observed = yield* Queue.unbounded<ServerConfigStreamEventType>();
-        yield* session.subscribeServerConfig().pipe(
-          Stream.runForEach((event) => Queue.offer(observed, event)),
+    Effect.gen(function* () {
+      const { factory, sockets } = yield* makeFactory(options);
+      const session = yield* factory.connect(PREPARED);
+      const ready = yield* Effect.forkChild(session.ready);
+      const socket = yield* awaitSocket(sockets);
+      socket.open();
+      yield* completeInitialConfig(socket, encodeServerConfig(SOURCE_SERVER_CONFIG), options);
+      yield* Fiber.join(ready);
+      const observed = yield* Queue.unbounded<ServerConfigStreamEventType>();
+      yield* session.subscribeServerConfig().pipe(
+        Stream.runForEach((event) => Queue.offer(observed, event)),
+        Effect.forkChild,
+      );
+      expect((yield* Queue.take(observed)).type).toBe("snapshot");
+      const themes: ServerConfigStreamEventType[] = options.environmentThemes
+        ? [{ version: 1, type: "environmentThemesUpdated", payload: { themes: [] } }]
+        : [];
+      for (const event of themes) {
+        yield* publishConfigEvents(socket, [event]);
+        expect(yield* Queue.take(observed)).toEqual(event);
+      }
+      const events: ServerConfigStreamEventType[] = [
+        SOURCE_EVENT,
+        { version: 1, type: "usageLimitSourcesUpdated", payload: { sources: [] } },
+        SOURCE_EVENT,
+      ];
+      for (const event of events) {
+        yield* publishConfigEvents(socket, [event]);
+        expect(yield* Queue.take(observed)).toEqual(event);
+        const started = yield* Deferred.make<void>();
+        const replay = yield* session.subscribeServerConfig(options).pipe(
+          Stream.tap(() => Deferred.succeed(started, undefined)),
+          Stream.takeUntil((item) => item.type === "keybindingsUpdated"),
+          Stream.runCollect,
           Effect.forkChild,
         );
-        expect((yield* Queue.take(observed)).type).toBe("snapshot");
-        const themes: ServerConfigStreamEventType[] = options.environmentThemes
-          ? [{ version: 1, type: "environmentThemesUpdated", payload: { themes: [] } }]
-          : [];
-        for (const event of themes) {
-          yield* publishConfigEvents(socket, [event]);
-          expect(yield* Queue.take(observed)).toEqual(event);
-        }
-        const events: ServerConfigStreamEventType[] = [
-          SOURCE_EVENT,
-          { version: 1, type: "usageLimitSourcesUpdated", payload: { sources: [] } },
-          SOURCE_EVENT,
-        ];
-        for (const event of events) {
-          yield* publishConfigEvents(socket, [event]);
-          expect(yield* Queue.take(observed)).toEqual(event);
-          const started = yield* Deferred.make<void>();
-          const replay = yield* session.subscribeServerConfig(options).pipe(
-            Stream.tap(() => Deferred.succeed(started, undefined)),
-            Stream.takeUntil((item) => item.type === "keybindingsUpdated"),
-            Stream.runCollect,
-            Effect.forkChild,
-          );
-          yield* Deferred.await(started);
-          const marker: ServerConfigStreamEventType = {
-            version: 1,
-            type: "keybindingsUpdated",
-            payload: { keybindings: [], issues: [] },
-          };
-          yield* publishConfigEvents(socket, [marker]);
-          expect(yield* Queue.take(observed)).toEqual(marker);
-          const replayed = Array.from(yield* Fiber.join(replay));
-          expect(replayed.slice(1)).toEqual([...themes, event, marker]);
-          let projection = applyServerConfigProjection(Option.none(), {
-            version: 1,
-            type: "snapshot",
-            config: SOURCE_SERVER_CONFIG,
-          });
-          projection = applyServerConfigProjection(projection, SOURCE_EVENT);
-          for (const item of replayed) projection = applyServerConfigProjection(projection, item);
-          expect(Option.getOrThrow(projection).config.usageLimitSources).toEqual(
-            event.type === "usageLimitSourcesUpdated" && event.payload.sources.length > 0
-              ? event.payload.sources
-              : undefined,
-          );
-        }
-        expect(socket.sent.map((message) => decodeJson(message)).filter(isRpcRequest)).toHaveLength(
-          1,
+        yield* Deferred.await(started);
+        const marker: ServerConfigStreamEventType = {
+          version: 1,
+          type: "keybindingsUpdated",
+          payload: { keybindings: [], issues: [] },
+        };
+        yield* publishConfigEvents(socket, [marker]);
+        expect(yield* Queue.take(observed)).toEqual(marker);
+        const replayed = Array.from(yield* Fiber.join(replay));
+        expect(replayed.slice(1)).toEqual([...themes, event, marker]);
+        let projection = applyServerConfigProjection(Option.none(), {
+          version: 1,
+          type: "snapshot",
+          config: SOURCE_SERVER_CONFIG,
+        });
+        projection = applyServerConfigProjection(projection, SOURCE_EVENT);
+        for (const item of replayed) projection = applyServerConfigProjection(projection, item);
+        expect(Option.getOrThrow(projection).config.usageLimitSources).toEqual(
+          event.type === "usageLimitSourcesUpdated" && event.payload.sources.length > 0
+            ? event.payload.sources
+            : undefined,
         );
-      }),
-    ),
+      }
+      expect(socket.sent.map((message) => decodeJson(message)).filter(isRpcRequest)).toHaveLength(
+        1,
+      );
+    }),
   );
 
   it.effect("replays theme updates and deletion as authoritative events", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const { factory, sockets } = yield* makeFactory({ environmentThemes: true });
-        const session = yield* factory.connect(PREPARED);
-        const readyFiber = yield* Effect.forkChild(session.ready);
-        const socket = yield* awaitSocket(sockets);
-        socket.open();
-        yield* completeInitialConfig(socket, ENCODED_THEME_SERVER_CONFIG, {
-          environmentThemes: true,
-        });
-        yield* Fiber.join(readyFiber);
+    Effect.gen(function* () {
+      const { factory, sockets } = yield* makeFactory({ environmentThemes: true });
+      const session = yield* factory.connect(PREPARED);
+      const readyFiber = yield* Effect.forkChild(session.ready);
+      const socket = yield* awaitSocket(sockets);
+      socket.open();
+      yield* completeInitialConfig(socket, ENCODED_THEME_SERVER_CONFIG, {
+        environmentThemes: true,
+      });
+      yield* Fiber.join(readyFiber);
 
-        const firstThemes = [
-          {
-            id: "nightfall",
-            name: "Nightfall",
-            appearance: "dark" as const,
-            canvas: "#1a1b26",
-            accent: "#7aa2f7",
-          },
-        ];
-        const replacementThemes = [
-          {
-            id: "midnight",
-            name: "Midnight",
-            appearance: "dark" as const,
-            canvas: "#000000",
-            accent: "#ffffff",
-          },
-        ];
-        const subscriberStarted = yield* Deferred.make<void>();
-        const subscriber = yield* session.subscribeServerConfig({ environmentThemes: true }).pipe(
-          Stream.mapEffect((event) =>
-            Deferred.succeed(subscriberStarted, undefined).pipe(Effect.as(event)),
-          ),
+      const firstThemes = [
+        {
+          id: "nightfall",
+          name: "Nightfall",
+          appearance: "dark" as const,
+          canvas: "#1a1b26",
+          accent: "#7aa2f7",
+        },
+      ];
+      const replacementThemes = [
+        {
+          id: "midnight",
+          name: "Midnight",
+          appearance: "dark" as const,
+          canvas: "#000000",
+          accent: "#ffffff",
+        },
+      ];
+      const subscriberStarted = yield* Deferred.make<void>();
+      const subscriber = yield* session.subscribeServerConfig({ environmentThemes: true }).pipe(
+        Stream.mapEffect((event) =>
+          Deferred.succeed(subscriberStarted, undefined).pipe(Effect.as(event)),
+        ),
+        Stream.take(4),
+        Stream.runCollect,
+        Effect.forkChild,
+      );
+      yield* Deferred.await(subscriberStarted);
+      yield* publishConfigEvents(socket, [
+        {
+          version: 1,
+          type: "environmentThemesUpdated",
+          payload: { themes: firstThemes },
+        },
+        {
+          version: 1,
+          type: "environmentThemesUpdated",
+          payload: { themes: replacementThemes },
+        },
+        {
+          version: 1,
+          type: "environmentThemesUpdated",
+          payload: { themes: [] },
+        },
+      ]);
+
+      const liveEvents = Array.from(yield* Fiber.join(subscriber));
+      expect(liveEvents.map((event) => event.type)).toEqual([
+        "snapshot",
+        "environmentThemesUpdated",
+        "environmentThemesUpdated",
+        "environmentThemesUpdated",
+      ]);
+      expect(liveEvents[2]).toMatchObject({ payload: { themes: replacementThemes } });
+
+      const replay = Array.from(
+        yield* session
+          .subscribeServerConfig({ environmentThemes: true })
+          .pipe(Stream.take(2), Stream.runCollect),
+      );
+      expect(replay.map((event) => event.type)).toEqual(["snapshot", "environmentThemesUpdated"]);
+      expect(replay[1]).toMatchObject({ payload: { themes: [] } });
+
+      let projection = applyServerConfigProjection(Option.none(), {
+        version: 1,
+        type: "snapshot",
+        config: THEME_SERVER_CONFIG,
+      });
+      projection = applyServerConfigProjection(projection, {
+        version: 1,
+        type: "environmentThemesUpdated",
+        payload: { themes: firstThemes },
+      });
+      for (const event of replay) {
+        projection = applyServerConfigProjection(projection, event);
+      }
+      expect(Option.getOrThrow(projection).config.environmentThemes).toBeUndefined();
+    }),
+  );
+
+  it.effect("recovers a slow subscriber after it misses theme and usage-source deletion", () =>
+    Effect.gen(function* () {
+      const { factory, sockets } = yield* makeFactory({
+        environmentThemes: true,
+        usageLimitSources: true,
+      });
+      const session = yield* factory.connect(PREPARED);
+      const readyFiber = yield* Effect.forkChild(session.ready);
+      const socket = yield* awaitSocket(sockets);
+      socket.open();
+      yield* completeInitialConfig(
+        socket,
+        encodeServerConfig({ ...SOURCE_SERVER_CONFIG, providers: [PROVIDER] }),
+        { environmentThemes: true, usageLimitSources: true },
+      );
+      yield* Fiber.join(readyFiber);
+
+      const slowSubscriberStarted = yield* Deferred.make<void>();
+      const releaseSlowSubscriber = yield* Deferred.make<void>();
+      let firstEvent = true;
+      const slowSubscriber = yield* session
+        .subscribeServerConfig({ environmentThemes: true, usageLimitSources: true })
+        .pipe(
+          Stream.mapEffect((event) => {
+            if (!firstEvent) return Effect.succeed(event);
+            firstEvent = false;
+            return Deferred.succeed(slowSubscriberStarted, undefined).pipe(
+              Effect.andThen(Deferred.await(releaseSlowSubscriber)),
+              Effect.as(event),
+            );
+          }),
           Stream.take(4),
           Stream.runCollect,
           Effect.forkChild,
         );
-        yield* Deferred.await(subscriberStarted);
-        yield* publishConfigEvents(socket, [
-          {
-            version: 1,
-            type: "environmentThemesUpdated",
-            payload: { themes: firstThemes },
-          },
-          {
-            version: 1,
-            type: "environmentThemesUpdated",
-            payload: { themes: replacementThemes },
-          },
-          {
-            version: 1,
-            type: "environmentThemesUpdated",
-            payload: { themes: [] },
+      yield* Deferred.await(slowSubscriberStarted);
+
+      const firstThemes = [
+        {
+          id: "nightfall",
+          name: "Nightfall",
+          appearance: "dark" as const,
+          canvas: "#1a1b26",
+          accent: "#7aa2f7",
+        },
+      ];
+      const themeEvents: ServerConfigStreamEventType[] = [
+        {
+          version: 1,
+          type: "environmentThemesUpdated",
+          payload: { themes: firstThemes },
+        },
+        {
+          version: 1,
+          type: "environmentThemesUpdated",
+          payload: {
+            themes: [{ ...firstThemes[0]!, name: "Nightfall 2" }],
           },
-        ]);
+        },
+        {
+          version: 1,
+          type: "environmentThemesUpdated",
+          payload: { themes: [] },
+        },
+      ];
+      const settingsEvents = Array.from({ length: 65 }, (): ServerConfigStreamEventType => ({
+        version: 1,
+        type: "settingsUpdated",
+        payload: { settings: DEFAULT_SERVER_SETTINGS },
+      }));
+      const sourceEvents: ServerConfigStreamEventType[] = [
+        SOURCE_EVENT,
+        { version: 1, type: "usageLimitSourcesUpdated", payload: { sources: [] } },
+      ];
+      // A delta carries no lists; a subscriber that misses it must still get its result.
+      const { models: _models, slashCommands: _commands, skills: _skills, ...status } = PROVIDER;
+      const providerEvent: ServerConfigStreamEventType = {
+        version: 1,
+        type: "providerStatusDeltas",
+        payload: {
+          providers: [{ ...status, checkedAt: "2026-04-10T00:05:00.000Z", message: "Checked" }],
+        },
+      };
+      const allEvents = [providerEvent, ...themeEvents, ...sourceEvents, ...settingsEvents];
+      const observedByFastSubscriber = yield* Queue.unbounded<ServerConfigStreamEventType>();
+      yield* session
+        .subscribeServerConfig({ environmentThemes: true, usageLimitSources: true })
+        .pipe(
+          Stream.runForEach((event) => Queue.offer(observedByFastSubscriber, event)),
+          Effect.forkChild,
+        );
+      expect((yield* Queue.take(observedByFastSubscriber)).type).toBe("snapshot");
+      for (const event of allEvents) {
+        yield* publishConfigEvents(socket, [event]);
+        expect(yield* Queue.take(observedByFastSubscriber)).toEqual(event);
+      }
+      yield* Deferred.succeed(releaseSlowSubscriber, undefined);
+
+      const recovered = Array.from(yield* Fiber.join(slowSubscriber));
+      expect(recovered.map((event) => event.type)).toEqual([
+        "snapshot",
+        "snapshot",
+        "environmentThemesUpdated",
+        "usageLimitSourcesUpdated",
+      ]);
+      expect(recovered[1]).toMatchObject({
+        config: {
+          providers: [{ ...PROVIDER, checkedAt: "2026-04-10T00:05:00.000Z", message: "Checked" }],
+        },
+      });
+      expect(recovered[2]).toMatchObject({ payload: { themes: [] } });
+      expect(recovered[3]).toMatchObject({ payload: { sources: [] } });
 
-        const liveEvents = Array.from(yield* Fiber.join(subscriber));
-        expect(liveEvents.map((event) => event.type)).toEqual([
-          "snapshot",
-          "environmentThemesUpdated",
-          "environmentThemesUpdated",
-          "environmentThemesUpdated",
-        ]);
-        expect(liveEvents[2]).toMatchObject({ payload: { themes: replacementThemes } });
+      let projection = applyServerConfigProjection(Option.none(), {
+        version: 1,
+        type: "snapshot",
+        config: SOURCE_SERVER_CONFIG,
+      });
+      projection = applyServerConfigProjection(projection, themeEvents[0]!);
+      projection = applyServerConfigProjection(projection, SOURCE_EVENT);
+      for (const event of recovered.slice(1)) {
+        projection = applyServerConfigProjection(projection, event);
+      }
+      expect(Option.getOrThrow(projection).config.environmentThemes).toBeUndefined();
+      expect(Option.getOrThrow(projection).config.usageLimitSources).toBeUndefined();
+    }),
+  );
 
-        const replay = Array.from(
-          yield* session
-            .subscribeServerConfig({ environmentThemes: true })
-            .pipe(Stream.take(2), Stream.runCollect),
-        );
-        expect(replay.map((event) => event.type)).toEqual(["snapshot", "environmentThemesUpdated"]);
-        expect(replay[1]).toMatchObject({ payload: { themes: [] } });
+  it.effect("closes the session when the config source dies", () =>
+    Effect.gen(function* () {
+      const { factory, sockets } = yield* makeFactory();
+      const session = yield* factory.connect(PREPARED);
+      const readyFiber = yield* Effect.forkChild(session.ready);
+      const socket = yield* awaitSocket(sockets);
+      socket.open();
+      yield* completeInitialConfig(socket);
+      yield* Fiber.join(readyFiber);
 
-        let projection = applyServerConfigProjection(Option.none(), {
-          version: 1,
-          type: "snapshot",
-          config: THEME_SERVER_CONFIG,
-        });
-        projection = applyServerConfigProjection(projection, {
-          version: 1,
-          type: "environmentThemesUpdated",
-          payload: { themes: firstThemes },
-        });
-        for (const event of replay) {
-          projection = applyServerConfigProjection(projection, event);
-        }
-        expect(Option.getOrThrow(projection).config.environmentThemes).toBeUndefined();
-      }),
-    ),
+      const closedFiber = yield* session.closed.pipe(Effect.exit, Effect.forkChild);
+      socket.serverMessage(
+        encodeJson({
+          _tag: "Defect",
+          defect: encodeDefect(new Error("config stream died")),
+        }),
+      );
+
+      const closed = yield* Fiber.join(closedFiber);
+      expect(Exit.isFailure(closed)).toBe(true);
+      if (Exit.isFailure(closed)) {
+        expect(Cause.hasDies(closed.cause)).toBe(true);
+      }
+    }),
   );
 
-  it.effect("recovers a slow subscriber after it misses theme and usage-source deletion", () =>
-    Effect.scoped(
+  it.effect.each([{ failure: "defect" as const }, { failure: "typed" as const }])(
+    "keeps durable config state alive after an owned $failure failure",
+    ({ failure }) =>
       Effect.gen(function* () {
-        const { factory, sockets } = yield* makeFactory({
+        const { factory, sockets } = yield* makeFactory({ environmentThemes: true });
+        const firstSession = yield* factory.connect(PREPARED);
+        const firstReady = yield* Effect.forkChild(firstSession.ready);
+        const firstSocket = yield* awaitSocket(sockets);
+        firstSocket.open();
+        yield* completeInitialConfig(firstSocket, ENCODED_THEME_SERVER_CONFIG, {
           environmentThemes: true,
-          usageLimitSources: true,
         });
-        const session = yield* factory.connect(PREPARED);
-        const readyFiber = yield* Effect.forkChild(session.ready);
-        const socket = yield* awaitSocket(sockets);
-        socket.open();
-        yield* completeInitialConfig(
-          socket,
-          encodeServerConfig({ ...SOURCE_SERVER_CONFIG, providers: [PROVIDER] }),
-          { environmentThemes: true, usageLimitSources: true },
+        yield* Fiber.join(firstReady);
+
+        const activeSession = yield* SubscriptionRef.make(Option.some(firstSession));
+        const supervisor = EnvironmentSupervisor.EnvironmentSupervisor.of({
+          target: TARGET,
+          state: yield* SubscriptionRef.make(AVAILABLE_CONNECTION_STATE),
+          session: activeSession,
+          prepared: yield* SubscriptionRef.make(Option.some(PREPARED)),
+          connect: Effect.void,
+          disconnect: Effect.void,
+          retryNow: Effect.void,
+        } satisfies EnvironmentSupervisor.EnvironmentSupervisor["Service"]);
+        const cache = Persistence.EnvironmentCacheStore.of({
+          loadShell: () => Effect.succeedNone,
+          saveShell: () => Effect.void,
+          loadThread: () => Effect.succeedNone,
+          saveThread: () => Effect.void,
+          removeThread: () => Effect.void,
+          loadServerConfig: () => Effect.succeedNone,
+          saveServerConfig: () => Effect.void,
+          loadVcsRefs: () => Effect.succeedNone,
+          saveVcsRefs: () => Effect.void,
+          removeVcsRefs: () => Effect.void,
+          clearVcsRefs: () => Effect.void,
+          clear: () => Effect.void,
+        });
+        const configState = yield* makeEnvironmentServerConfigState({
+          environmentThemes: true,
+        }).pipe(
+          Effect.provideService(EnvironmentSupervisor.EnvironmentSupervisor, supervisor),
+          Effect.provideService(Persistence.EnvironmentCacheStore, cache),
         );
-        yield* Fiber.join(readyFiber);
-
-        const slowSubscriberStarted = yield* Deferred.make<void>();
-        const releaseSlowSubscriber = yield* Deferred.make<void>();
-        let firstEvent = true;
-        const slowSubscriber = yield* session
-          .subscribeServerConfig({ environmentThemes: true, usageLimitSources: true })
-          .pipe(
-            Stream.mapEffect((event) => {
-              if (!firstEvent) return Effect.succeed(event);
-              firstEvent = false;
-              return Deferred.succeed(slowSubscriberStarted, undefined).pipe(
-                Effect.andThen(Deferred.await(releaseSlowSubscriber)),
-                Effect.as(event),
-              );
-            }),
-            Stream.take(4),
-            Stream.runCollect,
-            Effect.forkChild,
+        const awaitConfig = (predicate: (config: ServerConfigType) => boolean) =>
+          SubscriptionRef.changes(configState).pipe(
+            Stream.filter(Option.isSome),
+            Stream.map((projection) => projection.value.config),
+            Stream.filter(predicate),
+            Stream.runHead,
+            Effect.map(Option.getOrThrow),
           );
-        yield* Deferred.await(slowSubscriberStarted);
 
         const firstThemes = [
           {
-            id: "nightfall",
-            name: "Nightfall",
+            id: "first-theme",
+            name: "First theme",
             appearance: "dark" as const,
-            canvas: "#1a1b26",
-            accent: "#7aa2f7",
+            canvas: "#111111",
+            accent: "#ffffff",
           },
         ];
-        const themeEvents: ServerConfigStreamEventType[] = [
+        const firstThemeState = yield* awaitConfig(
+          (config) => config.environmentThemes?.[0]?.id === "first-theme",
+        ).pipe(Effect.forkChild);
+        yield* publishConfigEvents(firstSocket, [
           {
             version: 1,
             type: "environmentThemesUpdated",
             payload: { themes: firstThemes },
           },
+        ]);
+        expect((yield* Fiber.join(firstThemeState)).environmentThemes).toEqual(firstThemes);
+
+        const firstClosed = yield* firstSession.closed.pipe(Effect.exit, Effect.forkChild);
+        const firstRequest = yield* awaitRequest(firstSocket);
+        firstSocket.serverMessage(
+          failure === "defect"
+            ? encodeJson({
+                _tag: "Defect",
+                defect: encodeDefect(new Error("config stream died")),
+              })
+            : encodeJson({
+                _tag: "Exit",
+                requestId: firstRequest.id,
+                exit: {
+                  _tag: "Failure",
+                  cause: [
+                    {
+                      _tag: "Fail",
+                      error: {
+                        _tag: "EnvironmentAuthorizationError",
+                        message: "config subscription rejected",
+                        requiredScope: "orchestration:read",
+                      },
+                    },
+                  ],
+                },
+              }),
+        );
+        const firstClosedExit = yield* Fiber.join(firstClosed);
+        expect(Exit.isFailure(firstClosedExit)).toBe(true);
+        if (failure === "typed" && Exit.isFailure(firstClosedExit)) {
+          expect(Cause.squash(firstClosedExit.cause)).toBeInstanceOf(ConnectionBlockedError);
+          expect(Cause.squash(firstClosedExit.cause)).toMatchObject({ reason: "permission" });
+        }
+        yield* SubscriptionRef.set(activeSession, Option.none());
+
+        const recoveredConfig = {
+          ...THEME_SERVER_CONFIG,
+          environment: {
+            ...THEME_SERVER_CONFIG.environment,
+            label: "Recovered environment",
+          },
+        } satisfies ServerConfigType;
+        const secondSession = yield* factory.connect(PREPARED);
+        const secondReady = yield* Effect.forkChild(secondSession.ready);
+        const secondSocket = yield* awaitSocket(sockets, 1);
+        secondSocket.open();
+        yield* completeInitialConfig(secondSocket, encodeServerConfig(recoveredConfig), {
+          environmentThemes: true,
+        });
+        yield* Fiber.join(secondReady);
+
+        const recoveredState = yield* awaitConfig(
+          (config) => config.environment.label === "Recovered environment",
+        ).pipe(Effect.forkChild);
+        yield* SubscriptionRef.set(activeSession, Option.some(secondSession));
+        expect((yield* Fiber.join(recoveredState)).environmentThemes).toEqual(firstThemes);
+
+        const recoveredThemes = [
           {
-            version: 1,
-            type: "environmentThemesUpdated",
-            payload: {
-              themes: [{ ...firstThemes[0]!, name: "Nightfall 2" }],
-            },
+            id: "recovered-theme",
+            name: "Recovered theme",
+            appearance: "dark" as const,
+            canvas: "#000000",
+            accent: "#eeeeee",
           },
+        ];
+        const liveRecoveredState = yield* awaitConfig(
+          (config) => config.environmentThemes?.[0]?.id === "recovered-theme",
+        ).pipe(Effect.forkChild);
+        yield* publishConfigEvents(secondSocket, [
           {
             version: 1,
             type: "environmentThemesUpdated",
-            payload: { themes: [] },
-          },
-        ];
-        const settingsEvents = Array.from({ length: 65 }, (): ServerConfigStreamEventType => ({
-          version: 1,
-          type: "settingsUpdated",
-          payload: { settings: DEFAULT_SERVER_SETTINGS },
-        }));
-        const sourceEvents: ServerConfigStreamEventType[] = [
-          SOURCE_EVENT,
-          { version: 1, type: "usageLimitSourcesUpdated", payload: { sources: [] } },
-        ];
-        // A delta carries no lists; a subscriber that misses it must still get its result.
-        const { models: _models, slashCommands: _commands, skills: _skills, ...status } = PROVIDER;
-        const providerEvent: ServerConfigStreamEventType = {
-          version: 1,
-          type: "providerStatusDeltas",
-          payload: {
-            providers: [{ ...status, checkedAt: "2026-04-10T00:05:00.000Z", message: "Checked" }],
+            payload: { themes: recoveredThemes },
           },
-        };
-        const allEvents = [providerEvent, ...themeEvents, ...sourceEvents, ...settingsEvents];
-        const observedByFastSubscriber = yield* Queue.unbounded<ServerConfigStreamEventType>();
-        yield* session
-          .subscribeServerConfig({ environmentThemes: true, usageLimitSources: true })
-          .pipe(
-            Stream.runForEach((event) => Queue.offer(observedByFastSubscriber, event)),
-            Effect.forkChild,
-          );
-        expect((yield* Queue.take(observedByFastSubscriber)).type).toBe("snapshot");
-        for (const event of allEvents) {
-          yield* publishConfigEvents(socket, [event]);
-          expect(yield* Queue.take(observedByFastSubscriber)).toEqual(event);
-        }
-        yield* Deferred.succeed(releaseSlowSubscriber, undefined);
-
-        const recovered = Array.from(yield* Fiber.join(slowSubscriber));
-        expect(recovered.map((event) => event.type)).toEqual([
-          "snapshot",
-          "snapshot",
-          "environmentThemesUpdated",
-          "usageLimitSourcesUpdated",
         ]);
-        expect(recovered[1]).toMatchObject({
-          config: {
-            providers: [{ ...PROVIDER, checkedAt: "2026-04-10T00:05:00.000Z", message: "Checked" }],
-          },
-        });
-        expect(recovered[2]).toMatchObject({ payload: { themes: [] } });
-        expect(recovered[3]).toMatchObject({ payload: { sources: [] } });
-
-        let projection = applyServerConfigProjection(Option.none(), {
-          version: 1,
-          type: "snapshot",
-          config: SOURCE_SERVER_CONFIG,
-        });
-        projection = applyServerConfigProjection(projection, themeEvents[0]!);
-        projection = applyServerConfigProjection(projection, SOURCE_EVENT);
-        for (const event of recovered.slice(1)) {
-          projection = applyServerConfigProjection(projection, event);
-        }
-        expect(Option.getOrThrow(projection).config.environmentThemes).toBeUndefined();
-        expect(Option.getOrThrow(projection).config.usageLimitSources).toBeUndefined();
+        expect((yield* Fiber.join(liveRecoveredState)).environmentThemes).toEqual(recoveredThemes);
       }),
-    ),
-  );
-
-  it.effect("closes the session when the config source dies", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const { factory, sockets } = yield* makeFactory();
-        const session = yield* factory.connect(PREPARED);
-        const readyFiber = yield* Effect.forkChild(session.ready);
-        const socket = yield* awaitSocket(sockets);
-        socket.open();
-        yield* completeInitialConfig(socket);
-        yield* Fiber.join(readyFiber);
-
-        const closedFiber = yield* session.closed.pipe(Effect.exit, Effect.forkChild);
-        socket.serverMessage(
-          encodeJson({
-            _tag: "Defect",
-            defect: encodeDefect(new Error("config stream died")),
-          }),
-        );
-
-        const closed = yield* Fiber.join(closedFiber);
-        expect(Exit.isFailure(closed)).toBe(true);
-        if (Exit.isFailure(closed)) {
-          expect(Cause.hasDies(closed.cause)).toBe(true);
-        }
-      }),
-    ),
-  );
-
-  it.effect.each([{ failure: "defect" as const }, { failure: "typed" as const }])(
-    "keeps durable config state alive after an owned $failure failure",
-    ({ failure }) =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const { factory, sockets } = yield* makeFactory({ environmentThemes: true });
-          const firstSession = yield* factory.connect(PREPARED);
-          const firstReady = yield* Effect.forkChild(firstSession.ready);
-          const firstSocket = yield* awaitSocket(sockets);
-          firstSocket.open();
-          yield* completeInitialConfig(firstSocket, ENCODED_THEME_SERVER_CONFIG, {
-            environmentThemes: true,
-          });
-          yield* Fiber.join(firstReady);
-
-          const activeSession = yield* SubscriptionRef.make(Option.some(firstSession));
-          const supervisor = EnvironmentSupervisor.EnvironmentSupervisor.of({
-            target: TARGET,
-            state: yield* SubscriptionRef.make(AVAILABLE_CONNECTION_STATE),
-            session: activeSession,
-            prepared: yield* SubscriptionRef.make(Option.some(PREPARED)),
-            connect: Effect.void,
-            disconnect: Effect.void,
-            retryNow: Effect.void,
-          } satisfies EnvironmentSupervisor.EnvironmentSupervisor["Service"]);
-          const cache = Persistence.EnvironmentCacheStore.of({
-            loadShell: () => Effect.succeedNone,
-            saveShell: () => Effect.void,
-            loadThread: () => Effect.succeedNone,
-            saveThread: () => Effect.void,
-            removeThread: () => Effect.void,
-            loadServerConfig: () => Effect.succeedNone,
-            saveServerConfig: () => Effect.void,
-            loadVcsRefs: () => Effect.succeedNone,
-            saveVcsRefs: () => Effect.void,
-            removeVcsRefs: () => Effect.void,
-            clearVcsRefs: () => Effect.void,
-            clear: () => Effect.void,
-          });
-          const configState = yield* makeEnvironmentServerConfigState({
-            environmentThemes: true,
-          }).pipe(
-            Effect.provideService(EnvironmentSupervisor.EnvironmentSupervisor, supervisor),
-            Effect.provideService(Persistence.EnvironmentCacheStore, cache),
-          );
-          const awaitConfig = (predicate: (config: ServerConfigType) => boolean) =>
-            SubscriptionRef.changes(configState).pipe(
-              Stream.filter(Option.isSome),
-              Stream.map((projection) => projection.value.config),
-              Stream.filter(predicate),
-              Stream.runHead,
-              Effect.map(Option.getOrThrow),
-            );
-
-          const firstThemes = [
-            {
-              id: "first-theme",
-              name: "First theme",
-              appearance: "dark" as const,
-              canvas: "#111111",
-              accent: "#ffffff",
-            },
-          ];
-          const firstThemeState = yield* awaitConfig(
-            (config) => config.environmentThemes?.[0]?.id === "first-theme",
-          ).pipe(Effect.forkChild);
-          yield* publishConfigEvents(firstSocket, [
-            {
-              version: 1,
-              type: "environmentThemesUpdated",
-              payload: { themes: firstThemes },
-            },
-          ]);
-          expect((yield* Fiber.join(firstThemeState)).environmentThemes).toEqual(firstThemes);
-
-          const firstClosed = yield* firstSession.closed.pipe(Effect.exit, Effect.forkChild);
-          const firstRequest = yield* awaitRequest(firstSocket);
-          firstSocket.serverMessage(
-            failure === "defect"
-              ? encodeJson({
-                  _tag: "Defect",
-                  defect: encodeDefect(new Error("config stream died")),
-                })
-              : encodeJson({
-                  _tag: "Exit",
-                  requestId: firstRequest.id,
-                  exit: {
-                    _tag: "Failure",
-                    cause: [
-                      {
-                        _tag: "Fail",
-                        error: {
-                          _tag: "EnvironmentAuthorizationError",
-                          message: "config subscription rejected",
-                          requiredScope: "orchestration:read",
-                        },
-                      },
-                    ],
-                  },
-                }),
-          );
-          const firstClosedExit = yield* Fiber.join(firstClosed);
-          expect(Exit.isFailure(firstClosedExit)).toBe(true);
-          if (failure === "typed" && Exit.isFailure(firstClosedExit)) {
-            expect(Cause.squash(firstClosedExit.cause)).toBeInstanceOf(ConnectionBlockedError);
-            expect(Cause.squash(firstClosedExit.cause)).toMatchObject({ reason: "permission" });
-          }
-          yield* SubscriptionRef.set(activeSession, Option.none());
-
-          const recoveredConfig = {
-            ...THEME_SERVER_CONFIG,
-            environment: {
-              ...THEME_SERVER_CONFIG.environment,
-              label: "Recovered environment",
-            },
-          } satisfies ServerConfigType;
-          const secondSession = yield* factory.connect(PREPARED);
-          const secondReady = yield* Effect.forkChild(secondSession.ready);
-          const secondSocket = yield* awaitSocket(sockets, 1);
-          secondSocket.open();
-          yield* completeInitialConfig(secondSocket, encodeServerConfig(recoveredConfig), {
-            environmentThemes: true,
-          });
-          yield* Fiber.join(secondReady);
-
-          const recoveredState = yield* awaitConfig(
-            (config) => config.environment.label === "Recovered environment",
-          ).pipe(Effect.forkChild);
-          yield* SubscriptionRef.set(activeSession, Option.some(secondSession));
-          expect((yield* Fiber.join(recoveredState)).environmentThemes).toEqual(firstThemes);
-
-          const recoveredThemes = [
-            {
-              id: "recovered-theme",
-              name: "Recovered theme",
-              appearance: "dark" as const,
-              canvas: "#000000",
-              accent: "#eeeeee",
-            },
-          ];
-          const liveRecoveredState = yield* awaitConfig(
-            (config) => config.environmentThemes?.[0]?.id === "recovered-theme",
-          ).pipe(Effect.forkChild);
-          yield* publishConfigEvents(secondSocket, [
-            {
-              version: 1,
-              type: "environmentThemesUpdated",
-              payload: { themes: recoveredThemes },
-            },
-          ]);
-          expect((yield* Fiber.join(liveRecoveredState)).environmentThemes).toEqual(
-            recoveredThemes,
-          );
-        }),
-      ),
   );
 
   it.effect("rejects a server config for a different environment", () =>
@@ -1061,7 +1045,7 @@ describe("RpcSessionFactory", () => {
         }),
       );
       yield* Fiber.join(probeFiber);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("reaches ready when a newer server sends unknown config members", () =>
diff --git a/packages/client-runtime/src/state/assets.test.ts b/packages/client-runtime/src/state/assets.test.ts
index c2e85cd07507..bb54bb9799af 100644
--- a/packages/client-runtime/src/state/assets.test.ts
+++ b/packages/client-runtime/src/state/assets.test.ts
@@ -184,58 +184,52 @@ describe("asset URL requests", () => {
   const other = EnvironmentId.make("asset-other");
 
   it.effect("keeps a thread of images from flooding one environment with requests", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const harness = yield* makeAssetUrlHarness([remote]);
-        const total = ASSET_URL_MAX_IN_FLIGHT * 3;
-        harness.mountImages(remote, total);
-
-        for (let call = 0; call < ASSET_URL_MAX_IN_FLIGHT; call += 1) {
-          yield* Queue.take(harness.started);
-        }
-        expect(harness.inFlight(remote)).toBe(ASSET_URL_MAX_IN_FLIGHT);
-
-        // Each answer admits the next waiting request.
-        for (let call = 0; call < total; call += 1) {
-          yield* harness.release(remote);
-          if (call < total - ASSET_URL_MAX_IN_FLIGHT) yield* Queue.take(harness.started);
-        }
-        expect(harness.maxInFlight(remote)).toBe(ASSET_URL_MAX_IN_FLIGHT);
-      }),
-    ),
+    Effect.gen(function* () {
+      const harness = yield* makeAssetUrlHarness([remote]);
+      const total = ASSET_URL_MAX_IN_FLIGHT * 3;
+      harness.mountImages(remote, total);
+
+      for (let call = 0; call < ASSET_URL_MAX_IN_FLIGHT; call += 1) {
+        yield* Queue.take(harness.started);
+      }
+      expect(harness.inFlight(remote)).toBe(ASSET_URL_MAX_IN_FLIGHT);
+
+      // Each answer admits the next waiting request.
+      for (let call = 0; call < total; call += 1) {
+        yield* harness.release(remote);
+        if (call < total - ASSET_URL_MAX_IN_FLIGHT) yield* Queue.take(harness.started);
+      }
+      expect(harness.maxInFlight(remote)).toBe(ASSET_URL_MAX_IN_FLIGHT);
+    }),
   );
 
   it.effect("limits each environment on its own", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const harness = yield* makeAssetUrlHarness([remote, other]);
-        harness.mountImages(remote, ASSET_URL_MAX_IN_FLIGHT + 2);
-        for (let call = 0; call < ASSET_URL_MAX_IN_FLIGHT; call += 1) {
-          yield* Queue.take(harness.started);
-        }
-        harness.mountImages(other, 1);
-        expect(yield* Queue.take(harness.started)).toBe(other);
-        expect(harness.inFlight(remote)).toBe(ASSET_URL_MAX_IN_FLIGHT);
-      }),
-    ),
+    Effect.gen(function* () {
+      const harness = yield* makeAssetUrlHarness([remote, other]);
+      harness.mountImages(remote, ASSET_URL_MAX_IN_FLIGHT + 2);
+      for (let call = 0; call < ASSET_URL_MAX_IN_FLIGHT; call += 1) {
+        yield* Queue.take(harness.started);
+      }
+      harness.mountImages(other, 1);
+      expect(yield* Queue.take(harness.started)).toBe(other);
+      expect(harness.inFlight(remote)).toBe(ASSET_URL_MAX_IN_FLIGHT);
+    }),
   );
 
   it.effect("frees the limit when the session behind the requests is replaced", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const harness = yield* makeAssetUrlHarness([remote]);
-        harness.mountImages(remote, ASSET_URL_MAX_IN_FLIGHT * 2);
-        for (let call = 0; call < ASSET_URL_MAX_IN_FLIGHT; call += 1) {
-          yield* Queue.take(harness.started);
-        }
-
-        yield* harness.replaceSession(remote);
-        for (let call = 0; call < ASSET_URL_MAX_IN_FLIGHT; call += 1) {
-          yield* Queue.take(harness.started);
-        }
-        expect(harness.maxInFlight(remote)).toBe(ASSET_URL_MAX_IN_FLIGHT);
-      }),
-    ),
+    Effect.gen(function* () {
+      const harness = yield* makeAssetUrlHarness([remote]);
+      harness.mountImages(remote, ASSET_URL_MAX_IN_FLIGHT * 2);
+      for (let call = 0; call < ASSET_URL_MAX_IN_FLIGHT; call += 1) {
+        yield* Queue.take(harness.started);
+      }
+
+      yield* harness.replaceSession(remote);
+      for (let call = 0; call < ASSET_URL_MAX_IN_FLIGHT; call += 1) {
+        yield* Queue.take(harness.started);
+      }
+      expect(harness.maxInFlight(remote)).toBe(ASSET_URL_MAX_IN_FLIGHT);
+    }),
   );
 });
 
@@ -325,17 +319,15 @@ describe("desktop-local media fallback", () => {
   });
 
   it.effect("keeps a relative Markdown image on the thread's environment", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const { load } = yield* makeFallback();
-        expect(yield* load("docs/report.png")).toEqual({ loaded: false, calls: [remote] });
-        // The same resolved path written absolute still falls back, and shares no cached result.
-        expect(yield* load("/tmp/repo/docs/report.png")).toEqual({
-          loaded: true,
-          calls: [remote, local],
-        });
-      }),
-    ),
+    Effect.gen(function* () {
+      const { load } = yield* makeFallback();
+      expect(yield* load("docs/report.png")).toEqual({ loaded: false, calls: [remote] });
+      // The same resolved path written absolute still falls back, and shares no cached result.
+      expect(yield* load("/tmp/repo/docs/report.png")).toEqual({
+        loaded: true,
+        calls: [remote, local],
+      });
+    }),
   );
 });
 
diff --git a/packages/client-runtime/src/state/assets.ts b/packages/client-runtime/src/state/assets.ts
index c2e6e79c30b8..e0e511325cbb 100644
--- a/packages/client-runtime/src/state/assets.ts
+++ b/packages/client-runtime/src/state/assets.ts
@@ -28,7 +28,6 @@ import type { ProjectFaviconCache, ProjectFaviconTarget } from "../projectFavico
 import { createEnvironmentQueryAtomFamily } from "./runtime.ts";
 
 const ASSET_URL_REFRESH_INTERVAL_MS = 30 * 60_000;
-const ASSET_URL_STALE_TIME_MS = 5 * 60_000;
 const ASSET_URL_IDLE_TTL_MS = 60 * 60_000;
 export const ASSET_URL_MAX_IN_FLIGHT = 6;
 
@@ -291,7 +290,8 @@ export function createAssetEnvironmentAtoms<R, E>(
   const createUrl = createEnvironmentQueryAtomFamily(runtime, {
     label: "environment-data:assets:create-url",
     execute,
-    staleTimeMs: ASSET_URL_STALE_TIME_MS,
+    // Each mint signs a new URL, so a remounted reader reuses its URL until renewal is due.
+    staleTimeMs: ASSET_URL_REFRESH_INTERVAL_MS,
     idleTtlMs: ASSET_URL_IDLE_TTL_MS,
     refreshIntervalMs: ASSET_URL_REFRESH_INTERVAL_MS,
     refreshTrigger: ({ input }) =>
@@ -323,6 +323,14 @@ export function createAssetEnvironmentAtoms<R, E>(
   };
 }
 
+/**
+ * The resource a project's icon URL is minted for. Refreshing the `createUrl` query for it makes
+ * the server resolve the icon again instead of serving a cached answer.
+ */
+export function projectFaviconResource(cwd: string, path: string | null | undefined) {
+  return { _tag: "project-favicon" as const, cwd, ...(path ? { path } : {}) };
+}
+
 export function createProjectFaviconUrlAtomFamily(input: {
   readonly imageCache?: ProjectFaviconCache;
   readonly createUrl: (target: {
@@ -342,8 +350,10 @@ export function createProjectFaviconUrlAtomFamily(input: {
   const projectClones = input.projectClones;
   const family = Atom.family((key: string) => {
     const [environmentId, cwd, path] = decodeKey(JSON.parse(key));
-    const resource = { _tag: "project-favicon" as const, cwd, ...(path ? { path } : {}) };
-    const query = input.createUrl({ environmentId, input: { resource } });
+    const query = input.createUrl({
+      environmentId,
+      input: { resource: projectFaviconResource(cwd, path) },
+    });
     // A cloned project exists before its files do, and the server reports its
     // icon missing until the clone lands. Ask again whenever the clone's phase
     // changes: the first list a client sees may already say done.
diff --git a/packages/client-runtime/src/state/commandPermissions.test.ts b/packages/client-runtime/src/state/commandPermissions.test.ts
index d8da76a4b690..718a9dda93c0 100644
--- a/packages/client-runtime/src/state/commandPermissions.test.ts
+++ b/packages/client-runtime/src/state/commandPermissions.test.ts
@@ -70,124 +70,117 @@ const setup = Effect.gen(function* () {
 
 describe("command permissions", () => {
   it.effect("requires the destination read grant to refresh providers", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const registry = yield* setup;
-        const refresh = createCommandPermissions(runtime, WS_METHODS.serverRefreshProviders);
-        registry.set(sessions(env), AsyncResult.success(grant(true)));
-        expect(registry.get(refresh.permissionAtom(env))).toBe(false);
-        expect((yield* refresh.authorize(registry, env).pipe(Effect.flip))._tag).toBe(
-          "EnvironmentAuthorizationError",
-        );
-        registry.set(
-          sessions(env),
-          AsyncResult.success({
-            ...grant(false),
-            scopes: [AuthOrchestrationReadScope],
-            permissions: [AuthOrchestrationReadScope],
-          }),
-        );
-        expect(registry.get(refresh.permissionAtom(env))).toBe(true);
-        yield* refresh.authorize(registry, env);
-        registry.set(sessions(other), AsyncResult.success(grant(false)));
-        expect(registry.get(refresh.permissionAtom(other))).toBe(false);
-        expect((yield* refresh.authorize(registry, other).pipe(Effect.flip))._tag).toBe(
-          "EnvironmentAuthorizationError",
-        );
-        registry.set(sessions(env), AsyncResult.success(grant(false)));
-        expect(registry.get(refresh.permissionAtom(env))).toBe(false);
-        expect((yield* refresh.authorize(registry, env).pipe(Effect.flip))._tag).toBe(
-          "EnvironmentAuthorizationError",
-        );
-      }),
-    ),
+    Effect.gen(function* () {
+      const registry = yield* setup;
+      const refresh = createCommandPermissions(runtime, WS_METHODS.serverRefreshProviders);
+      registry.set(sessions(env), AsyncResult.success(grant(true)));
+      expect(registry.get(refresh.permissionAtom(env))).toBe(false);
+      expect((yield* refresh.authorize(registry, env).pipe(Effect.flip))._tag).toBe(
+        "EnvironmentAuthorizationError",
+      );
+      registry.set(
+        sessions(env),
+        AsyncResult.success({
+          ...grant(false),
+          scopes: [AuthOrchestrationReadScope],
+          permissions: [AuthOrchestrationReadScope],
+        }),
+      );
+      expect(registry.get(refresh.permissionAtom(env))).toBe(true);
+      yield* refresh.authorize(registry, env);
+      registry.set(sessions(other), AsyncResult.success(grant(false)));
+      expect(registry.get(refresh.permissionAtom(other))).toBe(false);
+      expect((yield* refresh.authorize(registry, other).pipe(Effect.flip))._tag).toBe(
+        "EnvironmentAuthorizationError",
+      );
+      registry.set(sessions(env), AsyncResult.success(grant(false)));
+      expect(registry.get(refresh.permissionAtom(env))).toBe(false);
+      expect((yield* refresh.authorize(registry, env).pipe(Effect.flip))._tag).toBe(
+        "EnvironmentAuthorizationError",
+      );
+    }),
   );
 
   it.effect("requires the destination preview grant to close a browser tab", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const registry = yield* setup;
-        const close = createCommandPermissions(runtime, WS_METHODS.previewClose);
-        registry.set(sessions(env), AsyncResult.success(grant(true)));
-        expect(registry.get(close.permissionAtom(env))).toBe(false);
-        expect((yield* close.authorize(registry, env).pipe(Effect.flip))._tag).toBe(
-          "EnvironmentAuthorizationError",
-        );
-        registry.set(
-          sessions(env),
-          AsyncResult.success({
-            ...grant(false),
-            scopes: [AuthPreviewOperateScope],
-            permissions: [AuthPreviewOperateScope],
-          }),
-        );
-        expect(registry.get(close.permissionAtom(env))).toBe(true);
-        yield* close.authorize(registry, env);
-        registry.set(sessions(other), AsyncResult.success(grant(false)));
-        expect(registry.get(close.permissionAtom(other))).toBe(false);
-        expect((yield* close.authorize(registry, other).pipe(Effect.flip))._tag).toBe(
-          "EnvironmentAuthorizationError",
-        );
-      }),
-    ),
+    Effect.gen(function* () {
+      const registry = yield* setup;
+      const close = createCommandPermissions(runtime, WS_METHODS.previewClose);
+      registry.set(sessions(env), AsyncResult.success(grant(true)));
+      expect(registry.get(close.permissionAtom(env))).toBe(false);
+      expect((yield* close.authorize(registry, env).pipe(Effect.flip))._tag).toBe(
+        "EnvironmentAuthorizationError",
+      );
+      registry.set(
+        sessions(env),
+        AsyncResult.success({
+          ...grant(false),
+          scopes: [AuthPreviewOperateScope],
+          permissions: [AuthPreviewOperateScope],
+        }),
+      );
+      expect(registry.get(close.permissionAtom(env))).toBe(true);
+      yield* close.authorize(registry, env);
+      registry.set(sessions(other), AsyncResult.success(grant(false)));
+      expect(registry.get(close.permissionAtom(other))).toBe(false);
+      expect((yield* close.authorize(registry, other).pipe(Effect.flip))._tag).toBe(
+        "EnvironmentAuthorizationError",
+      );
+    }),
   );
 
   it.effect("requires the destination provider grant to remove an incomplete connection", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const registry = yield* setup;
-        const remove = createCommandPermissions(runtime, WS_METHODS.providerAuthRemoveMethod);
-        registry.set(sessions(env), AsyncResult.success(grant(true)));
-        expect(registry.get(remove.permissionAtom(env))).toBe(false);
-        expect((yield* remove.authorize(registry, env).pipe(Effect.flip))._tag).toBe(
-          "EnvironmentAuthorizationError",
-        );
-        registry.set(
-          sessions(env),
-          AsyncResult.success({
-            ...grant(false),
-            scopes: [AuthProvidersManageScope],
-            permissions: [AuthProvidersManageScope],
-          }),
-        );
-        expect(registry.get(remove.permissionAtom(env))).toBe(true);
-        yield* remove.authorize(registry, env);
-        registry.set(sessions(other), AsyncResult.success(grant(false)));
-        expect(registry.get(remove.permissionAtom(other))).toBe(false);
-      }),
-    ),
+    Effect.gen(function* () {
+      const registry = yield* setup;
+      const remove = createCommandPermissions(runtime, WS_METHODS.providerAuthRemoveMethod);
+      registry.set(sessions(env), AsyncResult.success(grant(true)));
+      expect(registry.get(remove.permissionAtom(env))).toBe(false);
+      expect((yield* remove.authorize(registry, env).pipe(Effect.flip))._tag).toBe(
+        "EnvironmentAuthorizationError",
+      );
+      registry.set(
+        sessions(env),
+        AsyncResult.success({
+          ...grant(false),
+          scopes: [AuthProvidersManageScope],
+          permissions: [AuthProvidersManageScope],
+        }),
+      );
+      expect(registry.get(remove.permissionAtom(env))).toBe(true);
+      yield* remove.authorize(registry, env);
+      registry.set(sessions(other), AsyncResult.success(grant(false)));
+      expect(registry.get(remove.permissionAtom(other))).toBe(false);
+    }),
   );
 
   it.effect.each([
     { method: WS_METHODS.serverRunStorageCleanup, scope: AuthSettingsWriteScope },
     { method: WS_METHODS.serverReclaimDatabaseSpace, scope: AuthEnvironmentMaintainScope },
   ])("requires the destination $scope grant for $method", ({ method, scope }) =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const registry = yield* setup;
-        const command = createCommandPermissions(runtime, method);
-        registry.set(sessions(env), AsyncResult.success(grant(true)));
-        expect(registry.get(command.permissionAtom(env))).toBe(false);
-        expect((yield* command.authorize(registry, env).pipe(Effect.flip))._tag).toBe(
-          "EnvironmentAuthorizationError",
-        );
-        registry.set(
-          sessions(env),
-          AsyncResult.success({ ...grant(true), scopes: [scope], permissions: [scope] }),
-        );
-        expect(registry.get(command.permissionAtom(env))).toBe(true);
-        yield* command.authorize(registry, env);
-        registry.set(sessions(other), AsyncResult.success(grant(false)));
-        expect(registry.get(command.permissionAtom(other))).toBe(false);
-      }),
-    ),
+    Effect.gen(function* () {
+      const registry = yield* setup;
+      const command = createCommandPermissions(runtime, method);
+      registry.set(sessions(env), AsyncResult.success(grant(true)));
+      expect(registry.get(command.permissionAtom(env))).toBe(false);
+      expect((yield* command.authorize(registry, env).pipe(Effect.flip))._tag).toBe(
+        "EnvironmentAuthorizationError",
+      );
+      registry.set(
+        sessions(env),
+        AsyncResult.success({ ...grant(true), scopes: [scope], permissions: [scope] }),
+      );
+      expect(registry.get(command.permissionAtom(env))).toBe(true);
+      yield* command.authorize(registry, env);
+      registry.set(sessions(other), AsyncResult.success(grant(false)));
+      expect(registry.get(command.permissionAtom(other))).toBe(false);
+    }),
   );
 
-  it.effect("requires the destination settings grant to check OTLP endpoints", () =>
-    Effect.scoped(
+  it.effect.each([WS_METHODS.serverCheckOtlpEndpoint, WS_METHODS.serverCheckSecretSource])(
+    "requires the destination settings grant for %s",
+    (method) =>
       Effect.gen(function* () {
         const registry = yield* setup;
-        const check = createCommandPermissions(runtime, WS_METHODS.serverCheckOtlpEndpoint);
+        const check = createCommandPermissions(runtime, method);
         registry.set(sessions(env), AsyncResult.success(grant(true)));
         expect(registry.get(check.permissionAtom(env))).toBe(false);
         registry.set(
@@ -201,59 +194,49 @@ describe("command permissions", () => {
         expect(registry.get(check.permissionAtom(env))).toBe(true);
         yield* check.authorize(registry, env);
       }),
-    ),
   );
 
   it.effect.each([WS_METHODS.scheduledTasksDelete, ORCHESTRATION_V2_WS_METHODS.stopWorkflow])(
     "uses the target grant for both availability and execution of %s",
     (method) =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const registry = yield* setup;
-          const permissions = createCommandPermissions(runtime, method);
-          registry.set(sessions(env), AsyncResult.success(grant(true)));
-          expect(registry.get(permissions.permissionAtom(env))).toBe(true);
-          expect(permissions.permissionAtom(env)).toBe(permissions.permissionAtom(env));
-          yield* permissions.authorize(registry, env);
-          registry.set(sessions(other), AsyncResult.success(grant(false)));
-          expect(registry.get(permissions.permissionAtom(other))).toBe(false);
-          const denied = yield* permissions.authorize(registry, other).pipe(Effect.flip);
-          expect(denied._tag).toBe("EnvironmentAuthorizationError");
-        }),
-      ),
-  );
-  it.effect("waits for an initial grant", () =>
-    Effect.scoped(
       Effect.gen(function* () {
         const registry = yield* setup;
-        const fiber = yield* permissions.authorize(registry, env).pipe(Effect.forkChild);
-        yield* Effect.yieldNow;
+        const permissions = createCommandPermissions(runtime, method);
         registry.set(sessions(env), AsyncResult.success(grant(true)));
-        yield* Fiber.join(fiber);
+        expect(registry.get(permissions.permissionAtom(env))).toBe(true);
+        expect(permissions.permissionAtom(env)).toBe(permissions.permissionAtom(env));
+        yield* permissions.authorize(registry, env);
+        registry.set(sessions(other), AsyncResult.success(grant(false)));
+        expect(registry.get(permissions.permissionAtom(other))).toBe(false);
+        const denied = yield* permissions.authorize(registry, other).pipe(Effect.flip);
+        expect(denied._tag).toBe("EnvironmentAuthorizationError");
       }),
-    ),
+  );
+  it.effect("waits for an initial grant", () =>
+    Effect.gen(function* () {
+      const registry = yield* setup;
+      const fiber = yield* permissions.authorize(registry, env).pipe(Effect.forkChild);
+      yield* Effect.yieldNow;
+      registry.set(sessions(env), AsyncResult.success(grant(true)));
+      yield* Fiber.join(fiber);
+    }),
   );
   it.effect(
     "denies failed and unauthenticated sessions, but accepts a cached refreshing grant",
     () =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const registry = yield* setup;
-          registry.set(sessions(env), AsyncResult.failure(Cause.fail("offline")));
-          expect((yield* permissions.authorize(registry, env).pipe(Effect.flip))._tag).toBe(
-            "EnvironmentAuthorizationError",
-          );
-          registry.set(
-            sessions(env),
-            AsyncResult.success({ ...grant(true), authenticated: false }),
-          );
-          expect((yield* permissions.authorize(registry, env).pipe(Effect.flip))._tag).toBe(
-            "EnvironmentAuthorizationError",
-          );
-          registry.set(sessions(env), AsyncResult.waiting(AsyncResult.success(grant(true))));
-          yield* permissions.authorize(registry, env);
-        }),
-      ),
+      Effect.gen(function* () {
+        const registry = yield* setup;
+        registry.set(sessions(env), AsyncResult.failure(Cause.fail("offline")));
+        expect((yield* permissions.authorize(registry, env).pipe(Effect.flip))._tag).toBe(
+          "EnvironmentAuthorizationError",
+        );
+        registry.set(sessions(env), AsyncResult.success({ ...grant(true), authenticated: false }));
+        expect((yield* permissions.authorize(registry, env).pipe(Effect.flip))._tag).toBe(
+          "EnvironmentAuthorizationError",
+        );
+        registry.set(sessions(env), AsyncResult.waiting(AsyncResult.success(grant(true))));
+        yield* permissions.authorize(registry, env);
+      }),
   );
   it("rechecks permission after waiting in a serial command lane", async () => {
     const registry = AtomRegistry.make();
@@ -300,261 +283,251 @@ describe("command permissions", () => {
 it.effect(
   "requires source control alone for git, and both grants when attaching a worktree to a thread",
   () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const registry = yield* setup;
-        registry.set(sessions(env), AsyncResult.success(grant(true)));
-        const git = createCommandPermissions(runtime, WS_METHODS.vcsInit);
-        expect((yield* git.authorize(registry, env).pipe(Effect.flip)).requiredPermission).toBe(
-          AuthSourceControlWriteScope,
-        );
-        registry.set(
-          sessions(env),
-          AsyncResult.success({
-            ...grant(false),
-            scopes: [AuthSourceControlWriteScope],
-            permissions: [AuthSourceControlWriteScope],
-          }),
-        );
-        yield* git.authorize(registry, env);
-        const prepare = createCommandPermissions(runtime, WS_METHODS.gitPreparePullRequestThread);
-        const input = {
-          cwd: "/repo",
-          reference: "123",
-          mode: "worktree",
-          threadId: ThreadId.make("thread"),
-        };
-        expect(registry.get(prepare.permissionAtom(env, input))).toBe(false);
-        expect(
-          (yield* prepare.authorize(registry, env, input).pipe(Effect.flip)).requiredScope,
-        ).toBe(AuthOrchestrationOperateScope);
-        yield* prepare.authorize(registry, env, { ...input, threadId: undefined });
-        registry.set(
-          sessions(env),
-          AsyncResult.success({
-            ...grant(true),
-            scopes: [AuthSourceControlWriteScope, AuthOrchestrationOperateScope],
-            permissions: [AuthSourceControlWriteScope, AuthOrchestrationOperateScope],
-          }),
-        );
-        expect(registry.get(prepare.permissionAtom(env, input))).toBe(true);
-        yield* prepare.authorize(registry, env, input);
-      }),
-    ),
+    Effect.gen(function* () {
+      const registry = yield* setup;
+      registry.set(sessions(env), AsyncResult.success(grant(true)));
+      const git = createCommandPermissions(runtime, WS_METHODS.vcsInit);
+      expect((yield* git.authorize(registry, env).pipe(Effect.flip)).requiredPermission).toBe(
+        AuthSourceControlWriteScope,
+      );
+      registry.set(
+        sessions(env),
+        AsyncResult.success({
+          ...grant(false),
+          scopes: [AuthSourceControlWriteScope],
+          permissions: [AuthSourceControlWriteScope],
+        }),
+      );
+      yield* git.authorize(registry, env);
+      const prepare = createCommandPermissions(runtime, WS_METHODS.gitPreparePullRequestThread);
+      const input = {
+        cwd: "/repo",
+        reference: "123",
+        mode: "worktree",
+        threadId: ThreadId.make("thread"),
+      };
+      expect(registry.get(prepare.permissionAtom(env, input))).toBe(false);
+      expect((yield* prepare.authorize(registry, env, input).pipe(Effect.flip)).requiredScope).toBe(
+        AuthOrchestrationOperateScope,
+      );
+      yield* prepare.authorize(registry, env, { ...input, threadId: undefined });
+      registry.set(
+        sessions(env),
+        AsyncResult.success({
+          ...grant(true),
+          scopes: [AuthSourceControlWriteScope, AuthOrchestrationOperateScope],
+          permissions: [AuthSourceControlWriteScope, AuthOrchestrationOperateScope],
+        }),
+      );
+      expect(registry.get(prepare.permissionAtom(env, input))).toBe(true);
+      yield* prepare.authorize(registry, env, input);
+    }),
 );
 
 it.effect.each(["commit", "push", "commit_push", "create_pr", "commit_push_pr"] as const)(
   "%s needs thread read permission only when generating a PR from a thread",
   (action) =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const registry = yield* setup;
-        const command = createCommandPermissions(runtime, WS_METHODS.gitRunStackedAction);
-        const input = { actionId: "action", cwd: "/repo", action };
-        const withThread = { ...input, threadId: ThreadId.make("thread") };
-        const session = {
-          ...grant(false),
-          scopes: [AuthSourceControlWriteScope],
-          permissions: [AuthSourceControlWriteScope],
-        };
-        registry.set(sessions(env), AsyncResult.success(session));
-        expect(registry.get(command.permissionAtom(env, input))).toBe(true);
-        yield* command.authorize(registry, env, input);
-        const readsThread = action === "create_pr" || action === "commit_push_pr";
-        expect(registry.get(command.permissionAtom(env, withThread))).toBe(!readsThread);
-        if (readsThread) {
-          expect(
-            yield* command.authorize(registry, env, withThread).pipe(Effect.flip),
-          ).toMatchObject({ requiredPermission: AuthOrchestrationReadScope });
-        } else {
-          yield* command.authorize(registry, env, withThread);
-        }
-        registry.set(
-          sessions(env),
-          AsyncResult.success({
-            ...session,
-            scopes: [AuthSourceControlWriteScope, AuthOrchestrationReadScope],
-            permissions: [AuthSourceControlWriteScope, AuthOrchestrationReadScope],
-          }),
+    Effect.gen(function* () {
+      const registry = yield* setup;
+      const command = createCommandPermissions(runtime, WS_METHODS.gitRunStackedAction);
+      const input = { actionId: "action", cwd: "/repo", action };
+      const withThread = { ...input, threadId: ThreadId.make("thread") };
+      const session = {
+        ...grant(false),
+        scopes: [AuthSourceControlWriteScope],
+        permissions: [AuthSourceControlWriteScope],
+      };
+      registry.set(sessions(env), AsyncResult.success(session));
+      expect(registry.get(command.permissionAtom(env, input))).toBe(true);
+      yield* command.authorize(registry, env, input);
+      const readsThread = action === "create_pr" || action === "commit_push_pr";
+      expect(registry.get(command.permissionAtom(env, withThread))).toBe(!readsThread);
+      if (readsThread) {
+        expect(yield* command.authorize(registry, env, withThread).pipe(Effect.flip)).toMatchObject(
+          { requiredPermission: AuthOrchestrationReadScope },
         );
-        expect(registry.get(command.permissionAtom(env, withThread))).toBe(true);
+      } else {
         yield* command.authorize(registry, env, withThread);
-      }),
-    ),
+      }
+      registry.set(
+        sessions(env),
+        AsyncResult.success({
+          ...session,
+          scopes: [AuthSourceControlWriteScope, AuthOrchestrationReadScope],
+          permissions: [AuthSourceControlWriteScope, AuthOrchestrationReadScope],
+        }),
+      );
+      expect(registry.get(command.permissionAtom(env, withThread))).toBe(true);
+      yield* command.authorize(registry, env, withThread);
+    }),
 );
 
 it.effect(
   "refreshes linked environments after permitted writes and blocks a read-only session",
   () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const registry = yield* setup;
-        const peer: PeerLinkSummary = {
-          environmentId: EnvironmentId.make("peer"),
-          label: "Box",
-          urls: ["https://box.example.test"],
-          access: "auto",
-          linkedAt: DateTime.makeUnsafe("2026-10-01T12:00:00Z"),
-          expiresAt: DateTime.makeUnsafe("2026-10-31T12:00:00Z"),
-          lastReachedAt: null,
-          lastError: null,
-          status: "reachable",
-        };
-        let links: ReadonlyArray<PeerLinkSummary> = [];
-        const client = {
-          [WS_METHODS.peerLinksList]: () => Effect.sync(() => ({ links })),
-          [WS_METHODS.peerLinksLink]: vi.fn(() =>
-            Effect.sync(() => {
-              links = [peer];
-              return peer;
-            }),
-          ),
-          [WS_METHODS.peerLinksUnlink]: vi.fn(() =>
-            Effect.sync(() => {
-              links = [];
-              return { removed: true };
-            }),
-          ),
-        };
-        const supervisor = {
-          target: new BearerConnectionTarget({
-            environmentId: env,
-            label: "Test",
-            connectionId: "test",
+    Effect.gen(function* () {
+      const registry = yield* setup;
+      const peer: PeerLinkSummary = {
+        environmentId: EnvironmentId.make("peer"),
+        label: "Box",
+        urls: ["https://box.example.test"],
+        access: "auto",
+        linkedAt: DateTime.makeUnsafe("2026-10-01T12:00:00Z"),
+        expiresAt: DateTime.makeUnsafe("2026-10-31T12:00:00Z"),
+        lastReachedAt: null,
+        lastError: null,
+        status: "reachable",
+      };
+      let links: ReadonlyArray<PeerLinkSummary> = [];
+      const client = {
+        [WS_METHODS.peerLinksList]: () => Effect.sync(() => ({ links })),
+        [WS_METHODS.peerLinksLink]: vi.fn(() =>
+          Effect.sync(() => {
+            links = [peer];
+            return peer;
           }),
-          session: yield* SubscriptionRef.make(Option.some({ client } as unknown as RpcSession)),
-          state: yield* SubscriptionRef.make({
-            ...AVAILABLE_CONNECTION_STATE,
-            phase: "connected" as const,
+        ),
+        [WS_METHODS.peerLinksUnlink]: vi.fn(() =>
+          Effect.sync(() => {
+            links = [];
+            return { removed: true };
           }),
-        } as EnvironmentSupervisor["Service"];
-        const peerRuntime = Atom.runtime(
-          Layer.succeed(EnvironmentRegistry, {
-            run: (id, effect) => {
-              expect(id).toBe(env);
-              return Effect.provideService(effect, EnvironmentSupervisor, supervisor);
-            },
-            followStream: (id, stream) => {
-              expect(id).toBe(env);
-              return Stream.provideService(stream, EnvironmentSupervisor, supervisor);
-            },
-          } as EnvironmentRegistry["Service"]),
-        );
-        const peerLinks = createPeerLinkEnvironmentAtoms(peerRuntime);
-        const list = peerLinks.list({ environmentId: env, input: {} });
-        registry.mount(list);
-        const readLinks = AtomRegistry.getResult(registry, list, { suspendOnWaiting: true });
-        const setAccess = (writable: boolean) =>
-          registry.set(
-            sessions(env),
-            AsyncResult.success({
-              ...grant(false),
-              scopes: [AuthAccessReadScope, ...(writable ? [AuthAccessWriteScope] : [])],
-              permissions: [AuthAccessReadScope, ...(writable ? [AuthAccessWriteScope] : [])],
-            }),
-          );
-        registry.mount(sessions(other));
+        ),
+      };
+      const supervisor = {
+        target: new BearerConnectionTarget({
+          environmentId: env,
+          label: "Test",
+          connectionId: "test",
+        }),
+        session: yield* SubscriptionRef.make(Option.some({ client } as unknown as RpcSession)),
+        state: yield* SubscriptionRef.make({
+          ...AVAILABLE_CONNECTION_STATE,
+          phase: "connected" as const,
+        }),
+      } as EnvironmentSupervisor["Service"];
+      const peerRuntime = Atom.runtime(
+        Layer.succeed(EnvironmentRegistry, {
+          run: (id, effect) => {
+            expect(id).toBe(env);
+            return Effect.provideService(effect, EnvironmentSupervisor, supervisor);
+          },
+          followStream: (id, stream) => {
+            expect(id).toBe(env);
+            return Stream.provideService(stream, EnvironmentSupervisor, supervisor);
+          },
+        } as EnvironmentRegistry["Service"]),
+      );
+      const peerLinks = createPeerLinkEnvironmentAtoms(peerRuntime);
+      const list = peerLinks.list({ environmentId: env, input: {} });
+      registry.mount(list);
+      const readLinks = AtomRegistry.getResult(registry, list, { suspendOnWaiting: true });
+      const setAccess = (writable: boolean) =>
         registry.set(
-          sessions(other),
+          sessions(env),
           AsyncResult.success({
             ...grant(false),
-            scopes: [AuthAccessWriteScope],
-            permissions: [AuthAccessWriteScope],
-          }),
-        );
-        setAccess(false);
-        expect(yield* readLinks).toEqual({ links: [] });
-        const linkInput = { url: peer.urls[0]!, pairingCode: "test-code", access: peer.access };
-        const link = Effect.promise(() =>
-          peerLinks.link.run(registry, { environmentId: env, input: linkInput }),
-        );
-        const unlink = Effect.promise(() =>
-          peerLinks.unlink.run(registry, {
-            environmentId: env,
-            input: { environmentId: peer.environmentId },
+            scopes: [AuthAccessReadScope, ...(writable ? [AuthAccessWriteScope] : [])],
+            permissions: [AuthAccessReadScope, ...(writable ? [AuthAccessWriteScope] : [])],
           }),
         );
-        expect(registry.get(peerLinks.link.permissionAtom(env))).toBe(false);
-        const deniedLink = yield* link;
-        expect(deniedLink._tag).toBe("Failure");
-        if (deniedLink._tag === "Failure") {
-          expect(Cause.squash(deniedLink.cause)).toMatchObject({
-            _tag: "EnvironmentAuthorizationError",
-            requiredPermission: AuthAccessWriteScope,
-          });
-        }
-        expect(client[WS_METHODS.peerLinksLink]).not.toHaveBeenCalled();
-        setAccess(true);
-        expect(registry.get(peerLinks.link.permissionAtom(env))).toBe(true);
-        expect((yield* link)._tag).toBe("Success");
-        expect(client[WS_METHODS.peerLinksLink]).toHaveBeenCalledExactlyOnceWith(linkInput);
-        expect(yield* readLinks).toEqual({ links: [peer] });
-
-        setAccess(false);
-        expect(registry.get(peerLinks.unlink.permissionAtom(env))).toBe(false);
-        const deniedUnlink = yield* unlink;
-        expect(deniedUnlink._tag).toBe("Failure");
-        if (deniedUnlink._tag === "Failure") {
-          expect(Cause.squash(deniedUnlink.cause)).toMatchObject({
-            _tag: "EnvironmentAuthorizationError",
-            requiredPermission: AuthAccessWriteScope,
-          });
-        }
-        expect(client[WS_METHODS.peerLinksUnlink]).not.toHaveBeenCalled();
-        expect(yield* readLinks).toEqual({ links: [peer] });
-        setAccess(true);
-        expect(registry.get(peerLinks.unlink.permissionAtom(env))).toBe(true);
-        expect((yield* unlink)._tag).toBe("Success");
-        expect(client[WS_METHODS.peerLinksUnlink]).toHaveBeenCalledExactlyOnceWith({
-          environmentId: peer.environmentId,
-        });
-        expect(yield* readLinks).toEqual({ links: [] });
-      }),
-    ),
-);
-
-it.effect("requires access management to answer a link request", () =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      const registry = yield* setup;
-      registry.set(sessions(env), AsyncResult.success(grant(true)));
-      const answer = createCommandPermissions(runtime, WS_METHODS.peerLinksAnswerRequest);
-      expect(registry.get(answer.permissionAtom(env))).toBe(false);
-      expect((yield* answer.authorize(registry, env).pipe(Effect.flip)).requiredPermission).toBe(
-        AuthAccessWriteScope,
-      );
+      registry.mount(sessions(other));
       registry.set(
-        sessions(env),
+        sessions(other),
         AsyncResult.success({
           ...grant(false),
           scopes: [AuthAccessWriteScope],
           permissions: [AuthAccessWriteScope],
         }),
       );
-      expect(registry.get(answer.permissionAtom(env))).toBe(true);
-      yield* answer.authorize(registry, env);
+      setAccess(false);
+      expect(yield* readLinks).toEqual({ links: [] });
+      const linkInput = { url: peer.urls[0]!, pairingCode: "test-code", access: peer.access };
+      const link = Effect.promise(() =>
+        peerLinks.link.run(registry, { environmentId: env, input: linkInput }),
+      );
+      const unlink = Effect.promise(() =>
+        peerLinks.unlink.run(registry, {
+          environmentId: env,
+          input: { environmentId: peer.environmentId },
+        }),
+      );
+      expect(registry.get(peerLinks.link.permissionAtom(env))).toBe(false);
+      const deniedLink = yield* link;
+      expect(deniedLink._tag).toBe("Failure");
+      if (deniedLink._tag === "Failure") {
+        expect(Cause.squash(deniedLink.cause)).toMatchObject({
+          _tag: "EnvironmentAuthorizationError",
+          requiredPermission: AuthAccessWriteScope,
+        });
+      }
+      expect(client[WS_METHODS.peerLinksLink]).not.toHaveBeenCalled();
+      setAccess(true);
+      expect(registry.get(peerLinks.link.permissionAtom(env))).toBe(true);
+      expect((yield* link)._tag).toBe("Success");
+      expect(client[WS_METHODS.peerLinksLink]).toHaveBeenCalledExactlyOnceWith(linkInput);
+      expect(yield* readLinks).toEqual({ links: [peer] });
+
+      setAccess(false);
+      expect(registry.get(peerLinks.unlink.permissionAtom(env))).toBe(false);
+      const deniedUnlink = yield* unlink;
+      expect(deniedUnlink._tag).toBe("Failure");
+      if (deniedUnlink._tag === "Failure") {
+        expect(Cause.squash(deniedUnlink.cause)).toMatchObject({
+          _tag: "EnvironmentAuthorizationError",
+          requiredPermission: AuthAccessWriteScope,
+        });
+      }
+      expect(client[WS_METHODS.peerLinksUnlink]).not.toHaveBeenCalled();
+      expect(yield* readLinks).toEqual({ links: [peer] });
+      setAccess(true);
+      expect(registry.get(peerLinks.unlink.permissionAtom(env))).toBe(true);
+      expect((yield* unlink)._tag).toBe("Success");
+      expect(client[WS_METHODS.peerLinksUnlink]).toHaveBeenCalledExactlyOnceWith({
+        environmentId: peer.environmentId,
+      });
+      expect(yield* readLinks).toEqual({ links: [] });
     }),
-  ),
+);
+
+it.effect("requires access management to answer a link request", () =>
+  Effect.gen(function* () {
+    const registry = yield* setup;
+    registry.set(sessions(env), AsyncResult.success(grant(true)));
+    const answer = createCommandPermissions(runtime, WS_METHODS.peerLinksAnswerRequest);
+    expect(registry.get(answer.permissionAtom(env))).toBe(false);
+    expect((yield* answer.authorize(registry, env).pipe(Effect.flip)).requiredPermission).toBe(
+      AuthAccessWriteScope,
+    );
+    registry.set(
+      sessions(env),
+      AsyncResult.success({
+        ...grant(false),
+        scopes: [AuthAccessWriteScope],
+        permissions: [AuthAccessWriteScope],
+      }),
+    );
+    expect(registry.get(answer.permissionAtom(env))).toBe(true);
+    yield* answer.authorize(registry, env);
+  }),
 );
 
 it.effect("honors exact empty permissions and preserves legacy parent grants", () =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      const registry = yield* setup;
-      const git = createCommandPermissions(runtime, WS_METHODS.vcsInit);
-      registry.set(sessions(env), AsyncResult.success({ ...grant(true), permissions: [] }));
-      expect(registry.get(git.permissionAtom(env))).toBe(false);
-      const denied = yield* git.authorize(registry, env).pipe(Effect.flip);
-      expect(denied).toMatchObject({
-        requiredPermission: AuthSourceControlWriteScope,
-        requiredScope: AuthOrchestrationOperateScope,
-      });
-      const { permissions: _exact, ...legacy } = grant(true);
-      registry.set(sessions(env), AsyncResult.success(legacy));
-      expect(registry.get(git.permissionAtom(env))).toBe(true);
-      yield* git.authorize(registry, env);
-    }),
-  ),
+  Effect.gen(function* () {
+    const registry = yield* setup;
+    const git = createCommandPermissions(runtime, WS_METHODS.vcsInit);
+    registry.set(sessions(env), AsyncResult.success({ ...grant(true), permissions: [] }));
+    expect(registry.get(git.permissionAtom(env))).toBe(false);
+    const denied = yield* git.authorize(registry, env).pipe(Effect.flip);
+    expect(denied).toMatchObject({
+      requiredPermission: AuthSourceControlWriteScope,
+      requiredScope: AuthOrchestrationOperateScope,
+    });
+    const { permissions: _exact, ...legacy } = grant(true);
+    registry.set(sessions(env), AsyncResult.success(legacy));
+    expect(registry.get(git.permissionAtom(env))).toBe(true);
+    yield* git.authorize(registry, env);
+  }),
 );
 
 it.effect("rejects protected unary and streamed RPCs outside a guarded command", () =>
diff --git a/packages/client-runtime/src/state/connections.test.ts b/packages/client-runtime/src/state/connections.test.ts
index dac91b6cac3b..b12eb7bc570d 100644
--- a/packages/client-runtime/src/state/connections.test.ts
+++ b/packages/client-runtime/src/state/connections.test.ts
@@ -75,48 +75,44 @@ const newSession = () => Option.some({} as RpcSession.RpcSession);
 
 describe("environment catalog atoms", () => {
   it.effect("changes the session generation only when a new session comes up", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const { generation, generationAfter } = yield* makeCatalogHarness();
-        const first = generation();
-        // A retry reports the generation it is attempting before it is established.
-        expect(
-          yield* generationAfter(
-            connectionState({ phase: "connecting", stage: "opening", generation: 2, lastFailure }),
-          ),
-        ).toBe(first);
-        expect(
-          yield* generationAfter(
-            connectionState({ phase: "backoff", generation: 1, lastFailure, retryAt: 1 }),
-          ),
-        ).toBe(first);
-        expect(
-          yield* generationAfter(
-            connectionState({ phase: "connected", attempt: 2, generation: 2 }),
-            newSession(),
-          ),
-        ).not.toBe(first);
-      }),
-    ),
+    Effect.gen(function* () {
+      const { generation, generationAfter } = yield* makeCatalogHarness();
+      const first = generation();
+      // A retry reports the generation it is attempting before it is established.
+      expect(
+        yield* generationAfter(
+          connectionState({ phase: "connecting", stage: "opening", generation: 2, lastFailure }),
+        ),
+      ).toBe(first);
+      expect(
+        yield* generationAfter(
+          connectionState({ phase: "backoff", generation: 1, lastFailure, retryAt: 1 }),
+        ),
+      ).toBe(first);
+      expect(
+        yield* generationAfter(
+          connectionState({ phase: "connected", attempt: 2, generation: 2 }),
+          newSession(),
+        ),
+      ).not.toBe(first);
+    }),
   );
 
   it.effect("changes when a replaced supervisor's first session reuses an old generation", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const { generation, generationAfter } = yield* makeCatalogHarness();
-        const first = generation();
+    Effect.gen(function* () {
+      const { generation, generationAfter } = yield* makeCatalogHarness();
+      const first = generation();
+      yield* generationAfter(
+        connectionState({ phase: "backoff", generation: 1, lastFailure, retryAt: 1 }),
+      );
+      // Re-pairing or editing a route installs a new supervisor, whose counter starts over.
+      yield* generationAfter(connectionState({ phase: "available", generation: 0 }));
+      expect(
         yield* generationAfter(
-          connectionState({ phase: "backoff", generation: 1, lastFailure, retryAt: 1 }),
-        );
-        // Re-pairing or editing a route installs a new supervisor, whose counter starts over.
-        yield* generationAfter(connectionState({ phase: "available", generation: 0 }));
-        expect(
-          yield* generationAfter(
-            connectionState({ phase: "connected", attempt: 1, generation: 1 }),
-            newSession(),
-          ),
-        ).not.toBe(first);
-      }),
-    ),
+          connectionState({ phase: "connected", attempt: 1, generation: 1 }),
+          newSession(),
+        ),
+      ).not.toBe(first);
+    }),
   );
 });
diff --git a/packages/client-runtime/src/state/entities.test.ts b/packages/client-runtime/src/state/entities.test.ts
index dc811ce4e69f..b451374fb61b 100644
--- a/packages/client-runtime/src/state/entities.test.ts
+++ b/packages/client-runtime/src/state/entities.test.ts
@@ -98,6 +98,19 @@ describe("V2 client presentation", () => {
     ).toBeNull();
   });
 
+  it("keeps an imported thread that never ran out of Working", () => {
+    const imported = presentThreadShell(environmentId, {
+      ...v2ThreadShell,
+      historyOrigin: "v1_import",
+      activeProviderThreadId: ProviderThreadId.make("provider-thread-imported"),
+      latestRunId: null,
+      activeRunId: null,
+      status: "idle",
+      pendingBackgroundTasks: [],
+    });
+    expect(isThreadWorking(imported)).toBe(false);
+  });
+
   it.each([
     { kinds: ["command"], expected: "completed" },
     { kinds: ["command", "subagent"], expected: "idle" },
diff --git a/packages/client-runtime/src/state/fileMetadata.test.ts b/packages/client-runtime/src/state/fileMetadata.test.ts
index f3f93be3c4cb..daf50845e2c0 100644
--- a/packages/client-runtime/src/state/fileMetadata.test.ts
+++ b/packages/client-runtime/src/state/fileMetadata.test.ts
@@ -160,7 +160,7 @@ describe("file metadata", () => {
       yield* TestClock.adjust(60_001);
       yield* Effect.promise(() => vi.advanceTimersByTimeAsync(60_000));
       expect(h.batches).toEqual([[path], ["/workspace/known"], [path], [path]]);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("does not seed a different path from a literal name with a numeric suffix", () =>
@@ -179,7 +179,7 @@ describe("file metadata", () => {
       expect(yield* h.read("/workspace/read:12:3")).toEqual({ kind: "file", byteLength: 100 });
       expect(yield* h.read("/workspace/read")).toBeNull();
       expect(h.batches).toEqual([["/workspace/report"], ["/workspace/read"]]);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("retries only paths invalidated while their response is in flight", () =>
@@ -216,7 +216,7 @@ describe("file metadata", () => {
         byteLength: 10,
       });
       expect(h.batches).toHaveLength(2);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("an offscreen invalidation waits until that path is read again", () =>
@@ -236,7 +236,7 @@ describe("file metadata", () => {
         kind: "directory",
       });
       expect(h.batches).toHaveLength(2);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("invalidates a changed retained path without refetching other paths", () =>
@@ -262,7 +262,7 @@ describe("file metadata", () => {
       h.registry.refresh(h.atom("/workspace/unchanged", ENVIRONMENT_ID, threadId));
       yield* h.read("/workspace/unchanged", ENVIRONMENT_ID, threadId);
       expect(h.batches.slice(before)).toEqual([["/workspace/file"]]);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("a reconnect discards retained metadata from the previous session", () =>
@@ -279,7 +279,7 @@ describe("file metadata", () => {
         kind: "directory",
       });
       expect(h.batches).toHaveLength(2);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("keeps batches and cached paths separate across environments", () =>
@@ -293,7 +293,7 @@ describe("file metadata", () => {
         { concurrency: "unbounded" },
       );
       expect(h.batches.slice(1)).toEqual([["/workspace/new"], ["/workspace/new"]]);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("settles a failed batch and can retry after access is granted", () =>
@@ -309,7 +309,7 @@ describe("file metadata", () => {
       h.values.set("/workspace/a", { kind: "directory" });
       h.registry.refresh(h.atom("/workspace/a"));
       expect(yield* h.read("/workspace/a")).toEqual({ kind: "directory" });
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("reuses file read sizes and normalizes Windows cache keys", () =>
@@ -323,7 +323,7 @@ describe("file metadata", () => {
         .pipe(Effect.provideService(EnvironmentSupervisor.EnvironmentSupervisor, h.supervisor));
       expect(yield* h.read("c:/workspace/file/")).toEqual({ kind: "file", byteLength: 100 });
       expect(h.batches).toHaveLength(0);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("batches mounted paths and deduplicates repeated chips", () =>
@@ -343,7 +343,7 @@ describe("file metadata", () => {
       ]);
       yield* h.read("/workspace/file");
       expect(h.batches).toHaveLength(1);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("uses search and tree kinds without another request", () =>
@@ -352,7 +352,7 @@ describe("file metadata", () => {
       yield* h.seed("folder.ts", "directory");
       expect(yield* h.read("/workspace/folder.ts")).toEqual({ kind: "directory" });
       expect(h.batches).toHaveLength(0);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("splits large mounts into bounded batches and caches misses", () =>
@@ -368,6 +368,6 @@ describe("file metadata", () => {
       const count = h.batches.length;
       yield* h.read("/workspace/0");
       expect(h.batches).toHaveLength(count);
-    }).pipe(Effect.scoped),
+    }),
   );
 });
diff --git a/packages/client-runtime/src/state/filesystem.ts b/packages/client-runtime/src/state/filesystem.ts
index 6feec971c7b3..0b380101a99d 100644
--- a/packages/client-runtime/src/state/filesystem.ts
+++ b/packages/client-runtime/src/state/filesystem.ts
@@ -154,7 +154,6 @@ export function createFilesystemEnvironmentAtoms<R, E>(
       // lists it again. The short TTL only keeps the old listing on screen while it refreshes.
       idleTtlMs: BROWSE_IDLE_TTL_MS,
       staleTimeMs: 0,
-      revalidateOnRemount: true,
     }),
   };
 }
diff --git a/packages/client-runtime/src/state/models.ts b/packages/client-runtime/src/state/models.ts
index e09d0e4ebda5..6bc914b8572f 100644
--- a/packages/client-runtime/src/state/models.ts
+++ b/packages/client-runtime/src/state/models.ts
@@ -231,7 +231,7 @@ function shellRuntime(thread: OrchestrationV2ThreadShell): ThreadRuntimeSummary
   const parkAtIdle =
     backgroundWorkHoldsCompletion(thread.pendingBackgroundTasks ?? []) &&
     thread.status !== "failed";
-  if (thread.latestRunId === null && thread.activeProviderThreadId === null && !parkAtIdle) {
+  if (thread.latestRunId === null && !parkAtIdle) {
     return null;
   }
   const status = parkAtIdle ? "idle" : (thread.activityRunStatus ?? thread.status);
diff --git a/packages/client-runtime/src/state/orchestrationV2Projection.test.ts b/packages/client-runtime/src/state/orchestrationV2Projection.test.ts
index f6ba3e9f0c1a..9284b6f9b82d 100644
--- a/packages/client-runtime/src/state/orchestrationV2Projection.test.ts
+++ b/packages/client-runtime/src/state/orchestrationV2Projection.test.ts
@@ -483,6 +483,105 @@ describe("applyOrchestrationV2ProjectionEvent", () => {
     });
   });
 
+  it("hides a steer that fell back to the queue until its run starts", () => {
+    const queuedRunId = RunId.make("run-requeued-steer");
+    const queuedRun = { ...run, id: queuedRunId, ordinal: 2, status: "queued" } as const;
+    const reply = commandItem("item-reply", "reply", 102);
+    const steer: OrchestrationV2TurnItem = {
+      id: TurnItemId.make("item-steer"),
+      threadId,
+      runId,
+      nodeId: null,
+      providerThreadId: null,
+      providerTurnId: null,
+      nativeItemRef: null,
+      parentItemId: null,
+      ordinal: 101,
+      status: "completed",
+      title: null,
+      startedAt: now,
+      completedAt: now,
+      updatedAt: now,
+      type: "user_message",
+      messageId: MessageId.make("message-steer"),
+      inputIntent: "steer",
+      text: "steer",
+      attachments: [],
+      createdBy: "user",
+      creationSource: "web",
+    };
+    const event = (type: "run.updated" | "turn-item.updated", payload: unknown) =>
+      ({
+        id: `event-${type}`,
+        type,
+        threadId,
+        occurredAt: now,
+        payload,
+      }) as OrchestrationV2DomainEvent;
+    const apply = (
+      projection: OrchestrationV2ThreadProjection | null,
+      events: ReadonlyArray<OrchestrationV2DomainEvent>,
+      options?: Parameters<typeof applyOrchestrationV2ProjectionEvent>[2],
+    ) =>
+      events.reduce(
+        (next, item) => applyOrchestrationV2ProjectionEvent(next, item, options),
+        projection,
+      );
+    const visibleIds = (projection: OrchestrationV2ThreadProjection | null) =>
+      projection?.visibleTurnItems.map((row) => row.item.id);
+
+    const accepted = apply(emptyProjection, [
+      event("run.updated", { ...run, status: "running" }),
+      event("turn-item.updated", steer),
+      event("turn-item.updated", reply),
+    ]);
+    expect(visibleIds(accepted)).toEqual([steer.id, reply.id]);
+
+    const queuedSteer = event("turn-item.updated", {
+      ...steer,
+      runId: queuedRunId,
+      inputIntent: "queued_turn",
+      status: "pending",
+      startedAt: null,
+      completedAt: null,
+    });
+    const requeued = apply(accepted, [event("run.updated", queuedRun), queuedSteer]);
+    expect(visibleIds(requeued)).toEqual([reply.id]);
+
+    // Servers publish the start's user item and run update in either order.
+    const starting = event("run.updated", { ...queuedRun, status: "starting" });
+    const dispatchedSteer = event("turn-item.updated", {
+      ...steer,
+      runId: queuedRunId,
+      inputIntent: "queued_turn",
+    });
+    expect(visibleIds(apply(requeued, [dispatchedSteer, starting]))).toEqual([steer.id, reply.id]);
+    expect(visibleIds(apply(requeued, [starting, dispatchedSteer]))).toEqual([steer.id, reply.id]);
+    const cancelled = event("run.updated", { ...queuedRun, status: "cancelled" });
+    expect(visibleIds(apply(requeued, [cancelled]))).toEqual([reply.id]);
+
+    // A bounded snapshot taken while queued omits the hidden item, and the
+    // newer reply puts it below the watermark.
+    const bounded = {
+      ...requeued!,
+      turnItems: requeued!.turnItems.filter((item) => item.id !== steer.id),
+    };
+    const partial = { partialTimeline: true, latestLocalTurnOrdinal: reply.ordinal };
+    const failed = event("run.updated", { ...queuedRun, status: "failed" });
+    const failedSteer = event("turn-item.updated", {
+      ...steer,
+      runId: queuedRunId,
+      inputIntent: "queued_turn",
+      status: "failed",
+      startedAt: null,
+    });
+    const retained = apply(bounded, [failedSteer], partial);
+    expect(visibleIds(retained)).toEqual([reply.id]);
+    expect(visibleIds(apply(retained, [failed], partial))).toEqual([steer.id, reply.id]);
+    // Leaving the queue never invents an item the client did not receive.
+    expect(visibleIds(apply(bounded, [failed], partial))).toEqual([reply.id]);
+  });
+
   it("removes only hidden local items while preserving inherited rows", () => {
     const inherited = commandItem("item-inherited");
     const local = commandItem("item-local");
diff --git a/packages/client-runtime/src/state/orchestrationV2Projection.ts b/packages/client-runtime/src/state/orchestrationV2Projection.ts
index d9368ef4058a..76d1c9d6b9c1 100644
--- a/packages/client-runtime/src/state/orchestrationV2Projection.ts
+++ b/packages/client-runtime/src/state/orchestrationV2Projection.ts
@@ -1,4 +1,5 @@
 import { applyThreadPullRequestLinkUpdate } from "../threadPullRequests.ts";
+import { applyOrchestrationV2ThreadVisit } from "@t3tools/contracts";
 import type {
   OrchestrationV2DomainEvent,
   OrchestrationV2Run,
@@ -256,6 +257,29 @@ function upsertVisibleTurnItem(
   return updated;
 }
 
+// A user item retained for a queued run stays hidden until the run leaves the
+// queue, and its update can arrive before or after that run update. Items in
+// `turnItems` were loaded or streamed, so they skip the partial-window check;
+// items never received stay absent.
+function restoreQueuedUserItems(
+  projection: OrchestrationV2ThreadProjection,
+  runId: OrchestrationV2Run["id"],
+): OrchestrationV2ThreadProjection["visibleTurnItems"] {
+  let visibleTurnItems = projection.visibleTurnItems;
+  for (const item of projection.turnItems) {
+    if (item.runId !== runId || item.type !== "user_message" || item.inputIntent !== "queued_turn")
+      continue;
+    if (!shouldShowLocalTurnItem(projection, item)) continue;
+    visibleTurnItems = upsertVisibleTurnItem(
+      { ...projection, visibleTurnItems },
+      item,
+      false,
+      null,
+    );
+  }
+  return visibleTurnItems;
+}
+
 export function applyOrchestrationV2ProjectionEvent(
   projection: OrchestrationV2ThreadProjection | null,
   event: OrchestrationV2DomainEvent,
@@ -298,10 +322,21 @@ export function applyOrchestrationV2ProjectionEvent(
     case "thread.tags-updated":
     case "thread.marked-unread":
       return { ...projection, thread: event.payload };
+    case "thread.visit-recorded":
+      return {
+        ...projection,
+        thread: applyOrchestrationV2ThreadVisit(projection.thread, event.payload),
+      };
     case "run.created":
     case "run.updated": {
       const next = { ...base, runs: upsertEntity(base.runs, event.payload) };
-      return { ...next, visibleTurnItems: activeVisibleTurnItems(next) };
+      const visible = { ...next, visibleTurnItems: activeVisibleTurnItems(next) };
+      const wasQueued = base.runs.some(
+        (run) => run.id === event.payload.id && run.status === "queued",
+      );
+      return wasQueued && event.payload.status !== "queued"
+        ? { ...visible, visibleTurnItems: restoreQueuedUserItems(visible, event.payload.id) }
+        : visible;
     }
     case "run.background-work-cancelled":
       return {
diff --git a/packages/client-runtime/src/state/projectCommands.test.ts b/packages/client-runtime/src/state/projectCommands.test.ts
index 34c523f64e51..aa67ccd58026 100644
--- a/packages/client-runtime/src/state/projectCommands.test.ts
+++ b/packages/client-runtime/src/state/projectCommands.test.ts
@@ -172,7 +172,7 @@ describe("writeFile metadata", () => {
         yield* AtomRegistry.getResult(h.registry, metadata, { suspendOnWaiting: true }),
       ).toBeNull();
       expect(h.metadataRequests).toEqual([["/repo/foo"]]);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("does not restore old metadata from a read completed after a write", () =>
@@ -215,7 +215,7 @@ describe("writeFile metadata", () => {
       h.registry.refresh(metadata);
       expect(yield* readMetadata()).toEqual({ kind: "file", byteLength: 10 });
       expect(h.metadataRequests).toHaveLength(2);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("refreshes retained canonical and original paths after an aliased write", () =>
@@ -254,7 +254,7 @@ describe("writeFile metadata", () => {
         "/repo/foo",
         "/repo/./foo",
       ]);
-    }).pipe(Effect.scoped),
+    }),
   );
 });
 
@@ -267,6 +267,6 @@ describe("openScratch", () => {
       registry.set(storedProject, PROJECT);
       const result = yield* Fiber.join(opening);
       expect(result).toMatchObject({ _tag: "Success", value: PROJECT });
-    }).pipe(Effect.scoped),
+    }),
   );
 });
diff --git a/packages/client-runtime/src/state/projectGrouping.test.ts b/packages/client-runtime/src/state/projectGrouping.test.ts
index a5957d06e1b0..f4edba2b8d45 100644
--- a/packages/client-runtime/src/state/projectGrouping.test.ts
+++ b/packages/client-runtime/src/state/projectGrouping.test.ts
@@ -289,6 +289,20 @@ describe("buildProjectGroups", () => {
     expect(groups[1]?.label).toBe("julius/t3code-fork");
   });
 
+  // regression: #15049 a rename to the repository name snapped back to the display path
+  it("labels a renamed group by its title even when it matches the repository name", () => {
+    const folderTitles = [
+      makeProject("t3code", "/work/t3code", { title: "t3code" }),
+      makeProject("t3code-2", "/work/t3code-2", { title: "t3code" }),
+    ];
+    const renamed = folderTitles.map((project) => ({ ...project, hasCustomTitle: true }));
+
+    const label = (projects: ReadonlyArray<EnvironmentProject>) =>
+      buildProjectGroups({ projects, settings: settings("repository") })[0]?.label;
+    expect(label(folderTitles)).toBe("T3 Code");
+    expect(label(renamed)).toBe("t3code");
+  });
+
   it("applies a physical-project override without dropping its siblings", () => {
     const first = makeProject("t3code", "/work/t3code");
     const second = makeProject("t3code-2", "/work/t3code-2");
diff --git a/packages/client-runtime/src/state/projectGrouping.ts b/packages/client-runtime/src/state/projectGrouping.ts
index 46fdc4e3dd3a..c05a9724ce20 100644
--- a/packages/client-runtime/src/state/projectGrouping.ts
+++ b/packages/client-runtime/src/state/projectGrouping.ts
@@ -200,7 +200,9 @@ export function resolveScratchProjectScopeKey(
 
 export function deriveProjectGroupLabel(input: {
   readonly representative: Pick<EnvironmentProject, "title" | "repositoryIdentity">;
-  readonly members: ReadonlyArray<Pick<EnvironmentProject, "title" | "repositoryIdentity">>;
+  readonly members: ReadonlyArray<
+    Pick<EnvironmentProject, "title" | "hasCustomTitle" | "repositoryIdentity">
+  >;
 }): string {
   const sharedTitles = uniqueNonEmptyValues(input.members.map((member) => member.title));
   const sharedDisplayNames = uniqueNonEmptyValues(
@@ -215,8 +217,8 @@ export function deriveProjectGroupLabel(input: {
   if (
     sharedTitles.length === 1 &&
     sharedTitle !== undefined &&
-    !sharedDisplayNames.includes(sharedTitle) &&
-    !sharedRepositoryNames.includes(sharedTitle)
+    (input.members.some((member) => member.hasCustomTitle === true) ||
+      (!sharedDisplayNames.includes(sharedTitle) && !sharedRepositoryNames.includes(sharedTitle)))
   ) {
     return sharedTitle;
   }
diff --git a/packages/client-runtime/src/state/pullRequests.test.ts b/packages/client-runtime/src/state/pullRequests.test.ts
index f4571c44b03a..a70179c7974c 100644
--- a/packages/client-runtime/src/state/pullRequests.test.ts
+++ b/packages/client-runtime/src/state/pullRequests.test.ts
@@ -15,6 +15,7 @@ import { expect, it } from "@effect/vitest";
 import * as Schema from "effect/Schema";
 import * as Deferred from "effect/Deferred";
 import * as Fiber from "effect/Fiber";
+import * as TestClock from "effect/testing/TestClock";
 import * as Effect from "effect/Effect";
 import * as Latch from "effect/Latch";
 import * as Layer from "effect/Layer";
@@ -57,7 +58,7 @@ const trustedRouting = {
 
 class MutationRefused extends Schema.TaggedError<MutationRefused>()("MutationRefused", {}) {}
 
-for (const scenario of [
+it.effect.each([
   "prefers the local environment with the same github account",
   "falls back before mutation when the local account differs",
   "never retries an ambiguous mutation failure",
@@ -71,176 +72,169 @@ for (const scenario of [
   "keeps mutations on the origin when the alternate is disabled",
   "does not dispatch after the alternate is disabled during the probe",
   "preserves a local source account rejection when alternate accounts differ",
-] as const) {
-  (scenario === "returns a successful mutation when source invalidation stalls"
-    ? it.live
-    : it.effect)(scenario, () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const calls: string[] = [];
-        const inputs: unknown[] = [];
-        let trusted = true;
-        let disableAlternate = Effect.void;
-        const switchedAccount =
-          scenario === "preserves a local source account rejection when alternate accounts differ";
-        const mismatch =
-          scenario === "falls back before mutation when the local account differs" ||
-          switchedAccount;
-        const ambiguous = scenario === "never retries an ambiguous mutation failure";
-        const reading =
-          scenario === "returns a fast local source read without checking alternate identities";
-        const single = scenario === "keeps single-environment requests free of identity lookups";
-        const localOrigin =
-          scenario === "keeps a local origin ahead of another local environment" ||
-          switchedAccount ||
-          reading;
-        const oldOrigin =
-          scenario === "keeps mutations on an old origin server without retrying them";
-        const oldAlternate =
-          scenario === "skips an old alternate server before dispatching a mutation";
-        const failure = new PullRequestOperationError({
-          operation: switchedAccount ? "routeIdentity" : "runAction",
-          detail: "connection lost after dispatch",
-        });
-        const clientFor = (local: boolean) => {
-          const name = local ? "local" : "origin";
-          return {
-            [local ? WS_METHODS.pullRequestsRoutingIdentity : WS_METHODS.pullRequestsRouting]: (
-              input: unknown,
-            ) =>
-              Effect.gen(function* () {
-                if (local) expect(input).toEqual({ host: "github.com" });
-                calls.push(`${name}:identity`);
-                if (
-                  local &&
-                  scenario === "does not dispatch after the alternate is disabled during the probe"
-                )
-                  yield* disableAlternate;
-                if (
-                  local &&
-                  scenario ===
-                    "does not dispatch after routing permission is revoked during the probe"
-                )
-                  trusted = false;
-                if ((!local && oldOrigin) || (local && oldAlternate)) {
-                  return yield* Effect.die(
-                    `Unknown request tag: ${WS_METHODS.pullRequestsRouting}`,
-                  );
-                }
-                return {
-                  host: "github.com",
-                  provider: "github",
-                  viewer: "maria-rcks",
-                  accountId: local && mismatch ? "456" : "123",
-                };
-              }),
-            [WS_METHODS.pullRequestsRunAction]: (input: unknown) =>
-              Effect.gen(function* () {
-                calls.push(`${name}:mutation`);
-                inputs.push(input);
-                if (
-                  !local &&
-                  switchedAccount &&
-                  (input as { expectedAccountId?: string }).expectedAccountId === "123"
-                )
-                  return yield* failure;
-                if (local && ambiguous) return yield* failure;
-              }),
-            [WS_METHODS.pullRequestsSummary]: (input: { allowStale?: boolean }) =>
-              Effect.gen(function* () {
-                calls.push(`${name}:read`);
-                expect(input.allowStale).toBe(false);
-                if (local) return yield* failure;
-                return null;
-              }),
-            [WS_METHODS.pullRequestsInvalidate]: () =>
-              Effect.gen(function* () {
-                calls.push(`${name}:invalidate`);
-                if (
-                  !local &&
-                  scenario === "returns a successful mutation when source invalidation stalls"
-                ) {
-                  return yield* Effect.never;
-                }
-              }),
-          } as unknown as WsRpcProtocolClient;
-        };
-        const { environmentRegistry, supervisor } = yield* makeTestRuntime(
-          clientFor(false),
-          single ? undefined : clientFor(true),
-          localOrigin,
-        );
-        disableAlternate = SubscriptionRef.update(
-          environmentRegistry.entries,
-          (entries) =>
-            new Map(
-              [...entries].map(([id, entry]) => [
-                id,
-                id === TARGET.environmentId ? entry : { ...entry, enabled: false },
-              ]),
-            ),
-        );
-        const disabled =
-          scenario === "keeps mutations on the origin when the alternate is disabled";
-        const disabledDuringProbe =
-          scenario === "does not dispatch after the alternate is disabled during the probe";
-        if (disabled) yield* disableAlternate;
-        const input = {
-          projectId: ProjectId.make("project-1"),
-          host: "github.com",
-          repository: "acme/web",
-          number: 7,
-          action: "merge" as const,
-        };
-        const route = createPullRequestRouter();
-        const result = yield* (
-          reading
-            ? route(WS_METHODS.pullRequestsSummary, input)
-            : route(WS_METHODS.pullRequestsRunAction, input)
-        ).pipe(
-          Effect.provideService(EnvironmentRegistry.EnvironmentRegistry, environmentRegistry),
-          Effect.provideService(RpcPermissionGuard, { authorize: () => Effect.void }),
-          Effect.provideService(PullRequestRoutingPermissions, {
-            ...trustedRouting,
-            get: () => Effect.succeed(trusted ? "read-write" : "off"),
+] as const)("%s", (scenario) =>
+  Effect.gen(function* () {
+    const stalls = scenario === "returns a successful mutation when source invalidation stalls";
+    const invalidationStalled = yield* Deferred.make<void>();
+    const calls: string[] = [];
+    const inputs: unknown[] = [];
+    let trusted = true;
+    let disableAlternate = Effect.void;
+    const switchedAccount =
+      scenario === "preserves a local source account rejection when alternate accounts differ";
+    const mismatch =
+      scenario === "falls back before mutation when the local account differs" || switchedAccount;
+    const ambiguous = scenario === "never retries an ambiguous mutation failure";
+    const reading =
+      scenario === "returns a fast local source read without checking alternate identities";
+    const single = scenario === "keeps single-environment requests free of identity lookups";
+    const localOrigin =
+      scenario === "keeps a local origin ahead of another local environment" ||
+      switchedAccount ||
+      reading;
+    const oldOrigin = scenario === "keeps mutations on an old origin server without retrying them";
+    const oldAlternate = scenario === "skips an old alternate server before dispatching a mutation";
+    const failure = new PullRequestOperationError({
+      operation: switchedAccount ? "routeIdentity" : "runAction",
+      detail: "connection lost after dispatch",
+    });
+    const clientFor = (local: boolean) => {
+      const name = local ? "local" : "origin";
+      return {
+        [local ? WS_METHODS.pullRequestsRoutingIdentity : WS_METHODS.pullRequestsRouting]: (
+          input: unknown,
+        ) =>
+          Effect.gen(function* () {
+            if (local) expect(input).toEqual({ host: "github.com" });
+            calls.push(`${name}:identity`);
+            if (
+              local &&
+              scenario === "does not dispatch after the alternate is disabled during the probe"
+            )
+              yield* disableAlternate;
+            if (
+              local &&
+              scenario === "does not dispatch after routing permission is revoked during the probe"
+            )
+              trusted = false;
+            if ((!local && oldOrigin) || (local && oldAlternate)) {
+              return yield* Effect.die(`Unknown request tag: ${WS_METHODS.pullRequestsRouting}`);
+            }
+            return {
+              host: "github.com",
+              provider: "github",
+              viewer: "maria-rcks",
+              accountId: local && mismatch ? "456" : "123",
+            };
           }),
-          Effect.provideService(EnvironmentSupervisor.EnvironmentSupervisor, supervisor),
-          Effect.result,
-        );
-
-        if (switchedAccount) {
-          expect(result).toMatchObject({ _tag: "Failure", failure });
-          expect(calls.filter((call) => call.endsWith(":mutation"))).toEqual(["origin:mutation"]);
-          expect(inputs).toEqual([{ ...input, expectedAccountId: "123" }]);
-        } else if (ambiguous) {
-          expect(result).toMatchObject({ _tag: "Failure", failure });
-          expect(calls.filter((call) => call.endsWith(":mutation"))).toEqual(["local:mutation"]);
-        } else {
-          expect(result._tag).toBe("Success");
-          if (single || disabled) {
-            expect(calls.filter((call) => !call.endsWith(":invalidate"))).toEqual([
-              "origin:mutation",
-            ]);
-          } else if (reading) expect(calls).toEqual(["origin:read"]);
-          else if (
-            mismatch ||
-            localOrigin ||
-            oldOrigin ||
-            oldAlternate ||
-            !trusted ||
-            disabledDuringProbe
-          )
-            expect(calls.filter((call) => call.endsWith(":mutation"))).toEqual(["origin:mutation"]);
-          else {
-            expect(calls.filter((call) => call.endsWith(":mutation"))).toEqual(["local:mutation"]);
-            expect(calls).toContain("origin:invalidate");
-            expect(inputs).toEqual([{ ...input, expectedAccountId: "123" }]);
-          }
-        }
+        [WS_METHODS.pullRequestsRunAction]: (input: unknown) =>
+          Effect.gen(function* () {
+            calls.push(`${name}:mutation`);
+            inputs.push(input);
+            if (
+              !local &&
+              switchedAccount &&
+              (input as { expectedAccountId?: string }).expectedAccountId === "123"
+            )
+              return yield* failure;
+            if (local && ambiguous) return yield* failure;
+          }),
+        [WS_METHODS.pullRequestsSummary]: (input: { allowStale?: boolean }) =>
+          Effect.gen(function* () {
+            calls.push(`${name}:read`);
+            expect(input.allowStale).toBe(false);
+            if (local) return yield* failure;
+            return null;
+          }),
+        [WS_METHODS.pullRequestsInvalidate]: () =>
+          Effect.gen(function* () {
+            calls.push(`${name}:invalidate`);
+            if (!local && stalls) {
+              yield* Deferred.succeed(invalidationStalled, undefined);
+              return yield* Effect.never;
+            }
+          }),
+      } as unknown as WsRpcProtocolClient;
+    };
+    const { environmentRegistry, supervisor } = yield* makeTestRuntime(
+      clientFor(false),
+      single ? undefined : clientFor(true),
+      localOrigin,
+    );
+    disableAlternate = SubscriptionRef.update(
+      environmentRegistry.entries,
+      (entries) =>
+        new Map(
+          [...entries].map(([id, entry]) => [
+            id,
+            id === TARGET.environmentId ? entry : { ...entry, enabled: false },
+          ]),
+        ),
+    );
+    const disabled = scenario === "keeps mutations on the origin when the alternate is disabled";
+    const disabledDuringProbe =
+      scenario === "does not dispatch after the alternate is disabled during the probe";
+    if (disabled) yield* disableAlternate;
+    const input = {
+      projectId: ProjectId.make("project-1"),
+      host: "github.com",
+      repository: "acme/web",
+      number: 7,
+      action: "merge" as const,
+    };
+    const route = createPullRequestRouter();
+    const routed = (
+      reading
+        ? route(WS_METHODS.pullRequestsSummary, input)
+        : route(WS_METHODS.pullRequestsRunAction, input)
+    ).pipe(
+      Effect.provideService(EnvironmentRegistry.EnvironmentRegistry, environmentRegistry),
+      Effect.provideService(RpcPermissionGuard, { authorize: () => Effect.void }),
+      Effect.provideService(PullRequestRoutingPermissions, {
+        ...trustedRouting,
+        get: () => Effect.succeed(trusted ? "read-write" : "off"),
       }),
-    ),
-  );
-}
+      Effect.provideService(EnvironmentSupervisor.EnvironmentSupervisor, supervisor),
+      Effect.result,
+    );
+    const result = stalls
+      ? yield* Effect.gen(function* () {
+          const fiber = yield* Effect.forkChild(routed);
+          yield* Deferred.await(invalidationStalled);
+          yield* TestClock.adjust("1 second");
+          return yield* Fiber.join(fiber);
+        })
+      : yield* routed;
+
+    if (switchedAccount) {
+      expect(result).toMatchObject({ _tag: "Failure", failure });
+      expect(calls.filter((call) => call.endsWith(":mutation"))).toEqual(["origin:mutation"]);
+      expect(inputs).toEqual([{ ...input, expectedAccountId: "123" }]);
+    } else if (ambiguous) {
+      expect(result).toMatchObject({ _tag: "Failure", failure });
+      expect(calls.filter((call) => call.endsWith(":mutation"))).toEqual(["local:mutation"]);
+    } else {
+      expect(result._tag).toBe("Success");
+      if (single || disabled) {
+        expect(calls.filter((call) => !call.endsWith(":invalidate"))).toEqual(["origin:mutation"]);
+      } else if (reading) expect(calls).toEqual(["origin:read"]);
+      else if (
+        mismatch ||
+        localOrigin ||
+        oldOrigin ||
+        oldAlternate ||
+        !trusted ||
+        disabledDuringProbe
+      )
+        expect(calls.filter((call) => call.endsWith(":mutation"))).toEqual(["origin:mutation"]);
+      else {
+        expect(calls.filter((call) => call.endsWith(":mutation"))).toEqual(["local:mutation"]);
+        expect(calls).toContain("origin:invalidate");
+        expect(inputs).toEqual([{ ...input, expectedAccountId: "123" }]);
+      }
+    }
+  }),
+);
 
 it.effect.each([
   { probe: "origin", cancelled: "first" },
@@ -250,251 +244,243 @@ it.effect.each([
 ] as const)(
   "preserves a shared $probe probe's other reader when the $cancelled cancels",
   ({ probe, cancelled }) =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const started = yield* Deferred.make<void>();
-        const release = yield* Deferred.make<void>();
-        let probes = 0;
-        const clientFor = (local: boolean) =>
-          ({
-            [local ? WS_METHODS.pullRequestsRoutingIdentity : WS_METHODS.pullRequestsRouting]: () =>
-              Effect.gen(function* () {
-                if (local === (probe === "alternate")) {
-                  probes++;
-                  yield* Deferred.succeed(started, undefined);
-                  yield* Deferred.await(release);
-                }
-                return {
-                  host: "github.com",
-                  provider: "github",
-                  viewer: "maria",
-                  accountId: "123",
-                };
-              }),
-            [WS_METHODS.pullRequestsSummary]: () => Effect.succeed(null),
-          }) as unknown as WsRpcProtocolClient;
-        const { environmentRegistry, supervisor } = yield* makeTestRuntime(
-          clientFor(false),
-          clientFor(true),
+    Effect.gen(function* () {
+      const started = yield* Deferred.make<void>();
+      const release = yield* Deferred.make<void>();
+      let probes = 0;
+      const clientFor = (local: boolean) =>
+        ({
+          [local ? WS_METHODS.pullRequestsRoutingIdentity : WS_METHODS.pullRequestsRouting]: () =>
+            Effect.gen(function* () {
+              if (local === (probe === "alternate")) {
+                probes++;
+                yield* Deferred.succeed(started, undefined);
+                yield* Deferred.await(release);
+              }
+              return {
+                host: "github.com",
+                provider: "github",
+                viewer: "maria",
+                accountId: "123",
+              };
+            }),
+          [WS_METHODS.pullRequestsSummary]: () => Effect.succeed(null),
+        }) as unknown as WsRpcProtocolClient;
+      const { environmentRegistry, supervisor } = yield* makeTestRuntime(
+        clientFor(false),
+        clientFor(true),
+      );
+      const read = () =>
+        createPullRequestRouter()(WS_METHODS.pullRequestsSummary, {
+          projectId: ProjectId.make("project-1"),
+          repository: "acme/web",
+          number: 7,
+        }).pipe(
+          Effect.provideService(EnvironmentRegistry.EnvironmentRegistry, environmentRegistry),
+          Effect.provideService(EnvironmentSupervisor.EnvironmentSupervisor, supervisor),
+          Effect.provideService(PullRequestRoutingPermissions, trustedRouting),
         );
-        const read = () =>
-          createPullRequestRouter()(WS_METHODS.pullRequestsSummary, {
-            projectId: ProjectId.make("project-1"),
-            repository: "acme/web",
-            number: 7,
-          }).pipe(
-            Effect.provideService(EnvironmentRegistry.EnvironmentRegistry, environmentRegistry),
-            Effect.provideService(EnvironmentSupervisor.EnvironmentSupervisor, supervisor),
-            Effect.provideService(PullRequestRoutingPermissions, trustedRouting),
-          );
-        const first = yield* read().pipe(Effect.forkChild);
-        yield* Deferred.await(started);
-        const waiter = yield* read().pipe(Effect.forkChild);
-        yield* Effect.yieldNow;
-        yield* Fiber.interrupt(cancelled === "first" ? first : waiter);
-        yield* Deferred.succeed(release, undefined);
-        expect(yield* Fiber.join(cancelled === "first" ? waiter : first)).toBeNull();
-        expect(probes).toBe(cancelled === "first" ? 2 : 1);
-        yield* read();
-        expect(probes).toBe(cancelled === "first" ? 3 : 2);
-      }),
-    ),
+      const first = yield* read().pipe(Effect.forkChild);
+      yield* Deferred.await(started);
+      const waiter = yield* read().pipe(Effect.forkChild);
+      yield* Effect.yieldNow;
+      yield* Fiber.interrupt(cancelled === "first" ? first : waiter);
+      yield* Deferred.succeed(release, undefined);
+      expect(yield* Fiber.join(cancelled === "first" ? waiter : first)).toBeNull();
+      expect(probes).toBe(cancelled === "first" ? 2 : 1);
+      yield* read();
+      expect(probes).toBe(cancelled === "first" ? 3 : 2);
+    }),
 );
 
 it.effect.each(["revoked", "disabled"] as const)(
   "rechecks routing after an alternate with a shared probe is %s",
   (change) =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const started = yield* Deferred.make<void>();
-        const release = yield* Deferred.make<void>();
-        const reads: string[] = [];
-        let trusted = true;
-        let probes = 0;
-        const clientFor = (local: boolean) =>
-          ({
-            [local ? WS_METHODS.pullRequestsRoutingIdentity : WS_METHODS.pullRequestsRouting]: () =>
-              Effect.gen(function* () {
-                if (local) {
-                  probes++;
-                  yield* Deferred.succeed(started, undefined);
-                  yield* Deferred.await(release);
-                }
-                return {
-                  host: "github.com",
-                  provider: "github",
-                  viewer: "maria",
-                  accountId: "123",
-                };
-              }),
-            [WS_METHODS.pullRequestsSummary]: () =>
-              Effect.sync(() => {
-                reads.push(local ? "local" : "origin");
-                return null;
-              }),
-          }) as unknown as WsRpcProtocolClient;
-        const { environmentRegistry, supervisor } = yield* makeTestRuntime(
-          clientFor(false),
-          clientFor(true),
-        );
-        const readers = yield* Effect.all(
-          Array.from({ length: 2 }, () =>
-            createPullRequestRouter()(WS_METHODS.pullRequestsSummary, {
-              projectId: ProjectId.make("project-1"),
-              repository: "acme/web",
-              number: 7,
+    Effect.gen(function* () {
+      const started = yield* Deferred.make<void>();
+      const release = yield* Deferred.make<void>();
+      const reads: string[] = [];
+      let trusted = true;
+      let probes = 0;
+      const clientFor = (local: boolean) =>
+        ({
+          [local ? WS_METHODS.pullRequestsRoutingIdentity : WS_METHODS.pullRequestsRouting]: () =>
+            Effect.gen(function* () {
+              if (local) {
+                probes++;
+                yield* Deferred.succeed(started, undefined);
+                yield* Deferred.await(release);
+              }
+              return {
+                host: "github.com",
+                provider: "github",
+                viewer: "maria",
+                accountId: "123",
+              };
             }),
-          ),
-          { concurrency: "unbounded" },
-        ).pipe(
-          Effect.provideService(EnvironmentRegistry.EnvironmentRegistry, environmentRegistry),
-          Effect.provideService(EnvironmentSupervisor.EnvironmentSupervisor, supervisor),
-          Effect.provideService(PullRequestRoutingPermissions, {
-            ...trustedRouting,
-            get: () => Effect.sync(() => (trusted ? "read-write" : "off")),
-          }),
-          Effect.forkChild,
-        );
-        yield* Deferred.await(started);
-        yield* Effect.yieldNow;
-        if (change === "revoked") trusted = false;
-        else
-          yield* SubscriptionRef.update(
-            environmentRegistry.entries,
-            (entries) =>
-              new Map(
-                [...entries].map(([id, entry]) => [
-                  id,
-                  id === TARGET.environmentId ? entry : { ...entry, enabled: false },
-                ]),
-              ),
-          );
-        yield* Deferred.succeed(release, undefined);
-        expect(yield* Fiber.join(readers)).toEqual([null, null]);
-        expect(probes).toBe(1);
-        expect(reads).toEqual(["origin", "origin"]);
-      }),
-    ),
-);
-
-it.effect.each(["origin", "alternate"] as const)(
-  "keeps pending metadata from an old %s connection separate from its replacement",
-  (reconnected) =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const started = yield* Deferred.make<void>();
-        const release = yield* Deferred.make<void>();
-        const probes: string[] = [];
-        const clientFor = (local: boolean, replacement = false) =>
-          ({
-            [local ? WS_METHODS.pullRequestsRoutingIdentity : WS_METHODS.pullRequestsRouting]: () =>
-              Effect.gen(function* () {
-                if (local === (reconnected === "alternate")) {
-                  probes.push(replacement ? "new" : "old");
-                  if (!replacement) {
-                    yield* Deferred.succeed(started, undefined);
-                    yield* Deferred.await(release);
-                  }
-                }
-                return {
-                  host: "github.com",
-                  provider: "github",
-                  viewer: "maria",
-                  accountId: "123",
-                };
-              }),
-            [WS_METHODS.pullRequestsSummary]: () => Effect.succeed(null),
-          }) as unknown as WsRpcProtocolClient;
-        const { environmentRegistry, supervisor, localSupervisor } = yield* makeTestRuntime(
-          clientFor(false),
-          clientFor(true),
-        );
-        const read = () =>
+          [WS_METHODS.pullRequestsSummary]: () =>
+            Effect.sync(() => {
+              reads.push(local ? "local" : "origin");
+              return null;
+            }),
+        }) as unknown as WsRpcProtocolClient;
+      const { environmentRegistry, supervisor } = yield* makeTestRuntime(
+        clientFor(false),
+        clientFor(true),
+      );
+      const readers = yield* Effect.all(
+        Array.from({ length: 2 }, () =>
           createPullRequestRouter()(WS_METHODS.pullRequestsSummary, {
             projectId: ProjectId.make("project-1"),
             repository: "acme/web",
             number: 7,
-          }).pipe(
-            Effect.provideService(EnvironmentRegistry.EnvironmentRegistry, environmentRegistry),
-            Effect.provideService(EnvironmentSupervisor.EnvironmentSupervisor, supervisor),
-            Effect.provideService(PullRequestRoutingPermissions, trustedRouting),
-          );
-        const first = yield* read().pipe(Effect.forkChild);
-        yield* Deferred.await(started);
-        yield* SubscriptionRef.set(
-          (reconnected === "origin" ? supervisor : localSupervisor).session,
-          Option.some(session(clientFor(reconnected === "alternate", true))),
+          }),
+        ),
+        { concurrency: "unbounded" },
+      ).pipe(
+        Effect.provideService(EnvironmentRegistry.EnvironmentRegistry, environmentRegistry),
+        Effect.provideService(EnvironmentSupervisor.EnvironmentSupervisor, supervisor),
+        Effect.provideService(PullRequestRoutingPermissions, {
+          ...trustedRouting,
+          get: () => Effect.sync(() => (trusted ? "read-write" : "off")),
+        }),
+        Effect.forkChild,
+      );
+      yield* Deferred.await(started);
+      yield* Effect.yieldNow;
+      if (change === "revoked") trusted = false;
+      else
+        yield* SubscriptionRef.update(
+          environmentRegistry.entries,
+          (entries) =>
+            new Map(
+              [...entries].map(([id, entry]) => [
+                id,
+                id === TARGET.environmentId ? entry : { ...entry, enabled: false },
+              ]),
+            ),
         );
-        expect(yield* read()).toBeNull();
-        expect(probes).toEqual(["old", "new"]);
-        yield* Deferred.succeed(release, undefined);
-        expect(yield* Fiber.join(first)).toBeNull();
-      }),
-    ),
+      yield* Deferred.succeed(release, undefined);
+      expect(yield* Fiber.join(readers)).toEqual([null, null]);
+      expect(probes).toBe(1);
+      expect(reads).toEqual(["origin", "origin"]);
+    }),
 );
 
-it.effect("forgets routed viewed marks when a viewed-files batch fails", () =>
-  Effect.scoped(
+it.effect.each(["origin", "alternate"] as const)(
+  "keeps pending metadata from an old %s connection separate from its replacement",
+  (reconnected) =>
     Effect.gen(function* () {
-      const reference = {
-        projectId: ProjectId.make("project-1"),
-        host: "github.com",
-        repository: "acme/web",
-        number: 7,
-      };
-      const invalidations: { environment: string; input: unknown }[] = [];
-      const identity = () =>
-        Effect.succeed({
-          host: reference.host,
-          provider: "github",
-          accountId: "123",
-          viewer: "maria-rcks",
-        });
-      const clientFor = (environment: string) =>
+      const started = yield* Deferred.make<void>();
+      const release = yield* Deferred.make<void>();
+      const probes: string[] = [];
+      const clientFor = (local: boolean, replacement = false) =>
         ({
-          [WS_METHODS.pullRequestsRouting]: identity,
-          [WS_METHODS.pullRequestsRoutingIdentity]: identity,
-          [WS_METHODS.pullRequestsFilesViewed]: () =>
-            Effect.succeed({ files: [{ path: "a.ts", state: "unviewed" }], truncated: false }),
-          // The host may have applied part of the batch before refusing the rest.
-          [WS_METHODS.pullRequestsSetFilesViewed]: () => Effect.fail("second path refused"),
-          [WS_METHODS.pullRequestsInvalidate]: (input: unknown) =>
-            Effect.sync(() => {
-              invalidations.push({ environment, input });
+          [local ? WS_METHODS.pullRequestsRoutingIdentity : WS_METHODS.pullRequestsRouting]: () =>
+            Effect.gen(function* () {
+              if (local === (reconnected === "alternate")) {
+                probes.push(replacement ? "new" : "old");
+                if (!replacement) {
+                  yield* Deferred.succeed(started, undefined);
+                  yield* Deferred.await(release);
+                }
+              }
+              return {
+                host: "github.com",
+                provider: "github",
+                viewer: "maria",
+                accountId: "123",
+              };
             }),
+          [WS_METHODS.pullRequestsSummary]: () => Effect.succeed(null),
         }) as unknown as WsRpcProtocolClient;
-      const { environmentRegistry, supervisor } = yield* makeTestRuntime(
-        clientFor("origin"),
-        clientFor("local"),
+      const { environmentRegistry, supervisor, localSupervisor } = yield* makeTestRuntime(
+        clientFor(false),
+        clientFor(true),
       );
-      const route = createPullRequestRouter();
-      const write = yield* Effect.gen(function* () {
-        yield* route(WS_METHODS.pullRequestsFilesViewed, reference);
-        return yield* Effect.exit(
-          route(WS_METHODS.pullRequestsSetFilesViewed, {
-            ...reference,
-            files: [
-              { path: "a.ts", viewed: true },
-              { path: "b.ts", viewed: true },
-            ],
-          }),
+      const read = () =>
+        createPullRequestRouter()(WS_METHODS.pullRequestsSummary, {
+          projectId: ProjectId.make("project-1"),
+          repository: "acme/web",
+          number: 7,
+        }).pipe(
+          Effect.provideService(EnvironmentRegistry.EnvironmentRegistry, environmentRegistry),
+          Effect.provideService(EnvironmentSupervisor.EnvironmentSupervisor, supervisor),
+          Effect.provideService(PullRequestRoutingPermissions, trustedRouting),
         );
-      }).pipe(
-        Effect.provideService(EnvironmentRegistry.EnvironmentRegistry, environmentRegistry),
-        Effect.provideService(PullRequestRoutingPermissions, trustedRouting),
-        Effect.provideService(RpcPermissionGuard, { authorize: () => Effect.void }),
-        Effect.provideService(EnvironmentSupervisor.EnvironmentSupervisor, supervisor),
+      const first = yield* read().pipe(Effect.forkChild);
+      yield* Deferred.await(started);
+      yield* SubscriptionRef.set(
+        (reconnected === "origin" ? supervisor : localSupervisor).session,
+        Option.some(session(clientFor(reconnected === "alternate", true))),
       );
-      expect(write._tag).toBe("Failure");
-      expect(invalidations).toContainEqual({
-        environment: "local",
-        input: { reference: expect.objectContaining(reference), filesViewedOnly: true },
-      });
-      for (const call of invalidations) {
-        expect(call.input).toMatchObject({ filesViewedOnly: true });
-      }
+      expect(yield* read()).toBeNull();
+      expect(probes).toEqual(["old", "new"]);
+      yield* Deferred.succeed(release, undefined);
+      expect(yield* Fiber.join(first)).toBeNull();
     }),
-  ),
+);
+
+it.effect("forgets routed viewed marks when a viewed-files batch fails", () =>
+  Effect.gen(function* () {
+    const reference = {
+      projectId: ProjectId.make("project-1"),
+      host: "github.com",
+      repository: "acme/web",
+      number: 7,
+    };
+    const invalidations: { environment: string; input: unknown }[] = [];
+    const identity = () =>
+      Effect.succeed({
+        host: reference.host,
+        provider: "github",
+        accountId: "123",
+        viewer: "maria-rcks",
+      });
+    const clientFor = (environment: string) =>
+      ({
+        [WS_METHODS.pullRequestsRouting]: identity,
+        [WS_METHODS.pullRequestsRoutingIdentity]: identity,
+        [WS_METHODS.pullRequestsFilesViewed]: () =>
+          Effect.succeed({ files: [{ path: "a.ts", state: "unviewed" }], truncated: false }),
+        // The host may have applied part of the batch before refusing the rest.
+        [WS_METHODS.pullRequestsSetFilesViewed]: () => Effect.fail("second path refused"),
+        [WS_METHODS.pullRequestsInvalidate]: (input: unknown) =>
+          Effect.sync(() => {
+            invalidations.push({ environment, input });
+          }),
+      }) as unknown as WsRpcProtocolClient;
+    const { environmentRegistry, supervisor } = yield* makeTestRuntime(
+      clientFor("origin"),
+      clientFor("local"),
+    );
+    const route = createPullRequestRouter();
+    const write = yield* Effect.gen(function* () {
+      yield* route(WS_METHODS.pullRequestsFilesViewed, reference);
+      return yield* Effect.exit(
+        route(WS_METHODS.pullRequestsSetFilesViewed, {
+          ...reference,
+          files: [
+            { path: "a.ts", viewed: true },
+            { path: "b.ts", viewed: true },
+          ],
+        }),
+      );
+    }).pipe(
+      Effect.provideService(EnvironmentRegistry.EnvironmentRegistry, environmentRegistry),
+      Effect.provideService(PullRequestRoutingPermissions, trustedRouting),
+      Effect.provideService(RpcPermissionGuard, { authorize: () => Effect.void }),
+      Effect.provideService(EnvironmentSupervisor.EnvironmentSupervisor, supervisor),
+    );
+    expect(write._tag).toBe("Failure");
+    expect(invalidations).toContainEqual({
+      environment: "local",
+      input: { reference: expect.objectContaining(reference), filesViewedOnly: true },
+    });
+    for (const call of invalidations) {
+      expect(call.input).toMatchObject({ filesViewedOnly: true });
+    }
+  }),
 );
 
 const TARGET = new PrimaryConnectionTarget({
@@ -617,491 +603,477 @@ it.effect.each([
 ] as const)(
   "preserves source requests when routing to another environment is blocked by %s",
   (permission) =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const calls: string[] = [];
-        const failure = new PullRequestOperationError({
-          operation: "summary",
-          detail: "source failed",
-        });
-        const client = {
-          [WS_METHODS.pullRequestsSummary]: (input: { allowStale?: boolean }) =>
-            Effect.suspend(() => {
-              calls.push("source-read");
-              expect(input.allowStale).toBeUndefined();
-              return Effect.fail(failure);
-            }),
-          [WS_METHODS.pullRequestsRunAction]: () =>
-            Effect.sync(() => {
-              calls.push("source-write");
-            }),
-        } as unknown as WsRpcProtocolClient;
-        const alternate = {
-          [WS_METHODS.pullRequestsRoutingIdentity]: () =>
-            Effect.die("untrusted environment was contacted"),
-        } as unknown as WsRpcProtocolClient;
-        const { environmentRegistry, supervisor, localSupervisor } = yield* makeTestRuntime(
-          client,
-          alternate,
-        );
-        if (permission === "destination-disabled" || permission === "destination-unsupported") {
-          yield* SubscriptionRef.update(
-            environmentRegistry.entries,
-            (entries) =>
-              new Map(
-                [...entries].map(([id, entry]) => [
-                  id,
-                  id === TARGET.environmentId
-                    ? entry
-                    : {
-                        ...entry,
-                        enabled: permission !== "destination-disabled",
-                        ...(permission === "destination-unsupported"
-                          ? { unsupportedReason: "Protocol version mismatch" }
-                          : {}),
-                      },
-                ]),
-              ),
-          );
-          yield* SubscriptionRef.set(localSupervisor.session, Option.none());
-        }
-        const ref = {
-          projectId: ProjectId.make("project-1"),
-          repository: "private/repo",
-          number: 7,
-        };
-        const request = Effect.gen(function* () {
-          const route = createPullRequestRouter();
-          if (permission !== "read-only")
-            yield* route(WS_METHODS.pullRequestsSummary, ref).pipe(Effect.flip);
-          yield* route(WS_METHODS.pullRequestsRunAction, { ...ref, action: "merge" });
-        }).pipe(
-          Effect.provideService(EnvironmentRegistry.EnvironmentRegistry, environmentRegistry),
-          Effect.provideService(EnvironmentSupervisor.EnvironmentSupervisor, supervisor),
-          Effect.provideService(RpcPermissionGuard, { authorize: () => Effect.void }),
-        );
-        yield* permission === "default"
-          ? request
-          : request.pipe(
-              Effect.provideService(RpcPermissionGuard, { authorize: () => Effect.void }),
-              Effect.provideService(PullRequestRoutingPermissions, {
-                ...trustedRouting,
-                get: (entry) =>
-                  Effect.succeed(
-                    permission === "read-only"
-                      ? "read"
-                      : permission === "destination-disabled" ||
-                          permission === "destination-unsupported"
-                        ? "read-write"
-                        : (entry.target.environmentId === TARGET.environmentId) ===
-                            (permission === "origin-off")
-                          ? "off"
-                          : "read-write",
-                  ),
-              }),
-            );
-        expect(calls).toEqual(
-          permission === "read-only" ? ["source-write"] : ["source-read", "source-write"],
-        );
-      }),
-    ),
-);
-
-it.effect.each(
-  (["origin", "destination"] as const).flatMap((side) =>
-    (["matching", "changed", "missing", "unavailable", "failed"] as const).map((stored) => ({
-      side,
-      stored,
-    })),
-  ),
-)("checks the current $side SSH profile before routing with $stored storage", ({ side, stored }) =>
-  Effect.scoped(
     Effect.gen(function* () {
       const calls: string[] = [];
-      const identity = {
-        host: "github.com",
-        provider: "github",
-        viewer: "maria",
-        accountId: "123",
-      };
+      const failure = new PullRequestOperationError({
+        operation: "summary",
+        detail: "source failed",
+      });
       const client = {
-        [WS_METHODS.pullRequestsRouting]: () =>
-          Effect.sync(() => {
-            calls.push("source-probe");
-            return identity;
+        [WS_METHODS.pullRequestsSummary]: (input: { allowStale?: boolean }) =>
+          Effect.suspend(() => {
+            calls.push("source-read");
+            expect(input.allowStale).toBeUndefined();
+            return Effect.fail(failure);
           }),
-        [WS_METHODS.pullRequestsRunAction]: (input: { expectedAccountId?: string }) =>
-          Effect.gen(function* () {
-            if (input.expectedAccountId !== undefined) {
-              return yield* new PullRequestOperationError({
-                operation: "routeIdentity",
-                detail: "Source guard refused.",
-              });
-            }
+        [WS_METHODS.pullRequestsRunAction]: () =>
+          Effect.sync(() => {
             calls.push("source-write");
           }),
-        [WS_METHODS.pullRequestsInvalidate]: () => Effect.void,
       } as unknown as WsRpcProtocolClient;
       const alternate = {
         [WS_METHODS.pullRequestsRoutingIdentity]: () =>
-          Effect.sync(() => {
-            calls.push("alternate-probe");
-            return identity;
-          }),
-        [WS_METHODS.pullRequestsRunAction]: () =>
-          Effect.sync(() => {
-            calls.push("alternate-write");
-          }),
-        [WS_METHODS.pullRequestsInvalidate]: () => Effect.void,
+          Effect.die("untrusted environment was contacted"),
       } as unknown as WsRpcProtocolClient;
-      const { environmentRegistry, supervisor } = yield* makeTestRuntime(client, alternate);
-      const environmentId =
-        side === "origin" ? TARGET.environmentId : EnvironmentId.make("local-environment");
-      const profile = new SshConnectionProfile({
-        connectionId: "ssh-1",
-        environmentId,
-        label: "SSH",
-        target: { alias: "work", hostname: "work.example.test", username: "maria", port: 22 },
-      });
-      yield* SubscriptionRef.update(environmentRegistry.entries, (entries) =>
-        new Map(entries).set(environmentId, {
-          target: new SshConnectionTarget({
-            environmentId,
-            connectionId: profile.connectionId,
-            label: "SSH",
-          }),
-          profile: Option.some(profile),
-          enabled: true,
-        }),
+      const { environmentRegistry, supervisor, localSupervisor } = yield* makeTestRuntime(
+        client,
+        alternate,
       );
-      const read = Effect.suspend(() =>
-        stored === "failed"
-          ? Effect.fail(
-              new ConnectionTransientError({
-                reason: "remote-unavailable",
-                detail: "Profile storage unavailable.",
-              }),
-            )
-          : Effect.succeed(
-              stored === "missing"
-                ? Option.none()
-                : Option.some(
-                    stored === "changed"
-                      ? new SshConnectionProfile({
-                          ...profile,
-                          target: { ...profile.target, hostname: "replacement.example.test" },
-                        })
-                      : profile,
-                  ),
+      if (permission === "destination-disabled" || permission === "destination-unsupported") {
+        yield* SubscriptionRef.update(
+          environmentRegistry.entries,
+          (entries) =>
+            new Map(
+              [...entries].map(([id, entry]) => [
+                id,
+                id === TARGET.environmentId
+                  ? entry
+                  : {
+                      ...entry,
+                      enabled: permission !== "destination-disabled",
+                      ...(permission === "destination-unsupported"
+                        ? { unsupportedReason: "Protocol version mismatch" }
+                        : {}),
+                    },
+              ]),
             ),
-      );
-      const route = createPullRequestRouter()(WS_METHODS.pullRequestsRunAction, {
+        );
+        yield* SubscriptionRef.set(localSupervisor.session, Option.none());
+      }
+      const ref = {
         projectId: ProjectId.make("project-1"),
         repository: "private/repo",
         number: 7,
-        action: "merge",
+      };
+      const request = Effect.gen(function* () {
+        const route = createPullRequestRouter();
+        if (permission !== "read-only")
+          yield* route(WS_METHODS.pullRequestsSummary, ref).pipe(Effect.flip);
+        yield* route(WS_METHODS.pullRequestsRunAction, { ...ref, action: "merge" });
       }).pipe(
         Effect.provideService(EnvironmentRegistry.EnvironmentRegistry, environmentRegistry),
         Effect.provideService(EnvironmentSupervisor.EnvironmentSupervisor, supervisor),
-        Effect.provideService(PullRequestRoutingPermissions, trustedRouting),
         Effect.provideService(RpcPermissionGuard, { authorize: () => Effect.void }),
       );
-      yield* stored === "unavailable"
-        ? route
-        : route.pipe(
-            Effect.provideService(ConnectionProfileStore.ConnectionProfileStore, {
-              get: () => read,
-              put: () => Effect.die("unused"),
-              remove: () => Effect.die("unused"),
+      yield* permission === "default"
+        ? request
+        : request.pipe(
+            Effect.provideService(RpcPermissionGuard, { authorize: () => Effect.void }),
+            Effect.provideService(PullRequestRoutingPermissions, {
+              ...trustedRouting,
+              get: (entry) =>
+                Effect.succeed(
+                  permission === "read-only"
+                    ? "read"
+                    : permission === "destination-disabled" ||
+                        permission === "destination-unsupported"
+                      ? "read-write"
+                      : (entry.target.environmentId === TARGET.environmentId) ===
+                          (permission === "origin-off")
+                        ? "off"
+                        : "read-write",
+                ),
             }),
           );
       expect(calls).toEqual(
-        stored === "matching"
-          ? ["source-probe", "alternate-probe", "alternate-write"]
-          : ["source-write"],
+        permission === "read-only" ? ["source-write"] : ["source-read", "source-write"],
       );
     }),
-  ),
 );
 
-it.live.each([undefined, true, false])(
-  "keeps source workspace metadata and reports draft %s when an alternate answers a detail read",
-  (isDraft) =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const noted = yield* Deferred.make<unknown>();
-        const clientFor = (local: boolean) =>
-          ({
-            [local ? WS_METHODS.pullRequestsRoutingIdentity : WS_METHODS.pullRequestsRouting]: () =>
-              Effect.succeed({
-                host: "github.com",
-                provider: "github",
-                viewer: "maria-rcks",
-                accountId: "123",
-                projectTitle: local ? "local project" : "source project",
-                workspaceRoot: local ? "/Users/local/repo" : "/srv/source/repo",
-              }),
-            [WS_METHODS.pullRequestsDetail]: () =>
-              local
-                ? Effect.succeed({
-                    projectId: "local-project",
-                    projectTitle: "local project",
-                    workspaceRoot: "/Users/local/repo",
-                    title: "github title",
-                    state: "closed",
-                    ...(isDraft === undefined ? {} : { isDraft }),
-                    updatedAt: "2026-10-10T01:52:36Z",
-                  })
-                : Effect.never,
-            [WS_METHODS.pullRequestsReportState]: (input: unknown) =>
-              Deferred.succeed(noted, input).pipe(Effect.asVoid),
-          }) as unknown as WsRpcProtocolClient;
-        const { environmentRegistry, supervisor } = yield* makeTestRuntime(
-          clientFor(false),
-          clientFor(true),
-        );
-        const result = yield* createPullRequestRouter()(WS_METHODS.pullRequestsDetail, {
-          projectId: ProjectId.make("project-1"),
-          repository: "acme/web",
-          number: 7,
-        }).pipe(
-          Effect.provideService(EnvironmentRegistry.EnvironmentRegistry, environmentRegistry),
-          Effect.provideService(PullRequestRoutingPermissions, trustedRouting),
-          Effect.provideService(RpcPermissionGuard, { authorize: () => Effect.void }),
-          Effect.provideService(EnvironmentSupervisor.EnvironmentSupervisor, supervisor),
-        );
-        expect(result).toEqual({
-          projectId: "project-1",
-          projectTitle: "source project",
-          workspaceRoot: "/srv/source/repo",
-          title: "github title",
-          state: "closed",
-          ...(isDraft === undefined ? {} : { isDraft }),
-          updatedAt: "2026-10-10T01:52:36Z",
-        });
-        expect(yield* Deferred.await(noted)).toEqual({
-          reference: { projectId: "project-1", repository: "acme/web", number: 7 },
-          state: "closed",
-          ...(isDraft === undefined ? {} : { isDraft }),
-        });
+it.effect.each(
+  (["origin", "destination"] as const).flatMap((side) =>
+    (["matching", "changed", "missing", "unavailable", "failed"] as const).map((stored) => ({
+      side,
+      stored,
+    })),
+  ),
+)("checks the current $side SSH profile before routing with $stored storage", ({ side, stored }) =>
+  Effect.gen(function* () {
+    const calls: string[] = [];
+    const identity = {
+      host: "github.com",
+      provider: "github",
+      viewer: "maria",
+      accountId: "123",
+    };
+    const client = {
+      [WS_METHODS.pullRequestsRouting]: () =>
+        Effect.sync(() => {
+          calls.push("source-probe");
+          return identity;
+        }),
+      [WS_METHODS.pullRequestsRunAction]: (input: { expectedAccountId?: string }) =>
+        Effect.gen(function* () {
+          if (input.expectedAccountId !== undefined) {
+            return yield* new PullRequestOperationError({
+              operation: "routeIdentity",
+              detail: "Source guard refused.",
+            });
+          }
+          calls.push("source-write");
+        }),
+      [WS_METHODS.pullRequestsInvalidate]: () => Effect.void,
+    } as unknown as WsRpcProtocolClient;
+    const alternate = {
+      [WS_METHODS.pullRequestsRoutingIdentity]: () =>
+        Effect.sync(() => {
+          calls.push("alternate-probe");
+          return identity;
+        }),
+      [WS_METHODS.pullRequestsRunAction]: () =>
+        Effect.sync(() => {
+          calls.push("alternate-write");
+        }),
+      [WS_METHODS.pullRequestsInvalidate]: () => Effect.void,
+    } as unknown as WsRpcProtocolClient;
+    const { environmentRegistry, supervisor } = yield* makeTestRuntime(client, alternate);
+    const environmentId =
+      side === "origin" ? TARGET.environmentId : EnvironmentId.make("local-environment");
+    const profile = new SshConnectionProfile({
+      connectionId: "ssh-1",
+      environmentId,
+      label: "SSH",
+      target: { alias: "work", hostname: "work.example.test", username: "maria", port: 22 },
+    });
+    yield* SubscriptionRef.update(environmentRegistry.entries, (entries) =>
+      new Map(entries).set(environmentId, {
+        target: new SshConnectionTarget({
+          environmentId,
+          connectionId: profile.connectionId,
+          label: "SSH",
+        }),
+        profile: Option.some(profile),
+        enabled: true,
       }),
-    ),
-);
-
-it.live(
-  "refreshes identity before writes and invalidates prior readers across router instances",
-  () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        let originAccountId = "123";
-        const mutations: { environment: string; expectedAccountId: string }[] = [];
-        const invalidations: { environment: string; input: unknown }[] = [];
-        const identities: string[] = [];
-        const clientFor = (local: boolean) => {
-          const environment = local ? "local" : "origin";
-          return {
-            [local ? WS_METHODS.pullRequestsRoutingIdentity : WS_METHODS.pullRequestsRouting]: () =>
-              Effect.sync(() => {
-                identities.push(environment);
-                return {
-                  host: "github.com",
-                  provider: "github",
-                  viewer: "maria-rcks",
-                  accountId: local ? "123" : originAccountId,
-                };
-              }),
-            [WS_METHODS.pullRequestsSummary]: () => (local ? Effect.succeed(null) : Effect.never),
-            [WS_METHODS.pullRequestsRunAction]: (input: { expectedAccountId: string }) =>
-              Effect.sync(() => {
-                mutations.push({ environment, expectedAccountId: input.expectedAccountId });
-              }),
-            [WS_METHODS.pullRequestsInvalidate]: (input: unknown) =>
-              Effect.sync(() => {
-                invalidations.push({ environment, input });
-              }),
-          } as unknown as WsRpcProtocolClient;
-        };
-        const { environmentRegistry, supervisor } = yield* makeTestRuntime(
-          clientFor(false),
-          clientFor(true),
-        );
-        const reference = {
-          projectId: ProjectId.make("project-1"),
-          repository: "acme/web",
-          number: 7,
-        };
-        const hostedReference = { ...reference, host: "github.com", allowStale: false };
-        const route = createPullRequestRouter();
-        yield* Effect.gen(function* () {
-          yield* route(WS_METHODS.pullRequestsSummary, reference);
-          originAccountId = "456";
-          yield* route(WS_METHODS.pullRequestsRunAction, { ...reference, action: "merge" });
-
-          expect(identities.filter((environment) => environment === "origin")).toHaveLength(2);
-          expect(mutations).toEqual([{ environment: "origin", expectedAccountId: "456" }]);
-          expect(invalidations).toEqual(
-            expect.arrayContaining([
-              { environment: "origin", input: { reference: expect.objectContaining(reference) } },
-              { environment: "origin", input: { reference: hostedReference } },
-              { environment: "local", input: { reference: hostedReference } },
-              { environment: "origin", input: {} },
-              { environment: "local", input: {} },
-            ]),
-          );
-
-          invalidations.length = 0;
-          const refresh = createPullRequestRouter();
-          yield* refresh(WS_METHODS.pullRequestsInvalidate, { reference });
-          expect(invalidations).toContainEqual({
-            environment: "local",
-            input: { reference: hostedReference },
-          });
-
-          invalidations.length = 0;
-          yield* refresh(WS_METHODS.pullRequestsInvalidate, {});
-          expect(invalidations).toContainEqual({ environment: "local", input: {} });
-        }).pipe(
-          Effect.provideService(EnvironmentRegistry.EnvironmentRegistry, environmentRegistry),
-          Effect.provideService(PullRequestRoutingPermissions, trustedRouting),
-          Effect.provideService(RpcPermissionGuard, { authorize: () => Effect.void }),
-          Effect.provideService(EnvironmentSupervisor.EnvironmentSupervisor, supervisor),
+    );
+    const read = Effect.suspend(() =>
+      stored === "failed"
+        ? Effect.fail(
+            new ConnectionTransientError({
+              reason: "remote-unavailable",
+              detail: "Profile storage unavailable.",
+            }),
+          )
+        : Effect.succeed(
+            stored === "missing"
+              ? Option.none()
+              : Option.some(
+                  stored === "changed"
+                    ? new SshConnectionProfile({
+                        ...profile,
+                        target: { ...profile.target, hostname: "replacement.example.test" },
+                      })
+                    : profile,
+                ),
+          ),
+    );
+    const route = createPullRequestRouter()(WS_METHODS.pullRequestsRunAction, {
+      projectId: ProjectId.make("project-1"),
+      repository: "private/repo",
+      number: 7,
+      action: "merge",
+    }).pipe(
+      Effect.provideService(EnvironmentRegistry.EnvironmentRegistry, environmentRegistry),
+      Effect.provideService(EnvironmentSupervisor.EnvironmentSupervisor, supervisor),
+      Effect.provideService(PullRequestRoutingPermissions, trustedRouting),
+      Effect.provideService(RpcPermissionGuard, { authorize: () => Effect.void }),
+    );
+    yield* stored === "unavailable"
+      ? route
+      : route.pipe(
+          Effect.provideService(ConnectionProfileStore.ConnectionProfileStore, {
+            get: () => read,
+            put: () => Effect.die("unused"),
+            remove: () => Effect.die("unused"),
+          }),
         );
-      }),
-    ),
+    expect(calls).toEqual(
+      stored === "matching"
+        ? ["source-probe", "alternate-probe", "alternate-write"]
+        : ["source-write"],
+    );
+  }),
 );
 
-it.effect("keeps concurrent diff file reads on different hosts separate", () =>
-  Effect.scoped(
+it.effect.each([undefined, true, false])(
+  "keeps source workspace metadata and reports draft %s when an alternate answers a detail read",
+  (isDraft) =>
     Effect.gen(function* () {
-      const release = yield* Latch.make();
-      const started = yield* Latch.make();
-      const calls: string[] = [];
-      const client = {
-        [WS_METHODS.pullRequestsDiffFileContents]: (input: { readonly host: string }) =>
-          Effect.gen(function* () {
-            calls.push(input.host);
-            yield* started.open;
-            yield* release.await;
-            return { oldContents: "", newContents: input.host };
-          }),
-      } as unknown as WsRpcProtocolClient;
-      const { atoms, registry } = yield* makeTestRuntime(client);
-      const input = {
+      const noted = yield* Deferred.make<unknown>();
+      const clientFor = (local: boolean) =>
+        ({
+          [local ? WS_METHODS.pullRequestsRoutingIdentity : WS_METHODS.pullRequestsRouting]: () =>
+            Effect.succeed({
+              host: "github.com",
+              provider: "github",
+              viewer: "maria-rcks",
+              accountId: "123",
+              projectTitle: local ? "local project" : "source project",
+              workspaceRoot: local ? "/Users/local/repo" : "/srv/source/repo",
+            }),
+          [WS_METHODS.pullRequestsDetail]: () =>
+            local
+              ? Effect.succeed({
+                  projectId: "local-project",
+                  projectTitle: "local project",
+                  workspaceRoot: "/Users/local/repo",
+                  title: "github title",
+                  state: "closed",
+                  ...(isDraft === undefined ? {} : { isDraft }),
+                  updatedAt: "2026-10-10T01:52:36Z",
+                })
+              : Effect.never,
+          [WS_METHODS.pullRequestsReportState]: (input: unknown) =>
+            Deferred.succeed(noted, input).pipe(Effect.asVoid),
+        }) as unknown as WsRpcProtocolClient;
+      const { environmentRegistry, supervisor } = yield* makeTestRuntime(
+        clientFor(false),
+        clientFor(true),
+      );
+      const result = yield* createPullRequestRouter()(WS_METHODS.pullRequestsDetail, {
         projectId: ProjectId.make("project-1"),
         repository: "acme/web",
-        number: 1,
-        changeType: "change",
-        oldPath: "src/app.ts",
-        newPath: "src/app.ts",
-      } as const;
-      const first = atoms.diffFileContents.run(registry, {
-        environmentId: TARGET.environmentId,
-        input: { ...input, host: "github.com" },
+        number: 7,
+      }).pipe(
+        Effect.provideService(EnvironmentRegistry.EnvironmentRegistry, environmentRegistry),
+        Effect.provideService(PullRequestRoutingPermissions, trustedRouting),
+        Effect.provideService(RpcPermissionGuard, { authorize: () => Effect.void }),
+        Effect.provideService(EnvironmentSupervisor.EnvironmentSupervisor, supervisor),
+      );
+      expect(result).toEqual({
+        projectId: "project-1",
+        projectTitle: "source project",
+        workspaceRoot: "/srv/source/repo",
+        title: "github title",
+        state: "closed",
+        ...(isDraft === undefined ? {} : { isDraft }),
+        updatedAt: "2026-10-10T01:52:36Z",
       });
-      yield* started.await;
-      const second = atoms.diffFileContents.run(registry, {
-        environmentId: TARGET.environmentId,
-        input: { ...input, host: "github.example.com" },
+      expect(yield* Deferred.await(noted)).toEqual({
+        reference: { projectId: "project-1", repository: "acme/web", number: 7 },
+        state: "closed",
+        ...(isDraft === undefined ? {} : { isDraft }),
       });
-      yield* release.open;
-
-      const results = yield* Effect.promise(() => Promise.all([first, second]));
-      expect(results).toMatchObject([
-        { _tag: "Success", value: { newContents: "github.com" } },
-        { _tag: "Success", value: { newContents: "github.example.com" } },
-      ]);
-      expect(calls).toEqual(["github.com", "github.example.com"]);
     }),
-  ),
 );
 
-it.effect.each(["closed", "draft", "permission", "stack", "method"] as const)(
-  "rejects an unsafe quick merge with %s and keeps later actions running",
-  (reason) =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const calls: string[] = [];
-        const client = {
-          [WS_METHODS.pullRequestsDetail]: () =>
-            Effect.succeed({
-              state: reason === "closed" ? "closed" : "open",
-              isDraft: reason === "draft",
-              capabilities: { actions: ["merge"], stackActions: true },
-              viewerPermissions: { actions: reason === "permission" ? [] : ["merge"] },
+it.effect(
+  "refreshes identity before writes and invalidates prior readers across router instances",
+  () =>
+    Effect.gen(function* () {
+      let originAccountId = "123";
+      const mutations: { environment: string; expectedAccountId: string }[] = [];
+      const invalidations: { environment: string; input: unknown }[] = [];
+      const identities: string[] = [];
+      const clientFor = (local: boolean) => {
+        const environment = local ? "local" : "origin";
+        return {
+          [local ? WS_METHODS.pullRequestsRoutingIdentity : WS_METHODS.pullRequestsRouting]: () =>
+            Effect.sync(() => {
+              identities.push(environment);
+              return {
+                host: "github.com",
+                provider: "github",
+                viewer: "maria-rcks",
+                accountId: local ? "123" : originAccountId,
+              };
+            }),
+          [WS_METHODS.pullRequestsSummary]: () => (local ? Effect.succeed(null) : Effect.never),
+          [WS_METHODS.pullRequestsRunAction]: (input: { expectedAccountId: string }) =>
+            Effect.sync(() => {
+              mutations.push({ environment, expectedAccountId: input.expectedAccountId });
+            }),
+          [WS_METHODS.pullRequestsInvalidate]: (input: unknown) =>
+            Effect.sync(() => {
+              invalidations.push({ environment, input });
             }),
-          [WS_METHODS.pullRequestsStack]: () => Effect.succeed(reason === "stack" ? {} : null),
-          [WS_METHODS.pullRequestsRunAction]: (input: { action: string }) =>
-            Effect.sync(() => calls.push(input.action)),
         } as unknown as WsRpcProtocolClient;
-        const { atoms, registry } = yield* makeTestRuntime(client);
-        const target = {
-          environmentId: TARGET.environmentId,
-          input: { projectId: ProjectId.make("project-1"), repository: "acme/web", number: 1 },
-        };
-        const merge = atoms.runAction.run(registry, {
-          ...target,
-          input: {
-            ...target.input,
-            action: "merge",
-            resolveMergeMethod: () => {
-              if (reason === "method") throw new Error("No merge method is available.");
-              return "squash";
-            },
-          },
-        });
-        const close = atoms.runAction.run(registry, {
-          ...target,
-          input: { ...target.input, action: "close" },
+      };
+      const { environmentRegistry, supervisor } = yield* makeTestRuntime(
+        clientFor(false),
+        clientFor(true),
+      );
+      const reference = {
+        projectId: ProjectId.make("project-1"),
+        repository: "acme/web",
+        number: 7,
+      };
+      const hostedReference = { ...reference, host: "github.com", allowStale: false };
+      const route = createPullRequestRouter();
+      yield* Effect.gen(function* () {
+        yield* route(WS_METHODS.pullRequestsSummary, reference);
+        originAccountId = "456";
+        yield* route(WS_METHODS.pullRequestsRunAction, { ...reference, action: "merge" });
+
+        expect(identities.filter((environment) => environment === "origin")).toHaveLength(2);
+        expect(mutations).toEqual([{ environment: "origin", expectedAccountId: "456" }]);
+        expect(invalidations).toEqual(
+          expect.arrayContaining([
+            { environment: "origin", input: { reference: expect.objectContaining(reference) } },
+            { environment: "origin", input: { reference: hostedReference } },
+            { environment: "local", input: { reference: hostedReference } },
+            { environment: "origin", input: {} },
+            { environment: "local", input: {} },
+          ]),
+        );
+
+        invalidations.length = 0;
+        const refresh = createPullRequestRouter();
+        yield* refresh(WS_METHODS.pullRequestsInvalidate, { reference });
+        expect(invalidations).toContainEqual({
+          environment: "local",
+          input: { reference: hostedReference },
         });
-        const results = yield* Effect.promise(() => Promise.all([merge, close]));
-        expect(results.map((result) => result._tag)).toEqual(["Failure", "Success"]);
-        expect(calls).toEqual(["close"]);
-      }),
-    ),
+
+        invalidations.length = 0;
+        yield* refresh(WS_METHODS.pullRequestsInvalidate, {});
+        expect(invalidations).toContainEqual({ environment: "local", input: {} });
+      }).pipe(
+        Effect.provideService(EnvironmentRegistry.EnvironmentRegistry, environmentRegistry),
+        Effect.provideService(PullRequestRoutingPermissions, trustedRouting),
+        Effect.provideService(RpcPermissionGuard, { authorize: () => Effect.void }),
+        Effect.provideService(EnvironmentSupervisor.EnvironmentSupervisor, supervisor),
+      );
+    }),
 );
 
-it.effect("keeps a close batch ordered and continues after a refused close", () =>
-  Effect.scoped(
+it.effect("keeps concurrent diff file reads on different hosts separate", () =>
+  Effect.gen(function* () {
+    const release = yield* Latch.make();
+    const started = yield* Latch.make();
+    const calls: string[] = [];
+    const client = {
+      [WS_METHODS.pullRequestsDiffFileContents]: (input: { readonly host: string }) =>
+        Effect.gen(function* () {
+          calls.push(input.host);
+          yield* started.open;
+          yield* release.await;
+          return { oldContents: "", newContents: input.host };
+        }),
+    } as unknown as WsRpcProtocolClient;
+    const { atoms, registry } = yield* makeTestRuntime(client);
+    const input = {
+      projectId: ProjectId.make("project-1"),
+      repository: "acme/web",
+      number: 1,
+      changeType: "change",
+      oldPath: "src/app.ts",
+      newPath: "src/app.ts",
+    } as const;
+    const first = atoms.diffFileContents.run(registry, {
+      environmentId: TARGET.environmentId,
+      input: { ...input, host: "github.com" },
+    });
+    yield* started.await;
+    const second = atoms.diffFileContents.run(registry, {
+      environmentId: TARGET.environmentId,
+      input: { ...input, host: "github.example.com" },
+    });
+    yield* release.open;
+
+    const results = yield* Effect.promise(() => Promise.all([first, second]));
+    expect(results).toMatchObject([
+      { _tag: "Success", value: { newContents: "github.com" } },
+      { _tag: "Success", value: { newContents: "github.example.com" } },
+    ]);
+    expect(calls).toEqual(["github.com", "github.example.com"]);
+  }),
+);
+
+it.effect.each(["closed", "draft", "permission", "stack", "method"] as const)(
+  "rejects an unsafe quick merge with %s and keeps later actions running",
+  (reason) =>
     Effect.gen(function* () {
-      const calls: number[] = [];
-      const started = yield* Deferred.make<void>();
-      const release = yield* Deferred.make<void>();
+      const calls: string[] = [];
       const client = {
-        [WS_METHODS.pullRequestsRunAction]: (input: { number: number; action: string }) =>
-          Effect.gen(function* () {
-            expect(input.action).toBe("close");
-            calls.push(input.number);
-            if (input.number === 6) {
-              yield* Deferred.succeed(started, undefined);
-              yield* Deferred.await(release);
-            }
-            if (input.number === 5)
-              return yield* new PullRequestOperationError({
-                operation: "runAction",
-                detail: "You cannot close this pull request.",
-              });
+        [WS_METHODS.pullRequestsDetail]: () =>
+          Effect.succeed({
+            state: reason === "closed" ? "closed" : "open",
+            isDraft: reason === "draft",
+            capabilities: { actions: ["merge"], stackActions: true },
+            viewerPermissions: { actions: reason === "permission" ? [] : ["merge"] },
           }),
+        [WS_METHODS.pullRequestsStack]: () => Effect.succeed(reason === "stack" ? {} : null),
+        [WS_METHODS.pullRequestsRunAction]: (input: { action: string }) =>
+          Effect.sync(() => calls.push(input.action)),
       } as unknown as WsRpcProtocolClient;
       const { atoms, registry } = yield* makeTestRuntime(client);
-      const batch = [6, 5, 4].map((number) =>
-        atoms.runAction.run(registry, {
-          environmentId: TARGET.environmentId,
-          input: {
-            projectId: ProjectId.make("project-1"),
-            repository: "acme/web",
-            number,
-            action: "close",
+      const target = {
+        environmentId: TARGET.environmentId,
+        input: { projectId: ProjectId.make("project-1"), repository: "acme/web", number: 1 },
+      };
+      const merge = atoms.runAction.run(registry, {
+        ...target,
+        input: {
+          ...target.input,
+          action: "merge",
+          resolveMergeMethod: () => {
+            if (reason === "method") throw new Error("No merge method is available.");
+            return "squash";
           },
-        }),
-      );
-      yield* Deferred.await(started);
-      expect(calls).toEqual([6]);
-      yield* Deferred.succeed(release, undefined);
-      const results = yield* Effect.promise(() => Promise.all(batch));
-      expect(results.map((result) => result._tag)).toEqual(["Success", "Failure", "Success"]);
-      expect(calls).toEqual([6, 5, 4]);
+        },
+      });
+      const close = atoms.runAction.run(registry, {
+        ...target,
+        input: { ...target.input, action: "close" },
+      });
+      const results = yield* Effect.promise(() => Promise.all([merge, close]));
+      expect(results.map((result) => result._tag)).toEqual(["Failure", "Success"]);
+      expect(calls).toEqual(["close"]);
     }),
-  ),
+);
+
+it.effect("keeps a close batch ordered and continues after a refused close", () =>
+  Effect.gen(function* () {
+    const calls: number[] = [];
+    const started = yield* Deferred.make<void>();
+    const release = yield* Deferred.make<void>();
+    const client = {
+      [WS_METHODS.pullRequestsRunAction]: (input: { number: number; action: string }) =>
+        Effect.gen(function* () {
+          expect(input.action).toBe("close");
+          calls.push(input.number);
+          if (input.number === 6) {
+            yield* Deferred.succeed(started, undefined);
+            yield* Deferred.await(release);
+          }
+          if (input.number === 5)
+            return yield* new PullRequestOperationError({
+              operation: "runAction",
+              detail: "You cannot close this pull request.",
+            });
+        }),
+    } as unknown as WsRpcProtocolClient;
+    const { atoms, registry } = yield* makeTestRuntime(client);
+    const batch = [6, 5, 4].map((number) =>
+      atoms.runAction.run(registry, {
+        environmentId: TARGET.environmentId,
+        input: {
+          projectId: ProjectId.make("project-1"),
+          repository: "acme/web",
+          number,
+          action: "close",
+        },
+      }),
+    );
+    yield* Deferred.await(started);
+    expect(calls).toEqual([6]);
+    yield* Deferred.succeed(release, undefined);
+    const results = yield* Effect.promise(() => Promise.all(batch));
+    expect(results.map((result) => result._tag)).toEqual(["Success", "Failure", "Success"]);
+    expect(calls).toEqual([6, 5, 4]);
+  }),
 );
 
 const actionReference = {
@@ -1132,538 +1104,519 @@ function actionReplyClient(overrides: Record<string, unknown> = {}) {
 }
 
 it.effect("shows an action's reply in loaded readers and moves list rows without reads", () =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      const reads: string[] = [];
-      const open = { ...actionReference, state: "open", isDraft: true, observedAt: 100 };
-      const read = (name: string) => () =>
+  Effect.gen(function* () {
+    const reads: string[] = [];
+    const open = { ...actionReference, state: "open", isDraft: true, observedAt: 100 };
+    const read = (name: string) => () =>
+      Effect.sync(() => {
+        reads.push(name);
+        return open;
+      });
+    const replies: unknown[] = [];
+    const listAnswers: unknown[] = [];
+    const client = actionReplyClient({
+      [WS_METHODS.pullRequestsDetail]: read("detail"),
+      [WS_METHODS.pullRequestsPreview]: read("preview"),
+      [WS_METHODS.pullRequestsSummary]: read("summary"),
+      [WS_METHODS.pullRequestsList]: (input: { readonly state: string }) =>
         Effect.sync(() => {
-          reads.push(name);
-          return open;
-        });
-      const replies: unknown[] = [];
-      const listAnswers: unknown[] = [];
-      const client = actionReplyClient({
-        [WS_METHODS.pullRequestsDetail]: read("detail"),
-        [WS_METHODS.pullRequestsPreview]: read("preview"),
-        [WS_METHODS.pullRequestsSummary]: read("summary"),
-        [WS_METHODS.pullRequestsList]: (input: { readonly state: string }) =>
-          Effect.sync(() => {
-            reads.push(`list:${input.state}`);
-            return {
-              entries: input.state === "merged" ? [] : [open],
-              viewers: {},
-              providers: [],
-              errors: [],
-              truncated: false,
-              nextCursors: {},
-            };
-          }),
+          reads.push(`list:${input.state}`);
+          return {
+            entries: input.state === "merged" ? [] : [open],
+            viewers: {},
+            providers: [],
+            errors: [],
+            truncated: false,
+            nextCursors: {},
+          };
+        }),
+    });
+    const saved = new Map<string, string>();
+    const { atoms, registry, runtime } = yield* makeTestRuntime(
+      client,
+      undefined,
+      false,
+      {
+        actionReply: (target, reply) => Effect.sync(() => replies.push({ target, reply })),
+        list: (_target, value) => Effect.sync(() => listAnswers.push(value.entries)),
+      },
+      {
+        load: (_environmentId, key) => Effect.sync(() => Option.fromUndefinedOr(saved.get(key))),
+        save: (_environmentId, key, payload) => Effect.sync(() => void saved.set(key, payload)),
+      },
+    );
+    const target = { environmentId: TARGET.environmentId, input: actionReference };
+    const list = (input: PullRequestListInput) =>
+      atoms.list({ environmentId: target.environmentId, input });
+    const readers: ReadonlyArray<Atom.Atom<AsyncResult.AsyncResult<object, unknown>>> = [
+      atoms.detail(target),
+      atoms.preview(target),
+      createLinkedPullRequestSummaryAtomFamily(runtime, atoms.refreshes)(target),
+    ];
+    const all = list({ state: "all" });
+    const openDrafts = list({ state: "open", filters: { draft: "only" } });
+    const merged = list({ state: "merged" });
+    for (const atom of [...readers, all, openDrafts, merged]) {
+      registry.mount(atom);
+      yield* Effect.promise(() => executeAtomQuery(registry, atom));
+    }
+    reads.length = 0;
+
+    const answer = yield* Effect.promise(() =>
+      atoms.runAction.run(registry, { ...target, input: { ...target.input, action: "merge" } }),
+    );
+
+    expect(answer).toMatchObject({ _tag: "Success", value: actionReply });
+    for (const atom of readers) {
+      expect(Option.getOrThrow(AsyncResult.value(registry.get(atom)))).toMatchObject({
+        state: "merged",
+        isDraft: false,
+        title: "Ship it",
       });
-      const saved = new Map<string, string>();
-      const { atoms, registry, runtime } = yield* makeTestRuntime(
-        client,
-        undefined,
-        false,
-        {
-          actionReply: (target, reply) => Effect.sync(() => replies.push({ target, reply })),
-          list: (_target, value) => Effect.sync(() => listAnswers.push(value.entries)),
-        },
-        {
-          load: (_environmentId, key) => Effect.sync(() => Option.fromUndefinedOr(saved.get(key))),
-          save: (_environmentId, key, payload) => Effect.sync(() => void saved.set(key, payload)),
-        },
-      );
-      const target = { environmentId: TARGET.environmentId, input: actionReference };
-      const list = (input: PullRequestListInput) =>
-        atoms.list({ environmentId: target.environmentId, input });
-      const readers: ReadonlyArray<Atom.Atom<AsyncResult.AsyncResult<object, unknown>>> = [
-        atoms.detail(target),
-        atoms.preview(target),
-        createLinkedPullRequestSummaryAtomFamily(runtime, atoms.refreshes)(target),
-      ];
-      const all = list({ state: "all" });
-      const openDrafts = list({ state: "open", filters: { draft: "only" } });
-      const merged = list({ state: "merged" });
-      for (const atom of [...readers, all, openDrafts, merged]) {
-        registry.mount(atom);
-        yield* Effect.promise(() => executeAtomQuery(registry, atom));
-      }
-      reads.length = 0;
-
-      const answer = yield* Effect.promise(() =>
-        atoms.runAction.run(registry, { ...target, input: { ...target.input, action: "merge" } }),
-      );
-
-      expect(answer).toMatchObject({ _tag: "Success", value: actionReply });
-      for (const atom of readers) {
-        expect(Option.getOrThrow(AsyncResult.value(registry.get(atom)))).toMatchObject({
-          state: "merged",
-          isDraft: false,
-          title: "Ship it",
-        });
-      }
-      expect(Option.getOrThrow(AsyncResult.value(registry.get(all))).entries).toMatchObject([
-        // The row keeps its own read time: the reply does not carry its checks or labels.
-        { state: "merged", isDraft: false, observedAt: 100 },
-      ]);
-      expect(Option.getOrThrow(AsyncResult.value(registry.get(openDrafts))).entries).toEqual([]);
-      expect(replies).toEqual([{ target, reply: actionReply }]);
-      // A cold start paints the saved copy, so the patch must replace the saved answer.
-      const summaryKey = queryPersistenceKey(
-        "environment-data:pull-requests:linked-summary",
-        actionReference,
-      );
-      expect(JSON.parse(saved.get(summaryKey) ?? "null")).toMatchObject({ state: "merged" });
-      // Snapshot writers see the patched rows the way they see an answer.
-      expect(listAnswers).toContainEqual([expect.objectContaining({ state: "merged" })]);
-      // Only a read can place a row the listing did not hold.
-      yield* AtomRegistry.getResult(registry, merged, { suspendOnWaiting: true });
-      expect(reads).toEqual(["list:merged"]);
-    }),
-  ),
+    }
+    expect(Option.getOrThrow(AsyncResult.value(registry.get(all))).entries).toMatchObject([
+      // The row keeps its own read time: the reply does not carry its checks or labels.
+      { state: "merged", isDraft: false, observedAt: 100 },
+    ]);
+    expect(Option.getOrThrow(AsyncResult.value(registry.get(openDrafts))).entries).toEqual([]);
+    expect(replies).toEqual([{ target, reply: actionReply }]);
+    // A cold start paints the saved copy, so the patch must replace the saved answer.
+    const summaryKey = queryPersistenceKey(
+      "environment-data:pull-requests:linked-summary",
+      actionReference,
+    );
+    expect(JSON.parse(saved.get(summaryKey) ?? "null")).toMatchObject({ state: "merged" });
+    // Snapshot writers see the patched rows the way they see an answer.
+    expect(listAnswers).toContainEqual([expect.objectContaining({ state: "merged" })]);
+    // Only a read can place a row the listing did not hold.
+    yield* AtomRegistry.getResult(registry, merged, { suspendOnWaiting: true });
+    expect(reads).toEqual(["list:merged"]);
+  }),
 );
 
 it.effect("keeps an action's reply when a refresh started before the action answers late", () =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      let state: "open" | "merged" = "open";
-      let reads = 0;
-      const started = yield* Deferred.make<void>();
-      const release = yield* Deferred.make<void>();
-      const settled = yield* Deferred.make<void>();
-      const client = actionReplyClient({
-        [WS_METHODS.pullRequestsDetail]: () =>
-          Effect.gen(function* () {
-            reads++;
-            const snapshot = { ...actionReference, state, isDraft: false, observedAt: 100 };
-            if (reads === 2) {
-              yield* Deferred.succeed(started, undefined);
-              yield* Deferred.await(release).pipe(
-                Effect.onExit(() => Deferred.succeed(settled, undefined)),
-              );
-            }
-            return snapshot;
-          }),
-        [WS_METHODS.pullRequestsRunAction]: () =>
-          Effect.sync(() => {
-            state = "merged";
-            return actionReply;
-          }),
-      });
-      const { atoms, registry } = yield* makeTestRuntime(client);
-      const target = { environmentId: TARGET.environmentId, input: actionReference };
-      const detail = atoms.detail(target);
-      registry.mount(detail);
-      yield* AtomRegistry.getResult(registry, detail, { suspendOnWaiting: true });
-      registry.refresh(detail);
-      yield* Deferred.await(started);
-
-      yield* Effect.promise(() =>
-        atoms.runAction.run(registry, {
-          ...target,
-          input: { ...actionReference, action: "merge" },
+  Effect.gen(function* () {
+    let state: "open" | "merged" = "open";
+    let reads = 0;
+    const started = yield* Deferred.make<void>();
+    const release = yield* Deferred.make<void>();
+    const settled = yield* Deferred.make<void>();
+    const client = actionReplyClient({
+      [WS_METHODS.pullRequestsDetail]: () =>
+        Effect.gen(function* () {
+          reads++;
+          const snapshot = { ...actionReference, state, isDraft: false, observedAt: 100 };
+          if (reads === 2) {
+            yield* Deferred.succeed(started, undefined);
+            yield* Deferred.await(release).pipe(
+              Effect.onExit(() => Deferred.succeed(settled, undefined)),
+            );
+          }
+          return snapshot;
         }),
-      );
-      yield* Deferred.succeed(release, undefined);
-      yield* Deferred.await(settled);
-
-      expect(
-        (yield* AtomRegistry.getResult(registry, detail, { suspendOnWaiting: true })).state,
-      ).toBe("merged");
-      expect(Option.getOrThrow(AsyncResult.value(registry.get(detail))).state).toBe("merged");
-    }),
-  ),
+      [WS_METHODS.pullRequestsRunAction]: () =>
+        Effect.sync(() => {
+          state = "merged";
+          return actionReply;
+        }),
+    });
+    const { atoms, registry } = yield* makeTestRuntime(client);
+    const target = { environmentId: TARGET.environmentId, input: actionReference };
+    const detail = atoms.detail(target);
+    registry.mount(detail);
+    yield* AtomRegistry.getResult(registry, detail, { suspendOnWaiting: true });
+    registry.refresh(detail);
+    yield* Deferred.await(started);
+
+    yield* Effect.promise(() =>
+      atoms.runAction.run(registry, {
+        ...target,
+        input: { ...actionReference, action: "merge" },
+      }),
+    );
+    yield* Deferred.succeed(release, undefined);
+    yield* Deferred.await(settled);
+
+    expect(
+      (yield* AtomRegistry.getResult(registry, detail, { suspendOnWaiting: true })).state,
+    ).toBe("merged");
+    expect(Option.getOrThrow(AsyncResult.value(registry.get(detail))).state).toBe("merged");
+  }),
 );
 
 it.effect("keeps a list read the server's refresh started before the action replied", () =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      const refreshEvents = yield* PubSub.unbounded<number>();
-      let state: "open" | "merged" = "open";
-      let reads = 0;
-      const actionInputs: unknown[] = [];
-      const listWaiting = Latch.makeUnsafe();
-      const release = yield* Deferred.make<void>();
-      const client = actionReplyClient({
-        [WS_METHODS.pullRequestsSubscribeRefreshes]: () => Stream.fromPubSub(refreshEvents),
-        [WS_METHODS.pullRequestsList]: () =>
-          Effect.gen(function* () {
-            reads++;
-            const entries = [
-              { ...actionReference, state, isDraft: false, updatedAt: actionReply.updatedAt },
-            ];
-            if (reads === 2) yield* Deferred.await(release);
-            return {
-              entries,
-              viewers: {},
-              providers: [],
-              errors: [],
-              truncated: false,
-              nextCursors: {},
-            };
-          }),
-        [WS_METHODS.pullRequestsRunAction]: (input: unknown) =>
-          Effect.gen(function* () {
-            actionInputs.push(input);
-            state = "merged";
-            // The server announces its refresh before it replies.
-            yield* PubSub.publish(refreshEvents, 1);
-            yield* listWaiting.await;
-            return actionReply;
-          }),
-      });
-      const { atoms, registry } = yield* makeTestRuntime(client);
-      const target = { environmentId: TARGET.environmentId, input: actionReference };
-      const list = atoms.list({ environmentId: target.environmentId, input: { state: "all" } });
-      const unmount = registry.mount(list);
-      yield* Effect.addFinalizer(() => Effect.sync(unmount));
-      yield* Effect.promise(() => executeAtomQuery(registry, list));
-      const stop = registry.subscribe(list, (result) => {
-        if (result.waiting) listWaiting.openUnsafe();
-      });
-      yield* Effect.addFinalizer(() => Effect.sync(stop));
-
-      yield* Effect.promise(() =>
-        atoms.runAction.run(registry, {
-          ...target,
-          input: { ...actionReference, action: "merge" },
+  Effect.gen(function* () {
+    const refreshEvents = yield* PubSub.unbounded<number>();
+    let state: "open" | "merged" = "open";
+    let reads = 0;
+    const actionInputs: unknown[] = [];
+    const listWaiting = Latch.makeUnsafe();
+    const release = yield* Deferred.make<void>();
+    const client = actionReplyClient({
+      [WS_METHODS.pullRequestsSubscribeRefreshes]: () => Stream.fromPubSub(refreshEvents),
+      [WS_METHODS.pullRequestsList]: () =>
+        Effect.gen(function* () {
+          reads++;
+          const entries = [
+            { ...actionReference, state, isDraft: false, updatedAt: actionReply.updatedAt },
+          ];
+          if (reads === 2) yield* Deferred.await(release);
+          return {
+            entries,
+            viewers: {},
+            providers: [],
+            errors: [],
+            truncated: false,
+            nextCursors: {},
+          };
         }),
-      );
-      yield* Deferred.succeed(release, undefined);
-
-      expect(
-        (yield* AtomRegistry.getResult(registry, list, { suspendOnWaiting: true })).entries,
-      ).toMatchObject([{ state: "merged" }]);
-      expect(reads).toBe(2);
-      expect(actionInputs).toEqual([expect.objectContaining({ replyWithSummary: true })]);
-    }),
-  ),
+      [WS_METHODS.pullRequestsRunAction]: (input: unknown) =>
+        Effect.gen(function* () {
+          actionInputs.push(input);
+          state = "merged";
+          // The server announces its refresh before it replies.
+          yield* PubSub.publish(refreshEvents, 1);
+          yield* listWaiting.await;
+          return actionReply;
+        }),
+    });
+    const { atoms, registry } = yield* makeTestRuntime(client);
+    const target = { environmentId: TARGET.environmentId, input: actionReference };
+    const list = atoms.list({ environmentId: target.environmentId, input: { state: "all" } });
+    const unmount = registry.mount(list);
+    yield* Effect.addFinalizer(() => Effect.sync(unmount));
+    yield* Effect.promise(() => executeAtomQuery(registry, list));
+    const stop = registry.subscribe(list, (result) => {
+      if (result.waiting) listWaiting.openUnsafe();
+    });
+    yield* Effect.addFinalizer(() => Effect.sync(stop));
+
+    yield* Effect.promise(() =>
+      atoms.runAction.run(registry, {
+        ...target,
+        input: { ...actionReference, action: "merge" },
+      }),
+    );
+    yield* Deferred.succeed(release, undefined);
+
+    expect(
+      (yield* AtomRegistry.getResult(registry, list, { suspendOnWaiting: true })).entries,
+    ).toMatchObject([{ state: "merged" }]);
+    expect(reads).toBe(2);
+    expect(actionInputs).toEqual([expect.objectContaining({ replyWithSummary: true })]);
+  }),
 );
 
 it.effect("restarts a list page read sent while the action was in flight", () =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      const refreshEvents = yield* PubSub.unbounded<number>();
-      let state: "open" | "closed" = "open";
-      let pageReads = 0;
-      const actionSent = yield* Deferred.make<void>();
-      const pageStarted = yield* Deferred.make<void>();
-      const release = yield* Deferred.make<void>();
-      const settled = yield* Deferred.make<void>();
-      const listResult = (entries: ReadonlyArray<object>) => ({
-        entries,
-        viewers: {},
-        providers: [],
-        errors: [],
-        truncated: false,
-        nextCursors: {},
-      });
-      const client = actionReplyClient({
-        [WS_METHODS.pullRequestsSubscribeRefreshes]: () => Stream.fromPubSub(refreshEvents),
-        [WS_METHODS.pullRequestsList]: (input: PullRequestListInput) =>
-          Effect.gen(function* () {
-            const entries =
-              state === "open"
-                ? [{ ...actionReference, state, isDraft: false, updatedAt: "2026-10-27T09:00:00Z" }]
-                : [];
-            if (input.cursors !== undefined && ++pageReads === 2) {
-              yield* Deferred.succeed(pageStarted, undefined);
-              yield* Deferred.await(release).pipe(
-                Effect.onExit(() => Deferred.succeed(settled, undefined)),
-              );
-            }
-            return listResult(input.cursors === undefined ? [] : entries);
-          }),
-        [WS_METHODS.pullRequestsRunAction]: () =>
-          Effect.gen(function* () {
-            yield* Deferred.succeed(actionSent, undefined);
-            yield* Deferred.await(pageStarted);
-            state = "closed";
-            yield* PubSub.publish(refreshEvents, 1);
-            return { ...actionReply, state: "closed" };
-          }),
-      });
-      const { atoms, registry } = yield* makeTestRuntime(client);
-      const target = { environmentId: TARGET.environmentId, input: actionReference };
-      const listInput = { state: "open" } as const;
-      const head = atoms.list({ environmentId: target.environmentId, input: listInput });
-      const page = atoms.list({
-        environmentId: target.environmentId,
-        input: { ...listInput, cursors: { "github.example.com": "page-2" } },
-      });
-      for (const atom of [head, page]) {
-        const unmount = registry.mount(atom);
-        yield* Effect.addFinalizer(() => Effect.sync(unmount));
-        yield* Effect.promise(() => executeAtomQuery(registry, atom));
-      }
-
-      const action = yield* Effect.promise(() =>
-        atoms.runAction.run(registry, {
-          ...target,
-          input: { ...actionReference, action: "close" },
+  Effect.gen(function* () {
+    const refreshEvents = yield* PubSub.unbounded<number>();
+    let state: "open" | "closed" = "open";
+    let pageReads = 0;
+    const actionSent = yield* Deferred.make<void>();
+    const pageStarted = yield* Deferred.make<void>();
+    const release = yield* Deferred.make<void>();
+    const settled = yield* Deferred.make<void>();
+    const listResult = (entries: ReadonlyArray<object>) => ({
+      entries,
+      viewers: {},
+      providers: [],
+      errors: [],
+      truncated: false,
+      nextCursors: {},
+    });
+    const client = actionReplyClient({
+      [WS_METHODS.pullRequestsSubscribeRefreshes]: () => Stream.fromPubSub(refreshEvents),
+      [WS_METHODS.pullRequestsList]: (input: PullRequestListInput) =>
+        Effect.gen(function* () {
+          const entries =
+            state === "open"
+              ? [{ ...actionReference, state, isDraft: false, updatedAt: "2026-10-27T09:00:00Z" }]
+              : [];
+          if (input.cursors !== undefined && ++pageReads === 2) {
+            yield* Deferred.succeed(pageStarted, undefined);
+            yield* Deferred.await(release).pipe(
+              Effect.onExit(() => Deferred.succeed(settled, undefined)),
+            );
+          }
+          return listResult(input.cursors === undefined ? [] : entries);
         }),
-      ).pipe(Effect.forkScoped);
-      yield* Deferred.await(actionSent);
-      // Loading more rows re-reads a page while the close is on the wire.
-      registry.refresh(page);
-      yield* Fiber.join(action);
-      yield* Deferred.succeed(release, undefined);
-      yield* Deferred.await(settled);
+      [WS_METHODS.pullRequestsRunAction]: () =>
+        Effect.gen(function* () {
+          yield* Deferred.succeed(actionSent, undefined);
+          yield* Deferred.await(pageStarted);
+          state = "closed";
+          yield* PubSub.publish(refreshEvents, 1);
+          return { ...actionReply, state: "closed" };
+        }),
+    });
+    const { atoms, registry } = yield* makeTestRuntime(client);
+    const target = { environmentId: TARGET.environmentId, input: actionReference };
+    const listInput = { state: "open" } as const;
+    const head = atoms.list({ environmentId: target.environmentId, input: listInput });
+    const page = atoms.list({
+      environmentId: target.environmentId,
+      input: { ...listInput, cursors: { "github.example.com": "page-2" } },
+    });
+    for (const atom of [head, page]) {
+      const unmount = registry.mount(atom);
+      yield* Effect.addFinalizer(() => Effect.sync(unmount));
+      yield* Effect.promise(() => executeAtomQuery(registry, atom));
+    }
 
-      expect(
-        (yield* AtomRegistry.getResult(registry, page, { suspendOnWaiting: true })).entries,
-      ).toEqual([]);
-    }),
-  ),
+    const action = yield* Effect.promise(() =>
+      atoms.runAction.run(registry, {
+        ...target,
+        input: { ...actionReference, action: "close" },
+      }),
+    ).pipe(Effect.forkScoped);
+    yield* Deferred.await(actionSent);
+    // Loading more rows re-reads a page while the close is on the wire.
+    registry.refresh(page);
+    yield* Fiber.join(action);
+    yield* Deferred.succeed(release, undefined);
+    yield* Deferred.await(settled);
+
+    expect(
+      (yield* AtomRegistry.getResult(registry, page, { suspendOnWaiting: true })).entries,
+    ).toEqual([]);
+  }),
 );
 
 it.effect("shows a reopen reply at once and re-reads the fields it lacks", () =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      let reads = 0;
-      const release = yield* Deferred.make<void>();
-      const client = actionReplyClient({
-        [WS_METHODS.pullRequestsDetail]: () =>
-          Effect.gen(function* () {
-            reads++;
-            if (reads === 1) return { ...actionReference, state: "closed", observedAt: 100 };
-            yield* Deferred.await(release);
-            return { ...actionReference, state: "open", observedAt: 300 };
-          }),
-        [WS_METHODS.pullRequestsRunAction]: () => Effect.succeed({ ...actionReply, state: "open" }),
-      });
-      const { atoms, registry } = yield* makeTestRuntime(client);
-      const target = { environmentId: TARGET.environmentId, input: actionReference };
-      const detail = atoms.detail(target);
-      registry.mount(detail);
-      yield* AtomRegistry.getResult(registry, detail, { suspendOnWaiting: true });
-
-      yield* Effect.promise(() =>
-        atoms.runAction.run(registry, {
-          ...target,
-          input: { ...actionReference, action: "reopen" },
+  Effect.gen(function* () {
+    let reads = 0;
+    const release = yield* Deferred.make<void>();
+    const client = actionReplyClient({
+      [WS_METHODS.pullRequestsDetail]: () =>
+        Effect.gen(function* () {
+          reads++;
+          if (reads === 1) return { ...actionReference, state: "closed", observedAt: 100 };
+          yield* Deferred.await(release);
+          return { ...actionReference, state: "open", observedAt: 300 };
         }),
-      );
-
-      expect(Option.getOrThrow(AsyncResult.value(registry.get(detail))).state).toBe("open");
-      expect(reads).toBe(2);
-      yield* Deferred.succeed(release, undefined);
-      expect(
-        (yield* AtomRegistry.getResult(registry, detail, { suspendOnWaiting: true })).observedAt,
-      ).toBe(300);
-    }),
-  ),
+      [WS_METHODS.pullRequestsRunAction]: () => Effect.succeed({ ...actionReply, state: "open" }),
+    });
+    const { atoms, registry } = yield* makeTestRuntime(client);
+    const target = { environmentId: TARGET.environmentId, input: actionReference };
+    const detail = atoms.detail(target);
+    registry.mount(detail);
+    yield* AtomRegistry.getResult(registry, detail, { suspendOnWaiting: true });
+
+    yield* Effect.promise(() =>
+      atoms.runAction.run(registry, {
+        ...target,
+        input: { ...actionReference, action: "reopen" },
+      }),
+    );
+
+    expect(Option.getOrThrow(AsyncResult.value(registry.get(detail))).state).toBe("open");
+    expect(reads).toBe(2);
+    yield* Deferred.succeed(release, undefined);
+    expect(
+      (yield* AtomRegistry.getResult(registry, detail, { suspendOnWaiting: true })).observedAt,
+    ).toBe(300);
+  }),
 );
 
 it.effect("keeps each reader's read time when a reply leaves its checks as they were", () =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      const shown = {
-        ...actionReference,
-        state: "open",
-        isDraft: true,
-        updatedAt: "2026-10-27T09:00:00Z",
-        observedAt: 100,
-        checks: [{ status: "success" }],
-        checksState: "passing",
-      };
-      const client = actionReplyClient({
-        [WS_METHODS.pullRequestsDetail]: () => Effect.succeed(shown),
-        [WS_METHODS.pullRequestsSummary]: () => Effect.succeed(shown),
-        [WS_METHODS.pullRequestsList]: () =>
-          Effect.succeed({
-            entries: [shown],
-            viewers: {},
-            providers: [],
-            errors: [],
-            truncated: false,
-            nextCursors: {},
-          }),
-        [WS_METHODS.pullRequestsRunAction]: () =>
-          Effect.succeed({ ...actionReply, state: "open", observedAt: 300 }),
-      });
-      const answeredAt: Array<number | undefined> = [];
-      const { atoms, registry, runtime } = yield* makeTestRuntime(client, undefined, false, {
-        detail: (_target, value) => Effect.sync(() => answeredAt.push(value.observedAt)),
-      });
-      const target = { environmentId: TARGET.environmentId, input: actionReference };
-      const readers: ReadonlyArray<Atom.Atom<AsyncResult.AsyncResult<object, unknown>>> = [
-        atoms.detail(target),
-        createLinkedPullRequestSummaryAtomFamily(runtime, atoms.refreshes)(target),
-      ];
-      const list = atoms.list({ environmentId: target.environmentId, input: { state: "all" } });
-      for (const atom of [...readers, list]) {
-        registry.mount(atom);
-        yield* Effect.promise(() => executeAtomQuery(registry, atom));
-      }
-
-      yield* Effect.promise(() =>
-        atoms.runAction.run(registry, {
-          ...target,
-          input: { ...actionReference, action: "ready" },
+  Effect.gen(function* () {
+    const shown = {
+      ...actionReference,
+      state: "open",
+      isDraft: true,
+      updatedAt: "2026-10-27T09:00:00Z",
+      observedAt: 100,
+      checks: [{ status: "success" }],
+      checksState: "passing",
+    };
+    const client = actionReplyClient({
+      [WS_METHODS.pullRequestsDetail]: () => Effect.succeed(shown),
+      [WS_METHODS.pullRequestsSummary]: () => Effect.succeed(shown),
+      [WS_METHODS.pullRequestsList]: () =>
+        Effect.succeed({
+          entries: [shown],
+          viewers: {},
+          providers: [],
+          errors: [],
+          truncated: false,
+          nextCursors: {},
         }),
-      );
+      [WS_METHODS.pullRequestsRunAction]: () =>
+        Effect.succeed({ ...actionReply, state: "open", observedAt: 300 }),
+    });
+    const answeredAt: Array<number | undefined> = [];
+    const { atoms, registry, runtime } = yield* makeTestRuntime(client, undefined, false, {
+      detail: (_target, value) => Effect.sync(() => answeredAt.push(value.observedAt)),
+    });
+    const target = { environmentId: TARGET.environmentId, input: actionReference };
+    const readers: ReadonlyArray<Atom.Atom<AsyncResult.AsyncResult<object, unknown>>> = [
+      atoms.detail(target),
+      createLinkedPullRequestSummaryAtomFamily(runtime, atoms.refreshes)(target),
+    ];
+    const list = atoms.list({ environmentId: target.environmentId, input: { state: "all" } });
+    for (const atom of [...readers, list]) {
+      registry.mount(atom);
+      yield* Effect.promise(() => executeAtomQuery(registry, atom));
+    }
+
+    yield* Effect.promise(() =>
+      atoms.runAction.run(registry, {
+        ...target,
+        input: { ...actionReference, action: "ready" },
+      }),
+    );
 
-      // Checks read at 100 must not pass for a read at 300 against a newer checks read.
-      for (const atom of readers) {
-        expect(Option.getOrThrow(AsyncResult.value(registry.get(atom)))).toMatchObject({
-          isDraft: false,
-          observedAt: 100,
-        });
-      }
-      expect(Option.getOrThrow(AsyncResult.value(registry.get(list))).entries).toMatchObject([
-        { isDraft: false, checksState: "passing", observedAt: 100 },
-      ]);
-      expect(answeredAt).toEqual([100, 100]);
-    }),
-  ),
+    // Checks read at 100 must not pass for a read at 300 against a newer checks read.
+    for (const atom of readers) {
+      expect(Option.getOrThrow(AsyncResult.value(registry.get(atom)))).toMatchObject({
+        isDraft: false,
+        observedAt: 100,
+      });
+    }
+    expect(Option.getOrThrow(AsyncResult.value(registry.get(list))).entries).toMatchObject([
+      { isDraft: false, checksState: "passing", observedAt: 100 },
+    ]);
+    expect(answeredAt).toEqual([100, 100]);
+  }),
 );
 
 it.effect("re-reads an unstamped preview rather than order a reply against it", () =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      let reads = 0;
-      const client = actionReplyClient({
-        // Previews from servers before action replies carry neither update nor read time.
-        [WS_METHODS.pullRequestsPreview]: () =>
-          Effect.sync(() => {
-            reads++;
-            return {
-              ...actionReference,
-              title: "Reopened elsewhere",
-              url: actionReply.url,
-              author: null,
-              state: "open",
-              isDraft: false,
-              createdAt: "2026-10-27T08:00:00Z",
-            };
-          }),
-        [WS_METHODS.pullRequestsRunAction]: () =>
-          Effect.succeed({ ...actionReply, state: "closed" }),
-      });
-      const { atoms, registry } = yield* makeTestRuntime(client);
-      const target = { environmentId: TARGET.environmentId, input: actionReference };
-      const preview = atoms.preview(target);
-      registry.mount(preview);
-      yield* AtomRegistry.getResult(registry, preview, { suspendOnWaiting: true });
-
-      yield* Effect.promise(() =>
-        atoms.runAction.run(registry, {
-          ...target,
-          input: { ...actionReference, action: "close" },
+  Effect.gen(function* () {
+    let reads = 0;
+    const client = actionReplyClient({
+      // Previews from servers before action replies carry neither update nor read time.
+      [WS_METHODS.pullRequestsPreview]: () =>
+        Effect.sync(() => {
+          reads++;
+          return {
+            ...actionReference,
+            title: "Reopened elsewhere",
+            url: actionReply.url,
+            author: null,
+            state: "open",
+            isDraft: false,
+            createdAt: "2026-10-27T08:00:00Z",
+          };
         }),
-      );
-
-      expect(Option.getOrThrow(AsyncResult.value(registry.get(preview))).state).toBe("open");
-      expect(
-        (yield* AtomRegistry.getResult(registry, preview, { suspendOnWaiting: true })).state,
-      ).toBe("open");
-      expect(reads).toBe(2);
-    }),
-  ),
+      [WS_METHODS.pullRequestsRunAction]: () => Effect.succeed({ ...actionReply, state: "closed" }),
+    });
+    const { atoms, registry } = yield* makeTestRuntime(client);
+    const target = { environmentId: TARGET.environmentId, input: actionReference };
+    const preview = atoms.preview(target);
+    registry.mount(preview);
+    yield* AtomRegistry.getResult(registry, preview, { suspendOnWaiting: true });
+
+    yield* Effect.promise(() =>
+      atoms.runAction.run(registry, {
+        ...target,
+        input: { ...actionReference, action: "close" },
+      }),
+    );
+
+    expect(Option.getOrThrow(AsyncResult.value(registry.get(preview))).state).toBe("open");
+    expect(
+      (yield* AtomRegistry.getResult(registry, preview, { suspendOnWaiting: true })).state,
+    ).toBe("open");
+    expect(reads).toBe(2);
+  }),
 );
 
 it.effect("leaves a loaded list page alone when the reply concerns none of its rows", () =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      let pageReads = 0;
-      const client = actionReplyClient({
-        [WS_METHODS.pullRequestsList]: () =>
-          Effect.sync(() => {
-            pageReads++;
-            return {
-              entries: [
-                {
-                  ...actionReference,
-                  number: 2,
-                  state: "open",
-                  isDraft: false,
-                  updatedAt: "2026-10-27T09:00:00Z",
-                },
-              ],
-              viewers: {},
-              providers: [],
-              errors: [],
-              truncated: false,
-              nextCursors: {},
-            };
-          }),
-        [WS_METHODS.pullRequestsRunAction]: () => Effect.succeed({ ...actionReply, state: "open" }),
-      });
-      const { atoms, registry } = yield* makeTestRuntime(client);
-      const target = { environmentId: TARGET.environmentId, input: actionReference };
-      const page = atoms.list({
-        environmentId: target.environmentId,
-        input: { state: "open", cursors: { "github.example.com": "page-2" } },
-      });
-      const unmount = registry.mount(page);
-      yield* Effect.addFinalizer(() => Effect.sync(unmount));
-      yield* Effect.promise(() => executeAtomQuery(registry, page));
-
-      yield* Effect.promise(() =>
-        atoms.runAction.run(registry, {
-          ...target,
-          input: { ...actionReference, action: "ready" },
+  Effect.gen(function* () {
+    let pageReads = 0;
+    const client = actionReplyClient({
+      [WS_METHODS.pullRequestsList]: () =>
+        Effect.sync(() => {
+          pageReads++;
+          return {
+            entries: [
+              {
+                ...actionReference,
+                number: 2,
+                state: "open",
+                isDraft: false,
+                updatedAt: "2026-10-27T09:00:00Z",
+              },
+            ],
+            viewers: {},
+            providers: [],
+            errors: [],
+            truncated: false,
+            nextCursors: {},
+          };
         }),
-      );
+      [WS_METHODS.pullRequestsRunAction]: () => Effect.succeed({ ...actionReply, state: "open" }),
+    });
+    const { atoms, registry } = yield* makeTestRuntime(client);
+    const target = { environmentId: TARGET.environmentId, input: actionReference };
+    const page = atoms.list({
+      environmentId: target.environmentId,
+      input: { state: "open", cursors: { "github.example.com": "page-2" } },
+    });
+    const unmount = registry.mount(page);
+    yield* Effect.addFinalizer(() => Effect.sync(unmount));
+    yield* Effect.promise(() => executeAtomQuery(registry, page));
+
+    yield* Effect.promise(() =>
+      atoms.runAction.run(registry, {
+        ...target,
+        input: { ...actionReference, action: "ready" },
+      }),
+    );
 
-      yield* AtomRegistry.getResult(registry, page, { suspendOnWaiting: true });
-      expect(pageReads).toBe(1);
-    }),
-  ),
+    yield* AtomRegistry.getResult(registry, page, { suspendOnWaiting: true });
+    expect(pageReads).toBe(1);
+  }),
 );
 
-it.effect("keeps the server's post-commit read when a reopen reply lacks fields", () =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      const refreshEvents = yield* PubSub.unbounded<number>();
-      let reads = 0;
-      const detailWaiting = Latch.makeUnsafe();
-      const release = yield* Deferred.make<void>();
-      const client = actionReplyClient({
-        [WS_METHODS.pullRequestsSubscribeRefreshes]: () => Stream.fromPubSub(refreshEvents),
-        [WS_METHODS.pullRequestsDetail]: () =>
-          Effect.gen(function* () {
-            reads++;
-            if (reads === 1) return { ...actionReference, state: "closed", observedAt: 100 };
-            yield* Deferred.await(release);
-            return { ...actionReference, state: "open", observedAt: 300 };
-          }),
-        [WS_METHODS.pullRequestsRunAction]: () =>
-          Effect.gen(function* () {
-            // The server announces its refresh before it replies.
-            yield* PubSub.publish(refreshEvents, 1);
-            yield* detailWaiting.await;
-            return { ...actionReply, state: "open" };
-          }),
-      });
-      const { atoms, registry } = yield* makeTestRuntime(client);
-      const target = { environmentId: TARGET.environmentId, input: actionReference };
-      const detail = atoms.detail(target);
-      const unmount = registry.mount(detail);
-      yield* Effect.addFinalizer(() => Effect.sync(unmount));
-      yield* AtomRegistry.getResult(registry, detail, { suspendOnWaiting: true });
-      const stop = registry.subscribe(detail, (result) => {
-        if (result.waiting) detailWaiting.openUnsafe();
-      });
-      yield* Effect.addFinalizer(() => Effect.sync(stop));
-
-      yield* Effect.promise(() =>
-        atoms.runAction.run(registry, {
-          ...target,
-          input: { ...actionReference, action: "reopen" },
-        }),
-      );
-      expect(Option.getOrThrow(AsyncResult.value(registry.get(detail))).state).toBe("open");
-      yield* Deferred.succeed(release, undefined);
-
-      expect(
-        (yield* AtomRegistry.getResult(registry, detail, { suspendOnWaiting: true })).observedAt,
-      ).toBe(300);
-      expect(reads).toBe(2);
-    }),
-  ),
+it.effect("keeps the server's post-commit read when a reopen reply lacks fields", () =>
+  Effect.gen(function* () {
+    const refreshEvents = yield* PubSub.unbounded<number>();
+    let reads = 0;
+    const detailWaiting = Latch.makeUnsafe();
+    const release = yield* Deferred.make<void>();
+    const client = actionReplyClient({
+      [WS_METHODS.pullRequestsSubscribeRefreshes]: () => Stream.fromPubSub(refreshEvents),
+      [WS_METHODS.pullRequestsDetail]: () =>
+        Effect.gen(function* () {
+          reads++;
+          if (reads === 1) return { ...actionReference, state: "closed", observedAt: 100 };
+          yield* Deferred.await(release);
+          return { ...actionReference, state: "open", observedAt: 300 };
+        }),
+      [WS_METHODS.pullRequestsRunAction]: () =>
+        Effect.gen(function* () {
+          // The server announces its refresh before it replies.
+          yield* PubSub.publish(refreshEvents, 1);
+          yield* detailWaiting.await;
+          return { ...actionReply, state: "open" };
+        }),
+    });
+    const { atoms, registry } = yield* makeTestRuntime(client);
+    const target = { environmentId: TARGET.environmentId, input: actionReference };
+    const detail = atoms.detail(target);
+    const unmount = registry.mount(detail);
+    yield* Effect.addFinalizer(() => Effect.sync(unmount));
+    yield* AtomRegistry.getResult(registry, detail, { suspendOnWaiting: true });
+    const stop = registry.subscribe(detail, (result) => {
+      if (result.waiting) detailWaiting.openUnsafe();
+    });
+    yield* Effect.addFinalizer(() => Effect.sync(stop));
+
+    yield* Effect.promise(() =>
+      atoms.runAction.run(registry, {
+        ...target,
+        input: { ...actionReference, action: "reopen" },
+      }),
+    );
+    expect(Option.getOrThrow(AsyncResult.value(registry.get(detail))).state).toBe("open");
+    yield* Deferred.succeed(release, undefined);
+
+    expect(
+      (yield* AtomRegistry.getResult(registry, detail, { suspendOnWaiting: true })).observedAt,
+    ).toBe(300);
+    expect(reads).toBe(2);
+  }),
 );
 
 it.effect.each([
@@ -1672,507 +1625,537 @@ it.effect.each([
 ] as const)(
   "keeps %s when an older or reverting action reply arrives",
   ([, shownState, updatedAt, observedAt, replyState]) =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const shown = {
-          ...actionReference,
-          state: shownState,
-          isDraft: true,
-          updatedAt,
-          observedAt,
-        };
-        const client = actionReplyClient({
-          [WS_METHODS.pullRequestsDetail]: () => Effect.succeed(shown),
-          [WS_METHODS.pullRequestsPreview]: () => Effect.succeed(shown),
-          [WS_METHODS.pullRequestsRunAction]: () =>
-            Effect.succeed({ ...actionReply, state: replyState }),
-        });
-        const { atoms, registry } = yield* makeTestRuntime(client);
-        const target = { environmentId: TARGET.environmentId, input: actionReference };
-        const readers = [atoms.detail(target), atoms.preview(target), atoms.previewCard(target)];
-        for (const reader of readers) {
-          registry.mount(reader);
-          yield* AtomRegistry.getResult(registry, reader, { suspendOnWaiting: true });
-        }
-
-        yield* Effect.promise(() =>
-          atoms.runAction.run(registry, {
-            ...target,
-            input: { ...actionReference, action: "ready" },
-          }),
-        );
-        for (const reader of readers) {
-          expect(Option.getOrThrow(AsyncResult.value(registry.get(reader)))).toMatchObject({
-            state: shownState,
-            isDraft: true,
-          });
-        }
-      }),
-    ),
-);
-
-it.effect("keeps hover previews fresh after edits and turns", () =>
-  Effect.scoped(
     Effect.gen(function* () {
-      const refreshEvents = yield* PubSub.unbounded<number>();
-      let title = "Original title";
-      let reads = 0;
-      const read = (input: unknown) =>
-        Effect.sync(() => {
-          expect(input).toEqual(reference);
-          reads++;
-          return { ...reference, title };
-        });
-      const reference = {
-        projectId: ProjectId.make("project-1"),
-        repository: "acme/web",
-        number: 1,
-        host: "github.example.com",
+      const shown = {
+        ...actionReference,
+        state: shownState,
+        isDraft: true,
+        updatedAt,
+        observedAt,
       };
-      const client = {
-        [WS_METHODS.pullRequestsSubscribeRefreshes]: () => Stream.fromPubSub(refreshEvents),
-        [WS_METHODS.pullRequestsPreview]: read,
-        [WS_METHODS.pullRequestsDetail]: read,
-        [WS_METHODS.pullRequestsUpdate]: (input: { title: string }) =>
-          Effect.sync(() => {
-            title = input.title;
-          }),
+      const client = actionReplyClient({
+        [WS_METHODS.pullRequestsDetail]: () => Effect.succeed(shown),
+        [WS_METHODS.pullRequestsPreview]: () => Effect.succeed(shown),
         [WS_METHODS.pullRequestsRunAction]: () =>
-          Effect.sync(() => {
-            title = "Closed";
-          }),
-        [WS_METHODS.pullRequestsInvalidate]: () => Effect.void,
-      } as unknown as WsRpcProtocolClient;
+          Effect.succeed({ ...actionReply, state: replyState }),
+      });
       const { atoms, registry } = yield* makeTestRuntime(client);
-      const target = { environmentId: TARGET.environmentId, input: reference };
-      const preview = atoms.preview(target);
-      const unmount = registry.mount(preview);
-      yield* Effect.addFinalizer(() => Effect.sync(unmount));
-      expect(
-        (yield* AtomRegistry.getResult(registry, preview, { suspendOnWaiting: true })).title,
-      ).toBe(title);
-      yield* Effect.promise(() => executeAtomQuery(registry, preview));
-      expect(reads).toBe(1);
-      const edited = yield* Effect.promise(() =>
-        atoms.update.run(registry, { ...target, input: { ...reference, title: "Edited" } }),
-      );
-      expect(AsyncResult.isSuccess(edited)).toBe(true);
-      expect(
-        (yield* AtomRegistry.getResult(registry, preview, { suspendOnWaiting: true })).title,
-      ).toBe("Edited");
-      yield* Effect.promise(() =>
-        atoms.runAction.run(registry, { ...target, input: { ...reference, action: "close" } }),
-      );
-      expect(
-        (yield* AtomRegistry.getResult(registry, preview, { suspendOnWaiting: true })).title,
-      ).toBe("Closed");
-      title = "Refreshed";
+      const target = { environmentId: TARGET.environmentId, input: actionReference };
+      const readers = [atoms.detail(target), atoms.preview(target), atoms.previewCard(target)];
+      for (const reader of readers) {
+        registry.mount(reader);
+        yield* AtomRegistry.getResult(registry, reader, { suspendOnWaiting: true });
+      }
+
       yield* Effect.promise(() =>
-        atoms.invalidate.run(registry, {
-          environmentId: target.environmentId,
-          input: { reference },
+        atoms.runAction.run(registry, {
+          ...target,
+          input: { ...actionReference, action: "ready" },
         }),
       );
-      expect(
-        (yield* AtomRegistry.getResult(registry, preview, { suspendOnWaiting: true })).title,
-      ).toBe("Refreshed");
-      const refreshed = Latch.makeUnsafe();
-      const stop = registry.subscribe(preview, (result) => {
-        if (AsyncResult.isSuccess(result) && result.value.title === "After turn")
-          refreshed.openUnsafe();
-      });
-      yield* Effect.addFinalizer(() => Effect.sync(stop));
-      title = "After turn";
-      yield* PubSub.publish(refreshEvents, 1);
-      yield* refreshed.await;
-    }),
-  ),
-);
-
-it.effect("shares one refresh stream between independently created pull request readers", () =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      const revision = yield* SubscriptionRef.make(0);
-      let subscriptions = 0;
-      let title = "Original title";
-      const client = {
-        [WS_METHODS.pullRequestsSubscribeRefreshes]: () =>
-          Stream.unwrap(
-            Effect.sync(() => {
-              subscriptions++;
-              return SubscriptionRef.changes(revision);
-            }),
-          ),
-        [WS_METHODS.pullRequestsSummary]: () => Effect.sync(() => ({ title, state: "open" })),
-        [WS_METHODS.pullRequestsDetail]: () => Effect.sync(() => ({ title, state: "open" })),
-      } as unknown as WsRpcProtocolClient;
-      const { runtime, atoms, registry } = yield* makeTestRuntime(client);
-      const target = {
-        environmentId: TARGET.environmentId,
-        input: { projectId: ProjectId.make("project-1"), repository: "acme/web", number: 1 },
-      };
-      const summary = createLinkedPullRequestSummaryAtomFamily(runtime)(target);
-      const detail = atoms.detail(target);
-      for (const atom of [summary, detail]) {
-        const unmount = registry.mount(atom);
-        yield* Effect.addFinalizer(() => Effect.sync(unmount));
-        expect((yield* AtomRegistry.getResult(registry, atom)).title).toBe(title);
-      }
-      yield* AtomRegistry.getResult(
-        registry,
-        atoms.refreshes({ environmentId: target.environmentId, input: {} }),
-      );
-      expect(subscriptions).toBe(1);
-
-      const changed = [summary, detail].map((atom) => {
-        const ready = Latch.makeUnsafe();
-        const stop = registry.subscribe(atom, (result) => {
-          if (AsyncResult.isSuccess(result) && result.value.title === "Updated title") {
-            ready.openUnsafe();
-          }
+      for (const reader of readers) {
+        expect(Option.getOrThrow(AsyncResult.value(registry.get(reader)))).toMatchObject({
+          state: shownState,
+          isDraft: true,
         });
-        return { ready, stop };
-      });
-      yield* Effect.addFinalizer(() => Effect.sync(() => changed.forEach(({ stop }) => stop())));
-      title = "Updated title";
-      yield* SubscriptionRef.update(revision, (value) => value + 1);
-      for (const { ready } of changed) yield* ready.await;
-      expect(subscriptions).toBe(1);
+      }
     }),
-  ),
 );
 
-it.effect("shares close, reopen, and merge with an untouched client's mounted PR readers", () =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      const revision = yield* SubscriptionRef.make(0);
-      let state: "open" | "closed" | "merged" = "open";
-      const client = {
-        [WS_METHODS.pullRequestsSubscribeRefreshes]: () => SubscriptionRef.changes(revision),
-        [WS_METHODS.pullRequestsSummary]: () => Effect.sync(() => ({ state })),
-        [WS_METHODS.pullRequestsDetail]: () => Effect.sync(() => ({ state })),
-        [WS_METHODS.pullRequestsList]: () =>
-          Effect.sync(() => ({ entries: [{ number: 1, state }] })),
-        [WS_METHODS.pullRequestsRunAction]: (input: {
-          readonly action: "close" | "reopen" | "merge";
-        }) =>
-          Effect.gen(function* () {
-            state =
-              input.action === "close" ? "closed" : input.action === "merge" ? "merged" : "open";
-            yield* SubscriptionRef.update(revision, (value) => value + 1);
-          }),
-      } as unknown as WsRpcProtocolClient;
-      const writer = yield* makeTestRuntime(client);
-      const reader = yield* makeTestRuntime(client);
-      const target = {
-        environmentId: TARGET.environmentId,
-        input: {
-          projectId: ProjectId.make("project-1"),
-          host: "github.example.com",
-          repository: "acme/web",
-          number: 1,
-        },
-      };
-      const detail = reader.atoms.detail(target);
-      const summary = createLinkedPullRequestSummaryAtomFamily(
-        reader.runtime,
-        reader.atoms.refreshes,
-      )(target);
-      const list = reader.atoms.list({
-        environmentId: TARGET.environmentId,
-        input: { state: "all" },
+it.effect("keeps hover previews fresh after edits and turns", () =>
+  Effect.gen(function* () {
+    const refreshEvents = yield* PubSub.unbounded<number>();
+    let title = "Original title";
+    let reads = 0;
+    const read = (input: unknown) =>
+      Effect.sync(() => {
+        expect(input).toEqual(reference);
+        reads++;
+        return { ...reference, title };
       });
-      const unmountDetail = reader.registry.mount(detail);
-      const unmountSummary = reader.registry.mount(summary);
-      const unmountList = reader.registry.mount(list);
-      yield* Effect.addFinalizer(() =>
+    const reference = {
+      projectId: ProjectId.make("project-1"),
+      repository: "acme/web",
+      number: 1,
+      host: "github.example.com",
+    };
+    const client = {
+      [WS_METHODS.pullRequestsSubscribeRefreshes]: () => Stream.fromPubSub(refreshEvents),
+      [WS_METHODS.pullRequestsPreview]: read,
+      [WS_METHODS.pullRequestsDetail]: read,
+      [WS_METHODS.pullRequestsUpdate]: (input: { title: string }) =>
         Effect.sync(() => {
-          unmountDetail();
-          unmountSummary();
-          unmountList();
+          title = input.title;
         }),
-      );
-      expect((yield* AtomRegistry.getResult(reader.registry, detail)).state).toBe("open");
-      expect((yield* AtomRegistry.getResult(reader.registry, summary)).state).toBe("open");
-      expect((yield* AtomRegistry.getResult(reader.registry, list)).entries[0]?.state).toBe("open");
-
-      for (const [action, expected] of [
-        ["close", "closed"],
-        ["reopen", "open"],
-        ["merge", "merged"],
-      ] as const) {
-        const detailChanged = Latch.makeUnsafe();
-        const summaryChanged = Latch.makeUnsafe();
-        const listChanged = Latch.makeUnsafe();
-        const stops = [
-          reader.registry.subscribe(detail, (result) => {
-            if (AsyncResult.isSuccess(result) && result.value.state === expected) {
-              detailChanged.openUnsafe();
-            }
-          }),
-          reader.registry.subscribe(summary, (result) => {
-            if (AsyncResult.isSuccess(result) && result.value.state === expected) {
-              summaryChanged.openUnsafe();
-            }
-          }),
-          reader.registry.subscribe(list, (result) => {
-            if (AsyncResult.isSuccess(result) && result.value.entries[0]?.state === expected) {
-              listChanged.openUnsafe();
-            }
-          }),
-        ];
-        yield* Effect.addFinalizer(() => Effect.sync(() => stops.forEach((stop) => stop())));
-        const result = yield* Effect.promise(() =>
-          writer.atoms.runAction.run(writer.registry, {
-            ...target,
-            input: { ...target.input, action },
+      [WS_METHODS.pullRequestsRunAction]: () =>
+        Effect.sync(() => {
+          title = "Closed";
+        }),
+      [WS_METHODS.pullRequestsInvalidate]: () => Effect.void,
+    } as unknown as WsRpcProtocolClient;
+    const { atoms, registry } = yield* makeTestRuntime(client);
+    const target = { environmentId: TARGET.environmentId, input: reference };
+    const preview = atoms.preview(target);
+    const unmount = registry.mount(preview);
+    yield* Effect.addFinalizer(() => Effect.sync(unmount));
+    expect(
+      (yield* AtomRegistry.getResult(registry, preview, { suspendOnWaiting: true })).title,
+    ).toBe(title);
+    yield* Effect.promise(() => executeAtomQuery(registry, preview));
+    expect(reads).toBe(1);
+    const edited = yield* Effect.promise(() =>
+      atoms.update.run(registry, { ...target, input: { ...reference, title: "Edited" } }),
+    );
+    expect(AsyncResult.isSuccess(edited)).toBe(true);
+    expect(
+      (yield* AtomRegistry.getResult(registry, preview, { suspendOnWaiting: true })).title,
+    ).toBe("Edited");
+    yield* Effect.promise(() =>
+      atoms.runAction.run(registry, { ...target, input: { ...reference, action: "close" } }),
+    );
+    expect(
+      (yield* AtomRegistry.getResult(registry, preview, { suspendOnWaiting: true })).title,
+    ).toBe("Closed");
+    title = "Refreshed";
+    yield* Effect.promise(() =>
+      atoms.invalidate.run(registry, {
+        environmentId: target.environmentId,
+        input: { reference },
+      }),
+    );
+    expect(
+      (yield* AtomRegistry.getResult(registry, preview, { suspendOnWaiting: true })).title,
+    ).toBe("Refreshed");
+    const refreshed = Latch.makeUnsafe();
+    const stop = registry.subscribe(preview, (result) => {
+      if (AsyncResult.isSuccess(result) && result.value.title === "After turn")
+        refreshed.openUnsafe();
+    });
+    yield* Effect.addFinalizer(() => Effect.sync(stop));
+    title = "After turn";
+    yield* PubSub.publish(refreshEvents, 1);
+    yield* refreshed.await;
+  }),
+);
+
+it.effect("shares one refresh stream between independently created pull request readers", () =>
+  Effect.gen(function* () {
+    const revision = yield* SubscriptionRef.make(0);
+    let subscriptions = 0;
+    let title = "Original title";
+    const client = {
+      [WS_METHODS.pullRequestsSubscribeRefreshes]: () =>
+        Stream.unwrap(
+          Effect.sync(() => {
+            subscriptions++;
+            return SubscriptionRef.changes(revision);
           }),
-        );
-        expect(AsyncResult.isSuccess(result)).toBe(true);
-        yield* detailChanged.await;
-        yield* summaryChanged.await;
-        yield* listChanged.await;
-        expect((yield* AtomRegistry.getResult(reader.registry, detail)).state).toBe(expected);
-        expect((yield* AtomRegistry.getResult(reader.registry, summary)).state).toBe(expected);
-        expect((yield* AtomRegistry.getResult(reader.registry, list)).entries[0]?.state).toBe(
-          expected,
-        );
-        stops.forEach((stop) => stop());
-      }
-    }),
-  ),
+        ),
+      [WS_METHODS.pullRequestsSummary]: () => Effect.sync(() => ({ title, state: "open" })),
+      [WS_METHODS.pullRequestsDetail]: () => Effect.sync(() => ({ title, state: "open" })),
+    } as unknown as WsRpcProtocolClient;
+    const { runtime, atoms, registry } = yield* makeTestRuntime(client);
+    const target = {
+      environmentId: TARGET.environmentId,
+      input: { projectId: ProjectId.make("project-1"), repository: "acme/web", number: 1 },
+    };
+    const summary = createLinkedPullRequestSummaryAtomFamily(runtime)(target);
+    const detail = atoms.detail(target);
+    for (const atom of [summary, detail]) {
+      const unmount = registry.mount(atom);
+      yield* Effect.addFinalizer(() => Effect.sync(unmount));
+      expect((yield* AtomRegistry.getResult(registry, atom)).title).toBe(title);
+    }
+    yield* AtomRegistry.getResult(
+      registry,
+      atoms.refreshes({ environmentId: target.environmentId, input: {} }),
+    );
+    expect(subscriptions).toBe(1);
+
+    const changed = [summary, detail].map((atom) => {
+      const ready = Latch.makeUnsafe();
+      const stop = registry.subscribe(atom, (result) => {
+        if (AsyncResult.isSuccess(result) && result.value.title === "Updated title") {
+          ready.openUnsafe();
+        }
+      });
+      return { ready, stop };
+    });
+    yield* Effect.addFinalizer(() => Effect.sync(() => changed.forEach(({ stop }) => stop())));
+    title = "Updated title";
+    yield* SubscriptionRef.update(revision, (value) => value + 1);
+    for (const { ready } of changed) yield* ready.await;
+    expect(subscriptions).toBe(1);
+  }),
 );
 
-it.effect("shares checks reads across reference property order", () =>
-  Effect.scoped(
+it.effect.each([
+  { linkedThreadRefreshes: undefined, polledReads: 1, signalledReads: 0 },
+  { linkedThreadRefreshes: true, polledReads: 0, signalledReads: 1 },
+])(
+  "polls linked threads only on servers without linked-thread refreshes ($linkedThreadRefreshes)",
+  ({ linkedThreadRefreshes, polledReads, signalledReads }) =>
     Effect.gen(function* () {
       let reads = 0;
+      const linkedThreadSignal = yield* SubscriptionRef.make(0);
       const client = {
         [WS_METHODS.pullRequestsSubscribeRefreshes]: () => Stream.never,
-        [WS_METHODS.pullRequestsChecks]: () =>
+        [WS_METHODS.pullRequestsSubscribeLinkedThreadRefreshes]: () =>
+          SubscriptionRef.changes(linkedThreadSignal).pipe(Stream.filter((value) => value > 0)),
+        [WS_METHODS.pullRequestsLinkedThreads]: () =>
           Effect.sync(() => {
-            reads += 1;
-            return { state: "open", checks: [], observedAt: 1_000 };
+            reads++;
+            return { threads: [] };
           }),
       } as unknown as WsRpcProtocolClient;
+      vi.useFakeTimers();
+      yield* Effect.addFinalizer(() => Effect.sync(() => vi.useRealTimers()));
       const { atoms, registry } = yield* makeTestRuntime(client);
-      const projectId = ProjectId.make("project-1");
-      const row = atoms.checks({
-        environmentId: TARGET.environmentId,
-        input: { host: "github.com", repository: "acme/web", number: 1, projectId },
+      registry.set(initialConfigs(TARGET.environmentId), {
+        environment: { capabilities: { linkedThreadRefreshes } },
       });
-      const panel = atoms.checks({
+      const linked = atoms.linkedThreads({
         environmentId: TARGET.environmentId,
-        input: { projectId, host: "github.com", repository: "acme/web", number: 1 },
+        input: { projectId: ProjectId.make("project-1"), repository: "acme/web", number: 1 },
       });
-      yield* AtomRegistry.getResult(registry, row);
-      yield* AtomRegistry.getResult(registry, panel);
+      const unmount = registry.mount(linked);
+      yield* Effect.addFinalizer(() => Effect.sync(unmount));
+      yield* AtomRegistry.getResult(registry, linked);
       expect(reads).toBe(1);
+
+      yield* Effect.promise(() => vi.advanceTimersByTimeAsync(10_000));
+      expect(reads).toBe(1 + polledReads);
+
+      yield* SubscriptionRef.set(linkedThreadSignal, 1);
+      yield* Effect.promise(() => vi.advanceTimersByTimeAsync(0));
+      expect(reads).toBe(1 + polledReads + signalledReads);
     }),
-  ),
 );
 
-it.effect("keeps live detail reads separate from reads that allow stale data", () =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      let reads = 0;
-      let hostStamp: number | undefined;
-      let hold = false;
-      const readStarted = yield* Latch.make();
-      const releaseRead = yield* Latch.make();
-      const client = {
-        [WS_METHODS.pullRequestsSubscribeRefreshes]: () => Stream.never,
-        [WS_METHODS.pullRequestsDetail]: (input: { allowStale?: boolean }) =>
-          Effect.gen(function* () {
-            reads++;
-            if (hold) {
-              yield* readStarted.open;
-              yield* releaseRead.await;
-            }
-            return {
-              title: input.allowStale === false ? "latest checks" : "cached checks",
-              ...(hostStamp === undefined ? {} : { observedAt: hostStamp }),
-            };
-          }),
-      } as unknown as WsRpcProtocolClient;
-      const { atoms, registry, supervisor } = yield* makeTestRuntime(client);
-      const target = {
-        environmentId: TARGET.environmentId,
-        input: { projectId: ProjectId.make("project-1"), repository: "acme/web", number: 1 },
-      };
-      const cached = atoms.detail(target);
-      const live = atoms.detail({ ...target, input: { ...target.input, allowStale: false } });
-      const first = yield* AtomRegistry.getResult(registry, cached);
-      expect(first.title).toBe("cached checks");
-      expect(first.observedAt).toBeUndefined();
-      const reading = atoms.detailReadVersion(target);
-      const firstVersion = registry.get(reading);
-      expect(firstVersion).toBeGreaterThan(0);
-      expect((yield* AtomRegistry.getResult(registry, live)).title).toBe("latest checks");
-      expect(reads).toBe(2);
-      hold = true;
-      registry.refresh(cached);
-      yield* readStarted.await;
-      expect(registry.get(reading)).toBe(firstVersion);
-      yield* releaseRead.open;
-      expect(yield* AtomRegistry.getResult(registry, cached, { suspendOnWaiting: true })).toBe(
-        first,
+it.effect("shares close, reopen, and merge with an untouched client's mounted PR readers", () =>
+  Effect.gen(function* () {
+    const revision = yield* SubscriptionRef.make(0);
+    let state: "open" | "closed" | "merged" = "open";
+    const client = {
+      [WS_METHODS.pullRequestsSubscribeRefreshes]: () => SubscriptionRef.changes(revision),
+      [WS_METHODS.pullRequestsSummary]: () => Effect.sync(() => ({ state })),
+      [WS_METHODS.pullRequestsDetail]: () => Effect.sync(() => ({ state })),
+      [WS_METHODS.pullRequestsList]: () => Effect.sync(() => ({ entries: [{ number: 1, state }] })),
+      [WS_METHODS.pullRequestsRunAction]: (input: {
+        readonly action: "close" | "reopen" | "merge";
+      }) =>
+        Effect.gen(function* () {
+          state =
+            input.action === "close" ? "closed" : input.action === "merge" ? "merged" : "open";
+          yield* SubscriptionRef.update(revision, (value) => value + 1);
+        }),
+    } as unknown as WsRpcProtocolClient;
+    const writer = yield* makeTestRuntime(client);
+    const reader = yield* makeTestRuntime(client);
+    const target = {
+      environmentId: TARGET.environmentId,
+      input: {
+        projectId: ProjectId.make("project-1"),
+        host: "github.example.com",
+        repository: "acme/web",
+        number: 1,
+      },
+    };
+    const detail = reader.atoms.detail(target);
+    const summary = createLinkedPullRequestSummaryAtomFamily(
+      reader.runtime,
+      reader.atoms.refreshes,
+    )(target);
+    const list = reader.atoms.list({
+      environmentId: TARGET.environmentId,
+      input: { state: "all" },
+    });
+    const unmountDetail = reader.registry.mount(detail);
+    const unmountSummary = reader.registry.mount(summary);
+    const unmountList = reader.registry.mount(list);
+    yield* Effect.addFinalizer(() =>
+      Effect.sync(() => {
+        unmountDetail();
+        unmountSummary();
+        unmountList();
+      }),
+    );
+    expect((yield* AtomRegistry.getResult(reader.registry, detail)).state).toBe("open");
+    expect((yield* AtomRegistry.getResult(reader.registry, summary)).state).toBe("open");
+    expect((yield* AtomRegistry.getResult(reader.registry, list)).entries[0]?.state).toBe("open");
+
+    for (const [action, expected] of [
+      ["close", "closed"],
+      ["reopen", "open"],
+      ["merge", "merged"],
+    ] as const) {
+      const detailChanged = Latch.makeUnsafe();
+      const summaryChanged = Latch.makeUnsafe();
+      const listChanged = Latch.makeUnsafe();
+      const stops = [
+        reader.registry.subscribe(detail, (result) => {
+          if (AsyncResult.isSuccess(result) && result.value.state === expected) {
+            detailChanged.openUnsafe();
+          }
+        }),
+        reader.registry.subscribe(summary, (result) => {
+          if (AsyncResult.isSuccess(result) && result.value.state === expected) {
+            summaryChanged.openUnsafe();
+          }
+        }),
+        reader.registry.subscribe(list, (result) => {
+          if (AsyncResult.isSuccess(result) && result.value.entries[0]?.state === expected) {
+            listChanged.openUnsafe();
+          }
+        }),
+      ];
+      yield* Effect.addFinalizer(() => Effect.sync(() => stops.forEach((stop) => stop())));
+      const result = yield* Effect.promise(() =>
+        writer.atoms.runAction.run(writer.registry, {
+          ...target,
+          input: { ...target.input, action },
+        }),
       );
-      const settledVersion = registry.get(reading);
-      expect(settledVersion).toBeGreaterThan(firstVersion);
-      hold = false;
-
-      yield* SubscriptionRef.update(supervisor.state, (state) => ({
-        ...state,
-        phase: "offline" as const,
-      }));
-      yield* Effect.yieldNow;
-      registry.refresh(cached);
-      const offline = yield* AtomRegistry.getResult(registry, cached, { suspendOnWaiting: true });
-      expect(offline.observedAt).toBeUndefined();
-      expect(registry.get(reading)).toBe(settledVersion);
-      expect(reads).toBe(3);
-
-      yield* SubscriptionRef.update(supervisor.state, (state) => ({
-        ...state,
-        phase: "connected" as const,
-      }));
-      yield* Effect.yieldNow;
-      registry.refresh(cached);
-      const reread = yield* AtomRegistry.getResult(registry, cached, { suspendOnWaiting: true });
-      expect(reread).toBe(first);
-      expect(reread.observedAt).toBeUndefined();
-      expect(registry.get(reading)).toBeGreaterThan(settledVersion);
-
-      hostStamp = 27;
-      registry.refresh(cached);
-      expect(
-        (yield* AtomRegistry.getResult(registry, cached, { suspendOnWaiting: true })).observedAt,
-      ).toBe(hostStamp);
-    }),
-  ),
+      expect(AsyncResult.isSuccess(result)).toBe(true);
+      yield* detailChanged.await;
+      yield* summaryChanged.await;
+      yield* listChanged.await;
+      expect((yield* AtomRegistry.getResult(reader.registry, detail)).state).toBe(expected);
+      expect((yield* AtomRegistry.getResult(reader.registry, summary)).state).toBe(expected);
+      expect((yield* AtomRegistry.getResult(reader.registry, list)).entries[0]?.state).toBe(
+        expected,
+      );
+      stops.forEach((stop) => stop());
+    }
+  }),
+);
+
+it.effect("shares checks reads across reference property order", () =>
+  Effect.gen(function* () {
+    let reads = 0;
+    const client = {
+      [WS_METHODS.pullRequestsSubscribeRefreshes]: () => Stream.never,
+      [WS_METHODS.pullRequestsChecks]: () =>
+        Effect.sync(() => {
+          reads += 1;
+          return { state: "open", checks: [], observedAt: 1_000 };
+        }),
+    } as unknown as WsRpcProtocolClient;
+    const { atoms, registry } = yield* makeTestRuntime(client);
+    const projectId = ProjectId.make("project-1");
+    const row = atoms.checks({
+      environmentId: TARGET.environmentId,
+      input: { host: "github.com", repository: "acme/web", number: 1, projectId },
+    });
+    const panel = atoms.checks({
+      environmentId: TARGET.environmentId,
+      input: { projectId, host: "github.com", repository: "acme/web", number: 1 },
+    });
+    yield* AtomRegistry.getResult(registry, row);
+    yield* AtomRegistry.getResult(registry, panel);
+    expect(reads).toBe(1);
+  }),
+);
+
+it.effect("keeps live detail reads separate from reads that allow stale data", () =>
+  Effect.gen(function* () {
+    let reads = 0;
+    let hostStamp: number | undefined;
+    let hold = false;
+    const readStarted = yield* Latch.make();
+    const releaseRead = yield* Latch.make();
+    const client = {
+      [WS_METHODS.pullRequestsSubscribeRefreshes]: () => Stream.never,
+      [WS_METHODS.pullRequestsDetail]: (input: { allowStale?: boolean }) =>
+        Effect.gen(function* () {
+          reads++;
+          if (hold) {
+            yield* readStarted.open;
+            yield* releaseRead.await;
+          }
+          return {
+            title: input.allowStale === false ? "latest checks" : "cached checks",
+            ...(hostStamp === undefined ? {} : { observedAt: hostStamp }),
+          };
+        }),
+    } as unknown as WsRpcProtocolClient;
+    const { atoms, registry, supervisor } = yield* makeTestRuntime(client);
+    const target = {
+      environmentId: TARGET.environmentId,
+      input: { projectId: ProjectId.make("project-1"), repository: "acme/web", number: 1 },
+    };
+    const cached = atoms.detail(target);
+    const live = atoms.detail({ ...target, input: { ...target.input, allowStale: false } });
+    const first = yield* AtomRegistry.getResult(registry, cached);
+    expect(first.title).toBe("cached checks");
+    expect(first.observedAt).toBeUndefined();
+    const reading = atoms.detailReadVersion(target);
+    const firstVersion = registry.get(reading);
+    expect(firstVersion).toBeGreaterThan(0);
+    expect((yield* AtomRegistry.getResult(registry, live)).title).toBe("latest checks");
+    expect(reads).toBe(2);
+    hold = true;
+    registry.refresh(cached);
+    yield* readStarted.await;
+    expect(registry.get(reading)).toBe(firstVersion);
+    yield* releaseRead.open;
+    expect(yield* AtomRegistry.getResult(registry, cached, { suspendOnWaiting: true })).toBe(first);
+    const settledVersion = registry.get(reading);
+    expect(settledVersion).toBeGreaterThan(firstVersion);
+    hold = false;
+
+    yield* SubscriptionRef.update(supervisor.state, (state) => ({
+      ...state,
+      phase: "offline" as const,
+    }));
+    yield* Effect.yieldNow;
+    registry.refresh(cached);
+    const offline = yield* AtomRegistry.getResult(registry, cached, { suspendOnWaiting: true });
+    expect(offline.observedAt).toBeUndefined();
+    expect(registry.get(reading)).toBe(settledVersion);
+    expect(reads).toBe(3);
+
+    yield* SubscriptionRef.update(supervisor.state, (state) => ({
+      ...state,
+      phase: "connected" as const,
+    }));
+    yield* Effect.yieldNow;
+    registry.refresh(cached);
+    const reread = yield* AtomRegistry.getResult(registry, cached, { suspendOnWaiting: true });
+    expect(reread).toBe(first);
+    expect(reread.observedAt).toBeUndefined();
+    expect(registry.get(reading)).toBeGreaterThan(settledVersion);
+
+    hostStamp = 27;
+    registry.refresh(cached);
+    expect(
+      (yield* AtomRegistry.getResult(registry, cached, { suspendOnWaiting: true })).observedAt,
+    ).toBe(hostStamp);
+  }),
 );
 
 it.effect("updates cached labels after successful edits without rereading the host", () =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      let detailReads = 0;
-      let candidateReads = 0;
-      let refuse = false;
-      let failDetail = false;
-      const existing = { name: "existing", color: "111111" };
-      const addedLabel = { name: "new", color: "abcdef" };
-      const detailRefreshStarted = yield* Latch.make();
-      const releaseDetailRefresh = yield* Latch.make();
-      const client = {
-        [WS_METHODS.pullRequestsSubscribeRefreshes]: () => Stream.never,
-        [WS_METHODS.pullRequestsDetail]: () =>
-          Effect.gen(function* () {
-            detailReads++;
-            if (failDetail) {
-              yield* detailRefreshStarted.open;
-              yield* releaseDetailRefresh.await;
-              return yield* new MutationRefused();
-            }
-            return { title: "keep this title", labels: [existing] };
-          }),
-        [WS_METHODS.pullRequestsLabelCandidates]: () =>
-          Effect.sync(() => {
-            candidateReads++;
-            return {
-              candidates: [
-                { ...existing, description: null, isApplied: true },
-                { ...addedLabel, description: "description", isApplied: false },
-              ],
-              truncated: false,
-            };
-          }),
-        [WS_METHODS.pullRequestsSetLabels]: () =>
-          refuse ? Effect.fail(new MutationRefused()) : Effect.void,
-      } as unknown as WsRpcProtocolClient;
-      const { atoms, registry } = yield* makeTestRuntime(client);
-      const target = {
-        environmentId: TARGET.environmentId,
+  Effect.gen(function* () {
+    let detailReads = 0;
+    let candidateReads = 0;
+    let refuse = false;
+    let failDetail = false;
+    const existing = { name: "existing", color: "111111" };
+    const addedLabel = { name: "new", color: "abcdef" };
+    const detailRefreshStarted = yield* Latch.make();
+    const releaseDetailRefresh = yield* Latch.make();
+    const client = {
+      [WS_METHODS.pullRequestsSubscribeRefreshes]: () => Stream.never,
+      [WS_METHODS.pullRequestsDetail]: () =>
+        Effect.gen(function* () {
+          detailReads++;
+          if (failDetail) {
+            yield* detailRefreshStarted.open;
+            yield* releaseDetailRefresh.await;
+            return yield* new MutationRefused();
+          }
+          return { title: "keep this title", labels: [existing] };
+        }),
+      [WS_METHODS.pullRequestsLabelCandidates]: () =>
+        Effect.sync(() => {
+          candidateReads++;
+          return {
+            candidates: [
+              { ...existing, description: null, isApplied: true },
+              { ...addedLabel, description: "description", isApplied: false },
+            ],
+            truncated: false,
+          };
+        }),
+      [WS_METHODS.pullRequestsSetLabels]: () =>
+        refuse ? Effect.fail(new MutationRefused()) : Effect.void,
+    } as unknown as WsRpcProtocolClient;
+    const { atoms, registry } = yield* makeTestRuntime(client);
+    const target = {
+      environmentId: TARGET.environmentId,
+      input: {
+        projectId: ProjectId.make("project-1"),
+        repository: "acme/web",
+        number: 1,
+        host: "github.example.com",
+      },
+    };
+    const detail = atoms.detail({ ...target, input: { ...target.input, allowStale: false } });
+    const candidates = atoms.labelCandidates(target);
+    registry.mount(detail);
+    const unmountCandidates = registry.mount(candidates);
+    yield* AtomRegistry.getResult(registry, detail, { suspendOnWaiting: true });
+    yield* AtomRegistry.getResult(registry, candidates, { suspendOnWaiting: true });
+
+    const added = yield* Effect.promise(() =>
+      atoms.setLabels.run(registry, {
+        ...target,
         input: {
-          projectId: ProjectId.make("project-1"),
-          repository: "acme/web",
-          number: 1,
-          host: "github.example.com",
+          host: target.input.host,
+          projectId: target.input.projectId,
+          repository: target.input.repository,
+          number: target.input.number,
+          labels: ["new"],
+          applied: true,
         },
-      };
-      const detail = atoms.detail({ ...target, input: { ...target.input, allowStale: false } });
-      const candidates = atoms.labelCandidates(target);
-      registry.mount(detail);
-      const unmountCandidates = registry.mount(candidates);
-      yield* AtomRegistry.getResult(registry, detail, { suspendOnWaiting: true });
-      yield* AtomRegistry.getResult(registry, candidates, { suspendOnWaiting: true });
-
-      const added = yield* Effect.promise(() =>
+      }),
+    );
+    expect(AsyncResult.isSuccess(added)).toBe(true);
+    expect(yield* AtomRegistry.getResult(registry, detail)).toEqual({
+      title: "keep this title",
+      labels: [existing, addedLabel],
+    });
+    unmountCandidates();
+    registry.mount(atoms.labelCandidates(target));
+    expect((yield* AtomRegistry.getResult(registry, candidates)).candidates[1]).toEqual({
+      ...addedLabel,
+      description: "description",
+      isApplied: true,
+    });
+
+    for (const name of ["existing", "new"]) {
+      refuse = name === "new";
+      const result = yield* Effect.promise(() =>
         atoms.setLabels.run(registry, {
           ...target,
-          input: {
-            host: target.input.host,
-            projectId: target.input.projectId,
-            repository: target.input.repository,
-            number: target.input.number,
-            labels: ["new"],
-            applied: true,
-          },
+          input: { ...target.input, labels: [name], applied: false },
         }),
       );
-      expect(AsyncResult.isSuccess(added)).toBe(true);
-      expect(yield* AtomRegistry.getResult(registry, detail)).toEqual({
-        title: "keep this title",
-        labels: [existing, addedLabel],
-      });
-      unmountCandidates();
-      registry.mount(atoms.labelCandidates(target));
-      expect((yield* AtomRegistry.getResult(registry, candidates)).candidates[1]).toEqual({
-        ...addedLabel,
-        description: "description",
-        isApplied: true,
-      });
-
-      for (const name of ["existing", "new"]) {
-        refuse = name === "new";
-        const result = yield* Effect.promise(() =>
-          atoms.setLabels.run(registry, {
-            ...target,
-            input: { ...target.input, labels: [name], applied: false },
-          }),
-        );
-        expect(result._tag).toBe(refuse ? "Failure" : "Success");
-        expect((yield* AtomRegistry.getResult(registry, detail)).labels).toEqual([addedLabel]);
-        expect((yield* AtomRegistry.getResult(registry, candidates)).candidates).toMatchObject([
-          { name: "existing", isApplied: false },
-          { name: "new", isApplied: true },
-        ]);
-      }
-      expect(detailReads).toBe(1);
-      expect(candidateReads).toBe(1);
-
-      failDetail = true;
-      registry.refresh(detail);
-      yield* detailRefreshStarted.await;
-      expect(registry.get(detail).waiting).toBe(true);
-      expect(AsyncResult.getOrThrow(registry.get(detail)).labels).toEqual([addedLabel]);
-      yield* releaseDetailRefresh.open;
-      yield* Effect.exit(AtomRegistry.getResult(registry, detail, { suspendOnWaiting: true }));
-      expect(AsyncResult.isFailure(registry.get(detail))).toBe(true);
-      expect(AsyncResult.getOrThrow(registry.get(detail)).labels).toEqual([addedLabel]);
-      failDetail = false;
-      registry.refresh(detail);
-      expect(
-        (yield* AtomRegistry.getResult(registry, detail, { suspendOnWaiting: true })).labels,
-      ).toEqual([existing]);
-      expect(detailReads).toBe(3);
-    }),
-  ),
+      expect(result._tag).toBe(refuse ? "Failure" : "Success");
+      expect((yield* AtomRegistry.getResult(registry, detail)).labels).toEqual([addedLabel]);
+      expect((yield* AtomRegistry.getResult(registry, candidates)).candidates).toMatchObject([
+        { name: "existing", isApplied: false },
+        { name: "new", isApplied: true },
+      ]);
+    }
+    expect(detailReads).toBe(1);
+    expect(candidateReads).toBe(1);
+
+    failDetail = true;
+    registry.refresh(detail);
+    yield* detailRefreshStarted.await;
+    expect(registry.get(detail).waiting).toBe(true);
+    expect(AsyncResult.getOrThrow(registry.get(detail)).labels).toEqual([addedLabel]);
+    yield* releaseDetailRefresh.open;
+    yield* Effect.exit(AtomRegistry.getResult(registry, detail, { suspendOnWaiting: true }));
+    expect(AsyncResult.isFailure(registry.get(detail))).toBe(true);
+    expect(AsyncResult.getOrThrow(registry.get(detail)).labels).toEqual([addedLabel]);
+    failDetail = false;
+    registry.refresh(detail);
+    expect(
+      (yield* AtomRegistry.getResult(registry, detail, { suspendOnWaiting: true })).labels,
+    ).toEqual([existing]);
+    expect(detailReads).toBe(3);
+  }),
 );
 
 vi.mock("./session.ts", () => ({
-  createEnvironmentSessionAtoms: () => ({ sessionStateAtom: grantedSessions }),
+  createEnvironmentSessionAtoms: () => ({
+    sessionStateAtom: grantedSessions,
+    initialConfigValueAtom: initialConfigs,
+  }),
 }));
+const initialConfigs = Atom.family((_id: EnvironmentId) => Atom.make<unknown>(null));
 const grantedSessions = Atom.family((_id: EnvironmentId) =>
   Atom.make<AsyncResult.AsyncResult<AuthSessionState>>(
     AsyncResult.success({
@@ -2189,101 +2172,93 @@ const grantedSessions = Atom.family((_id: EnvironmentId) =>
 );
 
 it.effect("denies a routed write when only the origin has source-control permission", () =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      let writes = 0;
-      const identity = { host: "github.com", provider: "github", viewer: "test", accountId: "123" };
-      const client = {
-        [WS_METHODS.pullRequestsRouting]: () => Effect.succeed(identity),
-        [WS_METHODS.pullRequestsRoutingIdentity]: () => Effect.succeed(identity),
-        [WS_METHODS.pullRequestsRunAction]: () =>
-          Effect.sync(() => {
-            writes++;
-          }),
-      } as unknown as WsRpcProtocolClient;
-      const fixture = yield* makeTestRuntime(client, client);
-      const local = EnvironmentId.make("local-environment");
-      const stop = fixture.registry.mount(grantedSessions(local));
-      yield* Effect.addFinalizer(() => Effect.sync(stop));
-      fixture.registry.set(
-        grantedSessions(local),
-        AsyncResult.success({
-          authenticated: true,
-          scopes: [],
-          auth: {
-            policy: "remote-reachable" as const,
-            bootstrapMethods: [],
-            sessionMethods: [],
-            sessionCookieName: "test",
-          },
-        }),
-      );
-      const error = yield* createPullRequestRouter()(WS_METHODS.pullRequestsRunAction, {
-        projectId: ProjectId.make("project"),
-        repository: "acme/repo",
-        number: 1,
-        action: "merge",
-      }).pipe(
-        Effect.provideService(EnvironmentRegistry.EnvironmentRegistry, fixture.environmentRegistry),
-        Effect.provideService(EnvironmentSupervisor.EnvironmentSupervisor, fixture.supervisor),
-        Effect.provideService(PullRequestRoutingPermissions, trustedRouting),
-        Effect.provideService(RpcPermissionGuard, {
-          authorize: (id, method, input) =>
-            createCommandPermissions(fixture.runtime, method).authorize(
-              fixture.registry,
-              id,
-              input,
-            ),
+  Effect.gen(function* () {
+    let writes = 0;
+    const identity = { host: "github.com", provider: "github", viewer: "test", accountId: "123" };
+    const client = {
+      [WS_METHODS.pullRequestsRouting]: () => Effect.succeed(identity),
+      [WS_METHODS.pullRequestsRoutingIdentity]: () => Effect.succeed(identity),
+      [WS_METHODS.pullRequestsRunAction]: () =>
+        Effect.sync(() => {
+          writes++;
         }),
-        Effect.flip,
-      );
-      expect(error._tag).toBe("EnvironmentAuthorizationError");
-      expect(writes).toBe(0);
-    }),
-  ),
+    } as unknown as WsRpcProtocolClient;
+    const fixture = yield* makeTestRuntime(client, client);
+    const local = EnvironmentId.make("local-environment");
+    const stop = fixture.registry.mount(grantedSessions(local));
+    yield* Effect.addFinalizer(() => Effect.sync(stop));
+    fixture.registry.set(
+      grantedSessions(local),
+      AsyncResult.success({
+        authenticated: true,
+        scopes: [],
+        auth: {
+          policy: "remote-reachable" as const,
+          bootstrapMethods: [],
+          sessionMethods: [],
+          sessionCookieName: "test",
+        },
+      }),
+    );
+    const error = yield* createPullRequestRouter()(WS_METHODS.pullRequestsRunAction, {
+      projectId: ProjectId.make("project"),
+      repository: "acme/repo",
+      number: 1,
+      action: "merge",
+    }).pipe(
+      Effect.provideService(EnvironmentRegistry.EnvironmentRegistry, fixture.environmentRegistry),
+      Effect.provideService(EnvironmentSupervisor.EnvironmentSupervisor, fixture.supervisor),
+      Effect.provideService(PullRequestRoutingPermissions, trustedRouting),
+      Effect.provideService(RpcPermissionGuard, {
+        authorize: (id, method, input) =>
+          createCommandPermissions(fixture.runtime, method).authorize(fixture.registry, id, input),
+      }),
+      Effect.flip,
+    );
+    expect(error._tag).toBe("EnvironmentAuthorizationError");
+    expect(writes).toBe(0);
+  }),
 );
 
 it.effect("publishes the accepted guide run before the follow-up read finishes", () =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      const accepted = {
-        guide: null,
-        currentHeadSha: "head",
-        run: { _tag: "Running" as const, headSha: "head", startedAt: "2026-10-11T00:00:00.000Z" },
-      };
-      let reads = 0;
-      const refreshStarted = yield* Latch.make();
-      const client = {
-        [WS_METHODS.pullRequestsSubscribeRefreshes]: () => Stream.never,
-        [WS_METHODS.pullRequestsReviewGuide]: () =>
-          Effect.gen(function* () {
-            if (++reads > 1) {
-              yield* refreshStarted.open;
-              return yield* Effect.never;
-            }
-            return { guide: null, run: null, currentHeadSha: "head" };
-          }),
-        [WS_METHODS.pullRequestsGenerateReviewGuide]: () => Effect.succeed(accepted),
-      } as unknown as WsRpcProtocolClient;
-      const { atoms, registry } = yield* makeTestRuntime(client);
-      const target = {
-        environmentId: TARGET.environmentId,
-        input: { projectId: ProjectId.make("project-1"), repository: "acme/web", number: 1 },
-      };
-      registry.update(
-        grantedSessions(target.environmentId),
-        AsyncResult.map((session) => ({
-          ...session,
-          scopes: [...(session.scopes ?? []), AuthOrchestrationOperateScope],
-        })),
-      );
-      const query = atoms.reviewGuide(target);
-      registry.mount(query);
-      yield* AtomRegistry.getResult(registry, query, { suspendOnWaiting: true });
-      const result = yield* Effect.promise(() => atoms.generateReviewGuide.run(registry, target));
-      expect(result._tag).toBe("Success");
-      yield* refreshStarted.await;
-      expect(AsyncResult.getOrElse(registry.get(query), () => null)).toEqual(accepted);
-    }),
-  ),
+  Effect.gen(function* () {
+    const accepted = {
+      guide: null,
+      currentHeadSha: "head",
+      run: { _tag: "Running" as const, headSha: "head", startedAt: "2026-10-11T00:00:00.000Z" },
+    };
+    let reads = 0;
+    const refreshStarted = yield* Latch.make();
+    const client = {
+      [WS_METHODS.pullRequestsSubscribeRefreshes]: () => Stream.never,
+      [WS_METHODS.pullRequestsReviewGuide]: () =>
+        Effect.gen(function* () {
+          if (++reads > 1) {
+            yield* refreshStarted.open;
+            return yield* Effect.never;
+          }
+          return { guide: null, run: null, currentHeadSha: "head" };
+        }),
+      [WS_METHODS.pullRequestsGenerateReviewGuide]: () => Effect.succeed(accepted),
+    } as unknown as WsRpcProtocolClient;
+    const { atoms, registry } = yield* makeTestRuntime(client);
+    const target = {
+      environmentId: TARGET.environmentId,
+      input: { projectId: ProjectId.make("project-1"), repository: "acme/web", number: 1 },
+    };
+    registry.update(
+      grantedSessions(target.environmentId),
+      AsyncResult.map((session) => ({
+        ...session,
+        scopes: [...(session.scopes ?? []), AuthOrchestrationOperateScope],
+      })),
+    );
+    const query = atoms.reviewGuide(target);
+    registry.mount(query);
+    yield* AtomRegistry.getResult(registry, query, { suspendOnWaiting: true });
+    const result = yield* Effect.promise(() => atoms.generateReviewGuide.run(registry, target));
+    expect(result._tag).toBe("Success");
+    yield* refreshStarted.await;
+    expect(AsyncResult.getOrElse(registry.get(query), () => null)).toEqual(accepted);
+  }),
 );
diff --git a/packages/client-runtime/src/state/pullRequests.ts b/packages/client-runtime/src/state/pullRequests.ts
index e0ded133128a..9605acf7a19f 100644
--- a/packages/client-runtime/src/state/pullRequests.ts
+++ b/packages/client-runtime/src/state/pullRequests.ts
@@ -49,6 +49,7 @@ import * as EnvironmentSupervisor from "../connection/supervisor.ts";
 import { isStalePullRequestReply } from "../pullRequestReply.ts";
 import { parsePullRequestQuery } from "../pullRequestQuery.ts";
 import { reuseUnchanged } from "./serverConfigProjection.ts";
+import { createEnvironmentSessionAtoms } from "./session.ts";
 
 export {
   type PullRequestDiffLoadError,
@@ -433,6 +434,25 @@ export function createPullRequestEnvironmentAtoms<R, E>(
   onAnswer: PullRequestAnswerHandlers = {},
 ) {
   const refreshes = createPullRequestRefreshAtomFamily(runtime);
+  const sessions = createEnvironmentSessionAtoms(runtime);
+  const linkedThreadSignals = createEnvironmentRpcSubscriptionAtomFamily(runtime, {
+    label: "environment-data:pull-requests:linked-thread-refreshes",
+    tag: WS_METHODS.pullRequestsSubscribeLinkedThreadRefreshes,
+  });
+  // Servers without `linkedThreadRefreshes` never signal link changes, so poll them instead.
+  const linkedThreadsRefreshes = Atom.family((environmentId: EnvironmentId) =>
+    Atom.make((get): unknown => {
+      const signal = get(refreshes({ environmentId, input: {} }));
+      const config = get(sessions.initialConfigValueAtom(environmentId));
+      if (config?.environment.capabilities.linkedThreadRefreshes === true) {
+        return [signal, get(linkedThreadSignals({ environmentId, input: {} }))];
+      }
+      // @effect-diagnostics-next-line globalTimers:off - Mirrors `Atom.withRefresh`, outside an Effect runtime.
+      const handle = setTimeout(() => get.refreshSelf(), 10_000);
+      get.addFinalizer(() => clearTimeout(handle));
+      return {};
+    }),
+  );
   const commandScheduler = createAtomCommandScheduler();
   const routedRequest = createPullRequestRouter();
   const serialPerEnvironment = {
@@ -709,8 +729,7 @@ export function createPullRequestEnvironmentAtoms<R, E>(
       persistence: persistQuery(PullRequestLinkedThreadsResult),
       tag: WS_METHODS.pullRequestsLinkedThreads,
       staleTimeMs: 0,
-      refreshIntervalMs: 10_000,
-      refreshTrigger: ({ environmentId }) => refreshes({ environmentId, input: {} }),
+      refreshTrigger: ({ environmentId }) => linkedThreadsRefreshes(environmentId),
     }),
     // For callers that open a thread from the answer: a persisted one reads as final before
     // the connection is known, and a kept one can predate the thread.
diff --git a/packages/client-runtime/src/state/runtime.test.ts b/packages/client-runtime/src/state/runtime.test.ts
index 456d13109ed6..63f00b28fb17 100644
--- a/packages/client-runtime/src/state/runtime.test.ts
+++ b/packages/client-runtime/src/state/runtime.test.ts
@@ -1,5 +1,9 @@
 import { describe, expect, it } from "@effect/vitest";
+import * as NodeV8 from "node:v8";
+import * as NodeVM from "node:vm";
+import { vi } from "vite-plus/test";
 import {
+  DEFAULT_MAX_TERMINAL_BUFFER_BYTES,
   EnvironmentId,
   type FilesystemBrowseEntry,
   ORCHESTRATION_V2_WS_METHODS,
@@ -14,6 +18,7 @@ import {
   WS_METHODS,
 } from "@t3tools/contracts";
 import * as Cause from "effect/Cause";
+import * as Clock from "effect/Clock";
 import * as DateTime from "effect/DateTime";
 import * as Deferred from "effect/Deferred";
 import * as Effect from "effect/Effect";
@@ -25,6 +30,7 @@ import * as Queue from "effect/Queue";
 import * as Schema from "effect/Schema";
 import * as Stream from "effect/Stream";
 import * as SubscriptionRef from "effect/SubscriptionRef";
+import * as TestClock from "effect/testing/TestClock";
 import type { HttpClient } from "effect/http";
 import { AsyncResult, Atom, AtomRegistry } from "effect/reactivity";
 
@@ -39,6 +45,7 @@ import {
 import * as EnvironmentRegistry from "../connection/registry.ts";
 import * as EnvironmentSupervisor from "../connection/supervisor.ts";
 import { EnvironmentRpcUnavailableError } from "../rpc/client.ts";
+import type { WsRpcProtocolClient } from "../rpc/protocol.ts";
 import type * as RpcSession from "../rpc/session.ts";
 import { createOrchestrationEnvironmentAtoms } from "./orchestration.ts";
 import { createReviewEnvironmentAtoms } from "./review.ts";
@@ -50,6 +57,7 @@ import { createTerminalEnvironmentAtoms } from "./terminal.ts";
 import {
   createAtomCommandScheduler,
   createEnvironmentQueryAtomFamily,
+  createEnvironmentRpcSubscriptionAtomFamily,
   selectEnvironmentQueryData,
   createEnvironmentSubscriptionAtomFamily,
   createRuntimeCommand,
@@ -66,6 +74,8 @@ const QUERY_ENVIRONMENT = new PrimaryConnectionTarget({
   wsBaseUrl: "wss://query.example.test",
 });
 
+const decodeNumber = Schema.decodeUnknownEffect(Schema.Number);
+
 const QUERY_RPC_SESSION = {} as RpcSession.RpcSession;
 
 class TestQueryError extends Schema.TaggedError<TestQueryError>()("TestQueryError", {
@@ -162,6 +172,7 @@ const makeEnvironmentQueryHarness = Effect.fn("TestEnvironmentQuery.makeHarness"
 
   return {
     runtime,
+    family,
     atom: family({ environmentId: QUERY_ENVIRONMENT.environmentId, input: undefined }),
     supervisorSession,
     supervisorState,
@@ -196,119 +207,175 @@ const mountEnvironmentQuery = Effect.fn("TestEnvironmentQuery.mount")(function*
 });
 
 it.effect("keeps complete review metadata visible while a refresh is held", () =>
-  Effect.scoped(
+  Effect.gen(function* () {
+    const started = yield* Deferred.make<void>();
+    const release = yield* Deferred.make<void>();
+    let fullReads = 0;
+    const rpcSession = {
+      client: {
+        [WS_METHODS.reviewGetDiffPreview]: (input: ReviewDiffPreviewInput) =>
+          Effect.gen(function* () {
+            if (!input.trackedOnly && ++fullReads > 1) {
+              yield* Deferred.succeed(started, undefined);
+              yield* Deferred.await(release);
+            }
+            return {
+              cwd: input.cwd,
+              generatedAt: DateTime.makeUnsafe(0),
+              ...(input.trackedOnly ? { incomplete: true } : {}),
+              sources: [
+                {
+                  id: "working-tree",
+                  kind: "working-tree" as const,
+                  title: "Uncommitted",
+                  baseRef: "HEAD",
+                  headRef: null,
+                  diff: "",
+                  diffHash: String(fullReads),
+                  truncated: false,
+                  patchesDeferred: true,
+                  files: (input.trackedOnly ? ["tracked"] : ["tracked", "untracked"]).map(
+                    (path) => ({ path, previousPath: null, additions: 1, deletions: 0 }),
+                  ),
+                },
+              ],
+            };
+          }),
+      },
+    } as unknown as RpcSession.RpcSession;
+    const harness = yield* makeEnvironmentQueryHarness(Effect.void, { rpcSession });
+    const atom = createReviewEnvironmentAtoms(harness.runtime).diffPreview({
+      environmentId: QUERY_ENVIRONMENT.environmentId,
+      input: { cwd: "/project", sourceKind: "working-tree", metadataOnly: true },
+    });
+    const registry = yield* mountEnvironmentQuery(atom);
+    expect((yield* readEnvironmentQuery(registry, atom)).sources[0]!.files).toHaveLength(2);
+    registry.refresh(atom);
+    yield* Deferred.await(started);
+    yield* Effect.sync(() => {
+      const value = AsyncResult.getOrElse(registry.get(atom), () => null);
+      expect(value?.incomplete).not.toBe(true);
+      expect(value?.sources[0]!.files).toHaveLength(2);
+    }).pipe(Effect.ensuring(Deferred.succeed(release, undefined)));
+    expect((yield* readEnvironmentQuery(registry, atom)).sources[0]!.diffHash).toBe("2");
+  }),
+);
+
+describe("preview event subscriptions", () => {
+  it.effect("delivers every open and close when RPC events arrive in batches", () =>
     Effect.gen(function* () {
-      const started = yield* Deferred.make<void>();
-      const release = yield* Deferred.make<void>();
-      let fullReads = 0;
-      const rpcSession = {
-        client: {
-          [WS_METHODS.reviewGetDiffPreview]: (input: ReviewDiffPreviewInput) =>
-            Effect.gen(function* () {
-              if (!input.trackedOnly && ++fullReads > 1) {
-                yield* Deferred.succeed(started, undefined);
-                yield* Deferred.await(release);
-              }
-              return {
-                cwd: input.cwd,
-                generatedAt: DateTime.makeUnsafe(0),
-                ...(input.trackedOnly ? { incomplete: true } : {}),
-                sources: [
-                  {
-                    id: "working-tree",
-                    kind: "working-tree" as const,
-                    title: "Uncommitted",
-                    baseRef: "HEAD",
-                    headRef: null,
-                    diff: "",
-                    diffHash: String(fullReads),
-                    truncated: false,
-                    patchesDeferred: true,
-                    files: (input.trackedOnly ? ["tracked"] : ["tracked", "untracked"]).map(
-                      (path) => ({ path, previousPath: null, additions: 1, deletions: 0 }),
-                    ),
-                  },
-                ],
-              };
-            }),
+      const opened: PreviewEvent[] = ["thread-a", "thread-b"].map((threadId, index) => ({
+        type: "opened",
+        threadId,
+        tabId: `tab-${index}`,
+        serverEpoch: "epoch-1",
+        revision: index + 1,
+        createdAt: "2026-10-02T00:00:00.000Z",
+        snapshot: {
+          threadId,
+          tabId: `tab-${index}`,
+          navStatus: { _tag: "Idle" },
+          canGoBack: false,
+          canGoForward: false,
+          updatedAt: "2026-10-02T00:00:00.000Z",
         },
-      } as unknown as RpcSession.RpcSession;
-      const harness = yield* makeEnvironmentQueryHarness(Effect.void, { rpcSession });
-      const atom = createReviewEnvironmentAtoms(harness.runtime).diffPreview({
+      }));
+      const closed: PreviewEvent[] = opened.map((event, index) => ({
+        type: "closed",
+        threadId: event.threadId,
+        tabId: event.tabId,
+        serverEpoch: event.serverEpoch,
+        revision: opened.length + index + 1,
+        createdAt: event.createdAt,
+      }));
+      const releaseEvents = yield* Deferred.make<void>();
+      // Each iterable is one RPC chunk; separate emissions would hide lost events.
+      const stream = Stream.fromEffect(Deferred.await(releaseEvents)).pipe(
+        Stream.flatMap(() =>
+          Stream.fromIterable(opened).pipe(
+            Stream.concat(Stream.fromIterable(closed)),
+            Stream.concat(Stream.never),
+          ),
+        ),
+      );
+      const harness = yield* makeEnvironmentQueryHarness(Effect.void, {
+        rpcSession: {
+          client: { [WS_METHODS.subscribePreviewEvents]: () => stream },
+        } as unknown as RpcSession.RpcSession,
+      });
+      const atom = createPreviewEnvironmentAtoms(harness.runtime).events({
         environmentId: QUERY_ENVIRONMENT.environmentId,
-        input: { cwd: "/project", sourceKind: "working-tree", metadataOnly: true },
+        input: {},
       });
-      const registry = yield* mountEnvironmentQuery(atom);
-      expect((yield* readEnvironmentQuery(registry, atom)).sources[0]!.files).toHaveLength(2);
-      registry.refresh(atom);
-      yield* Deferred.await(started);
-      yield* Effect.sync(() => {
-        const value = AsyncResult.getOrElse(registry.get(atom), () => null);
-        expect(value?.incomplete).not.toBe(true);
-        expect(value?.sources[0]!.files).toHaveLength(2);
-      }).pipe(Effect.ensuring(Deferred.succeed(release, undefined)));
-      expect((yield* readEnvironmentQuery(registry, atom)).sources[0]!.diffHash).toBe("2");
+      const registry = AtomRegistry.make();
+      const observed: PreviewEvent[] = [];
+      const sawLast = yield* Deferred.make<void>();
+      const unsubscribe = registry.subscribe(
+        atom,
+        (result) => {
+          if (!AsyncResult.isSuccess(result)) return;
+          observed.push(result.value);
+          if (result.value === closed[closed.length - 1]) {
+            Deferred.doneUnsafe(sawLast, Exit.void);
+          }
+        },
+        { immediate: true },
+      );
+      yield* Effect.addFinalizer(() =>
+        Effect.sync(() => {
+          unsubscribe();
+          registry.dispose();
+        }),
+      );
+
+      yield* Deferred.succeed(releaseEvents, undefined);
+      yield* Deferred.await(sawLast);
+      expect(observed).toEqual([...opened, ...closed]);
     }),
-  ),
-);
+  );
+});
 
-describe("preview event subscriptions", () => {
-  it.effect("delivers every open and close when RPC events arrive in batches", () =>
-    Effect.scoped(
+describe("finite environment subscription lifecycle", () => {
+  it.effect(
+    "exposes early values and settles on the terminal value without waiting for a reconnect",
+    () =>
       Effect.gen(function* () {
-        const opened: PreviewEvent[] = ["thread-a", "thread-b"].map((threadId, index) => ({
-          type: "opened",
-          threadId,
-          tabId: `tab-${index}`,
-          serverEpoch: "epoch-1",
-          revision: index + 1,
-          createdAt: "2026-10-02T00:00:00.000Z",
-          snapshot: {
-            threadId,
-            tabId: `tab-${index}`,
-            navStatus: { _tag: "Idle" },
-            canGoBack: false,
-            canGoForward: false,
-            updatedAt: "2026-10-02T00:00:00.000Z",
-          },
-        }));
-        const closed: PreviewEvent[] = opened.map((event, index) => ({
-          type: "closed",
-          threadId: event.threadId,
-          tabId: event.tabId,
-          serverEpoch: event.serverEpoch,
-          revision: opened.length + index + 1,
-          createdAt: event.createdAt,
-        }));
-        const releaseEvents = yield* Deferred.make<void>();
-        // Each iterable is one RPC chunk; separate emissions would hide lost events.
-        const stream = Stream.fromEffect(Deferred.await(releaseEvents)).pipe(
-          Stream.flatMap(() =>
-            Stream.fromIterable(opened).pipe(
-              Stream.concat(Stream.fromIterable(closed)),
-              Stream.concat(Stream.never),
-            ),
+        const releaseFinal = yield* Deferred.make<void>();
+        const sawEarly = yield* Deferred.make<void>();
+        const sawFinal = yield* Deferred.make<void>();
+        const closed = yield* Deferred.make<void>();
+        const stream = Stream.concat(
+          Stream.succeed({ complete: false, count: 1 }),
+          Stream.fromEffect(
+            Deferred.await(releaseFinal).pipe(Effect.as({ complete: true, count: 123 })),
           ),
+        ).pipe(Stream.ensuring(Deferred.succeed(closed, undefined)));
+        const environmentRegistry = EnvironmentRegistry.EnvironmentRegistry.of({
+          followStream: (_environmentId: EnvironmentId, source: typeof stream) =>
+            Stream.concat(source, Stream.never),
+        } as unknown as EnvironmentRegistry.EnvironmentRegistry["Service"]);
+        const runtime = Atom.runtime(
+          Layer.succeed(EnvironmentRegistry.EnvironmentRegistry, environmentRegistry),
         );
-        const harness = yield* makeEnvironmentQueryHarness(Effect.void, {
-          rpcSession: {
-            client: { [WS_METHODS.subscribePreviewEvents]: () => stream },
-          } as unknown as RpcSession.RpcSession,
-        });
-        const atom = createPreviewEnvironmentAtoms(harness.runtime).events({
-          environmentId: QUERY_ENVIRONMENT.environmentId,
-          input: {},
+        const family = createEnvironmentSubscriptionAtomFamily(runtime, {
+          label: "test.finite-subscription",
+          subscribe: () => stream,
+          completeWhen: (value) => value.complete,
+          idleTtlMs: 0,
         });
+        const atom = family({ environmentId: QUERY_ENVIRONMENT.environmentId, input: undefined });
         const registry = AtomRegistry.make();
-        const observed: PreviewEvent[] = [];
-        const sawLast = yield* Deferred.make<void>();
+        const observed: Array<
+          AsyncResult.AsyncResult<{ complete: boolean; count: number }, unknown>
+        > = [];
         const unsubscribe = registry.subscribe(
           atom,
           (result) => {
-            if (!AsyncResult.isSuccess(result)) return;
-            observed.push(result.value);
-            if (result.value === closed[closed.length - 1]) {
-              Deferred.doneUnsafe(sawLast, Exit.void);
+            observed.push(result);
+            if (AsyncResult.isSuccess(result)) {
+              if (!result.value.complete) Deferred.doneUnsafe(sawEarly, Exit.void);
+              if (result.value.complete && !result.waiting)
+                Deferred.doneUnsafe(sawFinal, Exit.void);
             }
           },
           { immediate: true },
@@ -319,58 +386,86 @@ describe("preview event subscriptions", () => {
             registry.dispose();
           }),
         );
-
-        yield* Deferred.succeed(releaseEvents, undefined);
-        yield* Deferred.await(sawLast);
-        expect(observed).toEqual([...opened, ...closed]);
+        yield* Deferred.await(sawEarly);
+        const early = registry.get(atom);
+        expect(AsyncResult.isSuccess(early) && early.value.count).toBe(1);
+        expect(early.waiting).toBe(true);
+        yield* Deferred.succeed(releaseFinal, undefined);
+        yield* Deferred.await(sawFinal);
+        yield* Deferred.await(closed);
+        const final = registry.get(atom);
+        expect(AsyncResult.isSuccess(final) && final.value.count).toBe(123);
+        expect(final.waiting).toBe(false);
+        expect(observed.some((result) => AsyncResult.isFailure(result))).toBe(false);
       }),
-    ),
   );
-});
-
-describe("finite environment subscription lifecycle", () => {
   it.effect(
-    "exposes early values and settles on the terminal value without waiting for a reconnect",
+    "surfaces a decode defect from a finite RPC subscription instead of resubscribing",
     () =>
       Effect.scoped(
         Effect.gen(function* () {
-          const releaseFinal = yield* Deferred.make<void>();
-          const sawEarly = yield* Deferred.make<void>();
-          const sawFinal = yield* Deferred.make<void>();
-          const closed = yield* Deferred.make<void>();
-          const stream = Stream.concat(
-            Stream.succeed({ complete: false, count: 1 }),
-            Stream.fromEffect(
-              Deferred.await(releaseFinal).pipe(Effect.as({ complete: true, count: 123 })),
-            ),
-          ).pipe(Stream.ensuring(Deferred.succeed(closed, undefined)));
+          const firstSubscribed = yield* Deferred.make<void>();
+          const resubscribed = yield* Deferred.make<void>();
+          const surfaced = yield* Deferred.make<Cause.Cause<unknown>>();
+          let subscriptions = 0;
+          // Mirrors RpcClient, which decodes each chunk with `Effect.orDie`.
+          const decodeDefect = decodeNumber("not a number").pipe(Effect.orDie);
+          const client = {
+            [ORCHESTRATION_V2_WS_METHODS.searchThreadStream]: () => {
+              subscriptions += 1;
+              Deferred.doneUnsafe(subscriptions === 1 ? firstSubscribed : resubscribed, Exit.void);
+              return Stream.fromEffect(decodeDefect).pipe(Stream.drain);
+            },
+          } as unknown as WsRpcProtocolClient;
+          const rpcSession = {
+            client,
+            initialConfig: Effect.never,
+            subscribeServerConfig: () => Stream.never,
+            ready: Effect.void,
+            probe: Effect.void,
+            closed: Effect.never,
+          } as unknown as RpcSession.RpcSession;
+          const supervisor = EnvironmentSupervisor.EnvironmentSupervisor.of({
+            target: QUERY_ENVIRONMENT,
+            state: yield* SubscriptionRef.make(queryConnectionState()),
+            session: yield* SubscriptionRef.make(Option.some(rpcSession)),
+            prepared: yield* SubscriptionRef.make<Option.Option<PreparedConnection>>(Option.none()),
+            connect: Effect.void,
+            disconnect: Effect.void,
+            retryNow: Effect.void,
+          } satisfies EnvironmentSupervisor.EnvironmentSupervisor["Service"]);
           const environmentRegistry = EnvironmentRegistry.EnvironmentRegistry.of({
-            followStream: (_environmentId: EnvironmentId, source: typeof stream) =>
-              Stream.concat(source, Stream.never),
+            followStream: (_environmentId: EnvironmentId, stream: Stream.Stream<unknown>) =>
+              Stream.provideService(
+                stream,
+                EnvironmentSupervisor.EnvironmentSupervisor,
+                supervisor,
+              ),
           } as unknown as EnvironmentRegistry.EnvironmentRegistry["Service"]);
+          // Atoms run their own fibers; share the test clock so a pending retry is driven by it.
           const runtime = Atom.runtime(
-            Layer.succeed(EnvironmentRegistry.EnvironmentRegistry, environmentRegistry),
+            Layer.mergeAll(
+              Layer.succeed(EnvironmentRegistry.EnvironmentRegistry, environmentRegistry),
+              Layer.succeed(Clock.Clock, yield* Clock.Clock),
+            ),
           );
-          const family = createEnvironmentSubscriptionAtomFamily(runtime, {
-            label: "test.finite-subscription",
-            subscribe: () => stream,
-            completeWhen: (value) => value.complete,
+          // Same options as the progressive thread find in orchestration.ts.
+          const family = createEnvironmentRpcSubscriptionAtomFamily(runtime, {
+            label: "test.finite-rpc-subscription",
+            tag: ORCHESTRATION_V2_WS_METHODS.searchThreadStream,
+            completeWhen: (result) => result.complete !== false,
             idleTtlMs: 0,
           });
-          const atom = family({ environmentId: QUERY_ENVIRONMENT.environmentId, input: undefined });
+          const atom = family({
+            environmentId: QUERY_ENVIRONMENT.environmentId,
+            input: {} as never,
+          });
           const registry = AtomRegistry.make();
-          const observed: Array<
-            AsyncResult.AsyncResult<{ complete: boolean; count: number }, unknown>
-          > = [];
           const unsubscribe = registry.subscribe(
             atom,
             (result) => {
-              observed.push(result);
-              if (AsyncResult.isSuccess(result)) {
-                if (!result.value.complete) Deferred.doneUnsafe(sawEarly, Exit.void);
-                if (result.value.complete && !result.waiting)
-                  Deferred.doneUnsafe(sawFinal, Exit.void);
-              }
+              if (AsyncResult.isFailure(result))
+                Deferred.doneUnsafe(surfaced, Exit.succeed(result.cause));
             },
             { immediate: true },
           );
@@ -380,17 +475,25 @@ describe("finite environment subscription lifecycle", () => {
               registry.dispose();
             }),
           );
-          yield* Deferred.await(sawEarly);
-          const early = registry.get(atom);
-          expect(AsyncResult.isSuccess(early) && early.value.count).toBe(1);
-          expect(early.waiting).toBe(true);
-          yield* Deferred.succeed(releaseFinal, undefined);
-          yield* Deferred.await(sawFinal);
-          yield* Deferred.await(closed);
-          const final = registry.get(atom);
-          expect(AsyncResult.isSuccess(final) && final.value.count).toBe(123);
-          expect(final.waiting).toBe(false);
-          expect(observed.some((result) => AsyncResult.isFailure(result))).toBe(false);
+          yield* Deferred.await(firstSubscribed);
+          // Lets any same-session retry run, so its resubscription can win the race below.
+          yield* TestClock.adjust("1 minute");
+          const outcome = yield* Effect.raceFirst(
+            Deferred.await(surfaced).pipe(
+              Effect.map((cause) => ({ _tag: "surfaced", cause }) as const),
+            ),
+            Deferred.await(resubscribed).pipe(Effect.as({ _tag: "resubscribed" } as const)),
+          );
+
+          expect(
+            outcome._tag,
+            "finite subscription resubscribed after a decode defect instead of failing its consumer",
+          ).toBe("surfaced");
+          if (outcome._tag === "surfaced") {
+            expect(Cause.hasDies(outcome.cause)).toBe(true);
+            expect(Schema.isSchemaError(Cause.squash(outcome.cause))).toBe(true);
+          }
+          expect(subscriptions).toBe(1);
         }),
       ),
   );
@@ -552,6 +655,7 @@ describe("environment query lifecycle", () => {
         cwd: "/tmp/project",
         restartIfNotRunning: true,
       };
+      const sent = { ...input, maxHistoryBytes: DEFAULT_MAX_TERMINAL_BUFFER_BYTES };
       const atoms = createTerminalEnvironmentAtoms(harness.runtime);
       const registry = AtomRegistry.make();
       const atom = atoms.attach({ environmentId: QUERY_ENVIRONMENT.environmentId, input });
@@ -571,9 +675,9 @@ describe("environment query lifecycle", () => {
         }),
       );
 
-      expect(yield* Queue.take(inputs)).toEqual(input);
+      expect(yield* Queue.take(inputs)).toEqual(sent);
       yield* SubscriptionRef.set(harness.supervisorSession, Option.some({ ...firstSession }));
-      expect(yield* Queue.take(inputs)).toEqual(input);
+      expect(yield* Queue.take(inputs)).toEqual(sent);
       yield* Queue.offer(events, {
         type: "closed",
         threadId: input.threadId,
@@ -582,10 +686,10 @@ describe("environment query lifecycle", () => {
       yield* Deferred.await(received);
 
       yield* SubscriptionRef.set(harness.supervisorSession, Option.some({ ...firstSession }));
-      expect(yield* Queue.take(inputs)).toEqual({ ...input, resume: true });
+      expect(yield* Queue.take(inputs)).toEqual({ ...sent, resume: true });
       // Catalog replacements rerun the same stream through followStream's switchMap.
       yield* SubscriptionRef.update(harness.streamGeneration, (generation) => generation + 1);
-      expect(yield* Queue.take(inputs)).toEqual({ ...input, resume: true });
+      expect(yield* Queue.take(inputs)).toEqual({ ...sent, resume: true });
 
       unmount();
       registry.dispose();
@@ -597,111 +701,21 @@ describe("environment query lifecycle", () => {
           remountedRegistry.dispose();
         }),
       );
-      expect(yield* Queue.take(inputs)).toEqual(input);
+      expect(yield* Queue.take(inputs)).toEqual(sent);
     }),
   );
 
   it.effect(
     "hides a session replacement, reports the relay backoff, and recovers on reconnect",
     () =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const firstStarted = Latch.makeUnsafe();
-          const failFirst = Latch.makeUnsafe();
-          const firstSettled = Latch.makeUnsafe();
-          const unavailable = new EnvironmentRpcUnavailableError({
-            environmentId: QUERY_ENVIRONMENT.environmentId,
-            message: "Query environment is not connected.",
-          });
-          let executions = 0;
-          const execute = Effect.suspend(() => {
-            executions += 1;
-            if (executions > 1) {
-              return Effect.succeed("recovered");
-            }
-            firstStarted.openUnsafe();
-            return failFirst.await.pipe(
-              Effect.andThen(Effect.fail(unavailable)),
-              Effect.ensuring(
-                Effect.sync(() => {
-                  firstSettled.openUnsafe();
-                }),
-              ),
-            );
-          });
-          const harness = yield* makeEnvironmentQueryHarness(execute);
-          const registry = AtomRegistry.make();
-          const observed: Array<AsyncResult.AsyncResult<string, unknown>> = [];
-          const unsubscribe = registry.subscribe(
-            harness.atom,
-            (result) => {
-              observed.push(result);
-            },
-            { immediate: true },
-          );
-          yield* Effect.addFinalizer(() =>
-            Effect.sync(() => {
-              unsubscribe();
-              registry.dispose();
-            }),
-          );
-
-          yield* firstStarted.await;
-          yield* SubscriptionRef.set(harness.supervisorSession, Option.none());
-          yield* Effect.yieldNow;
-          failFirst.openUnsafe();
-          yield* firstSettled.await;
-          yield* Effect.yieldNow;
-
-          expect(observed.some(AsyncResult.isFailure)).toBe(false);
-
-          yield* SubscriptionRef.set(
-            harness.supervisorState,
-            queryConnectionState({ phase: "connecting", stage: "preparing" }),
-          );
-          yield* Effect.yieldNow;
-          const relayFailure = new ConnectionTransientError({
-            reason: "transport",
-            detail: "Relay session is reconnecting.",
-          });
-          yield* SubscriptionRef.set(
-            harness.supervisorState,
-            queryConnectionState({
-              phase: "backoff",
-              stage: null,
-              lastFailure: relayFailure,
-              retryAt: 1,
-            }),
-          );
-          yield* Effect.yieldNow;
-          // The query has never answered, so it reports why the environment is retrying.
-          const backingOff = registry.get(harness.atom);
-          expect(backingOff.waiting).toBe(false);
-          expect(AsyncResult.isFailure(backingOff) && Cause.squash(backingOff.cause)).toBe(
-            relayFailure,
-          );
-
-          yield* SubscriptionRef.set(harness.supervisorSession, Option.some(QUERY_RPC_SESSION));
-          yield* SubscriptionRef.set(
-            harness.supervisorState,
-            queryConnectionState({ generation: 2 }),
-          );
-          yield* Effect.yieldNow;
-          expect(
-            yield* AtomRegistry.getResult(registry, harness.atom, {
-              suspendOnWaiting: true,
-            }),
-          ).toBe("recovered");
-        }),
-      ),
-  );
-
-  it.effect("keeps a query pending when it loses its session before the atom sees the change", () =>
-    Effect.scoped(
       Effect.gen(function* () {
         const firstStarted = Latch.makeUnsafe();
         const failFirst = Latch.makeUnsafe();
         const firstSettled = Latch.makeUnsafe();
+        const unavailable = new EnvironmentRpcUnavailableError({
+          environmentId: QUERY_ENVIRONMENT.environmentId,
+          message: "Query environment is not connected.",
+        });
         let executions = 0;
         const execute = Effect.suspend(() => {
           executions += 1;
@@ -710,14 +724,7 @@ describe("environment query lifecycle", () => {
           }
           firstStarted.openUnsafe();
           return failFirst.await.pipe(
-            Effect.andThen(
-              Effect.fail(
-                new EnvironmentRpcUnavailableError({
-                  environmentId: QUERY_ENVIRONMENT.environmentId,
-                  message: "Query environment is not connected.",
-                }),
-              ),
-            ),
+            Effect.andThen(Effect.fail(unavailable)),
             Effect.ensuring(
               Effect.sync(() => {
                 firstSettled.openUnsafe();
@@ -743,47 +750,135 @@ describe("environment query lifecycle", () => {
         );
 
         yield* firstStarted.await;
-        // No yield before the failure: the request finds its session gone
-        // before the atom has processed the session change.
         yield* SubscriptionRef.set(harness.supervisorSession, Option.none());
+        yield* Effect.yieldNow;
         failFirst.openUnsafe();
         yield* firstSettled.await;
         yield* Effect.yieldNow;
 
         expect(observed.some(AsyncResult.isFailure)).toBe(false);
 
+        yield* SubscriptionRef.set(
+          harness.supervisorState,
+          queryConnectionState({ phase: "connecting", stage: "preparing" }),
+        );
+        yield* Effect.yieldNow;
+        const relayFailure = new ConnectionTransientError({
+          reason: "transport",
+          detail: "Relay session is reconnecting.",
+        });
+        yield* SubscriptionRef.set(
+          harness.supervisorState,
+          queryConnectionState({
+            phase: "backoff",
+            stage: null,
+            lastFailure: relayFailure,
+            retryAt: 1,
+          }),
+        );
+        yield* Effect.yieldNow;
+        // The query has never answered, so it reports why the environment is retrying.
+        const backingOff = registry.get(harness.atom);
+        expect(backingOff.waiting).toBe(false);
+        expect(AsyncResult.isFailure(backingOff) && Cause.squash(backingOff.cause)).toBe(
+          relayFailure,
+        );
+
         yield* SubscriptionRef.set(harness.supervisorSession, Option.some(QUERY_RPC_SESSION));
         yield* SubscriptionRef.set(
           harness.supervisorState,
           queryConnectionState({ generation: 2 }),
         );
+        yield* Effect.yieldNow;
         expect(
           yield* AtomRegistry.getResult(registry, harness.atom, {
             suspendOnWaiting: true,
           }),
         ).toBe("recovered");
-        expect(observed.some(AsyncResult.isFailure)).toBe(false);
       }),
-    ),
   );
 
-  it.effect("fails a query that reports unavailable while its session is still live", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const unavailable = new EnvironmentRpcUnavailableError({
-          environmentId: QUERY_ENVIRONMENT.environmentId,
-          message: "The environment did not respond to the request.",
-        });
-        const harness = yield* makeEnvironmentQueryHarness(Effect.fail(unavailable));
-        const registry = yield* mountEnvironmentQuery(harness.atom);
+  it.effect("keeps a query pending when it loses its session before the atom sees the change", () =>
+    Effect.gen(function* () {
+      const firstStarted = Latch.makeUnsafe();
+      const failFirst = Latch.makeUnsafe();
+      const firstSettled = Latch.makeUnsafe();
+      let executions = 0;
+      const execute = Effect.suspend(() => {
+        executions += 1;
+        if (executions > 1) {
+          return Effect.succeed("recovered");
+        }
+        firstStarted.openUnsafe();
+        return failFirst.await.pipe(
+          Effect.andThen(
+            Effect.fail(
+              new EnvironmentRpcUnavailableError({
+                environmentId: QUERY_ENVIRONMENT.environmentId,
+                message: "Query environment is not connected.",
+              }),
+            ),
+          ),
+          Effect.ensuring(
+            Effect.sync(() => {
+              firstSettled.openUnsafe();
+            }),
+          ),
+        );
+      });
+      const harness = yield* makeEnvironmentQueryHarness(execute);
+      const registry = AtomRegistry.make();
+      const observed: Array<AsyncResult.AsyncResult<string, unknown>> = [];
+      const unsubscribe = registry.subscribe(
+        harness.atom,
+        (result) => {
+          observed.push(result);
+        },
+        { immediate: true },
+      );
+      yield* Effect.addFinalizer(() =>
+        Effect.sync(() => {
+          unsubscribe();
+          registry.dispose();
+        }),
+      );
+
+      yield* firstStarted.await;
+      // No yield before the failure: the request finds its session gone
+      // before the atom has processed the session change.
+      yield* SubscriptionRef.set(harness.supervisorSession, Option.none());
+      failFirst.openUnsafe();
+      yield* firstSettled.await;
+      yield* Effect.yieldNow;
 
-        const exit = yield* AtomRegistry.getResult(registry, harness.atom, {
+      expect(observed.some(AsyncResult.isFailure)).toBe(false);
+
+      yield* SubscriptionRef.set(harness.supervisorSession, Option.some(QUERY_RPC_SESSION));
+      yield* SubscriptionRef.set(harness.supervisorState, queryConnectionState({ generation: 2 }));
+      expect(
+        yield* AtomRegistry.getResult(registry, harness.atom, {
           suspendOnWaiting: true,
-        }).pipe(Effect.exit);
+        }),
+      ).toBe("recovered");
+      expect(observed.some(AsyncResult.isFailure)).toBe(false);
+    }),
+  );
 
-        expect(exit).toStrictEqual(Exit.fail(unavailable));
-      }),
-    ),
+  it.effect("fails a query that reports unavailable while its session is still live", () =>
+    Effect.gen(function* () {
+      const unavailable = new EnvironmentRpcUnavailableError({
+        environmentId: QUERY_ENVIRONMENT.environmentId,
+        message: "The environment did not respond to the request.",
+      });
+      const harness = yield* makeEnvironmentQueryHarness(Effect.fail(unavailable));
+      const registry = yield* mountEnvironmentQuery(harness.atom);
+
+      const exit = yield* AtomRegistry.getResult(registry, harness.atom, {
+        suspendOnWaiting: true,
+      }).pipe(Effect.exit);
+
+      expect(exit).toStrictEqual(Exit.fail(unavailable));
+    }),
   );
 
   it.effect.each([
@@ -817,28 +912,26 @@ describe("environment query lifecycle", () => {
       expectedFailure: BLOCKED_QUERY_FAILURE,
     },
   ] as const)("settles as unavailable $condition", ({ state, expectedFailure }) =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const harness = yield* makeEnvironmentQueryHarness(Effect.succeed("connected"));
-        const registry = yield* mountEnvironmentQuery(harness.atom);
+    Effect.gen(function* () {
+      const harness = yield* makeEnvironmentQueryHarness(Effect.succeed("connected"));
+      const registry = yield* mountEnvironmentQuery(harness.atom);
 
-        expect(
-          yield* AtomRegistry.getResult(registry, harness.atom, {
-            suspendOnWaiting: true,
-          }),
-        ).toBe("connected");
+      expect(
+        yield* AtomRegistry.getResult(registry, harness.atom, {
+          suspendOnWaiting: true,
+        }),
+      ).toBe("connected");
 
-        yield* SubscriptionRef.set(harness.supervisorState, state);
-        yield* Effect.yieldNow;
+      yield* SubscriptionRef.set(harness.supervisorState, state);
+      yield* Effect.yieldNow;
 
-        const result = registry.get(harness.atom);
-        expect(AsyncResult.isFailure(result)).toBe(true);
-        expect(result.waiting).toBe(false);
-        if (AsyncResult.isFailure(result) && expectedFailure !== null) {
-          expect(Cause.squash(result.cause)).toBe(expectedFailure);
-        }
-      }),
-    ),
+      const result = registry.get(harness.atom);
+      expect(AsyncResult.isFailure(result)).toBe(true);
+      expect(result.waiting).toBe(false);
+      if (AsyncResult.isFailure(result) && expectedFailure !== null) {
+        expect(Cause.squash(result.cause)).toBe(expectedFailure);
+      }
+    }),
   );
 
   it.effect.each([
@@ -847,378 +940,428 @@ describe("environment query lifecycle", () => {
   ] as const)(
     "settles a query it never answered while its environment retries ($phase)",
     (retrying) =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const harness = yield* makeEnvironmentQueryHarness(Effect.succeed("connected"), {
-            initialState: queryConnectionState({ ...retrying, lastFailure: OFFLINE_QUERY_FAILURE }),
-          });
-          const registry = yield* mountEnvironmentQuery(harness.atom);
-          yield* Effect.yieldNow;
-
-          const result = registry.get(harness.atom);
-          expect(result.waiting).toBe(false);
-          expect(AsyncResult.isFailure(result) && Cause.squash(result.cause)).toBe(
-            OFFLINE_QUERY_FAILURE,
-          );
-
-          yield* SubscriptionRef.set(harness.supervisorState, queryConnectionState());
-          yield* Effect.yieldNow;
-          expect(yield* readEnvironmentQuery(registry, harness.atom)).toBe("connected");
-        }),
-      ),
-  );
-
-  it.effect("a refresh started on a new session generation answers from that session", () =>
-    Effect.scoped(
       Effect.gen(function* () {
         const harness = yield* makeEnvironmentQueryHarness(Effect.succeed("connected"), {
-          initialState: queryConnectionState({
-            phase: "backoff",
-            stage: null,
-            lastFailure: OFFLINE_QUERY_FAILURE,
-            retryAt: 1,
-          }),
+          initialState: queryConnectionState({ ...retrying, lastFailure: OFFLINE_QUERY_FAILURE }),
         });
         const registry = yield* mountEnvironmentQuery(harness.atom);
-        // Callers hold the failure a read got while the environment was retrying.
-        const failed = yield* Effect.promise(() =>
-          executeAtomQuery(registry, harness.atom, { reportFailure: false }),
-        );
-        expect(AsyncResult.isFailure(failed)).toBe(true);
-
-        const answered = yield* Deferred.make<AsyncResult.AsyncResult<string, unknown>>();
-        const sessionGeneration = environmentSessionGenerationAtom(
-          harness.runtime,
-          QUERY_ENVIRONMENT.environmentId,
-        );
-        const unmount = registry.mount(sessionGeneration);
-        const unsubscribe = registry.subscribe(sessionGeneration, () => {
-          void executeAtomQuery(registry, harness.atom, {
-            refresh: true,
-            reportFailure: false,
-          }).then((result) => Deferred.doneUnsafe(answered, Effect.succeed(result)));
-        });
-        yield* Effect.addFinalizer(() =>
-          Effect.sync(() => {
-            unsubscribe();
-            unmount();
-          }),
-        );
         yield* Effect.yieldNow;
 
-        yield* SubscriptionRef.set(
-          harness.supervisorSession,
-          Option.some({} as RpcSession.RpcSession),
-        );
-        yield* SubscriptionRef.set(
-          harness.supervisorState,
-          queryConnectionState({ generation: 2 }),
+        const result = registry.get(harness.atom);
+        expect(result.waiting).toBe(false);
+        expect(AsyncResult.isFailure(result) && Cause.squash(result.cause)).toBe(
+          OFFLINE_QUERY_FAILURE,
         );
-        expect(yield* Deferred.await(answered)).toMatchObject({
-          _tag: "Success",
-          value: "connected",
-        });
+
+        yield* SubscriptionRef.set(harness.supervisorState, queryConnectionState());
+        yield* Effect.yieldNow;
+        expect(yield* readEnvironmentQuery(registry, harness.atom)).toBe("connected");
       }),
-    ),
   );
 
-  it.effect("keeps a genuine query failure settled while reconnecting", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const expectedFailure = new TestQueryError({ message: "Query failed." });
-        const firstStarted = Latch.makeUnsafe();
-        const failFirst = Latch.makeUnsafe();
-        const refreshStarted = Latch.makeUnsafe();
-        const finishRefresh = Latch.makeUnsafe();
-        let executions = 0;
-        const execute = Effect.suspend(() => {
-          executions += 1;
-          if (executions === 1) {
-            firstStarted.openUnsafe();
-            return failFirst.await.pipe(Effect.andThen(Effect.fail(expectedFailure)));
-          }
-          refreshStarted.openUnsafe();
-          return finishRefresh.await.pipe(Effect.as("recovered"));
-        });
-        const harness = yield* makeEnvironmentQueryHarness(execute);
-        const registry = yield* mountEnvironmentQuery(harness.atom);
-
-        yield* firstStarted.await;
-        failFirst.openUnsafe();
-        const initial = yield* AtomRegistry.getResult(registry, harness.atom, {
-          suspendOnWaiting: true,
-        }).pipe(Effect.exit);
-        expect(Exit.isFailure(initial)).toBe(true);
-        if (Exit.isFailure(initial)) {
-          expect(Cause.squash(initial.cause)).toBe(expectedFailure);
-        }
+  it.effect("a refresh started on a new session generation answers from that session", () =>
+    Effect.gen(function* () {
+      const harness = yield* makeEnvironmentQueryHarness(Effect.succeed("connected"), {
+        initialState: queryConnectionState({
+          phase: "backoff",
+          stage: null,
+          lastFailure: OFFLINE_QUERY_FAILURE,
+          retryAt: 1,
+        }),
+      });
+      const registry = yield* mountEnvironmentQuery(harness.atom);
+      // Callers hold the failure a read got while the environment was retrying.
+      const failed = yield* Effect.promise(() =>
+        executeAtomQuery(registry, harness.atom, { reportFailure: false }),
+      );
+      expect(AsyncResult.isFailure(failed)).toBe(true);
 
-        yield* SubscriptionRef.set(
-          harness.supervisorState,
-          queryConnectionState({ phase: "connecting", stage: "opening" }),
-        );
-        yield* Effect.yieldNow;
+      const answered = yield* Deferred.make<AsyncResult.AsyncResult<string, unknown>>();
+      const sessionGeneration = environmentSessionGenerationAtom(
+        harness.runtime,
+        QUERY_ENVIRONMENT.environmentId,
+      );
+      const unmount = registry.mount(sessionGeneration);
+      const unsubscribe = registry.subscribe(sessionGeneration, () => {
+        void executeAtomQuery(registry, harness.atom, {
+          refresh: true,
+          reportFailure: false,
+        }).then((result) => Deferred.doneUnsafe(answered, Effect.succeed(result)));
+      });
+      yield* Effect.addFinalizer(() =>
+        Effect.sync(() => {
+          unsubscribe();
+          unmount();
+        }),
+      );
+      yield* Effect.yieldNow;
 
-        const refreshing = registry.get(harness.atom);
-        expect(AsyncResult.isFailure(refreshing)).toBe(true);
-        expect(refreshing.waiting).toBe(true);
-        if (AsyncResult.isFailure(refreshing)) {
-          expect(Cause.squash(refreshing.cause)).toBe(expectedFailure);
-        }
+      yield* SubscriptionRef.set(
+        harness.supervisorSession,
+        Option.some({} as RpcSession.RpcSession),
+      );
+      yield* SubscriptionRef.set(harness.supervisorState, queryConnectionState({ generation: 2 }));
+      expect(yield* Deferred.await(answered)).toMatchObject({
+        _tag: "Success",
+        value: "connected",
+      });
+    }),
+  );
 
-        yield* SubscriptionRef.set(
-          harness.supervisorState,
-          queryConnectionState({ generation: 2 }),
-        );
-        yield* refreshStarted.await;
-        finishRefresh.openUnsafe();
-        expect(
-          yield* AtomRegistry.getResult(registry, harness.atom, {
-            suspendOnWaiting: true,
-          }),
-        ).toBe("recovered");
-      }),
-    ),
+  it.effect("keeps a genuine query failure settled while reconnecting", () =>
+    Effect.gen(function* () {
+      const expectedFailure = new TestQueryError({ message: "Query failed." });
+      const firstStarted = Latch.makeUnsafe();
+      const failFirst = Latch.makeUnsafe();
+      const refreshStarted = Latch.makeUnsafe();
+      const finishRefresh = Latch.makeUnsafe();
+      let executions = 0;
+      const execute = Effect.suspend(() => {
+        executions += 1;
+        if (executions === 1) {
+          firstStarted.openUnsafe();
+          return failFirst.await.pipe(Effect.andThen(Effect.fail(expectedFailure)));
+        }
+        refreshStarted.openUnsafe();
+        return finishRefresh.await.pipe(Effect.as("recovered"));
+      });
+      const harness = yield* makeEnvironmentQueryHarness(execute);
+      const registry = yield* mountEnvironmentQuery(harness.atom);
+
+      yield* firstStarted.await;
+      failFirst.openUnsafe();
+      const initial = yield* AtomRegistry.getResult(registry, harness.atom, {
+        suspendOnWaiting: true,
+      }).pipe(Effect.exit);
+      expect(Exit.isFailure(initial)).toBe(true);
+      if (Exit.isFailure(initial)) {
+        expect(Cause.squash(initial.cause)).toBe(expectedFailure);
+      }
+
+      yield* SubscriptionRef.set(
+        harness.supervisorState,
+        queryConnectionState({ phase: "connecting", stage: "opening" }),
+      );
+      yield* Effect.yieldNow;
+
+      const refreshing = registry.get(harness.atom);
+      expect(AsyncResult.isFailure(refreshing)).toBe(true);
+      expect(refreshing.waiting).toBe(true);
+      if (AsyncResult.isFailure(refreshing)) {
+        expect(Cause.squash(refreshing.cause)).toBe(expectedFailure);
+      }
+
+      yield* SubscriptionRef.set(harness.supervisorState, queryConnectionState({ generation: 2 }));
+      yield* refreshStarted.await;
+      finishRefresh.openUnsafe();
+      expect(
+        yield* AtomRegistry.getResult(registry, harness.atom, {
+          suspendOnWaiting: true,
+        }),
+      ).toBe("recovered");
+    }),
   );
 
   it.effect("retains the last successful value while reconnecting", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const refreshStarted = Latch.makeUnsafe();
-        const finishRefresh = Latch.makeUnsafe();
-        let executions = 0;
-        const execute = Effect.suspend(() => {
-          executions += 1;
-          if (executions === 1) {
-            return Effect.succeed("cached");
-          }
-          refreshStarted.openUnsafe();
-          return finishRefresh.await.pipe(Effect.as("updated"));
-        });
-        const harness = yield* makeEnvironmentQueryHarness(execute);
-        const registry = yield* mountEnvironmentQuery(harness.atom);
+    Effect.gen(function* () {
+      const refreshStarted = Latch.makeUnsafe();
+      const finishRefresh = Latch.makeUnsafe();
+      let executions = 0;
+      const execute = Effect.suspend(() => {
+        executions += 1;
+        if (executions === 1) {
+          return Effect.succeed("cached");
+        }
+        refreshStarted.openUnsafe();
+        return finishRefresh.await.pipe(Effect.as("updated"));
+      });
+      const harness = yield* makeEnvironmentQueryHarness(execute);
+      const registry = yield* mountEnvironmentQuery(harness.atom);
 
-        expect(
-          yield* AtomRegistry.getResult(registry, harness.atom, {
-            suspendOnWaiting: true,
-          }),
-        ).toBe("cached");
+      expect(
+        yield* AtomRegistry.getResult(registry, harness.atom, {
+          suspendOnWaiting: true,
+        }),
+      ).toBe("cached");
 
-        yield* SubscriptionRef.set(
-          harness.supervisorState,
-          queryConnectionState({ phase: "connecting", stage: "opening" }),
-        );
-        yield* Effect.yieldNow;
-        expect(registry.get(harness.atom)).toMatchObject({
-          _tag: "Success",
-          value: "cached",
-          waiting: true,
-        });
+      yield* SubscriptionRef.set(
+        harness.supervisorState,
+        queryConnectionState({ phase: "connecting", stage: "opening" }),
+      );
+      yield* Effect.yieldNow;
+      expect(registry.get(harness.atom)).toMatchObject({
+        _tag: "Success",
+        value: "cached",
+        waiting: true,
+      });
 
-        yield* SubscriptionRef.set(
-          harness.supervisorState,
-          queryConnectionState({
-            phase: "backoff",
-            stage: null,
-            lastFailure: new ConnectionTransientError({
-              reason: "transport",
-              detail: "Retrying.",
-            }),
-            retryAt: 1,
+      yield* SubscriptionRef.set(
+        harness.supervisorState,
+        queryConnectionState({
+          phase: "backoff",
+          stage: null,
+          lastFailure: new ConnectionTransientError({
+            reason: "transport",
+            detail: "Retrying.",
           }),
-        );
-        yield* Effect.yieldNow;
-        expect(registry.get(harness.atom)).toMatchObject({
-          _tag: "Success",
-          value: "cached",
-          waiting: true,
-        });
+          retryAt: 1,
+        }),
+      );
+      yield* Effect.yieldNow;
+      expect(registry.get(harness.atom)).toMatchObject({
+        _tag: "Success",
+        value: "cached",
+        waiting: true,
+      });
 
-        yield* SubscriptionRef.set(
-          harness.supervisorState,
-          queryConnectionState({ generation: 2 }),
-        );
-        yield* refreshStarted.await;
-        expect(registry.get(harness.atom)).toMatchObject({
-          _tag: "Success",
-          value: "cached",
-          waiting: true,
-        });
+      yield* SubscriptionRef.set(harness.supervisorState, queryConnectionState({ generation: 2 }));
+      yield* refreshStarted.await;
+      expect(registry.get(harness.atom)).toMatchObject({
+        _tag: "Success",
+        value: "cached",
+        waiting: true,
+      });
 
-        finishRefresh.openUnsafe();
-        expect(
-          yield* AtomRegistry.getResult(registry, harness.atom, {
-            suspendOnWaiting: true,
-          }),
-        ).toBe("updated");
-      }),
-    ),
+      finishRefresh.openUnsafe();
+      expect(
+        yield* AtomRegistry.getResult(registry, harness.atom, {
+          suspendOnWaiting: true,
+        }),
+      ).toBe("updated");
+    }),
   );
 
   it.effect("filesystem browse lists the directory afresh when a picker reopens it", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const harness = yield* makeEnvironmentQueryHarness(Effect.void);
-        const entry = (name: string): FilesystemBrowseEntry => ({
-          name,
-          fullPath: `/tmp/t3-11476-repro/${name}`,
-        });
-        let onDisk = [entry("existing")];
-        const client = {
-          [WS_METHODS.filesystemBrowse]: () =>
-            Effect.sync(() => ({ parentPath: "/tmp/t3-11476-repro/", entries: onDisk })),
-        } as unknown as RpcSession.RpcSession["client"];
-        yield* SubscriptionRef.set(
-          harness.supervisorSession,
-          Option.some({ ...QUERY_RPC_SESSION, client }),
-        );
-        const atom = createFilesystemEnvironmentAtoms(harness.runtime).browse({
-          environmentId: QUERY_ENVIRONMENT.environmentId,
-          input: { partialPath: "/tmp/t3-11476-repro/" },
-        });
-        const registry = AtomRegistry.make();
-        yield* Effect.addFinalizer(() => Effect.sync(() => registry.dispose()));
-        // Stale-while-revalidate refreshes from a task on the registry scheduler;
-        // queue behind it so the read sees the revalidation instead of racing it.
-        const afterScheduledTasks = Effect.callback<void>((resume) => {
-          registry.schedulerAsync.makeDispatcher().scheduleTask(() => resume(Effect.void), 0);
-        });
-        const listNames = afterScheduledTasks.pipe(
-          Effect.andThen(readEnvironmentQuery(registry, atom)),
-          Effect.map((result) => result.entries.map((browseEntry) => browseEntry.name)),
-        );
+    Effect.gen(function* () {
+      const harness = yield* makeEnvironmentQueryHarness(Effect.void);
+      const entry = (name: string): FilesystemBrowseEntry => ({
+        name,
+        fullPath: `/tmp/t3-11476-repro/${name}`,
+      });
+      let onDisk = [entry("existing")];
+      const client = {
+        [WS_METHODS.filesystemBrowse]: () =>
+          Effect.sync(() => ({ parentPath: "/tmp/t3-11476-repro/", entries: onDisk })),
+      } as unknown as RpcSession.RpcSession["client"];
+      yield* SubscriptionRef.set(
+        harness.supervisorSession,
+        Option.some({ ...QUERY_RPC_SESSION, client }),
+      );
+      const atom = createFilesystemEnvironmentAtoms(harness.runtime).browse({
+        environmentId: QUERY_ENVIRONMENT.environmentId,
+        input: { partialPath: "/tmp/t3-11476-repro/" },
+      });
+      const registry = AtomRegistry.make();
+      yield* Effect.addFinalizer(() => Effect.sync(() => registry.dispose()));
+      // Stale-while-revalidate refreshes from a task on the registry scheduler;
+      // queue behind it so the read sees the revalidation instead of racing it.
+      const afterScheduledTasks = Effect.callback<void>((resume) => {
+        registry.schedulerAsync.makeDispatcher().scheduleTask(() => resume(Effect.void), 0);
+      });
+      const listNames = afterScheduledTasks.pipe(
+        Effect.andThen(readEnvironmentQuery(registry, atom)),
+        Effect.map((result) => result.entries.map((browseEntry) => browseEntry.name)),
+      );
 
-        const closePicker = registry.mount(atom);
-        expect(yield* listNames).toEqual(["existing"]);
-        closePicker();
-        // A closed picker stays closed past the registry's scheduled node
-        // removal; a remount within the same tick keeps the live node.
-        yield* afterScheduledTasks;
+      const closePicker = registry.mount(atom);
+      expect(yield* listNames).toEqual(["existing"]);
+      closePicker();
+      // A closed picker stays closed past the registry's scheduled node
+      // removal; a remount within the same tick keeps the live node.
+      yield* afterScheduledTasks;
 
-        onDisk = [entry("created-externally"), entry("existing")];
-        registry.mount(atom);
-        expect(yield* listNames).toEqual(["created-externally", "existing"]);
-      }),
-    ),
+      onDisk = [entry("created-externally"), entry("existing")];
+      registry.mount(atom);
+      expect(yield* listNames).toEqual(["created-externally", "existing"]);
+    }),
   );
 
   it.effect("refreshes on its trigger while read, and once on its next read when idle", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        let executions = 0;
-        const trigger = Atom.make(0).pipe(Atom.keepAlive);
-        const harness = yield* makeEnvironmentQueryHarness(
-          Effect.sync(() => (executions += 1)),
-          { refreshTrigger: trigger },
-        );
-        const registry = AtomRegistry.make();
-        yield* Effect.addFinalizer(() => Effect.sync(() => registry.dispose()));
-        const read = readEnvironmentQuery(registry, harness.atom);
+    Effect.gen(function* () {
+      let executions = 0;
+      const trigger = Atom.make(0).pipe(Atom.keepAlive);
+      const harness = yield* makeEnvironmentQueryHarness(
+        Effect.sync(() => (executions += 1)),
+        { refreshTrigger: trigger },
+      );
+      const registry = AtomRegistry.make();
+      yield* Effect.addFinalizer(() => Effect.sync(() => registry.dispose()));
+      const read = readEnvironmentQuery(registry, harness.atom);
 
-        const unmount = registry.mount(harness.atom);
-        expect(yield* read).toBe(1);
-        registry.set(trigger, 1);
-        expect(yield* read).toBe(2);
+      const unmount = registry.mount(harness.atom);
+      expect(yield* read).toBe(1);
+      registry.set(trigger, 1);
+      expect(yield* read).toBe(2);
+
+      unmount();
+      registry.set(trigger, 2);
+      registry.set(trigger, 3);
+      expect(executions).toBe(2);
 
+      expect(yield* read).toBe(3);
+    }),
+  );
+
+  it.effect("refetches when mounted again after its stale time, while still cached", () =>
+    Effect.gen(function* () {
+      let now = 0;
+      using _now = vi.spyOn(Date, "now").mockImplementation(() => now);
+      let contents = "before edit";
+      let fetches = 0;
+      const harness = yield* makeEnvironmentQueryHarness(
+        Effect.sync(() => {
+          fetches += 1;
+          return contents;
+        }),
+      );
+      const registry = AtomRegistry.make();
+      yield* Effect.addFinalizer(() => Effect.sync(() => registry.dispose()));
+      const read = readEnvironmentQuery(registry, harness.atom);
+      const remount = Effect.gen(function* () {
+        const unmount = registry.mount(harness.atom);
+        yield* Effect.yieldNow;
+        const value = yield* read;
         unmount();
-        registry.set(trigger, 2);
-        registry.set(trigger, 3);
-        expect(executions).toBe(2);
+        yield* Effect.yieldNow;
+        return value;
+      });
 
-        expect(yield* read).toBe(3);
-      }),
-    ),
+      expect(yield* remount).toBe("before edit");
+      contents = "after edit";
+
+      // Inside the harness's 60s stale time: the cached value stands.
+      now = 30_000;
+      expect(yield* remount).toBe("before edit");
+      expect(fetches).toBe(1);
+
+      // Past the stale time, well inside the default 5 minute idle TTL.
+      now = 61_000;
+      expect(yield* remount).toBe("after edit");
+      expect(fetches).toBe(2);
+    }),
+  );
+
+  it.effect("keeps its cache when collected while unmounted, inside its stale time", () =>
+    Effect.gen(function* () {
+      NodeV8.setFlagsFromString("--expose-gc");
+      const gc = NodeVM.runInNewContext("gc") as () => void;
+      using _now = vi.spyOn(Date, "now").mockReturnValue(0);
+      let fetches = 0;
+      const harness = yield* makeEnvironmentQueryHarness(
+        Effect.sync(() => {
+          fetches += 1;
+          return fetches;
+        }),
+      );
+      const registry = AtomRegistry.make();
+      yield* Effect.addFinalizer(() => Effect.sync(() => registry.dispose()));
+      // `Atom.family` holds members weakly, so the test must hold none: another environment
+      // than `harness.atom`'s, which the harness holds.
+      const environmentId = EnvironmentId.make("unheld-environment");
+      const query = () => harness.family({ environmentId, input: undefined });
+      const first = new WeakRef(query());
+      const remount = Effect.gen(function* () {
+        const unmount = registry.mount(query());
+        yield* Effect.yieldNow;
+        const value = yield* readEnvironmentQuery(registry, query());
+        unmount();
+        return value;
+      });
+      // A WeakRef target survives until the current job ends, so collect after it.
+      const collect = Effect.yieldNow.pipe(Effect.andThen(Effect.sync(gc)));
+
+      expect(yield* remount).toBe(1);
+      yield* collect;
+      expect(yield* remount).toBe(1);
+      yield* collect;
+      expect(first.deref()).toBe(query());
+      expect(fetches).toBe(1);
+    }),
   );
 
   it.effect.each([true, false])("loads thread link metadata with server support %s", (supported) =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const projectId = ProjectId.make("project");
-        const tag = supported
-          ? ORCHESTRATION_V2_WS_METHODS.getThreadLinkMetadata
-          : ORCHESTRATION_V2_WS_METHODS.getThreadTitles;
-        const harness = yield* makeEnvironmentQueryHarness(Effect.void, {
-          rpcSession: {
-            initialConfig: Effect.succeed({ threadLinkMetadata: supported }),
-            client: {
-              [tag]: () =>
-                Effect.succeed(
-                  supported ? { fork: { title: "Fork", projectId } } : { fork: "Fork" },
-                ),
-            },
-          } as unknown as RpcSession.RpcSession,
-        });
-        const runtime = harness.runtime as unknown as Atom.AtomRuntime<
-          EnvironmentRegistry.EnvironmentRegistry | HttpClient.HttpClient
-        >;
-        const atom = createOrchestrationEnvironmentAtoms(runtime).threadLinkMetadata({
-          environmentId: QUERY_ENVIRONMENT.environmentId,
-          input: { threadIds: [ThreadId.make("fork")] },
-        });
-        const registry = yield* mountEnvironmentQuery(atom);
-        expect(yield* readEnvironmentQuery(registry, atom)).toEqual({
-          fork: { title: "Fork", projectId: supported ? projectId : null },
-        });
-      }),
-    ),
+    Effect.gen(function* () {
+      const projectId = ProjectId.make("project");
+      const tag = supported
+        ? ORCHESTRATION_V2_WS_METHODS.getThreadLinkMetadata
+        : ORCHESTRATION_V2_WS_METHODS.getThreadTitles;
+      const harness = yield* makeEnvironmentQueryHarness(Effect.void, {
+        rpcSession: {
+          initialConfig: Effect.succeed({ threadLinkMetadata: supported }),
+          client: {
+            [tag]: () =>
+              Effect.succeed(supported ? { fork: { title: "Fork", projectId } } : { fork: "Fork" }),
+          },
+        } as unknown as RpcSession.RpcSession,
+      });
+      const runtime = harness.runtime as unknown as Atom.AtomRuntime<
+        EnvironmentRegistry.EnvironmentRegistry | HttpClient.HttpClient
+      >;
+      const atom = createOrchestrationEnvironmentAtoms(runtime).threadLinkMetadata({
+        environmentId: QUERY_ENVIRONMENT.environmentId,
+        input: { threadIds: [ThreadId.make("fork")] },
+      });
+      const registry = yield* mountEnvironmentQuery(atom);
+      expect(yield* readEnvironmentQuery(registry, atom)).toEqual({
+        fork: { title: "Fork", projectId: supported ? projectId : null },
+      });
+    }),
   );
 
   it.effect("re-checks thread titles when one of their threads leaves the shell", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const requests = yield* Queue.unbounded<Deferred.Deferred<Record<string, string>>>();
-        const harness = yield* makeEnvironmentQueryHarness(Effect.void, {
-          rpcSession: {
-            client: {
-              [ORCHESTRATION_V2_WS_METHODS.getThreadTitles]: () =>
-                Effect.gen(function* () {
-                  const answer = yield* Deferred.make<Record<string, string>>();
-                  yield* Queue.offer(requests, answer);
-                  return yield* Deferred.await(answer);
-                }),
-            },
-          } as unknown as RpcSession.RpcSession,
-        });
-        const shellState = Atom.make<Pick<EnvironmentShellState, "removedAt">>({
-          removedAt: new Map(),
-        }).pipe(Atom.keepAlive);
-        const removed = (entries: ReadonlyArray<readonly [string, number]>) => ({
-          removedAt: new Map(entries.map(([id, sequence]) => [ThreadId.make(id), sequence])),
-        });
-        // Thread titles never use the HTTP client.
-        const runtime = harness.runtime as unknown as Atom.AtomRuntime<
-          EnvironmentRegistry.EnvironmentRegistry | HttpClient.HttpClient
-        >;
-        const atom = createOrchestrationEnvironmentAtoms(runtime, {
-          shellState: () => shellState,
-        }).threadTitles({
-          environmentId: QUERY_ENVIRONMENT.environmentId,
-          input: { threadIds: [ThreadId.make("fork")] },
-        });
-        const registry = yield* mountEnvironmentQuery(atom);
-        const settled: Array<Record<string, string>> = [];
-        const unsubscribe = registry.subscribe(atom, (result) => {
-          if (AsyncResult.isSuccess(result) && !result.waiting) settled.push(result.value);
-        });
-        yield* Effect.addFinalizer(() => Effect.sync(unsubscribe));
-
-        yield* Deferred.succeed(yield* Queue.take(requests), { fork: "Fork" });
-        expect(yield* readEnvironmentQuery(registry, atom)).toEqual({ fork: "Fork" });
-
-        registry.set(shellState, removed([["other", 5]]));
-        expect(registry.get(atom).waiting).toBe(false);
-
-        // Archiving and then deleting the fork both remove it from the shell.
-        registry.set(shellState, removed([["fork", 6]]));
-        const beforeDelete = yield* Queue.take(requests);
-        registry.set(shellState, removed([["fork", 7]]));
-        const afterDelete = yield* Queue.take(requests);
-        yield* Deferred.succeed(beforeDelete, { fork: "Fork" });
-        yield* Deferred.succeed(afterDelete, {});
-        expect(yield* readEnvironmentQuery(registry, atom)).toEqual({});
-        expect(settled).toEqual([{ fork: "Fork" }, {}]);
-      }),
-    ),
+    Effect.gen(function* () {
+      const requests = yield* Queue.unbounded<Deferred.Deferred<Record<string, string>>>();
+      const harness = yield* makeEnvironmentQueryHarness(Effect.void, {
+        rpcSession: {
+          client: {
+            [ORCHESTRATION_V2_WS_METHODS.getThreadTitles]: () =>
+              Effect.gen(function* () {
+                const answer = yield* Deferred.make<Record<string, string>>();
+                yield* Queue.offer(requests, answer);
+                return yield* Deferred.await(answer);
+              }),
+          },
+        } as unknown as RpcSession.RpcSession,
+      });
+      const shellState = Atom.make<Pick<EnvironmentShellState, "removedAt">>({
+        removedAt: new Map(),
+      }).pipe(Atom.keepAlive);
+      const removed = (entries: ReadonlyArray<readonly [string, number]>) => ({
+        removedAt: new Map(entries.map(([id, sequence]) => [ThreadId.make(id), sequence])),
+      });
+      // Thread titles never use the HTTP client.
+      const runtime = harness.runtime as unknown as Atom.AtomRuntime<
+        EnvironmentRegistry.EnvironmentRegistry | HttpClient.HttpClient
+      >;
+      const atom = createOrchestrationEnvironmentAtoms(runtime, {
+        shellState: () => shellState,
+      }).threadTitles({
+        environmentId: QUERY_ENVIRONMENT.environmentId,
+        input: { threadIds: [ThreadId.make("fork")] },
+      });
+      const registry = yield* mountEnvironmentQuery(atom);
+      const settled: Array<Record<string, string>> = [];
+      const unsubscribe = registry.subscribe(atom, (result) => {
+        if (AsyncResult.isSuccess(result) && !result.waiting) settled.push(result.value);
+      });
+      yield* Effect.addFinalizer(() => Effect.sync(unsubscribe));
+
+      yield* Deferred.succeed(yield* Queue.take(requests), { fork: "Fork" });
+      expect(yield* readEnvironmentQuery(registry, atom)).toEqual({ fork: "Fork" });
+
+      registry.set(shellState, removed([["other", 5]]));
+      expect(registry.get(atom).waiting).toBe(false);
+
+      // Archiving and then deleting the fork both remove it from the shell.
+      registry.set(shellState, removed([["fork", 6]]));
+      const beforeDelete = yield* Queue.take(requests);
+      registry.set(shellState, removed([["fork", 7]]));
+      const afterDelete = yield* Queue.take(requests);
+      yield* Deferred.succeed(beforeDelete, { fork: "Fork" });
+      yield* Deferred.succeed(afterDelete, {});
+      expect(yield* readEnvironmentQuery(registry, atom)).toEqual({});
+      expect(settled).toEqual([{ fork: "Fork" }, {}]);
+    }),
   );
 });
 
@@ -1476,156 +1619,142 @@ describe("runtime command runner", () => {
 
 describe("persisted environment queries", () => {
   it.effect("keeps an in-memory cached page pending until revalidation settles", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const refreshStarted = Latch.makeUnsafe();
-        const finishRefresh = Latch.makeUnsafe();
-        let executions = 0;
-        const harness = yield* makeEnvironmentQueryHarness(
-          Effect.suspend(() => {
-            if (++executions === 1) return Effect.succeed("cached");
-            refreshStarted.openUnsafe();
-            return finishRefresh.await.pipe(Effect.as("fresh"));
-          }),
-          { persistence: { load: () => Effect.succeedNone, save: () => Effect.void } },
-        );
-        const registry = yield* mountEnvironmentQuery(harness.atom);
-        expect(yield* readEnvironmentQuery(registry, harness.atom)).toBe("cached");
-        registry.refresh(harness.atom);
-        yield* refreshStarted.await;
-        expect(registry.get(harness.atom)).toMatchObject({
-          _tag: "Success",
-          value: "cached",
-          waiting: true,
-        });
-        finishRefresh.openUnsafe();
-        expect(yield* readEnvironmentQuery(registry, harness.atom)).toBe("fresh");
-      }),
-    ),
+    Effect.gen(function* () {
+      const refreshStarted = Latch.makeUnsafe();
+      const finishRefresh = Latch.makeUnsafe();
+      let executions = 0;
+      const harness = yield* makeEnvironmentQueryHarness(
+        Effect.suspend(() => {
+          if (++executions === 1) return Effect.succeed("cached");
+          refreshStarted.openUnsafe();
+          return finishRefresh.await.pipe(Effect.as("fresh"));
+        }),
+        { persistence: { load: () => Effect.succeedNone, save: () => Effect.void } },
+      );
+      const registry = yield* mountEnvironmentQuery(harness.atom);
+      expect(yield* readEnvironmentQuery(registry, harness.atom)).toBe("cached");
+      registry.refresh(harness.atom);
+      yield* refreshStarted.await;
+      expect(registry.get(harness.atom)).toMatchObject({
+        _tag: "Success",
+        value: "cached",
+        waiting: true,
+      });
+      finishRefresh.openUnsafe();
+      expect(yield* readEnvironmentQuery(registry, harness.atom)).toBe("fresh");
+    }),
   );
 
   it.effect(
     "restores cached data in a new registry while offline, then refreshes on reconnect",
     () =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          let saved = Option.none<string>();
-          const saves = yield* Queue.unbounded<string>();
-          const persistence: QueryPersistence<string> = {
-            load: () => Effect.sync(() => saved),
-            save: (_environmentId, _key, value) =>
-              Effect.sync(() => {
-                saved = Option.some(value);
-              }).pipe(Effect.andThen(Queue.offer(saves, value))),
-          };
-          const first = yield* makeEnvironmentQueryHarness(Effect.succeed("first"), {
-            persistence,
-          });
-          const firstRegistry = yield* mountEnvironmentQuery(first.atom);
-          expect(yield* readEnvironmentQuery(firstRegistry, first.atom)).toBe("first");
-          expect(yield* Queue.take(saves)).toBe("first");
+      Effect.gen(function* () {
+        let saved = Option.none<string>();
+        const saves = yield* Queue.unbounded<string>();
+        const persistence: QueryPersistence<string> = {
+          load: () => Effect.sync(() => saved),
+          save: (_environmentId, _key, value) =>
+            Effect.sync(() => {
+              saved = Option.some(value);
+            }).pipe(Effect.andThen(Queue.offer(saves, value))),
+        };
+        const first = yield* makeEnvironmentQueryHarness(Effect.succeed("first"), {
+          persistence,
+        });
+        const firstRegistry = yield* mountEnvironmentQuery(first.atom);
+        expect(yield* readEnvironmentQuery(firstRegistry, first.atom)).toBe("first");
+        expect(yield* Queue.take(saves)).toBe("first");
 
-          const restarted = yield* makeEnvironmentQueryHarness(Effect.succeed("updated"), {
-            persistence,
-            initialState: queryConnectionState({ phase: "offline", network: "offline" }),
-          });
-          const registry = yield* mountEnvironmentQuery(restarted.atom);
-          expect(yield* readEnvironmentQuery(registry, restarted.atom)).toBe("first");
-          yield* SubscriptionRef.set(restarted.supervisorState, queryConnectionState());
-          yield* Effect.yieldNow;
-          expect(yield* readEnvironmentQuery(registry, restarted.atom)).toBe("updated");
-          expect(yield* Queue.take(saves)).toBe("updated");
-        }),
-      ),
+        const restarted = yield* makeEnvironmentQueryHarness(Effect.succeed("updated"), {
+          persistence,
+          initialState: queryConnectionState({ phase: "offline", network: "offline" }),
+        });
+        const registry = yield* mountEnvironmentQuery(restarted.atom);
+        expect(yield* readEnvironmentQuery(registry, restarted.atom)).toBe("first");
+        yield* SubscriptionRef.set(restarted.supervisorState, queryConnectionState());
+        yield* Effect.yieldNow;
+        expect(yield* readEnvironmentQuery(registry, restarted.atom)).toBe("updated");
+        expect(yield* Queue.take(saves)).toBe("updated");
+      }),
   );
 
   it.effect("answers readers while its save is pending, and ends the save with the query", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const saveEnded = Latch.makeUnsafe();
-        const harness = yield* makeEnvironmentQueryHarness(Effect.succeed("fresh"), {
-          persistence: {
-            load: () => Effect.succeedNone,
-            // The registry's scheduler stops on dispose, so signal synchronously.
-            save: () =>
-              Effect.never.pipe(
-                Effect.onInterrupt(() => Effect.sync(() => saveEnded.openUnsafe())),
-              ),
-          },
-        });
-        yield* Effect.scoped(
-          Effect.gen(function* () {
-            const registry = yield* mountEnvironmentQuery(harness.atom);
-            expect(yield* readEnvironmentQuery(registry, harness.atom)).toBe("fresh");
-          }),
-        );
-        yield* saveEnded.await;
-      }),
-    ),
+    Effect.gen(function* () {
+      const saveEnded = Latch.makeUnsafe();
+      const harness = yield* makeEnvironmentQueryHarness(Effect.succeed("fresh"), {
+        persistence: {
+          load: () => Effect.succeedNone,
+          // The registry's scheduler stops on dispose, so signal synchronously.
+          save: () =>
+            Effect.never.pipe(Effect.onInterrupt(() => Effect.sync(() => saveEnded.openUnsafe()))),
+        },
+      });
+      yield* Effect.scoped(
+        Effect.gen(function* () {
+          const registry = yield* mountEnvironmentQuery(harness.atom);
+          expect(yield* readEnvironmentQuery(registry, harness.atom)).toBe("fresh");
+        }),
+      );
+      yield* saveEnded.await;
+    }),
   );
 
   it.effect("hands each server answer to onAnswer before readers see it", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const answers: Array<readonly [string, string | null]> = [];
-        let served = 0;
-        const recorded = Atom.make<string | null>(null).pipe(Atom.keepAlive);
-        const harness = yield* makeEnvironmentQueryHarness(
-          Effect.sync(() => `answer-${++served}`),
-          {
-            onAnswer: (_target, value, registry) =>
-              Effect.sync(() => {
-                answers.push([value, registry.get(recorded)]);
-                registry.set(recorded, value);
-              }),
-          },
-        );
-        const registry = yield* mountEnvironmentQuery(harness.atom);
-        expect(yield* readEnvironmentQuery(registry, harness.atom)).toBe("answer-1");
-        expect(registry.get(recorded)).toBe("answer-1");
-        registry.refresh(harness.atom);
-        expect(yield* readEnvironmentQuery(registry, harness.atom)).toBe("answer-2");
-        expect(answers).toEqual([
-          ["answer-1", null],
-          ["answer-2", "answer-1"],
-        ]);
-      }),
-    ),
+    Effect.gen(function* () {
+      const answers: Array<readonly [string, string | null]> = [];
+      let served = 0;
+      const recorded = Atom.make<string | null>(null).pipe(Atom.keepAlive);
+      const harness = yield* makeEnvironmentQueryHarness(
+        Effect.sync(() => `answer-${++served}`),
+        {
+          onAnswer: (_target, value, registry) =>
+            Effect.sync(() => {
+              answers.push([value, registry.get(recorded)]);
+              registry.set(recorded, value);
+            }),
+        },
+      );
+      const registry = yield* mountEnvironmentQuery(harness.atom);
+      expect(yield* readEnvironmentQuery(registry, harness.atom)).toBe("answer-1");
+      expect(registry.get(recorded)).toBe("answer-1");
+      registry.refresh(harness.atom);
+      expect(yield* readEnvironmentQuery(registry, harness.atom)).toBe("answer-2");
+      expect(answers).toEqual([
+        ["answer-1", null],
+        ["answer-2", "answer-1"],
+      ]);
+    }),
   );
 
   it.effect("does not hand a value restored from persistence to onAnswer", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const answers: Array<string> = [];
-        const harness = yield* makeEnvironmentQueryHarness(Effect.succeed("server"), {
-          persistence: { load: () => Effect.succeedSome("cached"), save: () => Effect.void },
-          initialState: queryConnectionState({ phase: "offline", network: "offline" }),
-          onAnswer: (_target, value) => Effect.sync(() => answers.push(value)),
-        });
-        const registry = yield* mountEnvironmentQuery(harness.atom);
-        expect(yield* readEnvironmentQuery(registry, harness.atom)).toBe("cached");
-        expect(answers).toEqual([]);
-        yield* SubscriptionRef.set(harness.supervisorState, queryConnectionState());
-        yield* Effect.yieldNow;
-        expect(yield* readEnvironmentQuery(registry, harness.atom)).toBe("server");
-        expect(answers).toEqual(["server"]);
-      }),
-    ),
+    Effect.gen(function* () {
+      const answers: Array<string> = [];
+      const harness = yield* makeEnvironmentQueryHarness(Effect.succeed("server"), {
+        persistence: { load: () => Effect.succeedSome("cached"), save: () => Effect.void },
+        initialState: queryConnectionState({ phase: "offline", network: "offline" }),
+        onAnswer: (_target, value) => Effect.sync(() => answers.push(value)),
+      });
+      const registry = yield* mountEnvironmentQuery(harness.atom);
+      expect(yield* readEnvironmentQuery(registry, harness.atom)).toBe("cached");
+      expect(answers).toEqual([]);
+      yield* SubscriptionRef.set(harness.supervisorState, queryConnectionState());
+      yield* Effect.yieldNow;
+      expect(yield* readEnvironmentQuery(registry, harness.atom)).toBe("server");
+      expect(answers).toEqual(["server"]);
+    }),
   );
 
   it.effect("keeps cached content available when revalidation fails", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const harness = yield* makeEnvironmentQueryHarness(
-          Effect.fail(new TestQueryError({ message: "failed" })),
-          {
-            persistence: { load: () => Effect.succeedSome("cached"), save: () => Effect.void },
-          },
-        );
-        const registry = yield* mountEnvironmentQuery(harness.atom);
-        yield* Effect.result(readEnvironmentQuery(registry, harness.atom));
-        expect(AsyncResult.getOrElse(registry.get(harness.atom), () => null)).toBe("cached");
-      }),
-    ),
+    Effect.gen(function* () {
+      const harness = yield* makeEnvironmentQueryHarness(
+        Effect.fail(new TestQueryError({ message: "failed" })),
+        {
+          persistence: { load: () => Effect.succeedSome("cached"), save: () => Effect.void },
+        },
+      );
+      const registry = yield* mountEnvironmentQuery(harness.atom);
+      yield* Effect.result(readEnvironmentQuery(registry, harness.atom));
+      expect(AsyncResult.getOrElse(registry.get(harness.atom), () => null)).toBe("cached");
+    }),
   );
 });
diff --git a/packages/client-runtime/src/state/runtime.ts b/packages/client-runtime/src/state/runtime.ts
index 1d3c07a00f57..736b10fdeeac 100644
--- a/packages/client-runtime/src/state/runtime.ts
+++ b/packages/client-runtime/src/state/runtime.ts
@@ -11,7 +11,6 @@ import {
 import * as Cause from "effect/Cause";
 import * as Effect from "effect/Effect";
 import * as Exit from "effect/Exit";
-import { identity } from "effect/Function";
 import * as Option from "effect/Option";
 import * as Schema from "effect/Schema";
 import * as Stream from "effect/Stream";
@@ -97,13 +96,6 @@ interface EnvironmentQueryAtomOptions<Input, A, E, R> extends Omit<
   readonly persistence?: QueryPersistence<A>;
   readonly staleTimeMs?: number;
   readonly idleTtlMs?: number;
-  /**
-   * Check staleness each time the query is mounted again. By default the idle
-   * TTL keeps the stale-while-revalidate node warm, so a remount within it
-   * reads the cached value without checking. The cached value still shows
-   * while the query revalidates.
-   */
-  readonly revalidateOnRemount?: boolean;
   readonly refreshIntervalMs?: number;
   readonly refreshTrigger?: (target: {
     readonly environmentId: EnvironmentIdType;
@@ -567,6 +559,45 @@ const refreshEveryUntilFinal =
       { initialValueTarget: self },
     );
 
+const isStale = (result: AsyncResult.AsyncResult<unknown, unknown>, staleTimeMs: number) => {
+  if (result.waiting) return false;
+  const success =
+    result._tag === "Failure" ? Option.getOrUndefined(result.previousSuccess) : result;
+  if (success?._tag !== "Success") return result._tag === "Failure";
+  // @effect-diagnostics-next-line globalDate:off - `AsyncResult` timestamps come from `Date.now`.
+  return Date.now() - success.timestamp >= staleTimeMs;
+};
+
+/**
+ * Stale-while-revalidate on every mount. `Atom.swr` checks only when its node builds, which an idle
+ * TTL skips on a remount; this layer has no TTL (a transform drops it) while `self` keeps the cache.
+ * It reads `self` as a dependency, not a subscription, so `self` goes idle with its last reader.
+ */
+const revalidateOnMount =
+  (staleTimeMs: number) =>
+  <A, E>(
+    self: Atom.Atom<AsyncResult.AsyncResult<A, E>>,
+  ): Atom.Atom<AsyncResult.AsyncResult<A, E>> =>
+    Atom.transform(
+      self,
+      (get) => {
+        const current = get(self);
+        if (Option.isNone(get.self()) && isStale(current, staleTimeMs)) {
+          let active = true;
+          get.addFinalizer(() => {
+            active = false;
+          });
+          // Deferred out of the build, which runs while React renders. A plain read drops this
+          // node before the task runs, so only a mount refetches.
+          get.registry.schedulerAsync.makeDispatcher().scheduleTask(() => {
+            if (active && isStale(get.once(self), staleTimeMs)) get.refresh(self);
+          }, 0);
+        }
+        return current;
+      },
+      { initialValueTarget: self },
+    );
+
 /**
  * A query result's data alone. A refetch always publishes a new result (a new
  * timestamp, `waiting` on and off), while equal data keeps its identity, so a
@@ -619,6 +650,13 @@ function environmentConnectionAtoms<R, ER>(
   return family;
 }
 
+export function environmentConnectionAtom<R, ER>(
+  runtime: Atom.AtomRuntime<EnvironmentRegistry.EnvironmentRegistry | R, ER>,
+  environmentId: EnvironmentIdType,
+) {
+  return environmentConnectionAtoms(runtime)(environmentId);
+}
+
 const sessionGenerationAtomsByRuntime = new WeakMap<
   object,
   (environmentId: EnvironmentIdType) => Atom.Atom<number>
@@ -678,15 +716,12 @@ export function createEnvironmentQueryAtomFamily<R, ER, Input, A, E>(
   readonly input: Input;
 }) => Atom.Atom<AsyncResult.AsyncResult<A, E | ER | Error>> {
   const connectionAtom = environmentConnectionAtoms(runtime);
+  // `Atom.family` holds members weakly and the mounted layer has no TTL, so each member lives
+  // as long as its cache: keyed weakly, this lets both go once the cache's TTL ends.
+  const membersByCache = new WeakMap<Atom.Atom<unknown>, Atom.Atom<unknown>>();
   const family = Atom.family((key: string) => {
     const target = parseEnvironmentRpcKey<Input>(key);
     const idleTtlMs = options.idleTtlMs ?? 5 * 60_000;
-    // `Atom.swr` checks staleness only when its node builds. To revalidate on
-    // remount, the wrappers drop on unmount and the source alone keeps the
-    // cached value warm.
-    const keepWarm = Atom.setIdleTTL(idleTtlMs);
-    const keepSourceWarm = options.revalidateOnRemount ? keepWarm : identity;
-    const keepWrapperWarm = options.revalidateOnRemount ? identity : keepWarm;
     const queryAtom = runtime
       .atom<
         A,
@@ -810,14 +845,7 @@ export function createEnvironmentQueryAtomFamily<R, ER, Input, A, E>(
           );
         });
       })
-      .pipe(
-        keepSourceWarm,
-        Atom.swr({
-          staleTime: options.staleTimeMs ?? 30_000,
-          revalidateOnMount: true,
-        }),
-        keepWrapperWarm,
-      );
+      .pipe(Atom.setIdleTTL(idleTtlMs));
     const isFinal = (result: AsyncResult.AsyncResult<A, unknown>) =>
       options.isFinal !== undefined && Option.exists(AsyncResult.value(result), options.isFinal);
     const intervalQuery =
@@ -825,11 +853,17 @@ export function createEnvironmentQueryAtomFamily<R, ER, Input, A, E>(
         ? queryAtom
         : queryAtom.pipe(refreshEveryUntilFinal(options.refreshIntervalMs, isFinal));
     const refreshTrigger = options.refreshTrigger?.(target);
-    return (
+    const cache = (
       refreshTrigger === undefined
         ? intervalQuery
         : intervalQuery.pipe(refreshOnSignalWhileRead(refreshTrigger, isFinal))
-    ).pipe(keepWrapperWarm, Atom.withLabel(`${options.label}:${key}`));
+    ).pipe(Atom.setIdleTTL(idleTtlMs));
+    const member = cache.pipe(
+      revalidateOnMount(options.staleTimeMs ?? 30_000),
+      Atom.withLabel(`${options.label}:${key}`),
+    );
+    membersByCache.set(cache, member);
+    return member;
   });
   return (target) => family(environmentRpcKey(target));
 }
@@ -927,7 +961,6 @@ export function createEnvironmentRpcQueryAtomFamily<
     readonly persistence?: QueryPersistence<EnvironmentRpcSuccess<TTag>>;
     readonly staleTimeMs?: number;
     readonly idleTtlMs?: number;
-    readonly revalidateOnRemount?: boolean;
     readonly refreshIntervalMs?: number;
     readonly refreshTrigger?: (target: {
       readonly environmentId: EnvironmentIdType;
@@ -942,9 +975,6 @@ export function createEnvironmentRpcQueryAtomFamily<
     ...(options.persistence === undefined ? {} : { persistence: options.persistence }),
     ...(options.staleTimeMs === undefined ? {} : { staleTimeMs: options.staleTimeMs }),
     ...(options.idleTtlMs === undefined ? {} : { idleTtlMs: options.idleTtlMs }),
-    ...(options.revalidateOnRemount === undefined
-      ? {}
-      : { revalidateOnRemount: options.revalidateOnRemount }),
     ...(options.refreshIntervalMs === undefined
       ? {}
       : { refreshIntervalMs: options.refreshIntervalMs }),
diff --git a/packages/client-runtime/src/state/server.test.ts b/packages/client-runtime/src/state/server.test.ts
index f631429d10c6..daec4ac7087e 100644
--- a/packages/client-runtime/src/state/server.test.ts
+++ b/packages/client-runtime/src/state/server.test.ts
@@ -393,7 +393,7 @@ describe("accepted server update recovery", () => {
       expect(registry.get(serverUpdateStateAtom(TARGET.environmentId))).toEqual({
         status: "idle",
       });
-    }).pipe(Effect.scoped),
+    }),
   );
 });
 
@@ -1597,96 +1597,84 @@ describe("launcher update resume", () => {
   };
 
   it.effect("fails promptly when a server the launcher did not start comes back", () =>
-    Effect.scoped(
+    Effect.gen(function* () {
+      const update = yield* launchUpdate({
+        accepting: Stream.make(ACCEPTING),
+        resumed: after("1 second", ACCEPTING).pipe(Stream.concat(after("1 minute", REPLACEMENT))),
+      });
+      yield* update.resumeSubscribed;
+
+      yield* TestClock.adjust("1 second");
+      expect(update.state()).toMatchObject({ status: "running", stage: "resuming" });
+      yield* TestClock.adjust("1 minute");
+      expect(update.state()).toEqual(UNCOMMITTED_RESUME);
+    }),
+  );
+
+  it.effect(
+    "fails promptly when the accepting server's replay arrives after a quick acknowledgement",
+    () =>
       Effect.gen(function* () {
         const update = yield* launchUpdate({
-          accepting: Stream.make(ACCEPTING),
-          resumed: after("1 second", ACCEPTING).pipe(Stream.concat(after("1 minute", REPLACEMENT))),
+          accepting: after("3 seconds", ACCEPTING),
+          resumed: after("1 second", REPLACEMENT),
         });
+        yield* update.started;
+        yield* TestClock.adjust("3 seconds");
         yield* update.resumeSubscribed;
 
-        yield* TestClock.adjust("1 second");
-        expect(update.state()).toMatchObject({ status: "running", stage: "resuming" });
         yield* TestClock.adjust("1 minute");
         expect(update.state()).toEqual(UNCOMMITTED_RESUME);
       }),
-    ),
-  );
-
-  it.effect(
-    "fails promptly when the accepting server's replay arrives after a quick acknowledgement",
-    () =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const update = yield* launchUpdate({
-            accepting: after("3 seconds", ACCEPTING),
-            resumed: after("1 second", REPLACEMENT),
-          });
-          yield* update.started;
-          yield* TestClock.adjust("3 seconds");
-          yield* update.resumeSubscribed;
-
-          yield* TestClock.adjust("1 minute");
-          expect(update.state()).toEqual(UNCOMMITTED_RESUME);
-        }),
-      ),
   );
 
   it.effect(
     "waits for this update's outcome when a reconnect lands between the baseline and the request",
     () =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const update = yield* launchUpdate({
-            reconnectAfterBaseline: true,
-            accepting: Stream.make(ACCEPTING),
-            // The process that accepted the update over the new session replays its own ready first.
-            resumed: after("1 second", ready("2026-08-01T00:01:00.000Z", "0.0.30")).pipe(
-              Stream.concat(
-                after(
-                  "1 minute",
-                  ready(
-                    "2026-08-01T00:05:00.000Z",
-                    "0.0.31",
-                    committed("update-1", "0.0.30", "0.0.31"),
-                  ),
+      Effect.gen(function* () {
+        const update = yield* launchUpdate({
+          reconnectAfterBaseline: true,
+          accepting: Stream.make(ACCEPTING),
+          // The process that accepted the update over the new session replays its own ready first.
+          resumed: after("1 second", ready("2026-08-01T00:01:00.000Z", "0.0.30")).pipe(
+            Stream.concat(
+              after(
+                "1 minute",
+                ready(
+                  "2026-08-01T00:05:00.000Z",
+                  "0.0.31",
+                  committed("update-1", "0.0.30", "0.0.31"),
                 ),
               ),
             ),
-          });
-          yield* update.resumeSubscribed;
+          ),
+        });
+        yield* update.resumeSubscribed;
 
-          yield* TestClock.adjust("1 second");
-          expect(update.state()).toMatchObject({ status: "running", stage: "resuming" });
-          yield* TestClock.adjust("1 minute");
-          expect(update.state()).toMatchObject({ status: "idle" });
-        }),
-      ),
+        yield* TestClock.adjust("1 second");
+        expect(update.state()).toMatchObject({ status: "running", stage: "resuming" });
+        yield* TestClock.adjust("1 minute");
+        expect(update.state()).toMatchObject({ status: "idle" });
+      }),
   );
 
   it.effect(
     "sends the update without a baseline when the accepting server never replays ready",
     () =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const update = yield* launchUpdate({
-            accepting: Stream.never,
-            resumed: after(
-              "1 second",
-              ready(
-                "2026-08-01T00:05:00.000Z",
-                "0.0.31",
-                committed("update-1", "0.0.30", "0.0.31"),
-              ),
-            ),
-          });
-          yield* update.started;
+      Effect.gen(function* () {
+        const update = yield* launchUpdate({
+          accepting: Stream.never,
+          resumed: after(
+            "1 second",
+            ready("2026-08-01T00:05:00.000Z", "0.0.31", committed("update-1", "0.0.30", "0.0.31")),
+          ),
+        });
+        yield* update.started;
 
-          yield* TestClock.adjust("5 seconds");
-          yield* TestClock.adjust("1 second");
-          expect(update.state()).toMatchObject({ status: "idle" });
-        }),
-      ),
+        yield* TestClock.adjust("5 seconds");
+        yield* TestClock.adjust("1 second");
+        expect(update.state()).toMatchObject({ status: "idle" });
+      }),
   );
 });
 
@@ -1768,7 +1756,7 @@ describe("provider setup commands", () => {
         value: { driver: "antigravity" },
       });
       expect(yield* Queue.takeAll(requested)).toEqual(["antigravity"]);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("toggles a provider while another provider's update is still running", () =>
@@ -1840,7 +1828,7 @@ describe("provider setup commands", () => {
       );
       yield* TestClock.adjust(Duration.seconds(1));
       expect(yield* Fiber.join(saved)).toBe(true);
-    }).pipe(Effect.scoped),
+    }),
   );
 });
 
diff --git a/packages/client-runtime/src/state/server.ts b/packages/client-runtime/src/state/server.ts
index 5a42d07c9b34..55fd0c928280 100644
--- a/packages/client-runtime/src/state/server.ts
+++ b/packages/client-runtime/src/state/server.ts
@@ -9,6 +9,7 @@ import {
   type ServerSelfUpdateProgressEvent,
   type ServerSelfUpdateResult,
   shouldRecommendDatabaseCompaction,
+  type UsageSummary,
   WS_METHODS,
 } from "@t3tools/contracts";
 import * as Cause from "effect/Cause";
@@ -1497,30 +1498,42 @@ export function createServerEnvironmentAtoms<R, E>(
       tag: WS_METHODS.scheduledTasksSubscribe,
     }),
     // A cold transcript scan is measured in seconds, so keep the result around
-    // long enough that switching windows or re-rendering does not rescan.
+    // long enough that switching windows or re-rendering does not rescan. With
+    // nothing to show yet, the server's last scan answers first, then a plain
+    // read, then a read that waits for slow sources.
     usageSummary: createEnvironmentRpcQueryAtomFamily(runtime, {
       label: "environment-data:server:usage-summary",
       tag: WS_METHODS.serverGetUsageSummary,
       staleTimeMs: 60_000,
       refreshTrigger: ({ environmentId }) => usageScanSettingsAtom(environmentId),
-      execute: (input, emit) =>
-        request(WS_METHODS.serverGetUsageSummary, input).pipe(
-          Effect.filterOrElse(
-            (summary) => !summary.sources.some((source) => source.refreshing === true),
-            (summary) =>
-              emit(summary).pipe(
-                Effect.andThen(
-                  request(WS_METHODS.serverGetUsageSummary, { ...input, awaitRefresh: true }),
-                ),
-                Effect.catch((error) =>
-                  Effect.logWarning("Could not refresh slow usage sources.").pipe(
-                    Effect.annotateLogs({ ...safeErrorLogAttributes(error) }),
-                    Effect.as(summary),
-                  ),
+      execute: (input, emit, previous) => {
+        const settled = (summary: UsageSummary) =>
+          !summary.sources.some((source) => source.refreshing === true);
+        const read = request(WS_METHODS.serverGetUsageSummary, input).pipe(
+          Effect.filterOrElse(settled, (summary) =>
+            emit(summary).pipe(
+              Effect.andThen(
+                request(WS_METHODS.serverGetUsageSummary, { ...input, awaitRefresh: true }),
+              ),
+              Effect.catch((error) =>
+                Effect.logWarning("Could not refresh slow usage sources.").pipe(
+                  Effect.annotateLogs({ ...safeErrorLogAttributes(error) }),
+                  Effect.as(summary),
                 ),
               ),
+            ),
           ),
-        ),
+        );
+        if (Option.isSome(previous)) return read;
+        return request(WS_METHODS.serverGetUsageSummary, { ...input, provisional: true }).pipe(
+          Effect.matchEffect({
+            // The saved answer only speeds things up; without it the plain read still answers.
+            onFailure: () => read,
+            onSuccess: (saved) =>
+              settled(saved) ? Effect.succeed(saved) : emit(saved).pipe(Effect.andThen(read)),
+          }),
+        );
+      },
     }),
     resourceTelemetry: createEnvironmentRpcSubscriptionAtomFamily(runtime, {
       label: "environment-data:server:resource-telemetry",
@@ -1797,6 +1810,10 @@ export function createServerEnvironmentAtoms<R, E>(
       label: "environment-data:server:check-otlp-endpoint",
       tag: WS_METHODS.serverCheckOtlpEndpoint,
     }),
+    checkSecretSource: createEnvironmentRpcCommand(runtime, {
+      label: "environment-data:server:check-secret-source",
+      tag: WS_METHODS.serverCheckSecretSource,
+    }),
     listTextGeneratorModels: createEnvironmentRpcCommand(runtime, {
       label: "environment-data:server:list-text-generator-models",
       tag: WS_METHODS.serverListTextGeneratorModels,
diff --git a/packages/client-runtime/src/state/serverUsage.test.ts b/packages/client-runtime/src/state/serverUsage.test.ts
index b16550c7c487..4b6ee8e4cb05 100644
--- a/packages/client-runtime/src/state/serverUsage.test.ts
+++ b/packages/client-runtime/src/state/serverUsage.test.ts
@@ -232,7 +232,13 @@ const makeRefreshingHarness = Effect.fn("ServerUsageTest.makeRefreshingHarness")
       input.awaitRefresh === true
         ? Deferred.succeed(followUpStarted, undefined).pipe(Effect.andThen(followUp))
         : Effect.void,
-    (input) => [cursorSource(input.awaitRefresh !== true)],
+    // The saved answer differs from the plain one, so a test can tell which was kept.
+    (input) => [
+      {
+        ...cursorSource(input.awaitRefresh !== true),
+        ...(input.provisional === true ? { scannedFiles: 0 } : {}),
+      },
+    ],
   );
   return { ...harness, followUpStarted };
 });
@@ -254,49 +260,76 @@ function waitForCost<E>(
 }
 
 it.effect("restarts a pending usage read after a price change", () =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      const started = yield* Deferred.make<void>();
-      const interrupted = yield* Deferred.make<void>();
-      const harness = yield* makeHarness((request) =>
-        request === 1
-          ? Deferred.succeed(started, undefined).pipe(
-              Effect.andThen(Effect.never),
-              Effect.onInterrupt(() => Deferred.succeed(interrupted, undefined)),
-            )
-          : Effect.void,
-      );
-      const summary = harness.summary();
-      const unmount = harness.registry.mount(summary);
-      yield* Deferred.await(started);
-      yield* harness.updateSettings({
-        ...DEFAULT_SERVER_SETTINGS,
-        usagePriceOverrides: {
-          "custom-model": { inputCostPerMillionTokens: 5, outputCostPerMillionTokens: 10 },
-        },
-      });
-      yield* waitForCost(harness.registry, summary, 5);
-      yield* Deferred.await(interrupted);
-      expect(harness.requests()).toBe(2);
-      unmount();
-    }),
-  ),
+  Effect.gen(function* () {
+    const started = yield* Deferred.make<void>();
+    const interrupted = yield* Deferred.make<void>();
+    const harness = yield* makeHarness((request) =>
+      request === 1
+        ? Deferred.succeed(started, undefined).pipe(
+            Effect.andThen(Effect.never),
+            Effect.onInterrupt(() => Deferred.succeed(interrupted, undefined)),
+          )
+        : Effect.void,
+    );
+    const summary = harness.summary();
+    const unmount = harness.registry.mount(summary);
+    yield* Deferred.await(started);
+    yield* harness.updateSettings({
+      ...DEFAULT_SERVER_SETTINGS,
+      usagePriceOverrides: {
+        "custom-model": { inputCostPerMillionTokens: 5, outputCostPerMillionTokens: 10 },
+      },
+    });
+    yield* waitForCost(harness.registry, summary, 5);
+    yield* Deferred.await(interrupted);
+    expect(harness.requests()).toBe(2);
+    unmount();
+  }),
 );
 
 it.effect("keeps the cached usage summary when the awaited refresh fails", () =>
-  Effect.scoped(
-    Effect.gen(function* () {
-      const harness = yield* makeRefreshingHarness(
-        Effect.fail(new UsageReadError({ reason: "scanFailed", detail: "Cursor is down" })),
-      );
-      const summary = harness.summary();
-      const unmount = harness.registry.mount(summary);
-      expect((yield* settledSummary(harness.registry, summary)).sources).toEqual([
-        cursorSource(true),
-      ]);
-      expect(AsyncResult.isSuccess(harness.registry.get(summary))).toBe(true);
-      expect(harness.requests()).toBe(2);
-      unmount();
-    }),
-  ),
+  Effect.gen(function* () {
+    const harness = yield* makeRefreshingHarness(
+      Effect.fail(new UsageReadError({ reason: "scanFailed", detail: "Cursor is down" })),
+    );
+    const summary = harness.summary();
+    const unmount = harness.registry.mount(summary);
+    expect((yield* settledSummary(harness.registry, summary)).sources).toEqual([
+      cursorSource(true),
+    ]);
+    expect(AsyncResult.isSuccess(harness.registry.get(summary))).toBe(true);
+    // The saved answer is followed by a plain read before the one that waits for Cursor.
+    expect(
+      harness.inputs().map(({ provisional, awaitRefresh }) => ({ provisional, awaitRefresh })),
+    ).toEqual([
+      { provisional: true, awaitRefresh: undefined },
+      { provisional: undefined, awaitRefresh: undefined },
+      { provisional: undefined, awaitRefresh: true },
+    ]);
+    // With figures on screen, a refresh reads them exactly instead of asking for saved ones.
+    yield* harness.updateSettings({
+      ...DEFAULT_SERVER_SETTINGS,
+      usagePriceOverrides: {
+        "custom-model": { inputCostPerMillionTokens: 5, outputCostPerMillionTokens: 10 },
+      },
+    });
+    yield* waitForCost(harness.registry, summary, 5);
+    expect(harness.inputs()[3]?.provisional).toBeUndefined();
+    unmount();
+  }),
+);
+
+it.effect("reads usage in full when the saved answer cannot be read", () =>
+  Effect.gen(function* () {
+    const harness = yield* makeHarness((_request, input) =>
+      input.provisional === true
+        ? Effect.fail(new UsageReadError({ reason: "scanFailed", detail: "saved scan unreadable" }))
+        : Effect.void,
+    );
+    const summary = harness.summary();
+    const unmount = harness.registry.mount(summary);
+    yield* settledSummary(harness.registry, summary);
+    expect(harness.inputs().map(({ provisional }) => provisional)).toEqual([true, undefined]);
+    unmount();
+  }),
 );
diff --git a/packages/client-runtime/src/state/shell-sync.test.ts b/packages/client-runtime/src/state/shell-sync.test.ts
index 2699c8846f7b..96a5b59c5d74 100644
--- a/packages/client-runtime/src/state/shell-sync.test.ts
+++ b/packages/client-runtime/src/state/shell-sync.test.ts
@@ -308,7 +308,7 @@ describe("environment shell synchronization", () => {
       expect(Option.getOrThrow(resetState.snapshot).threads).toEqual([
         { ...resetRow, title: "After completion" },
       ]);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("skips unchanged shell writes, persists resets and flushes changed rows", () =>
diff --git a/packages/client-runtime/src/state/terminal.ts b/packages/client-runtime/src/state/terminal.ts
index a39e47b1340b..f62c2549daf1 100644
--- a/packages/client-runtime/src/state/terminal.ts
+++ b/packages/client-runtime/src/state/terminal.ts
@@ -1,4 +1,5 @@
 import {
+  DEFAULT_MAX_TERMINAL_BUFFER_BYTES,
   type EnvironmentId,
   type TerminalAttachInput,
   type TerminalCloseInput,
@@ -67,7 +68,11 @@ export function createTerminalEnvironmentAtoms<R, E>(
         // Retry an unanswered first attach unchanged so it can still open the shell.
         let replied = false;
         return subscribeDynamic(WS_METHODS.terminalAttach, () =>
-          Effect.sync(() => (replied ? { ...input, resume: true } : input)),
+          Effect.sync(() => ({
+            ...input,
+            ...(replied ? { resume: true } : {}),
+            maxHistoryBytes: DEFAULT_MAX_TERMINAL_BUFFER_BYTES,
+          })),
         ).pipe(
           Stream.onFirst(() =>
             Effect.sync(() => {
diff --git a/packages/client-runtime/src/state/terminalOutput.ts b/packages/client-runtime/src/state/terminalOutput.ts
index df4d2ee03955..7a2d529cd941 100644
--- a/packages/client-runtime/src/state/terminalOutput.ts
+++ b/packages/client-runtime/src/state/terminalOutput.ts
@@ -1,3 +1,5 @@
+import { retainedTerminalHistory } from "@t3tools/contracts";
+
 export interface TerminalOutputChunk {
   readonly startOffset: number;
   readonly data: string;
@@ -90,28 +92,6 @@ function splitStringByUtf8Bytes(data: string, maxBytes: number): ReadonlyArray<U
   return chunks;
 }
 
-function trimBufferToBytes(buffer: string, maxBufferBytes: number): string {
-  if (maxBufferBytes <= 0) {
-    return "";
-  }
-
-  const encoded = textEncoder.encode(buffer);
-  if (encoded.byteLength <= maxBufferBytes) {
-    return buffer;
-  }
-
-  let start = encoded.byteLength - maxBufferBytes;
-  while (start < encoded.length) {
-    const byte = encoded[start];
-    if (byte === undefined || (byte & 0b1100_0000) !== 0b1000_0000) {
-      break;
-    }
-    start += 1;
-  }
-
-  return textDecoder.decode(encoded.subarray(start));
-}
-
 function splitOutputChunks(
   data: string,
   firstOffset: number,
@@ -249,7 +229,7 @@ function resetOutput(
   data: string,
   maxBufferBytes: number,
 ): TerminalOutputState {
-  const retained = trimBufferToBytes(data, maxBufferBytes);
+  const retained = retainedTerminalHistory(data, maxBufferBytes);
   const reset = splitOutputChunks(
     retained,
     0,
diff --git a/packages/client-runtime/src/state/terminalSession.test.ts b/packages/client-runtime/src/state/terminalSession.test.ts
index 4eef70e09975..468b2ca8fdd6 100644
--- a/packages/client-runtime/src/state/terminalSession.test.ts
+++ b/packages/client-runtime/src/state/terminalSession.test.ts
@@ -1,6 +1,11 @@
 import { describe, expect, it } from "vite-plus/test";
 
-import { EnvironmentId, TerminalSessionSnapshot, ThreadId } from "@t3tools/contracts";
+import {
+  EnvironmentId,
+  retainedTerminalHistory,
+  TerminalSessionSnapshot,
+  ThreadId,
+} from "@t3tools/contracts";
 
 import {
   applyTerminalAttachStreamEvent,
@@ -119,6 +124,14 @@ describe("terminal session reducers", () => {
 
     expect(terminalOutputText(state.output)).toBe("\uFEFFtail");
     expect(state.output.retainedBytes).toBe(7);
+    const serverTail = retainedTerminalHistory("discardtail", 7);
+    expect(
+      applyTerminalAttachStreamEvent(
+        EMPTY_TERMINAL_BUFFER_STATE,
+        { type: "snapshot", snapshot: { ...BASE_SNAPSHOT, history: serverTail } },
+        7,
+      ),
+    ).toEqual(state);
   });
 
   it("trims whole Unicode code points from a partially retained chunk", () => {
diff --git a/packages/client-runtime/src/state/threadCommands.test.ts b/packages/client-runtime/src/state/threadCommands.test.ts
index 317ecab2bbb4..031ef68a1450 100644
--- a/packages/client-runtime/src/state/threadCommands.test.ts
+++ b/packages/client-runtime/src/state/threadCommands.test.ts
@@ -22,11 +22,16 @@ import * as Layer from "effect/Layer";
 import * as Option from "effect/Option";
 import * as Queue from "effect/Queue";
 import * as Scope from "effect/Scope";
+import * as Stream from "effect/Stream";
 import * as SubscriptionRef from "effect/SubscriptionRef";
 import { Atom, AtomRegistry } from "effect/reactivity";
 
 import * as EnvironmentRegistry from "../connection/registry.ts";
-import { BearerConnectionTarget } from "../connection/model.ts";
+import {
+  AVAILABLE_CONNECTION_STATE,
+  BearerConnectionTarget,
+  type SupervisorConnectionState,
+} from "../connection/model.ts";
 import * as EnvironmentSupervisor from "../connection/supervisor.ts";
 import type { RpcSession } from "../rpc/session.ts";
 import { createThreadEnvironmentAtoms } from "./threadCommands.ts";
@@ -96,12 +101,19 @@ const makeHarness = Effect.fn("TestThreadCommands.makeHarness")(function* (optio
     reply: Deferred.Deferred<{ sequence: number }, Error>;
   }>();
   const reconciled = yield* Queue.unbounded<ThreadId>();
+  const connectionFollowed = yield* Deferred.make<void>();
+  const connection = yield* SubscriptionRef.make<SupervisorConnectionState>({
+    ...AVAILABLE_CONNECTION_STATE,
+    desired: true,
+    phase: "connected",
+  });
   const supervisor = EnvironmentSupervisor.EnvironmentSupervisor.of({
     target: new BearerConnectionTarget({
       environmentId: ENVIRONMENT_ID,
       label: "Test",
       connectionId: "test",
     }),
+    state: connection,
     session: yield* SubscriptionRef.make(
       Option.some({
         client: {
@@ -120,6 +132,12 @@ const makeHarness = Effect.fn("TestThreadCommands.makeHarness")(function* (optio
       Layer.succeed(EnvironmentRegistry.EnvironmentRegistry, {
         run: (_environmentId, effect) =>
           Effect.provideService(effect, EnvironmentSupervisor.EnvironmentSupervisor, supervisor),
+        followStream: (_environmentId, stream) =>
+          Stream.provideService(
+            stream,
+            EnvironmentSupervisor.EnvironmentSupervisor,
+            supervisor,
+          ).pipe(Stream.onStart(Deferred.succeed(connectionFollowed, undefined))),
       } as EnvironmentRegistry.EnvironmentRegistry["Service"]),
       Layer.succeed(
         SecureRandom.SecureRandom,
@@ -137,13 +155,24 @@ const makeHarness = Effect.fn("TestThreadCommands.makeHarness")(function* (optio
       ),
     ),
   );
-  const snapshotAtom = Atom.family((_environmentId: EnvironmentId) => Atom.make(SNAPSHOT));
+  const snapshotAtom = Atom.family((_environmentId: EnvironmentId) =>
+    Atom.make<OrchestrationV2ShellSnapshot | null>(SNAPSHOT),
+  );
   const commands = createThreadEnvironmentAtoms(runtime, snapshotAtom);
   const registry = AtomRegistry.make();
   yield* Effect.addFinalizer(() => Effect.sync(() => registry.dispose()));
   const visibleAtom = commands.snapshotAtom(ENVIRONMENT_ID);
   registry.mount(visibleAtom);
-  return { registry, commands, snapshotAtom, visibleAtom, requests, reconciled };
+  return {
+    registry,
+    commands,
+    snapshotAtom,
+    visibleAtom,
+    requests,
+    reconciled,
+    connection,
+    connectionFollowed,
+  };
 });
 
 describe("history loading", () => {
@@ -255,6 +284,93 @@ describe("interrupt turn", () => {
   );
 });
 
+describe("title regeneration", () => {
+  it.effect("resolves with the outcome recorded for its own request", () =>
+    Effect.gen(function* () {
+      const h = yield* makeHarness();
+      const source = h.snapshotAtom(ENVIRONMENT_ID);
+      const thread = SNAPSHOT.threads[0]!;
+      const target = { environmentId: ENVIRONMENT_ID, input: { threadId: THREAD_ID } };
+      const earlier = {
+        requestId: CommandId.make("earlier"),
+        status: "renamed" as const,
+        completedAt: NOW,
+      };
+
+      h.registry.set(source, null);
+      const result = h.commands.regenerateTitle.run(h.registry, target);
+      const request = yield* Queue.take(h.requests);
+      const requestId = request.command.commandId;
+      yield* Deferred.succeed(request.reply, { sequence: 2 });
+      yield* Deferred.await(h.connectionFollowed);
+      h.registry.set(source, {
+        ...SNAPSHOT,
+        snapshotSequence: 2,
+        threads: [
+          {
+            ...thread,
+            titleRegeneration: { requestId, startedAt: NOW },
+            lastTitleRegeneration: earlier,
+          },
+        ],
+      });
+      h.registry.set(source, {
+        ...SNAPSHOT,
+        snapshotSequence: 3,
+        threads: [],
+        archivedThreads: [
+          {
+            ...thread,
+            archivedAt: NOW,
+            titleRegeneration: null,
+            lastTitleRegeneration: {
+              requestId,
+              status: "failed",
+              message: "model unavailable",
+              completedAt: NOW,
+            },
+          },
+        ],
+      });
+      const outcome = yield* Effect.promise(() => result);
+      expect(outcome).toMatchObject({
+        _tag: "Success",
+        value: { status: "failed", message: "model unavailable" },
+      });
+
+      const superseded = h.commands.regenerateTitle.run(h.registry, target);
+      const second = yield* Queue.take(h.requests);
+      h.registry.set(source, {
+        ...SNAPSHOT,
+        snapshotSequence: 4,
+        threads: [{ ...thread, titleRegeneration: null, lastTitleRegeneration: earlier }],
+      });
+      yield* Deferred.succeed(second.reply, { sequence: 4 });
+      expect(yield* Effect.promise(() => superseded)).toMatchObject({
+        _tag: "Success",
+        value: null,
+      });
+    }),
+  );
+
+  it.effect("settles without an outcome when the environment disconnects while waiting", () =>
+    Effect.gen(function* () {
+      const h = yield* makeHarness();
+      const result = h.commands.regenerateTitle.run(h.registry, {
+        environmentId: ENVIRONMENT_ID,
+        input: { threadId: THREAD_ID },
+      });
+      const request = yield* Queue.take(h.requests);
+      yield* Deferred.succeed(request.reply, { sequence: 2 });
+      yield* SubscriptionRef.update(h.connection, (state) => ({
+        ...state,
+        phase: "backoff" as const,
+      }));
+      expect(yield* Effect.promise(() => result)).toMatchObject({ _tag: "Success", value: null });
+    }),
+  );
+});
+
 describe("remote thread lifecycle commands", () => {
   const actions = [
     ["settle", {}, { settledOverride: "settled", pinnedAt: null, snoozedUntil: null }],
diff --git a/packages/client-runtime/src/state/threadCommands.ts b/packages/client-runtime/src/state/threadCommands.ts
index bb5f6b847fe5..865f6273b20a 100644
--- a/packages/client-runtime/src/state/threadCommands.ts
+++ b/packages/client-runtime/src/state/threadCommands.ts
@@ -1,8 +1,8 @@
-import type { ModelSelection, ThreadId } from "@t3tools/contracts";
+import { CommandId, type ModelSelection, type ThreadId } from "@t3tools/contracts";
 import * as SecureRandom from "effect/crypto/SecureRandom";
 import * as Effect from "effect/Effect";
 import * as Option from "effect/Option";
-import { Atom } from "effect/reactivity";
+import { AsyncResult, Atom, type AtomRegistry } from "effect/reactivity";
 import {
   WS_METHODS,
   type EnvironmentId,
@@ -17,7 +17,10 @@ import {
   createAtomCommandScheduler,
   createEnvironmentCommand,
   createEnvironmentRpcCommand,
+  environmentConnectionAtom,
+  mapAtomCommandResult,
 } from "./runtime.ts";
+import { waitForTitleRegenerationOutcome } from "./threadTitleRegeneration.ts";
 import {
   type InterruptThreadTurnInput,
   type UpdateThreadMetadataInput,
@@ -60,6 +63,7 @@ import {
   visitThread,
   watchThreadPullRequest,
 } from "../operations/commands.ts";
+import { connectionProjectionPhase } from "../connection/model.ts";
 import type { EnvironmentRegistry } from "../connection/registry.ts";
 import * as EnvironmentSupervisor from "../connection/supervisor.ts";
 import * as ThreadHistoryController from "./threadHistoryController.ts";
@@ -120,6 +124,19 @@ export function createThreadEnvironmentAtoms<R, E>(
     );
   });
 
+  const armTitleRegeneration = Effect.fn("ThreadCommands.armTitleRegeneration")(function* (input: {
+    readonly threadId: ThreadId;
+  }) {
+    const random = yield* SecureRandom.SecureRandom;
+    const requestId = CommandId.make(yield* random.uuidV4());
+    const result = yield* updateThreadMetadata({
+      threadId: input.threadId,
+      regenerateTitle: true,
+      commandId: requestId,
+    });
+    return { requestId, sequence: result.sequence };
+  });
+
   // Counts the commands that move or remove a thread's row. A list that holds its rows while
   // environments synchronize (`stepSteadyShells`) shows the user's own change at once.
   const rowActionsAtom = Atom.family((_environmentId: EnvironmentId) =>
@@ -136,6 +153,13 @@ export function createThreadEnvironmentAtoms<R, E>(
   });
 
   const sent = {
+    armTitleRegeneration: createEnvironmentCommand(runtime, {
+      label: "environment-data:commands:thread:regenerate-title",
+      execute: armTitleRegeneration,
+      scheduler,
+      concurrency,
+    }),
+
     create: createEnvironmentCommand(runtime, {
       label: "environment-data:commands:thread:create",
       execute: createThread,
@@ -411,8 +435,39 @@ export function createThreadEnvironmentAtoms<R, E>(
     unpin: rowAction(sent.unpin),
   };
   const optimistic = createOptimisticThreadLifecycle(snapshotAtom);
+  const disconnectedAtom = Atom.family((environmentId: EnvironmentId) =>
+    Atom.make((get) => {
+      const connection = AsyncResult.getOrElse(
+        get(environmentConnectionAtom(runtime, environmentId)),
+        () => null,
+      );
+      return connection !== null && connectionProjectionPhase(connection[0]) === "disconnected";
+    }),
+  );
+  const regenerateTitle = {
+    label: commands.armTitleRegeneration.label,
+    run: async (
+      registry: AtomRegistry.AtomRegistry,
+      target: { readonly environmentId: EnvironmentId; readonly input: { threadId: ThreadId } },
+    ) => {
+      const armed = await commands.armTitleRegeneration.run(registry, target);
+      const outcome =
+        armed._tag === "Success"
+          ? await waitForTitleRegenerationOutcome(
+              registry,
+              {
+                snapshot: snapshotAtom(target.environmentId),
+                disconnected: disconnectedAtom(target.environmentId),
+              },
+              { threadId: target.input.threadId, ...armed.value },
+            )
+          : null;
+      return mapAtomCommandResult(armed, () => outcome);
+    },
+  };
   return {
     ...commands,
+    regenerateTitle,
     rowActionsAtom,
     snapshotAtom: optimistic.snapshotAtom,
     pendingThreadIdsAtom: optimistic.pendingThreadIdsAtom,
diff --git a/packages/client-runtime/src/state/threadExecution.test.ts b/packages/client-runtime/src/state/threadExecution.test.ts
index d8dfad4aea7a..ea6de929b4cb 100644
--- a/packages/client-runtime/src/state/threadExecution.test.ts
+++ b/packages/client-runtime/src/state/threadExecution.test.ts
@@ -9,9 +9,11 @@ import {
   ProviderTurnId,
   RunAttemptId,
   RunId,
+  RuntimeRequestId,
   ThreadId,
   type OrchestrationV2ExecutionNode,
   type OrchestrationV2RunStatus,
+  type OrchestrationV2RuntimeRequest,
 } from "@t3tools/contracts";
 import * as DateTime from "effect/DateTime";
 import { createModelCapabilities, createModelSelection } from "@t3tools/shared/model";
@@ -20,6 +22,7 @@ import { describe, expect, it } from "vite-plus/test";
 
 import { v2Projection } from "./orchestrationV2TestFixtures.ts";
 import {
+  canResumeThread,
   deriveReportedModelSelection,
   deriveLatestThreadRun,
   deriveProviderSubagentStatus,
@@ -38,6 +41,23 @@ import {
 
 const now = DateTime.makeUnsafe("2026-07-28T10:00:00.000Z");
 
+function request(
+  id: string,
+  status: OrchestrationV2RuntimeRequest["status"],
+): OrchestrationV2RuntimeRequest {
+  return {
+    id: RuntimeRequestId.make(id),
+    nodeId: NodeId.make(`node-${id}`),
+    providerTurnId: null,
+    nativeRequestRef: null,
+    kind: "command",
+    status,
+    responseCapability: { type: "not_resumable", reason: "Session ended." },
+    createdAt: now,
+    resolvedAt: status === "pending" ? null : now,
+  };
+}
+
 function run(id: string, ordinal: number, status: OrchestrationV2RunStatus) {
   return {
     id: RunId.make(id),
@@ -369,6 +389,47 @@ describe("thread execution presentation", () => {
     expect(deriveThreadRuntime(onlyHeld)).toBeNull();
   });
 
+  it.each([
+    { name: "no requests", requests: [], runId: "run-stopped", held: false, expected: true },
+    {
+      name: "a pending request",
+      requests: [request("approval", "pending")],
+      runId: "run-stopped",
+      held: false,
+      expected: false,
+    },
+    {
+      name: "only a resolved request",
+      requests: [request("approval", "resolved")],
+      runId: "run-stopped",
+      held: false,
+      expected: true,
+    },
+    {
+      name: "a held queue behind a blocked continuation",
+      requests: [request("approval", "pending")],
+      runId: "run-stopped",
+      held: true,
+      expected: false,
+    },
+    {
+      name: "a held queue with no run to continue",
+      requests: [request("approval", "pending")],
+      runId: null,
+      held: true,
+      expected: true,
+    },
+    { name: "nothing to resume", requests: [], runId: null, held: false, expected: false },
+  ])("decides whether Resume can start with $name", ({ requests, runId, held, expected }) => {
+    expect(
+      canResumeThread(
+        { runtimeRequests: requests },
+        runId === null ? null : RunId.make(runId),
+        held,
+      ),
+    ).toBe(expected);
+  });
+
   it("does not expose a queued-only run as interruptible", () => {
     const queuedRun = run("run-queued", 1, "queued");
     const projection = { ...v2Projection, runs: [queuedRun], updatedAt: now };
@@ -492,7 +553,14 @@ describe("deriveRunlessWorkStartedAt", () => {
   };
 
   it("times a provider-native subagent from its runless root turn while it works", () => {
-    const projection = { ...nativeChild, nodes: [rootTurn("running", later)] };
+    const projection = {
+      ...nativeChild,
+      thread: {
+        ...nativeChild.thread,
+        activeProviderThreadId: ProviderThreadId.make("native-child"),
+      },
+      nodes: [rootTurn("running", later)],
+    };
     expect(deriveRunlessWorkStartedAt(projection)).toBe("2026-07-28T10:05:00.000Z");
     expect(deriveThreadRuntime(projection)).toBeNull();
   });
diff --git a/packages/client-runtime/src/state/threadExecution.ts b/packages/client-runtime/src/state/threadExecution.ts
index a9518e1bca30..622db98a2903 100644
--- a/packages/client-runtime/src/state/threadExecution.ts
+++ b/packages/client-runtime/src/state/threadExecution.ts
@@ -319,6 +319,19 @@ export function deriveResumableRunId(
     : null;
 }
 
+/**
+ * Whether Resume can start: the run's continuation, else the held queue. The server refuses that
+ * continuation while any request is pending, so the queue must not be released in its place.
+ */
+export function canResumeThread(
+  projection: Pick<ThreadStructure, "runtimeRequests">,
+  resumableRunId: RunId | null,
+  queueHeld: boolean,
+): boolean {
+  if (resumableRunId === null) return queueHeld;
+  return !projection.runtimeRequests.some((request) => request.status === "pending");
+}
+
 export function deriveThreadRuntime(
   projection: ThreadStructure & Pick<OrchestrationV2ThreadProjection, "updatedAt">,
 ): ThreadRuntimeSummary | null {
@@ -353,13 +366,7 @@ export function deriveThreadStructureRuntime(
     }),
   );
   // A pull request watch can hold a thread that never ran.
-  if (
-    latestRun === null &&
-    projection.thread.activeProviderThreadId === null &&
-    !backgroundWorkHoldsRun
-  ) {
-    return null;
-  }
+  if (latestRun === null && !backgroundWorkHoldsRun) return null;
   const activeRunId =
     latestMatchingRun(projection, (run) => INTERRUPTIBLE_RUN_STATUSES.has(run.status))?.id ?? null;
   return {
diff --git a/packages/client-runtime/src/state/threadFamilies.test.ts b/packages/client-runtime/src/state/threadFamilies.test.ts
index 2b2a4a6a1278..4dc621c901af 100644
--- a/packages/client-runtime/src/state/threadFamilies.test.ts
+++ b/packages/client-runtime/src/state/threadFamilies.test.ts
@@ -119,118 +119,116 @@ describe("createThreadFamilyAtoms", () => {
   });
 
   it.effect("reads a family per shell generation and retries a failed read", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const replies =
-          yield* Queue.unbounded<
-            Effect.Effect<OrchestrationV2ThreadFamily, OrchestrationV2GetShellSnapshotError>
-          >();
-        const client = {
-          [ORCHESTRATION_V2_WS_METHODS.getThreadFamily]: () => Effect.flatten(Queue.take(replies)),
-        } as unknown as WsRpcProtocolClient;
-        const session = {
-          client,
-          initialConfig: Effect.succeed({ shellThreadFamilies: true } as never),
-          ready: Effect.void,
-          probe: Effect.void,
-          closed: Effect.never,
-        } as unknown as RpcSession.RpcSession;
-        const supervisor = EnvironmentSupervisor.EnvironmentSupervisor.of({
-          target: TARGET,
-          state: yield* SubscriptionRef.make<SupervisorConnectionState>({
-            ...AVAILABLE_CONNECTION_STATE,
-            desired: true,
-            network: "online",
-            phase: "connected",
-            attempt: 1,
-            generation: 1,
-          }),
-          session: yield* SubscriptionRef.make(Option.some(session)),
-          prepared: yield* SubscriptionRef.make(Option.none<PreparedConnection>()),
-          connect: Effect.void,
-          disconnect: Effect.void,
-          retryNow: Effect.void,
-        } satisfies EnvironmentSupervisor.EnvironmentSupervisor["Service"]);
-        const run: EnvironmentRegistry.EnvironmentRegistry["Service"]["run"] = (
-          _environmentId,
-          effect,
-        ) => Effect.provideService(effect, EnvironmentSupervisor.EnvironmentSupervisor, supervisor);
-        const followStream: EnvironmentRegistry.EnvironmentRegistry["Service"]["followStream"] = (
-          _environmentId,
-          stream,
-        ) => Stream.provideService(stream, EnvironmentSupervisor.EnvironmentSupervisor, supervisor);
-        const runtime = Atom.runtime(
-          Layer.succeed(
-            EnvironmentRegistry.EnvironmentRegistry,
-            EnvironmentRegistry.EnvironmentRegistry.of({
-              run,
-              followStream,
-            } as unknown as EnvironmentRegistry.EnvironmentRegistry["Service"]),
-          ),
-        );
-        const parent = row("parent");
-        const child = row("idle-child");
-        const shellSnapshot = {
-          schemaVersion: 1,
-          snapshotSequence: 3,
-          projects: [],
-          threads: [parent],
-          archivedThreads: [],
-        } as OrchestrationV2ShellSnapshot;
-        const shellAt = (generation: number): EnvironmentShellState => ({
-          ...EMPTY_SHELL_STATE,
-          status: "live",
-          snapshot: Option.some(shellSnapshot),
-          generation,
-        });
-        const shellState = Atom.make<AsyncResult.AsyncResult<EnvironmentShellState>>(
-          AsyncResult.success(shellAt(0)),
-        );
-        const families = createThreadFamilyAtoms(runtime, () => shellState);
-        const registry = yield* Effect.acquireRelease(Effect.sync(AtomRegistry.make), (registry) =>
-          Effect.sync(() => registry.dispose()),
-        );
-        const family = families.familyAtom(TARGET.environmentId, parent.id);
-        const mergedIds = () =>
-          registry.get(families.snapshotAtom(TARGET.environmentId))?.threads.map(({ id }) => id);
-        // Waits for the read to finish either way; the assertions read its outcome.
-        const settle = AtomRegistry.getResult(registry, family, { suspendOnWaiting: true }).pipe(
-          Effect.ignore,
-          Effect.tap(() => Effect.yieldNow),
-        );
-        registry.mount(families.snapshotAtom(TARGET.environmentId));
-        families.mount(registry, TARGET.environmentId, parent.id);
+    Effect.gen(function* () {
+      const replies =
+        yield* Queue.unbounded<
+          Effect.Effect<OrchestrationV2ThreadFamily, OrchestrationV2GetShellSnapshotError>
+        >();
+      const client = {
+        [ORCHESTRATION_V2_WS_METHODS.getThreadFamily]: () => Effect.flatten(Queue.take(replies)),
+      } as unknown as WsRpcProtocolClient;
+      const session = {
+        client,
+        initialConfig: Effect.succeed({ shellThreadFamilies: true } as never),
+        ready: Effect.void,
+        probe: Effect.void,
+        closed: Effect.never,
+      } as unknown as RpcSession.RpcSession;
+      const supervisor = EnvironmentSupervisor.EnvironmentSupervisor.of({
+        target: TARGET,
+        state: yield* SubscriptionRef.make<SupervisorConnectionState>({
+          ...AVAILABLE_CONNECTION_STATE,
+          desired: true,
+          network: "online",
+          phase: "connected",
+          attempt: 1,
+          generation: 1,
+        }),
+        session: yield* SubscriptionRef.make(Option.some(session)),
+        prepared: yield* SubscriptionRef.make(Option.none<PreparedConnection>()),
+        connect: Effect.void,
+        disconnect: Effect.void,
+        retryNow: Effect.void,
+      } satisfies EnvironmentSupervisor.EnvironmentSupervisor["Service"]);
+      const run: EnvironmentRegistry.EnvironmentRegistry["Service"]["run"] = (
+        _environmentId,
+        effect,
+      ) => Effect.provideService(effect, EnvironmentSupervisor.EnvironmentSupervisor, supervisor);
+      const followStream: EnvironmentRegistry.EnvironmentRegistry["Service"]["followStream"] = (
+        _environmentId,
+        stream,
+      ) => Stream.provideService(stream, EnvironmentSupervisor.EnvironmentSupervisor, supervisor);
+      const runtime = Atom.runtime(
+        Layer.succeed(
+          EnvironmentRegistry.EnvironmentRegistry,
+          EnvironmentRegistry.EnvironmentRegistry.of({
+            run,
+            followStream,
+          } as unknown as EnvironmentRegistry.EnvironmentRegistry["Service"]),
+        ),
+      );
+      const parent = row("parent");
+      const child = row("idle-child");
+      const shellSnapshot = {
+        schemaVersion: 1,
+        snapshotSequence: 3,
+        projects: [],
+        threads: [parent],
+        archivedThreads: [],
+      } as OrchestrationV2ShellSnapshot;
+      const shellAt = (generation: number): EnvironmentShellState => ({
+        ...EMPTY_SHELL_STATE,
+        status: "live",
+        snapshot: Option.some(shellSnapshot),
+        generation,
+      });
+      const shellState = Atom.make<AsyncResult.AsyncResult<EnvironmentShellState>>(
+        AsyncResult.success(shellAt(0)),
+      );
+      const families = createThreadFamilyAtoms(runtime, () => shellState);
+      const registry = yield* Effect.acquireRelease(Effect.sync(AtomRegistry.make), (registry) =>
+        Effect.sync(() => registry.dispose()),
+      );
+      const family = families.familyAtom(TARGET.environmentId, parent.id);
+      const mergedIds = () =>
+        registry.get(families.snapshotAtom(TARGET.environmentId))?.threads.map(({ id }) => id);
+      // Waits for the read to finish either way; the assertions read its outcome.
+      const settle = AtomRegistry.getResult(registry, family, { suspendOnWaiting: true }).pipe(
+        Effect.ignore,
+        Effect.tap(() => Effect.yieldNow),
+      );
+      registry.mount(families.snapshotAtom(TARGET.environmentId));
+      families.mount(registry, TARGET.environmentId, parent.id);
 
-        // A cached shell from before this session's first snapshot reads nothing.
-        expect(threadFamilyRead(registry.get(family))).toBe("pending");
-        expect(yield* Queue.size(replies)).toBe(0);
+      // A cached shell from before this session's first snapshot reads nothing.
+      expect(threadFamilyRead(registry.get(family))).toBe("pending");
+      expect(yield* Queue.size(replies)).toBe(0);
 
-        registry.set(shellState, AsyncResult.success(shellAt(1)));
-        yield* Queue.offer(replies, Effect.succeed({ snapshotSequence: 3, threads: [child] }));
-        yield* settle;
-        expect(threadFamilyRead(registry.get(family))).toBe("settled");
-        expect(mergedIds()).toEqual(["parent", "idle-child"]);
+      registry.set(shellState, AsyncResult.success(shellAt(1)));
+      yield* Queue.offer(replies, Effect.succeed({ snapshotSequence: 3, threads: [child] }));
+      yield* settle;
+      expect(threadFamilyRead(registry.get(family))).toBe("settled");
+      expect(mergedIds()).toEqual(["parent", "idle-child"]);
 
-        // A new authoritative snapshot never reuses the old read, even while the next one waits
-        // or fails.
-        registry.set(shellState, AsyncResult.success(shellAt(2)));
-        expect(threadFamilyRead(registry.get(family))).toBe("pending");
-        expect(mergedIds()).toEqual(["parent"]);
-        yield* Queue.offer(
-          replies,
-          Effect.fail(new OrchestrationV2GetShellSnapshotError({ message: "read failed" })),
-        );
-        yield* settle;
-        expect(threadFamilyRead(registry.get(family))).toBe("failed");
-        expect(mergedIds()).toEqual(["parent"]);
+      // A new authoritative snapshot never reuses the old read, even while the next one waits
+      // or fails.
+      registry.set(shellState, AsyncResult.success(shellAt(2)));
+      expect(threadFamilyRead(registry.get(family))).toBe("pending");
+      expect(mergedIds()).toEqual(["parent"]);
+      yield* Queue.offer(
+        replies,
+        Effect.fail(new OrchestrationV2GetShellSnapshotError({ message: "read failed" })),
+      );
+      yield* settle;
+      expect(threadFamilyRead(registry.get(family))).toBe("failed");
+      expect(mergedIds()).toEqual(["parent"]);
 
-        families.refresh(registry, TARGET.environmentId, parent.id);
-        expect(threadFamilyRead(registry.get(family))).toBe("pending");
-        yield* Queue.offer(replies, Effect.succeed({ snapshotSequence: 5, threads: [child] }));
-        yield* settle;
-        expect(threadFamilyRead(registry.get(family))).toBe("settled");
-        expect(mergedIds()).toEqual(["parent", "idle-child"]);
-      }),
-    ),
+      families.refresh(registry, TARGET.environmentId, parent.id);
+      expect(threadFamilyRead(registry.get(family))).toBe("pending");
+      yield* Queue.offer(replies, Effect.succeed({ snapshotSequence: 5, threads: [child] }));
+      yield* settle;
+      expect(threadFamilyRead(registry.get(family))).toBe("settled");
+      expect(mergedIds()).toEqual(["parent", "idle-child"]);
+    }),
   );
 });
diff --git a/packages/client-runtime/src/state/threadSearch.ts b/packages/client-runtime/src/state/threadSearch.ts
index 23794cec2c33..81ff06b0861e 100644
--- a/packages/client-runtime/src/state/threadSearch.ts
+++ b/packages/client-runtime/src/state/threadSearch.ts
@@ -246,14 +246,7 @@ function buildThreadSearchSubject(
   projectTitle: string | null | undefined,
   environmentLabel: string | null | undefined,
 ): ThreadSearchSubject {
-  // What the user wrote, not agent wakes or task notices in the user role. A
-  // thread the user never wrote in counts from its creation; an older server
-  // omits the field, so the latest user-role message stands in.
-  const authored = thread.latestUserAuthoredMessageAt;
-  const activityAt =
-    authored === undefined
-      ? getThreadSortTimestamp(thread, "updated_at")
-      : Date.parse(authored ?? thread.createdAt);
+  const activityAt = getThreadSortTimestamp(thread, "updated_at");
   const localOpenedAt = localThreadOpens.get(`${thread.environmentId}:${thread.id}`) ?? 0;
   return {
     id: thread.id,
diff --git a/packages/client-runtime/src/state/threadShell.test.ts b/packages/client-runtime/src/state/threadShell.test.ts
index 39607575627d..d18a3e3adae1 100644
--- a/packages/client-runtime/src/state/threadShell.test.ts
+++ b/packages/client-runtime/src/state/threadShell.test.ts
@@ -160,6 +160,36 @@ describe("v2 thread shell lists", () => {
     registry.dispose();
   });
 
+  it("flags the parent while a live subagent waits on a secret card", () => {
+    const { registry, threads, snapshotAtom } = makeHarness();
+    const root = v2ThreadShell;
+    const child = {
+      ...root,
+      id: ThreadId.make("child"),
+      creationSource: "mcp" as const,
+      status: "running" as const,
+      activityRunStatus: "running" as const,
+      lineage: {
+        ...root.lineage,
+        parentThreadId: root.id,
+        relationshipToParent: "subagent" as const,
+      },
+      pendingRuntimeRequest: {
+        id: RuntimeRequestId.make("secret-card"),
+        kind: "user_input" as const,
+        createdAt: v2Now,
+        blocking: true,
+        userOnly: true,
+      },
+    };
+    registry.set(snapshotAtom(environmentId), { ...v2ShellSnapshot, threads: [root, child] });
+    expect(
+      registry.get(threads.threadShellAtom({ environmentId, threadId: root.id }))
+        ?.pendingSubagentRequest,
+    ).toBe("user_input");
+    registry.dispose();
+  });
+
   it("rolls a side chat's questions and approvals up to its parent row", () => {
     const { registry, threads, snapshotAtom } = makeHarness();
     const root = v2ThreadShell;
@@ -380,6 +410,21 @@ describe("v2 thread shell lists", () => {
     expect(registry.get(threads.threadShellAtom(parentRef))?.pendingSubagentRequest).toBeNull();
     expect(registry.get(inputs).map((thread) => thread.id)).toEqual([helper.id]);
 
+    // A secret card needs the user, so it still reaches the parent here.
+    registry.set(snapshotAtom(remoteEnvironmentId), {
+      ...v2ShellSnapshot,
+      threads: [
+        task,
+        {
+          ...helper,
+          pendingRuntimeRequest: { ...approval, kind: "user_input" as const, userOnly: true },
+        },
+      ],
+    });
+    expect(registry.get(threads.threadShellAtom(parentRef))?.pendingSubagentRequest).toBe(
+      "user_input",
+    );
+
     // A task whose parent is gone there is listed on its own, as is one whose
     // parent's environment is switched off.
     registry.set(snapshotAtom(environmentId), { ...v2ShellSnapshot, threads: [] });
diff --git a/packages/client-runtime/src/state/threadShell.ts b/packages/client-runtime/src/state/threadShell.ts
index f5ced761c566..3aaaab30720a 100644
--- a/packages/client-runtime/src/state/threadShell.ts
+++ b/packages/client-runtime/src/state/threadShell.ts
@@ -30,7 +30,7 @@ import {
 const EMPTY_THREADS: ReadonlyArray<OrchestrationV2ThreadShell> = Object.freeze([]);
 const EMPTY_SCOPED_THREAD_REFS: ReadonlyArray<ScopedThreadRef> = Object.freeze([]);
 const EMPTY_THREAD_INDEX: ReadonlyMap<ThreadId, OrchestrationV2ThreadShell> = new Map();
-const EMPTY_SUBAGENT_REQUESTS: ReadonlyMap<ThreadId, PendingSubagentRequest> = new Map();
+const EMPTY_SUBAGENT_REQUESTS: ReadonlyMap<ThreadId, never> = new Map<ThreadId, never>();
 const EMPTY_SIDE_CHATS_BY_PARENT: ReadonlyMap<
   ThreadId,
   ReadonlyArray<OrchestrationV2ThreadShell>
@@ -85,6 +85,17 @@ function subagentRequest(thread: OrchestrationV2ThreadShell): PendingSubagentReq
   return kind === "user_input" ? "user_input" : "approval";
 }
 
+/** A user-only card keeps its mark through roll-ups; clients see it as user_input. */
+type RolledUpRequest = PendingSubagentRequest | "user_only_input";
+
+const rolledUpRequest = (
+  thread: OrchestrationV2ThreadShell,
+  request: PendingSubagentRequest | null,
+): RolledUpRequest | null =>
+  request === "user_input" && thread.pendingRuntimeRequest?.userOnly === true
+    ? "user_only_input"
+    : request;
+
 /** A side chat asks its user directly, so questions roll up to the parent as well as approvals. */
 function sideChatRequest(thread: OrchestrationV2ThreadShell): PendingSubagentRequest | null {
   const kind = thread.pendingRuntimeRequest?.kind;
@@ -104,17 +115,13 @@ function pendingSubagentRequestsByThread(
   threads: ReadonlyArray<OrchestrationV2ThreadShell>,
   delegated: ReadonlyArray<{
     readonly parentThreadId: ThreadId;
-    readonly request: PendingSubagentRequest;
+    readonly request: RolledUpRequest;
   }> = [],
-): ReadonlyMap<ThreadId, PendingSubagentRequest> {
-  const requests = new Map<ThreadId, PendingSubagentRequest>();
+): ReadonlyMap<ThreadId, RolledUpRequest> {
+  const requests = new Map<ThreadId, RolledUpRequest>();
   let byId: ReadonlyMap<ThreadId, OrchestrationV2ThreadShell> | undefined;
-  const flag = (
-    firstParentId: ThreadId | null,
-    request: PendingSubagentRequest,
-    seen: Set<ThreadId>,
-  ) => {
-    // The coordinator answers child questions; only approvals need user attention.
+  const flag = (firstParentId: ThreadId | null, request: RolledUpRequest, seen: Set<ThreadId>) => {
+    // The coordinator answers child questions; approvals and user-only cards need the user.
     if (request === "user_input") return;
     byId ??= new Map(threads.map((thread) => [thread.id, thread] as const));
     let parentId = firstParentId;
@@ -138,7 +145,7 @@ function pendingSubagentRequestsByThread(
       continue;
     }
     if (child.lineage.relationshipToParent !== "subagent") continue;
-    const request = subagentRequest(child);
+    const request = rolledUpRequest(child, subagentRequest(child));
     if (request !== null) flag(parentId, request, new Set([child.id]));
   }
   for (const task of delegated) flag(task.parentThreadId, task.request, new Set());
@@ -146,8 +153,8 @@ function pendingSubagentRequestsByThread(
 }
 
 const sameRequests = (
-  left: ReadonlyMap<ThreadId, PendingSubagentRequest>,
-  right: ReadonlyMap<ThreadId, PendingSubagentRequest>,
+  left: ReadonlyMap<ThreadId, RolledUpRequest>,
+  right: ReadonlyMap<ThreadId, RolledUpRequest>,
 ) =>
   left.size === right.size &&
   [...right].every(([threadId, request]) => left.get(threadId) === request);
@@ -274,7 +281,7 @@ export function createEnvironmentThreadShellAtoms(input: {
   // environments run for it, so two environments delegating to each other
   // never read each other's totals.
   const localSubagentRequestsAtom = Atom.family((environmentId: EnvironmentId) => {
-    let previous = EMPTY_SUBAGENT_REQUESTS;
+    let previous: ReadonlyMap<ThreadId, RolledUpRequest> = EMPTY_SUBAGENT_REQUESTS;
     return Atom.make((get) => {
       const next = pendingSubagentRequestsByThread(get(environmentThreadsAtom(environmentId)));
       if (sameRequests(previous, next)) return previous;
@@ -305,7 +312,7 @@ export function createEnvironmentThreadShellAtoms(input: {
         else tasks.push(task);
       }
     }
-    let flags = new Map<EnvironmentId, ReadonlyMap<ThreadId, PendingSubagentRequest>>();
+    let flags = new Map<EnvironmentId, ReadonlyMap<ThreadId, RolledUpRequest>>();
     const requestsOf = (environmentId: EnvironmentId) =>
       flags.get(environmentId) ?? get(localSubagentRequestsAtom(environmentId));
     for (let changed = tasksByDelegator.size > 0; changed;) {
@@ -313,7 +320,7 @@ export function createEnvironmentThreadShellAtoms(input: {
       const next = new Map(flags);
       for (const [environmentId, tasks] of tasksByDelegator) {
         const delegated = tasks.flatMap(({ runsIn, thread, parentThreadId }) => {
-          const own = subagentRequest(thread);
+          const own = rolledUpRequest(thread, subagentRequest(thread));
           const nested = requestsOf(runsIn).get(thread.id);
           const request = own === "approval" ? own : (nested ?? own);
           return request === null ? [] : [{ parentThreadId, request }];
@@ -333,11 +340,15 @@ export function createEnvironmentThreadShellAtoms(input: {
   }).pipe(Atom.withLabel("environment-delegated-subagent-requests"));
 
   const pendingSubagentRequestsAtom = Atom.family((environmentId: EnvironmentId) => {
-    let previous = EMPTY_SUBAGENT_REQUESTS;
+    let previous: ReadonlyMap<ThreadId, PendingSubagentRequest> = EMPTY_SUBAGENT_REQUESTS;
     return Atom.make((get) => {
-      const next =
+      const rolledUp =
         get(delegatedSubagentRequestsAtom).get(environmentId) ??
         get(localSubagentRequestsAtom(environmentId));
+      const next = new Map<ThreadId, PendingSubagentRequest>();
+      for (const [threadId, request] of rolledUp) {
+        next.set(threadId, request === "user_only_input" ? "user_input" : request);
+      }
       if (sameRequests(previous, next)) return previous;
       previous = next;
       return next;
diff --git a/packages/client-runtime/src/state/threadSort.test.ts b/packages/client-runtime/src/state/threadSort.test.ts
index ec03d0760bd8..3ac982044b5b 100644
--- a/packages/client-runtime/src/state/threadSort.test.ts
+++ b/packages/client-runtime/src/state/threadSort.test.ts
@@ -172,6 +172,26 @@ describe("sortThreads", () => {
 
     expect(sorted.map((thread) => thread.id)).toEqual(["thread-1", "thread-2"]);
   });
+
+  it("orders last user message by what the user wrote, not agent messages in the user role", () => {
+    const sorted = sortThreads(
+      [
+        makeThread({
+          id: "agent-posted",
+          latestUserAuthoredMessageAt: "2026-03-09T10:00:00.000Z",
+          latestUserMessageAt: "2026-03-09T10:30:00.000Z",
+        }),
+        makeThread({
+          id: "user-wrote",
+          latestUserAuthoredMessageAt: "2026-03-09T10:10:00.000Z",
+          latestUserMessageAt: "2026-03-09T10:10:00.000Z",
+        }),
+      ],
+      "updated_at",
+    );
+
+    expect(sorted.map((thread) => thread.id)).toEqual(["user-wrote", "agent-posted"]);
+  });
 });
 
 describe("planPinnedReorder with hidden rows", () => {
diff --git a/packages/client-runtime/src/state/threadSort.ts b/packages/client-runtime/src/state/threadSort.ts
index 89b412a2c5da..b8a6b80db9da 100644
--- a/packages/client-runtime/src/state/threadSort.ts
+++ b/packages/client-runtime/src/state/threadSort.ts
@@ -6,6 +6,7 @@ export interface ThreadSortInput {
   readonly createdAt: string;
   readonly updatedAt: string;
   readonly latestUserMessageAt?: string | null;
+  readonly latestUserAuthoredMessageAt?: string | null;
   readonly messages?: ReadonlyArray<{
     readonly createdAt: string;
     readonly role: string;
@@ -80,6 +81,18 @@ function getFirstSortableTimestamp(...values: Array<string | null | undefined>):
 }
 
 function getLatestUserMessageTimestamp(thread: ThreadSortInput): number {
+  // Agents also post in the user role; only what the user wrote counts. A thread
+  // the user never wrote in counts from its creation; older servers omit the field.
+  if (thread.latestUserAuthoredMessageAt !== undefined) {
+    return (
+      getFirstSortableTimestamp(
+        thread.latestUserAuthoredMessageAt,
+        thread.createdAt,
+        thread.updatedAt,
+      ) ?? Number.NEGATIVE_INFINITY
+    );
+  }
+
   if (thread.latestUserMessageAt) {
     const latestUserMessageTimestamp = toSortableTimestamp(thread.latestUserMessageAt);
     if (latestUserMessageTimestamp !== null) {
diff --git a/packages/client-runtime/src/state/threadTitleRegeneration.ts b/packages/client-runtime/src/state/threadTitleRegeneration.ts
new file mode 100644
index 000000000000..07779dd77983
--- /dev/null
+++ b/packages/client-runtime/src/state/threadTitleRegeneration.ts
@@ -0,0 +1,66 @@
+import type {
+  CommandId,
+  OrchestrationV2ShellSnapshot,
+  ThreadId,
+  ThreadTitleRegenerationOutcome,
+} from "@t3tools/contracts";
+import type { Atom, AtomRegistry } from "effect/reactivity";
+
+export interface TitleRegenerationRequest {
+  readonly threadId: ThreadId;
+  readonly requestId: CommandId;
+  readonly sequence: number;
+}
+
+export interface TitleRegenerationSources {
+  readonly snapshot: Atom.Atom<OrchestrationV2ShellSnapshot | null>;
+  readonly disconnected: Atom.Atom<boolean>;
+}
+
+function settledOutcome(
+  snapshot: OrchestrationV2ShellSnapshot | null,
+  request: TitleRegenerationRequest,
+): ThreadTitleRegenerationOutcome | null | undefined {
+  if (snapshot === null) return undefined;
+  if (snapshot.snapshotSequence < request.sequence) return undefined;
+  const thread =
+    snapshot.threads.find((candidate) => candidate.id === request.threadId) ??
+    snapshot.archivedThreads.find((candidate) => candidate.id === request.threadId);
+  if (thread === undefined) return null;
+  const last = thread.lastTitleRegeneration;
+  if (last?.requestId === request.requestId) {
+    return last.message === undefined
+      ? { status: last.status }
+      : { status: last.status, message: last.message };
+  }
+  return thread.titleRegeneration?.requestId === request.requestId ? undefined : null;
+}
+
+export function waitForTitleRegenerationOutcome(
+  registry: AtomRegistry.AtomRegistry,
+  sources: TitleRegenerationSources,
+  request: TitleRegenerationRequest,
+): Promise<ThreadTitleRegenerationOutcome | null> {
+  return new Promise((resolve) => {
+    let settled = false;
+    let unsubscribes: ReadonlyArray<() => void> = [];
+    const release = () => {
+      for (const unsubscribe of unsubscribes) unsubscribe();
+    };
+    const check = () => {
+      if (settled) return;
+      let outcome = settledOutcome(registry.get(sources.snapshot), request);
+      if (outcome === undefined && registry.get(sources.disconnected)) outcome = null;
+      if (outcome === undefined) return;
+      settled = true;
+      release();
+      resolve(outcome);
+    };
+    unsubscribes = [
+      registry.subscribe(sources.snapshot, check),
+      registry.subscribe(sources.disconnected, check),
+    ];
+    if (settled) release();
+    else check();
+  });
+}
diff --git a/packages/client-runtime/src/state/vcs.test.ts b/packages/client-runtime/src/state/vcs.test.ts
index 80954ff3533b..6b15f8bc95db 100644
--- a/packages/client-runtime/src/state/vcs.test.ts
+++ b/packages/client-runtime/src/state/vcs.test.ts
@@ -198,7 +198,7 @@ describe("branch subscriptions", () => {
         expect(yield* second).toEqual([{ refName: "external", isRepo: true }]);
         registry.dispose();
         expect(yield* Queue.take(released)).toBe("external");
-      }).pipe(Effect.scoped),
+      }),
   );
 });
 
@@ -235,556 +235,595 @@ describe("cached VCS refs", () => {
   });
 
   it.effect("bypasses the server ref snapshot when a mounted list is invalidated", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const requests = yield* Queue.unbounded<VcsListRefsInput>();
-        const client = {
-          [WS_METHODS.vcsListRefs]: (input: VcsListRefsInput) =>
-            Effect.sync(() => {
-              Queue.offerUnsafe(requests, input);
-              return LIVE_REFS;
+    Effect.gen(function* () {
+      const requests = yield* Queue.unbounded<VcsListRefsInput>();
+      const client = {
+        [WS_METHODS.vcsListRefs]: (input: VcsListRefsInput) =>
+          Effect.sync(() => {
+            Queue.offerUnsafe(requests, input);
+            return LIVE_REFS;
+          }),
+      } as unknown as WsRpcProtocolClient;
+      const supervisor = EnvironmentSupervisor.EnvironmentSupervisor.of({
+        target: TARGET,
+        state: yield* SubscriptionRef.make(CONNECTED_CONNECTION_STATE),
+        session: yield* SubscriptionRef.make(Option.some(session(client))),
+        prepared: yield* SubscriptionRef.make(Option.none<PreparedConnection>()),
+        connect: Effect.void,
+        disconnect: Effect.void,
+        retryNow: Effect.void,
+      } satisfies EnvironmentSupervisor.EnvironmentSupervisor["Service"]);
+      const followStream: EnvironmentRegistry.EnvironmentRegistry["Service"]["followStream"] = (
+        _environmentId,
+        stream,
+      ) => Stream.provideService(stream, EnvironmentSupervisor.EnvironmentSupervisor, supervisor);
+      const environmentRegistry = EnvironmentRegistry.EnvironmentRegistry.of({
+        followStream,
+      } as unknown as EnvironmentRegistry.EnvironmentRegistry["Service"]);
+      const runtime = Atom.runtime(
+        Layer.merge(
+          Layer.succeed(EnvironmentRegistry.EnvironmentRegistry, environmentRegistry),
+          Layer.succeed(Persistence.EnvironmentCacheStore, cacheWithRefs(Option.none())),
+        ),
+      );
+      const atoms = createVcsEnvironmentAtoms(runtime);
+      const registry = yield* Effect.acquireRelease(Effect.sync(AtomRegistry.make), (registry) =>
+        Effect.sync(() => registry.dispose()),
+      );
+      yield* Effect.acquireRelease(
+        Effect.sync(() =>
+          registry.mount(
+            atoms.listRefs({
+              environmentId: TARGET.environmentId,
+              input: { cwd: "/repo", limit: 100 },
             }),
-        } as unknown as WsRpcProtocolClient;
-        const supervisor = EnvironmentSupervisor.EnvironmentSupervisor.of({
-          target: TARGET,
-          state: yield* SubscriptionRef.make(CONNECTED_CONNECTION_STATE),
-          session: yield* SubscriptionRef.make(Option.some(session(client))),
-          prepared: yield* SubscriptionRef.make(Option.none<PreparedConnection>()),
-          connect: Effect.void,
-          disconnect: Effect.void,
-          retryNow: Effect.void,
-        } satisfies EnvironmentSupervisor.EnvironmentSupervisor["Service"]);
-        const followStream: EnvironmentRegistry.EnvironmentRegistry["Service"]["followStream"] = (
-          _environmentId,
-          stream,
-        ) => Stream.provideService(stream, EnvironmentSupervisor.EnvironmentSupervisor, supervisor);
-        const environmentRegistry = EnvironmentRegistry.EnvironmentRegistry.of({
-          followStream,
-        } as unknown as EnvironmentRegistry.EnvironmentRegistry["Service"]);
-        const runtime = Atom.runtime(
-          Layer.merge(
-            Layer.succeed(EnvironmentRegistry.EnvironmentRegistry, environmentRegistry),
-            Layer.succeed(Persistence.EnvironmentCacheStore, cacheWithRefs(Option.none())),
           ),
-        );
-        const atoms = createVcsEnvironmentAtoms(runtime);
-        const registry = yield* Effect.acquireRelease(Effect.sync(AtomRegistry.make), (registry) =>
-          Effect.sync(() => registry.dispose()),
-        );
-        yield* Effect.acquireRelease(
-          Effect.sync(() =>
-            registry.mount(
-              atoms.listRefs({
-                environmentId: TARGET.environmentId,
-                input: { cwd: "/repo", limit: 100 },
-              }),
-            ),
-          ),
-          (unmount) => Effect.sync(unmount),
-        );
+        ),
+        (unmount) => Effect.sync(unmount),
+      );
 
-        expect(yield* Queue.take(requests)).toEqual({ cwd: "/repo", limit: 100 });
+      expect(yield* Queue.take(requests)).toEqual({ cwd: "/repo", limit: 100 });
 
-        invalidateVcsRefs(registry, TARGET);
+      invalidateVcsRefs(registry, TARGET);
 
-        expect(yield* Queue.take(requests)).toEqual({ cwd: "/repo", limit: 100, refresh: true });
+      expect(yield* Queue.take(requests)).toEqual({ cwd: "/repo", limit: 100, refresh: true });
 
-        yield* Effect.acquireRelease(
-          Effect.sync(() =>
-            registry.mount(
-              atoms.listRefs({
-                environmentId: TARGET.environmentId,
-                input: { cwd: "/other-repo", limit: 100 },
-              }),
-            ),
+      yield* Effect.acquireRelease(
+        Effect.sync(() =>
+          registry.mount(
+            atoms.listRefs({
+              environmentId: TARGET.environmentId,
+              input: { cwd: "/other-repo", limit: 100 },
+            }),
           ),
-          (unmount) => Effect.sync(unmount),
-        );
-        expect(yield* Queue.take(requests)).toEqual({
-          cwd: "/other-repo",
-          limit: 100,
-          refresh: true,
-        });
-
-        yield* Effect.acquireRelease(
-          Effect.sync(() =>
-            registry.mount(
-              atoms.listRefs({
-                environmentId: TARGET.environmentId,
-                input: { cwd: "/other-repo", query: "release", limit: 100 },
-              }),
-            ),
+        ),
+        (unmount) => Effect.sync(unmount),
+      );
+      expect(yield* Queue.take(requests)).toEqual({
+        cwd: "/other-repo",
+        limit: 100,
+        refresh: true,
+      });
+
+      yield* Effect.acquireRelease(
+        Effect.sync(() =>
+          registry.mount(
+            atoms.listRefs({
+              environmentId: TARGET.environmentId,
+              input: { cwd: "/other-repo", query: "release", limit: 100 },
+            }),
           ),
-          (unmount) => Effect.sync(unmount),
-        );
-        expect(yield* Queue.take(requests)).toEqual({
-          cwd: "/other-repo",
-          query: "release",
-          limit: 100,
-        });
-      }),
-    ),
+        ),
+        (unmount) => Effect.sync(unmount),
+      );
+      expect(yield* Queue.take(requests)).toEqual({
+        cwd: "/other-repo",
+        query: "release",
+        limit: 100,
+      });
+    }),
   );
 
   it.effect("does not repersist a refresh superseded by ref invalidation", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const registry = yield* Effect.acquireRelease(Effect.sync(AtomRegistry.make), (registry) =>
-          Effect.sync(() => registry.dispose()),
-        );
-        const saved = yield* Ref.make<ReadonlyArray<VcsListRefsResult>>([]);
-        const clears = yield* Ref.make(0);
-        const revisionsObservedDuringClear = yield* Ref.make<ReadonlyArray<number>>([]);
-        const cache = cacheWithRefs(Option.none(), {
-          saveVcsRefs: (_environmentId, _cwd, refs) =>
-            Ref.update(saved, (current) => [...current, refs]),
-          clearVcsRefs: () =>
-            Effect.all([
-              Ref.update(clears, (count) => count + 1),
-              Ref.update(revisionsObservedDuringClear, (current) => [
-                ...current,
-                registry.get(vcsRefsCacheStateAtom(TARGET)).revision,
-              ]),
-            ]).pipe(Effect.asVoid),
-        });
-
-        yield* invalidateCachedVcsRefs(registry, {
+    Effect.gen(function* () {
+      const registry = yield* Effect.acquireRelease(Effect.sync(AtomRegistry.make), (registry) =>
+        Effect.sync(() => registry.dispose()),
+      );
+      const saved = yield* Ref.make<ReadonlyArray<VcsListRefsResult>>([]);
+      const clears = yield* Ref.make(0);
+      const revisionsObservedDuringClear = yield* Ref.make<ReadonlyArray<number>>([]);
+      const cache = cacheWithRefs(Option.none(), {
+        saveVcsRefs: (_environmentId, _cwd, refs) =>
+          Ref.update(saved, (current) => [...current, refs]),
+        clearVcsRefs: () =>
+          Effect.all([
+            Ref.update(clears, (count) => count + 1),
+            Ref.update(revisionsObservedDuringClear, (current) => [
+              ...current,
+              registry.get(vcsRefsCacheStateAtom(TARGET)).revision,
+            ]),
+          ]).pipe(Effect.asVoid),
+      });
+
+      yield* invalidateCachedVcsRefs(registry, {
+        environmentId: TARGET.environmentId,
+        cwd: "/repo-worktree",
+      }).pipe(Effect.provideService(Persistence.EnvironmentCacheStore, cache));
+
+      expect(
+        yield* commitVcsRefsRefresh(registry, cache, {
           environmentId: TARGET.environmentId,
-          cwd: "/repo-worktree",
-        }).pipe(Effect.provideService(Persistence.EnvironmentCacheStore, cache));
-
-        expect(
-          yield* commitVcsRefsRefresh(registry, cache, {
-            environmentId: TARGET.environmentId,
-            cwd: "/repo",
-            refs: CACHED_REFS,
-            expectedRevision: 0,
-            persist: true,
-          }),
-        ).toBe(false);
-
-        expect(yield* Ref.get(saved)).toEqual([]);
-        expect(yield* Ref.get(clears)).toBe(1);
-        expect(yield* Ref.get(revisionsObservedDuringClear)).toEqual([0]);
-        expect(registry.get(vcsRefsCacheStateAtom(TARGET))).toEqual({
-          revision: 1,
-          persistedCacheReadable: true,
-        });
-
-        expect(
-          yield* commitVcsRefsRefresh(registry, cache, {
-            environmentId: TARGET.environmentId,
-            cwd: "/repo",
-            refs: LIVE_REFS,
-            expectedRevision: 1,
-            persist: true,
-          }),
-        ).toBe(true);
-        expect(yield* Ref.get(saved)).toEqual([LIVE_REFS]);
-      }),
-    ),
+          cwd: "/repo",
+          refs: CACHED_REFS,
+          expectedRevision: 0,
+          persist: true,
+        }),
+      ).toBe(false);
+
+      expect(yield* Ref.get(saved)).toEqual([]);
+      expect(yield* Ref.get(clears)).toBe(1);
+      expect(yield* Ref.get(revisionsObservedDuringClear)).toEqual([0]);
+      expect(registry.get(vcsRefsCacheStateAtom(TARGET))).toEqual({
+        revision: 1,
+        persistedCacheReadable: true,
+      });
+
+      expect(
+        yield* commitVcsRefsRefresh(registry, cache, {
+          environmentId: TARGET.environmentId,
+          cwd: "/repo",
+          refs: LIVE_REFS,
+          expectedRevision: 1,
+          persist: true,
+        }),
+      ).toBe(true);
+      expect(yield* Ref.get(saved)).toEqual([LIVE_REFS]);
+    }),
   );
 
   it.effect("invalidates persisted refs when ref-affecting commands settle", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const expectedError = new EnvironmentRpcUnavailableError({
-          environmentId: TARGET.environmentId,
-          message: "pull failed after fetching refs",
-        });
-        const client = {
-          [WS_METHODS.vcsPull]: () => Effect.fail(expectedError),
-          [WS_METHODS.vcsRefreshStatus]: () => Effect.void,
-          [WS_METHODS.gitPreparePullRequestThread]: () =>
-            Effect.succeed({ branch: "feature/pr", worktreePath: null }),
-        } as unknown as WsRpcProtocolClient;
-        const supervisor = EnvironmentSupervisor.EnvironmentSupervisor.of({
-          target: TARGET,
-          state: yield* SubscriptionRef.make(CONNECTED_CONNECTION_STATE),
-          session: yield* SubscriptionRef.make(Option.some(session(client))),
-          prepared: yield* SubscriptionRef.make(Option.none<PreparedConnection>()),
-          connect: Effect.void,
-          disconnect: Effect.void,
-          retryNow: Effect.void,
-        } satisfies EnvironmentSupervisor.EnvironmentSupervisor["Service"]);
-        const run: EnvironmentRegistry.EnvironmentRegistry["Service"]["run"] = (
-          _environmentId,
-          effect,
-        ) => Effect.provideService(effect, EnvironmentSupervisor.EnvironmentSupervisor, supervisor);
-        const environmentRegistry = EnvironmentRegistry.EnvironmentRegistry.of({
-          run,
-        } as unknown as EnvironmentRegistry.EnvironmentRegistry["Service"]);
-        const clears = yield* Ref.make(0);
-        const runtime = Atom.runtime(
-          Layer.merge(
-            Layer.succeed(EnvironmentRegistry.EnvironmentRegistry, environmentRegistry),
-            Layer.succeed(
-              Persistence.EnvironmentCacheStore,
-              cacheWithRefs(Option.none(), {
-                clearVcsRefs: () => Ref.update(clears, (count) => count + 1),
-              }),
-            ),
+    Effect.gen(function* () {
+      const expectedError = new EnvironmentRpcUnavailableError({
+        environmentId: TARGET.environmentId,
+        message: "pull failed after fetching refs",
+      });
+      const client = {
+        [WS_METHODS.vcsPull]: () => Effect.fail(expectedError),
+        [WS_METHODS.vcsRefreshStatus]: () => Effect.void,
+        [WS_METHODS.gitPreparePullRequestThread]: () =>
+          Effect.succeed({ branch: "feature/pr", worktreePath: null }),
+      } as unknown as WsRpcProtocolClient;
+      const supervisor = EnvironmentSupervisor.EnvironmentSupervisor.of({
+        target: TARGET,
+        state: yield* SubscriptionRef.make(CONNECTED_CONNECTION_STATE),
+        session: yield* SubscriptionRef.make(Option.some(session(client))),
+        prepared: yield* SubscriptionRef.make(Option.none<PreparedConnection>()),
+        connect: Effect.void,
+        disconnect: Effect.void,
+        retryNow: Effect.void,
+      } satisfies EnvironmentSupervisor.EnvironmentSupervisor["Service"]);
+      const run: EnvironmentRegistry.EnvironmentRegistry["Service"]["run"] = (
+        _environmentId,
+        effect,
+      ) => Effect.provideService(effect, EnvironmentSupervisor.EnvironmentSupervisor, supervisor);
+      const environmentRegistry = EnvironmentRegistry.EnvironmentRegistry.of({
+        run,
+      } as unknown as EnvironmentRegistry.EnvironmentRegistry["Service"]);
+      const clears = yield* Ref.make(0);
+      const runtime = Atom.runtime(
+        Layer.merge(
+          Layer.succeed(EnvironmentRegistry.EnvironmentRegistry, environmentRegistry),
+          Layer.succeed(
+            Persistence.EnvironmentCacheStore,
+            cacheWithRefs(Option.none(), {
+              clearVcsRefs: () => Ref.update(clears, (count) => count + 1),
+            }),
           ),
-        );
-        const atoms = createVcsEnvironmentAtoms(runtime);
-        const registry = yield* Effect.acquireRelease(Effect.sync(AtomRegistry.make), (registry) =>
-          Effect.sync(() => registry.dispose()),
-        );
+        ),
+      );
+      const atoms = createVcsEnvironmentAtoms(runtime);
+      const registry = yield* Effect.acquireRelease(Effect.sync(AtomRegistry.make), (registry) =>
+        Effect.sync(() => registry.dispose()),
+      );
+
+      const result = yield* Effect.promise(() =>
+        atoms.pull.run(registry, {
+          environmentId: TARGET.environmentId,
+          input: { cwd: "/repo" },
+        }),
+      );
 
-        const result = yield* Effect.promise(() =>
-          atoms.pull.run(registry, {
-            environmentId: TARGET.environmentId,
-            input: { cwd: "/repo" },
-          }),
-        );
+      expect(AsyncResult.isFailure(result)).toBe(true);
+      expect(yield* Ref.get(clears)).toBe(1);
+      expect(registry.get(vcsRefsCacheStateAtom(TARGET)).revision).toBe(1);
 
-        expect(AsyncResult.isFailure(result)).toBe(true);
-        expect(yield* Ref.get(clears)).toBe(1);
-        expect(registry.get(vcsRefsCacheStateAtom(TARGET)).revision).toBe(1);
+      const refreshResult = yield* Effect.promise(() =>
+        atoms.refreshStatus.run(registry, {
+          environmentId: TARGET.environmentId,
+          input: { cwd: "/repo" },
+        }),
+      );
 
-        const refreshResult = yield* Effect.promise(() =>
-          atoms.refreshStatus.run(registry, {
-            environmentId: TARGET.environmentId,
-            input: { cwd: "/repo" },
-          }),
-        );
+      expect(AsyncResult.isSuccess(refreshResult)).toBe(true);
+      expect(yield* Ref.get(clears)).toBe(2);
+      expect(registry.get(vcsRefsCacheStateAtom(TARGET)).revision).toBe(2);
 
-        expect(AsyncResult.isSuccess(refreshResult)).toBe(true);
-        expect(yield* Ref.get(clears)).toBe(2);
-        expect(registry.get(vcsRefsCacheStateAtom(TARGET)).revision).toBe(2);
+      const prepareResult = yield* Effect.promise(() =>
+        createGitEnvironmentAtoms(runtime).preparePullRequestThread.run(registry, {
+          environmentId: TARGET.environmentId,
+          input: { cwd: "/repo", reference: "42", mode: "local" },
+        }),
+      );
 
-        const prepareResult = yield* Effect.promise(() =>
-          createGitEnvironmentAtoms(runtime).preparePullRequestThread.run(registry, {
-            environmentId: TARGET.environmentId,
-            input: { cwd: "/repo", reference: "42", mode: "local" },
-          }),
-        );
+      expect(AsyncResult.isSuccess(prepareResult)).toBe(true);
+      expect(yield* Ref.get(clears)).toBe(3);
+      expect(registry.get(vcsRefsCacheStateAtom(TARGET)).revision).toBe(3);
+    }),
+  );
 
-        expect(AsyncResult.isSuccess(prepareResult)).toBe(true);
-        expect(yield* Ref.get(clears)).toBe(3);
-        expect(registry.get(vcsRefsCacheStateAtom(TARGET)).revision).toBe(3);
-      }),
-    ),
+  it.effect("a checkout does not wait behind a picker's local status refresh", () =>
+    Effect.gen(function* () {
+      const refreshStarted = yield* Deferred.make<void>();
+      const releaseRefresh = yield* Deferred.make<void>();
+      const client = {
+        [WS_METHODS.vcsRefreshStatus]: () =>
+          Deferred.succeed(refreshStarted, undefined).pipe(
+            Effect.andThen(Deferred.await(releaseRefresh)),
+          ),
+        [WS_METHODS.vcsSwitchRef]: () => Effect.succeed({ refName: "feature" }),
+      } as unknown as WsRpcProtocolClient;
+      const supervisor = EnvironmentSupervisor.EnvironmentSupervisor.of({
+        target: TARGET,
+        state: yield* SubscriptionRef.make(CONNECTED_CONNECTION_STATE),
+        session: yield* SubscriptionRef.make(Option.some(session(client))),
+        prepared: yield* SubscriptionRef.make(Option.none<PreparedConnection>()),
+        connect: Effect.void,
+        disconnect: Effect.void,
+        retryNow: Effect.void,
+      } satisfies EnvironmentSupervisor.EnvironmentSupervisor["Service"]);
+      const run: EnvironmentRegistry.EnvironmentRegistry["Service"]["run"] = (
+        _environmentId,
+        effect,
+      ) => Effect.provideService(effect, EnvironmentSupervisor.EnvironmentSupervisor, supervisor);
+      const runtime = Atom.runtime(
+        Layer.merge(
+          Layer.succeed(
+            EnvironmentRegistry.EnvironmentRegistry,
+            EnvironmentRegistry.EnvironmentRegistry.of({
+              run,
+            } as unknown as EnvironmentRegistry.EnvironmentRegistry["Service"]),
+          ),
+          Layer.succeed(Persistence.EnvironmentCacheStore, cacheWithRefs(Option.none())),
+        ),
+      );
+      const atoms = createVcsEnvironmentAtoms(runtime);
+      const registry = yield* Effect.acquireRelease(Effect.sync(AtomRegistry.make), (registry) =>
+        Effect.sync(() => registry.dispose()),
+      );
+      const target = { environmentId: TARGET.environmentId, input: { cwd: "/repo" } };
+
+      const refresh = atoms.refreshLocalStatusForPicker.run(registry, {
+        ...target,
+        input: { cwd: "/repo", localOnly: true },
+      });
+      yield* Deferred.await(refreshStarted);
+      const checkout = yield* Effect.promise(() =>
+        atoms.switchRef.run(registry, {
+          ...target,
+          input: { cwd: "/repo", refName: "feature" },
+        }),
+      );
+
+      expect(AsyncResult.isSuccess(checkout)).toBe(true);
+      yield* Deferred.succeed(releaseRefresh, undefined);
+      expect(AsyncResult.isSuccess(yield* Effect.promise(() => refresh))).toBe(true);
+    }),
   );
 
   it.effect("suppresses persisted snapshots after an environment-wide clear fails", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const registry = yield* Effect.acquireRelease(Effect.sync(AtomRegistry.make), (registry) =>
-          Effect.sync(() => registry.dispose()),
-        );
-        const persisted = yield* Ref.make<Option.Option<VcsListRefsResult>>(
-          Option.some(CACHED_REFS),
-        );
-        const loads = yield* Ref.make(0);
-        const clearAttempts = yield* Ref.make(0);
-        const cache = cacheWithRefs(Option.none(), {
-          loadVcsRefs: () =>
-            Ref.update(loads, (count) => count + 1).pipe(Effect.andThen(Ref.get(persisted))),
-          saveVcsRefs: (_environmentId, _cwd, refs) => Ref.set(persisted, Option.some(refs)),
-          clearVcsRefs: () =>
-            Ref.updateAndGet(clearAttempts, (count) => count + 1).pipe(
-              Effect.flatMap((attempt) =>
-                attempt === 1
-                  ? Effect.fail(
-                      new Persistence.ConnectionPersistenceError({
-                        operation: "clear-vcs-refs",
-                        message: "storage unavailable",
-                      }),
-                    )
-                  : Ref.set(persisted, Option.none()),
-              ),
+    Effect.gen(function* () {
+      const registry = yield* Effect.acquireRelease(Effect.sync(AtomRegistry.make), (registry) =>
+        Effect.sync(() => registry.dispose()),
+      );
+      const persisted = yield* Ref.make<Option.Option<VcsListRefsResult>>(Option.some(CACHED_REFS));
+      const loads = yield* Ref.make(0);
+      const clearAttempts = yield* Ref.make(0);
+      const cache = cacheWithRefs(Option.none(), {
+        loadVcsRefs: () =>
+          Ref.update(loads, (count) => count + 1).pipe(Effect.andThen(Ref.get(persisted))),
+        saveVcsRefs: (_environmentId, _cwd, refs) => Ref.set(persisted, Option.some(refs)),
+        clearVcsRefs: () =>
+          Ref.updateAndGet(clearAttempts, (count) => count + 1).pipe(
+            Effect.flatMap((attempt) =>
+              attempt === 1
+                ? Effect.fail(
+                    new Persistence.ConnectionPersistenceError({
+                      operation: "clear-vcs-refs",
+                      message: "storage unavailable",
+                    }),
+                  )
+                : Ref.set(persisted, Option.none()),
             ),
-        });
-
-        yield* invalidateCachedVcsRefs(registry, {
+          ),
+      });
+
+      yield* invalidateCachedVcsRefs(registry, {
+        environmentId: TARGET.environmentId,
+        cwd: "/repo",
+      }).pipe(Effect.provideService(Persistence.EnvironmentCacheStore, cache));
+
+      const state = registry.get(vcsRefsCacheStateAtom(TARGET));
+      expect(state).toEqual({
+        revision: 1,
+        persistedCacheReadable: false,
+      });
+
+      const supervisor = EnvironmentSupervisor.EnvironmentSupervisor.of({
+        target: TARGET,
+        state: yield* SubscriptionRef.make(AVAILABLE_CONNECTION_STATE),
+        session: yield* SubscriptionRef.make(Option.none<RpcSession>()),
+        prepared: yield* SubscriptionRef.make(Option.none<PreparedConnection>()),
+        connect: Effect.void,
+        disconnect: Effect.void,
+        retryNow: Effect.void,
+      } satisfies EnvironmentSupervisor.EnvironmentSupervisor["Service"]);
+      const refs = yield* Stream.unwrap(
+        makeCachedVcsRefsChanges(
+          { cwd: "/repo", limit: 100 },
+          state.revision,
+          registry,
+          state.persistedCacheReadable,
+        ).pipe(
+          Effect.provideService(EnvironmentSupervisor.EnvironmentSupervisor, supervisor),
+          Effect.provideService(Persistence.EnvironmentCacheStore, cache),
+        ),
+      ).pipe(Stream.runHead, Effect.forkChild({ startImmediately: true }));
+
+      yield* Effect.yieldNow;
+      expect(yield* Ref.get(loads)).toBe(0);
+      yield* Fiber.interrupt(refs);
+      expect(registry.get(vcsRefsCacheStateAtom(TARGET))).toEqual(state);
+
+      expect(
+        yield* commitVcsRefsRefresh(registry, cache, {
           environmentId: TARGET.environmentId,
           cwd: "/repo",
-        }).pipe(Effect.provideService(Persistence.EnvironmentCacheStore, cache));
-
-        const state = registry.get(vcsRefsCacheStateAtom(TARGET));
-        expect(state).toEqual({
-          revision: 1,
-          persistedCacheReadable: false,
-        });
-
-        const supervisor = EnvironmentSupervisor.EnvironmentSupervisor.of({
-          target: TARGET,
-          state: yield* SubscriptionRef.make(AVAILABLE_CONNECTION_STATE),
-          session: yield* SubscriptionRef.make(Option.none<RpcSession>()),
-          prepared: yield* SubscriptionRef.make(Option.none<PreparedConnection>()),
-          connect: Effect.void,
-          disconnect: Effect.void,
-          retryNow: Effect.void,
-        } satisfies EnvironmentSupervisor.EnvironmentSupervisor["Service"]);
-        const refs = yield* Stream.unwrap(
-          makeCachedVcsRefsChanges(
-            { cwd: "/repo", limit: 100 },
-            state.revision,
-            registry,
-            state.persistedCacheReadable,
-          ).pipe(
-            Effect.provideService(EnvironmentSupervisor.EnvironmentSupervisor, supervisor),
-            Effect.provideService(Persistence.EnvironmentCacheStore, cache),
-          ),
-        ).pipe(Stream.runHead, Effect.forkChild({ startImmediately: true }));
-
-        yield* Effect.yieldNow;
-        expect(yield* Ref.get(loads)).toBe(0);
-        yield* Fiber.interrupt(refs);
-        expect(registry.get(vcsRefsCacheStateAtom(TARGET))).toEqual(state);
-
-        expect(
-          yield* commitVcsRefsRefresh(registry, cache, {
-            environmentId: TARGET.environmentId,
-            cwd: "/repo",
-            refs: LIVE_REFS,
-            expectedRevision: state.revision,
-            persist: true,
-          }),
-        ).toBe(true);
-        const recoveredState = registry.get(vcsRefsCacheStateAtom(TARGET));
-        expect(recoveredState).toEqual({
-          revision: 1,
-          persistedCacheReadable: true,
-        });
-        expect(yield* Ref.get(clearAttempts)).toBe(2);
-
-        const recoveredRefs = yield* Stream.unwrap(
-          makeCachedVcsRefsChanges(
-            { cwd: "/repo", limit: 100 },
-            recoveredState.revision,
-            registry,
-            recoveredState.persistedCacheReadable,
-          ).pipe(
-            Effect.provideService(EnvironmentSupervisor.EnvironmentSupervisor, supervisor),
-            Effect.provideService(Persistence.EnvironmentCacheStore, cache),
-          ),
-        ).pipe(Stream.runHead);
+          refs: LIVE_REFS,
+          expectedRevision: state.revision,
+          persist: true,
+        }),
+      ).toBe(true);
+      const recoveredState = registry.get(vcsRefsCacheStateAtom(TARGET));
+      expect(recoveredState).toEqual({
+        revision: 1,
+        persistedCacheReadable: true,
+      });
+      expect(yield* Ref.get(clearAttempts)).toBe(2);
+
+      const recoveredRefs = yield* Stream.unwrap(
+        makeCachedVcsRefsChanges(
+          { cwd: "/repo", limit: 100 },
+          recoveredState.revision,
+          registry,
+          recoveredState.persistedCacheReadable,
+        ).pipe(
+          Effect.provideService(EnvironmentSupervisor.EnvironmentSupervisor, supervisor),
+          Effect.provideService(Persistence.EnvironmentCacheStore, cache),
+        ),
+      ).pipe(Stream.runHead);
 
-        expect(Option.getOrThrow(recoveredRefs)).toEqual(LIVE_REFS);
-        expect(yield* Ref.get(loads)).toBe(1);
-      }),
-    ),
+      expect(Option.getOrThrow(recoveredRefs)).toEqual(LIVE_REFS);
+      expect(yield* Ref.get(loads)).toBe(1);
+    }),
   );
 
   it.effect("loads an unfiltered branch list without a connection", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const supervisor = EnvironmentSupervisor.EnvironmentSupervisor.of({
-          target: TARGET,
-          state: yield* SubscriptionRef.make(AVAILABLE_CONNECTION_STATE),
-          session: yield* SubscriptionRef.make(Option.none<RpcSession>()),
-          prepared: yield* SubscriptionRef.make(Option.none<PreparedConnection>()),
-          connect: Effect.void,
-          disconnect: Effect.void,
-          retryNow: Effect.void,
-        } satisfies EnvironmentSupervisor.EnvironmentSupervisor["Service"]);
-        const refs = yield* Stream.unwrap(
-          makeCachedVcsRefsChanges({ cwd: "/repo", limit: 100 }).pipe(
-            Effect.provideService(EnvironmentSupervisor.EnvironmentSupervisor, supervisor),
-            Effect.provideService(
-              Persistence.EnvironmentCacheStore,
-              cacheWithRefs(Option.some(CACHED_REFS)),
-            ),
+    Effect.gen(function* () {
+      const supervisor = EnvironmentSupervisor.EnvironmentSupervisor.of({
+        target: TARGET,
+        state: yield* SubscriptionRef.make(AVAILABLE_CONNECTION_STATE),
+        session: yield* SubscriptionRef.make(Option.none<RpcSession>()),
+        prepared: yield* SubscriptionRef.make(Option.none<PreparedConnection>()),
+        connect: Effect.void,
+        disconnect: Effect.void,
+        retryNow: Effect.void,
+      } satisfies EnvironmentSupervisor.EnvironmentSupervisor["Service"]);
+      const refs = yield* Stream.unwrap(
+        makeCachedVcsRefsChanges({ cwd: "/repo", limit: 100 }).pipe(
+          Effect.provideService(EnvironmentSupervisor.EnvironmentSupervisor, supervisor),
+          Effect.provideService(
+            Persistence.EnvironmentCacheStore,
+            cacheWithRefs(Option.some(CACHED_REFS)),
           ),
-        ).pipe(Stream.runHead);
+        ),
+      ).pipe(Stream.runHead);
 
-        expect(Option.getOrThrow(refs)).toEqual(CACHED_REFS);
-      }),
-    ),
+      expect(Option.getOrThrow(refs)).toEqual(CACHED_REFS);
+    }),
   );
 
   it.effect("waits silently for a session while the connection phase is still connected", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const logs: unknown[] = [];
-        const logger = Logger.make(({ message }) => logs.push(message));
-        const liveSession = yield* SubscriptionRef.make(Option.none<RpcSession>());
-        const supervisor = EnvironmentSupervisor.EnvironmentSupervisor.of({
-          target: TARGET,
-          state: yield* SubscriptionRef.make(CONNECTED_CONNECTION_STATE),
-          session: liveSession,
-          prepared: yield* SubscriptionRef.make(Option.none<PreparedConnection>()),
-          connect: Effect.void,
-          disconnect: Effect.void,
-          retryNow: Effect.void,
-        } satisfies EnvironmentSupervisor.EnvironmentSupervisor["Service"]);
-        const refs = yield* Stream.unwrap(
-          makeCachedVcsRefsChanges({ cwd: "/repo", limit: 100 }).pipe(
-            Effect.provideService(EnvironmentSupervisor.EnvironmentSupervisor, supervisor),
-            Effect.provideService(
-              Persistence.EnvironmentCacheStore,
-              cacheWithRefs(Option.some(CACHED_REFS)),
-            ),
+    Effect.gen(function* () {
+      const logs: unknown[] = [];
+      const logger = Logger.make(({ message }) => logs.push(message));
+      const liveSession = yield* SubscriptionRef.make(Option.none<RpcSession>());
+      const supervisor = EnvironmentSupervisor.EnvironmentSupervisor.of({
+        target: TARGET,
+        state: yield* SubscriptionRef.make(CONNECTED_CONNECTION_STATE),
+        session: liveSession,
+        prepared: yield* SubscriptionRef.make(Option.none<PreparedConnection>()),
+        connect: Effect.void,
+        disconnect: Effect.void,
+        retryNow: Effect.void,
+      } satisfies EnvironmentSupervisor.EnvironmentSupervisor["Service"]);
+      const refs = yield* Stream.unwrap(
+        makeCachedVcsRefsChanges({ cwd: "/repo", limit: 100 }).pipe(
+          Effect.provideService(EnvironmentSupervisor.EnvironmentSupervisor, supervisor),
+          Effect.provideService(
+            Persistence.EnvironmentCacheStore,
+            cacheWithRefs(Option.some(CACHED_REFS)),
           ),
-        ).pipe(
-          Stream.take(2),
-          Stream.runCollect,
-          Effect.provide(Logger.layer([logger], { mergeWithExisting: false })),
-          Effect.forkChild({ startImmediately: true }),
-        );
-
-        yield* TestClock.adjust("1 minute");
-        expect(logs).toEqual([]);
-
-        const client = {
-          [WS_METHODS.vcsListRefs]: () => Effect.succeed(LIVE_REFS),
-        } as unknown as WsRpcProtocolClient;
-        yield* SubscriptionRef.set(liveSession, Option.some(session(client)));
-        expect(yield* Fiber.join(refs)).toEqual([CACHED_REFS, LIVE_REFS]);
-        expect(logs).toEqual([]);
-      }),
-    ),
+        ),
+      ).pipe(
+        Stream.take(2),
+        Stream.runCollect,
+        Effect.provide(Logger.layer([logger], { mergeWithExisting: false })),
+        Effect.forkChild({ startImmediately: true }),
+      );
+
+      yield* TestClock.adjust("1 minute");
+      expect(logs).toEqual([]);
+
+      const client = {
+        [WS_METHODS.vcsListRefs]: () => Effect.succeed(LIVE_REFS),
+      } as unknown as WsRpcProtocolClient;
+      yield* SubscriptionRef.set(liveSession, Option.some(session(client)));
+      expect(yield* Fiber.join(refs)).toEqual([CACHED_REFS, LIVE_REFS]);
+      expect(logs).toEqual([]);
+    }),
   );
 
   it.effect("cancels an in-flight refresh and restarts when the RPC session changes", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const started = yield* Deferred.make<void>();
-        const interrupted = yield* Deferred.make<void>();
-        const calls = yield* Ref.make(0);
-        const interruptions = yield* Ref.make(0);
-        const client = {
-          [WS_METHODS.vcsListRefs]: () =>
-            Ref.updateAndGet(calls, (count) => count + 1).pipe(
-              Effect.flatMap((count) =>
-                count === 1
-                  ? Deferred.succeed(started, undefined).pipe(
-                      Effect.andThen(Effect.never),
-                      Effect.onInterrupt(() =>
-                        Ref.update(interruptions, (interruptions) => interruptions + 1).pipe(
-                          Effect.andThen(Deferred.succeed(interrupted, undefined)),
-                        ),
+    Effect.gen(function* () {
+      const started = yield* Deferred.make<void>();
+      const interrupted = yield* Deferred.make<void>();
+      const calls = yield* Ref.make(0);
+      const interruptions = yield* Ref.make(0);
+      const client = {
+        [WS_METHODS.vcsListRefs]: () =>
+          Ref.updateAndGet(calls, (count) => count + 1).pipe(
+            Effect.flatMap((count) =>
+              count === 1
+                ? Deferred.succeed(started, undefined).pipe(
+                    Effect.andThen(Effect.never),
+                    Effect.onInterrupt(() =>
+                      Ref.update(interruptions, (interruptions) => interruptions + 1).pipe(
+                        Effect.andThen(Deferred.succeed(interrupted, undefined)),
                       ),
-                    )
-                  : Effect.succeed(LIVE_REFS),
-              ),
+                    ),
+                  )
+                : Effect.succeed(LIVE_REFS),
             ),
-        } as unknown as WsRpcProtocolClient;
-        const liveSession = yield* SubscriptionRef.make(Option.some(session(client)));
-        const supervisor = EnvironmentSupervisor.EnvironmentSupervisor.of({
-          target: TARGET,
-          state: yield* SubscriptionRef.make(CONNECTED_CONNECTION_STATE),
-          session: liveSession,
-          prepared: yield* SubscriptionRef.make(Option.none<PreparedConnection>()),
-          connect: Effect.void,
-          disconnect: Effect.void,
-          retryNow: Effect.void,
-        } satisfies EnvironmentSupervisor.EnvironmentSupervisor["Service"]);
-
-        const fiber = yield* Stream.unwrap(
-          makeCachedVcsRefsChanges({ cwd: "/repo", limit: 100 }).pipe(
-            Effect.provideService(EnvironmentSupervisor.EnvironmentSupervisor, supervisor),
-            Effect.provideService(Persistence.EnvironmentCacheStore, cacheWithRefs(Option.none())),
           ),
-        ).pipe(Stream.runHead, Effect.forkChild);
-
-        yield* Deferred.await(started);
-        yield* SubscriptionRef.set(liveSession, Option.none());
-        yield* Deferred.await(interrupted);
-        expect(yield* Ref.get(interruptions)).toBe(1);
-
-        yield* SubscriptionRef.set(liveSession, Option.some(session(client)));
-        expect(Option.getOrThrow(yield* Fiber.join(fiber))).toEqual(LIVE_REFS);
-        expect(yield* Ref.get(calls)).toBe(2);
-      }),
-    ),
+      } as unknown as WsRpcProtocolClient;
+      const liveSession = yield* SubscriptionRef.make(Option.some(session(client)));
+      const supervisor = EnvironmentSupervisor.EnvironmentSupervisor.of({
+        target: TARGET,
+        state: yield* SubscriptionRef.make(CONNECTED_CONNECTION_STATE),
+        session: liveSession,
+        prepared: yield* SubscriptionRef.make(Option.none<PreparedConnection>()),
+        connect: Effect.void,
+        disconnect: Effect.void,
+        retryNow: Effect.void,
+      } satisfies EnvironmentSupervisor.EnvironmentSupervisor["Service"]);
+
+      const fiber = yield* Stream.unwrap(
+        makeCachedVcsRefsChanges({ cwd: "/repo", limit: 100 }).pipe(
+          Effect.provideService(EnvironmentSupervisor.EnvironmentSupervisor, supervisor),
+          Effect.provideService(Persistence.EnvironmentCacheStore, cacheWithRefs(Option.none())),
+        ),
+      ).pipe(Stream.runHead, Effect.forkChild);
+
+      yield* Deferred.await(started);
+      yield* SubscriptionRef.set(liveSession, Option.none());
+      yield* Deferred.await(interrupted);
+      expect(yield* Ref.get(interruptions)).toBe(1);
+
+      yield* SubscriptionRef.set(liveSession, Option.some(session(client)));
+      expect(Option.getOrThrow(yield* Fiber.join(fiber))).toEqual(LIVE_REFS);
+      expect(yield* Ref.get(calls)).toBe(2);
+    }),
   );
 
   it.effect("retries Git failures and cancels pending retries when the session is removed", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const calls = yield* Ref.make(0);
-        const warnings = yield* Queue.unbounded<unknown>();
-        const logger = Logger.make(({ message }) => Queue.offerUnsafe(warnings, message));
-        const failure = new VcsProcessExitError({
-          operation: "listRefs",
-          command: "git",
-          cwd: "/repo",
-          exitCode: 128,
-          detail: "Could not read refs.",
-        });
-        const client = {
-          [WS_METHODS.vcsListRefs]: () =>
-            Ref.updateAndGet(calls, (count) => count + 1).pipe(
-              Effect.flatMap((count) =>
-                count < 3 ? Effect.fail(failure) : Effect.succeed(LIVE_REFS),
-              ),
-            ),
-        } as unknown as WsRpcProtocolClient;
-        const liveSession = yield* SubscriptionRef.make(Option.some(session(client)));
-        const supervisor = EnvironmentSupervisor.EnvironmentSupervisor.of({
-          target: TARGET,
-          state: yield* SubscriptionRef.make(CONNECTED_CONNECTION_STATE),
-          session: liveSession,
-          prepared: yield* SubscriptionRef.make(Option.none<PreparedConnection>()),
-          connect: Effect.void,
-          disconnect: Effect.void,
-          retryNow: Effect.void,
-        } satisfies EnvironmentSupervisor.EnvironmentSupervisor["Service"]);
-        const refs = yield* Stream.unwrap(
-          makeCachedVcsRefsChanges({ cwd: "/repo", limit: 100 }).pipe(
-            Effect.provideService(EnvironmentSupervisor.EnvironmentSupervisor, supervisor),
-            Effect.provideService(
-              Persistence.EnvironmentCacheStore,
-              cacheWithRefs(Option.some(CACHED_REFS)),
+    Effect.gen(function* () {
+      const calls = yield* Ref.make(0);
+      const warnings = yield* Queue.unbounded<unknown>();
+      const logger = Logger.make(({ message }) => Queue.offerUnsafe(warnings, message));
+      const failure = new VcsProcessExitError({
+        operation: "listRefs",
+        command: "git",
+        cwd: "/repo",
+        exitCode: 128,
+        detail: "Could not read refs.",
+      });
+      const client = {
+        [WS_METHODS.vcsListRefs]: () =>
+          Ref.updateAndGet(calls, (count) => count + 1).pipe(
+            Effect.flatMap((count) =>
+              count < 3 ? Effect.fail(failure) : Effect.succeed(LIVE_REFS),
             ),
           ),
-        ).pipe(
-          Stream.take(2),
-          Stream.runCollect,
-          Effect.provide(Logger.layer([logger], { mergeWithExisting: false })),
-          Effect.forkChild({ startImmediately: true }),
-        );
-
-        yield* Queue.take(warnings);
-        expect(yield* Ref.get(calls)).toBe(1);
-        yield* TestClock.adjust("1 second");
-        expect(yield* Ref.get(calls)).toBe(2);
-        expect(yield* Queue.size(warnings)).toBe(1);
-
-        yield* SubscriptionRef.set(liveSession, Option.none());
-        yield* TestClock.adjust("1 minute");
-        expect(yield* Ref.get(calls)).toBe(2);
-        expect(yield* Queue.size(warnings)).toBe(1);
-
-        yield* SubscriptionRef.set(liveSession, Option.some(session(client)));
-        expect(yield* Fiber.join(refs)).toEqual([CACHED_REFS, LIVE_REFS]);
-        expect(yield* Ref.get(calls)).toBe(3);
-      }),
-    ),
+      } as unknown as WsRpcProtocolClient;
+      const liveSession = yield* SubscriptionRef.make(Option.some(session(client)));
+      const supervisor = EnvironmentSupervisor.EnvironmentSupervisor.of({
+        target: TARGET,
+        state: yield* SubscriptionRef.make(CONNECTED_CONNECTION_STATE),
+        session: liveSession,
+        prepared: yield* SubscriptionRef.make(Option.none<PreparedConnection>()),
+        connect: Effect.void,
+        disconnect: Effect.void,
+        retryNow: Effect.void,
+      } satisfies EnvironmentSupervisor.EnvironmentSupervisor["Service"]);
+      const refs = yield* Stream.unwrap(
+        makeCachedVcsRefsChanges({ cwd: "/repo", limit: 100 }).pipe(
+          Effect.provideService(EnvironmentSupervisor.EnvironmentSupervisor, supervisor),
+          Effect.provideService(
+            Persistence.EnvironmentCacheStore,
+            cacheWithRefs(Option.some(CACHED_REFS)),
+          ),
+        ),
+      ).pipe(
+        Stream.take(2),
+        Stream.runCollect,
+        Effect.provide(Logger.layer([logger], { mergeWithExisting: false })),
+        Effect.forkChild({ startImmediately: true }),
+      );
+
+      yield* Queue.take(warnings);
+      expect(yield* Ref.get(calls)).toBe(1);
+      yield* TestClock.adjust("1 second");
+      expect(yield* Ref.get(calls)).toBe(2);
+      expect(yield* Queue.size(warnings)).toBe(1);
+
+      yield* SubscriptionRef.set(liveSession, Option.none());
+      yield* TestClock.adjust("1 minute");
+      expect(yield* Ref.get(calls)).toBe(2);
+      expect(yield* Queue.size(warnings)).toBe(1);
+
+      yield* SubscriptionRef.set(liveSession, Option.some(session(client)));
+      expect(yield* Fiber.join(refs)).toEqual([CACHED_REFS, LIVE_REFS]);
+      expect(yield* Ref.get(calls)).toBe(3);
+    }),
   );
 
   it.effect("emits persisted refs before a live refresh", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const client = {
-          [WS_METHODS.vcsListRefs]: () => Effect.succeed(LIVE_REFS),
-        } as unknown as WsRpcProtocolClient;
-        const supervisor = EnvironmentSupervisor.EnvironmentSupervisor.of({
-          target: TARGET,
-          state: yield* SubscriptionRef.make(CONNECTED_CONNECTION_STATE),
-          session: yield* SubscriptionRef.make(Option.some(session(client))),
-          prepared: yield* SubscriptionRef.make(Option.none<PreparedConnection>()),
-          connect: Effect.void,
-          disconnect: Effect.void,
-          retryNow: Effect.void,
-        } satisfies EnvironmentSupervisor.EnvironmentSupervisor["Service"]);
-
-        const refs = yield* Stream.unwrap(
-          makeCachedVcsRefsChanges({ cwd: "/repo", limit: 100 }).pipe(
-            Effect.provideService(EnvironmentSupervisor.EnvironmentSupervisor, supervisor),
-            Effect.provideService(
-              Persistence.EnvironmentCacheStore,
-              cacheWithRefs(Option.some(CACHED_REFS)),
-            ),
+    Effect.gen(function* () {
+      const client = {
+        [WS_METHODS.vcsListRefs]: () => Effect.succeed(LIVE_REFS),
+      } as unknown as WsRpcProtocolClient;
+      const supervisor = EnvironmentSupervisor.EnvironmentSupervisor.of({
+        target: TARGET,
+        state: yield* SubscriptionRef.make(CONNECTED_CONNECTION_STATE),
+        session: yield* SubscriptionRef.make(Option.some(session(client))),
+        prepared: yield* SubscriptionRef.make(Option.none<PreparedConnection>()),
+        connect: Effect.void,
+        disconnect: Effect.void,
+        retryNow: Effect.void,
+      } satisfies EnvironmentSupervisor.EnvironmentSupervisor["Service"]);
+
+      const refs = yield* Stream.unwrap(
+        makeCachedVcsRefsChanges({ cwd: "/repo", limit: 100 }).pipe(
+          Effect.provideService(EnvironmentSupervisor.EnvironmentSupervisor, supervisor),
+          Effect.provideService(
+            Persistence.EnvironmentCacheStore,
+            cacheWithRefs(Option.some(CACHED_REFS)),
           ),
-        ).pipe(Stream.take(2), Stream.runCollect);
+        ),
+      ).pipe(Stream.take(2), Stream.runCollect);
 
-        expect(refs).toEqual([CACHED_REFS, LIVE_REFS]);
-      }),
-    ),
+      expect(refs).toEqual([CACHED_REFS, LIVE_REFS]);
+    }),
   );
 });
 
diff --git a/packages/client-runtime/src/state/vcs.ts b/packages/client-runtime/src/state/vcs.ts
index 12d55a747705..310515ceb991 100644
--- a/packages/client-runtime/src/state/vcs.ts
+++ b/packages/client-runtime/src/state/vcs.ts
@@ -341,6 +341,13 @@ export function createVcsEnvironmentAtoms<R, E>(
       concurrency: vcsCommandConcurrency,
       onSettled: invalidateRefs,
     }),
+    // Outside the serial queue: it only reads status, and a checkout picked right after opening
+    // the picker must not wait behind that read.
+    refreshLocalStatusForPicker: createEnvironmentRpcCommand(runtime, {
+      label: "environment-data:vcs:refresh-local-status-for-picker",
+      tag: WS_METHODS.vcsRefreshStatus,
+      onSettled: invalidateRefs,
+    }),
     createWorktree: createEnvironmentRpcCommand(runtime, {
       label: "environment-data:vcs:create-worktree",
       tag: WS_METHODS.vcsCreateWorktree,
diff --git a/packages/client-runtime/src/state/vcsAction.test.ts b/packages/client-runtime/src/state/vcsAction.test.ts
index d4a1355fb4ff..67e9253cba4f 100644
--- a/packages/client-runtime/src/state/vcsAction.test.ts
+++ b/packages/client-runtime/src/state/vcsAction.test.ts
@@ -433,147 +433,142 @@ describe("vcsActionState", () => {
   });
 
   it.effect("invalidates persisted refs after successful and failed stacked actions", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const connectionState: SupervisorConnectionState = {
-          ...AVAILABLE_CONNECTION_STATE,
-          desired: true,
-          network: "online",
-          phase: "connected",
-          attempt: 1,
-          generation: 1,
-        };
-        const targetKey = { environmentId, cwd };
-        const successfulActionId = "invalidate-success";
-        const failedActionId = "invalidate-failure";
-        const interruptedActionId = "invalidate-interrupted";
-        const successfulTransportActionId = createVcsActionTransportId(
-          targetKey,
-          successfulActionId,
-        );
-        const failedTransportActionId = createVcsActionTransportId(targetKey, failedActionId);
-        const interruptedTransportActionId = createVcsActionTransportId(
-          targetKey,
-          interruptedActionId,
-        );
-        const rpcInputs = new Array<GitRunStackedActionInput>();
-        const client = {
-          [WS_METHODS.gitRunStackedAction]: (input: GitRunStackedActionInput) =>
-            (rpcInputs.push(input), input.actionId === successfulTransportActionId)
-              ? Stream.make(
+    Effect.gen(function* () {
+      const connectionState: SupervisorConnectionState = {
+        ...AVAILABLE_CONNECTION_STATE,
+        desired: true,
+        network: "online",
+        phase: "connected",
+        attempt: 1,
+        generation: 1,
+      };
+      const targetKey = { environmentId, cwd };
+      const successfulActionId = "invalidate-success";
+      const failedActionId = "invalidate-failure";
+      const interruptedActionId = "invalidate-interrupted";
+      const successfulTransportActionId = createVcsActionTransportId(targetKey, successfulActionId);
+      const failedTransportActionId = createVcsActionTransportId(targetKey, failedActionId);
+      const interruptedTransportActionId = createVcsActionTransportId(
+        targetKey,
+        interruptedActionId,
+      );
+      const rpcInputs = new Array<GitRunStackedActionInput>();
+      const client = {
+        [WS_METHODS.gitRunStackedAction]: (input: GitRunStackedActionInput) =>
+          (rpcInputs.push(input), input.actionId === successfulTransportActionId)
+            ? Stream.make(
+                progress({
+                  kind: "action_finished",
+                  actionId: successfulTransportActionId,
+                  cwd,
+                  action,
+                  result,
+                }),
+              )
+            : input.actionId === interruptedTransportActionId
+              ? Stream.fromEffect(Effect.interrupt)
+              : Stream.make(
                   progress({
-                    kind: "action_finished",
-                    actionId: successfulTransportActionId,
+                    kind: "action_failed",
+                    actionId: failedTransportActionId,
                     cwd,
                     action,
-                    result,
+                    phase: "push",
+                    message: "push failed after creating the branch",
                   }),
-                )
-              : input.actionId === interruptedTransportActionId
-                ? Stream.fromEffect(Effect.interrupt)
-                : Stream.make(
-                    progress({
-                      kind: "action_failed",
-                      actionId: failedTransportActionId,
-                      cwd,
-                      action,
-                      phase: "push",
-                      message: "push failed after creating the branch",
-                    }),
-                  ),
-        } as unknown as WsRpcProtocolClient;
-        const supervisor = EnvironmentSupervisor.EnvironmentSupervisor.of({
-          target,
-          state: yield* SubscriptionRef.make(connectionState),
-          session: yield* SubscriptionRef.make(Option.some(session(client))),
-          prepared: yield* SubscriptionRef.make(Option.none<PreparedConnection>()),
-          connect: Effect.void,
-          disconnect: Effect.void,
-          retryNow: Effect.void,
-        } satisfies EnvironmentSupervisor.EnvironmentSupervisor["Service"]);
-        const run: EnvironmentRegistry.EnvironmentRegistry["Service"]["run"] = (
-          _environmentId,
-          effect,
-        ) => Effect.provideService(effect, EnvironmentSupervisor.EnvironmentSupervisor, supervisor);
-        const runStream: EnvironmentRegistry.EnvironmentRegistry["Service"]["runStream"] = (
-          _environmentId,
-          stream,
-        ) => Stream.provideService(stream, EnvironmentSupervisor.EnvironmentSupervisor, supervisor);
-        const environmentRegistry = EnvironmentRegistry.EnvironmentRegistry.of({
-          run,
-          runStream,
-        } as unknown as EnvironmentRegistry.EnvironmentRegistry["Service"]);
-        const removed = new Array<string>();
-        const runtime = Atom.runtime(
-          Layer.merge(
-            Layer.succeed(EnvironmentRegistry.EnvironmentRegistry, environmentRegistry),
-            Layer.succeed(
-              Persistence.EnvironmentCacheStore,
-              cacheStore((removedEnvironmentId) => {
-                removed.push(`${removedEnvironmentId}:*`);
-              }),
-            ),
+                ),
+      } as unknown as WsRpcProtocolClient;
+      const supervisor = EnvironmentSupervisor.EnvironmentSupervisor.of({
+        target,
+        state: yield* SubscriptionRef.make(connectionState),
+        session: yield* SubscriptionRef.make(Option.some(session(client))),
+        prepared: yield* SubscriptionRef.make(Option.none<PreparedConnection>()),
+        connect: Effect.void,
+        disconnect: Effect.void,
+        retryNow: Effect.void,
+      } satisfies EnvironmentSupervisor.EnvironmentSupervisor["Service"]);
+      const run: EnvironmentRegistry.EnvironmentRegistry["Service"]["run"] = (
+        _environmentId,
+        effect,
+      ) => Effect.provideService(effect, EnvironmentSupervisor.EnvironmentSupervisor, supervisor);
+      const runStream: EnvironmentRegistry.EnvironmentRegistry["Service"]["runStream"] = (
+        _environmentId,
+        stream,
+      ) => Stream.provideService(stream, EnvironmentSupervisor.EnvironmentSupervisor, supervisor);
+      const environmentRegistry = EnvironmentRegistry.EnvironmentRegistry.of({
+        run,
+        runStream,
+      } as unknown as EnvironmentRegistry.EnvironmentRegistry["Service"]);
+      const removed = new Array<string>();
+      const runtime = Atom.runtime(
+        Layer.merge(
+          Layer.succeed(EnvironmentRegistry.EnvironmentRegistry, environmentRegistry),
+          Layer.succeed(
+            Persistence.EnvironmentCacheStore,
+            cacheStore((removedEnvironmentId) => {
+              removed.push(`${removedEnvironmentId}:*`);
+            }),
           ),
-        );
-        const manager = createVcsActionManager(runtime);
-        const registry = yield* Effect.acquireRelease(Effect.sync(AtomRegistry.make), (registry) =>
-          Effect.sync(() => registry.dispose()),
-        );
-        const state = vcsRefsCacheStateAtom({ environmentId });
-
-        expect(registry.get(state).revision).toBe(0);
-        const threadId = ThreadId.make("thread-stacked-action");
-        const projectId = ProjectId.make("project-stacked-action");
-        const successfulResult = yield* Effect.promise(() =>
-          manager.runStackedAction(targetKey).run(registry, {
-            actionId: successfulActionId,
-            action,
-            threadId,
-            projectId,
-          }),
-        );
-
-        expect(AsyncResult.isSuccess(successfulResult)).toBe(true);
-        expect(registry.get(manager.stateAtom(targetKey))).toEqual(EMPTY_VCS_ACTION_STATE);
-        expect(registry.get(state).revision).toBe(1);
-        expect(removed).toEqual([`${environmentId}:*`]);
-        expect(rpcInputs).toEqual([
-          { actionId: successfulTransportActionId, cwd, action, threadId, projectId },
-        ]);
-
-        const failedResult = yield* Effect.promise(() =>
-          manager.runStackedAction(targetKey).run(registry, {
-            actionId: failedActionId,
-            action,
-          }),
-        );
+        ),
+      );
+      const manager = createVcsActionManager(runtime);
+      const registry = yield* Effect.acquireRelease(Effect.sync(AtomRegistry.make), (registry) =>
+        Effect.sync(() => registry.dispose()),
+      );
+      const state = vcsRefsCacheStateAtom({ environmentId });
+
+      expect(registry.get(state).revision).toBe(0);
+      const threadId = ThreadId.make("thread-stacked-action");
+      const projectId = ProjectId.make("project-stacked-action");
+      const successfulResult = yield* Effect.promise(() =>
+        manager.runStackedAction(targetKey).run(registry, {
+          actionId: successfulActionId,
+          action,
+          threadId,
+          projectId,
+        }),
+      );
+
+      expect(AsyncResult.isSuccess(successfulResult)).toBe(true);
+      expect(registry.get(manager.stateAtom(targetKey))).toEqual(EMPTY_VCS_ACTION_STATE);
+      expect(registry.get(state).revision).toBe(1);
+      expect(removed).toEqual([`${environmentId}:*`]);
+      expect(rpcInputs).toEqual([
+        { actionId: successfulTransportActionId, cwd, action, threadId, projectId },
+      ]);
 
-        expect(AsyncResult.isFailure(failedResult)).toBe(true);
-        expect(registry.get(manager.stateAtom(targetKey))).toMatchObject({
-          isRunning: false,
-          operation: "run_change_request",
+      const failedResult = yield* Effect.promise(() =>
+        manager.runStackedAction(targetKey).run(registry, {
           actionId: failedActionId,
-          error: "Source control action 'commit_push' failed during push.",
-        });
-        expect(registry.get(state).revision).toBe(2);
-        expect(removed).toEqual([`${environmentId}:*`, `${environmentId}:*`]);
-
-        const interruptedResult = yield* Effect.promise(() =>
-          manager.runStackedAction(targetKey).run(registry, {
-            actionId: interruptedActionId,
-            action,
-          }),
-        );
-
-        expect(AsyncResult.isFailure(interruptedResult)).toBe(true);
-        if (AsyncResult.isFailure(interruptedResult)) {
-          expect(Cause.hasInterruptsOnly(interruptedResult.cause)).toBe(true);
-        }
-        expect(registry.get(manager.stateAtom(targetKey))).toEqual(EMPTY_VCS_ACTION_STATE);
-        expect(registry.get(state).revision).toBe(3);
-        expect(removed).toEqual([`${environmentId}:*`, `${environmentId}:*`, `${environmentId}:*`]);
-      }),
-    ),
+          action,
+        }),
+      );
+
+      expect(AsyncResult.isFailure(failedResult)).toBe(true);
+      expect(registry.get(manager.stateAtom(targetKey))).toMatchObject({
+        isRunning: false,
+        operation: "run_change_request",
+        actionId: failedActionId,
+        error: "Source control action 'commit_push' failed during push.",
+      });
+      expect(registry.get(state).revision).toBe(2);
+      expect(removed).toEqual([`${environmentId}:*`, `${environmentId}:*`]);
+
+      const interruptedResult = yield* Effect.promise(() =>
+        manager.runStackedAction(targetKey).run(registry, {
+          actionId: interruptedActionId,
+          action,
+        }),
+      );
+
+      expect(AsyncResult.isFailure(interruptedResult)).toBe(true);
+      if (AsyncResult.isFailure(interruptedResult)) {
+        expect(Cause.hasInterruptsOnly(interruptedResult.cause)).toBe(true);
+      }
+      expect(registry.get(manager.stateAtom(targetKey))).toEqual(EMPTY_VCS_ACTION_STATE);
+      expect(registry.get(state).revision).toBe(3);
+      expect(removed).toEqual([`${environmentId}:*`, `${environmentId}:*`, `${environmentId}:*`]);
+    }),
   );
 });
 
diff --git a/packages/client-runtime/src/voice-input/controller.test.ts b/packages/client-runtime/src/voice-input/controller.test.ts
index 41e56933ce10..15f5fea3aac7 100644
--- a/packages/client-runtime/src/voice-input/controller.test.ts
+++ b/packages/client-runtime/src/voice-input/controller.test.ts
@@ -49,7 +49,6 @@ function draft(overrides: Partial<VoiceDraftSnapshot> = {}): VoiceDraftSnapshot
     ownerKey: "environment:thread",
     text: "hello world",
     selection: { start: 6, end: 11 },
-    revision: 1,
     ...overrides,
   };
 }
@@ -102,7 +101,7 @@ describe("environment voice input", () => {
     expect(harness.controller.currentState.phase).toBe("error");
     expect(harness.deleted).toEqual([]);
 
-    harness.setDraft(draft({ text: "updated ", revision: 2, selection: { start: 8, end: 8 } }));
+    harness.setDraft(draft({ text: "updated ", selection: { start: 8, end: 8 } }));
     await harness.controller.start();
     expect(transcribe.mock.calls.map(([uri]) => uri)).toEqual([
       "file:///voice.m4a",
@@ -280,19 +279,74 @@ describe("resolveTranscriptCommit", () => {
     });
   });
 
-  it("does not replace text after the owner, text, or revision changes", () => {
+  it.each([
+    [
+      "at the start of the selection",
+      { start: 6, end: 11 },
+      "hello [cite]world",
+      "hello [cite]world new text",
+    ],
+    [
+      "inside the selection",
+      { start: 6, end: 11 },
+      "hello wo[cite]rld",
+      "hello wo[cite]rld new text",
+    ],
+    ["at the caret", { start: 6, end: 6 }, "hello [cite] world", "hello [cite] new text world"],
+    [
+      "that repeats the selection",
+      { start: 0, end: 5 },
+      "hello there hello world",
+      "hello there hello new text world",
+    ],
+    [
+      "that repeats the selection next to it",
+      { start: 0, end: 5 },
+      "hello hello world",
+      "hello hello new text world",
+    ],
+  ])("keeps text inserted %s while recording", (_, selection, current, expected) => {
+    const captured = draft({ text: "hello world", selection });
+    const result = resolveTranscriptCommit(
+      captured,
+      draft({ text: current, selection: { start: 0, end: 0 } }),
+      "new text",
+      "en-US",
+    );
+    expect(result).toMatchObject({ kind: "commit", text: expected });
+  });
+
+  it("keeps every citation when several were inserted while recording", () => {
+    const captured = draft({ text: "[todo", selection: { start: 0, end: 1 } });
+    const current = "[A](t3-citation://v1/a)[todo[B](t3-citation://v1/b)";
+    const result = resolveTranscriptCommit(
+      captured,
+      draft({ text: current, selection: { start: 0, end: 0 } }),
+      "spoken",
+      "en-US",
+    );
+    expect(result).toMatchObject({ kind: "commit", text: `${current} spoken` });
+  });
+
+  it("keeps surrogate pairs whole when an emoji changed while recording", () => {
+    const captured = draft({ text: "🔔", selection: { start: 0, end: 0 } });
+    const result = resolveTranscriptCommit(
+      captured,
+      draft({ text: "🤔", selection: { start: 0, end: 0 } }),
+      "hello",
+      "en-US",
+    );
+    expect(result).toMatchObject({ kind: "commit", text: "🤔hello" });
+  });
+
+  it("does not insert into a missing draft or another owner's draft", () => {
     const captured = draft();
+    expect(resolveTranscriptCommit(captured, null, "text", "en-US")).toEqual({ kind: "stale" });
     expect(
       resolveTranscriptCommit(captured, draft({ ownerKey: "other" }), "text", "en-US"),
     ).toEqual({
       kind: "stale",
     });
-    expect(resolveTranscriptCommit(captured, draft({ text: "newer" }), "text", "en-US")).toEqual({
-      kind: "stale",
-    });
-    expect(resolveTranscriptCommit(captured, draft({ revision: 2 }), "text", "en-US")).toEqual({
-      kind: "stale",
-    });
   });
 });
 
diff --git a/packages/client-runtime/src/voice-input/controller.ts b/packages/client-runtime/src/voice-input/controller.ts
index 668705546a48..d093b30a6497 100644
--- a/packages/client-runtime/src/voice-input/controller.ts
+++ b/packages/client-runtime/src/voice-input/controller.ts
@@ -50,7 +50,6 @@ export type VoiceDraftSnapshot = {
   readonly ownerKey: string;
   readonly text: string;
   readonly selection: { readonly start: number; readonly end: number };
-  readonly revision: number;
 };
 
 export type VoiceRecorderStatus = {
@@ -109,18 +108,37 @@ type TranscriptCommitResult =
 
 const WORD_SPACELESS_LANGUAGES = new Set(["ja", "zh", "yue", "th", "lo", "km", "my"]);
 
+const isHighSurrogate = (code: number) => code >= 0xd800 && code <= 0xdbff;
+const isLowSurrogate = (code: number) => code >= 0xdc00 && code <= 0xdfff;
+
+// Where `position` in `before` lands in `text`, placed after anything inserted at it.
+function mapPosition(before: string, text: string, position: number, suffixFirst: boolean) {
+  const shared = Math.min(before.length, text.length);
+  const matchesFromEnd = (offset: number) =>
+    before[before.length - 1 - offset] === text[text.length - 1 - offset];
+  let prefix = 0;
+  let suffix = 0;
+  // Matching is per UTF-16 unit; never let a boundary split a surrogate pair.
+  const scanSuffix = (limit: number) => {
+    while (suffix < limit && matchesFromEnd(suffix)) suffix += 1;
+    if (suffix > 0 && isLowSurrogate(before.charCodeAt(before.length - suffix))) suffix -= 1;
+  };
+  if (suffixFirst) scanSuffix(shared);
+  while (prefix < shared - suffix && before[prefix] === text[prefix]) prefix += 1;
+  if (prefix > 0 && isHighSurrogate(before.charCodeAt(prefix - 1))) prefix -= 1;
+  if (!suffixFirst) scanSuffix(shared - prefix);
+  if (position < prefix) return position;
+  if (position >= before.length - suffix) return position + text.length - before.length;
+  return text.length - suffix;
+}
+
 export function resolveTranscriptCommit(
   captured: VoiceDraftSnapshot,
   current: VoiceDraftSnapshot | null,
   transcript: string,
   locale: string,
 ): TranscriptCommitResult {
-  if (
-    !current ||
-    current.ownerKey !== captured.ownerKey ||
-    current.text !== captured.text ||
-    current.revision !== captured.revision
-  ) {
+  if (!current || current.ownerKey !== captured.ownerKey) {
     return { kind: "stale" };
   }
 
@@ -129,14 +147,24 @@ export function resolveTranscriptCommit(
     return { kind: "empty" };
   }
 
-  const isEmptySelection = captured.selection.start === captured.selection.end;
+  const { text } = current;
+  // An edit made while recording (a citation, a paste) is never replaced. The edit's position is
+  // ambiguous over repeated text, so insert after the selection under both extreme alignments.
+  const unchanged = text === captured.text;
+  const end = unchanged
+    ? captured.selection.end
+    : Math.max(
+        mapPosition(captured.text, text, captured.selection.end, false),
+        mapPosition(captured.text, text, captured.selection.end, true),
+      );
+  const start = unchanged ? captured.selection.start : end;
+  const isEmptySelection = start === end;
   const language = locale.split(/[-_]/)[0]!.toLowerCase();
   let insertion = replacement;
   if (isEmptySelection && !WORD_SPACELESS_LANGUAGES.has(language)) {
     const auto = language === "auto";
-    const caret = captured.selection.start;
-    const left = captured.text.slice(Math.max(0, caret - 2), caret);
-    const right = captured.text.slice(caret, caret + 2);
+    const left = text.slice(Math.max(0, start - 2), start);
+    const right = text.slice(start, start + 2);
     const leftEdge = auto ? /[A-Za-z0-9.!?,:;)\]}'"]$/ : /(?:\p{L}|\p{M}|\p{N}|[.!?,:;)\]}'"])$/u;
     const rightEdge = auto ? /^[A-Za-z0-9([{'"]/ : /^[\p{L}\p{M}\p{N}([{'"]/u;
     const leftNeedsBoundary =
@@ -150,12 +178,7 @@ export function resolveTranscriptCommit(
     insertion = `${leftNeedsBoundary ? " " : ""}${replacement}${rightNeedsBoundary ? " " : ""}`;
   }
 
-  const result = replaceTextRange(
-    captured.text,
-    captured.selection.start,
-    captured.selection.end,
-    insertion,
-  );
+  const result = replaceTextRange(text, start, end, insertion);
   return {
     kind: "commit",
     text: result.text,
diff --git a/packages/client-runtime/src/work-log/itemDetail.test.ts b/packages/client-runtime/src/work-log/itemDetail.test.ts
index cfa00db4f8f8..0b596002504b 100644
--- a/packages/client-runtime/src/work-log/itemDetail.test.ts
+++ b/packages/client-runtime/src/work-log/itemDetail.test.ts
@@ -113,3 +113,52 @@ describe("tool image output parsing", () => {
     },
   );
 });
+
+describe("MCP app tool output", () => {
+  it("shows the tool result, not the app wrapper", () => {
+    const text = "Notice\nview\tcount\n/home\t42";
+    const item = toolItem({
+      t3McpApp: {
+        attachmentId: "app-html",
+        server: "repro",
+        tool: "aggregate_rum_events",
+        resourceUri: "ui://repro/dataviz",
+      },
+      result: { content: [{ type: "text", text }] },
+    });
+    expect(turnItemOutputText(item)).toBe(text);
+  });
+
+  it("reads a result with metadata and marks images it cannot preview", () => {
+    const item = toolItem({
+      t3McpApp: {
+        attachmentId: "app-html",
+        server: "repro",
+        tool: "chart",
+        resourceUri: "ui://repro/chart",
+      },
+      result: {
+        content: [
+          { type: "text", text: "chart" },
+          { type: "image", mimeType: "image/png", data: "iVBORw0KGgo=" },
+        ],
+        _meta: { "ui/resourceUri": "ui://repro/chart" },
+      },
+    });
+    expect(turnItemOutputText(item)).toBe("chart\n[image]");
+
+    const bounded = toolItem({
+      t3McpApp: {
+        attachmentId: "app-html",
+        server: "repro",
+        tool: "chart",
+        resourceUri: "ui://repro/chart",
+      },
+      result: [
+        { type: "text", text: "chart" },
+        { type: "image", mimeType: "image/png" },
+      ],
+    });
+    expect(turnItemOutputText(bounded)).toBe("chart\n[image]");
+  });
+});
diff --git a/packages/client-runtime/src/work-log/itemDetail.ts b/packages/client-runtime/src/work-log/itemDetail.ts
index 16f79bd8d98c..6902b7a116d5 100644
--- a/packages/client-runtime/src/work-log/itemDetail.ts
+++ b/packages/client-runtime/src/work-log/itemDetail.ts
@@ -1,5 +1,10 @@
 import type { AssetResource, OrchestrationV2TurnItem } from "@t3tools/contracts";
-import { toolOutputImageBlocks, toolOutputImages } from "@t3tools/shared/toolOutput";
+import { MCP_APP_OUTPUT_KEY } from "@t3tools/shared/mcpApp";
+import {
+  mcpToolResultOutput,
+  toolOutputImageBlocks,
+  toolOutputImages,
+} from "@t3tools/shared/toolOutput";
 import * as DateTime from "effect/DateTime";
 
 const MAX_TEXT_BLOCK_DEPTH = 4;
@@ -90,10 +95,14 @@ function formatJsonValue(value: unknown): string | null {
   return json;
 }
 
-function formatToolValue(value: unknown, hasImagePreview = false): string | null {
+function formatToolValue(
+  value: unknown,
+  hasImagePreview = false,
+  previewedImageBlocks = toolOutputImageBlocks(value),
+): string | null {
   if (value === undefined || value === null) return null;
   if (hasImagePreview && isRecord(value) && value.type === "image") return null;
-  const text = textFromBlocks(value, 0, toolOutputImageBlocks(value));
+  const text = textFromBlocks(value, 0, previewedImageBlocks);
   if (text !== null) return text.trim() ? prettyJsonText(text) : null;
   return formatJsonValue(value);
 }
@@ -177,14 +186,24 @@ function commandOutputText(output: string): string {
     .join("\n");
 }
 
+// App calls store the provider result beside the app reference; its images get no preview.
+function dynamicToolOutputText(
+  item: Extract<OrchestrationV2TurnItem, { readonly type: "dynamic_tool" }>,
+): string | null {
+  const output = item.output;
+  if (!isRecord(output) || !(MCP_APP_OUTPUT_KEY in output) || !("result" in output)) {
+    return formatToolValue(output, item.viewedImagePath !== undefined);
+  }
+  const result = output.result;
+  return formatToolValue(isRecord(result) ? mcpToolResultOutput(result) : result, false, []);
+}
+
 export function turnItemOutputText(item: OrchestrationV2TurnItem): string | null {
   switch (item.type) {
     case "command_execution":
       return item.output?.trim() ? commandOutputText(item.output) || null : null;
     case "dynamic_tool":
-      return item.outputOmitted === true
-        ? null
-        : formatToolValue(item.output, item.viewedImagePath !== undefined);
+      return item.outputOmitted === true ? null : dynamicToolOutputText(item);
     case "file_search":
       return item.results?.length
         ? item.results
diff --git a/packages/client-runtime/src/work-log/userInput.test.ts b/packages/client-runtime/src/work-log/userInput.test.ts
new file mode 100644
index 000000000000..dce5aa45e8ec
--- /dev/null
+++ b/packages/client-runtime/src/work-log/userInput.test.ts
@@ -0,0 +1,39 @@
+import { describe, expect, it } from "vite-plus/test";
+
+import { getQuestionAnswerPreview, getQuestionAnswerText } from "./userInput.js";
+
+// Shape the web client submits for an answer holding a review-comment chip.
+const answerWithReviewComment = [
+  "See my note: [Review comment: notes.md L2; ref=review-comment_c1]",
+  "",
+  '<t3_context version="1">',
+  '<context kind="review-comment" id="review-comment_c1">',
+  "file: notes.md",
+  "range: L2 (2-2)",
+  "comment:",
+  "  Rename this",
+  "diff:",
+  "  +line changed",
+  "</context>",
+  "</t3_context>",
+].join("\n");
+
+describe("question answer display", () => {
+  it("keeps the provider context envelope out of answer history and preview", () => {
+    const history = getQuestionAnswerText(answerWithReviewComment);
+    const preview = getQuestionAnswerPreview({
+      requestId: "request-1",
+      answers: { q1: answerWithReviewComment },
+      attachmentsByQuestionId: {},
+      questionTextById: { q1: "What should change?" },
+    });
+
+    expect(history).toBe("See my note: [Review comment: notes.md L2]");
+    expect(preview).toContain("See my note:");
+    expect(preview).not.toContain("<t3_context");
+
+    const typedXml =
+      'Use this XML literally: <t3_context version="1"><context kind="review-comment" id="example">keep me</context></t3_context>';
+    expect(getQuestionAnswerText(typedXml)).toBe(typedXml);
+  });
+});
diff --git a/packages/client-runtime/src/work-log/userInput.ts b/packages/client-runtime/src/work-log/userInput.ts
index fe36126d70e3..bd9a10c2f268 100644
--- a/packages/client-runtime/src/work-log/userInput.ts
+++ b/packages/client-runtime/src/work-log/userInput.ts
@@ -1,4 +1,5 @@
 import { type UserInputAttachmentAnswerPayload } from "@t3tools/contracts";
+import { composerContextProviderTextForDisplay } from "@t3tools/shared/composerContextReferences";
 
 function record(value: unknown): Record<string, unknown> | undefined {
   return value !== null && typeof value === "object" && !Array.isArray(value)
@@ -7,7 +8,8 @@ function record(value: unknown): Record<string, unknown> | undefined {
 }
 
 export function getQuestionAnswerText(value: unknown): string {
-  if (typeof value === "string") return value;
+  // Answers holding context chips are stored in provider form.
+  if (typeof value === "string") return composerContextProviderTextForDisplay(value);
   if (Array.isArray(value)) return value.map(getQuestionAnswerText).filter(Boolean).join(", ");
   const nested = record(value);
   return nested ? getQuestionAnswerText(nested.answers) : "";
diff --git a/packages/contracts/src/acpRegistry.ts b/packages/contracts/src/acpRegistry.ts
index a269664fbefa..6c667c263d91 100644
--- a/packages/contracts/src/acpRegistry.ts
+++ b/packages/contracts/src/acpRegistry.ts
@@ -279,6 +279,10 @@ export const AcpRegistryProbeResult = Schema.Struct({
   models: Schema.Array(AcpRegistryProbeModel).check(Schema.isMaxLength(256)),
   currentModelId: Schema.NullOr(AcpRegistryProbeText),
   configOptions: Schema.Array(ProviderOptionDescriptor).check(Schema.isMaxLength(16)),
+  // configOptions ids that describe only the current model (ACP thought_level / model_config).
+  modelOptionIds: Schema.optionalKey(
+    Schema.Array(AcpRegistryProbeText).check(Schema.isMaxLength(16)),
+  ),
   sessionManagement: Schema.Struct({
     canList: Schema.Boolean,
     canLoad: Schema.Boolean,
diff --git a/packages/contracts/src/checkpointDiff.ts b/packages/contracts/src/checkpointDiff.ts
index 7322e6f431d1..0e13d0060b78 100644
--- a/packages/contracts/src/checkpointDiff.ts
+++ b/packages/contracts/src/checkpointDiff.ts
@@ -4,6 +4,9 @@ import * as Struct from "effect/Struct";
 
 import { NonNegativeInt, ThreadId, TrimmedNonEmptyString } from "./baseSchemas.ts";
 
+/** Ends a checkpoint diff the server cut off at its output size limit. */
+export const CHECKPOINT_DIFF_TRUNCATED_MARKER = "\n\n[truncated]";
+
 export const TurnCountRange = Schema.Struct({
   fromTurnCount: NonNegativeInt,
   toTurnCount: NonNegativeInt,
diff --git a/packages/contracts/src/clientRpcPermissions.ts b/packages/contracts/src/clientRpcPermissions.ts
index 8b4a7d48d279..8681c1ea8abe 100644
--- a/packages/contracts/src/clientRpcPermissions.ts
+++ b/packages/contracts/src/clientRpcPermissions.ts
@@ -25,6 +25,7 @@ export const CLIENT_GUARDED_RPC_SCOPES = {
   // Restarts the server, as an update does.
   [WS_METHODS.serverReclaimDatabaseSpace]: AuthEnvironmentMaintainScope,
   [WS_METHODS.serverCheckOtlpEndpoint]: AuthSettingsWriteScope,
+  [WS_METHODS.serverCheckSecretSource]: AuthSettingsWriteScope,
   // Listing models spends the stored API key, so only those who can choose a model may.
   [WS_METHODS.serverListTextGeneratorModels]: AuthSettingsWriteScope,
   [WS_METHODS.serverRefreshProviders]: AuthOrchestrationReadScope,
diff --git a/packages/contracts/src/desktopBootstrap.ts b/packages/contracts/src/desktopBootstrap.ts
index 48233f4d94d5..5148aa2c1c82 100644
--- a/packages/contracts/src/desktopBootstrap.ts
+++ b/packages/contracts/src/desktopBootstrap.ts
@@ -37,3 +37,6 @@ export type DesktopBackendBootstrap = typeof DesktopBackendBootstrap.Type;
 
 /** Written to `<t3Home>/runtime` before update shutdown so the backend retains its managed tunnel. */
 export const DESKTOP_UPDATE_RESTART_MARKER_FILE = "desktop-update-restart";
+
+export const DESKTOP_UPDATE_IN_PROGRESS_MARKER_FILE = "desktop-update-in-progress";
+export const DESKTOP_UPDATE_IN_PROGRESS_TTL_MS = 60_000;
diff --git a/packages/contracts/src/editor.ts b/packages/contracts/src/editor.ts
index 8732d7fe288e..28fd10d6e7b2 100644
--- a/packages/contracts/src/editor.ts
+++ b/packages/contracts/src/editor.ts
@@ -157,6 +157,8 @@ export type FileManagerRevealKind = typeof FileManagerRevealKind.Type;
 export const LaunchEditorInput = Schema.Struct({
   cwd: TrimmedNonEmptyString,
   editor: EditorId,
+  /** Workspace the target belongs to; JetBrains IDEs open positioned files in this project. */
+  projectRoot: Schema.optional(TrimmedNonEmptyString),
   /** Only for file-manager; requires the server's shellRevealInFileManager capability. */
   reveal: Schema.optional(Schema.Boolean),
 });
diff --git a/packages/contracts/src/environment.test.ts b/packages/contracts/src/environment.test.ts
index 80f1156663a0..1646684f1da0 100644
--- a/packages/contracts/src/environment.test.ts
+++ b/packages/contracts/src/environment.test.ts
@@ -16,7 +16,11 @@ const descriptor = {
 describe("ExecutionEnvironmentDescriptor", () => {
   it("decodes old, recognized and future manual installation descriptors", () => {
     expect(decodeDescriptor(descriptor).capabilities.serverInstallation).toBeUndefined();
-    for (const installation of [{ kind: "npx" }, { kind: "npm-global", prefix: "/opt/node" }]) {
+    for (const installation of [
+      { kind: "npx" },
+      { kind: "npm-global", prefix: "/opt/node" },
+      { kind: "t3-launcher", launcher: "/opt/bin/t3", baseDir: "/data/t3" },
+    ]) {
       expect(
         decodeDescriptor({
           ...descriptor,
@@ -24,7 +28,18 @@ describe("ExecutionEnvironmentDescriptor", () => {
         }).capabilities.serverInstallation,
       ).toEqual(installation);
     }
-    for (const installation of [{ kind: "future-manager" }, { kind: "npm-global" }]) {
+    const spaced = { kind: "t3-launcher", launcher: "/opt/bin/t3 ", baseDir: " /data/t3 " };
+    expect(
+      decodeDescriptor({
+        ...descriptor,
+        capabilities: { ...descriptor.capabilities, serverInstallation: spaced },
+      }).capabilities.serverInstallation,
+    ).toEqual(spaced);
+    for (const installation of [
+      { kind: "future-manager" },
+      { kind: "npm-global" },
+      { kind: "t3-launcher", launcher: "t3" },
+    ]) {
       expect(
         decodeDescriptor({
           ...descriptor,
diff --git a/packages/contracts/src/environment.ts b/packages/contracts/src/environment.ts
index 45a8e7119b1e..e305efb51f83 100644
--- a/packages/contracts/src/environment.ts
+++ b/packages/contracts/src/environment.ts
@@ -61,9 +61,18 @@ export type ExecutionEnvironmentPlatform = typeof ExecutionEnvironmentPlatform.T
 export const ServerSelfUpdateMethod = Schema.Literals(["boot-service", "respawn", "desktop-app"]);
 export type ServerSelfUpdateMethod = typeof ServerSelfUpdateMethod.Type;
 
+// Not trimmed: a path that differs from the installed one would update the wrong home.
+const InstalledPath = Schema.String.check(Schema.isNonEmpty());
+
 export const ServerInstallation = Schema.Union([
   Schema.Struct({ kind: Schema.Literals(["npx", "pnpm-dlx", "bunx"]) }),
   Schema.Struct({ kind: Schema.Literal("npm-global"), prefix: TrimmedNonEmptyString }),
+  // A launcher symlink into a downloaded runtime, as the install script and `t3 update` leave.
+  Schema.Struct({
+    kind: Schema.Literal("t3-launcher"),
+    launcher: InstalledPath,
+    baseDir: InstalledPath,
+  }),
 ]);
 export type ServerInstallation = typeof ServerInstallation.Type;
 
@@ -98,6 +107,8 @@ export const ExecutionEnvironmentCapabilities = Schema.Struct({
   storageCleanupRun: Schema.optionalKey(Schema.Boolean),
   databaseStorage: Schema.optionalKey(Schema.Boolean),
   otlpEndpointCheck: Schema.optionalKey(Schema.Boolean),
+  /** Serves `server.checkSecretSource`; hide the secret check where it is absent. */
+  secretSourceCheck: Schema.optionalKey(Schema.Boolean),
   projectWorktreeCleanup: Schema.optionalKey(Schema.Boolean),
   settledWorktreeCleanup: Schema.optionalKey(Schema.Boolean),
   worktreesDirectory: Schema.optionalKey(Schema.Boolean),
@@ -149,6 +160,8 @@ export const ExecutionEnvironmentCapabilities = Schema.Struct({
   projectOrganization: Schema.optionalKey(Schema.Boolean),
   /** Server answers projects.listIgnoredFiles. */
   ignoredFileListing: Schema.optionalKey(Schema.Boolean),
+  /** projects.listIgnoredFiles honors `query`. Older servers ignore it. */
+  ignoredFileSearch: Schema.optionalKey(Schema.Boolean),
   environmentIcon: Schema.optionalKey(Schema.Boolean),
   desktopAppUpdate: Schema.optionalKey(Schema.Boolean),
   /** The desktop app switches update tracks when a server update request names one. */
@@ -190,6 +203,8 @@ export const ExecutionEnvironmentCapabilities = Schema.Struct({
    */
   shellThreadFamilies: Schema.optionalKey(Schema.Boolean),
   shellOlderSettled: Schema.optionalKey(Schema.Boolean),
+  /** Publishes a pull request refresh when linked-thread answers change; older servers need polling. */
+  linkedThreadRefreshes: Schema.optionalKey(Schema.Boolean),
 });
 export type ExecutionEnvironmentCapabilities = typeof ExecutionEnvironmentCapabilities.Type;
 
diff --git a/packages/contracts/src/ipc.ts b/packages/contracts/src/ipc.ts
index 84843b1e26ab..a5a051e1b37a 100644
--- a/packages/contracts/src/ipc.ts
+++ b/packages/contracts/src/ipc.ts
@@ -1279,6 +1279,7 @@ export interface DesktopPreviewBridge {
   goBack: (tabId: string) => Promise<void>;
   goForward: (tabId: string) => Promise<void>;
   refresh: (tabId: string) => Promise<void>;
+  stopLoading: (tabId: string) => Promise<void>;
   zoomIn: (tabId: string) => Promise<void>;
   zoomOut: (tabId: string) => Promise<void>;
   resetZoom: (tabId: string) => Promise<void>;
diff --git a/packages/contracts/src/orchestrationProject.ts b/packages/contracts/src/orchestrationProject.ts
index d98c50e56e8d..35cee805b881 100644
--- a/packages/contracts/src/orchestrationProject.ts
+++ b/packages/contracts/src/orchestrationProject.ts
@@ -8,6 +8,9 @@ import { ProjectScript, ReceivedProjectIcon } from "./project.ts";
 export const OrchestrationProjectShell = Schema.Struct({
   id: ProjectId,
   title: TrimmedNonEmptyString,
+  // Set once someone renames the project. A folder-default title can equal the
+  // repository name, so grouped labels need this to tell a chosen name apart.
+  hasCustomTitle: Schema.optional(Schema.Boolean),
   workspaceRoot: TrimmedNonEmptyString,
   repositoryIdentity: Schema.optional(Schema.NullOr(RepositoryIdentity)),
   defaultModelSelection: Schema.NullOr(ModelSelection),
diff --git a/packages/contracts/src/orchestrationV2.ts b/packages/contracts/src/orchestrationV2.ts
index 1fb918956933..42868af7da95 100644
--- a/packages/contracts/src/orchestrationV2.ts
+++ b/packages/contracts/src/orchestrationV2.ts
@@ -45,6 +45,7 @@ import { AuthMcpClientAccess } from "./auth.ts";
 import { ChatAttachment } from "./chatAttachment.ts";
 import { ThreadGuestShare } from "./guestShare.ts";
 import { StoredThreadTags, ThreadTag } from "./threadTags.ts";
+import { ThreadTitleRegenerationOutcome } from "./threadTitle.ts";
 import {
   OrchestrationSearchThreadsInput,
   OrchestrationSearchThreadsResult,
@@ -456,6 +457,12 @@ const LenientThreadOpens = Schema.NullOr(OrchestrationV2ThreadOpens).pipe(
   Schema.catchDecoding(() => Effect.succeedSome(null)),
 );
 
+const OrchestrationV2LastTitleRegeneration = Schema.Struct({
+  ...ThreadTitleRegenerationOutcome.fields,
+  requestId: CommandId,
+  completedAt: Schema.DateTimeUtc,
+});
+
 export const OrchestrationV2AppThread = Schema.Struct({
   ...OrchestrationV2CreationFields,
   id: ThreadId,
@@ -519,6 +526,7 @@ export const OrchestrationV2AppThread = Schema.Struct({
       }),
     ),
   ),
+  lastTitleRegeneration: Schema.optional(Schema.NullOr(OrchestrationV2LastTitleRegeneration)),
   rollbackRequestId: Schema.optional(CommandId),
   rollbackFailure: Schema.optional(
     Schema.NullOr(
@@ -532,6 +540,24 @@ export const OrchestrationV2AppThread = Schema.Struct({
 });
 export type OrchestrationV2AppThread = typeof OrchestrationV2AppThread.Type;
 
+/** A visit changes read state only, so its event leaves the rest of the thread out. */
+export const OrchestrationV2ThreadVisit = Schema.Struct({
+  lastVisitedAt: OrchestrationV2AppThread.fields.lastVisitedAt,
+  opens: OrchestrationV2AppThread.fields.opens,
+});
+export type OrchestrationV2ThreadVisit = typeof OrchestrationV2ThreadVisit.Type;
+
+export function applyOrchestrationV2ThreadVisit<Thread extends OrchestrationV2AppThread>(
+  thread: Thread,
+  visit: OrchestrationV2ThreadVisit,
+): Thread {
+  return {
+    ...thread,
+    lastVisitedAt: visit.lastVisitedAt,
+    ...(visit.opens === undefined ? {} : { opens: visit.opens }),
+  };
+}
+
 /** A thread another agent drives: a local subagent or a task delegated from a linked environment. */
 export const isDelegatedAppThread = (
   thread: Pick<OrchestrationV2AppThread, "lineage" | "delegatedFrom">,
@@ -1030,6 +1056,8 @@ const PendingBackgroundTaskFields = {
   description: Schema.optional(TrimmedNonEmptyString),
   /** The subagent task that started this work and waits on it. */
   parentTaskId: Schema.optional(TrimmedNonEmptyString),
+  /** Native id of the turn item that started this work, when it is not `taskId`. */
+  nativeItemId: Schema.optional(TrimmedNonEmptyString),
   /**
    * The agent declared it resumes when this work ends, so the thread holds like it does for a
    * subagent. Only the agent knows whether a command is a wait or a dev server it left running.
@@ -1963,6 +1991,11 @@ export const OrchestrationV2DomainEvent = Schema.Union([
     type: Schema.Literal("thread.pull-request-link-updated"),
     payload: ThreadPullRequestLink,
   }),
+  Schema.Struct({
+    ...OrchestrationV2EventBase.fields,
+    type: Schema.Literal("thread.visit-recorded"),
+    payload: OrchestrationV2ThreadVisit,
+  }),
   Schema.Struct({
     ...OrchestrationV2EventBase.fields,
     type: Schema.Literal("run.created"),
@@ -2119,6 +2152,8 @@ export const OrchestrationV2PendingRuntimeRequestSummary = Schema.Struct({
   createdAt: Schema.DateTimeUtc,
   /** False for async questions the run keeps working past. Absent from older servers. */
   blocking: Schema.optional(Schema.Boolean),
+  /** Secret and link cards: only the user can answer them, never a coordinating agent. */
+  userOnly: Schema.optional(Schema.Boolean),
 });
 export type OrchestrationV2PendingRuntimeRequestSummary =
   typeof OrchestrationV2PendingRuntimeRequestSummary.Type;
@@ -2212,6 +2247,7 @@ export const OrchestrationV2ThreadShell = Schema.Struct({
       }),
     ),
   ),
+  lastTitleRegeneration: Schema.optional(Schema.NullOr(OrchestrationV2LastTitleRegeneration)),
   deletedAt: Schema.NullOr(Schema.DateTimeUtc),
 });
 export type OrchestrationV2ThreadShell = typeof OrchestrationV2ThreadShell.Type;
@@ -2381,10 +2417,23 @@ export const OrchestrationV2AppThreadJson = OrchestrationV2AppThread.mapFields((
       }),
     ),
   ),
+  lastTitleRegeneration: Schema.optional(
+    Schema.NullOr(
+      OrchestrationV2LastTitleRegeneration.mapFields((fields) => ({
+        ...fields,
+        completedAt: Schema.DateTimeUtcFromString,
+      })),
+    ),
+  ),
   deletedAt: Schema.NullOr(Schema.DateTimeUtcFromString),
 }));
 export type OrchestrationV2AppThreadJson = typeof OrchestrationV2AppThreadJson.Type;
 
+export const OrchestrationV2ThreadVisitJson = Schema.Struct({
+  lastVisitedAt: OrchestrationV2AppThreadJson.fields.lastVisitedAt,
+  opens: OrchestrationV2AppThreadJson.fields.opens,
+});
+
 export const OrchestrationV2RunJson = OrchestrationV2Run.mapFields((fields) => ({
   ...fields,
   requestedAt: Schema.DateTimeUtcFromString,
@@ -2820,6 +2869,14 @@ export const OrchestrationV2ThreadShellJson = OrchestrationV2ThreadShell.mapFiel
       }),
     ),
   ),
+  lastTitleRegeneration: Schema.optional(
+    Schema.NullOr(
+      OrchestrationV2LastTitleRegeneration.mapFields((fields) => ({
+        ...fields,
+        completedAt: Schema.DateTimeUtcFromString,
+      })),
+    ),
+  ),
   deletedAt: Schema.NullOr(Schema.DateTimeUtcFromString),
 }));
 export type OrchestrationV2ThreadShellJson = typeof OrchestrationV2ThreadShellJson.Type;
@@ -2877,6 +2934,11 @@ export const OrchestrationV2DomainEventJson = Schema.Union([
     type: Schema.Literal("thread.pull-request-link-updated"),
     payload: ThreadPullRequestLink,
   }),
+  Schema.Struct({
+    ...OrchestrationV2JsonEventBaseFields,
+    type: Schema.Literal("thread.visit-recorded"),
+    payload: OrchestrationV2ThreadVisitJson,
+  }),
   Schema.Struct({
     ...OrchestrationV2JsonEventBaseFields,
     type: Schema.Literal("run.created"),
@@ -3211,6 +3273,7 @@ export const OrchestrationV2Command = Schema.Union([
     threadId: ThreadId,
     requestId: CommandId,
     title: Schema.optional(TrimmedNonEmptyString),
+    outcome: Schema.optional(ThreadTitleRegenerationOutcome),
   }),
   Schema.Struct({
     type: Schema.Literal("thread.runtime-mode.set"),
@@ -3505,6 +3568,15 @@ const OrchestrationV2InternalCommand = Schema.Union([
     threadId: ThreadId,
     projectId: ProjectId,
   }),
+  /**
+   * After a push, the thread's watches forget whether their checks were running, since the push
+   * can start new ones. Applied to the watches as they are then, so no earlier read overwrites them.
+   */
+  Schema.Struct({
+    type: Schema.Literal("thread.pull-request-watch.checks-reopen"),
+    commandId: CommandId,
+    threadId: ThreadId,
+  }),
   Schema.Struct({
     type: Schema.Literal("thread.pull-request-watch.sync"),
     commandId: CommandId,
@@ -3512,6 +3584,11 @@ const OrchestrationV2InternalCommand = Schema.Union([
     ...ThreadPullRequestKey.fields,
     startedAt: IsoDateTime,
     watch: Schema.NullOr(ThreadPullRequestWatch),
+    /**
+     * The watch's `checksPending` when this read started. A push that clears it during the read
+     * makes the read's answer describe the old head, so the cleared answer stays.
+     */
+    checksPendingBefore: Schema.optional(Schema.Boolean),
     /** With `watch: null`, the state the ended watch keeps instead of its last saved one. */
     endedWatch: Schema.optional(ThreadPullRequestWatch),
     /** More watches of this thread recorded together, which `wake` also reports on. */
@@ -3521,6 +3598,7 @@ const OrchestrationV2InternalCommand = Schema.Union([
           ...ThreadPullRequestKey.fields,
           startedAt: IsoDateTime,
           watch: Schema.NullOr(ThreadPullRequestWatch),
+          checksPendingBefore: Schema.optional(Schema.Boolean),
           endedWatch: Schema.optional(ThreadPullRequestWatch),
           includesRemarks: Schema.optional(Schema.Boolean),
         }),
@@ -4135,10 +4213,10 @@ export type OrchestrationV2ForceStopThreadInput = typeof OrchestrationV2ForceSto
 
 export const OrchestrationV2ForceStopThreadResult = Schema.Struct({
   /**
-   * `killed`: the thread's own agent processes were killed. `released`: its provider session
-   * was torn down, which kills the agent's process group. `releasing`: that teardown has not
-   * finished yet and continues on the server. `shared`: the agent process also works for
-   * `sharedWithThreadIds`, so only this thread's turn was ended.
+   * `killed`: its own agent processes were killed. `released`: its provider session was torn
+   * down (killing the agent's process group) or handed to its newer run. `releasing`: teardown
+   * continues on the server. `shared`: the agent process also works for `sharedWithThreadIds`,
+   * so only this thread's turn was ended.
    */
   outcome: Schema.Literals(["killed", "released", "releasing", "shared"]),
   sharedWithThreadIds: Schema.Array(ThreadId),
diff --git a/packages/contracts/src/orchestratorMcp.ts b/packages/contracts/src/orchestratorMcp.ts
index f668fb7743af..99081420d91c 100644
--- a/packages/contracts/src/orchestratorMcp.ts
+++ b/packages/contracts/src/orchestratorMcp.ts
@@ -34,7 +34,7 @@ import {
 } from "./threadPullRequest.ts";
 import { secretRequestPageUrl } from "./secretRequest.ts";
 import { hasOnlyPairedSurrogates } from "./threadMetadataMcp.ts";
-import { ThreadTitleRegeneration } from "./threadTitle.ts";
+import { LastThreadTitleRegeneration, ThreadTitleRegeneration } from "./threadTitle.ts";
 import {
   OrchestrationV2Actor,
   OrchestrationV2CreationSource,
@@ -362,6 +362,17 @@ export const OrchestratorMcpThreadPullRequest = Schema.Struct({
 });
 export type OrchestratorMcpThreadPullRequest = typeof OrchestratorMcpThreadPullRequest.Type;
 
+/** Background work still open on the thread, as its provider reported it. */
+export const OrchestratorMcpThreadBackgroundTask = Schema.Struct({
+  taskId: TrimmedNonEmptyString,
+  kind: Schema.Literals(["subagent", "command", "monitor", "background_task"]),
+  description: Schema.optional(TrimmedNonEmptyString),
+  /** The agent waits on this command or monitor. Other kinds always hold the thread. */
+  awaited: Schema.optional(Schema.Literal(true)),
+  childThreadId: Schema.optional(ThreadId),
+});
+export type OrchestratorMcpThreadBackgroundTask = typeof OrchestratorMcpThreadBackgroundTask.Type;
+
 export const OrchestratorMcpThreadListItem = Schema.Struct({
   threadId: ThreadId,
   projectId: ProjectId,
@@ -376,13 +387,18 @@ export const OrchestratorMcpThreadListItem = Schema.Struct({
   runtimeMode: RuntimeMode,
   interactionMode: ProviderInteractionMode,
   linkedPullRequest: Schema.NullOr(ThreadLinkedPullRequest),
-  /** Linked pull requests not yet merged or closed; list_thread_pull_requests has all of them. */
+  /** Up to 5 open linked pull requests, watched first; list_thread_pull_requests pages all of them. */
   pullRequests: Schema.optional(Schema.Array(OrchestratorMcpThreadPullRequest)),
   pullRequestCount: Schema.optional(NonNegativeInt),
+  openPullRequestCount: Schema.optional(NonNegativeInt),
   settled: Schema.Boolean,
   settledAt: Schema.NullOr(IsoDateTime),
   snoozed: Schema.Boolean,
   snoozedUntil: Schema.NullOr(IsoDateTime),
+  /** Absent from linked environments that predate it. */
+  blockedOnThreadWait: Schema.optional(Schema.Boolean),
+  /** Absent from linked environments that predate it. */
+  pendingBackgroundTasks: Schema.optional(Schema.Array(OrchestratorMcpThreadBackgroundTask)),
   parentThreadId: Schema.NullOr(ThreadId),
   relationshipToParent: Schema.NullOr(Schema.Literals(["fork", "subagent"])),
   itemCount: NonNegativeInt,
@@ -421,15 +437,12 @@ export const OrchestratorMcpThreadReadInput = Schema.Struct({
   itemId: Schema.optional(TurnItemId),
   textOffset: Schema.optional(NonNegativeInt),
   view: Schema.optional(Schema.Literals(["messages", "activity"])),
-  afterPosition: Schema.optional(NonNegativeInt),
-  limit: Schema.optional(clampedPositiveInt(100)).annotate({
-    description: "Max items, 1 to 100.",
-  }),
-  runLimit: Schema.optional(clampedPositiveInt(50)).annotate({
-    description: "Max recent runs, 1 to 50.",
-  }),
-  maxCharsPerItem: Schema.optional(clampedPositiveInt(50_000)).annotate({
-    description: "Max chars per item, 1 to 50000.",
+  afterPosition: Schema.optional(Schema.Int.check(Schema.isGreaterThanOrEqualTo(-1))),
+  beforePosition: Schema.optional(NonNegativeInt),
+  limit: Schema.optional(clampedPositiveInt(100)).annotate({ description: "Max 100." }),
+  runLimit: Schema.optional(clampedPositiveInt(50)).annotate({ description: "Max 50." }),
+  maxCharsPerItem: Schema.optional(clampedPositiveInt(20_000)).annotate({
+    description: "Max 20000.",
   }),
 });
 export type OrchestratorMcpThreadReadInput = typeof OrchestratorMcpThreadReadInput.Type;
@@ -449,10 +462,12 @@ export const OrchestratorMcpThreadDetail = Schema.Struct({
   runtimeMode: RuntimeMode,
   interactionMode: ProviderInteractionMode,
   linkedPullRequest: Schema.NullOr(ThreadLinkedPullRequest),
-  /** Open linked pull requests, on the first page only; list_thread_pull_requests has all of them. */
+  /** Up to 5 open linked pull requests, watched first, on the first page only; list_thread_pull_requests pages all of them. */
   pullRequests: Schema.optional(Schema.Array(OrchestratorMcpThreadPullRequest)),
   pullRequestCount: Schema.optional(NonNegativeInt),
+  openPullRequestCount: Schema.optional(NonNegativeInt),
   titleRegeneration: Schema.NullOr(ThreadTitleRegeneration),
+  lastTitleRegeneration: Schema.optional(Schema.NullOr(LastThreadTitleRegeneration)),
   branch: Schema.NullOr(Schema.String),
   worktreePath: Schema.NullOr(Schema.String),
   parentThreadId: Schema.NullOr(ThreadId),
@@ -465,6 +480,10 @@ export const OrchestratorMcpThreadDetail = Schema.Struct({
   settledAt: Schema.NullOr(IsoDateTime),
   snoozed: Schema.Boolean,
   snoozedUntil: Schema.NullOr(IsoDateTime),
+  /** Absent from linked environments that predate it. */
+  blockedOnThreadWait: Schema.optional(Schema.Boolean),
+  /** Absent from linked environments that predate it. */
+  pendingBackgroundTasks: Schema.optional(Schema.Array(OrchestratorMcpThreadBackgroundTask)),
   createdAt: IsoDateTime,
   updatedAt: IsoDateTime,
 });
@@ -510,6 +529,8 @@ export const OrchestratorMcpThreadReadResult = Schema.Struct({
   items: Schema.Array(OrchestratorMcpThreadTimelineItem),
   nextPosition: Schema.NullOr(NonNegativeInt),
   hasMore: Schema.Boolean,
+  /** null when nothing is older than the page. Missing from peers that only read forward. */
+  earlierPosition: Schema.optional(Schema.NullOr(NonNegativeInt)),
 });
 export type OrchestratorMcpThreadReadResult = typeof OrchestratorMcpThreadReadResult.Type;
 
diff --git a/packages/contracts/src/previewAutomation.ts b/packages/contracts/src/previewAutomation.ts
index 597ae26ca034..2b8df15c42cb 100644
--- a/packages/contracts/src/previewAutomation.ts
+++ b/packages/contracts/src/previewAutomation.ts
@@ -262,7 +262,9 @@ export type PreviewAutomationResizeInput = typeof PreviewAutomationResizeInput.T
 export const PreviewAutomationResizeResult = Schema.Struct({
   tabId: PreviewTabId,
   setting: PreviewViewportSetting,
-  viewport: PreviewRenderedViewportSize,
+  viewport: Schema.optional(PreviewRenderedViewportSize).annotate({
+    description: "Viewport size after the resize. Omitted when it could not be measured.",
+  }),
 });
 export type PreviewAutomationResizeResult = typeof PreviewAutomationResizeResult.Type;
 
@@ -794,6 +796,7 @@ export class PreviewAutomationTimeoutError extends Schema.TaggedError<PreviewAut
 
 export const PreviewAutomationControlReason = Schema.Literals([
   "agentMismatch",
+  "unclaimedTab",
   "humanControl",
   "tabRequired",
   "closed",
@@ -814,6 +817,8 @@ export class PreviewAutomationControlInterruptedError extends Schema.TaggedError
   override get message(): string {
     if (this.reason === "agentMismatch")
       return "This browser tab belongs to another agent session or a human. Open your own tab.";
+    if (this.reason === "unclaimedTab")
+      return "This tab has no agent owner. Ask the user to close it in the browser panel.";
     if (this.reason === "humanControl")
       return "A human controls this browser tab. Wait until they release control.";
     if (this.reason === "tabRequired")
diff --git a/packages/contracts/src/project.test.ts b/packages/contracts/src/project.test.ts
index 168886ebe441..c3da9f2fe95c 100644
--- a/packages/contracts/src/project.test.ts
+++ b/packages/contracts/src/project.test.ts
@@ -10,12 +10,16 @@ import {
   ReceivedProjectIcon,
   StoredProjectIcon,
   ProjectReadFileError,
+  ProjectReadFileInput,
+  ProjectReadFileResult,
   ProjectCreatePayload,
   ProjectUpdatePayload,
   ProjectMutation,
   ProjectSearchContentsError,
   ProjectSearchEntriesError,
   ProjectWriteFileError,
+  ProjectWriteFileInput,
+  ProjectWriteFileResult,
 } from "./project.ts";
 
 const decodeProjectCreatePayload = Schema.decodeUnknownSync(ProjectCreatePayload);
@@ -23,6 +27,45 @@ const decodeProjectUpdatePayload = Schema.decodeUnknownSync(ProjectUpdatePayload
 const decodeProjectMutation = Schema.decodeUnknownSync(ProjectMutation);
 
 describe("project RPC errors", () => {
+  it("keeps whitespace in file paths across the wire", () => {
+    const roundTrip = <S extends Schema.Codec<unknown, unknown>>(schema: S, value: S["Type"]) =>
+      Schema.decodeUnknownSync(schema)(Schema.encodeSync(schema)(value));
+
+    for (const relativePath of [" ", " report.txt", "report.txt\t"]) {
+      const cwd = "/workspace";
+      const resolvedPath = `${cwd}/${relativePath}`;
+      expect(roundTrip(ProjectReadFileInput, { cwd, relativePath }).relativePath).toBe(
+        relativePath,
+      );
+      expect(
+        roundTrip(ProjectWriteFileInput, { cwd, relativePath, contents: "" }).relativePath,
+      ).toBe(relativePath);
+      expect(
+        roundTrip(ProjectReadFileResult, {
+          relativePath,
+          contents: "",
+          byteLength: 0,
+          truncated: false,
+        }).relativePath,
+      ).toBe(relativePath);
+      expect(roundTrip(ProjectWriteFileResult, { relativePath }).relativePath).toBe(relativePath);
+      for (const FileError of [ProjectReadFileError, ProjectWriteFileError]) {
+        const error = new FileError({
+          cwd,
+          relativePath,
+          failure: "operation_failed",
+          resolvedPath,
+          operationPath: resolvedPath,
+        });
+        expect(roundTrip(FileError, error)).toMatchObject({
+          relativePath,
+          resolvedPath,
+          operationPath: resolvedPath,
+        });
+      }
+    }
+  });
+
   it("derives stable messages from structured request context while retaining causes", () => {
     const cause = new Error("sensitive platform detail");
     const searchError = new ProjectSearchEntriesError({
diff --git a/packages/contracts/src/project.ts b/packages/contracts/src/project.ts
index 9b4fafb3f7bf..80848ba81f55 100644
--- a/packages/contracts/src/project.ts
+++ b/packages/contracts/src/project.ts
@@ -311,6 +311,8 @@ export type ProjectListEntriesResult = typeof ProjectListEntriesResult.Type;
 // are left out, so the list stays small enough to pick from.
 export const ProjectListIgnoredFilesInput = Schema.Struct({
   cwd: TrimmedNonEmptyString,
+  /** Case-insensitive path substring, applied before the listing cap. */
+  query: Schema.optionalKey(TrimmedString.check(Schema.isMaxLength(256))),
 });
 export type ProjectListIgnoredFilesInput = typeof ProjectListIgnoredFilesInput.Type;
 
@@ -438,14 +440,14 @@ export class ProjectListEntriesError extends Schema.TaggedError<ProjectListEntri
 export const ProjectReadFileInput = Schema.Struct({
   cwd: TrimmedNonEmptyString,
   // Workspace-relative or absolute host path; only workspace-relative paths are writable.
-  relativePath: TrimmedNonEmptyString.check(Schema.isMaxLength(PROJECT_READ_FILE_PATH_MAX_LENGTH)),
+  relativePath: Schema.NonEmptyString.check(Schema.isMaxLength(PROJECT_READ_FILE_PATH_MAX_LENGTH)),
   // Optional files can be absent without failing the read.
   allowMissing: Schema.optional(Schema.Boolean),
 });
 export type ProjectReadFileInput = typeof ProjectReadFileInput.Type;
 
 export const ProjectReadFileResult = Schema.Struct({
-  relativePath: TrimmedNonEmptyString,
+  relativePath: Schema.NonEmptyString,
   contents: Schema.String,
   byteLength: NonNegativeInt,
   truncated: Schema.Boolean,
@@ -490,12 +492,12 @@ export class ProjectReadFileError extends Schema.TaggedError<ProjectReadFileErro
   "ProjectReadFileError",
   {
     cwd: Schema.optional(TrimmedNonEmptyString),
-    relativePath: Schema.optional(TrimmedNonEmptyString),
+    relativePath: Schema.optional(Schema.NonEmptyString),
     failure: Schema.optional(ProjectFileFailure),
-    resolvedPath: Schema.optional(TrimmedNonEmptyString),
+    resolvedPath: Schema.optional(Schema.NonEmptyString),
     resolvedWorkspaceRoot: Schema.optional(TrimmedNonEmptyString),
     operation: Schema.optional(ProjectFileOperation),
-    operationPath: Schema.optional(TrimmedNonEmptyString),
+    operationPath: Schema.optional(Schema.NonEmptyString),
     message: TrimmedNonEmptyString,
     cause: Schema.optional(Schema.Defect()),
   },
@@ -513,13 +515,13 @@ export class ProjectReadFileError extends Schema.TaggedError<ProjectReadFileErro
 
 export const ProjectWriteFileInput = Schema.Struct({
   cwd: TrimmedNonEmptyString,
-  relativePath: TrimmedNonEmptyString.check(Schema.isMaxLength(PROJECT_WRITE_FILE_PATH_MAX_LENGTH)),
+  relativePath: Schema.NonEmptyString.check(Schema.isMaxLength(PROJECT_WRITE_FILE_PATH_MAX_LENGTH)),
   contents: Schema.String,
 });
 export type ProjectWriteFileInput = typeof ProjectWriteFileInput.Type;
 
 export const ProjectWriteFileResult = Schema.Struct({
-  relativePath: TrimmedNonEmptyString,
+  relativePath: Schema.NonEmptyString,
 });
 export type ProjectWriteFileResult = typeof ProjectWriteFileResult.Type;
 
@@ -555,12 +557,12 @@ export class ProjectWriteFileError extends Schema.TaggedError<ProjectWriteFileEr
   "ProjectWriteFileError",
   {
     cwd: Schema.optional(TrimmedNonEmptyString),
-    relativePath: Schema.optional(TrimmedNonEmptyString),
+    relativePath: Schema.optional(Schema.NonEmptyString),
     failure: Schema.optional(ProjectFileFailure),
-    resolvedPath: Schema.optional(TrimmedNonEmptyString),
+    resolvedPath: Schema.optional(Schema.NonEmptyString),
     resolvedWorkspaceRoot: Schema.optional(TrimmedNonEmptyString),
     operation: Schema.optional(ProjectFileOperation),
-    operationPath: Schema.optional(TrimmedNonEmptyString),
+    operationPath: Schema.optional(Schema.NonEmptyString),
     message: TrimmedNonEmptyString,
     cause: Schema.optional(Schema.Defect()),
   },
diff --git a/packages/contracts/src/providerUsageLimits.ts b/packages/contracts/src/providerUsageLimits.ts
index 67acbe0d35b0..851de4c72ffe 100644
--- a/packages/contracts/src/providerUsageLimits.ts
+++ b/packages/contracts/src/providerUsageLimits.ts
@@ -14,6 +14,9 @@ export const ServerProviderUsageWindow = Schema.Struct({
   id: TrimmedNonEmptyString,
   kind: Schema.Literals(["session", "weekly", "monthly", "other"]),
   label: TrimmedNonEmptyString,
+  /** When present, this limit applies only to these provider model IDs. */
+  modelIds: Schema.optional(Schema.Array(TrimmedNonEmptyString)),
+  providerIds: Schema.optional(Schema.Array(TrimmedNonEmptyString)),
   usedPercent: Schema.Number.check(Schema.isBetween({ minimum: 0, maximum: 100 })),
   resetsAt: Schema.optional(IsoDateTime),
   windowDurationMins: Schema.optional(NonNegativeInt),
diff --git a/packages/contracts/src/pullRequest.test.ts b/packages/contracts/src/pullRequest.test.ts
index 7c56ca8b9df3..91f22f20bfa5 100644
--- a/packages/contracts/src/pullRequest.test.ts
+++ b/packages/contracts/src/pullRequest.test.ts
@@ -104,7 +104,7 @@ describe("PullRequestCapabilities", () => {
       capabilities: {
         ...base,
         actions: options.actions,
-        mergeMethods: ["squash", "fast-forward", "merge"],
+        mergeMethods: ["squash", "semi-linear", "merge"],
         updateMethods: options.updateMethods,
         review: { ...base.review, verdicts: options.verdicts },
       },
diff --git a/packages/contracts/src/pullRequest.ts b/packages/contracts/src/pullRequest.ts
index 7604b1f07741..3f1198c1212e 100644
--- a/packages/contracts/src/pullRequest.ts
+++ b/packages/contracts/src/pullRequest.ts
@@ -54,7 +54,13 @@ export type PullRequestChecksState = typeof PullRequestChecksState.Type;
 export const PullRequestMergeability = Schema.Literals(["mergeable", "conflicting", "unknown"]);
 export type PullRequestMergeability = typeof PullRequestMergeability.Type;
 
-export const PullRequestMergeMethod = Schema.Literals(["merge", "squash", "rebase"]);
+/** `fast-forward` refuses unless the head contains the base, where `rebase` rewrites the branch onto it. */
+export const PullRequestMergeMethod = Schema.Literals([
+  "merge",
+  "squash",
+  "rebase",
+  "fast-forward",
+]);
 export type PullRequestMergeMethod = typeof PullRequestMergeMethod.Type;
 
 export const PullRequestAction = Schema.Literals([
@@ -335,6 +341,8 @@ export const PullRequestMergeCapabilities = Schema.Struct({
   merge: Schema.Boolean,
   squash: Schema.Boolean,
   rebase: Schema.Boolean,
+  /** Optional so servers that predate it still decode; absent means not allowed. */
+  "fast-forward": Schema.optional(Schema.Boolean),
 });
 export type PullRequestMergeCapabilities = typeof PullRequestMergeCapabilities.Type;
 
@@ -619,6 +627,14 @@ export const PullRequestReportStateInput = Schema.Struct({
 });
 export type PullRequestReportStateInput = typeof PullRequestReportStateInput.Type;
 
+/** The host's merge queue letting go of a pull request without merging it, newest first. */
+export const PullRequestMergeQueueRemoval = Schema.Struct({
+  id: TrimmedNonEmptyString,
+  removedAt: IsoDateTime,
+  reason: Schema.NullOr(Schema.String),
+});
+export type PullRequestMergeQueueRemoval = typeof PullRequestMergeQueueRemoval.Type;
+
 export const PullRequestDetail = Schema.Struct({
   provider: SourceControlProviderKind,
   capabilities: PullRequestCapabilities,
@@ -658,6 +674,8 @@ export const PullRequestDetail = Schema.Struct({
   autoMergeEnabled: Schema.optional(Schema.Boolean),
   autoMergeMethod: Schema.optional(PullRequestMergeMethod),
   workflowApprovalsRequired: Schema.optional(NonNegativeInt),
+  /** Absent where the host has no merge queue or does not report one. */
+  mergeQueueRemoval: Schema.optional(PullRequestMergeQueueRemoval),
   maintainerCanModify: Schema.optional(Schema.Boolean),
 });
 export type PullRequestDetail = typeof PullRequestDetail.Type;
diff --git a/packages/contracts/src/rpc.ts b/packages/contracts/src/rpc.ts
index 4755412bc009..adba6dbaca71 100644
--- a/packages/contracts/src/rpc.ts
+++ b/packages/contracts/src/rpc.ts
@@ -38,6 +38,8 @@ import * as Rpc from "effect/rpc/Rpc";
 import * as RpcGroup from "effect/rpc/RpcGroup";
 import * as RpcMiddleware from "effect/rpc/RpcMiddleware";
 import { NonNegativeInt, TrimmedNonEmptyString } from "./baseSchemas.ts";
+import { SecretSourceCheckResult } from "./settingsSecretValue.ts";
+import { SecretReference } from "./secretReference.ts";
 import {
   ProviderAuthCancelInput,
   ProviderAuthCompleteInput,
@@ -523,6 +525,7 @@ export const WS_METHODS = {
   peerLinksAnswerRequest: "peerLinks.answerRequest",
   serverUpdateSettings: "server.updateSettings",
   serverDiscoverSourceControl: "server.discoverSourceControl",
+  serverCheckSecretSource: "server.checkSecretSource",
   serverSearchAcpRegistry: "server.searchAcpRegistry",
   serverPrepareAcpRegistryAgent: "server.prepareAcpRegistryAgent",
   serverUninstallAcpRegistryManagedBinary: "server.uninstallAcpRegistryManagedBinary",
@@ -592,6 +595,7 @@ export const WS_METHODS = {
   pullRequestsInvalidate: "pullRequests.invalidate",
   pullRequestsReportState: "pullRequests.reportState",
   pullRequestsSubscribeRefreshes: "pullRequests.subscribeRefreshes",
+  pullRequestsSubscribeLinkedThreadRefreshes: "pullRequests.subscribeLinkedThreadRefreshes",
   pullRequestsReviewerCandidates: "pullRequests.reviewerCandidates",
   pullRequestsRequestReviewers: "pullRequests.requestReviewers",
   pullRequestsLabelCandidates: "pullRequests.labelCandidates",
@@ -875,6 +879,12 @@ const WsServerDiscoverSourceControlRpc = Rpc.make(WS_METHODS.serverDiscoverSourc
   error: EnvironmentAuthorizationError,
 });
 
+const WsServerCheckSecretSourceRpc = Rpc.make(WS_METHODS.serverCheckSecretSource, {
+  payload: Schema.Struct({ source: SecretReference }),
+  success: SecretSourceCheckResult,
+  error: EnvironmentAuthorizationError,
+});
+
 const WsServerSearchAcpRegistryRpc = Rpc.make(WS_METHODS.serverSearchAcpRegistry, {
   payload: AcpRegistrySearchInput,
   success: AcpRegistrySearchResult,
@@ -1229,6 +1239,17 @@ const WsPullRequestsSubscribeRefreshesRpc = Rpc.make(WS_METHODS.pullRequestsSubs
   stream: true,
 });
 
+// Separate from the refreshes above so linked-thread changes don't refetch forge-backed reads.
+const WsPullRequestsSubscribeLinkedThreadRefreshesRpc = Rpc.make(
+  WS_METHODS.pullRequestsSubscribeLinkedThreadRefreshes,
+  {
+    payload: Schema.Struct({}),
+    success: NonNegativeInt,
+    error: EnvironmentAuthorizationError,
+    stream: true,
+  },
+);
+
 // Fetch reviewer candidates only when the menu opens to avoid unused host requests.
 const WsPullRequestsReviewerCandidatesRpc = Rpc.make(WS_METHODS.pullRequestsReviewerCandidates, {
   payload: PullRequestReviewerCandidatesInput,
@@ -2118,6 +2139,7 @@ export const WsRpcGroup = RpcGroup.make(
   WsPeerLinksUnlinkRpc,
   WsPeerLinksAnswerRequestRpc,
   WsServerDiscoverSourceControlRpc,
+  WsServerCheckSecretSourceRpc,
   WsServerSearchAcpRegistryRpc,
   WsServerPrepareAcpRegistryAgentRpc,
   WsServerUninstallAcpRegistryManagedBinaryRpc,
@@ -2183,6 +2205,7 @@ export const WsRpcGroup = RpcGroup.make(
   WsPullRequestsInvalidateRpc,
   WsPullRequestsReportStateRpc,
   WsPullRequestsSubscribeRefreshesRpc,
+  WsPullRequestsSubscribeLinkedThreadRefreshesRpc,
   WsPullRequestsReviewerCandidatesRpc,
   WsPullRequestsRequestReviewersRpc,
   WsPullRequestsLabelCandidatesRpc,
diff --git a/packages/contracts/src/server.ts b/packages/contracts/src/server.ts
index 3449b01b9905..a983e7c0826f 100644
--- a/packages/contracts/src/server.ts
+++ b/packages/contracts/src/server.ts
@@ -83,6 +83,9 @@ export const ServerProviderModel = Schema.Struct({
   isCustom: Schema.Boolean,
   isDefault: Schema.optional(Schema.Boolean),
   isLegacy: Schema.optional(Schema.Boolean),
+  // False when the provider can run this model in sessions but not for
+  // application text generation. Absent means supported.
+  supportsTextGeneration: Schema.optional(Schema.Boolean),
   capabilities: Schema.NullOr(ModelCapabilities),
 });
 export type ServerProviderModel = typeof ServerProviderModel.Type;
diff --git a/packages/contracts/src/settings.ts b/packages/contracts/src/settings.ts
index 7a30af77f4a0..c5eec877ff13 100644
--- a/packages/contracts/src/settings.ts
+++ b/packages/contracts/src/settings.ts
@@ -1375,6 +1375,8 @@ export const ServerSettings = Schema.Struct({
   continueThreadsAfterServerUpdate: Schema.Boolean.pipe(
     Schema.withDecodingDefault(Effect.succeed(true)),
   ),
+  /** Holds an OS sleep inhibitor while any run is active; closing a laptop lid still sleeps it. */
+  keepAwakeWhileAgentsWork: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(true))),
 
   enableAgentBrowserAccess: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(true))),
   cloudSpeechCredentials: CloudSpeechCredentials.pipe(
@@ -1826,6 +1828,7 @@ export const ServerSettingsPatch = Schema.Struct({
   responseStreamingMode: Schema.optionalKey(ResponseStreamingMode),
   enableProviderUpdateChecks: Schema.optionalKey(Schema.Boolean),
   continueThreadsAfterServerUpdate: Schema.optionalKey(Schema.Boolean),
+  keepAwakeWhileAgentsWork: Schema.optionalKey(Schema.Boolean),
   enableAgentBrowserAccess: Schema.optionalKey(Schema.Boolean),
   cloudSpeechCredentials: Schema.optionalKey(
     Schema.Struct({
diff --git a/packages/contracts/src/settingsSecretValue.ts b/packages/contracts/src/settingsSecretValue.ts
index 669c80401323..93d720ba6555 100644
--- a/packages/contracts/src/settingsSecretValue.ts
+++ b/packages/contracts/src/settingsSecretValue.ts
@@ -121,3 +121,9 @@ export function withSettingsSecrets<Settings extends Readonly<Record<string, unk
   }
   return next as Settings;
 }
+
+export const SecretSourceCheckResult = Schema.Union([
+  Schema.TaggedStruct("Resolved", {}),
+  Schema.TaggedStruct("Failed", { detail: Schema.String }),
+]);
+export type SecretSourceCheckResult = typeof SecretSourceCheckResult.Type;
diff --git a/packages/contracts/src/terminal.ts b/packages/contracts/src/terminal.ts
index 8731d6ec25c8..7dcd75cb9d94 100644
--- a/packages/contracts/src/terminal.ts
+++ b/packages/contracts/src/terminal.ts
@@ -5,6 +5,33 @@ import { ProviderInstanceId } from "./providerInstance.ts";
 export const DEFAULT_TERMINAL_ID = "term-1";
 export const DEFAULT_MAX_TERMINAL_BUFFER_BYTES = 512 * 1024;
 
+const historyEncoder = new TextEncoder();
+// A BOM at a retained chunk boundary is terminal data, not an encoding marker.
+const historyDecoder = new TextDecoder("utf-8", { ignoreBOM: true });
+
+/** The final `maxBytes` of UTF-8 a client retains, starting at a code point boundary. */
+export function retainedTerminalHistory(history: string, maxBytes: number): string {
+  if (maxBytes <= 0) {
+    return "";
+  }
+
+  const encoded = historyEncoder.encode(history);
+  if (encoded.byteLength <= maxBytes) {
+    return history;
+  }
+
+  let start = encoded.byteLength - maxBytes;
+  while (start < encoded.length) {
+    const byte = encoded[start];
+    if (byte === undefined || (byte & 0b1100_0000) !== 0b1000_0000) {
+      break;
+    }
+    start += 1;
+  }
+
+  return historyDecoder.decode(encoded.subarray(start));
+}
+
 const TrimmedNonEmptyStringSchema = TrimmedNonEmptyString;
 const TerminalColsSchema = Schema.Int.check(Schema.isGreaterThanOrEqualTo(1)).check(
   Schema.isLessThanOrEqualTo(1000),
@@ -57,6 +84,8 @@ export const TerminalAttachInput = Schema.Struct({
   restartIfNotRunning: Schema.optional(Schema.Boolean),
   // Resubscriptions preserve stopped terminals; unknown IDs recover after a server restart.
   resume: Schema.optional(Schema.Boolean),
+  // Snapshots carry only the history a client this bounded keeps; older servers ignore it.
+  maxHistoryBytes: Schema.optional(Schema.Int.check(Schema.isGreaterThanOrEqualTo(0))),
 });
 export type TerminalAttachInput = typeof TerminalAttachInput.Type;
 
@@ -239,7 +268,7 @@ export class TerminalCwdNotFoundError extends Schema.TaggedError<TerminalCwdNotF
   },
 ) {
   override get message() {
-    return `Terminal cwd does not exist: ${this.cwd}`;
+    return `Terminal folder does not exist: ${this.cwd}. Restore the folder at this path before retrying.`;
   }
 }
 
diff --git a/packages/contracts/src/threadPullRequest.ts b/packages/contracts/src/threadPullRequest.ts
index bd0a65a3c0bc..7775f0755ff0 100644
--- a/packages/contracts/src/threadPullRequest.ts
+++ b/packages/contracts/src/threadPullRequest.ts
@@ -97,13 +97,25 @@ export const ThreadPullRequestWatch = Schema.Struct({
   /** Reported remarks at remarksThrough, so late arrivals at that timestamp still count. */
   remarkIds: Schema.Array(TrimmedNonEmptyString),
   conflicting: Schema.Boolean,
+  /** Last removal seen; null after an empty read, absent before the first read. */
+  mergeQueueRemovalId: Schema.optional(Schema.NullOr(TrimmedNonEmptyString)),
   /** Consecutive comment-only wakes; limited to prevent bot loops. */
   wakes: NonNegativeInt,
+  /**
+   * What is already on the pull request is recorded, not reported: conflicts on the first read, and
+   * checks on the first read that can be trusted to show them (one with a head and a full check read).
+   */
+  awaitingBaseline: Schema.optional(Schema.Literals(["all", "checks"])),
   /**
    * When the head was first read without any check, until a check shows up or the agent is told
    * none did. Null once either happened; absent on watches saved before it existed.
    */
   checksAwaitedSince: Schema.optional(Schema.NullOr(IsoDateTime)),
+  /**
+   * Whether the host was still running checks on the head at the last read. Only then does the
+   * watch keep its thread waiting; absent on watches not read since it existed.
+   */
+  checksPending: Schema.optional(Schema.Boolean),
 });
 export type ThreadPullRequestWatch = typeof ThreadPullRequestWatch.Type;
 
diff --git a/packages/contracts/src/threadTitle.ts b/packages/contracts/src/threadTitle.ts
index 8f14f431ecff..08f66bfb663e 100644
--- a/packages/contracts/src/threadTitle.ts
+++ b/packages/contracts/src/threadTitle.ts
@@ -7,3 +7,19 @@ export const ThreadTitleRegeneration = Schema.Struct({
   startedAt: IsoDateTime,
 });
 export type ThreadTitleRegeneration = typeof ThreadTitleRegeneration.Type;
+
+export const ThreadTitleRegenerationStatus = Schema.Literals(["renamed", "unchanged", "failed"]);
+export type ThreadTitleRegenerationStatus = typeof ThreadTitleRegenerationStatus.Type;
+
+export const ThreadTitleRegenerationOutcome = Schema.Struct({
+  status: ThreadTitleRegenerationStatus,
+  message: Schema.optional(Schema.String),
+});
+export type ThreadTitleRegenerationOutcome = typeof ThreadTitleRegenerationOutcome.Type;
+
+export const LastThreadTitleRegeneration = Schema.Struct({
+  ...ThreadTitleRegenerationOutcome.fields,
+  requestId: CommandId,
+  completedAt: IsoDateTime,
+});
+export type LastThreadTitleRegeneration = typeof LastThreadTitleRegeneration.Type;
diff --git a/packages/contracts/src/usage.ts b/packages/contracts/src/usage.ts
index 366368781172..76dd69ff9169 100644
--- a/packages/contracts/src/usage.ts
+++ b/packages/contracts/src/usage.ts
@@ -135,6 +135,8 @@ export const UsageSummaryInput = Schema.Struct({
   sinceTime: Schema.optional(TrimmedNonEmptyString),
   untilTime: Schema.optional(TrimmedNonEmptyString),
   awaitRefresh: Schema.optional(Schema.Boolean),
+  /** Accept an immediate answer from the last scan; its sources are marked refreshing. */
+  provisional: Schema.optional(Schema.Boolean),
   modelFilter: Schema.optional(UsageModelFilter),
 });
 export type UsageSummaryInput = typeof UsageSummaryInput.Type;
diff --git a/packages/effect-acp/src/client.test.ts b/packages/effect-acp/src/client.test.ts
index 2852f04769df..0c82aad033b9 100644
--- a/packages/effect-acp/src/client.test.ts
+++ b/packages/effect-acp/src/client.test.ts
@@ -1021,6 +1021,21 @@ it.layer(NodeServices.layer)("effect-acp client", (it) => {
         ]),
       );
       assert.deepEqual(yield* Fiber.join(promptFiber), { stopReason: "end_turn" });
+      const cancelledPrompt = yield* acp.agent
+        .prompt({ sessionId: "pi-session-1", prompt: [{ type: "text", text: "retry" }] })
+        .pipe(Effect.forkScoped);
+      const cancelledRequest = yield* Queue.take(output).pipe(
+        Effect.flatMap(Schema.decodeEffect(Schema.fromJsonString(PromptRequestV1))),
+      );
+      yield* Queue.offer(
+        input,
+        yield* encodeJsonl(Schema.Unknown, {
+          jsonrpc: "2.0",
+          id: cancelledRequest.id,
+          result: { stopReason: "cancelled", usage: {} },
+        }),
+      );
+      assert.deepEqual(yield* Fiber.join(cancelledPrompt), { stopReason: "cancelled" });
       assert.deepEqual(yield* Ref.get(updates), [
         {
           sessionId: "pi-session-1",
@@ -1476,7 +1491,7 @@ it.layer(NodeServices.layer)("effect-acp client", (it) => {
         ]),
       );
       assert.deepEqual(yield* Fiber.join(prompt), { stopReason: "error", error });
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("routes MCP-over-ACP connect, message, notification, and disconnect callbacks", () =>
@@ -1593,7 +1608,7 @@ it.layer(NodeServices.layer)("effect-acp client", (it) => {
     }),
   );
 
-  it.effect("delivers ACP v1 session notices, which the pinned v1 schema predates", () =>
+  it.effect("normalizes ACP v1 session notices and null tool names to v2 semantics", () =>
     Effect.gen(function* () {
       const { stdio, input, output } = yield* makeInMemoryStdio();
       const scope = yield* Scope.make();
@@ -1621,7 +1636,12 @@ it.layer(NodeServices.layer)("effect-acp client", (it) => {
         description: "Continuing without it.",
       } as const;
       const untitled = { sessionUpdate: "notice", severity: "info" } as const;
-      for (const update of [notice, untitled]) {
+      const toolUpdate = {
+        sessionUpdate: "tool_call_update",
+        toolCallId: "c",
+        status: "completed",
+      };
+      for (const update of [notice, untitled, { ...toolUpdate, name: null }]) {
         yield* Queue.offer(
           input,
           yield* encodeJsonl(SessionUpdateNotification, {
@@ -1631,12 +1651,16 @@ it.layer(NodeServices.layer)("effect-acp client", (it) => {
           }),
         );
       }
-      const received = yield* acp.raw.notifications.pipe(Stream.take(2), Stream.runCollect);
+      const received = yield* acp.raw.notifications.pipe(Stream.take(3), Stream.runCollect);
       assert.deepEqual(
         Array.from(received, (event) =>
           event._tag === "SessionUpdate" ? event.params.update : undefined,
         ),
-        [notice, { sessionUpdate: "_t3_unknown", originalSessionUpdate: "notice", raw: untitled }],
+        [
+          notice,
+          { sessionUpdate: "_t3_unknown", originalSessionUpdate: "notice", raw: untitled },
+          toolUpdate,
+        ],
       );
       yield* Scope.close(scope, Exit.void);
     }),
@@ -1689,7 +1713,7 @@ it.effect.each(["accept", "decline", "cancel"] as const)(
             method === "elicitation/create" ? response : { action: answer, _meta: response._meta },
         });
       }
-    }).pipe(Effect.scoped),
+    }),
 );
 
 it.effect.each(["elicitation/complete", "session/elicitation/complete"])(
@@ -1711,7 +1735,7 @@ it.effect.each(["elicitation/complete", "session/elicitation/complete"])(
         }),
       );
       assert.deepEqual(yield* Deferred.await(received), { elicitationId: "elicitation-1" });
-    }).pipe(Effect.scoped),
+    }),
 );
 
 it.effect("rejects malformed SDK elicitation without calling the question handler", () =>
@@ -1736,7 +1760,7 @@ it.effect("rejects malformed SDK elicitation without calling the question handle
     const response = yield* decodeWireError(yield* Queue.take(output));
     assert.equal(response.error.code, -32602);
     assert.equal(calls, 0);
-  }).pipe(Effect.scoped),
+  }),
 );
 
 it.effect("returns method-not-found when SDK elicitation has no question handler", () =>
@@ -1755,5 +1779,5 @@ it.effect("returns method-not-found when SDK elicitation has no question handler
     );
     const response = yield* decodeWireError(yield* Queue.take(output));
     assert.equal(response.error.code, -32601);
-  }).pipe(Effect.scoped),
+  }),
 );
diff --git a/packages/effect-acp/src/client.ts b/packages/effect-acp/src/client.ts
index 1d8f06c862de..011783532938 100644
--- a/packages/effect-acp/src/client.ts
+++ b/packages/effect-acp/src/client.ts
@@ -528,6 +528,15 @@ function normalizeV1SessionUpdate(
           },
     };
   }
+  const update = notification.update;
+  // v1 defines a null tool name as unchanged; v2 consumers read null as a clear.
+  if (
+    (update.sessionUpdate === "tool_call" || update.sessionUpdate === "tool_call_update") &&
+    update.name === null
+  ) {
+    const { name: _name, ...rest } = update;
+    return { ...notification, update: rest } as unknown as AcpSchema.SessionNotification;
+  }
   if (notification.update.sessionUpdate !== "available_commands_update") {
     return notification as unknown as AcpSchema.SessionNotification;
   }
diff --git a/packages/effect-acp/src/compat.ts b/packages/effect-acp/src/compat.ts
index 8e21d16fd198..b73884d39dd9 100644
--- a/packages/effect-acp/src/compat.ts
+++ b/packages/effect-acp/src/compat.ts
@@ -62,7 +62,11 @@ export type ToolKind = V2.ToolKind;
 export type ClientCapabilities = {
   readonly fs?: { readonly readTextFile?: boolean; readonly writeTextFile?: boolean };
   readonly terminal?: boolean;
-  readonly session?: { readonly list?: Meta; readonly notices?: Meta } | null;
+  readonly session?: {
+    readonly list?: Meta;
+    readonly notices?: Meta;
+    readonly compaction?: Meta;
+  } | null;
   readonly plan?: Meta;
   readonly auth?: { readonly terminal?: boolean };
   readonly elicitation?: V2.ElicitationCapabilities | null;
diff --git a/packages/effect-acp/src/protocol.test.ts b/packages/effect-acp/src/protocol.test.ts
index 27f949c3a780..19f58292ac46 100644
--- a/packages/effect-acp/src/protocol.test.ts
+++ b/packages/effect-acp/src/protocol.test.ts
@@ -239,6 +239,48 @@ it.layer(NodeServices.layer)("effect-acp protocol", (it) => {
     }),
   );
 
+  it.effect("evicts unread raw notifications while a slow reader handles an earlier one", () =>
+    Effect.gen(function* () {
+      const { stdio, input } = yield* makeInMemoryStdio();
+      const handled = yield* Queue.unbounded<number>();
+      const transport = yield* AcpProtocol.makeAcpPatchedProtocol({
+        stdio,
+        serverRequestMethods: new Set(),
+        onNotification: (notification) =>
+          Queue.offer(handled, decodeIndex(notification.params).index).pipe(Effect.asVoid),
+      });
+      const send = (index: number, textLength: number) =>
+        Queue.offer(input, largeNotification(index, textLength)).pipe(
+          Effect.andThen(Queue.take(handled)),
+        );
+
+      yield* send(1, 6 * MIB);
+      yield* send(2, 6 * MIB);
+      const entered = yield* Deferred.make<void>();
+      const release = yield* Deferred.make<void>();
+      const reader = yield* transport.incoming.pipe(
+        Stream.map((notification) => decodeIndex(notification.params).index),
+        Stream.tap((index) =>
+          index === 1
+            ? Deferred.succeed(entered, undefined).pipe(Effect.andThen(Deferred.await(release)))
+            : Effect.void,
+        ),
+        Stream.take(4),
+        Stream.runCollect,
+        Effect.forkScoped,
+      );
+      yield* Deferred.await(entered);
+
+      // Notification 2 is still unread, so 3 and 4 push it past the budget.
+      yield* send(3, 6 * MIB);
+      yield* send(4, 6 * MIB);
+      yield* send(5, 1);
+      yield* Deferred.succeed(release, undefined);
+
+      assert.deepEqual(yield* Fiber.join(reader), [1, 3, 4, 5]);
+    }),
+  );
+
   it.effect("delivers every raw notification to a reader that keeps up, then ends", () =>
     Effect.gen(function* () {
       const { stdio, input } = yield* makeInMemoryStdio();
diff --git a/packages/effect-acp/src/protocol.ts b/packages/effect-acp/src/protocol.ts
index 8ae077e4c5cd..490c27d8e0b0 100644
--- a/packages/effect-acp/src/protocol.ts
+++ b/packages/effect-acp/src/protocol.ts
@@ -313,9 +313,8 @@ export const makeAcpPatchedProtocol = Effect.fn("makeAcpPatchedProtocol")(functi
   const serverQueue = yield* Queue.unbounded<RpcMessage.FromClientEncoded>();
   const clientQueue = yield* Queue.unbounded<RpcMessage.FromServerEncoded>();
   const rawNotifications = yield* Queue.unbounded<AcpBufferedRawNotification, Cause.Done<void>>();
-  // JSON length of the notifications offered since the queue was last empty.
-  // `incoming` takes the whole backlog on every pull, so an empty queue holds
-  // nothing, and a read can only make this an overestimate.
+  // JSON length of the notifications still in the queue. `incoming` takes one
+  // at a time, so a slow reader holds at most one outside this budget.
   let rawNotificationsJsonLength = 0;
   // Raw readers finish with the connection: termination ends the queue, and so
   // does closing the scope, which interrupts the reader before it terminates.
@@ -494,7 +493,6 @@ export const makeAcpPatchedProtocol = Effect.fn("makeAcpPatchedProtocol")(functi
   // so readers never see more than the limits allow.
   const bufferRawNotification = (notification: AcpIncomingNotification, lineLength: number) =>
     Effect.sync(() => {
-      if (Queue.sizeUnsafe(rawNotifications) === 0) rawNotificationsJsonLength = 0;
       if (!Queue.offerUnsafe(rawNotifications, { notification, lineLength })) return;
       rawNotificationsJsonLength += lineLength;
       while (
@@ -1101,8 +1099,15 @@ export const makeAcpPatchedProtocol = Effect.fn("makeAcpPatchedProtocol")(functi
     clientProtocol,
     serverProtocol,
     get incoming() {
-      return Stream.fromQueue(rawNotifications).pipe(
-        Stream.map(({ notification }) => notification),
+      return Stream.fromPull(
+        Effect.succeed(
+          Queue.take(rawNotifications).pipe(
+            Effect.map(({ notification, lineLength }) => {
+              rawNotificationsJsonLength -= lineLength;
+              return [notification] as const;
+            }),
+          ),
+        ),
       );
     },
     request: sendRequest,
diff --git a/packages/effect-acp/src/rpc.ts b/packages/effect-acp/src/rpc.ts
index 9d21c7cbe33c..5154b948b0ad 100644
--- a/packages/effect-acp/src/rpc.ts
+++ b/packages/effect-acp/src/rpc.ts
@@ -245,7 +245,12 @@ const CompatDisableProviderRpc = Rpc.make(AGENT_METHODS.providers_disable, {
 
 const CompatPromptRpc = Rpc.make(AGENT_METHODS.session_prompt, {
   payload: Schema.Union([AcpSchema.PromptRequest, AcpSchemaV1.PromptRequest]),
-  success: Schema.Union([AcpSchemaV1.PromptResponse, AcpSchema.PromptResponse]),
+  success: Schema.Union([
+    AcpSchemaV1.PromptResponse,
+    // fx sends empty usage on cancellation; retain its stop reason when usage is invalid.
+    Schema.Struct({ stopReason: AcpSchemaV1.StopReason }),
+    AcpSchema.PromptResponse,
+  ]),
   error: AcpSchema.Error,
 });
 
diff --git a/packages/effect-codex-app-server/scripts/generate.ts b/packages/effect-codex-app-server/scripts/generate.ts
index 343738c800c8..187895588c07 100644
--- a/packages/effect-codex-app-server/scripts/generate.ts
+++ b/packages/effect-codex-app-server/scripts/generate.ts
@@ -145,6 +145,8 @@ const ManualSchemas: Record<string, Schema.Json> = {
 // `account/read` decode and take the provider down with it.
 const DefinitionOverrides: Record<string, Schema.Json> = {
   PlanType: { type: "string" },
+  // Newer Codex releases add hook events (e.g. `preModelRequest`); a closed enum drops their notifications.
+  HookEventName: { type: "string" },
   // Newer custom Codex binaries emit partial answers before additional tools or text.
   MessagePhase: {
     description:
@@ -186,6 +188,32 @@ function openStringEnum(schema: Schema.Json): Schema.Json {
   };
 }
 
+// Newer Codex identifies a generated image by `fileId` and omits the inline `result`.
+// Requiring `result` fails the whole notification decode and drops the finished image.
+function acceptImageFileIds(schema: Schema.Json): Schema.Json {
+  if (!isJsonSchemaNode(schema) || !Array.isArray(schema.oneOf)) return schema;
+  return {
+    ...schema,
+    oneOf: schema.oneOf.map((variant: Schema.Json) => {
+      if (
+        !isJsonSchemaNode(variant) ||
+        !isJsonSchemaNode(variant.properties) ||
+        !isJsonSchemaNode(variant.properties.type) ||
+        !Array.isArray(variant.properties.type.enum) ||
+        !variant.properties.type.enum.includes("imageGeneration") ||
+        !Array.isArray(variant.required)
+      ) {
+        return variant;
+      }
+      return {
+        ...variant,
+        properties: { ...variant.properties, fileId: { type: "string" } },
+        required: variant.required.filter((key: Schema.Json) => key !== "result"),
+      };
+    }),
+  };
+}
+
 const getGeneratedPaths = Effect.fn("getGeneratedPaths")(function* () {
   const path = yield* Path.Path;
   const generatedDir = path.join(import.meta.dirname, "..", "src", "_generated");
@@ -682,7 +710,9 @@ const generateFiles = Effect.fn("generateFiles")(function* () {
           DefinitionOverrides[definitionName] ??
             (OpenStringEnumDefinitions.has(definitionName)
               ? openStringEnum(definitionSchema)
-              : definitionSchema),
+              : definitionName === "ThreadItem"
+                ? acceptImageFileIds(definitionSchema)
+                : definitionSchema),
           localDefinitionNames,
           file.namespace,
           exportNameByQualifiedName,
diff --git a/packages/effect-codex-app-server/src/_generated/schema.gen.ts b/packages/effect-codex-app-server/src/_generated/schema.gen.ts
index 50fa95918b43..371cca59fcc9 100644
--- a/packages/effect-codex-app-server/src/_generated/schema.gen.ts
+++ b/packages/effect-codex-app-server/src/_generated/schema.gen.ts
@@ -2782,33 +2782,10 @@ export const ServerNotification__HookOutputEntryKind = Schema.Literals([
   "error",
 ]).annotate({ identifier: "ServerNotification__HookOutputEntryKind" });
 
-export type ServerNotification__HookEventName =
-  | "preToolUse"
-  | "permissionRequest"
-  | "postToolUse"
-  | "preCompact"
-  | "postCompact"
-  | "sessionStart"
-  | "sessionEnd"
-  | "userPromptSubmit"
-  | "subagentStart"
-  | "subagentStop"
-  | "stop"
-  | "interrupt";
-export const ServerNotification__HookEventName = Schema.Literals([
-  "preToolUse",
-  "permissionRequest",
-  "postToolUse",
-  "preCompact",
-  "postCompact",
-  "sessionStart",
-  "sessionEnd",
-  "userPromptSubmit",
-  "subagentStart",
-  "subagentStop",
-  "stop",
-  "interrupt",
-]).annotate({ identifier: "ServerNotification__HookEventName" });
+export type ServerNotification__HookEventName = string;
+export const ServerNotification__HookEventName = Schema.String.annotate({
+  identifier: "ServerNotification__HookEventName",
+});
 
 export type ServerNotification__HookExecutionMode = "sync" | "async";
 export const ServerNotification__HookExecutionMode = Schema.Literals(["sync", "async"]).annotate({
@@ -5653,33 +5630,10 @@ export const V2HookCompletedNotification__HookOutputEntryKind = Schema.Literals(
   "error",
 ]).annotate({ identifier: "V2HookCompletedNotification__HookOutputEntryKind" });
 
-export type V2HookCompletedNotification__HookEventName =
-  | "preToolUse"
-  | "permissionRequest"
-  | "postToolUse"
-  | "preCompact"
-  | "postCompact"
-  | "sessionStart"
-  | "sessionEnd"
-  | "userPromptSubmit"
-  | "subagentStart"
-  | "subagentStop"
-  | "stop"
-  | "interrupt";
-export const V2HookCompletedNotification__HookEventName = Schema.Literals([
-  "preToolUse",
-  "permissionRequest",
-  "postToolUse",
-  "preCompact",
-  "postCompact",
-  "sessionStart",
-  "sessionEnd",
-  "userPromptSubmit",
-  "subagentStart",
-  "subagentStop",
-  "stop",
-  "interrupt",
-]).annotate({ identifier: "V2HookCompletedNotification__HookEventName" });
+export type V2HookCompletedNotification__HookEventName = string;
+export const V2HookCompletedNotification__HookEventName = Schema.String.annotate({
+  identifier: "V2HookCompletedNotification__HookEventName",
+});
 
 export type V2HookCompletedNotification__HookExecutionMode = "sync" | "async";
 export const V2HookCompletedNotification__HookExecutionMode = Schema.Literals([
@@ -5760,33 +5714,10 @@ export const V2HooksListResponse__HookErrorInfo = Schema.Struct({
   path: Schema.String,
 }).annotate({ identifier: "V2HooksListResponse__HookErrorInfo" });
 
-export type V2HooksListResponse__HookEventName =
-  | "preToolUse"
-  | "permissionRequest"
-  | "postToolUse"
-  | "preCompact"
-  | "postCompact"
-  | "sessionStart"
-  | "sessionEnd"
-  | "userPromptSubmit"
-  | "subagentStart"
-  | "subagentStop"
-  | "stop"
-  | "interrupt";
-export const V2HooksListResponse__HookEventName = Schema.Literals([
-  "preToolUse",
-  "permissionRequest",
-  "postToolUse",
-  "preCompact",
-  "postCompact",
-  "sessionStart",
-  "sessionEnd",
-  "userPromptSubmit",
-  "subagentStart",
-  "subagentStop",
-  "stop",
-  "interrupt",
-]).annotate({ identifier: "V2HooksListResponse__HookEventName" });
+export type V2HooksListResponse__HookEventName = string;
+export const V2HooksListResponse__HookEventName = Schema.String.annotate({
+  identifier: "V2HooksListResponse__HookEventName",
+});
 
 export type V2HooksListResponse__HookSource =
   | "system"
@@ -5843,33 +5774,10 @@ export const V2HookStartedNotification__HookOutputEntryKind = Schema.Literals([
   "error",
 ]).annotate({ identifier: "V2HookStartedNotification__HookOutputEntryKind" });
 
-export type V2HookStartedNotification__HookEventName =
-  | "preToolUse"
-  | "permissionRequest"
-  | "postToolUse"
-  | "preCompact"
-  | "postCompact"
-  | "sessionStart"
-  | "sessionEnd"
-  | "userPromptSubmit"
-  | "subagentStart"
-  | "subagentStop"
-  | "stop"
-  | "interrupt";
-export const V2HookStartedNotification__HookEventName = Schema.Literals([
-  "preToolUse",
-  "permissionRequest",
-  "postToolUse",
-  "preCompact",
-  "postCompact",
-  "sessionStart",
-  "sessionEnd",
-  "userPromptSubmit",
-  "subagentStart",
-  "subagentStop",
-  "stop",
-  "interrupt",
-]).annotate({ identifier: "V2HookStartedNotification__HookEventName" });
+export type V2HookStartedNotification__HookEventName = string;
+export const V2HookStartedNotification__HookEventName = Schema.String.annotate({
+  identifier: "V2HookStartedNotification__HookEventName",
+});
 
 export type V2HookStartedNotification__HookExecutionMode = "sync" | "async";
 export const V2HookStartedNotification__HookExecutionMode = Schema.Literals([
@@ -7530,33 +7438,10 @@ export const V2PluginReadResponse__AppSummary = Schema.Struct({
   identifier: "V2PluginReadResponse__AppSummary",
 });
 
-export type V2PluginReadResponse__HookEventName =
-  | "preToolUse"
-  | "permissionRequest"
-  | "postToolUse"
-  | "preCompact"
-  | "postCompact"
-  | "sessionStart"
-  | "sessionEnd"
-  | "userPromptSubmit"
-  | "subagentStart"
-  | "subagentStop"
-  | "stop"
-  | "interrupt";
-export const V2PluginReadResponse__HookEventName = Schema.Literals([
-  "preToolUse",
-  "permissionRequest",
-  "postToolUse",
-  "preCompact",
-  "postCompact",
-  "sessionStart",
-  "sessionEnd",
-  "userPromptSubmit",
-  "subagentStart",
-  "subagentStop",
-  "stop",
-  "interrupt",
-]).annotate({ identifier: "V2PluginReadResponse__HookEventName" });
+export type V2PluginReadResponse__HookEventName = string;
+export const V2PluginReadResponse__HookEventName = Schema.String.annotate({
+  identifier: "V2PluginReadResponse__HookEventName",
+});
 
 export type V2PluginReadResponse__AbsolutePathBuf = string;
 export const V2PluginReadResponse__AbsolutePathBuf = Schema.String.annotate({
@@ -33074,12 +32959,13 @@ export type ServerNotification__ThreadItem =
   | {
       readonly failure?: ServerNotification__ImageGenerationFailure | null;
       readonly id: string;
-      readonly result: string;
+      readonly result?: string;
       readonly revisedPrompt?: string | null;
       readonly savedPath?: ServerNotification__AbsolutePathBuf | null;
       readonly status: string;
       readonly transparentBackground?: boolean | null;
       readonly type: "imageGeneration";
+      readonly fileId?: string;
     }
   | { readonly id: string; readonly review: string; readonly type: "enteredReviewMode" }
   | { readonly id: string; readonly review: string; readonly type: "exitedReviewMode" }
@@ -33374,7 +33260,7 @@ export const ServerNotification__ThreadItem = Schema.Union(
         Schema.Union([ServerNotification__ImageGenerationFailure, Schema.Null]),
       ),
       id: Schema.String,
-      result: Schema.String,
+      result: Schema.optionalKey(Schema.String),
       revisedPrompt: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
       savedPath: Schema.optionalKey(
         Schema.Union([ServerNotification__AbsolutePathBuf, Schema.Null]),
@@ -33382,6 +33268,7 @@ export const ServerNotification__ThreadItem = Schema.Union(
       status: Schema.String,
       transparentBackground: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
       type: Schema.Literal("imageGeneration").annotate({ title: "ImageGenerationThreadItemType" }),
+      fileId: Schema.optionalKey(Schema.String),
     }).annotate({ title: "ImageGenerationThreadItem" }),
     Schema.Struct({
       id: Schema.String,
@@ -33652,12 +33539,13 @@ export type V2ItemCompletedNotification__ThreadItem =
   | {
       readonly failure?: V2ItemCompletedNotification__ImageGenerationFailure | null;
       readonly id: string;
-      readonly result: string;
+      readonly result?: string;
       readonly revisedPrompt?: string | null;
       readonly savedPath?: V2ItemCompletedNotification__AbsolutePathBuf | null;
       readonly status: string;
       readonly transparentBackground?: boolean | null;
       readonly type: "imageGeneration";
+      readonly fileId?: string;
     }
   | { readonly id: string; readonly review: string; readonly type: "enteredReviewMode" }
   | { readonly id: string; readonly review: string; readonly type: "exitedReviewMode" }
@@ -33962,7 +33850,7 @@ export const V2ItemCompletedNotification__ThreadItem = Schema.Union(
         Schema.Union([V2ItemCompletedNotification__ImageGenerationFailure, Schema.Null]),
       ),
       id: Schema.String,
-      result: Schema.String,
+      result: Schema.optionalKey(Schema.String),
       revisedPrompt: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
       savedPath: Schema.optionalKey(
         Schema.Union([V2ItemCompletedNotification__AbsolutePathBuf, Schema.Null]),
@@ -33970,6 +33858,7 @@ export const V2ItemCompletedNotification__ThreadItem = Schema.Union(
       status: Schema.String,
       transparentBackground: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
       type: Schema.Literal("imageGeneration").annotate({ title: "ImageGenerationThreadItemType" }),
+      fileId: Schema.optionalKey(Schema.String),
     }).annotate({ title: "ImageGenerationThreadItem" }),
     Schema.Struct({
       id: Schema.String,
@@ -34137,12 +34026,13 @@ export type V2ItemStartedNotification__ThreadItem =
   | {
       readonly failure?: V2ItemStartedNotification__ImageGenerationFailure | null;
       readonly id: string;
-      readonly result: string;
+      readonly result?: string;
       readonly revisedPrompt?: string | null;
       readonly savedPath?: V2ItemStartedNotification__AbsolutePathBuf | null;
       readonly status: string;
       readonly transparentBackground?: boolean | null;
       readonly type: "imageGeneration";
+      readonly fileId?: string;
     }
   | { readonly id: string; readonly review: string; readonly type: "enteredReviewMode" }
   | { readonly id: string; readonly review: string; readonly type: "exitedReviewMode" }
@@ -34447,7 +34337,7 @@ export const V2ItemStartedNotification__ThreadItem = Schema.Union(
         Schema.Union([V2ItemStartedNotification__ImageGenerationFailure, Schema.Null]),
       ),
       id: Schema.String,
-      result: Schema.String,
+      result: Schema.optionalKey(Schema.String),
       revisedPrompt: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
       savedPath: Schema.optionalKey(
         Schema.Union([V2ItemStartedNotification__AbsolutePathBuf, Schema.Null]),
@@ -34455,6 +34345,7 @@ export const V2ItemStartedNotification__ThreadItem = Schema.Union(
       status: Schema.String,
       transparentBackground: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
       type: Schema.Literal("imageGeneration").annotate({ title: "ImageGenerationThreadItemType" }),
+      fileId: Schema.optionalKey(Schema.String),
     }).annotate({ title: "ImageGenerationThreadItem" }),
     Schema.Struct({
       id: Schema.String,
@@ -35356,12 +35247,13 @@ export type V2ReviewStartResponse__ThreadItem =
   | {
       readonly failure?: V2ReviewStartResponse__ImageGenerationFailure | null;
       readonly id: string;
-      readonly result: string;
+      readonly result?: string;
       readonly revisedPrompt?: string | null;
       readonly savedPath?: V2ReviewStartResponse__AbsolutePathBuf | null;
       readonly status: string;
       readonly transparentBackground?: boolean | null;
       readonly type: "imageGeneration";
+      readonly fileId?: string;
     }
   | { readonly id: string; readonly review: string; readonly type: "enteredReviewMode" }
   | { readonly id: string; readonly review: string; readonly type: "exitedReviewMode" }
@@ -35660,7 +35552,7 @@ export const V2ReviewStartResponse__ThreadItem = Schema.Union(
         Schema.Union([V2ReviewStartResponse__ImageGenerationFailure, Schema.Null]),
       ),
       id: Schema.String,
-      result: Schema.String,
+      result: Schema.optionalKey(Schema.String),
       revisedPrompt: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
       savedPath: Schema.optionalKey(
         Schema.Union([V2ReviewStartResponse__AbsolutePathBuf, Schema.Null]),
@@ -35668,6 +35560,7 @@ export const V2ReviewStartResponse__ThreadItem = Schema.Union(
       status: Schema.String,
       transparentBackground: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
       type: Schema.Literal("imageGeneration").annotate({ title: "ImageGenerationThreadItemType" }),
+      fileId: Schema.optionalKey(Schema.String),
     }).annotate({ title: "ImageGenerationThreadItem" }),
     Schema.Struct({
       id: Schema.String,
@@ -35822,12 +35715,13 @@ export type V2ThreadForkResponse__ThreadItem =
   | {
       readonly failure?: V2ThreadForkResponse__ImageGenerationFailure | null;
       readonly id: string;
-      readonly result: string;
+      readonly result?: string;
       readonly revisedPrompt?: string | null;
       readonly savedPath?: V2ThreadForkResponse__AbsolutePathBuf | null;
       readonly status: string;
       readonly transparentBackground?: boolean | null;
       readonly type: "imageGeneration";
+      readonly fileId?: string;
     }
   | { readonly id: string; readonly review: string; readonly type: "enteredReviewMode" }
   | { readonly id: string; readonly review: string; readonly type: "exitedReviewMode" }
@@ -36126,7 +36020,7 @@ export const V2ThreadForkResponse__ThreadItem = Schema.Union(
         Schema.Union([V2ThreadForkResponse__ImageGenerationFailure, Schema.Null]),
       ),
       id: Schema.String,
-      result: Schema.String,
+      result: Schema.optionalKey(Schema.String),
       revisedPrompt: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
       savedPath: Schema.optionalKey(
         Schema.Union([V2ThreadForkResponse__AbsolutePathBuf, Schema.Null]),
@@ -36134,6 +36028,7 @@ export const V2ThreadForkResponse__ThreadItem = Schema.Union(
       status: Schema.String,
       transparentBackground: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
       type: Schema.Literal("imageGeneration").annotate({ title: "ImageGenerationThreadItemType" }),
+      fileId: Schema.optionalKey(Schema.String),
     }).annotate({ title: "ImageGenerationThreadItem" }),
     Schema.Struct({
       id: Schema.String,
@@ -36277,12 +36172,13 @@ export type V2ThreadItemsListResponse__ThreadItem =
   | {
       readonly failure?: V2ThreadItemsListResponse__ImageGenerationFailure | null;
       readonly id: string;
-      readonly result: string;
+      readonly result?: string;
       readonly revisedPrompt?: string | null;
       readonly savedPath?: V2ThreadItemsListResponse__AbsolutePathBuf | null;
       readonly status: string;
       readonly transparentBackground?: boolean | null;
       readonly type: "imageGeneration";
+      readonly fileId?: string;
     }
   | { readonly id: string; readonly review: string; readonly type: "enteredReviewMode" }
   | { readonly id: string; readonly review: string; readonly type: "exitedReviewMode" }
@@ -36587,7 +36483,7 @@ export const V2ThreadItemsListResponse__ThreadItem = Schema.Union(
         Schema.Union([V2ThreadItemsListResponse__ImageGenerationFailure, Schema.Null]),
       ),
       id: Schema.String,
-      result: Schema.String,
+      result: Schema.optionalKey(Schema.String),
       revisedPrompt: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
       savedPath: Schema.optionalKey(
         Schema.Union([V2ThreadItemsListResponse__AbsolutePathBuf, Schema.Null]),
@@ -36595,6 +36491,7 @@ export const V2ThreadItemsListResponse__ThreadItem = Schema.Union(
       status: Schema.String,
       transparentBackground: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
       type: Schema.Literal("imageGeneration").annotate({ title: "ImageGenerationThreadItemType" }),
+      fileId: Schema.optionalKey(Schema.String),
     }).annotate({ title: "ImageGenerationThreadItem" }),
     Schema.Struct({
       id: Schema.String,
@@ -36738,12 +36635,13 @@ export type V2ThreadListResponse__ThreadItem =
   | {
       readonly failure?: V2ThreadListResponse__ImageGenerationFailure | null;
       readonly id: string;
-      readonly result: string;
+      readonly result?: string;
       readonly revisedPrompt?: string | null;
       readonly savedPath?: V2ThreadListResponse__AbsolutePathBuf | null;
       readonly status: string;
       readonly transparentBackground?: boolean | null;
       readonly type: "imageGeneration";
+      readonly fileId?: string;
     }
   | { readonly id: string; readonly review: string; readonly type: "enteredReviewMode" }
   | { readonly id: string; readonly review: string; readonly type: "exitedReviewMode" }
@@ -37042,7 +36940,7 @@ export const V2ThreadListResponse__ThreadItem = Schema.Union(
         Schema.Union([V2ThreadListResponse__ImageGenerationFailure, Schema.Null]),
       ),
       id: Schema.String,
-      result: Schema.String,
+      result: Schema.optionalKey(Schema.String),
       revisedPrompt: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
       savedPath: Schema.optionalKey(
         Schema.Union([V2ThreadListResponse__AbsolutePathBuf, Schema.Null]),
@@ -37050,6 +36948,7 @@ export const V2ThreadListResponse__ThreadItem = Schema.Union(
       status: Schema.String,
       transparentBackground: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
       type: Schema.Literal("imageGeneration").annotate({ title: "ImageGenerationThreadItemType" }),
+      fileId: Schema.optionalKey(Schema.String),
     }).annotate({ title: "ImageGenerationThreadItem" }),
     Schema.Struct({
       id: Schema.String,
@@ -37195,12 +37094,13 @@ export type V2ThreadMetadataUpdateResponse__ThreadItem =
   | {
       readonly failure?: V2ThreadMetadataUpdateResponse__ImageGenerationFailure | null;
       readonly id: string;
-      readonly result: string;
+      readonly result?: string;
       readonly revisedPrompt?: string | null;
       readonly savedPath?: V2ThreadMetadataUpdateResponse__AbsolutePathBuf | null;
       readonly status: string;
       readonly transparentBackground?: boolean | null;
       readonly type: "imageGeneration";
+      readonly fileId?: string;
     }
   | { readonly id: string; readonly review: string; readonly type: "enteredReviewMode" }
   | { readonly id: string; readonly review: string; readonly type: "exitedReviewMode" }
@@ -37505,7 +37405,7 @@ export const V2ThreadMetadataUpdateResponse__ThreadItem = Schema.Union(
         Schema.Union([V2ThreadMetadataUpdateResponse__ImageGenerationFailure, Schema.Null]),
       ),
       id: Schema.String,
-      result: Schema.String,
+      result: Schema.optionalKey(Schema.String),
       revisedPrompt: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
       savedPath: Schema.optionalKey(
         Schema.Union([V2ThreadMetadataUpdateResponse__AbsolutePathBuf, Schema.Null]),
@@ -37513,6 +37413,7 @@ export const V2ThreadMetadataUpdateResponse__ThreadItem = Schema.Union(
       status: Schema.String,
       transparentBackground: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
       type: Schema.Literal("imageGeneration").annotate({ title: "ImageGenerationThreadItemType" }),
+      fileId: Schema.optionalKey(Schema.String),
     }).annotate({ title: "ImageGenerationThreadItem" }),
     Schema.Struct({
       id: Schema.String,
@@ -37656,12 +37557,13 @@ export type V2ThreadReadResponse__ThreadItem =
   | {
       readonly failure?: V2ThreadReadResponse__ImageGenerationFailure | null;
       readonly id: string;
-      readonly result: string;
+      readonly result?: string;
       readonly revisedPrompt?: string | null;
       readonly savedPath?: V2ThreadReadResponse__AbsolutePathBuf | null;
       readonly status: string;
       readonly transparentBackground?: boolean | null;
       readonly type: "imageGeneration";
+      readonly fileId?: string;
     }
   | { readonly id: string; readonly review: string; readonly type: "enteredReviewMode" }
   | { readonly id: string; readonly review: string; readonly type: "exitedReviewMode" }
@@ -37960,7 +37862,7 @@ export const V2ThreadReadResponse__ThreadItem = Schema.Union(
         Schema.Union([V2ThreadReadResponse__ImageGenerationFailure, Schema.Null]),
       ),
       id: Schema.String,
-      result: Schema.String,
+      result: Schema.optionalKey(Schema.String),
       revisedPrompt: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
       savedPath: Schema.optionalKey(
         Schema.Union([V2ThreadReadResponse__AbsolutePathBuf, Schema.Null]),
@@ -37968,6 +37870,7 @@ export const V2ThreadReadResponse__ThreadItem = Schema.Union(
       status: Schema.String,
       transparentBackground: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
       type: Schema.Literal("imageGeneration").annotate({ title: "ImageGenerationThreadItemType" }),
+      fileId: Schema.optionalKey(Schema.String),
     }).annotate({ title: "ImageGenerationThreadItem" }),
     Schema.Struct({
       id: Schema.String,
@@ -38111,12 +38014,13 @@ export type V2ThreadResumeResponse__ThreadItem =
   | {
       readonly failure?: V2ThreadResumeResponse__ImageGenerationFailure | null;
       readonly id: string;
-      readonly result: string;
+      readonly result?: string;
       readonly revisedPrompt?: string | null;
       readonly savedPath?: V2ThreadResumeResponse__AbsolutePathBuf | null;
       readonly status: string;
       readonly transparentBackground?: boolean | null;
       readonly type: "imageGeneration";
+      readonly fileId?: string;
     }
   | { readonly id: string; readonly review: string; readonly type: "enteredReviewMode" }
   | { readonly id: string; readonly review: string; readonly type: "exitedReviewMode" }
@@ -38415,7 +38319,7 @@ export const V2ThreadResumeResponse__ThreadItem = Schema.Union(
         Schema.Union([V2ThreadResumeResponse__ImageGenerationFailure, Schema.Null]),
       ),
       id: Schema.String,
-      result: Schema.String,
+      result: Schema.optionalKey(Schema.String),
       revisedPrompt: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
       savedPath: Schema.optionalKey(
         Schema.Union([V2ThreadResumeResponse__AbsolutePathBuf, Schema.Null]),
@@ -38423,6 +38327,7 @@ export const V2ThreadResumeResponse__ThreadItem = Schema.Union(
       status: Schema.String,
       transparentBackground: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
       type: Schema.Literal("imageGeneration").annotate({ title: "ImageGenerationThreadItemType" }),
+      fileId: Schema.optionalKey(Schema.String),
     }).annotate({ title: "ImageGenerationThreadItem" }),
     Schema.Struct({
       id: Schema.String,
@@ -38566,12 +38471,13 @@ export type V2ThreadRevertResponse__ThreadItem =
   | {
       readonly failure?: V2ThreadRevertResponse__ImageGenerationFailure | null;
       readonly id: string;
-      readonly result: string;
+      readonly result?: string;
       readonly revisedPrompt?: string | null;
       readonly savedPath?: V2ThreadRevertResponse__AbsolutePathBuf | null;
       readonly status: string;
       readonly transparentBackground?: boolean | null;
       readonly type: "imageGeneration";
+      readonly fileId?: string;
     }
   | { readonly id: string; readonly review: string; readonly type: "enteredReviewMode" }
   | { readonly id: string; readonly review: string; readonly type: "exitedReviewMode" }
@@ -38870,7 +38776,7 @@ export const V2ThreadRevertResponse__ThreadItem = Schema.Union(
         Schema.Union([V2ThreadRevertResponse__ImageGenerationFailure, Schema.Null]),
       ),
       id: Schema.String,
-      result: Schema.String,
+      result: Schema.optionalKey(Schema.String),
       revisedPrompt: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
       savedPath: Schema.optionalKey(
         Schema.Union([V2ThreadRevertResponse__AbsolutePathBuf, Schema.Null]),
@@ -38878,6 +38784,7 @@ export const V2ThreadRevertResponse__ThreadItem = Schema.Union(
       status: Schema.String,
       transparentBackground: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
       type: Schema.Literal("imageGeneration").annotate({ title: "ImageGenerationThreadItemType" }),
+      fileId: Schema.optionalKey(Schema.String),
     }).annotate({ title: "ImageGenerationThreadItem" }),
     Schema.Struct({
       id: Schema.String,
@@ -39070,12 +38977,13 @@ export type V2ThreadStartedNotification__ThreadItem =
   | {
       readonly failure?: V2ThreadStartedNotification__ImageGenerationFailure | null;
       readonly id: string;
-      readonly result: string;
+      readonly result?: string;
       readonly revisedPrompt?: string | null;
       readonly savedPath?: V2ThreadStartedNotification__AbsolutePathBuf | null;
       readonly status: string;
       readonly transparentBackground?: boolean | null;
       readonly type: "imageGeneration";
+      readonly fileId?: string;
     }
   | { readonly id: string; readonly review: string; readonly type: "enteredReviewMode" }
   | { readonly id: string; readonly review: string; readonly type: "exitedReviewMode" }
@@ -39380,7 +39288,7 @@ export const V2ThreadStartedNotification__ThreadItem = Schema.Union(
         Schema.Union([V2ThreadStartedNotification__ImageGenerationFailure, Schema.Null]),
       ),
       id: Schema.String,
-      result: Schema.String,
+      result: Schema.optionalKey(Schema.String),
       revisedPrompt: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
       savedPath: Schema.optionalKey(
         Schema.Union([V2ThreadStartedNotification__AbsolutePathBuf, Schema.Null]),
@@ -39388,6 +39296,7 @@ export const V2ThreadStartedNotification__ThreadItem = Schema.Union(
       status: Schema.String,
       transparentBackground: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
       type: Schema.Literal("imageGeneration").annotate({ title: "ImageGenerationThreadItemType" }),
+      fileId: Schema.optionalKey(Schema.String),
     }).annotate({ title: "ImageGenerationThreadItem" }),
     Schema.Struct({
       id: Schema.String,
@@ -39531,12 +39440,13 @@ export type V2ThreadStartResponse__ThreadItem =
   | {
       readonly failure?: V2ThreadStartResponse__ImageGenerationFailure | null;
       readonly id: string;
-      readonly result: string;
+      readonly result?: string;
       readonly revisedPrompt?: string | null;
       readonly savedPath?: V2ThreadStartResponse__AbsolutePathBuf | null;
       readonly status: string;
       readonly transparentBackground?: boolean | null;
       readonly type: "imageGeneration";
+      readonly fileId?: string;
     }
   | { readonly id: string; readonly review: string; readonly type: "enteredReviewMode" }
   | { readonly id: string; readonly review: string; readonly type: "exitedReviewMode" }
@@ -39835,7 +39745,7 @@ export const V2ThreadStartResponse__ThreadItem = Schema.Union(
         Schema.Union([V2ThreadStartResponse__ImageGenerationFailure, Schema.Null]),
       ),
       id: Schema.String,
-      result: Schema.String,
+      result: Schema.optionalKey(Schema.String),
       revisedPrompt: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
       savedPath: Schema.optionalKey(
         Schema.Union([V2ThreadStartResponse__AbsolutePathBuf, Schema.Null]),
@@ -39843,6 +39753,7 @@ export const V2ThreadStartResponse__ThreadItem = Schema.Union(
       status: Schema.String,
       transparentBackground: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
       type: Schema.Literal("imageGeneration").annotate({ title: "ImageGenerationThreadItemType" }),
+      fileId: Schema.optionalKey(Schema.String),
     }).annotate({ title: "ImageGenerationThreadItem" }),
     Schema.Struct({
       id: Schema.String,
@@ -39986,12 +39897,13 @@ export type V2ThreadTurnsListResponse__ThreadItem =
   | {
       readonly failure?: V2ThreadTurnsListResponse__ImageGenerationFailure | null;
       readonly id: string;
-      readonly result: string;
+      readonly result?: string;
       readonly revisedPrompt?: string | null;
       readonly savedPath?: V2ThreadTurnsListResponse__AbsolutePathBuf | null;
       readonly status: string;
       readonly transparentBackground?: boolean | null;
       readonly type: "imageGeneration";
+      readonly fileId?: string;
     }
   | { readonly id: string; readonly review: string; readonly type: "enteredReviewMode" }
   | { readonly id: string; readonly review: string; readonly type: "exitedReviewMode" }
@@ -40296,7 +40208,7 @@ export const V2ThreadTurnsListResponse__ThreadItem = Schema.Union(
         Schema.Union([V2ThreadTurnsListResponse__ImageGenerationFailure, Schema.Null]),
       ),
       id: Schema.String,
-      result: Schema.String,
+      result: Schema.optionalKey(Schema.String),
       revisedPrompt: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
       savedPath: Schema.optionalKey(
         Schema.Union([V2ThreadTurnsListResponse__AbsolutePathBuf, Schema.Null]),
@@ -40304,6 +40216,7 @@ export const V2ThreadTurnsListResponse__ThreadItem = Schema.Union(
       status: Schema.String,
       transparentBackground: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
       type: Schema.Literal("imageGeneration").annotate({ title: "ImageGenerationThreadItemType" }),
+      fileId: Schema.optionalKey(Schema.String),
     }).annotate({ title: "ImageGenerationThreadItem" }),
     Schema.Struct({
       id: Schema.String,
@@ -40447,12 +40360,13 @@ export type V2ThreadUnarchiveResponse__ThreadItem =
   | {
       readonly failure?: V2ThreadUnarchiveResponse__ImageGenerationFailure | null;
       readonly id: string;
-      readonly result: string;
+      readonly result?: string;
       readonly revisedPrompt?: string | null;
       readonly savedPath?: V2ThreadUnarchiveResponse__AbsolutePathBuf | null;
       readonly status: string;
       readonly transparentBackground?: boolean | null;
       readonly type: "imageGeneration";
+      readonly fileId?: string;
     }
   | { readonly id: string; readonly review: string; readonly type: "enteredReviewMode" }
   | { readonly id: string; readonly review: string; readonly type: "exitedReviewMode" }
@@ -40757,7 +40671,7 @@ export const V2ThreadUnarchiveResponse__ThreadItem = Schema.Union(
         Schema.Union([V2ThreadUnarchiveResponse__ImageGenerationFailure, Schema.Null]),
       ),
       id: Schema.String,
-      result: Schema.String,
+      result: Schema.optionalKey(Schema.String),
       revisedPrompt: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
       savedPath: Schema.optionalKey(
         Schema.Union([V2ThreadUnarchiveResponse__AbsolutePathBuf, Schema.Null]),
@@ -40765,6 +40679,7 @@ export const V2ThreadUnarchiveResponse__ThreadItem = Schema.Union(
       status: Schema.String,
       transparentBackground: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
       type: Schema.Literal("imageGeneration").annotate({ title: "ImageGenerationThreadItemType" }),
+      fileId: Schema.optionalKey(Schema.String),
     }).annotate({ title: "ImageGenerationThreadItem" }),
     Schema.Struct({
       id: Schema.String,
@@ -40910,12 +40825,13 @@ export type V2TurnCompletedNotification__ThreadItem =
   | {
       readonly failure?: V2TurnCompletedNotification__ImageGenerationFailure | null;
       readonly id: string;
-      readonly result: string;
+      readonly result?: string;
       readonly revisedPrompt?: string | null;
       readonly savedPath?: V2TurnCompletedNotification__AbsolutePathBuf | null;
       readonly status: string;
       readonly transparentBackground?: boolean | null;
       readonly type: "imageGeneration";
+      readonly fileId?: string;
     }
   | { readonly id: string; readonly review: string; readonly type: "enteredReviewMode" }
   | { readonly id: string; readonly review: string; readonly type: "exitedReviewMode" }
@@ -41220,7 +41136,7 @@ export const V2TurnCompletedNotification__ThreadItem = Schema.Union(
         Schema.Union([V2TurnCompletedNotification__ImageGenerationFailure, Schema.Null]),
       ),
       id: Schema.String,
-      result: Schema.String,
+      result: Schema.optionalKey(Schema.String),
       revisedPrompt: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
       savedPath: Schema.optionalKey(
         Schema.Union([V2TurnCompletedNotification__AbsolutePathBuf, Schema.Null]),
@@ -41228,6 +41144,7 @@ export const V2TurnCompletedNotification__ThreadItem = Schema.Union(
       status: Schema.String,
       transparentBackground: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
       type: Schema.Literal("imageGeneration").annotate({ title: "ImageGenerationThreadItemType" }),
+      fileId: Schema.optionalKey(Schema.String),
     }).annotate({ title: "ImageGenerationThreadItem" }),
     Schema.Struct({
       id: Schema.String,
@@ -41371,12 +41288,13 @@ export type V2TurnStartedNotification__ThreadItem =
   | {
       readonly failure?: V2TurnStartedNotification__ImageGenerationFailure | null;
       readonly id: string;
-      readonly result: string;
+      readonly result?: string;
       readonly revisedPrompt?: string | null;
       readonly savedPath?: V2TurnStartedNotification__AbsolutePathBuf | null;
       readonly status: string;
       readonly transparentBackground?: boolean | null;
       readonly type: "imageGeneration";
+      readonly fileId?: string;
     }
   | { readonly id: string; readonly review: string; readonly type: "enteredReviewMode" }
   | { readonly id: string; readonly review: string; readonly type: "exitedReviewMode" }
@@ -41681,7 +41599,7 @@ export const V2TurnStartedNotification__ThreadItem = Schema.Union(
         Schema.Union([V2TurnStartedNotification__ImageGenerationFailure, Schema.Null]),
       ),
       id: Schema.String,
-      result: Schema.String,
+      result: Schema.optionalKey(Schema.String),
       revisedPrompt: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
       savedPath: Schema.optionalKey(
         Schema.Union([V2TurnStartedNotification__AbsolutePathBuf, Schema.Null]),
@@ -41689,6 +41607,7 @@ export const V2TurnStartedNotification__ThreadItem = Schema.Union(
       status: Schema.String,
       transparentBackground: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
       type: Schema.Literal("imageGeneration").annotate({ title: "ImageGenerationThreadItemType" }),
+      fileId: Schema.optionalKey(Schema.String),
     }).annotate({ title: "ImageGenerationThreadItem" }),
     Schema.Struct({
       id: Schema.String,
@@ -41843,12 +41762,13 @@ export type V2TurnStartResponse__ThreadItem =
   | {
       readonly failure?: V2TurnStartResponse__ImageGenerationFailure | null;
       readonly id: string;
-      readonly result: string;
+      readonly result?: string;
       readonly revisedPrompt?: string | null;
       readonly savedPath?: V2TurnStartResponse__AbsolutePathBuf | null;
       readonly status: string;
       readonly transparentBackground?: boolean | null;
       readonly type: "imageGeneration";
+      readonly fileId?: string;
     }
   | { readonly id: string; readonly review: string; readonly type: "enteredReviewMode" }
   | { readonly id: string; readonly review: string; readonly type: "exitedReviewMode" }
@@ -42143,7 +42063,7 @@ export const V2TurnStartResponse__ThreadItem = Schema.Union(
         Schema.Union([V2TurnStartResponse__ImageGenerationFailure, Schema.Null]),
       ),
       id: Schema.String,
-      result: Schema.String,
+      result: Schema.optionalKey(Schema.String),
       revisedPrompt: Schema.optionalKey(Schema.Union([Schema.String, Schema.Null])),
       savedPath: Schema.optionalKey(
         Schema.Union([V2TurnStartResponse__AbsolutePathBuf, Schema.Null]),
@@ -42151,6 +42071,7 @@ export const V2TurnStartResponse__ThreadItem = Schema.Union(
       status: Schema.String,
       transparentBackground: Schema.optionalKey(Schema.Union([Schema.Boolean, Schema.Null])),
       type: Schema.Literal("imageGeneration").annotate({ title: "ImageGenerationThreadItemType" }),
+      fileId: Schema.optionalKey(Schema.String),
     }).annotate({ title: "ImageGenerationThreadItem" }),
     Schema.Struct({
       id: Schema.String,
diff --git a/packages/effect-codex-app-server/src/client.ts b/packages/effect-codex-app-server/src/client.ts
index 28f677e03ee0..4bc5873688d2 100644
--- a/packages/effect-codex-app-server/src/client.ts
+++ b/packages/effect-codex-app-server/src/client.ts
@@ -86,12 +86,14 @@ type ServerNotificationHandler = (
   payload: unknown,
 ) => Effect.Effect<void, CodexError.CodexAppServerError>;
 
-const V2TurnStartParamsWithCollaborationMode = CodexSchema.V2TurnStartParams.pipe(
+/** The generated `turn/start` schema omits these fields; this is what the wire accepts. */
+export const V2TurnStartParams = CodexSchema.V2TurnStartParams.pipe(
   Schema.fieldsAssign({
     collaborationMode: Schema.optionalKey(CodexSchema.ClientRequest__CollaborationMode),
     additionalContext: Schema.optionalKey(
       Schema.Record(Schema.String, CodexSchema.V2TurnStartParams__AdditionalContextEntry),
     ),
+    cyberAccessProgram: Schema.optionalKey(CodexSchema.V2TurnStartParams__CyberAccessProgram),
   }),
 );
 
@@ -131,7 +133,7 @@ export const make = Effect.fn("effect-codex-app-server/CodexAppServerClient.make
     | Schema.Codec<CodexRpc.ClientRequestParamsByMethod[M], CodexRpc.ClientRequestParamsByMethod[M]>
     | undefined =>
     method === "turn/start"
-      ? (V2TurnStartParamsWithCollaborationMode as never)
+      ? (V2TurnStartParams as never)
       : (CodexRpc.CLIENT_REQUEST_PARAMS[method] as never);
 
   const getClientRequestResponseSchema = <M extends CodexRpc.ClientRequestMethod>(
diff --git a/packages/effect-codex-app-server/src/schema.test.ts b/packages/effect-codex-app-server/src/schema.test.ts
index dfbedf86af97..b7b86c2ed3c8 100644
--- a/packages/effect-codex-app-server/src/schema.test.ts
+++ b/packages/effect-codex-app-server/src/schema.test.ts
@@ -8,6 +8,8 @@ const isThreadReadResponse = Schema.is(CodexSchema.V2ThreadReadResponse);
 const isThreadResumeResponse = Schema.is(CodexSchema.V2ThreadResumeResponse);
 const isThreadForkResponse = Schema.is(CodexSchema.V2ThreadForkResponse);
 const isTurnCompletedNotification = Schema.is(CodexSchema.V2TurnCompletedNotification);
+const isHookStartedNotification = Schema.is(CodexSchema.V2HookStartedNotification);
+const isHookCompletedNotification = Schema.is(CodexSchema.V2HookCompletedNotification);
 const decodeThreadResumeResponse = Schema.decodeUnknownSync(CodexSchema.V2ThreadResumeResponse);
 
 it("keeps async questions in live notifications and thread history", () => {
@@ -33,6 +35,28 @@ it("keeps async questions in live notifications and thread history", () => {
   }
 });
 
+it("accepts generated images identified by fileId without inline result", () => {
+  const item = {
+    type: "imageGeneration",
+    id: "image-1",
+    status: "completed",
+    fileId: "file-1",
+    savedPath: "/tmp/generated.png",
+    revisedPrompt: null,
+  } as const;
+  for (const schema of [
+    CodexSchema.ServerNotification__ThreadItem,
+    CodexSchema.V2ItemStartedNotification__ThreadItem,
+    CodexSchema.V2ItemCompletedNotification__ThreadItem,
+    CodexSchema.V2ThreadReadResponse__ThreadItem,
+    CodexSchema.V2ThreadResumeResponse__ThreadItem,
+    CodexSchema.V2ThreadForkResponse__ThreadItem,
+    CodexSchema.V2TurnCompletedNotification__ThreadItem,
+  ]) {
+    assert.deepEqual(Schema.decodeSync(schema)(item), item);
+  }
+});
+
 it("keeps partial answers in notifications and persisted thread histories", () => {
   const item = {
     type: "agentMessage",
@@ -239,3 +263,26 @@ it("accepts account plan slugs newer than the pinned protocol", () => {
     assert.equal(isGetAccountResponse(accountResponse), true);
   }
 });
+
+it("accepts Codex model-request hook runs", () => {
+  for (const eventName of ["preModelRequest", "postModelRequest"]) {
+    const notification = {
+      threadId: "thread-1",
+      turnId: "turn-1",
+      run: {
+        id: `hook-${eventName}`,
+        eventName,
+        executionMode: "sync",
+        handlerType: "command",
+        scope: "turn",
+        sourcePath: "/tmp/project/.codex/hooks.json",
+        startedAt: 1,
+        status: "stopped",
+        displayOrder: 0,
+        entries: [{ kind: "stop", text: "Stop reason supplied by hook" }],
+      },
+    };
+    assert.equal(isHookStartedNotification(notification), true);
+    assert.equal(isHookCompletedNotification(notification), true);
+  }
+});
diff --git a/packages/provider-acp-registry/src/server/AcpRegistryRuntimeCoordinator.test.ts b/packages/provider-acp-registry/src/server/AcpRegistryRuntimeCoordinator.test.ts
index 38a57cfec3d0..a6662853ae02 100644
--- a/packages/provider-acp-registry/src/server/AcpRegistryRuntimeCoordinator.test.ts
+++ b/packages/provider-acp-registry/src/server/AcpRegistryRuntimeCoordinator.test.ts
@@ -29,7 +29,7 @@ describe("AcpRegistryRuntimeCoordinator", () => {
 
       yield* Deferred.succeed(releaseForeground, undefined);
       yield* Fiber.join(foreground);
-    }).pipe(Effect.provide(AcpRegistryRuntimeCoordinator.layer), Effect.scoped),
+    }).pipe(Effect.provide(AcpRegistryRuntimeCoordinator.layer)),
   );
 
   it.effect("interrupts an active background probe when foreground startup begins", () =>
@@ -57,7 +57,7 @@ describe("AcpRegistryRuntimeCoordinator", () => {
 
       yield* Deferred.succeed(releaseForeground, undefined);
       yield* Fiber.join(foreground);
-    }).pipe(Effect.provide(AcpRegistryRuntimeCoordinator.layer), Effect.scoped),
+    }).pipe(Effect.provide(AcpRegistryRuntimeCoordinator.layer)),
   );
 
   it.effect("serializes native session mutations across callers", () =>
@@ -84,7 +84,7 @@ describe("AcpRegistryRuntimeCoordinator", () => {
       yield* Fiber.join(first);
       yield* Fiber.join(second);
       expect(Option.isSome(yield* Deferred.poll(secondEntered))).toBe(true);
-    }).pipe(Effect.provide(AcpRegistryRuntimeCoordinator.layer), Effect.scoped),
+    }).pipe(Effect.provide(AcpRegistryRuntimeCoordinator.layer)),
   );
 
   it.effect("replays and replaces late command advertisements per provider instance", () =>
@@ -132,7 +132,7 @@ describe("AcpRegistryRuntimeCoordinator", () => {
       );
       yield* coordinator.clearAvailableCommands(codex);
       expect(Option.isNone(yield* coordinator.getAvailableCommands(codex))).toBe(true);
-    }).pipe(Effect.provide(AcpRegistryRuntimeCoordinator.layer), Effect.scoped),
+    }).pipe(Effect.provide(AcpRegistryRuntimeCoordinator.layer)),
   );
 
   it.effect("requires matching user consent before accepting URL authentication", () =>
@@ -174,7 +174,7 @@ describe("AcpRegistryRuntimeCoordinator", () => {
       expect(yield* Fiber.join(request)).toBe(true);
       expect(Option.isNone(yield* coordinator.getUrlAuthAction(instanceId))).toBe(true);
       yield* Fiber.interrupt(consumer);
-    }).pipe(Effect.provide(AcpRegistryRuntimeCoordinator.layer), Effect.scoped),
+    }).pipe(Effect.provide(AcpRegistryRuntimeCoordinator.layer)),
   );
 
   it.effect("publishes a replacement URL action before retiring the previous request", () =>
@@ -226,7 +226,7 @@ describe("AcpRegistryRuntimeCoordinator", () => {
       ).toBe(true);
       expect(yield* Fiber.join(replacement)).toBe(true);
       yield* Fiber.interrupt(consumer);
-    }).pipe(Effect.provide(AcpRegistryRuntimeCoordinator.layer), Effect.scoped),
+    }).pipe(Effect.provide(AcpRegistryRuntimeCoordinator.layer)),
   );
 
   it.effect("clears a published URL action when its request is interrupted", () =>
@@ -255,6 +255,6 @@ describe("AcpRegistryRuntimeCoordinator", () => {
       yield* Deferred.await(cleared);
       expect(Option.isNone(yield* coordinator.getUrlAuthAction(instanceId))).toBe(true);
       yield* Fiber.interrupt(consumer);
-    }).pipe(Effect.provide(AcpRegistryRuntimeCoordinator.layer), Effect.scoped),
+    }).pipe(Effect.provide(AcpRegistryRuntimeCoordinator.layer)),
   );
 });
diff --git a/packages/provider-acp-registry/src/server/AcpRegistrySupport.test.ts b/packages/provider-acp-registry/src/server/AcpRegistrySupport.test.ts
index c0716f802909..d9d9d883c2c5 100644
--- a/packages/provider-acp-registry/src/server/AcpRegistrySupport.test.ts
+++ b/packages/provider-acp-registry/src/server/AcpRegistrySupport.test.ts
@@ -1903,6 +1903,6 @@ describe("acpRegistryManagedBinaryDirectories", () => {
         architecture: "x64",
       });
       expect(missing).toEqual([]);
-    }).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)), Effect.scoped),
+    }).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
   );
 });
diff --git a/packages/provider-acp-registry/src/server/adapter.ts b/packages/provider-acp-registry/src/server/adapter.ts
index 5efe4ac83e2d..25656a9d808e 100644
--- a/packages/provider-acp-registry/src/server/adapter.ts
+++ b/packages/provider-acp-registry/src/server/adapter.ts
@@ -9,6 +9,8 @@ import {
   extractDevinSubagentUpdate,
 } from "./devinAcp.ts";
 import { extractDroidElicitationForm } from "./droidAcp.ts";
+import { extractOmpElicitationForm } from "./ompAcp.ts";
+import { extractOpenCodeElicitationForm } from "./opencodeAcp.ts";
 import {
   copilotClientCapabilitiesMeta,
   extractCopilotSubagentUpdate,
@@ -187,6 +189,16 @@ export const makeAcpRegistryAdapterV2 = Effect.fn("makeAcpRegistryAdapterV2")(fu
   const startupKey =
     options.settings.source === "local" ? `local:${options.instanceId}` : registryAgentId;
   const isDevin = registryAgentId === "devin";
+  const isOmp =
+    options.settings.source === "local" &&
+    /^omp(\.exe|\.cmd)?$/i.test(options.settings.commandPath.split(/[\\/]/).pop() ?? "");
+  const isOpenCode =
+    registryAgentId === "opencode" ||
+    registryAgentId === "opencode-v2" ||
+    (options.settings.source === "local" &&
+      /^opencode(?:-v2)?(\.exe|\.cmd)?$/i.test(
+        options.settings.commandPath.split(/[\\/]/).pop() ?? "",
+      ));
   // Local installs launch the `copilot` binary directly with no registry id.
   const isCopilot =
     registryAgentId === "github-copilot-cli" ||
@@ -219,10 +231,15 @@ export const makeAcpRegistryAdapterV2 = Effect.fn("makeAcpRegistryAdapterV2")(fu
         }
       : AcpProviderCapabilitiesV2,
     customModels: readCustomModelEntries(options.settings.customModels).map((entry) => entry.slug),
+    compactViaAdvertisedCommand: true,
     promptFailure: (cause) => acpRegistryPromptFailure(registryAgentId, cause),
     ...(registryAgentId === "factory-droid"
       ? { extractElicitationForm: extractDroidElicitationForm }
-      : {}),
+      : isOmp
+        ? { extractElicitationForm: extractOmpElicitationForm }
+        : isOpenCode
+          ? { extractElicitationForm: extractOpenCodeElicitationForm }
+          : {}),
     // glm-acp-agent is the one agent whose per-turn usage a live probe has verified.
     ...(registryAgentId === "glm-acp-agent" ? { reportsPerTurnPromptUsage: true } : {}),
     ...(registryAgentId === "mistral-vibe"
diff --git a/packages/provider-acp-registry/src/server/copilotAcp.ts b/packages/provider-acp-registry/src/server/copilotAcp.ts
index 5f29c930e9a9..848288689298 100644
--- a/packages/provider-acp-registry/src/server/copilotAcp.ts
+++ b/packages/provider-acp-registry/src/server/copilotAcp.ts
@@ -21,6 +21,9 @@ export const copilotClientCapabilitiesMeta = {
       "subagent.failed",
       "assistant.message_delta",
       "assistant.reasoning_delta",
+      "session.compaction_complete",
+      "assistant.turn_start",
+      "assistant.idle",
     ],
   },
 };
@@ -118,6 +121,27 @@ export function makeCopilotSubagentRouting() {
             result: typeof data.error === "string" ? data.error : null,
           });
         }
+        // Copilot sends no ACP compaction_update; agentId marks a subagent's own compaction.
+        // Older Copilot builds report a successful compaction without `outcome`.
+        case "session.compaction_complete": {
+          if (
+            event.agentId !== undefined ||
+            data.success !== true ||
+            (data.outcome !== undefined && data.outcome !== "applied")
+          ) {
+            return Effect.void;
+          }
+          return context.markSessionCompacted(event.sessionId);
+        }
+        // Copilot holds session/prompt while an attached async shell runs (github/copilot-cli#5293).
+        case "assistant.turn_start":
+        case "assistant.idle": {
+          if (event.agentId !== undefined || data.aborted === true) return Effect.void;
+          return context.reportForegroundWork({
+            sessionId: event.sessionId,
+            state: event.type === "assistant.idle" ? "idle" : "running",
+          });
+        }
         default:
           return Effect.void;
       }
diff --git a/packages/provider-acp-registry/src/server/driver.test.ts b/packages/provider-acp-registry/src/server/driver.test.ts
index 2783f336ec37..1495cb0bb64d 100644
--- a/packages/provider-acp-registry/src/server/driver.test.ts
+++ b/packages/provider-acp-registry/src/server/driver.test.ts
@@ -1,6 +1,10 @@
 import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
 import * as NodeServices from "@effect/platform-node/NodeServices";
-import { AcpRegistryOperationError, ProviderInstanceId } from "@t3tools/contracts";
+import {
+  AcpRegistryOperationError,
+  ProviderInstanceId,
+  type ServerProvider,
+} from "@t3tools/contracts";
 import * as IdAllocator from "@t3tools/provider-core/server/IdAllocator";
 import * as McpProviderSessions from "@t3tools/provider-core/server/McpProviderSessions";
 import * as ProviderEventLoggers from "@t3tools/provider-core/server/ProviderEventLoggers";
@@ -220,6 +224,53 @@ describe("acpRegistrySnapshotReadiness", () => {
         capabilities: { optionDescriptors: [{ id: "effort", currentValue: "high" }] },
       },
     ]);
+
+    // Session configOptions describe the current model only.
+    const sharedMode = {
+      id: "mode",
+      label: "Mode",
+      type: "select" as const,
+      options: [{ id: "ask", label: "Ask" }],
+      currentValue: "ask",
+    };
+    const twoModelList = [
+      { id: "glm", name: "GLM", description: null },
+      { id: "opus", name: "Opus", description: null },
+    ];
+    const afterGlm = applyAcpRegistryLiveConfiguration(
+      provider,
+      {
+        models: twoModelList,
+        currentModelId: "glm",
+        configOptions: [...liveOptions, sharedMode],
+        modelOptionIds: ["effort"],
+      },
+      [],
+    );
+    const twoModels = afterGlm.models;
+    expect(twoModels.find((model) => model.slug === "glm")).toMatchObject({
+      capabilities: { optionDescriptors: [{ id: "effort" }, { id: "mode" }] },
+    });
+    expect(
+      twoModels.find((model) => model.slug === "opus")?.capabilities?.optionDescriptors ?? [],
+    ).toEqual([sharedMode]);
+    // A later session on another model keeps the options learned for this one.
+    const afterOpus = applyAcpRegistryLiveConfiguration(
+      afterGlm,
+      {
+        models: twoModelList,
+        currentModelId: "opus",
+        configOptions: [{ ...liveOptions[0]!, id: "thinking" }, sharedMode],
+        modelOptionIds: ["thinking"],
+      },
+      [],
+    ).models;
+    expect(afterOpus.find((model) => model.slug === "glm")).toMatchObject({
+      capabilities: { optionDescriptors: [{ id: "mode" }, { id: "effort" }] },
+    });
+    expect(afterOpus.find((model) => model.slug === "opus")).toMatchObject({
+      capabilities: { optionDescriptors: [{ id: "thinking" }, { id: "mode" }] },
+    });
   });
 
   it("projects discovery without claiming authentication when no login methods are advertised", () => {
@@ -536,7 +587,9 @@ it.layer(driverLayer, { excludeTestServices: true })("AcpRegistryDriver", (it) =
           Stream.runHead,
         );
 
-      const probed = yield* waitForModels(["old-model"]).pipe(Effect.forkScoped);
+      const probed = yield* waitForModels(["old-model"]).pipe(
+        Effect.forkScoped({ startImmediately: true }),
+      );
       yield* instance.snapshot.refresh;
       yield* Fiber.join(probed);
       yield* coordinator.publishLiveConfiguration(
@@ -548,10 +601,100 @@ it.layer(driverLayer, { excludeTestServices: true })("AcpRegistryDriver", (it) =
       );
       yield* fileSystem.writeFileString(modelsPath, JSON.stringify(["old-model", "new-model"]));
 
-      const refreshed = yield* waitForModels(["old-model", "new-model"]).pipe(Effect.forkScoped);
+      const refreshed = yield* waitForModels(["old-model", "new-model"]).pipe(
+        Effect.forkScoped({ startImmediately: true }),
+      );
       yield* instance.invalidateCaches ?? Effect.void;
       yield* instance.snapshot.refresh;
       expect(Option.isSome(yield* Fiber.join(refreshed))).toBe(true);
     }),
   );
+
+  it.effect("keeps options learned for each model across a refresh", () =>
+    Effect.gen(function* () {
+      const fileSystem = yield* FileSystem.FileSystem;
+      const path = yield* Path.Path;
+      const directory = yield* fileSystem.makeTempDirectoryScoped({ prefix: "acp-driver-" });
+      const agentPath = path.join(directory, "agent.mjs");
+      const modelsPath = path.join(directory, "models.json");
+      yield* fileSystem.writeFileString(agentPath, fakeAgentSource);
+      yield* fileSystem.writeFileString(modelsPath, JSON.stringify(["model-a", "model-b"]));
+      const coordinator = yield* AcpRegistryRuntimeCoordinator.AcpRegistryRuntimeCoordinator;
+
+      const instance = yield* AcpRegistryDriver.create({
+        instanceId: identity.instanceId,
+        displayName: identity.displayName,
+        enabled: true,
+        environment: [],
+        config: decodeSettings({ agentId: "test-agent" }),
+      }).pipe(
+        Effect.provideService(AcpRegistrySupport.AcpRegistryCatalog, {
+          ...catalogWithInspection({
+            status: "ready",
+            agentId: "test-agent",
+            version: "1.0.0",
+            distribution: "npx",
+          }),
+          resolve: () =>
+            Effect.succeed({
+              distribution: "npx" as const,
+              spawn: { command: process.execPath, args: [agentPath, modelsPath] },
+            }),
+        }),
+      );
+      const effortBySlug = (snapshot: ServerProvider) =>
+        snapshot.models
+          .map(
+            (model) =>
+              `${model.slug}:${(model.capabilities?.optionDescriptors ?? []).map((option) => option.id).join("+")}`,
+          )
+          .join();
+      const waitFor = (expected: string) =>
+        instance.snapshot.streamChanges.pipe(
+          Stream.filter((snapshot) => effortBySlug(snapshot) === expected),
+          Stream.runHead,
+        );
+      const session = (currentModelId: string) =>
+        normalizeAcpRegistryLiveConfiguration(
+          [
+            {
+              id: "effort",
+              name: "Effort",
+              category: "thought_level",
+              type: "select",
+              currentValue: "high",
+              options: [
+                { value: "low", name: "Low" },
+                { value: "high", name: "High" },
+              ],
+            },
+          ],
+          undefined,
+          {
+            currentModelId,
+            availableModels: [
+              { modelId: "model-a", name: "model-a" },
+              { modelId: "model-b", name: "model-b" },
+            ],
+          },
+        );
+
+      const probed = yield* waitFor("model-a:,model-b:").pipe(
+        Effect.forkScoped({ startImmediately: true }),
+      );
+      yield* instance.snapshot.refresh;
+      yield* Fiber.join(probed);
+      const learned = yield* waitFor("model-a:effort,model-b:effort").pipe(
+        Effect.forkScoped({ startImmediately: true }),
+      );
+      yield* coordinator.publishLiveConfiguration(identity.instanceId, session("model-b"));
+      yield* coordinator.publishLiveConfiguration(identity.instanceId, session("model-a"));
+      yield* Fiber.join(learned);
+
+      yield* instance.snapshot.refresh;
+      expect(effortBySlug(yield* instance.snapshot.getSnapshot)).toBe(
+        "model-a:effort,model-b:effort",
+      );
+    }),
+  );
 });
diff --git a/packages/provider-acp-registry/src/server/driver.ts b/packages/provider-acp-registry/src/server/driver.ts
index 3bb96f5d4327..2db192b9c7f9 100644
--- a/packages/provider-acp-registry/src/server/driver.ts
+++ b/packages/provider-acp-registry/src/server/driver.ts
@@ -91,15 +91,36 @@ const makeUnsupportedTextGeneration = (): ProviderTextGeneration => {
 
 function modelsFromDiscovery(
   discovery:
-    | Pick<AcpRegistryLiveConfiguration, "models" | "currentModelId" | "configOptions">
+    | Pick<
+        AcpRegistryLiveConfiguration,
+        "models" | "currentModelId" | "configOptions" | "modelOptionIds"
+      >
     | undefined,
   customModels: ReadonlyArray<string>,
+  previousModels: ReadonlyArray<ServerProviderModel> = [],
 ): ReadonlyArray<ServerProviderModel> {
   const discovered = discovery?.models ?? [];
   const capabilities =
     discovery === undefined || discovery.configOptions.length === 0
       ? EMPTY_CAPABILITIES
       : createModelCapabilities({ optionDescriptors: discovery.configOptions });
+  // Model-specific options describe only the session's current model; other
+  // models keep the shared ones plus what an earlier session reported for them.
+  const modelOptionIds = new Set(discovery?.modelOptionIds ?? []);
+  const shared = (discovery?.configOptions ?? []).filter(
+    (descriptor) => !modelOptionIds.has(descriptor.id),
+  );
+  const sharedIds = new Set(shared.map((descriptor) => descriptor.id));
+  const capabilitiesFor = (slug: string) => {
+    if (slug === discovery?.currentModelId) return capabilities;
+    const own = (
+      previousModels.find((model) => model.slug === slug)?.capabilities?.optionDescriptors ?? []
+    ).filter((descriptor) => !sharedIds.has(descriptor.id));
+    const optionDescriptors = [...shared, ...own];
+    return optionDescriptors.length === 0
+      ? EMPTY_CAPABILITIES
+      : createModelCapabilities({ optionDescriptors });
+  };
   const builtInModels: ReadonlyArray<ServerProviderModel> =
     discovered.length === 0
       ? [
@@ -116,7 +137,7 @@ function modelsFromDiscovery(
           name: model.name,
           isCustom: false,
           ...(model.id === discovery?.currentModelId ? { isDefault: true } : {}),
-          capabilities,
+          capabilities: capabilitiesFor(model.id),
         }));
   return providerModelsFromSettings(builtInModels, customModels, capabilities);
 }
@@ -261,6 +282,7 @@ export function applyAcpRegistryLiveConfiguration(
   provider: ServerProvider,
   configuration: AcpRegistryLiveConfiguration,
   customModels: ReadonlyArray<string>,
+  previousModels: ReadonlyArray<ServerProviderModel> = provider.models,
 ): ServerProvider {
   const { message: _staleProbeMessage, ...snapshot } = provider;
   // session/load may omit models (Kimi returns `{}`); keep the probed list
@@ -284,7 +306,11 @@ export function applyAcpRegistryLiveConfiguration(
     models:
       configuration.models.length === 0 && configuration.configOptions.length === 0
         ? provider.models
-        : modelsFromDiscovery(discovery, customModels),
+        : modelsFromDiscovery(
+            discovery,
+            customModels,
+            previousModels.filter((model) => !model.isCustom),
+          ),
   };
 }
 
@@ -553,6 +579,23 @@ export const AcpRegistryDriver: ProviderDriver<AcpRegistrySettings, AcpRegistryD
         environment,
         processEnvironment,
       });
+    // Refreshes rebuild the snapshot from the probe, so per-model options
+    // learned from earlier sessions are kept here.
+    const learnedModels = yield* Ref.make<ReadonlyArray<ServerProviderModel>>([]);
+    const applyLiveConfiguration = (
+      provider: ServerProvider,
+      configuration: AcpRegistryLiveConfiguration,
+    ) =>
+      Ref.modify(learnedModels, (learned) => {
+        const next = applyAcpRegistryLiveConfiguration(
+          provider,
+          configuration,
+          effectiveConfig.customModels,
+          learned.length > 0 ? learned : provider.models,
+        );
+        return [next, next.models === provider.models ? learned : next.models];
+      });
+    const clearLearnedModels = Ref.set(learnedModels, []);
     const withLiveRuntimeState = Effect.fn("AcpRegistryDriver.withLiveRuntimeState")(function* (
       input: ServerProvider,
     ) {
@@ -571,18 +614,17 @@ export const AcpRegistryDriver: ProviderDriver<AcpRegistrySettings, AcpRegistryD
             configuration: runtimeCoordinator.value.getLiveConfiguration(instanceId),
             authAction: runtimeCoordinator.value.getUrlAuthAction(instanceId),
           }).pipe(
-            Effect.map(({ commands, configuration, authAction }) => {
+            Effect.flatMap(({ commands, configuration, authAction }) => {
               const withCommands = applyAcpRegistryAvailableCommands(provider, commands);
-              const withConfiguration = Option.match(configuration, {
-                onNone: () => withCommands,
+              return Option.match(configuration, {
+                onNone: () => Effect.succeed(withCommands),
                 onSome: (liveConfiguration) =>
-                  applyAcpRegistryLiveConfiguration(
-                    withCommands,
-                    liveConfiguration,
-                    effectiveConfig.customModels,
-                  ),
-              });
-              return applyAcpRegistryUrlAuthAction(withConfiguration, authAction);
+                  applyLiveConfiguration(withCommands, liveConfiguration),
+              }).pipe(
+                Effect.map((withConfiguration) =>
+                  applyAcpRegistryUrlAuthAction(withConfiguration, authAction),
+                ),
+              );
             }),
           );
     });
@@ -709,15 +751,8 @@ export const AcpRegistryDriver: ProviderDriver<AcpRegistrySettings, AcpRegistryD
           (configuration) =>
             liveSnapshotSemaphore.withPermit(
               getSnapshot.pipe(
-                Effect.flatMap((current) =>
-                  publishSnapshot(
-                    applyAcpRegistryLiveConfiguration(
-                      current,
-                      configuration,
-                      effectiveConfig.customModels,
-                    ),
-                  ),
-                ),
+                Effect.flatMap((current) => applyLiveConfiguration(current, configuration)),
+                Effect.flatMap(publishSnapshot),
               ),
             ),
         );
@@ -778,11 +813,13 @@ export const AcpRegistryDriver: ProviderDriver<AcpRegistrySettings, AcpRegistryD
         : provided;
     };
 
-    const clearLiveState = Option.isSome(runtimeCoordinator)
-      ? runtimeCoordinator.value
-          .clearLiveConfiguration(instanceId)
-          .pipe(Effect.andThen(runtimeCoordinator.value.clearAvailableCommands(instanceId)))
-      : Effect.void;
+    const clearLiveState = (
+      Option.isSome(runtimeCoordinator)
+        ? runtimeCoordinator.value
+            .clearLiveConfiguration(instanceId)
+            .pipe(Effect.andThen(runtimeCoordinator.value.clearAvailableCommands(instanceId)))
+        : Effect.void
+    ).pipe(Effect.andThen(clearLearnedModels));
     const controller = yield* AcpRegistryAuth.makeAcpRegistryAuth({
       instanceId,
       settings: effectiveConfig,
@@ -828,7 +865,10 @@ export const AcpRegistryDriver: ProviderDriver<AcpRegistrySettings, AcpRegistryD
       invalidateCaches: (Option.isSome(runtimeCoordinator)
         ? runtimeCoordinator.value.clearLiveConfiguration(instanceId)
         : Effect.void
-      ).pipe(Effect.andThen(liveSnapshotSemaphore.withPermit(invalidateEnrichmentCache))),
+      ).pipe(
+        Effect.andThen(clearLearnedModels),
+        Effect.andThen(liveSnapshotSemaphore.withPermit(invalidateEnrichmentCache)),
+      ),
       orchestrationAdapter,
       textGeneration: makeUnsupportedTextGeneration(),
       acpSessionManagement: {
diff --git a/packages/provider-acp-registry/src/server/ompAcp.ts b/packages/provider-acp-registry/src/server/ompAcp.ts
new file mode 100644
index 000000000000..851988337027
--- /dev/null
+++ b/packages/provider-acp-registry/src/server/ompAcp.ts
@@ -0,0 +1,65 @@
+import { type OrchestrationV2UserInputQuestion, TrimmedNonEmptyString } from "@t3tools/contracts";
+import type { AcpAdapterV2Flavor } from "@t3tools/provider-acp/server/adapter";
+import * as Schema from "effect/Schema";
+
+const isForm = Schema.is(
+  Schema.Struct({ properties: Schema.Record(Schema.String, Schema.Unknown) }),
+);
+const choice = Schema.Struct({
+  const: TrimmedNonEmptyString,
+  title: TrimmedNonEmptyString,
+  description: Schema.optional(Schema.String),
+});
+const isQuestion = Schema.is(
+  Schema.Struct({
+    title: TrimmedNonEmptyString,
+    description: Schema.optional(Schema.String),
+    type: Schema.Literal("string"),
+    oneOf: Schema.Array(choice),
+  }),
+);
+const isCompanion = Schema.is(
+  Schema.Struct({ type: Schema.Literal("string"), title: Schema.Literal("Other (type your own)") }),
+);
+
+/** OMP askDialog pairs qN choices with qN__other and puts the question in title. */
+export const extractOmpElicitationForm: NonNullable<
+  AcpAdapterV2Flavor["extractElicitationForm"]
+> = (request) => {
+  if (request.mode !== "form" || !isForm(request.requestedSchema)) return undefined;
+  const { properties } = request.requestedSchema;
+  const questions: OrchestrationV2UserInputQuestion[] = [];
+  for (const [id, field] of Object.entries(properties)) {
+    if (!/^q\d+$/.test(id)) continue;
+    if (!isQuestion(field) || !isCompanion(properties[`${id}__other`])) return undefined;
+    const choices = field.oneOf;
+    if (choices.length === 0) return undefined;
+    questions.push({
+      id,
+      header: field.description?.trim() || `Question ${questions.length + 1}`,
+      question: field.title,
+      options: choices.map((option) => ({
+        label: option.title,
+        value: option.const,
+        description: option.description?.trim() || option.title,
+      })),
+    });
+  }
+  // Do not hide unknown fields or partially reinterpret a different form.
+  if (questions.length === 0 || Object.keys(properties).length !== questions.length * 2)
+    return undefined;
+  return {
+    questions,
+    respond: (answers) => {
+      const content: Record<string, string> = {};
+      for (const question of questions) {
+        const answer = Object.hasOwn(answers, question.id) ? answers[question.id] : undefined;
+        if (typeof answer !== "string" || !answer.trim()) return { action: "cancel" };
+        if (question.options.some((option) => option.value === answer))
+          content[question.id] = answer;
+        else content[`${question.id}__other`] = answer;
+      }
+      return { action: "accept", content };
+    },
+  };
+};
diff --git a/packages/provider-acp-registry/src/server/opencodeAcp.test.ts b/packages/provider-acp-registry/src/server/opencodeAcp.test.ts
new file mode 100644
index 000000000000..c278ea57e840
--- /dev/null
+++ b/packages/provider-acp-registry/src/server/opencodeAcp.test.ts
@@ -0,0 +1,143 @@
+import type { AcpAdapterV2Flavor } from "@t3tools/provider-acp/server/adapter";
+import { describe, expect, it } from "vite-plus/test";
+
+import { extractOpenCodeElicitationForm } from "./opencodeAcp.ts";
+
+type ElicitationRequest = Parameters<NonNullable<AcpAdapterV2Flavor["extractElicitationForm"]>>[0];
+
+const request = (properties: Record<string, unknown>): ElicitationRequest =>
+  ({
+    mode: "form",
+    sessionId: "session-id",
+    message: "Questions",
+    requestedSchema: { type: "object", properties },
+  }) as ElicitationRequest;
+
+const colorQuestion = {
+  type: "string",
+  title: "Color preference",
+  description: "Which color do you prefer?",
+  oneOf: [
+    { const: "red", title: "Red", description: "Choose the color red" },
+    { const: "blue", title: "Blue" },
+  ],
+  default: "red",
+};
+const colorCompanion = {
+  type: "string",
+  title: "Color preference (other)",
+  description: "Type your own answer",
+  minLength: 1,
+};
+const multiColorQuestion = {
+  type: "array",
+  title: "Colors",
+  description: "Which colors?",
+  items: {
+    anyOf: [
+      { const: "red", title: "Red" },
+      { const: "blue", title: "Blue" },
+    ],
+  },
+};
+const multiColorCompanion = { type: "string", description: "Add your own answer" };
+const attachment = '\n\nAttached image "shot.png": "/tmp/shot.png"';
+
+describe("OpenCode ACP question form", () => {
+  it("folds the custom-answer companion into its question", () => {
+    const form = extractOpenCodeElicitationForm(
+      request({
+        q0: colorQuestion,
+        q0_custom: colorCompanion,
+        q1: { type: "string", title: "Notes", description: "Anything else?" },
+      }),
+    );
+
+    expect(form?.questions).toEqual([
+      {
+        id: "q0",
+        header: "Color preference",
+        question: "Which color do you prefer?",
+        options: [
+          { label: "Red", description: "Choose the color red", value: "red" },
+          { label: "Blue", description: "Blue", value: "blue" },
+        ],
+        allowCustomAnswer: true,
+      },
+      {
+        id: "q1",
+        header: "Notes",
+        question: "Anything else?",
+        options: [],
+        allowCustomAnswer: true,
+      },
+    ]);
+    expect(form?.respond({ q0: "blue", q1: "Later" })).toEqual({
+      action: "accept",
+      content: { q0: "blue", q1: "Later" },
+    });
+  });
+
+  it("prefers an option value over an earlier option label", () => {
+    const form = extractOpenCodeElicitationForm(
+      request({
+        q0: {
+          ...colorQuestion,
+          oneOf: [
+            { const: "a", title: "b" },
+            { const: "b", title: "B" },
+          ],
+        },
+        q0_custom: colorCompanion,
+      }),
+    );
+
+    expect(form?.respond({ q0: "b" })).toEqual({ action: "accept", content: { q0: "b" } });
+  });
+
+  it("sends a free-form answer to the companion field", () => {
+    const form = extractOpenCodeElicitationForm(
+      request({ q0: colorQuestion, q0_custom: colorCompanion }),
+    );
+
+    expect(form?.respond({ q0: "green" })).toEqual({
+      action: "accept",
+      content: { q0_custom: "green" },
+    });
+  });
+
+  it("keeps attachment text with the selected option", () => {
+    const form = extractOpenCodeElicitationForm(
+      request({ q0: colorQuestion, q0_custom: colorCompanion }),
+    );
+
+    expect(form?.respond({ q0: `blue${attachment}` })).toEqual({
+      action: "accept",
+      content: { q0: "blue", q0_custom: `Blue${attachment}` },
+    });
+  });
+
+  it("cancels empty or multi-value answers to a single-select question", () => {
+    const form = extractOpenCodeElicitationForm(
+      request({ q0: colorQuestion, q0_custom: colorCompanion }),
+    );
+
+    expect(form?.respond({})).toEqual({ action: "cancel" });
+    expect(form?.respond({ q0: "  " })).toEqual({ action: "cancel" });
+    expect(form?.respond({ q0: ["red", "blue"] })).toEqual({ action: "cancel" });
+  });
+
+  it.each([
+    ["a text-only form", { q0: { type: "string", title: "Name", description: "Who?" } }],
+    ["an unrelated field", { q0: colorQuestion, q0_custom: colorCompanion, extra: {} }],
+    ["a multi-select choice", { q0: multiColorQuestion, q0_custom: multiColorCompanion }],
+    ["an orphan companion", { q0_custom: colorCompanion }],
+    ["an enum choice", { q0: colorQuestion, q1: { type: "string", title: "Size", enum: ["S"] } }],
+    [
+      "a choice without a title",
+      { q0: colorQuestion, q1: { ...colorQuestion, oneOf: [{ const: "red" }] } },
+    ],
+  ])("leaves %s to the generic mapping", (_, properties) => {
+    expect(extractOpenCodeElicitationForm(request(properties))).toBeUndefined();
+  });
+});
diff --git a/packages/provider-acp-registry/src/server/opencodeAcp.ts b/packages/provider-acp-registry/src/server/opencodeAcp.ts
new file mode 100644
index 000000000000..3932a2224e6b
--- /dev/null
+++ b/packages/provider-acp-registry/src/server/opencodeAcp.ts
@@ -0,0 +1,135 @@
+import { type OrchestrationV2UserInputQuestion, TrimmedNonEmptyString } from "@t3tools/contracts";
+import type { AcpAdapterV2Flavor } from "@t3tools/provider-acp/server/adapter";
+import * as Predicate from "effect/Predicate";
+import * as Schema from "effect/Schema";
+
+const isForm = Schema.is(
+  Schema.Struct({ properties: Schema.Record(Schema.String, Schema.Unknown) }),
+);
+const choice = Schema.Struct({
+  const: Schema.String,
+  title: TrimmedNonEmptyString,
+  description: Schema.optional(Schema.String),
+});
+const isChoiceQuestion = Schema.is(
+  Schema.Struct({
+    type: Schema.Literal("string"),
+    title: TrimmedNonEmptyString,
+    description: Schema.optional(Schema.String),
+    oneOf: Schema.Array(choice),
+  }),
+);
+const isTextQuestion = Schema.is(
+  Schema.Struct({
+    type: Schema.Literal("string"),
+    title: TrimmedNonEmptyString,
+    description: Schema.optional(Schema.String),
+  }),
+);
+// The companion only carries a free-form answer, never a title we can show.
+const isCustomCompanion = Schema.is(
+  Schema.Struct({
+    type: Schema.Literal("string"),
+    description: Schema.Literals(["Type your own answer", "Add your own answer"]),
+  }),
+);
+
+const questionId = /^q\d+$/;
+const companionSuffix = "_custom";
+
+// Intake appends file references to a user's answer; keep them with the custom text.
+const splitAttachments = (value: string) => {
+  const marker = value.indexOf("\n\n");
+  if (marker < 0) return undefined;
+  const suffix = value.slice(marker);
+  if (!/^\n\nAttached (?:image|file) "(?:\\.|[^"\\\r\n])*": "/.test(suffix)) return undefined;
+  return { prefix: value.slice(0, marker), suffix };
+};
+
+type Option = OrchestrationV2UserInputQuestion["options"][number];
+
+const findChoice = (options: ReadonlyArray<Option>, value: string) =>
+  options.find((option) => option.value === value);
+
+// OpenCode 2.1 asks through ACP with a `qN` choice field plus a `qN_custom` companion.
+// Multi-select forms stay with the generic mapping: it keeps the companion as its own
+// question, and clients cannot yet send selected choices and custom text as one answer.
+export const extractOpenCodeElicitationForm: NonNullable<
+  AcpAdapterV2Flavor["extractElicitationForm"]
+> = (request) => {
+  if (request.mode !== "form" || !isForm(request.requestedSchema)) return undefined;
+  const { properties } = request.requestedSchema;
+  const questions: Array<OrchestrationV2UserInputQuestion> = [];
+  const withCompanion = new Set<string>();
+  let choices = 0;
+  for (const [id, field] of Object.entries(properties)) {
+    if (!questionId.test(id)) {
+      const owner = id.endsWith(companionSuffix) ? id.slice(0, -companionSuffix.length) : undefined;
+      if (owner === undefined || !questionId.test(owner) || !Object.hasOwn(properties, owner)) {
+        return undefined;
+      }
+      continue;
+    }
+    const companion = properties[`${id}${companionSuffix}`];
+    const hasCompanion = companion !== undefined;
+    if (hasCompanion && !isCustomCompanion(companion)) return undefined;
+    if (!isTextQuestion(field)) return undefined;
+    const fieldChoices = isChoiceQuestion(field) ? field.oneOf : undefined;
+    // Unsupported choice schemas belong to the generic mapping.
+    if (
+      fieldChoices === undefined &&
+      ("enum" in field || "oneOf" in field || "anyOf" in field || "items" in field)
+    ) {
+      return undefined;
+    }
+    const options = (fieldChoices ?? []).map((option) => ({
+      label: option.title,
+      description: option.description?.trim() || option.title,
+      value: option.const,
+    }));
+    if (options.length > 0) choices += 1;
+    if (hasCompanion) withCompanion.add(id);
+    questions.push({
+      id,
+      header: field.title,
+      question: field.description?.trim() || field.title,
+      options,
+      allowCustomAnswer: hasCompanion || options.length === 0,
+    });
+  }
+  // Recognize only question forms with a choice; leave every other schema to the ACP fallback.
+  if (choices === 0) return undefined;
+  return {
+    questions,
+    respond: (answers) => {
+      const content: Record<string, string> = {};
+      for (const question of questions) {
+        const answer = Object.hasOwn(answers, question.id) ? answers[question.id] : undefined;
+        if (!Predicate.isString(answer)) return { action: "cancel" };
+        const companionId = `${question.id}${companionSuffix}`;
+        const exact = findChoice(question.options, answer);
+        if (exact !== undefined) {
+          content[question.id] = answer;
+          continue;
+        }
+        if (answer.trim().length === 0) return { action: "cancel" };
+        const split = splitAttachments(answer);
+        const attached =
+          split === undefined ? undefined : findChoice(question.options, split.prefix);
+        if (withCompanion.has(question.id)) {
+          if (attached !== undefined && split !== undefined) {
+            content[question.id] = split.prefix;
+            content[companionId] = `${attached.label}${split.suffix}`;
+          } else {
+            content[companionId] = answer;
+          }
+        } else if (question.options.length === 0) {
+          content[question.id] = answer;
+        } else {
+          return { action: "cancel" };
+        }
+      }
+      return { action: "accept", content };
+    },
+  };
+};
diff --git a/packages/provider-acp-registry/src/server/probe.ts b/packages/provider-acp-registry/src/server/probe.ts
index e0b3a5a198de..2fcf80cbce4d 100644
--- a/packages/provider-acp-registry/src/server/probe.ts
+++ b/packages/provider-acp-registry/src/server/probe.ts
@@ -1,3 +1,4 @@
+import { resolveProviderProbeTimeoutMs } from "@t3tools/provider-core/server/snapshotProbe";
 import {
   AcpRegistryListProvidersResult,
   AcpRegistryOperationError,
@@ -42,8 +43,7 @@ const MAX_ID_LENGTH = 128;
 const MAX_NAME_LENGTH = 160;
 const MAX_DESCRIPTION_LENGTH = 1_024;
 const MAX_COMMAND_LINE_LENGTH = 2_048;
-const PROBE_TIMEOUT_SECONDS = 60;
-const PROBE_TIMEOUT = `${PROBE_TIMEOUT_SECONDS} seconds`;
+const PROBE_TIMEOUT_MS = 60_000;
 const COMMAND_ADVERTISEMENT_GRACE = "500 millis";
 const PROBE_SESSION_DELETE_TIMEOUT = "5 seconds";
 
@@ -168,6 +168,7 @@ export interface AcpRegistryLiveConfiguration {
   readonly models: ReadonlyArray<AcpRegistryProbeModel>;
   readonly currentModelId: string | null;
   readonly configOptions: AcpRegistryProbeResult["configOptions"];
+  readonly modelOptionIds?: NonNullable<AcpRegistryProbeResult["modelOptionIds"]>;
 }
 
 export function normalizeAcpRegistryLiveConfiguration(
@@ -195,12 +196,21 @@ export function normalizeAcpRegistryLiveConfiguration(
       ? null
       : (boundedOpaqueValue(currentModelId, MAX_ID_LENGTH) ?? null);
   const models = normalizeModels(candidates, boundedCurrentModelId);
+  const descriptors = acpProviderOptionDescriptors({ configOptions, modeState });
+  const modelOptionIds = new Set(
+    configOptions
+      .filter((option) => option.category === "thought_level" || option.category === "model_config")
+      .map((option) => option.id),
+  );
   return {
     models,
     currentModelId: models.some((model) => model.id === boundedCurrentModelId)
       ? boundedCurrentModelId
       : null,
-    configOptions: acpProviderOptionDescriptors({ configOptions, modeState }),
+    configOptions: descriptors,
+    modelOptionIds: descriptors
+      .filter((descriptor) => modelOptionIds.has(descriptor.id))
+      .map((descriptor) => descriptor.id),
   };
 }
 
@@ -322,6 +332,11 @@ export const probeAcpRegistryConfiguration = Effect.fn("AcpRegistryProbe.probeCo
     | SecureRandom.SecureRandom
   > {
     const catalog = yield* AcpRegistrySupport.AcpRegistryCatalog;
+    const probeTimeoutMs = resolveProviderProbeTimeoutMs(
+      "acp_registry",
+      PROBE_TIMEOUT_MS,
+      input.environment,
+    );
     const childProcessSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
     const random = yield* SecureRandom.SecureRandom;
     const pty = yield* Effect.serviceOption(PtyAdapter.PtyAdapter);
@@ -434,12 +449,12 @@ export const probeAcpRegistryConfiguration = Effect.fn("AcpRegistryProbe.probeCo
     }).pipe(
       Effect.scoped,
       Effect.timeoutOrElse({
-        duration: PROBE_TIMEOUT,
+        duration: probeTimeoutMs,
         orElse: () =>
           Effect.fail(
             new AcpRegistryOperationError({
               reason: "probe_failed",
-              message: `The ACP agent did not resolve and create a test session within ${PROBE_TIMEOUT_SECONDS} seconds. Package installation or agent startup may be slow; this check retries on the next provider refresh.`,
+              message: `The ACP agent did not resolve and create a test session within ${probeTimeoutMs / 1_000} seconds. Package installation or agent startup may be slow; this check retries on the next provider refresh.`,
             }),
           ),
       }),
diff --git a/packages/provider-acp/src/server/AcpSessionRuntime.ts b/packages/provider-acp/src/server/AcpSessionRuntime.ts
index 9131e1eaf297..b216d6cc88b4 100644
--- a/packages/provider-acp/src/server/AcpSessionRuntime.ts
+++ b/packages/provider-acp/src/server/AcpSessionRuntime.ts
@@ -1163,10 +1163,16 @@ export class AcpSessionRuntime extends Context.Service<
       providerId: string,
     ) => Effect.Effect<EffectAcpSchema.DisableProviderResponse, EffectAcpErrors.AcpError>;
     readonly logout: Effect.Effect<EffectAcpSchema.LogoutResponse, EffectAcpErrors.AcpError>;
-    /** options.dispatched settles when cancel can target this prompt. */
+    /**
+     * options.dispatched settles when cancel can target this prompt. options.released lets the
+     * next prompt go out while this one's response is still held; it still resolves this call.
+     */
     readonly prompt: (
       payload: Omit<EffectAcpSchema.PromptRequest, "sessionId">,
-      options?: { readonly dispatched?: Deferred.Deferred<void> },
+      options?: {
+        readonly dispatched?: Deferred.Deferred<void>;
+        readonly released?: Deferred.Deferred<void>;
+      },
     ) => Effect.Effect<EffectAcpSchema.PromptResponse, EffectAcpErrors.AcpError>;
     readonly cancel: Effect.Effect<void, EffectAcpErrors.AcpError>;
     readonly terminateProcessGroup?: Effect.Effect<void, AcpProcessGroupTerminationError>;
@@ -1798,8 +1804,9 @@ export const make = Effect.fn("AcpSessionRuntime.make")(function* (
       ...options.clientCapabilities?.fs,
     },
     terminal: options.clientCapabilities?.terminal ?? false,
-    // ACP v1 agents send session notices only to clients that advertise them; v2 needs no capability.
-    session: { ...options.clientCapabilities?.session, notices: {} },
+    // ACP v1 agents send session notices and compaction updates only to clients that advertise
+    // them; v2 needs no capability.
+    session: { ...options.clientCapabilities?.session, notices: {}, compaction: {} },
     ...(options.clientCapabilities?.auth ? { auth: options.clientCapabilities.auth } : {}),
     ...(options.clientCapabilities?.elicitation
       ? { elicitation: options.clientCapabilities.elicitation }
@@ -2375,6 +2382,17 @@ export const make = Effect.fn("AcpSessionRuntime.make")(function* (
     yield* child.kill({ forceKillAfter: "1 second" }).pipe(Effect.ignore);
   });
 
+  const joinPrompt = (
+    fiber: Fiber.Fiber<EffectAcpSchema.PromptResponse, EffectAcpErrors.AcpError>,
+  ) =>
+    Fiber.join(fiber).pipe(
+      Effect.catchCauseIf(
+        (cause) => options.cancelBehavior !== "wait-for-prompt" && Cause.hasInterruptsOnly(cause),
+        (_cause) =>
+          Effect.succeed({ stopReason: "cancelled" } satisfies EffectAcpSchema.PromptResponse),
+      ),
+    );
+
   const cancel = Effect.gen(function* () {
     const started = yield* getStartedState;
     const activePrompt = yield* Ref.get(activePromptRef);
@@ -2615,66 +2633,81 @@ export const make = Effect.fn("AcpSessionRuntime.make")(function* (
       Effect.andThen(runLoggedRequest("logout", {}, acp.agent.logout({}))),
     ),
     prompt: (payload, promptOptions?) =>
-      promptSerializationSemaphore.withPermit(
-        Effect.acquireUseRelease(
-          promptDispatchSemaphore.withPermit(
-            Effect.gen(function* () {
-              const started = yield* getStartedState;
-              yield* closeActiveAssistantSegment({ queue: eventQueue, assistantSegmentRef });
-              yield* Ref.set(assistantUpdatesOpenRef, true);
-              const requestPayload = {
-                sessionId: started.sessionId,
-                ...payload,
-              } satisfies EffectAcpSchema.PromptRequest;
-              const completed = yield* Deferred.make<void>();
-              const fiber = yield* runLoggedRequest(
-                "session/prompt",
-                requestPayload,
-                acp.agent.prompt(requestPayload),
-              ).pipe(Effect.forkIn(runtimeScope));
-              const active = { fiber, completed } satisfies AcpActivePrompt;
-              yield* Ref.set(activePromptRef, Option.some(active));
-              if (promptOptions?.dispatched) {
-                yield* Deferred.succeed(promptOptions.dispatched, undefined);
-              }
-              return active;
-            }).pipe(notificationSemaphore.withPermit),
-          ),
-          (activePrompt) =>
-            Fiber.join(activePrompt.fiber).pipe(
-              Effect.catchCauseIf(
-                (cause) =>
-                  options.cancelBehavior !== "wait-for-prompt" && Cause.hasInterruptsOnly(cause),
-                (_cause) =>
-                  Effect.succeed({
-                    stopReason: "cancelled",
-                  } satisfies EffectAcpSchema.PromptResponse),
-              ),
-              Effect.tap(() =>
-                closeActiveAssistantSegment({ queue: eventQueue, assistantSegmentRef }),
-              ),
+      promptSerializationSemaphore
+        .withPermit(
+          Effect.acquireUseRelease(
+            promptDispatchSemaphore.withPermit(
+              Effect.gen(function* () {
+                const started = yield* getStartedState;
+                yield* closeActiveAssistantSegment({ queue: eventQueue, assistantSegmentRef });
+                yield* Ref.set(assistantUpdatesOpenRef, true);
+                const requestPayload = {
+                  sessionId: started.sessionId,
+                  ...payload,
+                } satisfies EffectAcpSchema.PromptRequest;
+                const completed = yield* Deferred.make<void>();
+                const fiber = yield* runLoggedRequest(
+                  "session/prompt",
+                  requestPayload,
+                  acp.agent.prompt(requestPayload),
+                ).pipe(Effect.forkIn(runtimeScope));
+                const active = { fiber, completed } satisfies AcpActivePrompt;
+                yield* Ref.set(activePromptRef, Option.some(active));
+                if (promptOptions?.dispatched) {
+                  yield* Deferred.succeed(promptOptions.dispatched, undefined);
+                }
+                return active;
+              }).pipe(notificationSemaphore.withPermit),
             ),
-          (activePrompt, result) =>
-            Effect.gen(function* () {
-              if (
-                options.cancelBehavior === "wait-for-prompt" &&
-                Exit.isFailure(result) &&
-                Cause.hasInterrupts(result.cause)
-              ) {
-                yield* retireRuntime(
-                  new EffectAcpErrors.AcpTransportError({
-                    method: "session/prompt",
-                    detail: "The ACP prompt stopped before the agent confirmed completion.",
-                    cause: undefined,
-                  }),
-                );
-              }
-              yield* Fiber.interrupt(activePrompt.fiber).pipe(Effect.ignore);
-              yield* Ref.set(activePromptRef, Option.none());
-              yield* Deferred.succeed(activePrompt.completed, undefined);
-            }),
+            (activePrompt) => {
+              const settled = joinPrompt(activePrompt.fiber).pipe(
+                Effect.tap(() =>
+                  closeActiveAssistantSegment({ queue: eventQueue, assistantSegmentRef }),
+                ),
+                Effect.map((response) => ({ _tag: "Settled" as const, response })),
+              );
+              return promptOptions?.released === undefined
+                ? settled
+                : Effect.raceFirst(
+                    settled,
+                    Deferred.await(promptOptions.released).pipe(
+                      Effect.as({ _tag: "Released" as const, fiber: activePrompt.fiber }),
+                    ),
+                  );
+            },
+            (activePrompt, result) =>
+              Effect.gen(function* () {
+                if (Exit.isSuccess(result) && result.value._tag === "Released") {
+                  yield* Ref.set(activePromptRef, Option.none());
+                  yield* Deferred.succeed(activePrompt.completed, undefined);
+                  return;
+                }
+                if (
+                  options.cancelBehavior === "wait-for-prompt" &&
+                  Exit.isFailure(result) &&
+                  Cause.hasInterrupts(result.cause)
+                ) {
+                  yield* retireRuntime(
+                    new EffectAcpErrors.AcpTransportError({
+                      method: "session/prompt",
+                      detail: "The ACP prompt stopped before the agent confirmed completion.",
+                      cause: undefined,
+                    }),
+                  );
+                }
+                yield* Fiber.interrupt(activePrompt.fiber).pipe(Effect.ignore);
+                yield* Ref.set(activePromptRef, Option.none());
+                yield* Deferred.succeed(activePrompt.completed, undefined);
+              }),
+          ),
+        )
+        .pipe(
+          Effect.flatMap((outcome) =>
+            outcome._tag === "Settled"
+              ? Effect.succeed(outcome.response)
+              : joinPrompt(outcome.fiber),
+          ),
         ),
-      ),
     cancel:
       options.cancelBehavior === "wait-for-prompt"
         ? promptDispatchSemaphore.withPermit(cancel)
diff --git a/packages/provider-acp/src/server/adapter.ts b/packages/provider-acp/src/server/adapter.ts
index 8278dcc35fdf..24cde9fd967b 100644
--- a/packages/provider-acp/src/server/adapter.ts
+++ b/packages/provider-acp/src/server/adapter.ts
@@ -143,6 +143,36 @@ export const ACP_PROTOCOL = "acp.ndjson-jsonrpc" as const;
 
 // Grok summaries can trail hydrated tools by over two seconds; shorter waits split the wake.
 const ACP_DEFERRED_FINALIZE_DEBOUNCE: Duration.Input = "3000 millis";
+const ACP_BUSY_PROMPT_RETRY_INTERVAL: Duration.Input = "1 second";
+
+// pi-agent-core agents (oh-my-pi) end a turn while background work runs and reject
+// prompts until it finishes; the prompt is resent rather than failing the turn.
+function isAgentBusyPromptError(error: EffectAcpErrors.AcpError): boolean {
+  return (
+    error._tag === "AcpRequestError" && error.errorMessage.startsWith("Agent is already processing")
+  );
+}
+
+function sendPromptWhenIdle<A>(
+  turn: { readonly interrupted: boolean; readonly finalized: boolean },
+  prompt: () => Effect.Effect<A, EffectAcpErrors.AcpError>,
+): Effect.Effect<A, EffectAcpErrors.AcpError> {
+  // A Stop can land during the wait, so the flags are rechecked before each resend.
+  const stopped = () => turn.interrupted || turn.finalized;
+  return prompt().pipe(
+    Effect.catchIf(
+      (error) => isAgentBusyPromptError(error) && !stopped(),
+      (error) =>
+        Effect.sleep(ACP_BUSY_PROMPT_RETRY_INTERVAL).pipe(
+          Effect.andThen(
+            Effect.suspend(() =>
+              stopped() ? Effect.fail(error) : sendPromptWhenIdle(turn, prompt),
+            ),
+          ),
+        ),
+    ),
+  );
+}
 
 /**
  * Emit first chunks and segment-close events immediately; coalesce later chunks into full-text snapshots.
@@ -219,6 +249,16 @@ export interface AcpAdapterV2ExtensionContext {
     readonly output?: string;
     readonly report?: BackgroundWork;
   }) => Effect.Effect<void>;
+  /** For compactions reported outside ACP `compaction_update`. */
+  readonly markSessionCompacted: (sessionId: string) => Effect.Effect<void>;
+  /**
+   * For agents that hold `session/prompt` past their foreground work on ACP v1. An idle settles
+   * the run only after a `running` report during it, so an earlier prompt's idle cannot.
+   */
+  readonly reportForegroundWork: (notice: {
+    readonly sessionId: string;
+    readonly state: "running" | "idle";
+  }) => Effect.Effect<void>;
   readonly requestUserInput: (
     input: AcpAdapterV2UserInputRequest,
     requestContext: EffectAcpProtocol.AcpRequestContext,
@@ -296,7 +336,7 @@ export function acpPerTurnPromptUsage(
 }
 
 export interface AcpAdapterV2Flavor {
-  readonly buildPrompt?: (input: {
+  readonly buildAttachmentPrompt?: (input: {
     readonly text: string;
     readonly attachments: ReadonlyArray<ChatAttachment>;
     readonly resolveAttachmentPath: (attachment: ChatAttachment) => string | null;
@@ -329,6 +369,7 @@ export interface AcpAdapterV2Flavor {
   ) => Effect.Effect<string, never, ChildProcessSpawner.ChildProcessSpawner>;
   readonly driver: ProviderDriverKind;
   readonly capabilities: OrchestrationV2ProviderCapabilities;
+  readonly supportsNativeGoals?: Effect.Effect<boolean>;
   readonly clientCapabilitiesMeta?: NonNullable<
     EffectAcpSchema.InitializeRequest["clientCapabilities"]
   >["_meta"];
@@ -447,6 +488,8 @@ export interface AcpAdapterV2Flavor {
   ) => Effect.Effect<void>;
   readonly subagentsIdleOnTurnCompletion?: boolean;
   readonly supportsCompaction?: boolean;
+  /** Sends `/compact` as a prompt, only to sessions whose advertised commands include `compact`. */
+  readonly compactViaAdvertisedCommand?: boolean;
   /**
    * Native steering: `send` queues a message into the running turn and returns the
    * agent's id for it, which `injectedSteerId` reads from the update that delivers it.
@@ -477,11 +520,19 @@ export interface AcpAdapterV2Flavor {
       nativeTurnId: string,
     ) => NonNullable<EffectAcpSchema.ForkSessionRequest["_meta"]>;
   };
-  /** Compacts with the agent's own request, for agents that answer a `/compact` prompt as chat. */
-  readonly compactSession?: (
-    runtime: AcpSessionRuntime.AcpSessionRuntime["Service"],
-    sessionId: string,
-  ) => Effect.Effect<void, EffectAcpErrors.AcpError>;
+  /**
+   * Compacts with the agent's own request, for agents that answer a `/compact` prompt as chat.
+   * Compaction is refused when `supported` rejects the running agent's `initialize` result.
+   */
+  readonly compactSession?: {
+    readonly supported: (
+      initializeResult: AcpSessionRuntime.AcpSessionRuntimeStartResult["initializeResult"],
+    ) => boolean;
+    readonly compact: (
+      runtime: AcpSessionRuntime.AcpSessionRuntime["Service"],
+      sessionId: string,
+    ) => Effect.Effect<void, EffectAcpErrors.AcpError>;
+  };
   readonly runtimeHarness?: string;
   readonly registerExtensions?: (
     context: AcpAdapterV2ExtensionContext,
@@ -643,6 +694,7 @@ export interface AcpAdapterV2Options {
     readonly onCancelHeld?: () => Effect.Effect<void>;
     readonly afterPromptWireSettled?: () => Effect.Effect<void>;
     readonly afterPromptSettledWithBackgroundWork?: () => Effect.Effect<void>;
+    readonly afterPromptCallback?: () => Effect.Effect<void>;
     readonly onNativeResponseLifecycle?: (event: {
       readonly generation?: number;
       readonly requestId?: string;
@@ -793,6 +845,11 @@ function isCompactionMessage(message: ProviderAdapter.ProviderAdapterV2TurnMessa
   return message.text.trim() === "/compact" && message.attachments.length === 0;
 }
 
+/** `/compact`, optionally followed by preservation instructions that some agents accept. */
+function isCompactCommand(message: ProviderAdapter.ProviderAdapterV2TurnMessage): boolean {
+  return /^\/compact(?:\s|$)/.test(message.text.trim()) && message.attachments.length === 0;
+}
+
 function negotiatedCapabilities(
   base: OrchestrationV2ProviderCapabilities,
   started: AcpSessionRuntime.AcpSessionRuntimeStartResult,
@@ -964,6 +1021,25 @@ function makeProviderThread(input: {
   };
 }
 
+function appendToolContentText(content: unknown, text: string): unknown[] {
+  const next: unknown[] = Array.isArray(content) ? [...content] : [];
+  const last = unknownRecord(next.at(-1));
+  const lastContent = unknownRecord(last?.content);
+  if (
+    last?.type === "content" &&
+    lastContent?.type === "text" &&
+    typeof lastContent.text === "string"
+  ) {
+    next[next.length - 1] = {
+      ...last,
+      content: { ...lastContent, text: `${lastContent.text}${text}` },
+    };
+  } else {
+    next.push({ type: "content", content: { type: "text", text } });
+  }
+  return next;
+}
+
 function acpMcpToolCallOutput(rawOutput: unknown): unknown {
   const record = unknownRecord(rawOutput);
   if (record === undefined) return rawOutput;
@@ -1414,6 +1490,8 @@ interface ActiveAcpTurn {
   readonly promptWireSettled: Deferred.Deferred<void, never>;
   /** Completed once `session/prompt` is the runtime's active prompt. */
   readonly promptDispatched: Deferred.Deferred<void, never>;
+  /** Frees the runtime for the next prompt while the agent still holds this one's response. */
+  readonly foregroundIdle: Deferred.Deferred<void>;
   /** Clock millis just before `session/prompt` was handed to the runtime. */
   promptSentAt: number | null;
   /** Completed when an update after dispatch matches `cancelAfterPromptStarts.isStart`. */
@@ -1724,11 +1802,22 @@ export const makeAcpAdapterV2 = Effect.fn("makeAcpAdapterV2")(function* (
   const postSettleContinuationEnabled =
     flavor.enablePostSettleContinuation === true && continuationRequests !== undefined;
 
+  const readCapabilities = Effect.gen(function* () {
+    if (flavor.supportsNativeGoals === undefined) return flavor.capabilities;
+    return {
+      ...flavor.capabilities,
+      turns: {
+        ...flavor.capabilities.turns,
+        supportsNativeGoals: yield* flavor.supportsNativeGoals,
+      },
+    };
+  });
+
   return ProviderAdapter.ProviderAdapterV2.of({
     instanceId: options.instanceId,
     driver,
-    getCapabilities: Effect.fn("AcpAdapter.getCapabilities")(function () {
-      return Effect.succeed(flavor.capabilities);
+    getCapabilities: Effect.fn("AcpAdapter.getCapabilities")(function* () {
+      return yield* readCapabilities;
     }),
     planSelectionTransition: Effect.fn("AcpAdapter.planSelectionTransition")(function (input) {
       return Effect.succeed(acpSelectionTransition(input));
@@ -1961,8 +2050,35 @@ export const makeAcpAdapterV2 = Effect.fn("makeAcpAdapterV2")(function* (
         const activeSelection = yield* Ref.make<ModelSelection | null>(null);
         const activeInteractionMode = yield* Ref.make<ProviderInteractionMode | null>(null);
         const promptInstructionStates = yield* Ref.make(new Map<string, T3AcpInstructionState>());
+        const promptRuntimeInstructions = yield* Ref.make(new Map<string, string>());
         // Unique markers keep delayed prompt completions from clearing later compactions.
         const compactionMarkers = yield* Ref.make(new Map<string, symbol>());
+        // ACP may patch a completed compaction again; each compaction id marks its session once.
+        const completedCompactionIds = yield* Ref.make(new Set<string>());
+        // The next prompt in a compacted session resends T3's instructions and runtime notes.
+        // Only root sessions get prompts, so a marker on a child session is never read.
+        const markSessionCompacted = Effect.fn("AcpAdapterV2.markSessionCompacted")(function* (
+          sessionId: string,
+          compactionId?: string,
+        ) {
+          if (compactionId !== undefined) {
+            const key = `${sessionId}\u0000${compactionId}`;
+            const alreadyMarked = yield* Ref.modify(
+              completedCompactionIds,
+              (current): [boolean, Set<string>] =>
+                current.has(key) ? [true, current] : [false, new Set(current).add(key)],
+            );
+            if (alreadyMarked) return;
+          }
+          yield* Ref.update(compactionMarkers, (current) =>
+            new Map(current).set(sessionId, Symbol()),
+          );
+        });
+        const advertisedCommandNames = yield* Ref.make(new Map<string, ReadonlySet<string>>());
+        const compactsContext =
+          flavor.supportsCompaction === true ||
+          flavor.compactSession !== undefined ||
+          flavor.compactViaAdvertisedCommand === true;
         const runtimeRestartRequired = yield* Ref.make(false);
         const runtimeTeardownState = yield* Ref.make<AcpRuntimeTeardownState>({ _tag: "Idle" });
         const runtimeCallbackGeneration = yield* Ref.make(0);
@@ -2923,7 +3039,7 @@ export const makeAcpAdapterV2 = Effect.fn("makeAcpAdapterV2")(function* (
             if (other !== kind) yield* closeTextStream(context, other);
           }
           const stream = textStreamFor(context, kind);
-          const sourceMessageId = messageId?.trim() || null;
+          const sourceMessageId = messageId || null;
           if (
             stream.current !== null &&
             sourceMessageId !== null &&
@@ -3043,26 +3159,9 @@ export const makeAcpAdapterV2 = Effect.fn("makeAcpAdapterV2")(function* (
             if (toolCall.content.type !== "content") return;
             const text = acpContentBlockDisplayText(toolCall.content.content);
             if (text === undefined || text.length === 0) return;
-            const content: unknown[] = Array.isArray(previous?.data.content)
-              ? [...previous.data.content]
-              : [];
-            const last = unknownRecord(content.at(-1));
-            const lastContent = unknownRecord(last?.content);
-            if (
-              last?.type === "content" &&
-              lastContent?.type === "text" &&
-              typeof lastContent.text === "string"
-            ) {
-              content[content.length - 1] = {
-                ...last,
-                content: { ...lastContent, text: `${lastContent.text}${text}` },
-              };
-            } else {
-              content.push({ type: "content", content: { type: "text", text } });
-            }
             toolCall = {
               toolCallId: toolCall.toolCallId,
-              data: { content },
+              data: { content: appendToolContentText(previous?.data.content, text) },
             };
           }
           const merged = mergeToolCallState(previous, toolCall);
@@ -4139,11 +4238,13 @@ export const makeAcpAdapterV2 = Effect.fn("makeAcpAdapterV2")(function* (
                 updated.delete(context.nativeThreadId);
                 return updated;
               });
-              yield* Ref.update(compactionMarkers, (current) => {
-                const updated = new Map(current);
-                updated.set(context.nativeThreadId, Symbol());
-                return updated;
-              });
+              // A completion projected at turn end must not swallow the agent's later real one.
+              yield* markSessionCompacted(
+                context.nativeThreadId,
+                projectedStatus === undefined
+                  ? toolCall.toolCallId.slice("acp-compaction:".length)
+                  : undefined,
+              );
             }
           } else if (mcpIdentity !== undefined) {
             const toolName = `${mcpIdentity.server}.${mcpIdentity.tool}`;
@@ -4884,10 +4985,10 @@ export const makeAcpAdapterV2 = Effect.fn("makeAcpAdapterV2")(function* (
                 ? ("completed" as const)
                 : ("failed" as const);
           const embeddedToolCallIds = toolCallIdsByAgentTerminalId.get(terminalKey);
-          const projectedToolCallIds =
-            embeddedToolCallIds === undefined || embeddedToolCallIds.size === 0
-              ? [`acp-agent-terminal:${update.terminalId}`]
-              : [...embeddedToolCallIds];
+          const linked = embeddedToolCallIds !== undefined && embeddedToolCallIds.size > 0;
+          const projectedToolCallIds = linked
+            ? [...embeddedToolCallIds]
+            : [`acp-agent-terminal:${update.terminalId}`];
           const output = next.output.slice(-MAX_AGENT_TERMINAL_OUTPUT_CHARS);
           for (const toolCallId of projectedToolCallIds) {
             const existing = context.tools.get(toolCallId);
@@ -4906,7 +5007,8 @@ export const makeAcpAdapterV2 = Effect.fn("makeAcpAdapterV2")(function* (
               setToolOutputText(
                 {
                   ...seeded,
-                  status,
+                  // An agent-reported tool owns its status; terminal state only drives the synthetic one.
+                  status: (linked ? existing?.status : undefined) ?? status,
                   ...(next.command === undefined ? {} : { command: next.command }),
                 },
                 output,
@@ -5493,7 +5595,24 @@ export const makeAcpAdapterV2 = Effect.fn("makeAcpAdapterV2")(function* (
                   status: "inProgress" as const,
                   data: { toolCallId: update.toolCallId },
                 };
-                yield* emitTool(context, appendToolOutputText(previous, text));
+                // Text chunks extend the content list so a later content replacement still shows.
+                yield* emitTool(
+                  context,
+                  update.content.type === "content" && previous.data.rawOutput === undefined
+                    ? {
+                        ...previous,
+                        data: {
+                          ...previous.data,
+                          content: appendToolContentText(previous.data.content, text),
+                        },
+                      }
+                    : previous.data.rawOutput === undefined
+                      ? setToolOutputText(
+                          previous,
+                          `${textFromUnknown(previous.data.content) ?? ""}${text}`,
+                        )
+                      : appendToolOutputText(previous, text),
+                );
               }
               break;
             }
@@ -6355,10 +6474,17 @@ export const makeAcpAdapterV2 = Effect.fn("makeAcpAdapterV2")(function* (
                       clientTerminals.readOutputSnapshot,
                     );
               if (notification.update.sessionUpdate === "available_commands_update") {
-                yield* (
-                  flavor.onAvailableCommandsUpdate?.(notification.update.availableCommands) ??
-                    Effect.void
-                );
+                const sessionId = rawNotification.sessionId;
+                const advertisedCommands = notification.update.availableCommands;
+                yield* Ref.update(advertisedCommandNames, (current) => {
+                  const updated = new Map(current);
+                  updated.set(
+                    sessionId,
+                    new Set(advertisedCommands.map((command) => command.name.trim().toLowerCase())),
+                  );
+                  return updated;
+                });
+                yield* flavor.onAvailableCommandsUpdate?.(advertisedCommands) ?? Effect.void;
               }
               if (
                 notification.update.sessionUpdate === "config_option_update" ||
@@ -6372,9 +6498,15 @@ export const makeAcpAdapterV2 = Effect.fn("makeAcpAdapterV2")(function* (
                   ) ?? Effect.void
                 );
               }
-              yield* handleSessionUpdate(
-                flavor.normalizeSessionUpdate?.(notification) ?? notification,
-              );
+              const normalized = flavor.normalizeSessionUpdate?.(notification) ?? notification;
+              // Turn projection misses compactions that finish while idle or after settlement.
+              if (
+                normalized.update.sessionUpdate === "compaction_update" &&
+                normalized.update.status === "completed"
+              ) {
+                yield* markSessionCompacted(normalized.sessionId, normalized.update.compactionId);
+              }
+              yield* handleSessionUpdate(normalized);
             },
             Effect.mapError(
               (cause) =>
@@ -6840,6 +6972,32 @@ export const makeAcpAdapterV2 = Effect.fn("makeAcpAdapterV2")(function* (
                     yield* finishSubagentFromNotice(notice);
                   }),
                 ).pipe(Effect.asVoid),
+              markSessionCompacted: (sessionId) =>
+                runRuntimeCallbackAtGeneration(
+                  handlerGeneration,
+                  markSessionCompacted(sessionId),
+                ).pipe(Effect.asVoid),
+              reportForegroundWork: (notice) =>
+                runRuntimeCallbackAtGeneration(
+                  handlerGeneration,
+                  Effect.gen(function* () {
+                    if (yield* Ref.get(stoppedRunQuarantine)) return;
+                    const context = yield* Ref.get(activeTurn);
+                    if (
+                      context === null ||
+                      context.finalized ||
+                      context.interrupted ||
+                      context.nativeThreadId !== notice.sessionId
+                    )
+                      return;
+                    if (notice.state === "running") {
+                      context.workAccepted = true;
+                    } else if (context.workAccepted) {
+                      yield* Deferred.succeed(context.foregroundIdle, undefined);
+                      yield* finalizeTurn(context, "completed");
+                    }
+                  }),
+                ).pipe(Effect.asVoid),
               applyBackgroundTaskMutation: (incoming) =>
                 runRuntimeCallbackAtGeneration(
                   handlerGeneration,
@@ -7137,7 +7295,9 @@ export const makeAcpAdapterV2 = Effect.fn("makeAcpAdapterV2")(function* (
             yield* Ref.set(activeSelection, null);
             yield* Ref.set(activeInteractionMode, null);
             yield* Ref.set(promptInstructionStates, new Map());
+            yield* Ref.set(promptRuntimeInstructions, new Map());
             yield* Ref.set(compactionMarkers, new Map());
+            yield* Ref.set(completedCompactionIds, new Set());
             yield* Ref.set(providerTurns, new Map());
             yield* Ref.set(snapshot, emptySnapshotState());
             yield* continuationPermit.withPermit(
@@ -7187,8 +7347,9 @@ export const makeAcpAdapterV2 = Effect.fn("makeAcpAdapterV2")(function* (
         yield* Ref.set(activeSessionId, started.sessionId);
         yield* setActiveSessionSetup(started);
         rememberTerminalEnvironment(started.sessionId, yield* readMcpContext(input.threadId));
+        yield* runtime.drainEvents;
         const capabilities = negotiatedCapabilities(
-          flavor.capabilities,
+          yield* readCapabilities,
           started,
           flavor.modelOptionArrivesLate === true,
           flavor.forkFromTurn?.supported(started.initializeResult) === true,
@@ -7692,18 +7853,27 @@ export const makeAcpAdapterV2 = Effect.fn("makeAcpAdapterV2")(function* (
           if (settledStatus !== "failed") {
             yield* emitProviderRetry(context, settledStatus);
           }
+          if (
+            compactsContext &&
+            isCompactCommand(context.input.message) &&
+            settledStatus === "completed"
+          ) {
+            yield* markSessionCompacted(context.nativeThreadId);
+          }
           const now = yield* DateTime.now;
           if (
-            (flavor.supportsCompaction === true || flavor.compactSession !== undefined) &&
+            compactsContext &&
             isCompactionMessage(context.input.message) &&
-            settledStatus === "completed"
+            settledStatus === "completed" &&
+            !context.tools.keys().some((id) => id.startsWith("acp-compaction:"))
           ) {
-            const nativeItemId = `${context.nativeTurnId}:compaction`;
-            yield* Ref.update(compactionMarkers, (current) => {
+            context.contextUsage = null;
+            yield* Ref.update(contextUsageBySessionId, (current) => {
               const updated = new Map(current);
-              updated.set(context.nativeThreadId, Symbol());
+              updated.delete(context.nativeThreadId);
               return updated;
             });
+            const nativeItemId = `${context.nativeTurnId}:compaction`;
             yield* emitProviderEvent({
               type: "turn_item.updated",
               driver,
@@ -7956,15 +8126,12 @@ export const makeAcpAdapterV2 = Effect.fn("makeAcpAdapterV2")(function* (
           turnInput: ProviderAdapter.ProviderAdapterV2TurnInput,
           sessionId: string,
         ) {
-          const prompt: Array<EffectAcpSchema.ContentBlock> = [];
           const mcpSession = yield* mcpSessions.read(turnInput.threadId);
           const instructionState = {
             interactionMode: turnInput.runtimePolicy.interactionMode,
             hasT3Mcp: mcpSession !== undefined,
             hasDeviceTools: mcpSession?.capabilities?.has("device") === true,
           } satisfies T3AcpInstructionState;
-          const previousInstructionState = (yield* Ref.get(promptInstructionStates)).get(sessionId);
-          const compactionMarker = (yield* Ref.get(compactionMarkers)).get(sessionId);
           const userText =
             flavor.rewriteUserText === undefined
               ? turnInput.message.text
@@ -7983,16 +8150,6 @@ export const makeAcpAdapterV2 = Effect.fn("makeAcpAdapterV2")(function* (
             resolveExtractedTextPath: host.resolveExtractedTextPath,
           });
           const isNativeSlashCommand = userText.trimStart().startsWith("/");
-          const text = t3AcpPromptWithInstructions({
-            prompt: messageText,
-            state: instructionState,
-            ...(previousInstructionState === undefined || compactionMarker !== undefined
-              ? {}
-              : { previousState: previousInstructionState }),
-          });
-          if (text.length > 0) {
-            prompt.push({ type: "text", text });
-          }
           const imageAttachments = turnInput.message.attachments.filter(
             isProviderNativeImageAttachment,
           );
@@ -8002,13 +8159,39 @@ export const makeAcpAdapterV2 = Effect.fn("makeAcpAdapterV2")(function* (
               detail: "ACP driver did not negotiate image prompt support",
             });
           }
-          if (flavor.buildPrompt) {
+          const attachmentBlocks: Array<EffectAcpSchema.ContentBlock> = [];
+          for (const attachment of flavor.buildAttachmentPrompt ? [] : imageAttachments) {
+            const path = host.resolveAttachmentPath(attachment as ChatAttachment);
+            if (path === null) {
+              return yield* new ProviderAdapter.ProviderAdapterProtocolError({
+                driver,
+                detail: `Invalid attachment id '${attachment.id}'`,
+              });
+            }
+            const bytes = yield* fileSystem.readFile(path).pipe(
+              Effect.mapError(
+                (cause) =>
+                  new ProviderAdapter.ProviderAdapterProtocolError({
+                    driver,
+                    detail: `Failed to read attachment '${attachment.id}'`,
+                    reason: "attachment_unreadable",
+                    payload: cause,
+                  }),
+              ),
+            );
+            attachmentBlocks.push({
+              type: "image",
+              data: Buffer.from(bytes).toString("base64"),
+              mimeType: attachment.mimeType,
+            });
+          }
+          if (flavor.buildAttachmentPrompt) {
             const setup = yield* Ref.get(activeSessionSetup);
             const modelOption = findModelConfigOption(yield* runtime.getConfigOptions);
             const currentModelId = modelOption?.currentValue;
             const blocks = yield* flavor
-              .buildPrompt({
-                text,
+              .buildAttachmentPrompt({
+                text: messageText,
                 attachments: turnInput.message.attachments,
                 resolveAttachmentPath: host.resolveAttachmentPath,
                 promptCapabilities: setup?.initializeResult.agentCapabilities?.promptCapabilities,
@@ -8033,55 +8216,49 @@ export const makeAcpAdapterV2 = Effect.fn("makeAcpAdapterV2")(function* (
                     }),
                 ),
               );
-            prompt.splice(0, prompt.length, ...blocks);
-          }
-          for (const attachment of flavor.buildPrompt ? [] : imageAttachments) {
-            const path = host.resolveAttachmentPath(attachment as ChatAttachment);
-            if (path === null) {
-              return yield* new ProviderAdapter.ProviderAdapterProtocolError({
-                driver,
-                detail: `Invalid attachment id '${attachment.id}'`,
-              });
-            }
-            const bytes = yield* fileSystem.readFile(path).pipe(
-              Effect.mapError(
-                (cause) =>
-                  new ProviderAdapter.ProviderAdapterProtocolError({
-                    driver,
-                    detail: `Failed to read attachment '${attachment.id}'`,
-                    reason: "attachment_unreadable",
-                    payload: cause,
-                  }),
-              ),
-            );
-            prompt.push({
-              type: "image",
-              data: Buffer.from(bytes).toString("base64"),
-              mimeType: attachment.mimeType,
-            });
+            attachmentBlocks.push(...blocks);
           }
+          // Read delivery state after the awaits above, so a compaction that lands
+          // while the prompt is prepared still resends the notes in this prompt.
+          const previousInstructionState = (yield* Ref.get(promptInstructionStates)).get(sessionId);
+          const compactionMarker = (yield* Ref.get(compactionMarkers)).get(sessionId);
+          const text = t3AcpPromptWithInstructions({
+            prompt: messageText,
+            state: instructionState,
+            ...(previousInstructionState === undefined || compactionMarker !== undefined
+              ? {}
+              : { previousState: previousInstructionState }),
+          });
+          const sessionSetup = yield* Ref.get(activeSessionSetup);
+          const runtimeInstructions = buildRuntimeInstructions({
+            harness: flavor.runtimeHarness ?? driver,
+            model: turnInput.modelSelection.model,
+            pullRequestLinking:
+              sessionSetup === null ||
+              flavor.sessionCarriesPullRequestLinking?.(sessionSetup.initializeResult) !== true,
+          });
+          // The agent keeps its own history, so resend only after compaction or when the text changes.
+          const sendRuntimeInstructions =
+            !isNativeSlashCommand &&
+            (compactionMarker !== undefined ||
+              (yield* Ref.get(promptRuntimeInstructions)).get(sessionId) !== runtimeInstructions);
+          const promptText = flavor.buildAttachmentPrompt ? text.trim() : text;
+          const prompt: Array<EffectAcpSchema.ContentBlock> =
+            promptText.length > 0 ? [{ type: "text", text: promptText }] : [];
+          prompt.push(...attachmentBlocks);
           if (prompt.length === 0) {
             return yield* new ProviderAdapter.ProviderAdapterProtocolError({
               driver,
               detail: "ACP turn requires non-empty text or attachments",
             });
           }
-          if (!isNativeSlashCommand) {
-            const sessionSetup = yield* Ref.get(activeSessionSetup);
-            prompt.push({
-              type: "text",
-              text: buildRuntimeInstructions({
-                harness: flavor.runtimeHarness ?? driver,
-                model: turnInput.modelSelection.model,
-                pullRequestLinking:
-                  sessionSetup === null ||
-                  flavor.sessionCarriesPullRequestLinking?.(sessionSetup.initializeResult) !== true,
-              }),
-            });
+          if (sendRuntimeInstructions) {
+            prompt.push({ type: "text", text: runtimeInstructions });
           }
           return {
             prompt,
             instructionState: text === messageText ? undefined : instructionState,
+            runtimeInstructions: sendRuntimeInstructions ? runtimeInstructions : undefined,
             compactionMarker,
           };
         });
@@ -8097,6 +8274,11 @@ export const makeAcpAdapterV2 = Effect.fn("makeAcpAdapterV2")(function* (
           yield* Ref.set(activeSessionSetup, null);
           yield* Ref.set(activeSelection, null);
           yield* Ref.set(activeInteractionMode, null);
+          // A failed prompt may have been dropped, so the fresh runtime sends T3's notes again.
+          yield* Ref.set(promptInstructionStates, new Map());
+          yield* Ref.set(promptRuntimeInstructions, new Map());
+          yield* Ref.set(compactionMarkers, new Map());
+          yield* Ref.set(completedCompactionIds, new Set());
           yield* Ref.set(snapshot, emptySnapshotState());
           return true;
         });
@@ -8152,6 +8334,22 @@ export const makeAcpAdapterV2 = Effect.fn("makeAcpAdapterV2")(function* (
                 yield* Ref.set(activeInteractionMode, turnInput.runtimePolicy.interactionMode);
               }
             }
+            // Checked after activation: a loaded session advertises its own commands.
+            const compactionSetup = yield* Ref.get(activeSessionSetup);
+            if (
+              isCompactionMessage(turnInput.message) &&
+              ((flavor.compactViaAdvertisedCommand === true &&
+                (yield* Ref.get(advertisedCommandNames)).get(requestedSessionId)?.has("compact") !==
+                  true) ||
+                (flavor.compactSession !== undefined &&
+                  (compactionSetup === null ||
+                    !flavor.compactSession.supported(compactionSetup.initializeResult))))
+            ) {
+              return yield* new ProviderAdapter.ProviderCompactionUnsupportedError({
+                driver,
+                providerThreadId: turnInput.providerThread.id,
+              });
+            }
             yield* validateModelSelection(turnInput.modelSelection);
             yield* Ref.set(lastTurnRoute, {
               threadId: turnInput.threadId,
@@ -8251,6 +8449,7 @@ export const makeAcpAdapterV2 = Effect.fn("makeAcpAdapterV2")(function* (
               workAccepted: false,
               promptWireSettled,
               promptDispatched,
+              foregroundIdle: yield* Deferred.make<void>(),
               promptSentAt: null,
               promptStarted,
               promptUsage: undefined,
@@ -8397,7 +8596,10 @@ export const makeAcpAdapterV2 = Effect.fn("makeAcpAdapterV2")(function* (
                 ? undefined
                 : yield* flavor.watchPromptOutcome(requestedSessionId);
             const promptGeneration = yield* Ref.get(runtimeCallbackGeneration);
-            const promptOptions = { dispatched: context.promptDispatched };
+            const promptOptions = {
+              dispatched: context.promptDispatched,
+              released: context.foregroundIdle,
+            };
             context.promptSentAt = yield* Clock.currentTimeMillis;
             if (promptInactivityTimeoutMillis !== undefined) {
               context.inactivityWatchdog = yield* watchPromptInactivity(
@@ -8411,36 +8613,14 @@ export const makeAcpAdapterV2 = Effect.fn("makeAcpAdapterV2")(function* (
               : undefined;
             yield* (
               compactSession === undefined
-                ? runtime.prompt({ prompt: promptParts!.prompt }, promptOptions)
+                ? sendPromptWhenIdle(context, () =>
+                    runtime.prompt({ prompt: promptParts!.prompt }, promptOptions),
+                  )
                 : Deferred.succeed(context.promptDispatched, undefined).pipe(
-                    Effect.andThen(compactSession(runtime, requestedSessionId)),
+                    Effect.andThen(compactSession.compact(runtime, requestedSessionId)),
                     Effect.as({ stopReason: "end_turn" } satisfies EffectAcpSchema.PromptResponse),
                   )
             ).pipe(
-              Effect.tap(() =>
-                Ref.update(promptInstructionStates, (current) => {
-                  // Native compaction sends no prompt, so no instructions reached the agent.
-                  if (promptParts?.instructionState === undefined || compactSession !== undefined)
-                    return current;
-                  const updated = new Map(current);
-                  updated.set(requestedSessionId, promptParts.instructionState);
-                  return updated;
-                }),
-              ),
-              Effect.tap(() =>
-                Ref.update(compactionMarkers, (current) => {
-                  if (promptParts?.instructionState === undefined) return current;
-                  const observedMarker = promptParts.compactionMarker;
-                  if (
-                    observedMarker === undefined ||
-                    current.get(requestedSessionId) !== observedMarker
-                  )
-                    return current;
-                  const updated = new Map(current);
-                  updated.delete(requestedSessionId);
-                  return updated;
-                }),
-              ),
               // Settle the wire before the completion callback's permit so a settled-soft
               // Stop sees the native return. Capture usage only before finalize: a late
               // response must not flip a settled turn.
@@ -8460,6 +8640,41 @@ export const makeAcpAdapterV2 = Effect.fn("makeAcpAdapterV2")(function* (
                 runRuntimeCallbackAtGeneration(
                   promptGeneration,
                   Effect.gen(function* () {
+                    // Record delivery only for this runtime: a replacement can reuse the session id.
+                    // Grok cancels locally, refusals discard the prompt, and errors need a retry.
+                    // Native compaction sends no prompt, and the compacted session needs the notes.
+                    if (compactSession !== undefined) {
+                      yield* markSessionCompacted(requestedSessionId);
+                    } else if (
+                      result.stopReason !== "cancelled" &&
+                      result.stopReason !== "refusal" &&
+                      result.stopReason !== "error"
+                    ) {
+                      yield* Ref.update(promptInstructionStates, (current) => {
+                        if (promptParts?.instructionState === undefined) return current;
+                        const updated = new Map(current);
+                        updated.set(requestedSessionId, promptParts.instructionState);
+                        return updated;
+                      });
+                      yield* Ref.update(promptRuntimeInstructions, (current) => {
+                        if (promptParts?.runtimeInstructions === undefined) return current;
+                        const updated = new Map(current);
+                        updated.set(requestedSessionId, promptParts.runtimeInstructions);
+                        return updated;
+                      });
+                      yield* Ref.update(compactionMarkers, (current) => {
+                        if (promptParts?.instructionState === undefined) return current;
+                        const observedMarker = promptParts.compactionMarker;
+                        if (
+                          observedMarker === undefined ||
+                          current.get(requestedSessionId) !== observedMarker
+                        )
+                          return current;
+                        const updated = new Map(current);
+                        updated.delete(requestedSessionId);
+                        return updated;
+                      });
+                    }
                     if (context.finalized || followsAgentWorkState) return;
                     // ACP v2 reports a failed prompt as an idle `error`, not an RPC error.
                     const idleError = result.stopReason === "error" && !context.interrupted;
@@ -8513,7 +8728,10 @@ export const makeAcpAdapterV2 = Effect.fn("makeAcpAdapterV2")(function* (
                     }
                     yield* finalizeTurn(context, status);
                   }),
-                ).pipe(Effect.asVoid),
+                ).pipe(
+                  Effect.andThen(() => options.testHooks?.afterPromptCallback?.() ?? Effect.void),
+                  Effect.asVoid,
+                ),
               ),
               Effect.catchCause((cause) =>
                 runRuntimeCallbackAtGeneration(
@@ -8816,13 +9034,16 @@ export const makeAcpAdapterV2 = Effect.fn("makeAcpAdapterV2")(function* (
               ),
           ),
           startTurn,
-          ...(flavor.supportsCompaction === true || flavor.compactSession !== undefined
+          ...(compactsContext
             ? {
-                compactThread: (turnInput: ProviderAdapter.ProviderAdapterV2TurnInput) =>
-                  startTurn({
+                compactThread: Effect.fn("AcpAdapterV2.compactThread")(function* (
+                  turnInput: ProviderAdapter.ProviderAdapterV2TurnInput,
+                ) {
+                  return yield* startTurn({
                     ...turnInput,
                     message: { ...turnInput.message, text: "/compact" },
-                  }),
+                  });
+                }),
               }
             : {}),
           steerTurn: Effect.fn("AcpAdapterV2.steerTurn")(
diff --git a/packages/provider-acp/src/server/clientTerminals.test.ts b/packages/provider-acp/src/server/clientTerminals.test.ts
index c07de263b417..22f8bb9ce3dd 100644
--- a/packages/provider-acp/src/server/clientTerminals.test.ts
+++ b/packages/provider-acp/src/server/clientTerminals.test.ts
@@ -22,7 +22,7 @@ const withTerminals = <A, E>(use: (terminals: AcpClientTerminals) => Effect.Effe
       defaultCwd: process.cwd(),
     });
     return yield* use(terminals).pipe(Effect.ensuring(terminals.disposeAll));
-  }).pipe(Effect.provide(NodeServices.layer), Effect.scoped);
+  }).pipe(Effect.provide(NodeServices.layer));
 
 describe("AcpClientTerminals", () => {
   it.live("runs a command, buffers output, and reports the exit status", () =>
@@ -94,7 +94,7 @@ describe("AcpClientTerminals", () => {
       expect(terminals.readOutputSnapshot("session", terminal.terminalId)?.output).toBe(
         output.output,
       );
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.live("resolves terminal environment from the requesting ACP session", () =>
@@ -120,7 +120,7 @@ describe("AcpClientTerminals", () => {
         const output = yield* terminals.output({ sessionId, terminalId: created.terminalId });
         expect(output.output).toBe(expected);
       }
-    }).pipe(Effect.provide(NodeServices.layer), Effect.scoped),
+    }).pipe(Effect.provide(NodeServices.layer)),
   );
 
   it.live("runs Devin shell source with arguments, pipes, and session fallback variables", () =>
@@ -139,7 +139,7 @@ describe("AcpClientTerminals", () => {
       const output = yield* terminals.output({ sessionId: "devin", ...terminal });
       expect(exit.exitCode).toBe(0);
       expect(output.output.trim()).toBe("MAILBOX-PROBE");
-    }).pipe(Effect.provide(NodeServices.layer), Effect.scoped),
+    }).pipe(Effect.provide(NodeServices.layer)),
   );
 
   it.live.each([
@@ -237,7 +237,7 @@ describe("AcpClientTerminals", () => {
       const output = yield* terminals.output(request);
       expect(output.output).toBe("done\n");
       expect(output.exitStatus).toEqual({ exitCode: 0, signal: null });
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect.each([
@@ -298,7 +298,7 @@ describe("AcpClientTerminals", () => {
         expect(yield* child.isRunning).toBe(false);
         yield* Fiber.join(killing);
         expect(yield* Fiber.join(waiting)).toEqual({ exitCode: 137, signal: null });
-      }).pipe(Effect.scoped),
+      }),
   );
 
   it.live("force-kills commands that ignore SIGTERM and resolves wait_for_exit", () =>
@@ -352,7 +352,7 @@ describe("AcpClientTerminals", () => {
         expect(exit).toEqual({ exitCode: null, signal: "SIGKILL" });
       }
       expect(yield* child.isRunning).toBe(false);
-    }).pipe(Effect.provide(NodeServices.layer), Effect.scoped),
+    }).pipe(Effect.provide(NodeServices.layer)),
   );
 
   it.live("reserves terminal capacity across concurrent creates", () =>
diff --git a/packages/provider-acp/src/server/mcpOverAcpBridge.test.ts b/packages/provider-acp/src/server/mcpOverAcpBridge.test.ts
index ba45b1d761f8..e330db694fb7 100644
--- a/packages/provider-acp/src/server/mcpOverAcpBridge.test.ts
+++ b/packages/provider-acp/src/server/mcpOverAcpBridge.test.ts
@@ -78,7 +78,7 @@ describe("AcpMcpOverAcpBridge", () => {
       expect(requests[1]?.headers.get("mcp-protocol-version")).toBe("2025-06-18");
       expect(requests.at(-1)?.method).toBe("DELETE");
       expect(requests.at(-1)?.headers.get("mcp-session-id")).toBe("session-42");
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("aborts an in-flight HTTP request when the ACP call is interrupted", () =>
@@ -101,7 +101,7 @@ describe("AcpMcpOverAcpBridge", () => {
       const signal = yield* Effect.promise(() => started.promise);
       yield* Fiber.interrupt(request);
       expect(signal.aborted).toBe(true);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("answers a call while a long call on the same connection is pending", () =>
@@ -142,7 +142,7 @@ describe("AcpMcpOverAcpBridge", () => {
 
       waitResponse.resolve(reply(2, { content: [] }));
       expect(yield* Fiber.join(wait)).toEqual({ content: [] });
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("rejects unknown servers, connections, and oversized messages", () =>
diff --git a/packages/provider-acp/src/server/runtimeModel.test.ts b/packages/provider-acp/src/server/runtimeModel.test.ts
index 5b0e3327d981..b41c95f6466b 100644
--- a/packages/provider-acp/src/server/runtimeModel.test.ts
+++ b/packages/provider-acp/src/server/runtimeModel.test.ts
@@ -361,6 +361,50 @@ describe("AcpRuntimeModel", () => {
     ).toBe(true);
   });
 
+  it("clears explicitly nulled ACP v2 tool call fields and replaces raw input", () => {
+    const toolCall = (update: Omit<EffectAcpSchema.ToolCallUpdate, "toolCallId">) => {
+      const parsed = parseSessionUpdateEvent({
+        sessionId: "session-1",
+        update: { sessionUpdate: "tool_call_update", toolCallId: "call-1", ...update },
+      } satisfies EffectAcpSchema.SessionNotification);
+      const event = parsed.events.find((candidate) => candidate._tag === "ToolCallUpdated");
+      if (!event || event._tag !== "ToolCallUpdated") {
+        throw new Error("expected a tool call update");
+      }
+      return event.toolCall;
+    };
+
+    const created = toolCall({
+      name: "old-name",
+      title: "Old title",
+      kind: "read",
+      status: "in_progress",
+      content: [{ type: "content", content: { type: "text", text: "old output" } }],
+      rawInput: { path: "old.txt", obsolete: true },
+      _meta: { old: true },
+    });
+
+    expect(
+      mergeToolCallState(created, toolCall({ rawInput: { path: "new.txt" } })).data.rawInput,
+    ).toEqual({ path: "new.txt" });
+
+    const cleared = mergeToolCallState(
+      created,
+      toolCall({
+        name: null,
+        title: null,
+        kind: null,
+        status: null,
+        content: null,
+        rawInput: null,
+        _meta: null,
+      }),
+    );
+    const { name, title, kind, content, rawInput, meta } = cleared.data;
+    expect({ name, title, kind, content, rawInput, meta }).toEqual({});
+    expect({ kind: cleared.kind, title: cleared.title, status: cleared.status }).toEqual({});
+  });
+
   it("forwards an empty ACP v1 plan to clear previous entries", () => {
     const entries = [
       [{ content: "Inspect state", priority: "high", status: "pending" }],
diff --git a/packages/provider-acp/src/server/runtimeModel.ts b/packages/provider-acp/src/server/runtimeModel.ts
index 6b9f0a01dde4..3b936a30b766 100644
--- a/packages/provider-acp/src/server/runtimeModel.ts
+++ b/packages/provider-acp/src/server/runtimeModel.ts
@@ -842,6 +842,19 @@ function makeToolCallState(
       ? title
       : undefined;
   const data: Record<string, unknown> = { toolCallId };
+  // ACP v2 clears a field set to null; mergeToolCallState consumes these markers.
+  const clearable = {
+    name: input.name,
+    title: input.title,
+    kind: input.kind,
+    status: input.status,
+    content: input.content,
+    rawInput: input.rawInput,
+    meta: input._meta,
+  };
+  for (const [key, value] of Object.entries(clearable)) {
+    if (value === null) data[key] = null;
+  }
   if (input.name != null) data.name = input.name;
   if (kind) {
     data.kind = kind;
@@ -929,9 +942,9 @@ export function mergeToolCallState(
   next: AcpToolCallState,
 ): AcpToolCallState {
   const nextKind = next.kind ?? (typeof next.data.kind === "string" ? next.data.kind : undefined);
-  const kind = nextKind ?? previous?.kind;
-  const title = next.title ?? previous?.title;
-  const status = next.status ?? previous?.status;
+  const kind = next.data.kind === null ? nextKind : (nextKind ?? previous?.kind);
+  const title = next.data.title === null ? next.title : (next.title ?? previous?.title);
+  const status = next.data.status === null ? next.status : (next.status ?? previous?.status);
   const command = next.command ?? previous?.command;
   const detail = next.detail ?? previous?.detail;
   const data = mergeToolActivityData(previous?.data, next.data) ?? next.data;
diff --git a/packages/provider-core/src/server/ProviderAdapter.ts b/packages/provider-core/src/server/ProviderAdapter.ts
index 2a2537c8bf86..5b1b6301fa48 100644
--- a/packages/provider-core/src/server/ProviderAdapter.ts
+++ b/packages/provider-core/src/server/ProviderAdapter.ts
@@ -535,6 +535,8 @@ export interface ProviderAdapterV2TurnInput {
   readonly rootNodeId: NodeId;
   readonly providerThread: OrchestrationV2ProviderThread;
   readonly message: ProviderAdapterV2TurnMessage;
+  /** Leading characters of `message.text` that are inline handoff context, not the user's words. */
+  readonly inlineContextLength?: number;
   readonly modelSelection: ModelSelection;
   readonly runtimePolicy: ProviderAdapterV2RuntimePolicy;
   readonly appContext?: ReadonlyArray<{ readonly key: string; readonly text: string }>;
@@ -672,7 +674,11 @@ export interface ProviderAdapterV2SessionRuntime {
     providerThread: OrchestrationV2ProviderThread,
     options?: { readonly includeSubagents?: boolean },
   ) => Effect.Effect<boolean>;
-  /** Set only if all session background tasks end with its process; otherwise threads must keep Waiting. */
+  /**
+   * Set only if all session background tasks and tool calls end with its process. Releasing the
+   * session then clears its task roster and interrupts its open tool calls; otherwise threads
+   * must keep Waiting.
+   */
   readonly backgroundTasksEndWithProcess?: true;
   readonly getModelContextWindow?: (
     modelSelection: ModelSelection,
diff --git a/packages/provider-core/src/server/maintenanceResolver.test.ts b/packages/provider-core/src/server/maintenanceResolver.test.ts
index a20fe6b61b10..3475881732fa 100644
--- a/packages/provider-core/src/server/maintenanceResolver.test.ts
+++ b/packages/provider-core/src/server/maintenanceResolver.test.ts
@@ -429,6 +429,74 @@ it.layer(
     { skip: !symlinksSupported || windowsHost },
   );
 
+  it.effect.skipIf(windowsHost)(
+    "does not offer a Vite+ update npm's release-age policy will not install",
+    () =>
+      Effect.gen(function* () {
+        const tempDir = yield* makeTempDir("t3-release-age");
+        const npmBinDir = NodePath.join(tempDir, "npm-bin");
+        const npmPath = NodePath.join(npmBinDir, "npm");
+        writeExecutable(npmPath);
+        const vitePlusNodePath = NodePath.join(tempDir, "vite-plus-node/bin/node");
+        const binaryPath = NodePath.join(tempDir, ".vite-plus/bin/package-tool");
+        writeExecutable(binaryPath);
+        const advise = (env: NodeJS.ProcessEnv, vitePlusPacks: string, nodeSource = "lts") =>
+          resolveProviderMaintenanceCapabilitiesEffect(packageToolUpdate, {
+            binaryPath,
+            env: { PATH: npmBinDir, ...env },
+          }).pipe(
+            Effect.provideService(
+              ChildProcessSpawner.ChildProcessSpawner,
+              // `vp i -g` runs the npm beside Vite+'s Node; `npm view` ignores min-release-age.
+              stdoutSpawner((command, args) => {
+                if (command === "vp") {
+                  return JSON.stringify({
+                    node: { source: nodeSource, bin_path: vitePlusNodePath, installed: true },
+                  });
+                }
+                if (command === npmPath) {
+                  return args[0] === "view" ? '"1.2.0"' : "example-package-tool-1.2.0.tgz\n";
+                }
+                return command === NodePath.join(NodePath.dirname(vitePlusNodePath), "npm") &&
+                  args[0] === "pack"
+                  ? `example-package-tool-${vitePlusPacks}.tgz\n`
+                  : "";
+              }),
+            ),
+            Effect.flatMap((capabilities) =>
+              enrichProviderSnapshotWithVersionAdvisory(
+                { ...installedPackageToolProvider, version: "1.1.0" },
+                capabilities,
+              ),
+            ),
+            Effect.map((snapshot) => snapshot.versionAdvisory),
+          );
+
+        expect(yield* advise({ npm_config_min_release_age: "7" }, "1.1.0")).toMatchObject({
+          status: "current",
+          currentVersion: "1.1.0",
+          latestVersion: "1.1.0",
+        });
+        expect((yield* advise({}, "1.2.0"))?.latestVersion).toBe("1.2.0");
+        // Install never uses the system Node `vp env off` reports, so this falls back to `npm view`.
+        expect(
+          (yield* advise(
+            { npm_config_min_release_age: "7", VP_HOME: "system-first" },
+            "1.1.0",
+            "system PATH",
+          ))?.latestVersion,
+        ).toBe("1.2.0");
+      }).pipe(
+        Effect.provide(ProviderLatestVersions.layer),
+        Effect.provideService(
+          HttpClient.HttpClient,
+          HttpClient.make(() =>
+            Effect.die("a configured npm lookup must not fall back to public npm"),
+          ),
+        ),
+      ),
+  );
+
   it.effect.skipIf(!symlinksSupported || windowsHost)(
     "keeps configured npm registries' latest versions apart for one install",
     () =>
@@ -1566,6 +1634,55 @@ it.layer(
       }),
   );
 
+  for (const fixture of [
+    {
+      name: "an npm-shaped package",
+      definition: packageToolUpdate,
+      target: ["lib", "node_modules", "@example", "package-tool", "bin", "package-tool.exe"],
+    },
+    {
+      name: "a launcher script",
+      definition: nativePackageToolUpdate,
+      target: ["share", "native-package-tool", "native-package-tool"],
+    },
+  ]) {
+    it.effect.skipIf(!symlinksSupported || windowsHost)(
+      `leaves ${fixture.name} owned by MacPorts to MacPorts`,
+      () =>
+        Effect.gen(function* () {
+          const prefix = yield* makeTempDir("t3-macports");
+          writeExecutable(NodePath.join(prefix, "bin", "port"));
+          const target = NodePath.join(prefix, ...fixture.target);
+          writeExecutable(target);
+          const launcher = NodePath.join(prefix, "bin", NodePath.basename(target, ".exe"));
+          NodeFS.symlinkSync(target, launcher);
+
+          const capabilities = yield* resolveProviderMaintenanceCapabilitiesEffect(
+            fixture.definition,
+            { binaryPath: launcher, env: { PATH: NodePath.join(prefix, "bin") } },
+          ).pipe(
+            Effect.provideService(HostProcess.Platform, "darwin"),
+            Effect.provideService(
+              ChildProcessSpawner.ChildProcessSpawner,
+              stdoutSpawner((command, args) =>
+                NodePath.basename(command) === "port" && args.includes("provides")
+                  ? args.includes("-q")
+                    ? "package-tool\n"
+                    : args
+                        .filter((arg) => arg.startsWith("/"))
+                        .map((file) => `${file} is provided by: package-tool\n`)
+                        .join("")
+                  : "",
+              ),
+            ),
+          );
+
+          expect(capabilities.update).toBeNull();
+          expect(capabilities.manualCommand).toBe("sudo port upgrade package-tool");
+        }),
+    );
+  }
+
   it("quotes copyable command words the shell would split", () => {
     const posix = makeProviderMaintenanceCapabilities({
       provider: driver("packageTool"),
diff --git a/packages/provider-core/src/server/maintenanceResolver.ts b/packages/provider-core/src/server/maintenanceResolver.ts
index aecbfcbf5932..1d7125325381 100644
--- a/packages/provider-core/src/server/maintenanceResolver.ts
+++ b/packages/provider-core/src/server/maintenanceResolver.ts
@@ -482,6 +482,49 @@ const resolvePnpmGlobalLatestVersion = Effect.fn("resolvePnpmGlobalLatestVersion
   return nonEmptyString(listedEntries?.[0]?.dependencies?.[packageName]?.version);
 });
 
+// npm names the tarball `${name}-${version}.tgz`, dropping a scope's `@` and its `/`.
+function parseNpmPackVersion(stdout: string, packageName: string): string | null {
+  const prefix = `${packageName.replace(/^@/, "").replace("/", "-")}-`;
+  const filename = stdout.trim();
+  if (!filename.startsWith(prefix) || !filename.endsWith(".tgz")) return null;
+  const version = filename.slice(prefix.length, -".tgz".length);
+  return version && !/\s/.test(version) ? version : null;
+}
+
+const decodeVitePlusCurrentEnv = Schema.decodeUnknownOption(
+  Schema.fromJsonString(
+    Schema.Struct({
+      node: Schema.Struct({
+        source: Schema.String,
+        bin_path: Schema.String,
+        installed: Schema.Boolean,
+      }),
+    }),
+  ),
+);
+
+// `vp i -g` installs through the npm beside Vite+'s managed Node, even under `vp env off`, and
+// `vp env current` names that Node unless it reports a system one, which install does not use.
+// Pack honours npm's min-release-age and `before`, which `npm view` ignores, and resolves
+// `@latest` the way install does. `--json=false` keeps its output to the tarball name.
+const resolveVitePlusInstallableLatestVersion = Effect.fn(
+  "resolveVitePlusInstallableLatestVersion",
+)(function* (packageName: string, env: NodeJS.ProcessEnv, platform: NodeJS.Platform) {
+  const path = yield* Path.Path;
+  const current = yield* runProbe("vp", ["env", "current", "--json"], env);
+  const node = current ? Option.getOrUndefined(decodeVitePlusCurrentEnv(current))?.node : undefined;
+  if (!node?.installed || node.source === "system PATH" || !path.isAbsolute(node.bin_path)) {
+    return null;
+  }
+  const npmPath = path.join(path.dirname(node.bin_path), platform === "win32" ? "npm.cmd" : "npm");
+  const packed = yield* runProbe(
+    npmPath,
+    ["pack", "--dry-run", "--json=false", "--global", `${packageName}@latest`],
+    env,
+  );
+  return packed ? parseNpmPackVersion(packed, packageName) : null;
+});
+
 // `bun outdated` has no JSON output; its `Latest` column is what `@latest` installs
 // under minimumReleaseAge (marked `*`). `Update` is only the global package.json range.
 function parseBunOutdatedLatestVersion(output: string, packageName: string): string | null {
@@ -613,14 +656,6 @@ export const resolveMiseProviderMaintenance = Effect.fn("resolveMiseProviderMain
     }
     const args = ["upgrade", miseTool];
     const services = yield* Effect.context<ProviderMaintenanceResolverServices>();
-    // Mise reads its settings from this environment, so each one gets its own cached answer.
-    const envHash = NodeCrypto.createHash("sha256");
-    for (const [name, value] of Object.entries(context.env).toSorted(([a], [b]) =>
-      a < b ? -1 : 1,
-    )) {
-      envHash.update(`${name}\0${value ?? ""}\0`);
-    }
-    const envKey = envHash.digest("hex");
     const capabilities = makeProviderMaintenanceCapabilities({
       ...owner,
       updateExecutable: misePath,
@@ -643,7 +678,9 @@ export const resolveMiseProviderMaintenance = Effect.fn("resolveMiseProviderMain
     });
     return {
       ...capabilities,
-      latestVersionCacheKey: ["mise", misePath, miseTool, envKey].join("\0"),
+      latestVersionCacheKey: ["mise", misePath, miseTool, environmentCacheKey(context.env)].join(
+        "\0",
+      ),
     };
   },
 );
@@ -765,6 +802,15 @@ export const resolvePackageManagedProviderMaintenance = Effect.fn(
   if (commandPaths.some(isNixStoreCommandPath)) {
     return manual;
   }
+  const macPortsName = yield* resolveMacPortsOwner(context);
+  if (macPortsName !== null) {
+    return makeManualOnlyProviderMaintenanceCapabilities({
+      provider: definition.provider,
+      packageName,
+      installPath: context.realCommandPath,
+      ...(macPortsName ? { manualCommand: `sudo port upgrade ${macPortsName}` } : {}),
+    });
+  }
 
   const nativeUpdate = definition.nativeUpdate;
   const nativeEnv = nativeUpdate?.env;
@@ -797,14 +843,28 @@ export const resolvePackageManagedProviderMaintenance = Effect.fn(
       ? manual
       : native;
   if (commandPaths.some(isVitePlusGlobalCommandPath)) {
-    return makeProviderMaintenanceCapabilities({
+    const services = yield* Effect.context<ProviderMaintenanceResolverServices>();
+    const capabilities = makeProviderMaintenanceCapabilities({
       provider: definition.provider,
       packageName,
       updateExecutable: "vp",
       updateArgs: ["i", "-g", packageName],
       updateLockKey: "vite-plus-global",
       env: context.env,
+      lookupLatestVersion: resolveVitePlusInstallableLatestVersion(
+        packageName,
+        context.env,
+        context.platform,
+      ).pipe(Effect.provideContext(services)),
     });
+    return {
+      ...capabilities,
+      latestVersionCacheKey: [
+        "vite-plus-global",
+        packageName,
+        environmentCacheKey(context.env),
+      ].join("\0"),
+    };
   }
   if (commandPaths.some(isBunGlobalCommandPath)) {
     const services = yield* Effect.context<ProviderMaintenanceResolverServices>();
@@ -969,6 +1029,30 @@ const isMiseWrapperScript = Effect.fn("isMiseWrapperScript")(function* (
   return script.startsWith("#!") && /\bmise\s+(?:x|exec)\b/.test(script);
 });
 
+/**
+ * The port that installed the executable, "" when MacPorts owns it under an unusable name,
+ * or null when it does not. MacPorts prefixes are root-owned and its Claude port disables
+ * `claude update`, so neither npm nor the native updater can upgrade these installs.
+ */
+const resolveMacPortsOwner = Effect.fn("resolveMacPortsOwner")(function* (
+  context: ProviderMaintenanceResolutionContext,
+) {
+  if (context.platform === "win32") return null;
+  const fileSystem = yield* FileSystem.FileSystem;
+  const path = yield* Path.Path;
+  const siblingPort = path.join(path.dirname(context.resolvedCommandPath), "port");
+  const portPath = (yield* fileSystem.exists(siblingPort).pipe(Effect.orElseSucceed(() => false)))
+    ? siblingPort
+    : yield* resolveCommandPath("port", { env: context.env });
+  if (!portPath) return null;
+  const prefix = `${normalizeCommandPath(path.dirname(path.dirname(portPath)))}/`;
+  if (!normalizeCommandPath(context.realCommandPath).startsWith(prefix)) return null;
+  const output = yield* runProbe(portPath, ["provides", context.realCommandPath], context.env);
+  const name = output ? /\bis provided by: (\S+)/.exec(output)?.[1] : undefined;
+  if (name === undefined) return null;
+  return /^[\w.+-]+$/.test(name) ? name : "";
+});
+
 // Volta bin links only identify its shim; the package image proves ownership.
 const isVoltaPackageInstall = Effect.fn("isVoltaPackageInstall")(function* (
   context: ProviderMaintenanceResolutionContext,
diff --git a/packages/provider-core/src/server/orchestrationInstructions.ts b/packages/provider-core/src/server/orchestrationInstructions.ts
index bb4d33d2c56e..4ce08d71119f 100644
--- a/packages/provider-core/src/server/orchestrationInstructions.ts
+++ b/packages/provider-core/src/server/orchestrationInstructions.ts
@@ -13,8 +13,8 @@ Ordinary coding tasks need no T3 tools.
 - As a subagent or child, do the work yourself. Start no subagents unless your task says to.`,
   `- \`t3_thread_launch\` and \`create_threads\` make new top-level threads, only when the user asks for a new thread. "Subagent", "delegate", and "parallel" never mean one. Worktree thread: set \`workspaceStrategy\`. Honor a requested base. Otherwise independent work uses the default branch as \`remote/branch\` with \`startFromOrigin:true\`; with no remote, use the local default. Required unpublished commits and dependent work use their local base. Shell worktrees don't bind it, and no checkout setup in its prompt. No \`workspaceStrategy\`: project root, not your worktree.
 - Given a thread id, \`t3_thread_read\` it before you answer about it. Asked to settle a thread, this one too: \`t3_thread_organize\`.
-- Another machine: \`t3_environment_links\` lists linked ones. Pass its \`environmentId\` to a T3 tool to act there. Ids are then that machine's, so pass \`threadId\`.
-- A machine the user names that isn't linked ("delegate this to my vps"): call \`t3_environment_link\` with a \`hint\` from their words. Never ask for a pairing code in chat.
+- Another machine: \`t3_environment_links\` lists linked ones. Pass its \`environmentId\` and that machine's \`threadId\` to T3 tools.
+- Unlinked ("delegate this to my vps"): \`t3_environment_link\` with a \`hint\` from the user's words, never a pairing code in chat. No link tools: say to enable Settings → Labs → Linked environments.
 - In your reply, mention a thread by its \`link\`, verbatim, never a plain title or bare id.
 - A login, token, PIN, pairing code or sudo password only the user can give: call \`request_secret\`, not a chat ask or a handoff. Not for access you have. Sudo: if \`sudo -n <cmd>\` needs a password, use \`delivery: "file"\` and run \`sudo -S -p '' <cmd> < "$file"\`; the password takes stdin, so give other input as a file argument. Asked only to schedule: \`schedule_task\` without running its prompt.
 - T3 tools may load late. Try the name once before you call it absent.`,
diff --git a/packages/provider-core/src/server/snapshotProbe.test.ts b/packages/provider-core/src/server/snapshotProbe.test.ts
index 26b66751516c..e2d1e166c203 100644
--- a/packages/provider-core/src/server/snapshotProbe.test.ts
+++ b/packages/provider-core/src/server/snapshotProbe.test.ts
@@ -12,6 +12,7 @@ import * as ChildProcessSpawner from "effect/process/ChildProcessSpawner";
 
 import {
   isCommandMissingCause,
+  resolveProviderProbeTimeoutMs,
   parseGenericCliVersion,
   providerModelsFromSettings,
   spawnAndCollect,
@@ -161,6 +162,37 @@ describe("ProviderCommandNotFoundError", () => {
   });
 });
 
+describe("resolveProviderProbeTimeoutMs", () => {
+  it.each([
+    "codex",
+    "claude",
+    "cursor",
+    "antigravity",
+    "grok",
+    "kiro",
+    "fx",
+    "pi",
+    "muse",
+    "opencode",
+    "acp_registry",
+  ])("uses only %s's readiness override", (provider) => {
+    const key = `T3CODE_${provider.toUpperCase()}_PROBE_TIMEOUT_MS`;
+    expect(resolveProviderProbeTimeoutMs(provider, 25000, { [key]: "60000" })).toBe(60000);
+    expect(resolveProviderProbeTimeoutMs(provider, 25000, { [key]: "1000" })).toBe(25000);
+    expect(
+      resolveProviderProbeTimeoutMs(provider, 25000, { T3CODE_OTHER_PROBE_TIMEOUT_MS: "60000" }),
+    ).toBe(25000);
+  });
+  it.each([undefined, "", " ", "bad", "0", "-1", "1.5", "Infinity", "2147483648"])(
+    "retains the phase default for invalid value %s",
+    (value) => {
+      expect(
+        resolveProviderProbeTimeoutMs("claude", 25000, { T3CODE_CLAUDE_PROBE_TIMEOUT_MS: value }),
+      ).toBe(25000);
+    },
+  );
+});
+
 describe("spawnAndCollect", () => {
   // regression: #35262 - without forceKillAfter a timed-out probe whose CLI ignores
   // SIGTERM waits for it to exit, so the caller's timeout never returns.
diff --git a/packages/provider-core/src/server/snapshotProbe.ts b/packages/provider-core/src/server/snapshotProbe.ts
index a30b69ac9866..d86879091b6d 100644
--- a/packages/provider-core/src/server/snapshotProbe.ts
+++ b/packages/provider-core/src/server/snapshotProbe.ts
@@ -45,6 +45,19 @@ export const isWindowsCommandNotFound = Effect.fn("isWindowsCommandNotFound")(fu
 export const DEFAULT_TIMEOUT_MS = 4_000;
 export const AUTH_PROBE_TIMEOUT_MS = 10_000;
 
+export const resolveProviderProbeTimeoutMs = (
+  provider: string,
+  defaultTimeoutMs: number,
+  environment: NodeJS.ProcessEnv = process.env,
+): number => {
+  const timeoutMs = Number(environment[`T3CODE_${provider.toUpperCase()}_PROBE_TIMEOUT_MS`]);
+  // Overrides only extend: callers nest these deadlines and size optional work inside them
+  // against the defaults. Node timers overflow above a signed 32-bit delay.
+  return Number.isInteger(timeoutMs) && timeoutMs > defaultTimeoutMs && timeoutMs <= 2_147_483_647
+    ? timeoutMs
+    : defaultTimeoutMs;
+};
+
 export const COMPACT_SLASH_COMMAND = {
   name: "compact",
   description: "Summarize the conversation and reduce context usage",
diff --git a/packages/provider-core/src/server/usage.ts b/packages/provider-core/src/server/usage.ts
index eaed1d06ece4..c2c75a641e53 100644
--- a/packages/provider-core/src/server/usage.ts
+++ b/packages/provider-core/src/server/usage.ts
@@ -18,6 +18,8 @@ export interface UsageRecord {
   readonly rateModel?: string;
   readonly sessionId: string;
   readonly totals: UsageTokenTotals;
+  /** The part of `totals.cacheCreationTokens` written with a 1-hour TTL. */
+  readonly cacheCreation1hTokens?: number;
   readonly reportedCostUsd: number | null;
   readonly speed: UsageSpeed;
   readonly unresolvedServiceTierTurnId?: string;
diff --git a/packages/provider-core/src/server/usageLimits.test.ts b/packages/provider-core/src/server/usageLimits.test.ts
index 4b9c1b39c862..48bf7a76e85f 100644
--- a/packages/provider-core/src/server/usageLimits.test.ts
+++ b/packages/provider-core/src/server/usageLimits.test.ts
@@ -33,6 +33,29 @@ describe("applyUsageLimitsUpdate", () => {
       },
     });
     expect(next).toBe(published);
+    const scoped = { checkedAt, windows: [{ ...weekly, modelIds: ["opencode/a"] }] };
+    const providerScoped = { checkedAt, windows: [{ ...weekly, providerIds: ["opencode"] }] };
+    expect(
+      applyUsageLimitsUpdate({
+        previous: providerScoped,
+        checkedAt,
+        update: { windows: [{ ...weekly, providerIds: ["console-custom"] }] },
+      })?.windows[0]?.providerIds,
+    ).toEqual(["console-custom"]);
+    expect(
+      applyUsageLimitsUpdate({
+        previous: scoped,
+        checkedAt,
+        update: { windows: [{ ...weekly, modelIds: ["opencode/a"] }] },
+      }),
+    ).toBe(scoped);
+    expect(
+      applyUsageLimitsUpdate({
+        previous: scoped,
+        checkedAt,
+        update: { windows: [{ ...weekly, modelIds: ["opencode/b"] }] },
+      })?.windows[0]?.modelIds,
+    ).toEqual(["opencode/b"]);
   });
 
   it("upserts by id and keeps the reset a percent-only update omits", () => {
diff --git a/packages/provider-core/src/server/usageLimits.ts b/packages/provider-core/src/server/usageLimits.ts
index 1e4bcd009085..f9b8def9d65e 100644
--- a/packages/provider-core/src/server/usageLimits.ts
+++ b/packages/provider-core/src/server/usageLimits.ts
@@ -94,6 +94,16 @@ function usageWindowEquals(a: ServerProviderUsageWindow, b: ServerProviderUsageW
     a.kind === b.kind &&
     a.label === b.label &&
     a.usedPercent === b.usedPercent &&
+    (a.modelIds === b.modelIds ||
+      (a.modelIds !== undefined &&
+        b.modelIds !== undefined &&
+        a.modelIds.length === b.modelIds.length &&
+        a.modelIds.every((id, index) => id === b.modelIds?.[index]))) &&
+    (a.providerIds === b.providerIds ||
+      (a.providerIds !== undefined &&
+        b.providerIds !== undefined &&
+        a.providerIds.length === b.providerIds.length &&
+        a.providerIds.every((id, index) => id === b.providerIds?.[index]))) &&
     a.resetsAt === b.resetsAt &&
     a.windowDurationMins === b.windowDurationMins
   );
diff --git a/packages/provider-cursor/package.json b/packages/provider-cursor/package.json
index f073e7c921e3..95ebdf9a89db 100644
--- a/packages/provider-cursor/package.json
+++ b/packages/provider-cursor/package.json
@@ -50,6 +50,7 @@
     "@t3tools/provider-core": "workspace:*",
     "@t3tools/shared": "workspace:*",
     "effect": "catalog:",
+    "jsonc-parser": "3.3.1",
     "yaml": "catalog:"
   },
   "devDependencies": {
diff --git a/packages/provider-cursor/src/server/CursorSdk.test.ts b/packages/provider-cursor/src/server/CursorSdk.test.ts
index 60daa04365cc..ee53c3676434 100644
--- a/packages/provider-cursor/src/server/CursorSdk.test.ts
+++ b/packages/provider-cursor/src/server/CursorSdk.test.ts
@@ -1,10 +1,42 @@
+import * as NodeServices from "@effect/platform-node/NodeServices";
 import { assert, describe, it } from "@effect/vitest";
+import type { CursorConfigureOptions } from "@cursor/sdk";
+import * as HostProcess from "@t3tools/shared/HostProcess";
+import * as Context from "effect/Context";
 import * as Effect from "effect/Effect";
+import * as FileSystem from "effect/FileSystem";
 import * as Layer from "effect/Layer";
+import * as Logger from "effect/Logger";
+import * as Path from "effect/Path";
 import { vi } from "vite-plus/test";
 
 import * as CursorSdk from "./CursorSdk.ts";
 
+const sdkDefaults = vi.hoisted(() => ({ useHttp1ForAgent: undefined as boolean | undefined }));
+
+// Holds the SDK's process-wide default the way it does: only keys present change, null clears.
+vi.mock("./sdk.ts", () => ({
+  loadCursorSdk: () => ({
+    Cursor: {
+      configure: ({ local }: CursorConfigureOptions) => {
+        if (local !== undefined && "useHttp1ForAgent" in local) {
+          sdkDefaults.useHttp1ForAgent = local.useHttp1ForAgent ?? undefined;
+        }
+      },
+    },
+  }),
+  loadCursorSqlite: () => ({}),
+}));
+
+const withHost = (environment: NodeJS.ProcessEnv, home: string) =>
+  Effect.provide(
+    Layer.mergeAll(
+      NodeServices.layer,
+      Layer.succeed(HostProcess.Environment, environment),
+      Layer.succeed(HostProcess.HomeDirectory, home),
+    ),
+  );
+
 // Shaped like the SDK's minified class: the constructor is not named after the error.
 // @effect-diagnostics-next-line extendsNativeError:off - mimics the Cursor SDK's own native Error class.
 class o extends Error {
@@ -27,7 +59,7 @@ const rejectThroughGuard = (reason: unknown) =>
       for (const listener of others) process.on("unhandledRejection", listener);
     }
     return exit.mock.calls;
-  }).pipe(Effect.scoped);
+  }).pipe(Effect.scoped, withHost({}, "/nonexistent-home"));
 
 describe("CursorSdk unhandled rejection guard", () => {
   it.effect("keeps the server running when the SDK writes to a closed stream", () =>
@@ -70,3 +102,76 @@ describe("CursorSdk unhandled rejection guard", () => {
     }),
   );
 });
+
+const http1 = JSON.stringify({ network: { useHttp1ForAgent: true } });
+
+describe("CursorSdk agent transport", () => {
+  it.effect.each([
+    {
+      name: "when set in CURSOR_CONFIG_DIR over XDG_CONFIG_HOME",
+      env: { CURSOR_CONFIG_DIR: "config", XDG_CONFIG_HOME: "xdg" },
+      file: "config/cli-config.json",
+      text: http1,
+      expected: true,
+    },
+    {
+      name: "when set in XDG_CONFIG_HOME",
+      env: { XDG_CONFIG_HOME: "xdg" },
+      file: "xdg/cursor/cli-config.json",
+      text: http1,
+      expected: true,
+    },
+    {
+      name: "when set in the home directory",
+      env: {},
+      file: "home/.cursor/cli-config.json",
+      text: http1,
+      expected: true,
+    },
+    {
+      name: "when it is off",
+      env: {},
+      file: "home/.cursor/cli-config.json",
+      text: JSON.stringify({ network: { useHttp1ForAgent: false } }),
+      expected: undefined,
+    },
+    {
+      name: "when the file is damaged",
+      env: {},
+      file: "home/.cursor/cli-config.json",
+      text: "{",
+      expected: undefined,
+      warns: true,
+    },
+    { name: "when there is no file", env: {}, file: undefined, text: "", expected: undefined },
+  ])("follows the Cursor CLI's HTTP/1.1 setting $name", ({ env, file, text, expected, warns }) =>
+    Effect.gen(function* () {
+      const fileSystem = yield* FileSystem.FileSystem;
+      const path = yield* Path.Path;
+      const root = yield* fileSystem.makeTempDirectoryScoped({ prefix: "t3-cursor-cli-config-" });
+      if (file !== undefined) {
+        yield* fileSystem.makeDirectory(path.dirname(path.join(root, file)), { recursive: true });
+        yield* fileSystem.writeFileString(path.join(root, file), text);
+      }
+      const environment = Object.fromEntries(
+        Object.entries(env).map(([key, directory]) => [key, path.join(root, directory)]),
+      );
+      const warnings: Array<unknown> = [];
+      const captureWarnings = Logger.make(({ logLevel, message }) => {
+        if (logLevel === "Warn") warnings.push(message);
+      });
+      yield* Effect.gen(function* () {
+        const sdk = Context.get(yield* Layer.build(CursorSdk.layer), CursorSdk.CursorSdk);
+        assert.isUndefined(sdkDefaults.useHttp1ForAgent);
+        sdk.load();
+        assert.strictEqual(sdkDefaults.useHttp1ForAgent, expected);
+      }).pipe(
+        Effect.scoped,
+        withHost(environment, path.join(root, "home")),
+        Effect.provide(Logger.layer([captureWarnings], { mergeWithExisting: false })),
+      );
+      assert.isUndefined(sdkDefaults.useHttp1ForAgent);
+      assert.lengthOf(warnings, warns ? 1 : 0);
+    }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
+  );
+});
diff --git a/packages/provider-cursor/src/server/CursorSdk.ts b/packages/provider-cursor/src/server/CursorSdk.ts
index b59d09725243..0ac52526ad2f 100644
--- a/packages/provider-cursor/src/server/CursorSdk.ts
+++ b/packages/provider-cursor/src/server/CursorSdk.ts
@@ -1,7 +1,11 @@
 // @effect-diagnostics nodeBuiltinImport:off globalConsole:off -- The guard runs in Node's unhandled-rejection callback, outside an Effect runtime. stderr must match Node's default unhandled-rejection print.
+import * as HostProcess from "@t3tools/shared/HostProcess";
 import * as Context from "effect/Context";
 import * as Effect from "effect/Effect";
+import * as FileSystem from "effect/FileSystem";
 import * as Layer from "effect/Layer";
+import * as Path from "effect/Path";
+import * as Schema from "effect/Schema";
 
 import { loadCursorSdk, loadCursorSqlite } from "./sdk.ts";
 
@@ -67,6 +71,39 @@ function onUnhandledRejection(reason: unknown): void {
   process.exit(1);
 }
 
+const decodeCursorCliConfig = Schema.decodeEffect(
+  Schema.fromJsonString(
+    Schema.Struct({
+      network: Schema.optionalKey(
+        Schema.Struct({ useHttp1ForAgent: Schema.optionalKey(Schema.Boolean) }),
+      ),
+    }),
+  ),
+);
+
+// Proxies without HTTP/2 need this Cursor CLI setting, which the SDK never reads itself.
+const readCursorCliUseHttp1ForAgent = Effect.gen(function* () {
+  const fileSystem = yield* FileSystem.FileSystem;
+  const path = yield* Path.Path;
+  const { CURSOR_CONFIG_DIR, XDG_CONFIG_HOME } = yield* HostProcess.Environment;
+  const configDirectory = CURSOR_CONFIG_DIR?.trim()
+    ? CURSOR_CONFIG_DIR
+    : XDG_CONFIG_HOME?.trim()
+      ? path.join(XDG_CONFIG_HOME, "cursor")
+      : path.join(yield* HostProcess.HomeDirectory, ".cursor");
+  const configPath = path.join(configDirectory, "cli-config.json");
+  const config = yield* fileSystem.readFileString(configPath).pipe(
+    Effect.flatMap(decodeCursorCliConfig),
+    Effect.catchReason("PlatformError", "NotFound", () => Effect.undefined),
+    Effect.catch(() =>
+      Effect.logWarning("Cursor CLI config could not be read; using the default agent transport", {
+        path: configPath,
+      }).pipe(Effect.as(undefined)),
+    ),
+  );
+  return config?.network?.useHttp1ForAgent === true;
+}).pipe(Effect.withSpan("CursorSdk.readCliUseHttp1ForAgent"));
+
 /** Keeps the shell spawn guard armed while in-process agents run. */
 export class CursorSdk extends Context.Service<
   CursorSdk,
@@ -79,13 +116,34 @@ export class CursorSdk extends Context.Service<
 /** Provide once per process: a second guard would defer to the first and swallow real rejections. */
 export const layer = Layer.effect(
   CursorSdk,
-  Effect.acquireRelease(
-    Effect.sync(() => {
-      process.on("unhandledRejection", onUnhandledRejection);
-    }),
-    () =>
+  Effect.gen(function* () {
+    yield* Effect.acquireRelease(
+      Effect.sync(() => {
+        process.on("unhandledRejection", onUnhandledRejection);
+      }),
+      () =>
+        Effect.sync(() => {
+          process.off("unhandledRejection", onUnhandledRejection);
+        }),
+    );
+    // The SDK picks the agent transport per process, so no provider instance can own this.
+    const useHttp1ForAgent = yield* readCursorCliUseHttp1ForAgent;
+    let configured = false;
+    yield* Effect.addFinalizer(() =>
       Effect.sync(() => {
-        process.off("unhandledRejection", onUnhandledRejection);
+        if (configured) loadCursorSdk().Cursor.configure({ local: { useHttp1ForAgent: null } });
       }),
-  ).pipe(Effect.as(CursorSdk.of({ load: loadCursorSdk, loadSqlite: loadCursorSqlite }))),
+    );
+    return CursorSdk.of({
+      load: () => {
+        const sdk = loadCursorSdk();
+        if (useHttp1ForAgent && !configured) {
+          sdk.Cursor.configure({ local: { useHttp1ForAgent: true } });
+          configured = true;
+        }
+        return sdk;
+      },
+      loadSqlite: loadCursorSqlite,
+    });
+  }),
 );
diff --git a/packages/provider-cursor/src/server/adapter.test.ts b/packages/provider-cursor/src/server/adapter.test.ts
index e0f31cd8fb4a..1e1e17a1a0ec 100644
--- a/packages/provider-cursor/src/server/adapter.test.ts
+++ b/packages/provider-cursor/src/server/adapter.test.ts
@@ -21,6 +21,9 @@ import * as DateTime from "effect/DateTime";
 import * as Deferred from "effect/Deferred";
 import * as Effect from "effect/Effect";
 import * as Exit from "effect/Exit";
+import * as ChildProcess from "effect/process/ChildProcess";
+import { spawnAndCollect } from "@t3tools/provider-core/server/snapshotProbe";
+import * as HostProcess from "@t3tools/shared/HostProcess";
 import * as FileSystem from "effect/FileSystem";
 import * as Layer from "effect/Layer";
 import * as Option from "effect/Option";
@@ -28,6 +31,7 @@ import * as Path from "effect/Path";
 import * as Stream from "effect/Stream";
 import { vi } from "vite-plus/test";
 
+import { symlinksSupported } from "@t3tools/shared/testing/symlinks";
 import * as TestProviderHost from "@t3tools/provider-testing/TestProviderHost";
 import * as IdAllocator from "@t3tools/provider-core/server/IdAllocator";
 import * as McpProviderSessions from "@t3tools/provider-core/server/McpProviderSessions";
@@ -42,6 +46,7 @@ import {
 } from "./adapter.ts";
 import * as CursorAgentSdk from "./CursorAgentSdk.ts";
 import { loadCursorSdk } from "./sdk.ts";
+import { cursorWorkspaceMcpServers } from "./workspaceMcpServers.ts";
 
 // The SDK reads CURSOR_BACKEND_URL once when it loads, before any test body runs.
 const cursorBackendUrl = await vi.hoisted(async () => {
@@ -2034,6 +2039,236 @@ describe("CursorAdapterV2", () => {
     assert.notInclude(logged, "secret-cursor-mcp-token");
   });
 
+  it.effect.skipIf(!symlinksSupported)(
+    "starts mcp.json servers that use Cursor's workspace variables",
+    () =>
+      Effect.gen(function* () {
+        const fileSystem = yield* FileSystem.FileSystem;
+        const path = yield* Path.Path;
+        const scratch = yield* fileSystem.realPath(
+          yield* fileSystem.makeTempDirectoryScoped({ prefix: "cursor-v2-mcp-" }),
+        );
+        const workspace = path.join(scratch, "workspace");
+        const home = path.join(scratch, "home");
+        const loadServers = () =>
+          cursorWorkspaceMcpServers(cwd, { MCP_TYPE: "stdio" }).pipe(
+            Effect.provideService(HostProcess.HomeDirectory, home),
+            Effect.provideService(HostProcess.Environment, {}),
+          );
+        // Cursor resolves the project root through symlinks, as git does.
+        yield* fileSystem.makeDirectory(path.join(workspace, "packages", "app"), {
+          recursive: true,
+        });
+        yield* fileSystem.symlink(workspace, path.join(scratch, "link"));
+        const cwd = path.join(scratch, "link", "packages", "app");
+        yield* spawnAndCollect("git", ChildProcess.make("git", ["init", workspace]));
+        // Git prints forward slashes on Windows, and the loader passes its spelling through.
+        const projectRoot = (yield* spawnAndCollect(
+          "git",
+          ChildProcess.make("git", ["rev-parse", "--show-toplevel"], { cwd }),
+        )).stdout.trim();
+        yield* fileSystem.makeDirectory(path.join(workspace, ".cursor"), { recursive: true });
+        yield* fileSystem.makeDirectory(path.join(home, ".cursor"), { recursive: true });
+        yield* fileSystem.writeFileString(
+          path.join(workspace, ".cursor", "mcp.json"),
+          `{
+          // Cursor's editor accepts comments here.
+          "mcpServers": {
+            "repro": { "command": "node", "args": ["\${workspaceFolder}/server.mjs"], "startupTimeoutSec": 120 },
+            "plain": { "command": "node", "args": ["server.mjs"] },
+            "argument-only": { "command": "node", "args": ["server.mjs", "--workspace", "\${workspaceFolder}"] },
+            "env-only": { "command": "node", "args": ["server.mjs"], "env": { "PROJECT_ROOT": "\${workspaceFolder}" } },
+            "cwd-only": { "command": "node", "args": ["server.mjs"], "cwd": "\${workspaceFolder}" },
+            "unset-env": { "command": "node", "env": { "CONFIG": "\${env:T3_MCP_UNSET}" } },
+            "wrapped": { "command": "proto", "args": ["run", "node", "--", "\${workspaceFolder}/server.mjs"] },
+            "label": { "command": "node", "args": ["server.mjs", "--label", "\${workspaceFolder}/client"] },
+            "env-file": { "command": "node", "args": ["\${workspaceFolder}/server.mjs"], "envFile": ".env.mcp" },
+            "tool-filter": { "command": "node", "args": ["\${workspaceFolder}/server.mjs"], "enabledTools": ["read_file"] },
+            "off": { "command": "node", "args": ["\${workspaceFolder}/off.mjs"] },
+            "typed": { "type": "\${env:MCP_TYPE}", "command": "node", "args": ["server.mjs"] },
+            "plugin-docs-search": { "command": "node", "args": ["\${workspaceFolder}/search.mjs"] },
+          },
+        }`,
+        );
+        yield* fileSystem.writeFileString(
+          path.join(home, ".cursor", "mcp.json"),
+          JSON.stringify({
+            mcpServers: {
+              repro: { command: "node", args: ["${userHome}/shadowed.mjs"] },
+              docs: {
+                url: "https://docs.example/${workspaceFolderBasename}",
+                headers: { Authorization: "Bearer ${env:DOCS_TOKEN}" },
+                tls: { caBundle: "${userHome}/ca.pem" },
+              },
+            },
+          }),
+        );
+        // Cursor keeps per-project state under a directory named after the project path.
+        const projectDirectory = workspace.replace(/[^a-zA-Z0-9]+/g, "-").replace(/^-|-$/g, "");
+        yield* fileSystem.makeDirectory(path.join(home, ".cursor", "projects", projectDirectory), {
+          recursive: true,
+        });
+        yield* fileSystem.writeFileString(
+          path.join(home, ".cursor", "projects", projectDirectory, "mcp-disabled.json"),
+          JSON.stringify(["off"]),
+        );
+
+        const instanceId = ProviderInstanceId.make("cursor");
+        const threadId = ThreadId.make("cursor-mcp-thread");
+        const mcpSessions = yield* McpProviderSessions.McpProviderSessions;
+        yield* mcpSessions.set({
+          environmentId: EnvironmentId.make("cursor-mcp-environment"),
+          threadId,
+          providerSessionId: "cursor-mcp-session",
+          providerInstanceId: instanceId,
+          endpoint: "http://127.0.0.1:43123/mcp",
+          authorizationHeader: "Bearer synthetic-cursor-token",
+          browserToolsAvailable: false,
+        });
+        const t3Servers = cursorMcpServers(yield* mcpSessions.read(threadId));
+        const modelSelection = { instanceId, model: "composer-2.5" };
+        const runtimePolicy = ProviderAdapter.ProviderAdapterV2RuntimePolicy.make({
+          runtimeMode: "full-access",
+          interactionMode: "default",
+          cwd,
+        });
+        let openedWith: CursorAgentSdk.CursorAgentSdkOpenInput["options"] | undefined;
+        const sentWith: Array<Record<string, unknown> | undefined> = [];
+        const adapter = yield* makeCursorAdapterV2({
+          instanceId,
+          environment: {
+            HOME: path.join(scratch, "override"),
+            CURSOR_DATA_DIR: path.join(scratch, "override"),
+            DOCS_TOKEN: "docs-token",
+            MCP_TYPE: "stdio",
+          },
+        }).pipe(
+          Effect.provideService(CursorAgentSdk.CursorAgentSdkRunner, {
+            assertComplete: Effect.void,
+            open: (input) =>
+              Effect.sync(() => {
+                openedWith = input.options;
+                return {
+                  agentId: "native-cursor-mcp",
+                  listMessages: Effect.succeed([]),
+                  close: Effect.void,
+                  send: (sendInput) => {
+                    sentWith.push(sendInput.options?.mcpServers);
+                    return Effect.die("sent");
+                  },
+                };
+              }),
+          }),
+          Effect.provide(TestProviderHost.layer({ cwd })),
+        );
+        const runtime = yield* adapter.openSession({
+          threadId,
+          providerSessionId: ProviderSessionId.make("cursor-mcp-session"),
+          modelSelection,
+          runtimePolicy,
+        });
+        const providerThread = yield* runtime
+          .ensureThread({ threadId, modelSelection, runtimePolicy })
+          .pipe(
+            Effect.provideService(HostProcess.HomeDirectory, home),
+            Effect.provideService(HostProcess.Environment, {}),
+          );
+        const now = yield* DateTime.now;
+        const sendTurn = (ordinal: number) =>
+          runtime
+            .startTurn({
+              threadId,
+              providerThread,
+              modelSelection,
+              runtimePolicy,
+              runId: RunId.make(`cursor-mcp-run-${ordinal}`),
+              runOrdinal: ordinal,
+              providerTurnOrdinal: ordinal,
+              attemptId: RunAttemptId.make(`cursor-mcp-attempt-${ordinal}`),
+              rootNodeId: NodeId.make(`cursor-mcp-root-${ordinal}`),
+              appThread: {
+                id: threadId,
+                projectId: ProjectId.make("cursor-mcp-project"),
+                createdBy: "user",
+                creationSource: "web",
+                title: "Cursor MCP",
+                providerInstanceId: instanceId,
+                modelSelection,
+                runtimeMode: "full-access",
+                interactionMode: "default",
+                branch: null,
+                worktreePath: null,
+                activeProviderThreadId: providerThread.id,
+                lineage: {
+                  parentThreadId: null,
+                  relationshipToParent: null,
+                  rootThreadId: threadId,
+                },
+                forkedFrom: null,
+                createdAt: now,
+                updatedAt: now,
+                archivedAt: null,
+                settledOverride: null,
+                settledAt: null,
+                lastVisitedAt: null,
+                deletedAt: null,
+              },
+              message: {
+                messageId: MessageId.make(`cursor-mcp-message-${ordinal}`),
+                createdBy: "user",
+                creationSource: "web",
+                text: "Hello.",
+                attachments: [],
+              },
+            })
+            .pipe(
+              Effect.exit,
+              Effect.provideService(HostProcess.HomeDirectory, home),
+              Effect.provideService(HostProcess.Environment, {}),
+            );
+
+        const expectedServers = {
+          repro: {
+            command: "node",
+            args: [`${projectRoot}/server.mjs`],
+            startupTimeoutSec: 120,
+            cwd: projectRoot,
+          },
+          "cwd-only": { command: "node", args: ["server.mjs"], cwd: projectRoot },
+        };
+        // The agent is created with T3's server only; the resolved servers go with each turn.
+        assert.deepEqual(openedWith?.mcpServers, t3Servers);
+        yield* sendTurn(1);
+        assert.deepEqual(sentWith[0], { ...expectedServers, ...t3Servers });
+        // A server switched off between turns stays off on the next one.
+        yield* fileSystem.writeFileString(
+          path.join(home, ".cursor", "projects", projectDirectory, "mcp-disabled.json"),
+          JSON.stringify(["off", "repro"]),
+        );
+        yield* sendTurn(2);
+        const { repro: _disabled, ...stillEnabled } = expectedServers;
+        assert.deepEqual(sentWith[1], { ...stillEnabled, ...t3Servers });
+        // Unreadable disabled state starts none of the overrides, and the turn still goes out.
+        yield* fileSystem.writeFileString(
+          path.join(home, ".cursor", "projects", projectDirectory, "mcp-disabled.json"),
+          "[",
+        );
+        yield* sendTurn(3);
+        assert.deepEqual(sentWith[2], t3Servers);
+        yield* fileSystem.writeFileString(
+          path.join(workspace, ".cursor", "mcp.json"),
+          JSON.stringify({ mcpServers: { plain: { command: "node", args: ["server.mjs"] } } }),
+        );
+        yield* fileSystem.remove(path.join(home, ".cursor", "mcp.json"));
+        assert.deepEqual(yield* loadServers(), {});
+      }).pipe(
+        Effect.scoped,
+        Effect.provide(
+          Layer.mergeAll(NodeServices.layer, IdAllocator.layer, McpProviderSessions.layer),
+        ),
+      ),
+  );
+
   it("recognizes direct and SDK-wrapped abort failures as cancellation", () => {
     assert.isTrue(CursorAgentSdk.isCursorCancellationError({ name: "AbortError" }));
     assert.isTrue(
diff --git a/packages/provider-cursor/src/server/adapter.ts b/packages/provider-cursor/src/server/adapter.ts
index 243cf7341d40..6b3be72833b9 100644
--- a/packages/provider-cursor/src/server/adapter.ts
+++ b/packages/provider-cursor/src/server/adapter.ts
@@ -37,6 +37,7 @@ import * as Effect from "effect/Effect";
 import * as FileSystem from "effect/FileSystem";
 import * as Option from "effect/Option";
 import * as Path from "effect/Path";
+import * as ChildProcessSpawner from "effect/process/ChildProcessSpawner";
 import * as Queue from "effect/Queue";
 import * as Ref from "effect/Ref";
 import * as Schema from "effect/Schema";
@@ -55,6 +56,7 @@ import {
   hasCursorSkillMention,
   rewriteCursorSkillMentions,
 } from "./skills.ts";
+import { cursorWorkspaceMcpServers } from "./workspaceMcpServers.ts";
 import { t3OrchestrationPrompt } from "@t3tools/provider-core/server/orchestrationInstructions";
 import { buildRuntimeInstructions } from "@t3tools/provider-core/server/runtimeInstructions";
 import * as IdAllocator from "@t3tools/provider-core/server/IdAllocator";
@@ -305,6 +307,7 @@ const CURSOR_AGENT_SETTING_SOURCES = [
 export function makeCursorAgentOptions(input: {
   readonly apiKey?: string;
   readonly modelSelection: ModelSelection;
+  readonly models?: ReadonlyArray<ServerProviderModel>;
   readonly runtimePolicy: ProviderAdapter.ProviderAdapterV2RuntimePolicy;
   readonly threadId: ThreadId;
   readonly mcpSession: McpProviderSession.McpProviderSessionConfig | undefined;
@@ -313,7 +316,7 @@ export function makeCursorAgentOptions(input: {
   const policy = cursorRuntimeAgentPolicy(input.runtimePolicy, input.platform);
   const mcpServers = cursorMcpServers(input.mcpSession);
   return {
-    model: cursorSdkModelSelection(input.modelSelection),
+    model: cursorSdkModelSelection(input.modelSelection, input.models),
     name: `T3 Code ${input.threadId}`,
     mode: input.runtimePolicy.interactionMode === "plan" ? "plan" : "agent",
     ...(input.apiKey === undefined ? {} : { apiKey: input.apiKey }),
@@ -979,6 +982,7 @@ export const makeCursorAdapterV2 = Effect.fn("makeCursorAdapterV2")(function* (
   options: CursorAdapterV2Options,
 ) {
   const fileSystem = yield* FileSystem.FileSystem;
+  const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
   const path = yield* Path.Path;
   const idAllocator = yield* IdAllocator.IdAllocatorV2;
   const runner = yield* CursorAgentSdk.CursorAgentSdkRunner;
@@ -2245,6 +2249,22 @@ export const makeCursorAdapterV2 = Effect.fn("makeCursorAdapterV2")(function* (
           }
         };
 
+        const resolveWorkspaceMcpServers = (cwd: string | null) =>
+          cwd === null
+            ? Effect.succeed({})
+            : cursorWorkspaceMcpServers(cwd, adapterOptions.environment).pipe(
+                Effect.provideService(FileSystem.FileSystem, fileSystem),
+                Effect.provideService(Path.Path, path),
+                Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, spawner),
+                // Unreadable Cursor state leaves startup to the SDK rather than failing the turn.
+                Effect.catch((cause) =>
+                  Effect.logWarning("orchestration-v2.cursor-workspace-mcp-unresolved", {
+                    cwd,
+                    cause,
+                  }).pipe(Effect.as({})),
+                ),
+              );
+
         const openAgent = Effect.fnUntraced(function* (openInput: {
           readonly operation: "create" | "resume";
           readonly threadId: ThreadId;
@@ -2277,6 +2297,7 @@ export const makeCursorAdapterV2 = Effect.fn("makeCursorAdapterV2")(function* (
           const options = makeCursorAgentOptions({
             ...(apiKey === undefined ? {} : { apiKey }),
             modelSelection: openInput.modelSelection,
+            models: adapterOptions.getModels?.() ?? [],
             runtimePolicy: openInput.runtimePolicy,
             platform,
             threadId: openInput.threadId,
@@ -2456,15 +2477,25 @@ export const makeCursorAdapterV2 = Effect.fn("makeCursorAdapterV2")(function* (
             const compacted = prompt === undefined;
             const pendingUpdates: Array<InteractionUpdate> = [];
             let context: ActiveCursorTurn | null = null;
-            // Create-time and send-time mcpServers merge with settingSources (SDK >= 1.0.39).
+            // A send-time set replaces the create-time set, so the workspace servers go only here and are
+            // read again each turn from mcp.json and mcp-disabled.json; both merge with settingSources.
+            const turnMcpServers = {
+              ...(yield* resolveWorkspaceMcpServers(turnInput.runtimePolicy.cwd)),
+              ...mcpServers,
+            };
             const sdkRun = yield* agent.session
               .send({
                 message,
                 summarize: compacted,
                 options: {
-                  model: cursorSdkModelSelection(turnInput.modelSelection),
+                  model: cursorSdkModelSelection(
+                    turnInput.modelSelection,
+                    adapterOptions.getModels?.() ?? [],
+                  ),
                   mode: turnInput.runtimePolicy.interactionMode === "plan" ? "plan" : "agent",
-                  ...(mcpServers === undefined ? {} : { mcpServers }),
+                  ...(Object.keys(turnMcpServers).length === 0
+                    ? {}
+                    : { mcpServers: turnMcpServers }),
                 },
                 onDelta: (update) => {
                   if (context === null) {
@@ -2961,6 +2992,7 @@ export const makeCursorAdapterV2 = Effect.fn("makeCursorAdapterV2")(function* (
 
 export type CursorAdapterV2DriverEnv =
   | CursorAgentSdk.CursorAgentSdkRunner
+  | ChildProcessSpawner.ChildProcessSpawner
   | FileSystem.FileSystem
   | Path.Path
   | IdAllocator.IdAllocatorV2
diff --git a/packages/provider-cursor/src/server/auth.test.ts b/packages/provider-cursor/src/server/auth.test.ts
index d4ad401b69b5..e8e59cfc8e59 100644
--- a/packages/provider-cursor/src/server/auth.test.ts
+++ b/packages/provider-cursor/src/server/auth.test.ts
@@ -124,7 +124,7 @@ it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))("CursorAuth", (it
       expect(closedRequest).toBe(true);
       expect(Exit.isFailure(yield* Fiber.await(request))).toBe(true);
       expect(yield* harness.auth.readApiKey).toBeUndefined();
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("completes a remote browser login, saves its key and refreshes provider status", () =>
@@ -152,7 +152,7 @@ it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))("CursorAuth", (it
       expect(harness.changes).toEqual([true]);
       expect(Object.values(succeeded)).not.toContain("browser-key");
       expect(yield* Effect.promise(() => harness.store.load())).toEqual(harness.credentials);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("keeps the login link private to its owner and rejects other clients' mutations", () =>
@@ -177,7 +177,7 @@ it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))("CursorAuth", (it
         ),
       ).toBe(true);
       expect((yield* phase(auth, "waiting")).authorizationUrl).toBe(authorizationUrl);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("aborts cancellation and ignores a late successful SDK login", () => {
@@ -227,7 +227,7 @@ it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))("CursorAuth", (it
       yield* harness.auth.controller.start(owner);
       yield* phase(harness.auth, "succeeded");
       expect(yield* harness.auth.requireApiKey).toBe("browser-key");
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("shows a fixed reason when browser login fails and logs the SDK cause", () => {
@@ -264,7 +264,7 @@ it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))("CursorAuth", (it
       expect(yield* harness.auth.readApiKey).toBeUndefined();
       expect(yield* other.auth.requireApiKey).toBe("other-key");
       expect(harness.changes).toEqual([false]);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("cancels a pending sign-in on logout without saving its eventual key", () =>
@@ -277,7 +277,7 @@ it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))("CursorAuth", (it
       yield* Effect.sync(() => harness.complete.resolve());
       yield* Effect.promise(() => harness.returned.promise);
       expect(yield* harness.auth.readApiKey).toBeUndefined();
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("retains credentials if sessions cannot be stopped for logout", () =>
@@ -297,7 +297,7 @@ it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))("CursorAuth", (it
       );
       expect(Exit.isFailure(result)).toBe(true);
       expect(yield* harness.auth.requireApiKey).toBe("browser-key");
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect(
@@ -313,7 +313,7 @@ it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))("CursorAuth", (it
         ).toBe(true);
         expect(harness.loginOptions()).toBeUndefined();
         expect((yield* Effect.promise(() => harness.store.load()))?.apiKey).toBe("browser-key");
-      }).pipe(Effect.scoped),
+      }),
   );
 
   it.effect("ignores expired browser credentials and rejects disabled sign-in", () =>
@@ -324,6 +324,6 @@ it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))("CursorAuth", (it
       );
       expect(yield* harness.auth.readApiKey).toBeUndefined();
       expect(Exit.isFailure(yield* Effect.exit(harness.auth.controller.start(owner)))).toBe(true);
-    }).pipe(Effect.scoped),
+    }),
   );
 });
diff --git a/packages/provider-cursor/src/server/driver.test.ts b/packages/provider-cursor/src/server/driver.test.ts
index 164118085d23..213d413b6dee 100644
--- a/packages/provider-cursor/src/server/driver.test.ts
+++ b/packages/provider-cursor/src/server/driver.test.ts
@@ -45,7 +45,7 @@ const layerTest = TestProviderHost.layer({ runBackgroundWork: false }).pipe(
   Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
   Layer.provideMerge(IdAllocator.layer),
   Layer.provideMerge(McpProviderSessions.layer),
-  Layer.provideMerge(CursorSdk.layer),
+  Layer.provideMerge(CursorSdk.layer.pipe(Layer.provide(NodeServices.layer))),
   Layer.provideMerge(
     Layer.mock(CursorAgentSdk.CursorAgentSdkRunner)({
       open: () => Effect.die("Maintenance resolution must not open a Cursor session"),
@@ -183,7 +183,7 @@ it.layer(layerTest)("CursorDriver", (it) => {
         ).toBe("Failure");
         expect(openedKeys).toEqual(["instance-browser-key"]);
         expect(closed).toBe(1);
-      }).pipe(Effect.scoped),
+      }),
   );
 
   it.effect("budgets handoffs for the SDK model across catalog refreshes and option changes", () =>
@@ -389,7 +389,7 @@ it.layer(layerTest)("CursorDriver", (it) => {
           allowance: DEFAULT_HANDOFF_TOKEN_CAP,
         },
         catalogDefault: {
-          model: { id: "claude-opus-5-5" },
+          model: { id: "claude-opus-5-5", params: [{ id: "context", value: "1m" }] },
           window: 1_000_000,
           allowance: DEFAULT_HANDOFF_TOKEN_CAP,
         },
@@ -405,6 +405,6 @@ it.layer(layerTest)("CursorDriver", (it) => {
         },
         retainedDefault: catalogDefault,
       });
-    }).pipe(Effect.scoped),
+    }),
   );
 });
diff --git a/packages/provider-cursor/src/server/driver.ts b/packages/provider-cursor/src/server/driver.ts
index ef50abb0a93b..85ab45b107d7 100644
--- a/packages/provider-cursor/src/server/driver.ts
+++ b/packages/provider-cursor/src/server/driver.ts
@@ -208,6 +208,7 @@ export const CursorDriver: ProviderDriver<
       processEnv,
       auth.requireApiKey,
       auth.withAccess,
+      () => catalogModels,
     );
 
     const checkProvider = auth.readApiKey.pipe(
diff --git a/packages/provider-cursor/src/server/sdkModel.test.ts b/packages/provider-cursor/src/server/sdkModel.test.ts
new file mode 100644
index 000000000000..4ad129e1ae23
--- /dev/null
+++ b/packages/provider-cursor/src/server/sdkModel.test.ts
@@ -0,0 +1,73 @@
+import { ProviderInstanceId } from "@t3tools/contracts";
+import { describe, expect, it } from "vite-plus/test";
+
+import { cursorSdkModelSelection } from "./sdkModel.ts";
+import { buildCursorDiscoveredModelsFromSdk } from "./status.ts";
+
+const instanceId = ProviderInstanceId.make("cursor");
+const models = buildCursorDiscoveredModelsFromSdk([
+  {
+    id: "grok-4.5",
+    displayName: "Grok 4.5",
+    parameters: [
+      {
+        id: "effort",
+        displayName: "Effort",
+        values: [{ value: "low" }, { value: "medium" }, { value: "high" }],
+      },
+      { id: "fast", displayName: "Fast", values: [{ value: "false" }, { value: "true" }] },
+    ],
+    variants: [
+      {
+        displayName: "Grok 4.5 High Fast",
+        isDefault: true,
+        params: [
+          { id: "effort", value: "high" },
+          { id: "fast", value: "true" },
+        ],
+      },
+    ],
+  },
+]);
+
+describe("cursorSdkModelSelection", () => {
+  it.each([
+    {
+      name: "fills unset catalog parameters and keeps Fast off",
+      options: undefined,
+      params: [
+        { id: "effort", value: "high" },
+        { id: "fast", value: "false" },
+      ],
+    },
+    {
+      name: "keeps explicit options",
+      options: [
+        { id: "effort", value: "low" },
+        { id: "fastMode", value: true },
+      ],
+      params: [
+        { id: "effort", value: "low" },
+        { id: "fast", value: "true" },
+      ],
+    },
+  ])("$name", ({ options, params }) => {
+    const selection = cursorSdkModelSelection(
+      { instanceId, model: "grok-4.5", ...(options === undefined ? {} : { options }) },
+      models,
+    );
+    expect({
+      ...selection,
+      params: selection.params?.toSorted((a, b) => a.id.localeCompare(b.id)),
+    }).toEqual({
+      id: "grok-4.5",
+      params,
+    });
+  });
+
+  it("sends no parameters for a model missing from the catalog", () => {
+    expect(cursorSdkModelSelection({ instanceId, model: "auto" }, models)).toEqual({
+      id: "default",
+    });
+  });
+});
diff --git a/packages/provider-cursor/src/server/sdkModel.ts b/packages/provider-cursor/src/server/sdkModel.ts
index fec0bafc45ee..ec2a53b6aea7 100644
--- a/packages/provider-cursor/src/server/sdkModel.ts
+++ b/packages/provider-cursor/src/server/sdkModel.ts
@@ -55,13 +55,27 @@ export function cursorContextWindowTokens(
   return Number.isSafeInteger(tokens) && tokens > 0 ? tokens : undefined;
 }
 
-export function cursorSdkModelSelection(modelSelection: ModelSelection): CursorSdkModelSelection {
+export function cursorSdkModelSelection(
+  modelSelection: ModelSelection,
+  models: ReadonlyArray<ServerProviderModel> = [],
+): CursorSdkModelSelection {
+  const explicit = modelSelection.options ?? [];
+  const descriptors =
+    models.find((model) => model.slug === modelSelection.model)?.capabilities?.optionDescriptors ??
+    [];
+  // Some Cursor plans reject runs that leave a catalog parameter unset; T3 keeps Fast off until picked.
+  const defaults = descriptors.flatMap((descriptor) => {
+    if (explicit.some((option) => option.id === descriptor.id)) return [];
+    const value = descriptor.id === "fastMode" ? false : getProviderOptionCurrentValue(descriptor);
+    return value === undefined ? [] : [{ id: descriptor.id, value }];
+  });
+  const options = [...explicit, ...defaults];
   return {
     id: modelSelection.model === "auto" ? "default" : modelSelection.model,
-    ...(modelSelection.options === undefined || modelSelection.options.length === 0
+    ...(options.length === 0
       ? {}
       : {
-          params: modelSelection.options.map((option): ModelParameterValue => ({
+          params: options.map((option): ModelParameterValue => ({
             id: cursorSdkParameterId(option.id),
             value: String(option.value),
           })),
diff --git a/packages/provider-cursor/src/server/status.test.ts b/packages/provider-cursor/src/server/status.test.ts
index ddbddcac1f1e..9854fb7c2697 100644
--- a/packages/provider-cursor/src/server/status.test.ts
+++ b/packages/provider-cursor/src/server/status.test.ts
@@ -197,6 +197,33 @@ describe("checkCursorProviderStatus", () => {
     }),
   );
 
+  it.effect("allows slow SDK discovery with a configured readiness timeout", () =>
+    Effect.gen(function* () {
+      const fiber = yield* checkCursorProviderStatus(baseCursorSettings, {
+        CURSOR_API_KEY: "test-key",
+        T3CODE_CURSOR_PROBE_TIMEOUT_MS: "30000",
+      }).pipe(
+        Effect.provide(
+          CursorSdkCatalog.layerTest(() =>
+            Effect.sleep("20 seconds").pipe(
+              Effect.as({
+                user: {
+                  apiKeyName: "test",
+                  userEmail: "cursor@example.com",
+                  createdAt: "2026-01-01",
+                },
+                models: [sdkParameterizedModel],
+              }),
+            ),
+          ),
+        ),
+        Effect.forkChild,
+      );
+      yield* TestClock.adjust("20 seconds");
+      expect((yield* Fiber.join(fiber)).status).toBe("ready");
+    }),
+  );
+
   it.effect("surfaces SDK authentication failures", () =>
     Effect.gen(function* () {
       const provider = yield* checkCursorProviderStatus(baseCursorSettings, {
diff --git a/packages/provider-cursor/src/server/status.ts b/packages/provider-cursor/src/server/status.ts
index 0330fcaca0bc..0c4d8ae031aa 100644
--- a/packages/provider-cursor/src/server/status.ts
+++ b/packages/provider-cursor/src/server/status.ts
@@ -1,3 +1,4 @@
+import { resolveProviderProbeTimeoutMs } from "@t3tools/provider-core/server/snapshotProbe";
 import type { SDKModel, SDKUser } from "@cursor/sdk";
 import type {
   ModelCapabilities,
@@ -286,8 +287,13 @@ export const checkCursorProviderStatus = Effect.fn("checkCursorProviderStatus")(
   }
 
   const sdkCatalog = yield* CursorSdkCatalog.CursorSdkCatalog;
+  const timeoutMs = resolveProviderProbeTimeoutMs(
+    "cursor",
+    CURSOR_SDK_CATALOG_TIMEOUT_MS,
+    environment,
+  );
   const readCatalog = Effect.suspend(() => sdkCatalog.read(sdkApiKey)).pipe(
-    Effect.timeoutOption(CURSOR_SDK_CATALOG_TIMEOUT_MS),
+    Effect.timeoutOption(timeoutMs),
   );
   // api.cursor.com latency is intermittent; one slow read should not flip the provider to error.
   const catalogResult = yield* readCatalog.pipe(
@@ -338,7 +344,7 @@ export const checkCursorProviderStatus = Effect.fn("checkCursorProviderStatus")(
         version: null,
         status: "error",
         auth: { status: "unknown" },
-        message: `Cursor SDK catalog request timed out after ${CURSOR_SDK_CATALOG_TIMEOUT_MS}ms.`,
+        message: `Cursor SDK catalog request timed out after ${timeoutMs}ms.`,
       },
     });
   }
diff --git a/packages/provider-cursor/src/server/textGeneration.test.ts b/packages/provider-cursor/src/server/textGeneration.test.ts
index bfb02df390d8..a4b3c039cf92 100644
--- a/packages/provider-cursor/src/server/textGeneration.test.ts
+++ b/packages/provider-cursor/src/server/textGeneration.test.ts
@@ -5,6 +5,7 @@ import { describe, expect, it } from "@effect/vitest";
 import * as Effect from "effect/Effect";
 import * as FileSystem from "effect/FileSystem";
 import * as Layer from "effect/Layer";
+import * as Path from "effect/Path";
 import * as Schema from "effect/Schema";
 import { createModelSelection } from "@t3tools/shared/model";
 import { beforeEach, vi } from "vite-plus/test";
@@ -40,7 +41,7 @@ const layerFs = FileSystem.layerNoop({
   exists: () => Effect.succeed(hasCustomPolicy),
   makeTempDirectoryScoped: () => Effect.succeed("/isolated-text-generation"),
 });
-const layerTest = Layer.merge(layerFs, CursorSdk.layer);
+const layerTest = CursorSdk.layer.pipe(Layer.provideMerge(Layer.merge(layerFs, Path.layer)));
 
 const decodeCursorSettings = Schema.decodeSync(CursorSettings);
 const cursorSettings = decodeCursorSettings({ enabled: true });
diff --git a/packages/provider-cursor/src/server/textGeneration.ts b/packages/provider-cursor/src/server/textGeneration.ts
index 278839558ee9..82982dfabbb5 100644
--- a/packages/provider-cursor/src/server/textGeneration.ts
+++ b/packages/provider-cursor/src/server/textGeneration.ts
@@ -5,7 +5,11 @@ import * as Effect from "effect/Effect";
 import * as Option from "effect/Option";
 import * as Schema from "effect/Schema";
 
-import { type ProviderSetupError, TextGenerationError } from "@t3tools/contracts";
+import {
+  type ProviderSetupError,
+  type ServerProviderModel,
+  TextGenerationError,
+} from "@t3tools/contracts";
 import type { CursorSettings } from "../settings.ts";
 
 import * as TextGenerationOperations from "@t3tools/provider-core/server/textGenerationOperations";
@@ -51,6 +55,7 @@ export const makeCursorTextGeneration = Effect.fn("makeCursorTextGeneration")(fu
   environment?: NodeJS.ProcessEnv,
   resolveApiKey?: Effect.Effect<string, ProviderSetupError>,
   withAccess?: CursorAuth["withAccess"],
+  getModels?: () => ReadonlyArray<ServerProviderModel>,
 ) {
   const fs = yield* FileSystem.FileSystem;
   const sdk = yield* CursorSdk.CursorSdk;
@@ -117,7 +122,7 @@ export const makeCursorTextGeneration = Effect.fn("makeCursorTextGeneration")(fu
       const agentOptions = {
         apiKey,
         mode: "plan",
-        model: cursorSdkModelSelection(modelSelection),
+        model: cursorSdkModelSelection(modelSelection, getModels?.() ?? []),
         local: {
           cwd,
           store,
diff --git a/packages/provider-cursor/src/server/workspaceMcpServers.ts b/packages/provider-cursor/src/server/workspaceMcpServers.ts
new file mode 100644
index 000000000000..f3e53b508e3b
--- /dev/null
+++ b/packages/provider-cursor/src/server/workspaceMcpServers.ts
@@ -0,0 +1,175 @@
+// The SDK leaves editor variables literal; agent-level stdio clients take precedence.
+import type { McpServerConfig } from "@cursor/sdk";
+import * as Effect from "effect/Effect";
+import * as FileSystem from "effect/FileSystem";
+import * as Option from "effect/Option";
+import * as Path from "effect/Path";
+import * as Schema from "effect/Schema";
+import * as ChildProcess from "effect/process/ChildProcess";
+import { spawnAndCollect } from "@t3tools/provider-core/server/snapshotProbe";
+import { parse as parseJsonc, type ParseError } from "jsonc-parser";
+import * as HostProcess from "@t3tools/shared/HostProcess";
+
+// The SDK's own placeholder grammar: `${env:NAME}`, `${NAME}` and `${NAME:-default}`.
+const PLACEHOLDER_PATTERN = /\$\{(?:env:([A-Za-z_][A-Za-z0-9_]*)|([^:}]+)(?::-([^}]*))?)\}/g;
+const WORKSPACE_VARIABLE_PATTERN =
+  /\$\{(?:workspaceFolder|workspaceFolderBasename|userHome|pathSeparator|\/)\}/;
+const WORKSPACE_PATH_PATTERN = /^\$\{(?:workspaceFolder|userHome)\}[\\/]/;
+// These exit when their script argument is missing; other arguments may be labels a server ignores.
+const SCRIPT_INTERPRETERS = new Set(["node", "bun", "tsx", "python", "python3"]);
+
+const StringRecord = Schema.Record(Schema.String, Schema.String);
+const CursorMcpFile = Schema.Struct({
+  mcpServers: Schema.Record(
+    Schema.String,
+    Schema.Union([
+      Schema.Struct({
+        type: Schema.optional(Schema.Literal("stdio")),
+        command: Schema.String,
+        args: Schema.optional(Schema.Array(Schema.String)),
+        env: Schema.optional(StringRecord),
+        cwd: Schema.optional(Schema.String),
+        startupTimeoutSec: Schema.optional(Schema.Number),
+      }),
+      Schema.Struct({
+        type: Schema.optional(Schema.Literals(["http", "sse"])),
+        url: Schema.String,
+      }),
+    ]),
+  ),
+});
+const decodeCursorMcpFile = Schema.decodeUnknownOption(CursorMcpFile);
+const decodeDisabledServers = Schema.decodeEffect(
+  Schema.fromJsonString(Schema.Array(Schema.String)),
+);
+
+function expand<A>(value: A, resolve: (text: string) => string): A {
+  if (typeof value === "string") return resolve(value) as A;
+  if (Array.isArray(value)) return value.map((item: unknown) => expand(item, resolve)) as A;
+  if (typeof value === "object" && value !== null) {
+    return Object.fromEntries(
+      Object.entries(value).map(([key, item]) => [key, expand(item, resolve)]),
+    ) as A;
+  }
+  return value;
+}
+
+// Only servers whose literal copy cannot start: the SDK also starts the file-defined copy and
+// loses its handle when it keeps the inline one, and inline configs drop envFile and enabledTools.
+function needsWorkspaceExpansion(server: unknown): boolean {
+  if (typeof server !== "object" || server === null) return false;
+  if ("envFile" in server || "enabledTools" in server) return false;
+  const { command, cwd, args } = server as Record<string, unknown>;
+  return (
+    [command, cwd].some(
+      (text) => typeof text === "string" && WORKSPACE_VARIABLE_PATTERN.test(text),
+    ) ||
+    (typeof command === "string" &&
+      SCRIPT_INTERPRETERS.has(command.replace(/^.*[\\/]/, "").replace(/\.exe$/i, "")) &&
+      Array.isArray(args) &&
+      typeof args[0] === "string" &&
+      WORKSPACE_PATH_PATTERN.test(args[0]))
+  );
+}
+
+/** Cursor's project slug, as `~/.cursor/projects/<slug>` names it. */
+function cursorProjectSlug(projectRoot: string): string {
+  return projectRoot
+    .replace(/[^a-zA-Z0-9]/g, "-")
+    .replace(/-+/g, "-")
+    .replace(/^-+|-+$/g, "");
+}
+
+export const cursorWorkspaceMcpServers = Effect.fn("cursorWorkspaceMcpServers")(function* (
+  cwd: string,
+  environment: NodeJS.ProcessEnv,
+) {
+  const fileSystem = yield* FileSystem.FileSystem;
+  const path = yield* Path.Path;
+  const readJsonc = (file: string) =>
+    fileSystem.readFileString(file).pipe(
+      Effect.map((contents): unknown => {
+        const errors: ParseError[] = [];
+        const value: unknown = parseJsonc(contents, errors, { allowTrailingComma: true });
+        return errors.length === 0 ? value : null;
+      }),
+      Effect.catchIf(
+        (error) => error.reason._tag === "NotFound",
+        () => Effect.void,
+      ),
+    );
+
+  const hostEnvironment = yield* HostProcess.Environment;
+  const root = yield* spawnAndCollect(
+    "git",
+    ChildProcess.make("git", ["rev-parse", "--show-toplevel"], { cwd }),
+  ).pipe(Effect.option);
+  const projectRoot = Option.isSome(root) && root.value.code === 0 ? root.value.stdout.trim() : cwd;
+  const userHome = yield* HostProcess.HomeDirectory;
+  const cursorDataDirectory = hostEnvironment.CURSOR_DATA_DIR || path.join(userHome, ".cursor");
+  const loadDisabled = fileSystem
+    .readFileString(
+      path.join(
+        cursorDataDirectory,
+        "projects",
+        cursorProjectSlug(projectRoot),
+        "mcp-disabled.json",
+      ),
+    )
+    .pipe(
+      Effect.catchIf(
+        (error) => error.reason._tag === "NotFound",
+        () => Effect.succeed("[]"),
+      ),
+      Effect.flatMap(decodeDisabledServers),
+      Effect.map((names) => new Set(names)),
+    );
+  let disabled: Set<string> | undefined;
+  const variables = new Map([
+    ["workspaceFolder", projectRoot],
+    ["workspaceFolderBasename", path.basename(projectRoot)],
+    ["userHome", userHome],
+    ["pathSeparator", path.sep],
+    ["/", path.sep],
+  ]);
+  const resolve = (text: string) =>
+    text.replace(
+      PLACEHOLDER_PATTERN,
+      (match, envName: string | undefined, name: string, fallback: string | undefined) =>
+        (envName === undefined
+          ? (variables.get(name) ?? environment[name] ?? fallback)
+          : (environment[envName] ?? "")) ?? match,
+    );
+
+  const seen = new Set<string>();
+  const servers: Record<string, McpServerConfig> = {};
+  for (const file of [
+    path.join(projectRoot, ".cursor", "mcp.json"),
+    path.join(userHome, ".cursor", "mcp.json"),
+  ]) {
+    const contents = yield* readJsonc(file);
+    // Like the SDK, expand before validating, so `"type": "${env:TYPE}"` is valid.
+    const config = decodeCursorMcpFile(expand(contents, resolve));
+    if (Option.isNone(config)) continue;
+    const rawServers = (
+      contents as {
+        readonly mcpServers: Record<string, unknown>;
+      }
+    ).mcpServers;
+    for (const [name, server] of Object.entries(config.value.mcpServers)) {
+      if (seen.has(name)) continue;
+      seen.add(name);
+      // Plugin definitions take precedence in the SDK, which can see enabled plugins.
+      if (
+        "command" in server &&
+        !name.startsWith("plugin-") &&
+        needsWorkspaceExpansion(rawServers[name])
+      ) {
+        disabled ??= yield* loadDisabled;
+        if (disabled.has(name)) continue;
+        servers[name] = { ...server, cwd: server.cwd ?? projectRoot } as McpServerConfig;
+      }
+    }
+  }
+  return servers;
+});
diff --git a/packages/provider-fx/src/server/driver.test.ts b/packages/provider-fx/src/server/driver.test.ts
index b09ef594134d..102f4fe1d749 100644
--- a/packages/provider-fx/src/server/driver.test.ts
+++ b/packages/provider-fx/src/server/driver.test.ts
@@ -76,6 +76,6 @@ it.layer(layerTest)("FxDriver binary path", (it) => {
       assert.isNotEmpty(launches);
       assert.deepEqual([...new Set(launches)], [path.join("/test-home", ".local", "bin", "fx")]);
       assert.isTrue(snapshot.installed);
-    }).pipe(Effect.scoped),
+    }),
   );
 });
diff --git a/packages/provider-fx/src/server/skills.test.ts b/packages/provider-fx/src/server/skills.test.ts
index 5843aaf22b30..c1cb7102a2b1 100644
--- a/packages/provider-fx/src/server/skills.test.ts
+++ b/packages/provider-fx/src/server/skills.test.ts
@@ -52,7 +52,7 @@ describe("discoverFxSkills", () => {
           "home-claude",
         ],
       );
-    }).pipe(Effect.provide(NodeServices.layer), Effect.scoped),
+    }).pipe(Effect.provide(NodeServices.layer)),
   );
 
   // For `$review` with two skills of exactly that name, fx's model loads the
@@ -159,7 +159,7 @@ describe("discoverFxSkills", () => {
           ["Review", path.join(home, ".claude/skills/review/SKILL.md")],
         ],
       );
-    }).pipe(Effect.provide(NodeServices.layer), Effect.scoped),
+    }).pipe(Effect.provide(NodeServices.layer)),
   );
 
   // Nix home-manager and dotfile setups link ~/.fx/skills; fx then loads
@@ -194,6 +194,6 @@ describe("discoverFxSkills", () => {
         skills.map((skill) => skill.name),
         ["compat"],
       );
-    }).pipe(Effect.provide(NodeServices.layer), Effect.scoped),
+    }).pipe(Effect.provide(NodeServices.layer)),
   );
 });
diff --git a/packages/provider-fx/src/server/status.ts b/packages/provider-fx/src/server/status.ts
index d2196dd9c787..581b9549199e 100644
--- a/packages/provider-fx/src/server/status.ts
+++ b/packages/provider-fx/src/server/status.ts
@@ -1,3 +1,4 @@
+import { resolveProviderProbeTimeoutMs } from "@t3tools/provider-core/server/snapshotProbe";
 import { type ServerProviderAuth, type ServerProviderModel } from "@t3tools/contracts";
 import type { FxSettings } from "../settings.ts";
 import { createModelCapabilities } from "@t3tools/shared/model";
@@ -166,7 +167,9 @@ export const checkFxProviderStatus = Effect.fn("checkFxProviderStatus")(function
 
   const probeEnvironment = providerProbeEnvironment(environment);
   const versionResult = yield* runFxCli(settings, ["--version"], probeEnvironment).pipe(
-    Effect.timeoutOption(VERSION_PROBE_TIMEOUT_MS),
+    Effect.timeoutOption(
+      resolveProviderProbeTimeoutMs("fx", VERSION_PROBE_TIMEOUT_MS, environment),
+    ),
     Effect.result,
   );
   if (Result.isFailure(versionResult) || Option.isNone(versionResult.success)) {
@@ -193,7 +196,7 @@ export const checkFxProviderStatus = Effect.fn("checkFxProviderStatus")(function
 
   const read = (args: ReadonlyArray<string>) =>
     runFxCli(settings, args, probeEnvironment).pipe(
-      Effect.timeoutOption(AUTH_PROBE_TIMEOUT_MS),
+      Effect.timeoutOption(resolveProviderProbeTimeoutMs("fx", AUTH_PROBE_TIMEOUT_MS, environment)),
       Effect.map(Option.filter((output) => output.code === 0)),
       Effect.map(Option.map((output) => output.stdout)),
       Effect.orElseSucceed(() => Option.none<string>()),
diff --git a/packages/provider-grok/src/server/driver.test.ts b/packages/provider-grok/src/server/driver.test.ts
index 5987a27c38ad..56fc4d184c99 100644
--- a/packages/provider-grok/src/server/driver.test.ts
+++ b/packages/provider-grok/src/server/driver.test.ts
@@ -168,7 +168,6 @@ it.layer(layerTest)("GrokDriver", (it) => {
             return JSON.stringify({ casks: [{ version: "1.2.4,789" }] });
           }),
         ),
-        Effect.scoped,
       );
     });
   }
@@ -186,9 +185,6 @@ it.layer(layerTest)("GrokDriver", (it) => {
         config: { ...GrokDriver.defaultConfig(), binaryPath: path.join(tempDir, "grok") },
       });
       expect((yield* instance.snapshot.resolveMaintenance()).update).toBeNull();
-    }).pipe(
-      Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, noSpawner),
-      Effect.scoped,
-    ),
+    }).pipe(Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, noSpawner)),
   );
 });
diff --git a/packages/provider-grok/src/server/skills.ts b/packages/provider-grok/src/server/skills.ts
index f06eaa140ba2..a87545c09b90 100644
--- a/packages/provider-grok/src/server/skills.ts
+++ b/packages/provider-grok/src/server/skills.ts
@@ -1,3 +1,4 @@
+import { resolveProviderProbeTimeoutMs } from "@t3tools/provider-core/server/snapshotProbe";
 // The CLI catalog honors ignored/disabled skills and nested plugin skills that flat scans miss.
 import type { ServerProviderSkill } from "@t3tools/contracts";
 import type { GrokSettings } from "../settings.ts";
@@ -112,7 +113,9 @@ export const discoverGrokSkills = Effect.fn("discoverGrokSkills")(function* (
           cause,
         }),
     ),
-    Effect.timeoutOption(GROK_SKILLS_PROBE_TIMEOUT_MS),
+    Effect.timeoutOption(
+      resolveProviderProbeTimeoutMs("grok", GROK_SKILLS_PROBE_TIMEOUT_MS, environment),
+    ),
   );
 
   if (Option.isNone(inspectResult)) {
diff --git a/packages/provider-grok/src/server/status.ts b/packages/provider-grok/src/server/status.ts
index aea0f8120bd5..5c3d0042ce17 100644
--- a/packages/provider-grok/src/server/status.ts
+++ b/packages/provider-grok/src/server/status.ts
@@ -1,3 +1,4 @@
+import { resolveProviderProbeTimeoutMs } from "@t3tools/provider-core/server/snapshotProbe";
 import {
   type CustomModelSetting,
   type ModelCapabilities,
@@ -313,7 +314,7 @@ const probeGrokModels = Effect.fn("GrokProviderStatus.probeGrokModels")(function
   environment: NodeJS.ProcessEnv,
 ) {
   const modelsResult = yield* runGrokCliCommand(grokSettings, ["models"], environment).pipe(
-    Effect.timeoutOption(AUTH_PROBE_TIMEOUT_MS),
+    Effect.timeoutOption(resolveProviderProbeTimeoutMs("grok", AUTH_PROBE_TIMEOUT_MS, environment)),
     Effect.result,
   );
   // Only a clean exit is parsed. Failed invocations print help or error text that
@@ -429,7 +430,12 @@ export const checkGrokProviderStatus = Effect.fn("checkGrokProviderStatus")(func
     grokSettings,
     ["--version"],
     probeEnvironment,
-  ).pipe(Effect.timeoutOption(VERSION_PROBE_TIMEOUT_MS), Effect.result);
+  ).pipe(
+    Effect.timeoutOption(
+      resolveProviderProbeTimeoutMs("grok", VERSION_PROBE_TIMEOUT_MS, environment),
+    ),
+    Effect.result,
+  );
 
   if (Result.isFailure(versionResult)) {
     const error = versionResult.failure;
@@ -517,7 +523,9 @@ export const checkGrokProviderStatus = Effect.fn("checkGrokProviderStatus")(func
   );
 
   const acpExit = yield* discoverGrokMetadataViaAcpInitialize(grokSettings, probeEnvironment).pipe(
-    Effect.timeoutOption(GROK_ACP_INITIALIZE_TIMEOUT_MS),
+    Effect.timeoutOption(
+      resolveProviderProbeTimeoutMs("grok", GROK_ACP_INITIALIZE_TIMEOUT_MS, environment),
+    ),
     Effect.exit,
   );
   const acpMetadata = Exit.isSuccess(acpExit) ? Option.getOrUndefined(acpExit.value) : undefined;
diff --git a/packages/provider-grok/src/server/xaiAcpExtension.test.ts b/packages/provider-grok/src/server/xaiAcpExtension.test.ts
index a74078733d5d..b1a24b2cff81 100644
--- a/packages/provider-grok/src/server/xaiAcpExtension.test.ts
+++ b/packages/provider-grok/src/server/xaiAcpExtension.test.ts
@@ -30,9 +30,11 @@ import {
 import * as AcpSessionRuntime from "@t3tools/provider-acp/server/AcpSessionRuntime";
 import {
   type AcpToolCallState,
+  extractMcpToolCallIdentity,
   mergeToolCallState,
   parseSessionUpdateEvent,
 } from "@t3tools/provider-acp/server/runtimeModel";
+import { compactDynamicToolOutput, htmlRenderFromToolItem } from "@t3tools/shared/toolOutput";
 
 const decodeXAiAskUserQuestionRequest = Schema.decodeUnknownSync(XAiAskUserQuestionRequest);
 
@@ -340,6 +342,80 @@ describe("XAiAcpExtension", () => {
     expect(extractXAiMonitorTaskId(normalized)).toBe("019f44a5-87d1-7640-8e35-6a4667ffc873");
   });
 
+  // regression: #23714 Recorded from Grok 1.0.77 calling stdio MCP tools through `use_tool`.
+  it("rewrites use_tool MCP calls and results into the generic ACP MCP shapes", () => {
+    const meta = { "x.ai/tool": { version: 1, name: "use_tool", kind: "use_tool" } };
+    const grokCall = (
+      toolCallId: string,
+      tool: string,
+      toolInput: Record<string, unknown>,
+      completion: Record<string, unknown>,
+    ) => {
+      const rawInput = { tool_name: tool, tool_input: toolInput };
+      const updates = [
+        { sessionUpdate: "tool_call", toolCallId, title: "use_tool", rawInput, _meta: meta },
+        {
+          sessionUpdate: "tool_call_update",
+          toolCallId,
+          kind: "other",
+          title: tool,
+          rawInput: { variant: "UseTool", ...rawInput },
+          _meta: meta,
+        },
+        { sessionUpdate: "tool_call_update", toolCallId, ...completion },
+      ];
+      let state: AcpToolCallState | undefined;
+      for (const update of updates) {
+        state = normalizeXAiAcpToolCallState(
+          mergeToolCallState(state, parseRecordedToolCallUpdate(update)),
+        );
+      }
+      return state!;
+    };
+    const page = { attachmentId: "abc-html", title: "T", height: 300 };
+
+    const rendered = grokCall(
+      "call-85597c6c-6fb8-4c9c-a6a8-12c4a74ebc96-1",
+      "t3-code__html_render",
+      { path: "a.html" },
+      {
+        status: "completed",
+        rawOutput: {
+          type: "MCP",
+          tool_name: "html_render",
+          server_name: "t3-code",
+          output: { OkayOutput: JSON.stringify({ htmlRender: page, message: "Shown" }) },
+        },
+      },
+    );
+    expect(extractMcpToolCallIdentity(rendered)).toEqual({
+      server: "t3-code",
+      tool: "html_render",
+    });
+    expect(rendered.data.rawInput).toMatchObject({ arguments: { path: "a.html" } });
+    expect(
+      htmlRenderFromToolItem({ toolName: "t3-code.html_render", output: rendered.data.rawOutput }),
+    ).toEqual(page);
+
+    const failed = grokCall(
+      "call-2baebdc5-2446-4ac2-9652-85f97a76a05b-2",
+      "pencil__browser",
+      { action: "load-page" },
+      {
+        status: "failed",
+        rawOutput: {
+          type: "MCP",
+          tool_name: "browser",
+          server_name: "pencil",
+          output: { Error: "Page not found" },
+          is_error: true,
+        },
+      },
+    );
+    expect(extractMcpToolCallIdentity(failed)).toEqual({ server: "pencil", tool: "browser" });
+    expect(compactDynamicToolOutput(failed.data.rawOutput)?.isError).toBe(true);
+  });
+
   it("keeps Monitor ticks running while Grok reports them in progress", () => {
     // Grok 1.0.41 ticks report in_progress with exit_code 0; only _x.ai/task_completed ends the monitor.
     const command = "for i in 1 2 3; do sleep 8; echo tick $i; done";
diff --git a/packages/provider-grok/src/server/xaiAcpExtension.ts b/packages/provider-grok/src/server/xaiAcpExtension.ts
index 022dd327b55b..7181d1927923 100644
--- a/packages/provider-grok/src/server/xaiAcpExtension.ts
+++ b/packages/provider-grok/src/server/xaiAcpExtension.ts
@@ -558,7 +558,54 @@ function resolveXAiAcpToolTitle(toolCall: AcpToolCallState): string | undefined
 }
 
 /** Grok 1.0.41 monitor ticks report exit_code 0 before ending via _x.ai/task_completed. */
-export function normalizeXAiAcpToolCallState(toolCall: AcpToolCallState): AcpToolCallState {
+// Grok calls MCP tools through its `use_tool` built-in as "<server>__<tool>" and wraps results as
+// { type: "MCP", output: { OkayOutput } | { Error } }; rewrite both into the generic ACP MCP shapes.
+function normalizeXAiMcpToolCall(toolCall: AcpToolCallState): AcpToolCallState {
+  const meta = unknownRecord(toolCall.data.meta);
+  const rawInput = unknownRecord(toolCall.data.rawInput);
+  const toolName = nonEmptyString(rawInput?.tool_name) ?? "";
+  const separator = toolName.indexOf("__");
+  const isUseTool =
+    unknownRecord(meta?.["x.ai/tool"])?.name === "use_tool" &&
+    separator > 0 &&
+    separator + 2 < toolName.length;
+  const rawOutput = unknownRecord(toolCall.data.rawOutput);
+  const result = rawOutput?.type === "MCP" ? unknownRecord(rawOutput.output) : undefined;
+  const text =
+    typeof result?.Error === "string"
+      ? result.Error
+      : typeof result?.OkayOutput === "string"
+        ? result.OkayOutput
+        : undefined;
+  if (!isUseTool && text === undefined) return toolCall;
+  return {
+    ...toolCall,
+    data: {
+      ...toolCall.data,
+      ...(isUseTool
+        ? {
+            meta: { ...meta, is_mcp_tool_call: true },
+            rawInput: {
+              server: toolName.slice(0, separator),
+              tool: toolName.slice(separator + 2),
+              arguments: unknownRecord(rawInput?.tool_input) ?? {},
+            },
+          }
+        : {}),
+      ...(text === undefined
+        ? {}
+        : {
+            rawOutput: {
+              ...(typeof result?.Error === "string" ? { isError: true } : {}),
+              content: [{ type: "text", text }],
+            },
+          }),
+    },
+  };
+}
+
+export function normalizeXAiAcpToolCallState(incoming: AcpToolCallState): AcpToolCallState {
+  const toolCall = normalizeXAiMcpToolCall(incoming);
   const resolvedTitle = resolveXAiAcpToolTitle(toolCall);
   const withTitle =
     resolvedTitle !== undefined && resolvedTitle !== toolCall.title
diff --git a/packages/provider-kiro/src/server/adapter.ts b/packages/provider-kiro/src/server/adapter.ts
index 6815b60e8f22..67e837a35b35 100644
--- a/packages/provider-kiro/src/server/adapter.ts
+++ b/packages/provider-kiro/src/server/adapter.ts
@@ -93,25 +93,37 @@ const KiroProviderCapabilitiesV2 = {
 const KiroCompactResult = Schema.Struct({ success: Schema.Boolean });
 const decodeKiroCompactResult = Schema.decodeUnknownOption(KiroCompactResult);
 
-/** Kiro answers a `/compact` prompt as chat, so T3 compacts with Kiro's own request. */
-const compactKiroSession = (
-  runtime: AcpSessionRuntime.AcpSessionRuntime["Service"],
-  sessionId: string,
-) =>
-  runtime.request(KIRO_COMPACT_METHOD, { sessionId }).pipe(
-    Effect.flatMap((result) =>
-      Option.exists(decodeKiroCompactResult(result), (decoded) => decoded.success)
-        ? Effect.void
-        : Effect.fail(
-            new EffectAcpErrors.AcpRequestError({
-              code: -32603,
-              errorMessage: "Kiro could not compact the conversation.",
-              method: KIRO_COMPACT_METHOD,
-              data: result,
-            }),
-          ),
+const decodeKiroExtensionMethods = Schema.decodeUnknownOption(
+  Schema.Struct({ kiro: Schema.Struct({ extensionMethods: Schema.Array(Schema.String) }) }),
+);
+
+/**
+ * Kiro answers a `/compact` prompt as chat, so T3 compacts with Kiro's own request,
+ * on deployments whose `initialize` result lists it among Kiro's extension methods.
+ */
+const kiroCompactSession = {
+  supported: (
+    initializeResult: AcpSessionRuntime.AcpSessionRuntimeStartResult["initializeResult"],
+  ) =>
+    Option.exists(decodeKiroExtensionMethods(initializeResult.agentCapabilities?._meta), (meta) =>
+      meta.kiro.extensionMethods.includes(KIRO_COMPACT_METHOD),
     ),
-  );
+  compact: (runtime: AcpSessionRuntime.AcpSessionRuntime["Service"], sessionId: string) =>
+    runtime.request(KIRO_COMPACT_METHOD, { sessionId }).pipe(
+      Effect.flatMap((result) =>
+        Option.exists(decodeKiroCompactResult(result), (decoded) => decoded.success)
+          ? Effect.void
+          : Effect.fail(
+              new EffectAcpErrors.AcpRequestError({
+                code: -32603,
+                errorMessage: "Kiro could not compact the conversation.",
+                method: KIRO_COMPACT_METHOD,
+                data: result,
+              }),
+            ),
+      ),
+    ),
+};
 
 const KiroSteerResult = Schema.Struct({ queued: Schema.Literal(true), messageId: Schema.String });
 const decodeKiroSteerResult = Schema.decodeUnknownOption(KiroSteerResult);
@@ -568,7 +580,7 @@ function makeKiroAcpAdapterFlavor(options: KiroAdapterV2Options): AcpAdapterV2Fl
     cancelAfterPromptStarts: { isStart: isKiroPromptActivity, bound: KIRO_CANCEL_HOLD_BOUND },
     permissionDisposition: kiroPermissionDisposition,
     approvalOptions: kiroApprovalOptions,
-    compactSession: compactKiroSession,
+    compactSession: kiroCompactSession,
     steering: kiroSteering,
     forkFromTurn: kiroForkFromTurn,
     // Kiro V3 advertises `promptCapabilities.image`; the shared adapter reads it.
diff --git a/packages/provider-kiro/src/server/driver.test.ts b/packages/provider-kiro/src/server/driver.test.ts
index 58e69b092cdd..0159b903d9de 100644
--- a/packages/provider-kiro/src/server/driver.test.ts
+++ b/packages/provider-kiro/src/server/driver.test.ts
@@ -139,6 +139,6 @@ it.layer(layerTest)("KiroDriver binary path", (it) => {
         [path.join("/test-home", ".local", "bin", "kiro-cli")],
       );
       assert.isTrue(snapshot.installed);
-    }).pipe(Effect.scoped),
+    }),
   );
 });
diff --git a/packages/provider-kiro/src/server/status.ts b/packages/provider-kiro/src/server/status.ts
index 93298551527d..46f3361147fe 100644
--- a/packages/provider-kiro/src/server/status.ts
+++ b/packages/provider-kiro/src/server/status.ts
@@ -1,3 +1,4 @@
+import { resolveProviderProbeTimeoutMs } from "@t3tools/provider-core/server/snapshotProbe";
 import {
   type ModelCapabilities,
   ProviderDriverKind,
@@ -89,7 +90,7 @@ const snapshot = (
     enabled: settings.enabled,
     checkedAt,
     models: kiroModels(settings, listed, agents),
-    // `/compact` runs `_kiro/session/compact`; see compactKiroSession.
+    // `/compact` runs `_kiro/session/compact`; see kiroCompactSession.
     slashCommands: [COMPACT_SLASH_COMMAND],
     probe,
   });
@@ -376,7 +377,9 @@ export const checkKiroProviderStatus = Effect.fn("checkKiroProviderStatus")(func
 
   const probeEnvironment = providerProbeEnvironment(environment);
   const versionResult = yield* runKiroCli(settings, ["--version"], probeEnvironment).pipe(
-    Effect.timeoutOption(VERSION_PROBE_TIMEOUT_MS),
+    Effect.timeoutOption(
+      resolveProviderProbeTimeoutMs("kiro", VERSION_PROBE_TIMEOUT_MS, environment),
+    ),
     Effect.result,
   );
   if (Result.isFailure(versionResult) || Option.isNone(versionResult.success)) {
@@ -407,7 +410,10 @@ export const checkKiroProviderStatus = Effect.fn("checkKiroProviderStatus")(func
     settings,
     ["whoami", "--format", "json"],
     probeEnvironment,
-  ).pipe(Effect.timeoutOption(AUTH_PROBE_TIMEOUT_MS), Effect.result);
+  ).pipe(
+    Effect.timeoutOption(resolveProviderProbeTimeoutMs("kiro", AUTH_PROBE_TIMEOUT_MS, environment)),
+    Effect.result,
+  );
   const auth = kiroAuthFromWhoami(
     Result.isSuccess(whoamiResult) ? Option.getOrUndefined(whoamiResult.success) : undefined,
     environment,
@@ -433,12 +439,16 @@ export const checkKiroProviderStatus = Effect.fn("checkKiroProviderStatus")(func
               ["chat", "--list-models", "--format", "json"],
               probeEnvironment,
             ).pipe(
-              Effect.timeoutOption(AUTH_PROBE_TIMEOUT_MS),
+              Effect.timeoutOption(
+                resolveProviderProbeTimeoutMs("kiro", AUTH_PROBE_TIMEOUT_MS, environment),
+              ),
               Effect.map((output) => kiroModelsFromList(Option.getOrUndefined(output))),
               Effect.orElseSucceed(() => undefined),
             ),
             probeKiroAgents(settings, probeEnvironment).pipe(
-              Effect.timeoutOption(AUTH_PROBE_TIMEOUT_MS),
+              Effect.timeoutOption(
+                resolveProviderProbeTimeoutMs("kiro", AUTH_PROBE_TIMEOUT_MS, environment),
+              ),
               Effect.map(Option.getOrUndefined),
               Effect.orElseSucceed(() => undefined),
             ),
diff --git a/packages/provider-muse/src/server/driver.test.ts b/packages/provider-muse/src/server/driver.test.ts
index 7017b3f4e35a..09ca2e12ddb5 100644
--- a/packages/provider-muse/src/server/driver.test.ts
+++ b/packages/provider-muse/src/server/driver.test.ts
@@ -211,6 +211,6 @@ it.layer(layerTest)("MuseDriver usage", (it) => {
         const refreshed = yield* instance.snapshot.refresh;
         expect(refreshed.usageLimits).toEqual(latest.usageLimits);
         expect(refreshed.auth.label).toBe("tier-2");
-      }).pipe(Effect.scoped),
+      }),
   );
 });
diff --git a/packages/provider-muse/src/server/maintenance.test.ts b/packages/provider-muse/src/server/maintenance.test.ts
index 61b1a9fc32f2..ea97576c09b8 100644
--- a/packages/provider-muse/src/server/maintenance.test.ts
+++ b/packages/provider-muse/src/server/maintenance.test.ts
@@ -78,42 +78,40 @@ it.layer(NodeServices.layer)("Muse maintenance", (it) => {
   );
 
   it.effect("updates only a recognized launcher at the resolved instance path", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const fs = yield* FileSystem.FileSystem;
-        const directory = yield* fs.makeTempDirectoryScoped({ prefix: "muse-maintenance-" });
-        const binaryPath = `${directory}/custom muse`;
-        const context = {
-          binaryPath,
-          resolvedCommandPath: binaryPath,
-          realCommandPath: binaryPath,
-          platform: "linux" as const,
-          env: { MUSE_CHANNEL: "muse-canary" },
-        };
-        yield* fs.writeFileString(
-          binaryPath,
-          "#!/bin/bash\n# muse-code/launcher-2\n# MUSE_SYNC_UPDATE\n",
-        );
-        const result = yield* museMaintenance.resolve(context);
-        expect(result.update).toMatchObject({
-          executable: binaryPath,
-          args: ["--version"],
-          lockKey: `muse:${binaryPath}`,
-          env: {
-            MUSE_CHANNEL: "muse-canary",
-            MUSE_NO_AUTO_UPDATE: "0",
-            MUSE_SYNC_UPDATE: "1",
-            MUSE_UPDATE_INTERVAL_SECONDS: "0",
-          },
-        });
-        expect(result.update?.command).toBe(
-          `MUSE_CHANNEL=muse-canary MUSE_NO_AUTO_UPDATE=0 MUSE_SYNC_UPDATE=1 MUSE_UPDATE_INTERVAL_SECONDS=0 '${binaryPath}' --version`,
-        );
-        expect(result.compareVersions).toBe(compareMuseVersions);
-        yield* fs.writeFileString(binaryPath, "standalone binary");
-        expect((yield* museMaintenance.resolve(context)).update).toBeNull();
-        expect((yield* museMaintenance.resolve(null)).update).toBeNull();
-      }),
-    ),
+    Effect.gen(function* () {
+      const fs = yield* FileSystem.FileSystem;
+      const directory = yield* fs.makeTempDirectoryScoped({ prefix: "muse-maintenance-" });
+      const binaryPath = `${directory}/custom muse`;
+      const context = {
+        binaryPath,
+        resolvedCommandPath: binaryPath,
+        realCommandPath: binaryPath,
+        platform: "linux" as const,
+        env: { MUSE_CHANNEL: "muse-canary" },
+      };
+      yield* fs.writeFileString(
+        binaryPath,
+        "#!/bin/bash\n# muse-code/launcher-2\n# MUSE_SYNC_UPDATE\n",
+      );
+      const result = yield* museMaintenance.resolve(context);
+      expect(result.update).toMatchObject({
+        executable: binaryPath,
+        args: ["--version"],
+        lockKey: `muse:${binaryPath}`,
+        env: {
+          MUSE_CHANNEL: "muse-canary",
+          MUSE_NO_AUTO_UPDATE: "0",
+          MUSE_SYNC_UPDATE: "1",
+          MUSE_UPDATE_INTERVAL_SECONDS: "0",
+        },
+      });
+      expect(result.update?.command).toBe(
+        `MUSE_CHANNEL=muse-canary MUSE_NO_AUTO_UPDATE=0 MUSE_SYNC_UPDATE=1 MUSE_UPDATE_INTERVAL_SECONDS=0 '${binaryPath}' --version`,
+      );
+      expect(result.compareVersions).toBe(compareMuseVersions);
+      yield* fs.writeFileString(binaryPath, "standalone binary");
+      expect((yield* museMaintenance.resolve(context)).update).toBeNull();
+      expect((yield* museMaintenance.resolve(null)).update).toBeNull();
+    }),
   );
 });
diff --git a/packages/provider-muse/src/server/modelCatalog.ts b/packages/provider-muse/src/server/modelCatalog.ts
index b8a62297ddf5..a99deca5354d 100644
--- a/packages/provider-muse/src/server/modelCatalog.ts
+++ b/packages/provider-muse/src/server/modelCatalog.ts
@@ -1,3 +1,4 @@
+import { resolveProviderProbeTimeoutMs } from "@t3tools/provider-core/server/snapshotProbe";
 import type { SendUserTurnOptions } from "@muse-code/sdk";
 import { ModelCapabilities, ServerProviderModel } from "@t3tools/contracts";
 import { MuseSettings } from "../settings.ts";
@@ -11,6 +12,9 @@ import {
   type MuseSdkHost,
 } from "./sdk.ts";
 
+export const resolveMuseStartupTimeoutMs = (environment?: NodeJS.ProcessEnv) =>
+  resolveProviderProbeTimeoutMs("muse", 8_000, environment);
+
 type MuseReasoningEffort = NonNullable<SendUserTurnOptions<never>["reasoningEffort"]>;
 
 const REASONING_EFFORT_LABELS = {
@@ -111,7 +115,7 @@ export const discoverMuseModels = Effect.fn("discoverMuseModels")(function* (
         ...(environment ? { environment } : {}),
         ...(cwd ? { cwd } : {}),
         readOnly: true,
-        startupTimeoutMs: 8_000,
+        startupTimeoutMs: resolveMuseStartupTimeoutMs(environment),
       },
       createHost,
     ),
diff --git a/packages/provider-muse/src/server/status.test.ts b/packages/provider-muse/src/server/status.test.ts
index 582b0ee37b6b..a5e51cf9369f 100644
--- a/packages/provider-muse/src/server/status.test.ts
+++ b/packages/provider-muse/src/server/status.test.ts
@@ -56,90 +56,82 @@ const fakeCli = (source = 'process.stdout.write("muse 1.0.3-R2198.1\\n");') =>
 
 it.layer(NodeServices.layer)("Muse status", (it) => {
   it.effect("does not expose CLI stderr or start an SDK host after a failed version check", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const binaryPath = yield* fakeCli(
-          'process.stderr.write("secret-test-value");process.exit(2);',
-        );
-        const createHost = vi.fn(async () => makeHost(metaCatalog));
-        const snapshot = yield* checkMuseProviderStatus(
-          settings({ enabled: true, binaryPath }),
-          undefined,
-          undefined,
-          createHost,
-        );
-        expect(snapshot.installed).toBe(true);
-        expect(snapshot.status).toBe("error");
-        expect(snapshot.message).not.toContain("secret-test-value");
-        expect(createHost).not.toHaveBeenCalled();
-      }),
-    ),
+    Effect.gen(function* () {
+      const binaryPath = yield* fakeCli(
+        'process.stderr.write("secret-test-value");process.exit(2);',
+      );
+      const createHost = vi.fn(async () => makeHost(metaCatalog));
+      const snapshot = yield* checkMuseProviderStatus(
+        settings({ enabled: true, binaryPath }),
+        undefined,
+        undefined,
+        createHost,
+      );
+      expect(snapshot.installed).toBe(true);
+      expect(snapshot.status).toBe("error");
+      expect(snapshot.message).not.toContain("secret-test-value");
+      expect(createHost).not.toHaveBeenCalled();
+    }),
   );
 
   it.effect("tells the user to finish setup when the launcher has not installed its runtime", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        // What Muse's launcher prints when a fresh install runs under MUSE_NO_AUTO_UPDATE=1.
-        const binaryPath = yield* fakeCli(
-          'process.stderr.write("muse: installed binary is missing; rerun the installer\\n");process.exit(1);',
-        );
-        const snapshot = yield* checkMuseProviderStatus(settings({ enabled: true, binaryPath }));
-        expect(snapshot.status).toBe("error");
-        expect(snapshot.message).toContain("muse --version");
-      }),
-    ),
+    Effect.gen(function* () {
+      // What Muse's launcher prints when a fresh install runs under MUSE_NO_AUTO_UPDATE=1.
+      const binaryPath = yield* fakeCli(
+        'process.stderr.write("muse: installed binary is missing; rerun the installer\\n");process.exit(1);',
+      );
+      const snapshot = yield* checkMuseProviderStatus(settings({ enabled: true, binaryPath }));
+      expect(snapshot.status).toBe("error");
+      expect(snapshot.message).toContain("muse --version");
+    }),
   );
 
   it.effect("discovers the Meta catalog without treating it as authentication proof", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const binaryPath = yield* fakeCli();
-        const host = makeHost(metaCatalog);
-        const snapshot = yield* checkMuseProviderStatus(
-          settings({ enabled: true, binaryPath, customModels: ["muse-custom"] }),
-          undefined,
-          undefined,
-          async () => host,
-        );
-        expect(snapshot.status).toBe("ready");
-        expect(snapshot.message).toBeUndefined();
-        expect(snapshot.slashCommands).toEqual([COMPACT_SLASH_COMMAND]);
-        expect(snapshot.auth).toEqual({ status: "unknown" });
-        expect(snapshot.version).toBe("1.0.3-R2198.1");
-        expect(snapshot.models.map((model) => model.slug)).toEqual([
-          "muse-wonder-1.0",
-          "muse-custom",
-        ]);
-        expect(snapshot.models.map((model) => model.name)).toEqual([
-          "Muse Wonder 1.0",
-          "muse-custom",
-        ]);
-        const descriptor = snapshot.models[0]?.capabilities?.optionDescriptors?.[0];
-        expect(
-          descriptor?.type === "select" && descriptor.options.map((option) => option.id),
-        ).toEqual(["low", "medium", "high", "xhigh", "max"]);
-        expect(host.connection.request).toHaveBeenCalledWith("model/list", {});
-        expect(host.connection.command).not.toHaveBeenCalled();
-        expect(host.close).toHaveBeenCalledOnce();
-      }),
-    ),
+    Effect.gen(function* () {
+      const binaryPath = yield* fakeCli();
+      const host = makeHost(metaCatalog);
+      const snapshot = yield* checkMuseProviderStatus(
+        settings({ enabled: true, binaryPath, customModels: ["muse-custom"] }),
+        undefined,
+        undefined,
+        async () => host,
+      );
+      expect(snapshot.status).toBe("ready");
+      expect(snapshot.message).toBeUndefined();
+      expect(snapshot.slashCommands).toEqual([COMPACT_SLASH_COMMAND]);
+      expect(snapshot.auth).toEqual({ status: "unknown" });
+      expect(snapshot.version).toBe("1.0.3-R2198.1");
+      expect(snapshot.models.map((model) => model.slug)).toEqual([
+        "muse-wonder-1.0",
+        "muse-custom",
+      ]);
+      expect(snapshot.models.map((model) => model.name)).toEqual([
+        "Muse Wonder 1.0",
+        "muse-custom",
+      ]);
+      const descriptor = snapshot.models[0]?.capabilities?.optionDescriptors?.[0];
+      expect(
+        descriptor?.type === "select" && descriptor.options.map((option) => option.id),
+      ).toEqual(["low", "medium", "high", "xhigh", "max"]);
+      expect(host.connection.request).toHaveBeenCalledWith("model/list", {});
+      expect(host.connection.command).not.toHaveBeenCalled();
+      expect(host.close).toHaveBeenCalledOnce();
+    }),
   );
 
   it.effect("keeps an empty discovered catalog empty instead of advertising a fallback model", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const binaryPath = yield* fakeCli();
-        const host = makeHost({ providerId: "meta", models: [] });
-        const snapshot = yield* checkMuseProviderStatus(
-          settings({ enabled: true, binaryPath }),
-          undefined,
-          undefined,
-          async () => host,
-        );
-        expect(snapshot.status).toBe("warning");
-        expect(snapshot.models).toEqual([]);
-        expect(host.close).toHaveBeenCalledOnce();
-      }),
-    ),
+    Effect.gen(function* () {
+      const binaryPath = yield* fakeCli();
+      const host = makeHost({ providerId: "meta", models: [] });
+      const snapshot = yield* checkMuseProviderStatus(
+        settings({ enabled: true, binaryPath }),
+        undefined,
+        undefined,
+        async () => host,
+      );
+      expect(snapshot.status).toBe("warning");
+      expect(snapshot.models).toEqual([]);
+      expect(host.close).toHaveBeenCalledOnce();
+    }),
   );
 });
diff --git a/packages/provider-muse/src/server/status.ts b/packages/provider-muse/src/server/status.ts
index ef4940df1164..344ae1d1a684 100644
--- a/packages/provider-muse/src/server/status.ts
+++ b/packages/provider-muse/src/server/status.ts
@@ -1,3 +1,4 @@
+import { resolveProviderProbeTimeoutMs } from "@t3tools/provider-core/server/snapshotProbe";
 import { ServerProviderModel } from "@t3tools/contracts";
 import { MuseSettings } from "../settings.ts";
 import { resolveSpawnCommand } from "@t3tools/shared/shell";
@@ -9,7 +10,11 @@ import * as ChildProcess from "effect/process/ChildProcess";
 
 import { createMuseSdkHost, makeMuseEnvironment } from "./sdk.ts";
 import { parseMuseVersion } from "./maintenance.ts";
-import { discoverMuseModels, museModelCapabilities } from "./modelCatalog.ts";
+import {
+  discoverMuseModels,
+  museModelCapabilities,
+  resolveMuseStartupTimeoutMs,
+} from "./modelCatalog.ts";
 import {
   buildServerProvider,
   COMPACT_SLASH_COMMAND,
@@ -83,7 +88,12 @@ export const checkMuseProviderStatus = Effect.fn("checkMuseProviderStatus")(func
         ...(cwd ? { cwd } : {}),
       }),
     );
-  }).pipe(Effect.timeoutOption(DEFAULT_TIMEOUT_MS), Effect.result);
+  }).pipe(
+    Effect.timeoutOption(
+      resolveProviderProbeTimeoutMs("muse", DEFAULT_TIMEOUT_MS, museEnvironment),
+    ),
+    Effect.result,
+  );
 
   if (Result.isFailure(versionResult)) {
     const missing = isCommandMissingCause(versionResult.failure);
@@ -124,7 +134,8 @@ export const checkMuseProviderStatus = Effect.fn("checkMuseProviderStatus")(func
 
   const catalog = yield* discoverMuseModels(settings, museEnvironment, cwd, createHost).pipe(
     Effect.scoped,
-    Effect.timeoutOption(12_000),
+    // Startup shares the override, so the catalog keeps its 4 seconds on top of it.
+    Effect.timeoutOption(resolveMuseStartupTimeoutMs(museEnvironment) + 4_000),
     Effect.result,
   );
   if (Result.isFailure(catalog) || Option.isNone(catalog.success)) {
diff --git a/packages/provider-opencode/src/server/OpenCodeRuntime.ts b/packages/provider-opencode/src/server/OpenCodeRuntime.ts
index a99e8cd7daec..88ff243eccd4 100644
--- a/packages/provider-opencode/src/server/OpenCodeRuntime.ts
+++ b/packages/provider-opencode/src/server/OpenCodeRuntime.ts
@@ -1,3 +1,4 @@
+import { resolveProviderProbeTimeoutMs } from "@t3tools/provider-core/server/snapshotProbe";
 import * as NodeURL from "node:url";
 
 import type { ChatAttachment, ProviderApprovalDecision } from "@t3tools/contracts";
@@ -42,7 +43,7 @@ const encodeUnknownJsonStringExit = Schema.encodeUnknownExit(Schema.fromJsonStri
 const OPENCODE_EMPTY_CONFIG_CONTENT = "{}";
 
 export const MINIMUM_OPENCODE_VERSION = "1.14.19";
-const OPENCODE_HEALTH_TIMEOUT = "5 seconds";
+const OPENCODE_HEALTH_TIMEOUT_MS = 5_000;
 
 const OpenCodeHealthSchema = Schema.Struct({
   healthy: Schema.Literal(true),
@@ -163,10 +164,15 @@ export const runOpenCodeSdk = <A>(
 
 export const verifyOpenCodeServerVersion = Effect.fn("verifyOpenCodeServerVersion")(function* (
   client: OpencodeClient,
+  environment?: NodeJS.ProcessEnv,
 ) {
   const healthOption = yield* runOpenCodeSdk("global.health", (signal) =>
     client.global.health({ signal }),
-  ).pipe(Effect.timeoutOption(OPENCODE_HEALTH_TIMEOUT));
+  ).pipe(
+    Effect.timeoutOption(
+      resolveProviderProbeTimeoutMs("opencode", OPENCODE_HEALTH_TIMEOUT_MS, environment),
+    ),
+  );
   if (Option.isNone(healthOption)) {
     return yield* new OpenCodeRuntimeError({
       operation: "global.health",
@@ -578,7 +584,13 @@ const makeOpenCodeRuntime = Effect.gen(function* () {
             }),
         ),
       ));
-    const timeoutMs = input.timeoutMs ?? DEFAULT_OPENCODE_SERVER_TIMEOUT_MS;
+    const timeoutMs =
+      input.timeoutMs ??
+      resolveProviderProbeTimeoutMs(
+        "opencode",
+        DEFAULT_OPENCODE_SERVER_TIMEOUT_MS,
+        input.environment,
+      );
     const args = ["serve", `--hostname=${hostname}`, `--port=${port}`];
     const launch = yield* agentScope.wrap({
       command: input.binaryPath,
@@ -749,6 +761,7 @@ const makeOpenCodeRuntime = Effect.gen(function* () {
             directory: input.directory,
             ...(serverPassword !== undefined ? { serverPassword } : {}),
           }),
+          input.environment,
         )
     );
 
@@ -801,6 +814,7 @@ const makeOpenCodeRuntime = Effect.gen(function* () {
           directory: input.directory,
           ...(serverPassword !== undefined ? { serverPassword } : {}),
         }),
+        input.environment,
       ).pipe(
         Effect.map((version) => ({
           url: serverUrl,
diff --git a/packages/provider-opencode/src/server/OpenCodeServerLedger.test.ts b/packages/provider-opencode/src/server/OpenCodeServerLedger.test.ts
index 1310cdd8b36e..3fcb52c898d6 100644
--- a/packages/provider-opencode/src/server/OpenCodeServerLedger.test.ts
+++ b/packages/provider-opencode/src/server/OpenCodeServerLedger.test.ts
@@ -56,7 +56,6 @@ const spawnGroupLeader = (args: ReadonlyArray<string>, script: string) =>
     if (pid === undefined) return yield* Effect.die("spawn failed");
     const grouped = yield* Deferred.make<true | string>();
     const exited = yield* Deferred.make<NodeJS.Signals | null>();
-    const printed = yield* Deferred.make<void>();
     child.once("exit", (_code, signal) => Deferred.doneUnsafe(exited, Effect.succeed(signal)));
     // "close" fires after stdout drains, so a guard line always lands first. It only fires before
     // "grouped" when the shell died without starting the script, such as from a signal.
@@ -77,12 +76,9 @@ const spawnGroupLeader = (args: ReadonlyArray<string>, script: string) =>
           Effect.succeed(`\`ps -o pgid= -p ${pid}\` printed ${JSON.stringify(output)}`),
         );
       }
-      if (line === "ready") Deferred.doneUnsafe(printed, Effect.void);
     });
     const result = yield* Deferred.await(grouped);
-    return result === true
-      ? { pid, exited: Deferred.await(exited), printed: Deferred.await(printed) }
-      : result;
+    return result === true ? { pid, exited: Deferred.await(exited) } : result;
   });
 
 // A pid colliding with a live group id is rare, so a few retries clear it. Repeated failures
@@ -152,18 +148,21 @@ describe.each(observedPlatforms)("OpenCodeServerLedger observing as %s", (platfo
       const fs = yield* FileSystem.FileSystem;
       const path = yield* Path.Path;
       const stateDir = yield* fs.makeTempDirectoryScoped({ prefix: "t3-opencode-ledger-" });
-      // The inner shell prints once it has exec'd. Until then it still carries the wrapper's
-      // command line, and recording that would make the reaper skip the group as recycled.
+      const gate = path.join(stateDir, "gate");
+      const ready = path.join(stateDir, "ready");
+      NodeChildProcess.execFileSync("mkfifo", [gate, ready]);
+      // The wrapper's child is recorded before it execs and stopped after.
       const wrapper = yield* spawnGroup(
         SERVE_ARGS,
-        '/bin/sh -c "echo ready; sleep 600 & wait" "$0" "$@" & exit 0',
+        `(read _ < '${gate}'; exec /bin/sh -c 'echo > "${ready}"; sleep 600 & wait' "$0" "$@") & exit 0`,
       );
       yield* wrapper.exited;
-      yield* wrapper.printed;
       expect(groupExists(wrapper.pid)).toBe(true);
 
       yield* recordFromDeadServer(stateDir, wrapper);
       expect(yield* fs.readDirectory(path.join(stateDir, "opencode-servers"))).toHaveLength(1);
+      yield* fs.writeFileString(gate, "\n");
+      yield* fs.readFileString(ready);
 
       const restarted = yield* OpenCodeServerLedger.make({ stateDir });
       yield* restarted.reapOrphans;
@@ -173,6 +172,38 @@ describe.each(observedPlatforms)("OpenCodeServerLedger observing as %s", (platfo
     }).pipe(provideHost),
   );
 
+  it.live("stops a group recorded by an older server without serve arguments", () =>
+    Effect.gen(function* () {
+      const fs = yield* FileSystem.FileSystem;
+      const path = yield* Path.Path;
+      const stateDir = yield* fs.makeTempDirectoryScoped({ prefix: "t3-opencode-ledger-" });
+      const orphan = yield* spawnGroup(SERVE_ARGS);
+      yield* recordFromDeadServer(stateDir, orphan);
+      const entryPath = path.join(stateDir, "opencode-servers", `${orphan.pid}.json`);
+      const { args: _args, ...legacy } = JSON.parse(yield* fs.readFileString(entryPath));
+      yield* fs.writeFileString(entryPath, JSON.stringify(legacy));
+
+      const restarted = yield* OpenCodeServerLedger.make({ stateDir });
+      yield* restarted.reapOrphans;
+
+      expect(groupExists(orphan.pid)).toBe(false);
+    }).pipe(provideHost),
+  );
+
+  it.live("stops a group whose wrapper appends its own options", () =>
+    Effect.gen(function* () {
+      const fs = yield* FileSystem.FileSystem;
+      const stateDir = yield* fs.makeTempDirectoryScoped({ prefix: "t3-opencode-ledger-" });
+      const orphan = yield* spawnGroup([...SERVE_ARGS, "--log-level=ERROR"]);
+      yield* recordFromDeadServer(stateDir, orphan);
+
+      const restarted = yield* OpenCodeServerLedger.make({ stateDir });
+      yield* restarted.reapOrphans;
+
+      expect(groupExists(orphan.pid)).toBe(false);
+    }).pipe(provideHost),
+  );
+
   it.live("leaves a recycled pid alone when its start time does not match", () =>
     Effect.gen(function* () {
       const fs = yield* FileSystem.FileSystem;
@@ -201,7 +232,7 @@ describe.each(observedPlatforms)("OpenCodeServerLedger observing as %s", (platfo
       yield* recordFromDeadServer(stateDir, unrelated);
       const entryPath = path.join(stateDir, "opencode-servers", `${unrelated.pid}.json`);
       const entry = yield* fs.readFileString(entryPath);
-      yield* fs.writeFileString(entryPath, entry.replace("--port=4096", "--port=4097"));
+      yield* fs.writeFileString(entryPath, entry.replaceAll("--port=4096", "--port=4097"));
 
       const restarted = yield* OpenCodeServerLedger.make({ stateDir });
       yield* restarted.reapOrphans;
diff --git a/packages/provider-opencode/src/server/OpenCodeServerLedger.ts b/packages/provider-opencode/src/server/OpenCodeServerLedger.ts
index af90d19acd67..fb3ea7645e9b 100644
--- a/packages/provider-opencode/src/server/OpenCodeServerLedger.ts
+++ b/packages/provider-opencode/src/server/OpenCodeServerLedger.ts
@@ -21,6 +21,7 @@ const OpenCodeServerEntry = Schema.Struct({
   pid: Schema.Int,
   startTime: Schema.String,
   command: Schema.String,
+  args: Schema.optionalKey(Schema.Array(Schema.String)),
   port: Schema.Int,
   stateDir: Schema.String,
   owner: ProcessIdentity,
@@ -73,6 +74,11 @@ const parseDarwinPs = (output: string): ReadonlyArray<ObservedProcess> =>
     ];
   });
 
+// A wrapper's forked child keeps the wrapper's command line until it execs; the
+// serve arguments survive the exec, so they identify the server either way.
+const runsServe = (observed: ObservedProcess, args: ReadonlyArray<string>) =>
+  observed.command.endsWith(` ${args.join(" ")}`);
+
 const signalGroup = (pgid: number, signal: NodeJS.Signals) => {
   try {
     signalProcessGroup(pgid, signal);
@@ -193,9 +199,7 @@ export const make = Effect.fn("OpenCodeServerLedger.make")(function* (input: {
         leader !== undefined && !leader.zombie && leader.pgid === pgid
           ? [leader]
           : (yield* observeGroup(pgid)).filter((candidate) => !candidate.zombie);
-      const member =
-        members.find((candidate) => candidate.command.endsWith(` ${server.args.join(" ")}`)) ??
-        members[0];
+      const member = members.find((candidate) => runsServe(candidate, server.args)) ?? members[0];
       if (owner === undefined || member === undefined) {
         if (groupExists(pgid)) {
           yield* Effect.logWarning(
@@ -212,6 +216,7 @@ export const make = Effect.fn("OpenCodeServerLedger.make")(function* (input: {
         pid: member.pid,
         startTime: member.startTime,
         command: member.command,
+        args: server.args,
         port: server.port,
         stateDir: input.stateDir,
         owner,
@@ -239,7 +244,8 @@ export const make = Effect.fn("OpenCodeServerLedger.make")(function* (input: {
   );
 
   // Signals only a group whose recorded member still has the same pid, start
-  // time, group, and full command line, so a recycled pid is never touched.
+  // time, and group and still has the same command line or serve arguments, so
+  // a recycled pid is never touched.
   const stopOrphan = Effect.fn("OpenCodeServerLedger.stopOrphan")(function* (
     entry: OpenCodeServerEntry,
   ) {
@@ -249,7 +255,8 @@ export const make = Effect.fn("OpenCodeServerLedger.make")(function* (input: {
       observed.zombie ||
       observed.startTime !== entry.startTime ||
       observed.pgid !== entry.pgid ||
-      observed.command !== entry.command
+      (observed.command !== entry.command &&
+        (entry.args === undefined || !runsServe(observed, entry.args)))
     ) {
       return;
     }
diff --git a/packages/provider-opencode/src/server/adapter.test.ts b/packages/provider-opencode/src/server/adapter.test.ts
index 91400661e6ee..47cedeefc1c9 100644
--- a/packages/provider-opencode/src/server/adapter.test.ts
+++ b/packages/provider-opencode/src/server/adapter.test.ts
@@ -339,10 +339,7 @@ describe("OpenCodeAdapterV2", () => {
         assert.equal(Object.hasOwn(payload, "variant"), false);
       }
       if (kind === "unset") assert.equal(inventoryCalls, 0);
-    }).pipe(
-      Effect.provide(Layer.merge(IdAllocator.layer, McpProviderSessions.layer)),
-      Effect.scoped,
-    ),
+    }).pipe(Effect.provide(Layer.merge(IdAllocator.layer, McpProviderSessions.layer))),
   );
 
   it.effect("reuses successful model variants for the session and retries failed inventories", () =>
@@ -418,10 +415,7 @@ describe("OpenCodeAdapterV2", () => {
       variants = { medium: {} };
       assert.isFalse(Object.hasOwn(yield* submit(), "variant"));
       assert.equal(inventoryCalls, 2);
-    }).pipe(
-      Effect.provide(Layer.merge(IdAllocator.layer, McpProviderSessions.layer)),
-      Effect.scoped,
-    ),
+    }).pipe(Effect.provide(Layer.merge(IdAllocator.layer, McpProviderSessions.layer))),
   );
 
   it.effect("keeps queued steers behind a cold catalog lookup and cancels them on stop", () =>
@@ -511,10 +505,7 @@ describe("OpenCodeAdapterV2", () => {
       assert.isTrue(Exit.isFailure(yield* Fiber.join(firstSteer)));
       assert.isTrue(Exit.isFailure(yield* Fiber.join(secondSteer)));
       assert.deepEqual(calls, ["catalog", "catalog-aborted", "abort"]);
-    }).pipe(
-      Effect.provide(Layer.merge(IdAllocator.layer, McpProviderSessions.layer)),
-      Effect.scoped,
-    ),
+    }).pipe(Effect.provide(Layer.merge(IdAllocator.layer, McpProviderSessions.layer))),
   );
 
   it.effect.each([
@@ -575,10 +566,7 @@ describe("OpenCodeAdapterV2", () => {
       const terminal = events.findLast((event) => event.type === "turn.terminal");
       assert.strictEqual(session?.providerSession.lastError, sample.expected);
       assert.strictEqual(terminal?.failure?.message, sample.expected);
-    }).pipe(
-      Effect.provide(Layer.merge(IdAllocator.layer, McpProviderSessions.layer)),
-      Effect.scoped,
-    ),
+    }).pipe(Effect.provide(Layer.merge(IdAllocator.layer, McpProviderSessions.layer))),
   );
 
   it.effect("classifies APIError 429 as a usage limit", () =>
@@ -620,10 +608,7 @@ describe("OpenCodeAdapterV2", () => {
       );
       assert.equal(terminal?.status, "failed");
       assert.equal(terminal?.failure?.class, "usage_limit");
-    }).pipe(
-      Effect.provide(Layer.merge(IdAllocator.layer, McpProviderSessions.layer)),
-      Effect.scoped,
-    ),
+    }).pipe(Effect.provide(Layer.merge(IdAllocator.layer, McpProviderSessions.layer))),
   );
 
   it.effect("applies a changed runtime policy to the session on resume and turn start", () =>
@@ -676,10 +661,7 @@ describe("OpenCodeAdapterV2", () => {
       assert.deepStrictEqual(updates.slice(1), [
         { sessionID: "root", permission: openCodePermissionRules(fullAccess) },
       ]);
-    }).pipe(
-      Effect.provide(Layer.merge(IdAllocator.layer, McpProviderSessions.layer)),
-      Effect.scoped,
-    ),
+    }).pipe(Effect.provide(Layer.merge(IdAllocator.layer, McpProviderSessions.layer))),
   );
 
   it.effect("applies a changed runtime policy to existing subagent sessions", () =>
@@ -782,10 +764,7 @@ describe("OpenCodeAdapterV2", () => {
       });
       assert.equal(permissionAction(nativePermissions.get(child)!, "bash"), "ask");
       assert.equal(permissionAction(nativePermissions.get(child)!, "task"), "deny");
-    }).pipe(
-      Effect.provide(Layer.merge(IdAllocator.layer, McpProviderSessions.layer)),
-      Effect.scoped,
-    ),
+    }).pipe(Effect.provide(Layer.merge(IdAllocator.layer, McpProviderSessions.layer))),
   );
 
   it.effect.each(["completed", "failed", "unavailable"] as const)(
@@ -916,10 +895,7 @@ describe("OpenCodeAdapterV2", () => {
                 hasSubagents: false,
               },
         );
-      }).pipe(
-        Effect.provide(Layer.merge(IdAllocator.layer, McpProviderSessions.layer)),
-        Effect.scoped,
-      ),
+      }).pipe(Effect.provide(Layer.merge(IdAllocator.layer, McpProviderSessions.layer))),
   );
 
   // OpenCode 1.18.18 reports a context overflow as session.error, then auto-compacts and continues.
@@ -1022,10 +998,7 @@ describe("OpenCodeAdapterV2", () => {
             event.turnItem.text === "Post-compaction step",
         ),
       );
-    }).pipe(
-      Effect.provide(Layer.merge(IdAllocator.layer, McpProviderSessions.layer)),
-      Effect.scoped,
-    ),
+    }).pipe(Effect.provide(Layer.merge(IdAllocator.layer, McpProviderSessions.layer))),
   );
 
   it.effect("fails an explicit compaction that OpenCode reports as a context overflow", () =>
@@ -1069,10 +1042,7 @@ describe("OpenCodeAdapterV2", () => {
           (event) => event.type === "turn_item.updated" && event.turnItem.type === "compaction",
         ),
       );
-    }).pipe(
-      Effect.provide(Layer.merge(IdAllocator.layer, McpProviderSessions.layer)),
-      Effect.scoped,
-    ),
+    }).pipe(Effect.provide(Layer.merge(IdAllocator.layer, McpProviderSessions.layer))),
   );
 
   it.effect("preserves native multi-select and custom-answer flags through a live reply", () =>
@@ -1147,10 +1117,7 @@ describe("OpenCodeAdapterV2", () => {
         answers: { "question-0-drinks": ["Tea", "Water"] },
       });
       assert.deepInclude(delivered, { answers: [["Tea", "Water"]] });
-    }).pipe(
-      Effect.provide(Layer.merge(IdAllocator.layer, McpProviderSessions.layer)),
-      Effect.scoped,
-    ),
+    }).pipe(Effect.provide(Layer.merge(IdAllocator.layer, McpProviderSessions.layer))),
   );
 
   it.effect(
@@ -1399,10 +1366,7 @@ describe("OpenCodeAdapterV2", () => {
         const assistant = items.filter((item) => item.type === "assistant_message");
         assert.equal(assistant.at(-1)?.text, "Tool results received");
         assert.equal(assistant.at(-1)?.status, "completed");
-      }).pipe(
-        Effect.provide(Layer.merge(IdAllocator.layer, McpProviderSessions.layer)),
-        Effect.scoped,
-      ),
+      }).pipe(Effect.provide(Layer.merge(IdAllocator.layer, McpProviderSessions.layer))),
   );
 
   // OpenCode 1.18.32 background tasks complete at launch; children stay busy after root settlement.
@@ -1495,6 +1459,123 @@ describe("OpenCodeAdapterV2", () => {
       yield* push(status(child, "idle"));
       yield* push({ type: "session.idle", properties: { sessionID: child } });
       assert.isFalse(yield* hasPendingBackgroundWork, "an idle child must not pin idle release");
+    }).pipe(Effect.provide(Layer.merge(IdAllocator.layer, McpProviderSessions.layer))),
+  );
+
+  // After a restart the adapter no longer holds the child, so its earlier turns come from OpenCode.
+  it.effect.each([
+    { case: "in memory", restarted: false },
+    { case: "after a restart", restarted: true },
+  ])("appends a resumed task child's turn after its earlier turns ($case)", ({ restarted }) =>
+    Effect.gen(function* () {
+      const nativeEvents = asyncEventStream();
+      const push = (event: unknown) => Effect.promise(() => nativeEvents.push(event));
+      const root = "ses_root";
+      const child = "ses_child";
+      let promptId = "";
+      const harness = yield* makeOpenCodeRuntimeHarness("resumed-child", root, {
+        event: { subscribe: async () => ({ stream: nativeEvents.stream }) },
+        session: {
+          create: async () => ({ data: { id: root, time: { created: 1, updated: 1 } } }),
+          get: async () => ({
+            data: { id: child, parentID: root, permission: [], time: { created: 2, updated: 2 } },
+          }),
+          update: async () => ({ data: { id: child, parentID: root } }),
+          promptAsync: async (input: { messageID: string }) => {
+            promptId = input.messageID;
+            return { data: true };
+          },
+          abort: async () => ({ data: true }),
+          children: async () => ({ data: [] }),
+          // OpenCode may have stored the resume prompt before its event reaches the adapter.
+          messages: async () => ({
+            data: [
+              { info: { id: "msg_child_first", role: "user" }, parts: [] },
+              { info: { id: "msg_child_resume", role: "user" }, parts: [] },
+            ],
+          }),
+        },
+      });
+      yield* harness.startTurn();
+      const childTurns = yield* harness.runtime.events.pipe(
+        Stream.filter(
+          (event) =>
+            event.type === "provider_turn.updated" &&
+            event.providerTurn.status === "running" &&
+            event.providerTurn.providerThreadId.includes(child),
+        ),
+        Stream.take(restarted ? 1 : 2),
+        Stream.runCollect,
+        Effect.forkScoped,
+      );
+      const taskPart = (partId: string, status: "running" | "completed", taskId?: string) => ({
+        type: "message.part.updated",
+        properties: {
+          sessionID: root,
+          part: {
+            id: partId,
+            sessionID: root,
+            messageID: "msg_root_assistant",
+            type: "tool",
+            tool: "task",
+            callID: `call_${partId}`,
+            state: {
+              status,
+              input: {
+                description: "Explore",
+                prompt: "look around",
+                subagent_type: "general",
+                ...(taskId === undefined ? {} : { task_id: taskId }),
+              },
+              title: "Explore",
+              metadata: { parentSessionId: root, sessionId: child },
+              time: { start: 3, ...(status === "completed" ? { end: 4 } : {}) },
+              ...(status === "completed" ? { output: "done" } : {}),
+            },
+          },
+        },
+      });
+      const childPrompt = (id: string, created: number) => ({
+        type: "message.updated",
+        properties: {
+          sessionID: child,
+          info: { id, sessionID: child, role: "user", time: { created } },
+        },
+      });
+      const status = (sessionID: string, type: "busy" | "idle") => ({
+        type: "session.status",
+        properties: { sessionID, status: { type } },
+      });
+
+      yield* push({
+        type: "message.updated",
+        properties: {
+          sessionID: root,
+          info: { id: promptId, sessionID: root, role: "user", time: { created: 1 } },
+        },
+      });
+      yield* push(status(root, "busy"));
+      if (!restarted) {
+        yield* push(taskPart("prt_task_first", "running"));
+        yield* push(childPrompt("msg_child_first", 3));
+        yield* push(status(child, "busy"));
+        yield* push(status(child, "idle"));
+        yield* push({ type: "session.idle", properties: { sessionID: child } });
+        yield* push(taskPart("prt_task_first", "completed"));
+      }
+      // The lead resumes the same child session by passing its task_id.
+      yield* push(taskPart("prt_task_resume", "running", child));
+      yield* push(childPrompt("msg_child_resume", 5));
+      yield* push(status(child, "busy"));
+
+      const turns = Array.from(yield* Fiber.join(childTurns)).flatMap((event) =>
+        event.type === "provider_turn.updated" ? [event.providerTurn] : [],
+      );
+      assert.equal(new Set(turns.map((turn) => turn.providerThreadId)).size, 1);
+      assert.deepEqual(
+        turns.map((turn) => turn.ordinal),
+        restarted ? [2] : [1, 2],
+      );
     }).pipe(
       Effect.provide(Layer.merge(IdAllocator.layer, McpProviderSessions.layer)),
       Effect.scoped,
@@ -1625,10 +1706,7 @@ describe("OpenCodeAdapterV2", () => {
       );
       assert.ok(emptyWebSearch?.type === "web_search");
       assert.equal(emptyWebSearch.results, undefined);
-    }).pipe(
-      Effect.provide(Layer.merge(IdAllocator.layer, McpProviderSessions.layer)),
-      Effect.scoped,
-    ),
+    }).pipe(Effect.provide(Layer.merge(IdAllocator.layer, McpProviderSessions.layer))),
   );
 
   it.effect("drops cancelled OpenCode todos so a finished list completes", () =>
@@ -1681,10 +1759,7 @@ describe("OpenCodeAdapterV2", () => {
         ],
       );
       assert.equal(plan.status, "completed");
-    }).pipe(
-      Effect.provide(Layer.merge(IdAllocator.layer, McpProviderSessions.layer)),
-      Effect.scoped,
-    ),
+    }).pipe(Effect.provide(Layer.merge(IdAllocator.layer, McpProviderSessions.layer))),
   );
 
   it.effect("presents OpenCode MCP calls without treating remote tools as local edits", () =>
@@ -1852,10 +1927,7 @@ describe("OpenCodeAdapterV2", () => {
       assert.equal(items[3]?.toolName, "ambiguous_server_edit_document");
       assert.isUndefined(items[3]?.toolSource);
       assert.equal(statusReads, 1);
-    }).pipe(
-      Effect.provide(Layer.merge(IdAllocator.layer, McpProviderSessions.layer)),
-      Effect.scoped,
-    ),
+    }).pipe(Effect.provide(Layer.merge(IdAllocator.layer, McpProviderSessions.layer))),
   );
 
   it.effect("admits a native command on its user receipt before generation completes", () =>
@@ -1918,10 +1990,7 @@ describe("OpenCodeAdapterV2", () => {
       yield* Fiber.join(start);
       assert.equal(promptCalls, 0);
       release.resolve();
-    }).pipe(
-      Effect.provide(Layer.merge(IdAllocator.layer, McpProviderSessions.layer)),
-      Effect.scoped,
-    ),
+    }).pipe(Effect.provide(Layer.merge(IdAllocator.layer, McpProviderSessions.layer))),
   );
 
   it.effect("keeps an admitted native command running when its HTTP request times out", () =>
@@ -1998,10 +2067,7 @@ describe("OpenCodeAdapterV2", () => {
         "completed",
         "a command admitted by its user receipt must not fail when its HTTP request times out",
       );
-    }).pipe(
-      Effect.provide(Layer.merge(IdAllocator.layer, McpProviderSessions.layer)),
-      Effect.scoped,
-    ),
+    }).pipe(Effect.provide(Layer.merge(IdAllocator.layer, McpProviderSessions.layer))),
   );
 
   it.effect("compacts with the native summarize API and emits a completed compaction", () =>
@@ -2056,10 +2122,7 @@ describe("OpenCodeAdapterV2", () => {
       assert.isTrue(
         events.some((event) => event.type === "turn.terminal" && event.status === "completed"),
       );
-    }).pipe(
-      Effect.provide(Layer.merge(IdAllocator.layer, McpProviderSessions.layer)),
-      Effect.scoped,
-    ),
+    }).pipe(Effect.provide(Layer.merge(IdAllocator.layer, McpProviderSessions.layer))),
   );
 
   it.effect("ends a turn on the provider thread it started on", () =>
@@ -2096,10 +2159,7 @@ describe("OpenCodeAdapterV2", () => {
         Stream.runHead,
       );
       assert.equal(Option.getOrUndefined(terminal)?.providerThreadId, forkedRow.id);
-    }).pipe(
-      Effect.provide(Layer.merge(IdAllocator.layer, McpProviderSessions.layer)),
-      Effect.scoped,
-    ),
+    }).pipe(Effect.provide(Layer.merge(IdAllocator.layer, McpProviderSessions.layer))),
   );
 
   it.effect("does not restore messages beyond OpenCode's persisted revert boundary", () =>
@@ -2184,10 +2244,7 @@ describe("OpenCodeAdapterV2", () => {
         ["user-kept", "assistant-kept"],
       );
       assert.equal(snapshot.providerThread.nativeConversationHeadRef?.nativeId, "user-kept");
-    }).pipe(
-      Effect.provide(Layer.merge(IdAllocator.layer, McpProviderSessions.layer)),
-      Effect.scoped,
-    ),
+    }).pipe(Effect.provide(Layer.merge(IdAllocator.layer, McpProviderSessions.layer))),
   );
 
   it.effect("steers with the turn's agent, reasoning variant and system instructions", () =>
@@ -2240,10 +2297,7 @@ describe("OpenCodeAdapterV2", () => {
         { agent: steer?.agent, variant: steer?.variant, system: steer?.system },
         { agent: start?.agent, variant: start?.variant, system: start?.system },
       );
-    }).pipe(
-      Effect.provide(Layer.merge(IdAllocator.layer, McpProviderSessions.layer)),
-      Effect.scoped,
-    ),
+    }).pipe(Effect.provide(Layer.merge(IdAllocator.layer, McpProviderSessions.layer))),
   );
 
   it.effect("keeps a newly admitted prompt alive across stale idle and delayed busy evidence", () =>
@@ -2560,10 +2614,7 @@ describe("OpenCodeAdapterV2", () => {
       );
       const interrupted = yield* runtime.readThreadSnapshot({ providerThread });
       assert.equal(interrupted.providerTurns.at(-1)?.status, "interrupted");
-    }).pipe(
-      Effect.provide(Layer.merge(IdAllocator.layer, McpProviderSessions.layer)),
-      Effect.scoped,
-    ),
+    }).pipe(Effect.provide(Layer.merge(IdAllocator.layer, McpProviderSessions.layer))),
   );
 
   it.effect("rejects steering when stop wins the extracted-text lookup", () =>
@@ -2651,10 +2702,7 @@ describe("OpenCodeAdapterV2", () => {
         providerThread: harness.providerThread,
       });
       assert.equal(stopped.providerTurns.at(-1)?.status, "interrupted");
-    }).pipe(
-      Effect.provide(Layer.merge(IdAllocator.layer, McpProviderSessions.layer)),
-      Effect.scoped,
-    ),
+    }).pipe(Effect.provide(Layer.merge(IdAllocator.layer, McpProviderSessions.layer))),
   );
 
   it.effect("interrupts an initial prompt while its SDK request is pending", () =>
@@ -2819,10 +2867,7 @@ describe("OpenCodeAdapterV2", () => {
             (event.type === "provider_session.updated" && event.providerSession.status === "error"),
         ),
       );
-    }).pipe(
-      Effect.provide(Layer.merge(IdAllocator.layer, McpProviderSessions.layer)),
-      Effect.scoped,
-    ),
+    }).pipe(Effect.provide(Layer.merge(IdAllocator.layer, McpProviderSessions.layer))),
   );
 
   it.effect("fails an active turn when the OpenCode event stream ends cleanly", () =>
@@ -2865,10 +2910,7 @@ describe("OpenCodeAdapterV2", () => {
       assert.equal(terminal?.failure?.class, "transport_error");
       assert.equal(terminal?.threadDisposition, "broken");
       assert.equal((yield* Effect.exit(harness.startTurn()))._tag, "Failure");
-    }).pipe(
-      Effect.provide(Layer.merge(IdAllocator.layer, McpProviderSessions.layer)),
-      Effect.scoped,
-    ),
+    }).pipe(Effect.provide(Layer.merge(IdAllocator.layer, McpProviderSessions.layer))),
   );
 
   it.effect("fails compaction when its response races stream termination", () =>
@@ -2929,10 +2971,7 @@ describe("OpenCodeAdapterV2", () => {
             event.turnItem.status === "completed",
         ),
       );
-    }).pipe(
-      Effect.provide(Layer.merge(IdAllocator.layer, McpProviderSessions.layer)),
-      Effect.scoped,
-    ),
+    }).pipe(Effect.provide(Layer.merge(IdAllocator.layer, McpProviderSessions.layer))),
   );
 
   it.effect("does not register a turn after the OpenCode event stream ends", () =>
@@ -2990,10 +3029,7 @@ describe("OpenCodeAdapterV2", () => {
 
       assert.isTrue(Exit.isFailure(yield* Fiber.join(start)));
       assert.equal(promptCalls, 0);
-    }).pipe(
-      Effect.provide(Layer.merge(IdAllocator.layer, McpProviderSessions.layer)),
-      Effect.scoped,
-    ),
+    }).pipe(Effect.provide(Layer.merge(IdAllocator.layer, McpProviderSessions.layer))),
   );
 
   it("holds stale idle through prompt admission until the new user message is observed", () => {
@@ -3401,10 +3437,7 @@ it.effect.each([false, true])(
         assert.equal(result.messages.length, 0);
         assert.deepEqual(calls, ["fork", "permissions"]);
       }
-    }).pipe(
-      Effect.provide(Layer.merge(IdAllocator.layer, McpProviderSessions.layer)),
-      Effect.scoped,
-    ),
+    }).pipe(Effect.provide(Layer.merge(IdAllocator.layer, McpProviderSessions.layer))),
 );
 
 it.live.each([true, false])("opens an authenticated OpenCode session (external=%s)", (external) =>
diff --git a/packages/provider-opencode/src/server/adapter.ts b/packages/provider-opencode/src/server/adapter.ts
index 4459a219aa7d..b017a8861f40 100644
--- a/packages/provider-opencode/src/server/adapter.ts
+++ b/packages/provider-opencode/src/server/adapter.ts
@@ -378,7 +378,8 @@ interface OpenCodeThreadState {
   readonly messageRoles: Map<string, "user" | "assistant">;
   readonly userMessageIds: Array<string>;
   parentSubagent: OpenCodeSubagentContext | null;
-  nextChildTurnOrdinal: number;
+  // null: a child resumed after a restart, whose next ordinal is recovered from OpenCode.
+  nextChildTurnOrdinal: number | null;
   nextAdmissionGeneration: number;
   permission: PermissionRuleset;
   /** Parent rules last written into this child's `permission`; empty for root sessions. */
@@ -1308,6 +1309,22 @@ export const makeOpenCodeAdapterV2 = Effect.fn("makeOpenCodeAdapterV2")(function
           });
         });
 
+        // A child turn's ordinal never exceeds its user message's position in the session, and that
+        // position survives restarts, so it stays above every ordinal allocated before.
+        const storedUserMessagePosition = Effect.fnUntraced(function* (
+          childSessionId: string,
+          messageId: string,
+        ) {
+          const response = yield* sdkCall("session.messages", { sessionID: childSessionId }, () =>
+            client.session.messages({ sessionID: childSessionId }),
+          );
+          const userMessageIds = unwrapData("session.messages", response).flatMap((entry) =>
+            entry.info.role === "user" ? [entry.info.id] : [],
+          );
+          const index = userMessageIds.indexOf(messageId);
+          return (index === -1 ? userMessageIds.length : index) + 1;
+        });
+
         const emitSubagent = Effect.fnUntraced(function* (
           state: OpenCodeThreadState,
           turn: ActiveOpenCodeTurn,
@@ -1416,6 +1433,15 @@ export const makeOpenCodeAdapterV2 = Effect.fn("makeOpenCodeAdapterV2")(function
                   permission: childPermission,
                 }),
             );
+            // A Task call with task_id resumes the child, whose earlier turns already hold ordinals.
+            const knownChild = threads.get(childSessionId);
+            const resumedChild = knownChild?.parentSubagent == null ? undefined : knownChild;
+            const nextChildTurnOrdinal =
+              resumedChild === undefined
+                ? recordString(input, "task_id") === childSessionId
+                  ? null
+                  : 1
+                : resumedChild.nextChildTurnOrdinal;
             threads.set(childSessionId, {
               nativeSessionId: childSessionId,
               providerThread: childProviderThread,
@@ -1423,10 +1449,10 @@ export const makeOpenCodeAdapterV2 = Effect.fn("makeOpenCodeAdapterV2")(function
               activeTurn: null,
               providerTurns: new Map(),
               runtimeRequests: new Map(),
-              messageRoles: new Map(),
-              userMessageIds: [],
+              messageRoles: resumedChild?.messageRoles ?? new Map(),
+              userMessageIds: resumedChild?.userMessageIds ?? [],
               parentSubagent: context,
-              nextChildTurnOrdinal: 1,
+              nextChildTurnOrdinal,
               nextAdmissionGeneration: 1,
               permission: childPermission,
               inheritedPermission: openCodePermissionRules(turn.runtimePolicy),
@@ -2222,6 +2248,10 @@ export const makeOpenCodeAdapterV2 = Effect.fn("makeOpenCodeAdapterV2")(function
           message: Extract<OpenCodeMessage, { role: "user" }>,
         ) {
           if (state.appThread === null || state.parentSubagent === null) return null;
+          const ordinal =
+            state.nextChildTurnOrdinal ??
+            (yield* storedUserMessagePosition(state.nativeSessionId, message.id));
+          state.nextChildTurnOrdinal = ordinal + 1;
           const now = yield* DateTime.now;
           const startedAt = dateTimeFromEpoch(message.time.created, now);
           const rootNodeId = idAllocator.derive.nodeFromProviderItem({
@@ -2238,7 +2268,7 @@ export const makeOpenCodeAdapterV2 = Effect.fn("makeOpenCodeAdapterV2")(function
             nodeId: rootNodeId,
             runAttemptId: null,
             nativeTurnRef: providerRef(message.id, "weak"),
-            ordinal: state.nextChildTurnOrdinal++,
+            ordinal,
             status: "running",
             startedAt,
             completedAt: null,
diff --git a/packages/provider-opencode/src/server/driver.test.ts b/packages/provider-opencode/src/server/driver.test.ts
index ffb91b6a3199..b3c628e28fc6 100644
--- a/packages/provider-opencode/src/server/driver.test.ts
+++ b/packages/provider-opencode/src/server/driver.test.ts
@@ -279,7 +279,7 @@ it.layer(layer)("OpenCodeDriver runtime selection", (it) => {
         }),
       );
       assert.deepStrictEqual(serverStarts, ["start"]);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect.each(["2.1.2", null])(
@@ -312,7 +312,7 @@ it.layer(layer)("OpenCodeDriver runtime selection", (it) => {
         assert.strictEqual(maintenance.packageName, "@opencode/cli");
         assert.isNotEmpty(probeOffline);
         assert.isTrue(probeOffline.every((offline) => offline === "1"));
-      }).pipe(Effect.scoped),
+      }),
   );
 
   it.effect("skips the installed CLI probe when a localhost provider is disabled", () =>
@@ -333,7 +333,7 @@ it.layer(layer)("OpenCodeDriver runtime selection", (it) => {
       const snapshot = yield* instance.snapshot.refresh;
       assert.isFalse(snapshot.enabled);
       assert.deepStrictEqual(probed, []);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("opens a session through OpenCode 2 that a lazy mise shim installs on first use", () =>
@@ -356,7 +356,7 @@ it.layer(layer)("OpenCodeDriver runtime selection", (it) => {
       assert.deepStrictEqual(serverStarts, ["start"], "the OpenCode 2 adapter starts its server");
       const capabilities = yield* instance.orchestrationAdapter.getCapabilities();
       assert.isTrue(capabilities.sessions.supportsRuntimeModeSwitchInSession);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("does not scan a workspace through a 1.x server it could not probe offline", () =>
@@ -368,7 +368,7 @@ it.layer(layer)("OpenCodeDriver runtime selection", (it) => {
 
       yield* Effect.flip(instance.snapshotForCwd!(process.cwd()));
       assert.deepStrictEqual(serverStarts, []);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect.each([
@@ -404,7 +404,7 @@ it.layer(layer)("OpenCodeDriver runtime selection", (it) => {
         capabilities.turns.supportsNativeGoals === true,
         version.endsWith("2.2.5") || version.endsWith("2.2.6"),
       );
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("uses the connected OpenCode version for goal support after an upgrade", () =>
@@ -479,7 +479,7 @@ it.layer(layer)("OpenCodeDriver runtime selection", (it) => {
       assert.isTrue(
         (yield* instance.orchestrationAdapter.getCapabilities()).turns.supportsNativeGoals,
       );
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("answers capability reads without waiting on an unreachable server", () =>
@@ -804,6 +804,81 @@ it.layer(layer)("OpenCodeDriver runtime selection", (it) => {
     }).pipe(Effect.scoped, Effect.provide(TestClock.layer())),
   );
 
+  it.effect.each([
+    { status: 200, data: null, reason: "unsupported" },
+    { status: 404, data: null, reason: "unsupported" },
+    { status: 503, data: null, reason: "probeFailed" },
+    {
+      status: 200,
+      data: {
+        workspace: {
+          id: "remote-workspace",
+          name: "Remote workspace",
+          usageURL: "https://opencode.ai/console/remote-workspace",
+        },
+        budgets: [
+          {
+            id: "all",
+            limit: 20,
+            spent: 15,
+            scope: "combined",
+            per: "set",
+            coverage: "all",
+            models: [],
+            shared: true,
+            resetsAt: 1793491200000,
+          },
+        ],
+      },
+      reason: undefined,
+    },
+  ])(
+    "reads external workspace usage without local credentials, HTTP $status, $reason",
+    (scenario) =>
+      Effect.gen(function* () {
+        const requested: string[] = [];
+        const replay = replayOpenCodeServer(OPENCODE_2_RESPONSES, "secret", requested);
+        const server = HttpClient.make((request) => {
+          assert.notInclude(request.url, "opencode.ai/zen");
+          if (request.url.endsWith("/api/experimental/usage/limits")) {
+            assert.strictEqual(request.headers.authorization, "Basic b3BlbmNvZGU6c2VjcmV0");
+            return Effect.succeed(
+              HttpClientResponse.fromWeb(
+                request,
+                Response.json(
+                  {
+                    location: { directory: "/work" },
+                    data: scenario.data,
+                  },
+                  { status: scenario.status },
+                ),
+              ),
+            );
+          }
+          return replay.execute(request);
+        });
+        const instance = yield* create(
+          { serverUrl: "https://remote.example", serverPassword: "secret" },
+          server,
+        );
+        const [snapshot] = Array.from(
+          yield* instance.snapshot.streamChanges.pipe(
+            Stream.filter((snapshot) => snapshot.usageLimits !== undefined),
+            Stream.take(1),
+            Stream.runCollect,
+          ),
+        );
+        assert.strictEqual(snapshot?.usageLimits?.unavailable?.reason, scenario.reason);
+        if (scenario.reason === undefined) {
+          assert.strictEqual(snapshot?.usageLimits?.windows[0]?.usedPercent, 75);
+          assert.strictEqual(snapshot?.usageLimits?.externalUsage?.label, "Remote workspace");
+          assert.deepStrictEqual(snapshot?.usageLimits?.windows[0]?.providerIds, []);
+        } else {
+          assert.deepStrictEqual(snapshot?.usageLimits?.windows, []);
+        }
+      }),
+  );
+
   it.effect.each(
     [
       { name: "recovers" },
@@ -843,6 +918,10 @@ it.layer(layer)("OpenCodeDriver runtime selection", (it) => {
           );
         }
         const path = new URL(request.url).pathname;
+        if (path === "/api/experimental/usage/limits")
+          return Effect.succeed(
+            HttpClientResponse.fromWeb(request, new Response(null, { status: 404 })),
+          );
         if (path === "/api/model") modelReads += 1;
         const body =
           path === "/api/info"
@@ -1148,7 +1227,7 @@ it.layer(Layer.mergeAll(layer, Layer.succeed(OpenCodeRuntime.OpenCodeRuntime, op
         assert.deepStrictEqual(slugsOf(unreadable), ["opencode/big-pickle"]);
         assert.strictEqual(unreadable.workspaceModels, undefined);
         assert.strictEqual(unreadable.workspaceModelsPending, true);
-      }).pipe(Effect.scoped),
+      }),
     );
   },
 );
@@ -1183,7 +1262,7 @@ it.layer(layerUpdate)("OpenCodeDriver updates", (it) => {
         const v2 = yield* instance.snapshot.resolveMaintenance({ fresh: true });
         assert.strictEqual(v2.packageName, "@opencode/cli");
         assert.isNull(v2.update);
-      }).pipe(Effect.scoped),
+      }),
   );
 
   it.effect(
@@ -1218,6 +1297,6 @@ it.layer(layerUpdate)("OpenCodeDriver updates", (it) => {
           "after upgrading to 2.x, the next session must not open through the 1.x adapter",
         );
         assert.include(serverStarts, "start", "the OpenCode 2 adapter starts its server");
-      }).pipe(Effect.scoped),
+      }),
   );
 });
diff --git a/packages/provider-opencode/src/server/driver.ts b/packages/provider-opencode/src/server/driver.ts
index a0d2f7905e4a..9b39fed2546b 100644
--- a/packages/provider-opencode/src/server/driver.ts
+++ b/packages/provider-opencode/src/server/driver.ts
@@ -1,3 +1,4 @@
+import { resolveProviderProbeTimeoutMs } from "@t3tools/provider-core/server/snapshotProbe";
 import {
   ProviderDriverKind,
   settingsSecretLiteral,
@@ -8,6 +9,7 @@ import * as Digest from "effect/crypto/Digest";
 import * as SecureRandom from "effect/crypto/SecureRandom";
 import * as Deferred from "effect/Deferred";
 import * as Effect from "effect/Effect";
+import * as DateTime from "effect/DateTime";
 import * as Equal from "effect/Equal";
 import * as Option from "effect/Option";
 import * as FileSystem from "effect/FileSystem";
@@ -397,6 +399,7 @@ export const OpenCodeDriver: ProviderDriver<
     });
     const loadOpenCode2Models = yield* makeOpenCode2ModelLoader(
       openCode2Server.withConnection(({ client }) => loadOpenCode2Catalog(client, host.paths.cwd)),
+      processEnv,
     );
     const listOpenCode2Workspace = (cwd: string) =>
       openCode2Server.withConnection(({ client, events }) =>
@@ -440,6 +443,7 @@ export const OpenCodeDriver: ProviderDriver<
                 ),
             // OpenCode answers provider.list for a location only once its skill scan has ended.
             client.provider.list({ location }).pipe(Effect.timeout("10 seconds"), Effect.ignore),
+            processEnv,
           );
         }).pipe(Effect.scoped),
       );
@@ -459,7 +463,7 @@ export const OpenCodeDriver: ProviderDriver<
       ),
     );
 
-    const checkUsageLimits = readOpenCodeGoUsageLimits({
+    const legacyUsageLimits = readOpenCodeGoUsageLimits({
       enabled: effectiveConfig.enabled,
       serverUrl: effectiveConfig.serverUrl,
       environment: processEnv,
@@ -469,6 +473,30 @@ export const OpenCodeDriver: ProviderDriver<
       Effect.provideService(HttpClient.HttpClient, httpClient),
       Effect.provideService(Digest.Digest, digest),
     );
+    let unsupportedUsageVersion: string | undefined;
+    const checkUsageLimits = Effect.gen(function* () {
+      if (!effectiveConfig.enabled) return yield* legacyUsageLimits;
+      const runtime = yield* runtimeProbe.get;
+      if (runtime.generation === "v1" || runtime.version === unsupportedUsageVersion)
+        return yield* legacyUsageLimits;
+      const limits = yield* openCode2Server.withConnection((connection) =>
+        connection.usageLimits(host.paths.cwd),
+      );
+      if (limits === undefined) unsupportedUsageVersion = runtime.version;
+      return limits ?? (yield* legacyUsageLimits);
+    }).pipe(
+      Effect.timeout("10 seconds"),
+      Effect.catch(() =>
+        Effect.map(DateTime.now, (now) => ({
+          checkedAt: DateTime.formatIso(now),
+          windows: [],
+          unavailable: {
+            reason: "probeFailed" as const,
+            message: "OpenCode could not read workspace usage.",
+          },
+        })),
+      ),
+    );
     const checkProvider = Effect.all(
       {
         // A configured loopback server reports its running version. Probe the local
@@ -489,6 +517,7 @@ export const OpenCodeDriver: ProviderDriver<
           host.paths.cwd,
           runtimeProbe.refresh,
           loadOpenCode2Models,
+          processEnv,
         ).pipe(
           Effect.annotateLogs({ providerInstanceId: instanceId }),
           Effect.annotateSpans({ providerInstanceId: instanceId }),
@@ -517,7 +546,7 @@ export const OpenCodeDriver: ProviderDriver<
         {
           skills: openCodeRuntime.loadOpenCodeSkills(client),
           commandInventory: OpenCodeRuntime.loadOpenCodeCommands(client).pipe(
-            Effect.timeoutOption("10 seconds"),
+            Effect.timeoutOption(resolveProviderProbeTimeoutMs("opencode", 10_000, processEnv)),
             Effect.map((commands) => ({
               commands: Option.getOrElse(commands, () => []),
               slashCommandsPending: Option.isNone(commands),
@@ -681,6 +710,7 @@ export const OpenCodeDriver: ProviderDriver<
                         openCode2Server.withConnection(({ client }) =>
                           loadOpenCode2DirectoryCatalog(client, cwd),
                         ),
+                        processEnv,
                       ).pipe(
                         Effect.map(
                           Option.map((catalog) =>
@@ -689,7 +719,10 @@ export const OpenCodeDriver: ProviderDriver<
                         ),
                       ),
                       listOpenCode2Workspace(cwd).pipe(
-                        Effect.timeout("20 seconds"),
+                        // Leaves room for the reads around the scan wait, which uses the same override.
+                        Effect.timeout(
+                          2 * resolveProviderProbeTimeoutMs("opencode", 10_000, processEnv),
+                        ),
                         Effect.mapError(
                           (cause) =>
                             new ProviderDriverError({
@@ -715,7 +748,12 @@ export const OpenCodeDriver: ProviderDriver<
                   ),
                   v1: Effect.all([
                     snapshot.getSnapshot,
-                    loadWorkspaceForCwd(cwd).pipe(Effect.timeout("20 seconds")),
+                    loadWorkspaceForCwd(cwd).pipe(
+                      // Leaves room for connection setup before the command fallback below.
+                      Effect.timeout(
+                        2 * resolveProviderProbeTimeoutMs("opencode", 10_000, processEnv),
+                      ),
+                    ),
                   ]).pipe(
                     Effect.map(
                       ([machineSnapshot, { skills, models, commands, slashCommandsPending }]) => ({
diff --git a/packages/provider-opencode/src/server/status.test.ts b/packages/provider-opencode/src/server/status.test.ts
index c07464f03641..732aa5156082 100644
--- a/packages/provider-opencode/src/server/status.test.ts
+++ b/packages/provider-opencode/src/server/status.test.ts
@@ -801,37 +801,35 @@ it.layer(layerTest)("checkOpenCodeProviderStatus", (it) => {
   );
 
   it.effect("reports the upgraded CLI without restarting a borrowed OpenCode server", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const settings = makeOpenCodeSettings();
-        const owner = yield* OpenCodeServerOwner.make({
-          binaryPath: settings.binaryPath,
-          directory: process.cwd(),
-        });
-        yield* owner.withServer(() =>
-          Effect.gen(function* () {
-            runtimeMock.state.versionStdout = "opencode 1.14.20\n";
-            const snapshot = yield* checkOpenCodeProviderStatus(
-              settings,
-              process.cwd(),
-              probeOpenCodeRuntime(settings).pipe(
-                Effect.provideService(
-                  HttpClient.HttpClient,
-                  replayOpenCodeServer(OPENCODE_1_RESPONSES, settings.serverPassword),
-                ),
-                Effect.provideService(OpenCodeRuntime.OpenCodeRuntime, OpenCodeRuntimeTestDouble),
+    Effect.gen(function* () {
+      const settings = makeOpenCodeSettings();
+      const owner = yield* OpenCodeServerOwner.make({
+        binaryPath: settings.binaryPath,
+        directory: process.cwd(),
+      });
+      yield* owner.withServer(() =>
+        Effect.gen(function* () {
+          runtimeMock.state.versionStdout = "opencode 1.14.20\n";
+          const snapshot = yield* checkOpenCodeProviderStatus(
+            settings,
+            process.cwd(),
+            probeOpenCodeRuntime(settings).pipe(
+              Effect.provideService(
+                HttpClient.HttpClient,
+                replayOpenCodeServer(OPENCODE_1_RESPONSES, settings.serverPassword),
               ),
-              Effect.succeed([]),
-            ).pipe(Effect.provideService(OpenCodeServerOwner.OpenCodeServerOwner, owner));
+              Effect.provideService(OpenCodeRuntime.OpenCodeRuntime, OpenCodeRuntimeTestDouble),
+            ),
+            Effect.succeed([]),
+          ).pipe(Effect.provideService(OpenCodeServerOwner.OpenCodeServerOwner, owner));
 
-            NodeAssert.equal(snapshot.version, "1.14.19");
-            NodeAssert.equal(snapshot.installedVersion, "1.14.20");
-            NodeAssert.equal(runtimeMock.state.startCalls, 1);
-            NodeAssert.equal(runtimeMock.state.closeCalls, 0);
-          }),
-        );
-      }),
-    ),
+          NodeAssert.equal(snapshot.version, "1.14.19");
+          NodeAssert.equal(snapshot.installedVersion, "1.14.20");
+          NodeAssert.equal(runtimeMock.state.startCalls, 1);
+          NodeAssert.equal(runtimeMock.state.closeCalls, 0);
+        }),
+      );
+    }),
   );
 
   it.effect("lists a local OpenCode 2 binary's models in Full access only, never via 1.x", () =>
@@ -850,6 +848,12 @@ it.layer(layerTest)("checkOpenCodeProviderStatus", (it) => {
             name: "Space Bunny Free",
             variants: [{ id: "low" }, { id: "medium" }, { id: "high" }],
           },
+          {
+            providerID: "opencode-go",
+            id: "deepseek-v4.1-flash",
+            name: "DeepSeek V4.1 Flash",
+            variants: [{ id: "low" }, { id: "high" }, { id: "max" }],
+          },
         ]),
       );
 
@@ -869,7 +873,7 @@ it.layer(layerTest)("checkOpenCodeProviderStatus", (it) => {
       );
       NodeAssert.deepEqual(
         snapshot.models.map((model) => model.slug),
-        ["opencode/big-pickle", "opencode/space-bunny-free"],
+        ["opencode/big-pickle", "opencode-go/deepseek-v4.1-flash", "opencode/space-bunny-free"],
       );
       const variant = snapshot.models.find((model) => model.slug === "opencode/space-bunny-free")
         ?.capabilities?.optionDescriptors?.[0];
@@ -877,6 +881,18 @@ it.layer(layerTest)("checkOpenCodeProviderStatus", (it) => {
         variant?.type === "select" ? variant.options.map((option) => option.id) : [],
         ["low", "medium", "high"],
       );
+      const goVariant = snapshot.models.find(
+        (model) => model.slug === "opencode-go/deepseek-v4.1-flash",
+      )?.capabilities?.optionDescriptors?.[0];
+      const goVariantIds =
+        goVariant?.type === "select" ? goVariant.options.map((option) => option.id) : [];
+      NodeAssert.deepEqual(goVariantIds, ["low", "high", "max"]);
+      NodeAssert.ok(
+        goVariant?.type === "select" &&
+          goVariant.currentValue !== undefined &&
+          goVariantIds.includes(goVariant.currentValue),
+        "an OpenCode Go model gets a default reasoning variant it lists",
+      );
       NodeAssert.equal(runtimeMock.state.sdkClientInputs.length, 0);
     }),
   );
diff --git a/packages/provider-opencode/src/server/status.ts b/packages/provider-opencode/src/server/status.ts
index 0f24b1e22f47..0f90b9df2894 100644
--- a/packages/provider-opencode/src/server/status.ts
+++ b/packages/provider-opencode/src/server/status.ts
@@ -1,3 +1,4 @@
+import { resolveProviderProbeTimeoutMs } from "@t3tools/provider-core/server/snapshotProbe";
 import {
   type ModelCapabilities,
   type ServerProviderModel,
@@ -193,7 +194,7 @@ function inferDefaultVariant(
   if (providerID === "anthropic" || providerID.startsWith("google")) {
     return variants.includes("high") ? "high" : undefined;
   }
-  if (providerID === "openai" || providerID === "opencode") {
+  if (providerID === "openai" || providerID === "opencode" || providerID === "opencode-go") {
     return variants.includes("medium") ? "medium" : variants.includes("high") ? "high" : undefined;
   }
   return undefined;
@@ -517,10 +518,11 @@ const settleOpenCode2Catalog = <E>(
     );
   });
 
-const OPENCODE_2_CATALOG_SETTLE_TIMEOUT = "5 seconds";
+const OPENCODE_2_CATALOG_SETTLE_TIMEOUT_MS = 5_000;
 
 export const makeOpenCode2ModelLoader = <E>(
   list: Effect.Effect<ReadonlyArray<OpenCode2Model>, E>,
+  environment?: NodeJS.ProcessEnv,
 ) =>
   Effect.sync(() => {
     let lastLoaded: ReadonlyArray<OpenCode2Model> = [];
@@ -537,7 +539,13 @@ export const makeOpenCode2ModelLoader = <E>(
       return tracked.pipe(
         Effect.flatMap((first) =>
           settleOpenCode2Catalog(tracked, first).pipe(
-            Effect.timeoutOption(OPENCODE_2_CATALOG_SETTLE_TIMEOUT),
+            Effect.timeoutOption(
+              resolveProviderProbeTimeoutMs(
+                "opencode",
+                OPENCODE_2_CATALOG_SETTLE_TIMEOUT_MS,
+                environment,
+              ),
+            ),
           ),
         ),
         Effect.catch((error) =>
@@ -556,9 +564,12 @@ export const makeOpenCode2ModelLoader = <E>(
 /** None when the reads fail or never agree, so a partial catalog never passes for a settled one. */
 export const readSettledOpenCode2Catalog = <E>(
   list: Effect.Effect<ReadonlyArray<OpenCode2Model>, E>,
+  environment?: NodeJS.ProcessEnv,
 ) =>
   settleOpenCode2Catalog(list).pipe(
-    Effect.timeoutOption(OPENCODE_2_CATALOG_SETTLE_TIMEOUT),
+    Effect.timeoutOption(
+      resolveProviderProbeTimeoutMs("opencode", OPENCODE_2_CATALOG_SETTLE_TIMEOUT_MS, environment),
+    ),
     Effect.orElseSucceed(() => Option.none<ReadonlyArray<OpenCode2Model>>()),
   );
 
@@ -587,12 +598,15 @@ export const loadOpenCode2Workspace = Effect.fn("OpencodeProviderStatus.loadOpen
     scanned: Effect.Effect<void>,
     loaded: Effect.Effect<boolean>,
     settled: Effect.Effect<void> = Effect.void,
+    environment?: NodeJS.ProcessEnv,
   ) {
     const wasLoaded = yield* loaded;
     yield* settled;
     const first = yield* read;
     if (wasLoaded && first.commands.length > 0) return first;
-    yield* scanned.pipe(Effect.timeoutOption("10 seconds"));
+    yield* scanned.pipe(
+      Effect.timeoutOption(resolveProviderProbeTimeoutMs("opencode", 10_000, environment)),
+    );
     return yield* read;
   },
 );
@@ -749,6 +763,7 @@ export const checkOpenCodeProviderStatus = Effect.fn("checkOpenCodeProviderStatu
     ReadonlyArray<OpenCode2Model>,
     OpenCodeRuntime.OpenCodeRuntimeError
   >,
+  environment?: NodeJS.ProcessEnv,
 ): Effect.fn.Return<
   ServerProviderDraft,
   never,
@@ -865,6 +880,7 @@ export const checkOpenCodeProviderStatus = Effect.fn("checkOpenCodeProviderStatu
           ...(settingsSecretLiteral(openCodeSettings.serverPassword)
             ? { serverPassword: settingsSecretLiteral(openCodeSettings.serverPassword) }
             : {}),
+          ...(environment !== undefined ? { environment } : {}),
         })
         .pipe(Effect.flatMap(loadInventory), Effect.scoped)
     : serverOwner.withServer(loadInventory);
diff --git a/packages/provider-opencode/src/server/usage.test.ts b/packages/provider-opencode/src/server/usage.test.ts
index d211563738ad..02d1e5dc8cc2 100644
--- a/packages/provider-opencode/src/server/usage.test.ts
+++ b/packages/provider-opencode/src/server/usage.test.ts
@@ -1,3 +1,4 @@
+import type * as NodeWorkerThreads from "node:worker_threads";
 import * as NodeServices from "@effect/platform-node/NodeServices";
 import { assert, describe, it } from "@effect/vitest";
 import { DEFAULT_SERVER_SETTINGS, ProviderInstanceId } from "@t3tools/contracts";
@@ -13,6 +14,27 @@ import { vi } from "vite-plus/test";
 
 import { openCodeUsageReader, readOpenCodeUsage } from "./usage.ts";
 
+const readerWorkers = vi.hoisted(() => ({ started: 0, enabled: false }));
+
+// Statement spies only see the main thread, so reader workers fail to start unless a test enables them.
+vi.mock("node:worker_threads", async (importOriginal) => {
+  const actual = await importOriginal<typeof NodeWorkerThreads>();
+  class ReaderWorker extends actual.Worker {
+    constructor(...args: ConstructorParameters<typeof actual.Worker>) {
+      super(
+        ...((readerWorkers.enabled
+          ? args
+          : [
+              "throw new Error('reader workers disabled');",
+              { eval: true },
+            ]) as ConstructorParameters<typeof actual.Worker>),
+      );
+      readerWorkers.started++;
+    }
+  }
+  return { ...actual, Worker: ReaderWorker };
+});
+
 const openDatabase = (filename: string) =>
   Layer.build(NodeSqliteClient.layer({ filename })).pipe(
     Effect.map(Context.get(SqlClient.SqlClient)),
@@ -141,6 +163,7 @@ describe("readOpenCodeUsage", () => {
         );
       }
       let statements = 0;
+      let bodyReads = 0;
       const originalAll = NodeSqlite.StatementSync.prototype.all;
       yield* Effect.acquireRelease(
         Effect.sync(() =>
@@ -149,6 +172,7 @@ describe("readOpenCodeUsage", () => {
             ...params
           ) {
             statements++;
+            if (this.sourceSQL.includes("data ->")) bodyReads++;
             return originalAll.apply(this, params);
           }),
         ),
@@ -161,6 +185,51 @@ describe("readOpenCodeUsage", () => {
         ["opencode:a", "opencode:b", "opencode:c"],
       );
       assert.isBelow(statements, 10);
+
+      bodyReads = 0;
+      const repeated = yield* readOpenCodeUsage(dir, sinceMs);
+      assert.deepStrictEqual(
+        repeated.files.flatMap((file) => file.records).map((record) => record.dedupeKey),
+        ["opencode:a", "opencode:b", "opencode:c"],
+      );
+      // An unchanged database must not have its message bodies read and parsed again.
+      assert.strictEqual(bodyReads, 0);
+    }).pipe(Effect.provide(NodeServices.layer)),
+  );
+
+  it.effect("does not reuse rows from a replaced or restored database file", () =>
+    Effect.gen(function* () {
+      const fileSystem = yield* FileSystem.FileSystem;
+      const path = yield* Path.Path;
+      const dir = yield* fileSystem.makeTempDirectoryScoped({ prefix: "usage-replaced-" });
+      const write = (name: string, input: number) =>
+        Effect.scoped(
+          Effect.gen(function* () {
+            const db = yield* openDatabase(path.join(dir, name));
+            yield* db.unsafe("PRAGMA journal_mode = WAL");
+            yield* db.unsafe(
+              "CREATE TABLE message (id TEXT, session_id TEXT, time_created INTEGER, time_updated INTEGER, data TEXT)",
+            );
+            yield* db.unsafe(
+              "INSERT INTO message(rowid, id, session_id, time_created, time_updated, data) VALUES (1, 'a', 's', 1, 1, ?)",
+              [JSON.stringify({ modelID: "m", tokens: { input } })],
+            );
+          }),
+        );
+      const input = Effect.map(
+        readOpenCodeUsage(dir, 0),
+        (result) => result.files[0]?.records[0]?.totals.uncachedInputTokens,
+      );
+      yield* write("opencode.db", 100);
+      assert.strictEqual(yield* input, 100);
+      yield* write("replacement.db", 900);
+      yield* fileSystem.rename(path.join(dir, "replacement.db"), path.join(dir, "opencode.db"));
+      assert.strictEqual(yield* input, 900);
+      // A backup restored in place keeps the inode and birth time, like `cp -p`.
+      yield* write("backup.db", 500);
+      yield* fileSystem.copyFile(path.join(dir, "backup.db"), path.join(dir, "opencode.db"));
+      yield* fileSystem.utimes(path.join(dir, "opencode.db"), 0, 0);
+      assert.strictEqual(yield* input, 500);
     }).pipe(Effect.provide(NodeServices.layer)),
   );
 
@@ -188,6 +257,27 @@ describe("readOpenCodeUsage", () => {
       const legacy = path.join(dir, "storage", "message", message.sessionID);
       yield* fileSystem.makeDirectory(legacy, { recursive: true });
       yield* fileSystem.writeFileString(path.join(legacy, "msg-1.json"), JSON.stringify(message));
+      yield* Effect.acquireRelease(
+        Effect.sync(() => {
+          readerWorkers.enabled = true;
+          readerWorkers.started = 0;
+        }),
+        () => Effect.sync(() => (readerWorkers.enabled = false)),
+      );
+      let mainThreadBodyReads = 0;
+      const originalAll = NodeSqlite.StatementSync.prototype.all;
+      yield* Effect.acquireRelease(
+        Effect.sync(() =>
+          vi.spyOn(NodeSqlite.StatementSync.prototype, "all").mockImplementation(function (
+            this: NodeSqlite.StatementSync,
+            ...params
+          ) {
+            if (this.sourceSQL.includes("data ->")) mainThreadBodyReads++;
+            return originalAll.apply(this, params);
+          }),
+        ),
+        (spy) => Effect.sync(() => spy.mockRestore()),
+      );
       const first = yield* readOpenCodeUsage(dir, 0);
       assert.isFalse(first.error);
       const records = first.files.flatMap((file) => file.records);
@@ -212,6 +302,9 @@ describe("readOpenCodeUsage", () => {
         ["opencode:msg-2"],
       );
       assert.isAbove(Number((yield* fileSystem.stat(path.join(dir, "opencode.db-wal"))).size), 0);
+      // A large database must not be read on the server's event loop.
+      assert.isAbove(readerWorkers.started, 0);
+      assert.strictEqual(mainThreadBodyReads, 0);
     }).pipe(Effect.provide(NodeServices.layer)),
   );
 
diff --git a/packages/provider-opencode/src/server/usage.ts b/packages/provider-opencode/src/server/usage.ts
index 4ae7b6df358e..8d9bb28c70b3 100644
--- a/packages/provider-opencode/src/server/usage.ts
+++ b/packages/provider-opencode/src/server/usage.ts
@@ -11,6 +11,7 @@ import * as FileSystem from "effect/FileSystem";
 import * as Option from "effect/Option";
 import * as Path from "effect/Path";
 import type * as PlatformError from "effect/PlatformError";
+import * as Semaphore from "effect/Semaphore";
 import * as SqlClient from "effect/sql/SqlClient";
 
 import type { OpenCodeSettings } from "../settings.ts";
@@ -93,6 +94,18 @@ export interface OpenCodeUsageReadResult {
   readonly error: boolean;
 }
 
+interface CachedRow {
+  readonly updated: unknown;
+  readonly size: unknown;
+  readonly created: unknown;
+  readonly record: UsageRecord | null;
+}
+
+// Parsed rows by `${databasePath}\0${table}`, then rowid, so unchanged rows are not read again.
+const rowCache = new Map<string, { version: string; rows: Map<number, CachedRow> }>();
+// Concurrent scans of the same database would each read every uncached row.
+const scanLock = Semaphore.makeUnsafe(1);
+
 const isNotFound = (cause: PlatformError.PlatformError) => cause.reason._tag === "NotFound";
 const MESSAGE_PAGE_SIZE = 64;
 
@@ -116,6 +129,7 @@ const LEGACY_STAT_BATCH = 256;
 export const readOpenCodeUsage = Effect.fn("readOpenCodeUsage")(function* (
   root: string,
   sinceMs: number,
+  retentionCutoffMs = sinceMs,
 ): Effect.fn.Return<OpenCodeUsageReadResult, never, FileSystem.FileSystem | Path.Path> {
   const fileSystem = yield* FileSystem.FileSystem;
   const path = yield* Path.Path;
@@ -164,6 +178,22 @@ export const readOpenCodeUsage = Effect.fn("readOpenCodeUsage")(function* (
     found = true;
     const file = { path: path.join(root, name), records: [] as UsageRecord[] };
     files.push(file);
+    // Taken before the snapshot opens, so a write that races the scan invalidates its rows.
+    const [main, wal] = yield* Effect.forEach([file.path, `${file.path}-wal`], (target) =>
+      Effect.option(fileSystem.stat(target)),
+    );
+    const stamp = (info: Option.Option<FileSystem.File.Info>) =>
+      Option.match(info, {
+        onNone: () => "none",
+        onSome: (stat) => `${stat.size}:${Option.getOrNull(stat.mtime)?.getTime()}`,
+      });
+    // A replaced or restored database can repeat rowids and change markers, so every key includes
+    // the main file; WAL commits leave it alone until a checkpoint.
+    const identity = Option.match(main!, {
+      onNone: () => "none",
+      onSome: (stat) =>
+        `${stat.dev}:${Option.getOrNull(stat.ino)}:${Option.getOrNull(stat.birthtime)?.getTime()}/${stamp(main!)}`,
+    });
     yield* Effect.gen(function* () {
       const sql = yield* SqlClient.SqlClient;
       // Fail promptly on live-writer locks instead of stalling the server.
@@ -182,30 +212,53 @@ export const readOpenCodeUsage = Effect.fn("readOpenCodeUsage")(function* (
           ),
         );
         const timestamp = columns.has("time_created") ? "time_created" : "NULL";
+        const updated = columns.has("time_updated") ? "time_updated" : "NULL";
+        // Without time_updated an in-place edit can keep the length, so any database write counts.
+        const version = updated === "NULL" ? `${identity}/${stamp(wal!)}` : identity;
         const predicates = table === "session_message" ? ["type = 'assistant'"] : [];
         if (timestamp !== "NULL") predicates.push("time_created >= ?");
-        // List only rowids so SQLite can use time indexes without reading message bodies.
-        const listed = (yield* sql.unsafe<{ readonly row_id: number }>(
-          `SELECT rowid AS row_id FROM ${table}
+        // List rowids and change markers so SQLite can use time indexes without reading message
+        // bodies; octet_length comes from the record header.
+        const listed = (yield* sql.unsafe<{
+          readonly row_id: number;
+          readonly updated: unknown;
+          readonly size: unknown;
+          readonly created: unknown;
+        }>(
+          `SELECT rowid AS row_id, ${updated} AS updated, octet_length(data) AS size,
+             ${timestamp} AS created
+           FROM ${table}
            ${predicates.length ? `WHERE ${predicates.join(" AND ")}` : ""}`,
           timestamp === "NULL" ? [] : [sinceMs],
         )).toSorted((a, b) => a.row_id - b.row_id);
         databaseRows += listed.length;
+        const key = `${file.path}\0${table}`;
+        const previous = rowCache.get(key);
+        const reusable = previous?.version === version ? previous.rows : undefined;
+        const cached = new Map<number, CachedRow>();
+        const misses: typeof listed = [];
+        for (const row of listed) {
+          const hit = reusable?.get(row.row_id);
+          if (hit && hit.updated === row.updated && hit.size === row.size)
+            cached.set(row.row_id, hit);
+          else misses.push(row);
+        }
         // Filter and project in SQLite: user diffs and assistant bodies can be hundreds of MB.
         const validAssistant = `CASE WHEN typeof(data) = 'text' AND json_valid(data)
           THEN json_type(data, '$.role') IS NULL OR data ->> '$.role' = 'assistant' END`;
         // Omit per-page spans; the enclosing scan records row and page counts.
-        for (let start = 0; start < listed.length; start += MESSAGE_PAGE_SIZE) {
-          const page = listed.slice(start, start + MESSAGE_PAGE_SIZE);
+        for (let start = 0; start < misses.length; start += MESSAGE_PAGE_SIZE) {
+          const page = misses.slice(start, start + MESSAGE_PAGE_SIZE);
           databasePages++;
           const rows = yield* sql
             .unsafe<{
+              readonly row_id: number;
               readonly id: unknown;
               readonly session_id: unknown;
               readonly data: unknown;
               readonly created: unknown;
             }>(
-              `SELECT id, session_id, ${timestamp} AS created, json_object(
+              `SELECT rowid AS row_id, id, session_id, ${timestamp} AS created, json_object(
                  'tokens', data -> '$.tokens', 'cost', data -> '$.cost',
                  'model', data -> '$.model', 'modelID', data -> '$.modelID',
                  'providerID', data -> '$.providerID',
@@ -217,9 +270,10 @@ export const readOpenCodeUsage = Effect.fn("readOpenCodeUsage")(function* (
               page.map((row) => row.row_id),
             )
             .pipe(Effect.withTracerEnabled(false));
+          const parsed = new Map<number, UsageRecord | null>();
           for (const row of rows) {
-            append(
-              file.records,
+            parsed.set(
+              row.row_id,
               parseOpenCodeMessage(text(row.data), {
                 id: text(row.id),
                 sessionId: text(row.session_id),
@@ -227,12 +281,28 @@ export const readOpenCodeUsage = Effect.fn("readOpenCodeUsage")(function* (
               }),
             );
           }
+          // Rows the SQL filter dropped are cached as empty so they are not read again either.
+          for (const row of page) {
+            cached.set(row.row_id, { ...row, record: parsed.get(row.row_id) ?? null });
+          }
           yield* Effect.yieldNow;
         }
+        for (const row of listed) append(file.records, cached.get(row.row_id)!.record);
+        // Rows before this window were not listed; keep them for a wider window until retention.
+        for (const [rowId, entry] of reusable ?? []) {
+          const created = entry.created;
+          if (typeof created === "number" && created < sinceMs && created >= retentionCutoffMs)
+            cached.set(rowId, entry);
+        }
+        rowCache.set(key, { version, rows: cached });
       }
     }).pipe(
       (read) => Effect.flatMap(SqlClient.SqlClient, (sql) => sql.withTransaction(read)),
-      Effect.provide(NodeSqliteClient.layer({ filename: file.path, readonly: true })),
+      // Run the scan on a reader worker so large databases do not block the server's event loop.
+      NodeSqliteClient.readOnly,
+      Effect.provide(
+        NodeSqliteClient.layer({ filename: file.path, readonly: true, readerWorker: true }),
+      ),
       Effect.catchTags({
         SqlError: () => {
           error = true;
@@ -312,7 +382,7 @@ export const readOpenCodeUsage = Effect.fn("readOpenCodeUsage")(function* (
     "usage.database_pages": databasePages,
   });
   return { files, missing: !found && !error, error };
-});
+}, scanLock.withPermit);
 
 const resolveOpenCodeDataDirs = Effect.fn("resolveOpenCodeDataDirs")(function* (
   environment: NodeJS.ProcessEnv,
@@ -346,7 +416,11 @@ export type OpenCodeUsageReaderEnv = FileSystem.FileSystem | Path.Path;
 export const openCodeUsageReader: ProviderUsageReader<OpenCodeSettings, OpenCodeUsageReaderEnv> = {
   kind: "scan",
   provider: "opencode",
-  scan: Effect.fn("openCodeUsageReader.scan")(function* ({ instances, windowStartMs }) {
+  scan: Effect.fn("openCodeUsageReader.scan")(function* ({
+    instances,
+    windowStartMs,
+    retentionCutoffMs,
+  }) {
     const roots = new Set<string>();
     for (const instance of instances) {
       for (const root of yield* resolveOpenCodeDataDirs(instance.environment)) roots.add(root);
@@ -354,7 +428,7 @@ export const openCodeUsageReader: ProviderUsageReader<OpenCodeSettings, OpenCode
     return yield* Effect.forEach(
       roots,
       (dir) =>
-        readOpenCodeUsage(dir, windowStartMs).pipe(
+        readOpenCodeUsage(dir, windowStartMs, retentionCutoffMs).pipe(
           Effect.map((result) => ({
             dir,
             files: result.missing && !result.error ? null : result.files,
diff --git a/packages/provider-opencode/src/server/v2/OpenCode2Client.test.ts b/packages/provider-opencode/src/server/v2/OpenCode2Client.test.ts
index 30d00390769d..1cede7712d6d 100644
--- a/packages/provider-opencode/src/server/v2/OpenCode2Client.test.ts
+++ b/packages/provider-opencode/src/server/v2/OpenCode2Client.test.ts
@@ -4,6 +4,8 @@ import * as Cause from "effect/Cause";
 import * as Deferred from "effect/Deferred";
 import * as Effect from "effect/Effect";
 import * as Fiber from "effect/Fiber";
+import * as Exit from "effect/Exit";
+import * as Scope from "effect/Scope";
 import * as Layer from "effect/Layer";
 import * as Redacted from "effect/Redacted";
 import * as Schema from "effect/Schema";
@@ -79,7 +81,7 @@ describe("OpenCode2Client event subscription", () => {
       assert.strictEqual(error._tag, "HttpClientError");
       assert.strictEqual(error.reason._tag, "TransportError");
       assert.isTrue(Cause.isTimeoutError(error.cause));
-    }).pipe(Effect.scoped),
+    }),
   );
 });
 
@@ -168,6 +170,36 @@ describe("OpenCode2Client message history", () => {
     }),
   );
 });
+it.effect("closes an event subscription that recovery has not started reading", () =>
+  Effect.gen(function* () {
+    const signals: Array<AbortSignal> = [];
+    const http = HttpClient.make((request, _url, signal) =>
+      Effect.sync(() => {
+        signals.push(signal);
+        return HttpClientResponse.fromWeb(
+          request,
+          new Response(": connected\n\n", {
+            headers: { "content-type": "text/event-stream" },
+          }),
+        );
+      }),
+    );
+    const opencode = yield* OpenCode2Client.make.pipe(
+      Effect.provideService(HttpClient.HttpClient, http),
+    );
+    const connection = yield* opencode.connect({
+      baseUrl: "http://127.0.0.1:4096",
+      password: "test",
+    });
+    const scope = yield* Effect.acquireRelease(Scope.make(), (scope) =>
+      Scope.close(scope, Exit.void),
+    );
+    yield* connection.events.pipe(Effect.provideService(Scope.Scope, scope), Effect.asVoid);
+    assert.isFalse(signals[0]!.aborted);
+    yield* Scope.close(scope, Exit.void);
+    assert.isTrue(signals[0]!.aborted);
+  }),
+);
 
 describe("OpenCode2Client native image jobs", () => {
   it.effect.each([
@@ -248,3 +280,206 @@ describe("OpenCode2Client native image jobs", () => {
     }),
   );
 });
+
+describe("OpenCode2Client usage limits", () => {
+  it.effect("reads the connected workspace and maps Go and Console budgets", () =>
+    Effect.gen(function* () {
+      let workspace = "wrk_remote";
+      let usageURL: string | undefined;
+      const transport = HttpClient.make((request) => {
+        assert.strictEqual(request.headers.authorization, utf8Basic("remote-password"));
+        assert.deepStrictEqual(Array.from(request.urlParams), [
+          ["location[directory]", "/remote/project"],
+        ]);
+        if (request.url === "https://remote.example/prefix/api/provider")
+          return Effect.succeed(
+            HttpClientResponse.fromWeb(
+              request,
+              Response.json({
+                data: [
+                  { id: "opencode", integrationID: "opencode" },
+                  { id: "console-custom", integrationID: "opencode" },
+                  { id: "opencode-go", integrationID: "opencode" },
+                  { id: "anthropic", integrationID: "anthropic" },
+                  { id: "byok" },
+                ],
+              }),
+            ),
+          );
+        assert.strictEqual(
+          request.url,
+          "https://remote.example/prefix/api/experimental/usage/limits",
+        );
+        return Effect.succeed(
+          HttpClientResponse.fromWeb(
+            request,
+            Response.json({
+              location: { directory: "/remote/project" },
+              data: {
+                workspace: {
+                  id: workspace,
+                  name: workspace,
+                  usageURL: usageURL ?? "https://opencode.ai/console/" + workspace,
+                },
+                go: {
+                  rolling: { percent: 23, limited: false, resetsAt: 1793491200000 },
+                  weekly: { percent: 99, limited: true, resetsAt: 1793491200000 },
+                  monthly: { percent: 12, limited: false, resetsAt: 1793491200000 },
+                },
+                budgets: [
+                  {
+                    id: "all",
+                    limit: 20,
+                    spent: 15,
+                    scope: "combined",
+                    per: "set",
+                    coverage: "all",
+                    models: [],
+                    vendors: [],
+                    picked: false,
+                    shared: true,
+                    resetsAt: 1793491200000,
+                  },
+                  {
+                    id: "models",
+                    limit: 10,
+                    spent: 12,
+                    scope: "each",
+                    per: "model",
+                    coverage: "models",
+                    models: [
+                      { providerID: "opencode", modelID: "a", name: "Model A", spent: 12 },
+                      { providerID: "opencode", modelID: "b", name: "Model B", spent: 2 },
+                    ],
+                    vendors: [],
+                    picked: true,
+                    shared: false,
+                    resetsAt: 1793491200000,
+                  },
+                  {
+                    id: "zz_missing",
+                    limit: 10,
+                    spent: 10,
+                    scope: "each",
+                    per: "model",
+                    coverage: "models",
+                    models: [{ providerID: "opencode", modelID: "unknown", name: "Unknown spend" }],
+                    shared: false,
+                    resetsAt: 1793491200000,
+                  },
+                  {
+                    id: "zero",
+                    limit: 0,
+                    spent: 0,
+                    scope: "each",
+                    per: "set",
+                    coverage: "all",
+                    models: [],
+                    vendors: [],
+                    picked: false,
+                    shared: false,
+                    resetsAt: 1793491200000,
+                  },
+                ],
+              },
+            }),
+          ),
+        );
+      });
+      const opencode = yield* OpenCode2Client.make.pipe(
+        Effect.provideService(HttpClient.HttpClient, transport),
+      );
+      const api = yield* opencode.connect({
+        baseUrl: "https://remote.example/prefix",
+        password: "remote-password",
+      });
+      const first = yield* api.usageLimits("/remote/project");
+      assert.isDefined(first);
+      assert.deepStrictEqual(
+        first?.windows.map((window) => window.usedPercent),
+        [23, 100, 12, 75, 100, 20, 100, 100],
+      );
+      assert.isTrue(
+        first?.windows.every((window) => window.resetsAt === "2026-11-01T00:00:00.000Z"),
+      );
+      assert.include(first?.windows[3]?.label ?? "", "Shared");
+      assert.include(first?.windows[4]?.label ?? "", "Model A");
+      assert.deepStrictEqual(first?.windows[4]?.modelIds, ["opencode/a"]);
+      assert.strictEqual(first?.windows[3]?.modelIds, undefined);
+      assert.deepStrictEqual(first?.windows[3]?.providerIds, ["opencode", "console-custom"]);
+      assert.deepStrictEqual(first?.windows[7]?.modelIds, []);
+      assert.include(first?.windows[7]?.label ?? "", "Most used model");
+      assert.strictEqual(first?.credentialFingerprint, undefined);
+      workspace = "wrk_switched";
+      const next = yield* api.usageLimits("/remote/project");
+      assert.strictEqual(next?.externalUsage?.label, "wrk_switched");
+      assert.strictEqual(next?.externalUsage?.url, "https://opencode.ai/console/wrk_switched");
+      for (const url of [
+        "not a URL",
+        "javascript:alert(1)",
+        "custom-app://usage",
+        "file:///tmp/usage",
+      ]) {
+        usageURL = url;
+        const invalid = yield* api.usageLimits("/remote/project");
+        assert.strictEqual(invalid?.externalUsage, undefined);
+        assert.deepStrictEqual(invalid?.windows, next?.windows);
+      }
+      usageURL = "http://console.example/workspace/usage";
+      assert.strictEqual((yield* api.usageLimits("/remote/project"))?.externalUsage?.url, usageURL);
+    }),
+  );
+
+  it.effect("recognizes an older server's SPA fallback", () =>
+    Effect.gen(function* () {
+      const opencode = yield* OpenCode2Client.make.pipe(
+        Effect.provideService(
+          HttpClient.HttpClient,
+          HttpClient.make((request) =>
+            Effect.succeed(
+              HttpClientResponse.fromWeb(
+                request,
+                new Response("<!doctype html><title>OpenCode</title>", {
+                  headers: { "content-type": "text/html; charset=utf-8" },
+                }),
+              ),
+            ),
+          ),
+        ),
+      );
+      const api = yield* opencode.connect({ baseUrl: "https://old.example", password: "secret" });
+      assert.strictEqual(yield* api.usageLimits("/remote"), undefined);
+    }),
+  );
+
+  it.effect("distinguishes missing endpoints, signed out, and failed remote probes", () =>
+    Effect.gen(function* () {
+      for (const [status, body, reason] of [
+        [404, {}, undefined],
+        [405, {}, undefined],
+        [200, { location: { directory: "/remote" }, data: null }, "unsupported"],
+        [503, {}, "probeFailed"],
+        [401, {}, "probeFailed"],
+        [200, { data: { workspace: {} } }, "probeFailed"],
+      ] as const) {
+        const opencode = yield* OpenCode2Client.make.pipe(
+          Effect.provideService(
+            HttpClient.HttpClient,
+            HttpClient.make((request) =>
+              Effect.succeed(HttpClientResponse.fromWeb(request, Response.json(body, { status }))),
+            ),
+          ),
+        );
+        const api = yield* opencode.connect({
+          baseUrl: "https://remote.example",
+          password: "secret",
+        });
+        const result = yield* api.usageLimits("/remote");
+        if (reason === undefined) assert.strictEqual(result, undefined);
+        else assert.strictEqual(result?.unavailable?.reason, reason);
+        if (status === 200 && reason === "unsupported")
+          assert.include(result?.unavailable?.message ?? "", "signed in");
+      }
+    }),
+  );
+});
diff --git a/packages/provider-opencode/src/server/v2/OpenCode2Client.ts b/packages/provider-opencode/src/server/v2/OpenCode2Client.ts
index 56514825788e..1cc1190de00d 100644
--- a/packages/provider-opencode/src/server/v2/OpenCode2Client.ts
+++ b/packages/provider-opencode/src/server/v2/OpenCode2Client.ts
@@ -9,6 +9,7 @@ import * as Option from "effect/Option";
 import * as Redacted from "effect/Redacted";
 import * as Result from "effect/Result";
 import * as Schema from "effect/Schema";
+import type * as Scope from "effect/Scope";
 import * as Stream from "effect/Stream";
 import * as Sse from "effect/encoding/Sse";
 import * as HttpClient from "effect/http/HttpClient";
@@ -16,6 +17,8 @@ import * as HttpClientError from "effect/http/HttpClientError";
 import * as HttpClientRequest from "effect/http/HttpClientRequest";
 import * as HttpClientResponse from "effect/http/HttpClientResponse";
 
+import { readServerUsageLimits } from "./usageLimits.ts";
+
 /** OpenCode 2 accepts only HTTP Basic auth, always with this user name. */
 const OPENCODE_USERNAME = "opencode";
 
@@ -93,6 +96,9 @@ const decodeImageJob = Schema.decodeUnknownOption(NativeImageJob);
 /** events resolves on subscription acceptance; subscribe before work because the stream is volatile. */
 export interface OpenCode2Api {
   readonly client: OpenCodeClient;
+  readonly usageLimits: (
+    directory: string,
+  ) => Effect.Effect<import("@t3tools/contracts").ServerProviderUsageLimits | undefined>;
   readonly shellJobs?: (
     sessionID: string,
   ) => Effect.Effect<typeof ShellJobs.Type, HttpClientError.HttpClientError | Schema.SchemaError>;
@@ -108,7 +114,8 @@ export interface OpenCode2Api {
       OpenCode2StreamEvent,
       HttpClientError.HttpClientError | Sse.Retry | Sse.SseError | OpenCode2SilentStreamError
     >,
-    HttpClientError.HttpClientError
+    HttpClientError.HttpClientError,
+    Scope.Scope
   >;
 }
 
@@ -165,9 +172,13 @@ const undecodable = Effect.fnUntraced(function* (data: string) {
   return Result.failVoid;
 });
 
-const readEvents = HttpClient.get("/api/event", {
-  headers: { accept: "text/event-stream" },
-}).pipe(
+const readEvents = HttpClient.HttpClient.pipe(
+  // Recovery subscribes before reading history, so its stream may never be consumed.
+  Effect.flatMap((client) =>
+    HttpClient.withScope(client).get("/api/event", {
+      headers: { accept: "text/event-stream" },
+    }),
+  ),
   Effect.flatMap(HttpClientResponse.filterStatusOk),
   Effect.map((response) =>
     response.stream.pipe(
@@ -263,6 +274,13 @@ export const make = Effect.gen(function* () {
         Effect.provideService(HttpClient.HttpClient, fillCompactionRecents(authenticated)),
         Effect.map((client) => ({
           client,
+          usageLimits: (directory) =>
+            readServerUsageLimits(directory).pipe(
+              Effect.provideService(
+                HttpClient.HttpClient,
+                HttpClient.mapRequest(authenticated, HttpClientRequest.prependUrl(baseUrl)),
+              ),
+            ),
           shellJobs: Effect.fn("OpenCode2Client.shellJobs")(function (sessionID: string) {
             return authenticated
               .get(`${baseUrl}/api/experimental/job`, {
diff --git a/packages/provider-opencode/src/server/v2/OpenCode2Server.test.ts b/packages/provider-opencode/src/server/v2/OpenCode2Server.test.ts
index 61ac37d79cea..b096661c7927 100644
--- a/packages/provider-opencode/src/server/v2/OpenCode2Server.test.ts
+++ b/packages/provider-opencode/src/server/v2/OpenCode2Server.test.ts
@@ -253,8 +253,12 @@ describe("OpenCode2Server spawned server", () => {
       assert.strictEqual(first.version, "2.0.18");
       assert.strictEqual(first.external, false);
       assert.strictEqual(second.client, first.client);
+      if (first.processExit === undefined)
+        return yield* Effect.die("Missing owned process lifetime");
+      return first.processExit;
     }).pipe(
       Effect.scoped,
+      Effect.flatten,
       Effect.provide(
         Layer.mergeAll(
           OpenCode2Client.layer,
diff --git a/packages/provider-opencode/src/server/v2/OpenCode2Server.ts b/packages/provider-opencode/src/server/v2/OpenCode2Server.ts
index 30758c14872f..ced84482b48d 100644
--- a/packages/provider-opencode/src/server/v2/OpenCode2Server.ts
+++ b/packages/provider-opencode/src/server/v2/OpenCode2Server.ts
@@ -1,3 +1,4 @@
+import { resolveProviderProbeTimeoutMs } from "@t3tools/provider-core/server/snapshotProbe";
 // One OpenCode 2 process serves all directories; share it across instance threads.
 import type { OpenCodeClient } from "@opencode/client/effect";
 import * as Context from "effect/Context";
@@ -12,12 +13,14 @@ import * as OpenCodeRuntime from "../OpenCodeRuntime.ts";
 import * as OpenCodeServerOwner from "../OpenCodeServerOwner.ts";
 import * as OpenCode2Client from "./OpenCode2Client.ts";
 
-const INFO_TIMEOUT = "5 seconds";
+const INFO_TIMEOUT_MS = 5_000;
 
 export interface OpenCode2Connection extends OpenCode2Client.OpenCode2Api {
   readonly url: string;
   readonly version: string;
   readonly external: boolean;
+  /** Only owned processes have an authoritative lifetime signal. */
+  readonly processExit?: Effect.Effect<void>;
 }
 
 export class OpenCode2Server extends Context.Service<
@@ -50,7 +53,7 @@ export const serverEnvironment = (
   return { ...rest, OPENCODE_PASSWORD: Redacted.value(password) };
 };
 
-const httpFailureOf = (cause: unknown): HttpClientError.HttpClientError | undefined => {
+export const httpFailureOf = (cause: unknown): HttpClientError.HttpClientError | undefined => {
   if (HttpClientError.isHttpClientError(cause)) return cause;
   if (
     P.isTagged(cause, "ClientError") &&
@@ -77,10 +80,10 @@ const describeInfoFailure = (cause: unknown) => {
 };
 
 /** Only server info proves readiness; keep credential-bearing failure details out of client text. */
-export const verifyServer = (client: OpenCodeClient) =>
+export const verifyServer = (client: OpenCodeClient, environment?: NodeJS.ProcessEnv) =>
   client.server.info().pipe(
     Effect.timeoutOrElse({
-      duration: INFO_TIMEOUT,
+      duration: resolveProviderProbeTimeoutMs("opencode", INFO_TIMEOUT_MS, environment),
       orElse: () =>
         Effect.fail(
           new OpenCodeRuntime.OpenCodeRuntimeError({
@@ -125,7 +128,7 @@ export const make = Effect.fn("OpenCode2Server.make")(function* (input: {
     external: boolean,
   ) {
     const api = yield* opencode.connect({ baseUrl: url, password });
-    const version = yield* verifyServer(api.client);
+    const version = yield* verifyServer(api.client, input.environment);
     return { ...api, url, version, external } satisfies OpenCode2Connection;
   });
   let latest: OpenCode2Connection | undefined;
@@ -163,7 +166,7 @@ export const make = Effect.fn("OpenCode2Server.make")(function* (input: {
     withConnection: Effect.fn("OpenCode2Server.withConnection")(function (use) {
       return owner.withServer((server) =>
         latest?.url === server.url
-          ? use(latest)
+          ? use({ ...latest, processExit: server.exitCode.pipe(Effect.asVoid) })
           : Effect.die(new Error("OpenCode 2 server was lent before verification.")),
       );
     }),
diff --git a/packages/provider-opencode/src/server/v2/OpenCode2Service.test.ts b/packages/provider-opencode/src/server/v2/OpenCode2Service.test.ts
index 79c9dac2073a..a6744e9e89f7 100644
--- a/packages/provider-opencode/src/server/v2/OpenCode2Service.test.ts
+++ b/packages/provider-opencode/src/server/v2/OpenCode2Service.test.ts
@@ -91,6 +91,6 @@ it.layer(NodeServices.layer)("replaceOutdatedService", (it) => {
           command: [path.join(binDirectory, "opencode"), "serve", "--service"],
           env: { ...environment, PATH: "/nowhere", ELECTRON_RUN_AS_NODE: undefined },
         });
-      }).pipe(Effect.scoped),
+      }),
   );
 });
diff --git a/packages/provider-opencode/src/server/v2/adapter.ts b/packages/provider-opencode/src/server/v2/adapter.ts
index b13f6c361bac..728d2cf68e0a 100644
--- a/packages/provider-opencode/src/server/v2/adapter.ts
+++ b/packages/provider-opencode/src/server/v2/adapter.ts
@@ -48,9 +48,11 @@ import type * as Cause from "effect/Cause";
 import * as DateTime from "effect/DateTime";
 import * as Deferred from "effect/Deferred";
 import * as Digest from "effect/crypto/Digest";
+import * as Duration from "effect/Duration";
 import * as Effect from "effect/Effect";
 import * as Hex from "effect/encoding/Hex";
 import * as Exit from "effect/Exit";
+import * as P from "effect/Predicate";
 import * as FileSystem from "effect/FileSystem";
 import * as Queue from "effect/Queue";
 import * as Schedule from "effect/Schedule";
@@ -589,6 +591,44 @@ const RECONNECT_ATTEMPTS = 5;
 const RECONNECT_DELAY = "2 seconds";
 const RECONCILE_TIMEOUT = "15 seconds";
 const RECONNECT_WAIT = "30 seconds";
+const OWNED_RECONNECT_SCHEDULE = Schedule.exponential(RECONNECT_DELAY).pipe(
+  Schedule.modifyDelay(({ duration }) =>
+    Effect.succeed(Duration.min(duration, Duration.seconds(30))),
+  ),
+);
+const TRANSIENT_HTTP_STATUSES: ReadonlySet<number> = new Set([408, 425, 429]);
+// A live owned server is retried until it answers; these failures repeat however long it waits.
+const isPermanentRecoveryError = (error: unknown) => {
+  if (Schema.isSchemaError(error)) return true;
+  if (
+    P.isTagged(error, "UnauthorizedError") ||
+    P.isTagged(error, "InvalidRequestError") ||
+    P.isTagged(error, "InvalidCursorError")
+  ) {
+    return true;
+  }
+  const http = OpenCode2Server.httpFailureOf(error);
+  if (http !== undefined) {
+    const status = http.response?.status;
+    return (
+      status !== undefined && status >= 400 && status < 500 && !TRANSIENT_HTTP_STATUSES.has(status)
+    );
+  }
+  // ClientError also wraps an SSE retry request, which clears.
+  return (
+    P.isTagged(error, "ClientError") &&
+    P.hasProperty(error, "cause") &&
+    Schema.isSchemaError(error.cause)
+  );
+};
+const OWNED_RECOVERY_RETRY = {
+  schedule: OWNED_RECONNECT_SCHEDULE,
+  while: (error: unknown) => !isPermanentRecoveryError(error),
+};
+class OpenCode2ServerExitedError extends Schema.TaggedError<OpenCode2ServerExitedError>()(
+  "OpenCode2ServerExitedError",
+  {},
+) {}
 const LOST_BACKGROUND =
   "T3 Code lost its connection to OpenCode while this subagent ran, so its result is not shown.";
 const INVENTORY_TIMEOUT = "5 seconds";
@@ -660,10 +700,18 @@ const boundaryAfter = (
 
 const isProviderAdapterError = Schema.is(ProviderAdapter.ProviderAdapterV2Error);
 
-const modelRef = (selection: ProviderAdapter.ProviderAdapterV2TurnInput["modelSelection"]) => {
+// A saved or inherited variant the catalog model does not list makes OpenCode reject the turn.
+const modelRef = (
+  selection: ProviderAdapter.ProviderAdapterV2TurnInput["modelSelection"],
+  listedVariants: ReadonlySet<string> | undefined,
+) => {
   const parsed = OpenCodeRuntime.parseOpenCodeModelSlug(selection.model);
   if (parsed === null) return undefined;
-  const variant = getModelSelectionStringOptionValue(selection, "variant");
+  const selected = getModelSelectionStringOptionValue(selection, "variant");
+  const variant =
+    selected === undefined || listedVariants === undefined || listedVariants.has(selected)
+      ? selected
+      : undefined;
   return Model.Ref.make({
     providerID: Provider.ID.make(parsed.providerID),
     id: Model.ID.make(parsed.modelID),
@@ -765,9 +813,12 @@ export const make = Effect.fn("OpenCode2Adapter.make")(function* (instanceId: Pr
     const sessionScope = yield* Effect.scope;
     // Project config changes model limits; key by directory because this runtime serves all instance threads.
     const contextWindows = new Map<string, Map<string, number>>();
+    const modelVariants = new Map<string, Map<string, ReadonlySet<string>>>();
     const directoryOf = (cwd: string | null | undefined) => cwd ?? host.paths.cwd;
     const windowOf = (cwd: string | null | undefined, model: string) =>
       contextWindows.get(directoryOf(cwd))?.get(model);
+    const listedModelRef = (selection: ModelSelection, cwd: string | null | undefined) =>
+      modelRef(selection, modelVariants.get(directoryOf(cwd))?.get(selection.model));
     const now = yield* DateTime.now;
     let session: OrchestrationV2ProviderSession = {
       id: input.providerSessionId,
@@ -3326,90 +3377,98 @@ export const make = Effect.fn("OpenCode2Adapter.make")(function* (instanceId: Pr
       ).pipe(
         Stream.takeUntil((message) => message.id === start),
         Stream.runCollect,
+        Effect.catchTags({ SessionNotFoundError: () => Effect.succeed(null) }),
       );
-      // Without this turn's start in history, all retrieved turns are older.
-      const found = start === null || read.at(-1)?.id === start;
-      if (!found) return undefined;
-      const recent = before !== undefined && before !== null ? read.slice(0, -1) : read;
-      for (const message of recent) {
-        if (message.type === "user" && turn.steers.delete(message.id)) {
-          turn.settledInbox.add(message.id);
-        }
-      }
-      const idle = recent.find((message) => message.type === "idle");
-      const assistant = recent.find((message) => message.type === "assistant");
-      if (assistant?.retry !== undefined) {
-        // Snapshots omit when the retry was scheduled, so only its remaining delay is known.
-        yield* updateRetry(
-          state,
-          turn,
-          assistant.retry,
-          DateTime.toEpochMillis(assistant.retry.at) - DateTime.toEpochMillis(yield* DateTime.now),
-        );
-      } else if (
-        turn.retry !== undefined &&
-        assistant !== undefined &&
-        assistant.error === undefined &&
-        assistant.content.length > 0
-      ) {
-        yield* emitRetry(state, turn, "completed");
-        turn.retry = undefined;
-      }
-      for (const message of recent.toReversed()) {
-        if (message.type !== "assistant" || state.active !== turn) continue;
-        const ordinals = { text: 0, reasoning: 0 };
-        for (const [index, part] of message.content.entries()) {
-          if (part.type === "text" || part.type === "reasoning") {
-            const block = { assistantMessageID: message.id, ordinal: ordinals[part.type]++ };
-            // OpenCode saves a block's text only when the block ends, so the last block of a
-            // response still streaming stays open and keeps the text that already arrived.
-            const open =
-              message.time.streamed === undefined && index === message.content.length - 1;
-            yield* emitText(
+      return yield* lock.withPermit(
+        Effect.gen(function* () {
+          if (state.active !== turn) return undefined;
+          if (read === null) return { outcome: "missing" as const };
+          // Without this turn's start in history, all retrieved turns are older.
+          const found = start === null || read.at(-1)?.id === start;
+          if (!found) return undefined;
+          const recent = before !== undefined && before !== null ? read.slice(0, -1) : read;
+          for (const message of recent) {
+            if (message.type === "user" && turn.steers.delete(message.id)) {
+              turn.settledInbox.add(message.id);
+            }
+          }
+          const idle = recent.find((message) => message.type === "idle");
+          const assistant = recent.find((message) => message.type === "assistant");
+          if (assistant?.retry !== undefined) {
+            // Snapshots omit when the retry was scheduled, so only its remaining delay is known.
+            yield* updateRetry(
               state,
               turn,
-              block,
-              part.type,
-              (text) => (open && !part.text.startsWith(text) ? text : part.text),
-              !open,
+              assistant.retry,
+              DateTime.toEpochMillis(assistant.retry.at) -
+                DateTime.toEpochMillis(yield* DateTime.now),
             );
-            continue;
-          }
-          if (part.type !== "tool") continue;
-          if (!turn.tools.has(part.id)) {
-            turn.tools.set(part.id, { name: part.name, input: {} });
-            turn.startedAt.set(part.id, yield* DateTime.now);
-          }
-          const tool = turn.tools.get(part.id)!;
-          if (typeof part.state.input === "object" && part.state.input !== null) {
-            tool.input = part.state.input as Record<string, unknown>;
+          } else if (
+            turn.retry !== undefined &&
+            assistant !== undefined &&
+            assistant.error === undefined &&
+            assistant.content.length > 0
+          ) {
+            yield* emitRetry(state, turn, "completed");
+            turn.retry = undefined;
           }
-          if (part.state.status === "completed") {
-            yield* emitTool(state, turn, part.id, "completed", {
-              output: textOf(part.state.content),
-              files: part.state.content.flatMap((content) =>
-                content.type === "file" ? [content] : [],
-              ),
-              metadata: part.state.metadata,
-            });
-            if (
-              ![...state.imageJobs.values()].some(
-                (job) => job.turn === turn && job.toolId === part.id,
-              )
-            )
-              turn.tools.delete(part.id);
-          } else if (part.state.status === "error") {
-            yield* emitTool(state, turn, part.id, "failed", {
-              output: part.state.error.message,
-              metadata: part.state.metadata,
-            });
-            turn.tools.delete(part.id);
-          } else {
-            yield* emitTool(state, turn, part.id, "running");
+          for (const message of recent.toReversed()) {
+            if (message.type !== "assistant" || state.active !== turn) continue;
+            const ordinals = { text: 0, reasoning: 0 };
+            for (const [index, part] of message.content.entries()) {
+              if (part.type === "text" || part.type === "reasoning") {
+                const block = { assistantMessageID: message.id, ordinal: ordinals[part.type]++ };
+                // OpenCode saves a block's text only when the block ends, so the last block of a
+                // response still streaming stays open and keeps the text that already arrived.
+                const open =
+                  message.time.streamed === undefined && index === message.content.length - 1;
+                yield* emitText(
+                  state,
+                  turn,
+                  block,
+                  part.type,
+                  (text) => (open && !part.text.startsWith(text) ? text : part.text),
+                  !open,
+                );
+                continue;
+              }
+              if (part.type !== "tool") continue;
+              if (!turn.tools.has(part.id)) {
+                turn.tools.set(part.id, { name: part.name, input: {} });
+                turn.startedAt.set(part.id, yield* DateTime.now);
+              }
+              const tool = turn.tools.get(part.id)!;
+              if (typeof part.state.input === "object" && part.state.input !== null) {
+                tool.input = part.state.input as Record<string, unknown>;
+              }
+              if (part.state.status === "completed") {
+                yield* emitTool(state, turn, part.id, "completed", {
+                  output: textOf(part.state.content),
+                  files: part.state.content.flatMap((content) =>
+                    content.type === "file" ? [content] : [],
+                  ),
+                  metadata: part.state.metadata,
+                });
+                if (
+                  ![...state.imageJobs.values()].some(
+                    (job) => job.turn === turn && job.toolId === part.id,
+                  )
+                )
+                  turn.tools.delete(part.id);
+              } else if (part.state.status === "error") {
+                yield* emitTool(state, turn, part.id, "failed", {
+                  output: part.state.error.message,
+                  metadata: part.state.metadata,
+                });
+                turn.tools.delete(part.id);
+              } else {
+                yield* emitTool(state, turn, part.id, "running");
+              }
+            }
           }
-        }
-      }
-      return idle === undefined ? undefined : { outcome: idle.outcome };
+          return idle === undefined ? undefined : { outcome: idle.outcome };
+        }),
+      );
     });
 
     // Restarts retain the previous session.outcome; without an idle item, the lost execution was interrupted.
@@ -3461,7 +3520,7 @@ export const make = Effect.fn("OpenCode2Adapter.make")(function* (instanceId: Pr
       ) {
         return;
       }
-      const active = yield* client.session.active();
+      const active = { ...(yield* client.session.active()) };
       for (const sessionId of busy) if (!(sessionId in active)) busy.delete(sessionId);
       for (const state of threads.values()) {
         if (state.unsettled && !(state.sessionId in active)) state.unsettledStarted = true;
@@ -3472,72 +3531,101 @@ export const make = Effect.fn("OpenCode2Adapter.make")(function* (instanceId: Pr
         if (turn === undefined) continue;
         turn.missedEvents = true;
         const ended = yield* backfill(sessionId, state);
-        if (state.active !== turn) continue;
-        if (sessionId in active) {
-          turn.heldEnd = undefined;
-          continue;
+        if (ended?.outcome === "missing") {
+          delete active[Session.ID.make(sessionId)];
+          busy.delete(sessionId);
         }
-        const terminal: TurnTerminal =
-          ended?.outcome === "succeeded"
-            ? { status: turn.interrupted ? "interrupted" : "completed" }
-            : ended?.outcome === "failed"
-              ? {
-                  status: "failed",
-                  failure: makeProviderFailure({
-                    message:
-                      "OpenCode ended the turn with an error while T3 Code was reconnecting.",
-                    class: "provider_error",
-                  }),
-                }
-              : { status: "interrupted" };
-        yield* endExecution(state, turn, terminal);
+        yield* lock.withPermit(
+          Effect.gen(function* () {
+            if (state.active !== turn) return;
+            if (sessionId in active) {
+              turn.heldEnd = undefined;
+              return;
+            }
+            if (ended?.outcome === "missing") {
+              return yield* finishTurn(state, { status: "interrupted" }, "broken");
+            }
+            const terminal: TurnTerminal =
+              ended?.outcome === "succeeded"
+                ? { status: turn.interrupted ? "interrupted" : "completed" }
+                : ended?.outcome === "failed"
+                  ? {
+                      status: "failed",
+                      failure: makeProviderFailure({
+                        message:
+                          "OpenCode ended the turn with an error while T3 Code was reconnecting.",
+                        class: "provider_error",
+                      }),
+                    }
+                  : { status: "interrupted" };
+            yield* endExecution(state, turn, terminal);
+          }),
+        );
       }
       for (const state of threads.values()) {
-        yield* recoverImages(state).pipe(
-          Effect.timeout(INVENTORY_TIMEOUT),
-          Effect.ignore({ log: true }),
-        );
+        yield* lock
+          .withPermit(recoverImages(state).pipe(Effect.timeout(INVENTORY_TIMEOUT)))
+          .pipe(Effect.ignore({ log: true }));
       }
-      for (const state of background) {
-        for (const call of runningCalls(state)) {
-          const child = call.child?.sessionId;
-          if (child === undefined || !(child in active)) {
-            yield* settleCall(call, "interrupted", LOST_BACKGROUND);
+      yield* lock.withPermit(
+        Effect.gen(function* () {
+          for (const state of background) {
+            for (const call of runningCalls(state)) {
+              const child = call.child?.sessionId;
+              if (child === undefined || !(child in active)) {
+                yield* settleCall(call, "interrupted", LOST_BACKGROUND);
+              }
+            }
+            const sessions = sessionsOf(state);
+            for (const session of sessions) {
+              discardWakes(session, session.wakes.splice(0));
+              session.reports.clear();
+            }
+            for (const session of sessions.toReversed()) yield* syncRoster(session);
           }
-        }
-        const sessions = sessionsOf(state);
-        for (const session of sessions) {
-          discardWakes(session, session.wakes.splice(0));
-          session.reports.clear();
-        }
-        for (const session of sessions.toReversed()) yield* syncRoster(session);
-      }
-      // Stopped off the lock this reconcile holds; one still running waits for a Stop.
-      for (const thread of new Set([...strays.values()].map(rootOf))) {
-        yield* Effect.forkIn(stopStrays(thread), sessionScope);
-      }
+          // Stopped off the lock this reconcile holds; one still running waits for a Stop.
+          for (const thread of new Set([...strays.values()].map(rootOf))) {
+            yield* Effect.forkIn(stopStrays(thread), sessionScope);
+          }
+        }),
+      );
       const listed = new Map<string, Set<string>>();
       for (const sessionId of Object.keys(active)) {
-        if (ownerOf(sessionId) === undefined) continue;
+        const owner = ownerOf(sessionId);
+        if (owner === undefined) continue;
+        const turn = requestTurn(sessionId)?.turn;
+        // Replies may settle during these reads; an older snapshot must not ask again.
+        const known = new Set([...pending.values()].map((entry) => entry.native.id));
         const sessionID = Session.ID.make(sessionId);
         const [permissions, forms] = yield* Effect.all([
           client.permission.list({ sessionID }),
           client.session.form.list({ sessionID }),
         ]);
-        listed.set(sessionId, new Set([...permissions, ...forms].map((request) => request.id)));
-        const shown = new Set([...pending.values()].map((entry) => entry.native.id));
-        for (const request of permissions) {
-          if (!shown.has(request.id)) yield* onAsked({ type: "permission", request });
-        }
-        for (const form of forms) {
-          if (!shown.has(form.id)) yield* onAsked({ type: "form", form });
-        }
-      }
-      for (const entry of Array.from(pending.values())) {
-        if (listed.get(entry.sessionId)?.has(entry.native.id) !== true) {
-          yield* settleRequest(entry, "cancelled");
-        }
+        yield* lock.withPermit(
+          Effect.gen(function* () {
+            if (ownerOf(sessionId) !== owner || requestTurn(sessionId)?.turn !== turn) return;
+            listed.set(sessionId, new Set([...permissions, ...forms].map((request) => request.id)));
+            const shown = new Set([...pending.values()].map((entry) => entry.native.id));
+            for (const request of permissions) {
+              if (!shown.has(request.id) && !known.has(request.id))
+                yield* onAsked({ type: "permission", request });
+            }
+            for (const form of forms) {
+              if (!shown.has(form.id) && !known.has(form.id))
+                yield* onAsked({ type: "form", form });
+            }
+          }),
+        );
       }
+      yield* lock.withPermit(
+        Effect.gen(function* () {
+          for (const entry of Array.from(pending.values())) {
+            if (listed.get(entry.sessionId)?.has(entry.native.id) !== true) {
+              yield* settleRequest(entry, "cancelled");
+            }
+          }
+        }),
+      );
     });
 
     const reconnect = Effect.gen(function* () {
@@ -3545,7 +3633,7 @@ export const make = Effect.fn("OpenCode2Adapter.make")(function* (instanceId: Pr
       const scope = yield* Scope.make();
       const { next, stream } = yield* Effect.gen(function* () {
         const next = yield* borrow.pipe(Effect.provideService(Scope.Scope, scope));
-        return { next, stream: yield* next.events };
+        return { next, stream: yield* next.events.pipe(Effect.provideService(Scope.Scope, scope)) };
       }).pipe(Effect.onError(() => Scope.close(scope, Exit.void)));
       const previous = currentScope;
       connection = next;
@@ -3579,10 +3667,27 @@ export const make = Effect.fn("OpenCode2Adapter.make")(function* (instanceId: Pr
       for (const state of threads.values()) {
         yield* recoverShells(state).pipe(Effect.ignore({ log: true }));
       }
-      yield* lock.withPermit(reconcile()).pipe(Effect.timeout(RECONCILE_TIMEOUT));
+      // An owned process's exit, rather than a read deadline, bounds recovery; the bounded retry
+      // below then borrows a restarted server. HTTP waits stay outside the event lock so Stop can still settle.
+      const exited = next.processExit;
+      yield* exited === undefined
+        ? reconcile().pipe(Effect.timeout(RECONCILE_TIMEOUT))
+        : reconcile().pipe(
+            Effect.retry(OWNED_RECOVERY_RETRY),
+            Effect.raceFirst(
+              exited.pipe(Effect.andThen(Effect.fail(new OpenCode2ServerExitedError()))),
+            ),
+          );
       return stream;
     }).pipe(
-      Effect.retry({ times: RECONNECT_ATTEMPTS - 1, schedule: Schedule.spaced(RECONNECT_DELAY) }),
+      // Borrows and process exits stay bounded; only a live owned process is waited on above.
+      Effect.retry({
+        times: RECONNECT_ATTEMPTS - 1,
+        schedule: Schedule.spaced(RECONNECT_DELAY),
+        ...(connection.processExit === undefined
+          ? {}
+          : { while: (error: unknown) => !isPermanentRecoveryError(error) }),
+      }),
     );
 
     let currentScope = initial.scope;
@@ -3627,7 +3732,9 @@ export const make = Effect.fn("OpenCode2Adapter.make")(function* (instanceId: Pr
               Effect.option,
             );
             if (next._tag === "None") {
-              return yield* failAll("The OpenCode event stream was lost and could not reconnect.");
+              return yield* lock.withPermit(
+                failAll("The OpenCode event stream was lost and could not reconnect."),
+              );
             }
             streamFailure = undefined;
             const done = reconnected;
@@ -3638,7 +3745,9 @@ export const make = Effect.fn("OpenCode2Adapter.make")(function* (instanceId: Pr
         ),
       );
     // Subscribed before any session or prompt call, so no event of theirs is missed.
-    yield* follow(yield* connection.events).pipe(Effect.forkScoped);
+    yield* follow(
+      yield* connection.events.pipe(Effect.provideService(Scope.Scope, currentScope)),
+    ).pipe(Effect.forkScoped);
 
     yield* Effect.gen(function* () {
       const snapshots = yield* lock.withPermit(
@@ -3699,15 +3808,16 @@ export const make = Effect.fn("OpenCode2Adapter.make")(function* (instanceId: Pr
       Effect.suspend(() => {
         const windows = contextWindows.get(directory) ?? new Map<string, number>();
         contextWindows.set(directory, windows);
+        const variants = modelVariants.get(directory) ?? new Map<string, ReadonlySet<string>>();
+        modelVariants.set(directory, variants);
         return client.model.list({ location: { directory } }).pipe(
           Effect.timeout("5 seconds"),
           Effect.tap((models) =>
             Effect.sync(() => {
               for (const model of models.data) {
-                windows.set(
-                  `${model.providerID}/${model.id}`,
-                  model.limit.input ?? model.limit.context,
-                );
+                const slug = `${model.providerID}/${model.id}`;
+                windows.set(slug, model.limit.input ?? model.limit.context);
+                variants.set(slug, new Set(model.variants.map((variant) => variant.id)));
               }
             }),
           ),
@@ -4378,11 +4488,18 @@ export const make = Effect.fn("OpenCode2Adapter.make")(function* (instanceId: Pr
           const newest = yield* client.message.list({ sessionID, order: "desc", limit: 1 });
           yield* markBefore(sessionId, newest.data[0]?.id ?? null);
           if (!sending()) return;
-          yield* client.session.command({ sessionID, ...command });
           if (goalCommand?.type === "pause" || goalCommand?.type === "clear") {
-            yield* finishControl;
+            // OpenCode rejects pausing or clearing a missing goal; Codex treats that as a no-op.
+            yield* client.session.command({ sessionID, ...command }).pipe(
+              Effect.catchIf(
+                (error) =>
+                  error._tag === "CommandExecutionError" && error.message === "No goal is set.",
+                () => Effect.void,
+              ),
+            );
+            return yield* finishControl;
           }
-          return;
+          return yield* client.session.command({ sessionID, ...command }).pipe(Effect.asVoid);
         }
       }
       const mentions = skillMentions(text);
@@ -4434,7 +4551,7 @@ export const make = Effect.fn("OpenCode2Adapter.make")(function* (instanceId: Pr
             });
           }
           yield* readModelsOnce(threadInput.runtimePolicy.cwd);
-          const model = modelRef(threadInput.modelSelection);
+          const model = listedModelRef(threadInput.modelSelection, threadInput.runtimePolicy.cwd);
           if (model === undefined) {
             return yield* new ProviderAdapter.ProviderAdapterProtocolError({
               driver: OPENCODE_PROVIDER,
@@ -4611,7 +4728,7 @@ export const make = Effect.fn("OpenCode2Adapter.make")(function* (instanceId: Pr
                   }),
                 });
               }
-              const model = modelRef(turnInput.modelSelection);
+              const model = listedModelRef(turnInput.modelSelection, turnInput.runtimePolicy.cwd);
               if (model === undefined) {
                 yield* begin;
                 return yield* finishTurn(state, {
@@ -4830,6 +4947,16 @@ export const make = Effect.fn("OpenCode2Adapter.make")(function* (instanceId: Pr
               timeoutMs: INTERRUPT_TIMEOUT,
             });
           }
+          // Recovery may hold the terminal event behind a blocked history read.
+          if (reply.value.interrupted && streamFailure !== undefined) {
+            return yield* lock.withPermit(
+              Effect.gen(function* () {
+                if (state.active !== turn) return;
+                markUnsettled(state);
+                yield* finishTurn(state, { status: "interrupted" });
+              }),
+            );
+          }
           // Stop between steer executions retracts pending steers and skips any run they already started.
           if (!reply.value.interrupted && state.active === turn && turn.heldEnd !== undefined) {
             markUnsettled(state);
diff --git a/packages/provider-opencode/src/server/v2/usageLimits.ts b/packages/provider-opencode/src/server/v2/usageLimits.ts
new file mode 100644
index 000000000000..420d3bfe1a1a
--- /dev/null
+++ b/packages/provider-opencode/src/server/v2/usageLimits.ts
@@ -0,0 +1,188 @@
+import type { ServerProviderUsageWindow } from "@t3tools/contracts";
+import {
+  clampPercent,
+  makeUnavailableUsageLimits,
+  makeUsageLimits,
+} from "@t3tools/provider-core/server/usageLimits";
+import * as DateTime from "effect/DateTime";
+import * as Effect from "effect/Effect";
+import * as Schema from "effect/Schema";
+import * as HttpClient from "effect/http/HttpClient";
+import * as HttpClientResponse from "effect/http/HttpClientResponse";
+
+const Instant = Schema.Finite.check(
+  Schema.isBetween({ minimum: -8640000000000000, maximum: 8640000000000000 }),
+);
+const Meter = Schema.Struct({
+  percent: Schema.Finite,
+  limited: Schema.Boolean,
+  resetsAt: Instant,
+});
+const BudgetModel = Schema.Struct({
+  providerID: Schema.String,
+  modelID: Schema.String,
+  name: Schema.String,
+  spent: Schema.optionalKey(Schema.Finite),
+});
+// Decode only fields needed by T3, independently of the pinned 2.0 client.
+const ResponseBody = Schema.Struct({
+  location: Schema.Struct({ directory: Schema.String }),
+  data: Schema.NullOr(
+    Schema.Struct({
+      workspace: Schema.Struct({
+        id: Schema.String,
+        name: Schema.optionalKey(Schema.String),
+        usageURL: Schema.String,
+      }),
+      go: Schema.optionalKey(Schema.Struct({ rolling: Meter, weekly: Meter, monthly: Meter })),
+      budgets: Schema.Array(
+        Schema.Struct({
+          id: Schema.String,
+          limit: Schema.Finite,
+          spent: Schema.Finite,
+          scope: Schema.Literals(["each", "combined"]),
+          per: Schema.Literals(["set", "model"]),
+          coverage: Schema.Literals(["all", "models"]),
+          models: Schema.Array(BudgetModel),
+          shared: Schema.Boolean,
+          resetsAt: Instant,
+        }),
+      ),
+    }),
+  ),
+});
+
+const Providers = Schema.Struct({
+  data: Schema.Array(
+    Schema.Struct({
+      id: Schema.String,
+      integrationID: Schema.optionalKey(Schema.String),
+    }),
+  ),
+});
+
+const resetTime = (ms: number) => DateTime.formatIso(DateTime.makeUnsafe(ms));
+const budgetPercent = (spent: number, limit: number) =>
+  limit <= 0 ? 100 : clampPercent((spent / limit) * 100);
+
+/** Undefined alone permits the legacy credential reader; null data is authoritative. */
+export const readServerUsageLimits = Effect.fn("OpenCode2Client.usageLimits")(function* (
+  directory: string,
+) {
+  const checkedAt = DateTime.formatIso(yield* DateTime.now);
+  return yield* Effect.gen(function* () {
+    const response = yield* HttpClient.get("/api/experimental/usage/limits", {
+      urlParams: { "location[directory]": directory },
+    });
+    if (
+      response.status === 404 ||
+      response.status === 405 ||
+      (response.status === 200 &&
+        response.headers["content-type"]?.split(";")[0]?.trim() === "text/html")
+    )
+      return undefined;
+    const body = yield* HttpClientResponse.filterStatusOk(response).pipe(
+      Effect.flatMap(HttpClientResponse.schemaBodyJson(ResponseBody)),
+    );
+    if (body.data === null)
+      return makeUnavailableUsageLimits({
+        checkedAt,
+        reason: "unsupported",
+        message: "No OpenCode Console workspace is signed in.",
+      });
+    const { go, budgets, workspace } = body.data;
+    const consoleProviders = budgets.some(
+      (budget) => budget.coverage === "all" && budget.per === "set",
+    )
+      ? yield* HttpClient.get("/api/provider", {
+          urlParams: { "location[directory]": directory },
+        }).pipe(
+          Effect.flatMap(HttpClientResponse.filterStatusOk),
+          Effect.flatMap(HttpClientResponse.schemaBodyJson(Providers)),
+          Effect.map((page) =>
+            page.data
+              .filter(
+                (provider) =>
+                  provider.integrationID === "opencode" && provider.id !== "opencode-go",
+              )
+              .map((provider) => provider.id),
+          ),
+          Effect.orElseSucceed(() => []),
+        )
+      : [];
+    const windows: ServerProviderUsageWindow[] = [];
+    if (go) {
+      for (const [key, kind, label, duration] of [
+        ["rolling", "session", "Session", 300],
+        ["weekly", "weekly", "Weekly", 10080],
+        ["monthly", "monthly", "Monthly", undefined],
+      ] as const) {
+        const meter = go[key];
+        windows.push({
+          id: `go_${key}`,
+          kind,
+          label: `Go · ${label}`,
+          usedPercent: meter.limited ? 100 : clampPercent(meter.percent),
+          resetsAt: resetTime(meter.resetsAt),
+          ...(duration === undefined ? {} : { windowDurationMins: duration }),
+        });
+      }
+    }
+    for (const budget of budgets) {
+      const scope = budget.shared || budget.scope === "combined" ? "Shared" : "Individual";
+      const covered =
+        budget.coverage === "all"
+          ? "All spend"
+          : budget.models.map((model) => model.name).join(", ") || "Models";
+      if (
+        budget.per === "model" &&
+        budget.coverage === "models" &&
+        budget.models.length > 0 &&
+        budget.models.every((model) => model.spent !== undefined)
+      ) {
+        for (const model of budget.models) {
+          windows.push({
+            id: `budget_${budget.id}_${model.providerID}_${model.modelID}`,
+            kind: "other",
+            label: `Console · ${scope} · ${model.name}`,
+            modelIds: [`${model.providerID}/${model.modelID}`],
+            usedPercent: budgetPercent(model.spent ?? budget.spent, budget.limit),
+            resetsAt: resetTime(budget.resetsAt),
+          });
+        }
+      } else {
+        windows.push({
+          id: `budget_${budget.id}`,
+          kind: "other",
+          label: `Console · ${scope} · ${covered}${budget.per === "model" ? " · Most used model" : ""}`,
+          // Aggregate per-model spend cannot identify the exhausted model.
+          ...(budget.per === "model"
+            ? { modelIds: [] }
+            : budget.coverage === "models"
+              ? {
+                  modelIds: budget.models.map((model) => `${model.providerID}/${model.modelID}`),
+                }
+              : { providerIds: consoleProviders }),
+          usedPercent: budgetPercent(budget.spent, budget.limit),
+          resetsAt: resetTime(budget.resetsAt),
+        });
+      }
+    }
+    const usageURL = URL.parse(workspace.usageURL);
+    return {
+      ...makeUsageLimits({ checkedAt, windows }),
+      ...(usageURL?.protocol === "http:" || usageURL?.protocol === "https:"
+        ? { externalUsage: { label: workspace.name?.trim() || workspace.id, url: usageURL.href } }
+        : {}),
+    };
+  }).pipe(
+    Effect.timeout("5 seconds"),
+    Effect.orElseSucceed(() =>
+      makeUnavailableUsageLimits({
+        checkedAt,
+        reason: "probeFailed",
+        message: "OpenCode could not read workspace usage.",
+      }),
+    ),
+  );
+});
diff --git a/packages/provider-opencode/src/server/versionProbe.ts b/packages/provider-opencode/src/server/versionProbe.ts
index 8da0b38f8164..705cfe1cabf4 100644
--- a/packages/provider-opencode/src/server/versionProbe.ts
+++ b/packages/provider-opencode/src/server/versionProbe.ts
@@ -1,3 +1,4 @@
+import { resolveProviderProbeTimeoutMs } from "@t3tools/provider-core/server/snapshotProbe";
 import { parseSemver } from "@t3tools/shared/semver";
 import * as Cache from "effect/Cache";
 import * as Duration from "effect/Duration";
@@ -17,8 +18,8 @@ export interface ProbedOpenCode {
 }
 
 // Meant to stop a hung `--version`; wrapped installs can take several seconds to start cold.
-const OPENCODE_VERSION_PROBE_TIMEOUT = "10 seconds";
-const OPENCODE_SERVER_PROBE_TIMEOUT = "5 seconds";
+const OPENCODE_VERSION_PROBE_TIMEOUT_MS = 10_000;
+const OPENCODE_SERVER_PROBE_TIMEOUT_MS = 5_000;
 // 2.x's own CLI decodes `{version, pid}` from `/api/info`; requiring both keeps unrelated JSON out.
 const decodeApiInfo = Schema.decodeUnknownOption(
   Schema.fromJsonString(Schema.Struct({ version: Schema.String, pid: Schema.Int })),
@@ -60,6 +61,11 @@ export const probeOpenCodeBinary = Effect.fn("probeOpenCodeBinary")(function* (
   environment: NodeJS.ProcessEnv | undefined,
 ) {
   const runtime = yield* OpenCodeRuntime.OpenCodeRuntime;
+  const timeoutMs = resolveProviderProbeTimeoutMs(
+    "opencode",
+    OPENCODE_VERSION_PROBE_TIMEOUT_MS,
+    environment,
+  );
   const { stdout } = yield* runtime
     .runOpenCodeCommand({
       binaryPath,
@@ -68,12 +74,12 @@ export const probeOpenCodeBinary = Effect.fn("probeOpenCodeBinary")(function* (
     })
     .pipe(
       Effect.timeoutOrElse({
-        duration: OPENCODE_VERSION_PROBE_TIMEOUT,
+        duration: timeoutMs,
         orElse: () =>
           Effect.fail(
             new OpenCodeRuntime.OpenCodeRuntimeError({
               operation: "probeOpenCodeBinary",
-              detail: `OpenCode CLI version probe timed out after ${OPENCODE_VERSION_PROBE_TIMEOUT}.`,
+              detail: `OpenCode CLI version probe timed out after ${timeoutMs / 1_000} seconds.`,
             }),
           ),
       }),
@@ -90,6 +96,7 @@ export const probeOpenCodeBinary = Effect.fn("probeOpenCodeBinary")(function* (
 const probeOpenCodeServer = Effect.fn("probeOpenCodeServer")(function* (
   serverUrl: string,
   serverPassword: string,
+  environment?: NodeJS.ProcessEnv,
 ) {
   const client = yield* HttpClient.HttpClient;
   const baseUrl = URL.parse(serverUrl.trim());
@@ -132,7 +139,11 @@ const probeOpenCodeServer = Effect.fn("probeOpenCodeServer")(function* (
             }),
         ),
         Effect.timeoutOrElse({
-          duration: OPENCODE_SERVER_PROBE_TIMEOUT,
+          duration: resolveProviderProbeTimeoutMs(
+            "opencode",
+            OPENCODE_SERVER_PROBE_TIMEOUT_MS,
+            environment,
+          ),
           orElse: () =>
             Effect.fail(
               new OpenCodeRuntime.OpenCodeRuntimeError({
@@ -169,7 +180,7 @@ export const probeOpenCodeRuntime = (
   HttpClient.HttpClient | OpenCodeRuntime.OpenCodeRuntime
 > =>
   settings.serverUrl.trim().length > 0
-    ? probeOpenCodeServer(settings.serverUrl, settings.serverPassword)
+    ? probeOpenCodeServer(settings.serverUrl, settings.serverPassword, environment)
     : probeOpenCodeBinary(settings.binaryPath, environment);
 
 // Only 2.x is kept: 1.x can be upgraded in place while T3 runs, and 2.x converts the shared
diff --git a/packages/provider-pi/src/server/adapter.test.ts b/packages/provider-pi/src/server/adapter.test.ts
index 5d0c9db05db0..cde96ef359e9 100644
--- a/packages/provider-pi/src/server/adapter.test.ts
+++ b/packages/provider-pi/src/server/adapter.test.ts
@@ -30,6 +30,7 @@ import * as Layer from "effect/Layer";
 import * as Logger from "effect/Logger";
 import * as Queue from "effect/Queue";
 import * as Schema from "effect/Schema";
+import * as Scope from "effect/Scope";
 import * as Sink from "effect/Sink";
 import * as Stream from "effect/Stream";
 import * as ChildProcess from "effect/process/ChildProcess";
@@ -67,6 +68,7 @@ const decodeUserInputQuestions = Schema.decodeUnknownSync(
   Schema.Array(OrchestrationV2UserInputQuestion),
 );
 
+const isProviderProtocolError = Schema.is(ProviderAdapter.ProviderAdapterProtocolError);
 const decodeJsonLine = Schema.decodeSync(Schema.fromJsonString(Schema.Unknown));
 const encodeJsonLine = Schema.encodeSync(Schema.fromJsonString(Schema.Unknown));
 
@@ -167,7 +169,9 @@ interface FakePi {
   readonly resolveDeferredState: (data: unknown) => Effect.Effect<void>;
   readonly failNextState: () => void;
   readonly failNextThinking: () => void;
-  readonly deferNextLifecycle: (type: "switch_session" | "new_session" | "fork" | "abort") => void;
+  readonly deferNextLifecycle: (
+    type: "switch_session" | "new_session" | "fork" | "prompt" | "abort",
+  ) => void;
   readonly deferNextModelSelection: () => void;
   readonly queueModels: (models: ReadonlyArray<unknown>) => void;
   readonly vetoNextNewSession: () => void;
@@ -823,6 +827,7 @@ describe("PiAdapterV2", () => {
           statusText: "Watching 3 files",
         });
         const command = failure === "failed compact" ? "compact" : "prompt";
+        if (failure === "rejected prompt") fake.deferNextLifecycle("prompt");
         yield* startTurn(
           runtime,
           providerThread,
@@ -1307,6 +1312,7 @@ describe("PiAdapterV2", () => {
         yield* Queue.take(offers);
         yield* fake.emit({ type: "agent_settled" });
         yield* fake.emit({ type: "compaction_start", reason: "manual" });
+        fake.deferNextLifecycle("prompt");
         yield* startTurn(runtime, providerThread);
         yield* fake.emit({
           type: "extension_ui_request",
@@ -1645,6 +1651,7 @@ describe("PiAdapterV2", () => {
               event.type === "provider_session.updated" && event.providerSession.status === "ready",
           );
         }
+        fake.deferNextLifecycle("prompt");
         yield* startTurn(runtime, providerThread);
         const prompt = yield* fake.takeRequest("prompt");
         assert.equal(prompt["message"], "Hello pi");
@@ -1718,6 +1725,7 @@ describe("PiAdapterV2", () => {
         });
         yield* fake.emit({ type: "agent_start" });
         yield* Queue.take(offers);
+        fake.deferNextLifecycle("prompt");
         yield* startTurn(runtime, providerThread);
         yield* fake.takeRequest("prompt");
         yield* fake.emit({ type: "agent_settled", aborted });
@@ -1773,6 +1781,7 @@ describe("PiAdapterV2", () => {
           (event) =>
             event.type === "provider_session.updated" && event.providerSession.status === "ready",
         );
+        fake.deferNextLifecycle("prompt");
         yield* startTurn(runtime, providerThread, "default", [], "/hello");
         yield* fake.takeRequest("prompt");
         if (resumes) yield* fake.emit({ type: "agent_start" });
@@ -3772,7 +3781,83 @@ describe("PiAdapterV2", () => {
     }).pipe(Effect.scoped, Effect.provide(layerTest)),
   );
 
-  it.effect("settles a command-only prompt from its deferred ack and idle probe", () =>
+  it.effect.each([
+    { first: "initial", accepted: true },
+    { first: "steer", accepted: true },
+    { first: "steer", accepted: false },
+  ])(
+    "waits for consumed input acknowledgments, first=$first accepted=$accepted",
+    ({ first, accepted }) =>
+      Effect.gen(function* () {
+        const fake = yield* makeFakePi;
+        const { runtime, takeEvent } = yield* openRuntime(fake);
+        const providerThread = yield* runtime.ensureThread({
+          threadId: THREAD_ID,
+          modelSelection: modelSelection("default"),
+          runtimePolicy,
+        });
+        fake.deferNextLifecycle("prompt");
+        yield* startTurn(runtime, providerThread);
+        const initial = yield* fake.takeRequest("prompt");
+        fake.deferNextLifecycle("prompt");
+        const running = yield* takeEvent((event) => event.type === "provider_turn.updated");
+        assert.isTrue(running.type === "provider_turn.updated");
+        if (running.type !== "provider_turn.updated") return;
+        yield* runtime.steerTurn({
+          threadId: THREAD_ID,
+          runId: RunId.make("run:thread-pi-test:1"),
+          providerThread,
+          providerTurnId: running.providerTurn.id,
+          message: {
+            messageId: "message:handled-steer-first" as never,
+            text: "Consumed steer",
+            attachments: [],
+            createdBy: "user",
+            creationSource: "web",
+          },
+        });
+        const steer = yield* fake.takeRequest("prompt");
+        const stateRequests = fake
+          .allRequests()
+          .filter((request) => request["type"] === "get_state").length;
+        yield* fake.emit({
+          type: "response",
+          id: (first === "steer" ? steer : initial)["id"],
+          command: "prompt",
+          success: accepted,
+          data: { disposition: "handled" },
+          error: accepted ? undefined : "Input refused",
+        });
+        yield* fake.emit({
+          type: "extension_ui_request",
+          method: "notify",
+          message: "Steer acknowledged",
+        });
+        yield* takeEvent(
+          (event) => event.type === "turn_item.updated" && event.turnItem.type === "system_notice",
+        );
+        assert.equal(runtime.providerSession.status, "running");
+        assert.equal(
+          fake.allRequests().filter((request) => request["type"] === "get_state").length,
+          stateRequests,
+        );
+        yield* fake.emit({
+          type: "response",
+          id: (first === "steer" ? initial : steer)["id"],
+          command: "prompt",
+          success: true,
+          data: { disposition: "handled" },
+        });
+        const terminal = yield* takeEvent((event) => event.type === "turn.terminal");
+        assert.isTrue(terminal.type === "turn.terminal" && terminal.status === "completed");
+      }).pipe(Effect.scoped, Effect.provide(layerTest)),
+  );
+
+  it.effect.each([
+    { text: "/command-only", data: undefined, compacts: false },
+    { text: "Plain handled input", data: { disposition: "handled" }, compacts: false },
+    { text: "Handled input after compaction", data: { disposition: "handled" }, compacts: true },
+  ])("settles consumed input after its ack: $text", ({ text, data, compacts }) =>
     Effect.gen(function* () {
       const fake = yield* makeFakePi;
       const { runtime, takeEvent } = yield* openRuntime(fake);
@@ -3781,8 +3866,27 @@ describe("PiAdapterV2", () => {
         modelSelection: modelSelection("default"),
         runtimePolicy,
       });
-      yield* startTurn(runtime, providerThread, "default", [], "/command-only");
+      if (compacts) yield* fake.takeRequest("get_state");
+      fake.deferNextLifecycle("prompt");
+      yield* startTurn(runtime, providerThread, "default", [], text);
       yield* fake.takeRequest("prompt");
+      if (compacts) {
+        yield* fake.emit({ type: "compaction_start", reason: "manual" });
+        yield* fake.emit({
+          type: "compaction_end",
+          reason: "manual",
+          result: { summary: "Smaller context", tokensBefore: 1000, estimatedTokensAfter: 100 },
+          aborted: false,
+          willRetry: false,
+        });
+        yield* takeEvent(
+          (event) =>
+            event.type === "turn_item.updated" &&
+            event.turnItem.type === "compaction" &&
+            event.turnItem.status === "completed",
+        );
+        yield* fake.takeRequest("get_state");
+      }
       yield* fake.emit({
         type: "extension_ui_request",
         id: "ui-cmd",
@@ -3790,7 +3894,6 @@ describe("PiAdapterV2", () => {
         message: "Command finished\nwith details",
         notifyType: "info",
       });
-      yield* fake.emit({ type: "response", command: "prompt", success: true });
       const notice = yield* takeEvent(
         (event) =>
           (event.type === "turn_item.updated" && event.turnItem.type === "system_notice") ||
@@ -3802,6 +3905,8 @@ describe("PiAdapterV2", () => {
           notice.turnItem.status === "completed" &&
           notice.turnItem.message === "Command finished\nwith details",
       );
+      assert.equal(runtime.providerSession.status, "running");
+      yield* fake.emit({ type: "response", command: "prompt", success: true, data });
       const terminal = yield* takeEvent((event) => event.type === "turn.terminal");
       assert.isTrue(terminal.type === "turn.terminal" && terminal.status === "completed");
     }).pipe(Effect.scoped, Effect.provide(layerTest)),
@@ -4403,37 +4508,300 @@ describe("PiAdapterV2", () => {
     }).pipe(Effect.scoped, Effect.provide(layerTest)),
   );
 
-  it.effect("keeps a settled turn's late prompt rejection off the next turn", () =>
-    Effect.gen(function* () {
-      const fake = yield* makeFakePi;
-      const { runtime, takeEvent } = yield* openRuntime(fake);
-      const providerThread = yield* runtime.ensureThread({
-        threadId: THREAD_ID,
-        modelSelection: modelSelection("default"),
-        runtimePolicy,
-      });
-      yield* startTurn(runtime, providerThread, "default", [], "/my-command");
-      yield* fake.takeRequest("prompt");
-      yield* fake.emit({ type: "agent_start" });
-      yield* fake.emit({ type: "agent_settled" });
-      const firstTerminal = yield* takeEvent((event) => event.type === "turn.terminal");
-      assert.isTrue(firstTerminal.type === "turn.terminal" && firstTerminal.status === "completed");
+  it.effect.each(["settled", "outer-id", "outer-idless", "install-id", "install-idless"])(
+    "waits for a settled turn's late prompt ACK before accepting the next turn: %s",
+    (boundary) =>
+      Effect.gen(function* () {
+        const fake = yield* makeFakePi;
+        const { runtime, takeEvent } = yield* openRuntime(fake);
+        const providerThread = yield* runtime.ensureThread({
+          threadId: THREAD_ID,
+          modelSelection: modelSelection("default"),
+          runtimePolicy,
+        });
+        const interrupted = boundary !== "settled";
+        const atInstall = boundary.startsWith("install-");
+        // Suspend the next start before another turn acquires and releases ownership.
+        if (atInstall) fake.deferNextModelSelection();
+        let next = atInstall
+          ? yield* startTurn(
+              runtime,
+              providerThread,
+              "default",
+              [],
+              "Second turn",
+              modelSelection("xai/grok-4.6"),
+              2,
+            ).pipe(Effect.result, Effect.forkScoped)
+          : null;
+        const modelRequest = atInstall ? yield* fake.takeRequest("set_model") : null;
+        if (interrupted) fake.deferNextLifecycle("prompt");
+        yield* startTurn(runtime, providerThread, "default", [], "/my-command");
+        const firstPrompt = yield* fake.takeRequest("prompt");
+        const running = yield* takeEvent((event) => event.type === "provider_turn.updated");
+        assert.isTrue(running.type === "provider_turn.updated");
+        if (running.type !== "provider_turn.updated") return;
+        if (interrupted) {
+          const active = yield* startTurn(runtime, providerThread).pipe(Effect.result);
+          assert.isTrue(
+            active._tag === "Failure" &&
+              isProviderProtocolError(active.failure.cause) &&
+              active.failure.cause.reason === "previous_turn_active",
+          );
+          fake.deferNextLifecycle("prompt");
+          yield* runtime.steerTurn({
+            providerThread,
+            providerTurnId: running.providerTurn.id,
+            threadId: THREAD_ID,
+            runId: RunId.make("run:thread-pi-test:1"),
+            message: {
+              messageId: "message:old-steer" as never,
+              text: "Old steer",
+              attachments: [],
+              createdBy: "user",
+              creationSource: "web",
+            },
+          });
+          yield* fake.takeRequest("prompt");
+          yield* fake.emit({
+            type: "extension_ui_request",
+            id: "old-dialog",
+            method: "confirm",
+            title: "Old dialog",
+          });
+          yield* takeEvent(
+            (event) =>
+              event.type === "runtime_request.updated" && event.runtimeRequest.status === "pending",
+          );
+          yield* runtime.interruptTurn({ providerThread, providerTurnId: running.providerTurn.id });
+        } else {
+          yield* fake.emit({ type: "agent_start" });
+        }
+        yield* fake.emit({ type: "agent_settled" });
+        const firstTerminal = yield* takeEvent((event) => event.type === "turn.terminal");
+        assert.isTrue(
+          firstTerminal.type === "turn.terminal" &&
+            firstTerminal.status === (interrupted ? "interrupted" : "completed"),
+        );
 
-      yield* startTurn(runtime, providerThread, "default", [], "Second turn", undefined, 2);
-      yield* fake.takeRequest("prompt");
-      yield* fake.emit({
-        type: "response",
-        command: "prompt",
-        success: false,
-        error: "late command rejection",
-      });
-      yield* fake.emit({ type: "agent_start" });
-      yield* fake.emit({ type: "agent_settled" });
-      const secondTerminal = yield* takeEvent((event) => event.type === "turn.terminal");
-      assert.isTrue(
-        secondTerminal.type === "turn.terminal" && secondTerminal.status === "completed",
-      );
-    }).pipe(Effect.scoped, Effect.provide(layerTest)),
+        fake.deferNextLifecycle("prompt");
+        if (next === null) {
+          next = yield* startTurn(
+            runtime,
+            providerThread,
+            "default",
+            [],
+            "Second turn",
+            undefined,
+            2,
+          ).pipe(Effect.result, Effect.forkScoped({ startImmediately: true }));
+        }
+        if (modelRequest !== null) {
+          yield* fake.emit({
+            type: "response",
+            id: modelRequest["id"],
+            command: "set_model",
+            success: true,
+            data: { provider: "xai", id: "grok-4.6" },
+          });
+        }
+        if (interrupted) {
+          yield* fake.emit({
+            type: "extension_ui_request",
+            id: "old-ack-barrier",
+            method: "confirm",
+            title: "Old input acknowledged",
+          });
+          const barrier = yield* takeEvent((event) => event.type === "runtime_request.updated");
+          assert.isTrue(barrier.type === "runtime_request.updated");
+          if (barrier.type !== "runtime_request.updated") return;
+          yield* runtime.respondToRuntimeRequest({
+            requestId: barrier.runtimeRequest.id,
+            decision: "decline",
+          });
+          yield* fake.takeRequest("extension_ui_response");
+          assert.isUndefined(next.pollUnsafe());
+          assert.lengthOf(
+            fake.allRequests().filter((request) => request["type"] === "prompt"),
+            2,
+          );
+          yield* fake.emit({
+            type: "response",
+            command: "prompt",
+            success: false,
+            ...(boundary.endsWith("idless") ? {} : { id: firstPrompt["id"] }),
+            error: "late command rejection",
+          });
+          // Duplicate and unknown IDs cannot consume the remaining old steer.
+          for (const id of [firstPrompt["id"], "unknown-prompt"]) {
+            yield* fake.emit({ type: "response", id, command: "prompt", success: true });
+          }
+          yield* fake.emit({
+            type: "extension_ui_request",
+            id: "partial-ack-barrier",
+            method: "confirm",
+            title: "Partial ACK",
+          });
+          const partial = yield* takeEvent(
+            (event) =>
+              event.type === "runtime_request.updated" && event.runtimeRequest.status === "pending",
+          );
+          assert.isTrue(partial.type === "runtime_request.updated");
+          assert.isUndefined(next.pollUnsafe());
+          assert.lengthOf(
+            fake.allRequests().filter((request) => request["type"] === "prompt"),
+            2,
+          );
+          yield* fake.emit({ type: "response", command: "prompt", success: true });
+        }
+        assert.equal((yield* Fiber.join(next))._tag, "Success");
+        yield* fake.takeRequest("prompt");
+        yield* fake.emit({
+          type: "response",
+          id: firstPrompt["id"],
+          command: "prompt",
+          success: false,
+          error: "late command rejection",
+        });
+        yield* fake.emit({ type: "response", command: "prompt", success: true });
+        yield* fake.emit({ type: "agent_start" });
+        yield* fake.emit({ type: "agent_settled" });
+        const secondTerminal = yield* takeEvent((event) => event.type === "turn.terminal");
+        assert.isTrue(
+          secondTerminal.type === "turn.terminal" && secondTerminal.status === "completed",
+        );
+      }).pipe(Effect.scoped, Effect.provide(layerTest)),
+  );
+
+  it.effect.each([
+    { boundary: "outer", end: "session" },
+    { boundary: "outer", end: "transport" },
+    { boundary: "outer", end: "caller" },
+    { boundary: "install", end: "session" },
+    { boundary: "install", end: "transport" },
+    { boundary: "install", end: "caller" },
+  ])(
+    "settles an ACK-blocked start on $end cancellation at $boundary admission",
+    ({ boundary, end }) =>
+      Effect.gen(function* () {
+        const fake = yield* makeFakePi;
+        const runtimeScope = yield* Scope.make();
+        yield* Effect.addFinalizer(() => Scope.close(runtimeScope, Exit.void));
+        const { runtime, takeEvent } = yield* openRuntime(fake).pipe(Scope.provide(runtimeScope));
+        const providerThread = yield* runtime.ensureThread({
+          threadId: THREAD_ID,
+          modelSelection: modelSelection("default"),
+          runtimePolicy,
+        });
+        if (boundary === "install") fake.deferNextModelSelection();
+        let next =
+          boundary === "install"
+            ? yield* startTurn(
+                runtime,
+                providerThread,
+                "default",
+                [],
+                "Second turn",
+                modelSelection("xai/grok-4.6"),
+                2,
+              ).pipe(Effect.result, Effect.forkScoped({ startImmediately: true }))
+            : null;
+        const modelRequest = next === null ? null : yield* fake.takeRequest("set_model");
+        fake.deferNextLifecycle("prompt");
+        yield* startTurn(runtime, providerThread);
+        const oldPrompt = yield* fake.takeRequest("prompt");
+        const running = yield* takeEvent((event) => event.type === "provider_turn.updated");
+        assert.isTrue(running.type === "provider_turn.updated");
+        if (running.type !== "provider_turn.updated") return;
+        yield* runtime.interruptTurn({ providerThread, providerTurnId: running.providerTurn.id });
+        yield* fake.emit({ type: "agent_settled" });
+        yield* takeEvent((event) => event.type === "turn.terminal");
+        if (next === null) {
+          next = yield* startTurn(
+            runtime,
+            providerThread,
+            "default",
+            [],
+            "Second turn",
+            undefined,
+            2,
+          ).pipe(Effect.result, Effect.forkScoped({ startImmediately: true }));
+        }
+        if (modelRequest !== null) {
+          yield* fake.emit({
+            type: "response",
+            id: modelRequest["id"],
+            command: "set_model",
+            success: true,
+            data: { provider: "xai", id: "grok-4.6" },
+          });
+        }
+        yield* fake.emit({
+          type: "extension_ui_request",
+          id: "lifecycle-barrier",
+          method: "confirm",
+          title: "Pending ACK",
+        });
+        const dialog = yield* takeEvent(
+          (event) =>
+            event.type === "runtime_request.updated" && event.runtimeRequest.status === "pending",
+        );
+        assert.isTrue(dialog.type === "runtime_request.updated");
+        assert.isUndefined(next.pollUnsafe());
+        assert.lengthOf(
+          fake.allRequests().filter((request) => request["type"] === "prompt"),
+          1,
+        );
+        if (end === "caller") {
+          yield* Fiber.interrupt(next);
+          assert.isTrue(Exit.hasInterrupts(yield* Fiber.await(next)));
+          const replacement = yield* startTurn(
+            runtime,
+            providerThread,
+            "default",
+            [],
+            "Replacement",
+            undefined,
+            3,
+          ).pipe(Effect.result, Effect.forkScoped({ startImmediately: true }));
+          assert.isUndefined(replacement.pollUnsafe());
+          assert.lengthOf(
+            fake.allRequests().filter((request) => request["type"] === "prompt"),
+            1,
+          );
+          yield* fake.emit({
+            type: "response",
+            id: oldPrompt["id"],
+            command: "prompt",
+            success: true,
+          });
+          assert.equal((yield* Fiber.join(replacement))._tag, "Success");
+          yield* fake.takeRequest("prompt");
+          yield* fake.emit({ type: "agent_start" });
+          yield* fake.emit({ type: "agent_settled" });
+          const terminal = yield* takeEvent((event) => event.type === "turn.terminal");
+          assert.isTrue(terminal.type === "turn.terminal" && terminal.status === "completed");
+        } else {
+          if (end === "session") yield* Scope.close(runtimeScope, Exit.void);
+          else yield* fake.closeStdout;
+          const failed = yield* Fiber.join(next);
+          assert.isTrue(failed._tag === "Failure" && isProviderProtocolError(failed.failure.cause));
+          yield* fake.emit({
+            type: "response",
+            id: oldPrompt["id"],
+            command: "prompt",
+            success: true,
+          });
+          assert.equal(
+            (yield* startTurn(runtime, providerThread).pipe(Effect.result))._tag,
+            "Failure",
+          );
+          assert.lengthOf(
+            fake.allRequests().filter((request) => request["type"] === "prompt"),
+            1,
+          );
+        }
+      }).pipe(Effect.scoped, Effect.provide(layerTest)),
   );
 
   it.effect("shows compaction progress and completes the same activity row", () =>
@@ -5064,6 +5432,7 @@ describe("PiAdapterV2", () => {
         yield* fake.takeRequest("get_state");
         yield* takeEvent((event) => event.type === "turn.terminal");
 
+        fake.deferNextLifecycle("prompt");
         yield* startTurn(runtime, providerThread, "default", [], "Raced compaction", undefined, 2);
         yield* fake.takeRequest("prompt");
         yield* fake.emit({ type: "compaction_start", reason: "manual" });
@@ -5402,7 +5771,18 @@ describe("PiAdapterV2", () => {
     }).pipe(Effect.scoped, Effect.provide(layerTest)),
   );
 
-  it.effect("ignores an idle snapshot made stale by a steer", () =>
+  it.effect.each([
+    { handled: false, steer: "starts" },
+    { handled: true, steer: "starts" },
+    { handled: true, steer: "handled" },
+    { handled: true, steer: "rejected" },
+    { handled: true, steer: "compact-accepted" },
+    { handled: true, steer: "compact-rejected" },
+    { handled: false, steer: "compact-accepted" },
+    { handled: false, steer: "compact-rejected" },
+    { handled: true, steer: "compact-queued-accepted" },
+    { handled: true, steer: "compact-queued-rejected" },
+  ])("ignores stale idle probes, handled=$handled steer=$steer", ({ handled, steer }) =>
     Effect.gen(function* () {
       const fake = yield* makeFakePi;
       const { runtime, takeEvent } = yield* openRuntime(fake);
@@ -5411,6 +5791,7 @@ describe("PiAdapterV2", () => {
         modelSelection: modelSelection("default"),
         runtimePolicy,
       });
+      if (handled) fake.deferNextLifecycle("prompt");
       yield* startTurn(runtime, providerThread);
       yield* fake.takeRequest("prompt");
       const running = yield* takeEvent(
@@ -5421,30 +5802,95 @@ describe("PiAdapterV2", () => {
       const providerTurnId =
         running.type === "provider_turn.updated" ? running.providerTurn.id : undefined;
       assert.isDefined(providerTurnId);
-      yield* fake.emit({ type: "agent_start" });
+      if (!handled) yield* fake.emit({ type: "agent_start" });
 
       fake.deferNextState();
-      yield* fake.emit({ type: "agent_settled" });
+      yield* fake.emit(
+        handled
+          ? {
+              type: "response",
+              command: "prompt",
+              success: true,
+              data: { disposition: "handled" },
+            }
+          : { type: "agent_settled" },
+      );
       yield* fake.takeRequest("get_state");
-      yield* runtime.steerTurn({
+      const compact = steer.startsWith("compact-");
+      fake.deferNextLifecycle("prompt");
+      const steerInput = {
         threadId: THREAD_ID,
         runId: RunId.make("run:thread-pi-test:1"),
         providerThread,
         providerTurnId: providerTurnId!,
         message: {
           messageId: "message:thread-pi-test:late-steer" as never,
-          text: "Continue after settlement",
+          text: compact ? "/compact" : "Continue after settlement",
           attachments: [],
           createdBy: "user",
           creationSource: "web",
         },
-      });
-      yield* fake.takeRequest("prompt");
+      } satisfies ProviderAdapter.ProviderAdapterV2SteerInput;
+      yield* runtime.steerTurn(steerInput);
+      const steeredPrompt = yield* fake.takeRequest(compact ? "compact" : "prompt");
       yield* fake.resolveDeferredState({
         isStreaming: false,
         isCompacting: false,
         pendingMessageCount: 0,
       });
+      if (compact) {
+        if (steer.startsWith("compact-queued-")) {
+          yield* runtime.steerTurn(steerInput);
+          yield* fake.takeRequest("compact");
+          // Put a current probe before a notice in the pump, independent of fork scheduling.
+          for (const acknowledged of [false, true]) {
+            if (acknowledged) {
+              yield* fake.emit({ type: "response", command: "compact", success: true });
+              yield* fake.takeRequest("get_state");
+            }
+            yield* fake.emit({
+              type: "t3.settle_probe",
+              providerTurnId,
+              settleProbeGeneration: 2,
+              data: { isStreaming: false, isCompacting: false, pendingMessageCount: 0 },
+            });
+            yield* fake.emit({
+              type: "extension_ui_request",
+              method: "notify",
+              message: "Compact acknowledgment still pending",
+            });
+            const barrier = yield* takeEvent(
+              (event) =>
+                event.type === "turn.terminal" ||
+                (event.type === "turn_item.updated" && event.turnItem.type === "system_notice"),
+            );
+            assert.equal(barrier.type, "turn_item.updated");
+            assert.equal(runtime.providerSession.status, "running");
+          }
+        }
+        yield* fake.emit({
+          type: "response",
+          command: "compact",
+          success: !steer.endsWith("rejected"),
+          error: "Compact refused",
+        });
+        const terminal = yield* takeEvent((event) => event.type === "turn.terminal");
+        assert.isTrue(terminal.type === "turn.terminal" && terminal.status === "completed");
+        return;
+      }
+      if (steer !== "starts") {
+        yield* fake.emit({
+          type: "response",
+          id: steeredPrompt["id"],
+          command: "prompt",
+          success: steer === "handled",
+          data: { disposition: "handled" },
+          error: steer === "rejected" ? "Input refused" : undefined,
+        });
+        const terminal = yield* takeEvent((event) => event.type === "turn.terminal");
+        assert.isTrue(terminal.type === "turn.terminal" && terminal.status === "completed");
+        return;
+      }
 
       yield* fake.emit({ type: "agent_start" });
       yield* fake.emit({ type: "message_start", message: { role: "assistant" } });
@@ -5472,6 +5918,13 @@ describe("PiAdapterV2", () => {
           assistantItem.turnItem.text === "Recovered",
       );
 
+      yield* fake.emit({
+        type: "response",
+        id: steeredPrompt["id"],
+        command: "prompt",
+        success: true,
+        data: { disposition: "started" },
+      });
       fake.queueState({ isStreaming: false, isCompacting: false, pendingMessageCount: 0 });
       yield* fake.emit({ type: "agent_settled" });
       yield* fake.takeRequest("get_state");
diff --git a/packages/provider-pi/src/server/adapter.ts b/packages/provider-pi/src/server/adapter.ts
index 65f2a778dd32..2882a709a684 100644
--- a/packages/provider-pi/src/server/adapter.ts
+++ b/packages/provider-pi/src/server/adapter.ts
@@ -363,7 +363,7 @@ interface ActivePiTurn {
   nativeAborted: boolean;
   sawAgentActivity: boolean;
   adoptedWake: boolean;
-  readonly promptMayBeCommandOnly: boolean;
+  promptMayBeCommandOnly: boolean;
   latestCompactionAfterTokens: number | null;
   lastLiveUsedTokens: number | null;
   settleProbeGeneration: number;
@@ -563,12 +563,21 @@ export const makePiAdapterV2 = Effect.fn("makePiAdapterV2")(function* (
         void,
         ProviderAdapter.ProviderAdapterProtocolError
       > | null = null;
+      let pendingPromptResponsesDrained: Deferred.Deferred<
+        void,
+        ProviderAdapter.ProviderAdapterProtocolError
+      > | null = null;
       let closed = false;
       yield* Effect.addFinalizer(() =>
         Effect.gen(function* () {
           closed = true;
           sessionEntity = { ...sessionEntity, extensionStatuses: [] };
           pendingWake = null;
+          if (pendingPromptResponsesDrained !== null)
+            yield* Deferred.fail(
+              pendingPromptResponsesDrained,
+              protocolError("Pi session closed while awaiting prompt acknowledgment"),
+            );
           if (extensionStatusReset !== null)
             yield* Deferred.fail(
               extensionStatusReset.ready,
@@ -597,8 +606,8 @@ export const makePiAdapterV2 = Effect.fn("makePiAdapterV2")(function* (
       let contextWindow: number | null = null;
       const modelContextWindows = new Map<string, number>();
       let discoveredModels: ReadonlyArray<unknown> | null = null;
-      // Prompt ACKs lack IDs; retain session send order and ownership so late ACKs cannot affect new turns.
-      const pendingPromptResponses: Array<PiPromptSend> = [];
+      let nextPromptId = 0;
+      const pendingPromptResponses: Array<PiPromptSend & { readonly id: string }> = [];
       const pendingCompactResponses: Array<{
         readonly providerTurnId: OrchestrationV2ProviderTurn["id"];
         readonly kind: "turn_start" | "steer";
@@ -616,8 +625,13 @@ export const makePiAdapterV2 = Effect.fn("makePiAdapterV2")(function* (
           heldPrompts.push(prompt);
           return;
         }
-        yield* connection.send(prompt.record);
-        pendingPromptResponses.push(prompt);
+        const id = `t3-prompt-${nextPromptId++}`;
+        yield* connection.send({ ...prompt.record, id });
+        pendingPromptResponsesDrained ??= yield* Deferred.make<
+          void,
+          ProviderAdapter.ProviderAdapterProtocolError
+        >();
+        pendingPromptResponses.push({ ...prompt, id });
       });
       // A just-released prompt has not started its run yet, so a settle probe
       // racing it would see Pi idle. Its ack re-arms the probe instead.
@@ -2215,12 +2229,11 @@ export const makePiAdapterV2 = Effect.fn("makePiAdapterV2")(function* (
               if (compactTurn !== null) compactTurn.manualCompactInFlight = false;
               if (event["success"] === true) {
                 if (
-                  pendingCompact?.kind === "turn_start" &&
                   compactTurn !== null &&
-                  compactTurn.promptMayBeCommandOnly &&
-                  !compactTurn.sawAgentActivity
+                  (compactTurn.settleWhenIdle ||
+                    (compactTurn.promptMayBeCommandOnly && !compactTurn.sawAgentActivity))
                 ) {
-                  yield* scheduleSettleProbe(compactTurn);
+                  yield* scheduleSettleProbe(compactTurn, compactTurn.settleWhenIdle);
                 }
                 return;
               }
@@ -2231,6 +2244,12 @@ export const makePiAdapterV2 = Effect.fn("makePiAdapterV2")(function* (
                 yield* Effect.logWarning("Pi rejected a compact steer.", {
                   errorLength: recordString(event, "error")?.length,
                 });
+                if (
+                  compactTurn.settleWhenIdle ||
+                  (compactTurn.promptMayBeCommandOnly && !compactTurn.sawAgentActivity)
+                ) {
+                  yield* scheduleSettleProbe(compactTurn, compactTurn.settleWhenIdle);
+                }
                 return;
               }
               if (!compactTurn.sawCompaction) {
@@ -2246,9 +2265,23 @@ export const makePiAdapterV2 = Effect.fn("makePiAdapterV2")(function* (
               }
               return;
             }
-            // Only id-less prompts own ACK slots; a late reply to an id-bearing request must not take one.
-            if (command === "prompt" && typeof event["id"] === "string") return;
-            const pendingPrompt = command === "prompt" ? pendingPromptResponses.shift() : undefined;
+            const responseId = recordString(event, "id");
+            const promptIndex =
+              command !== "prompt"
+                ? -1
+                : responseId === undefined
+                  ? 0
+                  : pendingPromptResponses.findIndex((pending) => pending.id === responseId);
+            const pendingPrompt =
+              promptIndex < 0 ? undefined : pendingPromptResponses.splice(promptIndex, 1)[0];
+            if (
+              pendingPrompt !== undefined &&
+              pendingPromptResponses.length === 0 &&
+              pendingPromptResponsesDrained !== null
+            ) {
+              yield* Deferred.succeed(pendingPromptResponsesDrained, undefined);
+              pendingPromptResponsesDrained = null;
+            }
             const responseTurn =
               pendingPrompt?.providerTurnId === turn?.providerTurn.id ? turn : null;
             if (
@@ -2261,12 +2294,21 @@ export const makePiAdapterV2 = Effect.fn("makePiAdapterV2")(function* (
               heldPrompts.splice(rejectedHeldCount++, 0, pendingPrompt);
               return;
             }
-            // Settlement is not probed while a steer awaits its ack (see
-            // compaction_end); once Pi answers, the run it may have started is
-            // visible to get_state.
-            if (pendingPrompt?.kind === "steer" && responseTurn?.settleWhenIdle === true) {
-              yield* scheduleSettleProbe(responseTurn, true);
+            if (
+              event["success"] === true &&
+              pendingPrompt?.kind === "turn_start" &&
+              responseTurn !== null &&
+              recordString(event["data"], "disposition") === "handled"
+            ) {
+              responseTurn.promptMayBeCommandOnly = true;
             }
+            const consumedInputIsIdleCandidate =
+              responseTurn !== null &&
+              (responseTurn.settleWhenIdle ||
+                (responseTurn.promptMayBeCommandOnly && !responseTurn.sawAgentActivity)) &&
+              !pendingPromptResponses.some(
+                (pending) => pending.providerTurnId === responseTurn.providerTurn.id,
+              );
             if (event["success"] === true) {
               if (
                 pendingPrompt?.messageId !== undefined &&
@@ -2276,15 +2318,18 @@ export const makePiAdapterV2 = Effect.fn("makePiAdapterV2")(function* (
                 responseTurn.unreadSteers.push(pendingPrompt.messageId);
                 yield* emitSteerStatus(responseTurn, pendingPrompt.messageId, "pending");
               }
-              // Command-only prompts emit no agent_settled; probe idle and re-queue behind preceding native events.
+              // Consumed input may emit no agent_settled; probe idle behind preceding native events.
               if (
-                pendingPrompt?.kind === "turn_start" &&
                 responseTurn !== null &&
-                ((responseTurn.promptMayBeCommandOnly && !responseTurn.sawAgentActivity) ||
-                  (responseTurn.adoptedWake &&
+                (consumedInputIsIdleCandidate ||
+                  (pendingPrompt?.kind === "turn_start" &&
+                    responseTurn.adoptedWake &&
                     (responseTurn.settleWhenIdle || responseTurn.promptMayBeCommandOnly)))
               ) {
-                yield* scheduleSettleProbe(responseTurn, responseTurn.adoptedWake);
+                yield* scheduleSettleProbe(
+                  responseTurn,
+                  responseTurn.adoptedWake || responseTurn.settleWhenIdle,
+                );
               }
               return;
             }
@@ -2294,6 +2339,8 @@ export const makePiAdapterV2 = Effect.fn("makePiAdapterV2")(function* (
               yield* Effect.logWarning("Pi rejected a steer message.", {
                 errorLength: recordString(event, "error")?.length,
               });
+              if (consumedInputIsIdleCandidate && responseTurn !== null)
+                yield* scheduleSettleProbe(responseTurn, responseTurn.settleWhenIdle);
               return;
             }
             const failedTurn =
@@ -2352,6 +2399,18 @@ export const makePiAdapterV2 = Effect.fn("makePiAdapterV2")(function* (
             ) {
               return;
             }
+            if (
+              turn.manualCompactInFlight ||
+              pendingCompactResponses.some(
+                (pending) => pending.providerTurnId === turn.providerTurn.id,
+              ) ||
+              pendingPromptResponses.some(
+                (pending) => pending.providerTurnId === turn.providerTurn.id,
+              )
+            ) {
+              turn.settleWhenIdle = true;
+              return;
+            }
             if (probeFailed) {
               if (!settleAfterAgentActivity) {
                 if (state !== null) yield* finalizeTurn(state);
@@ -2420,6 +2479,12 @@ export const makePiAdapterV2 = Effect.fn("makePiAdapterV2")(function* (
             Effect.gen(function* () {
               runtimeRetired = true;
               const state = threadState;
+              closed = true;
+              if (pendingPromptResponsesDrained !== null)
+                yield* Deferred.fail(
+                  pendingPromptResponsesDrained,
+                  protocolError("Pi transport closed while awaiting prompt acknowledgment"),
+                );
               if (extensionStatusReset !== null)
                 yield* Deferred.fail(
                   extensionStatusReset.ready,
@@ -2771,12 +2836,18 @@ export const makePiAdapterV2 = Effect.fn("makePiAdapterV2")(function* (
             if (state === null) {
               return yield* protocolError("Pi session has no registered thread");
             }
-            if (state.activeTurn !== null) {
-              return yield* new ProviderAdapter.ProviderAdapterProtocolError({
-                driver: PI_PROVIDER,
-                detail: `Pi provider thread ${turnInput.providerThread.id} already has an active turn`,
-                reason: "previous_turn_active",
-              });
+            while (true) {
+              if (state.activeTurn !== null) {
+                return yield* new ProviderAdapter.ProviderAdapterProtocolError({
+                  driver: PI_PROVIDER,
+                  detail: `Pi provider thread ${turnInput.providerThread.id} already has an active turn`,
+                  reason: "previous_turn_active",
+                });
+              }
+              if (closed || stopRequested)
+                return yield* protocolError("Cannot start a Pi turn after session closure");
+              if (pendingPromptResponsesDrained === null) break;
+              yield* Deferred.await(pendingPromptResponsesDrained);
             }
             if (
               state.providerThread.nativeThreadRef?.nativeId !==
@@ -2854,83 +2925,89 @@ export const makePiAdapterV2 = Effect.fn("makePiAdapterV2")(function* (
               unreadSteers: [],
             };
             // Lock only install/send/start events; correlated setup must leave the pump free for dialogs.
-            yield* Effect.gen(function* () {
-              if (
-                threadState !== state ||
-                state.activeTurn !== null ||
-                closed ||
-                stopRequested ||
-                rollbackBarrier !== null ||
-                state.providerThread.nativeThreadRef?.nativeId !==
-                  turnInput.providerThread.nativeThreadRef?.nativeId
-              ) {
-                return yield* protocolError("Pi turn ownership changed before it could start");
-              }
-              const wake = pendingWake?.state === state ? pendingWake : null;
-              if (wake !== null && wake.state.providerThread.appThreadId !== turnInput.threadId) {
-                return yield* protocolError("Pi native wake belongs to a different app thread");
-              }
-              pendingWake = null;
-              state.providerThread = turnInput.providerThread;
-              state.activeTurn = activeTurn;
-              activeTurn.adoptedWake = wake !== null && !continuation;
-              if (compactCommand !== null) {
-                yield* connection.send(compactRpcRecord(compactCommand));
-                pendingCompactResponses.push({
-                  providerTurnId: providerTurn.id,
-                  kind: "turn_start",
+            while (true) {
+              const pendingAck = yield* Effect.gen(function* () {
+                if (
+                  threadState !== state ||
+                  state.activeTurn !== null ||
+                  closed ||
+                  stopRequested ||
+                  rollbackBarrier !== null ||
+                  state.providerThread.nativeThreadRef?.nativeId !==
+                    turnInput.providerThread.nativeThreadRef?.nativeId
+                ) {
+                  return yield* protocolError("Pi turn ownership changed before it could start");
+                }
+                if (pendingPromptResponsesDrained !== null) return pendingPromptResponsesDrained;
+                const wake = pendingWake?.state === state ? pendingWake : null;
+                if (wake !== null && wake.state.providerThread.appThreadId !== turnInput.threadId) {
+                  return yield* protocolError("Pi native wake belongs to a different app thread");
+                }
+                pendingWake = null;
+                state.providerThread = turnInput.providerThread;
+                state.activeTurn = activeTurn;
+                activeTurn.adoptedWake = wake !== null && !continuation;
+                if (compactCommand !== null) {
+                  yield* connection.send(compactRpcRecord(compactCommand));
+                  pendingCompactResponses.push({
+                    providerTurnId: providerTurn.id,
+                    kind: "turn_start",
+                  });
+                } else if (payload !== null) {
+                  yield* sendPrompt({
+                    providerTurnId: providerTurn.id,
+                    kind: "turn_start",
+                    record: {
+                      type: "prompt",
+                      message: payload.message,
+                      streamingBehavior: "steer",
+                      ...(payload.images.length === 0 ? {} : { images: payload.images }),
+                    },
+                  });
+                }
+                yield* emit({
+                  type: "provider_turn.updated",
+                  driver: PI_PROVIDER,
+                  threadId: turnInput.threadId,
+                  providerTurn,
                 });
-              } else if (payload !== null) {
-                yield* sendPrompt({
-                  providerTurnId: providerTurn.id,
-                  kind: "turn_start",
-                  record: {
-                    type: "prompt",
-                    message: payload.message,
-                    streamingBehavior: "steer",
-                    ...(payload.images.length === 0 ? {} : { images: payload.images }),
-                  },
+                yield* updateProviderThread(state, {
+                  status: "active",
+                  firstRunOrdinal: state.providerThread.firstRunOrdinal ?? turnInput.runOrdinal,
+                  lastRunOrdinal: turnInput.runOrdinal,
                 });
-              }
-              yield* emit({
-                type: "provider_turn.updated",
-                driver: PI_PROVIDER,
-                threadId: turnInput.threadId,
-                providerTurn,
-              });
-              yield* updateProviderThread(state, {
-                status: "active",
-                firstRunOrdinal: state.providerThread.firstRunOrdinal ?? turnInput.runOrdinal,
-                lastRunOrdinal: turnInput.runOrdinal,
-              });
-              yield* updateProviderSession("running", null);
-              if (wake !== null) {
-                for (const event of wake.events) {
-                  if (!continuation && event["type"] === "agent_settled") {
-                    activeTurn.nativeAborted = event["aborted"] === true;
-                    activeTurn.settleWhenIdle = true;
-                    continue;
+                yield* updateProviderSession("running", null);
+                if (wake !== null) {
+                  for (const event of wake.events) {
+                    if (!continuation && event["type"] === "agent_settled") {
+                      activeTurn.nativeAborted = event["aborted"] === true;
+                      activeTurn.settleWhenIdle = true;
+                      continue;
+                    }
+                    yield* handleSessionEvent(event);
                   }
-                  yield* handleSessionEvent(event);
+                } else if (continuation) {
+                  yield* finalizeTurn(state);
                 }
-              } else if (continuation) {
-                yield* finalizeTurn(state);
-              }
-              if (outOfTurnExtensionErrors.length > 0) {
-                yield* Queue.offer(connection.events, { type: "t3.flush_extension_errors" });
-              }
-            }).pipe(
-              sessionEventPermit.withPermits(1),
-              Effect.tapError(() =>
-                Effect.sync(() => {
-                  if (state.activeTurn === activeTurn) state.activeTurn = null;
-                }),
-              ),
-            );
+                if (outOfTurnExtensionErrors.length > 0) {
+                  yield* Queue.offer(connection.events, { type: "t3.flush_extension_errors" });
+                }
+                return null;
+              }).pipe(
+                sessionEventPermit.withPermits(1),
+                Effect.tapError(() =>
+                  Effect.sync(() => {
+                    if (state.activeTurn === activeTurn) state.activeTurn = null;
+                  }),
+                ),
+              );
+              if (pendingAck === null) break;
+              // The native event pump needs the permit to consume the actual ACK.
+              yield* Deferred.await(pendingAck);
+            }
             // Pi acks `prompt` only after slash-command expansion completes,
             // and extension commands may block on user dialogs indefinitely.
-            // Rejections therefore return later as id-less response records
-            // handled by the event pump.
+            // Correlated responses therefore return later through the event pump.
           },
           (effect, turnInput) =>
             effect.pipe(
diff --git a/packages/provider-pi/src/server/driver.test.ts b/packages/provider-pi/src/server/driver.test.ts
index 59586fdaedb3..072742c5cd7d 100644
--- a/packages/provider-pi/src/server/driver.test.ts
+++ b/packages/provider-pi/src/server/driver.test.ts
@@ -180,7 +180,7 @@ it.layer(layerTest)("PiDriver workspace discovery", (it) => {
           ["--offline"],
         );
       }
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("does not run a disabled provider's workspace probe", () =>
@@ -195,7 +195,7 @@ it.layer(layerTest)("PiDriver workspace discovery", (it) => {
       const workspace = yield* instance.snapshotForCwd!("/first");
       assert.isFalse(workspace.enabled);
       assert.deepEqual(workspace.skills, []);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect.each([true, false])(
@@ -234,7 +234,7 @@ it.layer(layerTest)("PiDriver workspace discovery", (it) => {
             ["test/other", []],
           ],
         );
-      }).pipe(Effect.scoped),
+      }),
   );
 
   it.effect(
@@ -254,6 +254,6 @@ it.layer(layerTest)("PiDriver workspace discovery", (it) => {
           (yield* instance.snapshot.getSnapshot).skills.map((skill) => skill.name),
           ["personal"],
         );
-      }).pipe(Effect.scoped),
+      }),
   );
 });
diff --git a/packages/provider-pi/src/server/status.test.ts b/packages/provider-pi/src/server/status.test.ts
index 2b887500f302..78d16ebd31c6 100644
--- a/packages/provider-pi/src/server/status.test.ts
+++ b/packages/provider-pi/src/server/status.test.ts
@@ -2,14 +2,15 @@ import * as NodeServices from "@effect/platform-node/NodeServices";
 import { assert, describe, it } from "@effect/vitest";
 import * as Cause from "effect/Cause";
 import * as Effect from "effect/Effect";
+import * as Deferred from "effect/Deferred";
+import * as Fiber from "effect/Fiber";
+import * as TestClock from "effect/testing/TestClock";
 import * as Queue from "effect/Queue";
 import * as Schema from "effect/Schema";
 import * as Sink from "effect/Sink";
 import * as Stream from "effect/Stream";
 import * as ChildProcess from "effect/process/ChildProcess";
 import * as ChildProcessSpawner from "effect/process/ChildProcessSpawner";
-import * as Fiber from "effect/Fiber";
-import * as TestClock from "effect/testing/TestClock";
 
 import { checkPiProviderStatus, MINIMUM_PI_VERSION } from "./status.ts";
 
@@ -57,14 +58,10 @@ function piProbeSpawner(version: string) {
   });
 }
 
-/** Fails the test if status runs `pi auth check` without `authCheck` or with other arguments. */
-const piDiscoverySpawner = (
+const piRpcProcess = (
   inventory: unknown,
-  options: {
-    readonly version?: string;
-    readonly state?: unknown;
-    readonly authCheck?: string | undefined;
-  } = {},
+  onModelRequest: Effect.Effect<void> = Effect.void,
+  state: unknown = {},
 ) =>
   Effect.gen(function* () {
     const stdout = yield* Queue.unbounded<Uint8Array, Cause.Done>();
@@ -79,13 +76,17 @@ const piDiscoverySpawner = (
           stdinBuffer = stdinBuffer.slice(newline + 1);
           if (line.length === 0) continue;
           const request = decodeRpcRequest(line);
+          if (request.type === "get_available_models") {
+            yield* onModelRequest;
+            if (inventory === null) continue;
+          }
           const data =
             request.type === "get_available_models"
               ? inventory
               : request.type === "get_commands"
                 ? { commands: [] }
                 : request.type === "get_state"
-                  ? (options.state ?? {})
+                  ? state
                   : {};
           yield* Queue.offer(
             stdout,
@@ -96,7 +97,31 @@ const piDiscoverySpawner = (
         }
       }),
     );
-    return ChildProcessSpawner.make((command) => {
+    return ChildProcessSpawner.makeHandle({
+      ...processHandle({}),
+      exitCode: Effect.never,
+      isRunning: Effect.succeed(true),
+      stdin,
+      stdout: Stream.fromQueue(stdout),
+    });
+  });
+
+/** Makes the extension-free launch exit before answering, like launch args naming an extension provider. */
+const exitsWithoutExtensions = Symbol("exitsWithoutExtensions");
+
+// Text generation lists models with --no-extensions, so its inventory can differ.
+const piDiscoverySpawner = (
+  inventory: unknown,
+  extensionFreeInventory: unknown = inventory,
+  onExtensionFreeModelRequest: Effect.Effect<void> = Effect.void,
+  options: {
+    readonly version?: string;
+    readonly state?: unknown;
+    readonly authCheck?: string | undefined;
+  } = {},
+) =>
+  Effect.succeed(
+    ChildProcessSpawner.make((command) => {
       const args = ChildProcess.isStandardCommand(command) ? command.args : [];
       if (args.includes("--version")) {
         return Effect.succeed(processHandle({ stdout: `pi ${options.version ?? "0.84.3"}\n` }));
@@ -107,17 +132,18 @@ const piDiscoverySpawner = (
           ? Effect.die(`Unexpected pi ${args.join(" ")}`)
           : Effect.succeed(processHandle({ stdout: options.authCheck, exitCode: 1 }));
       }
-      return Effect.succeed(
-        ChildProcessSpawner.makeHandle({
-          ...processHandle({}),
-          exitCode: Effect.never,
-          isRunning: Effect.succeed(true),
-          stdin,
-          stdout: Stream.fromQueue(stdout),
-        }),
+      if (args.includes("--no-extensions") && extensionFreeInventory === exitsWithoutExtensions) {
+        return Effect.succeed(
+          processHandle({ stderr: 'Error: Unknown provider "demo".', exitCode: 1 }),
+        );
+      }
+      return piRpcProcess(
+        args.includes("--no-extensions") ? extensionFreeInventory : inventory,
+        args.includes("--no-extensions") ? onExtensionFreeModelRequest : Effect.void,
+        options.state,
       );
-    });
-  });
+    }),
+  );
 
 const settings = {
   enabled: true,
@@ -263,6 +289,8 @@ describe("PiProvider", () => {
             { provider: "router", id: "auto" },
           ],
         },
+        undefined,
+        Effect.void,
         { version: row.version, state: { model: row.activeModel }, authCheck: row.authCheck },
       );
       const snapshot = yield* checkPiProviderStatus({
@@ -276,6 +304,89 @@ describe("PiProvider", () => {
     }).pipe(Effect.provide(NodeServices.layer)),
   );
 
+  it.effect("marks models that only load with Pi extensions as unusable for text generation", () =>
+    Effect.gen(function* () {
+      const spawner = yield* piDiscoverySpawner(
+        {
+          models: [
+            { provider: "anthropic", id: "claude-sonnet-4" },
+            { provider: "demo", id: "demo-model" },
+          ],
+        },
+        { models: [{ provider: "anthropic", id: "claude-sonnet-4" }] },
+      );
+      const snapshot = yield* checkPiProviderStatus(settings).pipe(
+        Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, spawner),
+      );
+      assert.deepEqual(
+        snapshot.models.map((model) => [model.slug, model.supportsTextGeneration]),
+        [
+          ["default", undefined],
+          ["anthropic/claude-sonnet-4", undefined],
+          ["demo/demo-model", false],
+        ],
+      );
+      assert.equal(snapshot.supportsTextGeneration, undefined);
+    }).pipe(Effect.provide(NodeServices.layer)),
+  );
+
+  it.effect.each([
+    { label: "exits before answering", extensionFreeInventory: exitsWithoutExtensions },
+    { label: "lists no models", extensionFreeInventory: { models: [] } },
+  ])("makes Pi unusable for text generation when Pi without extensions $label", (row) =>
+    Effect.gen(function* () {
+      const spawner = yield* piDiscoverySpawner(
+        { models: [{ provider: "demo", id: "extension-model" }] },
+        row.extensionFreeInventory,
+      );
+      const snapshot = yield* checkPiProviderStatus({
+        ...settings,
+        launchArgs: "--provider demo --model extension-model",
+        customModels: ["local/custom-alias"],
+      }).pipe(Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, spawner));
+      assert.equal(snapshot.status, "ready");
+      assert.equal(snapshot.auth.status, "authenticated");
+      // Pi default and custom models still run in chat, so the picker keeps them.
+      assert.deepEqual(
+        snapshot.models.map((model) => model.slug),
+        ["default", "demo/extension-model", "local/custom-alias"],
+      );
+      assert.equal(snapshot.supportsTextGeneration, false);
+    }).pipe(Effect.provide(NodeServices.layer)),
+  );
+
+  it.effect("preserves normal discovery when the extension-free model listing times out", () =>
+    Effect.gen(function* () {
+      const modelRequested = yield* Deferred.make<void>();
+      const spawner = yield* piDiscoverySpawner(
+        { models: [{ provider: "demo", id: "demo-model" }] },
+        null,
+        Deferred.succeed(modelRequested, undefined).pipe(Effect.asVoid),
+      );
+      const fiber = yield* checkPiProviderStatus(settings).pipe(
+        Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, spawner),
+        Effect.forkChild,
+      );
+      yield* Deferred.await(modelRequested);
+      yield* TestClock.adjust("5 seconds");
+      const snapshot = yield* Fiber.join(fiber);
+      assert.equal(snapshot.status, "ready");
+      assert.equal(snapshot.auth.status, "authenticated");
+      assert.deepEqual(
+        snapshot.models.map((model) => [model.slug, model.supportsTextGeneration]),
+        [
+          ["default", undefined],
+          ["demo/demo-model", undefined],
+        ],
+      );
+      assert.equal(snapshot.supportsTextGeneration, undefined);
+      assert.include(
+        snapshot.slashCommands.map((command) => command.name),
+        "compact",
+      );
+    }).pipe(Effect.provide(NodeServices.layer)),
+  );
+
   it.effect("advertises a model's service tiers beside its thinking levels", () =>
     Effect.gen(function* () {
       const spawner = yield* piDiscoverySpawner({
diff --git a/packages/provider-pi/src/server/status.ts b/packages/provider-pi/src/server/status.ts
index 5dfce10b8106..9361bc204eba 100644
--- a/packages/provider-pi/src/server/status.ts
+++ b/packages/provider-pi/src/server/status.ts
@@ -1,3 +1,4 @@
+import { resolveProviderProbeTimeoutMs } from "@t3tools/provider-core/server/snapshotProbe";
 import {
   type CustomModelSetting,
   type ServerProvider,
@@ -11,6 +12,7 @@ import * as DateTime from "effect/DateTime";
 import * as Effect from "effect/Effect";
 import * as Stream from "effect/Stream";
 import * as Exit from "effect/Exit";
+import * as Fiber from "effect/Fiber";
 import * as Option from "effect/Option";
 import * as Result from "effect/Result";
 import * as Schema from "effect/Schema";
@@ -57,6 +59,7 @@ const PI_PRESENTATION = {
 
 const VERSION_PROBE_TIMEOUT_MS = 10_000;
 const PI_RPC_DISCOVERY_TIMEOUT_MS = 30_000;
+const PI_TEXT_GENERATION_DISCOVERY_TIMEOUT_MS = 5_000;
 /**
  * get_entries arrived in 0.80.3 and agent_settled landed in source at 0.80.4.
  * Version 0.80.5 was the first published package containing both hooks.
@@ -81,6 +84,8 @@ interface PiDiscovery extends PiDiscoveredCommands {
   readonly authenticated: boolean;
   /** Pi's active model when Pi lists no model of its provider, so it cannot start a turn. */
   readonly unavailableActiveModel: { readonly provider: string; readonly id: string } | undefined;
+  /** Pi without extensions can load no model, so text generation fails for every entry. */
+  readonly textGenerationUnavailable: boolean;
 }
 
 function piModelsFromSettings(
@@ -141,6 +146,7 @@ const makePiDiscoveryConnection = Effect.fnUntraced(function* (
   environment: NodeJS.ProcessEnv,
   launchArgs: ReadonlyArray<string>,
   cwd?: string,
+  textGenerationLaunch = false,
 ) {
   const launch = buildPiRpcLaunch({
     launchArgs,
@@ -148,6 +154,8 @@ const makePiDiscoveryConnection = Effect.fnUntraced(function* (
     mcpSession: undefined,
     extensionPath: undefined,
     ephemeral: true,
+    disableExtensions: textGenerationLaunch,
+    disableTools: textGenerationLaunch,
     shortLived: true,
   });
   const connection = yield* makePiRpcConnection({
@@ -164,27 +172,79 @@ const makePiDiscoveryConnection = Effect.fnUntraced(function* (
   return connection;
 });
 
+// Text generation runs Pi with --no-extensions, so it cannot load models that an
+// extension or package registers. Listing models with that launch tells them apart.
+const discoverPiTextGenerationModelSlugs = Effect.fn(
+  "PiProviderStatus.discoverPiTextGenerationModelSlugs",
+)(function* (
+  piSettings: PiSettings,
+  environment: NodeJS.ProcessEnv,
+  launchArgs: ReadonlyArray<string>,
+  cwd?: string,
+) {
+  const connection = yield* makePiDiscoveryConnection(
+    piSettings,
+    environment,
+    launchArgs,
+    cwd,
+    true,
+  );
+  const modelsData = yield* connection.request({ type: "get_available_models" });
+  const models = yield* Effect.fromResult(parseDiscoveredModels(modelsData, undefined));
+  return new Set(models.map((model) => model.slug));
+}, Effect.scoped);
+
 const discoverPiViaRpc = Effect.fn("PiProviderStatus.discoverPiViaRpc")(function* (
   piSettings: PiSettings,
   environment: NodeJS.ProcessEnv,
   launchArgs: ReadonlyArray<string>,
   cwd?: string,
 ) {
+  const timeoutMs = resolveProviderProbeTimeoutMs("pi", PI_RPC_DISCOVERY_TIMEOUT_MS, environment);
+  // This optional probe must finish before the normal discovery deadline so
+  // it cannot discard an otherwise usable catalog and authentication state.
+  const textGenerationModelSlugsFiber = yield* discoverPiTextGenerationModelSlugs(
+    piSettings,
+    environment,
+    launchArgs,
+    cwd,
+  ).pipe(
+    // Pi exits before answering when launch args name a provider only an extension registers.
+    Effect.catchIf(
+      (error) =>
+        error._tag === "PiRpcError" && (error.operation === "read" || error.operation === "exit"),
+      () => Effect.succeed(new Set<string>()),
+    ),
+    Effect.orElseSucceed(() => undefined),
+    Effect.timeoutOrElse({
+      duration: PI_TEXT_GENERATION_DISCOVERY_TIMEOUT_MS,
+      orElse: () => Effect.void,
+    }),
+    Effect.forkScoped,
+  );
   const connection = yield* makePiDiscoveryConnection(piSettings, environment, launchArgs, cwd);
-  const stateData = yield* connection.request({ type: "get_state" });
-  const modelsData = yield* connection.request({ type: "get_available_models" });
+  const stateData = yield* connection.request({ type: "get_state" }, timeoutMs);
+  const modelsData = yield* connection.request({ type: "get_available_models" }, timeoutMs);
   const commandsData = yield* connection
-    .request({ type: "get_commands" })
+    .request({ type: "get_commands" }, timeoutMs)
     .pipe(Effect.orElseSucceed(() => undefined));
   const discoveredModels = yield* Effect.fromResult(parseDiscoveredModels(modelsData, stateData));
   const { slashCommands, skills } = parsePiDiscoveredCommands(commandsData);
+  const textGenerationModelSlugs = yield* Fiber.join(textGenerationModelSlugsFiber);
   // Pi lists only models of providers it holds credentials for, including extension, virtual and
   // --api-key ones. Turns need only the provider's credentials, so uncatalogued model ids still run.
   const activeModel = recordField(stateData, "model");
   const activeProvider = recordString(activeModel, "provider");
   const activeModelId = recordString(activeModel, "id");
   return {
-    models: discoveredModels,
+    models:
+      textGenerationModelSlugs === undefined
+        ? discoveredModels
+        : discoveredModels.map((model) =>
+            textGenerationModelSlugs.has(model.slug)
+              ? model
+              : { ...model, supportsTextGeneration: false },
+          ),
     slashCommands: withPiBuiltinSlashCommands(slashCommands),
     skills,
     authenticated: discoveredModels.length > 0,
@@ -194,6 +254,7 @@ const discoverPiViaRpc = Effect.fn("PiProviderStatus.discoverPiViaRpc")(function
       !discoveredModels.some((model) => model.subProvider === activeProvider)
         ? { provider: activeProvider, id: activeModelId }
         : undefined,
+    textGenerationUnavailable: textGenerationModelSlugs?.size === 0,
   } satisfies PiDiscovery;
 }, Effect.scoped);
 
@@ -210,18 +271,23 @@ export const discoverPiCommandsForCwd = Effect.fn("discoverPiCommandsForCwd")(
       cwd,
     );
     // A failed read must not replace a previously usable workspace catalog with an empty one.
-    const commandsData = yield* connection.request({ type: "get_commands" });
+    const commandsData = yield* connection.request(
+      { type: "get_commands" },
+      resolveProviderProbeTimeoutMs("pi", PI_RPC_DISCOVERY_TIMEOUT_MS, environment),
+    );
     const { slashCommands, skills } = parsePiDiscoveredCommands(commandsData);
     return { slashCommands: withPiBuiltinSlashCommands(slashCommands), skills };
   },
   Effect.scoped,
-  Effect.timeoutOrElse({
-    duration: PI_RPC_DISCOVERY_TIMEOUT_MS,
-    orElse: () =>
-      Effect.fail(
-        new PiRpcTimeoutError({ operation: "discovery", timeoutMs: PI_RPC_DISCOVERY_TIMEOUT_MS }),
-      ),
-  }),
+  (effect, _settings, environment) => {
+    const timeoutMs = resolveProviderProbeTimeoutMs("pi", PI_RPC_DISCOVERY_TIMEOUT_MS, environment);
+    return effect.pipe(
+      Effect.timeoutOrElse({
+        duration: timeoutMs,
+        orElse: () => Effect.fail(new PiRpcTimeoutError({ operation: "discovery", timeoutMs })),
+      }),
+    );
+  },
 );
 
 const runPiVersionCommand = Effect.fn("PiProviderStatus.runPiVersionCommand")(function* (
@@ -278,7 +344,7 @@ const describeUnavailablePiModel = Effect.fn("PiProviderStatus.describeUnavailab
           }),
         ),
       ),
-      Effect.timeout(DEFAULT_TIMEOUT_MS),
+      Effect.timeout(resolveProviderProbeTimeoutMs("pi", DEFAULT_TIMEOUT_MS, environment)),
       Effect.option,
     );
     const missingCredentials = Option.exists(
@@ -352,7 +418,9 @@ export const checkPiProviderStatus = Effect.fn("checkPiProviderStatus")(function
 
   const probeEnvironment = providerProbeEnvironment(environment);
   const versionResult = yield* runPiVersionCommand(piSettings, probeEnvironment).pipe(
-    Effect.timeoutOption(VERSION_PROBE_TIMEOUT_MS),
+    Effect.timeoutOption(
+      resolveProviderProbeTimeoutMs("pi", VERSION_PROBE_TIMEOUT_MS, environment),
+    ),
     Effect.result,
   );
 
@@ -464,7 +532,12 @@ export const checkPiProviderStatus = Effect.fn("checkPiProviderStatus")(function
     probeEnvironment,
     resolvedLaunchArgs.args,
     cwd,
-  ).pipe(Effect.timeoutOption(PI_RPC_DISCOVERY_TIMEOUT_MS), Effect.exit);
+  ).pipe(
+    Effect.timeoutOption(
+      resolveProviderProbeTimeoutMs("pi", PI_RPC_DISCOVERY_TIMEOUT_MS, environment),
+    ),
+    Effect.exit,
+  );
   if (Exit.isFailure(discoveryExit)) {
     yield* Effect.logWarning("Pi RPC discovery failed.", {
       errorTag: causeErrorTag(discoveryExit.cause),
@@ -514,22 +587,25 @@ export const checkPiProviderStatus = Effect.fn("checkPiProviderStatus")(function
           resolvedLaunchArgs.args,
           discovery.unavailableActiveModel,
         );
-  return buildServerProvider({
-    presentation: PI_PRESENTATION,
-    enabled: piSettings.enabled,
-    checkedAt,
-    models,
-    slashCommands: discovery.slashCommands,
-    skills: discovery.skills,
-    probe: {
-      installed: true,
-      version,
-      // Other Pi models still work when only the default is unavailable, so keep the picker usable.
-      status: discovery.authenticated ? "ready" : "warning",
-      auth: { status: discovery.authenticated ? "authenticated" : "unauthenticated", type: "pi" },
-      ...(message === undefined ? {} : { message }),
-    },
-  });
+  return {
+    ...buildServerProvider({
+      presentation: PI_PRESENTATION,
+      enabled: piSettings.enabled,
+      checkedAt,
+      models,
+      slashCommands: discovery.slashCommands,
+      skills: discovery.skills,
+      probe: {
+        installed: true,
+        version,
+        // Other Pi models still work when only the default is unavailable, so keep the picker usable.
+        status: discovery.authenticated ? "ready" : "warning",
+        auth: { status: discovery.authenticated ? "authenticated" : "unauthenticated", type: "pi" },
+        ...(message === undefined ? {} : { message }),
+      },
+    }),
+    ...(discovery.textGenerationUnavailable ? { supportsTextGeneration: false } : {}),
+  };
 });
 
 export const enrichPiSnapshot = (input: {
diff --git a/packages/secret-provider-core/src/server/SecretResolver.ts b/packages/secret-provider-core/src/server/SecretResolver.ts
index e3f64dbb0103..6682c8250306 100644
--- a/packages/secret-provider-core/src/server/SecretResolver.ts
+++ b/packages/secret-provider-core/src/server/SecretResolver.ts
@@ -1,6 +1,6 @@
 // Reads secrets that settings point at through a configured secret provider. Each read, including
 // a failed one, is held for the server's life so rebuilds never re-prompt an unlock; `invalidate`
-// (the Settings refresh) is the only way to read again.
+// (the Settings refresh) and a `fresh` read are the only ways to read again.
 import type { SecretReference, ServerSettings } from "@t3tools/contracts";
 import * as Context from "effect/Context";
 import * as Effect from "effect/Effect";
@@ -14,9 +14,14 @@ import type { SecretProviderDriver, SecretProviderDriverServices } from "./drive
 export class SecretResolver extends Context.Service<
   SecretResolver,
   {
-    /** Values in input order; `undefined` marks a reference that could not be read. */
+    /**
+     * Values in input order; `undefined` marks a reference that could not be read. `fresh` asks the
+     * provider again and returns what it answered, but an unreadable or empty answer does not
+     * replace a value that is already held.
+     */
     readonly read: (
       references: ReadonlyArray<SecretReference>,
+      options?: { readonly fresh?: boolean },
     ) => Effect.Effect<ReadonlyArray<string | undefined>>;
     /** Forgets the given references, or every reference, so the next read asks the provider again. */
     readonly invalidate: (references?: ReadonlyArray<SecretReference>) => Effect.Effect<void>;
@@ -90,12 +95,14 @@ export const make = Effect.fn("SecretResolver.make")(function* (options: {
   // Cache hits answer without the lock, so a read waiting on an unlock never stalls a cached one.
   const read: SecretResolver["Service"]["read"] = Effect.fn("SecretResolver.read")(function* (
     references,
+    readOptions,
   ) {
+    const fresh = readOptions?.fresh === true;
     const providers = yield* options.secretProviders;
     const plans = references.map((reference) => planFor(providers, reference));
     const isMissing = (reference: SecretReference, index: number) => {
       const plan = plans[index];
-      return plan !== undefined && !isCached(reference, plan);
+      return plan !== undefined && (fresh || !isCached(reference, plan));
     };
     if (!references.some(isMissing)) return answer(references, plans);
 
@@ -118,15 +125,23 @@ export const make = Effect.fn("SecretResolver.make")(function* (options: {
           ]);
           wanted.set(reference.provider, group);
         });
+        const answered = new Map<string, string | undefined>();
         for (const { plan, byReference } of wanted.values()) {
           const values = yield* plan.driver.read(plan.config, [...byReference.keys()]);
           [...byReference.values()].forEach((sameReference, index) => {
+            const value = values[index];
+            const readable = value !== undefined && value.trim() !== "";
             for (const reference of sameReference) {
-              cache.set(cacheKey(reference), { config: plan.configKey, value: values[index] });
+              answered.set(cacheKey(reference), value);
+              if (!fresh || readable || !isCached(reference, plan)) {
+                cache.set(cacheKey(reference), { config: plan.configKey, value });
+              }
             }
           });
         }
-        return answer(references, plans);
+        return fresh
+          ? references.map((reference) => answered.get(cacheKey(reference)))
+          : answer(references, plans);
       }),
     );
   }, Effect.provideContext(context));
diff --git a/packages/shared/package.json b/packages/shared/package.json
index f5f769236f90..ba0b394f26d0 100644
--- a/packages/shared/package.json
+++ b/packages/shared/package.json
@@ -267,6 +267,10 @@
       "types": "./src/composerTrigger.ts",
       "import": "./src/composerTrigger.ts"
     },
+    "./triagePrompt": {
+      "types": "./src/triagePrompt.ts",
+      "import": "./src/triagePrompt.ts"
+    },
     "./pullRequestComposerTrigger": {
       "types": "./src/pullRequestComposerTrigger.ts",
       "import": "./src/pullRequestComposerTrigger.ts"
@@ -367,6 +371,10 @@
       "types": "./src/testing/symlinks.ts",
       "import": "./src/testing/symlinks.ts"
     },
+    "./databaseMigrationLog": {
+      "types": "./src/databaseMigrationLog.ts",
+      "import": "./src/databaseMigrationLog.ts"
+    },
     "./httpReadiness": {
       "types": "./src/httpReadiness.ts",
       "import": "./src/httpReadiness.ts"
diff --git a/packages/shared/src/DrainableWorker.test.ts b/packages/shared/src/DrainableWorker.test.ts
index d6bad8114c5a..8c6a91573c32 100644
--- a/packages/shared/src/DrainableWorker.test.ts
+++ b/packages/shared/src/DrainableWorker.test.ts
@@ -80,52 +80,50 @@ describe("makeDrainableWorker", () => {
     }).pipe(Effect.provide(loggerLayer));
   });
 
-  it.live("waits for work enqueued during active processing before draining", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const processed: string[] = [];
-        const firstStarted = yield* Deferred.make<void>();
-        const releaseFirst = yield* Deferred.make<void>();
-        const secondStarted = yield* Deferred.make<void>();
-        const releaseSecond = yield* Deferred.make<void>();
+  it.effect("waits for work enqueued during active processing before draining", () =>
+    Effect.gen(function* () {
+      const processed: string[] = [];
+      const firstStarted = yield* Deferred.make<void>();
+      const releaseFirst = yield* Deferred.make<void>();
+      const secondStarted = yield* Deferred.make<void>();
+      const releaseSecond = yield* Deferred.make<void>();
 
-        const worker = yield* makeDrainableWorker((item: string) =>
-          Effect.gen(function* () {
-            if (item === "first") {
-              yield* Deferred.succeed(firstStarted, undefined).pipe(Effect.orDie);
-              yield* Deferred.await(releaseFirst);
-            }
+      const worker = yield* makeDrainableWorker((item: string) =>
+        Effect.gen(function* () {
+          if (item === "first") {
+            yield* Deferred.succeed(firstStarted, undefined).pipe(Effect.orDie);
+            yield* Deferred.await(releaseFirst);
+          }
 
-            if (item === "second") {
-              yield* Deferred.succeed(secondStarted, undefined).pipe(Effect.orDie);
-              yield* Deferred.await(releaseSecond);
-            }
+          if (item === "second") {
+            yield* Deferred.succeed(secondStarted, undefined).pipe(Effect.orDie);
+            yield* Deferred.await(releaseSecond);
+          }
 
-            processed.push(item);
-          }),
-        );
+          processed.push(item);
+        }),
+      );
 
-        yield* worker.enqueue("first");
-        yield* Deferred.await(firstStarted);
+      yield* worker.enqueue("first");
+      yield* Deferred.await(firstStarted);
 
-        const drained = yield* Deferred.make<void>();
-        yield* Effect.forkChild(
-          worker.drain.pipe(
-            Effect.tap(() => Deferred.succeed(drained, undefined).pipe(Effect.orDie)),
-          ),
-        );
+      const drained = yield* Deferred.make<void>();
+      yield* Effect.forkChild(
+        worker.drain.pipe(
+          Effect.tap(() => Deferred.succeed(drained, undefined).pipe(Effect.orDie)),
+        ),
+      );
 
-        yield* worker.enqueue("second");
-        yield* Deferred.succeed(releaseFirst, undefined);
-        yield* Deferred.await(secondStarted);
+      yield* worker.enqueue("second");
+      yield* Deferred.succeed(releaseFirst, undefined);
+      yield* Deferred.await(secondStarted);
 
-        expect(yield* Deferred.isDone(drained)).toBe(false);
+      expect(yield* Deferred.isDone(drained)).toBe(false);
 
-        yield* Deferred.succeed(releaseSecond, undefined);
-        yield* Deferred.await(drained);
+      yield* Deferred.succeed(releaseSecond, undefined);
+      yield* Deferred.await(drained);
 
-        expect(processed).toEqual(["first", "second"]);
-      }),
-    ),
+      expect(processed).toEqual(["first", "second"]);
+    }),
   );
 });
diff --git a/packages/shared/src/KeyedCoalescingWorker.test.ts b/packages/shared/src/KeyedCoalescingWorker.test.ts
index 8ce44069d2d5..e00834ddae05 100644
--- a/packages/shared/src/KeyedCoalescingWorker.test.ts
+++ b/packages/shared/src/KeyedCoalescingWorker.test.ts
@@ -6,185 +6,177 @@ import * as Effect from "effect/Effect";
 import { makeKeyedCoalescingWorker } from "./KeyedCoalescingWorker.ts";
 
 describe("makeKeyedCoalescingWorker", () => {
-  it.live("lets a queued key drain before a continuously updated key finishes", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const processed: string[] = [];
-        const busyStarted = yield* Deferred.make<void>();
-        const releaseBusy = yield* Deferred.make<void>();
-
-        const worker = yield* makeKeyedCoalescingWorker<string, number, never, never>({
-          merge: (_current, next) => next,
-          process: (key, value): Effect.Effect<void> =>
-            Effect.gen(function* () {
-              processed.push(`${key}:${value}`);
-              if (key !== "busy") return;
-
-              if (value === 1) {
-                yield* Deferred.succeed(busyStarted, undefined);
-                yield* Deferred.await(releaseBusy);
-              }
-              if (value < 4) yield* worker.enqueue(key, value + 1);
-            }),
-        });
-
-        yield* worker.enqueue("busy", 1);
-        yield* Deferred.await(busyStarted);
-        yield* worker.enqueue("quiet", 1);
-        yield* Deferred.succeed(releaseBusy, undefined);
-        yield* worker.drainKey("quiet");
-        yield* worker.drainKey("busy");
-
-        expect(processed).toEqual(["busy:1", "quiet:1", "busy:2", "busy:3", "busy:4"]);
-      }),
-    ),
+  it.effect("lets a queued key drain before a continuously updated key finishes", () =>
+    Effect.gen(function* () {
+      const processed: string[] = [];
+      const busyStarted = yield* Deferred.make<void>();
+      const releaseBusy = yield* Deferred.make<void>();
+
+      const worker = yield* makeKeyedCoalescingWorker<string, number, never, never>({
+        merge: (_current, next) => next,
+        process: (key, value): Effect.Effect<void> =>
+          Effect.gen(function* () {
+            processed.push(`${key}:${value}`);
+            if (key !== "busy") return;
+
+            if (value === 1) {
+              yield* Deferred.succeed(busyStarted, undefined);
+              yield* Deferred.await(releaseBusy);
+            }
+            if (value < 4) yield* worker.enqueue(key, value + 1);
+          }),
+      });
+
+      yield* worker.enqueue("busy", 1);
+      yield* Deferred.await(busyStarted);
+      yield* worker.enqueue("quiet", 1);
+      yield* Deferred.succeed(releaseBusy, undefined);
+      yield* worker.drainKey("quiet");
+      yield* worker.drainKey("busy");
+
+      expect(processed).toEqual(["busy:1", "quiet:1", "busy:2", "busy:3", "busy:4"]);
+    }),
   );
 
-  it.live("merges updates while waiting behind another key and drains the merged batch", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const processed: string[] = [];
-        const busyStarted = yield* Deferred.make<void>();
-        const releaseBusy = yield* Deferred.make<void>();
-        const quietStarted = yield* Deferred.make<void>();
-        const releaseQuiet = yield* Deferred.make<void>();
-        const mergedStarted = yield* Deferred.make<void>();
-        const releaseMerged = yield* Deferred.make<void>();
-
-        const worker = yield* makeKeyedCoalescingWorker<string, string, never, never>({
-          merge: (current, next) => `${current}+${next}`,
-          process: (key, value) =>
-            Effect.gen(function* () {
-              processed.push(`${key}:${value}`);
-              if (value === "first") {
-                yield* Deferred.succeed(busyStarted, undefined);
-                yield* Deferred.await(releaseBusy);
-              } else if (key === "quiet") {
-                yield* Deferred.succeed(quietStarted, undefined);
-                yield* Deferred.await(releaseQuiet);
-              } else if (value === "a+b+c") {
-                yield* Deferred.succeed(mergedStarted, undefined);
-                yield* Deferred.await(releaseMerged);
-              }
-            }),
-        });
-
-        yield* worker.enqueue("busy", "first");
-        yield* Deferred.await(busyStarted);
-        yield* worker.enqueue("quiet", "quiet");
-        yield* worker.enqueue("busy", "a");
-        yield* Deferred.succeed(releaseBusy, undefined);
-        yield* Deferred.await(quietStarted);
-        expect(processed).toEqual(["busy:first", "quiet:quiet"]);
-        yield* worker.enqueue("busy", "b");
-        yield* worker.enqueue("busy", "c");
-
-        const drained = yield* Deferred.make<void>();
-        yield* Effect.forkChild(
-          worker.drainKey("busy").pipe(Effect.andThen(Deferred.succeed(drained, undefined))),
-          { startImmediately: true },
-        );
-        expect(yield* Deferred.isDone(drained)).toBe(false);
-
-        yield* Deferred.succeed(releaseQuiet, undefined);
-        yield* Deferred.await(mergedStarted);
-        expect(yield* Deferred.isDone(drained)).toBe(false);
-        yield* Deferred.succeed(releaseMerged, undefined);
-        yield* Deferred.await(drained);
-        yield* worker.drainKey("quiet");
-
-        expect(processed).toEqual(["busy:first", "quiet:quiet", "busy:a+b+c"]);
-      }),
-    ),
+  it.effect("merges updates while waiting behind another key and drains the merged batch", () =>
+    Effect.gen(function* () {
+      const processed: string[] = [];
+      const busyStarted = yield* Deferred.make<void>();
+      const releaseBusy = yield* Deferred.make<void>();
+      const quietStarted = yield* Deferred.make<void>();
+      const releaseQuiet = yield* Deferred.make<void>();
+      const mergedStarted = yield* Deferred.make<void>();
+      const releaseMerged = yield* Deferred.make<void>();
+
+      const worker = yield* makeKeyedCoalescingWorker<string, string, never, never>({
+        merge: (current, next) => `${current}+${next}`,
+        process: (key, value) =>
+          Effect.gen(function* () {
+            processed.push(`${key}:${value}`);
+            if (value === "first") {
+              yield* Deferred.succeed(busyStarted, undefined);
+              yield* Deferred.await(releaseBusy);
+            } else if (key === "quiet") {
+              yield* Deferred.succeed(quietStarted, undefined);
+              yield* Deferred.await(releaseQuiet);
+            } else if (value === "a+b+c") {
+              yield* Deferred.succeed(mergedStarted, undefined);
+              yield* Deferred.await(releaseMerged);
+            }
+          }),
+      });
+
+      yield* worker.enqueue("busy", "first");
+      yield* Deferred.await(busyStarted);
+      yield* worker.enqueue("quiet", "quiet");
+      yield* worker.enqueue("busy", "a");
+      yield* Deferred.succeed(releaseBusy, undefined);
+      yield* Deferred.await(quietStarted);
+      expect(processed).toEqual(["busy:first", "quiet:quiet"]);
+      yield* worker.enqueue("busy", "b");
+      yield* worker.enqueue("busy", "c");
+
+      const drained = yield* Deferred.make<void>();
+      yield* Effect.forkChild(
+        worker.drainKey("busy").pipe(Effect.andThen(Deferred.succeed(drained, undefined))),
+        { startImmediately: true },
+      );
+      expect(yield* Deferred.isDone(drained)).toBe(false);
+
+      yield* Deferred.succeed(releaseQuiet, undefined);
+      yield* Deferred.await(mergedStarted);
+      expect(yield* Deferred.isDone(drained)).toBe(false);
+      yield* Deferred.succeed(releaseMerged, undefined);
+      yield* Deferred.await(drained);
+      yield* worker.drainKey("quiet");
+
+      expect(processed).toEqual(["busy:first", "quiet:quiet", "busy:a+b+c"]);
+    }),
   );
 
-  it.live("waits for latest work enqueued during active processing before draining the key", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const processed: string[] = [];
-        const firstStarted = yield* Deferred.make<void>();
-        const releaseFirst = yield* Deferred.make<void>();
-        const secondStarted = yield* Deferred.make<void>();
-        const releaseSecond = yield* Deferred.make<void>();
-
-        const worker = yield* makeKeyedCoalescingWorker<string, string, never, never>({
-          merge: (_current, next) => next,
-          process: (key, value) =>
-            Effect.gen(function* () {
-              processed.push(`${key}:${value}`);
-
-              if (value === "first") {
-                yield* Deferred.succeed(firstStarted, undefined).pipe(Effect.orDie);
-                yield* Deferred.await(releaseFirst);
-              }
-
-              if (value === "second") {
-                yield* Deferred.succeed(secondStarted, undefined).pipe(Effect.orDie);
-                yield* Deferred.await(releaseSecond);
-              }
-            }),
-        });
-
-        yield* worker.enqueue("terminal-1", "first");
-        yield* Deferred.await(firstStarted);
-
-        const drained = yield* Deferred.make<void>();
-        yield* Effect.forkChild(
-          worker
-            .drainKey("terminal-1")
-            .pipe(Effect.tap(() => Deferred.succeed(drained, undefined).pipe(Effect.orDie))),
-        );
-
-        yield* worker.enqueue("terminal-1", "second");
-        yield* Deferred.succeed(releaseFirst, undefined);
-        yield* Deferred.await(secondStarted);
-
-        expect(yield* Deferred.isDone(drained)).toBe(false);
-
-        yield* Deferred.succeed(releaseSecond, undefined);
-        yield* Deferred.await(drained);
-
-        expect(processed).toEqual(["terminal-1:first", "terminal-1:second"]);
-      }),
-    ),
+  it.effect("waits for latest work enqueued during active processing before draining the key", () =>
+    Effect.gen(function* () {
+      const processed: string[] = [];
+      const firstStarted = yield* Deferred.make<void>();
+      const releaseFirst = yield* Deferred.make<void>();
+      const secondStarted = yield* Deferred.make<void>();
+      const releaseSecond = yield* Deferred.make<void>();
+
+      const worker = yield* makeKeyedCoalescingWorker<string, string, never, never>({
+        merge: (_current, next) => next,
+        process: (key, value) =>
+          Effect.gen(function* () {
+            processed.push(`${key}:${value}`);
+
+            if (value === "first") {
+              yield* Deferred.succeed(firstStarted, undefined).pipe(Effect.orDie);
+              yield* Deferred.await(releaseFirst);
+            }
+
+            if (value === "second") {
+              yield* Deferred.succeed(secondStarted, undefined).pipe(Effect.orDie);
+              yield* Deferred.await(releaseSecond);
+            }
+          }),
+      });
+
+      yield* worker.enqueue("terminal-1", "first");
+      yield* Deferred.await(firstStarted);
+
+      const drained = yield* Deferred.make<void>();
+      yield* Effect.forkChild(
+        worker
+          .drainKey("terminal-1")
+          .pipe(Effect.tap(() => Deferred.succeed(drained, undefined).pipe(Effect.orDie))),
+      );
+
+      yield* worker.enqueue("terminal-1", "second");
+      yield* Deferred.succeed(releaseFirst, undefined);
+      yield* Deferred.await(secondStarted);
+
+      expect(yield* Deferred.isDone(drained)).toBe(false);
+
+      yield* Deferred.succeed(releaseSecond, undefined);
+      yield* Deferred.await(drained);
+
+      expect(processed).toEqual(["terminal-1:first", "terminal-1:second"]);
+    }),
   );
 
-  it.live("requeues pending work for a key after a processor failure and keeps draining", () =>
-    Effect.scoped(
-      Effect.gen(function* () {
-        const processed: string[] = [];
-        const firstStarted = yield* Deferred.make<void>();
-        const releaseFailure = yield* Deferred.make<void>();
-        const secondProcessed = yield* Deferred.make<void>();
-
-        const worker = yield* makeKeyedCoalescingWorker<string, string, string, never>({
-          merge: (_current, next) => next,
-          process: (key, value) =>
-            Effect.gen(function* () {
-              processed.push(`${key}:${value}`);
-
-              if (value === "first") {
-                yield* Deferred.succeed(firstStarted, undefined).pipe(Effect.orDie);
-                yield* Deferred.await(releaseFailure);
-                return yield* Effect.fail("boom");
-              }
-
-              if (value === "second") {
-                yield* Deferred.succeed(secondProcessed, undefined).pipe(Effect.orDie);
-              }
-            }),
-        });
-
-        yield* worker.enqueue("terminal-1", "first");
-        yield* Deferred.await(firstStarted);
-        yield* worker.enqueue("terminal-2", "quiet");
-        yield* worker.enqueue("terminal-1", "second");
-        yield* Deferred.succeed(releaseFailure, undefined);
-        yield* Deferred.await(secondProcessed);
-        yield* worker.drainKey("terminal-1");
-
-        expect(processed).toEqual(["terminal-1:first", "terminal-2:quiet", "terminal-1:second"]);
-      }),
-    ),
+  it.effect("requeues pending work for a key after a processor failure and keeps draining", () =>
+    Effect.gen(function* () {
+      const processed: string[] = [];
+      const firstStarted = yield* Deferred.make<void>();
+      const releaseFailure = yield* Deferred.make<void>();
+      const secondProcessed = yield* Deferred.make<void>();
+
+      const worker = yield* makeKeyedCoalescingWorker<string, string, string, never>({
+        merge: (_current, next) => next,
+        process: (key, value) =>
+          Effect.gen(function* () {
+            processed.push(`${key}:${value}`);
+
+            if (value === "first") {
+              yield* Deferred.succeed(firstStarted, undefined).pipe(Effect.orDie);
+              yield* Deferred.await(releaseFailure);
+              return yield* Effect.fail("boom");
+            }
+
+            if (value === "second") {
+              yield* Deferred.succeed(secondProcessed, undefined).pipe(Effect.orDie);
+            }
+          }),
+      });
+
+      yield* worker.enqueue("terminal-1", "first");
+      yield* Deferred.await(firstStarted);
+      yield* worker.enqueue("terminal-2", "quiet");
+      yield* worker.enqueue("terminal-1", "second");
+      yield* Deferred.succeed(releaseFailure, undefined);
+      yield* Deferred.await(secondProcessed);
+      yield* worker.drainKey("terminal-1");
+
+      expect(processed).toEqual(["terminal-1:first", "terminal-2:quiet", "terminal-1:second"]);
+    }),
   );
 });
diff --git a/packages/shared/src/agentAwareness.ts b/packages/shared/src/agentAwareness.ts
index 55ad807957d6..4e68951308c5 100644
--- a/packages/shared/src/agentAwareness.ts
+++ b/packages/shared/src/agentAwareness.ts
@@ -27,10 +27,23 @@ export interface SubagentRequestAwareness {
   readonly requestId: RuntimeRequestId;
   /** The child's own update time, which moves whenever its request changes. */
   readonly updatedAt: DateTime.Utc;
+  /** A card only the user can answer, rather than an approval. */
+  readonly waitsForInput?: boolean;
 }
 
-/** Provider-native subagents ask on their parent; the coordinator answers child questions. */
-export function subagentAwaitsApproval(
+/**
+ * Turn items that can start or end a subagent's user-only wait: its secret or link card,
+ * or a user message that moves past a link card. Filters that drop subagent transcript
+ * updates must keep these, or the parent's "Input needed" never appears or never clears.
+ */
+export const turnItemCanChangeUserWait = (item: { readonly type: string }) =>
+  item.type === "secret_request" || item.type === "link_request" || item.type === "user_message";
+
+/**
+ * Provider-native subagents ask on their parent. The coordinator answers child questions,
+ * but not a card only the user can answer, such as a secret.
+ */
+export function subagentAwaitsUser(
   thread: Pick<
     OrchestrationV2ThreadShell,
     "activityRunStatus" | "creationSource" | "lineage" | "pendingRuntimeRequest"
@@ -40,7 +53,7 @@ export function subagentAwaitsApproval(
   return (
     kind !== undefined &&
     kind !== "auth_refresh" &&
-    kind !== "user_input" &&
+    (kind !== "user_input" || thread.pendingRuntimeRequest?.userOnly === true) &&
     thread.lineage.relationshipToParent === "subagent" &&
     !isProviderNativeSubagentThread(thread) &&
     // The activity run stays set when a follow-up is queued behind a blocked run.
@@ -86,7 +99,7 @@ export interface ProjectThreadAwarenessV2Input {
     | "title"
     | "updatedAt"
   >;
-  /** The approval a live subagent below this thread is waiting on. */
+  /** What a live subagent below this thread is waiting on the user for. */
   readonly pendingSubagentRequest?: SubagentRequestAwareness | null;
 }
 
@@ -96,7 +109,7 @@ export function projectThreadAwarenessV2(
   const { environmentId, project, thread } = input;
   if (!isListedThreadLineage(thread.lineage)) return null;
   const subagentRequest = input.pendingSubagentRequest ?? null;
-  const phase = resolveThreadAwarenessPhaseV2(thread, subagentRequest !== null);
+  const phase = resolveThreadAwarenessPhaseV2(thread, subagentRequest);
   if (phase === null) {
     return null;
   }
@@ -140,7 +153,7 @@ export function projectThreadAwarenessV2(
 
 function resolveThreadAwarenessPhaseV2(
   thread: ProjectThreadAwarenessV2Input["thread"],
-  childAwaitsApproval: boolean,
+  subagentRequest: SubagentRequestAwareness | null,
 ): AgentAwarenessPhase | null {
   if (thread.pendingRuntimeRequest?.kind === "user_input") return "waiting_for_input";
   if (
@@ -151,7 +164,9 @@ function resolveThreadAwarenessPhaseV2(
   }
   // The parent can finish its own turn while a delegated child keeps working,
   // so a child's request outranks the parent's run status.
-  if (childAwaitsApproval) return "waiting_for_approval";
+  if (subagentRequest !== null) {
+    return subagentRequest.waitsForInput === true ? "waiting_for_input" : "waiting_for_approval";
+  }
   switch (thread.activityRunStatus ?? thread.status) {
     case "preparing":
     case "starting":
diff --git a/packages/shared/src/cloneUrl.test.ts b/packages/shared/src/cloneUrl.test.ts
index fc029e1b3b23..c053c95df412 100644
--- a/packages/shared/src/cloneUrl.test.ts
+++ b/packages/shared/src/cloneUrl.test.ts
@@ -129,6 +129,17 @@ describe("cloneUrlForProtocol", () => {
     expect(cloneUrlForProtocol("https://[2001:db8::1]/org/repo.git", "ssh")).toBe(
       "git@[2001:db8::1]:org/repo.git",
     );
+    for (const [literal, encoded] of [
+      ["my repo.git", "my%20repo.git"],
+      ["repo%20name.git", "repo%2520name.git"],
+      ["repo#1?.git", "repo%231%3F.git"],
+    ]) {
+      const scp = `git@host.example:team/${literal}`;
+      const https = `https://host.example/team/${encoded}`;
+      expect(cloneUrlForProtocol(https, "ssh")).toBe(scp);
+      expect(cloneUrlForProtocol(scp, "https")).toBe(https);
+      expect(cloneUrlForProtocol(`ssh://git@host.example/team/${encoded}`, "https")).toBe(https);
+    }
   });
 
   it("keeps the URL as is for its own protocol and drops HTTPS credentials on switch", () => {
@@ -141,6 +152,7 @@ describe("cloneUrlForProtocol", () => {
   });
 
   it("refuses rewrites that would guess wrong", () => {
+    expect(cloneUrlForProtocol("https://host.example/team/repo%ZZ.git", "ssh")).toBeNull();
     expect(cloneUrlForProtocol("ssh://git@host.example:2222/a/b.git", "https")).toBeNull();
     expect(cloneUrlForProtocol("https://host.example:8443/a/b.git", "ssh")).toBeNull();
     expect(cloneUrlForProtocol("https://host.example:8443/a/b.git", "https")).toBe(
diff --git a/packages/shared/src/cloneUrl.ts b/packages/shared/src/cloneUrl.ts
index 673a59918947..aa259c2ce4c8 100644
--- a/packages/shared/src/cloneUrl.ts
+++ b/packages/shared/src/cloneUrl.ts
@@ -7,16 +7,28 @@ const SCP_LIKE_URL = /^(?:[^@/\s]+@)?(\[[^\]@/\s]+\]|[^:/\s[\]]+):(?!\/)(.+)$/;
 const SSH_URL = /^ssh:\/\/(?:[^/\s]*@)?(\[[^\]@/\s]+\]|[^@:/\s]+)(:\d+)?\/(.+)$/;
 const HTTPS_URL = /^https?:\/\/(?:[^/\s]*@)?(\[[^\]@/\s]+\]|[^@:/\s]+)(:\d+)?\/(.+)$/;
 
-function parseCloneUrl(
-  url: string,
-): { protocol: CloneProtocol; host: string; path: string; customPort: boolean } | null {
+function parseCloneUrl(url: string): {
+  protocol: CloneProtocol;
+  host: string;
+  path: string;
+  customPort: boolean;
+  scp: boolean;
+} | null {
   const trimmed = url.trim();
   const ssh = SSH_URL.exec(trimmed);
-  if (ssh) return { protocol: "ssh", host: ssh[1]!, path: ssh[3]!, customPort: !!ssh[2] };
+  if (ssh)
+    return { protocol: "ssh", host: ssh[1]!, path: ssh[3]!, customPort: !!ssh[2], scp: false };
   const https = HTTPS_URL.exec(trimmed);
-  if (https) return { protocol: "https", host: https[1]!, path: https[3]!, customPort: !!https[2] };
+  if (https)
+    return {
+      protocol: "https",
+      host: https[1]!,
+      path: https[3]!,
+      customPort: !!https[2],
+      scp: false,
+    };
   const scp = SCP_LIKE_URL.exec(trimmed);
-  if (scp) return { protocol: "ssh", host: scp[1]!, path: scp[2]!, customPort: false };
+  if (scp) return { protocol: "ssh", host: scp[1]!, path: scp[2]!, customPort: false, scp: true };
   return null;
 }
 
@@ -44,9 +56,16 @@ export function cloneUrlForProtocol(url: string, protocol: CloneProtocol): strin
     const azure = /^([^/?#]+)\/([^/?#]+)\/_git\/([^/?#]+)$/.exec(parsed.path);
     return azure ? `git@ssh.dev.azure.com:v3/${azure[1]}/${azure[2]}/${azure[3]}` : null;
   }
-  return protocol === "ssh"
-    ? `git@${parsed.host}:${parsed.path}`
-    : `https://${parsed.host}/${parsed.path}`;
+  // SCP paths are literal; URI paths use percent escapes.
+  try {
+    if (protocol === "ssh") return `git@${parsed.host}:${decodeURIComponent(parsed.path)}`;
+    const path = parsed.scp
+      ? parsed.path.split("/").map(encodeURIComponent).join("/")
+      : parsed.path;
+    return `https://${parsed.host}/${path}`;
+  } catch {
+    return null;
+  }
 }
 
 const UNSAFE_SEGMENT = /^\.{1,2}$|[\\:*?"<>|\p{Cc}]|[ .]$/u;
diff --git a/packages/shared/src/composerContextReferences.ts b/packages/shared/src/composerContextReferences.ts
index 4302a1d69aa0..1c3094ef2884 100644
--- a/packages/shared/src/composerContextReferences.ts
+++ b/packages/shared/src/composerContextReferences.ts
@@ -427,6 +427,33 @@ export function projectComposerContextForProvider(input: {
   return `${body}\n\n<${CONTEXT_ENVELOPE_TAG} version="1">\n${entries.join("\n")}\n</${CONTEXT_ENVELOPE_TAG}>`;
 }
 
+const ENVELOPE_CLOSE = `</${CONTEXT_ENVELOPE_TAG}>`;
+const PROVIDER_MARKER = /\[([A-Z][^[\]:;\n]*): ([^[\];\n]*); ref=([^[\]\s]+)\]/g;
+const MARKER_ENVELOPE_PREFIX = `\n\n<${CONTEXT_ENVELOPE_TAG} version="1">\n<${CONTEXT_ENTRY_TAG} kind="`;
+
+/**
+ * Readable form of a single-reference `projectComposerContextForProvider` output, as question
+ * answers store it. Only an envelope right after its own marker is removed; typed XML stays.
+ */
+export function composerContextProviderTextForDisplay(text: string): string {
+  let result = "";
+  let cursor = 0;
+  for (const match of text.matchAll(PROVIDER_MARKER)) {
+    if (match.index < cursor) continue;
+    const markerEnd = match.index + match[0].length;
+    if (!text.startsWith(MARKER_ENVELOPE_PREFIX, markerEnd)) continue;
+    const kindEnd = text.indexOf('"', markerEnd + MARKER_ENVELOPE_PREFIX.length);
+    if (kindEnd === -1 || !text.startsWith(` id="${escapeAttribute(match[3]!)}"`, kindEnd + 1)) {
+      continue;
+    }
+    const close = text.indexOf(ENVELOPE_CLOSE, kindEnd);
+    if (close === -1) continue;
+    result += `${text.slice(cursor, match.index)}[${match[1]}: ${match[2]}]`;
+    cursor = close + ENVELOPE_CLOSE.length;
+  }
+  return result + text.slice(cursor);
+}
+
 // An agent reads threads on its own machine and on those it links to, even when a draft
 // moves between machines.
 export function threadContextsOutsideEnvironment(input: {
diff --git a/packages/shared/src/composerPullRequestMatches.test.ts b/packages/shared/src/composerPullRequestMatches.test.ts
index 64fdb946acfa..7ed872d4804b 100644
--- a/packages/shared/src/composerPullRequestMatches.test.ts
+++ b/packages/shared/src/composerPullRequestMatches.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from "vite-plus/test";
 
-import type { ThreadPullRequestLink } from "@t3tools/contracts";
+import type { ThreadPullRequestKey, ThreadPullRequestLink } from "@t3tools/contracts";
 
 import {
   composerPullRequestsFromLinks,
@@ -8,8 +8,12 @@ import {
   withLinkedComposerPullRequestsFirst,
 } from "./composerPullRequestMatches.ts";
 
+const keyOf = (entry: ThreadPullRequestKey) =>
+  `${entry.host.trim().toLowerCase()}/${entry.repository.trim().toLowerCase()}#${entry.number}`;
+
 const entry = (number: number, updatedAt: string) => ({
   number,
+  host: "github.com",
   projectId: "p1",
   repository: "owner/repo",
   updatedAt,
@@ -18,6 +22,7 @@ const entry = (number: number, updatedAt: string) => ({
 describe("filterComposerPullRequestMatches", () => {
   it("ranks the exact number above newer substring matches", () => {
     const result = filterComposerPullRequestMatches({
+      keyOf,
       entries: [entry(1234, "2026-01-03"), entry(123, "2026-01-01"), entry(1230, "2026-01-02")],
       projectId: "p1",
       repository: "owner/repo",
@@ -29,6 +34,7 @@ describe("filterComposerPullRequestMatches", () => {
 
   it("orders by update instant when timestamps carry different UTC offsets", () => {
     const result = filterComposerPullRequestMatches({
+      keyOf,
       entries: [entry(401, "2026-10-25T02:50:00+02:00"), entry(499, "2026-10-25T02:10:00+01:00")],
       projectId: "p1",
       repository: "owner/repo",
@@ -66,6 +72,7 @@ describe("linked pull requests", () => {
 
   it("offers a linked pull request from another repository above the project's own", () => {
     const result = filterComposerPullRequestMatches({
+      keyOf,
       entries: [entry(4, "2026-01-03"), { ...entry(4, "2026-01-04"), repository: "owner/other" }],
       linked: composerPullRequestsFromLinks([link("owner/repo-b", 4)], "p1"),
       projectId: "p1",
@@ -79,8 +86,27 @@ describe("linked pull requests", () => {
     ]);
   });
 
+  it("keeps linked reviews with the same repository and number on different hosts", () => {
+    const github = link("wireshark/wireshark", 1);
+    const gitlab = link("wireshark/wireshark", 1, {
+      host: "gitlab.com",
+      url: "https://gitlab.com/wireshark/wireshark/-/merge_requests/1",
+    });
+    const result = filterComposerPullRequestMatches({
+      keyOf,
+      entries: [],
+      linked: composerPullRequestsFromLinks([github, gitlab], "p1"),
+      projectId: "p1",
+      repository: "wireshark/wireshark",
+      query: "1",
+      limit: 10,
+    });
+    expect(result.map((match) => match.url)).toEqual([github.url, gitlab.url]);
+  });
+
   it("keeps one row for a linked pull request the project listing already has", () => {
     const result = filterComposerPullRequestMatches({
+      keyOf,
       entries: [entry(4, "2026-01-03")],
       linked: composerPullRequestsFromLinks([link("Owner/Repo", 4)], "p1"),
       projectId: "p1",
@@ -98,22 +124,34 @@ describe("linked pull requests", () => {
           snapshot: { ...link("owner/repo", 7).snapshot!, title: "Fix login" },
         }),
         link("owner/repo", 8),
+        link("owner/repo", 8, {
+          host: "gitlab.com",
+          url: "https://gitlab.com/owner/repo/-/merge_requests/8",
+          snapshot: { ...link("owner/repo", 8).snapshot!, title: "Fix CI" },
+        }),
       ],
       "p1",
     );
     const searching = withLinkedComposerPullRequestsFirst({
+      keyOf,
       matches: [],
       linked,
       query: "fix",
       limit: 10,
     });
-    expect(searching.map((match) => match.number)).toEqual([7]);
+    expect(searching.map((match) => match.number)).toEqual([7, 8]);
     const searched = withLinkedComposerPullRequestsFirst({
+      keyOf,
       matches: [entry(9, "2026-01-05"), entry(8, "2026-01-03")],
       linked,
       query: "fix",
       limit: 10,
     });
-    expect(searched).toEqual([linked[0], entry(8, "2026-01-03"), entry(9, "2026-01-05")]);
+    expect(searched).toEqual([
+      linked[0],
+      entry(8, "2026-01-03"),
+      linked[2],
+      entry(9, "2026-01-05"),
+    ]);
   });
 });
diff --git a/packages/shared/src/composerPullRequestMatches.ts b/packages/shared/src/composerPullRequestMatches.ts
index 7c6b3955a450..6eb38cf34ee6 100644
--- a/packages/shared/src/composerPullRequestMatches.ts
+++ b/packages/shared/src/composerPullRequestMatches.ts
@@ -1,11 +1,9 @@
-import type { ThreadPullRequestLink } from "@t3tools/contracts";
+import type { ThreadPullRequestKey, ThreadPullRequestLink } from "@t3tools/contracts";
 
 import { visibleThreadPullRequests } from "./threadPullRequests.ts";
 
-export interface ComposerPullRequestMatch {
-  readonly number: number;
+export interface ComposerPullRequestMatch extends ThreadPullRequestKey {
   readonly projectId: string;
-  readonly repository: string;
   readonly updatedAt: string;
 }
 
@@ -19,6 +17,7 @@ export function composerPullRequestsFromLinks(
       : [
           {
             projectId,
+            host: link.host,
             repository: link.repository,
             number: link.number,
             url: link.url,
@@ -43,10 +42,10 @@ export function filterComposerPullRequestMatches<
   readonly repository: string;
   readonly query: string;
   readonly limit: number;
+  readonly keyOf: (entry: Entry | Linked) => string;
 }): ReadonlyArray<Entry | Linked> {
   const repository = input.repository.trim().toLowerCase();
-  const keyOf = (entry: ComposerPullRequestMatch) =>
-    `${entry.repository.trim().toLowerCase()}#${entry.number}`;
+  const { keyOf } = input;
   const linked = (input.linked ?? []).filter((entry) => String(entry.number).includes(input.query));
   const linkedKeys = new Set(linked.map(keyOf));
   const matchingEntries = input.entries.filter(
@@ -62,7 +61,7 @@ export function filterComposerPullRequestMatches<
     }
   }
   const isExactMatch = (entry: ComposerPullRequestMatch) => String(entry.number) === input.query;
-  const isLinked = (entry: ComposerPullRequestMatch) => linkedKeys.has(keyOf(entry));
+  const isLinked = (entry: Entry | Linked) => linkedKeys.has(keyOf(entry));
   const updatedAtMs = (entry: ComposerPullRequestMatch) => Date.parse(entry.updatedAt) || 0;
   // Hermes has no ES2023 array methods, so sort a fresh array.
   return [...uniqueEntries.values()]
@@ -87,9 +86,9 @@ export function withLinkedComposerPullRequestsFirst<
   readonly linked: ReadonlyArray<Linked>;
   readonly query: string;
   readonly limit: number;
+  readonly keyOf: (entry: Entry | Linked) => string;
 }): ReadonlyArray<Entry | Linked> {
-  const keyOf = (entry: ComposerPullRequestMatch) =>
-    `${entry.repository.trim().toLowerCase()}#${entry.number}`;
+  const { keyOf } = input;
   const matchesByKey = new Map(input.matches.map((entry) => [keyOf(entry), entry]));
   const words = input.query.toLowerCase().split(/\s+/u).filter(Boolean);
   const linked = input.linked.flatMap((entry): Array<Entry | Linked> => {
diff --git a/packages/shared/src/composerTrigger.test.ts b/packages/shared/src/composerTrigger.test.ts
index 72ff3db848cf..338a0406ab0a 100644
--- a/packages/shared/src/composerTrigger.test.ts
+++ b/packages/shared/src/composerTrigger.test.ts
@@ -11,6 +11,8 @@ describe("detectComposerTrigger", () => {
     ["Run /tmp/build.sh", "Run /tmp/build.sh".length],
     ["/etc/hosts", "/etc/hosts".length],
     ["Use /etc/hosts now", "Use /et".length],
+    ["cmd /foo\\bar", "cmd /foo\\bar".length],
+    ["/Windows\\System32", "/Windows\\System32".length],
   ])("keeps the path in %j out of the slash menu", (text, cursor) => {
     expect(detectComposerTrigger(text, cursor)).toBeNull();
   });
diff --git a/packages/shared/src/composerTrigger.ts b/packages/shared/src/composerTrigger.ts
index 80292492154a..05ab5ca95859 100644
--- a/packages/shared/src/composerTrigger.ts
+++ b/packages/shared/src/composerTrigger.ts
@@ -45,7 +45,7 @@ function isWhitespace(char: string): boolean {
   return char === " " || char === "\n" || char === "\t" || char === "\r";
 }
 
-/** A second slash makes the whole word a path, even when the caret precedes that slash. */
+/** A second slash or backslash makes the whole word a path, even when the caret precedes it. */
 export function isPathWord(
   text: string,
   wordStart: number,
@@ -56,7 +56,7 @@ export function isPathWord(
   while (wordEnd < text.length && !isWhitespaceChar(text[wordEnd] ?? "")) {
     wordEnd += 1;
   }
-  return text.slice(wordStart + 1, wordEnd).includes("/");
+  return /[/\\]/.test(text.slice(wordStart + 1, wordEnd));
 }
 
 /**
diff --git a/packages/shared/src/databaseMigrationLog.ts b/packages/shared/src/databaseMigrationLog.ts
new file mode 100644
index 000000000000..7adc4e4a6c84
--- /dev/null
+++ b/packages/shared/src/databaseMigrationLog.ts
@@ -0,0 +1,14 @@
+// The server logs these around pending migrations; the desktop reads them from its output tail,
+// which keeps only the last few thousand characters, so each progress line also marks a running upgrade.
+export const DATABASE_MIGRATIONS_STARTED_MESSAGE = "Running database migrations";
+export const DATABASE_MIGRATION_PROGRESS_MESSAGE = "Upgrading database";
+export const DATABASE_MIGRATIONS_FINISHED_MESSAGE = "Migrations ran successfully";
+
+export function isRunningDatabaseMigrations(output: string): boolean {
+  return (
+    Math.max(
+      output.lastIndexOf(DATABASE_MIGRATIONS_STARTED_MESSAGE),
+      output.lastIndexOf(DATABASE_MIGRATION_PROGRESS_MESSAGE),
+    ) > output.lastIndexOf(DATABASE_MIGRATIONS_FINISHED_MESSAGE)
+  );
+}
diff --git a/packages/shared/src/markdownPipeline.ts b/packages/shared/src/markdownPipeline.ts
index e8042ee6d469..a549045259e4 100644
--- a/packages/shared/src/markdownPipeline.ts
+++ b/packages/shared/src/markdownPipeline.ts
@@ -274,6 +274,12 @@ export const CHAT_MARKDOWN_REMARK_PLUGINS_WITH_BREAKS: PluggableList = [
   remarkNormalizeLinksAndTagInlineCode,
 ];
 
+// Users type paths like ~/a and (~/b, which GFM's single-tilde strikethrough hides as <del>.
+// Appended after the base list, this reconfigures its remark-gfm entry; ~~double~~ still strikes.
+export const CHAT_USER_MARKDOWN_REMARK_PLUGINS: PluggableList = [
+  [remarkGfm, { singleTilde: false }],
+];
+
 // Start tags an HTML parser closes an open `<p>` for.
 const CLOSES_PARAGRAPH = new Set(
   "address article aside blockquote center details dialog dir div dl fieldset figcaption figure footer form h1 h2 h3 h4 h5 h6 header hgroup hr li listing main menu nav ol p plaintext pre search section summary table ul xmp dd dt".split(
diff --git a/packages/shared/src/mcpResponsePayloads.test.ts b/packages/shared/src/mcpResponsePayloads.test.ts
index 9a3737ab93f5..8027d6393f95 100644
--- a/packages/shared/src/mcpResponsePayloads.test.ts
+++ b/packages/shared/src/mcpResponsePayloads.test.ts
@@ -69,3 +69,25 @@ it.effect("reads SSE line endings across byte-chunk boundaries without splitting
     }
   }),
 );
+
+it.effect("picks the SSE reader from the media type alone, whatever its case", () =>
+  Effect.gen(function* () {
+    const response = new Response('data: {"id":1}\n\n', {
+      headers: { "content-type": "Text/Event-Stream; charset=utf-8" },
+    });
+    const payloads = yield* Stream.runCollect(
+      responsePayloads(response, (cause) => ({ _tag: "ResponsePayloadError" as const, cause })),
+    );
+    expect(Array.from(payloads)).toEqual([{ id: 1 }]);
+
+    const json = new Response('{"jsonrpc":"2.0","id":1,"result":{}}', {
+      headers: {
+        "content-type": 'application/json; profile="https://example.com/Text/Event-Stream"',
+      },
+    });
+    const jsonPayloads = yield* Stream.runCollect(
+      responsePayloads(json, (cause) => ({ _tag: "ResponsePayloadError" as const, cause })),
+    );
+    expect(Array.from(jsonPayloads)).toEqual([{ jsonrpc: "2.0", id: 1, result: {} }]);
+  }),
+);
diff --git a/packages/shared/src/mcpResponsePayloads.ts b/packages/shared/src/mcpResponsePayloads.ts
index ac8d301c404a..4c8d2e6fd306 100644
--- a/packages/shared/src/mcpResponsePayloads.ts
+++ b/packages/shared/src/mcpResponsePayloads.ts
@@ -35,8 +35,8 @@ export function responsePayloads<E>(
   if (response.status === 202 || response.status === 204) {
     return Stream.unwrap(discardResponseBody(response).pipe(Effect.as(Stream.empty)));
   }
-  const contentType = response.headers.get("content-type") ?? "";
-  if (contentType.includes("text/event-stream")) {
+  const mediaType = (response.headers.get("content-type") ?? "").split(";", 1)[0]!.trim();
+  if (mediaType.toLowerCase() === "text/event-stream") {
     return Stream.fromAsyncIterable(sseDataLines(response), onError).pipe(
       Stream.mapEffect((data) => Effect.try({ try: () => JSON.parse(data), catch: onError })),
     );
diff --git a/packages/shared/src/nodeSqliteClient.test.ts b/packages/shared/src/nodeSqliteClient.test.ts
index f8e91cb9a9ca..92ae7134017e 100644
--- a/packages/shared/src/nodeSqliteClient.test.ts
+++ b/packages/shared/src/nodeSqliteClient.test.ts
@@ -23,6 +23,7 @@ import * as SqliteClient from "./nodeSqliteClient.ts";
 const startedWorkers = vi.hoisted((): Array<NodeWorkerThreads.Worker> => []);
 const silentWorkers = vi.hoisted(() => ({ on: false, readyOnTerminate: false }));
 const failingWorkers = vi.hoisted(() => ({ message: undefined as string | undefined }));
+const checkpointWorkers = vi.hoisted((): Array<NodeWorkerThreads.Worker> => []);
 
 vi.mock("node:worker_threads", async (importOriginal) => {
   const actual = await importOriginal<typeof NodeWorkerThreads>();
@@ -36,6 +37,7 @@ vi.mock("node:worker_threads", async (importOriginal) => {
             : args) as ConstructorParameters<typeof actual.Worker>),
       );
       startedWorkers.push(this);
+      if (args[1]?.workerData?.frames !== undefined) checkpointWorkers.push(this);
     }
     override terminate() {
       // A "ready" already queued when termination starts reaches the parent before "exit".
@@ -222,7 +224,7 @@ it.effect("waits for another process's lock while the database opens", () =>
     yield* Effect.gen(function* () {
       const sql = yield* SqlClient.SqlClient;
       assert.deepEqual(yield* sql`SELECT COUNT(*) FROM entries`.values, [[0]]);
-    }).pipe(Effect.provide(SqliteClient.layer({ filename, checkpointWorker: true })));
+    }).pipe(Effect.provide(SqliteClient.layer({ filename, writerWorker: true })));
   }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
 );
 
@@ -244,6 +246,52 @@ it.effect("reports a transaction blocked by another writer as a lock timeout", (
   }).pipe(Effect.provide(NodeServices.layer)),
 );
 
+it.effect("lets the event loop run while a write waits for another connection's lock", () =>
+  Effect.gen(function* () {
+    const { filename, other } = yield* makeTempDatabase;
+    yield* Effect.gen(function* () {
+      const sql = yield* SqlClient.SqlClient;
+      yield* sql`PRAGMA busy_timeout = 5000`;
+      yield* Effect.sync(() => other.exec("BEGIN IMMEDIATE"));
+      const write = yield* Effect.forkChild(
+        sql`UPDATE counters SET value = value + 1 WHERE id = 1`,
+        { startImmediately: true },
+      );
+      // A writer on the event loop sleeps in SQLite's busy handler here, so this commit
+      // cannot run until that write has already timed out.
+      yield* eventLoopTurn;
+      yield* Effect.sync(() => other.exec("UPDATE counters SET value = 10 WHERE id = 1; COMMIT"));
+      yield* Fiber.join(write);
+      assert.deepEqual(yield* sql`SELECT value FROM counters WHERE id = 1`.values, [[11]]);
+    }).pipe(Effect.provide(SqliteClient.layer({ filename, writerWorker: true })));
+  }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
+);
+
+it.effect("finishes a write already sent to the writer before its caller is interrupted", () =>
+  Effect.gen(function* () {
+    const { filename, other } = yield* makeTempDatabase;
+    yield* Effect.gen(function* () {
+      const sql = yield* SqlClient.SqlClient;
+      yield* sql`PRAGMA busy_timeout = 5000`;
+      yield* Effect.sync(() => other.exec("BEGIN IMMEDIATE"));
+      const write = yield* Effect.forkChild(
+        sql`UPDATE counters SET value = value + 1 WHERE id = 1`,
+        { startImmediately: true },
+      );
+      yield* eventLoopTurn;
+      const interrupted = yield* Effect.forkChild(Fiber.interrupt(write), {
+        startImmediately: true,
+      });
+      yield* eventLoopTurn;
+      // The write is waiting in the worker for the lock, so the interrupt has to wait too.
+      assert.isUndefined(interrupted.pollUnsafe());
+      yield* Effect.sync(() => other.exec("COMMIT"));
+      yield* Fiber.join(interrupted);
+      assert.deepEqual(yield* sql`SELECT value FROM counters WHERE id = 1`.values, [[1]]);
+    }).pipe(Effect.provide(SqliteClient.layer({ filename, writerWorker: true })));
+  }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
+);
+
 it.effect("lets the writer commit while a read-only transaction is open", () =>
   withReaderClient((sql) =>
     Effect.gen(function* () {
@@ -420,7 +468,7 @@ it.effect("fails with a typed SqlError when the database file is not SQLite", ()
     const filename = path.join(directory, "state.sqlite");
     yield* fs.writeFileString(filename, "not a db\n");
 
-    const exit = yield* Layer.build(SqliteClient.layer({ filename, checkpointWorker: true })).pipe(
+    const exit = yield* Layer.build(SqliteClient.layer({ filename, writerWorker: true })).pipe(
       Effect.exit,
     );
 
@@ -514,45 +562,13 @@ it.effect.each([
     }).pipe(Effect.provide(SqliteClient.layer({ filename: ":memory:" }))),
 );
 
-const PAYLOAD = new Uint8Array(1024 * 1024).fill(7);
-const WAL_SIZE_LIMIT = 32 * 1024 * 1024;
-
-// Fails instead of hanging when admission holds the write: the worker retries a blocked
-// checkpoint on its own, so two blocked reports for one WAL generation mean a held write.
-const insertUnlessHeld = Effect.fnUntraced(function* (
-  sql: SqlClient.SqlClient,
-  worker: NodeWorkerThreads.Worker,
-  label: string,
-) {
-  const stalled = yield* Deferred.make<void>();
-  let seen: unknown;
-  const onMessage = (message: { type?: unknown; blocked?: unknown; generation?: unknown }) => {
-    if (message?.type !== "checkpoint" || message.blocked !== true) return;
-    if (message.generation === seen) Deferred.doneUnsafe(stalled, Effect.void);
-    seen = message.generation;
-  };
-  worker.on("message", onMessage);
-  const held = yield* Effect.raceFirst(
-    sql`INSERT INTO blobs VALUES (${PAYLOAD})`.pipe(Effect.as(false)),
-    Deferred.await(stalled).pipe(Effect.as(true)),
-  ).pipe(Effect.ensuring(Effect.sync(() => worker.off("message", onMessage))));
-  if (held) assert.fail(`${label} is held by admission while an outside reader pins the WAL`);
-});
-
-// `outside` stands in for `sqlite3 statev2.sqlite` or a backup script reading the database.
-const withOutsideConnection = <A, E>(
-  use: (options: {
-    readonly sql: SqlClient.SqlClient;
-    readonly worker: NodeWorkerThreads.Worker;
-    readonly outside: NodeSqlite.DatabaseSync;
-    readonly walSize: Effect.Effect<number>;
-  }) => Effect.Effect<A, E, SqlClient.SqlClient>,
-) =>
+it.effect("keeps writes moving while an outside reader pins the WAL, then trims the WAL", () =>
   Effect.gen(function* () {
     const fs = yield* FileSystem.FileSystem;
     const path = yield* Path.Path;
     const directory = yield* fs.makeTempDirectoryScoped({ prefix: "t3-sqlite-pinned-wal-" });
     const filename = path.join(directory, "state.sqlite");
+    // Stands in for `sqlite3 statev2.sqlite` or a backup script reading the database.
     const outside = yield* Effect.acquireRelease(
       Effect.sync(() => new NodeSqlite.DatabaseSync(filename)),
       (db) =>
@@ -561,64 +577,46 @@ const withOutsideConnection = <A, E>(
           db.close();
         }),
     );
-    outside.exec(`
-      PRAGMA journal_mode = WAL;
-      PRAGMA wal_autocheckpoint = 0;
-      CREATE TABLE blobs(data BLOB NOT NULL);
-    `);
+    outside.exec("PRAGMA journal_mode = WAL; CREATE TABLE blobs(data BLOB NOT NULL)");
     const walSize = fs.stat(`${filename}-wal`).pipe(
       Effect.map((info) => Number(info.size)),
       Effect.orDie,
     );
+    const limit = 8 * 1024 * 1024;
+    const payload = new Uint8Array(1024 * 1024).fill(7);
     yield* Effect.gen(function* () {
       const sql = yield* SqlClient.SqlClient;
-      yield* sql.unsafe(`PRAGMA journal_size_limit = ${WAL_SIZE_LIMIT}`);
-      return yield* use({ sql, worker: startedWorkers.at(-1)!, outside, walSize });
-    }).pipe(Effect.provide(SqliteClient.layer({ filename, checkpointWorker: true })));
-  }).pipe(Effect.scoped, Effect.provide(NodeServices.layer));
-
-const openReadTransaction = (db: NodeSqlite.DatabaseSync) => {
-  db.exec("BEGIN");
-  db.prepare("SELECT COUNT(*) FROM blobs").get();
-};
-
-it.effect("keeps admitting writes while an outside read transaction pins the WAL", () =>
-  withOutsideConnection(({ sql, worker, outside }) =>
-    Effect.gen(function* () {
-      yield* sql`INSERT INTO blobs VALUES (${PAYLOAD})`;
-      openReadTransaction(outside);
-      // 140 MiB passes both the 32 MiB size limit and the 32,768-frame ceiling.
-      for (let write = 1; write <= 140; write++) {
-        yield* insertUnlessHeld(sql, worker, `write ${write}`);
-      }
-      const rows = yield* sql<{ count: number }>`SELECT COUNT(*) AS count FROM blobs`;
-      assert.equal(rows[0]?.count, 141);
-    }),
-  ),
-);
-
-it.effect("keeps admitting writes while a reader stops TRUNCATE, then resets the WAL", () =>
-  withOutsideConnection(({ sql, worker, outside, walSize }) =>
-    Effect.gen(function* () {
-      const insert = outside.prepare("INSERT INTO blobs VALUES (?)");
-      for (let write = 1; write <= 40; write++) insert.run(PAYLOAD);
-      // A snapshot of an unbackfilled WAL lets PASSIVE finish but stops TRUNCATE.
-      openReadTransaction(outside);
-      const stopped = yield* Deferred.make<void>();
-      const reset = yield* Deferred.make<void>();
-      worker.on("message", (message: { type?: unknown; truncateId?: unknown; log?: unknown }) => {
-        if (message?.type !== "checkpoint" || message.truncateId === undefined) return;
-        Deferred.doneUnsafe(message.log === 0 ? reset : stopped, Effect.void);
-      });
-      // Starts a checkpoint without appending a frame past the reader's snapshot.
-      yield* sql`DELETE FROM blobs WHERE 0`;
-      yield* Deferred.await(stopped);
-      yield* insertUnlessHeld(sql, worker, "a write after the failed TRUNCATE");
-      assert.isAbove(yield* walSize, WAL_SIZE_LIMIT);
+      yield* sql.unsafe(`PRAGMA journal_size_limit = ${limit}`);
+      yield* sql`INSERT INTO blobs VALUES (${payload})`;
+      outside.exec("BEGIN");
+      outside.prepare("SELECT COUNT(*) FROM blobs").get();
+      for (let write = 0; write < 24; write++) yield* sql`INSERT INTO blobs VALUES (${payload})`;
+      assert.isAbove(yield* walSize, limit);
       outside.exec("COMMIT");
-      // No further write arrives; the worker has to retry on its own.
-      yield* Deferred.await(reset);
-      assert.equal(yield* walSize, 0);
-    }),
-  ),
+      const checkpointer = checkpointWorkers.at(-1)!;
+      const caughtUp = Effect.callback<void>((resume) => {
+        const onMessage = (message: { type?: unknown; log?: unknown; checkpointed?: unknown }) => {
+          if (
+            message?.type === "checked" &&
+            typeof message.log === "number" &&
+            message.log > 0 &&
+            message.log === message.checkpointed
+          ) {
+            resume(Effect.void);
+          }
+        };
+        checkpointer.on("message", onMessage);
+        checkpointer.ref();
+        return Effect.sync(() => {
+          checkpointer.off("message", onMessage);
+          checkpointer.unref();
+        });
+      });
+      // The worker checkpoints the released frames; the next write restarts the WAL at the limit.
+      yield* Effect.all([caughtUp, sql`DELETE FROM blobs WHERE rowid = 1`], { concurrency: 2 });
+      yield* sql`DELETE FROM blobs WHERE rowid = 2`;
+      assert.isAtMost(yield* walSize, limit);
+      assert.deepEqual(yield* sql`SELECT COUNT(*) FROM blobs`.values, [[23]]);
+    }).pipe(Effect.provide(SqliteClient.layer({ filename, writerWorker: true })));
+  }).pipe(Effect.scoped, Effect.provide(NodeServices.layer)),
 );
diff --git a/packages/shared/src/nodeSqliteClient.ts b/packages/shared/src/nodeSqliteClient.ts
index 251c795c30a9..73872a8805b0 100644
--- a/packages/shared/src/nodeSqliteClient.ts
+++ b/packages/shared/src/nodeSqliteClient.ts
@@ -35,8 +35,8 @@ export interface SqliteClientConfig {
   readonly spanAttributes?: Record<string, unknown> | undefined;
   /** Ignored for in-memory databases, which cannot share a second connection. */
   readonly readerWorker?: boolean | undefined;
-  /** Ignored for in-memory databases. */
-  readonly checkpointWorker?: boolean | undefined;
+  /** Runs the writer and WAL checkpoints off the event loop. Ignored for in-memory databases. */
+  readonly writerWorker?: boolean | undefined;
 }
 
 // SqlClient masks transaction acquisition, so readOnly carries the caller's interruption policy.
@@ -194,24 +194,31 @@ const hasLargeBinding = (params: ReadonlyArray<unknown>): boolean => {
 };
 
 // Inline worker source also runs in bundles and single-executable builds without module files.
-const readerWorkerSource = `
+const workerSource = `
 const { parentPort, workerData } = require("node:worker_threads");
 const { DatabaseSync } = require("node:sqlite");
+const describe = (error) => ({
+  message: String(error && error.message ? error.message : error),
+  code: error && error.code,
+  errcode: error && error.errcode,
+  errstr: error && error.errstr,
+});
 let db;
 try {
   // A read-only open cannot be undone by SQL, unlike PRAGMA query_only.
   const next = new DatabaseSync(workerData.filename, {
-    readOnly: true,
+    readOnly: workerData.readOnly,
     allowExtension: workerData.allowExtension,
   });
   next.exec("PRAGMA busy_timeout = 5000;");
-  // Without WAL a reader's shared lock blocks the writer's commits, so refuse.
+  // Reads the header, so a file that is not a database fails here rather than on first use.
   const mode = String(next.prepare("PRAGMA journal_mode").get().journal_mode).toLowerCase();
-  if (mode !== "wal") throw new Error("database uses journal_mode " + mode + ", not wal");
+  // Without WAL a reader's shared lock blocks the writer's commits, so refuse.
+  if (workerData.requireWal && mode !== "wal") throw new Error("database uses journal_mode " + mode + ", not wal");
   db = next;
   parentPort.postMessage({ type: "ready" });
 } catch (error) {
-  parentPort.postMessage({ type: "unavailable", message: String(error && error.message ? error.message : error) });
+  parentPort.postMessage({ type: "unavailable", ...describe(error) });
 }
 const statements = new Map();
 const prepare = (sql, cached) => {
@@ -226,10 +233,19 @@ const prepare = (sql, cached) => {
   statements.set(sql, statement);
   return statement;
 };
-parentPort.on("message", ({ id, sql, params, cached, values, raw, safeIntegers }) => {
+parentPort.on("message", (request) => {
+  if (request.type === "close") {
+    // Closing lets SQLite checkpoint and remove the WAL, which terminating would skip.
+    try {
+      if (db !== undefined) db.close();
+    } catch {}
+    parentPort.close();
+    return;
+  }
+  const { id, sql, params, cached, values, raw, safeIntegers } = request;
   let operation = "open";
   try {
-    if (db === undefined) throw new Error("database reader is unavailable");
+    if (db === undefined) throw new Error("database connection is unavailable");
     operation = "prepare";
     const statement = prepare(sql, cached);
     operation = "execute";
@@ -242,21 +258,12 @@ parentPort.on("message", ({ id, sql, params, cached, values, raw, safeIntegers }
       parentPort.postMessage({ id, rows: raw ? result : [] });
     }
   } catch (error) {
-    parentPort.postMessage({
-      id,
-      error: {
-        operation,
-        message: String(error && error.message ? error.message : error),
-        code: error && error.code,
-        errcode: error && error.errcode,
-        errstr: error && error.errstr,
-      },
-    });
+    parentPort.postMessage({ id, error: { operation, ...describe(error) } });
   }
 });
 `;
 
-interface ReaderRequest {
+interface WorkerRequest {
   readonly sql: string;
   readonly params: ReadonlyArray<unknown>;
   readonly cached: boolean;
@@ -264,24 +271,25 @@ interface ReaderRequest {
   readonly raw: boolean;
 }
 
-type ReaderStartup =
+interface WorkerFailure {
+  readonly message: string;
+  readonly code?: unknown;
+  readonly errcode?: unknown;
+  readonly errstr?: unknown;
+}
+
+type WorkerStartup =
   | { readonly type: "ready" }
-  | { readonly type: "unavailable"; readonly message: string };
+  | ({ readonly type: "unavailable" } & WorkerFailure);
 
-type ReaderReply =
+type WorkerReply =
   | { readonly id: number; readonly rows: ReadonlyArray<any> }
   | {
       readonly id: number;
-      readonly error: {
-        readonly operation: "open" | "prepare" | "execute";
-        readonly message: string;
-        readonly code?: unknown;
-        readonly errcode?: unknown;
-        readonly errstr?: unknown;
-      };
+      readonly error: WorkerFailure & { readonly operation: "open" | "prepare" | "execute" };
     };
 
-const readerFailureMessages = {
+const workerFailureMessages = {
   open: "Failed to open database",
   prepare: "Failed to prepare statement",
   execute: "Failed to execute statement",
@@ -290,46 +298,66 @@ const readerFailureMessages = {
 const failed = (cause: unknown, message: string, operation: string) =>
   new SqlError({ reason: classifyError(cause, message, operation) });
 
+const failedWith = (
+  { message, code, errcode, errstr }: WorkerFailure,
+  operation: keyof typeof workerFailureMessages,
+) =>
+  failed(
+    Object.assign(new Error(message), { code, errcode, errstr }),
+    workerFailureMessages[operation],
+    operation,
+  );
+
 // Read-transaction cleanup succeeds after worker exit because it can no longer change anything.
 const endsReadTransaction = (sql: string) => /^\s*ROLLBACK\b|^\s*COMMIT\b/i.test(sql);
 
 // WAL readers run concurrently; one worker serialized every read behind the slowest transaction.
 const READER_POOL_SIZE = 4;
+const READER_STARTUP_TIMEOUT = Duration.seconds(10);
 
 // Bind transactions to one worker; fail after its exit instead of resuming outside the transaction on a replacement.
-const makeReader = Effect.fnUntraced(function* (
-  options: SqliteClientConfig,
-  pool: { unavailable: boolean },
-) {
+const makeWorkerConnection = Effect.fnUntraced(function* (options: {
+  readonly filename: string;
+  readonly role: "reader" | "writer";
+  readonly readOnly: boolean;
+  readonly onReply?: () => void;
+}) {
+  const label = options.role === "reader" ? "Database reader" : "Database writer";
+  const readOnly = options.readOnly;
   let current:
     | {
         readonly worker: NodeWorkerThreads.Worker;
         readonly connection: Connection;
-        readonly started: Promise<ReaderStartup>;
+        readonly started: Promise<WorkerStartup>;
       }
     | undefined;
   let nextRequestId = 0;
+  // A replacement writer would lose the pragmas callers set on it, such as foreign_keys.
+  let writerStopped: string | undefined;
 
   const start = () => {
-    const worker = new NodeWorkerThreads.Worker(readerWorkerSource, {
+    const worker = new NodeWorkerThreads.Worker(workerSource, {
       eval: true,
       workerData: {
         filename: options.filename,
+        readOnly,
+        requireWal: options.role === "reader",
         allowExtension: false,
         prepareCacheSize: 200,
       },
     });
-    let announce: (startup: ReaderStartup) => void = () => {};
-    const started = new Promise<ReaderStartup>((resolve) => {
+    let announce: (startup: WorkerStartup) => void = () => {};
+    const started = new Promise<WorkerStartup>((resolve) => {
       announce = resolve;
     });
     let stoppedMessage: string | undefined;
     const pending = new Map<
       number,
-      { readonly endsTransaction: boolean; readonly resume: (reply: ReaderReply) => void }
+      { readonly endsTransaction: boolean; readonly resume: (reply: WorkerReply) => void }
     >();
     const stop = (message: string) => {
       stoppedMessage = message;
+      if (options.role === "writer") writerStopped = message;
       announce({ type: "unavailable", message });
       if (current?.worker === worker) current = undefined;
       for (const [id, request] of pending) {
@@ -341,7 +369,7 @@ const makeReader = Effect.fnUntraced(function* (
       }
       pending.clear();
     };
-    worker.on("message", (reply: ReaderReply | ReaderStartup) => {
+    worker.on("message", (reply: WorkerReply | WorkerStartup) => {
       if ("type" in reply) {
         announce(reply);
         if (pending.size === 0) worker.unref();
@@ -351,48 +379,43 @@ const makeReader = Effect.fnUntraced(function* (
       if (request === undefined) return;
       pending.delete(reply.id);
       if (pending.size === 0) worker.unref();
+      options.onReply?.();
       request.resume(reply);
     });
-    worker.on("error", (cause) => stop(`Database reader failed: ${cause.message}`));
-    worker.on("exit", (code) => stop(`Database reader exited with code ${code}`));
+    worker.on("error", (cause) => stop(`${label} failed: ${cause.message}`));
+    worker.on("exit", (code) => stop(`${label} exited with code ${code}`));
 
-    const request = (input: ReaderRequest) =>
+    const request = (input: WorkerRequest) =>
       Effect.withFiber<ReadonlyArray<any>, SqlError>((fiber) => {
-        const endsTransaction = endsReadTransaction(input.sql);
+        // A COMMIT that never reached a writer must fail; only its ROLLBACK is moot.
+        const endsTransaction = readOnly
+          ? endsReadTransaction(input.sql)
+          : /^\s*ROLLBACK\b/i.test(input.sql);
         if (stoppedMessage !== undefined) {
           return endsTransaction
             ? Effect.succeed([])
-            : Effect.fail(
-                failed(new Error(stoppedMessage), readerFailureMessages.execute, "execute"),
-              );
+            : Effect.fail(failedWith({ message: stoppedMessage }, "execute"));
         }
         const safeIntegers = Boolean(Context.get(fiber.context, Client.SafeIntegers));
-        return Effect.callback<ReadonlyArray<any>, SqlError>((resume) => {
+        const reply = Effect.callback<ReadonlyArray<any>, SqlError>((resume) => {
           const id = nextRequestId++;
           pending.set(id, {
             endsTransaction,
-            resume: (reply) => {
-              if ("rows" in reply) {
-                resume(Effect.succeed(reply.rows));
-                return;
-              }
-              const { operation, message, ...codes } = reply.error;
+            resume: (reply) =>
               resume(
-                Effect.fail(
-                  failed(
-                    Object.assign(new Error(message), codes),
-                    readerFailureMessages[operation],
-                    operation,
-                  ),
-                ),
-              );
-            },
+                "rows" in reply
+                  ? Effect.succeed(reply.rows)
+                  : Effect.fail(failedWith(reply.error, reply.error.operation)),
+              ),
           });
           if (pending.size === 1) worker.ref();
           const cached = input.cached && !hasLargeBinding(input.params);
           // oxlint-disable-next-line unicorn/require-post-message-target-origin -- Node workers do not accept a target origin.
           worker.postMessage({ id, safeIntegers, ...input, cached });
         });
+        // A posted write runs to the end, as it did on the event loop; the caller and its lock
+        // must not move on while the worker is still applying it. Reads stay cancellable.
+        return options.role === "writer" ? Effect.uninterruptible(reply) : reply;
       });
 
     const connection = identity<Connection>({
@@ -411,7 +434,7 @@ const makeReader = Effect.fnUntraced(function* (
       },
       executeUnprepared(sql, params, rowTransform) {
         // Read snapshots need deferred BEGIN; readonly connections reject IMMEDIATE and EXCLUSIVE.
-        const statement = /^\s*BEGIN\b/i.test(sql) ? "BEGIN" : sql;
+        const statement = readOnly && /^\s*BEGIN\b/i.test(sql) ? "BEGIN" : sql;
         const effect = request({
           sql: statement,
           params: params ?? [],
@@ -431,220 +454,154 @@ const makeReader = Effect.fnUntraced(function* (
 
   yield* Effect.addFinalizer(() =>
     Effect.promise(async () => {
-      await current?.worker.terminate();
+      const open = current;
+      if (open === undefined) return;
+      if (options.role === "writer") {
+        await new Promise<void>((resolve) => {
+          open.worker.once("exit", () => resolve());
+          open.worker.ref();
+          // oxlint-disable-next-line unicorn/require-post-message-target-origin -- Node workers do not accept a target origin.
+          open.worker.postMessage({ type: "close" });
+        });
+      }
+      await open.worker.terminate();
     }),
   );
 
-  const startupTimeout = Duration.seconds(10);
-
-  const turnOff = (reader: typeof current, reason: string) =>
-    Effect.suspend(() => {
-      if (reader !== undefined) {
-        if (current === reader) current = undefined;
-        void reader.worker.terminate();
-      }
-      if (pool.unavailable) return Effect.undefined;
-      pool.unavailable = true;
-      return Effect.logWarning("SQLite reader worker unavailable; reads use the main connection", {
-        reason,
-      }).pipe(Effect.as(undefined));
-    });
+  const retire = (worker: NodeWorkerThreads.Worker) => {
+    if (current?.worker === worker) current = undefined;
+    void worker.terminate();
+  };
 
-  return Effect.suspend((): Effect.Effect<Connection | undefined> => {
-    if (pool.unavailable) return Effect.undefined;
-    let reader: NonNullable<typeof current>;
+  return Effect.suspend((): Effect.Effect<Connection, SqlError> => {
+    if (current === undefined && writerStopped !== undefined) {
+      return Effect.fail(failedWith({ message: writerStopped }, "execute"));
+    }
+    let entry: NonNullable<typeof current>;
     try {
-      reader = current ?? start();
+      entry = current ?? start();
     } catch (cause) {
-      return turnOff(undefined, String(cause));
+      return Effect.fail(failed(cause, workerFailureMessages.open, "open"));
     }
+    const started = Effect.promise(() => entry.started);
     return Effect.flatMap(
       Effect.withFiber((fiber) => {
         const restore = Context.get(fiber.context, ReadOnly) ?? identity;
+        // Readers fall back to the writer; the writer has no fallback, so a slow disk only delays it.
         return restore(
-          Effect.timeoutOption(
-            Effect.promise(() => reader.started),
-            startupTimeout,
-          ),
+          options.role === "reader"
+            ? Effect.timeoutOption(started, READER_STARTUP_TIMEOUT)
+            : Effect.asSome(started),
         );
       }),
-      (startup): Effect.Effect<Connection | undefined> =>
-        // A late ready event must not hand out a worker retired by another acquire timeout.
-        pool.unavailable || current !== reader
-          ? Effect.undefined
-          : Option.isSome(startup) && startup.value.type === "ready"
-            ? Effect.succeed(reader.connection)
-            : turnOff(
-                reader,
-                Option.isSome(startup) && startup.value.type === "unavailable"
-                  ? startup.value.message
-                  : `worker did not open the database within ${Duration.toMillis(startupTimeout)} ms`,
-              ),
+      (startup): Effect.Effect<Connection, SqlError> => {
+        const outcome = Option.getOrUndefined(startup);
+        if (outcome?.type === "ready") {
+          // A late ready event must not hand out a worker retired by another acquire timeout.
+          return current === entry
+            ? Effect.succeed(entry.connection)
+            : Effect.fail(failedWith({ message: `${label} stopped while starting` }, "open"));
+        }
+        retire(entry.worker);
+        return Effect.fail(
+          failedWith(
+            outcome ?? {
+              message: `${label} did not open the database within ${Duration.toMillis(READER_STARTUP_TIMEOUT)} ms`,
+            },
+            "open",
+          ),
+        );
+      },
     );
   });
 });
 
+// A reader that cannot start turns off the whole pool, so routing never picks a dead slot.
+const makeReader = Effect.fnUntraced(function* (filename: string, pool: { unavailable: boolean }) {
+  const acquire = yield* makeWorkerConnection({ filename, role: "reader", readOnly: true });
+  return Effect.suspend((): Effect.Effect<Connection | undefined> =>
+    pool.unavailable
+      ? Effect.undefined
+      : acquire.pipe(
+          Effect.map((connection) => (pool.unavailable ? undefined : connection)),
+          Effect.catch((error) => {
+            if (pool.unavailable) return Effect.undefined;
+            pool.unavailable = true;
+            const cause = error.reason.cause;
+            return Effect.logWarning("SQLite reader worker unavailable; reads use the writer", {
+              reason: cause instanceof Error ? cause.message : error.message,
+            }).pipe(Effect.as(undefined));
+          }),
+        ),
+  );
+});
+
+// A checkpoint copies WAL pages into the database and syncs it. On the writer's thread every
+// write would wait for that sync, so a second connection checkpoints beside the writes.
 const CHECKPOINT_FRAMES = 1000;
 const CHECKPOINT_IDLE_MS = 100;
-const CHECKPOINT_BACKPRESSURE_FRAMES = 32_768;
-
-const readSafeSqliteInteger = (value: unknown) => {
-  const number = typeof value === "bigint" ? Number(value) : value;
-  return typeof number === "number" && Number.isSafeInteger(number) ? number : undefined;
-};
+// If checkpoints fall behind constant writes, the writer checkpoints itself, delaying writes only.
+const WRITER_BACKSTOP_FRAMES = 10_000;
 
-// Evaluated source also works in bundles and single-executable builds.
 const checkpointWorkerSource = `
 const { parentPort, workerData } = require("node:worker_threads");
 const { DatabaseSync } = require("node:sqlite");
-const { statSync } = require("node:fs");
 let db;
 let frames;
-let checkpoint;
-let truncate;
-let journalSizeLimit = -1;
-let generation = 0;
-let nextTruncateId = 0;
-let pendingTruncate;
-let pendingBarriers = 0;
+let passive;
 let idle;
-const initialize = () => {
-  if (db !== undefined) return;
-  // The writer switches to WAL after constructing the client.
-  db = new DatabaseSync(workerData.filename);
-  db.exec("PRAGMA busy_timeout = 5000;");
-  const mode = String(db.prepare("PRAGMA journal_mode").get().journal_mode).toLowerCase();
-  if (mode !== "wal") throw new Error("database uses journal_mode " + mode + ", not wal");
-  // macOS requires F_FULLFSYNC to flush the drive cache.
-  db.exec("PRAGMA checkpoint_fullfsync = ON;");
-  frames = db.prepare("PRAGMA wal_checkpoint(NOOP)");
-  checkpoint = db.prepare("PRAGMA wal_checkpoint(PASSIVE)");
-  truncate = db.prepare("PRAGMA wal_checkpoint(TRUNCATE)");
-};
-const atCeiling = (state) => state.log >= workerData.backpressureFrames;
-const exceedsSizeLimit = () =>
-  journalSizeLimit >= 0 && statSync(workerData.filename + "-wal").size > journalSizeLimit;
-// Retry a WAL past its limits even with admission open, so it resets once a pinning reader closes.
-const schedule = (state, retry) => {
-  if (retry || state.log - state.checkpointed >= workerData.frames) {
-    idle = setTimeout(() => check(undefined, undefined, true), workerData.idleMs);
+const check = (force) => {
+  if (db === undefined) {
+    db = new DatabaseSync(workerData.filename);
+    db.exec("PRAGMA busy_timeout = 5000;");
+    // macOS requires F_FULLFSYNC to flush the drive cache.
+    db.exec("PRAGMA checkpoint_fullfsync = ON;");
+    frames = db.prepare("PRAGMA wal_checkpoint(NOOP)");
+    passive = db.prepare("PRAGMA wal_checkpoint(PASSIVE)");
   }
-};
-const check = (id, nextJournalSizeLimit, force, nextGeneration = generation) => {
-  initialize();
-  if (Number.isSafeInteger(nextGeneration)) generation = Math.max(generation, nextGeneration);
-  if (Number.isSafeInteger(nextJournalSizeLimit)) journalSizeLimit = nextJournalSizeLimit;
-  let state = frames.get();
-  const oversized = exceedsSizeLimit();
-  let pinned = false;
-  if (force || state.log - state.checkpointed >= workerData.frames || oversized) {
-    const result = checkpoint.get();
-    // A reader's snapshot stopped the backfill; holding writes cannot let it catch up.
-    pinned = result.checkpointed < result.log;
+  const before = frames.get();
+  let state = before;
+  if (state.log - state.checkpointed >= workerData.frames || (force && state.log > state.checkpointed)) {
+    passive.get();
     state = frames.get();
   }
-  if (state.checkpointed === state.log && (atCeiling(state) || oversized)) {
-    pendingTruncate = { truncateId: ++nextTruncateId, checkId: id, generation, state };
-    parentPort.postMessage({
-      type: "truncate-request",
-      truncateId: pendingTruncate.truncateId,
-      checkId: id,
-      generation,
-      ...state,
-    });
-    return;
+  // The WAL restarts only once every frame is checkpointed, so catch up when writes pause.
+  // A reader pinning the WAL stops progress; the next write retries instead of a timer loop.
+  const progressed = !force || state.checkpointed > before.checkpointed;
+  if (state.log > state.checkpointed && progressed) {
+    idle = setTimeout(() => run(true), workerData.idleMs);
   }
-  const blocked = !pinned && (atCeiling(state) || oversized) && state.checkpointed < state.log;
-  parentPort.postMessage({ type: "checkpoint", id, generation, ...state, blocked });
-  schedule(state, atCeiling(state) || oversized);
+  parentPort.postMessage({ type: "checked", log: state.log, checkpointed: state.checkpointed });
 };
-const finishTruncate = (truncateId) => {
-  if (pendingTruncate === undefined || pendingTruncate.truncateId !== truncateId) return;
-  const pending = pendingTruncate;
-  parentPort.postMessage({ type: "truncate-start", truncateId });
-  // Admission is paused here; a pinned reader must not make truncation wait.
-  db.exec("PRAGMA busy_timeout = 0;");
+const run = (force) => {
+  clearTimeout(idle);
   try {
-    truncate.get();
-  } finally {
-    db.exec("PRAGMA busy_timeout = 5000;");
-  }
-  const state = frames.get();
-  pendingTruncate = undefined;
-  parentPort.postMessage({
-    type: "checkpoint",
-    id: pending.checkId,
-    generation: pending.generation,
-    truncateId,
-    ...state,
-    // With writes held, only a reader can stop the reset, and holding them longer would not
-    // release it.
-    blocked: false,
-  });
-  while (pendingBarriers > 0) {
-    pendingBarriers--;
-    parentPort.postMessage("barrier");
+    check(force);
+  } catch (error) {
+    parentPort.postMessage({ type: "failed", message: String(error && error.message ? error.message : error) });
   }
-  schedule(state, atCeiling(state) || exceedsSizeLimit());
 };
-parentPort.on("message", (request) => {
-  clearTimeout(idle);
-  if (request && request.type === "truncate") {
-    finishTruncate(request.truncateId);
-    return;
-  }
-  const isBarrier = request === "barrier";
-  if (pendingTruncate !== undefined) {
-    if (isBarrier) pendingBarriers++;
-    else if (request && request.type === "check") {
-      // Retire the request without labeling the pending snapshot with a newer generation.
-      parentPort.postMessage({
-        type: "checkpoint",
-        id: request.id,
-        generation: pendingTruncate.generation,
-        ...pendingTruncate.state,
-        blocked: true,
-      });
-    }
-    return;
-  }
-  const input = request && typeof request === "object" ? request : {};
-  check(input.id, input.journalSizeLimit, input.force, input.generation);
-  if (isBarrier) {
-    if (pendingTruncate !== undefined) pendingBarriers++;
-    else parentPort.postMessage("barrier");
-  }
-});
+parentPort.on("message", () => run(false));
 `;
 
-const startCheckpointWorker = Effect.fnUntraced(function* (
-  filename: string,
-  writer: NodeSqlite.DatabaseSync,
-) {
-  const warn = (reason: string) =>
-    Effect.logWarning(
-      "SQLite checkpoint worker unavailable; checkpoints run on the main connection",
-      { reason },
-    );
-  if (typeof writer.isTransaction !== "boolean" || typeof writer.setAuthorizer !== "function") {
-    yield* warn("Node SQLite lacks transaction-state or statement-authorizer support");
-    return undefined;
+const sqliteVersion = () => {
+  const db = new NodeSqlite.DatabaseSync(":memory:");
+  try {
+    return String(db.prepare("SELECT sqlite_version() AS version").get()?.version);
+  } finally {
+    db.close();
   }
-  // These are the writer's first statements, before callers set their own wait. A file that is
-  // not a database first fails here.
-  const { version, frames, sizeLimit } = yield* Effect.try({
-    try: () => {
-      writer.exec("PRAGMA busy_timeout = 5000;");
-      return {
-        version: String(writer.prepare("SELECT sqlite_version() AS version").get()?.version),
-        frames: writer.prepare("PRAGMA wal_checkpoint(NOOP)"),
-        sizeLimit: writer.prepare("PRAGMA journal_size_limit"),
-      };
-    },
-    catch: (cause) => failed(cause, "Failed to open database", "open"),
-  });
+};
+
+// Returns the writer's per-statement notification, or undefined when the writer checkpoints alone.
+const startCheckpointWorker = Effect.fnUntraced(function* (filename: string) {
+  const warn = (reason: string) =>
+    Effect.logWarning("SQLite checkpoint worker unavailable; the writer checkpoints its own WAL", {
+      reason,
+    });
+  const version = sqliteVersion();
   const [major = 0, minor = 0] = version.split(".").map(Number);
-  // Older SQLite treats NOOP as PASSIVE, which would checkpoint on the writer.
+  // Older SQLite treats NOOP as PASSIVE, so counting frames would checkpoint on every write.
   if (major < 3 || (major === 3 && minor < 51)) {
     yield* warn(`SQLite ${version} has no NOOP checkpoint`);
     return undefined;
@@ -653,12 +610,7 @@ const startCheckpointWorker = Effect.fnUntraced(function* (
     () =>
       new NodeWorkerThreads.Worker(checkpointWorkerSource, {
         eval: true,
-        workerData: {
-          filename,
-          frames: CHECKPOINT_FRAMES,
-          backpressureFrames: CHECKPOINT_BACKPRESSURE_FRAMES,
-          idleMs: CHECKPOINT_IDLE_MS,
-        },
+        workerData: { filename, frames: CHECKPOINT_FRAMES, idleMs: CHECKPOINT_IDLE_MS },
       }),
   );
   if (Result.isFailure(started)) {
@@ -666,199 +618,37 @@ const startCheckpointWorker = Effect.fnUntraced(function* (
     return undefined;
   }
   const worker = started.success;
+  worker.unref();
   const runFork = Effect.runForkWith(yield* Effect.context<never>());
   let stopped = false;
-  let generation = 0;
-  let nextId = 0;
-  let inFlight: number | undefined;
-  let checkAgain = false;
-  let blocked = false;
-  let log = 0;
-  let checkpointed = 0;
-  let unknown = false;
-  let truncate: { id: number; acknowledged: boolean } | undefined;
-  type Waiter = { resume: () => void; cancelled: boolean };
-  const waiters: Array<Waiter> = [];
-  let elected: Waiter | undefined;
-  const gated = () =>
-    !stopped && !writer.isTransaction && (unknown || blocked || truncate !== undefined);
-  const wake = () => {
-    if (!gated() && elected === undefined) {
-      elected = waiters.shift();
-      elected?.resume();
-    }
-    if (waiters.length === 0 && elected === undefined) worker.unref();
-  };
-  const release = (waiter: Waiter) => {
-    waiter.cancelled = true;
-    const index = waiters.indexOf(waiter);
-    if (index !== -1) waiters.splice(index, 1);
-    if (elected === waiter) elected = undefined;
-    wake();
-  };
-  const handBack = (reason: string) => {
+  const stop = (reason: string) => {
     if (stopped) return;
     stopped = true;
-    truncate = undefined;
-    try {
-      writer.exec(`PRAGMA wal_autocheckpoint = ${CHECKPOINT_FRAMES};`);
-    } catch {}
-    wake();
+    void worker.terminate();
     runFork(warn(reason));
   };
-  const send = (message: unknown) => {
-    try {
-      // oxlint-disable-next-line unicorn/require-post-message-target-origin -- Node workers do not accept a target origin.
-      worker.postMessage(message);
-    } catch (cause) {
-      handBack(String(cause));
-    }
-  };
-  const acknowledge = () => {
-    if (truncate === undefined || truncate.acknowledged || stopped || writer.isTransaction) return;
-    truncate.acknowledged = true;
-    send({ type: "truncate", truncateId: truncate.id });
-  };
-  const observe = () => {
-    try {
-      const state = frames.get();
-      const nextLog = readSafeSqliteInteger(state?.log);
-      const nextCheckpointed = readSafeSqliteInteger(state?.checkpointed);
-      if (nextLog === undefined || nextCheckpointed === undefined)
-        throw new Error("Invalid WAL frame counts");
-      log = nextLog;
-      checkpointed = nextCheckpointed;
-      unknown = false;
-      // Past the ceiling, hold writes until the worker judges this WAL; a reader can pin it there.
-      if (log >= CHECKPOINT_BACKPRESSURE_FRAMES) blocked = true;
-    } catch {
-      unknown = true;
-    }
-  };
-  const request = (force = false) => {
-    if (stopped || writer.isTransaction) return;
-    if (truncate !== undefined) {
-      acknowledge();
-      return;
-    }
-    if (inFlight !== undefined) {
-      checkAgain = true;
-      return;
-    }
-    if (!force && !gated() && log - checkpointed < CHECKPOINT_FRAMES) return;
-    inFlight = ++nextId;
-    try {
-      send({
-        type: "check",
-        id: inFlight,
-        generation,
-        journalSizeLimit: readSafeSqliteInteger(sizeLimit.get()?.journal_size_limit),
-        force: force || gated(),
-      });
-    } catch (cause) {
-      handBack(String(cause));
-    }
-  };
-  const check = () => {
-    if (stopped || writer.isTransaction) return;
-    generation++;
-    observe();
-    request();
-    wake();
-  };
-  worker.on("error", (cause) => handBack(cause.message));
-  worker.on("exit", (code) => handBack(`exited with code ${code}`));
-  worker.on("message", (message: unknown) => {
-    if (stopped || typeof message !== "object" || message === null || !("type" in message)) return;
-    if (
-      message.type === "truncate-request" &&
-      "truncateId" in message &&
-      typeof message.truncateId === "number"
-    ) {
-      truncate = { id: message.truncateId, acknowledged: false };
-      blocked = true;
-      acknowledge();
-      return;
-    }
-    if (message.type !== "checkpoint") return;
-    const completedTruncate =
-      truncate !== undefined && "truncateId" in message && message.truncateId === truncate.id;
-    if (completedTruncate) truncate = undefined;
-    // An acknowledged truncate excludes new writer mutations, so its result is current.
-    if (
-      (completedTruncate || ("generation" in message && message.generation === generation)) &&
-      "log" in message &&
-      typeof message.log === "number" &&
-      "checkpointed" in message &&
-      typeof message.checkpointed === "number" &&
-      "blocked" in message &&
-      typeof message.blocked === "boolean"
-    ) {
-      log = message.log;
-      checkpointed = message.checkpointed;
-      blocked = message.blocked;
-      unknown = false;
-    }
-    // Even a stale snapshot must retire its request so a newer check can run.
-    if ("id" in message && message.id === inFlight) inFlight = undefined;
-    if (checkAgain && inFlight === undefined) {
-      checkAgain = false;
-      request(true);
-    }
-    wake();
+  worker.on("message", (message: { readonly type?: unknown; readonly message?: unknown }) => {
+    if (message?.type === "failed") stop(String(message.message));
   });
+  worker.on("error", (cause) => stop(cause.message));
+  worker.on("exit", (code) => stop(`exited with code ${code}`));
   yield* Effect.addFinalizer(() =>
     Effect.promise(() => {
       stopped = true;
-      truncate = undefined;
-      wake();
       return worker.terminate();
     }),
   );
-  writer.exec("PRAGMA wal_autocheckpoint = 0;");
-  observe();
-  worker.unref();
-
-  const runWithAdmission = <A, E>(
-    execute: () => Exit.Exit<A, E>,
-    admitted?: Waiter,
-  ): Effect.Effect<A, E> =>
-    Effect.suspend(() => {
-      if (!gated()) {
-        // Release the election after executing; its successor must see the new WAL state.
-        try {
-          return execute();
-        } finally {
-          if (admitted !== undefined) release(admitted);
-        }
-      }
-      if (admitted !== undefined) release(admitted);
-      const waiter: Waiter = { resume: () => {}, cancelled: false };
-      const wait = Effect.uninterruptibleMask((restore) =>
-        Effect.withFiber((fiber) =>
-          (fiber.getRef(TransactionAcquire)?.restore ?? restore)(
-            Effect.callback<void>(function (this: Scheduler.Scheduler, resume) {
-              const dispatcher = this.makeDispatcher();
-              waiter.resume = () => {
-                dispatcher.scheduleTask(() => {
-                  if (!waiter.cancelled) resume(Effect.void);
-                }, 0);
-              };
-              waiters.push(waiter);
-              worker.ref();
-              request(true);
-              wake();
-              return Effect.sync(() => release(waiter));
-            }),
-          ),
-        ),
-      );
-      return wait.pipe(
-        Effect.flatMap(() => runWithAdmission(execute, waiter)),
-        Effect.onInterrupt(() => Effect.sync(() => release(waiter))),
-      );
+  let scheduled = false;
+  return () => {
+    if (stopped || scheduled) return;
+    scheduled = true;
+    // One check per event-loop turn is enough, however many statements finished in it.
+    setImmediate(() => {
+      scheduled = false;
+      // oxlint-disable-next-line unicorn/require-post-message-target-origin -- Node workers do not accept a target origin.
+      if (!stopped) worker.postMessage(0);
     });
-  return { check, runWithAdmission };
+  };
 });
 
 const make = Effect.fn("makeWithDatabase")(function* (
@@ -892,78 +682,7 @@ const make = Effect.fn("makeWithDatabase")(function* (
           }),
       }).pipe(Effect.orDie),
     );
-    // Started after the close finalizer, so the worker stops before the writer closes.
-    const checkpoint =
-      options.checkpointWorker && isFileDatabase
-        ? yield* startCheckpointWorker(options.filename, db)
-        : undefined;
-
     const statementReaderCache = new WeakMap<NodeSqlite.StatementSync, boolean>();
-    interface CheckpointClassification {
-      backpressure: boolean;
-      check: boolean;
-    }
-    const checkpointClassifications = new WeakMap<
-      NodeSqlite.StatementSync,
-      CheckpointClassification
-    >();
-    const mutatingPragmasWithValues = new Set([
-      "application_id",
-      "auto_vacuum",
-      "journal_mode",
-      "schema_version",
-      "user_version",
-    ]);
-    const mutatesPragma = (name: string | null, value: string | null) => {
-      const pragma = name?.toLowerCase();
-      if (pragma === undefined) return false;
-      if (pragma === "incremental_vacuum" || pragma === "optimize") return true;
-      if (pragma === "wal_checkpoint") return value?.toLowerCase() !== "noop";
-      return value !== null && mutatingPragmasWithValues.has(pragma);
-    };
-    let activeClassification: CheckpointClassification | undefined;
-    const withClassification = <A>(
-      classification: CheckpointClassification | undefined,
-      f: () => A,
-    ): A => {
-      if (classification === undefined) return f();
-      const previous = activeClassification;
-      activeClassification = classification;
-      try {
-        return f();
-      } finally {
-        activeClassification = previous;
-      }
-    };
-    if (checkpoint !== undefined) {
-      // SQLite may reprepare an expired statement while it executes. Keep this
-      // callback installed and collect only around that statement's prepare/run.
-      db.setAuthorizer((actionCode, action, argument) => {
-        const classification = activeClassification;
-        if (classification === undefined) return NodeSqlite.constants.SQLITE_OK;
-        const constants = NodeSqlite.constants;
-        if (actionCode === constants.SQLITE_TRANSACTION) {
-          classification.backpressure ||= action === "BEGIN";
-          classification.check ||= action === "COMMIT" || action === "ROLLBACK";
-        } else if (actionCode === constants.SQLITE_SAVEPOINT) {
-          classification.backpressure ||= action === "BEGIN";
-          classification.check = true;
-        } else if (actionCode === constants.SQLITE_PRAGMA && mutatesPragma(action, argument)) {
-          classification.backpressure = true;
-          classification.check = true;
-        } else if (
-          actionCode !== constants.SQLITE_READ &&
-          actionCode !== constants.SQLITE_SELECT &&
-          actionCode !== constants.SQLITE_FUNCTION &&
-          actionCode !== constants.SQLITE_RECURSIVE &&
-          actionCode !== constants.SQLITE_PRAGMA
-        ) {
-          classification.backpressure = true;
-          classification.check = true;
-        }
-        return constants.SQLITE_OK;
-      });
-    }
     const hasRows = (statement: NodeSqlite.StatementSync): boolean => {
       const cached = statementReaderCache.get(statement);
       if (cached !== undefined) {
@@ -976,12 +695,7 @@ const make = Effect.fn("makeWithDatabase")(function* (
 
     const prepare = (sql: string) =>
       Effect.try({
-        try: () => {
-          const classification = { backpressure: false, check: false };
-          const statement = withClassification(classification, () => db.prepare(sql));
-          if (checkpoint !== undefined) checkpointClassifications.set(statement, classification);
-          return statement;
-        },
+        try: () => db.prepare(sql),
         catch: (cause) =>
           new SqlError({
             reason: classifyError(cause, "Failed to prepare statement", "prepare"),
@@ -1003,52 +717,43 @@ const make = Effect.fn("makeWithDatabase")(function* (
       mode: "rows" | "raw" | "values" = "rows",
     ) =>
       Effect.withFiber<ReadonlyArray<any>, SqlError>((fiber) => {
-        const classification = checkpointClassifications.get(statement);
-        const execute = () => {
-          let arrays = false;
-          let result: Exit.Exit<ReadonlyArray<unknown>, SqlError>;
+        let arrays = false;
+        let result: Exit.Exit<ReadonlyArray<unknown>, SqlError>;
+        try {
+          statement.setReadBigInts(Boolean(Context.get(fiber.context, Client.SafeIntegers)));
+          if (hasRows(statement)) {
+            arrays = mode === "values";
+            if (arrays) statement.setReturnArrays(true);
+            result = Exit.succeed(statement.all(...(params as any)));
+          } else {
+            const value = statement.run(...(params as any));
+            result = Exit.succeed(
+              mode === "raw" ? (value as unknown as ReadonlyArray<unknown>) : [],
+            );
+          }
+        } catch (cause) {
+          result = Exit.fail(
+            new SqlError({
+              reason: classifyError(cause, "Failed to execute statement", "execute"),
+            }),
+          );
+        }
+        if (arrays) {
           try {
-            const value = withClassification(classification, () => {
-              statement.setReadBigInts(Boolean(Context.get(fiber.context, Client.SafeIntegers)));
-              if (hasRows(statement)) {
-                arrays = mode === "values";
-                if (arrays) statement.setReturnArrays(true);
-                return statement.all(...(params as any));
-              }
-              const result = statement.run(...(params as any));
-              return mode === "raw" ? (result as unknown as ReadonlyArray<unknown>) : [];
-            });
-            result = Exit.succeed(value);
+            statement.setReturnArrays(false);
           } catch (cause) {
-            result = Exit.fail(
+            return Exit.die(
               new SqlError({
-                reason: classifyError(cause, "Failed to execute statement", "execute"),
+                reason: classifyError(
+                  cause,
+                  "Failed to reset statement result mode",
+                  "resetResultMode",
+                ),
               }),
             );
-          } finally {
-            // OR FAIL may have committed earlier rows even when execution throws.
-            if (classification?.check) checkpoint?.check();
-          }
-          if (arrays) {
-            try {
-              statement.setReturnArrays(false);
-            } catch (cause) {
-              return Exit.die(
-                new SqlError({
-                  reason: classifyError(
-                    cause,
-                    "Failed to reset statement result mode",
-                    "resetResultMode",
-                  ),
-                }),
-              );
-            }
           }
-          return result;
-        };
-        return checkpoint !== undefined && classification?.backpressure
-          ? checkpoint.runWithAdmission(execute)
-          : execute();
+        }
+        return result;
       });
 
     const run = (sql: string, params: ReadonlyArray<unknown>, raw = false) =>
@@ -1088,14 +793,35 @@ const make = Effect.fn("makeWithDatabase")(function* (
   });
 
   const semaphore = yield* Semaphore.make(1);
-  const connection = yield* makeConnection;
-  // A reader that cannot start turns off the whole pool, so routing never picks a dead slot.
+  const writerWorker = options.writerWorker === true && isFileDatabase;
+  let checkpointAfterWrite: (() => void) | undefined;
+  const writerConnection: Effect.Effect<Connection, SqlError> = writerWorker
+    ? yield* makeWorkerConnection({
+        filename: options.filename,
+        role: "writer",
+        readOnly: options.readonly ?? false,
+        onReply: () => checkpointAfterWrite?.(),
+      })
+    : Effect.succeed(yield* makeConnection);
+  // Opening now fails the layer for a file that is not a database, not its first query.
+  const opened = yield* writerConnection;
+  // Started after the writer, so it stops first and the writer's close can checkpoint.
+  if (writerWorker && options.readonly !== true) {
+    checkpointAfterWrite = yield* startCheckpointWorker(options.filename);
+    if (checkpointAfterWrite !== undefined) {
+      yield* opened.executeUnprepared(
+        `PRAGMA wal_autocheckpoint = ${WRITER_BACKSTOP_FRAMES}`,
+        [],
+        undefined,
+      );
+    }
+  }
   const readerPool = { unavailable: false };
   const readers =
     options.readerWorker && isFileDatabase
       ? yield* Effect.forEach(Array.from({ length: READER_POOL_SIZE }), () =>
           Effect.map(
-            Effect.all([makeReader(options, readerPool), Semaphore.make(1)]),
+            Effect.all([makeReader(options.filename, readerPool), Semaphore.make(1)]),
             ([acquire, lock]) => ({
               acquire,
               lock,
@@ -1105,13 +831,22 @@ const make = Effect.fn("makeWithDatabase")(function* (
         )
       : [];
 
-  const writer = { name: "writer" as const, lock: semaphore, connection };
+  interface Target {
+    readonly name: Acquired["connection"];
+    readonly lock: Semaphore.Semaphore;
+    readonly connection: Connection;
+  }
+  const writer = Effect.map(writerConnection, (connection): Target => ({
+    name: "writer",
+    lock: semaphore,
+    connection,
+  }));
   let activeWriter: ConnectionOwner | undefined;
   // Callers must run route uninterruptibly and pass `claimed` a finalizer that runs `release` once.
   const route = (claimed: (release: Effect.Effect<void>) => Effect.Effect<void>) =>
-    Effect.withFiber((fiber) => {
+    Effect.withFiber((fiber): Effect.Effect<Target, SqlError> => {
       if (readers.length === 0 || readerPool.unavailable || !Context.get(fiber.context, ReadOnly)) {
-        return Effect.succeed(writer);
+        return writer;
       }
       // Least claimed wins and ties go to the lowest slot, so idle slots never start a worker.
       let slot = readers[0]!;
@@ -1124,10 +859,14 @@ const make = Effect.fn("makeWithDatabase")(function* (
             reader.claims--;
           }),
         ),
-        Effect.map(reader.acquire, (readerConnection) =>
+        Effect.flatMap(reader.acquire, (readerConnection) =>
           readerConnection === undefined
             ? writer
-            : { name: "reader" as const, lock: reader.lock, connection: readerConnection },
+            : Effect.succeed<Target>({
+                name: "reader",
+                lock: reader.lock,
+                connection: readerConnection,
+              }),
         ),
       );
     });
@@ -1141,8 +880,6 @@ const make = Effect.fn("makeWithDatabase")(function* (
     lockWaitMs: Number((clock.monotonicTimeNanosUnsafe() - start) / 1000n) / 1000,
   });
 
-  const writerBorrowBatchSize = 16;
-  let writerBorrowsSinceYield = 0;
   const borrower: Borrower = (use) =>
     Effect.uninterruptibleMask((restore) => {
       let release: Effect.Effect<void> = Effect.void;
@@ -1155,11 +892,7 @@ const make = Effect.fn("makeWithDatabase")(function* (
       );
     });
   const borrowTarget = <A, E, R>(
-    target: {
-      readonly name: Acquired["connection"];
-      readonly lock: Semaphore.Semaphore;
-      readonly connection: Connection;
-    },
+    target: Target,
     use: (connection: Connection) => Effect.Effect<A, E, R>,
   ): Effect.Effect<A, E, R> =>
     Effect.withFiber((fiber) => {
@@ -1185,34 +918,7 @@ const make = Effect.fn("makeWithDatabase")(function* (
               }),
             )
           : useConnection;
-      if (!options.checkpointWorker || target.name !== "writer") {
-        return target.lock.withPermits(1)(useOwnedConnection);
-      }
-      const writerUse = Effect.onExit(useOwnedConnection, (exit) =>
-        Effect.sync(() => {
-          writerBorrowsSinceYield = Exit.hasInterrupts(exit)
-            ? 0
-            : Math.min(writerBorrowsSinceYield + 1, writerBorrowBatchSize);
-        }),
-      );
-      return Effect.flatMap(target.lock.withPermitsIfAvailable(1)(writerUse), (result) =>
-        Option.isSome(result)
-          ? Effect.succeed(result.value)
-          : target.lock.withPermits(1)(
-              Effect.andThen(
-                // Failed SQL also consumes the batch; cancellation hands off immediately.
-                Effect.suspend(() => {
-                  if (writerBorrowsSinceYield < writerBorrowBatchSize) return Effect.void;
-                  writerBorrowsSinceYield = 0;
-                  return Effect.callback<void>((resume) => {
-                    const immediate = setImmediate(() => resume(Effect.void));
-                    return Effect.sync(() => clearImmediate(immediate));
-                  });
-                }),
-                writerUse,
-              ),
-            ),
-      );
+      return target.lock.withPermits(1)(useOwnedConnection);
     });
   const claimedUntilScopeCloses = (release: Effect.Effect<void>) =>
     Effect.withFiber((fiber) =>
diff --git a/packages/shared/src/observability.test.ts b/packages/shared/src/observability.test.ts
index 82fcf1128ac3..19a40e43d26e 100644
--- a/packages/shared/src/observability.test.ts
+++ b/packages/shared/src/observability.test.ts
@@ -255,335 +255,318 @@ describe("observability", () => {
     it.effect(
       "keeps trace producers responsive during a slow write, bounds the backlog, and drains on close",
       () =>
-        Effect.scoped(
-          Effect.gen(function* () {
-            const fs = yield* FileSystem.FileSystem;
-            const path = yield* Path.Path;
-            const directory = yield* fs.makeTempDirectoryScoped({
-              prefix: "t3-trace-backpressure-",
-            });
-            const tracePath = path.join(directory, "trace.ndjson");
-            const started = yield* Deferred.make<void>();
-            const release = yield* Deferred.make<void>();
-            const closed = yield* Ref.make(false);
-            const sink = yield* makeTraceSink({
-              filePath: tracePath,
-              maxBytes: 5_000_000,
-              maxFiles: 2,
-              batchWindowMs: 10_000,
-            }).pipe(
-              Effect.provideService(FileSystem.FileSystem, {
-                ...fs,
-                writeFile: (file, data, options) =>
-                  Effect.gen(function* () {
-                    yield* Deferred.succeed(started, undefined);
-                    yield* Deferred.await(release);
-                    yield* fs.writeFile(file, data, options);
-                  }),
-              }),
-            );
-            sink.push(makeRecord("first"));
-            const flushing = yield* Effect.forkChild(sink.flush);
-            yield* Deferred.await(started);
-            for (let index = 0; index < 2_000; index++)
-              sink.push(makeRecord("small", String(index)));
-            for (let index = 0; index < 3; index++)
-              sink.push({ ...makeRecord("large"), attributes: { payload: "x".repeat(2_000_000) } });
-            const closing = yield* Effect.forkChild(
-              sink.close().pipe(Effect.tap(() => Ref.set(closed, true))),
-            );
-            yield* Effect.yieldNow;
-            assert.isFalse(yield* Ref.get(closed));
-            yield* Deferred.succeed(release, undefined);
-            yield* Fiber.join(flushing);
-            yield* Fiber.join(closing);
-            const records = yield* readTraceRecords(tracePath);
-            assert.deepStrictEqual(
-              records.map((record) => record.name),
-              ["first", ...Array.from({ length: 2_000 }, () => "small"), "large", "large"],
-            );
-            assert.isTrue(yield* Ref.get(closed));
-          }),
-        ),
-    );
-
-    it.effect("writes buffered records synchronously for process exit", () =>
-      Effect.scoped(
         Effect.gen(function* () {
-          const fileSystem = yield* FileSystem.FileSystem;
+          const fs = yield* FileSystem.FileSystem;
           const path = yield* Path.Path;
-          const tempDir = yield* fileSystem.makeTempDirectoryScoped({ prefix: "t3-trace-sink-" });
-          const tracePath = path.join(tempDir, "exit.trace.ndjson");
+          const directory = yield* fs.makeTempDirectoryScoped({
+            prefix: "t3-trace-backpressure-",
+          });
+          const tracePath = path.join(directory, "trace.ndjson");
+          const started = yield* Deferred.make<void>();
+          const release = yield* Deferred.make<void>();
+          const closed = yield* Ref.make(false);
           const sink = yield* makeTraceSink({
             filePath: tracePath,
-            maxBytes: 1_000_000,
+            maxBytes: 5_000_000,
             maxFiles: 2,
             batchWindowMs: 10_000,
-          });
-
-          sink.push(makeRecord("before-exit"));
-          sink.flushSync();
-          sink.flushSync();
-
+          }).pipe(
+            Effect.provideService(FileSystem.FileSystem, {
+              ...fs,
+              writeFile: (file, data, options) =>
+                Effect.gen(function* () {
+                  yield* Deferred.succeed(started, undefined);
+                  yield* Deferred.await(release);
+                  yield* fs.writeFile(file, data, options);
+                }),
+            }),
+          );
+          sink.push(makeRecord("first"));
+          const flushing = yield* Effect.forkChild(sink.flush);
+          yield* Deferred.await(started);
+          for (let index = 0; index < 2_000; index++) sink.push(makeRecord("small", String(index)));
+          for (let index = 0; index < 3; index++)
+            sink.push({ ...makeRecord("large"), attributes: { payload: "x".repeat(2_000_000) } });
+          const closing = yield* Effect.forkChild(
+            sink.close().pipe(Effect.tap(() => Ref.set(closed, true))),
+          );
+          yield* Effect.yieldNow;
+          assert.isFalse(yield* Ref.get(closed));
+          yield* Deferred.succeed(release, undefined);
+          yield* Fiber.join(flushing);
+          yield* Fiber.join(closing);
           const records = yield* readTraceRecords(tracePath);
           assert.deepStrictEqual(
             records.map((record) => record.name),
-            ["before-exit"],
+            ["first", ...Array.from({ length: 2_000 }, () => "small"), "large", "large"],
           );
+          assert.isTrue(yield* Ref.get(closed));
         }),
-      ),
     );
 
-    it.effect("keeps every trace file within the configured limit for threshold flushes", () =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const fileSystem = yield* FileSystem.FileSystem;
-          const path = yield* Path.Path;
-          const tempDir = yield* fileSystem.makeTempDirectoryScoped({ prefix: "t3-trace-sink-" });
-          const tracePath = path.join(tempDir, "shared.trace.ndjson");
-          const maxBytes = 1_024;
-
-          const sink = yield* makeTraceSink({
-            filePath: tracePath,
-            maxBytes,
-            maxFiles: 2,
-            batchWindowMs: 10_000,
-          });
-
-          for (let index = 0; index < 256; index += 1) {
-            sink.push(makeRecord("threshold", `${index}-${"x".repeat(48)}`));
-          }
-          yield* sink.close();
+    it.effect("writes buffered records synchronously for process exit", () =>
+      Effect.gen(function* () {
+        const fileSystem = yield* FileSystem.FileSystem;
+        const path = yield* Path.Path;
+        const tempDir = yield* fileSystem.makeTempDirectoryScoped({ prefix: "t3-trace-sink-" });
+        const tracePath = path.join(tempDir, "exit.trace.ndjson");
+        const sink = yield* makeTraceSink({
+          filePath: tracePath,
+          maxBytes: 1_000_000,
+          maxFiles: 2,
+          batchWindowMs: 10_000,
+        });
+
+        sink.push(makeRecord("before-exit"));
+        sink.flushSync();
+        sink.flushSync();
+
+        const records = yield* readTraceRecords(tracePath);
+        assert.deepStrictEqual(
+          records.map((record) => record.name),
+          ["before-exit"],
+        );
+      }),
+    );
 
-          const matchingFiles = (yield* fileSystem.readDirectory(tempDir)).filter(
-            (entry) => entry === "shared.trace.ndjson" || entry.startsWith("shared.trace.ndjson."),
-          );
-          assert.include(matchingFiles, "shared.trace.ndjson.1");
-          for (const entry of matchingFiles) {
-            const stat = yield* fileSystem.stat(path.join(tempDir, entry));
-            assert.isAtMost(Number(stat.size), maxBytes, entry);
-          }
-        }),
-      ),
+    it.effect("keeps every trace file within the configured limit for threshold flushes", () =>
+      Effect.gen(function* () {
+        const fileSystem = yield* FileSystem.FileSystem;
+        const path = yield* Path.Path;
+        const tempDir = yield* fileSystem.makeTempDirectoryScoped({ prefix: "t3-trace-sink-" });
+        const tracePath = path.join(tempDir, "shared.trace.ndjson");
+        const maxBytes = 1_024;
+
+        const sink = yield* makeTraceSink({
+          filePath: tracePath,
+          maxBytes,
+          maxFiles: 2,
+          batchWindowMs: 10_000,
+        });
+
+        for (let index = 0; index < 256; index += 1) {
+          sink.push(makeRecord("threshold", `${index}-${"x".repeat(48)}`));
+        }
+        yield* sink.close();
+
+        const matchingFiles = (yield* fileSystem.readDirectory(tempDir)).filter(
+          (entry) => entry === "shared.trace.ndjson" || entry.startsWith("shared.trace.ndjson."),
+        );
+        assert.include(matchingFiles, "shared.trace.ndjson.1");
+        for (const entry of matchingFiles) {
+          const stat = yield* fileSystem.stat(path.join(tempDir, entry));
+          assert.isAtMost(Number(stat.size), maxBytes, entry);
+        }
+      }),
     );
 
     it.effect("drops a single trace record that cannot fit within the configured limit", () =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const fileSystem = yield* FileSystem.FileSystem;
-          const path = yield* Path.Path;
-          const tempDir = yield* fileSystem.makeTempDirectoryScoped({ prefix: "t3-trace-sink-" });
-          const tracePath = path.join(tempDir, "shared.trace.ndjson");
-          const maxBytes = 1_024;
-
-          const sink = yield* makeTraceSink({
-            filePath: tracePath,
-            maxBytes,
-            maxFiles: 2,
-            batchWindowMs: 10_000,
-          });
-
-          sink.push(makeRecord("oversized", "x".repeat(maxBytes * 2)));
-          sink.push(makeRecord("retained"));
-          yield* sink.close();
-
-          const records = yield* readTraceRecords(tracePath);
-          const stat = yield* fileSystem.stat(tracePath);
-          assert.deepEqual(
-            records.map((record) => record.name),
-            ["retained"],
-          );
-          assert.isAtMost(Number(stat.size), maxBytes);
-        }),
-      ),
+      Effect.gen(function* () {
+        const fileSystem = yield* FileSystem.FileSystem;
+        const path = yield* Path.Path;
+        const tempDir = yield* fileSystem.makeTempDirectoryScoped({ prefix: "t3-trace-sink-" });
+        const tracePath = path.join(tempDir, "shared.trace.ndjson");
+        const maxBytes = 1_024;
+
+        const sink = yield* makeTraceSink({
+          filePath: tracePath,
+          maxBytes,
+          maxFiles: 2,
+          batchWindowMs: 10_000,
+        });
+
+        sink.push(makeRecord("oversized", "x".repeat(maxBytes * 2)));
+        sink.push(makeRecord("retained"));
+        yield* sink.close();
+
+        const records = yield* readTraceRecords(tracePath);
+        const stat = yield* fileSystem.stat(tracePath);
+        assert.deepEqual(
+          records.map((record) => record.name),
+          ["retained"],
+        );
+        assert.isAtMost(Number(stat.size), maxBytes);
+      }),
     );
 
     it.effect("keeps WebSocket credentials out of trace files and exported spans", () =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const fileSystem = yield* FileSystem.FileSystem;
-          const path = yield* Path.Path;
-          const tempDir = yield* fileSystem.makeTempDirectoryScoped({ prefix: "t3-trace-sink-" });
-          const tracePath = path.join(tempDir, "shared.trace.ndjson");
-          const sink = yield* makeTraceSink({
-            filePath: tracePath,
-            maxBytes: 1024 * 1024,
-            maxFiles: 2,
-            batchWindowMs: 10_000,
-          });
-          const delegates: Array<Tracer.NativeSpan> = [];
-          const tracer = yield* makeLocalFileTracer({
-            filePath: tracePath,
-            maxBytes: 1024 * 1024,
-            maxFiles: 2,
-            batchWindowMs: 10_000,
-            sink,
-            delegate: Tracer.make({
-              span: (options) => {
-                const span = new Tracer.NativeSpan(options);
-                delegates.push(span);
-                return span;
-              },
-            }),
-          });
-          const url = "/ws?wsTicket=ticket-secret&dpop=proof-secret&clientSurface=web";
-
-          yield* Effect.annotateCurrentSpan({
-            "url.full": `http://127.0.0.1:3773${url}`,
-            "url.query": url.slice(4),
-          }).pipe(
-            Effect.withSpan("GET", { kind: "server" }),
-            Effect.provideService(Tracer.Tracer, tracer),
-          );
-          yield* Effect.die(new Error(`RequestParseError (GET ${url})`)).pipe(
-            Effect.tapCause((cause) => Effect.logError(cause)),
-            Effect.withSpan("DeviceHubProxy.proxyWebSocket"),
-            Effect.provideService(Tracer.Tracer, tracer),
-            Effect.provide(Logger.layer([Logger.tracerLogger], { mergeWithExisting: false })),
-            Effect.exit,
-          );
-          yield* sink.close();
-
-          const written = yield* fileSystem.readFileString(tracePath);
-          const exported = delegates.map((span) =>
-            JSON.stringify({
-              attributes: Object.fromEntries(span.attributes),
-              events: span.events.map(([, , attributes]) => attributes),
-              exit:
-                span.status._tag === "Ended" && Exit.isFailure(span.status.exit)
-                  ? Cause.pretty(span.status.exit.cause)
-                  : "",
-            }),
-          );
-          for (const text of [written, ...exported]) {
-            assert.notInclude(text, "ticket-secret");
-            assert.notInclude(text, "proof-secret");
-          }
-          assert.include(written, "wsTicket=<redacted>&dpop=<redacted>&clientSurface=web");
-          assert.include(exported.join("\n"), "effect.cause");
-        }),
-      ),
+      Effect.gen(function* () {
+        const fileSystem = yield* FileSystem.FileSystem;
+        const path = yield* Path.Path;
+        const tempDir = yield* fileSystem.makeTempDirectoryScoped({ prefix: "t3-trace-sink-" });
+        const tracePath = path.join(tempDir, "shared.trace.ndjson");
+        const sink = yield* makeTraceSink({
+          filePath: tracePath,
+          maxBytes: 1024 * 1024,
+          maxFiles: 2,
+          batchWindowMs: 10_000,
+        });
+        const delegates: Array<Tracer.NativeSpan> = [];
+        const tracer = yield* makeLocalFileTracer({
+          filePath: tracePath,
+          maxBytes: 1024 * 1024,
+          maxFiles: 2,
+          batchWindowMs: 10_000,
+          sink,
+          delegate: Tracer.make({
+            span: (options) => {
+              const span = new Tracer.NativeSpan(options);
+              delegates.push(span);
+              return span;
+            },
+          }),
+        });
+        const url = "/ws?wsTicket=ticket-secret&dpop=proof-secret&clientSurface=web";
+
+        yield* Effect.annotateCurrentSpan({
+          "url.full": `http://127.0.0.1:3773${url}`,
+          "url.query": url.slice(4),
+        }).pipe(
+          Effect.withSpan("GET", { kind: "server" }),
+          Effect.provideService(Tracer.Tracer, tracer),
+        );
+        yield* Effect.die(new Error(`RequestParseError (GET ${url})`)).pipe(
+          Effect.tapCause((cause) => Effect.logError(cause)),
+          Effect.withSpan("DeviceHubProxy.proxyWebSocket"),
+          Effect.provideService(Tracer.Tracer, tracer),
+          Effect.provide(Logger.layer([Logger.tracerLogger], { mergeWithExisting: false })),
+          Effect.exit,
+        );
+        yield* sink.close();
+
+        const written = yield* fileSystem.readFileString(tracePath);
+        const exported = delegates.map((span) =>
+          JSON.stringify({
+            attributes: Object.fromEntries(span.attributes),
+            events: span.events.map(([, , attributes]) => attributes),
+            exit:
+              span.status._tag === "Ended" && Exit.isFailure(span.status.exit)
+                ? Cause.pretty(span.status.exit.cause)
+                : "",
+          }),
+        );
+        for (const text of [written, ...exported]) {
+          assert.notInclude(text, "ticket-secret");
+          assert.notInclude(text, "proof-secret");
+        }
+        assert.include(written, "wsTicket=<redacted>&dpop=<redacted>&clientSurface=web");
+        assert.include(exported.join("\n"), "effect.cause");
+      }),
     );
 
     it.effect("drops only the invalid trace record when serialization fails", () =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const fileSystem = yield* FileSystem.FileSystem;
-          const path = yield* Path.Path;
-          const tempDir = yield* fileSystem.makeTempDirectoryScoped({ prefix: "t3-trace-sink-" });
-          const tracePath = path.join(tempDir, "shared.trace.ndjson");
-
-          const sink = yield* makeTraceSink({
-            filePath: tracePath,
-            maxBytes: 1024,
-            maxFiles: 2,
-            batchWindowMs: 10_000,
-          });
-
-          const circular: Array<unknown> = [];
-          circular.push(circular);
-
-          sink.push(makeRecord("alpha"));
-          sink.push({
-            ...makeRecord("invalid"),
-            attributes: {
-              circular,
-            },
-          } as TraceRecord);
-          sink.push(makeRecord("beta"));
-          yield* sink.close();
-
-          const lines = yield* readTraceRecords(tracePath);
-
-          assert.deepStrictEqual(
-            lines.map((line) => line.name),
-            ["alpha", "beta"],
-          );
-        }),
-      ),
+      Effect.gen(function* () {
+        const fileSystem = yield* FileSystem.FileSystem;
+        const path = yield* Path.Path;
+        const tempDir = yield* fileSystem.makeTempDirectoryScoped({ prefix: "t3-trace-sink-" });
+        const tracePath = path.join(tempDir, "shared.trace.ndjson");
+
+        const sink = yield* makeTraceSink({
+          filePath: tracePath,
+          maxBytes: 1024,
+          maxFiles: 2,
+          batchWindowMs: 10_000,
+        });
+
+        const circular: Array<unknown> = [];
+        circular.push(circular);
+
+        sink.push(makeRecord("alpha"));
+        sink.push({
+          ...makeRecord("invalid"),
+          attributes: {
+            circular,
+          },
+        } as TraceRecord);
+        sink.push(makeRecord("beta"));
+        yield* sink.close();
+
+        const lines = yield* readTraceRecords(tracePath);
+
+        assert.deepStrictEqual(
+          lines.map((line) => line.name),
+          ["alpha", "beta"],
+        );
+      }),
     );
 
     it.effect("writes nested spans to disk and captures log messages as span events", () =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const fileSystem = yield* FileSystem.FileSystem;
-          const path = yield* Path.Path;
-          const tempDir = yield* fileSystem.makeTempDirectoryScoped({ prefix: "t3-local-tracer-" });
-          const tracePath = path.join(tempDir, "shared.trace.ndjson");
+      Effect.gen(function* () {
+        const fileSystem = yield* FileSystem.FileSystem;
+        const path = yield* Path.Path;
+        const tempDir = yield* fileSystem.makeTempDirectoryScoped({ prefix: "t3-local-tracer-" });
+        const tracePath = path.join(tempDir, "shared.trace.ndjson");
 
-          yield* Effect.scoped(
-            Effect.gen(function* () {
-              const program = Effect.gen(function* () {
+        yield* Effect.scoped(
+          Effect.gen(function* () {
+            const program = Effect.gen(function* () {
+              yield* Effect.annotateCurrentSpan({
+                "demo.parent": true,
+              });
+              yield* Effect.logInfo("parent event");
+              yield* Effect.gen(function* () {
                 yield* Effect.annotateCurrentSpan({
-                  "demo.parent": true,
+                  "demo.child": true,
                 });
-                yield* Effect.logInfo("parent event");
-                yield* Effect.gen(function* () {
-                  yield* Effect.annotateCurrentSpan({
-                    "demo.child": true,
-                  });
-                  yield* Effect.logInfo("child event");
-                }).pipe(Effect.withSpan("child-span"));
-              }).pipe(Effect.withSpan("parent-span"));
-
-              yield* program.pipe(Effect.provide(layerTest(tracePath)));
-            }),
-          );
+                yield* Effect.logInfo("child event");
+              }).pipe(Effect.withSpan("child-span"));
+            }).pipe(Effect.withSpan("parent-span"));
 
-          const records = yield* readTraceRecords(tracePath);
-          assert.equal(records.length, 2);
+            yield* program.pipe(Effect.provide(layerTest(tracePath)));
+          }),
+        );
 
-          const parent = records.find((record) => record.name === "parent-span");
-          const child = records.find((record) => record.name === "child-span");
+        const records = yield* readTraceRecords(tracePath);
+        assert.equal(records.length, 2);
 
-          assert.notEqual(parent, undefined);
-          assert.notEqual(child, undefined);
-          if (!parent || !child) {
-            return;
-          }
+        const parent = records.find((record) => record.name === "parent-span");
+        const child = records.find((record) => record.name === "child-span");
 
-          assert.equal(child.parentSpanId, parent.spanId);
-          assert.equal(parent.attributes["demo.parent"], true);
-          assert.equal(child.attributes["demo.child"], true);
-          assert.equal(
-            parent.events.some((event) => event.name === "parent event"),
-            true,
-          );
-          assert.equal(
-            child.events.some((event) => event.name === "child event"),
-            true,
-          );
-          assert.equal(
-            child.events.some((event) => event.attributes["effect.logLevel"] === "INFO"),
-            true,
-          );
-        }),
-      ),
+        assert.notEqual(parent, undefined);
+        assert.notEqual(child, undefined);
+        if (!parent || !child) {
+          return;
+        }
+
+        assert.equal(child.parentSpanId, parent.spanId);
+        assert.equal(parent.attributes["demo.parent"], true);
+        assert.equal(child.attributes["demo.child"], true);
+        assert.equal(
+          parent.events.some((event) => event.name === "parent event"),
+          true,
+        );
+        assert.equal(
+          child.events.some((event) => event.name === "child event"),
+          true,
+        );
+        assert.equal(
+          child.events.some((event) => event.attributes["effect.logLevel"] === "INFO"),
+          true,
+        );
+      }),
     );
 
     it.effect("serializes interrupted spans with an interrupted exit status", () =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const fileSystem = yield* FileSystem.FileSystem;
-          const path = yield* Path.Path;
-          const tempDir = yield* fileSystem.makeTempDirectoryScoped({ prefix: "t3-local-tracer-" });
-          const tracePath = path.join(tempDir, "shared.trace.ndjson");
-
-          yield* Effect.scoped(
-            Effect.exit(
-              Effect.interrupt.pipe(
-                Effect.withSpan("interrupt-span"),
-                Effect.provide(layerTest(tracePath)),
-              ),
+      Effect.gen(function* () {
+        const fileSystem = yield* FileSystem.FileSystem;
+        const path = yield* Path.Path;
+        const tempDir = yield* fileSystem.makeTempDirectoryScoped({ prefix: "t3-local-tracer-" });
+        const tracePath = path.join(tempDir, "shared.trace.ndjson");
+
+        yield* Effect.scoped(
+          Effect.exit(
+            Effect.interrupt.pipe(
+              Effect.withSpan("interrupt-span"),
+              Effect.provide(layerTest(tracePath)),
             ),
-          );
+          ),
+        );
 
-          const records = yield* readTraceRecords(tracePath);
-          assert.equal(records.length, 1);
-          assert.equal(records[0]?.name, "interrupt-span");
-          assert.equal(records[0]?.exit?._tag, "Interrupted");
-        }),
-      ),
+        const records = yield* readTraceRecords(tracePath);
+        assert.equal(records.length, 1);
+        assert.equal(records[0]?.name, "interrupt-span");
+        assert.equal(records[0]?.exit?._tag, "Interrupted");
+      }),
     );
   });
 });
diff --git a/packages/shared/src/orchestrationV2PendingBackgroundWork.test.ts b/packages/shared/src/orchestrationV2PendingBackgroundWork.test.ts
index 1b5331c0d1be..a35767d4f270 100644
--- a/packages/shared/src/orchestrationV2PendingBackgroundWork.test.ts
+++ b/packages/shared/src/orchestrationV2PendingBackgroundWork.test.ts
@@ -3,6 +3,7 @@ import { ProviderInstanceId, ProviderThreadId } from "@t3tools/contracts";
 import {
   backgroundWorkHoldsCompletion,
   derivePendingBackgroundWork,
+  monitorHoldsWakeCompletion,
 } from "./orchestrationV2PendingBackgroundWork.ts";
 
 describe("backgroundWorkHoldsCompletion", () => {
@@ -434,6 +435,44 @@ describe("derivePendingBackgroundWork kinds", () => {
       ]);
     });
 
+    it("stops a watch whose checks all finished from holding the thread, while still listing it", () => {
+      const tasks = derivePendingBackgroundWork({
+        latestRun: { id: "run-1" as never, ordinal: 1, status: "completed" },
+        providerThreads: [],
+        turnItems: [],
+        pullRequests: [{ ...link(1, {}), watch: { ...watch, passed: true, checksPending: false } }],
+      });
+      expect(tasks).toEqual([
+        {
+          taskId: "pull-request-watch:github.com/acme/app#1",
+          description: "Watching pull request #1",
+          kind: "monitor",
+        },
+      ]);
+      expect(backgroundWorkHoldsCompletion(tasks)).toBe(false);
+      // Unlike a monitor that wakes per line, it lets a comment wake's run complete too.
+      expect(
+        monitorHoldsWakeCompletion({
+          latestRunBackgroundWake: true,
+          pendingBackgroundTasks: tasks,
+        }),
+      ).toBe(false);
+      expect(
+        monitorHoldsWakeCompletion({
+          latestRunBackgroundWake: true,
+          pendingBackgroundTasks: [...tasks, { taskId: "tail", kind: "monitor" }],
+        }),
+      ).toBe(true);
+
+      const running = derivePendingBackgroundWork({
+        latestRun: { id: "run-1" as never, ordinal: 1, status: "completed" },
+        providerThreads: [],
+        turnItems: [],
+        pullRequests: [{ ...link(1, {}), watch: { ...watch, checksPending: true } }],
+      });
+      expect(backgroundWorkHoldsCompletion(running)).toBe(true);
+    });
+
     it("lists no watch while a run is active", () => {
       expect(
         derivePendingBackgroundWork({
diff --git a/packages/shared/src/orchestrationV2PendingBackgroundWork.ts b/packages/shared/src/orchestrationV2PendingBackgroundWork.ts
index dfdf9a24ace1..3b25db88acec 100644
--- a/packages/shared/src/orchestrationV2PendingBackgroundWork.ts
+++ b/packages/shared/src/orchestrationV2PendingBackgroundWork.ts
@@ -108,13 +108,23 @@ function backgroundWorkKindHoldsCompletion(kind: PendingBackgroundWorkTask["kind
   }
 }
 
-/** A monitor wakes the agent once per line, so a progress wake run's completion waits for the monitor to end. */
+const PULL_REQUEST_WATCH_TASK_ID = "pull-request-watch:";
+
+export const isPullRequestWatchTask = (task: Pick<PendingBackgroundWorkTask, "taskId">) =>
+  task.taskId.startsWith(PULL_REQUEST_WATCH_TASK_ID);
+
+/**
+ * A monitor wakes the agent once per line, so a progress wake run's completion waits for the
+ * monitor to end. A pull request watch wakes only on news and holds while its checks run.
+ */
 export function monitorHoldsWakeCompletion(
   thread: Pick<OrchestrationV2ThreadShell, "latestRunBackgroundWake" | "pendingBackgroundTasks">,
 ): boolean {
   return (
     thread.latestRunBackgroundWake === true &&
-    (thread.pendingBackgroundTasks ?? []).some((task) => task.kind === "monitor")
+    (thread.pendingBackgroundTasks ?? []).some(
+      (task) => task.kind === "monitor" && !isPullRequestWatchTask(task),
+    )
   );
 }
 
@@ -313,10 +323,11 @@ function pullRequestWatchTasks(
           {
             // Links store their normalized identity, and this id only has to be unique within the
             // thread, so it reads those fields instead of parsing the URL.
-            taskId: `pull-request-watch:${link.host.toLowerCase()}/${link.repository.toLowerCase()}#${link.number}`,
+            taskId: `${PULL_REQUEST_WATCH_TASK_ID}${link.host.toLowerCase()}/${link.repository.toLowerCase()}#${link.number}`,
             description: `Watching pull request #${link.number}`,
             kind: "monitor" as const,
-            awaited: true as const,
+            // Once every check finished, a person moves the PR next: the watch stays on but holds nothing.
+            ...(link.watch.checksPending === false ? {} : { awaited: true as const }),
           },
         ],
   );
diff --git a/packages/shared/src/orchestrationV2ThreadError.ts b/packages/shared/src/orchestrationV2ThreadError.ts
index 3ba3ba2bf324..141d73f40254 100644
--- a/packages/shared/src/orchestrationV2ThreadError.ts
+++ b/packages/shared/src/orchestrationV2ThreadError.ts
@@ -122,7 +122,24 @@ export function latestUnheldRun(
   let latest: OrchestrationV2Run | null = null;
   for (const run of runs) {
     if (run.status === "queued" && run.queueHeld === true) continue;
+    if (outlivedBeforeStart(run, runs)) continue;
     if (latest === null || run.ordinal > latest.ordinal) latest = run;
   }
   return latest;
 }
+
+// Steering a queued message cancels its run before it starts and hands the message to the
+// earlier run, which outlives the cancellation; that earlier run then presents as latest.
+function outlivedBeforeStart(
+  run: OrchestrationV2Run,
+  runs: ReadonlyArray<OrchestrationV2Run>,
+): boolean {
+  if (run.status !== "cancelled" || run.startedAt !== null || !run.completedAt) return false;
+  const cancelledAt = DateTime.toEpochMillis(run.completedAt);
+  return runs.some(
+    (earlier) =>
+      earlier.ordinal < run.ordinal &&
+      earlier.status !== "queued" &&
+      (!earlier.completedAt || DateTime.toEpochMillis(earlier.completedAt) >= cancelledAt),
+  );
+}
diff --git a/packages/shared/src/orchestrationV2Timeline.test.ts b/packages/shared/src/orchestrationV2Timeline.test.ts
index 7d2b7b7cbee4..c2b7a0c92015 100644
--- a/packages/shared/src/orchestrationV2Timeline.test.ts
+++ b/packages/shared/src/orchestrationV2Timeline.test.ts
@@ -14,7 +14,6 @@ type VisibilityInput = Parameters<typeof createOrchestrationV2TurnItemVisibility
 
 const ordinaryStatuses = [
   "preparing",
-  "queued",
   "starting",
   "running",
   "waiting",
@@ -94,6 +93,7 @@ describe.each([
 
   it.each([
     ...ordinaryStatuses.map((status) => ({ status, hidden: [] })),
+    { status: "queued", hidden: ["queued"] },
     { status: "cancelled", hidden: ["queued"] },
     {
       status: "rolled_back",
@@ -217,11 +217,15 @@ describe.each([
 
 describe("indexed timeline visibility", () => {
   it.each([
-    ...ordinaryStatuses.flatMap(
+    ...[...ordinaryStatuses, "queued" as const].flatMap(
       (status) =>
         [
-          { statuses: ["rolled_back", status], visible: true, ordinaryVisible: true },
-          { statuses: ["cancelled", status], visible: true, ordinaryVisible: true },
+          {
+            statuses: ["rolled_back", status],
+            visible: status !== "queued",
+            ordinaryVisible: true,
+          },
+          { statuses: ["cancelled", status], visible: status !== "queued", ordinaryVisible: true },
           { statuses: [status, "rolled_back"], visible: false, ordinaryVisible: false },
           { statuses: [status, "cancelled"], visible: false, ordinaryVisible: true },
         ] as const,
diff --git a/packages/shared/src/orchestrationV2Timeline.ts b/packages/shared/src/orchestrationV2Timeline.ts
index 05f13557138b..e651dbfb0165 100644
--- a/packages/shared/src/orchestrationV2Timeline.ts
+++ b/packages/shared/src/orchestrationV2Timeline.ts
@@ -11,7 +11,7 @@ type TimelineTurnItem = Pick<OrchestrationV2TurnItem, "type" | "runId" | "nodeId
   readonly inputIntent?: OrchestrationV2UserMessageInputIntent;
 };
 
-export function isOrchestrationV2SupersededInterrupt(input: {
+function isOrchestrationV2SupersededInterrupt(input: {
   readonly item: TimelineTurnItem;
   readonly attempts: ReadonlyArray<TimelineRunAttempt>;
   readonly items: ReadonlyArray<TimelineTurnItem>;
@@ -52,12 +52,15 @@ export function isOrchestrationV2TurnItemVisible(input: {
     return false;
   }
 
-  // Cancelled queued input never reached the provider and must stay out of the transcript.
+  // A steer can return to the queue before delivery. Keep its retained item out
+  // of conversation history until its run starts; cancelled queued inputs stay hidden.
   if (
     item.type === "user_message" &&
     item.inputIntent === "queued_turn" &&
     item.runId !== null &&
-    input.runs.some((run) => run.id === item.runId && run.status === "cancelled")
+    input.runs.some(
+      (run) => run.id === item.runId && (run.status === "queued" || run.status === "cancelled"),
+    )
   ) {
     return false;
   }
@@ -76,7 +79,7 @@ export function createOrchestrationV2TurnItemVisibility(input: {
 }): (item: TimelineTurnItem) => boolean {
   const statuses = new Map<TimelineRun["id"], TimelineRun["status"]>();
   for (const run of input.runs) {
-    if (run.status === "rolled_back" || run.status === "cancelled")
+    if (run.status === "rolled_back" || run.status === "cancelled" || run.status === "queued")
       statuses.set(run.id, run.status);
     else statuses.delete(run.id);
   }
@@ -101,7 +104,7 @@ export function createOrchestrationV2TurnItemVisibility(input: {
     const status = item.runId === null ? undefined : statuses.get(item.runId);
     if (status === "rolled_back") return false;
     if (
-      status === "cancelled" &&
+      (status === "queued" || status === "cancelled") &&
       item.type === "user_message" &&
       item.inputIntent === "queued_turn"
     )
diff --git a/packages/shared/src/paletteSearch.test.ts b/packages/shared/src/paletteSearch.test.ts
index 4c00dd40571e..14f7f37dc920 100644
--- a/packages/shared/src/paletteSearch.test.ts
+++ b/packages/shared/src/paletteSearch.test.ts
@@ -333,6 +333,14 @@ describe("scoreThreadSearch beyond Latin text and titles", () => {
       ranges: [{ start: 0, end: 7 }],
     });
     expect(scoreThreadSearch("trim", subject, NOW)?.explain?.()).toBeUndefined();
+    // Nor is it in the flat t3-<hex> form used when a `t3` branch blocks nested refs.
+    const flat = thread("Add search", { branch: "t3-abcd1234" });
+    expect(scoreThreadSearch("t3", flat, NOW)).toBeNull();
+    expect(scoreThreadSearch("t3 connect", flat, NOW)).toBeNull();
+    expect(scoreThreadSearch("abcd1234", flat, NOW)).not.toBeNull();
+    for (const query of ["t3-abcd", "t3-abcd1234 connect", "connect t3-abcd1234"]) {
+      expect(scoreThreadSearch(query, { ...flat, projectTitle: "connect" }, NOW)).not.toBeNull();
+    }
   });
 
   it("reads letters and numbers typed together, without forgiving typos in numbers", () => {
diff --git a/packages/shared/src/paletteSearch.ts b/packages/shared/src/paletteSearch.ts
index c163482c3af7..02e29a02f2a5 100644
--- a/packages/shared/src/paletteSearch.ts
+++ b/packages/shared/src/paletteSearch.ts
@@ -923,9 +923,19 @@ export interface SearchMatchHint {
 }
 
 // Most threads' branches start with the app's own worktree prefix ("t3/", and
-// "t3code/" before it), so "t3 connect" would match nearly every thread.
+// "t3code/" before it, "t3-<hex>" when a "t3" branch blocks nested refs), so
+// "t3 connect" would match nearly every thread.
 // Only before more text, so typing "t3/" does not empty the list for a keystroke.
-const WORKTREE_BRANCH_PREFIX_PATTERN = new RegExp(`^(?:${WORKTREE_BRANCH_PREFIX}|t3code)/(?=\\S)`);
+const WORKTREE_BRANCH_PREFIX_PATTERN = new RegExp(
+  `^(?:(?:${WORKTREE_BRANCH_PREFIX}|t3code)/(?=\\S)|${WORKTREE_BRANCH_PREFIX}-(?=[0-9a-f]{8}$))`,
+);
+
+// The flat prefix anywhere in a query, while its hex is still being typed, so
+// "t3-abcd" and "connect t3-abcd1234" still reach the stripped branch field.
+const FLAT_BRANCH_QUERY_PREFIX_PATTERN = new RegExp(
+  `(^| )${WORKTREE_BRANCH_PREFIX}-(?=[0-9a-f]{1,8}(?: |$))`,
+  "g",
+);
 
 function searchableBranch(branch: string | null | undefined): string | null {
   return branch ? branch.replace(WORKTREE_BRANCH_PREFIX_PATTERN, "") : null;
@@ -1005,7 +1015,8 @@ function threadFieldQuery(normalizedQuery: string): string {
       fieldQuery: normalizedQuery
         .replace(/^(?:pr|pull request|pull)\s*(?=#?\d)/, "")
         .replace(/^#\s*/, "")
-        .replace(WORKTREE_BRANCH_PREFIX_PATTERN, ""),
+        .replace(WORKTREE_BRANCH_PREFIX_PATTERN, "")
+        .replace(FLAT_BRANCH_QUERY_PREFIX_PATTERN, "$1"),
     };
   }
   return lastFieldQuery.fieldQuery;
diff --git a/packages/shared/src/serverSettings.test.ts b/packages/shared/src/serverSettings.test.ts
index 347e6c746648..9836fe10fc77 100644
--- a/packages/shared/src/serverSettings.test.ts
+++ b/packages/shared/src/serverSettings.test.ts
@@ -377,6 +377,23 @@ describe("serverSettings helpers", () => {
     expect(settings.sourceControlWriterModelSelection).toBe(sourceControlWriterModelSelection);
   });
 
+  it("falls back from a removed instance whose id matches an inherited object key", () => {
+    for (const id of ["constructor", "toString", "valueOf"]) {
+      const speechPostProcessingModelSelection = createModelSelection(
+        ProviderInstanceId.make(id),
+        "gpt-5.4-mini",
+      );
+      const settings = { ...DEFAULT_SERVER_SETTINGS, speechPostProcessingModelSelection };
+
+      expect(isModelSelectionProviderEnabled(settings, speechPostProcessingModelSelection)).toBe(
+        false,
+      );
+      expect(resolveSpeechPostProcessingModelSelection(settings)).toBe(
+        settings.textGenerationModelSelection,
+      );
+    }
+  });
+
   it("falls back from a writer provider that cannot generate application text", () => {
     const instanceId = ProviderInstanceId.make("acp_writer");
     const sourceControlWriterModelSelection = createModelSelection(instanceId, "default");
diff --git a/packages/shared/src/serverSettings.ts b/packages/shared/src/serverSettings.ts
index 24b8d8e39979..023c6eb74333 100644
--- a/packages/shared/src/serverSettings.ts
+++ b/packages/shared/src/serverSettings.ts
@@ -51,7 +51,9 @@ export function isModelSelectionProviderEnabled(
 ): boolean {
   const generator = textGeneratorForSelection(settings, selection.instanceId);
   if (generator !== undefined) return generator.enabled;
-  const instanceConfig = settings.providerInstances[selection.instanceId];
+  const instanceConfig = Object.hasOwn(settings.providerInstances, selection.instanceId)
+    ? settings.providerInstances[selection.instanceId]
+    : undefined;
   if (instanceConfig !== undefined) {
     return resolveProviderInstanceEnabled(instanceConfig);
   }
diff --git a/packages/shared/src/shell.test.ts b/packages/shared/src/shell.test.ts
index 83561c8daced..d1e881a82187 100644
--- a/packages/shared/src/shell.test.ts
+++ b/packages/shared/src/shell.test.ts
@@ -807,40 +807,32 @@ effectIt.layer(NodeServices.layer)("resolveSpawnCommand", (it) => {
   it.effect.runIf(HostProcess.Platform.defaultValue() === "win32")(
     "runs the executable behind an npm shim directly when asked",
     () =>
-      Effect.scoped(
-        Effect.gen(function* () {
-          const fs = yield* FileSystem.FileSystem;
-          const path = yield* Path.Path;
-          const prefix = yield* fs.makeTempDirectoryScoped({ prefix: "t3-npm-shim-" });
-          const shim = path.join(prefix, "opencode.cmd");
-          const executable = path.join(
-            prefix,
-            "node_modules",
-            "opencode-ai",
-            "bin",
-            "opencode.exe",
+      Effect.gen(function* () {
+        const fs = yield* FileSystem.FileSystem;
+        const path = yield* Path.Path;
+        const prefix = yield* fs.makeTempDirectoryScoped({ prefix: "t3-npm-shim-" });
+        const shim = path.join(prefix, "opencode.cmd");
+        const executable = path.join(prefix, "node_modules", "opencode-ai", "bin", "opencode.exe");
+        yield* fs.makeDirectory(path.dirname(executable), { recursive: true });
+        yield* fs.writeFileString(executable, "");
+        yield* fs.writeFileString(shim, NPM_OPENCODE_SHIM);
+        const resolve = (bypassNpmShim: boolean) =>
+          resolveSpawnCommand("opencode", ["serve", "--port=4096"], {
+            env: { PATH: "", PATHEXT: ".COM;.EXE;.BAT;.CMD" },
+            bypassNpmShim,
+          }).pipe(
+            Effect.provideService(HostProcess.Platform, "win32"),
+            Effect.provideService(CommandResolutionCache, new Map()),
+            Effect.provideService(SpawnExecutableResolution, () => shim),
           );
-          yield* fs.makeDirectory(path.dirname(executable), { recursive: true });
-          yield* fs.writeFileString(executable, "");
-          yield* fs.writeFileString(shim, NPM_OPENCODE_SHIM);
-          const resolve = (bypassNpmShim: boolean) =>
-            resolveSpawnCommand("opencode", ["serve", "--port=4096"], {
-              env: { PATH: "", PATHEXT: ".COM;.EXE;.BAT;.CMD" },
-              bypassNpmShim,
-            }).pipe(
-              Effect.provideService(HostProcess.Platform, "win32"),
-              Effect.provideService(CommandResolutionCache, new Map()),
-              Effect.provideService(SpawnExecutableResolution, () => shim),
-            );
-
-          expect(yield* resolve(true)).toEqual({
-            command: executable,
-            args: ["serve", "--port=4096"],
-            shell: false,
-          });
-          expect((yield* resolve(false)).shell).toBe(true);
-        }),
-      ),
+
+        expect(yield* resolve(true)).toEqual({
+          command: executable,
+          args: ["serve", "--port=4096"],
+          shell: false,
+        });
+        expect((yield* resolve(false)).shell).toBe(true);
+      }),
   );
 
   it.effect("builds one escaped cmd.exe line for Windows command shims", () =>
diff --git a/packages/shared/src/threadFindText.test.ts b/packages/shared/src/threadFindText.test.ts
index d1929afd1ea1..3dabff0d8b4d 100644
--- a/packages/shared/src/threadFindText.test.ts
+++ b/packages/shared/src/threadFindText.test.ts
@@ -21,6 +21,14 @@ it("excludes review attachments rendered as context chips", () => {
   ]);
 });
 
+it("indexes single tildes in user paths as typed", () => {
+  const text = "Install as ~/a/x, then read (~/a/guide.md).";
+  expect(searchableMessageSegments({ role: "user", text, streaming: false })?.join("")).toBe(text);
+  expect(
+    searchableMessageSegments({ role: "user", text: "Drop ~~old~~", streaming: false })?.join(""),
+  ).toBe("Drop old");
+});
+
 it("excludes structured context chips without joining text across them", () => {
   expect(
     searchableMessageSegments({
diff --git a/packages/shared/src/threadFindText.ts b/packages/shared/src/threadFindText.ts
index 871f14562f9e..7c2b9006a16d 100644
--- a/packages/shared/src/threadFindText.ts
+++ b/packages/shared/src/threadFindText.ts
@@ -37,6 +37,7 @@ import {
   CHAT_MARKDOWN_REHYPE_PLUGINS,
   CHAT_MARKDOWN_REMARK_PLUGINS,
   CHAT_MARKDOWN_REMARK_PLUGINS_WITH_BREAKS,
+  CHAT_USER_MARKDOWN_REMARK_PLUGINS,
 } from "./markdownPipeline.ts";
 
 // Inline wrappers (including Shiki token spans) must not split a search phrase.
@@ -94,6 +95,7 @@ const insightBreaksProcessor = assistantTextProcessor(true, true);
 const userProcessor = unified()
   .use(remarkParse)
   .use(CHAT_MARKDOWN_REMARK_PLUGINS_WITH_BREAKS)
+  .use(CHAT_USER_MARKDOWN_REMARK_PLUGINS)
   .use(remarkRehype, { allowDangerousHtml: true });
 
 interface TextTree {
diff --git a/packages/shared/src/threadPullRequests.ts b/packages/shared/src/threadPullRequests.ts
index 0ff12bc3c3f1..de317a5dbda3 100644
--- a/packages/shared/src/threadPullRequests.ts
+++ b/packages/shared/src/threadPullRequests.ts
@@ -7,7 +7,7 @@ export function visibleThreadPullRequests(
   return links.filter((link) => link.source !== "stack-dismissed");
 }
 
-function latestUpdatedAt(link: ThreadPullRequestLink): number {
+export function threadPullRequestUpdatedAtMs(link: ThreadPullRequestLink): number {
   const value = link.snapshot?.updatedAt ?? link.linkedAt;
   const ms = Date.parse(value);
   return Number.isNaN(ms) ? 0 : ms;
@@ -41,7 +41,7 @@ export function threadSearchPullRequests(thread: {
     // Every pull request matches by number and link, but only the newest few
     // by title: a triage thread linked to dozens would match almost any word.
     const newestFirst = [...visibleThreadPullRequests(thread.pullRequests)].sort(
-      (left, right) => latestUpdatedAt(right) - latestUpdatedAt(left),
+      (left, right) => threadPullRequestUpdatedAtMs(right) - threadPullRequestUpdatedAtMs(left),
     );
     return branch.concat(
       newestFirst.map((link, index) =>
diff --git a/packages/shared/src/toolActivity.test.ts b/packages/shared/src/toolActivity.test.ts
index 8b7bbe66215b..dbcd0d9fb4c9 100644
--- a/packages/shared/src/toolActivity.test.ts
+++ b/packages/shared/src/toolActivity.test.ts
@@ -22,7 +22,7 @@ describe("toolActivity", () => {
     );
   });
 
-  it("keeps the first non-empty rawInput when a later update is empty", () => {
+  it("keeps the previous rawInput when a later update is empty and replaces it otherwise", () => {
     expect(
       mergeToolActivityData({ rawInput: { path: "src/a.ts" } }, { rawInput: {}, kind: "read" }),
     ).toEqual({
@@ -31,7 +31,7 @@ describe("toolActivity", () => {
     });
     expect(
       mergeToolActivityData({ rawInput: { path: "src/a.ts" } }, { rawInput: { startLine: 4 } }),
-    ).toEqual({ rawInput: { path: "src/a.ts", startLine: 4 } });
+    ).toEqual({ rawInput: { startLine: 4 } });
   });
 
   it("recognizes computer-use REPL calls before result metadata exists", () => {
diff --git a/packages/shared/src/toolActivity.ts b/packages/shared/src/toolActivity.ts
index c2ab58c4576f..5e10a52597e5 100644
--- a/packages/shared/src/toolActivity.ts
+++ b/packages/shared/src/toolActivity.ts
@@ -194,7 +194,10 @@ function extractPrimaryPath(data: Record<string, unknown> | undefined): string |
   return collectToolFilePaths(data)[0];
 }
 
-/** Preserve the first nonempty rawInput; later ACP updates often resend an empty object. */
+/**
+ * A null field clears it (ACP v2) and a nonempty rawInput replaces the previous one.
+ * An empty rawInput keeps the previous one; later ACP updates often resend an empty object.
+ */
 export function mergeToolActivityData(
   previous: unknown,
   next: unknown,
@@ -204,15 +207,18 @@ export function mergeToolActivityData(
   if (!nextRecord) {
     return previousRecord;
   }
-  if (!previousRecord) {
-    return nextRecord;
+  const merged = { ...previousRecord, ...nextRecord };
+  for (const [key, value] of Object.entries(merged)) {
+    if (value === null) {
+      delete merged[key];
+    }
+  }
+  if (!previousRecord || nextRecord.rawInput === null) {
+    return merged;
   }
   const previousInput = asRecord(previousRecord.rawInput);
   const nextInput = asRecord(nextRecord.rawInput);
-  const rawInput = recordHasKeys(nextInput)
-    ? { ...previousInput, ...nextInput }
-    : (previousInput ?? nextInput);
-  const merged = { ...previousRecord, ...nextRecord };
+  const rawInput = recordHasKeys(nextInput) ? nextInput : (previousInput ?? nextInput);
   if (recordHasKeys(rawInput)) {
     merged.rawInput = rawInput;
   } else {
diff --git a/packages/shared/src/toolOutput.test.ts b/packages/shared/src/toolOutput.test.ts
index 453695e397d7..a40bef9f2c3f 100644
--- a/packages/shared/src/toolOutput.test.ts
+++ b/packages/shared/src/toolOutput.test.ts
@@ -156,6 +156,7 @@ describe("toolOutputIndicatesFailure", () => {
       "<exited with exit code 2>",
       "Exited with exit code 1",
       "exit code: 127",
+      "clean exit first, then ExIt CoDe: 3",
     ])
       expect(toolOutputIndicatesFailure(text)).toBe(true);
   });
@@ -167,6 +168,9 @@ describe("toolOutputIndicatesFailure", () => {
       "Exited with exit code 0",
       "cannot find path",
       "is not recognized",
+      "exit",
+      "not found",
+      "the path cannot be found",
     ]) {
       expect(toolOutputIndicatesFailure(text)).toBe(false);
     }
@@ -195,6 +199,8 @@ describe("toolOutputImages", () => {
     expect(output).toEqual({ content, structuredContent });
     expect(mcpToolResultOutput({ content: [text], structuredContent })).toBe(structuredContent);
     expect(mcpToolResultOutput({ content })).toBe(content);
+    expect(mcpToolResultOutput({ content: [text], structuredContent: {} })).toEqual([text]);
+    expect(mcpToolResultOutput({ content: [text], structuredContent: [] })).toEqual([text]);
   });
 
   it("skips types the server must not serve inline", () => {
diff --git a/packages/shared/src/toolOutput.ts b/packages/shared/src/toolOutput.ts
index f2773b0045e4..e52546a87d63 100644
--- a/packages/shared/src/toolOutput.ts
+++ b/packages/shared/src/toolOutput.ts
@@ -232,17 +232,21 @@ export function mcpAppFromToolItem(item: {
     : undefined;
 }
 
+// A superset of every needle below, so most outputs are rejected by this single scan.
+const FAILURE_HINT =
+  /enoent|no such|no files found|not found|commandnotfound|not recognized|cannot (?:find path|be found)|exit/i;
+
 /** Some providers report completion even when command output describes a failure. */
 export function toolOutputIndicatesFailure(text: string): boolean {
   return (
-    /file not found|no files found|enoent|no such file|commandnotfoundexception|command not found|is not recognized as the name of a cmdlet|a parameter cannot be found that matches parameter name/i.test(
+    FAILURE_HINT.test(text) &&
+    (/file not found|no files found|enoent|no such file|commandnotfoundexception|command not found|is not recognized as the name of a cmdlet|a parameter cannot be found that matches parameter name/i.test(
       text,
     ) ||
-    (/cannot find path/i.test(text) && /because it does not exist/i.test(text)) ||
-    (/is not recognized/i.test(text) && /the term '/i.test(text)) ||
-    /<exited with exit code\s+[1-9]\d*\s*>/i.test(text) ||
-    /exit(?:ed)? with exit code\s+[1-9]\d*/i.test(text) ||
-    /exit code\s*[:\s]\s*[1-9]\d*\b/i.test(text)
+      (/cannot find path/i.test(text) && /because it does not exist/i.test(text)) ||
+      (/is not recognized/i.test(text) && /the term '/i.test(text)) ||
+      /exit(?:ed)? with exit code\s+[1-9]\d*/i.test(text) ||
+      /exit code\s*[:\s]\s*[1-9]\d*\b/i.test(text))
   );
 }
 
@@ -295,10 +299,15 @@ export function mcpToolResultOutput(result: {
   readonly content?: unknown;
   readonly structuredContent?: unknown;
 }): unknown {
-  if (result.structuredContent != null && toolOutputImages(result.content).length > 0) {
-    return { content: result.content, structuredContent: result.structuredContent };
+  const structuredContent =
+    (Array.isArray(result.structuredContent) || Predicate.isObject(result.structuredContent)) &&
+    Object.keys(result.structuredContent).length === 0
+      ? undefined
+      : result.structuredContent;
+  if (structuredContent != null && toolOutputImages(result.content).length > 0) {
+    return { content: result.content, structuredContent };
   }
-  return result.structuredContent ?? result.content;
+  return structuredContent ?? result.content;
 }
 
 export function omitToolOutputImageData(value: unknown): unknown {
diff --git a/packages/shared/src/triagePrompt.test.ts b/packages/shared/src/triagePrompt.test.ts
new file mode 100644
index 000000000000..e685baaada60
--- /dev/null
+++ b/packages/shared/src/triagePrompt.test.ts
@@ -0,0 +1,54 @@
+import { describe, expect, it } from "vite-plus/test";
+
+import { serializeComposerFileLink } from "./composerTrigger.ts";
+import { isTriagePrompt, replaceTriagePlaybookLink } from "./triagePrompt.ts";
+
+const appPrompt = (playbookPath: string) =>
+  `Read ${serializeComposerFileLink(playbookPath)} and follow it. `;
+
+const MACHINE_A = "/Users/a/.t3/triage/1/triage-playbook.md";
+const MACHINE_B = "/home/b/.t3/triage/2/triage-playbook.md";
+
+describe("replaceTriagePlaybookLink", () => {
+  it("replaces only the playbook link and keeps the text the user typed", () => {
+    const other = serializeComposerFileLink("/Users/a/notes (old)/log.md");
+    const prompt = `Before. ${appPrompt(MACHINE_A)}The app crashes, see ${other} (twice).`;
+
+    expect(replaceTriagePlaybookLink(prompt, appPrompt(MACHINE_B))).toBe(
+      `Before. ${appPrompt(MACHINE_B)}The app crashes, see ${other} (twice).`,
+    );
+  });
+
+  it.each([
+    ["spaces", "/Users/a b/My Data/triage-playbook.md"],
+    ["parentheses", "/Users/a/t3 (dev)/triage-playbook.md"],
+    ["hash and question mark", "/Users/a/#1/what?/triage-playbook.md"],
+    ["a Windows path", "C:\\Users\\a b\\t3 (dev)\\triage-playbook.md"],
+  ])("replaces a link whose path has %s", (_name, path) => {
+    expect(replaceTriagePlaybookLink(`${appPrompt(path)}It is slow.`, appPrompt(MACHINE_B))).toBe(
+      `${appPrompt(MACHINE_B)}It is slow.`,
+    );
+    expect(replaceTriagePlaybookLink(`${appPrompt(MACHINE_A)}It is slow.`, appPrompt(path))).toBe(
+      `${appPrompt(path)}It is slow.`,
+    );
+  });
+
+  it("replaces a link at the end of the prompt", () => {
+    const link = serializeComposerFileLink(MACHINE_A);
+    expect(replaceTriagePlaybookLink(`Follow ${link}`, appPrompt(MACHINE_B))).toBe(
+      `Follow ${serializeComposerFileLink(MACHINE_B)}`,
+    );
+  });
+
+  it("returns the prompt unchanged when it has no playbook link", () => {
+    const prompt = `The app crashes, see ${serializeComposerFileLink("/Users/a/log.md")} please.`;
+    expect(isTriagePrompt(prompt)).toBe(false);
+    expect(replaceTriagePlaybookLink(prompt, appPrompt(MACHINE_B))).toBe(prompt);
+  });
+
+  it("returns the prompt unchanged when the prepared prompt has no playbook link", () => {
+    expect(replaceTriagePlaybookLink(appPrompt(MACHINE_A), "Read the playbook.")).toBe(
+      appPrompt(MACHINE_A),
+    );
+  });
+});
diff --git a/packages/shared/src/triagePrompt.ts b/packages/shared/src/triagePrompt.ts
new file mode 100644
index 000000000000..0aed545ea349
--- /dev/null
+++ b/packages/shared/src/triagePrompt.ts
@@ -0,0 +1,33 @@
+import { TRIAGE_PROMPT_FILE_NAME } from "@t3tools/contracts";
+
+const PLAYBOOK_LINK_START = `[${TRIAGE_PROMPT_FILE_NAME}](`;
+
+/** A draft is a triage draft while its message still links the playbook file. */
+export const isTriagePrompt = (prompt: string) => prompt.includes(PLAYBOOK_LINK_START);
+
+// `serializeComposerFileLink` encodes `)` and whitespace, so the first `)` closes the link.
+const playbookLinkEnd = (text: string, start: number) => {
+  const close = text.indexOf(")", start + PLAYBOOK_LINK_START.length);
+  return close === -1 ? null : close + 1;
+};
+
+/**
+ * Moves a triage draft to the session another machine prepared: each playbook
+ * link in `prompt` becomes the link in `preparedPrompt`, and the rest of the
+ * text stays. A prompt without the link comes back unchanged.
+ */
+export function replaceTriagePlaybookLink(prompt: string, preparedPrompt: string): string {
+  const preparedStart = preparedPrompt.indexOf(PLAYBOOK_LINK_START);
+  const preparedEnd = preparedStart === -1 ? null : playbookLinkEnd(preparedPrompt, preparedStart);
+  if (preparedEnd === null) return prompt;
+  const link = preparedPrompt.slice(preparedStart, preparedEnd);
+  let next = "";
+  let cursor = 0;
+  while (true) {
+    const start = prompt.indexOf(PLAYBOOK_LINK_START, cursor);
+    const end = start === -1 ? null : playbookLinkEnd(prompt, start);
+    if (end === null) return next + prompt.slice(cursor);
+    next += prompt.slice(cursor, start) + link;
+    cursor = end;
+  }
+}
diff --git a/packages/shared/src/usageFormat.test.ts b/packages/shared/src/usageFormat.test.ts
index c847f323a206..79477fc1ed4d 100644
--- a/packages/shared/src/usageFormat.test.ts
+++ b/packages/shared/src/usageFormat.test.ts
@@ -2,7 +2,7 @@
 import { describe, expect, it, vi } from "vite-plus/test";
 import type { UsageSource } from "@t3tools/contracts";
 
-import { formatHourShort, makeWindow, usageSourceMessages } from "./usageFormat.ts";
+import { formatHourShort, formatTokens, makeWindow, usageSourceMessages } from "./usageFormat.ts";
 
 function malformedSource(count: number, overrides: Partial<UsageSource> = {}): UsageSource {
   return {
@@ -176,3 +176,11 @@ describe("hourly usage formatting", () => {
     }
   });
 });
+
+describe("token formatting", () => {
+  it("moves to the next unit when rounding reaches it", () => {
+    expect(formatTokens(999_999)).toBe("1M");
+    expect(formatTokens(999_999_999)).toBe("1B");
+    expect(formatTokens(-999_999)).toBe("-1M");
+  });
+});
diff --git a/packages/shared/src/usageFormat.ts b/packages/shared/src/usageFormat.ts
index 1c6ba7b8fd75..f2a2d9c73e76 100644
--- a/packages/shared/src/usageFormat.ts
+++ b/packages/shared/src/usageFormat.ts
@@ -63,13 +63,18 @@ export function formatCount(value: number): string {
   return INTEGER.format(Math.round(value));
 }
 
+const TOKEN_SUFFIXES = ["K", "M", "B", "T"] as const;
+
 export function formatTokens(value: number): string {
-  const abs = Math.abs(value);
-  if (abs >= 1e12) return `${trim(value / 1e12)}T`;
-  if (abs >= 1e9) return `${trim(value / 1e9)}B`;
-  if (abs >= 1e6) return `${trim(value / 1e6)}M`;
-  if (abs >= 1e3) return `${trim(value / 1e3)}K`;
-  return INTEGER.format(Math.round(value));
+  if (Math.abs(Math.round(value)) < 1e3) return INTEGER.format(Math.round(value));
+  let scaled = value / 1e3;
+  let unit = 0;
+  // Choose the unit after rounding, so 999,999 reads 1M rather than 1000K.
+  while (Math.abs(Number(trim(scaled))) >= 1e3 && unit < TOKEN_SUFFIXES.length - 1) {
+    scaled /= 1e3;
+    unit += 1;
+  }
+  return `${trim(scaled)}${TOKEN_SUFFIXES[unit]}`;
 }
 
 function trim(value: number): string {
diff --git a/packages/shared/src/usageLimits.test.ts b/packages/shared/src/usageLimits.test.ts
index bed48428a93c..9d2bf395a9d7 100644
--- a/packages/shared/src/usageLimits.test.ts
+++ b/packages/shared/src/usageLimits.test.ts
@@ -126,34 +126,88 @@ describe("new thread model fallback", () => {
     ).toBeDefined();
   });
   it.each([
-    ["cursor", ["autoPercentUsed"], "claude-opus-5-5", false],
-    ["cursor", ["autoPercentUsed"], "composer-2.5", false],
-    ["cursor", ["autoPercentUsed", "apiPercentUsed"], "composer-2.5", true],
-    ["antigravity", ["gemini-weekly"], "claude-opus-5-5", false],
-    ["antigravity", ["3p-weekly"], "claude-opus-5-5", true],
-    ["antigravity", ["gemini-weekly"], "antigravity-default", true],
-    ["codex", ["individual"], "gpt-5.5", true],
-    ["opencode", ["go_weekly"], "opencode/big-pickle", false],
-    ["opencode", ["go_weekly"], "opencode-go/big-pickle", true],
-  ] as const)("matches %s pools %s to %s", (driver, ids, model, usesFallback) => {
-    const defaultSelection = { ...selection, model };
-    expect(
-      resolveNewThreadModelSelection({
-        ...defaults,
-        defaultSelection,
-        providers: [
-          provider({
-            driver: ProviderDriverKind.make(driver),
-            usageLimits: {
-              checkedAt: limited.checkedAt,
-              windows: ids.map((id) => ({ ...window, id, usedPercent: 100 })),
-            },
-          }),
-          available,
-        ],
-      }).selection,
-    ).toEqual(usesFallback ? fallback : defaultSelection);
-  });
+    ["cursor", ["autoPercentUsed"], "claude-opus-5-5", false, undefined, undefined],
+    ["cursor", ["autoPercentUsed"], "composer-2.5", false, undefined, undefined],
+    ["cursor", ["autoPercentUsed", "apiPercentUsed"], "composer-2.5", true, undefined, undefined],
+    ["antigravity", ["gemini-weekly"], "claude-opus-5-5", false, undefined, undefined],
+    ["antigravity", ["3p-weekly"], "claude-opus-5-5", true, undefined, undefined],
+    ["antigravity", ["gemini-weekly"], "antigravity-default", true, undefined, undefined],
+    ["codex", ["individual"], "gpt-5.5", true, undefined, undefined],
+    ["opencode", ["go_weekly"], "opencode/big-pickle", false, undefined, undefined],
+    ["opencode", ["go_weekly"], "opencode-go/big-pickle", true, undefined, undefined],
+    ["opencode", ["budget_model"], "opencode/other", false, ["opencode/limited"], undefined],
+    ["opencode", ["budget_model"], "opencode/limited", true, ["opencode/limited"], undefined],
+    [
+      "opencode",
+      ["budget_set"],
+      "other/model",
+      false,
+      ["opencode/limited", "opencode/second"],
+      undefined,
+    ],
+    [
+      "opencode",
+      ["budget_set"],
+      "opencode/second",
+      true,
+      ["opencode/limited", "opencode/second"],
+      undefined,
+    ],
+    ["opencode", ["budget_empty"], "opencode/other", false, [], undefined],
+    [
+      "opencode",
+      ["budget_all"],
+      "anthropic/claude",
+      false,
+      undefined,
+      ["opencode", "console-custom"],
+    ],
+    [
+      "opencode",
+      ["budget_all"],
+      "opencode-go/model",
+      false,
+      undefined,
+      ["opencode", "console-custom"],
+    ],
+    ["opencode", ["budget_all"], "opencode/model", true, undefined, ["opencode", "console-custom"]],
+    [
+      "opencode",
+      ["budget_all"],
+      "console-custom/model",
+      true,
+      undefined,
+      ["opencode", "console-custom"],
+    ],
+    ["opencode", ["budget_all"], "opencode/model", false, undefined, []],
+  ] as const)(
+    "matches %s pools %s to %s",
+    (driver, ids, model, usesFallback, modelIds, providerIds) => {
+      const defaultSelection = { ...selection, model };
+      expect(
+        resolveNewThreadModelSelection({
+          ...defaults,
+          defaultSelection,
+          providers: [
+            provider({
+              driver: ProviderDriverKind.make(driver),
+              usageLimits: {
+                checkedAt: limited.checkedAt,
+                windows: ids.map((id) => ({
+                  ...window,
+                  id,
+                  usedPercent: 100,
+                  ...(modelIds === undefined ? {} : { modelIds }),
+                  ...(providerIds === undefined ? {} : { providerIds }),
+                })),
+              },
+            }),
+            available,
+          ],
+        }).selection,
+      ).toEqual(usesFallback ? fallback : defaultSelection);
+    },
+  );
 });
 
 describe("pace", () => {
@@ -804,6 +858,52 @@ describe("pools", () => {
     ).toEqual(["weekly", "weekly:secondary"]);
   });
 
+  it("weights pooled Codex quota and resets by each account's plan capacity", () => {
+    const [pool] = collectLimitPools(
+      collectLimitAccounts(
+        new Map([
+          [
+            EnvironmentId.make("env-a"),
+            {
+              ...laptop,
+              serverConfig: {
+                providers: [],
+                usageLimitSources: [
+                  {
+                    ...source,
+                    accounts: [
+                      ["pro", "ChatGPT Pro 200 Subscription", 100],
+                      ["plus", "ChatGPT Plus Subscription", 0],
+                    ].map(([id, plan, usedPercent]) => ({
+                      id: String(id),
+                      email: `${id}@example.com`,
+                      driver: ProviderDriverKind.make("codex"),
+                      plan: String(plan),
+                      usageLimits: {
+                        checkedAt,
+                        windows: [{ ...weekly, id: "secondary", usedPercent: Number(usedPercent) }],
+                      },
+                    })),
+                  },
+                ],
+              },
+            },
+          ],
+        ]),
+      ),
+      now,
+    );
+    const [pooledWeekly] = pool?.windows ?? [];
+    // Pro 20x holds 20 of the pool's 21 capacity parts.
+    expect(pooledWeekly?.remainingPercent).toBe(5);
+    expect(
+      pooledWeekly?.resets.map(({ member, restoresPercent }) => [
+        member.account.email,
+        restoresPercent,
+      ]),
+    ).toContainEqual(["pro@example.com", 95]);
+  });
+
   it("pools windows by id across accounts and orders resets by when they land", () => {
     const input = new Map([
       [
diff --git a/packages/shared/src/usageLimits.ts b/packages/shared/src/usageLimits.ts
index 716103ac2fc9..b7902f11d673 100644
--- a/packages/shared/src/usageLimits.ts
+++ b/packages/shared/src/usageLimits.ts
@@ -32,6 +32,10 @@ export function exhaustedUsageWindow(
   const exhausted = windows.filter(
     (window) =>
       (window.usedPercent ?? 0) >= 100 &&
+      (model === undefined || window.modelIds === undefined || window.modelIds.includes(model)) &&
+      (model === undefined ||
+        window.providerIds === undefined ||
+        window.providerIds.includes(model.split("/")[0] ?? "")) &&
       (!window.resetsAt ||
         !Number.isFinite(Date.parse(window.resetsAt)) ||
         Date.parse(window.resetsAt) > now),
@@ -539,6 +543,25 @@ function accountSortName(account: LimitAccount): string {
   return (account.displayName ?? account.email ?? account.key).toLowerCase();
 }
 
+const CODEX_PLAN_CAPACITY: Record<string, number> = {
+  "ChatGPT Plus Subscription": 1,
+  "ChatGPT Pro 100 Subscription": 5,
+  "ChatGPT Pro 200 Subscription": 20,
+};
+// Claude's published plan multipliers describe the session allowance only.
+const CLAUDE_SESSION_CAPACITY: Record<string, number> = { Pro: 1, Max: 5, Ultra: 20 };
+
+function planCapacity(account: LimitAccount, kind: ServerProviderUsageWindow["kind"]) {
+  if (!account.plan) return undefined;
+  if (account.driver === "codex" && (kind === "session" || kind === "weekly")) {
+    return CODEX_PLAN_CAPACITY[account.plan];
+  }
+  if (account.driver === "claudeAgent" && kind === "session") {
+    return CLAUDE_SESSION_CAPACITY[account.plan];
+  }
+  return undefined;
+}
+
 // Codex ids name slots, so pool by kind; other drivers' ids identify distinct allowances.
 function poolKey(driver: ServerProvider["driver"], window: ServerProviderUsageWindow): string {
   return driver === "codex" ? window.kind : `${window.kind}:${window.id}`;
@@ -607,15 +630,28 @@ function poolWindows(accounts: readonly LimitAccount[], now: number): readonly L
     const memberByAccount = new Map(members.map((member) => [member.account.key, member]));
     const first = members[0]!.window;
     const id = members[0]!.account.driver === "codex" ? key : first.id;
-    const usedPercent = members.reduce((sum, m) => sum + m.window.usedPercent, 0) / members.length;
+    // One unknown plan makes the pool incomparable by plan, so every member then counts once.
+    const capacities = members.map((m) => planCapacity(m.account, first.kind));
+    const weights = capacities.every((capacity) => capacity !== undefined)
+      ? capacities
+      : members.map(() => 1);
+    const weightOf = new Map(members.map((m, index) => [m, weights[index]!]));
+    const totalWeight = weights.reduce((sum, weight) => sum + weight, 0);
+    const usedPercent =
+      members.reduce((sum, m) => sum + m.window.usedPercent * weightOf.get(m)!, 0) / totalWeight;
     // Judge pace only for windows with reset clocks; others add spend without elapsed time.
     const timed = members.flatMap((m) => {
       const share = elapsedShare(m.window, now);
-      return share === null ? [] : [{ used: m.window.usedPercent, elapsed: share }];
+      return share === null
+        ? []
+        : [{ used: m.window.usedPercent, elapsed: share, weight: weightOf.get(m)! }];
     });
-    const timedUsed = timed.reduce((sum, t) => sum + t.used, 0) / timed.length;
+    const timedWeight = timed.reduce((sum, t) => sum + t.weight, 0);
+    const timedUsed = timed.reduce((sum, t) => sum + t.used * t.weight, 0) / timedWeight;
     const meanElapsed =
-      timed.length > 0 ? timed.reduce((sum, t) => sum + t.elapsed, 0) / timed.length : null;
+      timed.length > 0
+        ? timed.reduce((sum, t) => sum + t.elapsed * t.weight, 0) / timedWeight
+        : null;
     const resets = members
       .flatMap((member) => {
         const at = resetMillis(member.window);
@@ -625,7 +661,9 @@ function poolWindows(accounts: readonly LimitAccount[], now: number): readonly L
               {
                 member,
                 at,
-                restoresPercent: Math.round(member.refillPercent / members.length),
+                restoresPercent: Math.round(
+                  (member.refillPercent * weightOf.get(member)!) / totalWeight,
+                ),
               },
             ];
       })
diff --git a/packages/source-control-azure-devops/src/server/AzureDevOpsCli.test.ts b/packages/source-control-azure-devops/src/server/AzureDevOpsCli.test.ts
index 77b586737aba..4b77ce8e598d 100644
--- a/packages/source-control-azure-devops/src/server/AzureDevOpsCli.test.ts
+++ b/packages/source-control-azure-devops/src/server/AzureDevOpsCli.test.ts
@@ -83,6 +83,12 @@ describe("AzureDevOpsCli.layer", () => {
         classifyFailure?.("TF401180: The requested pull request was not found."),
         "not-found",
       );
+      assert.strictEqual(
+        classifyFailure?.(
+          "ERROR: TF400733: The request has been canceled: Request was blocked due to exceeding usage of resource 'Global' in namespace 'User'.",
+        ),
+        "rate-limited",
+      );
       assert.deepStrictEqual(call, {
         operation: "AzureDevOpsCli.execute",
         command: "az",
diff --git a/packages/source-control-azure-devops/src/server/AzureDevOpsCli.ts b/packages/source-control-azure-devops/src/server/AzureDevOpsCli.ts
index 68cd9d27522b..dd4c2bd3410b 100644
--- a/packages/source-control-azure-devops/src/server/AzureDevOpsCli.ts
+++ b/packages/source-control-azure-devops/src/server/AzureDevOpsCli.ts
@@ -368,6 +368,8 @@ const classifyAzFailure = (stderr: string): VcsProcessExitFailureKind | null =>
   if (normalized.includes("az devops login") || /please run '?az login'?/.test(normalized)) {
     return "authentication";
   }
+  // Azure DevOps reports usage-limit throttling as TF400733, often without an HTTP status.
+  if (normalized.includes("tf400733")) return "rate-limited";
   return normalized.includes("pull request") &&
     (normalized.includes("not found") || normalized.includes("does not exist"))
     ? "not-found"
diff --git a/packages/source-control-bitbucket/src/server/BitbucketApi.test.ts b/packages/source-control-bitbucket/src/server/BitbucketApi.test.ts
index ddfe567273ed..c8d7508619f8 100644
--- a/packages/source-control-bitbucket/src/server/BitbucketApi.test.ts
+++ b/packages/source-control-bitbucket/src/server/BitbucketApi.test.ts
@@ -619,7 +619,7 @@ it.effect("creates pull requests using the official REST payload shape", () => {
         branch: { name: "main" },
       },
     });
-  }).pipe(Effect.provide(layer), Effect.scoped);
+  }).pipe(Effect.provide(layer));
 });
 
 it.effect("reports the account Bitbucket confirms for the configured credential", () => {
diff --git a/packages/source-control-core/src/server/PullRequestProvider.ts b/packages/source-control-core/src/server/PullRequestProvider.ts
index d5aab49d2cc0..81d5e33d110f 100644
--- a/packages/source-control-core/src/server/PullRequestProvider.ts
+++ b/packages/source-control-core/src/server/PullRequestProvider.ts
@@ -22,6 +22,7 @@ import type {
   PullRequestListState,
   PullRequestMergeCapabilities,
   PullRequestMergeMethod,
+  PullRequestMergeQueueRemoval,
   PullRequestMergeability,
   PullRequestOmittedFileStat,
   PullRequestReaction,
@@ -212,6 +213,7 @@ export interface ProviderChangeRequestDetail extends ProviderChangeRequest {
   readonly autoMergeEnabled?: boolean;
   readonly autoMergeMethod?: PullRequestMergeMethod;
   readonly workflowApprovalsRequired?: number;
+  readonly mergeQueueRemoval?: PullRequestMergeQueueRemoval;
 }
 
 export interface ProviderChangeRequestActivity {
@@ -318,6 +320,8 @@ export interface PullRequestProviderApi {
    * definition's `publicHost` can be read from a project with no checkout of its repository.
    */
   readonly readsPublicHostWithoutCheckout?: boolean;
+  /** Concurrent summary reads share requests, so callers may keep many in flight. */
+  readonly batchesReads?: boolean;
   /**
    * Absent means every host detected as this kind is read. A host it refuses is listed as one that
    * cannot be browsed here, and nothing is sent for it.
diff --git a/packages/source-control-core/src/server/SourceControlProvider.ts b/packages/source-control-core/src/server/SourceControlProvider.ts
index 89c2166725f4..ddc4a8198c60 100644
--- a/packages/source-control-core/src/server/SourceControlProvider.ts
+++ b/packages/source-control-core/src/server/SourceControlProvider.ts
@@ -122,6 +122,8 @@ export class SourceControlProvider extends Context.Service<
     readonly headBranchProbe?: (input: {
       readonly headSelectors: ReadonlyArray<string>;
       readonly state: "open" | "all";
+      /** `owner:branch` when the head is the default branch, a name most forks share. */
+      readonly defaultBranchHeadSelector?: string | undefined;
     }) => { readonly headSelectors: ReadonlyArray<string>; readonly limit: number };
     readonly readChangeRequestTemplate?: (input: {
       readonly cwd: string;
diff --git a/packages/source-control-core/src/server/discovery.ts b/packages/source-control-core/src/server/discovery.ts
index 901e170be529..8b82a16725e0 100644
--- a/packages/source-control-core/src/server/discovery.ts
+++ b/packages/source-control-core/src/server/discovery.ts
@@ -195,17 +195,6 @@ function isCliRemoteRefinementSpec(
 const isVcsProcessTimeoutError = Schema.is(VcsProcessTimeoutError);
 const isVcsProcessExitError = Schema.is(VcsProcessExitError);
 
-/** An installed CLI whose version probe failed needs a repair, not install advice. */
-function probeFailureHint(spec: SourceControlCliDiscoverySpec, cause: unknown): string {
-  const command = `\`${[spec.executable, ...spec.versionArgs].join(" ")}\``;
-  const outcome = isVcsProcessTimeoutError(cause)
-    ? `timed out after ${cause.timeoutMs}ms`
-    : isVcsProcessExitError(cause)
-      ? `exited with status ${cause.exitCode}`
-      : "failed";
-  return `${command} ${outcome}. Check the \`${spec.executable}\` that the server's PATH resolves.`;
-}
-
 function probeCli(input: {
   readonly spec: SourceControlCliDiscoverySpec;
   readonly process: SourceControlHost.SourceControlHost["Service"]["process"];
@@ -238,11 +227,6 @@ function probeCli(input: {
       ),
       Effect.catch((cause) =>
         Effect.gen(function* () {
-          const hint = yield* unavailableInstallHint(
-            input.spec.executable,
-            input.spec.installHint,
-            cause,
-          );
           // Only a genuine spawn failure (e.g. ENOENT) means the CLI is absent. Any other failure
           // (timeout, non-zero exit) keeps it "available" so `probeSourceControlProvider` still
           // runs the fast `account show` auth probe instead of short-circuiting to the install
@@ -254,11 +238,7 @@ function probeCli(input: {
             executable: input.spec.executable,
             status,
             version: Option.none<string>(),
-            // A wrong-CPU hint or an absent executable keeps its advice; other failures need repair.
-            installHint:
-              hint !== input.spec.installHint || isMissingExecutable(cause)
-                ? hint
-                : probeFailureHint(input.spec, cause),
+            installHint: yield* failedProbeHint(input.spec, cause),
             detail: detailFromCause(cause),
           } satisfies DiscoveryProbeResult;
         }),
@@ -366,7 +346,7 @@ export function isMissingExecutable(error: unknown): boolean {
 // Intel-only `gh` on Apple Silicon without Rosetta.
 const BAD_CPU_TYPE_ERRNO = -86;
 
-export const unavailableInstallHint = Effect.fn("discovery.unavailableInstallHint")(function* (
+const unavailableInstallHint = Effect.fn("discovery.unavailableInstallHint")(function* (
   executable: string,
   installHint: string,
   cause: unknown,
@@ -387,6 +367,35 @@ export const unavailableInstallHint = Effect.fn("discovery.unavailableInstallHin
   return `\`${path ?? executable}\` is built for another CPU architecture, so this ${architecture} machine cannot run it. Remove or replace it. ${installHint}`;
 });
 
+/** An installed CLI whose version probe failed needs a repair, not install advice. */
+function probeFailureHint(
+  probe: { readonly executable: string; readonly versionArgs: ReadonlyArray<string> },
+  cause: unknown,
+): string {
+  const command = `\`${[probe.executable, ...probe.versionArgs].join(" ")}\``;
+  const outcome = isVcsProcessTimeoutError(cause)
+    ? `timed out after ${cause.timeoutMs}ms`
+    : isVcsProcessExitError(cause)
+      ? `exited with status ${cause.exitCode}`
+      : "failed";
+  return `${command} ${outcome}. Check the \`${probe.executable}\` that the server's PATH resolves.`;
+}
+
+export const failedProbeHint = Effect.fn("discovery.failedProbeHint")(function* (
+  probe: {
+    readonly executable: string;
+    readonly versionArgs: ReadonlyArray<string>;
+    readonly installHint: string;
+  },
+  cause: unknown,
+) {
+  const hint = yield* unavailableInstallHint(probe.executable, probe.installHint, cause);
+  // A wrong-CPU hint or an absent executable keeps its advice; other failures need repair.
+  return hint !== probe.installHint || isMissingExecutable(cause)
+    ? hint
+    : probeFailureHint(probe, cause);
+});
+
 class UnknownRemoteUnanswered extends Schema.TaggedError<UnknownRemoteUnanswered>()(
   "UnknownRemoteUnanswered",
   {},
diff --git a/packages/source-control-core/src/shared/definition.ts b/packages/source-control-core/src/shared/definition.ts
index a94ed6708e2d..280cea5a62b2 100644
--- a/packages/source-control-core/src/shared/definition.ts
+++ b/packages/source-control-core/src/shared/definition.ts
@@ -354,6 +354,15 @@ export interface SourceControlDefinition {
    * media itself, so it asks the server, whose driver for this host fetches it.
    */
   readonly mediaUrl?: (url: URL) => SourceControlMediaUrl | null;
+  /**
+   * A URL `mediaUrl` claims for the bytes of `path` at full commit `sha` in the repository at
+   * `repositoryUrl`. Null or absent when the host cannot serve one.
+   */
+  readonly rawFileUrl?: (input: {
+    readonly repositoryUrl: string;
+    readonly sha: string;
+    readonly path: string;
+  }) => string | null;
   readonly settings?: SourceControlHostSettingsSchema;
 }
 
diff --git a/packages/source-control-forgejo/src/server/ForgejoCli.ts b/packages/source-control-forgejo/src/server/ForgejoCli.ts
index 4ae39f3ae962..b4c57f22aec5 100644
--- a/packages/source-control-forgejo/src/server/ForgejoCli.ts
+++ b/packages/source-control-forgejo/src/server/ForgejoCli.ts
@@ -350,26 +350,47 @@ export const make = Effect.gen(function* () {
       readonly body?: string;
     }) {
       const base = new URL(`${input.baseUrl}/api/v1/`);
-      const url = new URL(input.path, base);
-      if (
-        url.origin !== base.origin ||
-        !url.pathname.startsWith(base.pathname) ||
-        url.username ||
-        url.password
-      )
+      const apiUrl = (path: string, from: string) => {
+        const url = URL.parse(path, from);
+        return url &&
+          url.origin === base.origin &&
+          url.pathname.startsWith(base.pathname) &&
+          !url.username &&
+          !url.password
+          ? url
+          : undefined;
+      };
+      const requested = apiUrl(input.path, base.href);
+      if (!requested)
         return yield* new ForgejoCliError({
           command: "fj",
           cwd: input.cwd,
           detail: "Invalid Forgejo API path.",
         });
-      let request = HttpClientRequest.make(input.method ?? "GET")(url.toString()).pipe(
-        HttpClientRequest.setHeader("Authorization", `token ${input.token}`),
-      );
-      if (input.body !== undefined)
-        request = request.pipe(HttpClientRequest.bodyText(input.body, "application/json"));
-      const response = yield* httpClient
-        .execute(request)
-        .pipe(Effect.provideService(FetchHttpClient.RequestInit, { redirect: "manual" }));
+      let url = requested;
+      const send = (target: URL) => {
+        let request = HttpClientRequest.make(input.method ?? "GET")(target.toString()).pipe(
+          HttpClientRequest.setHeader("Authorization", `token ${input.token}`),
+        );
+        if (input.body !== undefined)
+          request = request.pipe(HttpClientRequest.bodyText(input.body, "application/json"));
+        return httpClient
+          .execute(request)
+          .pipe(Effect.provideService(FetchHttpClient.RequestInit, { redirect: "manual" }));
+      };
+      let response = yield* send(url);
+      // Forgejo redirects a renamed repository's API paths before running the handler,
+      // so the same method and body are re-sent. The token never leaves the API base.
+      for (let hops = 0; hops < 5; hops++) {
+        const location = response.headers.location;
+        const next =
+          location && [301, 302, 307, 308].includes(response.status)
+            ? apiUrl(location, url.href)
+            : undefined;
+        if (!next) break;
+        url = next;
+        response = yield* send(url);
+      }
       const status = response.status;
       const body =
         status === 204 || status === 205
@@ -706,7 +727,8 @@ export const make = Effect.gen(function* () {
     });
     // tea reports HTTP failures with exit code zero; use its response status.
     const status = Number(/^HTTP\/\S+ (\d{3})/m.exec(result.stderr)?.[1]);
-    if (!status || status >= 400)
+    if (!status || status >= 400) {
+      const body = result.stdout.trim();
       return yield* new ForgejoCliError({
         command: "tea",
         cwd: input.cwd,
@@ -727,8 +749,13 @@ export const make = Effect.gen(function* () {
               ? "Forgejo repository or pull request was not found."
               : status === 429
                 ? "Forgejo API rate limit exceeded."
-                : `Forgejo API request failed${status ? ` (HTTP ${status})` : " without an HTTP status"}.`,
+                : !status
+                  ? "Forgejo API request failed without an HTTP status."
+                  : body
+                    ? `Forgejo API request failed (HTTP ${status}): ${body}`
+                    : `Forgejo API request failed (HTTP ${status}).`,
       });
+    }
     return result;
   });
   return ForgejoCli.of({ execute, listLogins, getAccount, resolveRepository, api });
diff --git a/packages/source-control-forgejo/src/server/ForgejoPullRequestProvider.test.ts b/packages/source-control-forgejo/src/server/ForgejoPullRequestProvider.test.ts
index 22b1b0c08907..3e118dfc691e 100644
--- a/packages/source-control-forgejo/src/server/ForgejoPullRequestProvider.test.ts
+++ b/packages/source-control-forgejo/src/server/ForgejoPullRequestProvider.test.ts
@@ -121,3 +121,106 @@ it.effect("filters listed pull requests by the requested state", () =>
     assert.deepStrictEqual(yield* numbers("open"), []);
   }),
 );
+
+const fastForwardOnly = {
+  cwd: "/forgejo",
+  repository: "maria/project",
+  host: "forge.example:3000",
+  number: 3,
+};
+const fastForwardOnlySettings = {
+  allow_merge_commits: false,
+  allow_squash_merge: false,
+  allow_rebase: false,
+  allow_rebase_explicit: false,
+  allow_fast_forward_only_merge: true,
+  default_merge_style: "fast-forward-only",
+};
+const fastForwardOnlyProvider = (
+  writes: Array<{ path: string; body: unknown }>,
+  mergeSettings: object = fastForwardOnlySettings,
+) =>
+  ForgejoPullRequestProvider.make.pipe(
+    Effect.provide(
+      Layer.mock(ForgejoCli.ForgejoCli)({
+        api: (input) => {
+          const [path] = input.path.split("?");
+          const reply = (value: unknown) =>
+            Effect.succeed(TestSourceControlHost.processOutput(JSON.stringify(value)));
+          if (input.method === "POST") {
+            writes.push({ path: input.path, body: input.body });
+            return reply("");
+          }
+          switch (path) {
+            case "user":
+              return reply({ login: "maria" });
+            case "repos/maria/project":
+              return reply({
+                full_name: "maria/project",
+                permissions: { push: true, admin: true },
+                ...mergeSettings,
+              });
+            case "repos/maria/project/pulls/3":
+              return reply({
+                number: 3,
+                title: "Fast-forward me",
+                body: "",
+                html_url: "https://forge.example:3000/maria/project/pulls/3",
+                user: { login: "maria" },
+                state: "open",
+                merged: false,
+                mergeable: true,
+                head: { ref: "feature", sha: "head-sha", repo: null },
+                base: { ref: "main", sha: "base-sha", repo: null },
+                merge_base: "base-sha",
+                created_at: "2026-10-12T00:00:00Z",
+                updated_at: "2026-10-12T00:00:00Z",
+                closed_at: null,
+                merged_at: null,
+                labels: [],
+              });
+            case "repos/maria/project/branches/main":
+              return reply({});
+            default:
+              return reply([]);
+          }
+        },
+      }),
+    ),
+  );
+
+it.effect("offers a fast-forward merge on a repository that only allows fast-forward", () =>
+  Effect.gen(function* () {
+    const provider = yield* fastForwardOnlyProvider([]);
+    const detail = yield* provider.getChangeRequest(fastForwardOnly);
+    const allowed = provider.capabilities.mergeMethods.filter(
+      (method) => detail.mergeCapabilities[method],
+    );
+    assert.deepStrictEqual(allowed, ["fast-forward"]);
+  }),
+);
+
+it.effect("does not offer fast-forward when Forgejo omits the setting", () =>
+  Effect.gen(function* () {
+    const provider = yield* fastForwardOnlyProvider([], {});
+    const detail = yield* provider.getChangeRequest(fastForwardOnly);
+    const allowed = provider.capabilities.mergeMethods.filter(
+      (method) => detail.mergeCapabilities[method],
+    );
+    assert.deepStrictEqual(allowed, ["merge", "squash", "rebase"]);
+  }),
+);
+
+it.effect("merges with Forgejo's fast-forward-only style", () =>
+  Effect.gen(function* () {
+    const writes: Array<{ path: string; body: unknown }> = [];
+    const provider = yield* fastForwardOnlyProvider(writes);
+    yield* provider.runAction({ ...fastForwardOnly, action: "merge", mergeMethod: "fast-forward" });
+    assert.deepStrictEqual(writes, [
+      {
+        path: "repos/maria/project/pulls/3/merge",
+        body: { Do: "fast-forward-only", delete_branch_after_merge: false },
+      },
+    ]);
+  }),
+);
diff --git a/packages/source-control-forgejo/src/server/ForgejoPullRequestProvider.ts b/packages/source-control-forgejo/src/server/ForgejoPullRequestProvider.ts
index 3a089e65c04b..70114b9fe45d 100644
--- a/packages/source-control-forgejo/src/server/ForgejoPullRequestProvider.ts
+++ b/packages/source-control-forgejo/src/server/ForgejoPullRequestProvider.ts
@@ -44,7 +44,7 @@ const CAPABILITIES: PullRequestCapabilities = {
   viewedFiles: "environment",
   comment: true,
   actions: [...definition.changeRequestActions],
-  mergeMethods: ["merge", "squash", "rebase"],
+  mergeMethods: ["merge", "squash", "rebase", "fast-forward"],
   updateMethods: ["merge", "rebase"],
   search: false,
   reactions: true,
@@ -385,6 +385,8 @@ export const make = Effect.gen(function* () {
           merge: repo.allow_merge_commits ?? true,
           squash: repo.allow_squash_merge ?? true,
           rebase: repo.allow_rebase ?? true,
+          // Added in Forgejo 7; older servers cannot fast-forward-only merge.
+          "fast-forward": repo.allow_fast_forward_only_merge ?? false,
         },
       } satisfies ProviderChangeRequestDetail;
     }),
@@ -542,7 +544,13 @@ export const make = Effect.gen(function* () {
               ...input,
               path: `${pullPath(input)}/merge`,
               method: "POST",
-              body: { Do: input.mergeMethod ?? "merge", delete_branch_after_merge: deleteBranch },
+              body: {
+                Do:
+                  input.mergeMethod === "fast-forward"
+                    ? "fast-forward-only"
+                    : (input.mergeMethod ?? "merge"),
+                delete_branch_after_merge: deleteBranch,
+              },
             }).pipe(
               Effect.catchTags({
                 // Forgejo merges before deleting the branch, so a refused deletion still merged.
diff --git a/packages/source-control-forgejo/src/server/ForgejoSourceControlProvider.test.ts b/packages/source-control-forgejo/src/server/ForgejoSourceControlProvider.test.ts
index 09c2a786a78c..fd11b31b8acf 100644
--- a/packages/source-control-forgejo/src/server/ForgejoSourceControlProvider.test.ts
+++ b/packages/source-control-forgejo/src/server/ForgejoSourceControlProvider.test.ts
@@ -1437,6 +1437,67 @@ it.effect("rejects HTTP failures even when tea exits successfully", () =>
   ),
 );
 
+it.effect("keeps Gitea's failure reason when tea reports an HTTP error", () =>
+  Effect.gen(function* () {
+    const cli = yield* ForgejoCli.make;
+    const result = yield* cli
+      .api({
+        cwd: "/repo",
+        repository: "http://forgejo.local:3000/maria/project",
+        path: "repos/maria/project/pulls/1/merge",
+        method: "POST",
+        body: { Do: "merge", delete_branch_after_merge: true },
+      })
+      .pipe(Effect.result);
+    assert.strictEqual(result._tag, "Failure");
+    if (result._tag === "Failure") {
+      assert.include(result.failure.detail, "405");
+      assert.include(result.failure.detail, "The head branch is behind the base branch");
+    }
+  }).pipe(
+    Effect.provideService(
+      FileSystem.FileSystem,
+      FileSystem.makeNoop({
+        exists: () => Effect.succeed(false),
+      }),
+    ),
+    Effect.provideService(
+      HttpClient.HttpClient,
+      HttpClient.make(() => {
+        throw new Error("tea must handle its own HTTP request");
+      }),
+    ),
+    Effect.provide(
+      TestSourceControlHost.layer({
+        process: {
+          run: (input) =>
+            Effect.succeed(
+              input.args[0] === "login"
+                ? processOutput(
+                    encodeJson([
+                      {
+                        name: "work",
+                        url: "http://forgejo.local:3000",
+                        ssh_host: "forgejo.local",
+                        user: "maria",
+                        default: "true",
+                      },
+                    ]),
+                  )
+                : processOutput(
+                    '{"message":"The head branch is behind the base branch","url":"http://forgejo.local:3000/api/swagger"}',
+                    {
+                      stderr:
+                        "HTTP/1.1 405 Method Not Allowed\nContent-Type: application/json;charset=utf-8\n",
+                    },
+                  ),
+            ),
+        },
+      }),
+    ),
+  ),
+);
+
 it.effect("routes mounted Forgejo repositories without repeating the mount in API paths", () =>
   Effect.gen(function* () {
     const cli = yield* ForgejoCli.make;
@@ -1786,6 +1847,62 @@ it.effect("loads later fj review pages when the server caps pages below the requ
   );
 });
 
+it.effect("re-sends an fj write with its method and body to a renamed repository's path", () => {
+  const requests: string[] = [];
+  return Effect.gen(function* () {
+    const cli = yield* ForgejoCli.make;
+    yield* cli.api({
+      cwd: "/repo",
+      repository: "https://forgejo.local/maria/old-name",
+      path: "repos/maria/old-name/issues/42/comments",
+      method: "POST",
+      body: { body: "only once" },
+    });
+    assert.deepStrictEqual(requests, [
+      "https://forgejo.local/api/v1/repos/maria/old-name/issues/42/comments",
+      "https://forgejo.local/api/v1/repos/maria/new-name/issues/42/comments",
+    ]);
+  }).pipe(
+    Effect.provideService(
+      FileSystem.FileSystem,
+      FileSystem.makeNoop({
+        exists: () => Effect.succeed(true),
+        readFileString: () =>
+          Effect.succeed(
+            encodeJson({
+              hosts: { "forgejo.local": { type: "Application", token: "test-token" } },
+            }),
+          ),
+      }),
+    ),
+    Effect.provideService(
+      HttpClient.HttpClient,
+      HttpClient.make((request) => {
+        requests.push(request.url);
+        assert.strictEqual(request.method, "POST");
+        assert.strictEqual(request.headers.authorization, "token test-token");
+        assert.deepStrictEqual(requestJson(request), { body: "only once" });
+        return Effect.succeed(
+          HttpClientResponse.fromWeb(
+            request,
+            requests.length === 1
+              ? new Response(null, {
+                  status: 301,
+                  headers: { location: "/api/v1/repos/maria/new-name/issues/42/comments" },
+                })
+              : new Response("{}", { status: 201 }),
+          ),
+        );
+      }),
+    ),
+    Effect.provide(
+      TestSourceControlHost.layer({
+        process: { run: () => Effect.succeed(processOutput("")) },
+      }),
+    ),
+  );
+});
+
 it.effect("handles fj mutation statuses without retrying failures or reading absent bodies", () =>
   Effect.gen(function* () {
     for (const status of [204, 205, 302, 401, 403, 404, 429, 500]) {
diff --git a/packages/source-control-forgejo/src/server/forgejoPullRequestJson.ts b/packages/source-control-forgejo/src/server/forgejoPullRequestJson.ts
index 38ddae9ad40f..a1976ee68929 100644
--- a/packages/source-control-forgejo/src/server/forgejoPullRequestJson.ts
+++ b/packages/source-control-forgejo/src/server/forgejoPullRequestJson.ts
@@ -32,6 +32,7 @@ export const ForgejoRepository = Schema.Struct({
   allow_merge_commits: Schema.optional(Schema.Boolean),
   allow_squash_merge: Schema.optional(Schema.Boolean),
   allow_rebase: Schema.optional(Schema.Boolean),
+  allow_fast_forward_only_merge: Schema.optional(Schema.Boolean),
   allow_rebase_update: Schema.optional(Schema.Boolean),
   default_delete_branch_after_merge: Schema.optional(Schema.Boolean),
 });
diff --git a/packages/source-control-github/src/server/GitHubPullRequestApi.ts b/packages/source-control-github/src/server/GitHubPullRequestApi.ts
index 45275bef0ae4..8eabb6a09518 100644
--- a/packages/source-control-github/src/server/GitHubPullRequestApi.ts
+++ b/packages/source-control-github/src/server/GitHubPullRequestApi.ts
@@ -933,11 +933,10 @@ const decodeMergeBase = Schema.decodeUnknownOption(
   ),
 );
 
-const GRAPHQL_MERGE_METHODS = {
-  merge: "MERGE",
-  squash: "SQUASH",
-  rebase: "REBASE",
-} as const satisfies Record<PullRequestMergeMethod, string>;
+// GitHub has no fast-forward-only merge; the service refuses methods a host does not advertise.
+const GRAPHQL_MERGE_METHODS: Partial<
+  Record<PullRequestMergeMethod, "MERGE" | "SQUASH" | "REBASE">
+> = { merge: "MERGE", squash: "SQUASH", rebase: "REBASE" };
 
 const PullRequestGraphQLGroup = GraphQLGroup.merge(
   PullRequestBatchesGraphQLGroup,
@@ -1509,6 +1508,7 @@ export const make = Effect.gen(function* () {
           headRef: `refs/pull/${input.number}/head`,
           required: asksRequired(input.host),
           requestedReviewers,
+          mergeQueue: input.host.toLowerCase() === "github.com",
         })
         .pipe(toleratingMissingPullRef(decodePullRequestCore));
     return SourceControlRateLimit.Interactive.pipe(
@@ -1793,7 +1793,10 @@ export const make = Effect.gen(function* () {
     (input) => {
       const lookup = pullRequestLookup(input);
       if (lookup === null) return Effect.succeed(null);
-      return GraphQLResolver.request(lookup, watchFingerprintResolver).pipe(
+      return GraphQLResolver.request(
+        { ...lookup, mergeQueue: input.host.toLowerCase() === "github.com" },
+        watchFingerprintResolver,
+      ).pipe(
         Effect.map((result) => {
           const pullRequest = result.repository?.pullRequest;
           return pullRequest == null ? null : toPullRequestWatchFingerprint(pullRequest);
@@ -2748,7 +2751,7 @@ export const make = Effect.gen(function* () {
             !IMMEDIATELY_MERGEABLE.has(state.mergeStateStatus?.toUpperCase() ?? ""));
         const merge = {
           pullRequestId: state.id,
-          mergeMethod: GRAPHQL_MERGE_METHODS[input.mergeMethod ?? "merge"],
+          mergeMethod: GRAPHQL_MERGE_METHODS[input.mergeMethod ?? "merge"] ?? "MERGE",
           ...(expectedHead === undefined ? {} : { expectedHeadOid: expectedHead }),
           ...(body === undefined ? {} : { commitBody: body }),
         };
diff --git a/packages/source-control-github/src/server/GitHubPullRequestProvider.ts b/packages/source-control-github/src/server/GitHubPullRequestProvider.ts
index 4809efc68998..a680f8e0ae12 100644
--- a/packages/source-control-github/src/server/GitHubPullRequestProvider.ts
+++ b/packages/source-control-github/src/server/GitHubPullRequestProvider.ts
@@ -399,6 +399,7 @@ export const make = Effect.gen(function* () {
     capabilities: CAPABILITIES,
     unavailableRequirement: UNAVAILABLE_REQUIREMENT,
     readsPublicHostWithoutCheckout: true,
+    batchesReads: true,
     mergeMessageRewrite: removeAgentCredits,
     getRoutingIdentity: (input) =>
       cli.getRoutingIdentity(input).pipe(Effect.mapError(fail("routeIdentity"))),
diff --git a/packages/source-control-github/src/server/GitHubRest.test.ts b/packages/source-control-github/src/server/GitHubRest.test.ts
index 8ac8e50fc17b..4f46c202976e 100644
--- a/packages/source-control-github/src/server/GitHubRest.test.ts
+++ b/packages/source-control-github/src/server/GitHubRest.test.ts
@@ -360,7 +360,7 @@ describe("GitHubRest", () => {
         expect(media?.status).toBe(401);
         expect(directRequests).toEqual([mediaUrl]);
       }).pipe(Effect.provide(layer), Effect.provideService(HostProcess.Environment, {}));
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect.each(["", "unavailable"])(
diff --git a/packages/source-control-github/src/server/GitHubSourceControlProvider.test.ts b/packages/source-control-github/src/server/GitHubSourceControlProvider.test.ts
index df3ddd29f759..134966231ceb 100644
--- a/packages/source-control-github/src/server/GitHubSourceControlProvider.test.ts
+++ b/packages/source-control-github/src/server/GitHubSourceControlProvider.test.ts
@@ -421,28 +421,59 @@ describe("GitHubSourceControlProvider repository resolution", () => {
 describe("GitHubSourceControlProvider change request lookups by head", () => {
   const remotes = remotesOutput(["origin", "git@github.com:acme/web.git"]);
 
-  it.effect("matches an owner:branch selector on the head owner", () => {
-    const { layer } = harness({
+  it.effect("filters an owner:branch selector by owner through REST", () => {
+    const paths: string[] = [];
+    const restNode = (number: number, mergedAt: string | null) => ({
+      number,
+      title: `PR ${number}`,
+      html_url: `https://github.com/acme/web/pull/${number}`,
+      state: mergedAt === null ? "open" : "closed",
+      merged_at: mergedAt,
+      closed_at: mergedAt,
+      updated_at: "2026-01-02T00:00:00Z",
+      base: { ref: "main", repo: { full_name: "acme/web" } },
+      head: {
+        ref: "main",
+        sha: "f".repeat(40),
+        repo: { name: "web", full_name: "me/web", owner: { login: "me", type: "User" } },
+      },
+    });
+    const { layer, graphqlCalls } = harness({
       remotes,
-      graphql: (lookup) => ({
-        pullRequests: {
-          nodes:
-            lookup.head === "main"
-              ? [node(9, "main", "someone"), node(8, "main", "me"), node(7, "main", "me")]
-              : [],
-        },
-      }),
+      api: {
+        rest: (input) =>
+          Effect.sync(() => {
+            paths.push(input.path);
+            return restResponse([restNode(8, null), restNode(7, "2026-01-01T00:00:00Z")]);
+          }),
+      },
     });
     return Effect.gen(function* () {
       const gh = yield* GitHubSourceControlProvider.make;
-      const open = yield* gh
-        .listChangeRequests({ cwd: "/repo", headSelector: "me:main", state: "open", limit: 1 })
-        .pipe(Effect.forkChild);
-      yield* TestClock.adjust("50 millis");
+      const probe = (defaultBranchHeadSelector?: string) =>
+        gh.headBranchProbe?.({
+          headSelectors: ["me:main", "main"],
+          state: "all",
+          defaultBranchHeadSelector,
+        }).headSelectors;
+      assert.deepStrictEqual([probe(), probe("me:main")], [["main"], ["me:main"]]);
+      const read = (state: "open" | "merged") =>
+        gh.listChangeRequests({ cwd: "/repo", headSelector: "me:main", state, limit: 1 });
+      const [open] = yield* read("open");
+      const [merged] = yield* read("merged");
+      assert.deepStrictEqual(
+        [open, merged].map((pr) => [pr?.number, pr?.state, pr?.headRepositoryOwnerLogin]),
+        [
+          [8, "open", "me"],
+          [7, "merged", "me"],
+        ],
+      );
       assert.deepStrictEqual(
-        (yield* Fiber.join(open)).map((pr) => pr.number),
-        [8],
+        paths.map((path) => new URL(path, "https://api.test/").searchParams.get("state")),
+        ["open", "closed"],
       );
+      assert.include(paths[0], "repos/acme/web/pulls?head=me%3Amain");
+      assert.lengthOf(graphqlCalls, 0);
     }).pipe(Effect.provide(layer));
   });
 
@@ -549,7 +580,7 @@ describe("GitHubSourceControlProvider writes", () => {
         body: "Body",
         maintainer_can_modify: true,
       });
-    }).pipe(Effect.provide(Layer.merge(layer, NodeServices.layer)), Effect.scoped);
+    }).pipe(Effect.provide(Layer.merge(layer, NodeServices.layer)));
   });
 
   it.effect("creates a repository under an organization the viewer is not", () => {
@@ -1115,7 +1146,7 @@ it.live.each([
       remoteName: "enterprise",
       remoteBranch: "feature",
     });
-  }).pipe(Effect.provide(layer), Effect.provideService(HostProcess.Environment, {}), Effect.scoped);
+  }).pipe(Effect.provide(layer), Effect.provideService(HostProcess.Environment, {}));
 });
 
 it.effect.each([
@@ -1197,7 +1228,6 @@ it.effect.each([
     }).pipe(
       Effect.provide(layer),
       Effect.provideService(HostProcess.Environment, { GH_REPO: envRepository }),
-      Effect.scoped,
     );
   },
 );
diff --git a/packages/source-control-github/src/server/GitHubSourceControlProvider.ts b/packages/source-control-github/src/server/GitHubSourceControlProvider.ts
index 317a3a321db3..e510473aa756 100644
--- a/packages/source-control-github/src/server/GitHubSourceControlProvider.ts
+++ b/packages/source-control-github/src/server/GitHubSourceControlProvider.ts
@@ -394,6 +394,60 @@ function repositoryCloneUrls(
 
 const decodeViewerLogin = decodeJsonResult(Schema.Struct({ login: TrimmedNonEmptyString }));
 
+const decodeRestPullRequests = decodeJsonResult(Schema.Array(Schema.Unknown));
+const decodeRestPullRequest = Schema.decodeUnknownOption(
+  Schema.Struct({
+    number: Schema.Number,
+    title: Schema.String,
+    html_url: Schema.String,
+    state: Schema.String,
+    draft: Schema.optional(Schema.Boolean),
+    merged_at: Schema.NullOr(Schema.String),
+    closed_at: Schema.NullOr(Schema.String),
+    updated_at: Schema.String,
+    base: Schema.Struct({ ref: Schema.String, repo: Schema.Struct({ full_name: Schema.String }) }),
+    head: Schema.Struct({
+      ref: Schema.String,
+      sha: Schema.String,
+      repo: Schema.NullOr(
+        Schema.Struct({
+          name: Schema.String,
+          full_name: Schema.String,
+          owner: Schema.Struct({ login: Schema.String, type: Schema.String }),
+        }),
+      ),
+    }),
+  }),
+);
+
+/** Reshapes a REST pull request into the GraphQL node so both decode the same way. */
+function restPullRequestNode(entry: unknown) {
+  const pr = Option.getOrNull(decodeRestPullRequest(entry));
+  if (pr === null) return null;
+  return {
+    number: pr.number,
+    title: pr.title,
+    url: pr.html_url,
+    baseRefName: pr.base.ref,
+    headRefName: pr.head.ref,
+    headRefOid: pr.head.sha,
+    state: pr.merged_at === null ? pr.state.toUpperCase() : "MERGED",
+    isDraft: pr.draft === true,
+    mergedAt: pr.merged_at,
+    closedAt: pr.closed_at,
+    updatedAt: pr.updated_at,
+    isCrossRepository: pr.head.repo?.full_name !== pr.base.repo.full_name,
+    headRepository: pr.head.repo && {
+      name: pr.head.repo.name,
+      nameWithOwner: pr.head.repo.full_name,
+    },
+    headRepositoryOwner: pr.head.repo && {
+      __typename: pr.head.repo.owner.type,
+      login: pr.head.repo.owner.login,
+    },
+  };
+}
+
 type PullRequestListState = "open" | "closed" | "merged" | "all";
 
 const GRAPHQL_STATES: Record<
@@ -567,6 +621,34 @@ export const make = Effect.gen(function* () {
     const limit = Math.min(Math.max(Math.trunc(input.limit), 1), 100);
     const ownerMatch = /^([^:/\s]+):(.+)$/u.exec(input.headSelector.trim());
     const headRefName = ownerMatch?.[2] ?? input.headSelector.trim();
+    if (ownerMatch) {
+      // GraphQL cannot filter heads by owner, and names like a fork's `main` match thousands.
+      const query = new URLSearchParams({
+        head: `${ownerMatch[1]}:${headRefName}`,
+        state: input.state === "all" || input.state === "open" ? input.state : "closed",
+        sort: "created",
+        direction: "desc",
+        per_page: String(OWNER_HEAD_SCAN_LIMIT),
+      });
+      const response = yield* rest({
+        host: locator.host,
+        operation: "listPullRequestsByHead",
+        allowReserve: input.allowReserve,
+        path: `repos/${encodeURIComponent(locator.owner)}/${encodeURIComponent(locator.name)}/pulls?${query}`,
+      });
+      const decoded = decodeRestPullRequests(response.body);
+      if (Result.isFailure(decoded)) {
+        return yield* failure("GitHub returned an invalid change request list.", decoded.failure);
+      }
+      return decoded.success
+        .flatMap((entry) => {
+          const node = Option.getOrNull(decodePullRequestNode(restPullRequestNode(entry)));
+          const record = node === null ? null : toPullRequestRecord(node);
+          return record === null ? [] : [record];
+        })
+        .filter((row) => input.state === "all" || row.state === input.state)
+        .slice(0, limit);
+    }
     const result = yield* graphqlRead(
       {
         host: locator.host,
@@ -582,22 +664,17 @@ export const make = Effect.gen(function* () {
           name: locator.name,
           head: headRefName,
           states: GRAPHQL_STATES[input.state],
-          first: ownerMatch ? OWNER_HEAD_SCAN_LIMIT : limit,
+          first: limit,
         },
         input.allowReserve ? interactiveHeadResolver : backgroundHeadResolver,
       ),
     );
     if (result.repository === null) return yield* notFound("The repository could not be read.");
-    const rows = (result.repository.pullRequests.nodes ?? []).flatMap((entry) => {
+    return (result.repository.pullRequests.nodes ?? []).flatMap((entry) => {
       const node = Option.getOrNull(decodePullRequestNode(entry));
       const record = node === null ? null : toPullRequestRecord(node);
       return record === null ? [] : [record];
     });
-    if (!ownerMatch) return rows;
-    const headOwner = ownerMatch[1]!.toLowerCase();
-    return rows
-      .filter((row) => row.headRepositoryOwnerLogin?.toLowerCase() === headOwner)
-      .slice(0, limit);
   });
 
   const readPullRequest = Effect.fn("GitHubSourceControlProvider.readPullRequest")(
@@ -884,9 +961,12 @@ export const make = Effect.gen(function* () {
     resolveRemoteWebHost: Effect.fn("GitHubSourceControlProvider.resolveRemoteWebHost")(
       ({ context }) => Effect.succeed(gitHubApiHostForRemote(context.remoteUrl)),
     ),
-    // GitHub matches bare heads; read a full page to disambiguate forks by owner.
-    headBranchProbe: ({ headSelectors }) => ({
-      headSelectors: headSelectors.filter((selector) => !selector.includes(":")),
+    // GitHub matches bare heads; read a full page to disambiguate forks by owner. A default branch
+    // collides with most forks, so its owner-qualified lookup has GitHub filter by owner instead.
+    headBranchProbe: ({ headSelectors, defaultBranchHeadSelector }) => ({
+      headSelectors: defaultBranchHeadSelector
+        ? [defaultBranchHeadSelector]
+        : headSelectors.filter((selector) => !selector.includes(":")),
       limit: 100,
     }),
     readChangeRequestTemplate: Effect.fn("GitHubSourceControlProvider.readChangeRequestTemplate")(
diff --git a/packages/source-control-github/src/server/gitHubMediaFetch.test.ts b/packages/source-control-github/src/server/gitHubMediaFetch.test.ts
index 8248a76e4b04..762ec4ce1c10 100644
--- a/packages/source-control-github/src/server/gitHubMediaFetch.test.ts
+++ b/packages/source-control-github/src/server/gitHubMediaFetch.test.ts
@@ -122,7 +122,6 @@ describe("GitHubMediaFetch", () => {
           );
         }),
       ),
-      Effect.scoped,
     );
   });
 
@@ -172,7 +171,6 @@ describe("GitHubMediaFetch", () => {
           );
         }),
       ),
-      Effect.scoped,
     );
   });
 
@@ -201,7 +199,7 @@ describe("GitHubMediaFetch", () => {
           { url: fixture.signedUrls[0] },
           { url: fixture.signedUrls[0], range: "bytes=2-5" },
         ]);
-      }).pipe(Effect.provide(fixture.layer), Effect.scoped);
+      }).pipe(Effect.provide(fixture.layer));
     },
   );
 
@@ -215,7 +213,7 @@ describe("GitHubMediaFetch", () => {
       expect(fixture.rendered.map((input) => input.body)).toEqual([
         { text: `![](${url})`, mode: "gfm", context: PR_REPOSITORY },
       ]);
-    }).pipe(Effect.provide(fixture.layer), Effect.scoped);
+    }).pipe(Effect.provide(fixture.layer));
   });
 
   it.effect("renders a fresh signed URL after an account switch, early expiry, or its TTL", () => {
@@ -237,6 +235,6 @@ describe("GitHubMediaFetch", () => {
       yield* fetchMedia(request);
       expect(fixture.rendered).toHaveLength(4);
       expect(fixture.requests.at(-1)?.url).toBe(fixture.signedUrls.at(-1));
-    }).pipe(Effect.provide(fixture.layer), Effect.scoped);
+    }).pipe(Effect.provide(fixture.layer));
   });
 });
diff --git a/packages/source-control-github/src/server/gitHubPullRequestEvents.test.ts b/packages/source-control-github/src/server/gitHubPullRequestEvents.test.ts
index cc944ff0a0b2..59f92c4bc49b 100644
--- a/packages/source-control-github/src/server/gitHubPullRequestEvents.test.ts
+++ b/packages/source-control-github/src/server/gitHubPullRequestEvents.test.ts
@@ -120,6 +120,7 @@ it.effect("follows a pull request across a refused app token, reconnects, and re
         "com.github.pull_request.head.changed.v1",
         "com.github.pull_request.state.changed.v1",
         "com.github.pull_request.merge_conflict.v1",
+        "com.github.pull_request.check_suite.status.changed.v1",
       ],
     });
     assert.deepEqual(deletes, ["event-subscriptions/1", "event-subscriptions/2"]);
diff --git a/packages/source-control-github/src/server/gitHubPullRequestEvents.ts b/packages/source-control-github/src/server/gitHubPullRequestEvents.ts
index 7afccc73990b..ddd9ee99f270 100644
--- a/packages/source-control-github/src/server/gitHubPullRequestEvents.ts
+++ b/packages/source-control-github/src/server/gitHubPullRequestEvents.ts
@@ -12,12 +12,13 @@ import { HttpClient, HttpClientRequest } from "effect/http";
 
 import * as GitHubRest from "./GitHubRest.ts";
 
-/** Events only say that something changed; readers fetch the pull request for what. */
+/** Readers fetch the pull request on every event, so check suites' conclusions go unused. */
 const EVENT_TYPES = [
   "com.github.pull_request.review.submitted.v1",
   "com.github.pull_request.head.changed.v1",
   "com.github.pull_request.state.changed.v1",
   "com.github.pull_request.merge_conflict.v1",
+  "com.github.pull_request.check_suite.status.changed.v1",
 ];
 const API_ORIGIN = "https://api.github.com";
 /** GitHub sends a keep-alive at least every 15 seconds while a stream is idle. */
diff --git a/packages/source-control-github/src/server/gitHubPullRequestJson.test.ts b/packages/source-control-github/src/server/gitHubPullRequestJson.test.ts
index 685afdc355c0..5f084ac203fb 100644
--- a/packages/source-control-github/src/server/gitHubPullRequestJson.test.ts
+++ b/packages/source-control-github/src/server/gitHubPullRequestJson.test.ts
@@ -559,6 +559,22 @@ describe("pull request detail decoding", () => {
     expect(detailOf([], { autoMergeRequest: null }).autoMergeEnabled).toBe(false);
   });
 
+  it("reads the newest merge queue removal, and none where the queue was not asked about", () => {
+    const removal = {
+      __typename: "RemovedFromMergeQueueEvent",
+      id: "RMQE_1",
+      createdAt: "2026-07-05T00:00:00Z",
+      reason: "Required status checks failed",
+    };
+    expect(detailOf([], { mergeQueueRemovals: { nodes: [removal] } }).mergeQueueRemoval).toEqual({
+      id: "RMQE_1",
+      removedAt: "2026-07-05T00:00:00Z",
+      reason: "Required status checks failed",
+    });
+    expect(detailOf([], { mergeQueueRemovals: { nodes: [] } }).mergeQueueRemoval).toBeUndefined();
+    expect(detailOf([]).mergeQueueRemoval).toBeUndefined();
+  });
+
   it("shows a re-running check once, as the run that is happening now", () => {
     const detail = detailOf([
       inWorkflow({
@@ -1753,12 +1769,14 @@ describe("pull request lookups", () => {
 });
 
 describe("pull request watch fingerprints", () => {
-  it("moves status with checks and remarks with comments, each without the other", () => {
+  it("moves status with checks and queue removals, and remarks with comments, not across", () => {
     const pullRequest = (input: {
       readonly running: number;
       readonly failed: number;
       readonly commentEditedAt: string | null;
       readonly reviews: number;
+      readonly removals: number;
+      readonly timelineItems: number;
     }) => ({
       state: "OPEN",
       mergeable: "MERGEABLE",
@@ -1766,6 +1784,7 @@ describe("pull request watch fingerprints", () => {
       comments: { totalCount: 1, nodes: [{ lastEditedAt: input.commentEditedAt }] },
       reviews: { totalCount: input.reviews, nodes: [] },
       reviewThreads: { totalCount: 0 },
+      mergeQueueRemovals: { totalCount: input.timelineItems, filteredCount: input.removals },
       commits: {
         nodes: [
           {
@@ -1787,7 +1806,14 @@ describe("pull request watch fingerprints", () => {
     });
     const fingerprint = (input: Parameters<typeof pullRequest>[0]) =>
       toPullRequestWatchFingerprint(decodeWatched(pullRequest(input)));
-    const base = { running: 2, failed: 0, commentEditedAt: null, reviews: 1 };
+    const base = {
+      running: 2,
+      failed: 0,
+      commentEditedAt: null,
+      reviews: 1,
+      removals: 0,
+      timelineItems: 3,
+    };
     const before = fingerprint(base);
     const checkFinished = fingerprint({ ...base, running: 1, failed: 1 });
     const summaryEdited = fingerprint({ ...base, commentEditedAt: "2026-10-05T23:47:43Z" });
@@ -1798,5 +1824,12 @@ describe("pull request watch fingerprints", () => {
     expect(summaryEdited.remarks).not.toBe(before.remarks);
     expect(summaryEdited.status).toBe(before.status);
     expect(replied.remarks).not.toBe(before.remarks);
+    // Queued and dropped between two passes leaves the head and its checks as they were.
+    const dropped = fingerprint({ ...base, removals: 1, timelineItems: 5 });
+    expect(dropped.status).not.toBe(before.status);
+    expect(dropped.remarks).toBe(before.remarks);
+    // GitHub's totalCount counts every timeline item, whatever itemTypes asks for.
+    const queued = fingerprint({ ...base, timelineItems: 4 });
+    expect(queued.status).toBe(before.status);
   });
 });
diff --git a/packages/source-control-github/src/server/gitHubPullRequestJson.ts b/packages/source-control-github/src/server/gitHubPullRequestJson.ts
index b97454d1c74b..24cbd59260d6 100644
--- a/packages/source-control-github/src/server/gitHubPullRequestJson.ts
+++ b/packages/source-control-github/src/server/gitHubPullRequestJson.ts
@@ -18,6 +18,7 @@ import type {
   PullRequestLabel,
   PullRequestMergeCapabilities,
   PullRequestMergeMethod,
+  PullRequestMergeQueueRemoval,
   PullRequestOmittedFileStat,
   PullRequestMergeability,
   PullRequestReaction,
@@ -1014,6 +1015,7 @@ export function toPullRequestWatchFingerprint(
       pr.headRefOid,
       stateCounts(contexts?.checkRunCountsByState ?? null),
       stateCounts(contexts?.statusContextCountsByState ?? null),
+      pr.mergeQueueRemovals?.filteredCount ?? 0,
     ].join(" "),
     remarks: [
       pr.comments.totalCount,
@@ -1026,6 +1028,7 @@ export function toPullRequestWatchFingerprint(
 }
 
 export interface GitHubPullRequestCore extends GitHubPullRequestDetail {
+  readonly mergeQueueRemoval?: PullRequestMergeQueueRemoval;
   readonly maintainerCanModify: boolean;
   readonly canEditMaintainerEdits: boolean;
   readonly reviewRequestTeams: ReadonlyArray<PullRequestActor>;
@@ -1045,7 +1048,17 @@ export function toPullRequestCore(result: PullRequestCore.Result): GitHubPullReq
   const pr = repository?.pullRequest;
   if (repository == null || pr == null) return null;
   const contexts = nodesOf(pr.commits)[0]?.commit.statusCheckRollup?.contexts;
+  const removal = nodesOf(pr.mergeQueueRemovals).at(-1);
   return {
+    ...(removal === undefined || !("id" in removal)
+      ? {}
+      : {
+          mergeQueueRemoval: {
+            id: removal.id,
+            removedAt: removal.createdAt,
+            reason: trimmed(removal.reason),
+          },
+        }),
     reviewRequestTeams: nodesOf(pr.reviewRequests).flatMap(
       ({ requestedReviewer }) => toRequestedTeam(requestedReviewer) ?? [],
     ),
diff --git a/packages/source-control-github/src/server/githubStackRebase.test.ts b/packages/source-control-github/src/server/githubStackRebase.test.ts
index 8bf4662a49e8..27980fda5c4b 100644
--- a/packages/source-control-github/src/server/githubStackRebase.test.ts
+++ b/packages/source-control-github/src/server/githubStackRebase.test.ts
@@ -89,7 +89,7 @@ it.layer(layer)("cascadeRebaseStack", (it) => {
       expect(yield* repo.git("log", "--format=%s", `${bottom}..${top}`)).toBe(
         "B: document the answer",
       );
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("drops a squash-merged lower layer's commits from the layer above it", () =>
@@ -142,7 +142,7 @@ it.layer(layer)("cascadeRebaseStack", (it) => {
       const top = yield* repo.head("feat/on-top");
       expect(yield* repo.git("rev-parse", `${top}~1`)).toBe(yield* repo.head("main"));
       expect(yield* repo.git("log", "--format=%s", `main..${top}`)).toBe("B");
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("refuses to overwrite a layer pushed after it was reviewed", () =>
@@ -160,7 +160,7 @@ it.layer(layer)("cascadeRebaseStack", (it) => {
       );
       expect(error).toMatchObject({ _tag: "GitHubStackRebaseGitError", number: 2, completed: 1 });
       expect(yield* repo.head("feat/answer-doc")).toBe(repo.layers[1]!.headSha);
-    }).pipe(Effect.scoped),
+    }),
   );
 
   it.effect("stops at a conflicting layer and leaves it untouched", () =>
@@ -202,6 +202,6 @@ it.layer(layer)("cascadeRebaseStack", (it) => {
         completed: 0,
       });
       expect(yield* repo.head("feat/answer-42")).toBe(repo.layers[0]!.headSha);
-    }).pipe(Effect.scoped),
+    }),
   );
 });
diff --git a/packages/source-control-github/src/server/pullRequestBatches.graphql b/packages/source-control-github/src/server/pullRequestBatches.graphql
index cb0b08ee7f1d..1dfc73d831b2 100644
--- a/packages/source-control-github/src/server/pullRequestBatches.graphql
+++ b/packages/source-control-github/src/server/pullRequestBatches.graphql
@@ -85,7 +85,12 @@ query PullRequestStackMembership($owner: String!, $name: String!, $number: Int!)
 # edit moves `updatedAt`, so an edit to an old comment on a long pull request is still in the page.
 # Reviews have no such order: an edit to a review older than the last hundred waits for the
 # watch's periodic full read, as do edits to comments inside review threads.
-query PullRequestWatchFingerprint($owner: String!, $name: String!, $number: Int!) {
+query PullRequestWatchFingerprint(
+  $owner: String!
+  $name: String!
+  $number: Int!
+  $mergeQueue: Boolean!
+) {
   repository(owner: $owner, name: $name) {
     pullRequest(number: $number) {
       state
@@ -106,6 +111,11 @@ query PullRequestWatchFingerprint($owner: String!, $name: String!, $number: Int!
       reviewThreads {
         totalCount
       }
+      # totalCount ignores itemTypes and counts every timeline item; filteredCount honours it.
+      mergeQueueRemovals: timelineItems(itemTypes: [REMOVED_FROM_MERGE_QUEUE_EVENT])
+        @include(if: $mergeQueue) {
+        filteredCount
+      }
       commits(last: 1) {
         nodes {
           commit {
diff --git a/packages/source-control-github/src/server/pullRequestBatches.graphql.ts b/packages/source-control-github/src/server/pullRequestBatches.graphql.ts
index 31b8863f4125..1a4e0ef5e85e 100644
--- a/packages/source-control-github/src/server/pullRequestBatches.graphql.ts
+++ b/packages/source-control-github/src/server/pullRequestBatches.graphql.ts
@@ -309,6 +309,13 @@ export const PullRequestReviewThreadConnection = Schema.Struct({
 })
 export interface PullRequestReviewThreadConnection extends Schema.Struct.Type<typeof PullRequestReviewThreadConnection.fields> {}
 
+/** The connection type for PullRequestTimelineItems. */
+export const PullRequestTimelineItemsConnection = Schema.Struct({
+  /** Identifies the count of items after applying `before` and `after` filters. */
+  filteredCount: Shared.Int
+})
+export interface PullRequestTimelineItemsConnection extends Schema.Struct.Type<typeof PullRequestTimelineItemsConnection.fields> {}
+
 /** Represents a count of the state of a check run. */
 export const CheckRunStateCount = Schema.Struct({
   /** The state of a check run. */
@@ -378,6 +385,8 @@ export const PullRequestWatchFingerprintRepositoryPullRequestPullRequest = Schem
   reviews: Schema.NullOr(ReviewsPullRequestReviewConnection),
   /** The list of all review threads for this pull request. */
   reviewThreads: PullRequestReviewThreadConnection,
+  /** A list of events, comments, commits, etc. associated with the pull request. */
+  mergeQueueRemovals: Schema.optionalKey(PullRequestTimelineItemsConnection),
   /** A list of commits present in this pull request's head branch not present in the base branch. */
   commits: PullRequestWatchFingerprintRepositoryPullRequestCommitsPullRequestCommitConnection
 })
@@ -396,17 +405,19 @@ export const PullRequestWatchFingerprint = GraphQL.query("PullRequestWatchFinger
     variables: [
       { name: "owner", body: "String!" },
       { name: "name", body: "String!" },
-      { name: "number", body: "Int!" }
+      { name: "number", body: "Int!" },
+      { name: "mergeQueue", body: "Boolean!" }
     ],
     selections: [
-      { name: "repository", body: ["(owner:$", "owner", " name:$", "name", "){pullRequest(number:$", "number", "){state mergeable headRefOid comments(first:100 orderBy:{field:UPDATED_AT direction:DESC}){totalCount nodes{lastEditedAt}}reviews(last:100){totalCount nodes{lastEditedAt}}reviewThreads{totalCount}commits(last:1){nodes{commit{statusCheckRollup{contexts{checkRunCountsByState{state count}statusContextCountsByState{state count}}}}}}}}"] }
+      { name: "repository", body: ["(owner:$", "owner", " name:$", "name", "){pullRequest(number:$", "number", "){state mergeable headRefOid comments(first:100 orderBy:{field:UPDATED_AT direction:DESC}){totalCount nodes{lastEditedAt}}reviews(last:100){totalCount nodes{lastEditedAt}}reviewThreads{totalCount}mergeQueueRemovals:timelineItems(itemTypes:[REMOVED_FROM_MERGE_QUEUE_EVENT])@include(if:$", "mergeQueue", "){filteredCount}commits(last:1){nodes{commit{statusCheckRollup{contexts{checkRunCountsByState{state count}statusContextCountsByState{state count}}}}}}}}"] }
     ],
     fragments: []
   },
   variables: {
     owner: Schema.String,
     name: Schema.String,
-    number: Shared.Int
+    number: Shared.Int,
+    mergeQueue: Schema.Boolean
   },
   result: Schema.Struct({
     /** Lookup a given repository by the owner and repository name. */
diff --git a/packages/source-control-github/src/server/pullRequestReads.graphql b/packages/source-control-github/src/server/pullRequestReads.graphql
index 96588a2a5872..88fbe80828e1 100644
--- a/packages/source-control-github/src/server/pullRequestReads.graphql
+++ b/packages/source-control-github/src/server/pullRequestReads.graphql
@@ -59,6 +59,7 @@ query PullRequestCore(
   $headRef: String!
   $required: Boolean!
   $requestedReviewers: Int!
+  $mergeQueue: Boolean!
 ) {
   repository(owner: $owner, name: $name) {
     mergeCommitAllowed
@@ -111,6 +112,18 @@ query PullRequestCore(
       autoMergeRequest {
         mergeMethod
       }
+      # Merge queue checks run on a commit of the queue's own, so a pull request the queue drops
+      # can keep a green head. Only this event says it left without merging.
+      mergeQueueRemovals: timelineItems(last: 1, itemTypes: [REMOVED_FROM_MERGE_QUEUE_EVENT])
+        @include(if: $mergeQueue) {
+        nodes {
+          ... on RemovedFromMergeQueueEvent {
+            id
+            createdAt
+            reason
+          }
+        }
+      }
       viewerCanUpdate
       viewerDidAuthor
       viewerCanUpdateBranch
diff --git a/packages/source-control-github/src/server/pullRequestReads.graphql.ts b/packages/source-control-github/src/server/pullRequestReads.graphql.ts
index ebb43f6d7c75..a12334d8f98c 100644
--- a/packages/source-control-github/src/server/pullRequestReads.graphql.ts
+++ b/packages/source-control-github/src/server/pullRequestReads.graphql.ts
@@ -264,6 +264,34 @@ export const AutoMergeRequest = Schema.Struct({
 })
 export interface AutoMergeRequest extends Schema.Struct.Type<typeof AutoMergeRequest.fields> {}
 
+/** Represents a 'removed_from_merge_queue' event on a given pull request. */
+export const RemovedFromMergeQueueEvent = Schema.Struct({
+  __typename: Schema.Literal("RemovedFromMergeQueueEvent"),
+  /** The Node ID of the RemovedFromMergeQueueEvent object */
+  id: Shared.ID,
+  /** Identifies the date and time when the object was created. */
+  createdAt: Shared.DateTime,
+  /** The reason this pull request was removed from the queue. */
+  reason: Schema.NullOr(Schema.String)
+})
+export interface RemovedFromMergeQueueEvent extends Schema.Struct.Type<typeof RemovedFromMergeQueueEvent.fields> {}
+
+/** An item in a pull request timeline */
+export const PullRequestTimelineItemsOther = Schema.Struct({
+  __typename: GraphQL.otherTypename<Shared.Typename.PullRequestTimelineItems>()(["RemovedFromMergeQueueEvent"])
+})
+export interface PullRequestTimelineItemsOther extends Schema.Struct.Type<typeof PullRequestTimelineItemsOther.fields> {}
+
+/** The connection type for PullRequestTimelineItems. */
+export const PullRequestTimelineItemsConnection = Schema.Struct({
+  /** A list of nodes. */
+  nodes: Schema.NullOr(Schema.Array(Schema.NullOr(Schema.Union([
+    RemovedFromMergeQueueEvent,
+    PullRequestTimelineItemsOther
+  ]))))
+})
+export interface PullRequestTimelineItemsConnection extends Schema.Struct.Type<typeof PullRequestTimelineItemsConnection.fields> {}
+
 /** Represents a comparison between two commit revisions. */
 export const Comparison = Schema.Struct({
   /** The number of commits behind the base branch. */
@@ -456,6 +484,8 @@ export const PullRequestCoreRepositoryPullRequestPullRequest = Schema.Struct({
   ])),
   /** Returns the auto-merge request object if one exists for this pull request. */
   autoMergeRequest: Schema.NullOr(AutoMergeRequest),
+  /** A list of events, comments, commits, etc. associated with the pull request. */
+  mergeQueueRemovals: Schema.optionalKey(PullRequestTimelineItemsConnection),
   /** Check if the current viewer can update this object. */
   viewerCanUpdate: Schema.Boolean,
   /** Did the viewer author this comment. */
@@ -502,10 +532,11 @@ export const PullRequestCore = GraphQL.query("PullRequestCore", {
       { name: "number", body: "Int!" },
       { name: "headRef", body: "String!" },
       { name: "required", body: "Boolean!" },
-      { name: "requestedReviewers", body: "Int!" }
+      { name: "requestedReviewers", body: "Int!" },
+      { name: "mergeQueue", body: "Boolean!" }
     ],
     selections: [
-      { name: "repository", body: ["(owner:$", "owner", " name:$", "name", "){mergeCommitAllowed squashMergeAllowed rebaseMergeAllowed autoMergeAllowed viewerPermission pullRequest(number:$", "number", "){number title url body state isDraft mergeable mergeStateStatus reviewDecision additions deletions changedFiles createdAt updatedAt mergedAt closedAt headRefName baseRefName headRefOid isCrossRepository maintainerCanModify headRepositoryOwner{__typename login}headRepository{nameWithOwner viewerPermission}headRef{id}author{__typename login avatarUrl...on User{id name}}autoMergeRequest{mergeMethod}viewerCanUpdate viewerDidAuthor viewerCanUpdateBranch baseRef{compare(headRef:$", "headRef", "){behindBy}}reviewRequests(first:$", "requestedReviewers", "){nodes{requestedReviewer{__typename...on User{login name}...on Bot{login}...on Team{slug combinedSlug teamName:name teamAvatarUrl:avatarUrl}}}}labels(first:100){nodes{name color description}}commits(last:1){nodes{commit{statusCheckRollup{contexts(first:100){nodes{__typename...", "CheckContext", "}pageInfo{hasNextPage endCursor}}}}}}}}"] }
+      { name: "repository", body: ["(owner:$", "owner", " name:$", "name", "){mergeCommitAllowed squashMergeAllowed rebaseMergeAllowed autoMergeAllowed viewerPermission pullRequest(number:$", "number", "){number title url body state isDraft mergeable mergeStateStatus reviewDecision additions deletions changedFiles createdAt updatedAt mergedAt closedAt headRefName baseRefName headRefOid isCrossRepository maintainerCanModify headRepositoryOwner{__typename login}headRepository{nameWithOwner viewerPermission}headRef{id}author{__typename login avatarUrl...on User{id name}}autoMergeRequest{mergeMethod}mergeQueueRemovals:timelineItems(last:1 itemTypes:[REMOVED_FROM_MERGE_QUEUE_EVENT])@include(if:$", "mergeQueue", "){nodes{__typename...on RemovedFromMergeQueueEvent{id createdAt reason}}}viewerCanUpdate viewerDidAuthor viewerCanUpdateBranch baseRef{compare(headRef:$", "headRef", "){behindBy}}reviewRequests(first:$", "requestedReviewers", "){nodes{requestedReviewer{__typename...on User{login name}...on Bot{login}...on Team{slug combinedSlug teamName:name teamAvatarUrl:avatarUrl}}}}labels(first:100){nodes{name color description}}commits(last:1){nodes{commit{statusCheckRollup{contexts(first:100){nodes{__typename...", "CheckContext", "}pageInfo{hasNextPage endCursor}}}}}}}}"] }
     ],
     fragments: [
       { name: "CheckContext", body: ["on StatusCheckRollupContext{__typename...on StatusContext{context state targetUrl createdAt description isRequired(pullRequestNumber:$", "number", ")@include(if:$", "required", ")}...on CheckRun{name status conclusion startedAt completedAt detailsUrl isRequired(pullRequestNumber:$", "number", ")@include(if:$", "required", ")checkSuite{workflowRun{workflow{name}}}}}"] }
@@ -517,7 +548,8 @@ export const PullRequestCore = GraphQL.query("PullRequestCore", {
     number: Shared.Int,
     headRef: Schema.String,
     required: Schema.Boolean,
-    requestedReviewers: Shared.Int
+    requestedReviewers: Shared.Int,
+    mergeQueue: Schema.Boolean
   },
   result: Schema.Struct({
     /** Lookup a given repository by the owner and repository name. */
diff --git a/packages/source-control-github/src/shared/definition.test.ts b/packages/source-control-github/src/shared/definition.test.ts
index eadf35620416..d43580a11e02 100644
--- a/packages/source-control-github/src/shared/definition.test.ts
+++ b/packages/source-control-github/src/shared/definition.test.ts
@@ -194,4 +194,19 @@ describe("GitHub media URLs", () => {
       expect(media(url), url).toBeNull();
     }
   });
+
+  it("addresses a committed file at a full SHA as immutable credentialed media", () => {
+    const sha = "0123456789abcdef0123456789abcdef01234567";
+    const rawFileUrl = (repositoryUrl: string, path: string, revision = sha) =>
+      definition.rawFileUrl?.({ repositoryUrl, sha: revision, path }) ?? null;
+    const url = rawFileUrl("https://github.com/owner/repo", "docs/a #1?.png");
+    expect(url).toBe(`https://github.com/owner/repo/raw/${sha}/docs/a%20%231%3F.png`);
+    expect(media(url ?? "")).toEqual({
+      fetchUrl: `https://raw.githubusercontent.com/owner/repo/${sha}/docs/a%20%231%3F.png`,
+      fileName: "a #1?.png",
+      immutable: true,
+    });
+    expect(rawFileUrl("https://github.com/owner/repo", "a.png", "main")).toBeNull();
+    expect(rawFileUrl("https://github.example.com/owner/repo", "a.png")).toBeNull();
+  });
 });
diff --git a/packages/source-control-github/src/shared/definition.ts b/packages/source-control-github/src/shared/definition.ts
index a9b8818a78b7..dcd5efd167ca 100644
--- a/packages/source-control-github/src/shared/definition.ts
+++ b/packages/source-control-github/src/shared/definition.ts
@@ -14,7 +14,7 @@ import {
   type SourceControlAppSignIn,
 } from "@t3tools/source-control-core/shared/definition";
 
-import { gitHubMediaUrl } from "./gitHubMedia.ts";
+import { gitHubMediaUrl, gitHubRawFileUrl } from "./gitHubMedia.ts";
 import { icon } from "./icon.ts";
 import { gitHubReferenceAutolinks } from "./referenceAutolinks.ts";
 
@@ -157,5 +157,6 @@ export const definition = defineSourceControl({
   canReadChangeRequestOnHost: (identity, link) =>
     isChangeRequestOnProjectHost(projectChangeRequestHost(identity, KIND), identity, link),
   mediaUrl: gitHubMediaUrl,
+  rawFileUrl: gitHubRawFileUrl,
   settings,
 });
diff --git a/packages/source-control-github/src/shared/gitHubMedia.ts b/packages/source-control-github/src/shared/gitHubMedia.ts
index eec80c071fd1..466f96c5a1c2 100644
--- a/packages/source-control-github/src/shared/gitHubMedia.ts
+++ b/packages/source-control-github/src/shared/gitHubMedia.ts
@@ -64,3 +64,19 @@ export function gitHubMediaUrl(url: URL): SourceControlMediaUrl | null {
     ? rawFile(`https://${RAW_HOST}/${repositoryFile[1]}/${repositoryFile[2]}/${repositoryFile[3]}`)
     : null;
 }
+
+export function gitHubRawFileUrl(input: {
+  readonly repositoryUrl: string;
+  readonly sha: string;
+  readonly path: string;
+}): string | null {
+  if (!COMMIT_SHA_PATTERN.test(input.sha)) return null;
+  const path = input.path.split("/").map(encodeURIComponent).join("/");
+  let url: URL;
+  try {
+    url = new URL(`${input.repositoryUrl}/raw/${input.sha}/${path}`);
+  } catch {
+    return null;
+  }
+  return gitHubMediaUrl(url) === null ? null : url.toString();
+}
diff --git a/packages/ssh/src/auth.test.ts b/packages/ssh/src/auth.test.ts
index 898f365e53ed..36ec691e5d81 100644
--- a/packages/ssh/src/auth.test.ts
+++ b/packages/ssh/src/auth.test.ts
@@ -84,7 +84,6 @@ describe("ssh auth", () => {
       assert.include(yield* fs.readFileString(askpassPath), 'printf "%s\\n" "$T3_SSH_AUTH_SECRET"');
     }).pipe(
       Effect.provide(Layer.merge(NodeServices.layer, Layer.succeed(HostProcess.Platform, "linux"))),
-      Effect.scoped,
     ),
   );
 
@@ -249,7 +248,6 @@ describe("ssh auth", () => {
       assert.include(yield* fs.readFileString(first), 'printf "%s\\n" "$T3_SSH_AUTH_SECRET"');
     }).pipe(
       Effect.provide(Layer.merge(NodeServices.layer, Layer.succeed(HostProcess.Platform, "linux"))),
-      Effect.scoped,
     ),
   );
 });
diff --git a/packages/ssh/src/command.test.ts b/packages/ssh/src/command.test.ts
index 4a4ba985629d..906be802edaf 100644
--- a/packages/ssh/src/command.test.ts
+++ b/packages/ssh/src/command.test.ts
@@ -3,11 +3,13 @@ import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
 import * as NodeServices from "@effect/platform-node/NodeServices";
 import * as HostProcess from "@t3tools/shared/HostProcess";
 import * as Effect from "effect/Effect";
+import * as Fiber from "effect/Fiber";
 import * as Layer from "effect/Layer";
 import * as Result from "effect/Result";
 import * as Schema from "effect/Schema";
 import * as Sink from "effect/Sink";
 import * as Stream from "effect/Stream";
+import * as TestClock from "effect/testing/TestClock";
 import { ChildProcess, ChildProcessSpawner } from "effect/process";
 
 import { parseSshResolveOutput, remoteStateKey, runSshCommand } from "./command.ts";
@@ -147,6 +149,45 @@ describe("ssh command", () => {
     }).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
   );
 
+  it.live.skipIf(HostProcess.Platform.defaultValue() === "win32")(
+    "a timed-out command leaves no helper running that ignored SIGTERM",
+    () =>
+      Effect.gen(function* () {
+        const nativeSpawner = yield* ChildProcessSpawner.ChildProcessSpawner;
+        // Stands in for ssh and a ProxyCommand: ssh exits on SIGTERM, the proxy ignores it.
+        const spawner = ChildProcessSpawner.make((command) =>
+          nativeSpawner.spawn(
+            ChildProcess.make(
+              process.execPath,
+              [
+                "-e",
+                `const proxy = require("node:child_process").spawn("sh", ["-c", "trap '' TERM; exec sleep 60"], { stdio: "ignore" });
+              process.stdout.write(proxy.pid + "\\n");
+              setInterval(() => {}, 1000);`,
+              ],
+              command._tag === "StandardCommand" ? command.options : {},
+            ),
+          ),
+        );
+        const failure = yield* runSshCommand(
+          { alias: "synthetic-fixture", hostname: "synthetic-fixture", username: null, port: null },
+          { timeoutMs: 1_000, keepErrorOutputTail: true },
+        ).pipe(
+          Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, spawner),
+          Effect.flip,
+        );
+        assert.instanceOf(failure, SshCommandError);
+        assert.equal(failure.message, "SSH command timed out after 1000ms.");
+        const proxyPid = Number(failure.stdout?.trim());
+        assert.isTrue(Number.isSafeInteger(proxyPid) && proxyPid > 1);
+        const state = (yield* nativeSpawner.string(
+          ChildProcess.make("ps", ["-p", String(proxyPid), "-o", "stat="]),
+        )).trim();
+        if (state !== "" && !state.startsWith("Z")) process.kill(proxyPid, "SIGKILL");
+        assert.isTrue(state === "" || state.startsWith("Z"), `proxy still running (${state})`);
+      }).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
+  );
+
   it.live("enables server-alive checks for long remote commands", () =>
     Effect.gen(function* () {
       // Ask OpenSSH for its effective configuration without opening a connection.
@@ -188,6 +229,47 @@ describe("ssh command", () => {
     }).pipe(Effect.provide(layerProcess));
   });
 
+  it.effect("keeps redacted output the command emitted before timing out", () => {
+    const spawner = ChildProcessSpawner.make(() =>
+      Effect.succeed(
+        ChildProcessSpawner.makeHandle({
+          pid: ChildProcessSpawner.ProcessId(123),
+          stdout: Stream.concat(
+            Stream.make(encoder.encode('PROGRESS: extracting\n{"credential":"pairing-secret"}\n')),
+            Stream.never,
+          ),
+          stderr: Stream.concat(
+            Stream.make(encoder.encode("REMOTE: waiting for archive extraction\n")),
+            Stream.never,
+          ),
+          all: Stream.empty,
+          exitCode: Effect.never,
+          isRunning: Effect.succeed(true),
+          kill: () => Effect.void,
+          stdin: Sink.drain,
+          getInputFd: () => Sink.drain,
+          getOutputFd: () => Stream.empty,
+          unref: Effect.succeed(Effect.void),
+        }),
+      ),
+    );
+    const layerSpawner = Layer.succeed(ChildProcessSpawner.ChildProcessSpawner, spawner);
+
+    return Effect.gen(function* () {
+      const fiber = yield* runSshCommand(
+        { alias: "devbox", hostname: "devbox", username: null, port: null },
+        { remoteCommandArgs: ["sh", "-s"], timeoutMs: 1_000, keepErrorOutputTail: true },
+      ).pipe(Effect.flip, Effect.forkChild);
+      yield* TestClock.adjust("1 second");
+      const failure = yield* Fiber.join(fiber);
+
+      assert.instanceOf(failure, SshCommandError);
+      assert.equal(failure.exitCode, null);
+      assert.equal(failure.stdout, 'PROGRESS: extracting\n{"credential":"[redacted]"}\n');
+      assert.equal(failure.stderr, "REMOTE: waiting for archive extraction\n");
+    }).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer, layerSpawner)));
+  });
+
   const changedKeyStderr =
     "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\r\n" +
     "@    WARNING: REMOTE HOST IDENTIFICATION HAS CHANGED!     @\r\n" +
diff --git a/packages/ssh/src/command.ts b/packages/ssh/src/command.ts
index d08516b8162d..409ee3b0635b 100644
--- a/packages/ssh/src/command.ts
+++ b/packages/ssh/src/command.ts
@@ -127,12 +127,23 @@ export function getLastNonEmptyOutputLine(stdout: string): string | null {
   );
 }
 
-const collectProcessOutput = <E>(stream: Stream.Stream<Uint8Array, E>): Effect.Effect<string, E> =>
+interface SshCommandOutput {
+  stdout: string;
+  stderr: string;
+}
+
+// Appends as chunks arrive so a timeout can still report what was printed.
+const collectProcessOutput = <E>(
+  stream: Stream.Stream<Uint8Array, E>,
+  output: SshCommandOutput,
+  key: keyof SshCommandOutput,
+): Effect.Effect<void, E> =>
   stream.pipe(
     Stream.decodeText(),
-    Stream.runFold(
-      () => "",
-      (acc, chunk) => acc + chunk,
+    Stream.runForEach((chunk) =>
+      Effect.sync(() => {
+        output[key] += chunk;
+      }),
     ),
   );
 
@@ -214,6 +225,7 @@ const runSshCommandInScope = Effect.fn("ssh/command.runSshCommand.inScope")(func
   target: DesktopSshEnvironmentTarget,
   input: RunSshCommandOptions,
   commandScope: Scope.Scope,
+  output: SshCommandOutput,
 ): Effect.fn.Return<
   SshCommandResult,
   SshCommandError | SshInvalidTargetError,
@@ -262,6 +274,7 @@ const runSshCommandInScope = Effect.fn("ssh/command.runSshCommand.inScope")(func
       ChildProcess.make(sshCommand, args, {
         env: environment,
         extendEnv: true,
+        forceKillAfter: "1 second",
         stdin: {
           stream: stdinStream(input.stdin),
           endOnDone: true,
@@ -285,10 +298,10 @@ const runSshCommandInScope = Effect.fn("ssh/command.runSshCommand.inScope")(func
       ),
     );
 
-  const [stdout, stderr, exitCode] = yield* Effect.all(
+  const [, , exitCode] = yield* Effect.all(
     [
-      collectProcessOutput(child.stdout),
-      collectProcessOutput(child.stderr),
+      collectProcessOutput(child.stdout, output, "stdout"),
+      collectProcessOutput(child.stderr, output, "stderr"),
       child.exitCode.pipe(Effect.map(Number)),
     ],
     { concurrency: "unbounded" },
@@ -306,6 +319,7 @@ const runSshCommandInScope = Effect.fn("ssh/command.runSshCommand.inScope")(func
     ),
   );
 
+  const { stdout, stderr } = output;
   if (exitCode !== 0) {
     const diagnosticStdout = redactSshErrorOutput(stdout, input.keepErrorOutputTail);
     yield* Effect.logWarning("ssh.command.failed", {
@@ -350,8 +364,9 @@ export const runSshCommand = Effect.fn("ssh/command.runSshCommand")(function* (
   SshCommandError | SshInvalidTargetError,
   ChildProcessSpawner.ChildProcessSpawner | FileSystem.FileSystem | Path.Path
 > {
+  const output: SshCommandOutput = { stdout: "", stderr: "" };
   return yield* Effect.scopedWith((commandScope) =>
-    runSshCommandInScope(target, input, commandScope),
+    runSshCommandInScope(target, input, commandScope, output),
   ).pipe(
     Effect.timeoutOption(Duration.millis(input.timeoutMs ?? DEFAULT_SSH_COMMAND_TIMEOUT_MS)),
     Effect.flatMap((result) =>
@@ -359,17 +374,22 @@ export const runSshCommand = Effect.fn("ssh/command.runSshCommand")(function* (
         onSome: Effect.succeed,
         // The enclosing operation owns the span for this inline handler.
         onNone: Effect.fnUntraced(function* () {
+          const diagnosticStdout = redactSshErrorOutput(output.stdout, input.keepErrorOutputTail);
+          const { stderr } = output;
           yield* Effect.logWarning("ssh.command.timedOut", {
             ...sshTargetLogFields(target),
             timeoutMs: input.timeoutMs ?? DEFAULT_SSH_COMMAND_TIMEOUT_MS,
             remoteCommandArgs: input.remoteCommandArgs ?? [],
             preHostArgs: input.preHostArgs ?? [],
             hasStdin: input.stdin !== undefined,
+            stdout: diagnosticStdout,
+            stderr,
           });
           return yield* new SshCommandError({
             command: ["ssh"],
             exitCode: null,
-            stderr: "",
+            stdout: diagnosticStdout,
+            stderr,
             message: `SSH command timed out after ${input.timeoutMs ?? DEFAULT_SSH_COMMAND_TIMEOUT_MS}ms.`,
           });
         }),
diff --git a/packages/ssh/src/config.test.ts b/packages/ssh/src/config.test.ts
index ec87248da51e..3a5120a662d9 100644
--- a/packages/ssh/src/config.test.ts
+++ b/packages/ssh/src/config.test.ts
@@ -4,7 +4,7 @@ import * as Effect from "effect/Effect";
 import * as FileSystem from "effect/FileSystem";
 import * as Path from "effect/Path";
 
-import { discoverSshHosts, parseKnownHostsHostnames } from "./config.ts";
+import { discoverSshHosts, parseKnownHosts } from "./config.ts";
 
 function makeTempHomeDir() {
   return Effect.gen(function* () {
@@ -70,7 +70,7 @@ describe("ssh config", () => {
           ]),
         ],
       );
-    }).pipe(Effect.provide(NodeServices.layer), Effect.scoped),
+    }).pipe(Effect.provide(NodeServices.layer)),
   );
 
   it.effect("skips directories and implicit dotfile Include matches but keeps explicit ones", () =>
@@ -117,7 +117,7 @@ describe("ssh config", () => {
           ["team", "team.example.com", "ssh-config"],
         ],
       );
-    }).pipe(Effect.provide(NodeServices.layer), Effect.scoped),
+    }).pipe(Effect.provide(NodeServices.layer)),
   );
 
   it.effect("discovers ssh config hosts across included files", () =>
@@ -127,6 +127,11 @@ describe("ssh config", () => {
       const homeDir = yield* makeTempHomeDir();
       const sshDir = path.join(homeDir, ".ssh");
       yield* fs.makeDirectory(path.join(sshDir, "config.d"), { recursive: true });
+      yield* fs.makeDirectory(path.join(sshDir, "teams", "one"), { recursive: true });
+      const blockedDir = path.join(sshDir, "teams", "blocked");
+      yield* fs.makeDirectory(blockedDir);
+      yield* fs.chmod(blockedDir, 0o000);
+      yield* Effect.addFinalizer(() => fs.chmod(blockedDir, 0o755).pipe(Effect.ignore));
       yield* fs.writeFileString(
         path.join(sshDir, "config"),
         [
@@ -135,9 +140,14 @@ describe("ssh config", () => {
           "Host=equalsbox",
           "Host *",
           "Include=config.d/*.conf",
+          "Include teams/*/*.conf",
           "",
         ].join("\n"),
       );
+      yield* fs.writeFileString(
+        path.join(sshDir, "teams", "one", "hosts.conf"),
+        "Host fixture\n  HostName fixture.example.com\n",
+      );
       yield* fs.writeFileString(
         path.join(sshDir, "config.d", "team.conf"),
         [
@@ -166,7 +176,7 @@ describe("ssh config", () => {
           alias: "bastion.example.com",
           hostname: "bastion.example.com",
           username: null,
-          port: null,
+          port: 2222,
           source: "known-hosts",
         },
         {
@@ -190,6 +200,13 @@ describe("ssh config", () => {
           port: null,
           source: "ssh-config",
         },
+        {
+          alias: "fixture",
+          hostname: "fixture.example.com",
+          username: null,
+          port: null,
+          source: "ssh-config",
+        },
         {
           alias: "known.example.com",
           hostname: "known.example.com",
@@ -205,7 +222,7 @@ describe("ssh config", () => {
           source: "ssh-config",
         },
       ]);
-    }).pipe(Effect.provide(NodeServices.layer), Effect.scoped),
+    }).pipe(Effect.provide(NodeServices.layer)),
   );
 
   it.effect("retains raw targets when included hostnames are inactive or uncertain", () =>
@@ -276,13 +293,82 @@ describe("ssh config", () => {
       assert.equal(hosts.find((host) => host.alias === "prod")?.hostname, "prod");
       assert.equal(hosts.find((host) => host.alias === "work")?.hostname, "work");
       assert.equal(hosts.find((host) => host.alias === "matched")?.hostname, "matched");
-    }).pipe(Effect.provide(NodeServices.layer), Effect.scoped),
+    }).pipe(Effect.provide(NodeServices.layer)),
+  );
+
+  it.effect("keeps each explicit known_hosts port as its own destination", () =>
+    Effect.gen(function* () {
+      const fs = yield* FileSystem.FileSystem;
+      const path = yield* Path.Path;
+      const homeDir = yield* makeTempHomeDir();
+      const sshDir = path.join(homeDir, ".ssh");
+      yield* fs.makeDirectory(sshDir);
+      yield* fs.writeFileString(
+        path.join(sshDir, "known_hosts"),
+        [
+          "[100.64.0.1]:2222 ssh-ed25519 AAAA",
+          "[100.64.0.1]:2223 ssh-ed25519 AAAA",
+          "[fd7a:115c:a1e0::1]:2222 ssh-ed25519 AAAA",
+          "",
+        ].join("\n"),
+      );
+
+      const hosts = yield* discoverSshHosts({ homeDir });
+      assert.deepEqual(
+        hosts
+          .map((host) => `${host.hostname} ${host.port}`)
+          .toSorted((left, right) => left.localeCompare(right)),
+        ["100.64.0.1 2222", "100.64.0.1 2223", "fd7a:115c:a1e0::1 2222"],
+      );
+    }).pipe(Effect.provide(NodeServices.layer)),
+  );
+
+  it.effect("keeps known_hosts ports that a configured alias for the address does not use", () =>
+    Effect.gen(function* () {
+      const fs = yield* FileSystem.FileSystem;
+      const path = yield* Path.Path;
+      const homeDir = yield* makeTempHomeDir();
+      const sshDir = path.join(homeDir, ".ssh");
+      yield* fs.makeDirectory(sshDir);
+      yield* fs.writeFileString(
+        path.join(sshDir, "known_hosts"),
+        [
+          "[192.0.2.10]:2222 ssh-ed25519 AAAA",
+          "[192.0.2.10]:2223 ssh-ed25519 AAAA",
+          "[192.0.2.20]:2222 ssh-ed25519 AAAA",
+          "[box]:2200 ssh-ed25519 AAAA",
+          "box ssh-ed25519 AAAA",
+          "192.0.2.20 ssh-ed25519 AAAA",
+          "",
+        ].join("\n"),
+      );
+      yield* fs.writeFileString(
+        path.join(sshDir, "config"),
+        [
+          "Host fixture",
+          "  HostName 192.0.2.10",
+          "  Port 22",
+          "Host prod",
+          "  HostName 192.0.2.20",
+          "  Port 2222",
+          "Host box",
+          "  Port 2200",
+          "",
+        ].join("\n"),
+      );
+
+      const hosts = yield* discoverSshHosts({ homeDir });
+      assert.deepEqual(
+        hosts.map((host) => `${host.alias} ${host.port}`),
+        ["192.0.2.10 2222", "192.0.2.10 2223", "box null", "fixture null", "prod null"],
+      );
+    }).pipe(Effect.provide(NodeServices.layer)),
   );
 
   it.effect("parses known_hosts entries without returning hashed hosts", () =>
     Effect.sync(() => {
       assert.deepEqual(
-        parseKnownHostsHostnames(
+        parseKnownHosts(
           [
             "github.com ssh-ed25519 AAAA",
             "gitlab.com,gitlab-alias ssh-ed25519 BBBB",
@@ -296,13 +382,13 @@ describe("ssh config", () => {
           ].join("\n"),
         ),
         [
-          "::1",
-          "2001:db8::1",
-          "github.com",
-          "gitlab-alias",
-          "gitlab.com",
-          "port.example.com",
-          "ssh.example.com",
+          { hostname: "::1", port: null },
+          { hostname: "2001:db8::1", port: null },
+          { hostname: "github.com", port: null },
+          { hostname: "gitlab-alias", port: null },
+          { hostname: "gitlab.com", port: null },
+          { hostname: "port.example.com", port: null },
+          { hostname: "ssh.example.com", port: 2200 },
         ],
       );
     }),
diff --git a/packages/ssh/src/config.ts b/packages/ssh/src/config.ts
index e14e2cf7b1d0..a8f183c9b05e 100644
--- a/packages/ssh/src/config.ts
+++ b/packages/ssh/src/config.ts
@@ -97,30 +97,46 @@ function globToRegExp(pattern: string): RegExp {
   );
 }
 
-const expandGlob = Effect.fnUntraced(function* (pattern: string) {
+function hasGlobWildcard(value: string): boolean {
+  return value.includes("*") || value.includes("?");
+}
+
+const expandGlob = Effect.fnUntraced(function* (
+  pattern: string,
+): Effect.fn.Return<
+  ReadonlyArray<string>,
+  PlatformError.PlatformError,
+  FileSystem.FileSystem | Path.Path
+> {
   const fs = yield* FileSystem.FileSystem;
   const path = yield* Path.Path;
-  if (!pattern.includes("*") && !pattern.includes("?")) {
+  if (!hasGlobWildcard(pattern)) {
     return (yield* fs.exists(pattern)) ? [pattern] : NO_HOSTS;
   }
 
-  const directory = path.dirname(pattern);
+  const directoryPattern = path.dirname(pattern);
   const basePattern = path.basename(pattern);
-  if (!(yield* fs.exists(directory))) {
-    return NO_HOSTS;
-  }
+  const directoryIsGlob = hasGlobWildcard(directoryPattern);
+  const directories = directoryIsGlob ? yield* expandGlob(directoryPattern) : [directoryPattern];
 
   const matcher = globToRegExp(basePattern);
-  const entries = yield* fs.readDirectory(directory);
   const matchedPaths: string[] = [];
-  for (const entry of entries) {
-    if (entry.startsWith(".") && !basePattern.startsWith(".")) continue;
-    if (!matcher.test(entry)) {
-      continue;
-    }
-    const entryPath = path.join(directory, entry);
-    if (yield* fs.exists(entryPath)) {
-      matchedPaths.push(entryPath);
+  for (const directory of directories) {
+    if (!(yield* fs.exists(directory))) continue;
+    if ((yield* fs.stat(directory)).type !== "Directory") continue;
+    // Like OpenSSH's glob, a wildcard-matched directory we cannot read matches nothing.
+    const entries = directoryIsGlob
+      ? yield* fs.readDirectory(directory).pipe(Effect.orElseSucceed(() => NO_HOSTS))
+      : yield* fs.readDirectory(directory);
+    for (const entry of entries) {
+      if (entry.startsWith(".") && !basePattern.startsWith(".")) continue;
+      if (!matcher.test(entry)) {
+        continue;
+      }
+      const entryPath = path.join(directory, entry);
+      if (yield* fs.exists(entryPath)) {
+        matchedPaths.push(entryPath);
+      }
     }
   }
   return matchedPaths.toSorted();
@@ -128,9 +144,11 @@ const expandGlob = Effect.fnUntraced(function* (pattern: string) {
 
 type HostCondition = ReadonlyArray<string> | null;
 
-interface HostNameRule {
+interface HostRule {
   readonly conditions: ReadonlyArray<HostCondition>;
-  readonly hostname: string | null;
+  // null: an unreadable Include that may set any directive.
+  readonly directive: "hostname" | "port" | null;
+  readonly value: string | null;
 }
 
 function matchesHostPatterns(alias: string, patterns: ReadonlyArray<string>): boolean {
@@ -148,19 +166,37 @@ function matchesHostPatterns(alias: string, patterns: ReadonlyArray<string>): bo
   return matched;
 }
 
-function resolveConfiguredHostname(alias: string, rules: ReadonlyArray<HostNameRule>) {
-  for (const { conditions, hostname } of rules) {
+function resolveConfiguredValue(
+  alias: string,
+  directive: "hostname" | "port",
+  rules: ReadonlyArray<HostRule>,
+) {
+  for (const rule of rules) {
     if (
-      conditions.some((condition) => condition !== null && !matchesHostPatterns(alias, condition))
+      (rule.directive !== null && rule.directive !== directive) ||
+      rule.conditions.some(
+        (condition) => condition !== null && !matchesHostPatterns(alias, condition),
+      )
     ) {
       continue;
     }
     // SSH takes the first value; an uncertain earlier value blocks later fallbacks.
-    if (conditions.includes(null) || hostname === null) return null;
-    if (/%(?!h)/u.test(hostname) || hostname.includes("$")) return null;
-    return hostname.replaceAll("%h", alias);
+    if (rule.conditions.includes(null) || rule.value === null) return null;
+    return rule.value;
   }
-  return null;
+  return undefined;
+}
+
+function resolveConfiguredHostname(alias: string, rules: ReadonlyArray<HostRule>) {
+  const hostname = resolveConfiguredValue(alias, "hostname", rules) ?? null;
+  if (hostname === null || /%(?!h)/u.test(hostname) || hostname.includes("$")) return null;
+  return hostname.replaceAll("%h", alias);
+}
+
+// "*" when the port is uncertain, so the alias still covers every known_hosts port.
+function resolveConfiguredPort(alias: string, rules: ReadonlyArray<HostRule>) {
+  const port = resolveConfiguredValue(alias, "port", rules);
+  return port === undefined ? "22" : (port ?? "*");
 }
 
 const collectSshConfigAliasesFromFile = Effect.fnUntraced(function* (
@@ -168,7 +204,7 @@ const collectSshConfigAliasesFromFile = Effect.fnUntraced(function* (
   visited: Set<string>,
   homeDir: string,
   aliases: Set<string>,
-  hostNameRules: Array<HostNameRule>,
+  hostNameRules: Array<HostRule>,
   inheritedConditions: ReadonlyArray<HostCondition>,
 ): Effect.fn.Return<void, PlatformError.PlatformError, FileSystem.FileSystem | Path.Path> {
   const fs = yield* FileSystem.FileSystem;
@@ -176,7 +212,7 @@ const collectSshConfigAliasesFromFile = Effect.fnUntraced(function* (
   const resolvedPath = path.resolve(filePath);
   if (visited.has(resolvedPath)) {
     // Read each file once, but never reuse its rules under a different Include context.
-    hostNameRules.push({ conditions: inheritedConditions, hostname: null });
+    hostNameRules.push({ conditions: inheritedConditions, directive: null, value: null });
     return;
   }
   if (!(yield* fs.exists(resolvedPath))) return;
@@ -201,10 +237,21 @@ const collectSshConfigAliasesFromFile = Effect.fnUntraced(function* (
     } else if (directive === "match") {
       condition = null;
     } else if (directive === "hostname") {
-      hostNameRules.push({ conditions, hostname: args?.length === 1 ? args[0]! : null });
+      hostNameRules.push({
+        conditions,
+        directive: "hostname",
+        value: args?.length === 1 ? args[0]! : null,
+      });
+    } else if (directive === "port") {
+      const port = args?.length === 1 ? Number(args[0]) : Number.NaN;
+      hostNameRules.push({
+        conditions,
+        directive: "port",
+        value: Number.isInteger(port) && port >= 1 && port <= 65535 ? String(port) : null,
+      });
     } else if (directive === "include") {
       if (args === null) {
-        hostNameRules.push({ conditions, hostname: null });
+        hostNameRules.push({ conditions, directive: null, value: null });
         continue;
       }
       for (const includePattern of args) {
@@ -215,10 +262,9 @@ const collectSshConfigAliasesFromFile = Effect.fnUntraced(function* (
         );
         if (
           /%|\$\{|\[/u.test(includePattern) ||
-          (includePattern.startsWith("~") && !/^~(?=$|\/|\\)/u.test(includePattern)) ||
-          hasSshPattern(path.dirname(resolvedPattern))
+          (includePattern.startsWith("~") && !/^~(?=$|\/|\\)/u.test(includePattern))
         ) {
-          hostNameRules.push({ conditions, hostname: null });
+          hostNameRules.push({ conditions, directive: null, value: null });
           continue;
         }
         const includedPaths = yield* expandGlob(resolvedPattern);
@@ -237,23 +283,32 @@ const collectSshConfigAliasesFromFile = Effect.fnUntraced(function* (
   }
 });
 
-function normalizeKnownHostsHostname(rawHost: string): string {
+interface KnownHost {
+  readonly hostname: string;
+  readonly port: number | null;
+}
+
+function parseKnownHostsHost(rawHost: string): KnownHost | null {
   const bracketMatch = /^\[([^\]]+)\]:(\d+)$/u.exec(rawHost);
   if (bracketMatch?.[1]) {
-    return bracketMatch[1];
+    const port = Number(bracketMatch[2]);
+    return port >= 1 && port <= 65535 ? { hostname: bracketMatch[1], port } : null;
   }
 
   if (!rawHost.includes(":")) {
-    return rawHost;
+    return { hostname: rawHost, port: null };
   }
 
   const firstColonIndex = rawHost.indexOf(":");
   const lastColonIndex = rawHost.lastIndexOf(":");
-  return firstColonIndex === lastColonIndex ? rawHost.slice(0, lastColonIndex) : rawHost;
+  return {
+    hostname: firstColonIndex === lastColonIndex ? rawHost.slice(0, lastColonIndex) : rawHost,
+    port: null,
+  };
 }
 
-export function parseKnownHostsHostnames(raw: string): ReadonlyArray<string> {
-  const hostnames = new Set<string>();
+export function parseKnownHosts(raw: string): ReadonlyArray<KnownHost> {
+  const hosts = new Map<string, KnownHost>();
 
   for (const line of raw.split(/\r?\n/u)) {
     const trimmed = line.trim();
@@ -270,23 +325,28 @@ export function parseKnownHostsHostnames(raw: string): ReadonlyArray<string> {
     }
 
     for (const rawHost of hostField.split(",")) {
-      const host = normalizeKnownHostsHostname(rawHost).trim();
-      if (host.length === 0 || hasSshPattern(host)) {
+      const parsed = parseKnownHostsHost(rawHost.trim());
+      if (parsed === null) continue;
+      const hostname = parsed.hostname.trim();
+      if (hostname.length === 0 || hasSshPattern(hostname)) {
         continue;
       }
-      hostnames.add(host);
+      hosts.set(`${hostname}\u0000${parsed.port ?? ""}`, { hostname, port: parsed.port });
     }
   }
 
-  return [...hostnames].toSorted((left, right) => left.localeCompare(right));
+  return [...hosts.values()].toSorted(
+    (left, right) =>
+      left.hostname.localeCompare(right.hostname) || (left.port ?? 0) - (right.port ?? 0),
+  );
 }
 
-const readKnownHostsHostnames = Effect.fnUntraced(function* (filePath: string) {
+const readKnownHosts = Effect.fnUntraced(function* (filePath: string) {
   const fs = yield* FileSystem.FileSystem;
   if (!(yield* fs.exists(filePath))) {
-    return NO_HOSTS;
+    return [];
   }
-  return parseKnownHostsHostnames(yield* fs.readFileString(filePath));
+  return parseKnownHosts(yield* fs.readFileString(filePath));
 });
 
 export const discoverSshHosts = Effect.fnUntraced(
@@ -307,7 +367,7 @@ export const discoverSshHosts = Effect.fnUntraced(
 
     const sshDirectory = path.join(homeDir, ".ssh");
     const configAliases = new Set<string>();
-    const hostNameRules: Array<HostNameRule> = [];
+    const hostNameRules: Array<HostRule> = [];
     yield* collectSshConfigAliasesFromFile(
       path.join(sshDirectory, "config"),
       new Set<string>(),
@@ -316,13 +376,18 @@ export const discoverSshHosts = Effect.fnUntraced(
       hostNameRules,
       [],
     );
-    const knownHosts = yield* readKnownHostsHostnames(path.join(sshDirectory, "known_hosts"));
+    const knownHosts = yield* readKnownHosts(path.join(sshDirectory, "known_hosts"));
     const discovered = new Map<string, DesktopDiscoveredSshHost>();
 
-    const configuredHostnames = new Set<string>();
+    const configuredNames = new Set<string>();
+    const configuredDestinations = new Set<string>();
     for (const alias of configAliases) {
       const hostname = resolveConfiguredHostname(alias, hostNameRules);
-      if (hostname !== null) configuredHostnames.add(hostname.toLowerCase());
+      const port = resolveConfiguredPort(alias, hostNameRules);
+      for (const name of hostname === null ? [alias] : [alias, hostname]) {
+        configuredNames.add(name.toLowerCase());
+        configuredDestinations.add(`${name.toLowerCase()}\u0000${port}`);
+      }
       discovered.set(alias, {
         alias,
         hostname: hostname ?? alias,
@@ -332,15 +397,22 @@ export const discoverSshHosts = Effect.fnUntraced(
       });
     }
 
-    for (const hostname of knownHosts) {
-      if (discovered.has(hostname) || configuredHostnames.has(hostname.toLowerCase())) {
+    for (const { hostname, port } of knownHosts) {
+      const name = hostname.toLowerCase();
+      // A port-less entry connects as `ssh <host>`, so a matching alias's Port applies to it.
+      if (
+        port === null
+          ? configuredNames.has(name)
+          : configuredDestinations.has(`${name}\u0000${port}`) ||
+            configuredDestinations.has(`${name}\u0000*`)
+      ) {
         continue;
       }
-      discovered.set(hostname, {
+      discovered.set(`${hostname}\u0000${port ?? ""}`, {
         alias: hostname,
         hostname,
         username: null,
-        port: null,
+        port,
         source: "known-hosts",
       });
     }
diff --git a/packages/ssh/src/launcherTestHarness.ts b/packages/ssh/src/launcherTestHarness.ts
new file mode 100644
index 000000000000..fb307fffd2f8
--- /dev/null
+++ b/packages/ssh/src/launcherTestHarness.ts
@@ -0,0 +1,238 @@
+// @effect-diagnostics nodeBuiltinImport:off - Executes the generated remote launcher in an isolated shell with fake commands and clock.
+import * as NodeFS from "node:fs";
+import * as NodePath from "node:path";
+import * as NodeURL from "node:url";
+import * as NodeChildProcess from "node:child_process";
+import * as NodeCrypto from "@effect/platform-node/NodeCrypto";
+import * as NodeServices from "@effect/platform-node/NodeServices";
+import * as Effect from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as Sink from "effect/Sink";
+import * as Stream from "effect/Stream";
+import { ChildProcessSpawner } from "effect/process";
+import { launchOrReuseRemoteServer, type RemoteT3RunnerOptions } from "./tunnel.ts";
+
+// Capture exactly the script sent over SSH, then run it with fake remote commands.
+export const captureLauncherFor = Effect.fn("test.captureLauncher")(function* (
+  runner: RemoteT3RunnerOptions,
+) {
+  let script = "";
+  const spawner = ChildProcessSpawner.make((command) =>
+    Effect.gen(function* () {
+      if (command._tag === "StandardCommand") {
+        const stdin = command.options.stdin;
+        if (typeof stdin === "object" && "stream" in stdin && Stream.isStream(stdin.stream)) {
+          script = yield* stdin.stream.pipe(Stream.decodeText(), Stream.mkString);
+        }
+      }
+      return ChildProcessSpawner.makeHandle({
+        pid: ChildProcessSpawner.ProcessId(123),
+        stdout: Stream.make(new TextEncoder().encode('{"remotePort":3773}\n')),
+        stderr: Stream.empty,
+        all: Stream.empty,
+        exitCode: Effect.succeed(ChildProcessSpawner.ExitCode(0)),
+        isRunning: Effect.succeed(false),
+        kill: () => Effect.void,
+        stdin: Sink.drain,
+        getInputFd: () => Sink.drain,
+        getOutputFd: () => Stream.empty,
+        unref: Effect.succeed(Effect.void),
+      });
+    }),
+  );
+  yield* launchOrReuseRemoteServer(
+    { alias: "test", hostname: "test.invalid", username: null, port: null },
+    undefined,
+    runner,
+  ).pipe(
+    Effect.provide(
+      Layer.mergeAll(
+        NodeServices.layer,
+        NodeCrypto.layer,
+        Layer.succeed(ChildProcessSpawner.ChildProcessSpawner, spawner),
+      ),
+    ),
+  );
+  return script;
+});
+
+export const captureLauncher = captureLauncherFor({ nodeScriptPath: "/fake/server.ts" });
+
+export function runLauncher(
+  script: string,
+  options: {
+    readonly marker?: unknown;
+    readonly archive?: boolean;
+    readonly clearMarkerOnReady?: boolean;
+    readonly recordedKind?: "managed" | "external";
+    readonly clockJump?: number;
+    readonly readyAt?: number;
+    readonly initialPort?: number;
+    // The desktop publishes runtime and removes the marker right after the first runtime read.
+    readonly publishAfterFirstRuntimeRead?: boolean;
+  },
+) {
+  const root = NodeURL.fileURLToPath(new URL("../../../", import.meta.url));
+  const home = NodeFS.mkdtempSync(NodePath.join(root, "packages/ssh/.ssh-launcher-test-"));
+  try {
+    const bin = NodePath.join(home, "bin");
+    const runtime = NodePath.join(home, ".t3/runtime");
+    NodeFS.mkdirSync(bin);
+    NodeFS.mkdirSync(runtime, { recursive: true });
+    const markerPath = NodePath.join(runtime, "desktop-update-in-progress");
+    if (options.marker)
+      NodeFS.writeFileSync(
+        markerPath,
+        typeof options.marker === "string" ? options.marker : JSON.stringify(options.marker),
+      );
+    NodeFS.writeFileSync(NodePath.join(home, "clock"), "0");
+    NodeFS.writeFileSync(NodePath.join(home, "events"), "");
+    const executable = (name: string, body: string) =>
+      NodeFS.writeFileSync(NodePath.join(bin, name), `#!/bin/sh\nset -eu\n${body}\n`, {
+        mode: 0o755,
+      });
+    NodeFS.writeFileSync(
+      NodePath.join(home, "clock.cjs"),
+      `
+const fs = require('node:fs');
+Date.now = () => Number(fs.readFileSync(process.env.HOME + '/clock', 'utf8'));
+`,
+    );
+    executable(
+      options.archive ? "test-node" : "node",
+      `
+case "\${2:-}" in
+  */server-runtime.json)
+    # A started server publishes its runtime record, which the launch waits for.
+    # The fake nohup runs in the background, so wait for it instead of racing it.
+    if [ -e "$HOME/picked-port" ]; then
+      while [ ! -e "$HOME/started-server" ]; do /bin/sleep 0.01; done
+    fi
+    if [ -e "$HOME/started-server" ]; then
+      printf 'record %s\\n' "$(cat "$HOME/clock")" >> "$HOME/events"
+      printf '%s 5999' "$(cat "$HOME/started-server")"
+      exit 0
+    fi
+    NOW="$(cat "$HOME/clock")"
+    printf 'runtime %s\\n' "$NOW" >> "$HOME/events"
+    if [ "$NOW" -ge "$TEST_READY_AT" ] || [ -e "$2" ]; then printf '%s %s' "$TEST_SERVER_PID" 4888
+    elif [ "$TEST_PUBLISH_AFTER_FIRST_READ" = 1 ]; then
+      mkdir -p "\${2%/*}"
+      printf '{}' > "$2"
+      rm -f "$HOME/.t3/runtime/desktop-update-in-progress"
+      exit 1
+    elif [ -n "$TEST_INITIAL_PORT" ]; then printf '%s %s' "$TEST_SERVER_PID" "$TEST_INITIAL_PORT"
+    else exit 1; fi ;;
+  */port)
+    printf 'start %s\\n' "$(cat "$HOME/clock")" >> "$HOME/events"
+    touch "$HOME/picked-port"
+    printf 5999 ;;
+  [0-9]*)
+    NOW="$(cat "$HOME/clock")"
+    printf 'probe %s %s\\n' "$2" "$NOW" >> "$HOME/events"
+    [ "$2" = 5999 ] || { [ "$2" = 4888 ] && { [ "$NOW" -ge "$TEST_READY_AT" ] || [ -e "$HOME/.t3/userdata/server-runtime.json" ]; }; } ;;
+  */desktop-update-in-progress)
+    printf 'marker %s\\n' "$(cat "$HOME/clock")" >> "$HOME/events"
+    exec "$TEST_REAL_NODE" --require "$HOME/clock.cjs" "$@" ;;
+  *) exec "$TEST_REAL_NODE" --require "$HOME/clock.cjs" "$@" ;;
+esac`,
+    );
+    executable(
+      "sleep",
+      `awk -v seconds="$1" '{ printf "%.0f", $1 + seconds * 1000 }' "$HOME/clock" > "$HOME/clock.next"
+mv "$HOME/clock.next" "$HOME/clock"
+if [ "$TEST_CLEAR_MARKER" = 1 ] && [ "$(cat "$HOME/clock")" -ge "$TEST_READY_AT" ]; then
+  rm -f "$HOME/.t3/runtime/desktop-update-in-progress"
+fi
+if [ -n "$TEST_CLOCK_JUMP" ] && [ ! -e "$HOME/jumped" ]; then
+  printf '%s' "$TEST_CLOCK_JUMP" > "$HOME/clock"
+  touch "$HOME/jumped"
+fi`,
+    );
+    executable("nohup", 'printf "%s" "$$" > "$HOME/started-server"');
+    // The test process stands in for a recorded server; report the serve command it would run.
+    executable(
+      "ps",
+      `if [ "$*" = "-ww -o args= -p $TEST_SERVER_PID" ]; then
+  printf '/bin/sh %s/.t3/ssh-launch/test-target/run-t3.sh serve --host 127.0.0.1 --port 5999\\n' "$HOME"
+  exit 0
+fi
+PATH=/usr/bin:/bin exec ps "$@"`,
+    );
+    if (options.recordedKind) {
+      const state = NodePath.join(home, ".t3/ssh-launch/test-target");
+      NodeFS.mkdirSync(state, { recursive: true });
+      NodeFS.writeFileSync(NodePath.join(state, "pid"), String(process.pid));
+      NodeFS.writeFileSync(NodePath.join(state, "port"), "5999");
+      NodeFS.writeFileSync(NodePath.join(state, "managed"), options.recordedKind);
+      const runner = script.split("cat >\"$RUNNER_NEXT\" <<'SH'\n")[1]?.split("\nSH\n")[0];
+      if (!runner) throw new Error("runner missing");
+      NodeFS.writeFileSync(NodePath.join(state, "run-t3.sh"), runner + "\n");
+    }
+    if (options.archive) {
+      executable("node", 'printf "unexpected host node invocation\\n" >&2; exit 1');
+      const version = NodePath.join(home, ".t3/runtime/versions/1.2.3");
+      NodeFS.mkdirSync(version, { recursive: true });
+      NodeFS.writeFileSync(NodePath.join(version, ".install-complete"), "1.2.3");
+      NodeFS.writeFileSync(
+        NodePath.join(home, "helper.ts"),
+        `
+import * as Effect from "effect/Effect";
+import * as NodeServices from "@effect/platform-node/NodeServices";
+import { Command } from "effect/cli";
+import { sshHelperCommand } from ${JSON.stringify(NodePath.join(root, "apps/server/src/cli/sshHelper.ts"))};
+await Effect.runPromise(Command.runWith(sshHelperCommand, { version: "1.2.3" })(process.argv.slice(2)).pipe(Effect.provide(NodeServices.layer)));
+`,
+      );
+      NodeFS.writeFileSync(
+        NodePath.join(version, "t3"),
+        `#!/bin/sh
+set -eu
+if [ "$1" = --version ]; then printf 1.2.3; exit; fi
+[ "$1" = __ssh-helper ]
+case "$2" in
+  update-remaining) printf 'marker %s\\n' "$(cat "$HOME/clock")" >> "$HOME/events"; exec "$TEST_REAL_NODE" --require "$HOME/clock.cjs" "$HOME/helper.ts" "$2" "$3" ;;
+  runtime-port | pick-port | wait-ready) exec "$HOME/bin/test-node" - "$3" ;;
+  *) exit 1 ;;
+esac
+`,
+        { mode: 0o755 },
+      );
+    }
+    const result = NodeChildProcess.spawnSync("/bin/sh", ["-s", "--", "test-target"], {
+      input: `kill() {
+  if [ "$1" = -0 ]; then command kill "$@"; else
+    printf 'kill %s\\n' "$*" >> "$HOME/events"
+    return 1
+  fi
+}
+${script}`,
+      encoding: "utf8",
+      timeout: 30_000,
+      env: {
+        ...process.env,
+        HOME: home,
+        PATH: `${bin}:/usr/bin:/bin`,
+        TEST_REAL_NODE: process.execPath,
+        TEST_CLEAR_MARKER: options.clearMarkerOnReady ? "1" : "0",
+        TEST_CLOCK_JUMP: options.clockJump === undefined ? "" : String(options.clockJump),
+        TEST_SERVER_PID: String(process.pid),
+        TEST_READY_AT: String(options.readyAt ?? 1_000_000),
+        TEST_INITIAL_PORT: options.initialPort === undefined ? "" : String(options.initialPort),
+        TEST_PUBLISH_AFTER_FIRST_READ: options.publishAfterFirstRuntimeRead ? "1" : "0",
+      },
+    });
+    if (result.error || result.status !== 0)
+      throw new Error(
+        `launcher failed: ${result.error ?? result.status}\n${result.stderr}\n${result.stdout}\n${NodeFS.readFileSync(NodePath.join(home, "events"), "utf8")}`,
+      );
+    return {
+      output: JSON.parse(result.stdout.trim()),
+      events: NodeFS.readFileSync(NodePath.join(home, "events"), "utf8").trim().split("\n"),
+      now: Number(NodeFS.readFileSync(NodePath.join(home, "clock"), "utf8")),
+      markerExists: NodeFS.existsSync(markerPath),
+    };
+  } finally {
+    NodeFS.rmSync(home, { recursive: true, force: true });
+  }
+}
diff --git a/packages/ssh/src/tunnel.test.ts b/packages/ssh/src/tunnel.test.ts
index 03f8ebe2a62e..67e3945f1aa5 100644
--- a/packages/ssh/src/tunnel.test.ts
+++ b/packages/ssh/src/tunnel.test.ts
@@ -27,6 +27,7 @@ import { TestClock } from "effect/testing";
 import { HttpClient, HttpClientError, HttpClientResponse } from "effect/http";
 import { ChildProcess, ChildProcessSpawner } from "effect/process";
 
+import { captureLauncher, captureLauncherFor, runLauncher } from "./launcherTestHarness.ts";
 import * as SshAuth from "./auth.ts";
 import { remoteStateKey } from "./command.ts";
 import { SshCommandError, SshPasswordPromptError, SshReadinessError } from "./errors.ts";
@@ -133,7 +134,12 @@ const serve = (tries) => {
 serve(40);
 `;
 
-// Runs the remote half of an SSH command (`sh -l -s -- <key>`) as a local shell
+// The launch's POSIX bootstrap without the account login shell around it, so the
+// test machine's login profile cannot move HOME.
+const launchStateKey = (command: ChildProcess.Command) =>
+  /exec sh -s -- (\S+)"/u.exec(commandArgs(command).join(" "))?.[1];
+
+// Runs the remote half of an SSH launch as a local shell
 // whose HOME is the given directory. Every launch after the first starts once
 // a server is running (or after 10s), which lines up the race deterministically.
 const localRemoteShellLayer = (home: string) =>
@@ -151,7 +157,7 @@ const localRemoteShellLayer = (home: string) =>
         return spawner.spawn(
           ChildProcess.make(
             "sh",
-            ["-c", `${gate}exec sh -s -- "$1"`, "sh", ...commandArgs(command).slice(-1)],
+            ["-c", `${gate}exec sh -s -- "$1"`, "sh", launchStateKey(command) ?? ""],
             {
               ...command.options,
               env: { ...command.options.env, HOME: home },
@@ -165,6 +171,56 @@ const localRemoteShellLayer = (home: string) =>
   );
 
 describe("ssh tunnel scripts", () => {
+  it.live("distinguishes an incompatible remote Node from a missing executable", () =>
+    Effect.gen(function* () {
+      const fs = yield* FileSystem.FileSystem;
+      const home = yield* fs.makeTempDirectoryScoped({ prefix: "t3-ssh-node-" });
+      const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
+      for (const missing of [false, true]) {
+        const nodeFixture = missing
+          ? "command() { return 1; }; "
+          : 'node() { cat >/dev/null; printf "Remote node 18.20.8 does not satisfy required range >=999.0.0.\\n" >&2; return 1; }; ';
+        const remoteShell = ChildProcessSpawner.make((command) => {
+          if (command._tag !== "StandardCommand") return spawner.spawn(command);
+          return spawner.spawn(
+            ChildProcess.make(
+              "sh",
+              ["-c", `${nodeFixture}eval "$(cat)"`, "sh", ...commandArgs(command).slice(-1)],
+              {
+                ...command.options,
+                env: {
+                  ...command.options.env,
+                  HOME: home,
+                  NVM_DIR: NodePath.join(home, ".nvm"),
+                  FNM_DIR: NodePath.join(home, ".fnm"),
+                  VOLTA_HOME: NodePath.join(home, ".volta"),
+                },
+              },
+            ),
+          );
+        });
+        const result = yield* SshTunnel.launchOrReuseRemoteServer(
+          { alias: "devbox", hostname: "devbox", username: null, port: null },
+          undefined,
+          { nodeScriptPath: "/unused/server.ts", nodeEngineRange: ">=999.0.0" },
+        ).pipe(
+          Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, remoteShell),
+          Effect.result,
+        );
+        assert.isTrue(Result.isFailure(result));
+        if (!Result.isFailure(result)) return;
+        assert.isTrue(isSshCommandError(result.failure));
+        if (!isSshCommandError(result.failure)) return;
+        assert.equal(result.failure.exitCode, 1);
+        assert.equal(result.failure.stderr.includes("missing node on PATH"), missing);
+        assert.equal(
+          result.failure.stderr.includes("does not satisfy required range >=999.0.0"),
+          !missing,
+        );
+      }
+    }).pipe(Effect.scoped, Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))),
+  );
+
   it("rejects archive versions that are not a single exact version segment", () => {
     for (const archiveVersion of [
       "../other",
@@ -296,12 +352,8 @@ describe("ssh tunnel scripts", () => {
       username: "julius",
       port: 2222,
     } as const;
-    const spawnedCommands: Array<ReadonlyArray<string>> = [];
-    const spawner = ChildProcessSpawner.make((command) =>
-      Effect.sync(() => {
-        spawnedCommands.push(commandArgs(command));
-        return makeSuccessfulProcess('loaded nvm default\n{"remotePort":3774}\n');
-      }),
+    const spawner = ChildProcessSpawner.make(() =>
+      Effect.succeed(makeSuccessfulProcess('loaded nvm default\n{"remotePort":3774}\n')),
     );
     const layerSpawner = Layer.succeed(ChildProcessSpawner.ChildProcessSpawner, spawner);
     const layerProcess = Layer.merge(
@@ -312,10 +364,112 @@ describe("ssh tunnel scripts", () => {
     return Effect.gen(function* () {
       const result = yield* SshTunnel.launchOrReuseRemoteServer(target, undefined, ARCHIVE);
       assert.equal(result.remotePort, 3774);
-      assert.deepEqual(spawnedCommands[0]?.slice(-5, -1), ["sh", "-l", "-s", "--"]);
     }).pipe(Effect.provide(layerProcess));
   });
 
+  it.effect.skipIf(HostProcess.Platform.defaultValue() === "win32")(
+    "loads login settings without changing the POSIX bootstrap or its state key",
+    () =>
+      Effect.gen(function* () {
+        const fs = yield* FileSystem.FileSystem;
+        const directory = yield* fs.makeTempDirectoryScoped({ prefix: "t3-ssh-login-" });
+        const startupFile = `${directory}/bash-env`;
+        const bash = `${directory}/bash`;
+        // System profiles can reset HOME. Suppress profile reads while BASH_ENV
+        // checks that the launcher still requests Bash login mode.
+        yield* fs.writeFileString(bash, '#!/bin/sh\nexec /bin/bash --noprofile "$@"\n');
+        yield* fs.chmod(bash, 0o755);
+        yield* fs.writeFileString(
+          startupFile,
+          "if shopt -q login_shell; then export T3_SSH_LOGIN_ENV=loaded; fi\n",
+        );
+        const target = { alias: "login-test", hostname: "login-test", username: null, port: null };
+        let remoteCommand = "";
+        const capture = ChildProcessSpawner.make((command) =>
+          Effect.sync(() => {
+            const args = commandArgs(command);
+            remoteCommand = args.slice(args.indexOf(target.alias) + 1).join(" ");
+            return makeSuccessfulProcess('{"remotePort":3774}\n');
+          }),
+        );
+        yield* SshTunnel.launchOrReuseRemoteServer(target, undefined, ARCHIVE).pipe(
+          Effect.provideService(ChildProcessSpawner.ChildProcessSpawner, capture),
+        );
+        yield* fs.writeFileString(
+          `${directory}/.zprofile`,
+          "if [[ -o login ]]; then export T3_SSH_LOGIN_ENV=loaded; fi\n",
+        );
+        const spawner = yield* ChildProcessSpawner.ChildProcessSpawner;
+        const cases = [
+          { shell: bash, outerShell: "/bin/sh", expected: "loaded" },
+          { shell: "/bin/sh", outerShell: "/bin/sh", expected: "missing" },
+          { shell: "", outerShell: "/bin/sh", expected: "missing" },
+          { shell: "/unavailable/csh", outerShell: "/bin/sh", expected: "missing" },
+          { shell: "/unavailable/tcsh", outerShell: "/bin/sh", expected: "missing" },
+          { shell: "/unavailable/pwsh", outerShell: "/bin/sh", expected: "missing" },
+        ];
+        if (yield* fs.exists("/bin/zsh")) {
+          cases.push({ shell: "/bin/zsh", outerShell: "/bin/zsh", expected: "loaded" });
+        }
+        if (yield* fs.exists("/bin/tcsh")) {
+          cases.push({ shell: "/bin/tcsh", outerShell: "/bin/tcsh", expected: "missing" });
+        }
+        const environment = yield* HostProcess.Environment;
+        for (const folder of (environment.PATH ?? "").split(":")) {
+          const nu = `${folder}/nu`;
+          if (folder && (yield* fs.exists(nu))) {
+            cases.push({ shell: nu, outerShell: nu, expected: "missing" });
+            break;
+          }
+        }
+        for (const { shell, outerShell, expected } of cases) {
+          const child = yield* spawner.spawn(
+            ChildProcess.make(outerShell, ["-c", remoteCommand], {
+              env: {
+                PATH: environment.PATH ?? "/usr/bin:/bin",
+                HOME: directory,
+                XDG_CONFIG_HOME: directory,
+                SHELL: shell,
+                BASH_ENV: startupFile,
+                ZDOTDIR: directory,
+                T3_SSH_LOGIN_ENV: "",
+              },
+              stdin: {
+                stream: Stream.make(
+                  new TextEncoder().encode('printf "%s:%s" "${T3_SSH_LOGIN_ENV:-missing}" "$1"'),
+                ),
+                endOnDone: true,
+              },
+            }),
+          );
+          const [stdout, stderr, exitCode] = yield* Effect.all(
+            [
+              child.stdout.pipe(
+                Stream.decodeText(),
+                Stream.runFold(
+                  () => "",
+                  (a, b) => a + b,
+                ),
+              ),
+              child.stderr.pipe(
+                Stream.decodeText(),
+                Stream.runFold(
+                  () => "",
+                  (a, b) => a + b,
+                ),
+              ),
+              child.exitCode,
+            ],
+            { concurrency: "unbounded" },
+          );
+          assert.equal(Number(exitCode), 0, stderr);
+          // First-run shell messages can precede the bootstrap response.
+          const response = stdout.trim().split(/\r?\n/u).at(-1) ?? "";
+          assert.match(response, new RegExp(`^${expected}:[a-f0-9]{16}$`), shell || "unset SHELL");
+        }
+      }).pipe(Effect.provide(Layer.merge(NodeServices.layer, NodeCrypto.layer))),
+  );
+
   it.effect("accepts pretty-printed pairing JSON after remote shell startup noise", () => {
     const target = {
       alias: "devbox",
@@ -527,6 +681,75 @@ describe("ssh tunnel scripts", () => {
     }),
   );
 
+  it.effect("connects and reuses a tunnel whose responses take over a second", () =>
+    Effect.gen(function* () {
+      // Over a ~1s RTT link each request through the forward takes a few round trips.
+      const RESPONSE_MS = 2_500;
+      const tunnelSpawned = yield* Deferred.make<void>();
+      const reconnectProbed = yield* Deferred.make<void>();
+      const forwardReplaced = yield* Deferred.make<void>();
+      let forwards = 0;
+      let connected = false;
+      const spawner = ChildProcessSpawner.make((command) =>
+        commandArgs(command).includes("-N")
+          ? Effect.sync(() => ++forwards).pipe(
+              Effect.flatMap((count) =>
+                Deferred.succeed(count === 1 ? tunnelSpawned : forwardReplaced, undefined),
+              ),
+              Effect.as(makeRunningProcess(() => undefined)),
+            )
+          : Effect.succeed(makeSuccessfulProcess('{"remotePort":3773}\n')),
+      );
+      const httpClient = HttpClient.make((request) =>
+        Effect.gen(function* () {
+          if (connected) yield* Deferred.succeed(reconnectProbed, undefined);
+          yield* Effect.sleep(Duration.millis(RESPONSE_MS));
+          return HttpClientResponse.fromWeb(request, new Response("", { status: 200 }));
+        }),
+      );
+      const layer = Layer.mergeAll(
+        NodeServices.layer,
+        NodeCrypto.layer,
+        Layer.succeed(ChildProcessSpawner.ChildProcessSpawner, spawner),
+        Layer.succeed(HttpClient.HttpClient, httpClient),
+        Layer.succeed(NetService.NetService, testNetService),
+        SshAuth.SshPasswordPrompt.disabledLayer,
+        SshTunnel.SshEnvironmentManager.layer({ resolveCliRunner: Effect.succeed(ARCHIVE) }),
+      );
+      yield* Effect.gen(function* () {
+        const manager = yield* SshTunnel.SshEnvironmentManager;
+        const ensure = yield* Effect.forkChild(
+          Effect.result(
+            manager.ensureEnvironment({
+              alias: "devbox",
+              hostname: "devbox",
+              username: null,
+              port: null,
+            }),
+          ),
+        );
+        yield* Deferred.await(tunnelSpawned);
+        yield* TestClock.adjust(Duration.seconds(60));
+        const result = yield* Fiber.join(ensure);
+        assert.isTrue(
+          Result.isSuccess(result),
+          Result.isFailure(result) ? result.failure.message : undefined,
+        );
+        if (Result.isFailure(result)) return;
+
+        connected = true;
+        const reconnect = yield* Effect.forkChild(manager.ensureEnvironment(result.success.target));
+        yield* Deferred.await(reconnectProbed);
+        yield* TestClock.adjust(Duration.seconds(60));
+        const outcome = yield* Effect.raceFirst(
+          Fiber.join(reconnect).pipe(Effect.map((environment) => environment.httpBaseUrl)),
+          Deferred.await(forwardReplaced).pipe(Effect.as("replaced the forward")),
+        );
+        assert.equal(outcome, result.success.httpBaseUrl);
+      }).pipe(Effect.provide(layer), Effect.scoped);
+    }),
+  );
+
   it.effect("reconnects a saved alias through the port its ssh config names now", () =>
     Effect.gen(function* () {
       let configPort = 53_791;
@@ -746,7 +969,7 @@ describe("ssh tunnel scripts", () => {
               }
               return tunnel;
             }
-            if (args.some((arg, index) => arg === "-s" && args[index + 1] === "--")) {
+            if (args.includes("-c")) {
               if (isTarget) {
                 launches += 1;
                 remoteRunning = true;
@@ -923,17 +1146,20 @@ server.listen(Number(flag("--port") ?? 0), "127.0.0.1", () => {
       const fakeServer = `${root}/fake-t3.cjs`;
       yield* fs.makeDirectory(home, { recursive: true });
       yield* fs.writeFileString(fakeServer, FAKE_SERVER);
-      // Runs the remote command locally under the temp HOME, without -l so the test
-      // machine's login profile cannot move HOME. setsid keeps a launched server alive
+      // Runs the remote command locally under the temp HOME. setsid keeps a launched server alive
       // when the command's process group goes away, as sshd would.
       const sshAsLocalShell = ChildProcessSpawner.make((command) => {
         if (command._tag !== "StandardCommand" || command.command !== "ssh") {
           return realSpawner.spawn(command);
         }
         if (command.args.includes("-G")) return Effect.succeed(makeSuccessfulProcess(""));
-        const remoteArgs = command.args.slice(command.args.indexOf("--") + 2);
+        const stateKey = launchStateKey(command);
+        const remoteArgs =
+          stateKey === undefined
+            ? command.args.slice(command.args.indexOf("--") + 2)
+            : ["sh", "-s", "--", stateKey];
         return realSpawner.spawn(
-          ChildProcess.make("setsid", ["-w", ...remoteArgs.filter((arg) => arg !== "-l")], {
+          ChildProcess.make("setsid", ["-w", ...remoteArgs], {
             ...command.options,
             env: { PATH: process.env.PATH ?? "", HOME: home },
             extendEnv: false,
@@ -1037,3 +1263,135 @@ server.listen(Number(flag("--port") ?? 0), "127.0.0.1", () => {
 // desktop app with network access on) listens on *:<port>. Linux refuses that
 // bind unless both sockets set SO_REUSEPORT, so on Linux the preload adds it to
 // the picker's probe and the holder sets it too.
+
+describe("SSH launch during desktop update", () => {
+  it.effect("archive launcher reuses the replacement without host Node", () =>
+    Effect.gen(function* () {
+      const script = yield* captureLauncherFor({ archiveVersion: "1.2.3" });
+      const result = runLauncher(script, {
+        archive: true,
+        marker: { startedAt: 0, expiresAt: 60_000 },
+        readyAt: 2_000,
+      });
+      assert.deepEqual(result.output, { remotePort: 4888, serverKind: "external" });
+      assert.equal(result.now, 2_000);
+      assert.isFalse(result.events.some((event) => event.startsWith("start ")));
+    }),
+  );
+
+  it.effect.each(["managed", "external"] as const)(
+    "reuses recorded %s server without runtime metadata or an update wait",
+    (recordedKind) =>
+      Effect.gen(function* () {
+        const result = runLauncher(yield* captureLauncher, {
+          marker: { startedAt: 0, expiresAt: 60_000 },
+          recordedKind,
+        });
+        assert.deepEqual(result.output, { remotePort: 5999, serverKind: recordedKind });
+        assert.equal(result.now, 0);
+        assert.isFalse(result.events.some((event) => event.startsWith("kill ")));
+        assert.isFalse(result.events.some((event) => event.startsWith("start ")));
+      }),
+  );
+
+  it.effect.each([
+    ["malformed", "broken"],
+    ["future", { startedAt: 1_000, expiresAt: 61_000 }],
+    ["expired", { startedAt: -60_000, expiresAt: 0 }],
+  ] as const)("preserves %s markers without waiting", ([, marker]) =>
+    Effect.gen(function* () {
+      const result = runLauncher(yield* captureLauncher, { marker });
+      assert.equal(result.now, 0);
+      assert.isTrue(result.markerExists);
+      assert.deepEqual(result.output, { remotePort: 5999, serverKind: "managed" });
+    }),
+  );
+
+  it.effect("bounds the wait when the host clock jumps back", () =>
+    Effect.gen(function* () {
+      const result = runLauncher(yield* captureLauncher, {
+        marker: { startedAt: 0, expiresAt: 60_000 },
+        clockJump: -30_000,
+      });
+      assert.deepEqual(result.output, { remotePort: 5999, serverKind: "managed" });
+      assert.isBelow(result.events.filter((event) => event.startsWith("runtime ")).length, 62);
+    }),
+  );
+
+  it.effect("refreshes runtime after readiness removes the marker between polls", () =>
+    Effect.gen(function* () {
+      const result = runLauncher(yield* captureLauncher, {
+        marker: { startedAt: 0, expiresAt: 60_000 },
+        readyAt: 8_000,
+        clearMarkerOnReady: true,
+      });
+      assert.deepEqual(result.output, { remotePort: 4888, serverKind: "external" });
+      assert.equal(result.now, 8_000);
+      assert.isFalse(result.markerExists);
+      assert.isFalse(result.events.some((event) => event.startsWith("start ")));
+      assert.isFalse(result.events.some((event) => event.startsWith("kill ")));
+    }),
+  );
+
+  it.effect("reuses a runtime published before the first marker read", () =>
+    Effect.gen(function* () {
+      const result = runLauncher(yield* captureLauncher, {
+        marker: { startedAt: 0, expiresAt: 60_000 },
+        publishAfterFirstRuntimeRead: true,
+      });
+      assert.deepEqual(result.output, { remotePort: 4888, serverKind: "external" });
+      assert.equal(result.now, 0);
+      assert.isFalse(result.events.some((event) => event.startsWith("start ")));
+    }),
+  );
+
+  it.effect("waits across the eight-second installer gap and reuses the replacement server", () =>
+    Effect.gen(function* () {
+      const result = runLauncher(yield* captureLauncher, {
+        marker: { startedAt: 0, expiresAt: 60_000 },
+        readyAt: 8_000,
+      });
+      assert.deepEqual(result.output, { remotePort: 4888, serverKind: "external" });
+      assert.equal(result.now, 8_000);
+      assert.isFalse(result.events.some((event) => event.startsWith("start ")));
+      assert.isAtLeast(result.events.filter((event) => event.startsWith("runtime ")).length, 2);
+    }),
+  );
+
+  it.effect("keeps waiting while a stale runtime record points at a dead port", () =>
+    Effect.gen(function* () {
+      const result = runLauncher(yield* captureLauncher, {
+        marker: { startedAt: 0, expiresAt: 60_000 },
+        initialPort: 3773,
+        readyAt: 3_000,
+      });
+      assert.deepEqual(result.output, { remotePort: 4888, serverKind: "external" });
+      assert.equal(result.now, 3_000);
+      assert.isFalse(result.events.some((event) => event.startsWith("start ")));
+    }),
+  );
+
+  it.effect("starts a server when the marker expires without a replacement becoming ready", () =>
+    Effect.gen(function* () {
+      const result = runLauncher(yield* captureLauncher, {
+        marker: { startedAt: 0, expiresAt: 60_000 },
+      });
+      assert.deepEqual(result.output, { remotePort: 5999, serverKind: "managed" });
+      assert.isAtLeast(result.now, 60_000);
+      assert.isAtMost(result.now, 61_000);
+      assert.isTrue(result.markerExists, "an expired marker is ignored, not deleted");
+      assert.equal(result.events.filter((event) => event.startsWith("start ")).length, 1);
+    }),
+  );
+
+  it.effect("starts immediately without a marker", () =>
+    Effect.gen(function* () {
+      const result = runLauncher(yield* captureLauncher, {});
+      assert.deepEqual(result.output, { remotePort: 5999, serverKind: "managed" });
+      assert.equal(result.now, 0);
+      assert.equal(result.events.filter((event) => event.startsWith("start ")).length, 1);
+      assert.equal(result.events.filter((event) => event.startsWith("marker ")).length, 1);
+      assert.equal(result.events.filter((event) => event.startsWith("runtime ")).length, 1);
+    }),
+  );
+});
diff --git a/packages/ssh/src/tunnel.ts b/packages/ssh/src/tunnel.ts
index 5d4ac857b17b..aec0da3c9f77 100644
--- a/packages/ssh/src/tunnel.ts
+++ b/packages/ssh/src/tunnel.ts
@@ -1,3 +1,7 @@
+import {
+  DESKTOP_UPDATE_IN_PROGRESS_MARKER_FILE,
+  DESKTOP_UPDATE_IN_PROGRESS_TTL_MS,
+} from "@t3tools/contracts";
 import type {
   DesktopSshEnvironmentBootstrap,
   DesktopSshEnvironmentTarget,
@@ -51,6 +55,8 @@ const DEFAULT_REMOTE_PORT = 3773;
 const REMOTE_PORT_SCAN_WINDOW = 200;
 const SSH_READY_TIMEOUT_MS = 20_000;
 const SSH_READY_PROBE_TIMEOUT_MS = 1_000;
+// Probes through the forward pay several link round trips, about 4s at a 1s RTT.
+const SSH_TUNNEL_READY_PROBE_TIMEOUT_MS = 5_000;
 const TUNNEL_SHUTDOWN_TIMEOUT_MS = 2_000;
 const TUNNEL_STDERR_TAIL_CHARS = 16_384;
 const REMOTE_READY_TIMEOUT_MS = 60_000;
@@ -70,19 +76,26 @@ const REMOTE_PID_EXIT_WAIT_MS = 2_000;
 // The server answers HTTP before it writes server-runtime.json, which is how
 // a launch for another alias finds it.
 const REMOTE_RUNTIME_RECORD_WAIT_SECONDS = 10;
+// The desktop update wait runs under the home lock. Its last poll and the
+// adoption after it each add a reuse probe, and the poll adds one sleep.
+const REMOTE_UPDATE_WAIT_MS =
+  DESKTOP_UPDATE_IN_PROGRESS_TTL_MS +
+  2 * (REMOTE_REUSE_READY_TIMEOUT_MS + SSH_READY_PROBE_TIMEOUT_MS) +
+  1_000;
 // A launch holds the home lock through up to two reuse probes, readiness, two
-// server exit waits, and the runtime record wait; each probe may overrun its
-// deadline by one request.
+// server exit waits, the runtime record wait, and the update wait; each probe
+// may overrun its deadline by one request.
 const REMOTE_LAUNCH_LOCK_WAIT_SECONDS = Math.ceil(
   (REMOTE_READY_TIMEOUT_MS +
     2 * REMOTE_REUSE_READY_TIMEOUT_MS +
     2 * REMOTE_PID_EXIT_WAIT_MS +
     REMOTE_RUNTIME_RECORD_WAIT_SECONDS * 1000 +
-    4 * SSH_READY_PROBE_TIMEOUT_MS) /
+    4 * SSH_READY_PROBE_TIMEOUT_MS +
+    REMOTE_UPDATE_WAIT_MS) /
     1000,
 );
 const REMOTE_LAUNCH_TIMEOUT_MS =
-  REMOTE_LAUNCH_LOCK_WAIT_SECONDS * 1000 + REMOTE_LAUNCH_BASE_TIMEOUT_MS;
+  REMOTE_LAUNCH_LOCK_WAIT_SECONDS * 1000 + REMOTE_UPDATE_WAIT_MS + REMOTE_LAUNCH_BASE_TIMEOUT_MS;
 
 export interface RemoteT3RunnerOptions {
   readonly nodeScriptPath?: string | null;
@@ -602,7 +615,9 @@ if [ "$T3_ARCHIVE_MODE" = "1" ]; then
   # archive before the port and readiness probes rely on it.
   "$RUNNER_NEXT" --version >/dev/null
 elif ! ensure_remote_node_path; then
-  printf 'Remote host is missing node on PATH. Install Node or configure a supported version manager for non-interactive shells.\\n' >&2
+  if ! command -v node >/dev/null 2>&1; then
+    printf 'Remote host is missing node on PATH. Install Node or configure a supported version manager for non-interactive shells.\\n' >&2
+  fi
   exit 1
 fi
 # Recovery runs under its own lock and re-reads the owner there, so a waiter
@@ -713,9 +728,29 @@ try {
 }
 NODE
 }
+# This script ships with the SSH client; older clients do not honor this marker.
+update_remaining() {
+  if [ "$T3_ARCHIVE_MODE" = "1" ]; then
+    "$RUNNER_FILE" __ssh-helper update-remaining "$DEFAULT_SERVER_HOME/runtime/@@T3_UPDATE_MARKER_FILE@@"
+    return
+  fi
+  node - "$DEFAULT_SERVER_HOME/runtime/@@T3_UPDATE_MARKER_FILE@@" <<'NODE'
+const fs = require("node:fs");
+const path = process.argv[2];
+try {
+  const { startedAt, expiresAt } = JSON.parse(fs.readFileSync(path, "utf8"));
+  const now = Date.now();
+  if (Number.isFinite(startedAt) && Number.isFinite(expiresAt) &&
+      startedAt <= now && expiresAt > now && expiresAt > startedAt) {
+    process.stdout.write(String(Math.min(expiresAt - now, @@T3_UPDATE_TTL_MS@@)));
+  }
+} catch {}
+NODE
+}
 REMOTE_PID="$(cat "$PID_FILE" 2>/dev/null || true)"
 REMOTE_PORT="$(cat "$PORT_FILE" 2>/dev/null || true)"
 REMOTE_MANAGED="$(cat "$MANAGED_FILE" 2>/dev/null || true)"
+adopt_default_server() {
 DEFAULT_RUNTIME_INFO="$(resolve_default_runtime_port 2>/dev/null || true)"
 DEFAULT_RUNTIME_PID=""
 DEFAULT_REMOTE_PORT=""
@@ -730,6 +765,7 @@ fi
 if [ -n "$DEFAULT_REMOTE_PORT" ] && [ "$REMOTE_MANAGED" = "managed" ] && [ "$DEFAULT_RUNTIME_PID" = "$REMOTE_PID" ]; then
   REMOTE_PORT="$DEFAULT_REMOTE_PORT"
   printf '%s\\n' "$REMOTE_PORT" >"$PORT_FILE"
+  return 0
 elif [ -n "$DEFAULT_REMOTE_PORT" ]; then
   REMOTE_PORT="$DEFAULT_REMOTE_PORT"
   if wait_ready "@@T3_REUSE_READY_TIMEOUT_MS@@"; then
@@ -751,12 +787,16 @@ elif [ -n "$DEFAULT_REMOTE_PORT" ]; then
       REMOTE_PID=""
       REMOTE_MANAGED="external"
     fi
+    return 0
   else
     REMOTE_PID="$(cat "$PID_FILE" 2>/dev/null || true)"
     REMOTE_PORT="$(cat "$PORT_FILE" 2>/dev/null || true)"
     REMOTE_MANAGED="$(cat "$MANAGED_FILE" 2>/dev/null || true)"
   fi
 fi
+return 1
+}
+adopt_default_server || true
 if [ "$REMOTE_MANAGED" = "external" ]; then
   # A server adopted above has just answered. While it is still alive, probing
   # it again could catch a momentary stall and launch a second server beside it.
@@ -804,6 +844,30 @@ if [ -z "$REMOTE_PORT" ] && [ -z "$DEFAULT_RUNTIME_INFO" ]; then
     break
   done
 fi
+if [ -z "$REMOTE_PORT" ]; then
+  # The sleep count bounds a host clock that stops advancing.
+  UPDATE_WAITED=0
+  UPDATE_SAW_MARKER=0
+  while [ "$UPDATE_WAITED" -le @@T3_UPDATE_TTL_SECONDS@@ ]; do
+    UPDATE_REMAINING="$(update_remaining 2>/dev/null || true)"
+    [ -n "$UPDATE_REMAINING" ] || break
+    UPDATE_SAW_MARKER=1
+    [ "$UPDATE_WAITED" -lt @@T3_UPDATE_TTL_SECONDS@@ ] || break
+    if adopt_default_server; then break; fi
+    REMOTE_PID=""
+    REMOTE_PORT=""
+    REMOTE_MANAGED=""
+    sleep 1
+    UPDATE_WAITED=$((UPDATE_WAITED + 1))
+  done
+  # The desktop clears the marker after publishing runtime, possibly before the first marker read,
+  # so refresh once more before falling back. A cleanly stopped server leaves no runtime file.
+  if { [ "$UPDATE_SAW_MARKER" -eq 1 ] || [ -f "$DEFAULT_RUNTIME_FILE" ]; } && [ -z "$REMOTE_PORT" ] && ! adopt_default_server; then
+    REMOTE_PID=""
+    REMOTE_PORT=""
+    REMOTE_MANAGED=""
+  fi
+fi
 if [ -z "$REMOTE_PORT" ]; then
   REMOTE_PORT="$(pick_port)" || true
   if [ -z "$REMOTE_PORT" ]; then
@@ -949,6 +1013,9 @@ export function buildRemoteNodeEnvScript(input?: RemoteT3RunnerOptions): string
 
 function buildRemoteLaunchScript(input?: RemoteT3RunnerOptions): string {
   return applyScriptPlaceholders(REMOTE_LAUNCH_SCRIPT, {
+    T3_UPDATE_MARKER_FILE: DESKTOP_UPDATE_IN_PROGRESS_MARKER_FILE,
+    T3_UPDATE_TTL_MS: String(DESKTOP_UPDATE_IN_PROGRESS_TTL_MS),
+    T3_UPDATE_TTL_SECONDS: String(DESKTOP_UPDATE_IN_PROGRESS_TTL_MS / 1000),
     T3_ARCHIVE_MODE: isNodeScriptRunner(input) ? "0" : "1",
     T3_NODE_ENV_SCRIPT: buildRemoteNodeEnvScript(input),
     T3_RUNNER_SCRIPT: stripTrailingNewlines(buildRemoteT3RunnerScript(input)),
@@ -1003,7 +1070,15 @@ export const launchOrReuseRemoteServer = Effect.fn("ssh/tunnel.launchOrReuseRemo
       stateKey,
     });
     const result = yield* runSshCommand(target, {
-      remoteCommandArgs: ["sh", "-l", "-s", "--", stateKey],
+      // Shells known to take `-l -c` with a POSIX-style `exec` read their own login
+      // profiles first; any other shell (csh, pwsh, ...) keeps the plain `sh -l` launch.
+      remoteCommandArgs: [
+        "sh",
+        "-c",
+        shellSingleQuote(
+          `case "\${SHELL##*/}" in bash|zsh|ksh|fish|nu) exec "$SHELL" -l -c "exec sh -s -- ${stateKey}" ;; *) exec sh -l -s -- ${stateKey} ;; esac`,
+        ),
+      ],
       stdin: buildRemoteLaunchScript(runner),
       timeoutMs: isNodeScriptRunner(runner)
         ? REMOTE_LAUNCH_TIMEOUT_MS
@@ -1159,7 +1234,7 @@ const waitForHttpReady = (input: {
     ...(input.path === undefined ? {} : { path: input.path }),
     ...(input.timeoutMs === undefined ? {} : { timeoutMs: input.timeoutMs }),
     ...(input.intervalMs === undefined ? {} : { intervalMs: input.intervalMs }),
-    probeTimeoutMs: input.probeTimeoutMs ?? SSH_READY_PROBE_TIMEOUT_MS,
+    probeTimeoutMs: input.probeTimeoutMs ?? SSH_TUNNEL_READY_PROBE_TIMEOUT_MS,
     makeError: ({ requestUrl, probeTimeoutMs, cause }) => {
       if (typeof cause === "object" && cause !== null && "kind" in cause) {
         const kind = (cause as { readonly kind?: unknown }).kind;
@@ -1784,7 +1859,10 @@ const makeSshEnvironmentManager = Effect.fn("ssh/tunnel.SshEnvironmentManager.ma
         remotePort: entry.remotePort,
       });
       const readinessExit = yield* Effect.exit(
-        waitForHttpReady({ baseUrl: entry.httpBaseUrl, timeoutMs: 2_000 }),
+        waitForHttpReady({
+          baseUrl: entry.httpBaseUrl,
+          timeoutMs: SSH_TUNNEL_READY_PROBE_TIMEOUT_MS,
+        }),
       );
       if (Exit.isSuccess(readinessExit)) {
         yield* Effect.logDebug("ssh.environment.tunnel.reused", {
diff --git a/packages/tailscale/src/tailscale.test.ts b/packages/tailscale/src/tailscale.test.ts
index 569a204c0651..095323e037ac 100644
--- a/packages/tailscale/src/tailscale.test.ts
+++ b/packages/tailscale/src/tailscale.test.ts
@@ -110,6 +110,7 @@ describe("tailscale", () => {
       ] as const) {
         const reachable = yield* probeTailscaleHttpsEndpoint({
           baseUrl: "https://desktop.example.ts.net",
+          environmentId: "this-environment",
         }).pipe(
           Effect.provideService(
             HttpClient.HttpClient,
@@ -123,6 +124,34 @@ describe("tailscale", () => {
     }),
   );
 
+  it.effect("does not treat another T3 server behind the Serve URL as this server", () =>
+    Effect.gen(function* () {
+      const answer = (environmentId: string) =>
+        HttpClient.make((request) =>
+          Effect.succeed(
+            HttpClientResponse.fromWeb(
+              request,
+              Response.json({
+                environmentId,
+                label: "T3 server",
+                platform: { os: "linux", arch: "x64" },
+                serverVersion: "0.1.9",
+                capabilities: { repositoryIdentity: true },
+              }),
+            ),
+          ),
+        );
+      const probe = (served: string) =>
+        probeTailscaleHttpsEndpoint({
+          baseUrl: "https://desktop.example.ts.net",
+          environmentId: "this-environment",
+        }).pipe(Effect.provideService(HttpClient.HttpClient, answer(served)));
+
+      assert.isTrue(yield* probe("this-environment"));
+      assert.isFalse(yield* probe("another-environment"));
+    }),
+  );
+
   it("finds the Serve routes that forward to the bound address, and only those", () => {
     const status = JSON.stringify({
       TCP: {
@@ -255,6 +284,7 @@ describe("tailscale", () => {
     Effect.gen(function* () {
       const status = yield* parseTailscaleStatus(tailscaleStatusJson);
       assert.deepEqual(status, {
+        running: null,
         magicDnsName: "desktop.tail.ts.net",
         tailnetIpv4Addresses: ["100.100.100.100"],
         httpsServeEnabled: null,
@@ -417,6 +447,29 @@ describe("tailscale", () => {
     }),
   );
 
+  // regression: #35510 - without the https capability `tailscale serve` prints an
+  // enablement notice, writes no Serve config, and still exits 0.
+  it.effect("fails serve when the tailnet has not enabled HTTPS", () => {
+    const layer = layerMockSpawner((_command, args) => {
+      if (args[0] === "status") {
+        return {
+          stdout:
+            '{"BackendState":"Running","Self":{"DNSName":"desktop.tail.ts.net.","CapMap":{}}}',
+        };
+      }
+      if (args[1] === "status") return { stdout: "{}\n" };
+      return { stdout: "\nYou don't have permission to enable this feature.\n" };
+    });
+
+    return Effect.gen(function* () {
+      const exit = yield* ensureTailscaleServe({ localPort: 3773 }).pipe(
+        Effect.provide(layer),
+        Effect.exit,
+      );
+      assert.isTrue(Exit.isFailure(exit), "no Serve route was configured");
+    });
+  });
+
   // regression: #21609 - without forceKillAfter a timed-out probe only gets
   // SIGTERM, so a group member that ignores it outlives the call.
   it.effect("escalates timed-out probes to SIGKILL", () => {
@@ -439,7 +492,7 @@ describe("tailscale", () => {
       yield* readTailscaleStatus.pipe(Effect.provide(layer));
       yield* readTailscaleSshEnabled.pipe(Effect.provide(layer));
       yield* ensureTailscaleServe({ localPort: 45_678 }).pipe(Effect.provide(layer));
-      assert.deepEqual(killGraces, [500, 500, 500]);
+      assert.deepEqual(killGraces, [500, 500, 500, 500]);
     });
   });
 });
diff --git a/packages/tailscale/src/tailscale.ts b/packages/tailscale/src/tailscale.ts
index 03ab702c86dd..0456f95ab485 100644
--- a/packages/tailscale/src/tailscale.ts
+++ b/packages/tailscale/src/tailscale.ts
@@ -1,5 +1,6 @@
 import { ExecutionEnvironmentDescriptor } from "@t3tools/contracts";
 import * as HostProcess from "@t3tools/shared/HostProcess";
+import * as NetService from "@t3tools/shared/Net";
 import { isLocalLoopbackHost, normalizeHostname } from "@t3tools/shared/hostClassification";
 import * as Duration from "effect/Duration";
 import * as Effect from "effect/Effect";
@@ -46,6 +47,7 @@ export const TailscaleStderrDiagnostic = Schema.Literals([
   "not-logged-in",
   "not-running",
   "permission-denied",
+  "unsupported-target",
   "unknown",
 ]);
 export type TailscaleStderrDiagnostic = typeof TailscaleStderrDiagnostic.Type;
@@ -62,6 +64,8 @@ const STDERR_DIAGNOSTIC_PATTERNS: ReadonlyArray<
     "not-running",
   ],
   [/permission denied|access denied|must be root|operation not permitted/i, "permission-denied"],
+  // The macOS apps, and tailscaled without SO_MARK, proxy only to localhost, 127.0.0.1 and ::1.
+  [/doesn't support connecting to remote destinations/i, "unsupported-target"],
 ];
 
 const stderrDiagnosticOf = (stderr: string): TailscaleStderrDiagnostic | undefined => {
@@ -145,12 +149,18 @@ const TailscaleStatusSelf = Schema.Struct({
 });
 
 const TailscaleStatusJson = Schema.Struct({
+  BackendState: Schema.optional(Schema.Unknown),
   Self: Schema.optional(TailscaleStatusSelf),
 });
 
 export type TailscaleStatusJson = typeof TailscaleStatusJson.Type;
 
 export interface TailscaleStatus {
+  /**
+   * `tailscale down` keeps `Self` from the last netmap, so the DNS name alone
+   * does not mean the tailnet is reachable. `null` when the CLI omits BackendState.
+   */
+  readonly running: boolean | null;
   readonly magicDnsName: string | null;
   readonly tailnetIpv4Addresses: readonly string[];
   /**
@@ -220,6 +230,7 @@ export const parseTailscaleStatus = (
 
       const capMap = parsed.Self?.CapMap;
       return {
+        running: parsed.BackendState === undefined ? null : parsed.BackendState === "Running",
         magicDnsName: normalizeMagicDnsName(parsed),
         tailnetIpv4Addresses,
         httpsServeEnabled:
@@ -443,16 +454,35 @@ const runTailscaleCommand = Effect.fn("tailscale.runTailscaleCommand")(function*
   );
 });
 
-export const ensureTailscaleServe = (input: {
+export class TailscaleServeHttpsDisabledError extends Schema.TaggedError<TailscaleServeHttpsDisabledError>()(
+  "TailscaleServeHttpsDisabledError",
+  {},
+) {
+  override get message(): string {
+    return "Tailscale Serve needs HTTPS enabled on the tailnet. Enable HTTPS certificates at https://login.tailscale.com/admin/dns.";
+  }
+}
+
+export const ensureTailscaleServe = Effect.fn("tailscale.ensureTailscaleServe")(function* (input: {
   readonly localPort: number;
   readonly servePort?: number;
   readonly localHost?: string;
-}): Effect.Effect<void, TailscaleCommandError, ChildProcessSpawner.ChildProcessSpawner> => {
+}): Effect.fn.Return<
+  void,
+  TailscaleCommandError | TailscaleServeHttpsDisabledError,
+  ChildProcessSpawner.ChildProcessSpawner
+> {
+  // Without the capability `tailscale serve` prints an enablement notice and exits 0, or blocks on
+  // it, having configured nothing either way.
+  const status = yield* Effect.option(readTailscaleStatus);
+  if (Option.isSome(status) && status.value.httpsServeEnabled === false) {
+    return yield* new TailscaleServeHttpsDisabledError();
+  }
   const servePort = input.servePort ?? DEFAULT_TAILSCALE_SERVE_PORT;
   const localHost = input.localHost ?? "127.0.0.1";
   const args = ["serve", "--bg", `--https=${servePort}`, `http://${localHost}:${input.localPort}`];
-  return runTailscaleCommand(args, TAILSCALE_SERVE_TIMEOUT);
-};
+  return yield* runTailscaleCommand(args, TAILSCALE_SERVE_TIMEOUT);
+});
 
 /** A Serve route: a web handler at `mount` on `servePort`, or a TCP forward without one. */
 export interface TailscaleServeRoute {
@@ -697,7 +727,7 @@ export const parseTailscaleServeRootHolders = (
   return [...tcp, ...web];
 };
 
-export const readTailscaleServeRootHolders = (
+const readTailscaleServeRootHolders = (
   servePort: number,
   target: { readonly host: string; readonly port: number },
 ) =>
@@ -710,19 +740,42 @@ export const readTailscaleServeRootHolders = (
     }),
   );
 
+/**
+ * Who holds the root of `servePort`: nobody, the server at `target`, only dead loopback ports (an
+ * unclean exit leaves one), or another live server or app, whose route must be left alone.
+ */
+export const readTailscaleServeRootHolder = Effect.fn("tailscale.readTailscaleServeRootHolder")(
+  function* (servePort: number, target: { readonly host: string; readonly port: number }) {
+    const net = yield* NetService.NetService;
+    const holders = yield* readTailscaleServeRootHolders(servePort, target);
+    if (holders.length === 0) return "none" as const;
+    if (holders.some((holder) => holder.ours)) return "ours" as const;
+    const live = yield* Effect.forEach(holders, (holder) =>
+      holder.ours || holder.loopback === undefined
+        ? Effect.succeed(true)
+        : net.hasListenerOnHost(holder.loopback.port, holder.loopback.host),
+    );
+    return live.includes(true) ? ("other" as const) : ("dead" as const);
+  },
+);
+
 export const probeTailscaleHttpsEndpoint = Effect.fn("tailscale.probeTailscaleHttpsEndpoint")(
-  function* (input: { readonly baseUrl: string; readonly timeout?: Duration.Input }) {
+  function* (input: {
+    readonly baseUrl: string;
+    readonly environmentId: string;
+    readonly timeout?: Duration.Input;
+  }) {
     const client = yield* HttpClient.HttpClient;
     const descriptor = yield* Effect.gen(function* () {
       const url = new URL("/.well-known/t3/environment", input.baseUrl);
       const response = yield* client
         .execute(HttpClientRequest.get(url.toString()))
         .pipe(Effect.flatMap(HttpClientResponse.filterStatusOk));
-      // A Serve mapping to another app also answers 2xx; only a T3 descriptor proves this server.
+      // Another app or another T3 server can hold the Serve port; only our own descriptor counts.
       return yield* HttpClientResponse.schemaBodyJson(ExecutionEnvironmentDescriptor)(response);
     }).pipe(Effect.timeoutOption(input.timeout ?? TAILSCALE_PROBE_TIMEOUT));
 
-    return Option.isSome(descriptor);
+    return Option.isSome(descriptor) && descriptor.value.environmentId === input.environmentId;
   },
   Effect.orElseSucceed(() => false),
 );
diff --git a/patches/@expo__ui@58.0.27.patch b/patches/@expo__ui@58.0.27.patch
new file mode 100644
index 000000000000..0ecb33e6a8ba
--- /dev/null
+++ b/patches/@expo__ui@58.0.27.patch
@@ -0,0 +1,24 @@
+diff --git a/android/src/main/java/expo/modules/ui/RNHostView.kt b/android/src/main/java/expo/modules/ui/RNHostView.kt
+--- a/android/src/main/java/expo/modules/ui/RNHostView.kt
++++ b/android/src/main/java/expo/modules/ui/RNHostView.kt
+@@ -847,7 +847,19 @@
+   override fun setNestedScrollingEnabled(enabled: Boolean) {
+     childHelper.isNestedScrollingEnabled = enabled
+   }
+-  override fun isNestedScrollingEnabled(): Boolean = childHelper.isNestedScrollingEnabled
++  // Relaying above only needs the helper's flag. Views that look for a scroll target, like
++  // Material's BottomSheetBehavior, read this one, so a host of buttons must not claim to scroll.
++  override fun isNestedScrollingEnabled(): Boolean =
++    childHelper.isNestedScrollingEnabled && hasNestedScrollingDescendant(this)
++
++  private fun hasNestedScrollingDescendant(group: ViewGroup): Boolean {
++    for (index in 0 until group.childCount) {
++      val child = group.getChildAt(index)
++      if (child.isNestedScrollingEnabled) return true
++      if (child is ViewGroup && hasNestedScrollingDescendant(child)) return true
++    }
++    return false
++  }
+   override fun startNestedScroll(axes: Int): Boolean = childHelper.startNestedScroll(axes)
+   override fun startNestedScroll(axes: Int, type: Int): Boolean = childHelper.startNestedScroll(axes, type)
+   override fun stopNestedScroll() = childHelper.stopNestedScroll()
diff --git a/patches/@ff-labs__fff-node@0.11.0.patch b/patches/@ff-labs__fff-node@0.11.0.patch
index 76e45e152a51..8468783d2a6a 100644
--- a/patches/@ff-labs__fff-node@0.11.0.patch
+++ b/patches/@ff-labs__fff-node@0.11.0.patch
@@ -1,16 +1,5 @@
-diff --git a/package.json b/package.json
---- a/package.json
-+++ b/package.json
-@@ -11,7 +11,7 @@
-     ".": {
-       "types": "./dist/index.d.ts",
-       "import": "./dist/index.js",
--      "require": "./dist/index.cjs",
-+      "require": "./dist/index.js",
-       "default": "./dist/index.js"
-     },
-     "./package.json": "./package.json"
 diff --git a/dist/fff-api.d.ts b/dist/fff-api.d.ts
+index 0f90eedca20655ccd30b8f28e433b2094341fbdf..c2ef86927d6e3ab0e8584330fa0ac3fdacc06cf5 100644
 --- a/dist/fff-api.d.ts
 +++ b/dist/fff-api.d.ts
 @@ -199,7 +199,7 @@ export type Location = {
@@ -40,7 +29,34 @@ diff --git a/dist/fff-api.d.ts b/dist/fff-api.d.ts
      scores: Score[];
      /** Total number of items (files + dirs) that matched */
      totalMatched: number;
+diff --git a/dist/finder.d.ts b/dist/finder.d.ts
+index 452102d720cc19b0560cfc9e2f1a320687047c92..3d3211c70a7de4b97792edb32cc9466c8ba89547 100644
+--- a/dist/finder.d.ts
++++ b/dist/finder.d.ts
+@@ -242,6 +242,10 @@ export declare class FileFinder implements FileFinderApi {
+      * background watcher might have missed.
+      */
+     scanFiles(): Result<void>;
++    /**
++     * Trigger a rescan without blocking the JS thread. Patched in T3 Code.
++     */
++    scanFilesAsync(): Promise<Result<void>>;
+     /**
+      * Check if a scan is currently in progress.
+      */
+@@ -254,6 +258,10 @@ export declare class FileFinder implements FileFinderApi {
+      * Get the current scan progress.
+      */
+     getScanProgress(): Result<ScanProgress>;
++    /**
++     * Read scan progress without blocking the JS thread. Patched in T3 Code.
++     */
++    getScanProgressAsync(): Promise<Result<ScanProgress>>;
+     /**
+      * Wait for the initial file scan to complete.
+      * Non-blocking: polls `isScanning` and yields to the event loop between checks.
 diff --git a/dist/index.js b/dist/index.js
+index 7c1d722eabc8d8eb98998eb48c5fe9d70b749d10..138e590bdcb1bc4fd33f7d195b8d588ac7f86cc9 100644
 --- a/dist/index.js
 +++ b/dist/index.js
 @@ -1,7 +1,7 @@
@@ -86,7 +102,45 @@ diff --git a/dist/index.js b/dist/index.js
    if (isNullPointer(ptr)) return null;
    try {
      const [str] = restorePointer({
-@@ -426,9 +437,9 @@ function ffiDestroy(handle) {
+@@ -303,6 +314,26 @@ function freeResult(resultPtr) {
+ function readResultEnvelope(funcName, paramsType, paramsValue) {
+   loadLibrary();
+   const { rawPtr, struct: structData } = callRaw(funcName, paramsType, paramsValue);
++  return envelopeFromRaw(rawPtr, structData);
++}
++async function readResultEnvelopeOnNativeThread(funcName, handle) {
++  loadLibrary();
++  const rawPtr = await load({
++    library: LIBRARY_KEY,
++    funcName,
++    retType: DataType.External,
++    paramsType: [DataType.External],
++    paramsValue: [handle],
++    freeResultMemory: false,
++    runInNewThread: true
++  });
++  const [structData] = restorePointer({
++    retType: [FFF_RESULT_STRUCT],
++    paramsValue: wrapPointer([rawPtr])
++  });
++  return envelopeFromRaw(rawPtr, structData);
++}
++function envelopeFromRaw(rawPtr, structData) {
+   if (structData.success === 0) {
+     const errorStr = readCString(structData.error);
+     freeResult(rawPtr);
+@@ -311,7 +342,9 @@ function readResultEnvelope(funcName, paramsType, paramsValue) {
+   return { rawPtr, struct: structData };
+ }
+ function callVoidResult(funcName, paramsType, paramsValue) {
+-  const res = readResultEnvelope(funcName, paramsType, paramsValue);
++  return voidResultFromEnvelope(readResultEnvelope(funcName, paramsType, paramsValue));
++}
++function voidResultFromEnvelope(res) {
+   if ("ok" in res) return res;
+   freeResult(res.rawPtr);
+   return { ok: true, value: void 0 };
+@@ -426,9 +459,9 @@ function ffiDestroy(handle) {
    });
  }
  var FFF_FILE_ITEM_STRUCT = {
@@ -99,7 +153,7 @@ diff --git a/dist/index.js b/dist/index.js
    size: DataType.U64,
    modified: DataType.U64,
    access_frecency_score: DataType.I64,
-@@ -445,8 +456,9 @@ var FFF_SCORE_STRUCT = {
+@@ -445,8 +478,9 @@ var FFF_SCORE_STRUCT = {
    distance_penalty: DataType.I32,
    current_file_penalty: DataType.I32,
    combo_match_boost: DataType.I32,
@@ -110,7 +164,7 @@ diff --git a/dist/index.js b/dist/index.js
  };
  var FFF_SEARCH_RESULT_STRUCT = {
    items: DataType.External,
-@@ -462,8 +474,8 @@ var FFF_SEARCH_RESULT_STRUCT = {
+@@ -462,8 +496,8 @@ var FFF_SEARCH_RESULT_STRUCT = {
    location_end_col: DataType.I32
  };
  var FFF_DIR_ITEM_STRUCT = {
@@ -121,7 +175,7 @@ diff --git a/dist/index.js b/dist/index.js
    max_access_frecency: DataType.I32
  };
  var FFF_DIR_SEARCH_RESULT_STRUCT = {
-@@ -475,9 +487,9 @@ var FFF_DIR_SEARCH_RESULT_STRUCT = {
+@@ -475,9 +509,9 @@ var FFF_DIR_SEARCH_RESULT_STRUCT = {
  };
  var FFF_MIXED_ITEM_STRUCT = {
    item_type: DataType.U8,
@@ -134,7 +188,7 @@ diff --git a/dist/index.js b/dist/index.js
    size: DataType.U64,
    modified: DataType.U64,
    access_frecency_score: DataType.I64,
-@@ -500,10 +512,10 @@ var FFF_MIXED_SEARCH_RESULT_STRUCT = {
+@@ -500,10 +534,10 @@ var FFF_MIXED_SEARCH_RESULT_STRUCT = {
    location_end_col: DataType.I32
  };
  var FFF_GREP_MATCH_STRUCT = {
@@ -149,7 +203,7 @@ diff --git a/dist/index.js b/dist/index.js
    match_ranges: DataType.External,
    context_before: DataType.External,
    context_after: DataType.External,
-@@ -598,18 +610,13 @@ function readMixedItemFromRaw(raw) {
+@@ -598,18 +632,13 @@ function readMixedItemFromRaw(raw) {
  }
  function callAccessor(funcName, resultPtr, index, structDef) {
    loadLibrary();
@@ -170,7 +224,7 @@ diff --git a/dist/index.js b/dist/index.js
  }
  function ptrOffset(base, bytes) {
    return load({
-@@ -766,6 +773,7 @@ function parseSearchResult(rawPtr) {
+@@ -766,6 +795,7 @@ function parseSearchResult(rawPtr) {
    }
    const items = [];
    const scores = [];
@@ -178,7 +232,7 @@ diff --git a/dist/index.js b/dist/index.js
    for (let i = 0; i < count; i++) {
      const rawItem = callAccessor(
        "fff_search_result_get_item",
-@@ -774,13 +782,15 @@ function parseSearchResult(rawPtr) {
+@@ -774,13 +804,15 @@ function parseSearchResult(rawPtr) {
        FFF_FILE_ITEM_STRUCT
      );
      items.push(readFileItemFromRaw(rawItem));
@@ -201,7 +255,7 @@ diff --git a/dist/index.js b/dist/index.js
    }
    load({
      library: LIBRARY_KEY,
-@@ -824,6 +834,7 @@ function parseDirSearchResult(rawPtr) {
+@@ -824,6 +856,7 @@ function parseDirSearchResult(rawPtr) {
    const count = sr.count;
    const items = [];
    const scores = [];
@@ -209,7 +263,7 @@ diff --git a/dist/index.js b/dist/index.js
    for (let i = 0; i < count; i++) {
      const rawItem = callAccessor(
        "fff_dir_search_result_get_item",
-@@ -832,13 +843,15 @@ function parseDirSearchResult(rawPtr) {
+@@ -832,13 +865,15 @@ function parseDirSearchResult(rawPtr) {
        FFF_DIR_ITEM_STRUCT
      );
      items.push(readDirItemFromRaw(rawItem));
@@ -232,7 +286,7 @@ diff --git a/dist/index.js b/dist/index.js
    }
    load({
      library: LIBRARY_KEY,
-@@ -897,6 +910,7 @@ function parseMixedSearchResult(rawPtr) {
+@@ -897,6 +932,7 @@ function parseMixedSearchResult(rawPtr) {
    }
    const items = [];
    const scores = [];
@@ -240,7 +294,7 @@ diff --git a/dist/index.js b/dist/index.js
    for (let i = 0; i < count; i++) {
      const rawItem = callAccessor(
        "fff_mixed_search_result_get_item",
-@@ -905,13 +919,15 @@ function parseMixedSearchResult(rawPtr) {
+@@ -905,13 +941,15 @@ function parseMixedSearchResult(rawPtr) {
        FFF_MIXED_ITEM_STRUCT
      );
      items.push(readMixedItemFromRaw(rawItem));
@@ -263,3 +317,108 @@ diff --git a/dist/index.js b/dist/index.js
    }
    load({
      library: LIBRARY_KEY,
+@@ -1188,7 +1226,11 @@ var FFF_SCAN_PROGRESS_STRUCT = {
+ };
+ function ffiGetScanProgress(handle) {
+   loadLibrary();
+-  const res = readResultEnvelope("fff_get_scan_progress", [DataType.External], [handle]);
++  return scanProgressFromEnvelope(
++    readResultEnvelope("fff_get_scan_progress", [DataType.External], [handle])
++  );
++}
++function scanProgressFromEnvelope(res) {
+   if ("ok" in res) return res;
+   const handlePtr = res.struct.handle;
+   freeResult(res.rawPtr);
+@@ -1429,6 +1471,8 @@ var FileFinder = class _FileFinder {
+   handle;
+   /** Native ids of this instance's active watch subscriptions. */
+   watchers = /* @__PURE__ */ new Set();
++  /** Patched in T3 Code: in-flight native-thread calls by function name. */
++  nativeThreadCalls = /* @__PURE__ */ new Map();
+   constructor(handle) {
+     this.handle = handle;
+   }
+@@ -1485,12 +1529,37 @@ var FileFinder = class _FileFinder {
+   destroy() {
+     if (this.handle !== null) {
+       const handle = this.handle;
+-      ffiDestroy(handle);
++      const watchers = this.watchers;
+       this.handle = null;
+-      ffiWatchCleanupAfterDestroy(handle, this.watchers);
+-      this.watchers.clear();
++      this.watchers = /* @__PURE__ */ new Set();
++      const release = () => {
++        ffiDestroy(handle);
++        ffiWatchCleanupAfterDestroy(handle, watchers);
++      };
++      // Patched in T3 Code: a native-thread call may still be using the handle.
++      if (this.nativeThreadCalls.size > 0) {
++        Promise.allSettled(this.nativeThreadCalls.values()).then(release);
++      } else {
++        release();
++      }
+     }
+   }
++  /**
++   * Patched in T3 Code: runs a handle-only call on a libuv pool thread so waiting on fff's
++   * picker lock never blocks the JS thread. Concurrent callers share one call, so one finder
++   * holds at most one pool thread per function.
++   */
++  callOnNativeThread(funcName, fromEnvelope) {
++    const guard = this.ensureAlive();
++    if (!guard.ok) return Promise.resolve(guard);
++    const pending = this.nativeThreadCalls.get(funcName);
++    if (pending) return pending;
++    const call = readResultEnvelopeOnNativeThread(funcName, guard.value).then(fromEnvelope, (cause) => err(String(cause))).finally(() => {
++      this.nativeThreadCalls.delete(funcName);
++    });
++    this.nativeThreadCalls.set(funcName, call);
++    return call;
++  }
+   /**
+    * Check if this instance has been destroyed.
+    */
+@@ -1757,6 +1826,18 @@ var FileFinder = class _FileFinder {
+     if (!guard.ok) return guard;
+     return ffiScanFiles(guard.value);
+   }
++  /**
++   * Trigger a rescan without blocking the JS thread. Patched in T3 Code.
++   */
++  scanFilesAsync() {
++    return this.callOnNativeThread("fff_scan_files", voidResultFromEnvelope);
++  }
++  /**
++   * Read scan progress without blocking the JS thread. Patched in T3 Code.
++   */
++  getScanProgressAsync() {
++    return this.callOnNativeThread("fff_get_scan_progress", scanProgressFromEnvelope);
++  }
+   /**
+    * Check if a scan is currently in progress.
+    */
+@@ -1838,7 +1919,8 @@ var FileFinder = class _FileFinder {
+     if (!guard.ok) return guard;
+     const deadline = Date.now() + timeoutMs;
+     while (true) {
+-      const progress = this.getScanProgress();
++      // Patched in T3 Code: the progress read takes the picker lock.
++      const progress = await this.getScanProgressAsync();
+       if (!progress.ok) return progress;
+       if (!progress.value.isScanning && progress.value.isWarmupComplete) {
+         return { ok: true, value: true };
+diff --git a/package.json b/package.json
+index e000a78b3f79826200979ebb3fe297b599bcea67..84325461c2d963cb42cf72267079d36a419c1398 100644
+--- a/package.json
++++ b/package.json
+@@ -11,7 +11,7 @@
+     ".": {
+       "types": "./dist/index.d.ts",
+       "import": "./dist/index.js",
+-      "require": "./dist/index.cjs",
++      "require": "./dist/index.js",
+       "default": "./dist/index.js"
+     },
+     "./package.json": "./package.json"
diff --git a/patches/electron-updater@6.8.9.patch b/patches/electron-updater@6.8.9.patch
index 29c0b3bf62b6..1e343589cb50 100644
--- a/patches/electron-updater@6.8.9.patch
+++ b/patches/electron-updater@6.8.9.patch
@@ -1,5 +1,5 @@
 diff --git a/out/electronHttpExecutor.js b/out/electronHttpExecutor.js
-index 0ae9e1126e1dc136977914ef1bfd46709fc9db1b..3932b6607ca41e6663aae001111c9b18594ed37a 100644
+index 0ae9e1126e1dc136977914ef1bfd46709fc9db1b..c298ffe7808c421c29e16f1e2ba8510f0cd31142 100644
 --- a/out/electronHttpExecutor.js
 +++ b/out/electronHttpExecutor.js
 @@ -61,6 +61,35 @@ class ElectronHttpExecutor extends builder_util_runtime_1.HttpExecutor {
@@ -38,3 +38,98 @@ index 0ae9e1126e1dc136977914ef1bfd46709fc9db1b..3932b6607ca41e6663aae001111c9b18
      addRedirectHandlers(request, options, reject, redirectCount, handler) {
          request.on("redirect", (statusCode, method, redirectUrl) => {
              // no way to modify request options, abort old and make a new one
+diff --git a/out/providers/GitHubProvider.js b/out/providers/GitHubProvider.js
+index e768d24e7a957caf32a4b8ca6c68cb50eb5865ee..708a1fa7d740192944f04259cde6d6bf79d58c53 100644
+--- a/out/providers/GitHubProvider.js
++++ b/out/providers/GitHubProvider.js
+@@ -107,6 +107,32 @@ class GitHubProvider extends BaseGitHubProvider {
+         catch (e) {
+             throw (0, builder_util_runtime_1.newError)(`Cannot parse releases feed: ${e.stack || e.message},\nXML:\n${feedXml}`, "ERR_UPDATER_INVALID_RELEASE_FEED");
+         }
++        // The atom feed lists only the 10 newest git tags of any kind, in an order GitHub picks, so
++        // the release workflow also records a prerelease channel's newest release at one fixed URL.
++        // The newer of the two answers wins; the API scan is the last resort.
++        let apiRelease = null;
++        if (this.updater.allowPrerelease && this.updater.channel) {
++            const feedTag = tag;
++            const pointer = await this.getChannelPointerRelease(this.updater.channel, cancellationToken);
++            if (pointer !== null && (tag == null || semver.gt(pointer.tag_name, tag))) {
++                apiRelease = pointer;
++                tag = pointer.tag_name;
++            }
++            // With no nightly in the feed, a pointer that offers nothing new may be stale, so the API
++            // scan still runs. Its failure is fatal only when nothing else answered.
++            if (feedTag == null && (tag == null || !semver.gt(tag, this.updater.currentVersion))) {
++                const listed = await this.getLatestChannelRelease(this.updater.channel, cancellationToken).catch(e => {
++                    if (tag == null) {
++                        throw e;
++                    }
++                    return null;
++                });
++                if (listed !== null && (tag == null || semver.gt(listed.tag_name, tag))) {
++                    apiRelease = listed;
++                    tag = listed.tag_name;
++                }
++            }
++        }
+         if (tag == null) {
+             throw (0, builder_util_runtime_1.newError)(`No published versions on GitHub`, "ERR_UPDATER_NO_PUBLISHED_VERSIONS");
+         }
+@@ -144,6 +170,14 @@ class GitHubProvider extends BaseGitHubProvider {
+             }
+         }
+         const result = (0, Provider_1.parseUpdateInfo)(rawData, channelFile, channelFileUrl);
++        if (apiRelease !== null) {
++            if (result.releaseName == null) {
++                result.releaseName = apiRelease.name || apiRelease.tag_name;
++            }
++            if (result.releaseNotes == null) {
++                result.releaseNotes = apiRelease.body || "";
++            }
++        }
+         if (result.releaseName == null) {
+             result.releaseName = latestRelease.elementValueOrEmpty("title");
+         }
+@@ -155,6 +189,42 @@ class GitHubProvider extends BaseGitHubProvider {
+             ...result,
+         };
+     }
++    async getChannelPointerRelease(channel, cancellationToken) {
++        try {
++            const url = (0, util_1.newUrlFromBase)(this.getBaseDownloadPath("update-feed", `${channel}.json`), this.baseUrl);
++            const rawData = await this.httpRequest(url, { accept: "application/json, */*" }, cancellationToken);
++            const release = rawData == null ? null : JSON.parse(rawData);
++            const releaseChannel = release == null || typeof release.tag_name !== "string" ? null : semver.prerelease(release.tag_name);
++            return releaseChannel !== null && releaseChannel[0] === channel ? release : null;
++        }
++        catch (e) {
++            // A fork, or a moment between two uploads, has no pointer. The feed still answers.
++            return null;
++        }
++    }
++    async getLatestChannelRelease(channel, cancellationToken) {
++        for (let page = 1; page <= 5; page++) {
++            const url = new url_1.URL(`${this.computeGithubBasePath(`/repos/${this.options.owner}/${this.options.repo}/releases`)}?per_page=100&page=${page}`, this.baseApiUrl);
++            const rawData = await this.httpRequest(url, { Accept: "application/vnd.github+json" }, cancellationToken);
++            const releases = rawData == null ? [] : JSON.parse(rawData);
++            if (!Array.isArray(releases)) {
++                return null;
++            }
++            for (const release of releases) {
++                if (release == null || release.draft || typeof release.tag_name !== "string" || !semver.valid(release.tag_name)) {
++                    continue;
++                }
++                const releaseChannel = semver.prerelease(release.tag_name);
++                if (releaseChannel !== null && releaseChannel[0] === channel) {
++                    return release;
++                }
++            }
++            if (releases.length < 100) {
++                return null;
++            }
++        }
++        return null;
++    }
+     async getLatestTagName(cancellationToken) {
+         const options = this.options;
+         // do not use API for GitHub to avoid limit, only for custom host or GitHub Enterprise
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 787e546e2599..7da8fa86a62e 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -347,9 +347,9 @@ overrides:
   shell-quote@1: ^1.11.0
   smol-toml@1: ^1.9.0
   valibot@1: ^1.4.2
-  effect: 4.1.2
-  '@opencode/protocol>effect': 4.1.2
-  '@opencode/schema>effect': 4.1.2
+  effect: 4.1.3
+  '@opencode/protocol>effect': 4.1.3
+  '@opencode/schema>effect': 4.1.3
   node-abi: 4.33.0
   '@react-native/metro-config': 0.88.1
   electron-webauthn>@electron-webauthn/macos: 1.3.1
@@ -374,7 +374,8 @@ patchedDependencies:
   '@clerk/expo-native-components@0.4.4': 7a808b92da8460750b85818552e13be3fb73d111691c7db76965970351e124e4
   '@cursor/sdk@1.2.0': 57f502128bf6accd976963b126e227c86a45d815a53a8dc450461beae3bed4a4
   '@effect/vitest@4.1.2': 299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7
-  '@ff-labs/fff-node@0.11.0': cc71fcec015f4d39bc96ae2e2bf6b0ca678124c722c66a7841efce9d34b5983c
+  '@expo/ui@58.0.27': 9f2547678939f4ec78fe45163b6455aad63d3c80353d7e0cc783f6a61a7ccc2f
+  '@ff-labs/fff-node@0.11.0': a71dc3a5544fc47afacf0fe9da04dccec3018e625a76c96087ebfdf35e293768
   '@legendapp/list@3.7.2': 3c68607b8bb7a531873bcbe0b197d163ef1fdb4d4cf52a4ddf9d2b3804671658
   '@muse-code/sdk@1.4.6': 7b495b607fc5d76b444c7c4d58821e839726a30e6f3c53564f0d59f2d5b42101
   '@pierre/diffs@1.7.0-beta.3': 4a64f63a0def94c5add9d86d70560d26d6857e1f5150133862e42e1fd77bc4e8
@@ -384,7 +385,7 @@ patchedDependencies:
   alchemy@2.0.0-beta.85: 07cc8c7e14b3b9af143ddd40a059f117c27e55139fbf20bd5dde2eb30509cedd
   app-builder-lib@26.16.1: 0fbe9ae51783f5768ebe197d12d1fdb7d477a08c92e5db2f6356bcce62613c53
   dbus-next@0.10.2: cfff57561b0ee59b5addb3b2e6c6f20906e967507a530ab67e8db8108e520ba4
-  electron-updater@6.8.9: 2ed21db470f254c5e095a0eb8dabc086c310d180322004bceee7d56e7ce86b84
+  electron-updater@6.8.9: 5e096d34a46fdbaa6d48a5803b2c0ed9c7c04f8ab43a30ebebbf726f8f28ed8e
   expo-audio@58.0.11: 93691f7f59edb30a3bb2c23b489e605e7ea35506b1212d4a2ebbd1fd79079483
   expo-modules-core@58.0.30: f0b0fd100550ed76e5c25b4d13eb7c9ff62825f8f197c53edf7bf447c50c9fb7
   expo-network@58.0.4: 159c2d760d1cd5102e95df51c20600111e7a72096ef0daea8215d50cae48bd98
@@ -454,7 +455,7 @@ importers:
         version: 0.15.4
       '@effect/platform-node':
         specifier: 4.1.2
-        version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
+        version: 4.1.2(bufferutil@4.1.0)(effect@4.1.3)(redis@6.2.1)(utf-8-validate@6.0.6)
       '@napi-rs/keyring':
         specifier: ^1.3.0
         version: 1.3.0
@@ -477,8 +478,8 @@ importers:
         specifier: 0.10.2
         version: 0.10.2(patch_hash=cfff57561b0ee59b5addb3b2e6c6f20906e967507a530ab67e8db8108e520ba4)
       effect:
-        specifier: 4.1.2
-        version: 4.1.2
+        specifier: 4.1.3
+        version: 4.1.3
       electron:
         specifier: 44.10.1
         version: 44.10.1(supports-color@8.1.1)
@@ -487,7 +488,7 @@ importers:
         version: 8.2.0
       electron-updater:
         specifier: 6.8.9
-        version: 6.8.9(patch_hash=2ed21db470f254c5e095a0eb8dabc086c310d180322004bceee7d56e7ce86b84)(supports-color@8.1.1)
+        version: 6.8.9(patch_hash=5e096d34a46fdbaa6d48a5803b2c0ed9c7c04f8ab43a30ebebbf726f8f28ed8e)(supports-color@8.1.1)
       electron-webauthn:
         specifier: 'catalog:'
         version: 1.3.1(typescript@6.0.3)
@@ -506,7 +507,7 @@ importers:
     devDependencies:
       '@effect/vitest':
         specifier: 4.1.2
-        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.3)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
       '@types/node':
         specifier: 24.12.4
         version: 24.12.4
@@ -564,7 +565,7 @@ importers:
         version: 0.4.4(patch_hash=7a808b92da8460750b85818552e13be3fb73d111691c7db76965970351e124e4)(expo@58.0.23)(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0)(supports-color@8.1.1)(typescript@6.0.3)
       '@effect/atom-react':
         specifier: 4.1.2
-        version: 4.1.2(effect@4.1.2)(react@19.3.0)(scheduler@0.28.0)
+        version: 4.1.2(effect@4.1.3)(react@19.3.0)(scheduler@0.28.0)
       '@expo-google-fonts/dm-sans':
         specifier: ^0.4.2
         version: 0.4.2
@@ -573,7 +574,7 @@ importers:
         version: 58.0.17(@expo/log-box@58.0.15)(expo@58.0.23)(react-dom@19.3.0(react@19.3.0))(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0)
       '@expo/ui':
         specifier: 58.0.27
-        version: 58.0.27(@babel/core@7.29.7(supports-color@8.1.1))(expo@58.0.23)(react-dom@19.3.0(react@19.3.0))(react-native-worklets@0.13.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0)(supports-color@8.1.1))(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0)
+        version: 58.0.27(patch_hash=9f2547678939f4ec78fe45163b6455aad63d3c80353d7e0cc783f6a61a7ccc2f)(@babel/core@7.29.7(supports-color@8.1.1))(expo@58.0.23)(react-dom@19.3.0(react@19.3.0))(react-native-worklets@0.13.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0)(supports-color@8.1.1))(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0)
       '@formatjs/intl-displaynames':
         specifier: 6.8.13
         version: 6.8.13
@@ -609,7 +610,7 @@ importers:
         version: 7.5.1(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0)
       '@react-navigation/native-stack':
         specifier: 7.21.0
-        version: 7.21.0(patch_hash=990d575444c4af2ce8218b3b7a8280fe244c03abbdb32b822a2e862f791dbf42)(bce9d5917b75ecfdccb2630d9f614f34)
+        version: 7.21.0(patch_hash=990d575444c4af2ce8218b3b7a8280fe244c03abbdb32b822a2e862f791dbf42)(8cabb04b1defcb22245317e78e4e5f29)
       '@t3tools/client-runtime':
         specifier: workspace:*
         version: link:../../packages/client-runtime
@@ -641,8 +642,8 @@ importers:
         specifier: 8.0.3
         version: 8.0.3
       effect:
-        specifier: 4.1.2
-        version: 4.1.2
+        specifier: 4.1.3
+        version: 4.1.3
       expo:
         specifier: 58.0.23
         version: 58.0.23(d226faf1ca90e630d8c56a2108dee32d)
@@ -773,8 +774,8 @@ importers:
         specifier: 0.88.1
         version: 0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6)
       react-native-enriched-markdown:
-        specifier: file:deps/react-native-enriched-markdown-1.2.0-t3.18-497fbe63.tgz
-        version: file:apps/mobile/deps/react-native-enriched-markdown-1.2.0-t3.18-497fbe63.tgz(katex@0.16.47)(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0)
+        specifier: file:deps/react-native-enriched-markdown-1.2.0-t3.18-0dc7ed81.tgz
+        version: file:apps/mobile/deps/react-native-enriched-markdown-1.2.0-t3.18-0dc7ed81.tgz(katex@0.16.47)(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0)
       react-native-gesture-handler:
         specifier: 3.5.0
         version: 3.5.0(patch_hash=171379dd378f8f11e9187876dec2116e5cbf5f21cef6576cdde6956518324f98)(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0)
@@ -797,8 +798,8 @@ importers:
         specifier: ~5.11.1
         version: 5.11.1(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0)
       react-native-screens:
-        specifier: file:deps/react-native-screens-5.0.0-t3.48.tgz
-        version: file:apps/mobile/deps/react-native-screens-5.0.0-t3.48.tgz(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0)
+        specifier: file:deps/react-native-screens-5.0.0-t3.50.tgz
+        version: file:apps/mobile/deps/react-native-screens-5.0.0-t3.50.tgz(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0)
       react-native-svg:
         specifier: 15.16.1
         version: 15.16.1(patch_hash=110f9243ffad03654ce40dd1cdb09f01af16b8fa2ccb2b2cd3d62e682c180399)(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0)
@@ -829,10 +830,10 @@ importers:
         version: 7.29.7(supports-color@8.1.1)
       '@effect/platform-node':
         specifier: 4.1.2
-        version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
+        version: 4.1.2(bufferutil@4.1.0)(effect@4.1.3)(redis@6.2.1)(utf-8-validate@6.0.6)
       '@effect/vitest':
         specifier: 4.1.2
-        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.3)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
       '@pierre/trees':
         specifier: 1.0.0-beta.6
         version: 1.0.0-beta.6(@pierre/theme@2.0.0)(@shikijs/themes@4.2.0)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)(shiki@4.2.0)
@@ -874,13 +875,13 @@ importers:
         version: 1.2.0(patch_hash=57f502128bf6accd976963b126e227c86a45d815a53a8dc450461beae3bed4a4)(zod@4.6.7)
       '@effect/platform-node':
         specifier: 4.1.2
-        version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
+        version: 4.1.2(bufferutil@4.1.0)(effect@4.1.3)(redis@6.2.1)(utf-8-validate@6.0.6)
       '@effect/platform-node-shared':
         specifier: 4.1.2
-        version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6)
+        version: 4.1.2(bufferutil@4.1.0)(effect@4.1.3)(utf-8-validate@6.0.6)
       '@ff-labs/fff-node':
         specifier: 0.11.0
-        version: 0.11.0(patch_hash=cc71fcec015f4d39bc96ae2e2bf6b0ca678124c722c66a7841efce9d34b5983c)
+        version: 0.11.0(patch_hash=a71dc3a5544fc47afacf0fe9da04dccec3018e625a76c96087ebfdf35e293768)
       '@muse-code/sdk':
         specifier: 1.4.6
         version: 1.4.6(patch_hash=7b495b607fc5d76b444c7c4d58821e839726a30e6f3c53564f0d59f2d5b42101)(@types/node@24.12.4)
@@ -951,8 +952,8 @@ importers:
         specifier: 8.0.3
         version: 8.0.3
       effect:
-        specifier: 4.1.2
-        version: 4.1.2
+        specifier: 4.1.3
+        version: 4.1.3
       ffi-rs:
         specifier: 1.3.2
         version: 1.3.2
@@ -992,10 +993,10 @@ importers:
     devDependencies:
       '@effect/graphql-generator':
         specifier: 'catalog:'
-        version: 4.1.2(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6))(effect@4.1.2)
+        version: 4.1.2(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.3)(redis@6.2.1)(utf-8-validate@6.0.6))(effect@4.1.3)
       '@effect/vitest':
         specifier: 4.1.2
-        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.3)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
       '@handy-computer/models':
         specifier: 0.2.3
         version: 0.2.3
@@ -1100,7 +1101,7 @@ importers:
         version: 3.2.2(react@19.3.0)
       '@effect/atom-react':
         specifier: 4.1.2
-        version: 4.1.2(effect@4.1.2)(react@19.3.0)(scheduler@0.28.0)
+        version: 4.1.2(effect@4.1.3)(react@19.3.0)(scheduler@0.28.0)
       '@fontsource-variable/inter':
         specifier: ^5.3.0
         version: 5.3.0
@@ -1198,8 +1199,8 @@ importers:
         specifier: ^3.4.17
         version: 3.4.17
       effect:
-        specifier: 4.1.2
-        version: 4.1.2
+        specifier: 4.1.3
+        version: 4.1.3
       entities:
         specifier: 8.1.0
         version: 8.1.0
@@ -1293,10 +1294,10 @@ importers:
     devDependencies:
       '@effect/platform-node':
         specifier: 4.1.2
-        version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
+        version: 4.1.2(bufferutil@4.1.0)(effect@4.1.3)(redis@6.2.1)(utf-8-validate@6.0.6)
       '@effect/vitest':
         specifier: 4.1.2
-        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.3)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
       '@tailwindcss/vite':
         specifier: 4.3.3
         version: 4.3.3(@voidzero-dev/vite-plus-core@1.4.0(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))
@@ -1368,7 +1369,7 @@ importers:
     dependencies:
       '@effect/platform-node':
         specifier: 4.1.2
-        version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
+        version: 4.1.2(bufferutil@4.1.0)(effect@4.1.3)(redis@6.2.1)(utf-8-validate@6.0.6)
       '@t3tools/contracts':
         specifier: workspace:*
         version: link:../packages/contracts
@@ -1379,12 +1380,12 @@ importers:
         specifier: workspace:*
         version: link:../packages/shared
       effect:
-        specifier: 4.1.2
-        version: 4.1.2
+        specifier: 4.1.3
+        version: 4.1.3
     devDependencies:
       '@effect/vitest':
         specifier: 4.1.2
-        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.3)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
       '@types/node':
         specifier: 24.12.4
         version: 24.12.4
@@ -1395,8 +1396,8 @@ importers:
   infra/coil-update-relay:
     dependencies:
       effect:
-        specifier: 4.1.2
-        version: 4.1.2
+        specifier: 4.1.3
+        version: 4.1.3
     devDependencies:
       '@cloudflare/workers-types':
         specifier: ^4.20260601.1
@@ -1406,28 +1407,28 @@ importers:
     dependencies:
       '@alchemy.run/axiom':
         specifier: 'catalog:'
-        version: 2.0.0-beta.85(alchemy@2.0.0-beta.85(patch_hash=07cc8c7e14b3b9af143ddd40a059f117c27e55139fbf20bd5dde2eb30509cedd)(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.2)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6)))(effect@4.1.2)
+        version: 2.0.0-beta.85(alchemy@2.0.0-beta.85(patch_hash=07cc8c7e14b3b9af143ddd40a059f117c27e55139fbf20bd5dde2eb30509cedd)(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.3)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.3)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.3)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6)))(effect@4.1.3)
       '@alchemy.run/cloudflare':
         specifier: 'catalog:'
-        version: 2.0.0-beta.85(935199ac9c22ca360eddcc7164e5b8a7)
+        version: 2.0.0-beta.85(dabba7d529c10a239fedb30f64291b80)
       '@alchemy.run/drizzle':
         specifier: 'catalog:'
-        version: 2.0.0-beta.85(8a334cf6654889bd393813214c98db49)
+        version: 2.0.0-beta.85(eb667a4b2658382830b9c27fc99af2f0)
       '@alchemy.run/planetscale':
         specifier: 'catalog:'
-        version: 2.0.0-beta.85(@effect/sql-pg@4.1.2(effect@4.1.2))(alchemy@2.0.0-beta.85(patch_hash=07cc8c7e14b3b9af143ddd40a059f117c27e55139fbf20bd5dde2eb30509cedd)(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.2)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6)))(effect@4.1.2)(pg@8.23.0)
+        version: 2.0.0-beta.85(@effect/sql-pg@4.1.2(effect@4.1.3))(alchemy@2.0.0-beta.85(patch_hash=07cc8c7e14b3b9af143ddd40a059f117c27e55139fbf20bd5dde2eb30509cedd)(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.3)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.3)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.3)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6)))(effect@4.1.3)(pg@8.23.0)
       '@clerk/backend':
         specifier: 3.27.0
         version: 3.27.0(react-dom@19.3.0(react@19.3.0))(react@19.3.0)
       '@distilled.cloud/cloudflare':
         specifier: 'catalog:'
-        version: 1.0.0-rc.18(effect@4.1.2)
+        version: 1.0.0-rc.18(effect@4.1.3)
       '@effect/sql-pg':
         specifier: 4.1.2
-        version: 4.1.2(effect@4.1.2)
+        version: 4.1.2(effect@4.1.3)
       '@effect/sql-sqlite-do':
         specifier: 'catalog:'
-        version: 4.1.2(effect@4.1.2)
+        version: 4.1.2(effect@4.1.3)
       '@noble/curves':
         specifier: 'catalog:'
         version: 1.9.1
@@ -1445,26 +1446,26 @@ importers:
         version: link:../../packages/shared
       alchemy:
         specifier: 2.0.0-beta.85
-        version: 2.0.0-beta.85(patch_hash=07cc8c7e14b3b9af143ddd40a059f117c27e55139fbf20bd5dde2eb30509cedd)(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.2)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6))
+        version: 2.0.0-beta.85(patch_hash=07cc8c7e14b3b9af143ddd40a059f117c27e55139fbf20bd5dde2eb30509cedd)(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.3)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.3)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.3)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6))
       drizzle-orm:
         specifier: 1.0.0-rc.5
-        version: 1.0.0-rc.5(@cloudflare/workers-types@4.20260604.1)(@effect/sql-d1@4.1.1(effect@4.1.2))(@effect/sql-pg@4.1.2(effect@4.1.2))(@effect/sql-sqlite-do@4.1.2(effect@4.1.2))(@electric-sql/pglite@0.3.15)(@libsql/client@0.17.3(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/sql.js@1.4.11)(bun-types@1.3.14)(effect@4.1.2)(expo-sqlite@58.0.15(expo@58.0.23)(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0))(pg@8.23.0)(sql.js@1.15.0)(zod@4.6.7)
+        version: 1.0.0-rc.5(@cloudflare/workers-types@4.20260604.1)(@effect/sql-d1@4.1.1(effect@4.1.3))(@effect/sql-pg@4.1.2(effect@4.1.3))(@effect/sql-sqlite-do@4.1.2(effect@4.1.3))(@electric-sql/pglite@0.3.15)(@libsql/client@0.17.3(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/sql.js@1.4.11)(bun-types@1.3.14)(effect@4.1.3)(expo-sqlite@58.0.15(expo@58.0.23)(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0))(pg@8.23.0)(sql.js@1.15.0)(zod@4.6.7)
       effect:
-        specifier: 4.1.2
-        version: 4.1.2
+        specifier: 4.1.3
+        version: 4.1.3
     devDependencies:
       '@alchemy.run/test':
         specifier: 'catalog:'
-        version: 2.0.0-beta.85(patch_hash=29c0539ea71d9cc372f0b16558640599beb9bc609605feb2a493da268d72713e)(93775fed45909d71c0b8bba962f026cf)
+        version: 2.0.0-beta.85(patch_hash=29c0539ea71d9cc372f0b16558640599beb9bc609605feb2a493da268d72713e)(9cad13029aba0f237bc67ebbac58cedc)
       '@cloudflare/workers-types':
         specifier: ^4.20260601.1
         version: 4.20260604.1
       '@effect/platform-node':
         specifier: 4.1.2
-        version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
+        version: 4.1.2(bufferutil@4.1.0)(effect@4.1.3)(redis@6.2.1)(utf-8-validate@6.0.6)
       '@effect/vitest':
         specifier: 4.1.2
-        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.3)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
       '@electric-sql/pglite':
         specifier: 0.3.15
         version: 0.3.15
@@ -1473,7 +1474,7 @@ importers:
         version: 24.12.4
       drizzle-kit:
         specifier: 1.0.0-rc.5
-        version: 1.0.0-rc.5(drizzle-orm@1.0.0-rc.5(@cloudflare/workers-types@4.20260604.1)(@effect/sql-d1@4.1.1(effect@4.1.2))(@effect/sql-pg@4.1.2(effect@4.1.2))(@effect/sql-sqlite-do@4.1.2(effect@4.1.2))(@electric-sql/pglite@0.3.15)(@libsql/client@0.17.3(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/sql.js@1.4.11)(bun-types@1.3.14)(effect@4.1.2)(expo-sqlite@58.0.15(expo@58.0.23)(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0))(pg@8.23.0)(sql.js@1.15.0)(zod@4.6.7))
+        version: 1.0.0-rc.5(drizzle-orm@1.0.0-rc.5(@cloudflare/workers-types@4.20260604.1)(@effect/sql-d1@4.1.1(effect@4.1.3))(@effect/sql-pg@4.1.2(effect@4.1.3))(@effect/sql-sqlite-do@4.1.2(effect@4.1.3))(@electric-sql/pglite@0.3.15)(@libsql/client@0.17.3(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/sql.js@1.4.11)(bun-types@1.3.14)(effect@4.1.3)(expo-sqlite@58.0.15(expo@58.0.23)(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0))(pg@8.23.0)(sql.js@1.15.0)(zod@4.6.7))
       vite:
         specifier: npm:@voidzero-dev/vite-plus-core@1.4.0
         version: '@voidzero-dev/vite-plus-core@1.4.0(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0)'
@@ -1485,16 +1486,16 @@ importers:
     dependencies:
       '@alchemy.run/axiom':
         specifier: 'catalog:'
-        version: 2.0.0-beta.85(alchemy@2.0.0-beta.85(patch_hash=07cc8c7e14b3b9af143ddd40a059f117c27e55139fbf20bd5dde2eb30509cedd)(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.2)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6)))(effect@4.1.2)
+        version: 2.0.0-beta.85(alchemy@2.0.0-beta.85(patch_hash=07cc8c7e14b3b9af143ddd40a059f117c27e55139fbf20bd5dde2eb30509cedd)(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.3)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.3)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.3)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6)))(effect@4.1.3)
       '@alchemy.run/cloudflare':
         specifier: 'catalog:'
-        version: 2.0.0-beta.85(935199ac9c22ca360eddcc7164e5b8a7)
+        version: 2.0.0-beta.85(dabba7d529c10a239fedb30f64291b80)
       alchemy:
         specifier: 2.0.0-beta.85
-        version: 2.0.0-beta.85(patch_hash=07cc8c7e14b3b9af143ddd40a059f117c27e55139fbf20bd5dde2eb30509cedd)(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.2)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6))
+        version: 2.0.0-beta.85(patch_hash=07cc8c7e14b3b9af143ddd40a059f117c27e55139fbf20bd5dde2eb30509cedd)(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.3)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.3)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.3)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6))
       effect:
-        specifier: 4.1.2
-        version: 4.1.2
+        specifier: 4.1.3
+        version: 4.1.3
       jose:
         specifier: 'catalog:'
         version: 6.2.2
@@ -1504,10 +1505,10 @@ importers:
         version: 4.20260604.1
       '@effect/platform-node':
         specifier: 4.1.2
-        version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
+        version: 4.1.2(bufferutil@4.1.0)(effect@4.1.3)(redis@6.2.1)(utf-8-validate@6.0.6)
       '@effect/vitest':
         specifier: 4.1.2
-        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.3)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
       '@types/node':
         specifier: 24.12.4
         version: 24.12.4
@@ -1521,15 +1522,15 @@ importers:
         specifier: ^1.63.0
         version: 1.89.0
       effect:
-        specifier: 4.1.2
-        version: 4.1.2
+        specifier: 4.1.3
+        version: 4.1.3
     devDependencies:
       '@effect/platform-node':
         specifier: 4.1.2
-        version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
+        version: 4.1.2(bufferutil@4.1.0)(effect@4.1.3)(redis@6.2.1)(utf-8-validate@6.0.6)
       '@effect/vitest':
         specifier: 4.1.2
-        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.3)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
       vite-plus:
         specifier: 1.4.0
         version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
@@ -1582,8 +1583,8 @@ importers:
         specifier: workspace:*
         version: link:../source-control-definitions
       effect:
-        specifier: 4.1.2
-        version: 4.1.2
+        specifier: 4.1.3
+        version: 4.1.3
       jszip:
         specifier: 3.10.1
         version: 3.10.1
@@ -1596,7 +1597,7 @@ importers:
     devDependencies:
       '@effect/vitest':
         specifier: 4.1.2
-        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.3)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
       '@types/three':
         specifier: 0.180.0
         version: 0.180.0
@@ -1607,12 +1608,12 @@ importers:
   packages/contracts:
     dependencies:
       effect:
-        specifier: 4.1.2
-        version: 4.1.2
+        specifier: 4.1.3
+        version: 4.1.3
     devDependencies:
       '@effect/vitest':
         specifier: 4.1.2
-        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.3)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
       vite-plus:
         specifier: 1.4.0
         version: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
@@ -1620,18 +1621,18 @@ importers:
   packages/effect-acp:
     dependencies:
       effect:
-        specifier: 4.1.2
-        version: 4.1.2
+        specifier: 4.1.3
+        version: 4.1.3
     devDependencies:
       '@effect/openapi-generator':
         specifier: 'catalog:'
-        version: 4.1.2(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6))(effect@4.1.2)(encoding@0.1.13)
+        version: 4.1.2(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.3)(redis@6.2.1)(utf-8-validate@6.0.6))(effect@4.1.3)(encoding@0.1.13)
       '@effect/platform-node':
         specifier: 4.1.2
-        version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
+        version: 4.1.2(bufferutil@4.1.0)(effect@4.1.3)(redis@6.2.1)(utf-8-validate@6.0.6)
       '@effect/vitest':
         specifier: 4.1.2
-        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.3)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
       '@types/node':
         specifier: 24.12.4
         version: 24.12.4
@@ -1642,18 +1643,18 @@ importers:
   packages/effect-codex-app-server:
     dependencies:
       effect:
-        specifier: 4.1.2
-        version: 4.1.2
+        specifier: 4.1.3
+        version: 4.1.3
     devDependencies:
       '@effect/openapi-generator':
         specifier: 'catalog:'
-        version: 4.1.2(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6))(effect@4.1.2)(encoding@0.1.13)
+        version: 4.1.2(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.3)(redis@6.2.1)(utf-8-validate@6.0.6))(effect@4.1.3)(encoding@0.1.13)
       '@effect/platform-node':
         specifier: 4.1.2
-        version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
+        version: 4.1.2(bufferutil@4.1.0)(effect@4.1.3)(redis@6.2.1)(utf-8-validate@6.0.6)
       '@effect/vitest':
         specifier: 4.1.2
-        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.3)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
       '@types/node':
         specifier: 24.12.4
         version: 24.12.4
@@ -1676,15 +1677,15 @@ importers:
         specifier: 8.0.3
         version: 8.0.3
       effect:
-        specifier: 4.1.2
-        version: 4.1.2
+        specifier: 4.1.3
+        version: 4.1.3
     devDependencies:
       '@effect/platform-node':
         specifier: 4.1.2
-        version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
+        version: 4.1.2(bufferutil@4.1.0)(effect@4.1.3)(redis@6.2.1)(utf-8-validate@6.0.6)
       '@effect/vitest':
         specifier: 4.1.2
-        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.3)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
       '@types/node':
         specifier: 24.12.4
         version: 24.12.4
@@ -1713,15 +1714,15 @@ importers:
         specifier: workspace:*
         version: link:../shared
       effect:
-        specifier: 4.1.2
-        version: 4.1.2
+        specifier: 4.1.3
+        version: 4.1.3
     devDependencies:
       '@effect/platform-node':
         specifier: 4.1.2
-        version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
+        version: 4.1.2(bufferutil@4.1.0)(effect@4.1.3)(redis@6.2.1)(utf-8-validate@6.0.6)
       '@effect/vitest':
         specifier: 4.1.2
-        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.3)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
       '@t3tools/provider-testing':
         specifier: workspace:*
         version: link:../provider-testing
@@ -1744,15 +1745,15 @@ importers:
         specifier: workspace:*
         version: link:../shared
       effect:
-        specifier: 4.1.2
-        version: 4.1.2
+        specifier: 4.1.3
+        version: 4.1.3
     devDependencies:
       '@effect/platform-node':
         specifier: 4.1.2
-        version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
+        version: 4.1.2(bufferutil@4.1.0)(effect@4.1.3)(redis@6.2.1)(utf-8-validate@6.0.6)
       '@effect/vitest':
         specifier: 4.1.2
-        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.3)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
       '@types/node':
         specifier: 24.12.4
         version: 24.12.4
@@ -1775,18 +1776,21 @@ importers:
         specifier: workspace:*
         version: link:../shared
       effect:
-        specifier: 4.1.2
-        version: 4.1.2
+        specifier: 4.1.3
+        version: 4.1.3
+      jsonc-parser:
+        specifier: 3.3.1
+        version: 3.3.1
       yaml:
         specifier: ^2.9.0
         version: 2.9.0
     devDependencies:
       '@effect/platform-node':
         specifier: 4.1.2
-        version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
+        version: 4.1.2(bufferutil@4.1.0)(effect@4.1.3)(redis@6.2.1)(utf-8-validate@6.0.6)
       '@effect/vitest':
         specifier: 4.1.2
-        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.3)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
       '@t3tools/provider-testing':
         specifier: workspace:*
         version: link:../provider-testing
@@ -1812,15 +1816,15 @@ importers:
         specifier: workspace:*
         version: link:../shared
       effect:
-        specifier: 4.1.2
-        version: 4.1.2
+        specifier: 4.1.3
+        version: 4.1.3
     devDependencies:
       '@effect/platform-node':
         specifier: 4.1.2
-        version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
+        version: 4.1.2(bufferutil@4.1.0)(effect@4.1.3)(redis@6.2.1)(utf-8-validate@6.0.6)
       '@effect/vitest':
         specifier: 4.1.2
-        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.3)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
       '@t3tools/provider-testing':
         specifier: workspace:*
         version: link:../provider-testing
@@ -1849,15 +1853,15 @@ importers:
         specifier: workspace:*
         version: link:../shared
       effect:
-        specifier: 4.1.2
-        version: 4.1.2
+        specifier: 4.1.3
+        version: 4.1.3
     devDependencies:
       '@effect/platform-node':
         specifier: 4.1.2
-        version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
+        version: 4.1.2(bufferutil@4.1.0)(effect@4.1.3)(redis@6.2.1)(utf-8-validate@6.0.6)
       '@effect/vitest':
         specifier: 4.1.2
-        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.3)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
       '@t3tools/provider-testing':
         specifier: workspace:*
         version: link:../provider-testing
@@ -1886,15 +1890,15 @@ importers:
         specifier: workspace:*
         version: link:../shared
       effect:
-        specifier: 4.1.2
-        version: 4.1.2
+        specifier: 4.1.3
+        version: 4.1.3
     devDependencies:
       '@effect/platform-node':
         specifier: 4.1.2
-        version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
+        version: 4.1.2(bufferutil@4.1.0)(effect@4.1.3)(redis@6.2.1)(utf-8-validate@6.0.6)
       '@effect/vitest':
         specifier: 4.1.2
-        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.3)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
       '@t3tools/provider-testing':
         specifier: workspace:*
         version: link:../provider-testing
@@ -1923,15 +1927,15 @@ importers:
         specifier: workspace:*
         version: link:../shared
       effect:
-        specifier: 4.1.2
-        version: 4.1.2
+        specifier: 4.1.3
+        version: 4.1.3
     devDependencies:
       '@effect/platform-node':
         specifier: 4.1.2
-        version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
+        version: 4.1.2(bufferutil@4.1.0)(effect@4.1.3)(redis@6.2.1)(utf-8-validate@6.0.6)
       '@effect/vitest':
         specifier: 4.1.2
-        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.3)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
       '@t3tools/provider-testing':
         specifier: workspace:*
         version: link:../provider-testing
@@ -1949,7 +1953,7 @@ importers:
         version: 1.15.13
       '@opencode/client':
         specifier: 2.0.28
-        version: 2.0.28(effect@4.1.2)
+        version: 2.0.28(effect@4.1.3)
       '@opencode/protocol':
         specifier: 2.0.28
         version: 2.0.28
@@ -1966,15 +1970,15 @@ importers:
         specifier: workspace:*
         version: link:../shared
       effect:
-        specifier: 4.1.2
-        version: 4.1.2
+        specifier: 4.1.3
+        version: 4.1.3
     devDependencies:
       '@effect/platform-node':
         specifier: 4.1.2
-        version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
+        version: 4.1.2(bufferutil@4.1.0)(effect@4.1.3)(redis@6.2.1)(utf-8-validate@6.0.6)
       '@effect/vitest':
         specifier: 4.1.2
-        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.3)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
       '@t3tools/provider-testing':
         specifier: workspace:*
         version: link:../provider-testing
@@ -1997,15 +2001,15 @@ importers:
         specifier: workspace:*
         version: link:../shared
       effect:
-        specifier: 4.1.2
-        version: 4.1.2
+        specifier: 4.1.3
+        version: 4.1.3
     devDependencies:
       '@effect/platform-node':
         specifier: 4.1.2
-        version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
+        version: 4.1.2(bufferutil@4.1.0)(effect@4.1.3)(redis@6.2.1)(utf-8-validate@6.0.6)
       '@effect/vitest':
         specifier: 4.1.2
-        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.3)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
       '@t3tools/provider-testing':
         specifier: workspace:*
         version: link:../provider-testing
@@ -2020,7 +2024,7 @@ importers:
     dependencies:
       '@effect/platform-node':
         specifier: 4.1.2
-        version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
+        version: 4.1.2(bufferutil@4.1.0)(effect@4.1.3)(redis@6.2.1)(utf-8-validate@6.0.6)
       '@t3tools/contracts':
         specifier: workspace:*
         version: link:../contracts
@@ -2031,8 +2035,8 @@ importers:
         specifier: workspace:*
         version: link:../shared
       effect:
-        specifier: 4.1.2
-        version: 4.1.2
+        specifier: 4.1.3
+        version: 4.1.3
     devDependencies:
       '@types/node':
         specifier: 24.12.4
@@ -2044,15 +2048,15 @@ importers:
         specifier: workspace:*
         version: link:../contracts
       effect:
-        specifier: 4.1.2
-        version: 4.1.2
+        specifier: 4.1.3
+        version: 4.1.3
     devDependencies:
       '@effect/platform-node':
         specifier: 4.1.2
-        version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
+        version: 4.1.2(bufferutil@4.1.0)(effect@4.1.3)(redis@6.2.1)(utf-8-validate@6.0.6)
       '@effect/vitest':
         specifier: 4.1.2
-        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.3)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
       '@types/node':
         specifier: 24.12.4
         version: 24.12.4
@@ -2084,15 +2088,15 @@ importers:
         specifier: workspace:*
         version: link:../shared
       effect:
-        specifier: 4.1.2
-        version: 4.1.2
+        specifier: 4.1.3
+        version: 4.1.3
     devDependencies:
       '@effect/platform-node':
         specifier: 4.1.2
-        version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
+        version: 4.1.2(bufferutil@4.1.0)(effect@4.1.3)(redis@6.2.1)(utf-8-validate@6.0.6)
       '@effect/vitest':
         specifier: 4.1.2
-        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.3)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
       '@types/node':
         specifier: 24.12.4
         version: 24.12.4
@@ -2112,8 +2116,8 @@ importers:
         specifier: workspace:*
         version: link:../contracts
       effect:
-        specifier: 4.1.2
-        version: 4.1.2
+        specifier: 4.1.3
+        version: 4.1.3
       ffi-rs:
         specifier: 1.3.2
         version: 1.3.2
@@ -2162,10 +2166,10 @@ importers:
     devDependencies:
       '@effect/platform-node':
         specifier: 4.1.2
-        version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
+        version: 4.1.2(bufferutil@4.1.0)(effect@4.1.3)(redis@6.2.1)(utf-8-validate@6.0.6)
       '@effect/vitest':
         specifier: 4.1.2
-        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.3)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
       '@types/mdast':
         specifier: ^4.0.4
         version: 4.0.4
@@ -2194,15 +2198,15 @@ importers:
         specifier: 8.0.3
         version: 8.0.3
       effect:
-        specifier: 4.1.2
-        version: 4.1.2
+        specifier: 4.1.3
+        version: 4.1.3
     devDependencies:
       '@effect/platform-node':
         specifier: 4.1.2
-        version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
+        version: 4.1.2(bufferutil@4.1.0)(effect@4.1.3)(redis@6.2.1)(utf-8-validate@6.0.6)
       '@effect/vitest':
         specifier: 4.1.2
-        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.3)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
       '@t3tools/source-control-testing':
         specifier: workspace:*
         version: link:../source-control-testing
@@ -2228,15 +2232,15 @@ importers:
         specifier: workspace:*
         version: link:../source-control-core
       effect:
-        specifier: 4.1.2
-        version: 4.1.2
+        specifier: 4.1.3
+        version: 4.1.3
     devDependencies:
       '@effect/platform-node':
         specifier: 4.1.2
-        version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
+        version: 4.1.2(bufferutil@4.1.0)(effect@4.1.3)(redis@6.2.1)(utf-8-validate@6.0.6)
       '@effect/vitest':
         specifier: 4.1.2
-        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.3)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
       '@t3tools/source-control-testing':
         specifier: workspace:*
         version: link:../source-control-testing
@@ -2256,12 +2260,12 @@ importers:
         specifier: workspace:*
         version: link:../shared
       effect:
-        specifier: 4.1.2
-        version: 4.1.2
+        specifier: 4.1.3
+        version: 4.1.3
     devDependencies:
       '@effect/vitest':
         specifier: 4.1.2
-        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.3)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
       '@types/node':
         specifier: 24.12.4
         version: 24.12.4
@@ -2273,7 +2277,7 @@ importers:
     dependencies:
       '@effect/platform-node':
         specifier: 4.1.2
-        version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
+        version: 4.1.2(bufferutil@4.1.0)(effect@4.1.3)(redis@6.2.1)(utf-8-validate@6.0.6)
       '@t3tools/contracts':
         specifier: workspace:*
         version: link:../contracts
@@ -2287,12 +2291,12 @@ importers:
         specifier: workspace:*
         version: link:../source-control-core
       effect:
-        specifier: 4.1.2
-        version: 4.1.2
+        specifier: 4.1.3
+        version: 4.1.3
     devDependencies:
       '@effect/vitest':
         specifier: 4.1.2
-        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.3)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
       '@types/node':
         specifier: 24.12.4
         version: 24.12.4
@@ -2342,15 +2346,15 @@ importers:
         specifier: workspace:*
         version: link:../source-control-core
       effect:
-        specifier: 4.1.2
-        version: 4.1.2
+        specifier: 4.1.3
+        version: 4.1.3
     devDependencies:
       '@effect/platform-node':
         specifier: 4.1.2
-        version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
+        version: 4.1.2(bufferutil@4.1.0)(effect@4.1.3)(redis@6.2.1)(utf-8-validate@6.0.6)
       '@effect/vitest':
         specifier: 4.1.2
-        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.3)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
       '@t3tools/source-control-testing':
         specifier: workspace:*
         version: link:../source-control-testing
@@ -2376,12 +2380,12 @@ importers:
         specifier: workspace:*
         version: link:../source-control-core
       effect:
-        specifier: 4.1.2
-        version: 4.1.2
+        specifier: 4.1.3
+        version: 4.1.3
     devDependencies:
       '@effect/vitest':
         specifier: 4.1.2
-        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.3)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
       '@t3tools/source-control-testing':
         specifier: workspace:*
         version: link:../source-control-testing
@@ -2396,7 +2400,7 @@ importers:
     dependencies:
       '@effect/platform-node':
         specifier: 4.1.2
-        version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
+        version: 4.1.2(bufferutil@4.1.0)(effect@4.1.3)(redis@6.2.1)(utf-8-validate@6.0.6)
       '@t3tools/contracts':
         specifier: workspace:*
         version: link:../contracts
@@ -2410,15 +2414,15 @@ importers:
         specifier: workspace:*
         version: link:../source-control-core
       effect:
-        specifier: 4.1.2
-        version: 4.1.2
+        specifier: 4.1.3
+        version: 4.1.3
     devDependencies:
       '@effect/graphql-generator':
         specifier: 'catalog:'
-        version: 4.1.2(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6))(effect@4.1.2)
+        version: 4.1.2(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.3)(redis@6.2.1)(utf-8-validate@6.0.6))(effect@4.1.3)
       '@effect/vitest':
         specifier: 4.1.2
-        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.3)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
       '@t3tools/source-control-testing':
         specifier: workspace:*
         version: link:../source-control-testing
@@ -2441,12 +2445,12 @@ importers:
         specifier: workspace:*
         version: link:../source-control-core
       effect:
-        specifier: 4.1.2
-        version: 4.1.2
+        specifier: 4.1.3
+        version: 4.1.3
     devDependencies:
       '@effect/vitest':
         specifier: 4.1.2
-        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.3)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
       '@t3tools/source-control-testing':
         specifier: workspace:*
         version: link:../source-control-testing
@@ -2461,7 +2465,7 @@ importers:
     dependencies:
       '@effect/platform-node':
         specifier: 4.1.2
-        version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
+        version: 4.1.2(bufferutil@4.1.0)(effect@4.1.3)(redis@6.2.1)(utf-8-validate@6.0.6)
       '@t3tools/contracts':
         specifier: workspace:*
         version: link:../contracts
@@ -2472,8 +2476,8 @@ importers:
         specifier: workspace:*
         version: link:../source-control-core
       effect:
-        specifier: 4.1.2
-        version: 4.1.2
+        specifier: 4.1.3
+        version: 4.1.3
     devDependencies:
       '@types/node':
         specifier: 24.12.4
@@ -2488,15 +2492,15 @@ importers:
         specifier: workspace:*
         version: link:../shared
       effect:
-        specifier: 4.1.2
-        version: 4.1.2
+        specifier: 4.1.3
+        version: 4.1.3
     devDependencies:
       '@effect/platform-node':
         specifier: 4.1.2
-        version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
+        version: 4.1.2(bufferutil@4.1.0)(effect@4.1.3)(redis@6.2.1)(utf-8-validate@6.0.6)
       '@effect/vitest':
         specifier: 4.1.2
-        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.3)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
       '@types/node':
         specifier: 24.12.4
         version: 24.12.4
@@ -2513,12 +2517,12 @@ importers:
         specifier: workspace:*
         version: link:../shared
       effect:
-        specifier: 4.1.2
-        version: 4.1.2
+        specifier: 4.1.3
+        version: 4.1.3
     devDependencies:
       '@effect/vitest':
         specifier: 4.1.2
-        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.3)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
       '@types/node':
         specifier: 24.12.4
         version: 24.12.4
@@ -2536,7 +2540,7 @@ importers:
         version: 0.15.5(e2e@0.23.0)
       '@effect/platform-node':
         specifier: 4.1.2
-        version: 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
+        version: 4.1.2(bufferutil@4.1.0)(effect@4.1.3)(redis@6.2.1)(utf-8-validate@6.0.6)
       '@electron/asar':
         specifier: ^4.3.0
         version: 4.3.0
@@ -2559,8 +2563,8 @@ importers:
         specifier: 0.23.0
         version: 0.23.0
       effect:
-        specifier: 4.1.2
-        version: 4.1.2
+        specifier: 4.1.3
+        version: 4.1.3
       playwright-core:
         specifier: 1.64.1
         version: 1.64.1
@@ -2576,7 +2580,7 @@ importers:
     devDependencies:
       '@effect/vitest':
         specifier: 4.1.2
-        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+        version: 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.3)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
       '@types/plist':
         specifier: 'catalog:'
         version: 3.0.5
@@ -2625,13 +2629,13 @@ packages:
     resolution: {integrity: sha512-hOV18VHG6ivrbPnk35hoqlCQPc6bR8b9soGmHlSkbnPIgVZUg7jpliF9AztSSJbJK4GHcBFc9hWetwCRHzGYAg==}
     peerDependencies:
       alchemy: 2.0.0-beta.85
-      effect: 4.1.2
+      effect: 4.1.3
 
   '@alchemy.run/axiom@2.0.0-beta.85':
     resolution: {integrity: sha512-dpBBDxZaRlRIiszRYTUB9M3e3yN6hvkyYTpc0E66tJfcESY6rwp2O2fl38Mun5iLEyGJb2Gvv4HqPiURYWzrHw==}
     peerDependencies:
       alchemy: 2.0.0-beta.85
-      effect: 4.1.2
+      effect: 4.1.3
 
   '@alchemy.run/cloudflare-runtime@2.0.0-beta.85':
     resolution: {integrity: sha512-OyGH/j5R9QaUdMjvm3y6pIUpMa7T9SvVYvlVd+fWo/eltOf+k/KQxC12QHC2fe22GVs3apL28l9f4VUH8N9aEA==}
@@ -2639,7 +2643,7 @@ packages:
       '@distilled.cloud/cloudflare': 1.0.0-rc.18
       '@effect/platform-bun': 4.1.2
       '@effect/platform-node': 4.1.2
-      effect: 4.1.2
+      effect: 4.1.3
       rolldown: 1.2.13
       vite: ^7.0.0 || ^8.0.0
     peerDependenciesMeta:
@@ -2660,7 +2664,7 @@ packages:
       '@effect/platform-bun': 4.1.2
       '@effect/platform-node': 4.1.2
       alchemy: 2.0.0-beta.85
-      effect: 4.1.2
+      effect: 4.1.3
       vite: ^7.0.0 || ^8.0.0
     peerDependenciesMeta:
       '@alchemy.run/domain':
@@ -2679,7 +2683,7 @@ packages:
     peerDependencies:
       '@effect/platform-bun': 4.1.2
       alchemy: 2.0.0-beta.85
-      effect: 4.1.2
+      effect: 4.1.3
     peerDependenciesMeta:
       '@effect/platform-bun':
         optional: true
@@ -2694,7 +2698,7 @@ packages:
       alchemy: 2.0.0-beta.85
       drizzle-kit: 1.0.0-rc.5
       drizzle-orm: 1.0.0-rc.5
-      effect: 4.1.2
+      effect: 4.1.3
     peerDependenciesMeta:
       '@alchemy.run/cloudflare':
         optional: true
@@ -2714,7 +2718,7 @@ packages:
     resolution: {integrity: sha512-rBG26S6nGVF3fzCTnvMKu/Un/5H+YepOIJyld+1JeaAKV78z3U+bYtR+dSWR6KcW8tG8xX9pj83sisZdp0iNog==}
     peerDependencies:
       alchemy: 2.0.0-beta.85
-      effect: 4.1.2
+      effect: 4.1.3
       mysql2: ^3.24.2
       pg: ^8.22.0
     peerDependenciesMeta:
@@ -2742,7 +2746,7 @@ packages:
       '@effect/sql-mysql2': ^4.1.0
       '@effect/sql-pg': 4.1.2
       alchemy: 2.0.0-beta.85
-      effect: 4.1.2
+      effect: 4.1.3
       mysql2: ^3.24.2
       pg: ^8.22.0
     peerDependenciesMeta:
@@ -2765,7 +2769,7 @@ packages:
       '@effect/vitest': 4.1.2
       '@opentui/core': ^0.6.6
       alchemy: 2.0.0-beta.85
-      effect: 4.1.2
+      effect: 4.1.3
       vitest: ^5.0.4
     peerDependenciesMeta:
       '@effect/vitest':
@@ -3742,42 +3746,42 @@ packages:
   '@distilled.cloud/acme@1.0.0-rc.18':
     resolution: {integrity: sha512-OWO6NG9IcpDqZCzlrN5T4MIQqSbpZ5cw61Ru/dYn1vr3AIyx3Vlg+Ew8NhlunpURr4wqDUW2/7QW3fKbrmfwLg==}
     peerDependencies:
-      effect: 4.1.2
+      effect: 4.1.3
 
   '@distilled.cloud/aws4signer@1.0.0-rc.18':
     resolution: {integrity: sha512-eYJi2rsblwjxpa0kj2qUQYqY9cEwD6ow0njiFL6I5ZnlOqrE8I3aLiWvScoc3s9bQUQD5nFdmSnORoPJ5GsHKg==}
     peerDependencies:
-      effect: 4.1.2
+      effect: 4.1.3
 
   '@distilled.cloud/aws@1.0.0-rc.18':
     resolution: {integrity: sha512-VZDlOGEXvXvTdY/0sTEoTWnPCGde+fjvq1ZIW3wgiZK/X8ChbbonGArg+Sc9OO4E9tr1WBymASrZ906uLnLWFw==}
     peerDependencies:
-      effect: 4.1.2
+      effect: 4.1.3
 
   '@distilled.cloud/axiom@1.0.0-rc.18':
     resolution: {integrity: sha512-8z6PPKm3OlEI9ovuSgqnQBYrGU5Fg8LVrk/Xs85NBDH8kJ69ttdJ8vaSb6hILi9hHluefvYO7SJ1XTOXxH+vCw==}
     peerDependencies:
-      effect: 4.1.2
+      effect: 4.1.3
 
   '@distilled.cloud/cloudflare@1.0.0-rc.18':
     resolution: {integrity: sha512-UJB7pitkg7msm7BGTuAE8yYx4GzKdPLRtiOm3G3XHw07xLUlqEiEr4xpSf0CeziWzDygjI53FSkpC2qyVZr49g==}
     peerDependencies:
-      effect: 4.1.2
+      effect: 4.1.3
 
   '@distilled.cloud/core@1.0.0-rc.18':
     resolution: {integrity: sha512-Iui60+sNl1CwUu7NKGLuFf3VC4H9xYzfm0Fc8ZQvd87qwf1sDMB3EAWZrq/QFgrwzSY16z2mJ0PNHaBUnGet8A==}
     peerDependencies:
-      effect: 4.1.2
+      effect: 4.1.3
 
   '@distilled.cloud/iceberg@1.0.0-rc.18':
     resolution: {integrity: sha512-XjUJ/vEOylhIZbAm85O9H6YqXKWGfVROT5BE9BGA/RXvo0bLK2+sUcjC6BoN77a99lImJkrXJuvbHBhNebObEA==}
     peerDependencies:
-      effect: 4.1.2
+      effect: 4.1.3
 
   '@distilled.cloud/planetscale@1.0.0-rc.18':
     resolution: {integrity: sha512-GSpQVfwYq2QKjjQpjiMl4IUBgyS7doNX4mnIzIRzM44BMMtTwx0gMcBj7b7PVAA0O7MyKLKV134Ba1+w3u71kw==}
     peerDependencies:
-      effect: 4.1.2
+      effect: 4.1.3
 
   '@dnd-kit/accessibility@3.1.1':
     resolution: {integrity: sha512-2P+YgaXF+gRsIihwwY1gCsQSYnu9Zyj2py8kY5fFvUM1qm2WA2u639R6YNVfU4GWr+ZM5mqEsfHZZLoRONbemw==}
@@ -3827,7 +3831,7 @@ packages:
   '@effect/atom-react@4.1.2':
     resolution: {integrity: sha512-XRAm4lks2kzNFQIz9QTGKR02CaDTR9VJNRXDjDAR8OzM15ybrK4YkB7OlFZ9U+hxXe3DXJZx7RU1/xI2Em2PGQ==}
     peerDependencies:
-      effect: 4.1.2
+      effect: 4.1.3
       react: '>=19.0.0 <20.0.0'
       scheduler: '>=0.25.0 <0.29.0'
 
@@ -3836,47 +3840,47 @@ packages:
     hasBin: true
     peerDependencies:
       '@effect/platform-node': 4.1.2
-      effect: 4.1.2
+      effect: 4.1.3
 
   '@effect/openapi-generator@4.1.2':
     resolution: {integrity: sha512-seh1li7cp6XE734rWmsQ/lQ2RFp1YCMb1PP6pZ7CvFAeoAUsgM4J2z8iCllY8yE2VnswWWw9GQ/XKHLm/gpGzg==}
     hasBin: true
     peerDependencies:
       '@effect/platform-node': 4.1.2
-      effect: 4.1.2
+      effect: 4.1.3
 
   '@effect/platform-bun@4.1.2':
     resolution: {integrity: sha512-waEAa84CITqjctgw9VdhlL9PyXRHICG3KAWTFRDPUE2XL/pfMPhO7V9oFdfx22dbAhhUzV+MHs0d9hnmy/DQ7w==}
     peerDependencies:
-      effect: 4.1.2
+      effect: 4.1.3
 
   '@effect/platform-node-shared@4.1.2':
     resolution: {integrity: sha512-wSwl9A/G1hcVvF8nLI+YfB3EyOIDvWS6+lsTZBkmgDnPBL7m8YWZF+1HD+mdEsb52SUGfukip46Q3gRwSdk3QA==}
     engines: {node: '>=22.19.0'}
     peerDependencies:
-      effect: 4.1.2
+      effect: 4.1.3
 
   '@effect/platform-node@4.1.2':
     resolution: {integrity: sha512-ye0UjxORdd5Qu3paZ1LljgGOALWHt7muP9VTpjUSCNfcesiB/Hm7wPJIvZeu4gnwpTe5BtEnO1VHngWqjJp8mA==}
     engines: {node: '>=22.19.0'}
     peerDependencies:
-      effect: 4.1.2
+      effect: 4.1.3
       redis: '>=5.1.0 <7.0.0'
 
   '@effect/sql-d1@4.1.1':
     resolution: {integrity: sha512-CQMOiw9bmj4ifsUA4KLwIgBJBMpPHaF3OYdXnA9oOxeEmD61+XDLkJUSA2mG7BWCIEZc7MquGxl3HuUVOeqtSA==}
     peerDependencies:
-      effect: 4.1.2
+      effect: 4.1.3
 
   '@effect/sql-pg@4.1.2':
     resolution: {integrity: sha512-0UehR7B5W8dC+dX6fDeWStLbVbBb2M4pk4HBATEeH0cmV4Odl2lckTg0jFmLuadekTLa4OyB+bZQo1yTG1y2Mw==}
     peerDependencies:
-      effect: 4.1.2
+      effect: 4.1.3
 
   '@effect/sql-sqlite-do@4.1.2':
     resolution: {integrity: sha512-1qlYhIvNsvYxvfp1183FPMGnHN/9TAGtlMLsBB7OrVE5R/9bWnWyahMxGID79sJ6csW3Azeyxk3ZwRdWXLvNTQ==}
     peerDependencies:
-      effect: 4.1.2
+      effect: 4.1.3
 
   '@effect/tsgo-darwin-arm64@0.67.1':
     resolution: {integrity: sha512-q10xwD2s+KvZEwbY5OHGSmfAp9Is4e/a7PS4NiUVnvGnPOCbjOMEbVrYjOImy5uawPAa1CVA+55qxCv4ctaw4g==}
@@ -3920,7 +3924,7 @@ packages:
   '@effect/vitest@4.1.2':
     resolution: {integrity: sha512-JJPwAHkJHxvM/woW9mMW/khjasAHcmwWdOMAgMy16rfqsxcVhFDnrRsvN9VI2+kMv8zDCCyBE2q1n5hzZlfE0w==}
     peerDependencies:
-      effect: 4.1.2
+      effect: 4.1.3
 
   '@electric-sql/pglite@0.3.15':
     resolution: {integrity: sha512-Cj++n1Mekf9ETfdc16TlDi+cDDQF0W7EcbyRHYOAeZdsAe8M/FJg18itDTSwyHfar2WIezawM9o0EKaRGVKygQ==}
@@ -5288,7 +5292,7 @@ packages:
   '@opencode/client@2.0.28':
     resolution: {integrity: sha512-YV0Yxk93/K2h4Xy/sEW/4ZYGMwn7ltxG2Y/Vdy2VCIZ2z0/r9MI6x5/XawSNfCvImBxuHkQNbYtu9Rgp3ArJ4g==}
     peerDependencies:
-      effect: 4.1.2
+      effect: 4.1.3
       solid-js: '>=1.9.0'
     peerDependenciesMeta:
       effect:
@@ -7919,7 +7923,7 @@ packages:
       '@alchemy.run/frontend-frameworks': 2.0.0-beta.85
       '@effect/platform-bun': 4.1.2
       '@effect/platform-node': 4.1.2
-      effect: 4.1.2
+      effect: 4.1.3
       vite: ^7.0.0 || ^8.0.0
       ws: 8.22.0
     peerDependenciesMeta:
@@ -8806,7 +8810,7 @@ packages:
       arktype: '>=2.0.0'
       better-sqlite3: '>=9.3.0'
       bun-types: '*'
-      effect: 4.1.2
+      effect: 4.1.3
       expo-sqlite: '>=14.0.0'
       mssql: ^11.0.1
       mysql2: '>=2'
@@ -8961,8 +8965,8 @@ packages:
   ee-first@1.1.1:
     resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==}
 
-  effect@4.1.2:
-    resolution: {integrity: sha512-d3Oah1WyKxFLFh19yWheS5IXIVaITzxZ71JkE1rkUozq/6EcJSU5nPk5bF2QrSygZ3SQoiNQB8TsxFriyMeMaQ==}
+  effect@4.1.3:
+    resolution: {integrity: sha512-QWNEu35groH/78Ejq01lZGt8U0sF1P4nrhbcAZz5WffcS27bUUK9C/db+xWWUwNYUvFD5SrSLE0mFGtwyP0PCQ==}
 
   ejs@3.1.10:
     resolution: {integrity: sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==}
@@ -11552,8 +11556,8 @@ packages:
       '@types/react': '>=18'
       react: '>=18'
 
-  react-native-enriched-markdown@file:apps/mobile/deps/react-native-enriched-markdown-1.2.0-t3.18-497fbe63.tgz:
-    resolution: {integrity: sha512-2Ph2EXnXbcYd5LK5SmDwqnQNgwqOVAK2uqasW1NzzFGqm5SRR4QD1TmAvUFytrKudnRkzHW8kpnHgXcYRhcyBA==, tarball: file:apps/mobile/deps/react-native-enriched-markdown-1.2.0-t3.18-497fbe63.tgz}
+  react-native-enriched-markdown@file:apps/mobile/deps/react-native-enriched-markdown-1.2.0-t3.18-0dc7ed81.tgz:
+    resolution: {integrity: sha512-CuNf6350oZ1vnxYAX2g7bFv9fs4ckG4EMQKNYu+o/O9mYAuLZJX9VPGpDT7vS9Qwmn74J+wKrCOx7VQkLs0uKA==, tarball: file:apps/mobile/deps/react-native-enriched-markdown-1.2.0-t3.18-0dc7ed81.tgz}
     version: 1.2.0-t3.18
     peerDependencies:
       katex: '>=0.16.0'
@@ -11618,9 +11622,9 @@ packages:
       react: '*'
       react-native: '*'
 
-  react-native-screens@file:apps/mobile/deps/react-native-screens-5.0.0-t3.48.tgz:
-    resolution: {integrity: sha512-DQa7yVsOye72bUNH4UVC3D8QicmOm+LMFLpZui6ZEnwU5wtlyEsqFX26kKSvDkpByAffQVIqqJ3s0QNCGNwF1A==, tarball: file:apps/mobile/deps/react-native-screens-5.0.0-t3.48.tgz}
-    version: 5.0.0-t3.48
+  react-native-screens@file:apps/mobile/deps/react-native-screens-5.0.0-t3.50.tgz:
+    resolution: {integrity: sha512-APO5MIX4Bf842vXuChMsL/5GTC+Xl5GQEl48QBOgUJkEGibpmU54HZ+jWWDvnIqqQyzYntKF/iK7OCSR+S4xSg==, tarball: file:apps/mobile/deps/react-native-screens-5.0.0-t3.50.tgz}
+    version: 5.0.0-t3.50
     peerDependencies:
       react: '*'
       react-native: '*'
@@ -13107,27 +13111,27 @@ snapshots:
     dependencies:
       json-schema: 0.4.0
 
-  '@alchemy.run/acme@2.0.0-beta.85(alchemy@2.0.0-beta.85(patch_hash=07cc8c7e14b3b9af143ddd40a059f117c27e55139fbf20bd5dde2eb30509cedd)(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.2)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6)))(effect@4.1.2)':
+  '@alchemy.run/acme@2.0.0-beta.85(alchemy@2.0.0-beta.85(patch_hash=07cc8c7e14b3b9af143ddd40a059f117c27e55139fbf20bd5dde2eb30509cedd)(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.3)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.3)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.3)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6)))(effect@4.1.3)':
     dependencies:
-      '@distilled.cloud/acme': 1.0.0-rc.18(effect@4.1.2)
-      alchemy: 2.0.0-beta.85(patch_hash=07cc8c7e14b3b9af143ddd40a059f117c27e55139fbf20bd5dde2eb30509cedd)(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.2)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6))
-      effect: 4.1.2
+      '@distilled.cloud/acme': 1.0.0-rc.18(effect@4.1.3)
+      alchemy: 2.0.0-beta.85(patch_hash=07cc8c7e14b3b9af143ddd40a059f117c27e55139fbf20bd5dde2eb30509cedd)(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.3)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.3)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.3)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6))
+      effect: 4.1.3
 
-  '@alchemy.run/axiom@2.0.0-beta.85(alchemy@2.0.0-beta.85(patch_hash=07cc8c7e14b3b9af143ddd40a059f117c27e55139fbf20bd5dde2eb30509cedd)(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.2)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6)))(effect@4.1.2)':
+  '@alchemy.run/axiom@2.0.0-beta.85(alchemy@2.0.0-beta.85(patch_hash=07cc8c7e14b3b9af143ddd40a059f117c27e55139fbf20bd5dde2eb30509cedd)(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.3)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.3)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.3)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6)))(effect@4.1.3)':
     dependencies:
-      '@distilled.cloud/axiom': 1.0.0-rc.18(effect@4.1.2)
-      '@distilled.cloud/core': 1.0.0-rc.18(effect@4.1.2)
-      alchemy: 2.0.0-beta.85(patch_hash=07cc8c7e14b3b9af143ddd40a059f117c27e55139fbf20bd5dde2eb30509cedd)(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.2)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6))
-      effect: 4.1.2
+      '@distilled.cloud/axiom': 1.0.0-rc.18(effect@4.1.3)
+      '@distilled.cloud/core': 1.0.0-rc.18(effect@4.1.3)
+      alchemy: 2.0.0-beta.85(patch_hash=07cc8c7e14b3b9af143ddd40a059f117c27e55139fbf20bd5dde2eb30509cedd)(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.3)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.3)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.3)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6))
+      effect: 4.1.3
 
-  '@alchemy.run/cloudflare-runtime@2.0.0-beta.85(@distilled.cloud/cloudflare@1.0.0-rc.18(effect@4.1.2))(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/node@24.12.4)(@voidzero-dev/vite-plus-core@1.4.0(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.2)(rolldown@1.2.13)(typescript@6.0.3)':
+  '@alchemy.run/cloudflare-runtime@2.0.0-beta.85(@distilled.cloud/cloudflare@1.0.0-rc.18(effect@4.1.3))(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.3)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.3)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/node@24.12.4)(@voidzero-dev/vite-plus-core@1.4.0(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.3)(rolldown@1.2.13)(typescript@6.0.3)':
     dependencies:
       '@alchemy.run/node-utils': 2.0.0-beta.85
       '@cloudflare/unenv-preset': 2.16.2(unenv@2.0.0-rc.24)(workerd@1.20261026.1)
-      '@distilled.cloud/cloudflare': 1.0.0-rc.18(effect@4.1.2)
+      '@distilled.cloud/cloudflare': 1.0.0-rc.18(effect@4.1.3)
       '@puppeteer/browsers': 3.2.6(yauzl@3.4.0)
       capnp-es: 0.0.16(typescript@6.0.3)
-      effect: 4.1.2
+      effect: 4.1.3
       magic-string: 0.30.21
       mime: 4.1.1
       sharp: 0.35.5(@types/node@24.12.4)
@@ -13135,8 +13139,8 @@ snapshots:
       workerd: 1.20261026.1
       yauzl: 3.4.0
     optionalDependencies:
-      '@effect/platform-bun': 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6)
-      '@effect/platform-node': 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
+      '@effect/platform-bun': 4.1.2(bufferutil@4.1.0)(effect@4.1.3)(utf-8-validate@6.0.6)
+      '@effect/platform-node': 4.1.2(bufferutil@4.1.0)(effect@4.1.3)(redis@6.2.1)(utf-8-validate@6.0.6)
       rolldown: 1.2.13
       vite: '@voidzero-dev/vite-plus-core@1.4.0(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0)'
     transitivePeerDependencies:
@@ -13144,27 +13148,27 @@ snapshots:
       - proxy-agent
       - typescript
 
-  '@alchemy.run/cloudflare@2.0.0-beta.85(935199ac9c22ca360eddcc7164e5b8a7)':
-    dependencies:
-      '@alchemy.run/acme': 2.0.0-beta.85(alchemy@2.0.0-beta.85(patch_hash=07cc8c7e14b3b9af143ddd40a059f117c27e55139fbf20bd5dde2eb30509cedd)(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.2)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6)))(effect@4.1.2)
-      '@alchemy.run/cloudflare-runtime': 2.0.0-beta.85(@distilled.cloud/cloudflare@1.0.0-rc.18(effect@4.1.2))(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/node@24.12.4)(@voidzero-dev/vite-plus-core@1.4.0(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.2)(rolldown@1.2.13)(typescript@6.0.3)
-      '@alchemy.run/docker': 2.0.0-beta.85(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6))(alchemy@2.0.0-beta.85(patch_hash=07cc8c7e14b3b9af143ddd40a059f117c27e55139fbf20bd5dde2eb30509cedd)(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.2)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6)))(effect@4.1.2)
-      '@alchemy.run/sql': 2.0.0-beta.85(@effect/sql-pg@4.1.2(effect@4.1.2))(alchemy@2.0.0-beta.85(patch_hash=07cc8c7e14b3b9af143ddd40a059f117c27e55139fbf20bd5dde2eb30509cedd)(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.2)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6)))(effect@4.1.2)(pg@8.23.0)
-      '@distilled.cloud/aws': 1.0.0-rc.18(effect@4.1.2)
-      '@distilled.cloud/aws4signer': 1.0.0-rc.18(effect@4.1.2)
-      '@distilled.cloud/cloudflare': 1.0.0-rc.18(effect@4.1.2)
-      '@distilled.cloud/core': 1.0.0-rc.18(effect@4.1.2)
-      '@distilled.cloud/iceberg': 1.0.0-rc.18(effect@4.1.2)
-      '@effect/sql-d1': 4.1.1(effect@4.1.2)
-      alchemy: 2.0.0-beta.85(patch_hash=07cc8c7e14b3b9af143ddd40a059f117c27e55139fbf20bd5dde2eb30509cedd)(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.2)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6))
-      effect: 4.1.2
+  '@alchemy.run/cloudflare@2.0.0-beta.85(dabba7d529c10a239fedb30f64291b80)':
+    dependencies:
+      '@alchemy.run/acme': 2.0.0-beta.85(alchemy@2.0.0-beta.85(patch_hash=07cc8c7e14b3b9af143ddd40a059f117c27e55139fbf20bd5dde2eb30509cedd)(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.3)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.3)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.3)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6)))(effect@4.1.3)
+      '@alchemy.run/cloudflare-runtime': 2.0.0-beta.85(@distilled.cloud/cloudflare@1.0.0-rc.18(effect@4.1.3))(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.3)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.3)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/node@24.12.4)(@voidzero-dev/vite-plus-core@1.4.0(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.3)(rolldown@1.2.13)(typescript@6.0.3)
+      '@alchemy.run/docker': 2.0.0-beta.85(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.3)(utf-8-validate@6.0.6))(alchemy@2.0.0-beta.85(patch_hash=07cc8c7e14b3b9af143ddd40a059f117c27e55139fbf20bd5dde2eb30509cedd)(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.3)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.3)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.3)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6)))(effect@4.1.3)
+      '@alchemy.run/sql': 2.0.0-beta.85(@effect/sql-pg@4.1.2(effect@4.1.3))(alchemy@2.0.0-beta.85(patch_hash=07cc8c7e14b3b9af143ddd40a059f117c27e55139fbf20bd5dde2eb30509cedd)(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.3)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.3)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.3)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6)))(effect@4.1.3)(pg@8.23.0)
+      '@distilled.cloud/aws': 1.0.0-rc.18(effect@4.1.3)
+      '@distilled.cloud/aws4signer': 1.0.0-rc.18(effect@4.1.3)
+      '@distilled.cloud/cloudflare': 1.0.0-rc.18(effect@4.1.3)
+      '@distilled.cloud/core': 1.0.0-rc.18(effect@4.1.3)
+      '@distilled.cloud/iceberg': 1.0.0-rc.18(effect@4.1.3)
+      '@effect/sql-d1': 4.1.1(effect@4.1.3)
+      alchemy: 2.0.0-beta.85(patch_hash=07cc8c7e14b3b9af143ddd40a059f117c27e55139fbf20bd5dde2eb30509cedd)(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.3)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.3)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.3)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6))
+      effect: 4.1.3
       pathe: 2.0.3
       picomatch: 4.0.7
       rolldown: 1.2.13
       tinyglobby: 0.2.17
     optionalDependencies:
-      '@effect/platform-bun': 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6)
-      '@effect/platform-node': 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
+      '@effect/platform-bun': 4.1.2(bufferutil@4.1.0)(effect@4.1.3)(utf-8-validate@6.0.6)
+      '@effect/platform-node': 4.1.2(bufferutil@4.1.0)(effect@4.1.3)(redis@6.2.1)(utf-8-validate@6.0.6)
       vite: '@voidzero-dev/vite-plus-core@1.4.0(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0)'
     transitivePeerDependencies:
       - '@effect/sql-libsql'
@@ -13176,26 +13180,26 @@ snapshots:
       - proxy-agent
       - typescript
 
-  '@alchemy.run/docker@2.0.0-beta.85(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6))(alchemy@2.0.0-beta.85(patch_hash=07cc8c7e14b3b9af143ddd40a059f117c27e55139fbf20bd5dde2eb30509cedd)(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.2)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6)))(effect@4.1.2)':
+  '@alchemy.run/docker@2.0.0-beta.85(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.3)(utf-8-validate@6.0.6))(alchemy@2.0.0-beta.85(patch_hash=07cc8c7e14b3b9af143ddd40a059f117c27e55139fbf20bd5dde2eb30509cedd)(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.3)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.3)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.3)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6)))(effect@4.1.3)':
     dependencies:
-      alchemy: 2.0.0-beta.85(patch_hash=07cc8c7e14b3b9af143ddd40a059f117c27e55139fbf20bd5dde2eb30509cedd)(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.2)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6))
-      effect: 4.1.2
+      alchemy: 2.0.0-beta.85(patch_hash=07cc8c7e14b3b9af143ddd40a059f117c27e55139fbf20bd5dde2eb30509cedd)(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.3)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.3)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.3)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6))
+      effect: 4.1.3
       rolldown: 1.2.13
     optionalDependencies:
-      '@effect/platform-bun': 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6)
+      '@effect/platform-bun': 4.1.2(bufferutil@4.1.0)(effect@4.1.3)(utf-8-validate@6.0.6)
 
-  '@alchemy.run/drizzle@2.0.0-beta.85(8a334cf6654889bd393813214c98db49)':
+  '@alchemy.run/drizzle@2.0.0-beta.85(eb667a4b2658382830b9c27fc99af2f0)':
     dependencies:
-      '@alchemy.run/sql': 2.0.0-beta.85(@effect/sql-pg@4.1.2(effect@4.1.2))(alchemy@2.0.0-beta.85(patch_hash=07cc8c7e14b3b9af143ddd40a059f117c27e55139fbf20bd5dde2eb30509cedd)(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.2)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6)))(effect@4.1.2)(pg@8.23.0)
-      '@effect/sql-d1': 4.1.1(effect@4.1.2)
-      '@effect/sql-sqlite-do': 4.1.2(effect@4.1.2)
-      alchemy: 2.0.0-beta.85(patch_hash=07cc8c7e14b3b9af143ddd40a059f117c27e55139fbf20bd5dde2eb30509cedd)(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.2)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6))
-      drizzle-orm: 1.0.0-rc.5(@cloudflare/workers-types@4.20260604.1)(@effect/sql-d1@4.1.1(effect@4.1.2))(@effect/sql-pg@4.1.2(effect@4.1.2))(@effect/sql-sqlite-do@4.1.2(effect@4.1.2))(@electric-sql/pglite@0.3.15)(@libsql/client@0.17.3(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/sql.js@1.4.11)(bun-types@1.3.14)(effect@4.1.2)(expo-sqlite@58.0.15(expo@58.0.23)(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0))(pg@8.23.0)(sql.js@1.15.0)(zod@4.6.7)
-      effect: 4.1.2
+      '@alchemy.run/sql': 2.0.0-beta.85(@effect/sql-pg@4.1.2(effect@4.1.3))(alchemy@2.0.0-beta.85(patch_hash=07cc8c7e14b3b9af143ddd40a059f117c27e55139fbf20bd5dde2eb30509cedd)(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.3)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.3)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.3)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6)))(effect@4.1.3)(pg@8.23.0)
+      '@effect/sql-d1': 4.1.1(effect@4.1.3)
+      '@effect/sql-sqlite-do': 4.1.2(effect@4.1.3)
+      alchemy: 2.0.0-beta.85(patch_hash=07cc8c7e14b3b9af143ddd40a059f117c27e55139fbf20bd5dde2eb30509cedd)(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.3)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.3)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.3)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6))
+      drizzle-orm: 1.0.0-rc.5(@cloudflare/workers-types@4.20260604.1)(@effect/sql-d1@4.1.1(effect@4.1.3))(@effect/sql-pg@4.1.2(effect@4.1.3))(@effect/sql-sqlite-do@4.1.2(effect@4.1.3))(@electric-sql/pglite@0.3.15)(@libsql/client@0.17.3(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/sql.js@1.4.11)(bun-types@1.3.14)(effect@4.1.3)(expo-sqlite@58.0.15(expo@58.0.23)(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0))(pg@8.23.0)(sql.js@1.15.0)(zod@4.6.7)
+      effect: 4.1.3
     optionalDependencies:
-      '@alchemy.run/cloudflare': 2.0.0-beta.85(935199ac9c22ca360eddcc7164e5b8a7)
-      '@effect/sql-pg': 4.1.2(effect@4.1.2)
-      drizzle-kit: 1.0.0-rc.5(drizzle-orm@1.0.0-rc.5(@cloudflare/workers-types@4.20260604.1)(@effect/sql-d1@4.1.1(effect@4.1.2))(@effect/sql-pg@4.1.2(effect@4.1.2))(@effect/sql-sqlite-do@4.1.2(effect@4.1.2))(@electric-sql/pglite@0.3.15)(@libsql/client@0.17.3(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/sql.js@1.4.11)(bun-types@1.3.14)(effect@4.1.2)(expo-sqlite@58.0.15(expo@58.0.23)(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0))(pg@8.23.0)(sql.js@1.15.0)(zod@4.6.7))
+      '@alchemy.run/cloudflare': 2.0.0-beta.85(dabba7d529c10a239fedb30f64291b80)
+      '@effect/sql-pg': 4.1.2(effect@4.1.3)
+      drizzle-kit: 1.0.0-rc.5(drizzle-orm@1.0.0-rc.5(@cloudflare/workers-types@4.20260604.1)(@effect/sql-d1@4.1.1(effect@4.1.3))(@effect/sql-pg@4.1.2(effect@4.1.3))(@effect/sql-sqlite-do@4.1.2(effect@4.1.3))(@electric-sql/pglite@0.3.15)(@libsql/client@0.17.3(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/sql.js@1.4.11)(bun-types@1.3.14)(effect@4.1.3)(expo-sqlite@58.0.15(expo@58.0.23)(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0))(pg@8.23.0)(sql.js@1.15.0)(zod@4.6.7))
     transitivePeerDependencies:
       - mysql2
       - pg
@@ -13205,13 +13209,13 @@ snapshots:
       chokidar: 5.0.0
       rolldown: 1.2.13
 
-  '@alchemy.run/planetscale@2.0.0-beta.85(@effect/sql-pg@4.1.2(effect@4.1.2))(alchemy@2.0.0-beta.85(patch_hash=07cc8c7e14b3b9af143ddd40a059f117c27e55139fbf20bd5dde2eb30509cedd)(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.2)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6)))(effect@4.1.2)(pg@8.23.0)':
+  '@alchemy.run/planetscale@2.0.0-beta.85(@effect/sql-pg@4.1.2(effect@4.1.3))(alchemy@2.0.0-beta.85(patch_hash=07cc8c7e14b3b9af143ddd40a059f117c27e55139fbf20bd5dde2eb30509cedd)(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.3)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.3)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.3)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6)))(effect@4.1.3)(pg@8.23.0)':
     dependencies:
-      '@alchemy.run/sql': 2.0.0-beta.85(@effect/sql-pg@4.1.2(effect@4.1.2))(alchemy@2.0.0-beta.85(patch_hash=07cc8c7e14b3b9af143ddd40a059f117c27e55139fbf20bd5dde2eb30509cedd)(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.2)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6)))(effect@4.1.2)(pg@8.23.0)
-      '@distilled.cloud/core': 1.0.0-rc.18(effect@4.1.2)
-      '@distilled.cloud/planetscale': 1.0.0-rc.18(effect@4.1.2)
-      alchemy: 2.0.0-beta.85(patch_hash=07cc8c7e14b3b9af143ddd40a059f117c27e55139fbf20bd5dde2eb30509cedd)(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.2)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6))
-      effect: 4.1.2
+      '@alchemy.run/sql': 2.0.0-beta.85(@effect/sql-pg@4.1.2(effect@4.1.3))(alchemy@2.0.0-beta.85(patch_hash=07cc8c7e14b3b9af143ddd40a059f117c27e55139fbf20bd5dde2eb30509cedd)(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.3)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.3)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.3)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6)))(effect@4.1.3)(pg@8.23.0)
+      '@distilled.cloud/core': 1.0.0-rc.18(effect@4.1.3)
+      '@distilled.cloud/planetscale': 1.0.0-rc.18(effect@4.1.3)
+      alchemy: 2.0.0-beta.85(patch_hash=07cc8c7e14b3b9af143ddd40a059f117c27e55139fbf20bd5dde2eb30509cedd)(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.3)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.3)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.3)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6))
+      effect: 4.1.3
     optionalDependencies:
       pg: 8.23.0
     transitivePeerDependencies:
@@ -13224,21 +13228,21 @@ snapshots:
       '@types/react': 19.3.0
       react-devtools-core: 6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6)
 
-  '@alchemy.run/sql@2.0.0-beta.85(@effect/sql-pg@4.1.2(effect@4.1.2))(alchemy@2.0.0-beta.85(patch_hash=07cc8c7e14b3b9af143ddd40a059f117c27e55139fbf20bd5dde2eb30509cedd)(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.2)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6)))(effect@4.1.2)(pg@8.23.0)':
+  '@alchemy.run/sql@2.0.0-beta.85(@effect/sql-pg@4.1.2(effect@4.1.3))(alchemy@2.0.0-beta.85(patch_hash=07cc8c7e14b3b9af143ddd40a059f117c27e55139fbf20bd5dde2eb30509cedd)(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.3)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.3)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.3)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6)))(effect@4.1.3)(pg@8.23.0)':
     dependencies:
-      alchemy: 2.0.0-beta.85(patch_hash=07cc8c7e14b3b9af143ddd40a059f117c27e55139fbf20bd5dde2eb30509cedd)(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.2)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6))
-      effect: 4.1.2
+      alchemy: 2.0.0-beta.85(patch_hash=07cc8c7e14b3b9af143ddd40a059f117c27e55139fbf20bd5dde2eb30509cedd)(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.3)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.3)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.3)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6))
+      effect: 4.1.3
     optionalDependencies:
-      '@effect/sql-pg': 4.1.2(effect@4.1.2)
+      '@effect/sql-pg': 4.1.2(effect@4.1.3)
       pg: 8.23.0
 
-  '@alchemy.run/test@2.0.0-beta.85(patch_hash=29c0539ea71d9cc372f0b16558640599beb9bc609605feb2a493da268d72713e)(93775fed45909d71c0b8bba962f026cf)':
+  '@alchemy.run/test@2.0.0-beta.85(patch_hash=29c0539ea71d9cc372f0b16558640599beb9bc609605feb2a493da268d72713e)(9cad13029aba0f237bc67ebbac58cedc)':
     dependencies:
-      '@effect/platform-bun': 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6)
-      effect: 4.1.2
+      '@effect/platform-bun': 4.1.2(bufferutil@4.1.0)(effect@4.1.3)(utf-8-validate@6.0.6)
+      effect: 4.1.3
     optionalDependencies:
-      '@effect/vitest': 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
-      alchemy: 2.0.0-beta.85(patch_hash=07cc8c7e14b3b9af143ddd40a059f117c27e55139fbf20bd5dde2eb30509cedd)(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.2)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6))
+      '@effect/vitest': 4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.3)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
+      alchemy: 2.0.0-beta.85(patch_hash=07cc8c7e14b3b9af143ddd40a059f117c27e55139fbf20bd5dde2eb30509cedd)(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.3)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.3)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.3)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6))
       vitest: 5.0.5(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/browser-preview@5.0.5)(@vitest/ui@5.0.5)(@voidzero-dev/vite-plus-core@1.4.0(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(@volar/typescript@2.4.28(typescript@6.0.3))(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0)
     transitivePeerDependencies:
       - bufferutil
@@ -14217,45 +14221,45 @@ snapshots:
 
   '@dimforge/rapier3d-compat@0.12.0': {}
 
-  '@distilled.cloud/acme@1.0.0-rc.18(effect@4.1.2)':
+  '@distilled.cloud/acme@1.0.0-rc.18(effect@4.1.3)':
     dependencies:
-      '@distilled.cloud/core': 1.0.0-rc.18(effect@4.1.2)
-      effect: 4.1.2
+      '@distilled.cloud/core': 1.0.0-rc.18(effect@4.1.3)
+      effect: 4.1.3
 
-  '@distilled.cloud/aws4signer@1.0.0-rc.18(effect@4.1.2)':
+  '@distilled.cloud/aws4signer@1.0.0-rc.18(effect@4.1.3)':
     dependencies:
-      '@distilled.cloud/core': 1.0.0-rc.18(effect@4.1.2)
-      effect: 4.1.2
+      '@distilled.cloud/core': 1.0.0-rc.18(effect@4.1.3)
+      effect: 4.1.3
 
-  '@distilled.cloud/aws@1.0.0-rc.18(effect@4.1.2)':
+  '@distilled.cloud/aws@1.0.0-rc.18(effect@4.1.3)':
     dependencies:
-      '@distilled.cloud/aws4signer': 1.0.0-rc.18(effect@4.1.2)
-      '@distilled.cloud/core': 1.0.0-rc.18(effect@4.1.2)
-      effect: 4.1.2
+      '@distilled.cloud/aws4signer': 1.0.0-rc.18(effect@4.1.3)
+      '@distilled.cloud/core': 1.0.0-rc.18(effect@4.1.3)
+      effect: 4.1.3
 
-  '@distilled.cloud/axiom@1.0.0-rc.18(effect@4.1.2)':
+  '@distilled.cloud/axiom@1.0.0-rc.18(effect@4.1.3)':
     dependencies:
-      '@distilled.cloud/core': 1.0.0-rc.18(effect@4.1.2)
-      effect: 4.1.2
+      '@distilled.cloud/core': 1.0.0-rc.18(effect@4.1.3)
+      effect: 4.1.3
 
-  '@distilled.cloud/cloudflare@1.0.0-rc.18(effect@4.1.2)':
+  '@distilled.cloud/cloudflare@1.0.0-rc.18(effect@4.1.3)':
     dependencies:
-      '@distilled.cloud/core': 1.0.0-rc.18(effect@4.1.2)
-      effect: 4.1.2
+      '@distilled.cloud/core': 1.0.0-rc.18(effect@4.1.3)
+      effect: 4.1.3
 
-  '@distilled.cloud/core@1.0.0-rc.18(effect@4.1.2)':
+  '@distilled.cloud/core@1.0.0-rc.18(effect@4.1.3)':
     dependencies:
-      effect: 4.1.2
+      effect: 4.1.3
 
-  '@distilled.cloud/iceberg@1.0.0-rc.18(effect@4.1.2)':
+  '@distilled.cloud/iceberg@1.0.0-rc.18(effect@4.1.3)':
     dependencies:
-      '@distilled.cloud/core': 1.0.0-rc.18(effect@4.1.2)
-      effect: 4.1.2
+      '@distilled.cloud/core': 1.0.0-rc.18(effect@4.1.3)
+      effect: 4.1.3
 
-  '@distilled.cloud/planetscale@1.0.0-rc.18(effect@4.1.2)':
+  '@distilled.cloud/planetscale@1.0.0-rc.18(effect@4.1.3)':
     dependencies:
-      '@distilled.cloud/core': 1.0.0-rc.18(effect@4.1.2)
-      effect: 4.1.2
+      '@distilled.cloud/core': 1.0.0-rc.18(effect@4.1.3)
+      effect: 4.1.3
 
   '@dnd-kit/accessibility@3.1.1(react@19.3.0)':
     dependencies:
@@ -14301,64 +14305,64 @@ snapshots:
       e2e: 0.23.0
       playwright-core: 1.64.1
 
-  '@effect/atom-react@4.1.2(effect@4.1.2)(react@19.3.0)(scheduler@0.28.0)':
+  '@effect/atom-react@4.1.2(effect@4.1.3)(react@19.3.0)(scheduler@0.28.0)':
     dependencies:
-      effect: 4.1.2
+      effect: 4.1.3
       react: 19.3.0
       scheduler: 0.28.0
 
-  '@effect/graphql-generator@4.1.2(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6))(effect@4.1.2)':
+  '@effect/graphql-generator@4.1.2(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.3)(redis@6.2.1)(utf-8-validate@6.0.6))(effect@4.1.3)':
     dependencies:
-      '@effect/platform-node': 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
-      effect: 4.1.2
+      '@effect/platform-node': 4.1.2(bufferutil@4.1.0)(effect@4.1.3)(redis@6.2.1)(utf-8-validate@6.0.6)
+      effect: 4.1.3
 
-  '@effect/openapi-generator@4.1.2(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6))(effect@4.1.2)(encoding@0.1.13)':
+  '@effect/openapi-generator@4.1.2(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.3)(redis@6.2.1)(utf-8-validate@6.0.6))(effect@4.1.3)(encoding@0.1.13)':
     dependencies:
-      '@effect/platform-node': 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
-      effect: 4.1.2
+      '@effect/platform-node': 4.1.2(bufferutil@4.1.0)(effect@4.1.3)(redis@6.2.1)(utf-8-validate@6.0.6)
+      effect: 4.1.3
       swagger2openapi: 7.0.8(encoding@0.1.13)
     transitivePeerDependencies:
       - encoding
 
-  '@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6)':
+  '@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.3)(utf-8-validate@6.0.6)':
     dependencies:
-      '@effect/platform-node-shared': 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6)
-      effect: 4.1.2
+      '@effect/platform-node-shared': 4.1.2(bufferutil@4.1.0)(effect@4.1.3)(utf-8-validate@6.0.6)
+      effect: 4.1.3
     transitivePeerDependencies:
       - bufferutil
       - utf-8-validate
 
-  '@effect/platform-node-shared@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6)':
+  '@effect/platform-node-shared@4.1.2(bufferutil@4.1.0)(effect@4.1.3)(utf-8-validate@6.0.6)':
     dependencies:
       '@types/ws': 8.18.2
-      effect: 4.1.2
+      effect: 4.1.3
       ws: 8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6)
     transitivePeerDependencies:
       - bufferutil
       - utf-8-validate
 
-  '@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)':
+  '@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.3)(redis@6.2.1)(utf-8-validate@6.0.6)':
     dependencies:
-      '@effect/platform-node-shared': 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6)
-      effect: 4.1.2
+      '@effect/platform-node-shared': 4.1.2(bufferutil@4.1.0)(effect@4.1.3)(utf-8-validate@6.0.6)
+      effect: 4.1.3
       redis: 6.2.1
       undici: 8.12.4
     transitivePeerDependencies:
       - bufferutil
       - utf-8-validate
 
-  '@effect/sql-d1@4.1.1(effect@4.1.2)':
+  '@effect/sql-d1@4.1.1(effect@4.1.3)':
     dependencies:
       '@cloudflare/workers-types': 5.20261026.1
-      effect: 4.1.2
+      effect: 4.1.3
 
-  '@effect/sql-pg@4.1.2(effect@4.1.2)':
+  '@effect/sql-pg@4.1.2(effect@4.1.3)':
     dependencies:
-      effect: 4.1.2
+      effect: 4.1.3
 
-  '@effect/sql-sqlite-do@4.1.2(effect@4.1.2)':
+  '@effect/sql-sqlite-do@4.1.2(effect@4.1.3)':
     dependencies:
-      effect: 4.1.2
+      effect: 4.1.3
 
   '@effect/tsgo-darwin-arm64@0.67.1':
     optional: true
@@ -14391,9 +14395,9 @@ snapshots:
       '@effect/tsgo-win32-arm64': 0.67.1
       '@effect/tsgo-win32-x64': 0.67.1
 
-  '@effect/vitest@4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.2)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)':
+  '@effect/vitest@4.1.2(patch_hash=299510b71c36537a832a67e9d160a5f112a5f326a29e95c41cb45fc8234e47c7)(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(effect@4.1.3)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)':
     dependencies:
-      effect: 4.1.2
+      effect: 4.1.3
       vite-plus: 1.4.0(@astrojs/compiler-rs@0.5.1)(@types/node@24.12.4)(@vitest/browser-playwright@5.0.5)(@vitest/ui@5.0.5)(@volar/typescript@2.4.28(typescript@6.0.3))(bufferutil@4.1.0)(esbuild@0.28.2)(jiti@2.7.0)(jsdom@30.1.0(@noble/hashes@1.8.0))(playwright@1.64.1)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(utf-8-validate@6.0.6)(yaml@2.9.0)
     transitivePeerDependencies:
       - '@arethetypeswrong/core'
@@ -15130,8 +15134,8 @@ snapshots:
 
   '@expo/sudo-prompt@9.3.2': {}
 
-  '@expo/ui@58.0.27(@babel/core@7.29.7(supports-color@8.1.1))(expo@58.0.23)(react-dom@19.3.0(react@19.3.0))(react-native-worklets@0.13.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0)(supports-color@8.1.1))(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0)':
-    dependencies:
+  ? '@expo/ui@58.0.27(patch_hash=9f2547678939f4ec78fe45163b6455aad63d3c80353d7e0cc783f6a61a7ccc2f)(@babel/core@7.29.7(supports-color@8.1.1))(expo@58.0.23)(react-dom@19.3.0(react@19.3.0))(react-native-worklets@0.13.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0)(supports-color@8.1.1))(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0)'
+  : dependencies:
       expo: 58.0.23(d226faf1ca90e630d8c56a2108dee32d)
       react: 19.3.0
       react-native: 0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6)
@@ -15178,7 +15182,7 @@ snapshots:
   '@ff-labs/fff-bin-win32-x64@0.11.0':
     optional: true
 
-  '@ff-labs/fff-node@0.11.0(patch_hash=cc71fcec015f4d39bc96ae2e2bf6b0ca678124c722c66a7841efce9d34b5983c)':
+  '@ff-labs/fff-node@0.11.0(patch_hash=a71dc3a5544fc47afacf0fe9da04dccec3018e625a76c96087ebfdf35e293768)':
     dependencies:
       ffi-rs: 1.3.2
     optionalDependencies:
@@ -15869,22 +15873,22 @@ snapshots:
     dependencies:
       cross-spawn: 7.0.6
 
-  '@opencode/client@2.0.28(effect@4.1.2)':
+  '@opencode/client@2.0.28(effect@4.1.3)':
     dependencies:
       '@opencode/protocol': 2.0.28
       '@opencode/schema': 2.0.28
     optionalDependencies:
-      effect: 4.1.2
+      effect: 4.1.3
 
   '@opencode/protocol@2.0.28':
     dependencies:
       '@opencode/schema': 2.0.28
-      effect: 4.1.2
+      effect: 4.1.3
 
   '@opencode/schema@2.0.28':
     dependencies:
       '@standard-schema/spec': 1.1.0
-      effect: 4.1.2
+      effect: 4.1.3
 
   '@oslojs/asn1@1.0.0':
     dependencies:
@@ -16682,7 +16686,7 @@ snapshots:
     optionalDependencies:
       '@react-native-masked-view/masked-view': 0.3.2(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0)
 
-  '@react-navigation/native-stack@7.21.0(patch_hash=990d575444c4af2ce8218b3b7a8280fe244c03abbdb32b822a2e862f791dbf42)(bce9d5917b75ecfdccb2630d9f614f34)':
+  '@react-navigation/native-stack@7.21.0(patch_hash=990d575444c4af2ce8218b3b7a8280fe244c03abbdb32b822a2e862f791dbf42)(8cabb04b1defcb22245317e78e4e5f29)':
     dependencies:
       '@react-navigation/elements': 2.9.45(83450c2b8dad8f97d4bec4849f35b99e)
       '@react-navigation/native': 7.5.1(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0)
@@ -16690,7 +16694,7 @@ snapshots:
       react: 19.3.0
       react-native: 0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6)
       react-native-safe-area-context: 5.11.1(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0)
-      react-native-screens: file:apps/mobile/deps/react-native-screens-5.0.0-t3.48.tgz(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0)
+      react-native-screens: file:apps/mobile/deps/react-native-screens-5.0.0-t3.50.tgz(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0)
       sf-symbols-typescript: 2.2.0
       warn-once: 0.1.1
     transitivePeerDependencies:
@@ -17971,12 +17975,12 @@ snapshots:
       json-schema-traverse: 1.0.0
       require-from-string: 2.0.2
 
-  alchemy@2.0.0-beta.85(patch_hash=07cc8c7e14b3b9af143ddd40a059f117c27e55139fbf20bd5dde2eb30509cedd)(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.2)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6)):
+  alchemy@2.0.0-beta.85(patch_hash=07cc8c7e14b3b9af143ddd40a059f117c27e55139fbf20bd5dde2eb30509cedd)(@effect/platform-bun@4.1.2(bufferutil@4.1.0)(effect@4.1.3)(utf-8-validate@6.0.6))(@effect/platform-node@4.1.2(bufferutil@4.1.0)(effect@4.1.3)(redis@6.2.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(@voidzero-dev/vite-plus-core@1.4.0(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0))(effect@4.1.3)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))(ws@8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6)):
     dependencies:
       '@alchemy.run/node-utils': 2.0.0-beta.85
       '@alchemy.run/sigil': 0.1.0-alpha.1(@types/react@19.3.0)(react-devtools-core@6.1.5(bufferutil@4.1.0)(utf-8-validate@6.0.6))
       capnweb: 0.12.0
-      effect: 4.1.2
+      effect: 4.1.3
       fflate: 0.8.3
       pathe: 2.0.3
       picomatch: 4.0.7
@@ -17984,8 +17988,8 @@ snapshots:
       tinyglobby: 0.2.17
       yaml: 2.9.0
     optionalDependencies:
-      '@effect/platform-bun': 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(utf-8-validate@6.0.6)
-      '@effect/platform-node': 4.1.2(bufferutil@4.1.0)(effect@4.1.2)(redis@6.2.1)(utf-8-validate@6.0.6)
+      '@effect/platform-bun': 4.1.2(bufferutil@4.1.0)(effect@4.1.3)(utf-8-validate@6.0.6)
+      '@effect/platform-node': 4.1.2(bufferutil@4.1.0)(effect@4.1.3)(redis@6.2.1)(utf-8-validate@6.0.6)
       vite: '@voidzero-dev/vite-plus-core@1.4.0(@types/node@24.12.4)(@volar/typescript@2.4.28(typescript@6.0.3))(esbuild@0.28.2)(jiti@2.7.0)(terser@5.48.0)(typescript@6.0.3)(unrun@0.2.39)(yaml@2.9.0)'
       ws: 8.22.0(bufferutil@4.1.0)(utf-8-validate@6.0.6)
     transitivePeerDependencies:
@@ -18944,21 +18948,21 @@ snapshots:
 
   dotenv@16.6.1: {}
 
-  drizzle-kit@1.0.0-rc.5(drizzle-orm@1.0.0-rc.5(@cloudflare/workers-types@4.20260604.1)(@effect/sql-d1@4.1.1(effect@4.1.2))(@effect/sql-pg@4.1.2(effect@4.1.2))(@effect/sql-sqlite-do@4.1.2(effect@4.1.2))(@electric-sql/pglite@0.3.15)(@libsql/client@0.17.3(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/sql.js@1.4.11)(bun-types@1.3.14)(effect@4.1.2)(expo-sqlite@58.0.15(expo@58.0.23)(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0))(pg@8.23.0)(sql.js@1.15.0)(zod@4.6.7)):
+  drizzle-kit@1.0.0-rc.5(drizzle-orm@1.0.0-rc.5(@cloudflare/workers-types@4.20260604.1)(@effect/sql-d1@4.1.1(effect@4.1.3))(@effect/sql-pg@4.1.2(effect@4.1.3))(@effect/sql-sqlite-do@4.1.2(effect@4.1.3))(@electric-sql/pglite@0.3.15)(@libsql/client@0.17.3(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/sql.js@1.4.11)(bun-types@1.3.14)(effect@4.1.3)(expo-sqlite@58.0.15(expo@58.0.23)(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0))(pg@8.23.0)(sql.js@1.15.0)(zod@4.6.7)):
     optionalDependencies:
-      drizzle-orm: 1.0.0-rc.5(@cloudflare/workers-types@4.20260604.1)(@effect/sql-d1@4.1.1(effect@4.1.2))(@effect/sql-pg@4.1.2(effect@4.1.2))(@effect/sql-sqlite-do@4.1.2(effect@4.1.2))(@electric-sql/pglite@0.3.15)(@libsql/client@0.17.3(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/sql.js@1.4.11)(bun-types@1.3.14)(effect@4.1.2)(expo-sqlite@58.0.15(expo@58.0.23)(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0))(pg@8.23.0)(sql.js@1.15.0)(zod@4.6.7)
+      drizzle-orm: 1.0.0-rc.5(@cloudflare/workers-types@4.20260604.1)(@effect/sql-d1@4.1.1(effect@4.1.3))(@effect/sql-pg@4.1.2(effect@4.1.3))(@effect/sql-sqlite-do@4.1.2(effect@4.1.3))(@electric-sql/pglite@0.3.15)(@libsql/client@0.17.3(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/sql.js@1.4.11)(bun-types@1.3.14)(effect@4.1.3)(expo-sqlite@58.0.15(expo@58.0.23)(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0))(pg@8.23.0)(sql.js@1.15.0)(zod@4.6.7)
 
-  drizzle-orm@1.0.0-rc.5(@cloudflare/workers-types@4.20260604.1)(@effect/sql-d1@4.1.1(effect@4.1.2))(@effect/sql-pg@4.1.2(effect@4.1.2))(@effect/sql-sqlite-do@4.1.2(effect@4.1.2))(@electric-sql/pglite@0.3.15)(@libsql/client@0.17.3(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/sql.js@1.4.11)(bun-types@1.3.14)(effect@4.1.2)(expo-sqlite@58.0.15(expo@58.0.23)(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0))(pg@8.23.0)(sql.js@1.15.0)(zod@4.6.7):
+  drizzle-orm@1.0.0-rc.5(@cloudflare/workers-types@4.20260604.1)(@effect/sql-d1@4.1.1(effect@4.1.3))(@effect/sql-pg@4.1.2(effect@4.1.3))(@effect/sql-sqlite-do@4.1.2(effect@4.1.3))(@electric-sql/pglite@0.3.15)(@libsql/client@0.17.3(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/sql.js@1.4.11)(bun-types@1.3.14)(effect@4.1.3)(expo-sqlite@58.0.15(expo@58.0.23)(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0))(pg@8.23.0)(sql.js@1.15.0)(zod@4.6.7):
     optionalDependencies:
       '@cloudflare/workers-types': 4.20260604.1
-      '@effect/sql-d1': 4.1.1(effect@4.1.2)
-      '@effect/sql-pg': 4.1.2(effect@4.1.2)
-      '@effect/sql-sqlite-do': 4.1.2(effect@4.1.2)
+      '@effect/sql-d1': 4.1.1(effect@4.1.3)
+      '@effect/sql-pg': 4.1.2(effect@4.1.3)
+      '@effect/sql-sqlite-do': 4.1.2(effect@4.1.3)
       '@electric-sql/pglite': 0.3.15
       '@libsql/client': 0.17.3(bufferutil@4.1.0)(utf-8-validate@6.0.6)
       '@types/sql.js': 1.4.11
       bun-types: 1.3.14
-      effect: 4.1.2
+      effect: 4.1.3
       expo-sqlite: 58.0.15(expo@58.0.23)(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0)
       pg: 8.23.0
       sql.js: 1.15.0
@@ -18997,7 +19001,7 @@ snapshots:
 
   ee-first@1.1.1: {}
 
-  effect@4.1.2: {}
+  effect@4.1.3: {}
 
   ejs@3.1.10:
     dependencies:
@@ -19049,7 +19053,7 @@ snapshots:
 
   electron-to-chromium@1.5.430: {}
 
-  electron-updater@6.8.9(patch_hash=2ed21db470f254c5e095a0eb8dabc086c310d180322004bceee7d56e7ce86b84)(supports-color@8.1.1):
+  electron-updater@6.8.9(patch_hash=5e096d34a46fdbaa6d48a5803b2c0ed9c7c04f8ab43a30ebebbf726f8f28ed8e)(supports-color@8.1.1):
     dependencies:
       builder-util-runtime: 9.7.0(supports-color@8.1.1)
       fs-extra: 10.1.0
@@ -19604,7 +19608,7 @@ snapshots:
   ? expo-widgets@58.0.27(patch_hash=8bf49067f93742855e15f29559ac75c8b50230b47069060993c9ea01dac11171)(@babel/core@7.29.7(supports-color@8.1.1))(expo@58.0.23)(react-dom@19.3.0(react@19.3.0))(react-native-worklets@0.13.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0)(supports-color@8.1.1))(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0)
   : dependencies:
       '@expo/plist': 0.10.1
-      '@expo/ui': 58.0.27(@babel/core@7.29.7(supports-color@8.1.1))(expo@58.0.23)(react-dom@19.3.0(react@19.3.0))(react-native-worklets@0.13.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0)(supports-color@8.1.1))(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0)
+      '@expo/ui': 58.0.27(patch_hash=9f2547678939f4ec78fe45163b6455aad63d3c80353d7e0cc783f6a61a7ccc2f)(@babel/core@7.29.7(supports-color@8.1.1))(expo@58.0.23)(react-dom@19.3.0(react@19.3.0))(react-native-worklets@0.13.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0)(supports-color@8.1.1))(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0)
       expo: 58.0.23(d226faf1ca90e630d8c56a2108dee32d)
       react: 19.3.0
       react-native: 0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6)
@@ -22481,7 +22485,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  react-native-enriched-markdown@file:apps/mobile/deps/react-native-enriched-markdown-1.2.0-t3.18-497fbe63.tgz(katex@0.16.47)(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0):
+  react-native-enriched-markdown@file:apps/mobile/deps/react-native-enriched-markdown-1.2.0-t3.18-0dc7ed81.tgz(katex@0.16.47)(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0):
     dependencies:
       react: 19.3.0
       react-native: 0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6)
@@ -22539,7 +22543,7 @@ snapshots:
       react: 19.3.0
       react-native: 0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6)
 
-  react-native-screens@file:apps/mobile/deps/react-native-screens-5.0.0-t3.48.tgz(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0):
+  react-native-screens@file:apps/mobile/deps/react-native-screens-5.0.0-t3.50.tgz(react-native@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(@react-native/metro-config@0.88.1(@babel/core@7.29.7(supports-color@8.1.1))(bufferutil@4.1.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(supports-color@8.1.1)(utf-8-validate@6.0.6))(react@19.3.0):
     dependencies:
       react: 19.3.0
       react-freeze: 1.0.4(react@19.3.0)
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index ec6437094ed5..259c1637232a 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -23,7 +23,7 @@ allowBuilds:
   node-pty: true
   # Ships N-API prebuilds; its install script only rebuilds from source.
   objc-js: false
-  "react-native-enriched-markdown@file:apps/mobile/deps/react-native-enriched-markdown-1.2.0-t3.18-497fbe63.tgz": true
+  "react-native-enriched-markdown@file:apps/mobile/deps/react-native-enriched-markdown-1.2.0-t3.18-0dc7ed81.tgz": true
   sharp: true
   utf-8-validate: false
   workerd: false
@@ -68,7 +68,7 @@ catalog:
   "@types/react-dom": ~19.3.0
   "@types/ws": 8.18.2
   alchemy: 2.0.0-beta.85
-  effect: 4.1.2
+  effect: 4.1.3
   electron-webauthn: 1.3.1
   jose: 6.2.2
   lightningcss: 1.33.0
@@ -254,6 +254,9 @@ patchedDependencies:
   "@effect/vitest@4.1.2": patches/@effect__vitest@4.1.2.patch
   expo-sharing@58.0.22: patches/expo-sharing@58.0.22.patch
   expo-widgets@58.0.27: patches/expo-widgets@58.0.27.patch
+  # Android: an RNHostView without a scrolling descendant (an app bar's buttons) is no longer the
+  # scroll target a Material bottom sheet picks, so sheet content can sit below its header.
+  "@expo/ui@58.0.27": patches/@expo__ui@58.0.27.patch
   "@ff-labs/fff-node@0.11.0": patches/@ff-labs__fff-node@0.11.0.patch
   # Exports the dependency-light subpaths mobile and the web diff parser import, and makes find
   # cover folded files and collapsed context (onRevealSearchMatch).
diff --git a/scripts/coil/sync-upstream.sh b/scripts/coil/sync-upstream.sh
index bff60cf34872..490d46009956 100755
--- a/scripts/coil/sync-upstream.sh
+++ b/scripts/coil/sync-upstream.sh
@@ -87,6 +87,7 @@ retire_upstream_workflows() {
 .github/workflows/desktop-macos-preview.yml
 .github/workflows/desktop-macos-preview-publish.yml
 .github/workflows/issue-labels.yml
+.github/workflows/issue-vouch.yml
 .github/workflows/mobile-android-apk.yml
 .github/workflows/mobile-eas-preview.yml
 .github/workflows/mobile-eas-preview-fork.yml
@@ -231,7 +232,8 @@ fi
 # mobile and desktop on one ubuntu-latest runner, `MessagesTimeline.test.tsx` blows the 30s its
 # `beforeAll` pins in-file (3 of 3 runs at the 2026-10-08 sync), and `--hookTimeout` cannot
 # override an in-file value. `@t3tools/monorepo` is the root package, whose `test` is
-# `vp run -r test` and would re-run web.
+# `vp run -r test` and would re-run web. Web runs as two shards so each gets a fresh headless
+# Chromium, which lost its page late in one full run (see coil-ci.yml's test_web).
 # --testTimeout because apps/web pins 15s (tuned for upstream's blacksmith runners), too tight
 # for an upstream CPU-bound test here. 120s is the highest any package configures
 # (apps/server), so it never LOWERS a package's own budget. --hookTimeout is NOT implied by
@@ -247,7 +249,8 @@ for script in $VERIFY; do
     commands=(
       "$RUN --filter @t3tools/desktop ensure:electron"
       "$RUN --filter !@t3tools/monorepo --filter !@t3tools/web test $TEST_FLAGS"
-      "$RUN --filter @t3tools/web test $TEST_FLAGS"
+      "$RUN --filter @t3tools/web test --shard 1/2 $TEST_FLAGS"
+      "$RUN --filter @t3tools/web test --shard 2/2 $TEST_FLAGS"
     )
   else
     commands=("$RUN $script")
diff --git a/scripts/dev-runner.test.ts b/scripts/dev-runner.test.ts
index d522bfdb1579..af1735210a48 100644
--- a/scripts/dev-runner.test.ts
+++ b/scripts/dev-runner.test.ts
@@ -1,5 +1,6 @@
 // @effect-diagnostics nodeBuiltinImport:off - builds real worktree layouts on disk.
 import * as NodeServices from "@effect/platform-node/NodeServices";
+import * as NodeChildProcess from "node:child_process";
 import * as NodeFS from "node:fs";
 import * as NodeOS from "node:os";
 import * as NodePath from "node:path";
@@ -189,6 +190,51 @@ it.layer(NodeServices.layer)("dev-runner", (it) => {
         assert.equal(env.HOST, undefined);
       }),
     );
+
+    it.effect("drops an inherited T3CODE_HOST and T3CODE_LAN from a parent T3 server", () =>
+      Effect.gen(function* () {
+        const env = yield* createDevRunnerEnv({
+          mode: "dev",
+          baseEnv: { T3CODE_PORT: "3773", T3CODE_HOST: "0.0.0.0", T3CODE_LAN: "true" },
+          serverOffset: 0,
+          webOffset: 0,
+          t3Home: undefined,
+          browser: undefined,
+          autoBootstrapProjectFromCwd: undefined,
+          logWebSocketEvents: undefined,
+          host: undefined,
+          port: undefined,
+          devUrl: undefined,
+        });
+
+        assert.equal(env.T3CODE_PORT, "13773");
+        assert.equal(env.T3CODE_HOST, undefined);
+        assert.equal(env.T3CODE_LAN, undefined);
+      }),
+    );
+  });
+
+  describe("cli", () => {
+    it("ignores the parent T3 server's T3CODE_PORT and T3CODE_HOST", () => {
+      const result = NodeChildProcess.spawnSync(
+        process.execPath,
+        ["scripts/dev-runner.ts", "dev:server", "--dry-run"],
+        {
+          cwd: NodePath.resolve(import.meta.dirname, ".."),
+          encoding: "utf8",
+          env: {
+            ...process.env,
+            T3CODE_PORT: "3773",
+            T3CODE_HOST: "0.0.0.0",
+          },
+        },
+      );
+
+      assert.equal(result.status, 0, result.stderr);
+      const output = `${result.stdout}${result.stderr}`;
+      assert.match(output, /serverPort=\d+ /);
+      assert.notMatch(output, /serverPort=3773 /);
+    });
   });
 
   describe("findFirstAvailableOffset", () => {
@@ -574,6 +620,15 @@ it.layer(NodeServices.layer)("dev-runner", (it) => {
         }),
       );
 
+      // Node resolves localhost to ::1 first, so a 127.0.0.1 target can miss the backend.
+      it.effect("--built --host localhost keeps the backend's localhost name", () =>
+        Effect.gen(function* () {
+          const { env, tailscaleCalls } = yield* shareSpawned({ built: true, host: "localhost" });
+          const serve = tailscaleCalls.find((args) => args.includes("--bg"));
+          assert.equal(serve?.at(-1), `http://localhost:${env?.T3CODE_PORT}`);
+        }),
+      );
+
       it.effect("without --built keeps Vite behind the tailnet URL", () =>
         Effect.gen(function* () {
           const { env, vpArgs, tailscaleCalls } = yield* shareSpawned({});
diff --git a/scripts/dev-runner.ts b/scripts/dev-runner.ts
index 9cd8e598acf1..682886bca82b 100644
--- a/scripts/dev-runner.ts
+++ b/scripts/dev-runner.ts
@@ -20,6 +20,7 @@ import * as Schema from "effect/Schema";
 import { Argument, Command, Flag } from "effect/cli";
 import { ChildProcess } from "effect/process";
 
+import { defaultDevMemoryLimitBytes, enforceDevMemoryLimit } from "./lib/dev-memory-limit.ts";
 import { type DevShareError, shareDevServer, unshareDevServer } from "./lib/dev-share.ts";
 import { loadRepoEnv } from "./lib/public-config.ts";
 
@@ -59,6 +60,13 @@ export function isProxiableBindHost(host: string): boolean {
   );
 }
 
+function sharedBackendTargetHost(host: string | undefined): string {
+  const normalized = host?.trim() ?? "";
+  if (normalized === "::1" || normalized === "[::1]") return "[::1]";
+  if (normalized === "localhost") return "localhost";
+  return "127.0.0.1";
+}
+
 export const DEFAULT_T3_HOME = Effect.map(Effect.service(Path.Path), (path) =>
   path.join(NodeOS.homedir(), ".t3"),
 );
@@ -205,11 +213,6 @@ const optionalBooleanConfig = (name: string): Config.Config<boolean | undefined>
     Config.option,
     Config.map((value) => Option.getOrUndefined(value)),
   );
-const optionalPortConfig = (name: string): Config.Config<number | undefined> =>
-  Config.Port(name).pipe(
-    Config.option,
-    Config.map((value) => Option.getOrUndefined(value)),
-  );
 const optionalIntegerConfig = (name: string): Config.Config<number | undefined> =>
   Config.Int(name).pipe(
     Config.option,
@@ -371,12 +374,15 @@ export const createDevRunnerEnv = Effect.fn("dev-runner.createDevRunnerEnv")(fun
     delete output.T3CODE_SINGLE_ORIGIN_DEV;
     delete output.T3CODE_MODE;
     delete output.T3CODE_NO_BROWSER;
-    delete output.T3CODE_HOST;
     delete output.T3CODE_DEV_AUTH_TOKEN;
   }
 
+  // Agent shells inherit the parent T3 server's bind settings; only --host widens the dev server.
+  delete output.T3CODE_LAN;
   if (!isDesktopMode && host !== undefined) {
     output.T3CODE_HOST = host;
+  } else {
+    delete output.T3CODE_HOST;
   }
 
   if (!isDesktopMode) {
@@ -683,6 +689,7 @@ interface DevRunnerCliInput {
   readonly share: boolean;
   readonly seed?: boolean | undefined;
   readonly built: boolean;
+  readonly memoryLimitGb?: number | undefined;
   readonly runArgs: ReadonlyArray<string>;
 }
 
@@ -788,12 +795,13 @@ export const runDevRunnerWithInput = Effect.fn("dev-runner.runDevRunnerWithInput
         shareDevServer({
           webPort: sharedWebPort,
           // The backend binds 127.0.0.1 unless --host changes it. A wildcard
-          // still answers there; `--host ::1` binds only the IPv6 loopback.
+          // still answers there; `--host ::1` binds only the IPv6 loopback, and
+          // `localhost` binds whichever loopback Node resolves first.
           ...(input.built
             ? {
                 localTarget: {
                   port: Number(env.T3CODE_PORT),
-                  host: ["::1", "[::1]"].includes(input.host?.trim() ?? "") ? "[::1]" : "127.0.0.1",
+                  host: sharedBackendTargetHost(input.host),
                 },
               }
             : {}),
@@ -877,10 +885,9 @@ export const runDevRunnerWithInput = Effect.fn("dev-runner.runDevRunnerWithInput
     env,
     extendEnv: false,
     shell: spawnCommand.shell,
-    // Keep Vite+ in the same process group so terminal signals (Ctrl+C)
-    // reach it directly. Effect defaults to detached: true on non-Windows,
-    // which would put the runner in a new group and require manual forwarding.
-    detached: false,
+    // Its own process group: teardown signals the whole group, because vp
+    // does not pass SIGTERM on to Vite and the server.
+    detached: true,
     forceKillAfter: "1500 millis",
   }).pipe(
     Effect.mapError(
@@ -893,6 +900,10 @@ export const runDevRunnerWithInput = Effect.fn("dev-runner.runDevRunnerWithInput
     ),
   );
 
+  const memoryLimitBytes =
+    input.memoryLimitGb === undefined
+      ? defaultDevMemoryLimitBytes()
+      : input.memoryLimitGb * 1024 ** 3;
   const exitCode = yield* child.exitCode.pipe(
     Effect.mapError(
       (cause) =>
@@ -902,6 +913,7 @@ export const runDevRunnerWithInput = Effect.fn("dev-runner.runDevRunnerWithInput
           cause,
         }),
     ),
+    Effect.raceFirst(enforceDevMemoryLimit(memoryLimitBytes)),
   );
   if (exitCode !== 0) {
     return yield* new DevRunnerProcessExitError({
@@ -911,6 +923,8 @@ export const runDevRunnerWithInput = Effect.fn("dev-runner.runDevRunnerWithInput
   }
 });
 
+const NonNegativeInt = Schema.Int.check(Schema.isGreaterThanOrEqualTo(0));
+
 const devRunnerCli = Command.make("dev-runner", {
   mode: Argument.Literals("mode", DEV_RUNNER_MODES).pipe(
     Argument.withDescription("Development mode to run."),
@@ -938,13 +952,19 @@ const devRunnerCli = Command.make("dev-runner", {
     Flag.withFallbackConfig(optionalBooleanConfig("T3CODE_LOG_WS_EVENTS")),
   ),
   host: Flag.String("host").pipe(
-    Flag.withDescription("Server host/interface override (forwards to T3CODE_HOST)."),
-    Flag.withFallbackConfig(optionalStringConfig("T3CODE_HOST")),
+    Flag.withDescription(
+      "Server host/interface override (forwards to T3CODE_HOST). Ambient T3CODE_HOST is ignored: agent shells inherit it from the T3 server that spawned them.",
+    ),
+    Flag.optional,
+    Flag.map(Option.getOrUndefined),
   ),
   port: Flag.Int("port").pipe(
     Flag.withSchema(Schema.Int.check(Schema.isBetween({ minimum: 1, maximum: 65535 }))),
-    Flag.withDescription("Server port override (forwards to T3CODE_PORT)."),
-    Flag.withFallbackConfig(optionalPortConfig("T3CODE_PORT")),
+    Flag.withDescription(
+      "Server port override (forwards to T3CODE_PORT). Ambient T3CODE_PORT is ignored: agent shells inherit it from the T3 server that spawned them.",
+    ),
+    Flag.optional,
+    Flag.map(Option.getOrUndefined),
   ),
   devUrl: Flag.String("dev-url").pipe(
     Flag.withSchema(Schema.URLFromString),
@@ -976,6 +996,18 @@ const devRunnerCli = Command.make("dev-runner", {
     ),
     Flag.withDefault(false),
   ),
+  memoryLimitGb: Flag.Int("memory-limit-gb").pipe(
+    Flag.withSchema(NonNegativeInt),
+    Flag.withDescription(
+      "Stop the dev server when it and its child processes use more than this many GiB of RAM plus swap (equivalent to T3CODE_DEV_MEMORY_LIMIT_GB). Defaults to half of RAM, at most 16. 0 turns it off. Linux only.",
+    ),
+    Flag.withFallbackConfig(
+      Config.schema(NonNegativeInt, "T3CODE_DEV_MEMORY_LIMIT_GB").pipe(
+        Config.option,
+        Config.map(Option.getOrUndefined),
+      ),
+    ),
+  ),
   runArgs: Argument.String("run-arg").pipe(
     Argument.withDescription("Additional Vite+ run args (pass after `--`)."),
     Argument.variadic(),
@@ -992,6 +1024,9 @@ const cliRuntimeLayer = Layer.mergeAll(
 );
 
 if (import.meta.main) {
+  // runMain interrupts (running finalizers such as the --share unmapping) only
+  // on SIGINT/SIGTERM; a closed terminal or dropped SSH session sends SIGHUP.
+  process.on("SIGHUP", () => process.kill(process.pid, "SIGTERM"));
   Command.run(devRunnerCli, { version: "0.0.0" }).pipe(
     Effect.scoped,
     Effect.provide(cliRuntimeLayer),
diff --git a/scripts/e2e.config.ts b/scripts/e2e.config.ts
index 520fc8338da7..989d63326ac8 100644
--- a/scripts/e2e.config.ts
+++ b/scripts/e2e.config.ts
@@ -31,6 +31,12 @@ const resolved = await Effect.gen(function* () {
     appDir: path.resolve(scripts, env.T3_SCENARIO_APP_DIR ?? ".."),
     home,
     startApp: path.join(scripts, "scenarios/start-app.ts"),
+    // e2e gives the app only PATH, HOME and the temp directory. A scenario that needs more names
+    // it here: exact names or prefixes ending in `*`, separated by commas.
+    inheritEnv: (env.T3_SCENARIO_INHERIT_ENV ?? "")
+      .split(",")
+      .map((name) => name.trim())
+      .filter((name) => name !== ""),
     mobile: {
       host: host || "127.0.0.1",
       // A mobile target has no `app.url`, so e2e cannot pick these ports.
@@ -143,6 +149,7 @@ export default {
           executable: resolved.node,
           args: [startApp, "web", T3_HOME, LOOPBACK, "{port}"],
           cwd: APP_DIR,
+          inheritEnv: resolved.inheritEnv,
           startupTimeout: 300_000,
           log: ".e2e/app.log",
         },
@@ -170,6 +177,7 @@ export default {
             MOBILE.host,
           ],
           cwd: APP_DIR,
+          inheritEnv: resolved.inheritEnv,
           startupTimeout: 300_000,
           log: ".e2e/mobile-app.log",
         },
diff --git a/scripts/install.sh b/scripts/install.sh
index 46df9a715eb8..2630bb3a60b3 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -248,7 +248,7 @@ else
   fi
   expected="$(grep " \*\{0,1\}${archive}\$" "${staging}/SHA256SUMS" | cut -d' ' -f1)"
   [ -n "$expected" ] || fail "t3 ${version} has no release archive for ${platform}-${arch}"
-  download "${base_url}/v${version}/${archive}" "${staging}/${archive}"
+  download "${base_url}/v${version}/${archive}" "${staging}/${archive}" || fail "could not download ${archive}"
 
   step "Verifying the download..."
   actual="$(checksum "${staging}/${archive}")"
diff --git a/scripts/install.test.ts b/scripts/install.test.ts
index ec4212a89ec5..3536ca2dd36d 100644
--- a/scripts/install.test.ts
+++ b/scripts/install.test.ts
@@ -130,6 +130,58 @@ describe.skipIf(HostProcess.Platform.defaultValue() !== "linux")("installer chan
   });
 });
 
+// regression: #35834
+describe.skipIf(HostProcess.Platform.defaultValue() !== "linux")(
+  "installer archive download",
+  () => {
+    it("names the archive when it returns 404", async () => {
+      const root = await NodeFSP.mkdtemp(NodePath.join(NodeOS.tmpdir(), "t3-install-archive-"));
+      const arch = HostProcess.Architecture.defaultValue() === "arm64" ? "arm64" : "x64";
+      const archive = `t3-1.2.3-linux-${arch}.tar.gz`;
+      const server = NodeHttp.createServer((request, response) => {
+        if (request.url === "/v1.2.3/SHA256SUMS")
+          return response.end(`${"0".repeat(64)}  ${archive}\n`);
+        response.writeHead(404).end();
+      });
+      try {
+        await new Promise<void>((resolve) => server.listen(0, "127.0.0.1", resolve));
+        const address = server.address();
+        if (!address || typeof address === "string") throw new Error("Expected a TCP listener");
+        const { code, output } = await new Promise<{ code: number | null; output: string }>(
+          (resolve, reject) => {
+            const child = NodeChildProcess.spawn(
+              "sh",
+              [NodePath.resolve(import.meta.dirname, "install.sh")],
+              {
+                env: {
+                  ...process.env,
+                  T3CODE_CHANNEL: "",
+                  T3CODE_VERSION: "1.2.3",
+                  T3CODE_HOME: NodePath.join(root, "home"),
+                  T3CODE_INSTALL_BIN_DIR: NodePath.join(root, "bin"),
+                  T3CODE_RELEASE_BASE_URL: `http://127.0.0.1:${address.port}`,
+                },
+                stdio: ["ignore", "pipe", "pipe"],
+              },
+            );
+            let output = "";
+            child.stdout.on("data", (chunk: Buffer) => (output += chunk.toString()));
+            child.stderr.on("data", (chunk: Buffer) => (output += chunk.toString()));
+            child.on("error", reject);
+            child.on("close", (code) => resolve({ code, output }));
+          },
+        );
+        expect(code, output).not.toBe(0);
+        expect(output).toMatch(new RegExp(`t3 install: .*${archive.replaceAll(".", "\\.")}`));
+      } finally {
+        server.closeAllConnections();
+        await new Promise<void>((resolve) => server.close(() => resolve()));
+        await NodeFSP.rm(root, { recursive: true, force: true });
+      }
+    });
+  },
+);
+
 /** Runs an installer for a version that is already unpacked, so only the t3 command step runs. */
 async function installOver(input: {
   readonly script: "install.sh" | "install.ps1";
diff --git a/scripts/lib/dev-memory-limit.test.ts b/scripts/lib/dev-memory-limit.test.ts
new file mode 100644
index 000000000000..90fc2cb47dcb
--- /dev/null
+++ b/scripts/lib/dev-memory-limit.test.ts
@@ -0,0 +1,23 @@
+import { assert, it } from "@effect/vitest";
+
+import {
+  parseProcStatParentPid,
+  parseProcStatusBytes,
+  processTreePids,
+} from "./dev-memory-limit.ts";
+
+it("counts RAM and swap for the dev runner's descendants only", () => {
+  assert.strictEqual(parseProcStatParentPid("812 (node (vite) 2) S 77 812 812 0 -1"), 77);
+  assert.strictEqual(
+    parseProcStatusBytes("Name:\tnode\nVmRSS:\t   2048 kB\nVmSwap:\t  1024 kB\nThreads:\t9\n"),
+    3 * 1024 * 1024,
+  );
+  // Listed before its parent, as /proc may order them.
+  const processes = [
+    { pid: 30, ppid: 20 },
+    { pid: 20, ppid: 10 },
+    { pid: 11, ppid: 1 },
+    { pid: 10, ppid: 1 },
+  ];
+  assert.deepStrictEqual([...processTreePids(10, processes)].sort(), [10, 20, 30]);
+});
diff --git a/scripts/lib/dev-memory-limit.ts b/scripts/lib/dev-memory-limit.ts
new file mode 100644
index 000000000000..fff8823ec218
--- /dev/null
+++ b/scripts/lib/dev-memory-limit.ts
@@ -0,0 +1,95 @@
+/** Stops a dev server whose process tree outgrows a memory limit, so a leak cannot fill RAM and swap. */
+
+import * as NodeOS from "node:os";
+
+import * as HostProcess from "@t3tools/shared/HostProcess";
+import * as Effect from "effect/Effect";
+import * as FileSystem from "effect/FileSystem";
+import * as Schema from "effect/Schema";
+
+const GiB = 1024 ** 3;
+
+/** Half of RAM, at most 16 GiB. A fresh bundled-dev server uses about 7 GiB. */
+export const defaultDevMemoryLimitBytes = (totalBytes = NodeOS.totalmem()) =>
+  Math.min(16 * GiB, Math.floor(totalBytes / 2));
+
+export class DevRunnerMemoryLimitError extends Schema.TaggedError<DevRunnerMemoryLimitError>()(
+  "DevRunnerMemoryLimitError",
+  { usedBytes: Schema.Number, limitBytes: Schema.Number },
+) {
+  override get message(): string {
+    const gib = (bytes: number) => (bytes / GiB).toFixed(1);
+    return `The dev server used ${gib(this.usedBytes)} GiB of RAM and swap, over its ${gib(this.limitBytes)} GiB limit, so it was stopped. Start it again, or set --memory-limit-gb (T3CODE_DEV_MEMORY_LIMIT_GB; 0 turns the limit off).`;
+  }
+}
+
+export interface ProcessSample {
+  readonly pid: number;
+  readonly ppid: number;
+}
+
+/** `comm` can hold spaces and parentheses, so fields are read after its last `)`. */
+export function parseProcStatParentPid(stat: string): number | undefined {
+  const ppid = Number(stat.slice(stat.lastIndexOf(")") + 2).split(" ")[1]);
+  return Number.isInteger(ppid) ? ppid : undefined;
+}
+
+export function parseProcStatusBytes(status: string): number {
+  const kib = (field: string) =>
+    Number(new RegExp(`^${field}:\\s+(\\d+) kB`, "m").exec(status)?.[1] ?? 0);
+  return (kib("VmRSS") + kib("VmSwap")) * 1024;
+}
+
+export function processTreePids(rootPid: number, processes: ReadonlyArray<ProcessSample>) {
+  const tree = new Set([rootPid]);
+  for (let grew = true; grew;) {
+    grew = false;
+    for (const { pid, ppid } of processes) {
+      if (tree.has(ppid) && !tree.has(pid)) {
+        tree.add(pid);
+        grew = true;
+      }
+    }
+  }
+  return tree;
+}
+
+const readProcessTreeBytes = Effect.fn("DevRunner.readProcessTreeBytes")(function* (
+  rootPid: number,
+) {
+  const fs = yield* FileSystem.FileSystem;
+  // Processes exit between listing and reading, so each read may fail.
+  const read = (path: string) => fs.readFileString(path).pipe(Effect.option);
+  const entries = yield* fs.readDirectory("/proc").pipe(Effect.orElseSucceed(() => []));
+  const pids = entries.filter((entry) => /^\d+$/.test(entry));
+  const processes: ProcessSample[] = [];
+  for (const pid of pids) {
+    const stat = yield* read(`/proc/${pid}/stat`);
+    const ppid = stat._tag === "Some" ? parseProcStatParentPid(stat.value) : undefined;
+    if (ppid !== undefined) processes.push({ pid: Number(pid), ppid });
+  }
+  let bytes = 0;
+  for (const pid of processTreePids(rootPid, processes)) {
+    const status = yield* read(`/proc/${pid}/status`);
+    if (status._tag === "Some") bytes += parseProcStatusBytes(status.value);
+  }
+  return bytes;
+});
+
+/**
+ * Samples this process and its descendants every 30 seconds and fails once
+ * they hold more than `limitBytes` of RAM plus swap. Linux only; elsewhere it
+ * never completes.
+ */
+export const enforceDevMemoryLimit = Effect.fn("DevRunner.enforceDevMemoryLimit")(function* (
+  limitBytes: number,
+) {
+  if ((yield* HostProcess.Platform) !== "linux" || limitBytes <= 0) return yield* Effect.never;
+  while (true) {
+    yield* Effect.sleep("30 seconds");
+    const usedBytes = yield* readProcessTreeBytes(process.pid);
+    if (usedBytes > limitBytes) {
+      return yield* new DevRunnerMemoryLimitError({ usedBytes, limitBytes });
+    }
+  }
+});
diff --git a/scripts/lib/dev-share.ts b/scripts/lib/dev-share.ts
index 781443214590..0c42fe9f3116 100644
--- a/scripts/lib/dev-share.ts
+++ b/scripts/lib/dev-share.ts
@@ -6,6 +6,7 @@ import {
   ensureTailscaleServe,
   readTailscaleStatus,
   type TailscaleCommandError,
+  type TailscaleServeHttpsDisabledError,
   type TailscaleStderrDiagnostic,
 } from "@t3tools/tailscale";
 import * as Effect from "effect/Effect";
@@ -18,13 +19,18 @@ const DIAGNOSTIC_EXPLANATIONS: Record<TailscaleStderrDiagnostic, string | undefi
   "not-logged-in": "this machine is not logged into a tailnet — run `tailscale up`",
   "not-running": "Tailscale is not running; start it and try again",
   "permission-denied": "permission denied — `tailscale serve` may need elevated privileges",
+  "unsupported-target": "this Tailscale install can only proxy to localhost",
   unknown: undefined,
 };
 
-const explainCommandFailure = (error: TailscaleCommandError): string | undefined =>
-  error._tag === "TailscaleCommandExitError" && error.stderrDiagnostic !== undefined
-    ? (DIAGNOSTIC_EXPLANATIONS[error.stderrDiagnostic] ?? "run the command by hand to see why")
-    : undefined;
+const explainCommandFailure = (
+  error: TailscaleCommandError | TailscaleServeHttpsDisabledError,
+): string | undefined =>
+  error._tag === "TailscaleServeHttpsDisabledError"
+    ? "HTTPS is not enabled on this tailnet — enable HTTPS certificates at https://login.tailscale.com/admin/dns"
+    : error._tag === "TailscaleCommandExitError" && error.stderrDiagnostic !== undefined
+      ? (DIAGNOSTIC_EXPLANATIONS[error.stderrDiagnostic] ?? "run the command by hand to see why")
+      : undefined;
 
 export class TailscaleUnavailableError extends Schema.TaggedError<TailscaleUnavailableError>()(
   "TailscaleUnavailableError",
diff --git a/scripts/mobile-e2e.ts b/scripts/mobile-e2e.ts
index abeb484e158d..4b6121378a35 100644
--- a/scripts/mobile-e2e.ts
+++ b/scripts/mobile-e2e.ts
@@ -32,14 +32,17 @@ const REPO_ROOT = NodePath.resolve(NodePath.dirname(NodeURL.fileURLToPath(import
 
 const log = (scope: string, message: string) => NodeProcess.stderr.write(`[${scope}] ${message}\n`);
 
-/** This machine's Tailscale address (100.64.0.0/10), which pool devices reach it on. */
-function tailnetAddress(): string {
-  for (const addresses of Object.values(NodeOS.networkInterfaces())) {
-    for (const address of addresses ?? []) {
-      const [first, second] = address.address.split(".").map(Number);
-      if (address.family === "IPv4" && first === 100 && second! >= 64 && second! < 128)
-        return address.address;
-    }
+/** This machine's Tailscale address, which pool devices reach it on. */
+async function tailnetAddress(): Promise<string> {
+  // Other VPNs share 100.64.0.0/10, so ask Tailscale instead of matching interface ranges.
+  // The macOS app bundles its CLI without putting a launcher on PATH.
+  for (const cli of ["tailscale", "/Applications/Tailscale.app/Contents/MacOS/Tailscale"]) {
+    const stdout = await run(cli, ["ip", "-4"]).then(
+      (result) => result.stdout,
+      () => "",
+    );
+    const address = stdout.trim().split("\n")[0];
+    if (address) return address;
   }
   throw new Error("No Tailscale IPv4 address: pool devices reach Metro and the fixture over it.");
 }
@@ -173,7 +176,7 @@ async function main() {
     throw new Error(
       "Set SIMLOCK_AGENT_DEVICE_URL (<gateway>/v1/agent-device) and AGENT_DEVICE_DAEMON_AUTH_TOKEN (a Simlock agent token) to run on the device pool.",
     );
-  const host = tailnetAddress();
+  const host = await tailnetAddress();
 
   const runId = new Date().toISOString().replaceAll(/[:.]/g, "-");
   const outputDirectory = NodePath.join(REPO_ROOT, "artifacts/mobile-e2e", runId);
diff --git a/scripts/prove-scenario.test.ts b/scripts/prove-scenario.test.ts
index 51fc2f3ece7d..a22d636b516f 100644
--- a/scripts/prove-scenario.test.ts
+++ b/scripts/prove-scenario.test.ts
@@ -91,6 +91,20 @@ describe("prove-scenario", () => {
     expect(proof.verdict).toMatch(row.verdict);
   });
 
+  it("tells a scenario that stopped from an app that did not start", () => {
+    const side = (report: Parameters<typeof readSide>[2]) =>
+      readSide("aaaaaaaaaaaa", "/out/base/results", report);
+    const head = readSide("bbbbbbbbbbbb", "/out/head/results", passed);
+    // A control the scenario did not find: the app ran, so the scenario is what needs fixing.
+    const stopped = buildProof(side(brokenScenario), head, (path) => path);
+    expect(stopped.couldNotRun).toBe("scenario");
+    expect(stopped.verdict).toMatch(/fix the scenario/);
+    const noApp = buildProof(side(undefined), head, (path) => path);
+    expect(noApp.couldNotRun).toBe("app");
+    expect(noApp.verdict).not.toMatch(/fix the scenario/);
+    expect(buildProof(side(failed), head, (path) => path).couldNotRun).toBeNull();
+  });
+
   it("labels captures with their side and commit and keeps the pairing token out", () => {
     const proof = buildProof(
       readSide("aaaaaaaaaaaa", "/out/base/results", failed),
diff --git a/scripts/prove-scenario.ts b/scripts/prove-scenario.ts
index 6b0bb9c1a44f..68e5433ebef2 100644
--- a/scripts/prove-scenario.ts
+++ b/scripts/prove-scenario.ts
@@ -53,6 +53,11 @@ export interface SideResult {
   readonly status: "passed" | "failed" | "error";
   readonly title: string;
   readonly message?: string;
+  /**
+   * For `error`, what stopped: `app` when the app did not start or no test ran, `scenario` when
+   * the app ran and the scenario stopped before its assertion, such as on a control it did not find.
+   */
+  readonly stopped?: "app" | "scenario";
   readonly steps: ReadonlyArray<{ readonly step: string; readonly status: string }>;
   /** Capture paths under the run's results directory, in the order the scenario took them. */
   readonly captures: ReadonlyArray<string>;
@@ -75,7 +80,16 @@ export function readSide(
       executed.length > 1
         ? `the scenario file ran ${executed.length} tests; a proof needs exactly one`
         : "e2e wrote no report: the app did not start, or no test was selected";
-    return { sha, status: "error", title: "", message, steps: [], captures: [], videos: [] };
+    return {
+      sha,
+      status: "error",
+      stopped: "app",
+      title: "",
+      message,
+      steps: [],
+      captures: [],
+      videos: [],
+    };
   }
   const files = (kind: string) =>
     (attempt.artifacts ?? []).flatMap((artifact) =>
@@ -84,15 +98,18 @@ export function readSide(
         : [],
     );
   const error = attempt.error;
+  // e2e exits 0 for a skipped test too, and a test that did not run proves nothing.
+  const status =
+    attempt.status === "passed"
+      ? "passed"
+      : error?.code === "ASSERTION_FAILED"
+        ? "failed"
+        : "error";
   return {
     sha,
-    // e2e exits 0 for a skipped test too, and a test that did not run proves nothing.
-    status:
-      attempt.status === "passed"
-        ? "passed"
-        : error?.code === "ASSERTION_FAILED"
-          ? "failed"
-          : "error",
+    status,
+    // A test that ended with an error of its own got as far as the app.
+    ...(status === "error" ? { stopped: error === undefined ? "app" : "scenario" } : {}),
     title: result.titlePath.join(" > "),
     ...(error === undefined
       ? attempt.status === "passed"
@@ -123,7 +140,7 @@ export function buildProof(base: SideResult, head: SideResult, link: (path: stri
   const broken = base.status === "error" ? base : head.status === "error" ? head : undefined;
   const verdict =
     broken !== undefined
-      ? `Not proven: the scenario could not run on ${broken === base ? `base ${baseSha}` : `head ${headSha}`} (${broken.message ?? "unknown error"}).`
+      ? `Not proven: the scenario could not run on ${broken === base ? `base ${baseSha}` : `head ${headSha}`} (${broken.message ?? "unknown error"}).${broken.stopped === "scenario" ? " The app ran and the scenario stopped before its assertion: fix the scenario and run it again." : ""}`
       : base.status === "passed"
         ? head.status === "passed"
           ? `Not proven: the scenario passes on base ${baseSha} too, so it does not reproduce the bug.`
@@ -160,6 +177,8 @@ export function buildProof(base: SideResult, head: SideResult, link: (path: stri
     scenario: head.title || base.title,
     failsOnBase: base.status === "failed",
     passesOnHead: head.status === "passed",
+    /** Why there is no verdict on the behavior: the app did not run, or the scenario stopped. */
+    couldNotRun: broken?.stopped ?? null,
     baseSha: base.sha,
     headSha: head.sha,
     verdict,
@@ -192,10 +211,18 @@ const withCheckout = Effect.fn("prove.withCheckout")(function* <A, E, R>(
   if (clean && (yield* git(["rev-parse", "HEAD"])) === sha) return yield* use(repo);
   // Beside this checkout, not in the temp directory, so tooling resolves as it does here.
   const worktree = `${repo}-scenario-${short(sha)}`;
+  // A run that was killed left its worktree behind, and git refuses to add over it.
+  const discard = git(["worktree", "remove", "--force", worktree]).pipe(
+    Effect.ignore,
+    Effect.andThen(git(["worktree", "prune"])),
+    Effect.ignore,
+  );
   return yield* Effect.acquireUseRelease(
-    git(["worktree", "add", "--quiet", "--detach", "--force", worktree, sha]),
+    discard.pipe(
+      Effect.andThen(git(["worktree", "add", "--quiet", "--detach", "--force", worktree, sha])),
+    ),
     () => run("vp", ["i"], { cwd: worktree, echo: true }).pipe(Effect.andThen(use(worktree))),
-    () => git(["worktree", "remove", "--force", worktree]).pipe(Effect.ignore),
+    () => discard,
   );
 });
 
@@ -204,6 +231,7 @@ const runSide = Effect.fn("prove.runSide")(function* (
   side: "base" | "head",
   rev: string,
   scenarioPath: string,
+  target: string,
 ) {
   const fs = yield* FileSystem.FileSystem;
   const path = yield* Path.Path;
@@ -216,7 +244,7 @@ const runSide = Effect.fn("prove.runSide")(function* (
     // The scenario and e2e come from this checkout; only the app comes from `appDir`.
     run(
       path.join(scripts, "node_modules/.bin/e2e"),
-      ["run", scenarioPath, "--output", path.relative(scripts, outDir)],
+      ["run", scenarioPath, "--target", target, "--output", path.relative(scripts, outDir)],
       {
         cwd: scripts,
         env: { ...environment, T3_SCENARIO_APP_DIR: appDir, E2E_TELEMETRY_DISABLED: "1" },
@@ -230,7 +258,22 @@ const runSide = Effect.fn("prove.runSide")(function* (
     Effect.flatMap(decodeReport),
     Effect.orElseSucceed(() => undefined),
   );
-  return readSide(sha, path.join(outDir, "results"), report);
+  const result = readSide(sha, path.join(outDir, "results"), report);
+  // Written as each side ends, so a proof whose second side is cut short still has its first.
+  yield* fs
+    .writeFileString(
+      path.join(scripts, ".e2e/prove", `${side}.json`),
+      `${yield* encodeProof(result)}\n`,
+    )
+    .pipe(Effect.ignore);
+  return result;
+});
+
+/** The one target a scenario runs on: an iOS scenario imports `t3-mobile.ts`, a web one does not. */
+const targetOf = Effect.fn("prove.targetOf")(function* (scenarioPath: string) {
+  const fs = yield* FileSystem.FileSystem;
+  const source = yield* fs.readFileString(scenarioPath).pipe(Effect.orElseSucceed(() => ""));
+  return source.includes("t3-mobile") ? "ios" : "web";
 });
 
 /** Uploads the captures and maps each to its URL; a failed upload leaves the map empty. */
@@ -262,6 +305,7 @@ const prove = Effect.fn("prove")(function* (input: {
   readonly base: string;
   readonly head: string;
   readonly uploadCommand: Option.Option<string>;
+  readonly target: Option.Option<string>;
 }) {
   const fs = yield* FileSystem.FileSystem;
   const path = yield* Path.Path;
@@ -271,8 +315,10 @@ const prove = Effect.fn("prove")(function* (input: {
   // A proof left by an earlier run must not be read as this one's.
   yield* fs.remove(proveDir, { recursive: true, force: true });
   yield* fs.makeDirectory(proveDir, { recursive: true });
-  const base = yield* runSide("base", input.base, scenarioPath);
-  const head = yield* runSide("head", input.head, scenarioPath);
+  // Only that target's app starts: a web scenario needs no Metro and no device.
+  const target = Option.getOrElse(input.target, () => "") || (yield* targetOf(scenarioPath));
+  const base = yield* runSide("base", input.base, scenarioPath, target);
+  const head = yield* runSide("head", input.head, scenarioPath, target);
   const links = Option.isSome(input.uploadCommand)
     ? yield* upload(input.uploadCommand.value, [...base.captures, ...head.captures])
     : new Map<string, string>();
@@ -285,8 +331,13 @@ const prove = Effect.fn("prove")(function* (input: {
   yield* fs.writeFileString(path.join(proveDir, "proof.md"), proof.markdown);
   yield* fs.writeFileString(path.join(proveDir, "proof.json"), `${json}\n`);
   yield* Console.log(json);
-  const couldNotRun = base.status === "error" || head.status === "error";
-  return proof.failsOnBase && proof.passesOnHead ? 0 : couldNotRun ? 2 : 1;
+  return proof.failsOnBase && proof.passesOnHead
+    ? 0
+    : proof.couldNotRun === "scenario"
+      ? 3
+      : proof.couldNotRun === "app"
+        ? 2
+        : 1;
 });
 
 const command = Command.make(
@@ -304,6 +355,12 @@ const command = Command.make(
       Flag.withDescription("Command that takes capture paths and prints one URL per line."),
       Flag.optional,
     ),
+    target: Flag.String("target").pipe(
+      Flag.withDescription(
+        "Target to run on: web or ios. Default: ios when the scenario imports t3-mobile.ts, else web.",
+      ),
+      Flag.optional,
+    ),
   },
   (input) =>
     prove(input).pipe(
diff --git a/scripts/scenarios/t3.ts b/scripts/scenarios/t3.ts
index 4df481ace8cf..24bb6e73d38b 100644
--- a/scripts/scenarios/t3.ts
+++ b/scripts/scenarios/t3.ts
@@ -2,11 +2,13 @@
 // app. `t3-mobile.ts` is the same for the iOS app.
 import * as NodeServices from "@effect/platform-node/NodeServices";
 import { test as base } from "@e2e-dev/web";
+import { expect } from "e2e";
 import * as HostProcess from "@t3tools/shared/HostProcess";
 import * as Effect from "effect/Effect";
 import * as FileSystem from "effect/FileSystem";
 import * as Path from "effect/Path";
 import * as Schema from "effect/Schema";
+import { FetchHttpClient, HttpClient, HttpClientResponse } from "effect/http";
 
 import { APP_DIR, T3_HOME } from "../e2e.config.ts";
 import { run } from "./shell.ts";
@@ -23,12 +25,19 @@ export interface T3State {
     readonly title: string;
     readonly messages: ReadonlyArray<string>;
     readonly model?: string;
-  }) => Promise<void>;
+  }) => Promise<T3Thread>;
+}
+
+export interface T3Thread {
+  readonly threadId: string;
 }
 
 export interface T3 extends T3State {
-  /** Opens the app, signed in, at `path`. */
-  readonly open: (path?: string) => Promise<void>;
+  /**
+   * Opens the app, signed in, at a path or on a thread `t3.thread` returned. Opening the thread
+   * by its link is the reliable way to reach it: a sidebar row covers its own title text.
+   */
+  readonly open: (target?: string | T3Thread) => Promise<void>;
 }
 
 /** e2e's fixtures are promise functions; this is the one place an Effect becomes a promise. */
@@ -99,6 +108,7 @@ export function makeState(home: string, env: NodeJS.ProcessEnv = {}) {
     const started = yield* turn(["start", input.project, first, "--title", input.title, ...replay]);
     const { threadId } = yield* decodeLaunched(started.stdout);
     for (const message of rest) yield* turn(["send", threadId, message]);
+    return { threadId } satisfies T3Thread;
   });
 
   return {
@@ -122,14 +132,31 @@ const readPairingPath = Effect.gen(function* () {
   return yield* fs.readFileString(path.join(T3_HOME, "pairing-path"));
 });
 
+/** The id every thread link starts with, asked of the server the app talks to. */
+const environmentId = (baseUrl: string) =>
+  HttpClient.get(`${baseUrl}/.well-known/t3/environment`).pipe(
+    Effect.flatMap(HttpClientResponse.filterStatusOk),
+    Effect.flatMap(
+      HttpClientResponse.schemaBodyJson(Schema.Struct({ environmentId: Schema.String })),
+    ),
+    Effect.map((environment) => environment.environmentId),
+    Effect.provide(FetchHttpClient.layer),
+  );
+
 export const test = base.extend<{ t3: T3 }>({
-  t3: async ({ app }, use) => {
+  t3: async ({ app, browser }, use) => {
     const { state, cleanup } = makeState(T3_HOME);
     await use({
       ...state,
-      open: async (path = "/") => {
+      open: async (target = "/") => {
         await app.open(await runPromise(readPairingPath));
-        if (path !== "/") await app.open(path);
+        // The pairing page signs in and then leaves itself. Going anywhere before it has done
+        // so cancels the sign-in, and the next page is the pairing page again.
+        await expect(browser).not.toHaveURL(/\/pair(?:[?#]|$)/, { timeout: 60_000 });
+        if (typeof target !== "string") {
+          const environment = await runPromise(environmentId(app.baseUrl ?? ""));
+          await app.open(`/${environment}/${target.threadId}`);
+        } else if (target !== "/") await app.open(target);
       },
     });
     await runPromise(cleanup);
diff --git a/scripts/scenarios/thread-opens-by-link.e2e.ts b/scripts/scenarios/thread-opens-by-link.e2e.ts
new file mode 100644
index 000000000000..9df71118df88
--- /dev/null
+++ b/scripts/scenarios/thread-opens-by-link.e2e.ts
@@ -0,0 +1,20 @@
+import { expect } from "e2e";
+
+import { test, WEB } from "./t3.ts";
+
+test(
+  "A seeded thread opens by its link and shows its history",
+  WEB,
+  async ({ t3, app, screen }) => {
+    const project = await t3.project("demo");
+    const thread = await t3.thread({
+      project,
+      title: "Earlier work",
+      messages: ["first", "second"],
+    });
+    await t3.open(thread);
+
+    await expect(screen.getByText("second fixture turn complete", { exact: false })).toBeVisible();
+    await app.screenshot("thread");
+  },
+);
diff --git a/vite.config.ts b/vite.config.ts
index e6e46335e1a4..c7a92ccbc9ad 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -51,6 +51,12 @@ const RESTRICTED_IMPORT_PATHS = [
     message:
       "Use NativeScrollViewMarker or NativeScrollView (src/native/NativeScrollViewMarker.tsx): they carry the header's scroll-edge blur under the Duo's vertical bar.",
   },
+  {
+    name: "react-native",
+    importNames: ["RefreshControl"],
+    message:
+      "Use RefreshControl from src/components/ui/RefreshControl: Android bottom sheets own the pull at the top, so it steps aside there.",
+  },
 ];
 
 const RESTRICTED_UI_VARIANT_PATTERNS = [