Merge commit '847c8c852d0af6cfd8da0a2cfbb8e6a38042dabf' into brennanb2025/perf-tick-affinity-gate

.gitignore

@@ -100,6 +100,7 @@ docs/**
 !docs/reference/headless-linux-server.md
 !docs/reference/linux-glibc-compatibility.md
 !docs/reference/relay-grace-time-reconfiguration.md
+!docs/reference/windows-setup-shell.md
 
 # Stably CLI (only docs/ are tracked)
 .stably/*

AGENTS.md

@@ -29,6 +29,7 @@ Orca targets macOS, Linux, and Windows. Keep all platform-dependent behavior beh
 - **Keyboard shortcuts**: Never hardcode `e.metaKey`. Use a platform check (`navigator.userAgent.includes('Mac')`) to pick `metaKey` on Mac and `ctrlKey` on Linux/Windows. Electron menu accelerators should use `CmdOrCtrl`.
 - **Shortcut labels in UI**: Display `⌘` / `⇧` on Mac and `Ctrl+` / `Shift+` on other platforms.
 - **File paths**: Use `path.join` or Electron/Node path utilities — never assume `/` or `\`.
+- **Windows setup scripts**: the setup/issue-command runner is a `.cmd` batch file unless the script starts with a `#!` line — never derive that from the user's terminal-shell preference, and never launch a `.cmd` runner with a bare `cmd.exe /c` from a Git Bash pane (MSYS rewrites the `/c`). See [`docs/reference/windows-setup-shell.md`](./docs/reference/windows-setup-shell.md).
 - **Linux native modules**: keep the glibc floor at Ubuntu 20.04 / glibc 2.31. A module compiled from source on a newer runner can reference symbol versions absent on the floor and crash the app on startup. See [`docs/reference/linux-glibc-compatibility.md`](./docs/reference/linux-glibc-compatibility.md); packaging fails if a bundled native binary needs newer glibc.
 
 ## SSH Use Case

README.md

@@ -36,7 +36,7 @@
 
 Monitor and steer your agents from your phone — get notified when an agent finishes and send follow-ups from anywhere.
 
-[iOS App Store](https://apps.apple.com/us/app/orca-ide/id6766130217) · [TestFlight](https://testflight.apple.com/join/YjeGMQBA) · [Android APK 0.0.36](https://github.com/stablyai/orca/releases/download/mobile-android-v0.0.36/app-release.apk) · [Docs →](https://www.onorca.dev/docs/mobile)
+[iOS App Store](https://apps.apple.com/us/app/orca-ide/id6766130217) · [TestFlight](https://testflight.apple.com/join/YjeGMQBA) · [Android APK 0.0.37](https://github.com/stablyai/orca/releases/download/mobile-android-v0.0.37/app-release.apk) · [Docs →](https://www.onorca.dev/docs/mobile)
 
 </td>
 <td width="50%">
@@ -230,7 +230,7 @@ yay -S stably-orca-bin
 Pair with your desktop app to monitor and steer your agents from your phone.
 
 - **iOS:** [Download on the App Store](https://apps.apple.com/us/app/orca-ide/id6766130217) or [join TestFlight](https://testflight.apple.com/join/YjeGMQBA)
-- **Android:** [Download APK 0.0.36](https://github.com/stablyai/orca/releases/download/mobile-android-v0.0.36/app-release.apk)
+- **Android:** [Download APK 0.0.37](https://github.com/stablyai/orca/releases/download/mobile-android-v0.0.37/app-release.apk)
 
 ---
 

build-plugins/plain-node-entry-guard.ts

@@ -26,6 +26,23 @@ const PLAIN_NODE_ENTRY_NAMES = [
   'codex/codex-app-server-grant-entry'
 ] as const
 
+// Entries executed as worker threads of the main process. Electron's module is
+// not registered on worker threads, so require("electron") throws
+// "Cannot find module 'electron'" there too (verified on Electron 43) and kills
+// the worker at startup. These carry hand-written "must stay electron-free"
+// comments, which is convention, not enforcement — and the port-scan worker in
+// particular sits one import away from a client module that deliberately does
+// require electron.
+const WORKER_THREAD_ENTRY_NAMES = [
+  'stt-worker',
+  'warp-theme-parser-worker',
+  'session-scanner-opencode-sqlite-worker-entry',
+  'main-thread-hang-watchdog-entry',
+  'port-scan-command-worker-entry'
+] as const
+
+type EntryRuntime = 'plain-Node process' | 'worker thread'
+
 const ELECTRON_REQUIRE_RE = /require\(\s*["']electron["']\s*\)/
 
 function collectReachableChunks(
@@ -56,13 +73,14 @@ function collectReachableChunks(
 function assertNoElectronRequire(
   entryName: string,
   entry: OutputChunk,
-  byFileName: Map<string, OutputChunk>
+  byFileName: Map<string, OutputChunk>,
+  runtime: EntryRuntime = 'plain-Node process'
 ): void {
   for (const chunk of collectReachableChunks(entry, byFileName)) {
     if (ELECTRON_REQUIRE_RE.test(chunk.code)) {
       throw new Error(
         `[plain-node-entry-guard] "${entryName}" reaches chunk "${chunk.fileName}" that ` +
-          `requires electron. "${entryName}" runs as a plain-Node process, where ` +
+          `requires electron. "${entryName}" runs as a ${runtime}, where ` +
           `require("electron") throws MODULE_NOT_FOUND and kills it at startup (the ` +
           `v1.4.129-rc.1 daemon outage). Keep electron imports out of its module graph.`
       )
@@ -125,7 +143,14 @@ export function createPlainNodeEntryGuardPlugin(): Plugin {
       for (const entryName of PLAIN_NODE_ENTRY_NAMES) {
         const entry = entryByName.get(entryName)
         if (entry) {
-          assertNoElectronRequire(entryName, entry, byFileName)
+          assertNoElectronRequire(entryName, entry, byFileName, 'plain-Node process')
+        }
+      }
+
+      for (const entryName of WORKER_THREAD_ENTRY_NAMES) {
+        const entry = entryByName.get(entryName)
+        if (entry) {
+          assertNoElectronRequire(entryName, entry, byFileName, 'worker thread')
         }
       }
 

config/knip.json

@@ -10,6 +10,7 @@
     "src/main/speech/stt-worker.ts",
     "src/main/warp-themes/warp-theme-parser-worker.ts",
     "src/main/ai-vault/session-scanner-opencode-sqlite-worker-entry.ts",
+    "src/main/ports/port-scan-command-worker-entry.ts",
     "src/main/ipc/parcel-watcher-process-entry.ts",
     "src/main/hang-watchdog/main-thread-hang-watchdog-entry.ts",
     "src/main/codex/codex-app-server-grant-entry.ts",

config/reliability-gates.jsonc

@@ -10,6 +10,101 @@
     }
   },
   "gates": [
+    {
+      "id": "editor.restored-sibling-owner-reparent",
+      "title": "Restored sibling tabs migrate filesystem authority before becoming editable",
+      "maturity": "experimental",
+      "protection": "partial",
+      "owner": "editor-runtime",
+      "layer": "renderer-store-controller-contract",
+      "surfaces": [
+        "restored editor tabs",
+        "editor save and autosave",
+        "filesystem watches and hot-exit persistence"
+      ],
+      "platforms": ["macos", "linux", "windows"],
+      "providers": ["local", "ssh", "paired-runtime"],
+      "coveredPlatforms": ["macos"],
+      "coveredProviders": ["local", "ssh", "paired-runtime"],
+      "coverageNotes": "Deterministic store/controller tests cover local, direct-SSH, paired-runtime identity, folder workspaces, queue quiescence, stale route and connection-generation rejection, authoritative active-workspace projection, owner-derived IDs, drafts and editor maps, tab/group placement, exact watch replacement, change/delete/rename correlation, explicit save, autosave, collision refusal without activation reconciliation, provenance, and restart hot-exit persistence. Live headed/headless paired-runtime and post-establish Electron IPC remain uncollected.",
+      "motivatingLinks": [
+        "https://github.com/stablyai/orca/issues/11304",
+        "https://github.com/stablyai/orca/pull/11369"
+      ],
+      "invariant": "A restored absolute path owned by a same-host sibling workspace cannot read, save, watch, or persist until old saves drain, the exact route and host generations are revalidated, and one authoritative activation transaction installs the sibling owner, target projection, editor state, reconciliation, and first-activation terminal preparation; collisions and stale routes fail before activation preparation or reconciliation.",
+      "oracle": "Hold an old-owner save in flight, start migration, then remove the sibling, change a folder root, or reconnect SSH and require owner migration to fail closed after quiescence. On a stable route require one coherent target-workspace projection, first-activation terminal generation preparation, destination authority for explicit save and autosave, exact watch replacement, destination-only change/delete/rename handling, owner-derived state rekeys, and hot-exit restart ownership. Seed an invalid destination tab/group model before a collision and require the target projection to remain byte-identical.",
+      "commands": [
+        "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/store/slices/restored-editor-owner-reparent.test.ts src/renderer/src/components/editor/restored-editor-owner-save-lifecycle.test.ts src/renderer/src/lib/runtime-workspace-file-route.test.ts"
+      ],
+      "testFiles": [
+        "src/renderer/src/store/slices/restored-editor-owner-reparent.test.ts",
+        "src/renderer/src/components/editor/restored-editor-owner-save-lifecycle.test.ts",
+        "src/renderer/src/lib/runtime-workspace-file-route.test.ts"
+      ],
+      "assertionRefs": [
+        {
+          "file": "src/renderer/src/store/slices/restored-editor-owner-reparent.test.ts",
+          "assertions": [
+            "one atomic commit rekeys owner-derived editor, preview, draft, cursor, view, tab, group, active, reveal, focus, provenance, and persistence state",
+            "active reparenting uses the centralized workspace activation transaction for terminal, browser, pending-creation, explorer, first-activation, and post-commit state",
+            "source watch unsubscribes once, destination watch subscribes once, and only destination change/delete/rename events reach the file",
+            "dirty and clean destination collisions fail closed without changing either open session or reconciling destination tabs and groups",
+            "folder and direct-SSH owners retain exact root, host, target, and connection-generation authority"
+          ]
+        },
+        {
+          "file": "src/renderer/src/components/editor/restored-editor-owner-save-lifecycle.test.ts",
+          "assertions": [
+            "migration waits for the old save queue and routes later explicit and automatic saves through the destination worktree",
+            "a removed sibling, changed folder root, or changed direct-SSH generation after quiescence rejects migration without changing ownership"
+          ]
+        },
+        {
+          "file": "src/renderer/src/lib/runtime-workspace-file-route.test.ts",
+          "assertions": [
+            "same-host runtime, folder, local, and direct-SSH roots resolve without cross-host fallback"
+          ]
+        }
+      ],
+      "evidenceRuns": [
+        {
+          "date": "2026-08-03",
+          "runner": "local",
+          "platform": "macos",
+          "command": "pnpm exec vitest run --config config/vitest.config.ts src/renderer/src/store/slices/restored-editor-owner-reparent.test.ts src/renderer/src/components/editor/restored-editor-owner-save-lifecycle.test.ts src/renderer/src/lib/runtime-workspace-file-route.test.ts",
+          "result": "passed",
+          "durationSeconds": 3,
+          "summary": "Three deterministic files passed 20 lifecycle, stale-route, activation, ownership, host, collision, persistence, watch, and save tests."
+        }
+      ],
+      "runtimeBudget": {
+        "p95Seconds": 5,
+        "scope": "focused renderer store/controller contract on a local development runner"
+      },
+      "flakeHistory": {
+        "status": "unknown",
+        "evidence": "One local deterministic run is recorded; CI and soak history have not started."
+      },
+      "redGreenEvidence": {
+        "status": "complete",
+        "evidence": "The final2 verifier's byte-identical post-quiescence lifecycle scope passed 21/21 on 7890271160 and failed 7 tests on f92db196a1; base e08eba674c, published 1bcfe3bcb0, and revert b3627461ab were structurally red. The permanent collision oracle is in test blob ac62a89c671a0c8f081ebf06736715bd2150ce9f (SHA-256 a61970ace80be1cb56f781aee6f878a8446c6c4527f9eb0cd0c151d8df96bf50). The same byte-identical blob is structurally red on base, published, and revert, behaviorally red on rejected final2 candidate 7890271160 because pre-commit reconciliation removes the stale destination tab, and green on implementation b72a838cdc; the full permanent gate passes 20/20."
+      },
+      "performanceBudget": {
+        "required": true,
+        "evidence": "Route lookup scans only the already-indexed renderer workspace catalog, while migration is O(open editor files + source/destination tabs/groups) and performs no provider call, Git scan, polling, retry, subprocess, or global fanout beyond the required old/new watch delta."
+      },
+      "promotionCriteria": [
+        "Collect two fresh child-verifier decisions against the correction candidate.",
+        "Collect headed and headless paired-runtime coverage after the post-establish Electron IPC gap is fixed.",
+        "Collect physical Windows or WSL path/host evidence and CI soak history."
+      ],
+      "knownGaps": [
+        "Headed Electron post-establish IPC, paired headless, reconnect, and physical Windows/WSL journeys are uncollected.",
+        "Cold many-repo main-process sibling discovery remains a separately measured follow-up.",
+        "Registered-workspace symlink policy remains inherited and unchanged."
+      ],
+      "demotionRule": "Keep experimental or demote if migration can race a save, retain source authority, fan out watches, lose dirty/editor state, accept an owner-generation change, merge a collision, or the focused contract flakes without a product or harness bug."
+    },
     {
       "id": "terminal-provider.login-session-retirement",
       "title": "macOS login-session retirement preserves live daemons through transient rejection bursts",
@@ -2243,6 +2338,120 @@
       ],
       "demotionRule": "Demote or quarantine if the gate flakes without a product or harness bug, if a Pi handler can again await receiver I/O, or if coalescing allows an older status to overwrite a newer one."
     },
+    {
+      "id": "agent-status.manual-compact-identity",
+      "title": "Manual Claude compact completion retires only its exact status generation",
+      "maturity": "experimental",
+      "protection": "partial",
+      "owner": "agent-session",
+      "layer": "shared-main-relay-contract",
+      "surfaces": [
+        "Claude status hooks",
+        "manual compact lifecycle",
+        "last-status persistence",
+        "SSH relay ingest"
+      ],
+      "platforms": ["macos", "linux", "windows"],
+      "providers": ["local", "daemon", "ssh", "wsl", "remote-runtime"],
+      "coveredPlatforms": ["macos"],
+      "coveredProviders": ["local", "ssh"],
+      "coverageNotes": "Deterministic listener, loopback HTTP, relay-restart, persisted-restore, and fake-SSH transport contracts run on macOS. Claude Code 2.1.220 captures prove manual PreCompact starts a new prompt UUID and exact PreCompact/PostCompact pairs share it. The shared Node paths are platform-independent; live Linux, Windows, WSL, and paired-runtime journeys remain gaps.",
+      "motivatingLinks": [
+        "https://github.com/stablyai/orca/issues/11352",
+        "https://github.com/stablyai/orca/pull/11353"
+      ],
+      "invariant": "A Claude manual PreCompact may replace only a current Claude row from the same receiving connection and provider session; a manual PostCompact may mark done only when the current authoritative row is its exact manual PreCompact generation, including provider prompt UUID. Missing identity is never a wildcard; later cross-provider work, replay, duplication, pane or tab retirement, and server stop invalidate completion. Automatic Claude and Kimi completion remain fail-closed until their hooks expose independently proven generation identity.",
+      "oracle": "Run one byte-identical state-machine oracle plus local HTTP, relay-restart, SSH, and persisted-restore streams using Claude's observed different prior-turn and compact prompt UUIDs. Require matching manual completion to emit done while wrong or absent prompt UUID, session-presence mismatch, wrong source or connection, stale replay and duplicate delivery, later Codex work, automatic completion, and lifecycle cleanup cannot retire the current row. Assert both emitted event order and the authoritative lastStatusByPaneKey snapshot.",
+      "commands": [
+        "pnpm exec vitest run --config config/vitest.config.ts src/shared/manual-compact-prompt-identity.test.ts src/main/agent-hooks/manual-compact-hook-stream.test.ts src/main/agent-hooks/manual-compact-status-cleanup.test.ts src/shared/agent-hook-listener.test.ts src/shared/agent-hook-relay.test.ts src/relay/agent-hook-server.test.ts src/main/agent-hooks/server.test.ts src/main/ssh/ssh-relay-session-agent-hooks.integration.test.ts --reporter=dot",
+        "Manual Claude Code 2.1.220 interactive compact: isolate UserPromptSubmit, PreCompact, and PostCompact hooks; submit one ordinary prompt then /compact; compare source, trigger, session_id, and prompt_id"
+      ],
+      "testFiles": [
+        "src/shared/manual-compact-prompt-identity.test.ts",
+        "src/main/agent-hooks/manual-compact-hook-stream.test.ts",
+        "src/main/agent-hooks/manual-compact-status-cleanup.test.ts",
+        "src/shared/agent-hook-listener.test.ts",
+        "src/shared/agent-hook-relay.test.ts",
+        "src/relay/agent-hook-server.test.ts",
+        "src/main/agent-hooks/server.test.ts",
+        "src/main/ssh/ssh-relay-session-agent-hooks.integration.test.ts"
+      ],
+      "assertionRefs": [
+        {
+          "file": "src/shared/manual-compact-prompt-identity.test.ts",
+          "assertions": [
+            "matching manual identity settles once",
+            "stale, duplicate, session-mismatched, malformed, automatic, and unproven provider completion fail closed",
+            "4,097 rejected pane keys allocate no ownership state"
+          ]
+        },
+        {
+          "file": "src/main/agent-hooks/manual-compact-hook-stream.test.ts",
+          "assertions": [
+            "local HTTP and relay-restart streams preserve the distinct prior-turn and compact prompt identities",
+            "later provider work and wrong transport identity remain authoritative",
+            "persisted PreCompact restores its prompt"
+          ]
+        },
+        {
+          "file": "src/main/agent-hooks/manual-compact-status-cleanup.test.ts",
+          "assertions": ["pane, tab, and server cleanup revoke compact completion authority"]
+        },
+        {
+          "file": "src/main/ssh/ssh-relay-session-agent-hooks.integration.test.ts",
+          "assertions": [
+            "SSH stamps the receiving connection and forwards source, prompt UUID, session, and manual trigger"
+          ]
+        }
+      ],
+      "evidenceRuns": [
+        {
+          "date": "2026-08-02",
+          "runner": "local",
+          "platform": "macos",
+          "command": "pnpm exec vitest run --config config/vitest.config.ts src/shared/manual-compact-prompt-identity.test.ts src/main/agent-hooks/manual-compact-hook-stream.test.ts src/main/agent-hooks/manual-compact-status-cleanup.test.ts src/shared/agent-hook-listener.test.ts src/shared/agent-hook-relay.test.ts src/relay/agent-hook-server.test.ts src/main/agent-hooks/server.test.ts src/main/ssh/ssh-relay-session-agent-hooks.integration.test.ts --reporter=dot",
+          "result": "passed",
+          "durationSeconds": 2.66,
+          "summary": "Eight focused files and 435 tests passed with local HTTP, relay, SSH, persistence, adversarial identity, cleanup, and existing provider-regression coverage."
+        },
+        {
+          "date": "2026-08-02",
+          "runner": "manual",
+          "platform": "macos",
+          "command": "Manual Claude Code 2.1.220 interactive compact: isolate UserPromptSubmit, PreCompact, and PostCompact hooks; submit one ordinary prompt then /compact; compare source, trigger, session_id, and prompt_id",
+          "result": "passed",
+          "durationSeconds": 120,
+          "summary": "A fresh capture proved /compact emits no UserPromptSubmit and its PreCompact uses a new UUID distinct from the preceding user turn; the preserved authenticated capture proved the matching manual PreCompact and PostCompact share that UUID and session. Automatic capture reused one prompt UUID across multiple compact generations, so automatic completion remains disabled."
+        }
+      ],
+      "runtimeBudget": {
+        "p95Seconds": 20,
+        "scope": "shared, main-process, relay, persistence, and fake-SSH contract tests"
+      },
+      "flakeHistory": {
+        "status": "unknown",
+        "evidence": "New deterministic gate with one local run; CI soak history is not yet available."
+      },
+      "redGreenEvidence": {
+        "status": "complete",
+        "evidence": "The byte-identical oracle (SHA-256 24e80c15b467ffa9c47a81099f11bf26dea71293e47b5d950b2fad1497094764) failed 5 of 6 on origin/main@a20165a43d, passed 6 of 6 on the candidate, failed 3 of 6 when only the exact-transition guard was disabled, and passed 6 of 6 after restoration."
+      },
+      "performanceBudget": {
+        "required": true,
+        "evidence": "Each compact event performs one O(1) current-status lookup plus bounded UUID, source, connection, session, and event comparisons. Identity lives on the existing status row and is removed by its existing lifecycle; the change adds no owner map, global scan, polling, timer, subprocess, network request, or listener. The 4,097-key adversarial arm retains zero status, prompt, or ownership entries."
+      },
+      "promotionCriteria": [
+        "Collect 100 consecutive focused CI passes or 14 days of soak history.",
+        "Run live manual compact journeys on Linux and Windows and through a real SSH target.",
+        "Keep automatic compact completion disabled until a generation-unique provider identity is proven."
+      ],
+      "knownGaps": [
+        "No live Linux, Windows, WSL, paired-runtime, or real-SSH manual compact journey was run.",
+        "Claude versions before prompt_id support intentionally cannot complete a manual compact row through PostCompact.",
+        "Automatic Claude and Kimi completion remain intentionally fail-closed because their hooks do not prove an exact compact generation."
+      ],
+      "demotionRule": "Demote or quarantine if identity-mismatched completion can retire newer work, cleanup retains compact authority, or the focused gate flakes without a product or harness bug."
+    },
     {
       "id": "agent-session.provider-ownership",
       "title": "Provider sessions are resumed once per workspace ownership claim",
@@ -6646,15 +6855,16 @@
       "providers": ["local", "daemon", "ssh", "wsl", "remote-runtime"],
       "coveredPlatforms": ["macos"],
       "coveredProviders": ["local", "daemon", "ssh"],
-      "coverageNotes": "A deterministic service-state-machine oracle now models a current-contract worker and coordinator whose renderer graph identities disappear across an app/runtime update. It exercises the production verifier with restored PTY and hydrated hook commitments, proves authenticated completion replay across a fresh runtime, explicit takeover, ordinary mail routing, remote-attachment process fencing, retained Task/Dispatch/terminal identity, and unchanged fixture marker bytes, and rejects foreign pane evidence. Other deterministic units cover authority-aware legacy formatting, exact legacy worker identity planning, local worker presentation, retained-output reads after adoption, reveal-failure warnings, stable-pane Run/Dispatch routing, the SSH in-process CLI fallback, and federated non-reveal. Two isolated macOS Electron journeys launch fake Codex workers through the real RPC path and record append-only spawn/interruption ledgers. They assert immediate inactive presentation, one live agent PID, stable PTY/incarnation/tab/leaf/worktree/Task/Dispatch identity, and no interruption after workspace re-entry; the restart journey additionally removes renderer ownership, marks the Dispatch legacy, retains the daemon process across an app restart, and proves exact background adoption with readable ACK output and no resume replay. Distinct A/B artifacts plus live SSH, WSL, folder, remote-runtime, Linux, and Windows cutover journeys remain explicit gaps.",
+      "coverageNotes": "A deterministic service-state-machine oracle now models a current-contract worker and coordinator whose renderer graph identities disappear across an app/runtime update. It exercises the production verifier with restored PTY and hydrated hook commitments, proves authenticated completion replay across a fresh runtime, explicit takeover, ordinary mail routing, remote-attachment process fencing, retained Task/Dispatch/terminal identity, and unchanged fixture marker bytes, and rejects foreign pane evidence. Other deterministic units cover authority-aware legacy formatting, exact legacy worker identity planning, local worker presentation, retained-output reads after adoption, reveal-failure warnings, stable-pane Run/Dispatch routing, creator pane/process/Run-generation fencing, indexed retained-Run lookup scaling, the SSH in-process CLI fallback, and federated non-reveal. Two isolated macOS Electron journeys launch fake Codex workers through the real RPC path and record append-only spawn/interruption ledgers. They assert immediate inactive presentation, one live agent PID, stable PTY/incarnation/tab/leaf/worktree/Task/Dispatch identity, and no interruption after workspace re-entry; the restart journey additionally removes renderer ownership, marks the Dispatch legacy, retains the daemon process across an app restart, and proves exact background adoption with readable ACK output and no resume replay. Distinct A/B artifacts plus live SSH, WSL, folder, remote-runtime, Linux, and Windows cutover journeys remain explicit gaps.",
       "motivatingLinks": ["https://github.com/stablyai/orca/pull/11107#discussion_r3663321387"],
-      "invariant": "Starting a worker in the coordinator's current workspace must materialize one inactive terminal tab before worker-start returns, preserve coordinator focus, and remain exactly once after workspace re-entry. After an app update or restart, an exact live legacy worker must fence automatic provider resume, adopt its original PTY into its original background pane, retain readable output, and clear the resume record without spawning, writing, signalling, interrupting, replacing, or focusing the worker. A current-contract worker whose renderer graph identity is temporarily absent must retain its Dispatch capability and settle exactly once from exact hook-attested handle, pane, and process evidence; otherwise only an exact attested coordinator may take over. An exact existing target workspace must receive a discoverable tab without stealing coordinator focus; if renderer reveal fails, worker-start must expose that the live worker remains background-only. Run and Dispatch checks must resolve through the caller's stable pane identity when a terminal handle is reminted, while a live handle outranks mismatched pane metadata, explicit legacy terminal inspection remains handle-scoped, and remote or headless worker presentation remains background-only.",
-      "oracle": "Drive Run create, Task create, and worker-start through production Electron runtimes with a deterministic Codex fixture. Require append-only ledgers with one still-live PID and no interruption, a visible inactive worker tab while the coordinator stays active, Run delivery through stable pane identity, and stable PTY/incarnation, tab, leaf, worktree, Task, and Dispatch across workspace re-entry. In a restart journey, retain the original daemon PTY and PID, remove renderer ownership, retain sleeping-session evidence, mark the Dispatch legacy, relaunch, and require exact inactive tab adoption, readable ACK output, cleared resume state, one spawn, and no resume argv or Conversation interrupted text after another workspace round trip. The service oracle removes renderer lookup identity from current-contract callers while retaining real restored-PTY and hook commitments, replays authenticated completion and takeover across fresh runtimes, and requires one Task, Dispatch, terminal authority, message, mutation, ordinary-mail delivery, remote process fencing, and unchanged fixture marker bytes while foreign pane evidence remains rejected. Unit tests separately assert authority-specific legacy affordances, exact identity and owner matching, retained-output fallback, pane-stable routing, federated non-activation, and SSH fallback parity.",
+      "invariant": "Starting a worker in the coordinator's current workspace must materialize one inactive terminal tab before worker-start returns, preserve coordinator focus, and remain exactly once after workspace re-entry. After an app update or restart, an exact live legacy worker must fence automatic provider resume, adopt its original PTY into its original background pane, retain readable output, and clear the resume record without spawning, writing, signalling, interrupting, replacing, or focusing the worker. A current-contract worker whose renderer graph identity is temporarily absent must retain its Dispatch capability and settle exactly once from exact hook-attested handle, pane, and process evidence; otherwise only an exact attested coordinator may take over. An exact existing target workspace must receive a discoverable tab without stealing coordinator focus; if renderer reveal fails, worker-start must expose that the live worker remains background-only. Run and Dispatch checks must resolve through the caller's stable pane identity when a terminal handle is reminted, while a live handle outranks mismatched pane metadata. A nested worker's creator edge requires the current creator pane, process incarnation, and owning Run generation; reminting and rebinding that pane to another Run must remove the stale edge. Explicit legacy terminal inspection remains handle-scoped, and remote or headless worker presentation remains background-only.",
+      "oracle": "Drive Run create, Task create, and worker-start through production Electron runtimes with a deterministic Codex fixture. Require append-only ledgers with one still-live PID and no interruption, a visible inactive worker tab while the coordinator stays active, Run delivery through stable pane identity, and stable PTY/incarnation, tab, leaf, worktree, Task, and Dispatch across workspace re-entry. In a restart journey, retain the original daemon PTY and PID, remove renderer ownership, retain sleeping-session evidence, mark the Dispatch legacy, relaunch, and require exact inactive tab adoption, readable ACK output, cleared resume state, one spawn, and no resume argv or Conversation interrupted text after another workspace round trip. The service oracle removes renderer lookup identity from current-contract callers while retaining real restored-PTY and hook commitments, replays authenticated completion and takeover across fresh runtimes, and requires one Task, Dispatch, terminal authority, message, mutation, ordinary-mail delivery, remote process fencing, and unchanged fixture marker bytes while foreign pane evidence remains rejected. Unit tests separately remint a creator pane and process from Run A into Run B, require the nested Run A worker to fall back to its current coordinator, require indexed query plans, and bound 300 Task reads with 50,000 retained Runs. They also assert authority-specific legacy affordances, exact identity and owner matching, retained-output fallback, pane-stable routing, federated non-activation, and SSH fallback parity.",
       "commands": [
         "pnpm exec vitest run --config config/vitest.config.ts src/main/runtime/rpc/orchestration-runtime-update-settlement.test.ts --reporter=dot",
         "pnpm exec vitest run --config config/vitest.config.ts src/cli/handlers/orchestration.test.ts src/cli/handlers/orchestration-check-identity.test.ts src/cli/handlers/orchestration-worker-cli.test.ts src/main/runtime/rpc/methods/orchestration.test.ts src/main/ssh/ssh-remote-orca-cli.test.ts",
         "pnpm exec vitest run --config config/vitest.config.ts src/main/runtime/orchestration/formatter.test.ts src/main/runtime/rpc/methods/orchestration-federation.test.ts",
         "pnpm exec vitest run --config config/vitest.config.ts src/main/runtime/orchestration/orchestration-legacy-worker-terminal-recovery.test.ts",
+        "pnpm exec vitest run --config config/vitest.config.ts src/main/runtime/orchestration/orchestration-creator-authority-performance.test.ts",
         "pnpm exec vitest run --config config/vitest.config.ts src/main/runtime/orca-runtime.test.ts",
         "pnpm run test:e2e -- tests/e2e/orchestration-worker-terminal-visibility.spec.ts --workers=1",
         "pnpm run test:e2e -- tests/e2e/orchestration-legacy-worker-restart-recovery.spec.ts --workers=1"
@@ -6663,6 +6873,7 @@
         "src/main/runtime/rpc/orchestration-runtime-update-settlement.test.ts",
         "src/main/runtime/orchestration/formatter.test.ts",
         "src/main/runtime/orchestration/orchestration-legacy-worker-terminal-recovery.test.ts",
+        "src/main/runtime/orchestration/orchestration-creator-authority-performance.test.ts",
         "src/main/runtime/orca-runtime.test.ts",
         "src/cli/handlers/orchestration.test.ts",
         "src/cli/handlers/orchestration-check-identity.test.ts",
@@ -6684,6 +6895,13 @@
             "ordinary mail and remote attachments use the same attested pane and process authority"
           ]
         },
+        {
+          "file": "src/main/runtime/orchestration/orchestration-creator-authority-performance.test.ts",
+          "assertions": [
+            "creator lookup uses the assignee-handle and pane-leaf indexes without a retained-Run scan",
+            "300 Task reads remain bounded with 50,000 unrelated retained Runs"
+          ]
+        },
         {
           "file": "src/main/runtime/orchestration/orchestration-legacy-worker-terminal-recovery.test.ts",
           "assertions": [

config/scripts/build-windows-cli-launcher.test.mjs

@@ -14,6 +14,21 @@ import { describe, expect, it } from 'vitest'
 
 const itCrossHost = process.platform === 'win32' ? it.skip : it
 const projectRoot = resolve(import.meta.dirname, '../..')
+const WINDOWS_LOCK_CODES = ['EBUSY', 'ENOTEMPTY', 'EPERM']
+
+// Why: Windows releases the image handle on a just-executed exe (and finishes the
+// AV scan of the freshly compiled one) after the process exits, so tearing down the
+// fixture races those locks. Retry, then leave the temp tree rather than reporting a
+// teardown lock as a launcher failure.
+function removeFixtureTree(path) {
+  try {
+    rmSync(path, { recursive: true, force: true, maxRetries: 10, retryDelay: 100 })
+  } catch (error) {
+    if (process.platform !== 'win32' || !WINDOWS_LOCK_CODES.includes(error?.code)) {
+      throw error
+    }
+  }
+}
 // Why: cold csc.exe startup exceeds Vitest's 5s unit budget on hosted Windows;
 // keep the larger allowance scoped to the real compiler integration test.
 function itWindows(name, test) {
@@ -35,7 +50,7 @@ describe('Windows CLI launcher', () => {
       expect(result.stderr).toContain('Windows CLI launcher')
       expect(result.stderr).toContain('Windows host')
     } finally {
-      rmSync(outputRoot, { recursive: true, force: true })
+      removeFixtureTree(outputRoot)
     }
   })
 
@@ -108,7 +123,7 @@ describe('Windows CLI launcher', () => {
         orcaNodeOptions: '--no-warnings'
       })
     } finally {
-      rmSync(appRoot, { recursive: true, force: true })
+      removeFixtureTree(appRoot)
     }
   })
 
@@ -161,7 +176,7 @@ describe('Windows CLI launcher', () => {
         pathKeys: ['PATH', 'Path']
       })
     } finally {
-      rmSync(appRoot, { recursive: true, force: true })
+      removeFixtureTree(appRoot)
     }
   })
 })

config/scripts/happy-dom-mutation-observer-retention.test.ts

@@ -0,0 +1,72 @@
+/** @vitest-environment happy-dom */
+import { describe, expect, it } from 'vitest'
+
+import {
+  installHappyDomMutationObserverRetention,
+  retainedMutationCallbackCount
+} from './happy-dom-mutation-observer-retention'
+
+function readListenerCallbacks(target: Node): unknown[] {
+  const listenersSymbol = Object.getOwnPropertySymbols(target).find(
+    (candidate) => candidate.description === 'mutationListeners'
+  )
+  const listeners = listenersSymbol
+    ? (target as unknown as Record<symbol, unknown>)[listenersSymbol]
+    : []
+  if (!Array.isArray(listeners)) {
+    return []
+  }
+  return listeners.map((listener: { callback?: { deref: () => unknown } }) =>
+    listener.callback?.deref()
+  )
+}
+
+describe('happy-dom MutationObserver retention', () => {
+  it('pins the internal callback that happy-dom only holds weakly', () => {
+    expect(installHappyDomMutationObserverRetention()).toBe(true)
+    const target = document.createElement('div')
+    document.body.append(target)
+    const observer = new MutationObserver(() => {})
+    observer.observe(target, { childList: true, subtree: true })
+
+    const callbacks = readListenerCallbacks(target)
+    expect(callbacks.length).toBe(1)
+    expect(callbacks[0]).toBeTypeOf('function')
+    expect(retainedMutationCallbackCount(observer)).toBe(1)
+
+    observer.disconnect()
+    expect(retainedMutationCallbackCount(observer)).toBe(0)
+    target.remove()
+  })
+
+  it('keeps delivering records after the weak callback would have been collected', async () => {
+    installHappyDomMutationObserverRetention()
+    const target = document.createElement('div')
+    document.body.append(target)
+    let deliveries = 0
+    const observer = new MutationObserver(() => {
+      deliveries += 1
+    })
+    observer.observe(target, { childList: true, subtree: true })
+
+    target.replaceChildren(document.createElement('div'))
+    await Promise.resolve()
+    expect(deliveries).toBe(1)
+
+    const collectGarbage = (globalThis as { gc?: () => void }).gc
+    if (collectGarbage) {
+      for (let round = 0; round < 5; round += 1) {
+        await new Promise((resolve) => setTimeout(resolve, 1))
+        collectGarbage()
+      }
+      await new Promise((resolve) => setTimeout(resolve, 1))
+    }
+
+    target.replaceChildren(document.createElement('span'))
+    await Promise.resolve()
+    expect(deliveries).toBe(2)
+
+    observer.disconnect()
+    target.remove()
+  })
+})

config/scripts/happy-dom-mutation-observer-retention.ts

@@ -0,0 +1,81 @@
+// Why: happy-dom stores each MutationObserver's internal callback in a WeakRef, so any GC pause
+// under parallel test load silently and permanently stops a still-connected observer. Browsers
+// keep that callback reachable for as long as the observer observes; mirror that lifetime here so
+// DOM-driven tests never lose mutation records mid-run.
+
+type HappyDomMutationListener = {
+  callback?: { deref: () => unknown }
+}
+
+type PatchableMutationObserver = {
+  observe: (target: Node, options?: MutationObserverInit) => void
+  disconnect: () => void
+}
+
+const MUTATION_LISTENERS_SYMBOL_DESCRIPTION = 'mutationListeners'
+const RETENTION_INSTALLED = Symbol.for('orca.happyDomMutationObserverRetention')
+
+const retainedCallbacks = new WeakMap<object, Set<unknown>>()
+
+function readMutationListeners(target: Node): HappyDomMutationListener[] {
+  const listenersSymbol = Object.getOwnPropertySymbols(target).find(
+    (candidate) => candidate.description === MUTATION_LISTENERS_SYMBOL_DESCRIPTION
+  )
+  if (!listenersSymbol) {
+    return []
+  }
+  const listeners = (target as unknown as Record<symbol, unknown>)[listenersSymbol]
+  return Array.isArray(listeners) ? (listeners as HappyDomMutationListener[]) : []
+}
+
+/** Number of internal callbacks pinned for `observer`; drops to 0 once it disconnects. */
+export function retainedMutationCallbackCount(observer: MutationObserver): number {
+  return retainedCallbacks.get(observer)?.size ?? 0
+}
+
+export function installHappyDomMutationObserverRetention(): boolean {
+  const observerClass = (globalThis as { MutationObserver?: typeof MutationObserver })
+    .MutationObserver
+  if (!observerClass) {
+    return false
+  }
+  const prototype = observerClass.prototype as unknown as PatchableMutationObserver &
+    Record<symbol, unknown>
+  if (prototype[RETENTION_INSTALLED] === true) {
+    return true
+  }
+  const observe = prototype.observe
+  const disconnect = prototype.disconnect
+
+  prototype.observe = function patchedObserve(
+    this: object,
+    target: Node,
+    options?: MutationObserverInit
+  ): void {
+    const existing = new Set(readMutationListeners(target))
+    observe.call(this as unknown as PatchableMutationObserver, target, options)
+    const pinned = retainedCallbacks.get(this) ?? new Set<unknown>()
+    for (const listener of readMutationListeners(target)) {
+      if (existing.has(listener)) {
+        continue
+      }
+      const callback = listener.callback?.deref()
+      if (callback) {
+        pinned.add(callback)
+      }
+    }
+    if (pinned.size > 0) {
+      retainedCallbacks.set(this, pinned)
+    }
+  }
+
+  prototype.disconnect = function patchedDisconnect(this: object): void {
+    disconnect.call(this as unknown as PatchableMutationObserver)
+    retainedCallbacks.delete(this)
+  }
+
+  prototype[RETENTION_INSTALLED] = true
+  return true
+}
+
+installHappyDomMutationObserverRetention()

config/scripts/locale-cross-locale-key-overrides.mjs

@@ -134,5 +134,30 @@ export const CROSS_LOCALE_KEY_OVERRIDES = {
   'auto.hooks.useSettingsNavigationMetadata.40d80bad8a': {
     zh: '测试版',
     ja: 'ベータ'
+  },
+  // Issue/PR state picker; it sits beside 已关闭, so 进行中 is a different state.
+  'auto.components.PullRequestPage.7b8f6bf6d8': {
+    zh: '开放'
+  },
+  // This "Open" is the button that opens the config file, not an issue state.
+  'auto.components.settings.McpConfigFileRow.e720c139cd': {
+    zh: '打开'
+  },
+  // Terminal cursor-color group: the on-screen cursor, not the Cursor editor.
+  'auto.components.settings.TerminalWindowSection.c9e1fdf42f': {
+    ko: '커서',
+    zh: '光标'
+  },
+  'auto.components.onboarding.ThemeStep.ab2a583a97': {
+    ko: '커서',
+    zh: '光标'
+  },
+  // Tailwind swatch labels: bare 天空 (the sky), 锌 and 空 (the metal, the sky) are not colors.
+  'auto.components.sidebar.workspace.status.6437a8c253': {
+    zh: '天蓝',
+    ja: '空色'
+  },
+  'auto.components.sidebar.workspace.status.caabd5ca85': {
+    zh: '锌灰'
   }
 }

config/scripts/locale-generic-ui-terms.mjs

@@ -0,0 +1,102 @@
+// Ordinary UI vocabulary that reads like a brand but is not one. Every locale should translate
+// these, so the policy must neither pin the whole value to English nor revert the translation
+// inside a sentence. The product-name homonyms (Continue.dev, the agent entries) stay Latin
+// through ENGLISH_ONLY_KEY_PREFIXES, which matches on the catalog key rather than the word.
+
+// Renderings a locale is expected to use. They are translations, never machine-translation
+// errors, so a brand revert must leave them alone. Nonsense forms that share the same English
+// term (zh 回购 "repurchase agreement", ja 端子 "electrical connector", es "Comprometerse")
+// stay in BRAND_MISTRANSLATIONS and keep getting reverted.
+const GENERIC_TERM_FAMILIES = [
+  {
+    terms: ['Agent', 'Agents', 'agent', 'agents'],
+    renderings: {
+      ko: ['에이전트'],
+      ja: ['エージェント'],
+      zh: ['代理', '智能体'],
+      es: ['Agente', 'agente', 'Agentes', 'agentes']
+    }
+  },
+  {
+    terms: ['Commit', 'Commits', 'commit', 'commits'],
+    renderings: {
+      ko: ['커밋'],
+      ja: ['コミット'],
+      zh: ['提交'],
+      es: [
+        'Confirmación',
+        'confirmación',
+        'Confirmaciones',
+        'confirmaciones',
+        'Confirmar',
+        'confirmar'
+      ]
+    }
+  },
+  {
+    terms: ['Continue'],
+    renderings: {
+      ko: ['계속하다', '계속'],
+      ja: ['続ける', '続行'],
+      zh: ['继续'],
+      es: ['Continuar', 'continuar']
+    }
+  },
+  {
+    terms: ['Repo', 'Repos', 'repo', 'repos'],
+    renderings: {
+      ko: ['저장소', '레포'],
+      ja: ['リポジトリ', 'リポ'],
+      zh: ['存储库', '仓库'],
+      es: ['Repositorio', 'repositorio', 'Repositorios', 'repositorios']
+    }
+  },
+  {
+    terms: ['Terminal', 'Terminals', 'terminal', 'terminals'],
+    renderings: {
+      ko: ['터미널'],
+      ja: ['ターミナル'],
+      zh: ['终端'],
+      es: ['Terminales', 'terminales']
+    }
+  }
+]
+
+export const LOCALIZABLE_GENERIC_TERMS = new Set(
+  GENERIC_TERM_FAMILIES.flatMap((family) => family.terms)
+)
+
+const RENDERINGS_BY_TERM = new Map(
+  GENERIC_TERM_FAMILIES.flatMap((family) => family.terms.map((term) => [term, family.renderings]))
+)
+
+export function isLocalizableGenericTerm(term) {
+  return LOCALIZABLE_GENERIC_TERMS.has(term)
+}
+
+export function isCanonicalGenericRendering(term, locale, form) {
+  return RENDERINGS_BY_TERM.get(term)?.[locale]?.includes(form) ?? false
+}
+
+export function canonicalGenericRenderings(locale) {
+  return GENERIC_TERM_FAMILIES.flatMap((family) =>
+    (family.renderings[locale] ?? []).map((form) => ({ form, terms: family.terms }))
+  )
+}
+
+function spansOf(value, needle) {
+  const spans = []
+  for (let at = value.indexOf(needle); at !== -1; at = value.indexOf(needle, at + 1)) {
+    spans.push([at, at + needle.length])
+  }
+  return spans
+}
+
+// Why: zh 终端子进程 ("terminal sub-process") contains 端子, so a blind revert of the
+// electrical-connector mistranslation would cut a valid word in half.
+export function overlapsCanonicalRendering(term, locale, value, start, end) {
+  const renderings = RENDERINGS_BY_TERM.get(term)?.[locale] ?? []
+  return renderings.some((form) =>
+    spansOf(value, form).some(([from, to]) => start < to && from < end)
+  )
+}

config/scripts/locale-generic-ui-terms.test.mjs

@@ -0,0 +1,174 @@
+import { describe, expect, it } from 'vitest'
+
+import { LOCALIZABLE_GENERIC_TERMS } from './locale-generic-ui-terms.mjs'
+import { NEVER_TRANSLATE_VALUES, repairTranslatedValue } from './locale-translation-policy.mjs'
+
+// Why: #12113 — repair-locale-catalog rewrote ~2000 translated values back to English because
+// generic UI words (agent, terminal, commit, repo, Continue) were treated as brands. These pin
+// the boundary: generic words stay translated, real brand names stay Latin.
+describe('locale generic UI terms', () => {
+  it('keeps a translated generic term when the whole value is that term', () => {
+    expect(
+      repairTranslatedValue({
+        key: 'auto.components.settings.AppearancePane.terminalTitle',
+        enValue: 'Terminal',
+        localeValue: '터미널',
+        locale: 'ko'
+      })
+    ).toBe('터미널')
+    expect(
+      repairTranslatedValue({
+        key: 'auto.components.settings.QuickCommandsPane.4ccc63da87',
+        enValue: 'Agent',
+        localeValue: '에이전트',
+        locale: 'ko'
+      })
+    ).toBe('에이전트')
+    expect(
+      repairTranslatedValue({
+        key: 'auto.components.mobile.MobileHero.a8fb43cf1c',
+        enValue: 'Continue',
+        localeValue: '继续',
+        locale: 'zh'
+      })
+    ).toBe('继续')
+  })
+
+  it('keeps a translated generic term inside a sentence', () => {
+    expect(
+      repairTranslatedValue({
+        key: 'auto.components.settings.EditorFontSection.matchTerminal',
+        enValue: 'Match terminal font',
+        localeValue: '터미널 글꼴과 동일',
+        locale: 'ko'
+      })
+    ).toBe('터미널 글꼴과 동일')
+    expect(
+      repairTranslatedValue({
+        key: 'auto.components.settings.ExperimentalPane.agentDashboard.toggleLabel',
+        enValue: 'Toggle Agent Dashboard',
+        localeValue: '에이전트 대시보드 전환',
+        locale: 'ko'
+      })
+    ).toBe('에이전트 대시보드 전환')
+    expect(
+      repairTranslatedValue({
+        key: 'components.agentSessionContinuation.dialogTitle',
+        enValue: 'Continue in New Session',
+        localeValue: '新しいセッションで続ける',
+        locale: 'ja'
+      })
+      // 新しい → 新規 is an unrelated phrase fix; 続ける is what must survive.
+    ).toBe('新規セッションで続ける')
+  })
+
+  it('still reverts real brand names that machine translation localized', () => {
+    expect(
+      repairTranslatedValue({
+        key: 'auto.stats.StatsPane.7d26110cea',
+        enValue: 'Codex',
+        localeValue: '사본',
+        locale: 'ko'
+      })
+    ).toBe('Codex')
+    expect(
+      repairTranslatedValue({
+        key: 'auto.components.settings.appearance.search.9ae151b26b',
+        enValue: 'linear',
+        localeValue: '线性',
+        locale: 'zh'
+      })
+    ).toBe('Linear')
+    expect(
+      repairTranslatedValue({
+        key: 'auto.components.settings.NetworkPane.tailscale',
+        enValue: 'Connect over Tailscale',
+        localeValue: '通过尾鳞连接',
+        locale: 'zh'
+      })
+    ).toBe('通过 Tailscale 连接')
+  })
+
+  it('still reverts nonsense renderings of a generic term', () => {
+    // 端子 is an electrical connector, 回购 a repurchase agreement, Comprometerse "to pledge".
+    expect(
+      repairTranslatedValue({
+        key: 'auto.components.agent.AgentCombobox.986f946354',
+        enValue: 'Blank Terminal',
+        localeValue: '空白端子',
+        locale: 'zh'
+      })
+    ).toBe('空白 Terminal')
+    expect(
+      repairTranslatedValue({
+        key: 'auto.components.right.sidebar.source.control.primary.action.ed93b4f14f',
+        enValue: 'Commit',
+        localeValue: 'Comprometerse',
+        locale: 'es'
+      })
+    ).toBe('Commit')
+    expect(
+      repairTranslatedValue({
+        key: 'auto.components.LinearIssueMarkdownDescriptionEditor.d9c47069ef',
+        enValue: 'Markdown',
+        localeValue: '가격 인하',
+        locale: 'ko'
+      })
+    ).toBe('Markdown')
+  })
+
+  it('does not cut a valid word that contains a nonsense rendering', () => {
+    // 终端子进程 is "terminal sub-process" — 端子 sits inside 终端 + 子.
+    expect(
+      repairTranslatedValue({
+        key: 'auto.components.settings.AdvancedNetworkSettingsSection.823e0f15b1',
+        enValue: 'Proxy URL for Orca network requests and local terminal subprocesses.',
+        localeValue: '用于 Orca 网络请求和本地终端子进程的代理 URL。',
+        locale: 'zh'
+      })
+    ).toBe('用于 Orca 网络请求和本地终端子进程的代理 URL。')
+  })
+
+  it('still fills in a translation when the catalog holds English', () => {
+    expect(
+      repairTranslatedValue({
+        key: 'auto.components.feature.wall.BrowserAnimatedVisual.04096318ab',
+        enValue: 'Terminal 1',
+        localeValue: 'Terminal 1',
+        locale: 'ko'
+      })
+    ).toBe('터미널 1')
+    expect(
+      repairTranslatedValue({
+        key: 'auto.store.slices.worktrees.889487d8bb',
+        enValue: 'Dismiss',
+        localeValue: '해고하다',
+        locale: 'ko'
+      })
+    ).toBe('닫기')
+  })
+
+  it('keeps agent catalog product names in English by key, not by word', () => {
+    expect(
+      repairTranslatedValue({
+        key: 'auto.lib.agent.catalog.9e2a9bb87b',
+        enValue: 'Continue',
+        localeValue: '继续',
+        locale: 'zh'
+      })
+    ).toBe('Continue')
+    expect(
+      repairTranslatedValue({
+        key: 'auto.lib.agent.catalog.760bc6883d',
+        enValue: 'Codex',
+        localeValue: '사본',
+        locale: 'ko'
+      })
+    ).toBe('Codex')
+  })
+
+  it('does not list a generic term as never-translatable', () => {
+    const pinned = [...LOCALIZABLE_GENERIC_TERMS].filter((term) => NEVER_TRANSLATE_VALUES.has(term))
+    expect(pinned).toEqual([])
+  })
+})

config/scripts/locale-ja-value-overrides.mjs

@@ -94,7 +94,7 @@ export const JA_VALUE_OVERRIDES = {
   'Launch plan': '起動プラン',
   'Launch agent': 'エージェントを起動',
   'Launch {{value0}} in a new terminal': '新規ターミナルで {{value0}} を起動',
-  Play: 'Play',
+  Play: '再生',
   Action: '操作',
   Actions: '操作',
   action: '操作',
@@ -135,7 +135,7 @@ export const JA_VALUE_OVERRIDES = {
   'Pick a base branch below': '以下のベースブランチを選択',
   'Choose floating workspace directory': 'フローティング ワークスペース ディレクトリを選択',
   'Local project, Git repo, or folder with many repos':
-    'ローカルプロジェクト、Git repo、または多数の repos を含むフォルダー',
+    'ローカルプロジェクト、Git リポジトリ、または多数のリポジトリを含むフォルダー',
   'Enter passphrase': 'パスフレーズを入力',
   'Enter password': 'パスワードを入力',
   'Enter the passphrase for': 'のパスフレーズを入力',

config/scripts/locale-key-overrides.mjs

@@ -162,8 +162,8 @@ const BASE_LOCALE_KEY_OVERRIDES = {
     ja: 'クローズ'
   },
   'auto.components.GitHubItemDialog.dc1ca081a8': {
-    ko: '진행 중',
-    zh: '进行中',
+    ko: '열림',
+    zh: '开放',
     ja: 'オープン'
   },
   'auto.components.tab.bar.TabBarCreateEntry.b27864279e': {
@@ -176,10 +176,11 @@ const BASE_LOCALE_KEY_OVERRIDES = {
     zh: '打开 Linear 任务',
     ja: 'Linear タスクを開く'
   },
+  // Onboarding pill beside Orca Mobile: "New" marks a new feature, not a create action.
   'auto.components.sidebar.SidebarNav.c86d83b5c3': {
-    ko: '새로 만들기',
-    zh: '新建',
-    ja: '新規'
+    ko: '신규',
+    zh: '新功能',
+    ja: '新機能'
   },
   'auto.components.sidebar.SidebarSettingsHelpMenu.eb9884e55b': {
     ko: 'Discord',

config/scripts/locale-ko-key-overrides.json

@@ -752,6 +752,21 @@
   "auto.components.contextual.tours.ContextualTourProgressDots.dcd6e6b03e": {
     "ko": "{{value1}}단계 중 {{value0}}단계"
   },
+  "auto.components.contextual.tours.ContextualTourOverlaySurface.complete": {
+    "ko": "완료"
+  },
+  "auto.components.contextual.tours.contextual.tour.overlay.measurement.automations.intro.body": {
+    "ko": "자동화는 일정에 따라 agent 작업을 실행합니다. 이 버튼을 눌러 자동화를 추가하세요."
+  },
+  "auto.components.contextual.tours.contextual.tour.overlay.measurement.automations.intro.title": {
+    "ko": "자동화란 무엇인가요?"
+  },
+  "auto.components.contextual.tours.contextual.tour.overlay.measurement.automations.results.body": {
+    "ko": "실행 내역에서 자동화가 언제 실행되었는지, 어떤 일이 발생했는지, 출력을 어디서 확인할 수 있는지 볼 수 있습니다."
+  },
+  "auto.components.contextual.tours.contextual.tour.overlay.measurement.automations.results.title": {
+    "ko": "결과 확인"
+  },
   "auto.components.crash.report.CrashReportDialog.88fea8e84e": {
     "ko": "보내지 않음"
   },
@@ -1868,6 +1883,9 @@
   "auto.components.right.sidebar.SourceControl.3a231c845b": {
     "ko": "알 수 없음"
   },
+  "auto.components.right.sidebar.SourceControl.6d7f2a47e5": {
+    "ko": "폴더의 변경 사항 취소"
+  },
   "auto.components.right.sidebar.SourceControl.812cb992ee": {
     "ko": "{{value0}}에서 열기"
   },
@@ -1880,6 +1898,9 @@
   "auto.components.right.sidebar.SourceControl.9bb062a886": {
     "ko": "commit 되지 않음"
   },
+  "auto.components.right.sidebar.SourceControl.a5e5a11090": {
+    "ko": "모든 변경 사항 취소 실패 — 취소 전에 파일의 스테이징을 해제하지 못했습니다."
+  },
   "auto.components.right.sidebar.SourceControl.aaf1451654": {
     "ko": "초안 {{value0}} 만들기"
   },
@@ -1994,6 +2015,9 @@
   "auto.components.right.sidebar.source.control.discard.confirmation.2ae5a785b3": {
     "ko": "스테이징되지 않은 변경 사항을 모두 삭제하시겠습니까?"
   },
+  "auto.components.right.sidebar.source.control.discard.confirmation.40e9357b2a": {
+    "ko": "이렇게 하면 HEAD에서 파일을 복원하고 파일 삭제를 취소합니다. 이 작업은 취소할 수 없습니다."
+  },
   "auto.components.right.sidebar.source.control.discard.confirmation.5ddd8cac7f": {
     "ko": "스테이징된 변경 사항을 모두 삭제하시겠습니까?"
   },
@@ -2015,6 +2039,9 @@
   "auto.components.right.sidebar.source.control.primary.action.1d47e850cf": {
     "ko": "연결된 리뷰 브랜치에 업데이트 푸시"
   },
+  "auto.components.right.sidebar.source.control.primary.action.5a477d80cb": {
+    "ko": "모든 변경 사항 스테이징"
+  },
   "auto.components.right.sidebar.source.control.primary.action.a5d1f7b036": {
     "ko": "{{value0}}을(를) 만들기 전에 commits을 게시하세요."
   },
@@ -2162,6 +2189,9 @@
   "auto.components.settings.AutoRenameBranchFromWorkSetting.a4fa380b67": {
     "ko": "{assistantMessage}"
   },
+  "auto.components.settings.AutoRenameBranchFromWorkSetting.d9b65054ef": {
+    "ko": ") 작업을 요약하는 짧은 이름으로 변경됩니다. Orca가 직접 이름 붙인 브랜치만 이름을 바꾸며, 푸시된 후에는 이름을 바꾸지 않습니다."
+  },
   "auto.components.settings.AutoRenameBranchPromptEditor.ebb942a2ec": {
     "ko": "fix-login-flow"
   },
@@ -2228,6 +2258,9 @@
   "auto.components.settings.DefaultWindowsProjectRuntimeSetting.wslUnavailable": {
     "ko": "WSL을 사용할 수 없습니다. WSL을 상속하는 프로젝트는 복구가 필요합니다."
   },
+  "auto.components.settings.DevToolsPane.orcaCloudDescription": {
+    "ko": "자사 클라우드 로그인의 개발자 전용 미리보기. 프로덕션에서는 숨겨집니다. 개발 환경에서는 ORCA_CLOUD_API_URL과 ORCA_CLOUD_CLIENT_ID가 설정되면 사이드바 계정 전환기에도 표시됩니다."
+  },
   "auto.components.settings.DeveloperPermissionsPane.16381e040a": {
     "ko": "마이크"
   },
@@ -2255,6 +2288,12 @@
   "auto.components.settings.ExperimentalPane.newWorktreeCardStyle.description": {
     "ko": "업데이트된 워크트리 카드 레이아웃, 메타데이터 배치, 카드 표시 메뉴 옵션 및 상태 표시를 미리 봅니다."
   },
+  "auto.components.settings.EphemeralVmsPane.recipes": {
+    "ko": "레시피"
+  },
+  "auto.components.settings.EphemeralVmsPane.whatTitle": {
+    "ko": "이 스킬로 함께 하는 작업"
+  },
   "auto.components.settings.GeneralEditorSettingsSection.45c6e85c4d": {
     "ko": "편집기"
   },
@@ -2727,7 +2766,7 @@
     "ko": "이 SSH 대상의 원격 릴레이를 강제로 중지합니다. 이 대상의 활성 원격 terminals과 포트 포워딩이 종료됩니다."
   },
   "auto.components.settings.SshTargetForm.137e88ce8d": {
-    "ko": "연결 해제 후 릴레이가 terminals을 활성 상태로 유지하는 기간입니다. 기본값: 10800(3시간). 최대:"
+    "ko": "Orca가 이 호스트에서 연결 해제된 뒤에도 원격 터미널은 계속 실행됩니다."
   },
   "auto.components.settings.SshTargetForm.2ee9bcd2e8": {
     "ko": "server, deploy@server:2222, ssh://server"
@@ -3710,6 +3749,9 @@
   "auto.components.settings.ssh.search.f9493b80c0": {
     "ko": "서버"
   },
+  "auto.components.settings.source.control.action.recipe.options.commitMessage": {
+    "ko": "스테이징된 변경 사항에서 commit 메시지를 생성합니다."
+  },
   "auto.components.settings.task.tracker.integration.cards.1a12e33fe5": {
     "ko": "Linear 액세스 추가"
   },
@@ -4683,7 +4725,7 @@
     "ko": "중지 중"
   },
   "auto.components.status.bar.WorkspaceSpaceCompactPanel.8ff597593d": {
-    "ko": "Space"
+    "ko": "저장 공간"
   },
   "auto.components.status.bar.WorkspaceSpaceCompactPanel.9be86c46a0": {
     "ko": "확보 가능"
@@ -4953,7 +4995,7 @@
     "ko": "선택한 리포지토리와 일치하는 비활성 워크스페이스가 없습니다."
   },
   "auto.components.workspace.space.WorkspaceSpacePage.45f6302dbc": {
-    "ko": "Space"
+    "ko": "저장 공간"
   },
   "auto.components.workspace.space.WorkspaceSpacePage.8d0048e1cb": {
     "ko": "워크스페이스 디스크 사용량과 회수 가능한 워크트리 저장 공간."

config/scripts/locale-ko-value-overrides.mjs

@@ -209,7 +209,7 @@ export const KO_VALUE_OVERRIDES = {
   'Install the Orca skill so agents know to use the Orca CLI.':
     '에이전트가 Orca CLI를 사용하도록 Orca 스킬을 설치하세요.',
   'Local project, Git repo, or folder with many repos':
-    '로컬 프로젝트, Git repo 또는 repos가 많은 폴더',
+    '로컬 프로젝트, Git 저장소 또는 저장소가 많은 폴더',
   'Linear, GitLab, Bitbucket, Azure DevOps, Gitea, and Jira live in Settings > Integrations.':
     'Linear, GitLab, Bitbucket, Azure DevOps, Gitea 및 Jira는 설정 > 연동에 있습니다.',
   'changed since you last approved. Re-review before it runs':

config/scripts/locale-phrase-fixes.mjs

@@ -371,9 +371,10 @@ export const LOCALE_PHRASE_FIXES = {
     { pattern: /指挥进展/g, replacement: 'Conductor 进度', whenEnIncludes: 'Conductor Progress' },
     { pattern: /指挥评论/g, replacement: 'Conductor 评审', whenEnIncludes: 'Conductor Review' },
     { pattern: /指挥完成/g, replacement: 'Conductor 完成', whenEnIncludes: 'Conductor Done' },
-    { pattern: /琥珀色/g, replacement: 'Amber', whenEnIncludes: 'Amber' },
-    { pattern: /蓝色的/g, replacement: 'Blue', whenEnIncludes: 'Blue' },
-    { pattern: /中性的/g, replacement: 'Neutral', whenEnIncludes: 'Neutral' },
+    // Swatch labels want the bare color noun, not the adjectival 的 form — and not English.
+    { pattern: /琥珀色/g, replacement: '琥珀', whenEnIncludes: 'Amber' },
+    { pattern: /蓝色的/g, replacement: '蓝色', whenEnIncludes: 'Blue' },
+    { pattern: /中性的/g, replacement: '中性', whenEnIncludes: 'Neutral' },
     { pattern: /破坏性的/g, replacement: 'destructive', whenEnIncludes: 'destructive' },
     { pattern: /注解/g, replacement: '批注', whenEnIncludes: 'Annotation' },
     ...ZH_PHRASE_FIXES_ROUND5

config/scripts/locale-prose-term-exemptions.mjs

@@ -1,19 +0,0 @@
-const LOCALIZED_PROSE_TERM_KEYS = new Set([
-  'auto.hooks.useMacosTccPromptNotice.description',
-  'auto.components.settings.DeveloperPermissionsPane.7ca17b62c8'
-])
-
-const LOCALIZABLE_PROSE_TERMS = new Set([
-  'Agent',
-  'Agents',
-  'agent',
-  'agents',
-  'Terminal',
-  'Terminals',
-  'terminal',
-  'terminals'
-])
-
-export function isLocalizedProseTermContext(term, key) {
-  return LOCALIZED_PROSE_TERM_KEYS.has(key) && LOCALIZABLE_PROSE_TERMS.has(term)
-}

config/scripts/locale-repair-catalog-missing-leaves.test.mjs

@@ -0,0 +1,30 @@
+import { describe, expect, it } from 'vitest'
+
+import { repairCatalog } from './locale-translation-policy.mjs'
+
+// Regression: en.json routinely carries keys a locale catalog has not been bootstrapped with yet
+// (~190 per locale at the time of writing), which crashed the whole repair run before it did any work.
+describe('repairCatalog with un-bootstrapped keys', () => {
+  const enCatalog = {
+    auto: {
+      lib: { agent: { catalog: { '760bc6883d': 'Codex' } } },
+      components: { untranslated: 'Continue', nested: { alsoMissing: 'Refresh' } }
+    }
+  }
+
+  const translatedOnly = () => ({ auto: { lib: { agent: { catalog: { '760bc6883d': '사본' } } } } })
+
+  it('skips leaves the locale catalog is missing instead of throwing', () => {
+    for (const locale of ['ko', 'ja', 'zh', 'es']) {
+      const localeCatalog = translatedOnly()
+      expect(() => repairCatalog(enCatalog, localeCatalog, locale), locale).not.toThrow()
+      expect(localeCatalog.auto.components, locale).toBeUndefined()
+    }
+  })
+
+  it('still repairs the leaves that are present', () => {
+    const localeCatalog = translatedOnly()
+    expect(repairCatalog(enCatalog, localeCatalog, 'ko')).toBe(1)
+    expect(localeCatalog.auto.lib.agent.catalog['760bc6883d']).toBe('Codex')
+  })
+})

config/scripts/locale-translation-policy-ko-round5.test.mjs

@@ -45,7 +45,7 @@ describe('locale-translation-policy ko round 5', () => {
         localeValue: '에이전트가 Orca CLI 사용 방법을 알 수 있도록 Orca 기술을 설치합니다.',
         locale: 'ko'
       })
-    ).toBe('agents가 Orca CLI를 사용하도록 Orca 스킬을 설치하세요.')
+    ).toBe('에이전트가 Orca CLI를 사용하도록 Orca 스킬을 설치하세요.')
     expect(
       repairTranslatedValue({
         key: 'auto.components.editor.MarkdownPreview.322afab6ff',
@@ -92,7 +92,8 @@ describe('locale-translation-policy ko round 5', () => {
     ).toBe('파이프라인')
   })
 
-  it('keeps protected workflow terms in English', () => {
+  // Why: #12113 — brand names stay Latin, but generic workflow nouns keep their Korean.
+  it('keeps brand names English and generic workflow terms translated', () => {
     expect(
       repairTranslatedValue({
         key: 'auto.components.feature.wall.BrowserAnimatedVisual.04096318ab',
@@ -100,7 +101,7 @@ describe('locale-translation-policy ko round 5', () => {
         localeValue: '터미널 1',
         locale: 'ko'
       })
-    ).toBe('Terminal 1')
+    ).toBe('터미널 1')
     expect(
       repairTranslatedValue({
         key: 'auto.components.skills.SkillsPage.38e0951c3a',
@@ -108,7 +109,7 @@ describe('locale-translation-policy ko round 5', () => {
         localeValue: '에이전트 스킬',
         locale: 'ko'
       })
-    ).toBe('Agent 스킬')
+    ).toBe('에이전트 스킬')
     expect(
       repairTranslatedValue({
         key: 'auto.components.LinearIssueMarkdownDescriptionEditor.d9c47069ef',
@@ -124,7 +125,7 @@ describe('locale-translation-policy ko round 5', () => {
         localeValue: '푸시되지 않은 커밋',
         locale: 'ko'
       })
-    ).toBe('푸시되지 않은 commits')
+    ).toBe('푸시되지 않은 커밋')
     expect(
       repairTranslatedValue({
         key: 'auto.components.workspace.cleanup.WorkspaceCleanupDialog.0b1766738a',
@@ -132,7 +133,7 @@ describe('locale-translation-policy ko round 5', () => {
         localeValue: '레포',
         locale: 'ko'
       })
-    ).toBe('Repo')
+    ).toBe('레포')
     expect(
       repairTranslatedValue({
         key: 'auto.components.sidebar.add.repo.local.start.actions.fb4fc5380e',
@@ -140,7 +141,7 @@ describe('locale-translation-policy ko round 5', () => {
         localeValue: '로컬 프로젝트, Git 저장소 또는 저장소가 많은 폴더',
         locale: 'ko'
       })
-    ).toBe('로컬 프로젝트, Git repo 또는 repos가 많은 폴더')
+    ).toBe('로컬 프로젝트, Git 저장소 또는 저장소가 많은 폴더')
   })
 
   it('re-glues Korean particles after Latin terms without gluing content words', () => {

config/scripts/locale-translation-policy.es-round5.test.mjs

@@ -3,7 +3,8 @@ import { describe, expect, it } from 'vitest'
 import { repairTranslatedValue } from './locale-translation-policy.mjs'
 
 describe('locale-translation-policy es round 5', () => {
-  it('keeps protected workflow terms in English', () => {
+  // Why: #12113 — brand names stay Latin, but generic workflow nouns keep their Spanish.
+  it('keeps brand names English and generic workflow terms translated', () => {
     expect(
       repairTranslatedValue({
         key: 'auto.components.LinearIssueMarkdownDescriptionEditor.d9c47069ef',
@@ -43,7 +44,7 @@ describe('locale-translation-policy es round 5', () => {
         localeValue: 'mensaje de confirmación',
         locale: 'es'
       })
-    ).toBe('mensaje de Commit')
+    ).toBe('mensaje de confirmación')
     expect(
       repairTranslatedValue({
         key: 'auto.components.workspace.cleanup.WorkspaceCleanupDialog.0b1766738a',
@@ -51,7 +52,7 @@ describe('locale-translation-policy es round 5', () => {
         localeValue: 'repositorio',
         locale: 'es'
       })
-    ).toBe('Repo')
+    ).toBe('repositorio')
     expect(
       repairTranslatedValue({
         key: 'auto.components.sidebar.add.repo.local.start.actions.fb4fc5380e',
@@ -59,6 +60,6 @@ describe('locale-translation-policy es round 5', () => {
         localeValue: 'Proyecto local, repositorio de Git o carpeta con muchos repositorios',
         locale: 'es'
       })
-    ).toBe('Proyecto local, repo de Git o carpeta con muchos repos')
+    ).toBe('Proyecto local, repositorio de Git o carpeta con muchos repositorios')
   })
 })

config/scripts/locale-translation-policy.ja-round5.test.mjs

@@ -27,7 +27,7 @@ describe('locale-translation-policy ja round 5', () => {
         localeValue: '遊ぶ',
         locale: 'ja'
       })
-    ).toBe('Play')
+    ).toBe('再生')
     expect(
       repairTranslatedValue({
         key: 'auto.components.TaskPage.8396825a14',
@@ -102,7 +102,8 @@ describe('locale-translation-policy ja round 5', () => {
     ).toBe('まずプロジェクトを追加')
   })
 
-  it('keeps protected workflow terms in English', () => {
+  // Why: #12113 — brand names stay Latin, but generic workflow nouns keep their Japanese.
+  it('keeps brand names English and generic workflow terms translated', () => {
     expect(
       repairTranslatedValue({
         key: 'auto.components.status.bar.WorkspaceSpaceManagerPanel.e9528a89b3',
@@ -118,7 +119,7 @@ describe('locale-translation-policy ja round 5', () => {
         localeValue: 'エージェントのスキル',
         locale: 'ja'
       })
-    ).toBe('Agent のスキル')
+    ).toBe('エージェントのスキル')
     expect(
       repairTranslatedValue({
         key: 'auto.components.tab.bar.TabBar.3d5d6c960d',
@@ -134,7 +135,7 @@ describe('locale-translation-policy ja round 5', () => {
         localeValue: 'コミット',
         locale: 'ja'
       })
-    ).toBe('commits')
+    ).toBe('コミット')
     expect(
       repairTranslatedValue({
         key: 'auto.components.mobile.slides.WorktreeListSlide.22971156df',
@@ -142,7 +143,7 @@ describe('locale-translation-policy ja round 5', () => {
         localeValue: 'リポ',
         locale: 'ja'
       })
-    ).toBe('Repo')
+    ).toBe('リポ')
     expect(
       repairTranslatedValue({
         key: 'auto.components.sidebar.add.repo.local.start.actions.fb4fc5380e',
@@ -151,6 +152,6 @@ describe('locale-translation-policy ja round 5', () => {
           'ローカル プロジェクト、Git リポジトリ、または多数のリポジトリを含むフォルダー',
         locale: 'ja'
       })
-    ).toBe('ローカルプロジェクト、Git repo、または多数の repos を含むフォルダー')
+    ).toBe('ローカルプロジェクト、Git リポジトリ、または多数のリポジトリを含むフォルダー')
   })
 })

config/scripts/locale-translation-policy.mjs

@@ -1,5 +1,8 @@
 import { CJK_LATIN_SPACED_TERMS } from './locale-cjk-latin-spaced-terms.mjs'
-import { isLocalizedProseTermContext } from './locale-prose-term-exemptions.mjs'
+import {
+  isCanonicalGenericRendering,
+  overlapsCanonicalRendering
+} from './locale-generic-ui-terms.mjs'
 import { isScreenCursorContext } from './locale-screen-cursor-exemptions.mjs'
 import { LOCALE_KEY_OVERRIDES } from './locale-key-overrides.mjs'
 import { LOCALE_PHRASE_FIXES } from './locale-phrase-fixes.mjs'
@@ -17,9 +20,10 @@ const OPEN_IN_APP_CATALOG_PREFIX = 'auto.lib.open.in.app.catalog.'
 // Why: product names and agent labels stay Latin — MT reads them as common words (Codex→copy, Gemini→zodiac).
 export const ENGLISH_ONLY_KEY_PREFIXES = [AGENT_CATALOG_PREFIX, OPEN_IN_APP_CATALOG_PREFIX]
 
+// Only genuine brand, product, and code tokens belong here. Ordinary UI words that happen to
+// name a product (agent, terminal, commit, repo, Continue) live in locale-generic-ui-terms.mjs
+// and are translated; their product sense is pinned by ENGLISH_ONLY_KEY_PREFIXES instead.
 export const NEVER_TRANSLATE_VALUES = new Set([
-  'Agent',
-  'Agents',
   'Aider',
   'Amp',
   'Android',
@@ -33,7 +37,6 @@ export const NEVER_TRANSLATE_VALUES = new Set([
   'Codebuff',
   'Codex',
   'Command Code',
-  'Continue',
   'Cursor',
   'Droid',
   'Devin',
@@ -60,30 +63,16 @@ export const NEVER_TRANSLATE_VALUES = new Set([
   'Pi',
   'PostHog',
   'Qwen Code',
-  'Repo',
-  'Repos',
   'Rovo Dev',
-  'Commit',
-  'Commits',
   'Markdown',
-  'Terminal',
-  'Terminals',
   'VS Code',
   'Warp',
   'Zed',
-  'agent',
-  'agents',
   'android',
   'codex',
-  'commit',
-  'commits',
   'gemini',
   'claude',
   'markdown',
-  'repo',
-  'repos',
-  'terminal',
-  'terminals',
   'gh',
   'idle',
   'anthropic',
@@ -368,6 +357,18 @@ function includesPreservedLatinTerm(value, term) {
   return new RegExp(`(^|[^A-Za-z_])${escapeRegExp(term)}($|[^A-Za-z_])`).test(value)
 }
 
+function replaceMistranslatedForm(value, wrong, brand, locale) {
+  let result = ''
+  let cursor = 0
+  for (let at = value.indexOf(wrong); at !== -1; at = value.indexOf(wrong, cursor)) {
+    const end = at + wrong.length
+    result += value.slice(cursor, at)
+    result += overlapsCanonicalRendering(brand, locale, value, at, end) ? wrong : brand
+    cursor = end
+  }
+  return result + value.slice(cursor)
+}
+
 function applyBrandMistranslationFixes(enValue, localeValue, locale, key = '') {
   let result = localeValue
   const mistranslations = BRAND_MISTRANSLATIONS[locale] ?? {}
@@ -383,9 +384,6 @@ function applyBrandMistranslationFixes(enValue, localeValue, locale, key = '') {
     if (isScreenCursorContext(brand, enValue, key)) {
       continue
     }
-    if (isLocalizedProseTermContext(brand, key)) {
-      continue
-    }
     if (includesPreservedLatinTerm(result, brand)) {
       continue
     }
@@ -393,11 +391,16 @@ function applyBrandMistranslationFixes(enValue, localeValue, locale, key = '') {
       if (!result.includes(wrong)) {
         continue
       }
+      // Why: #12113 — a generic term's correct translation is not a mistranslation; reverting it
+      // rewrote ~2000 translated values back to English on every repair run.
+      if (isCanonicalGenericRendering(brand, locale, wrong)) {
+        continue
+      }
       // Why: "Copy identifier" legitimately uses 사본/复制 — only swap when English names the brand.
       if (brand === 'Codex' && /\bCopy\b/i.test(enValue)) {
         continue
       }
-      result = result.replaceAll(wrong, brand)
+      result = replaceMistranslatedForm(result, wrong, brand, locale)
     }
   }
 
@@ -548,6 +551,11 @@ export function repairCatalog(enCatalog, localeCatalog, locale) {
 
   for (const leaf of leaves) {
     const current = leaf.key.split('.').reduce((cursor, part) => cursor?.[part], localeCatalog)
+    // Why: en.json carries keys the locale catalog has not been bootstrapped with yet; repair only
+    // rewrites values that already exist, so skip instead of crashing on undefined.
+    if (typeof current !== 'string') {
+      continue
+    }
     const next = repairTranslatedValue({
       key: leaf.key,
       enValue: leaf.value,

config/scripts/locale-translation-policy.test.mjs

@@ -80,7 +80,7 @@ describe('locale-translation-policy', () => {
         localeValue: '壊れた小切手に対して AI エージェントを開始しました。',
         locale: 'ja'
       })
-    ).toBe('失敗したチェックに対して AI agent を開始しました。')
+    ).toBe('失敗したチェックに対して AI エージェントを開始しました。')
     expect(
       repairTranslatedValue({
         key: 'auto.hooks.useSettingsNavigationMetadata.95a1886d94',
@@ -88,7 +88,7 @@ describe('locale-translation-policy', () => {
         localeValue: '電話機からターミナルとエージェントを制御します。',
         locale: 'ja'
       })
-    ).toBe('スマートフォンから terminals と agents を操作')
+    ).toBe('スマートフォンからターミナルとエージェントを操作')
     expect(
       repairTranslatedValue({
         key: 'auto.components.GitHubItemDialog.934add88b6',
@@ -267,7 +267,7 @@ describe('locale-translation-policy', () => {
         localeValue: '未已检测代理',
         locale: 'zh'
       })
-    ).toBe('未检测到 agents')
+    ).toBe('未检测到代理')
     expect(
       repairTranslatedValue({
         key: 'auto.components.skills.SkillsPage.38e0951c3a',
@@ -275,7 +275,7 @@ describe('locale-translation-policy', () => {
         localeValue: '代理技巧',
         locale: 'zh'
       })
-    ).toBe('Agent 技能')
+    ).toBe('代理技能')
     expect(
       repairTranslatedValue({
         key: 'auto.components.settings.appearance.search.9ae151b26b',
@@ -358,7 +358,7 @@ describe('locale-translation-policy', () => {
         localeValue: 'コミットするものは何もありません。 PR はすでに統合されています。',
         locale: 'ja'
       })
-    ).toBe('commit するものはありません。PR はすでにマージされています。')
+    ).toBe('コミットするものはありません。PR はすでにマージされています。')
     expect(
       repairTranslatedValue({
         key: 'auto.components.settings.integrations.search.581844769a',
@@ -546,7 +546,7 @@ describe('locale-translation-policy', () => {
         localeValue: '玩',
         locale: 'zh'
       })
-    ).toBe('Play')
+    ).toBe('播放')
     expect(
       repairTranslatedValue({
         key: 'auto.components.right.sidebar.SourceControlAgentActionDialogForm.1bc0bdbb5e',

config/scripts/locale-translation-policy.zh-round5.test.mjs

@@ -86,7 +86,9 @@ describe('locale-translation-policy zh round 5', () => {
     ).toBe('集成')
   })
 
-  it('keeps Terminal as a product surface term', () => {
+  // Why: #12113 — 终端 is the correct rendering and survives; only the 端子 ("electrical
+  // connector") mistranslation still reverts to Latin.
+  it('keeps terminal translated but reverts the 端子 mistranslation', () => {
     expect(
       repairTranslatedValue({
         key: 'auto.components.settings.Settings.3de4bbb841',
@@ -94,7 +96,7 @@ describe('locale-translation-policy zh round 5', () => {
         localeValue: '终端',
         locale: 'zh'
       })
-    ).toBe('Terminal')
+    ).toBe('终端')
     expect(
       repairTranslatedValue({
         key: 'auto.components.feature.wall.BrowserAnimatedVisual.04096318ab',
@@ -102,7 +104,7 @@ describe('locale-translation-policy zh round 5', () => {
         localeValue: '终端 1',
         locale: 'zh'
       })
-    ).toBe('Terminal 1')
+    ).toBe('终端 1')
     expect(
       repairTranslatedValue({
         key: 'auto.components.agent.AgentCombobox.986f946354',
@@ -118,7 +120,7 @@ describe('locale-translation-policy zh round 5', () => {
         localeValue: '分体式端子右',
         locale: 'zh'
       })
-    ).toBe('向右拆分 Terminal')
+    ).toBe('向右拆分终端')
     expect(
       repairTranslatedValue({
         key: 'auto.components.settings.TerminalAppearanceSection.abcb4dd019',
@@ -126,7 +128,7 @@ describe('locale-translation-policy zh round 5', () => {
         localeValue: '终端Cursor',
         locale: 'zh'
       })
-    ).toBe('Terminal Cursor')
+    ).toBe('终端 Cursor')
     expect(
       repairTranslatedValue({
         key: 'auto.components.terminal.FloatingTerminalPanel.3215fc73e9',
@@ -137,7 +139,8 @@ describe('locale-translation-policy zh round 5', () => {
     ).toBe('新 Terminal')
   })
 
-  it('keeps workflow terms in English', () => {
+  // Why: #12113 — brand names stay Latin, but generic workflow nouns keep their Chinese.
+  it('keeps brand names English and generic workflow terms translated', () => {
     expect(
       repairTranslatedValue({
         key: 'auto.components.sidebar.SidebarNav.9c95e1ce91',
@@ -145,7 +148,7 @@ describe('locale-translation-policy zh round 5', () => {
         localeValue: '代理',
         locale: 'zh'
       })
-    ).toBe('Agents')
+    ).toBe('代理')
     expect(
       repairTranslatedValue({
         key: 'auto.components.GitHubItemDialog.28986b3747',
@@ -153,7 +156,7 @@ describe('locale-translation-policy zh round 5', () => {
         localeValue: '已启动 AI 代理处理失败的检查。',
         locale: 'zh'
       })
-    ).toBe('已启动 AI agent 处理失败的检查。')
+    ).toBe('已启动 AI 代理处理失败的检查。')
     expect(
       repairTranslatedValue({
         key: 'auto.components.LinearIssueMarkdownDescriptionEditor.d9c47069ef',
@@ -177,7 +180,7 @@ describe('locale-translation-policy zh round 5', () => {
         localeValue: '次提交',
         locale: 'zh'
       })
-    ).toBe('commits')
+    ).toBe('次提交')
     expect(
       repairTranslatedValue({
         key: 'auto.store.slices.worktrees.d1d78a7baa',
@@ -187,7 +190,7 @@ describe('locale-translation-policy zh round 5', () => {
           'Git 无法安全删除分支“{{value0}}”{{value1}}，因此 Orca 保留它以避免丢失本地提交。',
         locale: 'zh'
       })
-    ).toBe('Git 无法安全删除分支“{{value0}}”{{value1}}，因此 Orca 保留它以避免丢失本地 commits。')
+    ).toBe('Git 无法安全删除分支“{{value0}}”{{value1}}，因此 Orca 保留它以避免丢失本地提交。')
   })
 
   it('does not confuse proxy copy with Agent terminology', () => {
@@ -234,7 +237,7 @@ describe('locale-translation-policy zh round 5', () => {
         localeValue: '本地项目、Git 存储库或包含多个存储库的文件夹',
         locale: 'zh'
       })
-    ).toBe('本地项目、Git repo 或包含多个 repos 的文件夹')
+    ).toBe('本地项目、Git 仓库或包含多个仓库的文件夹')
   })
 
   it('keeps product, provider, code, and shell tokens untranslated', () => {

config/scripts/locale-value-overrides.mjs

@@ -8,7 +8,7 @@ export const LOCALE_VALUE_OVERRIDES = {
     'OpenCode Go': 'OpenCode Go',
     'Open in Cursor': 'Abrir en Cursor',
     'Local project, Git repo, or folder with many repos':
-      'Proyecto local, repo de Git o carpeta con muchos repos'
+      'Proyecto local, repositorio de Git o carpeta con muchos repositorios'
   },
   ko: {
     Save: '저장',
@@ -305,7 +305,8 @@ export const LOCALE_VALUE_OVERRIDES = {
     teams: '团队',
     passing: '通过',
     'opened this issue': '创建了此议题',
-    Open: '进行中',
+    // No blanket "Open" override: it is a verb on buttons (打开) and a state next to 已关闭 (开放),
+    // so a single value-wide mapping is wrong for half the call sites. Per-key catalog values decide.
     'Join Discord': '加入 Discord',
     'Pull request merged': '拉取请求已合并',
     'Agent Skills': '代理技能',

config/scripts/locale-zh-value-overrides.mjs

@@ -67,8 +67,8 @@ export const ZH_VALUE_OVERRIDES = {
   Inline: '内联',
   thread: '帖子串',
   destructive: 'destructive',
-  sheet: 'sheet',
-  page: 'page',
+  sheet: '面板',
+  page: '页面',
   Annotation: '批注',
   'check #': '检查 #',
   by: '由',
@@ -92,16 +92,18 @@ export const ZH_VALUE_OVERRIDES = {
     '仓库操作方案。在此仓库自定义之前，将使用全局设置。',
   'Adds action recipes for Source Control commit, pull request, branch-name, and fix actions.':
     '为源代码管理的提交、拉取请求、分支命名和修复操作添加操作方案。',
-  Play: 'Play',
-  Flag: 'Flag',
-  Zinc: 'Zinc',
-  Rose: 'Rose',
-  Emerald: 'Emerald',
-  Amber: 'Amber',
-  Violet: 'Violet',
-  Sky: 'Sky',
-  Blue: 'Blue',
-  Neutral: 'Neutral',
+  // Workspace status icon and color swatch labels; siblings below are translated, so English
+  // pins here would leave the picker half-Chinese on the next catalog regeneration.
+  Play: '播放',
+  Flag: '标记',
+  Zinc: '锌灰',
+  Rose: '玫瑰',
+  Emerald: '翡翠',
+  Amber: '琥珀',
+  Violet: '紫罗兰',
+  Sky: '天蓝',
+  Blue: '蓝色',
+  Neutral: '中性',
   Dashed: '虚线',
   Dot: '圆点',
   Circle: '圆形',
@@ -201,8 +203,7 @@ export const ZH_VALUE_OVERRIDES = {
     '每个已连接的 Linear 工作区都有一个由活动运行时存储的密钥。全权限密钥可覆盖密钥所有者可访问的所有团队；受限密钥可随时更换。',
   'Show Linear in the Tasks source picker and sidebar shortcuts.':
     '在任务源选择器和侧边栏快捷方式中显示 Linear。',
-  'Local project, Git repo, or folder with many repos':
-    '本地项目、Git repo 或包含多个 repos 的文件夹',
+  'Local project, Git repo, or folder with many repos': '本地项目、Git 仓库或包含多个仓库的文件夹',
   'Staged Changes': '已暂存的更改',
   Changes: '更改',
   'Untracked Files': '未跟踪文件',
@@ -210,8 +211,8 @@ export const ZH_VALUE_OVERRIDES = {
   'Split Down': '向下拆分',
   'Split Left': '向左拆分',
   'Split Right': '向右拆分',
-  'Split Terminal Down': '向下拆分 Terminal',
-  'Split Terminal Right': '向右拆分 Terminal',
+  'Split Terminal Down': '向下拆分终端',
+  'Split Terminal Right': '向右拆分终端',
   'Optional account switching for Claude while preserving shared chat context.':
     'Claude 的可选账户切换，同时保留共享聊天上下文。',
   'Countdown timer showing time until prompt cache expires (Claude agents).':

config/scripts/plain-node-entry-guard.test.ts

@@ -85,3 +85,91 @@ describe('plain Node entry guard', () => {
     )
   })
 })
+
+// Why (#11161): Electron's module is not registered on worker threads either —
+// require("electron") throws "Cannot find module 'electron'" inside a
+// main-process worker and kills it at startup. The worker entries carried only
+// hand-written "must stay electron-free" comments, and the port-scan worker sits
+// one import away from a client that deliberately does require electron.
+describe('worker thread entry guard', () => {
+  function runWorkerWriteBundle(plugin: Plugin, bundle: Rollup.OutputBundle): void {
+    const hook = plugin.writeBundle
+    if (typeof hook !== 'function') {
+      throw new Error('Expected writeBundle hook')
+    }
+    hook.call(
+      { meta: { watchMode: false } } as never,
+      { dir: createOutputDir() } as Rollup.NormalizedOutputOptions,
+      bundle
+    )
+  }
+
+  function workerChunk(name: string, code: string, imports: string[] = []): Rollup.OutputChunk {
+    return {
+      type: 'chunk',
+      code,
+      dynamicImports: [],
+      fileName: `${name}.js`,
+      imports,
+      isEntry: true,
+      name
+    } as Rollup.OutputChunk
+  }
+
+  it('rejects an Electron require reachable from a worker entry', () => {
+    const plugin = createPlainNodeEntryGuardPlugin()
+    const bundle = {
+      'port-scan-command-worker-entry.js': workerChunk(
+        'port-scan-command-worker-entry',
+        'require("electron")'
+      )
+    } as Rollup.OutputBundle
+
+    expect(() => runWorkerWriteBundle(plugin, bundle)).toThrow('requires electron')
+  })
+
+  it('names the worker-thread runtime so the failure is actionable', () => {
+    const plugin = createPlainNodeEntryGuardPlugin()
+    const bundle = {
+      'stt-worker.js': workerChunk('stt-worker', 'require("electron")')
+    } as Rollup.OutputBundle
+
+    expect(() => runWorkerWriteBundle(plugin, bundle)).toThrow('runs as a worker thread')
+  })
+
+  // The real risk is transitive: a worker entry importing a shared chunk that
+  // reaches the electron-requiring client, not a direct import anyone would spot.
+  it('follows shared chunks out of a worker entry', () => {
+    const plugin = createPlainNodeEntryGuardPlugin()
+    const bundle = {
+      'session-scanner-opencode-sqlite-worker-entry.js': workerChunk(
+        'session-scanner-opencode-sqlite-worker-entry',
+        'require("./chunks/shared.js")',
+        ['chunks/shared.js']
+      ),
+      'chunks/shared.js': {
+        type: 'chunk',
+        code: 'require("electron")',
+        dynamicImports: [],
+        fileName: 'chunks/shared.js',
+        imports: [],
+        isEntry: false,
+        name: 'shared'
+      } as Rollup.OutputChunk
+    } as Rollup.OutputBundle
+
+    expect(() => runWorkerWriteBundle(plugin, bundle)).toThrow('chunks/shared.js')
+  })
+
+  it('passes a clean worker entry', () => {
+    const plugin = createPlainNodeEntryGuardPlugin()
+    const bundle = {
+      'warp-theme-parser-worker.js': workerChunk(
+        'warp-theme-parser-worker',
+        'require("node:worker_threads")'
+      )
+    } as Rollup.OutputBundle
+
+    expect(() => runWorkerWriteBundle(plugin, bundle)).not.toThrow()
+  })
+})

config/scripts/verify-localization-catalog.mjs

@@ -6,6 +6,9 @@ import process from 'node:process'
 // TypeScript 7 is a native CLI; AST consumers still need the legacy JavaScript API.
 import ts from 'typescript-api'
 
+import { canonicalGenericRenderings } from './locale-generic-ui-terms.mjs'
+import { repairTranslatedValue } from './locale-translation-policy.mjs'
+
 const SOURCE_EXTENSIONS = new Set(['.ts', '.tsx', '.js', '.jsx', '.mts', '.cts'])
 const SKIP_PATH_PARTS = new Set(['.git', 'dist', 'node_modules', 'out', '__snapshots__', 'assets'])
 const LOCALIZATION_FUNCTION_NAMES = new Set(['t', 'translate', 'translateMain'])
@@ -282,9 +285,51 @@ function applyMissingEnglishEntries(catalog, missing) {
   return changed
 }
 
+// Why: #12113 — parity checks pass while repair-locale-catalog rewrites translated generic terms
+// back to English, so drift only surfaces when someone regenerates the catalog.
+export function collectGenericTermRegressions(enEntries, localeEntries, localeName) {
+  const renderings = canonicalGenericRenderings(localeName)
+  if (renderings.length === 0) {
+    return []
+  }
+
+  const regressions = []
+  for (const [key, enValue] of enEntries) {
+    const localeValue = localeEntries.get(key)
+    if (typeof enValue !== 'string' || typeof localeValue !== 'string') {
+      continue
+    }
+    const repaired = repairTranslatedValue({ key, enValue, localeValue, locale: localeName })
+    if (repaired === localeValue) {
+      continue
+    }
+    // Why: {{agent}} is an interpolation name, not English copy the reader sees.
+    const repairedCopy = repaired.replace(PLACEHOLDER_RE, '')
+    for (const { form, terms } of renderings) {
+      if (!localeValue.includes(form) || repaired.includes(form)) {
+        continue
+      }
+      if (
+        terms.some((term) => new RegExp(`(^|[^A-Za-z])${term}($|[^A-Za-z])`).test(repairedCopy))
+      ) {
+        regressions.push({ key, form, localeValue, repaired })
+        break
+      }
+    }
+  }
+  return regressions
+}
+
+function formatGenericTermRegressions(regressions) {
+  return regressions
+    .map((entry) => `${entry.key}: ${entry.form} -> English (${entry.repaired})`)
+    .join('\n')
+}
+
 function verifyLocaleCatalog(enCatalog, localeName, localeCatalog) {
   const { enEntries, localeEntries, missingInLocale, extraInLocale, interpolationMismatches } =
     collectLocaleParityIssues(enCatalog, localeCatalog)
+  const genericTermRegressions = collectGenericTermRegressions(enEntries, localeEntries, localeName)
 
   // Why: feature PRs own English declarations; absent target leaves deliberately
   // use i18next's existing English fallback until a localization PR supplies them.
@@ -292,7 +337,11 @@ function verifyLocaleCatalog(enCatalog, localeName, localeCatalog) {
     `${localeName}.json coverage: ${enEntries.size - missingInLocale.length}/${enEntries.size} translated, ${missingInLocale.length} missing.`
   )
 
-  if (extraInLocale.length > 0 || interpolationMismatches.length > 0) {
+  if (
+    extraInLocale.length > 0 ||
+    interpolationMismatches.length > 0 ||
+    genericTermRegressions.length > 0
+  ) {
     console.error(`Locale catalog validation failed for ${localeName}.json.`)
     if (extraInLocale.length > 0) {
       console.error('')
@@ -310,6 +359,18 @@ function verifyLocaleCatalog(enCatalog, localeName, localeCatalog) {
         console.error(`...and ${interpolationMismatches.length - 20} more interpolation mismatches`)
       }
     }
+    if (genericTermRegressions.length > 0) {
+      console.error('')
+      console.error(
+        'repair-locale-catalog would rewrite these translated terms back to English.',
+        'Treat the term as generic in config/scripts/locale-generic-ui-terms.mjs',
+        'instead of listing its translation as a mistranslation.'
+      )
+      console.error(formatGenericTermRegressions(genericTermRegressions.slice(0, 20)))
+      if (genericTermRegressions.length > 20) {
+        console.error(`...and ${genericTermRegressions.length - 20} more generic term regressions`)
+      }
+    }
     return 1
   }
 

config/scripts/verify-localization-catalog.test.mjs

@@ -4,7 +4,10 @@ import path from 'node:path'
 
 import { describe, expect, it, vi } from 'vitest'
 
-import { main as verifyLocalizationCatalog } from './verify-localization-catalog.mjs'
+import {
+  collectGenericTermRegressions,
+  main as verifyLocalizationCatalog
+} from './verify-localization-catalog.mjs'
 
 function writeJson(filePath, value) {
   writeFileSync(filePath, `${JSON.stringify(value, null, 2)}\n`, 'utf8')
@@ -123,4 +126,47 @@ describe('verify-localization-catalog', () => {
       report.mockRestore()
     }
   })
+
+  // Why: #12113 — parity checks passed while the repair policy rewrote translated terms to English.
+  it('flags catalog values the repair policy would rewrite back to English', () => {
+    const enEntries = new Map([['auto.example.commitLabel', 'Commit message']])
+
+    expect(
+      collectGenericTermRegressions(
+        enEntries,
+        new Map([['auto.example.commitLabel', 'mensaje de confirmación']]),
+        'es'
+      )
+    ).toEqual([])
+
+    // A locale whose committed value is the English term is stable, not a regression.
+    expect(
+      collectGenericTermRegressions(
+        enEntries,
+        new Map([['auto.example.commitLabel', 'mensaje de Commit']]),
+        'es'
+      )
+    ).toEqual([])
+
+    // 'Comprometerse' is a real mistranslation, so reverting it to Latin is expected.
+    expect(
+      collectGenericTermRegressions(
+        enEntries,
+        new Map([['auto.example.commitLabel', 'mensaje de Comprometerse']]),
+        'es'
+      )
+    ).toEqual([])
+  })
+
+  it('ignores interpolation names when looking for English rewrites', () => {
+    expect(
+      collectGenericTermRegressions(
+        new Map([
+          ['components.agentSessionContinuation.originalAgent', 'Original agent: {{agent}}']
+        ]),
+        new Map([['components.agentSessionContinuation.originalAgent', '原智能体：{{agent}}']]),
+        'zh'
+      )
+    ).toEqual([])
+  })
 })

config/vitest.config.ts

@@ -17,6 +17,8 @@ export default defineConfig({
     environment: 'node',
     // Why: Node 26's undefined Web Storage globals prevent Vitest from installing happy-dom's.
     execArgv: ['--no-experimental-webstorage'],
+    // Why: happy-dom drops MutationObserver callbacks on GC; keep them alive like a browser does.
+    setupFiles: [resolve('config/scripts/happy-dom-mutation-observer-retention.ts')],
     include: [
       'src/**/*.test.ts',
       'src/**/*.test.tsx',

docs/assets/readme-downloads.svg

@@ -1,5 +1,5 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="106" height="20" role="img" aria-label="downloads: 13m">
-  <title>downloads: 13m</title>
+<svg xmlns="http://www.w3.org/2000/svg" width="106" height="20" role="img" aria-label="downloads: 14m">
+  <title>downloads: 14m</title>
   <linearGradient id="s" x2="0" y2="100%">
     <stop offset="0" stop-color="#bbb" stop-opacity=".1"/>
     <stop offset="1" stop-opacity=".1"/>
@@ -15,7 +15,7 @@
   <g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="11">
     <text x="37" y="15" fill="#010101" fill-opacity=".3">downloads</text>
     <text x="37" y="14">downloads</text>
-    <text x="90" y="15" fill="#010101" fill-opacity=".3">13m</text>
-    <text x="90" y="14">13m</text>
+    <text x="90" y="15" fill="#010101" fill-opacity=".3">14m</text>
+    <text x="90" y="14">14m</text>
   </g>
 </svg>

docs/reference/headless-linux-server.md

@@ -155,6 +155,8 @@ display `:99` when no display exists:
 Description=Orca runtime server
 After=network-online.target
 Wants=network-online.target
+StartLimitIntervalSec=300
+StartLimitBurst=5
 
 [Service]
 Type=simple
@@ -165,6 +167,7 @@ ExecStart=/opt/orca/orca-linux.AppImage serve --port 6768 --pairing-address 100.
 StandardOutput=journal
 StandardError=journal
 Restart=on-failure
+RestartPreventExitStatus=3
 RestartSec=5
 
 [Install]
@@ -174,6 +177,19 @@ WantedBy=multi-user.target
 Replace `100.64.1.20` with the LAN, Tailscale, tunnel, or public hostname that
 clients should use.
 
+Exit status `3` means another process already owns this userData profile, so
+`RestartPreventExitStatus=3` stops the unit instead of retrying a launch that
+cannot succeed. Any other permanent startup fault is capped at 5 starts per
+5 minutes; systemd's defaults (10s window, 5 starts) can never trip at
+`RestartSec=5`, which is how one bad launch could restart thousands of times.
+The start limit counts operator-initiated starts too, so once it trips systemd
+refuses a plain `systemctl start` until the 5-minute window rolls over. Run
+`sudo systemctl reset-failed orca-serve.service` first to clear it — the
+[Upgrade](#upgrade-steps) and [Roll back](#roll-back) scripts already do.
+On systemd older than 230 those two directives are spelled
+`StartLimitInterval=`/`StartLimitBurst=` and belong in `[Service]`; Ubuntu
+20.04, Orca's oldest supported base, ships systemd 245.
+
 Enable the service:
 
 ```bash
@@ -228,6 +244,8 @@ Then add the display dependency to the Orca service:
 Description=Orca runtime server
 After=network-online.target orca-xvfb.service
 Wants=network-online.target orca-xvfb.service
+StartLimitIntervalSec=300
+StartLimitBurst=5
 
 [Service]
 Type=simple
@@ -237,6 +255,7 @@ Environment=DISPLAY=:99
 Environment=LIBGL_ALWAYS_SOFTWARE=1
 ExecStart=/opt/orca/orca-linux.AppImage serve --port 6768 --pairing-address 100.64.1.20
 Restart=on-failure
+RestartPreventExitStatus=3
 RestartSec=5
 
 [Install]
@@ -415,6 +434,8 @@ recover_failed_upgrade() {
     sudo rm -f /opt/orca/orca-linux.AppImage.recovering \
       /opt/orca/VERSION.recovering
     if ((recovery_ok)); then
+      # A tripped StartLimitBurst refuses a plain start
+      sudo systemctl reset-failed orca-serve.service || true
       sudo systemctl start orca-serve.service || true
     else
       echo 'Upgrade recovery failed; service remains stopped' >&2
@@ -482,6 +503,8 @@ sudo mv "$ORCA_ROLLBACK_NEW" "$ORCA_ROLLBACK"
 ORCA_BINARY_PROMOTED=1
 sudo mv -f /opt/orca/orca-linux.AppImage.new /opt/orca/orca-linux.AppImage
 sudo mv -f /opt/orca/VERSION.new /opt/orca/VERSION
+# Clears a start-limit hit left by the version being replaced
+sudo systemctl reset-failed orca-serve.service
 sudo systemctl start orca-serve.service
 ORCA_SERVICE_STOPPED=0
 trap - EXIT
@@ -614,6 +637,8 @@ restart_after_rollback_error() {
       fi
     fi
     if ((recovery_ok)); then
+      # A tripped StartLimitBurst refuses a plain start
+      sudo systemctl reset-failed orca-serve.service || true
       sudo systemctl start orca-serve.service || true
     else
       echo 'Rollback recovery failed; service remains stopped' >&2
@@ -714,6 +739,8 @@ if ((ORCA_ROLLBACK_HAS_VERSION)); then
 else
   sudo rm -f /opt/orca/VERSION
 fi
+# The crash-looping build you are rolling back from tripped StartLimitBurst
+sudo systemctl reset-failed orca-serve.service
 sudo systemctl start orca-serve.service
 ORCA_SERVICE_STOPPED=0
 sudo rm -rf -- "$ORCA_RESTORE"
@@ -805,9 +832,24 @@ refuse to run there and print the command to run on the machine you want.
   `orca` user and that `/opt/orca` is readable by that user.
 - Clients cannot connect: make sure `--pairing-address` is an address reachable
   from the client, and make sure firewalls allow the selected `--port`.
+- Journal shows `Another Orca instance is already running for this userData
+  profile` and the unit exits `3`: another process already owns the profile, so
+  `RestartPreventExitStatus=3` leaves the unit `failed` on purpose. Find the
+  owner with `systemctl status orca-serve` and `pgrep -af orca`. Stop it (or
+  keep it and leave the unit down), then run
+  `sudo systemctl reset-failed orca-serve && sudo systemctl start orca-serve` —
+  `reset-failed` clears the failed state and any start-limit counter. If no owner
+  exists, the lock is stale (Chromium recorded a pid that
+  has since been reused): remove `SingletonLock` and `SingletonSocket` from the
+  userData directory and start again. If an earlier crash-loop already leaked
+  AppImage mounts, list them with `findmnt -rn -t fuse.orca-linux.AppImage` and
+  release only the ones with no live owner using `fusermount -uz <target>` (or
+  `umount -l <target>`), leaving the running instance's mount alone.
 - Service crash-loops right after an upgrade: use [Roll back](#roll-back) with
   the pre-upgrade `.ready` bundle. Do not rerun the upgrade first; doing so would
-  make the crashing version the next rollback binary.
+  make the crashing version the next rollback binary. The loop trips
+  `StartLimitBurst`, so any manual `systemctl start` outside that script needs
+  `sudo systemctl reset-failed orca-serve.service` first.
 - Diagnosing other missing libraries: extract the AppImage without launching it
   with `./orca-linux.AppImage --appimage-extract`, then run
   `ldd squashfs-root/orca` to list any shared libraries the host is missing.

docs/reference/windows-setup-shell.md

@@ -0,0 +1,86 @@
+# Windows setup-runner shell
+
+On native Windows, Orca writes the `orca.yaml` setup script (and the issue command) to a generated
+runner file and types a launch command into a terminal. The runner is a **`.cmd` batch file by
+default**, exactly as it has been since setup hooks shipped.
+
+A script opts into bash by starting with a `#!` interpreter line:
+
+```yaml
+scripts:
+  setup: |
+    #!/usr/bin/env bash
+    [ -f .env ] || cp .env.example .env
+    pnpm install
+```
+
+Without that line the script keeps running under `cmd.exe`:
+
+```yaml
+scripts:
+  setup: |
+    copy .env.example .env
+    xcopy /E assets dist
+```
+
+## Why the script declares it, not the terminal preference
+
+`terminalWindowsShell` says which shell *interactive terminals* open in. It says nothing about the
+language a project's setup script is written in. Deriving the runner from it had two consequences:
+
+- Windows users with batch-syntax setup scripts silently switched to bash on upgrade, so `copy`,
+  `xcopy`, `set VAR=value`, and `if errorlevel 1` stopped working.
+- Two people on the same repo got different interpreters for the same `orca.yaml`, so no project
+  could write a setup script that worked for all of its Windows contributors.
+
+A `#!` line is per-project, explicit, and identical for everyone who checks the repo out.
+
+The same rule applies to the per-user setup command in **Settings → repository hooks**
+(`repo.hookSettings.scripts.setup`): it is merged into the same script that reaches the runner, so a
+POSIX one-liner stored there needs its own `#!` line to run under bash on Windows.
+
+## What the `#!` line does and does not select
+
+The generated runner is always executed by bash (`bash <runner>`; Git Bash on native Windows), on
+every platform. The `#!` line therefore does two things:
+
+- It declares the script is written for a POSIX shell, which is what selects the bash runner.
+- Its option flags are replayed with `set`, so `#!/usr/bin/env -S bash -euo pipefail` really does
+  get `pipefail`. Without that replay the flags would be silently dropped, because `bash <runner>`
+  never parses the interpreter line. Only the flags `set` itself accepts
+  (`[--abefhkmnptuvxBCHP] [-o option]`) are replayed; invocation-only ones such as `-l` are
+  dropped, because `set -l` exits 2 and would abort the runner before its first line.
+
+The interpreter name itself is not honored beyond "is this a POSIX shell": `#!/bin/sh` and
+`#!/bin/zsh` scripts run under bash, exactly as they already did on macOS and Linux.
+
+## Requirements for the bash runner
+
+A `#!` line only takes effect when Orca can actually launch bash from the configured terminal — the
+terminal shell must resolve to Git Bash (`resolveWindowsGitBashShellPath`). The generated runner
+uses MSYS `/c/...` paths, which Cygwin and the WSL shim do not accept, and the launch command is
+typed into whatever shell the terminal opened with.
+
+When bash is not available (a PowerShell/cmd terminal, or an SSH-to-Windows host, which always uses
+the remote's `.cmd` runner) the `#!` script is **not** executed under cmd. The generated `.cmd`
+runner prints why and exits 1, because running the interpreter-agnostic prefix of a bash script
+(`pnpm install`, `git submodule update`) and only failing at the first bash-only line leaves a
+half-set-up worktree that looks finished.
+
+## Launching a `.cmd` runner from a Git Bash terminal
+
+The runner format and the shell that types the launch command are independent: a Git Bash terminal
+with a batch-syntax setup script gets a `.cmd` runner launched from a bash pane. `cmd.exe /c
+"C:\..."` cannot be used there — MSYS rewrites the bare `/c` switch into a drive path, so cmd opens
+interactively and the runner never executes (issue #6896). Those launches reuse the PowerShell
+`ProcessStartInfo` launcher (`buildWindowsCmdRunnerDelayedLaunchCommand`), which carries the switch
+and the runner path outside the command line. `WorktreeSetupLaunch.shell` therefore describes the
+launching pane; the runner file's `.cmd`/`.sh` extension describes the format.
+
+The `wait-for-setup` gate follows the same split. The pane types the gate and already quoted the
+agent startup command for itself, so a `.cmd` runner launched from a Git Bash pane still gets the
+bash gate — PowerShell's `Invoke-Expression` cannot parse POSIX `'\''` escaping. The gate wraps the
+same `ProcessStartInfo` launcher, so the batch runner is never handed to bash.
+
+WSL worktrees and non-Windows platforms are unaffected: they always use the bash runner. SSH hosts
+choose their runner from the remote path format, never from local Windows preferences.

electron.vite.config.ts

@@ -216,6 +216,11 @@ export const electronViteConfig: UserConfig = {
           'session-scanner-opencode-sqlite-worker-entry': resolve(
             'src/main/ai-vault/session-scanner-opencode-sqlite-worker-entry.ts'
           ),
+          // Why: libuv spawns processes inline on the calling loop, so the port
+          // scan's probe commands run on a worker thread instead of the UI one.
+          'port-scan-command-worker-entry': resolve(
+            'src/main/ports/port-scan-command-worker-entry.ts'
+          ),
           // Why: forked with ELECTRON_RUN_AS_NODE so @parcel/watcher faults
           // can't take down the main process (issue #7547).
           'parcel-watcher-process-entry': resolve('src/main/ipc/parcel-watcher-process-entry.ts'),

mobile/app.json

@@ -2,7 +2,7 @@
   "expo": {
     "name": "Orca",
     "slug": "orca-mobile",
-    "version": "0.0.36",
+    "version": "0.0.37",
     "orientation": "default",
     "icon": "./assets/icon.png",
     "userInterfaceStyle": "automatic",
@@ -75,7 +75,7 @@
       "allowBackup": false,
       "permissions": ["RECORD_AUDIO", "MODIFY_AUDIO_SETTINGS"],
       "package": "com.stably.orca.mobile",
-      "versionCode": 9
+      "versionCode": 10
     },
     "plugins": [
       "expo-router",

mobile/app/h/[hostId]/index.tsx

@@ -164,7 +164,8 @@ export function HostScreen({
   const [filters, setFilters] = useState<FilterState>({
     filterRepoIds: new Set(),
     hideSleeping: false,
-    hideDefaultBranch: false
+    hideDefaultBranch: false,
+    alwaysShowDefaultBranch: true
   })
   const [groupMode, setGroupMode] = useState<MobileGroupMode>('repo')
   const [workspaceStatuses, setWorkspaceStatuses] = useState<readonly WorkspaceStatusDefinition[]>(
@@ -195,6 +196,7 @@ export function HostScreen({
     sortMode: 'recent',
     hideSleeping: false,
     hideDefaultBranch: false,
+    alwaysShowDefaultBranch: true,
     filterRepoIds: [],
     collapsedGroups: [],
     workspaceStatuses: DEFAULT_MOBILE_WORKSPACE_STATUSES
@@ -206,6 +208,7 @@ export function HostScreen({
       sortMode,
       hideSleeping: filters.hideSleeping,
       hideDefaultBranch: filters.hideDefaultBranch,
+      alwaysShowDefaultBranch: filters.alwaysShowDefaultBranch !== false,
       filterRepoIds: [...filters.filterRepoIds],
       collapsedGroups: [...collapsedGroups],
       workspaceStatuses
@@ -222,7 +225,8 @@ export function HostScreen({
     setFilters({
       filterRepoIds: new Set(next.filterRepoIds),
       hideSleeping: next.hideSleeping,
-      hideDefaultBranch: next.hideDefaultBranch
+      hideDefaultBranch: next.hideDefaultBranch,
+      alwaysShowDefaultBranch: next.alwaysShowDefaultBranch
     })
   }, [])
 
@@ -234,6 +238,9 @@ export function HostScreen({
       if (!client) {
         return
       }
+      // alwaysShowDefaultBranchWorkspace is deliberately absent: mobile reads it
+      // but has no toggle, so echoing its local default would silently revert a
+      // desktop opt-out on the first filter tap before ui.get lands (#8873).
       const payload: WorkspaceViewSettings = {
         groupBy: groupModeToDesktop(next.groupMode),
         sortBy: next.sortMode,

mobile/app/index.tsx

@@ -16,16 +16,13 @@ import {
 } from '../src/components/AccountUsage'
 import AsyncStorage from '@react-native-async-storage/async-storage'
 import { loadHosts } from '../src/transport/host-store'
-import { navigateToMobileHostEdit } from '../src/transport/host-edit-navigation'
+import { useOpenMobileHostEdit } from '../src/transport/use-open-mobile-host-edit'
 import { removeHostAndCloseClient } from '../src/transport/host-removal-lifecycle'
-import { pickResumeWorktree } from '../src/worktree/resume-worktree'
-import { WORKTREE_PS_FULL_LIMIT } from '../src/worktree/worktree-catalog-snapshot-client'
-import {
-  markHomeWorktreeCatalogUnavailable,
-  type HomeWorktreeSummary,
-  type HostWorktreeInfo
-} from '../src/worktree/home-worktree-info'
+import { fetchHomeHostWorktreeInfo } from '../src/worktree/home-host-worktree-fetch'
+import { totalHomeStats, type HomeStatsSummary } from '../src/stats/home-stats-total'
+import type { HomeWorktreeSummary, HostWorktreeInfo } from '../src/worktree/home-worktree-info'
 import type { RpcClient } from '../src/transport/rpc-client'
+import { createHostConnectRefetchGate } from '../src/transport/host-connect-refetch-gate'
 import { sendSingleFlightRequest } from '../src/transport/request-single-flight'
 import {
   useAllHostClients,
@@ -68,13 +65,6 @@ function endpointLabel(endpoint: string): string {
   }
 }
 
-type StatsSummary = {
-  totalAgentsSpawned: number
-  totalPRsCreated: number
-  totalAgentTimeMs: number
-  firstEventAt: number | null
-}
-
 type HomeTaskSettings = {
   visibleTaskProviders?: unknown
 }
@@ -123,7 +113,9 @@ function clientKey(client: RpcClient): number {
 function fetchStats(
   client: RpcClient,
   hostId: string,
-  setStats: (s: StatsSummary) => void,
+  setStats: (
+    updater: (prev: Record<string, HomeStatsSummary>) => Record<string, HomeStatsSummary>
+  ) => void,
   disposed: () => boolean
 ) {
   sendSingleFlightRequest(client, hostId, 'stats.summary')
@@ -132,61 +124,13 @@ function fetchStats(
         return
       }
       if (response.ok) {
-        setStats(response.result as StatsSummary)
+        // Keyed by host: the header totals every desktop instead of showing whoever replied last.
+        setStats((prev) => ({ ...prev, [hostId]: response.result as HomeStatsSummary }))
       }
     })
     .catch(() => {})
 }
 
-function fetchWorktreeInfo(
-  client: RpcClient,
-  hostId: string,
-  setInfo: (
-    updater: (prev: Record<string, HostWorktreeInfo>) => Record<string, HostWorktreeInfo>
-  ) => void,
-  disposed: () => boolean
-) {
-  const markUnavailable = () => {
-    setInfo((prev) => {
-      const current = prev[hostId]
-      const next = markHomeWorktreeCatalogUnavailable(current, hostId)
-      return next === current ? prev : { ...prev, [hostId]: next }
-    })
-  }
-
-  sendSingleFlightRequest(client, hostId, 'worktree.ps', { limit: WORKTREE_PS_FULL_LIMIT })
-    .then((response) => {
-      if (disposed()) {
-        return
-      }
-      if (response.ok) {
-        const result = response.result as { worktrees: HomeWorktreeSummary[] }
-        const worktrees = result.worktrees ?? []
-        setCachedWorktrees(hostId, worktrees)
-        const activeStatuses = new Set(['working', 'active', 'permission'])
-        const active = worktrees.filter((w) => w.status && activeStatuses.has(w.status))
-        // Mirror the desktop's focused workspace (see pickResumeWorktree).
-        const lastActive = pickResumeWorktree(worktrees)
-        setInfo((prev) => ({
-          ...prev,
-          [hostId]: {
-            hostId,
-            totalWorktrees: worktrees.length,
-            activeCount: active.length,
-            lastActiveWorktree: lastActive
-          }
-        }))
-      } else {
-        markUnavailable()
-      }
-    })
-    .catch(() => {
-      if (!disposed()) {
-        markUnavailable()
-      }
-    })
-}
-
 function fetchAccountsSnapshot(
   client: RpcClient,
   hostId: string,
@@ -262,6 +206,7 @@ function repoColor(name: string): string {
 
 export default function HomeScreen() {
   const router = useRouter()
+  const openMobileHostEdit = useOpenMobileHostEdit()
   const openMobileTasks = useOpenMobileTasks()
   const insets = useSafeAreaInsets()
   // Why: cap/center content on wide/tablet canvases so cards don't stretch edge-to-edge on iPad.
@@ -272,7 +217,7 @@ export default function HomeScreen() {
   const [hostStates, setHostStates] = useState<Record<string, ConnectionState>>({})
   const [hostAttempts, setHostAttempts] = useState<Record<string, number>>({})
   const [hostLastConnected, setHostLastConnected] = useState<Record<string, number | null>>({})
-  const [stats, setStats] = useState<StatsSummary | null>(null)
+  const [statsByHost, setStatsByHost] = useState<Record<string, HomeStatsSummary>>({})
   const [worktreeInfo, setWorktreeInfo] = useState<Record<string, HostWorktreeInfo>>({})
   const [accountsByHost, setAccountsByHost] = useState<Record<string, AccountsSnapshot>>({})
   const [taskProvidersByHost, setTaskProvidersByHost] = useState<Record<string, TaskProvider[]>>({})
@@ -285,6 +230,8 @@ export default function HomeScreen() {
 
   // Why: shared clients from the per-host store, not N independent WebSockets. See docs/mobile-shared-client-per-host.md.
   const hostIds = useMemo(() => hosts.map((h) => h.id), [hosts])
+  // Why: scoped to the paired hosts so an unpaired desktop's cached reply leaves the header total.
+  const stats = useMemo(() => totalHomeStats(statsByHost, hostIds), [statsByHost, hostIds])
   const allClients = useAllHostClients(hostIds)
   const hostPaths = useMemo(
     () => Object.fromEntries(allClients.map(({ hostId, path }) => [hostId, path])),
@@ -375,8 +322,8 @@ export default function HomeScreen() {
       })
       for (const entry of allClientsRef.current) {
         if (entry.client.getState() === 'connected') {
-          fetchStats(entry.client, entry.hostId, setStats, () => stale)
-          fetchWorktreeInfo(entry.client, entry.hostId, setWorktreeInfo, () => stale)
+          fetchStats(entry.client, entry.hostId, setStatsByHost, () => stale)
+          void fetchHomeHostWorktreeInfo(entry.client, entry.hostId, setWorktreeInfo, () => stale)
           fetchAccountsSnapshot(entry.client, entry.hostId, setAccountsByHost, () => stale)
           fetchTaskProviders(entry.client, entry.hostId, setTaskProvidersByHost, () => stale)
         }
@@ -457,60 +404,70 @@ export default function HomeScreen() {
     })
   }, [allClients, hosts])
 
-  // Per-host notif/accounts subs + one-shot stats on 'connected'; re-runs per (hostId, client) pair, socket stays open so it's cheap.
-  useEffect(() => {
-    const cleanups: Array<() => void> = []
-    for (const entry of allClients) {
-      let unsubNotif: (() => void) | null = null
-      let unsubAccounts: (() => void) | null = null
-      let statsFetched = false
-      const wireUp = (state: ConnectionState) => {
-        if (state === 'connected') {
-          if (!unsubNotif) {
-            unsubNotif = subscribeToDesktopNotifications(entry.client, entry.hostId)
-          }
-          if (!unsubAccounts) {
-            unsubAccounts = entry.client.subscribe('accounts.subscribe', null, (payload) => {
-              if (!payload || typeof payload !== 'object') {
-                return
+  // Notif/accounts subs + a snapshot read per connect for one host. Lives outside the effect body
+  // because react-doctor's effect-needs-cleanup false-positives on `subscribe` inside one; the
+  // returned disposer owns every handle allocated here.
+  const wireHostSubscriptions = (entry: {
+    hostId: string
+    client: RpcClient
+    state: ConnectionState
+  }) => {
+    let unsubNotif: (() => void) | null = null
+    let unsubAccounts: (() => void) | null = null
+    const refetchGate = createHostConnectRefetchGate()
+    const wireUp = (state: ConnectionState) => {
+      const reconnected = refetchGate.observe(state)
+      if (state === 'connected') {
+        if (!unsubNotif) {
+          unsubNotif = subscribeToDesktopNotifications(entry.client, entry.hostId)
+        }
+        if (!unsubAccounts) {
+          unsubAccounts = entry.client.subscribe('accounts.subscribe', null, (payload) => {
+            if (!payload || typeof payload !== 'object') {
+              return
+            }
+            const evt = payload as { type?: string; snapshot?: unknown }
+            if (evt.type === 'ready' || evt.type === 'snapshot') {
+              try {
+                const snapshot = decodeAccountsSnapshot(evt.snapshot)
+                setAccountsByHost((prev) => ({ ...prev, [entry.hostId]: snapshot }))
+              } catch {
+                // Keep the last proven snapshot; malformed remote data must
+                // not enter render state or crash the home host cards.
               }
-              const evt = payload as { type?: string; snapshot?: unknown }
-              if (evt.type === 'ready' || evt.type === 'snapshot') {
-                try {
-                  const snapshot = decodeAccountsSnapshot(evt.snapshot)
-                  setAccountsByHost((prev) => ({ ...prev, [entry.hostId]: snapshot }))
-                } catch {
-                  // Keep the last proven snapshot; malformed remote data must
-                  // not enter render state or crash the home host cards.
-                }
-              }
-            })
-          }
-          if (!statsFetched) {
-            statsFetched = true
-            fetchStats(entry.client, entry.hostId, setStats, () => false)
-            fetchWorktreeInfo(entry.client, entry.hostId, setWorktreeInfo, () => false)
-            fetchTaskProviders(entry.client, entry.hostId, setTaskProvidersByHost, () => false)
-          }
-        } else {
-          if (unsubNotif) {
-            unsubNotif()
-            unsubNotif = null
-          }
-          if (unsubAccounts) {
-            unsubAccounts()
-            unsubAccounts = null
-          }
+            }
+          })
+        }
+        // Why: the socket survives backgrounding/handoffs by reconnecting, so re-read the host
+        // snapshot on every reconnect — a one-shot latch left the card on stale data forever.
+        if (reconnected) {
+          fetchStats(entry.client, entry.hostId, setStatsByHost, () => false)
+          void fetchHomeHostWorktreeInfo(entry.client, entry.hostId, setWorktreeInfo, () => false)
+          fetchTaskProviders(entry.client, entry.hostId, setTaskProvidersByHost, () => false)
+        }
+      } else {
+        if (unsubNotif) {
+          unsubNotif()
+          unsubNotif = null
+        }
+        if (unsubAccounts) {
+          unsubAccounts()
+          unsubAccounts = null
         }
       }
-      wireUp(entry.state)
-      const unsubState = entry.client.onStateChange(wireUp)
-      cleanups.push(() => {
-        unsubState()
-        unsubNotif?.()
-        unsubAccounts?.()
-      })
     }
+    wireUp(entry.state)
+    const unsubState = entry.client.onStateChange(wireUp)
+    return () => {
+      unsubState()
+      unsubNotif?.()
+      unsubAccounts?.()
+    }
+  }
+
+  // Re-runs per (hostId, client) pair; the socket stays open so it's cheap.
+  useEffect(() => {
+    const cleanups = allClients.map((entry) => wireHostSubscriptions(entry))
     return () => {
       for (const c of cleanups) {
         c()
@@ -750,7 +707,6 @@ export default function HomeScreen() {
             const state = hostStates[item.id] ?? 'connecting'
             const attempts = hostAttempts[item.id] ?? 0
             const lastConnectedAt = hostLastConnected[item.id] ?? null
-            const info = worktreeInfo[item.id]
             const verdict = classifyConnection({
               state,
               reconnectAttempts: attempts,
@@ -763,12 +719,7 @@ export default function HomeScreen() {
                 state={state}
                 verdict={verdict}
                 path={hostPaths[item.id] ?? 'lan'}
-                worktreeCounts={
-                  info && !info.catalogUnavailable
-                    ? { total: info.totalWorktrees, active: info.activeCount }
-                    : undefined
-                }
-                worktreeCountsUnavailable={info?.catalogUnavailable === true}
+                worktreeInfo={worktreeInfo[item.id]}
                 onPress={() => router.push(`/h/${item.id}`)}
                 onLongPress={() => {
                   triggerMediumImpact()
@@ -956,7 +907,7 @@ export default function HomeScreen() {
           onDismiss: () => setActionTarget(null),
           onReconnect: (hostId) => void forceReconnectHost(hostId),
           onDisconnect: closeHostClient,
-          onEdit: (hostId) => navigateToMobileHostEdit(router, hostId),
+          onEdit: openMobileHostEdit,
           onRemove: setConfirmRemove
         })}
         onClose={() => setActionTarget(null)}

mobile/src/cache/home-snapshot-cache.ts

@@ -5,25 +5,12 @@
 // WebSocket reconnects and the first responses come back.
 import AsyncStorage from '@react-native-async-storage/async-storage'
 import type { AccountsSnapshot } from '../components/AccountUsage'
+// Why: the canonical shape, so persisted counts keep carrying countsProvenAt — the home card
+// needs it to know whether a rehydrated count is minutes or days old.
+import type { HostWorktreeInfo } from '../worktree/home-worktree-info'
 
 const STORAGE_KEY = 'orca:home-snapshot:v1'
 
-type WorktreeSummary = {
-  worktreeId: string
-  repo: string
-  branch: string
-  displayName: string
-  liveTerminalCount: number
-  status?: 'working' | 'active' | 'permission' | 'done' | 'inactive'
-}
-
-type HostWorktreeInfo = {
-  hostId: string
-  totalWorktrees: number
-  activeCount: number
-  lastActiveWorktree: WorktreeSummary | null
-}
-
 export type HomeSnapshot = {
   worktreeInfo: Record<string, HostWorktreeInfo>
   accountsByHost: Record<string, AccountsSnapshot>

mobile/src/components/MobileHostCard.test.tsx

@@ -0,0 +1,93 @@
+import { createElement } from 'react'
+import { act, create, type ReactTestRenderer } from 'react-test-renderer'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type { ConnectionVerdict } from '../transport/connection-health'
+import type { HostProfile } from '../transport/types'
+import {
+  markHomeWorktreeCatalogUnavailable,
+  type HostWorktreeInfo
+} from '../worktree/home-worktree-info'
+import { MobileHostCard } from './MobileHostCard'
+
+vi.mock('react-native', () => ({
+  Pressable: 'Pressable',
+  StyleSheet: { create: <T,>(styles: T) => styles },
+  Text: 'Text',
+  View: 'View'
+}))
+vi.mock('lucide-react-native', () => ({ ChevronRight: 'ChevronRight', Monitor: 'Monitor' }))
+vi.mock('./StatusDot', () => ({ StatusDot: 'StatusDot' }))
+
+const host: HostProfile = {
+  id: 'host-1',
+  name: 'Studio',
+  endpoint: 'ws://studio.local:8765',
+  deviceToken: 'token',
+  publicKeyB64: 'key',
+  lastConnected: 0
+}
+const verdict: ConnectionVerdict = { kind: 'normal', label: 'Connected' }
+const loaded: HostWorktreeInfo = {
+  hostId: 'host-1',
+  totalWorktrees: 12,
+  activeCount: 2,
+  lastActiveWorktree: null,
+  countsProvenAt: Date.now()
+}
+
+describe('MobileHostCard', () => {
+  let renderer: ReactTestRenderer | null = null
+
+  beforeEach(() => {
+    globalThis.IS_REACT_ACT_ENVIRONMENT = true
+  })
+
+  afterEach(() => {
+    act(() => renderer?.unmount())
+    renderer = null
+  })
+
+  async function renderCard(worktreeInfo: HostWorktreeInfo | undefined): Promise<string[]> {
+    await act(async () => {
+      renderer = create(
+        createElement(MobileHostCard, {
+          host,
+          state: 'connected',
+          verdict,
+          path: 'lan',
+          worktreeInfo,
+          onPress: () => {},
+          onLongPress: () => {}
+        })
+      )
+    })
+    return renderer!.root
+      .findAllByType('Text')
+      .flatMap((node) => node.children.filter((child) => typeof child === 'string'))
+  }
+
+  it('renders the counts the host proved', async () => {
+    expect(await renderCard(loaded)).toContain('12 worktrees · 2 active')
+  })
+
+  it('keeps rendering the last proven counts after a failed refresh', async () => {
+    // The regression this card shipped once: the caller dropped the counts the
+    // failure path deliberately preserved.
+    expect(await renderCard(markHomeWorktreeCatalogUnavailable(loaded, 'host-1'))).toContain(
+      'Last known: 12 worktrees · 2 active'
+    )
+  })
+
+  it('never asserts a count for a catalog that failed with nothing proven', async () => {
+    expect(await renderCard(markHomeWorktreeCatalogUnavailable(undefined, 'host-1'))).toContain(
+      'Worktree list unavailable'
+    )
+  })
+
+  it('shows no worktree line before the first read lands', async () => {
+    const lines = await renderCard(undefined)
+
+    expect(lines).not.toContain('0 worktrees')
+    expect(lines).not.toContain('Worktree list unavailable')
+  })
+})

mobile/src/components/MobileHostCard.tsx

@@ -6,6 +6,7 @@ import { mobileConnectionPathLabel } from '../transport/mobile-connection-path-l
 import type { MobileConnectionPath } from '../transport/stable-logical-rpc-client'
 import type { ConnectionState, HostProfile } from '../transport/types'
 import { colors, radii, spacing } from '../theme/mobile-theme'
+import { homeHostWorktreeSummary, type HostWorktreeInfo } from '../worktree/home-worktree-info'
 import { StatusDot } from './StatusDot'
 
 export function MobileHostCard(props: {
@@ -13,20 +14,15 @@ export function MobileHostCard(props: {
   state: ConnectionState
   verdict: ConnectionVerdict
   path: MobileConnectionPath
-  worktreeCounts?: { total: number; active: number }
-  // Why (STA-3123): the host is connected but its worktree catalog request failed,
-  // so the card must say "unavailable" instead of asserting a count of zero.
-  worktreeCountsUnavailable?: boolean
+  // Why: the card owns the fresh/stale/unavailable wording so no caller can re-gate the counts
+  // away (STA-3123 shipped that bug once already).
+  worktreeInfo?: HostWorktreeInfo
   onPress: () => void
   onLongPress: () => void
 }) {
   const connected = props.state === 'connected'
   const isError = ['warning', 'unreachable', 'auth-failed'].includes(props.verdict.kind)
-  const worktreeSummary = props.worktreeCounts
-    ? `${props.worktreeCounts.total} worktree${props.worktreeCounts.total === 1 ? '' : 's'}${props.worktreeCounts.active > 0 ? ` · ${props.worktreeCounts.active} active` : ''}`
-    : props.worktreeCountsUnavailable
-      ? 'Worktree list unavailable'
-      : null
+  const worktreeSummary = homeHostWorktreeSummary(props.worktreeInfo)
   return (
     <Pressable
       style={({ pressed }) => [styles.card, pressed && styles.cardPressed]}

mobile/src/home-host-edit-navigation-source.test.ts

@@ -5,8 +5,7 @@ const homeSource = readFileSync(new URL('../app/index.tsx', import.meta.url), 'u
 
 describe('Home host edit navigation wiring', () => {
   it('uses the cold-navigator-safe edit transition', () => {
-    expect(homeSource).toMatch(
-      /onEdit:\s*\(hostId\)\s*=>\s*navigateToMobileHostEdit\(router,\s*hostId\)/
-    )
+    expect(homeSource).toMatch(/const openMobileHostEdit = useOpenMobileHostEdit\(\)/)
+    expect(homeSource).toMatch(/onEdit:\s*openMobileHostEdit/)
   })
 })

mobile/src/session/MobileNativeChatAsk.tsx

@@ -282,6 +282,7 @@ const styles = StyleSheet.create({
   },
   option: {
     flexDirection: 'row',
+    alignItems: 'center',
     gap: spacing.sm,
     padding: spacing.sm,
     borderRadius: radii.card,
@@ -299,8 +300,7 @@ const styles = StyleSheet.create({
     borderWidth: 1.5,
     borderColor: colors.textMuted,
     alignItems: 'center',
-    justifyContent: 'center',
-    marginTop: 1
+    justifyContent: 'center'
   },
   checkCircle: {
     borderRadius: 9

mobile/src/session/MobileNativeChatOverlay.test.ts

@@ -0,0 +1,193 @@
+import { createElement } from 'react'
+import { act, create, type ReactTestRenderer } from 'react-test-renderer'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type { NativeChatMessage } from '../../../src/shared/native-chat-types'
+import { MobileNativeChatOverlay } from './MobileNativeChatOverlay'
+import type { MobileNativeChatController } from './use-mobile-native-chat-controller'
+
+vi.mock('react-native', () => ({
+  StyleSheet: { create: (styles: unknown) => styles, absoluteFillObject: {} },
+  View: 'View'
+}))
+
+vi.mock('./MobileNativeChatView', () => ({ MobileNativeChatView: 'ChatView' }))
+
+function assistantTurn(id: string, text: string): NativeChatMessage {
+  return { id, role: 'assistant', blocks: [{ type: 'text', text }], timestamp: 0, source: 'hook' }
+}
+
+function suppressRendererWarning(): () => void {
+  const original = console.error
+  const spy = vi.spyOn(console, 'error').mockImplementation((...args) => {
+    if (typeof args[0] === 'string' && args[0].includes('react-test-renderer is deprecated')) {
+      return
+    }
+    original(...args)
+  })
+  return () => spy.mockRestore()
+}
+
+/** One render of the route: chat visible or not, the transcript it currently
+ *  holds, and the agent-status stream behind it. */
+type Tick = {
+  show?: boolean
+  messages?: NativeChatMessage[]
+  streamingText?: string
+  streamLive?: boolean
+  identity?: string
+}
+
+function overlayElement(tick: Tick): ReturnType<typeof createElement> {
+  const controller = {
+    showNativeChat: tick.show ?? true,
+    nativeChatSession: { messages: tick.messages ?? [], status: 'ready' },
+    nativeChatAgent: 'claude',
+    nativeChatAgentWorking: tick.streamLive ?? false,
+    nativeChatStreamingText: tick.streamingText,
+    nativeChatStreamLive: tick.streamLive ?? false,
+    nativeChatStreamScopeKey: tick.identity ?? 'tab-a',
+    chatPending: [],
+    chatComposerText: '',
+    setChatComposerText: vi.fn()
+  } as unknown as MobileNativeChatController
+  return createElement(MobileNativeChatOverlay, {
+    controller,
+    images: {} as never,
+    onMicPress: vi.fn(),
+    micActive: false,
+    dictationMode: 'toggle',
+    onMicPressIn: vi.fn(),
+    onMicPressOut: vi.fn(),
+    inputLockReason: null,
+    sendErrorMessage: null,
+    onClearSendError: vi.fn(),
+    keyboardInset: 0
+  })
+}
+
+describe('MobileNativeChatOverlay streaming gate', () => {
+  let renderer: ReactTestRenderer | null = null
+
+  beforeEach(() => {
+    globalThis.IS_REACT_ACT_ENVIRONMENT = true
+  })
+
+  afterEach(() => {
+    act(() => renderer?.unmount())
+    renderer = null
+  })
+
+  async function render(tick: Tick): Promise<void> {
+    const restore = suppressRendererWarning()
+    try {
+      await act(async () => {
+        renderer = create(overlayElement(tick))
+      })
+    } finally {
+      restore()
+    }
+  }
+
+  async function update(tick: Tick): Promise<void> {
+    await act(async () => {
+      renderer?.update(overlayElement(tick))
+    })
+  }
+
+  /** The bubble text handed to the chat list, or `'hidden'` when chat is off. */
+  function streaming(): string | null | 'hidden' {
+    const views = renderer!.root.findAll((node) => node.type === 'ChatView')
+    return views.length === 0 ? 'hidden' : (views[0].props.streaming as string | null)
+  }
+
+  it('keeps streaming a reply that repeats the previous turn as a prefix', async () => {
+    const prior = [assistantTurn('a1', 'The tests pass.')]
+    await render({ messages: prior })
+    expect(streaming()).toBeNull()
+
+    await update({ messages: prior, streamingText: 'The tests', streamLive: true })
+
+    expect(streaming()).toBe('The tests')
+  })
+
+  it('drops the streaming bubble once the reply lands as its own turn', async () => {
+    const prior = [assistantTurn('a1', 'Done.')]
+    await render({ messages: prior })
+    await update({ messages: prior, streamingText: 'Done.', streamLive: true })
+    expect(streaming()).toBe('Done.')
+
+    await update({
+      messages: [...prior, assistantTurn('a2', 'Done.')],
+      streamingText: 'Done.',
+      streamLive: true
+    })
+
+    expect(streaming()).toBeNull()
+  })
+
+  it('keeps the bubble across a peek at the terminal view', async () => {
+    // Toggling to the terminal unmounts the chat list and unsubscribes its
+    // transcript. The gate lives above that boundary, so the baseline survives
+    // and the repeated-prefix reply keeps streaming on the way back.
+    const prior = [assistantTurn('a1', 'Done.')]
+    await render({ messages: prior })
+    await update({ messages: prior, streamingText: 'Done.', streamLive: true })
+    expect(streaming()).toBe('Done.')
+
+    await update({ show: false, messages: [], streamLive: true })
+    expect(streaming()).toBe('hidden')
+    // Back on chat the session withholds its transcript until a fresh read
+    // settles, so the throttled stream text returns a round trip ahead of it.
+    await update({ messages: [], streamLive: true })
+    await update({ messages: [], streamingText: 'Done.', streamLive: true })
+    await update({ messages: prior, streamingText: 'Done.', streamLive: true })
+
+    expect(streaming()).toBe('Done.')
+  })
+
+  it('keeps the bubble across a peek at the terminal taken between turns', async () => {
+    // Same toggle, but taken while idle: the transcript empties before the next
+    // turn starts, so the gate has to reject that empty tail as a baseline.
+    const prior = [assistantTurn('a1', 'Done.')]
+    await render({ messages: prior })
+
+    await update({ show: false, messages: [] })
+    await update({ show: false, messages: [], streamLive: true })
+    await update({ messages: [], streamLive: true })
+    await update({ messages: [], streamingText: 'Done.', streamLive: true })
+    await update({ messages: prior, streamingText: 'Done.', streamLive: true })
+
+    expect(streaming()).toBe('Done.')
+  })
+
+  it('hides a repeated part whose own turn landed during a mid-turn gap', async () => {
+    // Between parts the status frame carries no assistant text (a tool call), so
+    // the stream goes textless while the turn is still live and the part that
+    // just finished lands in the transcript. Re-anchoring on that tick would
+    // adopt it as history and render it a second time.
+    const prior = [assistantTurn('a1', 'Done.')]
+    await render({ messages: prior })
+    await update({ messages: prior, streamingText: 'Done.', streamLive: true })
+    expect(streaming()).toBe('Done.')
+
+    const landed = [...prior, assistantTurn('a2', 'Done.')]
+    await update({ messages: landed, streamLive: true })
+    await update({ messages: landed, streamingText: 'Done.', streamLive: true })
+
+    expect(streaming()).toBeNull()
+  })
+
+  it("does not carry one chat's baseline into another stream identity", async () => {
+    const prior = [assistantTurn('a1', 'Shared answer text')]
+    await render({ messages: prior, identity: 'tab-a' })
+
+    await update({
+      messages: prior,
+      streamingText: 'Shared answer',
+      streamLive: true,
+      identity: 'tab-b'
+    })
+
+    expect(streaming()).toBeNull()
+  })
+})

mobile/src/session/MobileNativeChatOverlay.tsx

@@ -1,7 +1,10 @@
+import { useMemo } from 'react'
 import { StyleSheet, View } from 'react-native'
 import { MobileNativeChatView, type MobileNativeChatInputLockReason } from './MobileNativeChatView'
+import { foldMobileNativeChatMessages } from './mobile-native-chat-render-data'
 import type { MobileNativeChatImageAttachments } from './use-mobile-native-chat-image-attachments'
 import type { MobileNativeChatController } from './use-mobile-native-chat-controller'
+import { useMobileNativeChatStreamingBubble } from './use-mobile-native-chat-streaming-bubble'
 
 type Props = {
   controller: MobileNativeChatController
@@ -22,7 +25,9 @@ type Props = {
 }
 
 /** Keeps the terminal mounted underneath chat so its PTY subscription survives
- *  view toggles while the native surface owns the visible composer. */
+ *  view toggles while the native surface owns the visible composer. Also owns
+ *  the streaming gate: this component stays mounted across those toggles, while
+ *  the chat list below it does not. */
 export function MobileNativeChatOverlay({
   controller,
   images,
@@ -36,19 +41,27 @@ export function MobileNativeChatOverlay({
   onClearSendError,
   keyboardInset
 }: Props): React.JSX.Element | null {
+  const session = controller.nativeChatSession
+  const folded = useMemo(() => foldMobileNativeChatMessages(session.messages), [session.messages])
+  const streaming = useMobileNativeChatStreamingBubble(
+    folded,
+    controller.nativeChatStreamingText,
+    controller.nativeChatStreamScopeKey,
+    controller.nativeChatStreamLive
+  )
   if (!controller.showNativeChat) {
     return null
   }
-  const session = controller.nativeChatSession
   return (
     <View style={styles.overlay}>
       <MobileNativeChatView
         messages={session.messages}
+        folded={folded}
         status={session.status}
         error={session.error}
         agent={controller.nativeChatAgent}
         agentWorking={controller.nativeChatAgentWorking}
-        streamingText={controller.nativeChatStreamingText}
+        streaming={streaming}
         onStop={controller.handleNativeChatStop}
         ask={controller.nativeChatAsk}
         onAnswerAsk={controller.handleNativeChatAnswerAsk}

mobile/src/session/MobileNativeChatView.test.ts

@@ -1,6 +1,7 @@
 import { createElement } from 'react'
 import { act, create, type ReactTestInstance, type ReactTestRenderer } from 'react-test-renderer'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type { NativeChatMessage } from '../../../src/shared/native-chat-types'
 import { MobileNativeChatView } from './MobileNativeChatView'
 
 vi.mock('react-native', () => ({
@@ -58,6 +59,9 @@ vi.mock('./MobileNativeChatComposer', async () => {
 })
 
 type Overrides = {
+  messages?: Parameters<typeof MobileNativeChatView>[0]['messages']
+  folded?: Parameters<typeof MobileNativeChatView>[0]['folded']
+  streaming?: string | null
   sendErrorMessage?: string | null
   onClearSendError?: () => void
   inputLockReason?: 'disconnected' | 'waiting' | null
@@ -75,7 +79,25 @@ function suppressRendererWarning(): () => void {
   return () => spy.mockRestore()
 }
 
-describe('MobileNativeChatView send-error banner', () => {
+function assistantTurn(id: string, text: string): NativeChatMessage {
+  return { id, role: 'assistant', blocks: [{ type: 'text', text }], timestamp: 0, source: 'hook' }
+}
+
+function chatViewElement(overrides: Overrides): ReturnType<typeof createElement> {
+  return createElement(MobileNativeChatView, {
+    messages: [],
+    folded: [],
+    status: 'ready',
+    streaming: null,
+    onSend: vi.fn().mockResolvedValue(true),
+    pending: [],
+    composerText: '',
+    onComposerTextChange: vi.fn(),
+    ...overrides
+  })
+}
+
+describe('MobileNativeChatView', () => {
   let renderer: ReactTestRenderer | null = null
 
   beforeEach(() => {
@@ -91,23 +113,25 @@ describe('MobileNativeChatView send-error banner', () => {
     const restore = suppressRendererWarning()
     try {
       await act(async () => {
-        renderer = create(
-          createElement(MobileNativeChatView, {
-            messages: [],
-            status: 'ready',
-            onSend: overrides.onSend ?? vi.fn().mockResolvedValue(true),
-            pending: [],
-            composerText: '',
-            onComposerTextChange: vi.fn(),
-            ...overrides
-          })
-        )
+        renderer = create(chatViewElement(overrides))
       })
     } finally {
       restore()
     }
   }
 
+  async function update(overrides: Overrides = {}): Promise<void> {
+    await act(async () => {
+      renderer?.update(chatViewElement(overrides))
+    })
+  }
+
+  /** Ids of the rows the list is currently rendering. */
+  function listIds(): string[] {
+    const list = renderer!.root.find((node) => node.type === 'FlatList')
+    return (list.props.data as { id: string }[]).map((row) => row.id)
+  }
+
   function banners(): ReactTestInstance[] {
     return renderer!.root.findAll((node) => node.props.accessibilityRole === 'alert')
   }
@@ -161,4 +185,16 @@ describe('MobileNativeChatView send-error banner', () => {
 
     expect(onClearSendError).toHaveBeenCalledOnce()
   })
+
+  // The gate that decides `streaming` lives in MobileNativeChatOverlay, which
+  // outlives this view; see MobileNativeChatOverlay.test.ts.
+  it('appends the gated streaming bubble after the folded transcript', async () => {
+    const folded = [assistantTurn('a1', 'The tests pass.')]
+    await render({ folded })
+    expect(listIds()).toEqual(['a1'])
+
+    await update({ folded, streaming: 'The tests' })
+
+    expect(listIds()).toEqual(['a1', 'streaming'])
+  })
 })

mobile/src/session/MobileNativeChatView.tsx

@@ -16,7 +16,6 @@ import { colors } from '../theme/mobile-theme'
 import { styles } from './mobile-native-chat-view-styles'
 import {
   buildMobileNativeChatTransientData,
-  foldMobileNativeChatMessages,
   mobileNativeChatEmptyState,
   type MobileNativeChatPendingItem
 } from './mobile-native-chat-render-data'
@@ -39,7 +38,10 @@ import type { MobileNativeChatStatus } from './use-mobile-native-chat-session'
 export type MobileNativeChatInputLockReason = 'disconnected' | 'waiting'
 
 type Props = {
+  /** Raw transcript, only for telling "still loading" from "loaded and empty". */
   messages: NativeChatMessage[]
+  /** `messages` with noise stripped and tool turns folded in, from the overlay. */
+  folded: NativeChatMessage[]
   status: MobileNativeChatStatus
   error?: string
   /** Resolved agent for this chat; names the empty-state copy (desktop parity). */
@@ -47,9 +49,9 @@ type Props = {
   agentWorking?: boolean
   /** Interrupt the agent mid-turn (shown as a Stop button on the working bar). */
   onStop?: () => void
-  /** Live partial assistant text while a turn is still streaming (from the agent
-   *  status hook). Shown as an in-progress bubble until the transcript catches up. */
-  streamingText?: string
+  /** Live partial assistant text to show as an in-progress bubble, already gated
+   *  by the overlay against the transcript catching up. */
+  streaming: string | null
   hasMore?: boolean
   loadingEarlier?: boolean
   onLoadEarlier?: () => void
@@ -102,12 +104,13 @@ type Props = {
 
 export function MobileNativeChatView({
   messages,
+  folded,
   status,
   error,
   agent,
   agentWorking,
   onStop,
-  streamingText,
+  streaming,
   hasMore,
   loadingEarlier,
   onLoadEarlier,
@@ -165,10 +168,9 @@ export function MobileNativeChatView({
   // `data` is the list source: folded transcript + synthetic streaming bubble +
   // route-owned optimistic queued messages. Memoize on the same deps so the
   // downstream autoscroll effects/`renderItem` keep referential stability.
-  const foldedMessages = useMemo(() => foldMobileNativeChatMessages(messages), [messages])
   const { data } = useMemo(
-    () => buildMobileNativeChatTransientData({ folded: foldedMessages, streamingText, pending }),
-    [foldedMessages, streamingText, pending]
+    () => buildMobileNativeChatTransientData({ folded, streaming, pending }),
+    [folded, streaming, pending]
   )
 
   // Follow the tail as the conversation grows and keep the newest message above

mobile/src/session/mobile-native-chat-open-file.test.ts

@@ -36,6 +36,7 @@ describe('resolveMobileNativeChatWorktreePath', () => {
       .mockResolvedValueOnce({
         ok: true,
         result: {
+          worktree: 'sibling-worktree',
           exists: true,
           isDirectory: false,
           openTarget: { kind: 'worktree-file', relativePath: 'src/app.ts' }
@@ -51,7 +52,7 @@ describe('resolveMobileNativeChatWorktreePath', () => {
     })
 
     expect(sendRequest).toHaveBeenLastCalledWith('files.open', {
-      worktree: 'id:worktree',
+      worktree: 'id:sibling-worktree',
       relativePath: 'src/app.ts'
     })
   })

mobile/src/session/mobile-native-chat-open-file.ts

@@ -1,12 +1,17 @@
 import type { RuntimeTerminalPathResolution } from '../../../src/shared/runtime-types'
 import type { RpcClient } from '../transport/rpc-client'
 
-export async function resolveMobileNativeChatWorktreePath(args: {
+type MobileNativeChatWorktreeTarget = {
+  worktreeId: string
+  relativePath: string
+}
+
+async function resolveMobileNativeChatWorktreeTarget(args: {
   client: RpcClient
   worktreeId: string
   pathText: string
   terminal: string | null
-}): Promise<string | null> {
+}): Promise<MobileNativeChatWorktreeTarget | null> {
   try {
     const response = await args.client.sendRequest('files.resolveTerminalPath', {
       worktree: `id:${args.worktreeId}`,
@@ -20,28 +25,39 @@ export async function resolveMobileNativeChatWorktreePath(args: {
     if (!resolved.exists || resolved.isDirectory) {
       return null
     }
-    return resolved.openTarget?.kind === 'worktree-file'
-      ? resolved.openTarget.relativePath
-      : (resolved.relativePath ?? null)
+    const relativePath =
+      resolved.openTarget?.kind === 'worktree-file'
+        ? resolved.openTarget.relativePath
+        : (resolved.relativePath ?? null)
+    return relativePath
+      ? { worktreeId: resolved.worktree?.trim() || args.worktreeId, relativePath }
+      : null
   } catch {
-    // Callers fire-and-forget file opens; a disconnect/timeout must not become
-    // an unhandled rejection.
     return null
   }
 }
 
+export async function resolveMobileNativeChatWorktreePath(args: {
+  client: RpcClient
+  worktreeId: string
+  pathText: string
+  terminal: string | null
+}): Promise<string | null> {
+  return (await resolveMobileNativeChatWorktreeTarget(args))?.relativePath ?? null
+}
+
 export async function openMobileNativeChatFile(args: {
   client: RpcClient
   worktreeId: string
   pathText: string
   terminal: string | null
 }): Promise<void> {
-  const relativePath = await resolveMobileNativeChatWorktreePath(args)
-  if (relativePath) {
+  const target = await resolveMobileNativeChatWorktreeTarget(args)
+  if (target) {
     try {
       await args.client.sendRequest('files.open', {
-        worktree: `id:${args.worktreeId}`,
-        relativePath
+        worktree: `id:${target.worktreeId}`,
+        relativePath: target.relativePath
       })
     } catch {
       // Best-effort open; failures surface as a no-op rather than an

mobile/src/session/mobile-native-chat-permission-send.test.ts

@@ -13,6 +13,11 @@ import {
   markMobileNativeChatInputStale,
   resetMobileNativeChatStaleInputForTests
 } from './mobile-native-chat-stale-input'
+import {
+  acquireMobileNativeChatTerminalWrite,
+  releaseMobileNativeChatTerminalWrite,
+  resetMobileNativeChatTerminalWritesForTests
+} from './mobile-native-chat-terminal-write-lock'
 
 describe('sendMobileNativeChatPermissionResponse', () => {
   it('writes an approval as raw bytes without appending Return', async () => {
@@ -64,6 +69,7 @@ describe('useMobileNativeChatPermissionSend', () => {
   beforeEach(() => {
     globalThis.IS_REACT_ACT_ENVIRONMENT = true
     resetMobileNativeChatStaleInputForTests()
+    resetMobileNativeChatTerminalWritesForTests()
   })
 
   afterEach(() => {
@@ -102,4 +108,42 @@ describe('useMobileNativeChatPermissionSend', () => {
     expect(sendRequest.mock.calls[0]?.[1]).toMatchObject({ text: '1', enter: false })
     expect(isMobileNativeChatInputStale('terminal')).toBe(true)
   })
+
+  it('rejects a choice while another composed write holds the terminal, then recovers', async () => {
+    const onSendError = vi.fn()
+    const sendRequest = vi.fn().mockResolvedValue({
+      ok: true,
+      result: { send: { handle: 'terminal', accepted: true, bytesWritten: 1 } }
+    })
+    function Harness(): null {
+      respond = useMobileNativeChatPermissionSend({
+        client: { sendRequest } as unknown as RpcClient,
+        enabled: true,
+        handleRef: { current: 'terminal' },
+        deviceTokenRef: { current: null },
+        onSendError
+      })
+      return null
+    }
+    act(() => {
+      renderer = create(createElement(Harness))
+    })
+
+    // An image paste sequence is mid-flight into the same PTY: the choice
+    // keystroke must not interleave into it.
+    expect(acquireMobileNativeChatTerminalWrite('terminal')).toBe(true)
+    await act(async () => {
+      await expect(respond?.('1')).resolves.toBe(false)
+    })
+    expect(sendRequest).not.toHaveBeenCalled()
+    expect(onSendError).toHaveBeenCalledWith('Response not sent')
+
+    releaseMobileNativeChatTerminalWrite('terminal')
+    await act(async () => {
+      await expect(respond?.('1')).resolves.toBe(true)
+    })
+    // The choice released its own hold on the way out.
+    expect(acquireMobileNativeChatTerminalWrite('terminal')).toBe(true)
+    releaseMobileNativeChatTerminalWrite('terminal')
+  })
 })

mobile/src/session/mobile-native-chat-permission-send.ts

@@ -4,6 +4,10 @@ import {
   sendMobileNativeChatMessageWithOutcome,
   type MobileNativeChatSendOutcome
 } from './mobile-native-chat-send'
+import {
+  acquireMobileNativeChatTerminalWrite,
+  releaseMobileNativeChatTerminalWrite
+} from './mobile-native-chat-terminal-write-lock'
 
 export function sendMobileNativeChatPermissionResponse(args: {
   client: RpcClient
@@ -36,15 +40,26 @@ export function useMobileNativeChatPermissionSend(args: {
         args.onSendError('Response not sent (disconnected)')
         return false
       }
+      // A choice keystroke must not interleave into a mid-flight composed write
+      // (image paste, paced answer) on the same PTY.
+      if (!acquireMobileNativeChatTerminalWrite(terminal)) {
+        args.onSendError('Response not sent')
+        return false
+      }
       // No stale-input heal here (unlike the text/ask sends): a choice is an
       // `enter: false` key for an active overlay that swallows the clear, so it
       // would consume the marker still protecting the next real message.
-      const outcome = await sendMobileNativeChatPermissionResponse({
-        client: args.client,
-        terminal,
-        deviceToken: args.deviceTokenRef.current,
-        text
-      })
+      let outcome: MobileNativeChatSendOutcome
+      try {
+        outcome = await sendMobileNativeChatPermissionResponse({
+          client: args.client,
+          terminal,
+          deviceToken: args.deviceTokenRef.current,
+          text
+        })
+      } finally {
+        releaseMobileNativeChatTerminalWrite(terminal)
+      }
       if (outcome === 'unknown') {
         // Why: the response may have been delivered (ack lost / path cutover) —
         // a definite "not sent" would invite a double answer.

mobile/src/session/mobile-native-chat-render-data.test.ts

@@ -1,7 +1,8 @@
 import { describe, expect, it } from 'vitest'
 import type { NativeChatMessage } from '../../../src/shared/native-chat-types'
 import {
-  buildMobileNativeChatData,
+  buildMobileNativeChatTransientData,
+  foldMobileNativeChatMessages,
   mobileNativeChatEmptyState
 } from './mobile-native-chat-render-data'
 
@@ -50,13 +51,22 @@ describe('mobileNativeChatEmptyState', () => {
   })
 })
 
-describe('buildMobileNativeChatData', () => {
+/** Mirrors the view: fold the raw transcript, then assemble the list. */
+function build(
+  messages: NativeChatMessage[],
+  streaming: string | null,
+  pending: Parameters<typeof buildMobileNativeChatTransientData>[0]['pending']
+): NativeChatMessage[] {
+  return buildMobileNativeChatTransientData({
+    folded: foldMobileNativeChatMessages(messages),
+    streaming,
+    pending
+  }).data
+}
+
+describe('buildMobileNativeChatTransientData', () => {
   it('appends pending optimistic messages at the tail as user turns', () => {
-    const { data } = buildMobileNativeChatData({
-      messages: [assistant('a1', 'hello')],
-      streamingText: undefined,
-      pending: [{ id: 'p1', text: 'queued' }]
-    })
+    const data = build([assistant('a1', 'hello')], null, [{ id: 'p1', text: 'queued' }])
     const last = data[data.length - 1]
     expect(last.id).toBe('p1')
     expect(last.role).toBe('user')
@@ -64,10 +74,9 @@ describe('buildMobileNativeChatData', () => {
   })
 
   it('renders a pending send with images as text followed by image-ref thumbnails', () => {
-    const { data } = buildMobileNativeChatData({
-      messages: [],
-      pending: [{ id: 'p1', text: 'look', images: ['file:///a.jpg', 'file:///b.jpg'] }]
-    })
+    const data = build([], null, [
+      { id: 'p1', text: 'look', images: ['file:///a.jpg', 'file:///b.jpg'] }
+    ])
     const last = data[data.length - 1]
     expect(last.role).toBe('user')
     expect(last.blocks).toEqual([
@@ -78,10 +87,7 @@ describe('buildMobileNativeChatData', () => {
   })
 
   it('renders an image-only pending send (no text) as just the thumbnail', () => {
-    const { data } = buildMobileNativeChatData({
-      messages: [],
-      pending: [{ id: 'p1', text: '', images: ['file:///a.jpg'] }]
-    })
+    const data = build([], null, [{ id: 'p1', text: '', images: ['file:///a.jpg'] }])
     expect(data[data.length - 1].blocks).toEqual([{ type: 'image-ref', url: 'file:///a.jpg' }])
   })
 
@@ -89,14 +95,15 @@ describe('buildMobileNativeChatData', () => {
     // Claude records an attached image as `[Image: source: /path]` + an
     // `[Image #1] `-prefixed caption turn; the fold must merge them into one
     // user turn with an image-ref block instead of showing raw marker text.
-    const { data } = buildMobileNativeChatData({
-      messages: [
+    const data = build(
+      [
         user('u1', '[Image: source: /tmp/a.png]'),
         user('u2', '[Image #1] look at this'),
         assistant('a1', 'nice photo')
       ],
-      pending: []
-    })
+      null,
+      []
+    )
     const merged = data.find((message) => message.role === 'user')
     expect(merged?.blocks).toEqual([
       { type: 'image-ref', path: '/tmp/a.png' },
@@ -105,49 +112,20 @@ describe('buildMobileNativeChatData', () => {
   })
 
   it('renders a lone image marker turn (no caption) as an image-ref block', () => {
-    const { data } = buildMobileNativeChatData({
-      messages: [user('u1', '[Image: source: /tmp/a.png]')],
-      pending: []
-    })
+    const data = build([user('u1', '[Image: source: /tmp/a.png]')], null, [])
     expect(data[0]?.blocks).toEqual([{ type: 'image-ref', path: '/tmp/a.png' }])
   })
 
-  it('adds a synthetic streaming bubble while the partial text leads the transcript', () => {
-    const { streaming, data } = buildMobileNativeChatData({
-      messages: [user('u1', 'hi')],
-      streamingText: 'thinking out loud',
-      pending: []
-    })
-    expect(streaming).toBe('thinking out loud')
-    expect(data.some((m) => m.id === 'streaming')).toBe(true)
+  it('appends a synthetic bubble for gated streaming text, between transcript and pending', () => {
+    // Whether text streams at all is the gate's call
+    // (`mobile-native-chat-streaming-gate.test.ts`); this only places it.
+    const data = build([user('u1', 'hi')], 'thinking out loud', [{ id: 'p1', text: 'queued' }])
+    expect(data.map((message) => message.id)).toEqual(['u1', 'streaming', 'p1'])
+    expect(data[1].blocks).toEqual([{ type: 'text', text: 'thinking out loud' }])
   })
 
-  it('shows a short new streaming reply even after a longer previous turn', () => {
-    // The last folded turn is a long completed reply; a short new stream must not
-    // be suppressed just for being shorter than the prior turn.
-    const { streaming, data } = buildMobileNativeChatData({
-      messages: [assistant('a1', 'This is a long completed previous answer that ran on a while')],
-      streamingText: 'Ok',
-      pending: []
-    })
-    expect(streaming).toBe('Ok')
-    expect(data.some((m) => m.id === 'streaming')).toBe(true)
-  })
-
-  it('drops the streaming bubble once the real assistant turn already contains it', () => {
-    const { streaming, data } = buildMobileNativeChatData({
-      messages: [assistant('a1', 'done answer')],
-      streamingText: 'done',
-      pending: []
-    })
-    expect(streaming).toBeNull()
-    expect(data.some((m) => m.id === 'streaming')).toBe(false)
-  })
-
-  it('returns no streaming bubble for empty/whitespace streaming text', () => {
-    expect(
-      buildMobileNativeChatData({ messages: [], streamingText: '   ', pending: [] }).streaming
-    ).toBeNull()
-    expect(buildMobileNativeChatData({ messages: [], pending: [] }).streaming).toBeNull()
+  it('omits the bubble when the gate withheld the streaming text', () => {
+    const data = build([assistant('a1', 'done answer')], null, [])
+    expect(data.some((message) => message.id === 'streaming')).toBe(false)
   })
 })

mobile/src/session/mobile-native-chat-render-data.ts

@@ -43,41 +43,25 @@ export type MobileNativeChatPendingItem = {
   images?: string[]
 }
 
-/** Derive the list data from the raw transcript: fold tool turns into the
- *  assistant turn, optionally append a synthetic streaming bubble, then the
- *  route-owned optimistic "queued" messages at the tail. Returns the
- *  intermediate `folded`/`streaming` so the caller can memoize on them. */
-export function buildMobileNativeChatData({
-  messages,
-  streamingText,
-  pending
-}: {
-  messages: NativeChatMessage[]
-  streamingText?: string
-  pending: MobileNativeChatPendingItem[]
-}): { folded: NativeChatMessage[]; streaming: string | null; data: NativeChatMessage[] } {
-  const folded = foldMobileNativeChatMessages(messages)
-  return buildMobileNativeChatTransientData({ folded, streamingText, pending })
-}
-
 export function foldMobileNativeChatMessages(messages: NativeChatMessage[]): NativeChatMessage[] {
   // Normalize first (desktop assembler parity): image marker turns fold into
   // image-ref blocks instead of rendering as raw `[Image: …]` text.
   return foldToolMessages(stripNoiseMessages(normalizeImageTranscriptMessages(messages)))
 }
 
+/** Assemble the list data the chat renders: the folded transcript, then a
+ *  synthetic bubble for the streaming text the gate let through, then the
+ *  route-owned optimistic "queued" messages at the tail. */
 export function buildMobileNativeChatTransientData({
   folded,
-  streamingText,
+  streaming,
   pending
 }: {
   folded: NativeChatMessage[]
-  streamingText?: string
+  /** Streaming bubble text, already gated by `deriveMobileNativeChatStreaming`. */
+  streaming: string | null
   pending: MobileNativeChatPendingItem[]
 }): { folded: NativeChatMessage[]; streaming: string | null; data: NativeChatMessage[] } {
-  // Only show the streaming bubble while its text leads the transcript — once the
-  // real assistant turn lands with the same text, drop the synthetic one.
-  const streaming = deriveStreaming(folded, streamingText)
   const data: NativeChatMessage[] = [
     ...folded,
     ...(streaming
@@ -106,26 +90,3 @@ export function buildMobileNativeChatTransientData({
   ]
   return { folded, streaming, data }
 }
-
-function deriveStreaming(folded: NativeChatMessage[], streamingText?: string): string | null {
-  const text = streamingText?.trim()
-  if (!text) {
-    return null
-  }
-  const last = folded[folded.length - 1]
-  const lastText =
-    last?.role === 'assistant'
-      ? last.blocks
-          .filter((b) => b.type === 'text')
-          .map((b) => (b.type === 'text' ? b.text : ''))
-          .join('')
-          .trim()
-      : ''
-  // Hide the synthetic bubble only once the real turn has landed leading with the
-  // streamed text. A bare length compare would suppress a short new reply behind a
-  // longer previous turn; a completed prior turn won't start with the new prefix.
-  if (lastText.startsWith(text)) {
-    return null
-  }
-  return text
-}

mobile/src/session/mobile-native-chat-streaming-gate.test.ts

@@ -0,0 +1,238 @@
+import { describe, expect, it } from 'vitest'
+import type { NativeChatMessage } from '../../../src/shared/native-chat-types'
+import {
+  createMobileNativeChatStreamingGate,
+  deriveMobileNativeChatStreaming,
+  type MobileNativeChatStreamingGate
+} from './mobile-native-chat-streaming-gate'
+
+function assistant(id: string, text: string): NativeChatMessage {
+  return {
+    id,
+    role: 'assistant',
+    blocks: [{ type: 'text', text }],
+    timestamp: 0,
+    source: 'transcript'
+  }
+}
+
+/** Run a sequence of (folded, streamingText) ticks through one gate. */
+function run(ticks: { folded: NativeChatMessage[]; text?: string; live?: boolean }[]): {
+  gate: MobileNativeChatStreamingGate
+  results: (string | null)[]
+} {
+  let gate = createMobileNativeChatStreamingGate()
+  const results: (string | null)[] = []
+  for (const tick of ticks) {
+    const step = deriveMobileNativeChatStreaming(gate, tick.folded, tick.text, {
+      streamLive: tick.live
+    })
+    gate = step.gate
+    results.push(step.streaming)
+  }
+  return { gate, results }
+}
+
+describe('deriveMobileNativeChatStreaming', () => {
+  it('shows a genuine reply that repeats the previous turn as a prefix', () => {
+    const prior = [assistant('a1', 'The tests pass.')]
+    const { results } = run([
+      { folded: prior }, // idle tick anchors the pre-stream tail
+      { folded: prior, text: 'The' },
+      { folded: prior, text: 'The tests' },
+      { folded: prior, text: 'The tests pass.' }
+    ])
+    expect(results).toEqual([null, 'The', 'The tests', 'The tests pass.'])
+  })
+
+  it('hides the bubble once the real turn lands leading with the streamed text', () => {
+    const prior = [assistant('a1', 'earlier turn')]
+    const landed = [...prior, assistant('a2', 'fresh answer with a tail')]
+    const { results } = run([
+      { folded: prior },
+      { folded: prior, text: 'fresh answer' },
+      { folded: landed, text: 'fresh answer' }
+    ])
+    expect(results).toEqual([null, 'fresh answer', null])
+  })
+
+  it('suppresses an identical repeated reply once its own turn lands', () => {
+    const prior = [assistant('a1', 'Done.')]
+    const landed = [...prior, assistant('a2', 'Done.')]
+    const { results } = run([
+      { folded: prior },
+      { folded: prior, text: 'Done.' }, // repeated-prefix reply stays visible
+      { folded: landed, text: 'Done.' } // its own turn landed — hide
+    ])
+    expect(results).toEqual([null, 'Done.', null])
+  })
+
+  it('keeps hiding for the rest of a segment after the turn lands', () => {
+    const prior = [assistant('a1', 'earlier')]
+    const landed = [...prior, assistant('a2', 'answer body')]
+    const { results } = run([
+      { folded: prior },
+      { folded: prior, text: 'answer' },
+      { folded: landed, text: 'answer' },
+      { folded: landed, text: 'answer bo' }
+    ])
+    expect(results).toEqual([null, 'answer', null, null])
+  })
+
+  it('keeps the segment baseline through textless ticks while the turn is live', () => {
+    // Chat is hidden mid-stream: the transcript unsubscribes and the status
+    // stops reaching the gate, but the turn has not ended. Coming back, the
+    // stream text returns before the re-read transcript does.
+    const prior = [assistant('a1', 'Done.')]
+    const { results } = run([
+      { folded: prior },
+      { folded: prior, text: 'Done.', live: true },
+      { folded: [], live: true },
+      { folded: [], text: 'Done.', live: true },
+      { folded: prior, text: 'Done.', live: true }
+    ])
+    expect(results).toEqual([null, 'Done.', null, 'Done.', 'Done.'])
+  })
+
+  it('still hides after a hidden gap once the reply landed as its own turn', () => {
+    const prior = [assistant('a1', 'Done.')]
+    const landed = [...prior, assistant('a2', 'Done.')]
+    const { results } = run([
+      { folded: prior },
+      { folded: prior, text: 'Done.', live: true },
+      { folded: [], live: true },
+      { folded: landed, text: 'Done.', live: true }
+    ])
+    expect(results).toEqual([null, 'Done.', null, null])
+  })
+
+  it('hides a reply whose own turn landed before its status text arrived', () => {
+    // The pane stays `working` past the reply (a subagent or a background task
+    // is still live), and the transcript push beats the throttled status text.
+    // Anchoring on that textless tick would adopt the reply as pre-stream
+    // history and render it a second time as a bubble.
+    const prior = [assistant('a1', 'Done.')]
+    const landed = [...prior, assistant('a2', 'Done.')]
+    const { results } = run([
+      { folded: prior, live: true },
+      { folded: landed, live: true },
+      { folded: landed, text: 'Done.', live: true },
+      { folded: landed, text: 'Done.', live: true }
+    ])
+    expect(results).toEqual([null, null, null, null])
+  })
+
+  it('keeps the pre-stream baseline across a hidden gap taken between turns', () => {
+    // Peeking at the terminal while idle tears the transcript down to empty. An
+    // empty tail is not history: adopting it strands the baseline and swallows
+    // the repeated-prefix reply that arrives next.
+    const prior = [assistant('a1', 'Done.')]
+    const { results } = run([
+      { folded: prior },
+      { folded: [] },
+      { folded: [], live: true },
+      { folded: prior, text: 'Done.', live: true }
+    ])
+    expect(results).toEqual([null, null, null, 'Done.'])
+  })
+
+  it('anchors on the first tail it sees when mounted mid-turn', () => {
+    // Opening a workspace whose agent is already working: that first textless
+    // tick is the only pre-stream history the gate will ever get.
+    const prior = [assistant('a1', 'Done.')]
+    const { results } = run([
+      { folded: prior, live: true },
+      { folded: prior, text: 'Done.', live: true }
+    ])
+    expect(results).toEqual([null, 'Done.'])
+  })
+
+  it('anchors on a textless tick once the turn ends', () => {
+    const prior = [assistant('a1', 'first answer')]
+    const landed = [...prior, assistant('a2', 'second answer')]
+    const { results } = run([
+      { folded: prior },
+      { folded: prior, text: 'second answer', live: true },
+      { folded: landed },
+      { folded: landed, text: 'second answer', live: true }
+    ])
+    expect(results).toEqual([null, 'second answer', null, 'second answer'])
+  })
+
+  it('does not treat the previous turn as a segment start after re-anchoring', () => {
+    // The textless anchor clears the remembered text too. Keeping it would read
+    // the next turn's opener as a new segment, re-anchor onto the reply that
+    // just landed, and render it a second time as a bubble.
+    const prior = [assistant('a1', 'context')]
+    const firstLanded = [...prior, assistant('a2', 'Alpha done')]
+    const secondLanded = [...firstLanded, assistant('a3', 'Beta reply')]
+    const { results } = run([
+      { folded: prior },
+      { folded: prior, text: 'Alpha', live: true },
+      { folded: firstLanded }, // turn ended — re-anchor onto a2
+      { folded: secondLanded, text: 'Beta', live: true } // a3 already landed
+    ])
+    expect(results).toEqual([null, 'Alpha', null, null])
+  })
+
+  it('re-anchors when a new reply part replaces the stream mid-turn', () => {
+    const prior = [assistant('a1', 'context')]
+    const partOneLanded = [...prior, assistant('a2', 'part one full text')]
+    const { results } = run([
+      { folded: prior },
+      { folded: prior, text: 'part one' },
+      { folded: partOneLanded, text: 'part one' }, // caught up — hide
+      // Part two is not an extension of part one: new segment, new baseline.
+      { folded: partOneLanded, text: 'part' }
+    ])
+    expect(results).toEqual([null, 'part one', null, 'part'])
+  })
+
+  it('falls back to suppress-on-prefix when text arrives on the first tick', () => {
+    // No tail ever observed before the text: a duplicate bubble is worse than
+    // briefly hiding a mount-coincident repeated reply.
+    const landed = [assistant('a1', 'flushed part still streaming in status')]
+    const { results } = run([{ folded: landed, text: 'flushed part' }])
+    expect(results).toEqual([null])
+  })
+
+  it('is idempotent for a repeated tick', () => {
+    const prior = [assistant('a1', 'The tests pass.')]
+    const first = run([{ folded: prior }, { folded: prior, text: 'The tests' }])
+    const again = deriveMobileNativeChatStreaming(first.gate, prior, 'The tests')
+    expect(again.streaming).toBe('The tests')
+    expect(again.gate).toBe(first.gate)
+  })
+
+  it('drops a prior chat baseline when the stream identity changes', () => {
+    // The other chat's tail must not license showing a bubble here — a swapped
+    // scope resets to the mid-stream fallback rather than reusing its baseline.
+    const repeatedId = [assistant('a1', 'new answer landed')]
+    let gate = createMobileNativeChatStreamingGate('tab-a')
+    gate = deriveMobileNativeChatStreaming(gate, repeatedId, undefined, { scopeKey: 'tab-a' }).gate
+
+    const switched = deriveMobileNativeChatStreaming(gate, repeatedId, 'new answer', {
+      scopeKey: 'tab-b'
+    })
+
+    expect(switched.streaming).toBeNull()
+    expect(switched.gate.scopeKey).toBe('tab-b')
+    expect(switched.gate.baselineTailId).toBeNull()
+  })
+
+  it('returns null for empty or whitespace streaming text', () => {
+    const prior = [assistant('a1', 'x')]
+    expect(run([{ folded: prior, text: '   ' }]).results).toEqual([null])
+    expect(run([{ folded: prior }]).results).toEqual([null])
+  })
+
+  it('shows the first reply of an empty chat and hides it once the turn lands', () => {
+    const landed = [assistant('a1', 'Hello there')]
+    const { results } = run([
+      { folded: [] },
+      { folded: [], text: 'Hello' },
+      { folded: landed, text: 'Hello' }
+    ])
+    expect(results).toEqual([null, 'Hello', null])
+  })
+})

mobile/src/session/mobile-native-chat-streaming-gate.ts

@@ -0,0 +1,93 @@
+import type { NativeChatMessage } from '../../../src/shared/native-chat-types'
+
+/** Decides whether the live streaming preview should render as a synthetic
+ *  bubble. Text alone can't tell "the transcript caught up with this stream"
+ *  from "a new reply happens to repeat the previous turn's prefix" — the old
+ *  prefix test swallowed genuine repeated-prefix replies. The gate keeps the
+ *  transcript tail observed when the current stream segment began: the bubble
+ *  hides only when the tail MOVED during the segment and leads with the
+ *  streamed text (the real turn landed), never for an older identical turn. */
+export type MobileNativeChatStreamingGate = {
+  /** Chat/session identity this baseline belongs to. */
+  scopeKey: string | null
+  /** Streamed text seen on the previous tick ('' while idle). */
+  prevText: string
+  /** Folded tail message id when the current segment began; null while the
+   *  gate has never observed a transcript tail (text arrived on its very first
+   *  tick), where the legacy suppress-on-prefix rule applies. */
+  baselineTailId: string | null
+}
+
+export function createMobileNativeChatStreamingGate(
+  scopeKey: string | null = null
+): MobileNativeChatStreamingGate {
+  return { scopeKey, prevText: '', baselineTailId: null }
+}
+
+function assistantTailText(tail: NativeChatMessage | undefined): string {
+  if (!tail || tail.role !== 'assistant') {
+    return ''
+  }
+  return tail.blocks
+    .filter((block) => block.type === 'text')
+    .map((block) => (block.type === 'text' ? block.text : ''))
+    .join('')
+    .trim()
+}
+
+// Reuses the incoming gate object when nothing moved, so a caller can detect
+// "no change" by reference (and a render-time state adjustment can settle).
+function advanceGate(
+  gate: MobileNativeChatStreamingGate,
+  prevText: string,
+  baselineTailId: string | null
+): MobileNativeChatStreamingGate {
+  return gate.prevText === prevText && gate.baselineTailId === baselineTailId
+    ? gate
+    : { ...gate, prevText, baselineTailId }
+}
+
+/** Advance the gate one tick and derive the visible streaming text (null hides
+ *  the bubble). Pure and idempotent for a repeated (text, tail) pair, so a
+ *  re-render without new data cannot flip the decision. */
+export function deriveMobileNativeChatStreaming(
+  gate: MobileNativeChatStreamingGate,
+  folded: readonly NativeChatMessage[],
+  streamingText: string | undefined,
+  options: {
+    scopeKey?: string | null
+    /** Whether the agent is still mid-turn. A textless tick then means "no
+     *  observation this render", not "the stream ended". */
+    streamLive?: boolean
+  } = {}
+): { gate: MobileNativeChatStreamingGate; streaming: string | null } {
+  const scopeKey = options.scopeKey === undefined ? gate.scopeKey : options.scopeKey
+  const scopedGate =
+    gate.scopeKey === scopeKey ? gate : createMobileNativeChatStreamingGate(scopeKey)
+  const text = streamingText?.trim() ?? ''
+  const tail = folded.at(-1)
+  const tailId = tail?.id ?? null
+  if (!text) {
+    // Only a textless tick that carries a real tail and is outside a live turn
+    // is trustworthy pre-stream history. Mid-turn gaps (a tool call, a throttle
+    // lull, the transcript landing the reply before its status text) would
+    // otherwise adopt that reply as history and render it a second time as a
+    // bubble; a torn-down transcript carries no tail at all. The exception is a
+    // gate that has never anchored — mounted mid-turn, the first real tail it
+    // sees is the best pre-stream history it will ever get.
+    const canAnchor = tailId !== null && (!options.streamLive || scopedGate.baselineTailId === null)
+    return { gate: canAnchor ? advanceGate(scopedGate, '', tailId) : scopedGate, streaming: null }
+  }
+  // A stream that is not an extension of the previous tick is a new segment
+  // (next reply part); re-anchor to the tail that predates it.
+  const segmentStart = scopedGate.prevText !== '' && !text.startsWith(scopedGate.prevText)
+  const baselineTailId = segmentStart ? tailId : scopedGate.baselineTailId
+  const tailLeadsWithStream = assistantTailText(tail).startsWith(text)
+  // A null baseline (text on the very first tick, no tail ever seen) is unequal
+  // to every real tail id, so this degrades to the legacy suppress-on-prefix rule.
+  const caughtUp = tailLeadsWithStream && tailId !== baselineTailId
+  return {
+    gate: advanceGate(scopedGate, text, baselineTailId),
+    streaming: caughtUp ? null : text
+  }
+}

mobile/src/session/mobile-native-chat-terminal-write-lock.test.ts

@@ -0,0 +1,20 @@
+import { afterEach, describe, expect, it } from 'vitest'
+import {
+  acquireMobileNativeChatTerminalWrite,
+  releaseMobileNativeChatTerminalWrite,
+  resetMobileNativeChatTerminalWritesForTests
+} from './mobile-native-chat-terminal-write-lock'
+
+describe('mobile-native-chat-terminal-write-lock', () => {
+  afterEach(resetMobileNativeChatTerminalWritesForTests)
+
+  it('allows composed writes on different terminals to proceed concurrently', () => {
+    expect(acquireMobileNativeChatTerminalWrite('terminal-a')).toBe(true)
+
+    expect(acquireMobileNativeChatTerminalWrite('terminal-b')).toBe(true)
+    expect(acquireMobileNativeChatTerminalWrite('terminal-a')).toBe(false)
+
+    releaseMobileNativeChatTerminalWrite('terminal-a')
+    releaseMobileNativeChatTerminalWrite('terminal-b')
+  })
+})

mobile/src/session/mobile-native-chat-terminal-write-lock.ts

@@ -0,0 +1,25 @@
+// Serializes composed native-chat write sequences (clear/paste/settle/submit,
+// paced answer keystrokes) per HOST terminal. Two concurrent sequences into one
+// PTY interleave their bytes; a second sender must be rejected up front, not
+// woven in. Module scope for the same reason as the stale-input marker: the
+// terminal outlives any one screen, and independent hooks share the same PTY.
+const writeInFlightTerminals = new Set<string>()
+
+/** Claim the terminal for one composed write sequence. False = another
+ *  sequence is mid-flight; the caller must reject its send. */
+export function acquireMobileNativeChatTerminalWrite(terminal: string): boolean {
+  if (writeInFlightTerminals.has(terminal)) {
+    return false
+  }
+  writeInFlightTerminals.add(terminal)
+  return true
+}
+
+export function releaseMobileNativeChatTerminalWrite(terminal: string): void {
+  writeInFlightTerminals.delete(terminal)
+}
+
+/** Test-only: module scope outlives a single test's hooks. */
+export function resetMobileNativeChatTerminalWritesForTests(): void {
+  writeInFlightTerminals.clear()
+}

mobile/src/session/mobile-terminal-file-tap-open.test.ts

@@ -135,6 +135,56 @@ describe('openMobileTerminalFileTap', () => {
     expect(switchSessionTab).toHaveBeenCalledWith(openedTab)
   })
 
+  it('opens a sibling terminal path through the resolved owning worktree', async () => {
+    const client = createClient([
+      ok({
+        worktree: 'wt-2',
+        relativePath: 'docs/readme.md',
+        absolutePath: '/repo-b/docs/readme.md',
+        exists: true,
+        isDirectory: false,
+        openTarget: {
+          kind: 'worktree-file',
+          provider: 'local',
+          relativePath: 'docs/readme.md',
+          absolutePath: '/repo-b/docs/readme.md'
+        }
+      })
+    ])
+    const pushPreviewRoute = vi.fn()
+
+    openMobileTerminalFileTap({
+      client,
+      hostId: 'host-1',
+      worktreeId: 'wt-1',
+      pathText: '/repo-b/docs/readme.md',
+      line: null,
+      column: null,
+      pushPreviewRoute,
+      openBrowser: vi.fn(),
+      triggerOpenFeedback: vi.fn(),
+      fetchSessionTabs: vi.fn(),
+      getSessionTabs: () => [],
+      getActiveSessionTabId: () => null,
+      getActivationState: activeTerminalState,
+      switchSessionTab: vi.fn(),
+      scheduleDelayedAction: vi.fn()
+    })
+    await Promise.resolve()
+    await Promise.resolve()
+
+    expect(pushPreviewRoute).toHaveBeenCalledWith({
+      pathname: '/h/[hostId]/files/preview/[worktreeId]',
+      params: expect.objectContaining({
+        hostId: 'host-1',
+        worktreeId: 'wt-2',
+        source: 'worktree',
+        relativePath: 'docs/readme.md'
+      })
+    })
+    expect(client.sendRequest).not.toHaveBeenCalledWith('files.open', expect.anything())
+  })
+
   it('opens worktree-contained line references through the preview route', async () => {
     const client = createClient([
       ok({

mobile/src/session/mobile-terminal-file-tap-open.ts

@@ -74,13 +74,17 @@ async function openMobileTerminalFileTapAsync<T extends TerminalFileTapSessionTa
   if (!shouldActivateOpenedMobileSessionTab(options.getActivationState(false))) {
     return
   }
+  const resolvedWorktreeId = resolved.worktree?.trim() || options.worktreeId
+  const resolvedWorktree = `id:${resolvedWorktreeId}`
+  const resolvedWorktreeName =
+    resolvedWorktreeId === options.worktreeId ? options.worktreeName : undefined
 
   if (resolved.openTarget?.kind === 'absolute-file') {
     options.triggerOpenFeedback()
     options.pushPreviewRoute(
       createMobileFilePreviewHref({
         hostId: options.hostId,
-        worktreeId: options.worktreeId,
+        worktreeId: resolvedWorktreeId,
         source: 'terminalArtifact',
         absolutePath: resolved.openTarget.absolutePath,
         grantId: resolved.openTarget.grantId,
@@ -92,7 +96,7 @@ async function openMobileTerminalFileTapAsync<T extends TerminalFileTapSessionTa
         name: displayNameFromPath(resolved.openTarget.absolutePath),
         ...(options.line !== null ? { line: String(options.line) } : {}),
         ...(options.column !== null ? { column: String(options.column) } : {}),
-        ...(options.worktreeName ? { worktreeName: options.worktreeName } : {})
+        ...(resolvedWorktreeName ? { worktreeName: resolvedWorktreeName } : {})
       })
     )
     return
@@ -106,17 +110,21 @@ async function openMobileTerminalFileTapAsync<T extends TerminalFileTapSessionTa
     return
   }
   options.triggerOpenFeedback()
-  if (options.line !== null || options.column !== null) {
+  if (
+    resolvedWorktreeId !== options.worktreeId ||
+    options.line !== null ||
+    options.column !== null
+  ) {
     options.pushPreviewRoute(
       createMobileFilePreviewHref({
         hostId: options.hostId,
-        worktreeId: options.worktreeId,
+        worktreeId: resolvedWorktreeId,
         source: 'worktree',
         relativePath: openedPath,
         name: displayNameFromPath(openedPath),
         ...(options.line !== null ? { line: String(options.line) } : {}),
         ...(options.column !== null ? { column: String(options.column) } : {}),
-        ...(options.worktreeName ? { worktreeName: options.worktreeName } : {})
+        ...(resolvedWorktreeName ? { worktreeName: resolvedWorktreeName } : {})
       })
     )
     return
@@ -131,7 +139,7 @@ async function openMobileTerminalFileTapAsync<T extends TerminalFileTapSessionTa
   }
   const openResponse = await options.client.sendRequest(
     'files.open',
-    { worktree, relativePath: openedPath },
+    { worktree: resolvedWorktree, relativePath: openedPath },
     { timeoutMs: 15_000 }
   )
   if (!openResponse.ok) {

mobile/src/session/use-mobile-native-chat-answer-send.test.ts

@@ -11,7 +11,13 @@ import {
   markMobileNativeChatInputStale,
   resetMobileNativeChatStaleInputForTests
 } from './mobile-native-chat-stale-input'
+import {
+  acquireMobileNativeChatTerminalWrite,
+  releaseMobileNativeChatTerminalWrite,
+  resetMobileNativeChatTerminalWritesForTests
+} from './mobile-native-chat-terminal-write-lock'
 import { useMobileNativeChatAnswerSend } from './use-mobile-native-chat-answer-send'
+import { useNativeChatAcceptedAction } from './use-native-chat-action-outcomes'
 
 type AnswerSend = ReturnType<typeof useMobileNativeChatAnswerSend>
 
@@ -40,17 +46,24 @@ describe('useMobileNativeChatAnswerSend', () => {
   let mountedClient: RpcClient | null = null
   let mountedOnSendError: ((message: string) => void) | null = null
   let mountedAgent: AgentType = 'claude'
+  // The route sends through useNativeChatAcceptedAction, whose accepted callback
+  // retires the shared send-error banner (use-mobile-native-chat-controller.ts).
+  let acceptedAnswerAsk: AnswerSend['answerAsk'] | null = null
+  let onAccepted = vi.fn()
 
   beforeEach(() => {
+    onAccepted = vi.fn()
     vi.useFakeTimers()
     globalThis.IS_REACT_ACT_ENVIRONMENT = true
     resetMobileNativeChatStaleInputForTests()
+    resetMobileNativeChatTerminalWritesForTests()
   })
 
   afterEach(() => {
     act(() => renderer?.unmount())
     renderer = null
     answerSend = null
+    acceptedAnswerAsk = null
     mountedClient = null
     mountedOnSendError = null
     mountedAgent = 'claude'
@@ -68,6 +81,7 @@ describe('useMobileNativeChatAnswerSend', () => {
       streamIdentity: 'host\0worktree\0tab\0session',
       onSendError: mountedOnSendError!
     })
+    acceptedAnswerAsk = useNativeChatAcceptedAction(answerSend.answerAsk, onAccepted)
     return null
   }
 
@@ -396,4 +410,517 @@ describe('useMobileNativeChatAnswerSend', () => {
     await expect(result).resolves.toBe(false)
     expect(sendRequest).toHaveBeenCalledTimes(1)
   })
+
+  it('rejects an answer while another composed write holds the terminal', async () => {
+    const onSendError = vi.fn()
+    const sendRequest = vi.fn().mockResolvedValue(acceptedResponse())
+    await mount({ sendRequest } as unknown as RpcClient, onSendError)
+
+    // An image paste sequence is mid-flight into the same PTY.
+    expect(acquireMobileNativeChatTerminalWrite('terminal')).toBe(true)
+    await expect(answerSend?.answerAsk(TABS_OR_SPACES, [{ indices: [1] }])).resolves.toBe(false)
+    expect(sendRequest).not.toHaveBeenCalled()
+    expect(onSendError).toHaveBeenCalledWith('Answer not sent')
+
+    // Once that sequence releases, answers flow again.
+    releaseMobileNativeChatTerminalWrite('terminal')
+    await expect(answerSend?.answerAsk(TABS_OR_SPACES, [{ indices: [1] }])).resolves.toBe(true)
+  })
+
+  it('answers again on the same handle after an earlier answer already landed', async () => {
+    const onSendError = vi.fn()
+    const sendRequest = vi.fn().mockResolvedValue(acceptedResponse())
+    await mount({ sendRequest } as unknown as RpcClient, onSendError)
+
+    await expect(answerSend?.answerAsk(TABS_OR_SPACES, [{ indices: [0] }])).resolves.toBe(true)
+    // A landed answer resolves its turn FALSE — correct for a queued successor,
+    // fatal if the turn outlives the chain. Leaving it parked in the slot fences
+    // every later answer on this handle for the life of the hook, not just an
+    // overlapping one, so the ask card dies after its first use.
+    await expect(answerSend?.answerAsk(TABS_OR_SPACES, [{ indices: [1] }])).resolves.toBe(true)
+    expect(sendRequest).toHaveBeenCalledTimes(2)
+    expect(onSendError).not.toHaveBeenCalled()
+  })
+
+  it('fences a superseding answer after the cancelled chain moved the selector', async () => {
+    const sendRequest = vi.fn().mockResolvedValue(acceptedResponse())
+    await mount({ sendRequest } as unknown as RpcClient, vi.fn())
+
+    const prompt: AskPrompt = {
+      questions: [
+        { question: 'q1', multiSelect: false, options: [{ label: 'A' }, { label: 'B' }] },
+        { question: 'q2', multiSelect: false, options: [{ label: 'C' }, { label: 'D' }] }
+      ]
+    }
+    let first: Promise<boolean> | undefined
+    let second: Promise<boolean> | undefined
+    await act(async () => {
+      first = answerSend?.answerAsk(prompt, [{ indices: [0] }, { indices: [0] }])
+    })
+    // The first digit already advanced Claude to q2. Replaying a from-q1 key
+    // plan now would answer the wrong question.
+    await act(async () => {
+      second = answerSend?.answerAsk(TABS_OR_SPACES, [{ indices: [1] }])
+    })
+    await act(async () => vi.runAllTimersAsync())
+
+    await expect(first).resolves.toBe(false)
+    await expect(second).resolves.toBe(false)
+    expect(sendRequest).toHaveBeenCalledTimes(1)
+    // Both chains unwound: the terminal is free for the next composed write.
+    expect(acquireMobileNativeChatTerminalWrite('terminal')).toBe(true)
+    releaseMobileNativeChatTerminalWrite('terminal')
+  })
+
+  it('does not write a successor after the prior in-flight key is accepted', async () => {
+    let resolveFirst: (response: unknown) => void = () => undefined
+    const sendRequest = vi
+      .fn()
+      .mockImplementationOnce(
+        () =>
+          new Promise((resolve) => {
+            resolveFirst = resolve
+          })
+      )
+      .mockResolvedValue(acceptedResponse())
+    await mount({ sendRequest } as unknown as RpcClient, vi.fn())
+
+    const prompt: AskPrompt = {
+      questions: [
+        { question: 'q1', multiSelect: false, options: [{ label: 'A' }, { label: 'B' }] },
+        { question: 'q2', multiSelect: false, options: [{ label: 'C' }, { label: 'D' }] }
+      ]
+    }
+    let first: Promise<boolean> | undefined
+    let second: Promise<boolean> | undefined
+    await act(async () => {
+      first = answerSend?.answerAsk(prompt, [{ indices: [0] }, { indices: [0] }])
+      await Promise.resolve()
+    })
+    await act(async () => {
+      second = answerSend?.answerAsk(TABS_OR_SPACES, [{ indices: [1] }])
+      await Promise.resolve()
+    })
+
+    // The successor is queued behind the in-flight key, not racing it.
+    expect(sendRequest).toHaveBeenCalledTimes(1)
+    await act(async () => {
+      resolveFirst(acceptedResponse())
+      await Promise.resolve()
+    })
+    await expect(first).resolves.toBe(false)
+    await expect(second).resolves.toBe(false)
+    expect(sendRequest).toHaveBeenCalledTimes(1)
+  })
+
+  it('lets a queued successor continue after the prior key is definitely rejected', async () => {
+    let resolveFirst: (response: unknown) => void = () => undefined
+    const sendRequest = vi
+      .fn()
+      .mockImplementationOnce(
+        () =>
+          new Promise((resolve) => {
+            resolveFirst = resolve
+          })
+      )
+      .mockResolvedValue(acceptedResponse())
+    await mount({ sendRequest } as unknown as RpcClient, vi.fn())
+
+    let first: Promise<boolean> | undefined
+    let second: Promise<boolean> | undefined
+    await act(async () => {
+      first = answerSend?.answerAsk(TABS_OR_SPACES, [{ indices: [0] }])
+      await Promise.resolve()
+    })
+    await act(async () => {
+      second = answerSend?.answerAsk(TABS_OR_SPACES, [{ indices: [1] }])
+      await Promise.resolve()
+    })
+    await act(async () => {
+      resolveFirst({
+        ...acceptedResponse(),
+        result: { send: { accepted: false } }
+      })
+      await Promise.resolve()
+    })
+
+    // Nothing landed, so the selector never moved — the successor is safe.
+    await expect(first).resolves.toBe(false)
+    await expect(second).resolves.toBe(true)
+    expect(sendRequest).toHaveBeenCalledTimes(2)
+  })
+
+  it('does not write a successor after the prior delivery becomes ambiguous', async () => {
+    let rejectFirst: (error: Error) => void = () => undefined
+    const sendRequest = vi
+      .fn()
+      .mockImplementationOnce(
+        () =>
+          new Promise((_resolve, reject) => {
+            rejectFirst = reject
+          })
+      )
+      .mockResolvedValue(acceptedResponse())
+    await mount({ sendRequest } as unknown as RpcClient, vi.fn())
+
+    let first: Promise<boolean> | undefined
+    let second: Promise<boolean> | undefined
+    await act(async () => {
+      first = answerSend?.answerAsk(TABS_OR_SPACES, [{ indices: [0] }])
+      await Promise.resolve()
+    })
+    await act(async () => {
+      second = answerSend?.answerAsk(TABS_OR_SPACES, [{ indices: [1] }])
+      await Promise.resolve()
+    })
+    await act(async () => {
+      rejectFirst(markRpcDeliveryUnknown(new Error('Connection closed')))
+      await Promise.resolve()
+    })
+
+    // The key may have landed; a blind successor could double-step the selector.
+    await expect(first).resolves.toBe(false)
+    await expect(second).resolves.toBe(false)
+    expect(sendRequest).toHaveBeenCalledTimes(1)
+  })
+
+  it('tells the user when a queued answer is fenced instead of dropping it silently', async () => {
+    const onSendError = vi.fn()
+    let rejectFirst: (error: Error) => void = () => undefined
+    const sendRequest = vi
+      .fn()
+      .mockImplementationOnce(
+        () =>
+          new Promise((_resolve, reject) => {
+            rejectFirst = reject
+          })
+      )
+      .mockResolvedValue(acceptedResponse())
+    await mount({ sendRequest } as unknown as RpcClient, onSendError)
+
+    let first: Promise<boolean> | undefined
+    let second: Promise<boolean> | undefined
+    await act(async () => {
+      first = answerSend?.answerAsk(TABS_OR_SPACES, [{ indices: [0] }])
+      await Promise.resolve()
+    })
+    await act(async () => {
+      second = answerSend?.answerAsk(TABS_OR_SPACES, [{ indices: [1] }])
+      await Promise.resolve()
+    })
+    await act(async () => {
+      rejectFirst(markRpcDeliveryUnknown(new Error('Connection closed')))
+      await Promise.resolve()
+    })
+
+    await expect(first).resolves.toBe(false)
+    await expect(second).resolves.toBe(false)
+    // The card re-enables on a false result, so an unreported fence looks exactly
+    // like a dead button. The superseded chain stays quiet — the newest answer
+    // owns the error surface, and it is the one the user is waiting on.
+    expect(onSendError).toHaveBeenCalledTimes(1)
+    expect(onSendError).toHaveBeenCalledWith('Answer not sent — check chat before retrying')
+  })
+
+  it('tells the user when a dropped lease fences a queued answer whose predecessor landed', async () => {
+    const onSendError = vi.fn()
+    const settle: Array<(response: unknown) => void> = []
+    const sendRequest = vi.fn().mockImplementation(
+      () =>
+        new Promise((resolve) => {
+          settle.push(resolve)
+        })
+    )
+    await mount({ sendRequest } as unknown as RpcClient, onSendError)
+
+    let first: Promise<boolean> | undefined
+    let second: Promise<boolean> | undefined
+    await act(async () => {
+      first = answerSend?.answerAsk(TABS_OR_SPACES, [{ indices: [1] }])
+      await Promise.resolve()
+    })
+    await act(async () => {
+      second = answerSend?.answerAsk(TABS_OR_SPACES, [{ indices: [0] }])
+      await Promise.resolve()
+    })
+    // A transport blip, not a user cancel: unlike Stop and ask-cancel, the lost
+    // input lease writes no Escape, so the card stays up with Submit re-enabled.
+    await setEnabled(false)
+    await act(async () => {
+      settle[0]!(acceptedResponse())
+      await Promise.resolve()
+    })
+
+    expect(sendRequest).toHaveBeenCalledTimes(1)
+    await expect(first).resolves.toBe(false)
+    await expect(second).resolves.toBe(false)
+    // The first option key LANDED, so the live selector already moved. Reporting
+    // nothing invites a retry that double-steps it.
+    expect(onSendError).toHaveBeenCalledTimes(1)
+    expect(onSendError).toHaveBeenCalledWith('Answer not sent — check chat before retrying')
+  })
+
+  it('keeps the terminal locked while a queued successor writes', async () => {
+    const settle: Array<(response: unknown) => void> = []
+    const sendRequest = vi.fn().mockImplementation(
+      () =>
+        new Promise((resolve) => {
+          settle.push(resolve)
+        })
+    )
+    await mount({ sendRequest } as unknown as RpcClient, vi.fn())
+
+    let first: Promise<boolean> | undefined
+    let second: Promise<boolean> | undefined
+    await act(async () => {
+      first = answerSend?.answerAsk(TABS_OR_SPACES, [{ indices: [0] }])
+      await Promise.resolve()
+    })
+    await act(async () => {
+      second = answerSend?.answerAsk(TABS_OR_SPACES, [{ indices: [1] }])
+      await Promise.resolve()
+    })
+    expect(sendRequest).toHaveBeenCalledTimes(1)
+
+    // Nothing landed, so the successor is cleared to write.
+    await act(async () => {
+      settle[0]!({ ...acceptedResponse(), result: { send: { accepted: false } } })
+      await Promise.resolve()
+    })
+    expect(sendRequest).toHaveBeenCalledTimes(2)
+    // The successor's key is on the wire. The superseded chain unwinding behind it
+    // must NOT free the terminal, or an image paste interleaves into this sequence.
+    expect(acquireMobileNativeChatTerminalWrite('terminal')).toBe(false)
+
+    await act(async () => {
+      settle[1]!(acceptedResponse())
+      await Promise.resolve()
+    })
+    await expect(first).resolves.toBe(false)
+    await expect(second).resolves.toBe(true)
+    expect(acquireMobileNativeChatTerminalWrite('terminal')).toBe(true)
+    releaseMobileNativeChatTerminalWrite('terminal')
+  })
+
+  it('does not retire the fence banner when the superseded answer lands', async () => {
+    const onSendError = vi.fn()
+    const settle: Array<(response: unknown) => void> = []
+    const sendRequest = vi.fn().mockImplementation(
+      () =>
+        new Promise((resolve) => {
+          settle.push(resolve)
+        })
+    )
+    await mount({ sendRequest } as unknown as RpcClient, onSendError)
+
+    let first: Promise<boolean> | undefined
+    let second: Promise<boolean> | undefined
+    await act(async () => {
+      first = acceptedAnswerAsk?.(TABS_OR_SPACES, [{ indices: [0] }])
+      await Promise.resolve()
+    })
+    await act(async () => {
+      second = acceptedAnswerAsk?.(TABS_OR_SPACES, [{ indices: [1] }])
+      await Promise.resolve()
+    })
+    // The healthy path: the first answer LANDS, which is also the case that fences
+    // hardest — its key moved the live selector.
+    await act(async () => {
+      settle[0]!(acceptedResponse())
+      await Promise.resolve()
+    })
+
+    await expect(first).resolves.toBe(false)
+    await expect(second).resolves.toBe(false)
+    expect(onSendError).toHaveBeenCalledWith('Answer not sent — check chat before retrying')
+    // A superseded chain reporting success would clear the banner it just raised —
+    // the accepted hook runs after the fence, so the user would see nothing at all.
+    expect(onAccepted).not.toHaveBeenCalled()
+    expect(sendRequest).toHaveBeenCalledTimes(1)
+  })
+
+  it('does not retire the fence banner when a superseded pasted answer lands', async () => {
+    const onSendError = vi.fn()
+    const settle: Array<(response: unknown) => void> = []
+    const sendRequest = vi.fn().mockImplementation(
+      () =>
+        new Promise((resolve) => {
+          settle.push(resolve)
+        })
+    )
+    await mount({ sendRequest } as unknown as RpcClient, onSendError, 'grok')
+
+    let first: Promise<boolean> | undefined
+    let second: Promise<boolean> | undefined
+    await act(async () => {
+      first = acceptedAnswerAsk?.(TABS_OR_SPACES, [{ indices: [0] }])
+      await Promise.resolve()
+    })
+    await act(async () => {
+      second = acceptedAnswerAsk?.(TABS_OR_SPACES, [{ indices: [1] }])
+      await Promise.resolve()
+    })
+    await act(async () => {
+      settle[0]!(acceptedResponse())
+      await Promise.resolve()
+    })
+
+    // The pasted shape commits with Enter, so a superseded chain is doubly unsafe
+    // to report as accepted — the answer it committed is not the one on screen.
+    await expect(first).resolves.toBe(false)
+    await expect(second).resolves.toBe(false)
+    expect(onAccepted).not.toHaveBeenCalled()
+    expect(onSendError).toHaveBeenCalledWith('Answer not sent — check chat before retrying')
+  })
+
+  it('reports a landed answer that Stop cancelled with no successor waiting', async () => {
+    const onSendError = vi.fn()
+    const settle: Array<(response: unknown) => void> = []
+    const sendRequest = vi.fn().mockImplementation(
+      () =>
+        new Promise((resolve) => {
+          settle.push(resolve)
+        })
+    )
+    await mount({ sendRequest } as unknown as RpcClient, onSendError)
+
+    let first: Promise<boolean> | undefined
+    await act(async () => {
+      first = acceptedAnswerAsk?.(TABS_OR_SPACES, [{ indices: [1] }])
+      await Promise.resolve()
+    })
+    // Stop, an ask cancel, and a dropped input lease all bump the generation with
+    // NO successor chain behind them.
+    await act(async () => {
+      answerSend?.cancelPending()
+      settle[0]!(acceptedResponse())
+      await Promise.resolve()
+    })
+
+    // The key is on the PTY and nobody else owns the surface. Calling that a
+    // non-send leaves the card up and silent (fail() never runs on an accepted
+    // write), and the retry double-steps the selector this key already moved.
+    await expect(first).resolves.toBe(true)
+    expect(onAccepted).toHaveBeenCalledTimes(1)
+    expect(onSendError).not.toHaveBeenCalled()
+  })
+
+  it('reports a landed pasted answer that Stop cancelled with no successor', async () => {
+    const onSendError = vi.fn()
+    const settle: Array<(response: unknown) => void> = []
+    const sendRequest = vi.fn().mockImplementation(
+      () =>
+        new Promise((resolve) => {
+          settle.push(resolve)
+        })
+    )
+    await mount({ sendRequest } as unknown as RpcClient, onSendError, 'grok')
+
+    let first: Promise<boolean> | undefined
+    await act(async () => {
+      first = acceptedAnswerAsk?.(TABS_OR_SPACES, [{ indices: [1] }])
+      await Promise.resolve()
+    })
+    await act(async () => {
+      answerSend?.cancelPending()
+      settle[0]!(acceptedResponse())
+      await Promise.resolve()
+    })
+
+    // The pasted shape already committed with Enter, so suppressing the success
+    // strands an answered card the user is invited to submit a second time.
+    await expect(first).resolves.toBe(true)
+    expect(onAccepted).toHaveBeenCalledTimes(1)
+    expect(onSendError).not.toHaveBeenCalled()
+  })
+
+  it('fences a third answer behind an already-fenced successor, reporting once', async () => {
+    const onSendError = vi.fn()
+    const settle: Array<(response: unknown) => void> = []
+    const sendRequest = vi.fn().mockImplementation(
+      () =>
+        new Promise((resolve) => {
+          settle.push(resolve)
+        })
+    )
+    await mount({ sendRequest } as unknown as RpcClient, onSendError)
+
+    let first: Promise<boolean> | undefined
+    let second: Promise<boolean> | undefined
+    let third: Promise<boolean> | undefined
+    await act(async () => {
+      first = answerSend?.answerAsk(TABS_OR_SPACES, [{ indices: [0] }])
+      await Promise.resolve()
+    })
+    await act(async () => {
+      second = answerSend?.answerAsk(TABS_OR_SPACES, [{ indices: [1] }])
+      await Promise.resolve()
+    })
+    await act(async () => {
+      third = answerSend?.answerAsk(TABS_OR_SPACES, [{ indices: [0] }])
+      await Promise.resolve()
+    })
+    expect(sendRequest).toHaveBeenCalledTimes(1)
+
+    await act(async () => {
+      settle[0]!(acceptedResponse())
+      await Promise.resolve()
+    })
+    await expect(first).resolves.toBe(false)
+    await expect(second).resolves.toBe(false)
+    await expect(third).resolves.toBe(false)
+    // The middle chain sent nothing, so only the verdict it INHERITED can stop the
+    // third from replaying a from-scratch plan onto the advanced selector.
+    expect(sendRequest).toHaveBeenCalledTimes(1)
+    // Only the newest chain owns the error surface.
+    expect(onSendError).toHaveBeenCalledTimes(1)
+    expect(onSendError).toHaveBeenCalledWith('Answer not sent — check chat before retrying')
+  })
+
+  it('queues a late third answer behind the successor already on the wire', async () => {
+    const settle: Array<(response: unknown) => void> = []
+    const sendRequest = vi.fn().mockImplementation(
+      () =>
+        new Promise((resolve) => {
+          settle.push(resolve)
+        })
+    )
+    await mount({ sendRequest } as unknown as RpcClient, vi.fn())
+
+    let first: Promise<boolean> | undefined
+    let second: Promise<boolean> | undefined
+    let third: Promise<boolean> | undefined
+    await act(async () => {
+      first = answerSend?.answerAsk(TABS_OR_SPACES, [{ indices: [0] }])
+      await Promise.resolve()
+    })
+    await act(async () => {
+      second = answerSend?.answerAsk(TABS_OR_SPACES, [{ indices: [1] }])
+      await Promise.resolve()
+    })
+    // Nothing landed, so the successor is cleared and puts its own key on the wire.
+    await act(async () => {
+      settle[0]!({ ...acceptedResponse(), result: { send: { accepted: false } } })
+      await Promise.resolve()
+    })
+    expect(sendRequest).toHaveBeenCalledTimes(2)
+
+    await act(async () => {
+      third = answerSend?.answerAsk(TABS_OR_SPACES, [{ indices: [0] }])
+      await Promise.resolve()
+      await Promise.resolve()
+    })
+    // The first chain unwound while the second was mid-write: it must not have
+    // dropped the second's turn, or this one writes into the same PTY concurrently.
+    expect(sendRequest).toHaveBeenCalledTimes(2)
+
+    await act(async () => {
+      settle[1]!(acceptedResponse())
+      await Promise.resolve()
+    })
+    await expect(first).resolves.toBe(false)
+    await expect(second).resolves.toBe(false)
+    await expect(third).resolves.toBe(false)
+    expect(sendRequest).toHaveBeenCalledTimes(2)
+  })
 })

mobile/src/session/use-mobile-native-chat-answer-send.ts

@@ -14,6 +14,10 @@ import {
   sendMobileNativeChatMessageWithOutcome
 } from './mobile-native-chat-send'
 import { healMobileNativeChatStaleInput } from './mobile-native-chat-stale-input'
+import {
+  acquireMobileNativeChatTerminalWrite,
+  releaseMobileNativeChatTerminalWrite
+} from './mobile-native-chat-terminal-write-lock'
 import {
   resolveNativeChatTranscriptAgent,
   shouldStepNativeChatAskAnswer
@@ -72,6 +76,12 @@ export function useMobileNativeChatAnswerSend(args: {
   const generationRef = useRef(0)
   const activeRouteRef = useRef({ client, enabled, sessionId, streamIdentity })
   activeRouteRef.current = { client, enabled, sessionId, streamIdentity }
+  // Per-terminal count of this hook's chains sharing one write-lock hold: a
+  // superseding answer inherits the cancelled chain's hold (it re-enters before
+  // the old chain unwinds), and only the last chain out releases the lock.
+  const writeHoldsRef = useRef(new Map<string, number>())
+  // Successors wait for the prior RPC and inherit any delivery ambiguity.
+  const writeTurnsRef = useRef(new Map<string, Promise<boolean>>())
   const delaysRef = useRef<
     Set<{ timer: ReturnType<typeof setTimeout>; resolve: (completed: boolean) => void }>
   >(new Set())
@@ -103,125 +113,191 @@ export function useMobileNativeChatAnswerSend(args: {
       if (!hasAskAnswer(prompt, selections)) {
         return false
       }
+      // One composed write sequence per terminal: an answer landing mid-flight
+      // in an image paste (or vice versa) would interleave bytes into the PTY.
+      // A superseding answer shares the cancelled chain's hold on this terminal
+      // (that chain has not unwound to its release yet).
+      const holds = writeHoldsRef.current
+      const heldCount = holds.get(handle) ?? 0
+      if (heldCount === 0 && !acquireMobileNativeChatTerminalWrite(handle)) {
+        onSendError('Answer not sent')
+        return false
+      }
+      holds.set(handle, heldCount + 1)
+      const previousTurn = writeTurnsRef.current.get(handle) ?? Promise.resolve(true)
+      let finishTurn: (safeToContinue: boolean) => void = () => undefined
+      const turn = new Promise<boolean>((resolve) => {
+        finishTurn = resolve
+      })
+      writeTurnsRef.current.set(handle, turn)
       // A new answer supersedes any still-pending keystroke writes.
       cancelPending()
       const generation = generationRef.current
       let sawUnknownOutcome = false
       let sawAcceptedGroup = false
-      // One budget for the whole answer instead of a fresh timeout per keystroke
-      // group, which let an N-group selector hold the card for N × the send timeout.
-      // It bounds transport time only: each deliberate pacing wait is credited back
-      // below, so a long multi-question answer still gets a full budget to write in.
-      let deadline = openMobileNativeChatSendBudget()
-      const sendTerminal = async (body: string, enter: boolean): Promise<boolean> => {
-        const activeRoute = activeRouteRef.current
-        if (
-          !activeRoute.enabled ||
-          activeRoute.client !== client ||
-          activeRoute.sessionId !== sessionId ||
-          activeRoute.streamIdentity !== streamIdentity ||
-          handleRef.current !== handle
-        ) {
-          return false
-        }
-        const outcome = await sendMobileNativeChatMessageWithOutcome({
-          client,
-          terminal: handle,
-          text: body,
-          enter,
-          deadline,
-          ...(deviceTokenRef.current
-            ? { mobileClient: { id: deviceTokenRef.current, type: 'mobile' } }
-            : {})
-        })
-        if (outcome === 'unknown') {
-          sawUnknownOutcome = true
-        }
-        if (outcome === 'accepted') {
-          sawAcceptedGroup = true
-        }
-        return outcome === 'accepted'
-      }
-      const wait = (ms: number): Promise<boolean> =>
-        new Promise((resolve) => {
-          const delay = {
-            timer: setTimeout(() => {
-              delaysRef.current.delete(delay)
-              resolve(generationRef.current === generation)
-            }, ms),
-            resolve
-          }
-          delaysRef.current.add(delay)
-        })
-      const fail = (): false => {
-        if (generationRef.current === generation) {
-          // Why: keystrokes that may have landed (ack lost / path cutover) must
-          // not read as a definite failure — a blind resend could double-step
-          // the selector. An earlier group that WAS accepted is the same hazard
-          // in definite form: a multi-question answer whose shared budget ran out
-          // mid-sequence left the remote selector half-stepped, and telling the
-          // user nothing was sent invites a retry on top of the advanced state.
-          onSendError(
-            sawAcceptedGroup
-              ? 'Answer partly sent — check chat before retrying'
-              : sawUnknownOutcome
-                ? 'Answer unconfirmed — check chat before retrying'
-                : 'Answer not sent'
-          )
-        }
-        return false
-      }
-      // Grok commits pasted labels; Claude and Codex need their selector-specific
-      // keystrokes paced so each step renders before the next lands.
-      if (!shouldStepNativeChatAskAnswer(agentRef.current)) {
-        // This shape pastes the label into the composer and commits it, so an
-        // orphaned image paste would be submitted along with the answer (#10228).
-        // The selector shapes below deliberately skip the heal: their keys are
-        // `enter: false` for an active overlay, and a single-select answer is a
-        // bare option digit that cannot submit the line at all, so clearing there
-        // would consume the marker still protecting the next real message.
-        // Desktop splits it identically — use-native-chat-interactive-send.ts
-        // routes only the pasted-label shape through the clearing sender.
-        if (
-          !(await healMobileNativeChatStaleInput({
-            client,
-            terminal: handle,
-            deviceToken: deviceTokenRef.current,
-            deadline
-          }))
-        ) {
-          if (generationRef.current === generation) {
-            onSendError('Answer not sent')
+      let predecessorSafe = true
+      try {
+        predecessorSafe = await previousTurn
+        if (!predecessorSafe) {
+          // Fenced. Report it: the card re-enables on a false result, so silence
+          // here is indistinguishable from a dead button. "Check chat" rather than
+          // a bare "not sent" because the PREVIOUS answer's keys may have landed.
+          // Gate on the turn slot, not the generation: a dropped input lease bumps
+          // the generation without writing the Escape that Stop and ask-cancel do,
+          // so the card is still up and silence there strands an advanced selector.
+          if (writeTurnsRef.current.get(handle) === turn) {
+            onSendError('Answer not sent — check chat before retrying')
           }
           return false
         }
+        // Superseded by a newer answer, which owns the error surface from here.
         if (generationRef.current !== generation) {
           return false
         }
-        return (await sendTerminal(formatAskAnswer(prompt, selections), true)) || fail()
-      }
-      const groups =
-        resolveNativeChatTranscriptAgent(agentRef.current) === 'codex'
-          ? buildCodexAskAnswerKeys(prompt, selections)
-          : buildAskAnswerKeys(prompt, selections)
-      for (let index = 0; index < groups.length; index += 1) {
-        if (generationRef.current !== generation) {
-          return false
-        }
-        const group = groups[index]!
-        const body = 'raw' in group ? group.raw : sanitizeAskFreeText(group.text)
-        if (!(await sendTerminal(body, false))) {
-          return fail()
-        }
-        if (index < groups.length - 1) {
-          if (!(await wait(MOBILE_NATIVE_CHAT_QUESTION_STEP_MS))) {
+        // One budget for the whole answer instead of a fresh timeout per keystroke
+        // group, which let an N-group selector hold the card for N × the send timeout.
+        // It bounds transport time only: each deliberate pacing wait is credited back
+        // below, so a long multi-question answer still gets a full budget to write in.
+        let deadline = openMobileNativeChatSendBudget()
+        const sendTerminal = async (body: string, enter: boolean): Promise<boolean> => {
+          const activeRoute = activeRouteRef.current
+          if (
+            !activeRoute.enabled ||
+            activeRoute.client !== client ||
+            activeRoute.sessionId !== sessionId ||
+            activeRoute.streamIdentity !== streamIdentity ||
+            handleRef.current !== handle
+          ) {
             return false
           }
-          // Pacing is deliberate, not transport latency — don't charge it to the budget.
-          deadline += MOBILE_NATIVE_CHAT_QUESTION_STEP_MS
+          const outcome = await sendMobileNativeChatMessageWithOutcome({
+            client,
+            terminal: handle,
+            text: body,
+            enter,
+            deadline,
+            ...(deviceTokenRef.current
+              ? { mobileClient: { id: deviceTokenRef.current, type: 'mobile' } }
+              : {})
+          })
+          if (outcome === 'unknown') {
+            sawUnknownOutcome = true
+          }
+          if (outcome === 'accepted') {
+            sawAcceptedGroup = true
+          }
+          return outcome === 'accepted'
+        }
+        const wait = (ms: number): Promise<boolean> => {
+          // Already superseded: don't hold the successor for a full pacing step
+          // waiting on a timer whose only job is to report the cancellation.
+          if (generationRef.current !== generation) {
+            return Promise.resolve(false)
+          }
+          return new Promise((resolve) => {
+            const delay = {
+              timer: setTimeout(() => {
+                delaysRef.current.delete(delay)
+                resolve(generationRef.current === generation)
+              }, ms),
+              resolve
+            }
+            delaysRef.current.add(delay)
+          })
+        }
+        const fail = (): false => {
+          if (generationRef.current === generation) {
+            // Why: keystrokes that may have landed (ack lost / path cutover) must
+            // not read as a definite failure — a blind resend could double-step
+            // the selector. An earlier group that WAS accepted is the same hazard
+            // in definite form: a multi-question answer whose shared budget ran out
+            // mid-sequence left the remote selector half-stepped, and telling the
+            // user nothing was sent invites a retry on top of the advanced state.
+            onSendError(
+              sawAcceptedGroup
+                ? 'Answer partly sent — check chat before retrying'
+                : sawUnknownOutcome
+                  ? 'Answer unconfirmed — check chat before retrying'
+                  : 'Answer not sent'
+            )
+          }
+          return false
+        }
+        // Grok commits pasted labels; Claude and Codex need their selector-specific
+        // keystrokes paced so each step renders before the next lands.
+        if (!shouldStepNativeChatAskAnswer(agentRef.current)) {
+          // This shape pastes the label into the composer and commits it, so an
+          // orphaned image paste would be submitted along with the answer (#10228).
+          // The selector shapes below deliberately skip the heal: their keys are
+          // `enter: false` for an active overlay, and a single-select answer is a
+          // bare option digit that cannot submit the line at all, so clearing there
+          // would consume the marker still protecting the next real message.
+          // Desktop splits it identically — use-native-chat-interactive-send.ts
+          // routes only the pasted-label shape through the clearing sender.
+          if (
+            !(await healMobileNativeChatStaleInput({
+              client,
+              terminal: handle,
+              deviceToken: deviceTokenRef.current,
+              deadline
+            }))
+          ) {
+            if (generationRef.current === generation) {
+              onSendError('Answer not sent')
+            }
+            return false
+          }
+          if (generationRef.current !== generation) {
+            return false
+          }
+          // A chain a successor took over from must not report success either: an
+          // accepted answer retires the shared send-error banner, wiping the
+          // successor's fence. Test the turn slot, not the generation counter —
+          // Stop, ask-cancel and a dropped lease all bump the generation with no
+          // successor, and there a landed answer IS a success.
+          const sent = (await sendTerminal(formatAskAnswer(prompt, selections), true)) || fail()
+          return sent && writeTurnsRef.current.get(handle) === turn
+        }
+        const groups =
+          resolveNativeChatTranscriptAgent(agentRef.current) === 'codex'
+            ? buildCodexAskAnswerKeys(prompt, selections)
+            : buildAskAnswerKeys(prompt, selections)
+        for (let index = 0; index < groups.length; index += 1) {
+          if (generationRef.current !== generation) {
+            return false
+          }
+          const group = groups[index]!
+          const body = 'raw' in group ? group.raw : sanitizeAskFreeText(group.text)
+          if (!(await sendTerminal(body, false))) {
+            return fail()
+          }
+          if (index < groups.length - 1) {
+            if (!(await wait(MOBILE_NATIVE_CHAT_QUESTION_STEP_MS))) {
+              return false
+            }
+            // Pacing is deliberate, not transport latency — don't charge it to the budget.
+            deadline += MOBILE_NATIVE_CHAT_QUESTION_STEP_MS
+          }
+        }
+        // Taken over on the last key: same as above, the successor owns the surface.
+        return groups.length > 0 && writeTurnsRef.current.get(handle) === turn
+      } finally {
+        // Any accepted key changed the live selector, so a queued replacement
+        // cannot safely apply its from-scratch key plan to that new position.
+        finishTurn(predecessorSafe && !sawUnknownOutcome && !sawAcceptedGroup)
+        if (writeTurnsRef.current.get(handle) === turn) {
+          writeTurnsRef.current.delete(handle)
+        }
+        // Last chain out releases; a superseded chain unwinding late must not
+        // free the lock out from under the successor sharing its hold.
+        const remaining = (holds.get(handle) ?? 1) - 1
+        if (remaining <= 0) {
+          holds.delete(handle)
+          releaseMobileNativeChatTerminalWrite(handle)
+        } else {
+          holds.set(handle, remaining)
         }
       }
-      return groups.length > 0
     },
     [
       agentRef,

mobile/src/session/use-mobile-native-chat-controller.test.ts

@@ -47,8 +47,12 @@ vi.mock('./use-mobile-native-chat-drafts', () => ({
 vi.mock('./use-mobile-native-chat-prompts', () => ({
   useMobileNativeChatPrompts: () => ({ permission: null, question: null, ask: null })
 }))
+const answerSendArgs: { streamIdentity?: string }[] = []
 vi.mock('./use-mobile-native-chat-answer-send', () => ({
-  useMobileNativeChatAnswerSend: () => ({ answerAsk: vi.fn(), cancelPending: vi.fn() })
+  useMobileNativeChatAnswerSend: (args: { streamIdentity?: string }) => {
+    answerSendArgs.push(args)
+    return { answerAsk: vi.fn(), cancelPending: vi.fn() }
+  }
 }))
 vi.mock('./mobile-native-chat-permission-send', () => ({
   useMobileNativeChatPermissionSend: () => vi.fn()
@@ -421,3 +425,99 @@ describe('useMobileNativeChatController launch-draft wiring', () => {
     expect(draftsArgs.at(-1)).toMatchObject({ launchDraft: null, chatActive: true })
   })
 })
+
+describe('useMobileNativeChatController streaming scope', () => {
+  let renderer: ReactTestRenderer | null = null
+  let controller: MobileNativeChatController | null = null
+  const clientStub = { sendRequest: vi.fn() }
+
+  const workingTab = {
+    type: 'terminal',
+    id: 'tab-1',
+    terminal: 'term-1',
+    launchAgent: 'claude',
+    agentStatus: {
+      state: 'working',
+      agentType: 'claude',
+      providerSession: { id: 'session-1' }
+    },
+    isActive: true
+  }
+
+  function Harness(): null {
+    controller = useMobileNativeChatController({
+      client: clientStub as unknown as RpcClient,
+      connState: 'connected',
+      hostId: 'h',
+      worktreeId: 'w',
+      activeSessionTab: workingTab as never,
+      activeSessionTabId: 'tab-1',
+      activeHandleRef: { current: 'term-1' },
+      deviceTokenRef: { current: null },
+      nativeChatTranscriptIsLocalReadable: true,
+      nativeChatInputLeaseReady: true,
+      onSendError: vi.fn(),
+      onSendResolved: vi.fn()
+    })
+    return null
+  }
+
+  beforeEach(() => {
+    globalThis.IS_REACT_ACT_ENVIRONMENT = true
+    viewMode.isTabChatView = () => true
+    const original = console.error
+    const spy = vi.spyOn(console, 'error').mockImplementation((...a) => {
+      if (typeof a[0] === 'string' && a[0].includes('react-test-renderer is deprecated')) {
+        return
+      }
+      original(...a)
+    })
+    try {
+      act(() => {
+        renderer = create(createElement(Harness))
+      })
+    } finally {
+      spy.mockRestore()
+    }
+  })
+
+  afterEach(() => {
+    act(() => renderer?.unmount())
+    renderer = null
+    controller = null
+    viewMode.isTabChatView = () => true
+  })
+
+  it('holds the stream scope and liveness while the user peeks at the terminal', () => {
+    // Both feed the streaming gate, which lives above the chat view's mount and
+    // must not be reset by a view toggle.
+    expect(controller?.showNativeChat).toBe(true)
+    const scopeKey = controller?.nativeChatStreamScopeKey
+    expect(scopeKey).toContain('session-1')
+    expect(controller?.nativeChatStreamLive).toBe(true)
+
+    viewMode.isTabChatView = () => false
+    act(() => renderer?.update(createElement(Harness)))
+
+    expect(controller?.showNativeChat).toBe(false)
+    expect(controller?.nativeChatAgentWorking).toBe(false)
+    expect(controller?.nativeChatStreamScopeKey).toBe(scopeKey)
+    expect(controller?.nativeChatStreamLive).toBe(true)
+  })
+
+  it('keeps the delayed-send route guard view-gated, unlike the stream scope', () => {
+    // `streamIdentity` fences a delayed answer/stop to the route it was armed
+    // on, so it must still drop its session when chat closes — the scope key is
+    // the one that has to survive the toggle. Same string while chat is open.
+    const before = answerSendArgs.at(-1)?.streamIdentity
+    expect(before).toBe(controller?.nativeChatStreamScopeKey)
+
+    viewMode.isTabChatView = () => false
+    act(() => renderer?.update(createElement(Harness)))
+
+    const after = answerSendArgs.at(-1)?.streamIdentity
+    expect(after).not.toBe(before)
+    expect(after).not.toContain('session-1')
+    expect(controller?.nativeChatStreamScopeKey).toBe(before)
+  })
+})

mobile/src/session/use-mobile-native-chat-controller.ts

@@ -49,6 +49,10 @@ export type MobileNativeChatController = {
   nativeChatSession: ReturnType<typeof useMobileNativeChatSession>
   nativeChatAgentWorking: boolean
   nativeChatStreamingText?: string
+  /** Agent mid-turn, regardless of whether chat is the visible view. */
+  nativeChatStreamLive: boolean
+  /** Host/workspace/tab/session scope for stateful streaming suppression. */
+  nativeChatStreamScopeKey: string
   nativeChatPermission: ReturnType<typeof detectAgentPermission>
   nativeChatQuestion: ReturnType<typeof parseAgentQuestion>
   nativeChatAsk: ReturnType<typeof parseAskFromStatus>
@@ -124,7 +128,12 @@ export function useMobileNativeChatController(args: {
   activeChatAgentRef.current = activeChatResolution?.agent ?? null
 
   const activeChatSessionId = activeChatResolution?.sessionId ?? null
-  const streamIdentity = `${hostId}\0${worktreeId}\0${activeSessionTabId ?? ''}\0${activeChatSessionId ?? ''}\0${activeHandleRef.current ?? ''}`
+  const routeKey = `${hostId}\0${worktreeId}\0${activeSessionTabId ?? ''}`
+  const streamIdentity = `${routeKey}\0${activeChatSessionId ?? ''}\0${activeHandleRef.current ?? ''}`
+  // Same chat, but keyed off the tab rather than the view-gated resolution:
+  // `streamIdentity` goes session-less the moment the user peeks at the terminal,
+  // and a scope that flips on a view toggle throws the gate's baseline away.
+  const streamScopeKey = `${routeKey}\0${activeSessionTab?.agentStatus?.providerSession?.id ?? ''}\0${activeHandleRef.current ?? ''}`
 
   const nativeChatSession = useMobileNativeChatSession({
     client,
@@ -160,6 +169,9 @@ export function useMobileNativeChatController(args: {
 
   const nativeChatStatus = activeChatResolution ? activeSessionTab?.agentStatus : null
   const nativeChatAgentWorking = nativeChatStatus?.state === 'working'
+  // Deliberately not gated on the chat view being visible: the streaming gate
+  // has to tell "hidden mid-turn" from "the turn ended".
+  const nativeChatStreamLive = activeSessionTab?.agentStatus?.state === 'working'
   // Throttle the streaming bubble: OpenCode emits a status frame per streamed
   // part, and each one re-renders and re-parses the whole accumulated markdown.
   const nativeChatStreamingText = useThrottledLatestValue(
@@ -273,6 +285,8 @@ export function useMobileNativeChatController(args: {
     nativeChatSession,
     nativeChatAgentWorking,
     nativeChatStreamingText,
+    nativeChatStreamLive,
+    nativeChatStreamScopeKey: streamScopeKey,
     nativeChatPermission,
     nativeChatQuestion,
     nativeChatAsk,

mobile/src/session/use-mobile-native-chat-image-attachments.test.ts

@@ -5,6 +5,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import type { RpcClient } from '../transport/rpc-client'
 import type { RpcResponse, RpcSuccess } from '../transport/types'
 import { resetMobileNativeChatStaleInputForTests } from './mobile-native-chat-stale-input'
+import { resetMobileNativeChatTerminalWritesForTests } from './mobile-native-chat-terminal-write-lock'
 import { useMobileNativeChatImageAttachments } from './use-mobile-native-chat-image-attachments'
 
 // Fully stub the picker so the real expo/react-native chain never loads under
@@ -88,9 +89,10 @@ describe('useMobileNativeChatImageAttachments', () => {
   beforeEach(() => {
     globalThis.IS_REACT_ACT_ENVIRONMENT = true
     pick.mockReset()
-    // Stale markers live at module scope now (they outlive the screen), so they
-    // also outlive a test.
+    // Stale markers and write locks live at module scope (they outlive the
+    // screen), so they also outlive a test.
     resetMobileNativeChatStaleInputForTests()
+    resetMobileNativeChatTerminalWritesForTests()
   })
   afterEach(() => {
     act(() => renderer?.unmount())

mobile/src/session/use-mobile-native-chat-image-attachments.ts

@@ -26,6 +26,10 @@ import {
   isMobileNativeChatInputStale,
   markMobileNativeChatInputStale
 } from './mobile-native-chat-stale-input'
+import {
+  acquireMobileNativeChatTerminalWrite,
+  releaseMobileNativeChatTerminalWrite
+} from './mobile-native-chat-terminal-write-lock'
 
 type CurrentRef<T> = { readonly current: T }
 type ShowToast = (message: string, durationMs?: number) => void
@@ -127,8 +131,6 @@ export function useMobileNativeChatImageAttachments({
   // checked 'connected' at entry, so only a ref can see a mid-upload disconnect.
   const connStateRef = useRef(connState)
   connStateRef.current = connState
-  // Serialize clear/paste/submit ownership per terminal while allowing other tabs to send.
-  const sendInFlightTerminalsRef = useRef(new Set<string>())
 
   const attachments = (scopeKey ? attachmentsByScope[scopeKey] : undefined) ?? NO_ATTACHMENTS
 
@@ -219,15 +221,15 @@ export function useMobileNativeChatImageAttachments({
 
   const sendNativeChat = useCallback(
     async (text: string): Promise<boolean> => {
+      // Serialize clear/paste/submit ownership per terminal while allowing other
+      // tabs to send. Shared with the prompt-card writes (answer/permission), so
+      // a card tap can't interleave into a mid-flight paste sequence either.
       const operationTerminal = activeHandleRef.current
-      if (operationTerminal && sendInFlightTerminalsRef.current.has(operationTerminal)) {
+      if (operationTerminal && !acquireMobileNativeChatTerminalWrite(operationTerminal)) {
         onError?.()
         onSendError('Message not sent')
         return false
       }
-      if (operationTerminal) {
-        sendInFlightTerminalsRef.current.add(operationTerminal)
-      }
       // One budget for the whole user action. The paste loop, the settle, and the
       // text body that follows are a single send from the composer's point of view;
       // opening a budget per leg let `sending` run to twice the stated ceiling.
@@ -347,7 +349,7 @@ export function useMobileNativeChatImageAttachments({
         }
       } finally {
         if (operationTerminal) {
-          sendInFlightTerminalsRef.current.delete(operationTerminal)
+          releaseMobileNativeChatTerminalWrite(operationTerminal)
         }
       }
     },

mobile/src/session/use-mobile-native-chat-message-send.test.ts

@@ -19,6 +19,11 @@ vi.mock('./mobile-native-chat-stale-input', () => ({
 }))
 
 import { useMobileNativeChatMessageSend } from './use-mobile-native-chat-message-send'
+import {
+  acquireMobileNativeChatTerminalWrite,
+  releaseMobileNativeChatTerminalWrite,
+  resetMobileNativeChatTerminalWritesForTests
+} from './mobile-native-chat-terminal-write-lock'
 import { buildAgentTuiClearInputForText } from '../../../src/shared/agent-tui-input-clear'
 
 type Send = ReturnType<typeof useMobileNativeChatMessageSend>
@@ -28,6 +33,7 @@ const DRAFT = 'Linked Linear issue: ABC-123\nhttps://linear.app/x/issue/ABC-123'
 describe('useMobileNativeChatMessageSend', () => {
   let renderer: ReactTestRenderer | null = null
   let api: Send | null = null
+  let onSendError = vi.fn()
 
   const mount = (
     readSeededLaunchDraftSeed: () => { text: string; createdAt: number | null } | null
@@ -44,7 +50,7 @@ describe('useMobileNativeChatMessageSend', () => {
         restoreRejectedDraft: () => {},
         acceptSend: () => {},
         holdUnconfirmedSend: () => {},
-        onSendError: () => {}
+        onSendError
       })
       return null
     }
@@ -70,6 +76,8 @@ describe('useMobileNativeChatMessageSend', () => {
     sendWithOutcome.mockResolvedValue('accepted')
     clearInputWrite.mockReset()
     clearInputWrite.mockResolvedValue(true)
+    onSendError = vi.fn()
+    resetMobileNativeChatTerminalWritesForTests()
   })
   afterEach(() => {
     act(() => {
@@ -173,4 +181,27 @@ describe('useMobileNativeChatMessageSend', () => {
     })
     expect(sentArgs().resolvedLaunchDraft).toBeUndefined()
   })
+
+  it('rejects a question answer while another composed write holds the terminal', async () => {
+    mount(() => null)
+    // An image paste sequence is mid-flight into the same PTY.
+    expect(acquireMobileNativeChatTerminalWrite('term')).toBe(true)
+
+    let result: boolean | undefined
+    await act(async () => {
+      result = await api!.answerQuestion('1')
+    })
+    expect(result).toBe(false)
+    expect(sendWithOutcome).not.toHaveBeenCalled()
+    expect(onSendError).toHaveBeenCalledWith('Answer not sent')
+
+    releaseMobileNativeChatTerminalWrite('term')
+    await act(async () => {
+      result = await api!.answerQuestion('1')
+    })
+    expect(result).toBe(true)
+    // The answer released its own hold on the way out.
+    expect(acquireMobileNativeChatTerminalWrite('term')).toBe(true)
+    releaseMobileNativeChatTerminalWrite('term')
+  })
 })

mobile/src/session/use-mobile-native-chat-message-send.ts

@@ -7,6 +7,10 @@ import {
   type MobileNativeChatSendOutcome
 } from './mobile-native-chat-send'
 import { healMobileNativeChatStaleInput } from './mobile-native-chat-stale-input'
+import {
+  acquireMobileNativeChatTerminalWrite,
+  releaseMobileNativeChatTerminalWrite
+} from './mobile-native-chat-terminal-write-lock'
 import type { MobileNativeChatSendOrigin } from './use-mobile-native-chat-drafts'
 import type { MobileNativeChatLaunchDraftSeed } from './use-mobile-native-chat-launch-draft-seed'
 import { buildAgentTuiClearInputForText } from '../../../src/shared/agent-tui-input-clear'
@@ -210,11 +214,26 @@ export function useMobileNativeChatMessageSend(args: {
     [sendWithOutcome]
   )
 
-  // A question answer is not composer text, so it never syncs the draft.
+  // A question answer is not composer text, so it never syncs the draft. It
+  // reaches this send directly (not through the image hook's locked path), so
+  // it takes the per-terminal write lock itself: an answer landing mid-flight
+  // in an image paste sequence would interleave bytes into the PTY.
   const answerQuestion = useCallback(
-    async (text: string): Promise<boolean> =>
-      (await sendMessage(text, undefined, false)) !== 'rejected',
-    [sendMessage]
+    async (text: string): Promise<boolean> => {
+      const terminal = handleRef.current
+      if (terminal && !acquireMobileNativeChatTerminalWrite(terminal)) {
+        onSendError('Answer not sent')
+        return false
+      }
+      try {
+        return (await sendMessage(text, undefined, false)) !== 'rejected'
+      } finally {
+        if (terminal) {
+          releaseMobileNativeChatTerminalWrite(terminal)
+        }
+      }
+    },
+    [handleRef, onSendError, sendMessage]
   )
 
   return { send, sendWithOutcome, answerQuestion }

mobile/src/session/use-mobile-native-chat-streaming-bubble.ts

@@ -0,0 +1,31 @@
+import { useState } from 'react'
+import type { NativeChatMessage } from '../../../src/shared/native-chat-types'
+import {
+  createMobileNativeChatStreamingGate,
+  deriveMobileNativeChatStreaming
+} from './mobile-native-chat-streaming-gate'
+
+/** Live streaming-bubble text for the chat list. The gate remembers which
+ *  transcript tail predates the current stream segment, so a reply that repeats
+ *  the previous turn's prefix still shows while streaming. Call this from a
+ *  component that outlives the chat list itself: the baseline has to survive the
+ *  view toggles that unmount it, or the next segment reverts to prefix-matching.
+ *  `streamLive` keeps those textless gaps from reading as an idle stream. */
+export function useMobileNativeChatStreamingBubble(
+  folded: readonly NativeChatMessage[],
+  streamingText: string | undefined,
+  scopeKey: string,
+  streamLive: boolean
+): string | null {
+  const [gate, setGate] = useState(() => createMobileNativeChatStreamingGate(scopeKey))
+  const step = deriveMobileNativeChatStreaming(gate, folded, streamingText, {
+    scopeKey,
+    streamLive
+  })
+  if (step.gate !== gate) {
+    // Render-time state adjustment (derived-state pattern): the advance is
+    // idempotent for a repeated (text, tail) pair, so this settles in one pass.
+    setGate(step.gate)
+  }
+  return step.streaming
+}

mobile/src/stats/home-stats-total.test.ts

@@ -0,0 +1,81 @@
+import { describe, expect, it } from 'vitest'
+import { totalHomeStats, type HomeStatsSummary } from './home-stats-total'
+
+function stats(overrides: Partial<HomeStatsSummary> = {}): HomeStatsSummary {
+  return {
+    totalAgentsSpawned: 10,
+    totalPRsCreated: 2,
+    totalAgentTimeMs: 60_000,
+    firstEventAt: 1_700_000_000_000,
+    ...overrides
+  }
+}
+
+describe('totalHomeStats', () => {
+  it('has nothing to show before any host answers', () => {
+    expect(totalHomeStats({}, ['host-1'])).toBeNull()
+  })
+
+  it('passes a single host through unchanged', () => {
+    expect(totalHomeStats({ 'host-1': stats() }, ['host-1'])).toEqual(stats())
+  })
+
+  it('sums every desktop instead of letting the last reply win', () => {
+    const total = totalHomeStats(
+      {
+        'host-1': stats(),
+        'host-2': stats({ totalAgentsSpawned: 5, totalPRsCreated: 1, totalAgentTimeMs: 30_000 })
+      },
+      ['host-1', 'host-2']
+    )
+
+    expect(total).toMatchObject({
+      totalAgentsSpawned: 15,
+      totalPRsCreated: 3,
+      totalAgentTimeMs: 90_000
+    })
+  })
+
+  it('drops a removed desktop from the total', () => {
+    // Replies are cached for the life of the process, so the entry outlives the pairing.
+    const byHost = {
+      'host-1': stats(),
+      'host-2': stats({ totalAgentsSpawned: 5, totalPRsCreated: 1, totalAgentTimeMs: 30_000 })
+    }
+
+    expect(totalHomeStats(byHost, ['host-1'])).toEqual(stats())
+    expect(totalHomeStats(byHost, [])).toBeNull()
+  })
+
+  it('keeps the earliest known first event', () => {
+    const total = totalHomeStats(
+      {
+        'host-1': stats({ firstEventAt: 2_000 }),
+        'host-2': stats({ firstEventAt: null }),
+        'host-3': stats({ firstEventAt: 1_000 })
+      },
+      ['host-1', 'host-2', 'host-3']
+    )
+
+    expect(total?.firstEventAt).toBe(1_000)
+  })
+
+  it('reports no first event when no host has one', () => {
+    expect(
+      totalHomeStats({ 'host-1': stats({ firstEventAt: null }) }, ['host-1'])?.firstEventAt
+    ).toBeNull()
+  })
+
+  it('ignores a malformed reply instead of poisoning the header', () => {
+    const total = totalHomeStats(
+      {
+        'host-1': stats(),
+        'host-2': null as unknown as HomeStatsSummary,
+        'host-3': { totalAgentsSpawned: 'lots' } as unknown as HomeStatsSummary
+      },
+      ['host-1', 'host-2', 'host-3']
+    )
+
+    expect(total).toEqual(stats())
+  })
+})

mobile/src/stats/home-stats-total.ts

@@ -0,0 +1,51 @@
+export type HomeStatsSummary = {
+  totalAgentsSpawned: number
+  totalPRsCreated: number
+  totalAgentTimeMs: number
+  firstEventAt: number | null
+}
+
+/**
+ * Why: the home header shows one lifetime-usage row for every paired desktop. Each host answers
+ * stats.summary for itself, so a single shared slot made the row flip to whichever host replied
+ * last — visible churn now that every reconnect re-reads. Sum instead; one host still totals itself.
+ *
+ * Summing only `hostIds` keeps an unpaired desktop out of the total: replies are cached per host
+ * for the life of the process, so an entry outlives the host it describes.
+ */
+export function totalHomeStats(
+  byHost: Record<string, HomeStatsSummary>,
+  hostIds: readonly string[]
+): HomeStatsSummary | null {
+  const hosts = hostIds.filter((id) => id in byHost).map((id) => byHost[id])
+  if (hosts.length === 0) {
+    return null
+  }
+  const total: HomeStatsSummary = {
+    totalAgentsSpawned: 0,
+    totalPRsCreated: 0,
+    totalAgentTimeMs: 0,
+    firstEventAt: null
+  }
+  for (const host of hosts) {
+    // The rows come straight off the wire unvalidated; a malformed desktop reply must not
+    // NaN out or crash the header for every other host.
+    if (!host || typeof host !== 'object') {
+      continue
+    }
+    total.totalAgentsSpawned += finiteOrZero(host.totalAgentsSpawned)
+    total.totalPRsCreated += finiteOrZero(host.totalPRsCreated)
+    total.totalAgentTimeMs += finiteOrZero(host.totalAgentTimeMs)
+    if (typeof host.firstEventAt === 'number' && Number.isFinite(host.firstEventAt)) {
+      total.firstEventAt =
+        total.firstEventAt === null
+          ? host.firstEventAt
+          : Math.min(total.firstEventAt, host.firstEventAt)
+    }
+  }
+  return total
+}
+
+function finiteOrZero(value: number): number {
+  return typeof value === 'number' && Number.isFinite(value) ? value : 0
+}

mobile/src/transport/host-connect-refetch-gate.test.ts

@@ -0,0 +1,28 @@
+import { describe, expect, it } from 'vitest'
+import { createHostConnectRefetchGate } from './host-connect-refetch-gate'
+import type { ConnectionState } from './types'
+
+function refetchesFor(states: ConnectionState[]): number {
+  const gate = createHostConnectRefetchGate()
+  return states.filter((state) => gate.observe(state)).length
+}
+
+describe('createHostConnectRefetchGate', () => {
+  it('fetches once on the first connect', () => {
+    expect(refetchesFor(['connecting', 'handshaking', 'connected'])).toBe(1)
+  })
+
+  it('fetches again after a dropped socket comes back', () => {
+    expect(
+      refetchesFor(['connected', 'reconnecting', 'connecting', 'handshaking', 'connected'])
+    ).toBe(2)
+  })
+
+  it('does not storm while the connection holds', () => {
+    expect(refetchesFor(['connected', 'connected', 'connected'])).toBe(1)
+  })
+
+  it('never fetches while the host stays down', () => {
+    expect(refetchesFor(['connecting', 'disconnected', 'reconnecting', 'auth-failed'])).toBe(0)
+  })
+})

mobile/src/transport/host-connect-refetch-gate.ts

@@ -0,0 +1,18 @@
+import type { ConnectionState } from './types'
+
+// Why: a logical client survives socket drops, so screens that fetch once per client latched
+// after the first connect and never refreshed after a background/handoff reconnect. Gate the
+// refetch on the transition INTO 'connected' — one read per reconnect, no polling timer.
+export function createHostConnectRefetchGate(): {
+  observe: (state: ConnectionState) => boolean
+} {
+  let connected = false
+  return {
+    observe(state) {
+      const nowConnected = state === 'connected'
+      const crossedIntoConnected = nowConnected && !connected
+      connected = nowConnected
+      return crossedIntoConnected
+    }
+  }
+}

mobile/src/transport/host-edit-navigation.test.ts

@@ -1,29 +1,95 @@
 import { describe, expect, it, vi } from 'vitest'
-import { mobileHostEditRoute, navigateToMobileHostEdit } from './host-edit-navigation'
+import {
+  mobileHostEditHostRoute,
+  mobileHostEditRoute,
+  navigateToMobileHostEdit,
+  type MobileHostEditNavigationState
+} from './host-edit-navigation'
 
-describe('mobileHostEditRoute', () => {
-  it('keeps the dynamic host segment explicit for a cold host navigator', () => {
-    expect(mobileHostEditRoute('host-1')).toEqual({
-      pathname: '/h/[hostId]/edit',
-      params: { hostId: 'host-1' }
-    })
-  })
+function navigationHarness(initialState: MobileHostEditNavigationState) {
+  let stateListener = () => {}
+  let state = initialState
+  const unsubscribeState = vi.fn()
+  const navigation = {
+    addListener: vi.fn((_event: 'state', listener: () => void) => {
+      stateListener = listener
+      return unsubscribeState
+    }),
+    getState: () => state
+  }
+  return {
+    navigation,
+    setState(nextState: MobileHostEditNavigationState) {
+      state = nextState
+      stateListener()
+    },
+    unsubscribeState
+  }
+}
 
-  it('mounts a cold host navigator before replacing its index with edit', () => {
-    let nextFrame: FrameRequestCallback | null = null
+describe('mobile host edit navigation', () => {
+  it('waits for the expected host route to commit before replacing it with Edit', () => {
+    const harness = navigationHarness({ index: 0, routes: [{ name: 'index' }] })
     const push = vi.fn()
     const replace = vi.fn()
-    vi.stubGlobal('requestAnimationFrame', (callback: FrameRequestCallback) => {
-      nextFrame = callback
-      return 1
-    })
 
-    navigateToMobileHostEdit({ push, replace }, 'host-1')
-    expect(push).toHaveBeenCalledWith('/h/host-1')
+    navigateToMobileHostEdit(harness.navigation, { push, replace }, 'host/1')
+
+    expect(push).toHaveBeenCalledWith(mobileHostEditHostRoute('host/1'))
     expect(replace).not.toHaveBeenCalled()
 
-    nextFrame?.(0)
-    expect(replace).toHaveBeenCalledWith(mobileHostEditRoute('host-1'))
-    vi.unstubAllGlobals()
+    harness.setState({
+      index: 1,
+      routes: [{ name: 'index' }, { name: 'h', params: { hostId: 'host/1' } }]
+    })
+
+    expect(harness.unsubscribeState).toHaveBeenCalledOnce()
+    expect(replace).toHaveBeenCalledWith(mobileHostEditRoute('host/1'))
+  })
+
+  it('does not replace an unrelated host route', () => {
+    const harness = navigationHarness({ index: 0, routes: [{ name: 'index' }] })
+    const replace = vi.fn()
+
+    navigateToMobileHostEdit(harness.navigation, { push: vi.fn(), replace }, 'host-1')
+    harness.setState({ index: 0, routes: [{ name: 'h', params: { hostId: 'host-2' } }] })
+
+    expect(replace).not.toHaveBeenCalled()
+  })
+
+  it('cancels a pending replacement when navigation leaves the host flow', () => {
+    const harness = navigationHarness({ index: 0, routes: [{ name: 'index' }] })
+    const replace = vi.fn()
+    const controller = navigateToMobileHostEdit(
+      harness.navigation,
+      { push: vi.fn(), replace },
+      'host-1'
+    )
+
+    harness.setState({ index: 0, routes: [{ name: 'h', params: { hostId: 'host-2' } }] })
+    controller.cancel()
+    harness.setState({ index: 0, routes: [{ name: 'h', params: { hostId: 'host-1' } }] })
+
+    expect(harness.unsubscribeState).toHaveBeenCalledOnce()
+    expect(replace).not.toHaveBeenCalled()
+  })
+
+  it('unsubscribes when mounting the host throws synchronously', () => {
+    const harness = navigationHarness({ index: 0, routes: [{ name: 'index' }] })
+    const error = new Error('navigation failed')
+
+    expect(() =>
+      navigateToMobileHostEdit(
+        harness.navigation,
+        {
+          push: () => {
+            throw error
+          },
+          replace: vi.fn()
+        },
+        'host-1'
+      )
+    ).toThrow(error)
+    expect(harness.unsubscribeState).toHaveBeenCalledOnce()
   })
 })

mobile/src/transport/host-edit-navigation.ts

@@ -1,8 +1,31 @@
-type HostEditRouter = {
+export type MobileHostEditNavigationState = Readonly<{
+  index: number
+  routes: readonly MobileHostEditNavigationRoute[]
+}>
+
+export type MobileHostEditNavigationRoute = Readonly<{
+  name: string
+  params?: Readonly<{ hostId?: unknown }>
+}>
+
+export type MobileHostEditRootNavigation = {
+  addListener: (event: 'state', listener: () => void) => () => void
+  getState: () => MobileHostEditNavigationState
+}
+
+export type MobileHostEditRouter = {
   push: (href: `/h/${string}`) => void
   replace: (href: ReturnType<typeof mobileHostEditRoute>) => void
 }
 
+export type MobileHostEditNavigationController = Readonly<{
+  cancel: () => void
+}>
+
+export function mobileHostEditHostRoute(hostId: string): `/h/${string}` {
+  return `/h/${encodeURIComponent(hostId)}`
+}
+
 export function mobileHostEditRoute(hostId: string) {
   return {
     pathname: '/h/[hostId]/edit' as const,
@@ -10,10 +33,49 @@ export function mobileHostEditRoute(hostId: string) {
   }
 }
 
-export function navigateToMobileHostEdit(router: HostEditRouter, hostId: string): void {
-  // Why: a cold nested host navigator resolves a deep push to its index route.
-  router.push(`/h/${hostId}`)
-  requestAnimationFrame(() => {
+export function navigateToMobileHostEdit(
+  navigation: MobileHostEditRootNavigation,
+  router: MobileHostEditRouter,
+  hostId: string
+): MobileHostEditNavigationController {
+  let active = true
+  let hostRouteSeen = false
+  let unsubscribeState = () => {}
+  const dispose = () => {
+    if (!active) {
+      return
+    }
+    active = false
+    unsubscribeState()
+  }
+
+  // Why: cold Expo deep links resolve to index; target Edit after the host route commits.
+  const onState = () => {
+    if (!active) {
+      return
+    }
+    const state = navigation.getState()
+    const currentRoute = state.routes[state.index]
+    if (currentRoute?.name !== 'h') {
+      if (hostRouteSeen) {
+        dispose()
+      }
+      return
+    }
+    hostRouteSeen = true
+    if (currentRoute.params?.hostId !== hostId) {
+      return
+    }
+    dispose()
     router.replace(mobileHostEditRoute(hostId))
-  })
+  }
+
+  try {
+    unsubscribeState = navigation.addListener('state', onState)
+    router.push(mobileHostEditHostRoute(hostId))
+  } catch (error) {
+    dispose()
+    throw error
+  }
+  return { cancel: dispose }
 }

mobile/src/transport/mobile-direct-return-probe.ts

@@ -0,0 +1,83 @@
+import { openAuthenticatedDirectEndpoint } from './mobile-direct-endpoint-probe'
+import type { MobileEndpointHysteresis } from './mobile-endpoint-hysteresis'
+import type { RpcClient } from './rpc-client'
+import type { HostProfile } from './types'
+import type { MobileConnectionPath } from './stable-logical-rpc-client'
+
+const DIRECT_PROBE_INTERVAL_MS = 15_000
+
+// While the runtime channel rides the relay, periodically probe the direct
+// endpoint and migrate back once hysteresis proves it stable.
+export class DirectReturnProbe {
+  private timer: ReturnType<typeof setTimeout> | null = null
+
+  constructor(
+    private readonly deps: {
+      now: () => number
+      setTimer: typeof setTimeout
+      clearTimer: typeof clearTimeout
+      openDirect: (endpoint: string) => RpcClient
+    },
+    private readonly hooks: {
+      hysteresis: MobileEndpointHysteresis
+      host: () => HostProfile
+      canSchedule: () => boolean
+      canAttempt: () => boolean
+      beginOperation: () => void
+      migrate: (client: RpcClient, path: MobileConnectionPath) => Promise<void>
+      onDirectMigrated: () => Promise<void>
+      afterProbe: () => void
+    }
+  ) {}
+
+  schedule(delayMs = DIRECT_PROBE_INTERVAL_MS): void {
+    if (!this.hooks.canSchedule() || this.timer) {
+      return
+    }
+    this.timer = this.deps.setTimer(() => {
+      this.timer = null
+      void this.probe()
+    }, delayMs)
+  }
+
+  clear(): void {
+    if (this.timer) {
+      this.deps.clearTimer(this.timer)
+      this.timer = null
+    }
+  }
+
+  private async probe(): Promise<void> {
+    if (!this.hooks.canAttempt() || !this.hooks.hysteresis.canProbe(this.deps.now())) {
+      this.schedule()
+      return
+    }
+    this.hooks.beginOperation()
+    let successful: Awaited<ReturnType<typeof openAuthenticatedDirectEndpoint>> = null
+    try {
+      successful = await openAuthenticatedDirectEndpoint(
+        this.hooks.host(),
+        this.deps.openDirect,
+        12_000
+      )
+      if (!successful) {
+        this.hooks.hysteresis.recordDirectFailure(this.deps.now())
+        return
+      }
+      if (!this.hooks.hysteresis.recordDirectSuccess(this.deps.now())) {
+        successful.client.close()
+        return
+      }
+      await this.hooks.migrate(successful.client, successful.path)
+      successful = null
+      this.hooks.hysteresis.recordMigration(this.deps.now())
+      await this.hooks.onDirectMigrated()
+    } finally {
+      successful?.client.close()
+      // Why: a relay drop or backoff timer can arrive while the probe owns the
+      // operation mutex; afterProbe releases it and replays deferred recovery.
+      this.hooks.afterProbe()
+      this.schedule()
+    }
+  }
+}

mobile/src/transport/mobile-endpoint-lifecycle.ts

@@ -90,6 +90,7 @@ function createSupervisor(
     readBundle: readMobileRelayCredentialBundle,
     writeBundle: writeMobileRelayCredentialBundle,
     saveHost,
+    onLog,
     now: Date.now,
     randomBytes: ExpoCrypto.getRandomBytes,
     setTimer: setTimeout,

mobile/src/transport/mobile-endpoint-supervisor-contract.ts

@@ -3,7 +3,7 @@ import type { MobileRelayCredentialBundle } from './mobile-relay-credential-bund
 import type { MobileRelayRpcSession } from './mobile-relay-rpc-session'
 import type { resolveMobileRelayEndpoint } from './mobile-relay-resume-director'
 import type { RpcClient } from './rpc-client'
-import type { HostProfile } from './types'
+import type { ConnectionLogSink, HostProfile } from './types'
 
 export type MobileEndpointSupervisorDependencies = {
   openDirect: (endpoint: string) => RpcClient
@@ -20,4 +20,5 @@ export type MobileEndpointSupervisorDependencies = {
   randomBytes: (length: number) => Uint8Array
   setTimer: typeof setTimeout
   clearTimer: typeof clearTimeout
+  onLog?: ConnectionLogSink
 }

mobile/src/transport/mobile-endpoint-supervisor-test-fakes.ts

@@ -0,0 +1,169 @@
+import { vi } from 'vitest'
+import type { MobileRelayCredentialBundle } from './mobile-relay-credential-bundle'
+import type { MobileRelayRpcSession } from './mobile-relay-rpc-session'
+import type { MobileEndpointSupervisorDependencies } from './mobile-endpoint-supervisor'
+import type { RpcClient } from './rpc-client'
+import type { MobileConnectionPath, StableLogicalRpcClient } from './stable-logical-rpc-client'
+import type { ConnectionState, HostProfile, RpcResponse } from './types'
+
+export class FakeSession implements RpcClient {
+  readonly sendRequest = vi.fn(
+    async (_method: string, _params?: unknown): Promise<RpcResponse> => ({
+      id: 'rpc-1',
+      ok: true,
+      result: {},
+      _meta: { runtimeId: 'runtime-1' }
+    })
+  )
+  readonly subscribe = vi.fn(() => () => {})
+  readonly updateTerminalSubscriptionViewport = vi.fn()
+  readonly notifyForeground = vi.fn()
+  readonly close = vi.fn()
+  private readonly listeners = new Set<(state: ConnectionState) => void>()
+
+  constructor(private state: ConnectionState) {}
+
+  getState = () => this.state
+  getReconnectAttempt = () => 0
+  getLastConnectedAt = () => null
+  onStateChange = (listener: (state: ConnectionState) => void) => {
+    this.listeners.add(listener)
+    return () => this.listeners.delete(listener)
+  }
+
+  publishState(state: ConnectionState): void {
+    this.state = state
+    for (const listener of this.listeners) {
+      listener(state)
+    }
+  }
+}
+
+export class FakeRelaySession extends FakeSession implements MobileRelayRpcSession {
+  constructor(
+    state: ConnectionState,
+    private readonly failure: Error | null = null,
+    private readonly resumeExpiry = Date.now() + 30 * 24 * 3_600_000,
+    private readonly renewed = true
+  ) {
+    super(state)
+  }
+  // Why: production-realistic defaults — fictional fake values hid three
+  // live defects in this subsystem (latch, churn, int32 timer overflow).
+  getAttachDeadlineAt = () => Date.now() + 10_000
+  getResumeExpiresAt = () => this.resumeExpiry
+  getResumeConfirmation = () => ({
+    v: 1 as const,
+    reqId: 'confirm-1',
+    currentVersion: 2,
+    acceptedAs: this.renewed ? ('current' as const) : ('grace' as const),
+    renewed: this.renewed,
+    resumeExpiresAt: this.resumeExpiry
+  })
+  getFailure = () => this.failure
+}
+
+export class FakeLogicalClient extends FakeSession implements StableLogicalRpcClient {
+  private path: MobileConnectionPath
+  private generation = 1
+
+  constructor(state: ConnectionState, path: MobileConnectionPath) {
+    super(state)
+    this.path = path
+  }
+
+  migrateTo = vi.fn(async (session: RpcClient, path: MobileConnectionPath) => {
+    if (session.getState() !== 'connected') {
+      session.close()
+      throw new Error(`replacement session ${session.getState()}`)
+    }
+    this.path = path
+    this.generation += 1
+    this.publishState('connected')
+  })
+  suspendActiveSession = vi.fn(() => this.publishState('disconnected'))
+  getActivePath = () => this.path
+  getGeneration = () => this.generation
+}
+
+export const relay = {
+  v: 1 as const,
+  directorUrl: 'https://relay.onorca.dev',
+  cellUrl: 'https://relay-c1.onorca.dev',
+  assignmentEpoch: 7,
+  relayHostId: 'AbCdEf0123_-xyZ9',
+  e2eeFraming: 2 as const
+}
+export const host: HostProfile = {
+  id: 'host-1',
+  name: 'Blue Whale',
+  endpoint: 'ws://192.168.1.10:6768',
+  deviceToken: 'device-token',
+  publicKeyB64: 'A'.repeat(44),
+  lastConnected: 1,
+  endpoints: [
+    { id: 'direct-primary', kind: 'lan', url: 'ws://192.168.1.10:6768' },
+    { id: 'relay-primary', kind: 'relay', url: 'wss://relay-c1.onorca.dev/v1/connect/id' }
+  ],
+  relayHostId: relay.relayHostId,
+  relay
+}
+export const bundle: MobileRelayCredentialBundle = {
+  v: 1,
+  hostId: host.id,
+  deviceToken: host.deviceToken,
+  current: {
+    token: 'A'.repeat(43),
+    hash: 'B'.repeat(43),
+    version: 2,
+    expiresAt: Number.MAX_SAFE_INTEGER
+  }
+}
+
+export function dependencies(
+  overrides: Partial<MobileEndpointSupervisorDependencies> = {}
+): MobileEndpointSupervisorDependencies {
+  return {
+    openDirect: vi.fn(() => new FakeSession('connected')),
+    openRelay: vi.fn(() => new FakeRelaySession('connected')),
+    resolveRelay: vi.fn(async ({ relay }) => relay),
+    readBundle: vi.fn(async () => bundle),
+    writeBundle: vi.fn(async () => {}),
+    saveHost: vi.fn(async () => {}),
+    now: Date.now,
+    randomBytes: (length) => new Uint8Array(length).fill(1),
+    setTimer: setTimeout,
+    clearTimer: clearTimeout,
+    ...overrides
+  }
+}
+
+export function mockCredentialRotation(logical: FakeLogicalClient): void {
+  let installResult: Record<string, unknown> | null = null
+  logical.sendRequest.mockImplementation(async (method, params) => {
+    const request = params as { installReqId?: string; reqId?: string }
+    if (method === 'pairing.provisionRelay') {
+      installResult = {
+        v: 1,
+        reqId: request.reqId,
+        authorizationMode: 'authenticated-direct',
+        currentVersion: 3,
+        resumeExpiresAt: Date.now() + 300_000,
+        graceExpiresAt: Date.now() + 60_000
+      }
+      return { id: 'rpc-2', ok: true, result: installResult, _meta: { runtimeId: 'runtime-1' } }
+    }
+    return {
+      id: 'rpc-1',
+      ok: true,
+      result: {
+        v: 1,
+        relay,
+        installStatus: installResult
+          ? { v: 1, reqId: request.installReqId, state: 'committed', result: installResult }
+          : { v: 1, reqId: request.installReqId, state: 'not-found' }
+      },
+      _meta: { runtimeId: 'runtime-1' }
+    }
+  })
+}

mobile/src/transport/mobile-endpoint-supervisor.test.ts

@@ -2,177 +2,22 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import type { MobileRelayCredentialBundle } from './mobile-relay-credential-bundle'
 import { hashMobileRelayCredential } from './mobile-relay-credential-hash'
 import { RelayOuterError } from './mobile-relay-e2ee-link'
-import type { MobileRelayRpcSession } from './mobile-relay-rpc-session'
 import {
-  MobileEndpointSupervisor,
-  type MobileEndpointSupervisorDependencies
-} from './mobile-endpoint-supervisor'
-import type { RpcClient } from './rpc-client'
-import type { MobileConnectionPath, StableLogicalRpcClient } from './stable-logical-rpc-client'
-import type { ConnectionState, HostProfile, RpcResponse } from './types'
+  bundle,
+  dependencies,
+  FakeLogicalClient,
+  FakeRelaySession,
+  FakeSession,
+  host,
+  mockCredentialRotation,
+  relay
+} from './mobile-endpoint-supervisor-test-fakes'
+import { MobileEndpointSupervisor } from './mobile-endpoint-supervisor'
 
 vi.mock('react-native', () => ({ Platform: { OS: 'ios' } }))
 vi.mock('expo-secure-store', () => ({ WHEN_UNLOCKED_THIS_DEVICE_ONLY: 'when-unlocked' }))
 vi.mock('expo-crypto', () => ({ getRandomBytes: (length: number) => new Uint8Array(length) }))
 
-class FakeSession implements RpcClient {
-  readonly sendRequest = vi.fn(
-    async (_method: string, _params?: unknown): Promise<RpcResponse> => ({
-      id: 'rpc-1',
-      ok: true,
-      result: {},
-      _meta: { runtimeId: 'runtime-1' }
-    })
-  )
-  readonly subscribe = vi.fn(() => () => {})
-  readonly updateTerminalSubscriptionViewport = vi.fn()
-  readonly notifyForeground = vi.fn()
-  readonly close = vi.fn()
-  private readonly listeners = new Set<(state: ConnectionState) => void>()
-
-  constructor(private state: ConnectionState) {}
-
-  getState = () => this.state
-  getReconnectAttempt = () => 0
-  getLastConnectedAt = () => null
-  onStateChange = (listener: (state: ConnectionState) => void) => {
-    this.listeners.add(listener)
-    return () => this.listeners.delete(listener)
-  }
-
-  publishState(state: ConnectionState): void {
-    this.state = state
-    for (const listener of this.listeners) {
-      listener(state)
-    }
-  }
-}
-
-class FakeRelaySession extends FakeSession implements MobileRelayRpcSession {
-  constructor(
-    state: ConnectionState,
-    private readonly failure: Error | null = null,
-    private readonly lease = Date.now() + 120_000
-  ) {
-    super(state)
-  }
-  getLeaseExpiresAt = () => this.lease
-  getResumeConfirmation = () => ({
-    v: 1 as const,
-    reqId: 'confirm-1',
-    currentVersion: 2,
-    acceptedAs: 'current' as const,
-    renewed: true,
-    resumeExpiresAt: Date.now() + 300_000
-  })
-  getFailure = () => this.failure
-}
-
-class FakeLogicalClient extends FakeSession implements StableLogicalRpcClient {
-  private path: MobileConnectionPath
-  private generation = 1
-
-  constructor(state: ConnectionState, path: MobileConnectionPath) {
-    super(state)
-    this.path = path
-  }
-
-  migrateTo = vi.fn(async (session: RpcClient, path: MobileConnectionPath) => {
-    if (session.getState() !== 'connected') {
-      session.close()
-      throw new Error(`replacement session ${session.getState()}`)
-    }
-    this.path = path
-    this.generation += 1
-    this.publishState('connected')
-  })
-  suspendActiveSession = vi.fn(() => this.publishState('disconnected'))
-  getActivePath = () => this.path
-  getGeneration = () => this.generation
-}
-
-const relay = {
-  v: 1 as const,
-  directorUrl: 'https://relay.onorca.dev',
-  cellUrl: 'https://relay-c1.onorca.dev',
-  assignmentEpoch: 7,
-  relayHostId: 'AbCdEf0123_-xyZ9',
-  e2eeFraming: 2 as const
-}
-const host: HostProfile = {
-  id: 'host-1',
-  name: 'Blue Whale',
-  endpoint: 'ws://192.168.1.10:6768',
-  deviceToken: 'device-token',
-  publicKeyB64: 'A'.repeat(44),
-  lastConnected: 1,
-  endpoints: [
-    { id: 'direct-primary', kind: 'lan', url: 'ws://192.168.1.10:6768' },
-    { id: 'relay-primary', kind: 'relay', url: 'wss://relay-c1.onorca.dev/v1/connect/id' }
-  ],
-  relayHostId: relay.relayHostId,
-  relay
-}
-const bundle: MobileRelayCredentialBundle = {
-  v: 1,
-  hostId: host.id,
-  deviceToken: host.deviceToken,
-  current: {
-    token: 'A'.repeat(43),
-    hash: 'B'.repeat(43),
-    version: 2,
-    expiresAt: Number.MAX_SAFE_INTEGER
-  }
-}
-
-function dependencies(
-  overrides: Partial<MobileEndpointSupervisorDependencies> = {}
-): MobileEndpointSupervisorDependencies {
-  return {
-    openDirect: vi.fn(() => new FakeSession('connected')),
-    openRelay: vi.fn(() => new FakeRelaySession('connected')),
-    resolveRelay: vi.fn(async ({ relay }) => relay),
-    readBundle: vi.fn(async () => bundle),
-    writeBundle: vi.fn(async () => {}),
-    saveHost: vi.fn(async () => {}),
-    now: Date.now,
-    randomBytes: (length) => new Uint8Array(length).fill(1),
-    setTimer: setTimeout,
-    clearTimer: clearTimeout,
-    ...overrides
-  }
-}
-
-function mockCredentialRotation(logical: FakeLogicalClient): void {
-  let installResult: Record<string, unknown> | null = null
-  logical.sendRequest.mockImplementation(async (method, params) => {
-    const request = params as { installReqId?: string; reqId?: string }
-    if (method === 'pairing.provisionRelay') {
-      installResult = {
-        v: 1,
-        reqId: request.reqId,
-        authorizationMode: 'authenticated-direct',
-        currentVersion: 3,
-        resumeExpiresAt: Date.now() + 300_000,
-        graceExpiresAt: Date.now() + 60_000
-      }
-      return { id: 'rpc-2', ok: true, result: installResult, _meta: { runtimeId: 'runtime-1' } }
-    }
-    return {
-      id: 'rpc-1',
-      ok: true,
-      result: {
-        v: 1,
-        relay,
-        installStatus: installResult
-          ? { v: 1, reqId: request.installReqId, state: 'committed', result: installResult }
-          : { v: 1, reqId: request.installReqId, state: 'not-found' }
-      },
-      _meta: { runtimeId: 'runtime-1' }
-    }
-  })
-}
-
 describe('mobile endpoint supervisor', () => {
   beforeEach(() => {
     vi.useFakeTimers()
@@ -716,6 +561,7 @@ describe('mobile endpoint supervisor', () => {
       .mockReturnValueOnce(new FakeRelaySession('disconnected', new RelayOuterError(4408)))
     const deps = dependencies({
       openRelay,
+      openDirect: vi.fn(() => new FakeSession('disconnected')),
       resolveRelay: vi.fn(() => resolvePending)
     })
     const supervisor = new MobileEndpointSupervisor(logical, host, deps)
@@ -744,12 +590,13 @@ describe('mobile endpoint supervisor', () => {
       .mockReturnValueOnce(new FakeRelaySession('disconnected', new RelayOuterError(4408)))
     const deps = dependencies({
       openRelay,
+      openDirect: vi.fn(() => new FakeSession('disconnected')),
       resolveRelay: vi.fn(() => resolvePending)
     })
     const supervisor = new MobileEndpointSupervisor(logical, host, deps)
 
     await supervisor.start()
-    await vi.advanceTimersByTimeAsync(1000)
+    await vi.advanceTimersByTimeAsync(60_000)
     await vi.waitFor(() => expect(deps.resolveRelay).toHaveBeenCalledOnce())
     supervisor.setForeground(false)
     finishResolve?.(relay)
@@ -785,11 +632,14 @@ describe('mobile endpoint supervisor', () => {
       .fn()
       .mockReturnValueOnce(new FakeRelaySession('connected', null, Date.now() + 31_000))
       .mockImplementation(() => new FakeRelaySession('disconnected', new RelayOuterError(4404)))
-    const deps = dependencies({ openRelay })
+    const deps = dependencies({
+      openRelay,
+      openDirect: vi.fn(() => new FakeSession('disconnected'))
+    })
     const supervisor = new MobileEndpointSupervisor(logical, host, deps)
 
     await supervisor.start()
-    await vi.advanceTimersByTimeAsync(1000)
+    await vi.advanceTimersByTimeAsync(60_000)
     expect(openRelay).toHaveBeenCalledTimes(2)
 
     await vi.advanceTimersByTimeAsync(5000)
@@ -797,6 +647,27 @@ describe('mobile endpoint supervisor', () => {
     supervisor.stop()
   })
 
+  it('skips forced rotation for a session resumed without renewal', async () => {
+    // Why: renewed=false means a re-resume provably returns the same unchanged
+    // deadline; rotating anyway churned one session replacement per clamp floor.
+    const logical = new FakeLogicalClient('disconnected', 'lan')
+    const openRelay = vi.fn(
+      () => new FakeRelaySession('connected', null, Date.now() + 31_000, false)
+    )
+    const deps = dependencies({
+      openRelay,
+      openDirect: vi.fn(() => new FakeSession('disconnected'))
+    })
+    const supervisor = new MobileEndpointSupervisor(logical, host, deps)
+
+    await supervisor.start()
+    expect(openRelay).toHaveBeenCalledTimes(1)
+
+    await vi.advanceTimersByTimeAsync(5 * 60_000)
+    expect(openRelay).toHaveBeenCalledTimes(1)
+    supervisor.stop()
+  })
+
   it('keeps a fatal lease-replacement gate after the active relay later drops', async () => {
     const logical = new FakeLogicalClient('disconnected', 'lan')
     const openRelay = vi
@@ -808,12 +679,13 @@ describe('mobile endpoint supervisor', () => {
       .mockImplementation(() => new FakeRelaySession('connected'))
     const deps = dependencies({
       openRelay,
+      openDirect: vi.fn(() => new FakeSession('disconnected')),
       randomBytes: () => new Uint8Array([128, 0])
     })
     const supervisor = new MobileEndpointSupervisor(logical, host, deps)
 
     await supervisor.start()
-    await vi.advanceTimersByTimeAsync(1000)
+    await vi.advanceTimersByTimeAsync(60_000)
     expect(openRelay).toHaveBeenCalledTimes(2)
 
     // The old relay can outlive its rejected lease replacement, then close separately.
@@ -833,12 +705,13 @@ describe('mobile endpoint supervisor', () => {
       .mockImplementation(() => new FakeRelaySession('connected'))
     const deps = dependencies({
       openRelay,
+      openDirect: vi.fn(() => new FakeSession('disconnected')),
       randomBytes: () => new Uint8Array([128, 0])
     })
     const supervisor = new MobileEndpointSupervisor(logical, host, deps)
 
     await supervisor.start()
-    await vi.advanceTimersByTimeAsync(1000)
+    await vi.advanceTimersByTimeAsync(60_000)
     expect(openRelay).toHaveBeenCalledTimes(2)
 
     supervisor.setForeground(true)

mobile/src/transport/mobile-endpoint-supervisor.ts

@@ -1,5 +1,5 @@
-import { openAuthenticatedDirectEndpoint } from './mobile-direct-endpoint-probe'
 import type { MobileEndpointSupervisorDependencies } from './mobile-endpoint-supervisor-contract'
+import { DirectReturnProbe } from './mobile-direct-return-probe'
 import { RelayReconnectController } from './mobile-relay-reconnect-controller'
 import { RelayLeaseRotationTimer } from './mobile-relay-lease-rotation-timer'
 import { MobileEndpointHysteresis } from './mobile-endpoint-hysteresis'
@@ -9,6 +9,8 @@ import {
   persistRelayHost,
   toError
 } from './mobile-endpoint-supervisor-support'
+import { selectDialableRelayCredentials } from './mobile-relay-credential-selection'
+import { createRelayRecoveryLog, type RelayRecoveryLog } from './mobile-relay-recovery-log'
 import {
   applyResumeConfirmation,
   mobileRelayCredentialNeedsRotation,
@@ -20,7 +22,6 @@ import type { HostProfile } from './types'
 
 export type { MobileEndpointSupervisorDependencies } from './mobile-endpoint-supervisor-contract'
 
-const DIRECT_PROBE_INTERVAL_MS = 15_000
 const DIRECT_OBSERVATION_MS = 30_000
 const MINIMUM_DWELL_MS = 60_000
 const FAILURE_COOLDOWN_MS = 60_000
@@ -32,11 +33,12 @@ export class MobileEndpointSupervisor {
   private operationInFlight = false
   private credentialRotationInFlight = false
   private relayRotationPending = false
-  private probeTimer: ReturnType<typeof setTimeout> | null = null
   private unsubscribeState: (() => void) | null = null
   private readonly hysteresis: MobileEndpointHysteresis
   private readonly relayReconnect: RelayReconnectController
   private readonly leaseRotation: RelayLeaseRotationTimer
+  private readonly logRelay: RelayRecoveryLog
+  private readonly directProbe: DirectReturnProbe
 
   constructor(
     private readonly logical: StableLogicalRpcClient,
@@ -49,24 +51,52 @@ export class MobileEndpointSupervisor {
       failureCooldownMs: FAILURE_COOLDOWN_MS,
       minimumDwellMs: MINIMUM_DWELL_MS
     })
+    this.logRelay = createRelayRecoveryLog(dependencies.now, dependencies.onLog)
     this.relayReconnect = new RelayReconnectController(dependencies, this.recoverRelay.bind(this))
     this.leaseRotation = new RelayLeaseRotationTimer(dependencies, () => {
       this.relayRotationPending = true
       void this.recoverRelay(true)
     })
+    this.directProbe = new DirectReturnProbe(dependencies, {
+      hysteresis: this.hysteresis,
+      host: () => this.host,
+      canSchedule: () =>
+        !this.stopped && this.foreground && this.logical.getActivePath() === 'relay',
+      canAttempt: () => !this.stopped && this.foreground && !this.operationInFlight,
+      beginOperation: () => {
+        this.operationInFlight = true
+      },
+      migrate: (client, path) => this.logical.migrateTo(client, path),
+      onDirectMigrated: async () => {
+        this.leaseRotation.clear()
+        this.relayRotationPending = false
+        await this.rotateCredentialIfNeeded(this.relayReconnect.resetForDirectConnection())
+      },
+      afterProbe: () => {
+        this.operationInFlight = false
+        if (this.relayRotationPending || this.logical.getState() !== 'connected') {
+          void this.recoverRelay(this.relayRotationPending)
+        }
+      }
+    })
   }
 
   async start(): Promise<void> {
     this.bundle = await this.dependencies.readBundle(this.host.id).catch(() => null)
-    if (this.stopped || !this.bundle || !this.host.relay) {
+    if (this.stopped || !this.host.relay) {
       return
     }
+    if (!this.bundle) {
+      // Why: a Keychain race at open must not kill relay recovery for the whole
+      // process lifetime; each recovery attempt re-reads the durable bundle.
+      this.logRelay('credential bundle unavailable at start; recovery will re-read')
+    }
     this.unsubscribeState = this.logical.onStateChange((state) => {
       if (state === 'connected') {
         if (this.logical.getActivePath() !== 'relay') {
           void this.rotateCredentialIfNeeded(this.relayReconnect.resetForDirectConnection())
         }
-        this.scheduleDirectProbe()
+        this.directProbe.schedule()
       } else {
         // Why: the direct client enters reconnecting after its first failed
         // dial and may never publish disconnected while its retry loop lives.
@@ -78,7 +108,7 @@ export class MobileEndpointSupervisor {
       // are still loading, before the supervisor subscribes to state changes.
       await this.recoverRelay()
     } else {
-      this.scheduleDirectProbe()
+      this.directProbe.schedule()
     }
   }
 
@@ -87,11 +117,11 @@ export class MobileEndpointSupervisor {
     this.foreground = foreground
     if (foreground) {
       this.relayReconnect.handleForeground(this.logical, wasForeground)
-      this.scheduleDirectProbe(0)
+      this.directProbe.schedule(0)
     } else {
       // Why: background phones must not hold billed relay data splices.
       this.relayReconnect.suspendActiveRelay(this.logical)
-      this.clearDirectProbeTimer()
+      this.directProbe.clear()
       this.relayReconnect.clear()
       this.leaseRotation.clear()
     }
@@ -101,7 +131,7 @@ export class MobileEndpointSupervisor {
     this.stopped = true
     this.unsubscribeState?.()
     this.unsubscribeState = null
-    this.clearDirectProbeTimer()
+    this.directProbe.clear()
     this.relayReconnect.clear()
     this.leaseRotation.clear()
   }
@@ -112,7 +142,6 @@ export class MobileEndpointSupervisor {
       this.stopped ||
       !this.foreground ||
       this.operationInFlight ||
-      !this.bundle ||
       !this.host.relay ||
       (!forceReplacement && !this.relayReconnect.needsRecovery(this.logical.getState()))
     ) {
@@ -121,23 +150,42 @@ export class MobileEndpointSupervisor {
     // Why: revival and lease timers can overlap resume failures; one shared cooldown
     // prevents PEER_DROPPED/LIMIT_EXCEEDED reconnect churn.
     if (this.relayReconnect.shouldDefer()) {
+      this.logRelay('recovery deferred by cooldown or gate')
       return
     }
     this.operationInFlight = true
     let lastError: Error | null = null
     let retryAfterOperation = false
     try {
-      const credentials = this.relayReconnect.eligibleCredentials(
-        this.bundle.current,
-        this.bundle.grace
-      )
-      for (const credential of credentials) {
+      const selection = await selectDialableRelayCredentials({
+        bundle: this.bundle,
+        controller: this.relayReconnect,
+        readBundle: () => this.dependencies.readBundle(this.host.id),
+        onAdoptedFresherBundle: () => this.logRelay('adopted fresher durable credential bundle')
+      })
+      this.bundle = selection.bundle
+      if (selection.credentials.length === 0) {
+        // Why: "expired" vs "missing" separates a sleep-past-expiry phone
+        // (needs re-pair or LAN) from a Keychain failure in field reports.
+        this.logRelay(
+          selection.bundle
+            ? 'relay credential expired or rejected; slow reprobe armed'
+            : 'no relay credential bundle; slow reprobe armed'
+        )
+        this.relayReconnect.armCredentialReprobe()
+        return
+      }
+      for (const credential of selection.credentials) {
         const result = await this.tryRelayCredential(credential)
         if (result.ok) {
           retryAfterOperation = this.logical.getState() !== 'connected'
           return
         }
         lastError = result.error
+        this.logRelay(
+          'relay dial failed',
+          `${result.error.name}: ${String(result.error.message).slice(0, 80)}`
+        )
         if (this.relayReconnect.shouldTryGraceAfterRelayFailure(result.error)) {
           // Why: a rejected version stays invalid; retry only the grace credential.
           this.relayReconnect.recordRejectedCredential(credential.version)
@@ -145,12 +193,10 @@ export class MobileEndpointSupervisor {
           break
         }
       }
-      if (credentials.length > 0) {
-        // Why: cleanup may happen while a relay dial is awaiting the network;
-        // record its outcome without recreating a foreground retry timer.
-        const scheduleRetry = !forceReplacement && this.foreground && !this.stopped
-        this.relayReconnect.registerFailure(lastError, scheduleRetry)
-      }
+      // Why: cleanup may happen while a relay dial is awaiting the network;
+      // record its outcome without recreating a foreground retry timer.
+      const scheduleRetry = !forceReplacement && this.foreground && !this.stopped
+      this.relayReconnect.registerFailure(lastError, scheduleRetry)
     } finally {
       this.operationInFlight = false
       if (forceReplacement && this.relayRotationPending && !this.stopped && this.foreground) {
@@ -207,6 +253,7 @@ export class MobileEndpointSupervisor {
       }
       this.relayRotationPending = false
       this.hysteresis.recordMigration(this.dependencies.now())
+      this.logRelay('runtime channel migrated to relay')
       const confirmation = session.getResumeConfirmation()
       if (confirmation) {
         this.bundle = applyResumeConfirmation(this.bundle, credential.version, confirmation)
@@ -215,71 +262,24 @@ export class MobileEndpointSupervisor {
         await this.dependencies.writeBundle(this.bundle).catch(() => {})
       }
       // Why: async persistence can finish after stop/background; never recreate a stale timer.
+      // Why: rotate against the resume credential's expiry, never the hello's
+      // leaseExpiresAt — that field is the cell's ~10s attach-reservation
+      // deadline, and using it forced a session replacement every second.
+      // Why: renewed=false means a re-resume provably returns the same
+      // unchanged deadline — rotating then just churns one replacement per
+      // clamp floor until a fresh credential arrives over direct or disk.
       this.leaseRotation.scheduleFromLease(
-        this.stopped || !this.foreground ? null : session.getLeaseExpiresAt()
+        this.stopped || !this.foreground || confirmation?.renewed === false
+          ? null
+          : (confirmation?.resumeExpiresAt ?? session.getResumeExpiresAt())
       )
-      this.scheduleDirectProbe()
+      this.directProbe.schedule()
       return { ok: true }
     } catch (error) {
       return { ok: false, error: session.getFailure() ?? toError(error) }
     }
   }
 
-  private scheduleDirectProbe(delayMs = DIRECT_PROBE_INTERVAL_MS): void {
-    if (
-      this.stopped ||
-      !this.foreground ||
-      this.logical.getActivePath() !== 'relay' ||
-      this.probeTimer
-    ) {
-      return
-    }
-    this.probeTimer = this.dependencies.setTimer(() => {
-      this.probeTimer = null
-      void this.probeDirect()
-    }, delayMs)
-  }
-
-  private async probeDirect(): Promise<void> {
-    if (
-      this.stopped ||
-      !this.foreground ||
-      this.operationInFlight ||
-      !this.hysteresis.canProbe(this.dependencies.now())
-    ) {
-      this.scheduleDirectProbe()
-      return
-    }
-    this.operationInFlight = true
-    let successful: Awaited<ReturnType<typeof openAuthenticatedDirectEndpoint>> = null
-    try {
-      const openDirect = this.dependencies.openDirect
-      successful = await openAuthenticatedDirectEndpoint(this.host, openDirect, 12_000)
-      if (!successful) {
-        this.hysteresis.recordDirectFailure(this.dependencies.now())
-        return
-      }
-      if (!this.hysteresis.recordDirectSuccess(this.dependencies.now())) {
-        successful.client.close()
-        return
-      }
-      await this.logical.migrateTo(successful.client, successful.path)
-      successful = null
-      this.hysteresis.recordMigration(this.dependencies.now())
-      this.leaseRotation.clear()
-      this.relayRotationPending = false
-      await this.rotateCredentialIfNeeded(this.relayReconnect.resetForDirectConnection())
-    } finally {
-      successful?.client.close()
-      this.operationInFlight = false
-      // Why: a relay drop or backoff timer can arrive while the direct probe owns the mutex.
-      if (this.relayRotationPending || this.logical.getState() !== 'connected') {
-        void this.recoverRelay(this.relayRotationPending)
-      }
-      this.scheduleDirectProbe()
-    }
-  }
-
   private async rotateCredentialIfNeeded(force = false): Promise<void> {
     if (
       this.stopped ||
@@ -321,11 +321,4 @@ export class MobileEndpointSupervisor {
       }
     }
   }
-
-  private clearDirectProbeTimer(): void {
-    if (this.probeTimer) {
-      this.dependencies.clearTimer(this.probeTimer)
-      this.probeTimer = null
-    }
-  }
 }

mobile/src/transport/mobile-relay-credential-selection.ts

@@ -0,0 +1,42 @@
+import type { MobileRelayCredentialBundle } from './mobile-relay-credential-bundle'
+import type { RelayReconnectController } from './mobile-relay-reconnect-controller'
+
+// Why: pairing recovery, re-pairing, or a raced rotation can land a fresh
+// durable bundle after the supervisor snapshotted its copy; a gated retry must
+// see it instead of dialing (or refusing to dial) on stale state forever.
+//
+// Adoption is decided by OUTCOME, not by version: renewals extend expiresAt
+// without bumping current.version, and a re-pair restarts the version counter,
+// so version comparison cannot tell fresh from stale. The durable bundle is
+// adopted exactly when it yields a dialable (unexpired, non-rejected)
+// credential while the in-memory one does not — which also means a revoked
+// version can never be resurrected from a stale disk copy.
+export async function selectDialableRelayCredentials(args: {
+  bundle: MobileRelayCredentialBundle | null
+  controller: RelayReconnectController
+  readBundle: () => Promise<MobileRelayCredentialBundle | null>
+  onAdoptedFresherBundle: () => void
+}): Promise<{
+  bundle: MobileRelayCredentialBundle | null
+  credentials: MobileRelayCredentialBundle['current'][]
+}> {
+  const memory = args.bundle
+  const memoryCredentials = memory
+    ? args.controller.eligibleCredentials(memory.current, memory.grace)
+    : []
+  if (memoryCredentials.length > 0) {
+    // Why: in-memory can be newer than disk (a resume confirmation whose
+    // durable write failed); never let a stale disk copy shadow it.
+    return { bundle: memory, credentials: memoryCredentials }
+  }
+  const disk = await args.readBundle().catch(() => null)
+  if (disk) {
+    const diskCredentials = args.controller.eligibleCredentials(disk.current, disk.grace)
+    if (diskCredentials.length > 0) {
+      args.controller.acceptFreshCredential(disk.current.version)
+      args.onAdoptedFresherBundle()
+      return { bundle: disk, credentials: diskCredentials }
+    }
+  }
+  return { bundle: memory ?? disk, credentials: [] }
+}

mobile/src/transport/mobile-relay-lease-rotation-timer.ts

@@ -2,6 +2,13 @@
 // little before the deadline (and retry shortly if a forced rotation didn't land)
 // so the session never lapses. Owns the single lease/rotation timer slot.
 const LEASE_ROTATION_MARGIN_MS = 30_000
+// Why: both ends must be clamped. The floor bounds any bad deadline to one
+// forced rotation per minute instead of a sub-second loop; the ceiling keeps
+// the delay far below setTimeout's 32-bit limit (a 30-day resume TTL minus the
+// margin overflows int32 and fires at 1ms), at the cost of a harmless
+// re-resume every few hours on long-lived sessions.
+const LEASE_ROTATION_MIN_DELAY_MS = 60_000
+const LEASE_ROTATION_MAX_DELAY_MS = 6 * 60 * 60 * 1000
 
 export type RelayLeaseRotationDependencies = {
   now: () => number
@@ -23,9 +30,12 @@ export class RelayLeaseRotationTimer {
     if (!leaseExpiresAt) {
       return
     }
-    const delay = Math.max(
-      1000,
-      leaseExpiresAt - this.dependencies.now() - LEASE_ROTATION_MARGIN_MS
+    const delay = Math.min(
+      LEASE_ROTATION_MAX_DELAY_MS,
+      Math.max(
+        LEASE_ROTATION_MIN_DELAY_MS,
+        leaseExpiresAt - this.dependencies.now() - LEASE_ROTATION_MARGIN_MS
+      )
     )
     this.arm(delay)
   }

mobile/src/transport/mobile-relay-reconnect-controller.test.ts

@@ -6,7 +6,9 @@ import { RelayReconnectController } from './mobile-relay-reconnect-controller'
 import type { StableLogicalRpcClient } from './stable-logical-rpc-client'
 
 vi.mock('react-native', () => ({ Platform: { OS: 'ios' } }))
-vi.mock('expo-crypto', () => ({ getRandomBytes: (length: number) => new Uint8Array(length) }))
+vi.mock('expo-crypto', () => ({
+  getRandomBytes: (length: number) => new Uint8Array(length)
+}))
 
 describe('relay reconnect controller', () => {
   beforeEach(() => {
@@ -47,16 +49,146 @@ describe('relay reconnect controller', () => {
     expect(onRetry).not.toHaveBeenCalled()
   })
 
-  it('waits for an external signal after rejected E2EE authentication', () => {
+  it('reprobes slowly after rejected E2EE authentication instead of parking forever', () => {
+    // Why: on a relay-only phone a permanent gate is a permanent outage — the
+    // desktop can commit pairing credentials moments after the first rejection.
     const onRetry = vi.fn()
     const reconnect = createController(onRetry)
 
     reconnect.registerFailure(new MobileE2EEAuthenticationError())
 
     expect(reconnect.shouldDefer()).toBe(true)
-    expect(vi.getTimerCount()).toBe(0)
-    vi.advanceTimersByTime(60_000)
     expect(onRetry).not.toHaveBeenCalled()
+    vi.advanceTimersByTime(59_000)
+    expect(onRetry).not.toHaveBeenCalled()
+    vi.advanceTimersByTime(1_000)
+    expect(onRetry).toHaveBeenCalledTimes(1)
+    // The reprobe tick passes the gate exactly once, then defers again.
+    expect(reconnect.shouldDefer()).toBe(false)
+    expect(reconnect.shouldDefer()).toBe(true)
+  })
+
+  it('keeps the fresh-credential gate reprobing after each failed gated attempt', () => {
+    const onRetry = vi.fn()
+    const reconnect = createController(onRetry)
+
+    reconnect.registerFailure(new RelayOuterError(4401))
+    expect(reconnect.shouldDefer()).toBe(true)
+
+    vi.advanceTimersByTime(60_000)
+    expect(onRetry).toHaveBeenCalledTimes(1)
+    expect(reconnect.shouldDefer()).toBe(false)
+    // The gated attempt fails again with only rejected credentials on hand.
+    reconnect.registerFailure(new RelayOuterError(4401))
+
+    // The gated cadence escalates: the second reprobe waits twice as long.
+    vi.advanceTimersByTime(60_000)
+    expect(onRetry).toHaveBeenCalledTimes(1)
+    vi.advanceTimersByTime(60_000)
+    expect(onRetry).toHaveBeenCalledTimes(2)
+  })
+
+  it('resets the gated cadence when the app returns to the foreground', () => {
+    // Why: reopening the app is the strongest "conditions changed" signal a
+    // phone produces — it must not wait out an escalated 15-minute tick even
+    // when it cannot lift the credential gate itself.
+    const onRetry = vi.fn()
+    const reconnect = createController(onRetry)
+    const logical = { getState: () => 'disconnected' } as never
+
+    reconnect.registerFailure(new RelayOuterError(4401))
+    vi.advanceTimersByTime(60_000)
+    expect(onRetry).toHaveBeenCalledTimes(1)
+    // A failed gated attempt escalates the next tick beyond the base cadence.
+    reconnect.registerFailure(new RelayOuterError(4401))
+
+    reconnect.clear()
+    reconnect.handleForeground(logical, false)
+    expect(onRetry).toHaveBeenCalledTimes(2)
+
+    expect(reconnect.shouldDefer()).toBe(true)
+    vi.advanceTimersByTime(60_000)
+    expect(onRetry).toHaveBeenCalledTimes(3)
+  })
+
+  it('mints the gate pass when arming a no-bundle reprobe under a held gate', () => {
+    // Why: an external-signal gate never records rejected versions, so the
+    // no-dialable-bundle path must still mint the tick's pass token — a plain
+    // cooldown tick bounces off shouldDefer and doubles the effective cadence.
+    const onRetry = vi.fn()
+    const reconnect = createController(onRetry)
+
+    reconnect.registerFailure(new MobileE2EEAuthenticationError())
+    expect(reconnect.shouldDefer()).toBe(true)
+    vi.advanceTimersByTime(60_000)
+    expect(onRetry).toHaveBeenCalledTimes(1)
+    expect(reconnect.shouldDefer()).toBe(false)
+    // The gated attempt finds no dialable credential at all and re-arms.
+    reconnect.armCredentialReprobe()
+
+    vi.advanceTimersByTime(120_000)
+    expect(onRetry).toHaveBeenCalledTimes(2)
+    expect(reconnect.shouldDefer()).toBe(false)
+  })
+
+  it('does not arm a gate reprobe timer when the supervisor declined retries', () => {
+    // Why: scheduleRetry=false means background or stopped — a tick firing
+    // there wakes nothing useful, and the next foreground resume re-arms.
+    const onRetry = vi.fn()
+    const reconnect = createController(onRetry)
+    const logical = { getState: () => 'disconnected' } as never
+
+    reconnect.registerFailure(new MobileE2EEAuthenticationError(), false)
+    expect(vi.getTimerCount()).toBe(0)
+    reconnect.registerFailure(new RelayOuterError(4401), false)
+    expect(vi.getTimerCount()).toBe(0)
+    reconnect.registerFailure(new RelayOuterError(4429), false)
+    expect(vi.getTimerCount()).toBe(0)
+    vi.runAllTimers()
+    expect(onRetry).not.toHaveBeenCalled()
+
+    // Resume restores the gated cadence instead of stalling forever.
+    reconnect.handleForeground(logical, false)
+    expect(reconnect.shouldDefer()).toBe(true)
+    expect(vi.getTimerCount()).toBe(1)
+  })
+
+  it('does not let an orphaned reprobe timer swallow the next fast backoff', () => {
+    const onRetry = vi.fn()
+    const reconnect = createController(onRetry)
+    const logical = { getState: () => 'disconnected' } as never
+
+    reconnect.registerFailure(new MobileE2EEAuthenticationError())
+    // A foreground revival nudge clears the external-signal gate and its timer.
+    reconnect.handleForeground(logical, true)
+    expect(onRetry).toHaveBeenCalledTimes(1)
+
+    // A plain transport failure must schedule its own fast retry, not wait
+    // out a leftover 60s reprobe timer.
+    reconnect.registerFailure(new RelayOuterError(4429))
+    vi.advanceTimersByTime(600)
+    expect(onRetry).toHaveBeenCalledTimes(2)
+  })
+
+  it('lifts the fresh-credential gate when a durable bundle carries a new version', () => {
+    const onRetry = vi.fn()
+    const reconnect = createController(onRetry)
+
+    reconnect.recordRejectedCredential(2)
+    reconnect.armCredentialReprobe()
+    expect(reconnect.shouldDefer()).toBe(true)
+
+    reconnect.acceptFreshCredential(2)
+    expect(reconnect.shouldDefer()).toBe(true)
+
+    reconnect.acceptFreshCredential(3)
+    expect(reconnect.shouldDefer()).toBe(false)
+    expect(
+      reconnect.eligibleCredentials(
+        { token: 'fresh', version: 3, expiresAt: Number.MAX_SAFE_INTEGER },
+        null
+      )
+    ).toHaveLength(1)
   })
 
   it('upgrades host-revival gating to fresh credentials without later downgrading it', () => {

mobile/src/transport/mobile-relay-reconnect-controller.ts

@@ -6,18 +6,10 @@ import {
 import type { MobileRelayRpcSession } from './mobile-relay-rpc-session'
 import { MobileE2EEAuthenticationError } from './mobile-e2ee-v2-physical-channel'
 import { RelayOuterError } from './mobile-relay-e2ee-link'
+import { RELAY_STABLE_CONNECTION_MS, RelayRetryDelays } from './mobile-relay-retry-delays'
 import type { StableLogicalRpcClient } from './stable-logical-rpc-client'
 import type { ConnectionState } from './types'
 
-// Why: relay resume closes and silent cellular NAT rebinds otherwise cause
-// immediate re-dials that ping-pong the phone between connected and disconnected.
-const RELAY_BACKOFF_MIN_MS = 250
-const RELAY_BACKOFF_BASE_MS = 500
-const RELAY_BACKOFF_CEILING_MS = 30_000
-const RELAY_STABLE_CONNECTION_MS = RELAY_BACKOFF_CEILING_MS
-const RELAY_HOST_OFFLINE_RETRY_MIN_MS = 5_000
-const RELAY_HOST_OFFLINE_RETRY_MAX_MS = 15_000
-
 export type RelayReconnectDependencies = {
   now: () => number
   randomBytes: (length: number) => Uint8Array
@@ -34,21 +26,29 @@ export class RelayReconnectController {
   private timer: ReturnType<typeof setTimeout> | null = null
   private activeSession: MobileRelayRpcSession | null = null
   private recoveryGate: RecoveryGate | null = null
+  private gateReprobePending = false
+  private gateReprobeStreak = 0
   private readonly rejectedCredentialVersions = new Set<number>()
+  private readonly delays: RelayRetryDelays
 
   constructor(
     private readonly dependencies: RelayReconnectDependencies,
     private readonly onRetry: (forceReplacement?: boolean) => void
-  ) {}
+  ) {
+    this.delays = new RelayRetryDelays(dependencies.randomBytes)
+  }
 
   handleForeground(logical: StableLogicalRpcClient, wasForeground: boolean): void {
     if (!wasForeground) {
-      // Why: an app resume is a fresh signal, unlike repeated network-flap nudges.
+      // Why: an app resume is a fresh signal, unlike repeated network-flap
+      // nudges — it resets the gated cadence even when it cannot lift the
+      // credential gate, so reopening the app never waits out a 15min tick.
+      this.gateReprobeStreak = 0
       if (this.recoveryGate !== 'fresh-credential') {
         this.reset()
       }
     } else if (this.recoveryGate === 'external-signal') {
-      this.recoveryGate = null
+      this.liftGate()
     }
     if (
       wasForeground &&
@@ -87,8 +87,7 @@ export class RelayReconnectController {
     this.activeSession = session
     this.activeRelayConnectedAt = this.dependencies.now()
     this.nextAttemptAt = 0
-    this.recoveryGate = null
-    this.clearTimer()
+    this.liftGate()
   }
 
   resetForDirectConnection(): boolean {
@@ -97,10 +96,14 @@ export class RelayReconnectController {
     this.activeSession = null
     this.activeRelayConnectedAt = null
     if (needsCredentialRefresh) {
-      // Why: the rejected credential stays unusable until its replacement is durable.
+      // Why: the rejected credential stays unusable until its replacement is
+      // durable. No reprobe timer here — direct is live, rotation over it
+      // clears the gate, and any later state failure re-arms via shouldDefer.
       this.consecutiveFailures = 0
       this.nextAttemptAt = 0
       this.recoveryGate = 'fresh-credential'
+      this.gateReprobePending = false
+      this.gateReprobeStreak = 0
       this.clearTimer()
     } else {
       this.reset()
@@ -128,10 +131,43 @@ export class RelayReconnectController {
     if (eligible.length === 0 && this.rejectedCredentialVersions.size > 0) {
       this.recoveryGate = 'fresh-credential'
       this.clearTimer()
+      this.scheduleGateReprobe()
     }
     return eligible
   }
 
+  // For callers that found no dialable credential at all: keep a slow retry
+  // alive so a later durable write can recover.
+  armCredentialReprobe(): void {
+    if (this.rejectedCredentialVersions.size > 0) {
+      this.recoveryGate = 'fresh-credential'
+      this.clearTimer()
+      this.scheduleGateReprobe()
+      return
+    }
+    if (this.recoveryGate) {
+      // Why: under a held gate the tick must mint its pass token — a plain
+      // cooldown tick bounces off shouldDefer and doubles the effective cadence.
+      this.clearTimer()
+      this.scheduleGateReprobe()
+      return
+    }
+    // Why: a merely missing or expired bundle must not enter the credential
+    // gate — that gate forces a rotation on the next direct connect. A plain
+    // cooldown retries the read on the same escalating cadence.
+    const delay = this.delays.gateReprobeDelayMs(this.gateReprobeStreak)
+    this.nextAttemptAt = this.dependencies.now() + delay
+    this.clearTimer()
+    this.scheduleReprobeTick(delay, false)
+  }
+
+  // A durable bundle whose current version is not rejected reopens the gate.
+  acceptFreshCredential(version: number): void {
+    if (this.recoveryGate === 'fresh-credential' && !this.rejectedCredentialVersions.has(version)) {
+      this.liftGate()
+    }
+  }
+
   recordRejectedCredential(version: number): void {
     this.rejectedCredentialVersions.add(version)
   }
@@ -154,6 +190,12 @@ export class RelayReconnectController {
   // re-dial. Arms the self-scheduled retry so recovery still happens on its own.
   shouldDefer(): boolean {
     if (this.recoveryGate) {
+      if (this.gateReprobePending) {
+        // Why: the slow reprobe tick gets exactly one attempt through the gate.
+        this.gateReprobePending = false
+        return false
+      }
+      this.scheduleGateReprobe()
       return true
     }
     if (this.dependencies.now() < this.nextAttemptAt) {
@@ -173,8 +215,12 @@ export class RelayReconnectController {
       this.recoveryGate === 'fresh-credential' ||
       (this.recoveryGate === 'external-signal' && recovery?.kind !== 'disable-relay-credential')
     ) {
-      // Why: only the gate's external signal can make a known-fatal recovery retryable.
+      // Why: a failed reprobe stays gated, but the slow cadence must keep going
+      // — unless the supervisor is backgrounded/stopped; resume re-arms it.
       this.clearTimer()
+      if (scheduleRetry) {
+        this.scheduleGateReprobe()
+      }
       return
     }
     const now = this.dependencies.now()
@@ -189,18 +235,29 @@ export class RelayReconnectController {
     this.activeRelayConnectedAt = null
     this.consecutiveFailures += 1
     const delay =
-      recovery?.kind === 'retry-after-host-offline' ? this.hostOfflineDelayMs() : this.delayMs()
+      recovery?.kind === 'retry-after-host-offline'
+        ? this.delays.hostOfflineDelayMs()
+        : this.delays.transportDelayMs(this.consecutiveFailures)
     this.nextAttemptAt = now + delay
     if (error instanceof MobileE2EEAuthenticationError) {
-      // Why: pairing state cannot change on a timer; polling only wakes the radio.
+      // Why: an E2EE rejection is usually pairing revocation, but it also fires
+      // transiently right after pairing while the desktop commits credentials —
+      // reprobe slowly instead of waiting forever for a UI nudge.
       this.recoveryGate = 'external-signal'
       this.clearTimer()
+      if (scheduleRetry) {
+        this.scheduleGateReprobe()
+      }
       return
     }
     if (recovery?.kind === 'disable-relay-credential') {
-      // Why: a rejected outer credential cannot recover until direct connectivity refreshes it.
+      // Why: never redial a rejected credential fast, but keep a slow reprobe
+      // alive — the caller re-reads durable state before each gated attempt.
       this.recoveryGate = 'fresh-credential'
       this.clearTimer()
+      if (scheduleRetry) {
+        this.scheduleGateReprobe()
+      }
       return
     }
     if (recovery?.kind === 'retry-after-host-offline') {
@@ -235,12 +292,12 @@ export class RelayReconnectController {
     this.consecutiveFailures = 0
     this.activeRelayConnectedAt = null
     this.nextAttemptAt = 0
-    this.recoveryGate = null
-    this.clearTimer()
+    this.liftGate()
   }
 
   clear(): void {
     this.clearTimer()
+    this.gateReprobePending = false
     this.activeSession = null
     this.activeRelayConnectedAt = null
   }
@@ -263,20 +320,34 @@ export class RelayReconnectController {
     }, delay)
   }
 
-  private delayMs(): number {
-    const exponent = Math.max(0, this.consecutiveFailures - 1)
-    const cap = Math.min(RELAY_BACKOFF_CEILING_MS, RELAY_BACKOFF_BASE_MS * 2 ** exponent)
-    // Full jitter (uniform in [0, cap)), floored so retries never busy-loop.
-    return Math.max(RELAY_BACKOFF_MIN_MS, Math.floor(cap * this.jitterFraction()))
+  private scheduleGateReprobe(): void {
+    this.scheduleReprobeTick(this.delays.gateReprobeDelayMs(this.gateReprobeStreak), true)
   }
 
-  private hostOfflineDelayMs(): number {
-    const range = RELAY_HOST_OFFLINE_RETRY_MAX_MS - RELAY_HOST_OFFLINE_RETRY_MIN_MS
-    return RELAY_HOST_OFFLINE_RETRY_MIN_MS + Math.floor(range * this.jitterFraction())
+  private scheduleReprobeTick(delay: number, mintToken: boolean): void {
+    if (this.timer) {
+      return
+    }
+    this.timer = this.dependencies.setTimer(() => {
+      this.timer = null
+      // Why: the streak advances once per fired tick — arm attempts within one
+      // cycle recompute the same delay instead of triple-escalating it.
+      this.gateReprobeStreak = Math.min(this.gateReprobeStreak + 1, 8)
+      // Why: the tick token is only minted while its gate still holds; a later
+      // gate must not spend a stale token and bypass its own cooldown.
+      if (mintToken && this.recoveryGate) {
+        this.gateReprobePending = true
+      }
+      this.onRetry()
+    }, delay)
   }
 
-  private jitterFraction(): number {
-    const [high, low] = this.dependencies.randomBytes(2)
-    return (((high ?? 0) << 8) | (low ?? 0)) / 0x1_00_00
+  // Why: clearing a gate must also drop its timer, pending tick, and cadence —
+  // an orphaned reprobe timer would otherwise swallow the next fast backoff.
+  private liftGate(): void {
+    this.recoveryGate = null
+    this.gateReprobePending = false
+    this.gateReprobeStreak = 0
+    this.clearTimer()
   }
 }

mobile/src/transport/mobile-relay-recovery-log.ts

@@ -0,0 +1,22 @@
+import type { ConnectionLogSink } from './types'
+
+export type RelayRecoveryLog = (message: string, detail?: string) => void
+
+// Why: relay recovery failed silently in production for weeks; every decision
+// must reach logcat and the in-app connection log.
+export function createRelayRecoveryLog(
+  now: () => number,
+  onLog?: ConnectionLogSink
+): RelayRecoveryLog {
+  let sequence = 0
+  return (message, detail) => {
+    console.log(`[relay] ${message}`, detail ?? '')
+    onLog?.({
+      id: `relay-${++sequence}`,
+      ts: now(),
+      level: 'info',
+      message: `Relay: ${message}`,
+      ...(detail ? { detail } : {})
+    })
+  }
+}

mobile/src/transport/mobile-relay-retry-delays.ts

@@ -0,0 +1,45 @@
+// Why: relay resume closes and silent cellular NAT rebinds otherwise cause
+// immediate re-dials that ping-pong the phone between connected and disconnected.
+const RELAY_BACKOFF_MIN_MS = 250
+const RELAY_BACKOFF_BASE_MS = 500
+const RELAY_BACKOFF_CEILING_MS = 30_000
+export const RELAY_STABLE_CONNECTION_MS = RELAY_BACKOFF_CEILING_MS
+const RELAY_HOST_OFFLINE_RETRY_MIN_MS = 5_000
+const RELAY_HOST_OFFLINE_RETRY_MAX_MS = 15_000
+// Why: gates must slow recovery down, never end it — a relay-only phone has no
+// direct path to refresh credentials, so a timerless gate is a permanent outage.
+// The cadence escalates and jitters so a permanently revoked device is not a
+// forever one-minute beacon and a fleet-wide gating event cannot phase-align.
+const RELAY_GATE_REPROBE_BASE_MS = 60_000
+const RELAY_GATE_REPROBE_CEILING_MS = 15 * 60_000
+
+// Every relay retry delay in one place: transport backoff, known-offline
+// polling, and the escalating gated reprobe cadence, all jittered.
+export class RelayRetryDelays {
+  constructor(private readonly randomBytes: (length: number) => Uint8Array) {}
+
+  transportDelayMs(consecutiveFailures: number): number {
+    const exponent = Math.max(0, consecutiveFailures - 1)
+    const cap = Math.min(RELAY_BACKOFF_CEILING_MS, RELAY_BACKOFF_BASE_MS * 2 ** exponent)
+    // Full jitter (uniform in [0, cap)), floored so retries never busy-loop.
+    return Math.max(RELAY_BACKOFF_MIN_MS, Math.floor(cap * this.jitterFraction()))
+  }
+
+  hostOfflineDelayMs(): number {
+    const range = RELAY_HOST_OFFLINE_RETRY_MAX_MS - RELAY_HOST_OFFLINE_RETRY_MIN_MS
+    return RELAY_HOST_OFFLINE_RETRY_MIN_MS + Math.floor(range * this.jitterFraction())
+  }
+
+  gateReprobeDelayMs(streak: number): number {
+    const base = Math.min(
+      RELAY_GATE_REPROBE_CEILING_MS,
+      RELAY_GATE_REPROBE_BASE_MS * 2 ** Math.min(streak, 8)
+    )
+    return Math.floor(base * (0.75 + 0.5 * this.jitterFraction()))
+  }
+
+  private jitterFraction(): number {
+    const [high, low] = this.randomBytes(2)
+    return (((high ?? 0) << 8) | (low ?? 0)) / 0x1_00_00
+  }
+}

mobile/src/transport/mobile-relay-rpc-session.test.ts

@@ -119,7 +119,7 @@ describe('mobile relay RPC session', () => {
     })
     expect(confirmationRequest.params).not.toHaveProperty('relayDeviceId')
     expect(confirmationRequest.params).not.toHaveProperty('acceptedCredentialVersion')
-    expect(session.getLeaseExpiresAt()).toEqual(expect.any(Number))
+    expect(session.getAttachDeadlineAt()).toEqual(expect.any(Number))
   })
 
   it('rejects a mismatched outer credential version and closes the physical link', () => {

mobile/src/transport/mobile-relay-rpc-session.ts

@@ -19,7 +19,10 @@ type PendingRequest = {
 }
 
 export type MobileRelayRpcSession = RpcClient & {
-  getLeaseExpiresAt(): number | null
+  // The cell's attach-reservation deadline (~10s). Diagnostics only — never
+  // schedule anything from it; rotation keys off getResumeExpiresAt().
+  getAttachDeadlineAt(): number | null
+  getResumeExpiresAt(): number | null
   getResumeConfirmation(): DeviceResumeConfirmed | null
   getFailure(): Error | null
 }
@@ -40,7 +43,8 @@ export function connectMobileRelayRpcSession(args: {
   let state: ConnectionState = 'connecting'
   let requestCounter = 0
   let lastConnectedAt: number | null = null
-  let leaseExpiresAt: number | null = null
+  let attachDeadlineAt: number | null = null
+  let resumeExpiresAt: number | null = null
   let resumeConfirmation: DeviceResumeConfirmed | null = null
   let failure: Error | null = null
   let closed = false
@@ -65,7 +69,8 @@ export function connectMobileRelayRpcSession(args: {
         fail(new Error('relay resume credential version mismatch'))
         return
       }
-      leaseExpiresAt = hello.leaseExpiresAt
+      attachDeadlineAt = hello.leaseExpiresAt
+      resumeExpiresAt = hello.resumeExpiresAt
       publishState('handshaking')
     },
     onAuthenticated: () => void confirmResume(),
@@ -109,7 +114,8 @@ export function connectMobileRelayRpcSession(args: {
       streams.clear()
       publishState('disconnected')
     },
-    getLeaseExpiresAt: () => leaseExpiresAt,
+    getAttachDeadlineAt: () => attachDeadlineAt,
+    getResumeExpiresAt: () => resumeExpiresAt,
     getResumeConfirmation: () => resumeConfirmation,
     getFailure: () => failure
   }
@@ -131,6 +137,7 @@ export function connectMobileRelayRpcSession(args: {
         throw new Error('relay resume confirmation missing')
       }
       resumeConfirmation = result.resumeConfirmation
+      resumeExpiresAt = result.resumeConfirmation.resumeExpiresAt
       lastConnectedAt = Date.now()
       publishState('connected')
     } catch (error) {

mobile/src/transport/mobile-relay-runtime-failover.test.ts

@@ -0,0 +1,454 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { connect, type RpcClient } from './rpc-client'
+import {
+  createStableLogicalRpcClient,
+  type MobileConnectionPath,
+  type StableLogicalRpcClient
+} from './stable-logical-rpc-client'
+import { MobileE2EEAuthenticationError } from './mobile-e2ee-v2-physical-channel'
+import { RelayOuterError } from './mobile-relay-e2ee-link'
+import type { MobileRelayCredentialBundle } from './mobile-relay-credential-bundle'
+import type { MobileRelayRpcSession } from './mobile-relay-rpc-session'
+import {
+  MobileEndpointSupervisor,
+  type MobileEndpointSupervisorDependencies
+} from './mobile-endpoint-supervisor'
+import type { ConnectionState, HostProfile, RpcResponse } from './types'
+
+// Regression suite for the 2026-08 field failure: a phone paired over the
+// relay whose direct LAN endpoint is unreachable (Tailscale off) dialed the
+// LAN endpoint forever and never recovered a relay runtime session.
+
+vi.mock('react-native', () => ({ Platform: { OS: 'android' } }))
+vi.mock('expo-secure-store', () => ({
+  WHEN_UNLOCKED_THIS_DEVICE_ONLY: 'when-unlocked'
+}))
+vi.mock('expo-crypto', () => ({
+  getRandomBytes: (length: number) => new Uint8Array(length)
+}))
+
+vi.mock('./e2ee', () => ({
+  generateKeyPair: () => ({
+    publicKey: new Uint8Array(32),
+    secretKey: new Uint8Array(32)
+  }),
+  deriveSharedKey: () => new Uint8Array(32),
+  publicKeyFromBase64: () => new Uint8Array(32),
+  publicKeyToBase64: () => 'client-public-key',
+  encrypt: (plaintext: string) => plaintext,
+  decrypt: (raw: string) => raw,
+  decryptBytes: (bytes: Uint8Array) => bytes
+}))
+
+class FakeSession implements RpcClient {
+  readonly sendRequest = vi.fn(
+    async (): Promise<RpcResponse> => ({
+      id: 'rpc-1',
+      ok: true,
+      result: {},
+      _meta: { runtimeId: 'runtime-1' }
+    })
+  )
+  readonly subscribe = vi.fn(() => () => {})
+  readonly updateTerminalSubscriptionViewport = vi.fn()
+  readonly notifyForeground = vi.fn()
+  readonly close = vi.fn()
+  private readonly listeners = new Set<(state: ConnectionState) => void>()
+
+  constructor(private state: ConnectionState) {}
+
+  getState = () => this.state
+  getReconnectAttempt = () => 0
+  getLastConnectedAt = () => null
+  onStateChange = (listener: (state: ConnectionState) => void) => {
+    this.listeners.add(listener)
+    return () => this.listeners.delete(listener)
+  }
+
+  publishState(state: ConnectionState): void {
+    this.state = state
+    for (const listener of this.listeners) {
+      listener(state)
+    }
+  }
+}
+
+class FakeRelaySession extends FakeSession implements MobileRelayRpcSession {
+  constructor(
+    state: ConnectionState,
+    private readonly failure: Error | null = null
+  ) {
+    super(state)
+  }
+  // Why: production-realistic constants — fictional fake values hid three
+  // live defects in this subsystem (latch, churn, int32 timer overflow).
+  getAttachDeadlineAt = () => Date.now() + 10_000
+  getResumeExpiresAt = () => Date.now() + 30 * 24 * 3_600_000
+  getResumeConfirmation = () => null
+  getFailure = () => this.failure
+}
+
+class FakeLogicalClient extends FakeSession implements StableLogicalRpcClient {
+  private path: MobileConnectionPath
+
+  constructor(state: ConnectionState, path: MobileConnectionPath) {
+    super(state)
+    this.path = path
+  }
+
+  migrateTo = vi.fn(async (session: RpcClient, path: MobileConnectionPath) => {
+    if (session.getState() !== 'connected') {
+      session.close()
+      throw new Error(`replacement session ${session.getState()}`)
+    }
+    this.path = path
+    this.publishState('connected')
+  })
+  suspendActiveSession = vi.fn(() => this.publishState('disconnected'))
+  getActivePath = () => this.path
+}
+
+const relay = {
+  v: 1 as const,
+  directorUrl: 'https://relay.onorca.dev',
+  cellUrl: 'https://relay-c1.onorca.dev',
+  assignmentEpoch: 7,
+  relayHostId: 'AbCdEf0123_-xyZ9',
+  e2eeFraming: 2 as const
+}
+
+const DIRECT_ENDPOINT = 'ws://100.88.90.25:6768'
+
+const host: HostProfile = {
+  id: 'host-1',
+  name: 'Blue Whale',
+  endpoint: DIRECT_ENDPOINT,
+  deviceToken: 'device-token',
+  publicKeyB64: 'A'.repeat(44),
+  lastConnected: 1,
+  endpoints: [
+    { id: 'direct-primary', kind: 'lan', url: DIRECT_ENDPOINT },
+    {
+      id: 'relay-primary',
+      kind: 'relay',
+      url: 'wss://relay-c1.onorca.dev/v1/connect/id'
+    }
+  ],
+  relayHostId: relay.relayHostId,
+  relay
+}
+
+function bundleWith(version: number, expiresAt: number): MobileRelayCredentialBundle {
+  return {
+    v: 1,
+    hostId: host.id,
+    deviceToken: host.deviceToken,
+    current: {
+      token: `token-v${version}`.padEnd(43, 'A'),
+      hash: 'B'.repeat(43),
+      version,
+      expiresAt
+    }
+  }
+}
+
+function dependencies(
+  overrides: Partial<MobileEndpointSupervisorDependencies> = {}
+): MobileEndpointSupervisorDependencies {
+  return {
+    openDirect: vi.fn(() => new FakeSession('connected')),
+    openRelay: vi.fn(() => new FakeRelaySession('connected')),
+    resolveRelay: vi.fn(async ({ relay }) => relay),
+    readBundle: vi.fn(async () => bundleWith(2, Number.MAX_SAFE_INTEGER)),
+    writeBundle: vi.fn(async () => {}),
+    saveHost: vi.fn(async () => {}),
+    now: Date.now,
+    randomBytes: (length: number) => new Uint8Array(length),
+    setTimer: setTimeout,
+    clearTimer: clearTimeout,
+    ...overrides
+  }
+}
+
+describe('relay runtime recovery without direct connectivity', () => {
+  beforeEach(() => {
+    vi.spyOn(console, 'log').mockImplementation(() => {})
+    vi.useFakeTimers()
+    vi.setSystemTime(new Date('2026-08-02T12:00:00Z'))
+  })
+
+  afterEach(() => {
+    vi.useRealTimers()
+    vi.restoreAllMocks()
+  })
+
+  it('recovers from a rejected outer credential once a fresher bundle is durable', async () => {
+    const logical = new FakeLogicalClient('disconnected', 'lan')
+    const openRelay = vi
+      .fn()
+      .mockReturnValueOnce(new FakeRelaySession('disconnected', new RelayOuterError(4401)))
+      .mockImplementation(() => new FakeRelaySession('connected'))
+    const readBundle = vi
+      .fn(async () => bundleWith(3, Number.MAX_SAFE_INTEGER))
+      .mockResolvedValueOnce(bundleWith(2, Number.MAX_SAFE_INTEGER))
+    const deps = dependencies({ openRelay, readBundle })
+    const supervisor = new MobileEndpointSupervisor(logical, host, deps)
+
+    await supervisor.start()
+    await vi.advanceTimersByTimeAsync(0)
+    expect(openRelay).toHaveBeenCalledOnce()
+
+    // Pre-fix, the fresh-credential gate latched here with no timer and no exit.
+    await vi.advanceTimersByTimeAsync(60_000)
+    expect(openRelay).toHaveBeenCalledTimes(2)
+    expect(openRelay).toHaveBeenLastCalledWith(
+      relay,
+      expect.objectContaining({ version: 3 }),
+      expect.any(String)
+    )
+    expect(logical.getActivePath()).toBe('relay')
+    supervisor.stop()
+  })
+
+  it('recovers when the credential bundle was unreadable at supervisor start', async () => {
+    const logical = new FakeLogicalClient('disconnected', 'lan')
+    const readBundle = vi
+      .fn(async () => bundleWith(2, Number.MAX_SAFE_INTEGER))
+      .mockResolvedValueOnce(null)
+    const deps = dependencies({ readBundle })
+    const supervisor = new MobileEndpointSupervisor(logical, host, deps)
+
+    // Pre-fix, a null first read killed relay recovery for the process lifetime.
+    await supervisor.start()
+    await vi.advanceTimersByTimeAsync(0)
+
+    expect(deps.openRelay).toHaveBeenCalled()
+    expect(logical.getActivePath()).toBe('relay')
+    supervisor.stop()
+  })
+
+  it('recovers from an expired-at-start bundle after a fresh credential lands', async () => {
+    const logical = new FakeLogicalClient('disconnected', 'lan')
+    const expired = bundleWith(2, Date.now() - 1)
+    const readBundle = vi.fn(async () => expired)
+    const deps = dependencies({ readBundle })
+    const supervisor = new MobileEndpointSupervisor(logical, host, deps)
+
+    await supervisor.start()
+    await vi.advanceTimersByTimeAsync(0)
+    expect(deps.openRelay).not.toHaveBeenCalled()
+
+    readBundle.mockImplementation(async () => bundleWith(3, Number.MAX_SAFE_INTEGER))
+    // Pre-fix, an expired bundle produced a silent no-op with nothing scheduled.
+    await vi.advanceTimersByTimeAsync(60_000)
+
+    expect(deps.openRelay).toHaveBeenCalledOnce()
+    expect(logical.getActivePath()).toBe('relay')
+    supervisor.stop()
+  })
+
+  it('retries after an E2EE authentication rejection without a UI nudge', async () => {
+    const logical = new FakeLogicalClient('disconnected', 'lan')
+    const openRelay = vi
+      .fn()
+      .mockReturnValueOnce(
+        new FakeRelaySession('disconnected', new MobileE2EEAuthenticationError())
+      )
+      .mockImplementation(() => new FakeRelaySession('connected'))
+    const deps = dependencies({ openRelay })
+    const supervisor = new MobileEndpointSupervisor(logical, host, deps)
+
+    await supervisor.start()
+    await vi.advanceTimersByTimeAsync(0)
+    expect(openRelay).toHaveBeenCalledOnce()
+
+    // Pre-fix, this state waited indefinitely for a foreground/navigation event.
+    await vi.advanceTimersByTimeAsync(60_000)
+    expect(openRelay).toHaveBeenCalledTimes(2)
+    expect(logical.getActivePath()).toBe('relay')
+    supervisor.stop()
+  })
+
+  it('adopts a durable renewal that extends expiry without bumping the version', async () => {
+    // Why: resume confirmations and pairing recovery renew expiresAt while
+    // keeping current.version — version comparison cannot see this freshness.
+    const logical = new FakeLogicalClient('disconnected', 'lan')
+    const expired = bundleWith(2, Date.now() - 1)
+    const readBundle = vi
+      .fn(async () => bundleWith(2, Number.MAX_SAFE_INTEGER))
+      .mockResolvedValueOnce(expired)
+      .mockResolvedValueOnce(expired)
+    const deps = dependencies({ readBundle })
+    const supervisor = new MobileEndpointSupervisor(logical, host, deps)
+
+    await supervisor.start()
+    await vi.advanceTimersByTimeAsync(0)
+    expect(deps.openRelay).not.toHaveBeenCalled()
+
+    await vi.advanceTimersByTimeAsync(60_000)
+    expect(deps.openRelay).toHaveBeenCalledOnce()
+    expect(deps.openRelay).toHaveBeenLastCalledWith(
+      relay,
+      expect.objectContaining({ version: 2 }),
+      expect.any(String)
+    )
+    expect(logical.getActivePath()).toBe('relay')
+    supervisor.stop()
+  })
+
+  it('adopts a re-paired credential whose version counter restarted', async () => {
+    // Why: re-pairing overwrites the same keychain slot with a NEW credential
+    // record whose counter restarts at 1 — lower than the rejected version.
+    const logical = new FakeLogicalClient('disconnected', 'lan')
+    const openRelay = vi
+      .fn()
+      .mockReturnValueOnce(new FakeRelaySession('disconnected', new RelayOuterError(4401)))
+      .mockImplementation(() => new FakeRelaySession('connected'))
+    const readBundle = vi
+      .fn(async () => bundleWith(1, Number.MAX_SAFE_INTEGER))
+      .mockResolvedValueOnce(bundleWith(4, Number.MAX_SAFE_INTEGER))
+    const deps = dependencies({ openRelay, readBundle })
+    const supervisor = new MobileEndpointSupervisor(logical, host, deps)
+
+    await supervisor.start()
+    await vi.advanceTimersByTimeAsync(0)
+    expect(openRelay).toHaveBeenCalledOnce()
+
+    await vi.advanceTimersByTimeAsync(60_000)
+    expect(openRelay).toHaveBeenCalledTimes(2)
+    expect(openRelay).toHaveBeenLastCalledWith(
+      relay,
+      expect.objectContaining({ version: 1 }),
+      expect.any(String)
+    )
+    expect(logical.getActivePath()).toBe('relay')
+    supervisor.stop()
+  })
+
+  it('does not churn relay sessions off the cell attach-reservation deadline', async () => {
+    // Why: the relay-hello's leaseExpiresAt is a ~10s attach deadline. Keying
+    // rotation off it replaced the session every second, killing any RPC
+    // slower than the cycle (the field symptom: "Worktree list unavailable").
+    const logical = new FakeLogicalClient('disconnected', 'lan')
+    const openRelay = vi.fn(() => new FakeRelaySession('connected'))
+    // Direct stays unreachable, as in the field — return probes must not
+    // confuse the churn measurement by migrating back to direct.
+    const openDirect = vi.fn(() => new FakeSession('disconnected'))
+    const deps = dependencies({ openRelay, openDirect })
+    const supervisor = new MobileEndpointSupervisor(logical, host, deps)
+
+    await supervisor.start()
+    await vi.advanceTimersByTimeAsync(0)
+    expect(openRelay).toHaveBeenCalledOnce()
+
+    await vi.advanceTimersByTimeAsync(5 * 60_000)
+    expect(openRelay).toHaveBeenCalledOnce()
+    expect(logical.getActivePath()).toBe('relay')
+    supervisor.stop()
+  })
+
+  it('recovers immediately on a background/foreground cycle after an E2EE rejection', async () => {
+    const logical = new FakeLogicalClient('disconnected', 'lan')
+    const openRelay = vi
+      .fn()
+      .mockReturnValueOnce(
+        new FakeRelaySession('disconnected', new MobileE2EEAuthenticationError())
+      )
+      .mockImplementation(() => new FakeRelaySession('connected'))
+    const deps = dependencies({ openRelay })
+    const supervisor = new MobileEndpointSupervisor(logical, host, deps)
+
+    await supervisor.start()
+    await vi.advanceTimersByTimeAsync(0)
+    expect(openRelay).toHaveBeenCalledOnce()
+
+    supervisor.setForeground(false)
+    supervisor.setForeground(true)
+    await vi.advanceTimersByTimeAsync(0)
+
+    expect(openRelay).toHaveBeenCalledTimes(2)
+    expect(logical.getActivePath()).toBe('relay')
+    supervisor.stop()
+  })
+})
+
+// The field failure's first symptom: a real direct rpc-client dialing an
+// unroutable LAN endpoint (instant 1006) while relay credentials sit unused.
+class DeadSocket {
+  static constructed: string[] = []
+  onopen: (() => void) | null = null
+  onclose: ((event: { code?: number; reason?: string }) => void) | null = null
+  onerror: ((event: unknown) => void) | null = null
+  onmessage: ((event: { data: unknown }) => void) | null = null
+  readyState = 0
+
+  constructor(readonly url: string) {
+    DeadSocket.constructed.push(url)
+    setTimeout(() => {
+      this.readyState = 3
+      this.onclose?.({ code: 1006, reason: '' })
+    }, 50)
+  }
+
+  send(): void {}
+  close(): void {
+    this.readyState = 3
+  }
+}
+
+describe('failover with a real direct rpc-client', () => {
+  beforeEach(() => {
+    DeadSocket.constructed = []
+    vi.stubGlobal('WebSocket', DeadSocket)
+    vi.spyOn(console, 'log').mockImplementation(() => {})
+    vi.useFakeTimers()
+    vi.setSystemTime(new Date('2026-08-02T12:00:00Z'))
+  })
+
+  afterEach(() => {
+    vi.useRealTimers()
+    vi.unstubAllGlobals()
+    vi.restoreAllMocks()
+  })
+
+  it('migrates the logical client to relay after the direct dial fails', async () => {
+    const logical = createStableLogicalRpcClient(
+      connect(DIRECT_ENDPOINT, host.deviceToken, host.publicKeyB64),
+      'tailscale' as MobileConnectionPath
+    )
+    const deps = dependencies()
+    const supervisor = new MobileEndpointSupervisor(logical, host, deps)
+
+    await supervisor.start()
+    await vi.advanceTimersByTimeAsync(3_000)
+
+    expect(deps.openRelay).toHaveBeenCalled()
+    expect(logical.getActivePath()).toBe('relay')
+    supervisor.stop()
+    logical.close()
+  })
+
+  it('reaches relay even when the bundle read settles after the first direct failure', async () => {
+    const logical = createStableLogicalRpcClient(
+      connect(DIRECT_ENDPOINT, host.deviceToken, host.publicKeyB64),
+      'tailscale' as MobileConnectionPath
+    )
+    const deps = dependencies({
+      readBundle: vi.fn(async () => {
+        await new Promise((resolve) => setTimeout(resolve, 200))
+        return bundleWith(2, Number.MAX_SAFE_INTEGER)
+      })
+    })
+    const supervisor = new MobileEndpointSupervisor(logical, host, deps)
+
+    const started = supervisor.start()
+    await vi.advanceTimersByTimeAsync(300)
+    await started
+    await vi.advanceTimersByTimeAsync(3_000)
+
+    expect(deps.openRelay).toHaveBeenCalled()
+    expect(logical.getActivePath()).toBe('relay')
+    supervisor.stop()
+    logical.close()
+  })
+})

mobile/src/transport/use-open-mobile-host-edit.ts

@@ -0,0 +1,29 @@
+import { useCallback, useEffect, useRef } from 'react'
+import { useNavigation, useRouter } from 'expo-router'
+import {
+  navigateToMobileHostEdit,
+  type MobileHostEditNavigationController,
+  type MobileHostEditRootNavigation
+} from './host-edit-navigation'
+
+export function useOpenMobileHostEdit(): (hostId: string) => void {
+  const navigation = useNavigation<MobileHostEditRootNavigation>()
+  const router = useRouter()
+  const pendingRef = useRef<MobileHostEditNavigationController | null>(null)
+
+  useEffect(
+    () => () => {
+      pendingRef.current?.cancel()
+      pendingRef.current = null
+    },
+    []
+  )
+
+  return useCallback(
+    (hostId) => {
+      pendingRef.current?.cancel()
+      pendingRef.current = navigateToMobileHostEdit(navigation, router, hostId)
+    },
+    [navigation, router]
+  )
+}

mobile/src/worktree/home-host-worktree-fetch.test.ts

@@ -0,0 +1,236 @@
+import { describe, expect, it } from 'vitest'
+import { createHostConnectRefetchGate } from '../transport/host-connect-refetch-gate'
+import type { RpcClient } from '../transport/rpc-client'
+import {
+  createStableLogicalRpcClient,
+  LogicalClientCutoverError
+} from '../transport/stable-logical-rpc-client'
+import type { ConnectionState, RpcResponse } from '../transport/types'
+import { fetchHomeHostWorktreeInfo } from './home-host-worktree-fetch'
+import type { HostWorktreeInfo } from './home-worktree-info'
+
+type FakeSession = {
+  client: RpcClient
+  calls: number
+  settle: (response: RpcResponse | Error) => void
+}
+
+function fakeSession(): FakeSession {
+  const pending: Array<(response: RpcResponse | Error) => void> = []
+  const fake: FakeSession = {
+    calls: 0,
+    settle(response: RpcResponse | Error) {
+      const next = pending.shift()
+      next?.(response)
+    },
+    client: {
+      sendRequest: () => {
+        fake.calls += 1
+        return new Promise<RpcResponse>((resolve, reject) => {
+          pending.push((response) =>
+            response instanceof Error ? reject(response) : resolve(response)
+          )
+        })
+      },
+      subscribe: () => () => {},
+      updateTerminalSubscriptionViewport: () => {},
+      getState: (): ConnectionState => 'connected',
+      getReconnectAttempt: () => 0,
+      getLastConnectedAt: () => null,
+      onStateChange: () => () => {},
+      notifyForeground: () => {},
+      close: () => {}
+    }
+  }
+  return fake
+}
+
+// Drains the promise chain so a retry queued in a .catch has reached the transport.
+const flush = () => new Promise((resolve) => setTimeout(resolve, 0))
+
+function catalogResponse(count: number, active: number): RpcResponse {
+  const worktrees = Array.from({ length: count }, (_, index) => ({
+    worktreeId: `wt-${index}`,
+    repo: 'orca',
+    branch: `branch-${index}`,
+    displayName: `Workspace ${index}`,
+    liveTerminalCount: 0,
+    status: index < active ? ('working' as const) : ('done' as const)
+  }))
+  return { ok: true, result: { worktrees } } as RpcResponse
+}
+
+function infoStore() {
+  let state: Record<string, HostWorktreeInfo> = {}
+  return {
+    get current() {
+      return state
+    },
+    setInfo(updater: (prev: Record<string, HostWorktreeInfo>) => Record<string, HostWorktreeInfo>) {
+      state = updater(state)
+    }
+  }
+}
+
+const notDisposed = () => false
+
+describe('fetchHomeHostWorktreeInfo', () => {
+  it('keeps the last proven counts when the in-flight read rejects', async () => {
+    const store = infoStore()
+    const host = fakeSession()
+
+    const loaded = fetchHomeHostWorktreeInfo(host.client, 'host-1', store.setInfo, notDisposed)
+    host.settle(catalogResponse(12, 2))
+    await loaded
+
+    const failed = fetchHomeHostWorktreeInfo(host.client, 'host-1', store.setInfo, notDisposed)
+    host.settle(new Error('socket closed mid-request'))
+    await failed
+
+    expect(store.current['host-1']).toEqual({
+      hostId: 'host-1',
+      totalWorktrees: 12,
+      activeCount: 2,
+      lastActiveWorktree: expect.objectContaining({ worktreeId: 'wt-0' }),
+      catalogUnavailable: true,
+      staleCounts: true,
+      // Age-stamped so the card can stop calling day-old counts "last known".
+      countsProvenAt: expect.any(Number)
+    })
+  })
+
+  it('stamps when the host proved the counts', async () => {
+    const store = infoStore()
+    const host = fakeSession()
+    const before = Date.now()
+
+    const loaded = fetchHomeHostWorktreeInfo(host.client, 'host-1', store.setInfo, notDisposed)
+    host.settle(catalogResponse(3, 1))
+    await loaded
+
+    const provenAt = store.current['host-1'].countsProvenAt
+    expect(provenAt).toBeGreaterThanOrEqual(before)
+    expect(provenAt).toBeLessThanOrEqual(Date.now())
+  })
+
+  it('marks a host whose catalog never loaded as unavailable, not empty', async () => {
+    const store = infoStore()
+    const host = fakeSession()
+
+    const failed = fetchHomeHostWorktreeInfo(host.client, 'host-1', store.setInfo, notDisposed)
+    host.settle({ ok: false, error: { code: 'internal' } } as RpcResponse)
+    await failed
+
+    expect(store.current['host-1']).toMatchObject({
+      totalWorktrees: 0,
+      catalogUnavailable: true
+    })
+    expect(store.current['host-1'].staleCounts).toBeUndefined()
+  })
+
+  it('re-reads the catalog on reconnect and clears the stale flag', async () => {
+    const store = infoStore()
+    const host = fakeSession()
+    const gate = createHostConnectRefetchGate()
+
+    const connect = async (response: RpcResponse | Error) => {
+      if (!gate.observe('connected')) {
+        return
+      }
+      const done = fetchHomeHostWorktreeInfo(host.client, 'host-1', store.setInfo, notDisposed)
+      host.settle(response)
+      await done
+    }
+
+    await connect(catalogResponse(12, 2))
+    // Socket dies mid-poll: counts survive, flagged stale.
+    const dropped = fetchHomeHostWorktreeInfo(host.client, 'host-1', store.setInfo, notDisposed)
+    host.settle(new Error('socket closed mid-request'))
+    await dropped
+    gate.observe('reconnecting')
+    expect(store.current['host-1'].staleCounts).toBe(true)
+
+    await connect(catalogResponse(13, 3))
+
+    expect(store.current['host-1']).toMatchObject({
+      totalWorktrees: 13,
+      activeCount: 3
+    })
+    expect(store.current['host-1'].staleCounts).toBeUndefined()
+    expect(store.current['host-1'].catalogUnavailable).toBeUndefined()
+    // Two connects + the dropped poll: the gate must not re-read while the link holds.
+    expect(host.calls).toBe(3)
+    await connect(catalogResponse(13, 3))
+    expect(host.calls).toBe(3)
+  })
+
+  it('re-reads through a relay→direct cutover, which never leaves connected', async () => {
+    const store = infoStore()
+    const relay = fakeSession()
+    const direct = fakeSession()
+    const logical = createStableLogicalRpcClient(relay.client, 'relay')
+    const gate = createHostConnectRefetchGate()
+    const gateFires: ConnectionState[] = []
+    logical.onStateChange((state) => {
+      if (gate.observe(state)) {
+        gateFires.push(state)
+      }
+    })
+    gate.observe(logical.getState())
+
+    const loaded = fetchHomeHostWorktreeInfo(logical, 'host-1', store.setInfo, notDisposed)
+    relay.settle(catalogResponse(12, 2))
+    await loaded
+
+    // The supervisor's direct probe migrates while a refresh is on the wire.
+    const interrupted = fetchHomeHostWorktreeInfo(logical, 'host-1', store.setInfo, notDisposed)
+    await logical.migrateTo(direct.client, 'lan')
+    await flush()
+
+    expect(direct.calls).toBe(1)
+    direct.settle(catalogResponse(13, 3))
+    await interrupted
+
+    // The gate can't cover this: migrateTo republishes 'connected' from 'connected'.
+    expect(gateFires).toEqual([])
+    expect(store.current['host-1']).toMatchObject({ totalWorktrees: 13, activeCount: 3 })
+    expect(store.current['host-1'].staleCounts).toBeUndefined()
+    expect(store.current['host-1'].catalogUnavailable).toBeUndefined()
+  })
+
+  it('gives up on a host that keeps cutting over so the card still reports the failure', async () => {
+    const store = infoStore()
+    const host = fakeSession()
+
+    const loaded = fetchHomeHostWorktreeInfo(host.client, 'host-1', store.setInfo, notDisposed)
+    host.settle(catalogResponse(12, 2))
+    await loaded
+
+    const cutoverStorm = fetchHomeHostWorktreeInfo(
+      host.client,
+      'host-1',
+      store.setInfo,
+      notDisposed
+    )
+    for (let attempt = 0; attempt < 6; attempt += 1) {
+      host.settle(new LogicalClientCutoverError())
+      await flush()
+    }
+    await cutoverStorm
+
+    // 1 original + CUTOVER_RETRY_LIMIT retries, then the failure is surfaced.
+    expect(host.calls).toBe(4)
+    expect(store.current['host-1'].staleCounts).toBe(true)
+  })
+
+  it('ignores a response that lands after the screen is disposed', async () => {
+    const store = infoStore()
+    const host = fakeSession()
+
+    const done = fetchHomeHostWorktreeInfo(host.client, 'host-1', store.setInfo, () => true)
+    host.settle(new Error('socket closed mid-request'))
+    await done
+
+    expect(store.current['host-1']).toBeUndefined()
+  })
+})

mobile/src/worktree/home-host-worktree-fetch.ts

@@ -0,0 +1,79 @@
+import { setCachedWorktrees } from '../cache/worktree-cache'
+import { sendSingleFlightRequest } from '../transport/request-single-flight'
+import type { RpcClient } from '../transport/rpc-client'
+import { isLogicalClientCutoverError } from '../transport/stable-logical-rpc-client'
+import {
+  markHomeWorktreeCatalogUnavailable,
+  type HomeWorktreeSummary,
+  type HostWorktreeInfo
+} from './home-worktree-info'
+import { pickResumeWorktree } from './resume-worktree'
+import { WORKTREE_PS_FULL_LIMIT } from './worktree-catalog-snapshot-client'
+
+const ACTIVE_STATUSES = new Set(['working', 'active', 'permission'])
+// Why: a relay↔direct cutover rejects in-flight reads without ever leaving 'connected', so the
+// connect gate never re-arms. Re-issue on the replacement session; cap it so a migration loop
+// can't spin. See runtime-capability-probe.ts for the same hazard on status.get.
+const CUTOVER_RETRY_LIMIT = 2
+
+export type HostWorktreeInfoSetter = (
+  updater: (prev: Record<string, HostWorktreeInfo>) => Record<string, HostWorktreeInfo>
+) => void
+
+/** Reads one host's worktree catalog for the Home card, preserving proven counts on failure. */
+export function fetchHomeHostWorktreeInfo(
+  client: RpcClient,
+  hostId: string,
+  setInfo: HostWorktreeInfoSetter,
+  disposed: () => boolean
+): Promise<void> {
+  const markUnavailable = (): void => {
+    setInfo((prev) => {
+      const current = prev[hostId]
+      const next = markHomeWorktreeCatalogUnavailable(current, hostId)
+      return next === current ? prev : { ...prev, [hostId]: next }
+    })
+  }
+
+  const attempt = (cutoverRetriesLeft: number): Promise<void> =>
+    sendSingleFlightRequest(client, hostId, 'worktree.ps', { limit: WORKTREE_PS_FULL_LIMIT })
+      .then((response) => {
+        if (disposed()) {
+          return
+        }
+        if (!response.ok) {
+          markUnavailable()
+          return
+        }
+        const result = response.result as { worktrees?: HomeWorktreeSummary[] }
+        const worktrees = result.worktrees ?? []
+        setCachedWorktrees(hostId, worktrees)
+        const active = worktrees.filter((w) => w.status && ACTIVE_STATUSES.has(w.status))
+        // Mirror the desktop's focused workspace (see pickResumeWorktree).
+        const lastActive = pickResumeWorktree(worktrees)
+        setInfo((prev) => ({
+          ...prev,
+          [hostId]: {
+            hostId,
+            totalWorktrees: worktrees.length,
+            activeCount: active.length,
+            lastActiveWorktree: lastActive,
+            countsProvenAt: Date.now()
+          }
+        }))
+      })
+      .catch((error: unknown) => {
+        if (disposed()) {
+          return
+        }
+        // A cutover raises only after migrateTo installed an authenticated replacement, so the
+        // read was interrupted, not answered — ask again instead of latching "Last known".
+        if (cutoverRetriesLeft > 0 && isLogicalClientCutoverError(error)) {
+          return attempt(cutoverRetriesLeft - 1)
+        }
+        // Any other rejection (socket died mid-request) is a failed refresh, not an empty host.
+        markUnavailable()
+      })
+
+  return attempt(CUTOVER_RETRY_LIMIT)
+}

mobile/src/worktree/home-worktree-info.test.ts

@@ -1,5 +1,10 @@
 import { describe, expect, it } from 'vitest'
-import { markHomeWorktreeCatalogUnavailable, type HostWorktreeInfo } from './home-worktree-info'
+import {
+  HOME_WORKTREE_COUNTS_LIVE_MAX_AGE_MS,
+  homeHostWorktreeSummary,
+  markHomeWorktreeCatalogUnavailable,
+  type HostWorktreeInfo
+} from './home-worktree-info'
 
 describe('markHomeWorktreeCatalogUnavailable', () => {
   it('marks a host unavailable when no catalog has loaded', () => {
@@ -28,7 +33,8 @@ describe('markHomeWorktreeCatalogUnavailable', () => {
 
     expect(markHomeWorktreeCatalogUnavailable(current, 'host-1')).toEqual({
       ...current,
-      catalogUnavailable: true
+      catalogUnavailable: true,
+      staleCounts: true
     })
   })
 
@@ -44,3 +50,73 @@ describe('markHomeWorktreeCatalogUnavailable', () => {
     expect(markHomeWorktreeCatalogUnavailable(current, 'host-1')).toBe(current)
   })
 })
+
+describe('homeHostWorktreeSummary', () => {
+  const provenAt = 1_700_000_000_000
+  const loaded: HostWorktreeInfo = {
+    hostId: 'host-1',
+    totalWorktrees: 12,
+    activeCount: 2,
+    lastActiveWorktree: null,
+    countsProvenAt: provenAt
+  }
+
+  it('summarizes a freshly loaded catalog', () => {
+    expect(homeHostWorktreeSummary(loaded, provenAt)).toBe('12 worktrees · 2 active')
+    expect(
+      homeHostWorktreeSummary({ ...loaded, totalWorktrees: 1, activeCount: 0 }, provenAt)
+    ).toBe('1 worktree')
+  })
+
+  it('keeps showing the last proven counts after a failed refresh', () => {
+    const afterFailure = markHomeWorktreeCatalogUnavailable(loaded, 'host-1')
+
+    expect(homeHostWorktreeSummary(afterFailure, provenAt + 30_000)).toBe(
+      'Last known: 12 worktrees · 2 active'
+    )
+  })
+
+  it('keeps the last proven counts however long ago the refresh failed', () => {
+    const afterFailure = markHomeWorktreeCatalogUnavailable(loaded, 'host-1')
+
+    // A session that stays connected past the live window then hits one failed refresh is the
+    // headline case: the counts are history, not nothing.
+    expect(
+      homeHostWorktreeSummary(afterFailure, provenAt + HOME_WORKTREE_COUNTS_LIVE_MAX_AGE_MS + 1)
+    ).toBe('Last known: 12 worktrees · 2 active')
+    expect(homeHostWorktreeSummary(afterFailure, provenAt + 3 * 86_400_000)).toBe(
+      'Last known: 12 worktrees · 2 active'
+    )
+  })
+
+  it('stops calling aged-out counts live even while a refresh is only pending', () => {
+    // A snapshot rehydrated from a previous app session describes a host we have not reached yet.
+    expect(homeHostWorktreeSummary(loaded, provenAt + HOME_WORKTREE_COUNTS_LIVE_MAX_AGE_MS)).toBe(
+      '12 worktrees · 2 active'
+    )
+    expect(
+      homeHostWorktreeSummary(loaded, provenAt + HOME_WORKTREE_COUNTS_LIVE_MAX_AGE_MS + 1)
+    ).toBe('Last known: 12 worktrees · 2 active')
+    expect(homeHostWorktreeSummary(loaded, provenAt + 3 * 86_400_000)).toBe(
+      'Last known: 12 worktrees · 2 active'
+    )
+  })
+
+  it('treats counts persisted before age stamping as no longer live', () => {
+    const preUpgrade: HostWorktreeInfo = { ...loaded, countsProvenAt: undefined }
+
+    expect(homeHostWorktreeSummary(preUpgrade, provenAt)).toBe(
+      'Last known: 12 worktrees · 2 active'
+    )
+    expect(
+      homeHostWorktreeSummary(markHomeWorktreeCatalogUnavailable(preUpgrade, 'host-1'), provenAt)
+    ).toBe('Last known: 12 worktrees · 2 active')
+  })
+
+  it('reports unavailable only when no catalog ever loaded', () => {
+    expect(homeHostWorktreeSummary(markHomeWorktreeCatalogUnavailable(undefined, 'host-1'))).toBe(
+      'Worktree list unavailable'
+    )
+    expect(homeHostWorktreeSummary(undefined)).toBeNull()
+  })
+})

mobile/src/worktree/home-worktree-info.ts

@@ -15,8 +15,17 @@ export type HostWorktreeInfo = {
   activeCount: number
   lastActiveWorktree: HomeWorktreeSummary | null
   catalogUnavailable?: boolean
+  // The counts are the last proven ones, kept across a failed refresh.
+  staleCounts?: boolean
+  // When the host last answered with these counts (ms epoch); absent in snapshots an older
+  // build persisted, which is why an unstamped count counts as expired rather than fresh.
+  countsProvenAt?: number
 }
 
+// Why: the home snapshot is persisted across launches, so counts could otherwise be rendered as
+// live while describing a workspace set proven days ago. Past this window they are only history.
+export const HOME_WORKTREE_COUNTS_LIVE_MAX_AGE_MS = 10 * 60_000
+
 export function markHomeWorktreeCatalogUnavailable(
   current: HostWorktreeInfo | undefined,
   hostId: string
@@ -25,7 +34,9 @@ export function markHomeWorktreeCatalogUnavailable(
     return current
   }
   if (current) {
-    return { ...current, catalogUnavailable: true }
+    // Why: `current` predates this failure, so its counts are proven host truth — a dropped
+    // socket must not erase them, only flag them as no longer live.
+    return { ...current, catalogUnavailable: true, staleCounts: true }
   }
   return {
     hostId,
@@ -35,3 +46,32 @@ export function markHomeWorktreeCatalogUnavailable(
     catalogUnavailable: true
   }
 }
+
+/** The host card's worktree line, or null when nothing is known yet. */
+export function homeHostWorktreeSummary(
+  info: HostWorktreeInfo | undefined,
+  now: number = Date.now()
+): string | null {
+  if (!info) {
+    return null
+  }
+  // Why (STA-3123): a catalog that never loaded must not assert a count the host has not proven.
+  if (info.catalogUnavailable && !info.staleCounts) {
+    return 'Worktree list unavailable'
+  }
+  const counts = `${info.totalWorktrees} worktree${info.totalWorktrees === 1 ? '' : 's'}${
+    info.activeCount > 0 ? ` · ${info.activeCount} active` : ''
+  }`
+  // Age bounds liveness, not the counts themselves: a failed refresh — or a rehydrated snapshot the
+  // host has not re-confirmed — is still the last thing it told us, so keep it and drop the claim
+  // that it is current.
+  return info.staleCounts || !provenRecently(info, now) ? `Last known: ${counts}` : counts
+}
+
+function provenRecently(info: HostWorktreeInfo, now: number): boolean {
+  // A snapshot written before countsProvenAt existed has an unknowable age; treat it as expired.
+  return (
+    typeof info.countsProvenAt === 'number' &&
+    now - info.countsProvenAt <= HOME_WORKTREE_COUNTS_LIVE_MAX_AGE_MS
+  )
+}

mobile/src/worktree/host-worktree-refresh.test.ts

@@ -86,8 +86,8 @@ describe('startHostWorktreeRefresh', () => {
     // Mount force-fetch.
     expect(fetchRepoMetadata).toHaveBeenCalledTimes(1)
 
-    // Foregrounded: repo.list rides the interval as a convergence safety-net for desktop
-    // Settings edits that never emit a runtime reposChanged (the callee self-throttles).
+    // Foregrounded: repo.list rides the interval as a convergence safety-net for hosts on an
+    // older build, whose Settings edits emit no runtime reposChanged (the callee self-throttles).
     await vi.advanceTimersByTimeAsync(9_000)
     expect(fetchWorktrees).toHaveBeenCalledTimes(4)
     expect(fetchRepoMetadata).toHaveBeenCalledTimes(4)

mobile/src/worktree/host-worktree-refresh.ts

@@ -39,11 +39,11 @@ export function startHostWorktreeRefresh({
       return
     }
     void fetchWorktrees()
-    // Why: desktop Settings repo edits (icon/color/name, repo removal) notify only the
-    // renderer IPC, not the runtime clientEvents stream, so `reposChanged` never reaches
-    // mobile. Keep a periodic repo.list as the convergence safety-net; fetchRepoMetadata
-    // self-throttles to REPO_METADATA_REFRESH_MS (60s), so this is ~1 request/min while
-    // foregrounded — the AppState gate is what removes the waste (both stop while backgrounded).
+    // Why: desktop Settings repo edits (icon/color/name, repo removal) now emit `reposChanged`
+    // (#11994), but a host on an older build does not; keep this periodic repo.list as the
+    // convergence safety-net. fetchRepoMetadata self-throttles to REPO_METADATA_REFRESH_MS
+    // (60s), so this is ~1 request/min while foregrounded — the AppState gate is what removes
+    // the waste (both stop while backgrounded).
     void fetchRepoMetadata()
   }, WORKTREE_REFRESH_MS)
   const unsubscribe = client.subscribe(

mobile/src/worktree/workspace-list-sections.test.ts

@@ -106,6 +106,95 @@ describe('filterWorktrees', () => {
     ).toEqual([featureNamedMain])
   })
 
+  it('keeps a sleeping main worktree visible under hide-sleeping by default (#8873)', () => {
+    const main = worktree({ worktreeId: 'main', branch: 'main', isMainWorktree: true })
+    const feature = worktree({ worktreeId: 'feature', isMainWorktree: false })
+
+    expect(
+      filterWorktrees(
+        [main, feature],
+        { filterRepoIds: new Set(), hideSleeping: true, hideDefaultBranch: false },
+        ''
+      )
+    ).toEqual([main])
+  })
+
+  it('keeps a sleeping folder workspace visible under hide-sleeping', () => {
+    const folder = worktree({
+      workspaceKind: 'folder-workspace',
+      worktreeId: 'folder:workspace-1',
+      branch: '',
+      isMainWorktree: true
+    })
+
+    expect(
+      filterWorktrees(
+        [folder],
+        { filterRepoIds: new Set(), hideSleeping: true, hideDefaultBranch: false },
+        ''
+      )
+    ).toEqual([folder])
+  })
+
+  it('re-hides the sleeping main worktree when the desktop setting is off', () => {
+    const main = worktree({ worktreeId: 'main', branch: 'main', isMainWorktree: true })
+
+    expect(
+      filterWorktrees(
+        [main],
+        {
+          filterRepoIds: new Set(),
+          hideSleeping: true,
+          hideDefaultBranch: false,
+          alwaysShowDefaultBranch: false
+        },
+        ''
+      )
+    ).toEqual([])
+  })
+
+  it('falls back to the branch heuristic for hosts that omit isMainWorktree', () => {
+    const legacyMain = worktree({ worktreeId: 'legacy-main', branch: 'refs/heads/master' })
+
+    expect(
+      filterWorktrees(
+        [legacyMain],
+        { filterRepoIds: new Set(), hideSleeping: true, hideDefaultBranch: false },
+        ''
+      )
+    ).toEqual([legacyMain])
+  })
+
+  it('keeps a sleeping folder workspace on hosts that omit isMainWorktree', () => {
+    // A folder workspace has no branch, so the legacy branch heuristic can never
+    // recognise it — without its own arm, #8873 still reproduces on old desktops.
+    const legacyFolder = worktree({
+      workspaceKind: 'folder-workspace',
+      worktreeId: 'folder:legacy-1',
+      branch: ''
+    })
+
+    expect(
+      filterWorktrees(
+        [legacyFolder],
+        { filterRepoIds: new Set(), hideSleeping: true, hideDefaultBranch: false },
+        ''
+      )
+    ).toEqual([legacyFolder])
+  })
+
+  it('lets hide-default-branch still win over the sleeping exemption', () => {
+    const main = worktree({ worktreeId: 'main', branch: 'main', isMainWorktree: true })
+
+    expect(
+      filterWorktrees(
+        [main],
+        { filterRepoIds: new Set(), hideSleeping: true, hideDefaultBranch: true },
+        ''
+      )
+    ).toEqual([])
+  })
+
   it('keeps folder workspaces when default branch hiding is enabled', () => {
     const folder = worktree({
       workspaceKind: 'folder-workspace',

mobile/src/worktree/workspace-list-sections.ts

@@ -65,6 +65,19 @@ function isDefaultBranchWorkspace(w: Worktree): boolean {
   return branch === 'main' || branch === 'master'
 }
 
+/**
+ * Whether "Hide sleeping" must keep this row — the project's entry point (#8873).
+ * Falls back to the branch heuristic for hosts that predate isMainWorktree; a
+ * folder workspace is always its project's entry point, and isDefaultBranchWorkspace
+ * rejects it by design, so it needs its own legacy arm or #8873 still reproduces.
+ */
+function isSleepingSweepExempt(w: Worktree, alwaysShowDefaultBranch: boolean | undefined): boolean {
+  if (alwaysShowDefaultBranch === false) {
+    return false
+  }
+  return w.isMainWorktree ?? (w.workspaceKind === 'folder-workspace' || isDefaultBranchWorkspace(w))
+}
+
 function orderMainWorktreeFirst(worktrees: Worktree[]): Worktree[] {
   const mainWorktrees = worktrees.filter((worktree) => worktree.isMainWorktree)
   if (mainWorktrees.length === 0) {
@@ -80,7 +93,9 @@ export function filterWorktrees(
 ): Worktree[] {
   let result = worktrees.filter((w) => !w.isArchived)
   if (filters.hideSleeping) {
-    result = result.filter(isWorktreeActive)
+    result = result.filter(
+      (w) => isSleepingSweepExempt(w, filters.alwaysShowDefaultBranch) || isWorktreeActive(w)
+    )
   }
   if (filters.hideDefaultBranch) {
     result = result.filter((w) => !isDefaultBranchWorkspace(w))

mobile/src/worktree/workspace-list-types.ts

@@ -52,6 +52,8 @@ export type FilterState = {
   filterRepoIds: Set<string>
   hideSleeping: boolean
   hideDefaultBranch: boolean
+  /** Absent means on: #8873's exemption must fail open on older host payloads. */
+  alwaysShowDefaultBranch?: boolean
 }
 
 export type Section = { key: string; title: string; icon?: 'pin'; data: Worktree[] }

mobile/src/worktree/workspace-view-settings.ts

@@ -16,6 +16,7 @@ export type WorkspaceViewSettings = {
   sortBy?: 'name' | 'smart' | 'recent' | 'repo' | 'manual'
   hideSleepingWorkspaces?: boolean
   hideDefaultBranchWorkspace?: boolean
+  alwaysShowDefaultBranchWorkspace?: boolean
   filterRepoIds?: string[]
   collapsedGroups?: string[]
   workspaceStatuses?: WorkspaceStatusDefinition[]
@@ -60,6 +61,7 @@ export type MobileViewState = {
   sortMode: MobileSortMode
   hideSleeping: boolean
   hideDefaultBranch: boolean
+  alwaysShowDefaultBranch: boolean
   filterRepoIds: string[]
   collapsedGroups: string[]
   workspaceStatuses: readonly WorkspaceStatusDefinition[]
@@ -83,6 +85,8 @@ export function applyDesktopViewSettings(
     sortMode: sortMode ?? current.sortMode,
     hideSleeping: settings.hideSleepingWorkspaces ?? current.hideSleeping,
     hideDefaultBranch: settings.hideDefaultBranchWorkspace ?? current.hideDefaultBranch,
+    alwaysShowDefaultBranch:
+      settings.alwaysShowDefaultBranchWorkspace ?? current.alwaysShowDefaultBranch,
     filterRepoIds: settings.filterRepoIds ?? current.filterRepoIds,
     collapsedGroups: settings.collapsedGroups ?? current.collapsedGroups,
     workspaceStatuses