diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 2957c8eaa6e..a862d0d9395 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -315,6 +315,7 @@ jobs:
               . != "tests/e2e/ssh-codex-display-artifacts-repro.spec.ts" and
               . != "tests/e2e/ssh-cold-activation-restore.spec.ts" and
               . != "tests/e2e/ssh-cold-hydration-gap-tab-seeding.spec.ts" and
+              . != "tests/e2e/ssh-emptied-worktree-reactivation.spec.ts" and
               . != "tests/e2e/ssh-docker-five-pane-input-under-flood.spec.ts" and
               . != "tests/e2e/ssh-docker-bulk-open-freeze-repro.spec.ts" and
               . != "tests/e2e/ssh-docker-half-open-link.spec.ts" and
@@ -386,6 +387,7 @@ jobs:
       contains(inputs.test_files, 'tests/e2e/ssh-codex-display-artifacts-repro.spec.ts') ||
       contains(inputs.test_files, 'tests/e2e/ssh-cold-activation-restore.spec.ts') ||
       contains(inputs.test_files, 'tests/e2e/ssh-cold-hydration-gap-tab-seeding.spec.ts') ||
+      contains(inputs.test_files, 'tests/e2e/ssh-emptied-worktree-reactivation.spec.ts') ||
       contains(inputs.test_files, 'tests/e2e/ssh-docker-five-pane-input-under-flood.spec.ts') ||
       contains(inputs.test_files, 'tests/e2e/ssh-docker-bulk-open-freeze-repro.spec.ts') ||
       contains(inputs.test_files, 'tests/e2e/ssh-docker-half-open-link.spec.ts') ||
diff --git a/config/scripts/check-runtime-electron-ratchet.mjs b/config/scripts/check-runtime-electron-ratchet.mjs
index 19810c2f402..3e04b8c46f2 100644
--- a/config/scripts/check-runtime-electron-ratchet.mjs
+++ b/config/scripts/check-runtime-electron-ratchet.mjs
@@ -48,9 +48,9 @@ export const STRUCTURED_CHAT_LANES = [
   { directory: ['src', 'main', 'codex'] },
   { directory: ['src', 'shared'] },
   { directory: ['src', 'main', 'runtime'], basename: /^(?:structured-|agent-session-)/ },
-  // Allowed absent until they land; every other lane throws if missing, so a rename can't empty it.
-  { directory: ['src', 'main', 'acp'], mayBeAbsent: true },
-  { directory: ['src', 'main', 'provider-process'], mayBeAbsent: true }
+  { directory: ['src', 'main', 'provider-process'] },
+  // Allowed absent until it lands; every other lane throws if missing, so a rename can't empty it.
+  { directory: ['src', 'main', 'acp'], mayBeAbsent: true }
 ]
 
 export function collectStructuredChatEntryPoints(root = ROOT) {
diff --git a/config/scripts/check-runtime-electron-ratchet.test.mjs b/config/scripts/check-runtime-electron-ratchet.test.mjs
index 1f4f37c01a9..a8985f0c014 100644
--- a/config/scripts/check-runtime-electron-ratchet.test.mjs
+++ b/config/scripts/check-runtime-electron-ratchet.test.mjs
@@ -32,12 +32,13 @@ describe('structured chat coverage', () => {
     return root
   }
 
-  // Every lane that must exist; acp/ and provider-process/ may be absent until they land.
+  // Every lane that must exist; acp/ may be absent until it lands.
   const requiredLanes = {
     'src/main/native-chat/reader.ts': 'export {}',
     'src/main/claude/claude-session.ts': 'export {}',
     'src/main/codex/codex-session.ts': 'export {}',
     'src/main/runtime/structured-agent-session-host.ts': 'export {}',
+    'src/main/provider-process/provider-process-teardown.ts': 'export {}',
     'src/shared/agent-session-record.ts': 'export {}'
   }
 
@@ -89,7 +90,7 @@ describe('structured chat coverage', () => {
         Object.entries(requiredLanes).filter(([file]) => !file.startsWith(`${lane}/`))
       )
       expect(() => collectStructuredChatEntryPoints(fixture(without))).toThrow(`${lane} is missing`)
-      expect(collectStructuredChatEntryPoints(fixture(requiredLanes))).toHaveLength(5)
+      expect(collectStructuredChatEntryPoints(fixture(requiredLanes))).toHaveLength(6)
     }
   )
 
@@ -128,7 +129,7 @@ describe('the default entry points', () => {
     }
   })
 
-  // Retires the temporary flag: the PR that adds acp/ or provider-process/ must make it required.
+  // Retires the temporary flag: the PR that adds acp/ must make it required.
   it('lets only directories that have not landed yet be absent', () => {
     for (const lane of STRUCTURED_CHAT_LANES.filter((candidate) => candidate.mayBeAbsent)) {
       expect(
diff --git a/config/scripts/ci-e2e-job-selection.mjs b/config/scripts/ci-e2e-job-selection.mjs
index 6126e753b5d..cb9d07aec25 100644
--- a/config/scripts/ci-e2e-job-selection.mjs
+++ b/config/scripts/ci-e2e-job-selection.mjs
@@ -8,6 +8,7 @@ export const DOCKER_SSH_E2E_SPECS = [
   'tests/e2e/ssh-codex-display-artifacts-repro.spec.ts',
   'tests/e2e/ssh-cold-activation-restore.spec.ts',
   'tests/e2e/ssh-cold-hydration-gap-tab-seeding.spec.ts',
+  'tests/e2e/ssh-emptied-worktree-reactivation.spec.ts',
   'tests/e2e/ssh-docker-five-pane-input-under-flood.spec.ts',
   'tests/e2e/ssh-docker-bulk-open-freeze-repro.spec.ts',
   'tests/e2e/ssh-docker-half-open-link.spec.ts',
diff --git a/config/scripts/run-ssh-docker-e2e.mjs b/config/scripts/run-ssh-docker-e2e.mjs
index 64709cdbb43..72fbbb9d44f 100644
--- a/config/scripts/run-ssh-docker-e2e.mjs
+++ b/config/scripts/run-ssh-docker-e2e.mjs
@@ -60,6 +60,7 @@ const result = spawnSync(
     'tests/e2e/ssh-codex-display-artifacts-repro.spec.ts',
     'tests/e2e/ssh-cold-activation-restore.spec.ts',
     'tests/e2e/ssh-cold-hydration-gap-tab-seeding.spec.ts',
+    'tests/e2e/ssh-emptied-worktree-reactivation.spec.ts',
     'tests/e2e/ssh-docker-five-pane-input-under-flood.spec.ts',
     'tests/e2e/ssh-docker-bulk-open-freeze-repro.spec.ts',
     'tests/e2e/ssh-docker-half-open-link.spec.ts',
diff --git a/config/update-translation.txt b/config/update-translation.txt
index d1a85bab724..566189544c4 100644
--- a/config/update-translation.txt
+++ b/config/update-translation.txt
@@ -65,3 +65,45 @@ Method (reproducible):
   ko 색인화. R3 sign-off clean on all locales (R2 fixes byte-verified,
   full placeholder parity 0 mismatches, 0 missing keys).
 
+## Scan 2026-10-05
+
+- HEAD scanned: d3943c6d81 (origin/main; branch rebased onto it). Base: a15a5c8c1a6.
+  Window: a15a5c8c1a6 .. HEAD (~1008 commits). Note: origin/main was still advancing
+  during the scan; the one en key added in the last 13 commits (browser markup
+  `...tool.eraser`) already shipped translated upstream in all five locales.
+- Gates before fix: catalog verify PASS (all five locales missing the SAME 87 keys),
+  coverage --check PASS (13 allowlisted), extraction PASS, runtime-catalog PASS.
+  So no unkeyed strings and en.json in sync; the gap was target-locale coverage only.
+- Delta since base: 87 new en keys (csv editor x34, provider credit balance x11,
+  activity x31, jira assignee x3, workspace-delete change checks x5, nested-worktree
+  removal x10) plus 18 changed en values (Gemini CLI legacy, structured-chat copy/scope,
+  markdown notes, unverifiable -> "no recent update", onboarding casing, arrow spacing).
+  es had fully caught up to fr/ja/ko/zh, so all five shared the same 87-key gap.
+- **11 of the 87 are intentionally untranslated**: the provider credit-balance keys
+  (`auto.components.status.bar.{StatusBar.*,tooltip.*,provider.extra.usage.section.*}`)
+  are pinned as sparse-fallback by `provider-credit-balance-locales.test.ts` (#25408),
+  which asserts every target catalog OMITS them and falls back to English at runtime.
+  Translated the remaining 76 new keys (x5) and left the 11 balance keys absent.
+- Changed-value review: 15 of the 18 already matched the new English upstream; only 3
+  were stale (AccountsPane Gemini legacy description + label, onboarding arrow spacing).
+- Applied 76 new keys x5 via apply-translation-delta.mjs (pipeline repaired ja
+  open->オープン, zh 智能体->代理 xN, ko refreshFailed spacing) + 3 stale updates x5 via
+  the same repairTranslatedValue gate. Strictly additive: +380 new keys, 0 removed.
+- Gates after fix: catalog verify PASS (all five 15268/15279; the 11 omissions are the
+  pinned balance keys), coverage --check PASS (13 allowlisted), extraction PASS,
+  runtime-catalog PASS, locale vitest suites PASS (34 files, 288 tests).
+- Reviews (3 of max 4 rounds; round 0 = 5 parallel translators, then 5 reviewers/round):
+  R1 applied 11 fixes (es structuredCopy "Off"->"Si está desactivado", structuredScope
+  semicolon lowercase, 5f02e6fb21 review->"de revisión"; fr nestedRemoval pronoun
+  agreement; ja f80603d293 compound-word space + csv.indexProgress->インデックス作成中;
+  ko f80603d293 agent->에이전트 + structuredScope fallback + structuredCopy 지원->기반;
+  zh f80603d293 切换->交接/注释->笔记 + threadListOptionsActive->个生效).
+  R1 rejected 2 as repo-convention conflicts: ja TaskPage half-width 例: (28 existing
+  occurrences) and ko showMoreAgents (pinned Latin "agents" by
+  config/scripts/locale-ko-key-overrides.json, so no locale change).
+  R2 applied 3 (es structuredScope unified "chat de terminal"; zh structuredCopy
+  ->基于终端的 + activity hideAutomation/CLI-created re-add 工作区 to match ja/ko);
+  ko re-flagged the pinned override, rejected again.
+  R3 sign-off clean on all five locales (0 errors, 0 warns; placeholders byte-identical,
+  0 stale changed keys, 0 generic-term regressions).
+
diff --git a/src/main/codex/codex-structured-dispatch-echo.test.ts b/src/main/codex/codex-structured-dispatch-echo.test.ts
index c7eb43bf96f..1eeb8186ad9 100644
--- a/src/main/codex/codex-structured-dispatch-echo.test.ts
+++ b/src/main/codex/codex-structured-dispatch-echo.test.ts
@@ -133,9 +133,9 @@ describe('the turn Codex answered a send into but has not opened', () => {
   it('is the turn the latest armed send was answered into', () => {
     const echoes = createCodexDispatchEchoes()
     echoes.arm('client-1')
-    echoes.bindTurn('client-1', 'thread-1', 'turn-1')
+    echoes.bindTurn('client-1', 'thread-1', 'turn-1', 'start')
     echoes.arm('client-2')
-    echoes.bindTurn('client-2', 'thread-1', 'turn-2')
+    echoes.bindTurn('client-2', 'thread-1', 'turn-2', 'start')
 
     expect(echoes.answeredUnopenedTurn('thread-1', NONE_OPEN)).toBe('turn-2')
   })
@@ -143,7 +143,7 @@ describe('the turn Codex answered a send into but has not opened', () => {
   it('is none once Codex opened that turn', () => {
     const echoes = createCodexDispatchEchoes()
     echoes.arm('client-1')
-    echoes.bindTurn('client-1', 'thread-1', 'turn-1')
+    echoes.bindTurn('client-1', 'thread-1', 'turn-1', 'start')
 
     expect(echoes.answeredUnopenedTurn('thread-1', new Set(['turn-1']))).toBeNull()
   })
@@ -151,7 +151,7 @@ describe('the turn Codex answered a send into but has not opened', () => {
   it('is none once that turn ended, even with its send still armed for an echo', () => {
     const echoes = createCodexDispatchEchoes()
     echoes.arm('client-1')
-    echoes.bindTurn('client-1', 'thread-1', 'turn-1')
+    echoes.bindTurn('client-1', 'thread-1', 'turn-1', 'start')
     // A completed end leaves its unechoed send armed.
     expect(echoes.endTurn('thread-1', 'turn-1', { status: 'completed' })).toEqual([])
 
@@ -161,9 +161,9 @@ describe('the turn Codex answered a send into but has not opened', () => {
   it('skips a turn a wait left unopened, and still names an earlier one', () => {
     const echoes = createCodexDispatchEchoes()
     echoes.arm('client-1')
-    echoes.bindTurn('client-1', 'thread-1', 'turn-1')
+    echoes.bindTurn('client-1', 'thread-1', 'turn-1', 'start')
     echoes.arm('client-2')
-    echoes.bindTurn('client-2', 'thread-1', 'turn-2')
+    echoes.bindTurn('client-2', 'thread-1', 'turn-2', 'start')
 
     echoes.leftUnopened('thread-1', 'turn-2')
 
@@ -174,7 +174,7 @@ describe('the turn Codex answered a send into but has not opened', () => {
     const echoes = createCodexDispatchEchoes()
     echoes.arm('client-1')
     echoes.arm('client-2')
-    echoes.bindTurn('client-2', 'thread-2', 'turn-2')
+    echoes.bindTurn('client-2', 'thread-2', 'turn-2', 'start')
 
     expect(echoes.answeredUnopenedTurn('thread-1', NONE_OPEN)).toBeNull()
   })
diff --git a/src/main/codex/codex-structured-dispatch-echo.ts b/src/main/codex/codex-structured-dispatch-echo.ts
index 1eee3bc9a0a..4ad6d58faed 100644
--- a/src/main/codex/codex-structured-dispatch-echo.ts
+++ b/src/main/codex/codex-structured-dispatch-echo.ts
@@ -1,5 +1,8 @@
 import type { ProviderDiagnostic } from '../../shared/agent-session-failure'
-import type { AgentJournalItemIdentity } from '../../shared/agent-session-journal-types'
+import type {
+  AgentJournalItemIdentity,
+  AgentJournalTurnJoin
+} from '../../shared/agent-session-journal-types'
 
 /** Sends awaiting their echo. One bound to a turn that ended without taking it settles from that
  *  end; any other whose echo never arrives is retired by the journal's recovery on exit. */
@@ -35,10 +38,15 @@ export type CodexDispatchEchoes = {
   /** Drops an armed send whose write never reached the provider. */
   disarm: (clientMessageId: string) => void
   /**
-   * Binds a send to the turn Codex answered it into. Returns that turn's end when the answer is
-   * read after it; a send that end settles is no longer armed.
+   * Binds a send to the turn Codex answered it into, and how it joined that turn. Returns that
+   * turn's end when the answer is read after it; a send that end settles is no longer armed.
    */
-  bindTurn: (clientMessageId: string, threadId: string, turnId: string) => CodexTurnEnd | null
+  bindTurn: (
+    clientMessageId: string,
+    threadId: string,
+    turnId: string,
+    via: AgentJournalTurnJoin
+  ) => CodexTurnEnd | null
   /** The turn the latest armed send was answered into that is neither in `openTurnIds`, ended, nor
    *  left unopened through a wait: one Codex has picked for the send but not opened. */
   answeredUnopenedTurn: (threadId: string, openTurnIds: ReadonlySet<string>) => string | null
@@ -52,7 +60,11 @@ export type CodexDispatchEchoes = {
    * completed, which echoes its pending input first, so one it never echoed waits for recovery. An
    * interrupt withdraws an un-echoed send, steered or the turn's own input: neither reached history.
    */
-  endTurn: (threadId: string, turnId: string, end: CodexTurnEnd) => string[]
+  endTurn: (
+    threadId: string,
+    turnId: string,
+    end: CodexTurnEnd
+  ) => { clientMessageId: string; via: AgentJournalTurnJoin }[]
   /** Submission origin for this exact send, retained until its echo settles it. */
   requestOrigin: (clientMessageId: string) => CodexDispatchRequestOrigin | null
   /** Highest causal sequence assigned to a dispatch in this session. */
@@ -64,7 +76,11 @@ export type CodexDispatchEchoes = {
 export function createCodexDispatchEchoes(): CodexDispatchEchoes {
   const armed = new Map<
     string,
-    { requestedAt: number | null; sequence: number; turn?: { threadId: string; turnId: string } }
+    {
+      requestedAt: number | null
+      sequence: number
+      turn?: { threadId: string; turnId: string; via: AgentJournalTurnJoin }
+    }
   >()
   const endedTurns = new Map<string, CodexTurnEnd>()
   const unopenedTurns = new Set<string>()
@@ -101,12 +117,12 @@ export function createCodexDispatchEchoes(): CodexDispatchEchoes {
     },
     settle: (clientMessageId) => armed.delete(clientMessageId),
     disarm: (clientMessageId) => void armed.delete(clientMessageId),
-    bindTurn: (clientMessageId, threadId, turnId) => {
+    bindTurn: (clientMessageId, threadId, turnId, via) => {
       const entry = armed.get(clientMessageId)
       if (!entry) {
         return null
       }
-      entry.turn = { threadId, turnId }
+      entry.turn = { threadId, turnId, via }
       const end = endedTurns.get(turnKey(threadId, turnId)) ?? null
       if (end && settles(end)) {
         armed.delete(clientMessageId)
@@ -141,10 +157,10 @@ export function createCodexDispatchEchoes(): CodexDispatchEchoes {
       }
       const settled = [...armed].flatMap(([clientMessageId, entry]) =>
         entry.turn && turnKey(entry.turn.threadId, entry.turn.turnId) === turn
-          ? [clientMessageId]
+          ? [{ clientMessageId, via: entry.turn.via }]
           : []
       )
-      for (const clientMessageId of settled) {
+      for (const { clientMessageId } of settled) {
         armed.delete(clientMessageId)
       }
       return settled
diff --git a/src/main/codex/codex-structured-session-adapter.ts b/src/main/codex/codex-structured-session-adapter.ts
index 288e08b9e34..1c5a034fd63 100644
--- a/src/main/codex/codex-structured-session-adapter.ts
+++ b/src/main/codex/codex-structured-session-adapter.ts
@@ -130,7 +130,7 @@ export class CodexStructuredSessionAdapter implements StructuredAgentSessionAdap
     }
     if (event.type === 'notification') {
       // Only an admitted turn end settles; a refused one settles on the retry that lands.
-      settleCodexSendsInEndedTurn(session, event.method, event.params, (settlement) =>
+      settleCodexSendsInEndedTurn(session, event, (settlement) =>
         this.deps.onDispatchSettledLate?.({ sessionId: event.sessionId, ...settlement })
       )
       // After the admission check, so a refused frame is observed by the child records
diff --git a/src/main/codex/codex-structured-session-state.ts b/src/main/codex/codex-structured-session-state.ts
index a96499846bb..7669895937d 100644
--- a/src/main/codex/codex-structured-session-state.ts
+++ b/src/main/codex/codex-structured-session-state.ts
@@ -1,5 +1,6 @@
 import type { StructuredAgentSessionLogger } from '../native-chat/agent-session-wire/structured-agent-session-logger'
 import type {
+  AgentJournalAnsweredTurnIdentity,
   AgentJournalItemIdentity,
   AgentSessionJournalIdentity
 } from '../../shared/agent-session-journal-types'
@@ -97,7 +98,10 @@ export type CodexStructuredSessionAdapterDeps = {
   onDispatchSettledLate?: (
     input: { sessionId: string; clientMessageId: string } & (
       | { providerIdentity: AgentJournalItemIdentity }
-      | ({ state: 'rejected' } & AgentJournalDispatchRejection)
+      | ({
+          state: 'rejected'
+          answeredInTurn: AgentJournalAnsweredTurnIdentity
+        } & AgentJournalDispatchRejection)
     )
   ) => void
   /** Codex reported its thread not running with no turn open: a send whose
diff --git a/src/main/codex/codex-structured-turn-end-settlement.test.ts b/src/main/codex/codex-structured-turn-end-settlement.test.ts
index 38cc648f79d..2b6542a4333 100644
--- a/src/main/codex/codex-structured-turn-end-settlement.test.ts
+++ b/src/main/codex/codex-structured-turn-end-settlement.test.ts
@@ -1,5 +1,9 @@
 import { describe, expect, it, vi } from 'vitest'
-import type { AgentJournalItemBody } from '../../shared/agent-session-journal-types'
+import type {
+  AgentJournalItemBody,
+  AgentJournalItemIdentity
+} from '../../shared/agent-session-journal-types'
+import { agentJournalItemKey } from '../../shared/agent-session-journal-item-key'
 import { classifyDispatchRejection } from '../../shared/structured-agent-session-dispatch-rejection'
 import { createCodexDispatchEchoes } from './codex-structured-dispatch-echo'
 import {
@@ -20,11 +24,17 @@ async function turnEndRig() {
   Object.assign(codex.routes, turns.routes)
   const settlements: LateSettlement[] = []
   const bodies: AgentJournalItemBody[] = []
+  const turnRecords: AgentJournalItemIdentity[] = []
   const adapter = await acquiredCodexAdapter({
     codex,
     settlements,
     sink: {
-      appendItem: (_identity, body) => bodies.push(body),
+      appendItem: (identity, body) => {
+        bodies.push(body)
+        if (body.kind === 'turn') {
+          turnRecords.push(identity)
+        }
+      },
       appendTombstone: () => {},
       publish: () => {}
     }
@@ -46,7 +56,18 @@ async function turnEndRig() {
   const settledIds = () => settlements.map(({ clientMessageId }) => clientMessageId)
   const categoryOf = (settlement: LateSettlement | undefined) =>
     settlement && 'state' in settlement ? classifyDispatchRejection(settlement).category : null
-  return { codex, turns, adapter, send, sendAndOpen, settlements, settledIds, categoryOf, bodies }
+  return {
+    codex,
+    turns,
+    adapter,
+    send,
+    sendAndOpen,
+    settlements,
+    settledIds,
+    categoryOf,
+    bodies,
+    turnRecords
+  }
 }
 
 describe('a Codex send its turn ended without echoing', () => {
@@ -286,13 +307,82 @@ describe('a Codex send its turn ended without echoing', () => {
   })
 })
 
+describe('the turn a withdrawn Codex send names', () => {
+  it('is the record of the turn it opened, when that turn is interrupted', async () => {
+    const rig = await turnEndRig()
+    await rig.sendAndOpen('client-1')
+
+    rig.turns.end('interrupted')
+
+    expect(rig.turnRecords.length).toBeGreaterThan(0)
+    expect(new Set(rig.turnRecords.map(agentJournalItemKey)).size).toBe(1)
+    expect(rig.settlements).toEqual([
+      expect.objectContaining({
+        clientMessageId: 'client-1',
+        answeredInTurn: { turn: rig.turnRecords[0], via: 'start' }
+      })
+    ])
+  })
+
+  it('is the running turn for a send steered into it', async () => {
+    const rig = await turnEndRig()
+    await rig.sendAndOpen('client-1')
+    await rig.send('client-2')
+
+    rig.turns.end('interrupted')
+
+    expect(rig.settlements.map((settlement) => [settlement.clientMessageId, settlement])).toEqual([
+      [
+        'client-1',
+        expect.objectContaining({ answeredInTurn: { turn: rig.turnRecords[0], via: 'start' } })
+      ],
+      [
+        'client-2',
+        expect.objectContaining({ answeredInTurn: { turn: rig.turnRecords[0], via: 'steer' } })
+      ]
+    ])
+  })
+
+  it('is the ended turn whose end was read before the answer', async () => {
+    const rig = await turnEndRig()
+    const release = rig.turns.holdNextAnswer()
+    const sending = rig.send('client-1')
+    await vi.waitFor(() => expect(rig.turns.turnId).toBe('turn-1'))
+    rig.turns.start()
+    rig.turns.end('interrupted')
+    release()
+
+    await expect(sending).resolves.toMatchObject({
+      state: 'rejected',
+      answeredInTurn: { turn: rig.turnRecords[0], via: 'start' }
+    })
+  })
+
+  it('is not named when its turn completes without echoing it: the send stays pending', async () => {
+    const rig = await turnEndRig()
+    const release = rig.turns.holdNextAnswer()
+    const sending = rig.send('client-1')
+    await vi.waitFor(() => expect(rig.turns.turnId).toBe('turn-1'))
+    rig.turns.start()
+    rig.turns.end('completed')
+    release()
+
+    await expect(sending).resolves.toEqual({ state: 'admitted' })
+    await rig.sendAndOpen('client-2')
+    rig.turns.end('completed')
+    expect(rig.settlements).toEqual([])
+  })
+})
+
 describe('a send bound to a turn', () => {
   it('dies with the settlement its turn end makes', () => {
     const echoes = createCodexDispatchEchoes()
     echoes.arm('client-1')
-    echoes.bindTurn('client-1', 'thread-1', 'turn-1')
+    echoes.bindTurn('client-1', 'thread-1', 'turn-1', 'start')
 
-    expect(echoes.endTurn('thread-1', 'turn-1', { status: 'interrupted' })).toEqual(['client-1'])
+    expect(echoes.endTurn('thread-1', 'turn-1', { status: 'interrupted' })).toEqual([
+      { clientMessageId: 'client-1', via: 'start' }
+    ])
     expect(echoes.size).toBe(0)
     expect(echoes.settle('client-1')).toBe(false)
   })
@@ -300,20 +390,20 @@ describe('a send bound to a turn', () => {
   it('dies with its child, which forgets recorded turn ends too', () => {
     const echoes = createCodexDispatchEchoes()
     echoes.arm('client-1')
-    echoes.bindTurn('client-1', 'thread-1', 'turn-1')
+    echoes.bindTurn('client-1', 'thread-1', 'turn-1', 'start')
     echoes.endTurn('thread-2', 'turn-2', { status: 'interrupted' })
 
     echoes.clear()
 
     expect(echoes.size).toBe(0)
     echoes.arm('client-2')
-    expect(echoes.bindTurn('client-2', 'thread-2', 'turn-2')).toBeNull()
+    expect(echoes.bindTurn('client-2', 'thread-2', 'turn-2', 'start')).toBeNull()
   })
 
   it('is matched by thread as well as turn id', () => {
     const echoes = createCodexDispatchEchoes()
     echoes.arm('client-1')
-    echoes.bindTurn('client-1', 'thread-1', 'turn-1')
+    echoes.bindTurn('client-1', 'thread-1', 'turn-1', 'start')
 
     expect(echoes.endTurn('thread-2', 'turn-1', { status: 'interrupted' })).toEqual([])
     expect(echoes.size).toBe(1)
diff --git a/src/main/codex/codex-structured-turn-end-settlement.ts b/src/main/codex/codex-structured-turn-end-settlement.ts
index 65700644933..376d9adb6e1 100644
--- a/src/main/codex/codex-structured-turn-end-settlement.ts
+++ b/src/main/codex/codex-structured-turn-end-settlement.ts
@@ -17,7 +17,9 @@ import {
   agentSessionFailureWords,
   type AgentJournalDispatchRejection
 } from '../../shared/agent-session-failure-words'
+import type { AgentJournalAnsweredTurnIdentity } from '../../shared/agent-session-journal-types'
 import type { CodexTurnEnd } from './codex-structured-dispatch-echo'
+import { codexTurnLifecycleIdentity } from './codex-structured-journal-translation-turns'
 import type { CodexSession } from './codex-structured-session-state'
 import {
   readCodexThreadId,
@@ -41,6 +43,8 @@ export function codexDispatchRejection(
 export type CodexTurnEndSettlement = {
   clientMessageId: string
   state: 'rejected'
+  /** The turn Codex answered the send into, whose end settled it, and how the send joined it. */
+  answeredInTurn: AgentJournalAnsweredTurnIdentity
 } & AgentJournalDispatchRejection
 
 function errorDetail(params: unknown): ProviderDiagnostic | undefined {
@@ -80,19 +84,27 @@ export function codexTurnEndRejection(end: CodexTurnEnd): AgentJournalDispatchRe
 /** Settles the sends bound to the turn this admitted notification ended. */
 export function settleCodexSendsInEndedTurn(
   session: Pick<CodexSession, 'threadId' | 'dispatchEchoes'>,
-  method: string,
-  params: unknown,
+  frame: { sessionId: string; method: string; params: unknown },
   settle: (settlement: CodexTurnEndSettlement) => void
 ): void {
-  const turnId = readCodexTurnId(params)
-  const end = readCodexTurnEnd(method, params)
-  if (!turnId || !end || (readCodexThreadId(params) ?? session.threadId) !== session.threadId) {
+  const turnId = readCodexTurnId(frame.params)
+  const end = readCodexTurnEnd(frame.method, frame.params)
+  if (
+    !turnId ||
+    !end ||
+    (readCodexThreadId(frame.params) ?? session.threadId) !== session.threadId
+  ) {
     return
   }
   const rejection = codexTurnEndRejection(end)
-  for (const clientMessageId of session.dispatchEchoes.endTurn(session.threadId, turnId, end)) {
+  const turn = codexTurnLifecycleIdentity(frame.sessionId, turnId)
+  for (const { clientMessageId, via } of session.dispatchEchoes.endTurn(
+    session.threadId,
+    turnId,
+    end
+  )) {
     if (rejection) {
-      settle({ clientMessageId, state: 'rejected', ...rejection })
+      settle({ clientMessageId, state: 'rejected', answeredInTurn: { turn, via }, ...rejection })
     }
   }
 }
diff --git a/src/main/codex/codex-structured-turn-start.ts b/src/main/codex/codex-structured-turn-start.ts
index 7f0a2ec0c23..271def87607 100644
--- a/src/main/codex/codex-structured-turn-start.ts
+++ b/src/main/codex/codex-structured-turn-start.ts
@@ -1,5 +1,8 @@
 import { agentSessionFailureFact, providerDiagnosticOf } from '../../shared/agent-session-failure'
-import type { AgentJournalMessageItem } from '../../shared/agent-session-journal-types'
+import type {
+  AgentJournalMessageItem,
+  AgentJournalTurnJoin
+} from '../../shared/agent-session-journal-types'
 import type { NativeChatBlock } from '../../shared/native-chat-types'
 import type { AgentSessionDispatchOutcome } from '../native-chat/agent-session-wire/structured-agent-session-adapter'
 import {
@@ -8,6 +11,7 @@ import {
 } from './codex-app-server-connection'
 import { isCodexAppServerUnsupportedError } from './codex-app-server-session'
 import type { CodexDispatchEchoes } from './codex-structured-dispatch-echo'
+import { codexTurnLifecycleIdentity } from './codex-structured-journal-translation-turns'
 import { readCodexTurnId } from './codex-structured-thread-facts'
 import {
   codexRunningOrOpeningTurn,
@@ -107,7 +111,7 @@ async function steerCodexTurn(
   host: CodexTurnHost,
   expectedTurnId: string,
   input: { clientMessageId: string; body: AgentJournalMessageItem; timeoutMs?: number }
-): Promise<{ turnId: string } | null> {
+): Promise<{ turnId: string; via: 'steer' } | null> {
   try {
     const answer = await host.connection.request(
       'turn/steer',
@@ -119,7 +123,7 @@ async function steerCodexTurn(
       },
       { timeoutMs: input.timeoutMs }
     )
-    return { turnId: readCodexTurnId(answer) ?? expectedTurnId }
+    return { turnId: readCodexTurnId(answer) ?? expectedTurnId, via: 'steer' }
   } catch (error) {
     if (isCodexAppServerRequestError(error) || isCodexAppServerUnsupportedError(error)) {
       return null
@@ -141,7 +145,7 @@ export async function startCodexTurn(
     requestedAt?: number
     timeoutMs?: number
   }
-): Promise<{ turnId: string | null } | false> {
+): Promise<{ turnId: string | null; via: AgentJournalTurnJoin } | false> {
   // Armed before the write: the echo and `turn/started` can both land while the
   // response is in flight, and the start must snapshot this send in its frontier.
   if (!host.dispatchEchoes.arm(input.clientMessageId, input.requestedAt)) {
@@ -167,7 +171,7 @@ export async function startCodexTurn(
     },
     { timeoutMs: input.timeoutMs }
   )
-  return { turnId: readCodexTurnId(answer) }
+  return { turnId: readCodexTurnId(answer), via: 'start' }
 }
 
 /**
@@ -178,10 +182,15 @@ export async function startCodexTurn(
  */
 export async function dispatchCodexTurn(
   session: CodexTurnHost,
-  input: { clientMessageId: string; body: AgentJournalMessageItem; requestedAt?: number },
+  input: {
+    sessionId: string
+    clientMessageId: string
+    body: AgentJournalMessageItem
+    requestedAt?: number
+  },
   timeoutMs: number | undefined
 ): Promise<AgentSessionDispatchOutcome> {
-  let answer: { turnId: string | null } | false
+  let answer: { turnId: string | null; via: AgentJournalTurnJoin } | false
   try {
     answer = await startCodexTurn(session, { ...input, timeoutMs })
   } catch (error) {
@@ -205,8 +214,22 @@ export async function dispatchCodexTurn(
   }
   // An answer read after the turn it names already ended is settled by that end.
   const endedFirst = answer.turnId
-    ? session.dispatchEchoes.bindTurn(input.clientMessageId, session.threadId, answer.turnId)
+    ? session.dispatchEchoes.bindTurn(
+        input.clientMessageId,
+        session.threadId,
+        answer.turnId,
+        answer.via
+      )
     : null
   const rejection = endedFirst ? codexTurnEndRejection(endedFirst) : null
-  return rejection ? { state: 'rejected', ...rejection } : { state: 'admitted' }
+  return rejection && answer.turnId
+    ? {
+        state: 'rejected',
+        answeredInTurn: {
+          turn: codexTurnLifecycleIdentity(input.sessionId, answer.turnId),
+          via: answer.via
+        },
+        ...rejection
+      }
+    : { state: 'admitted' }
 }
diff --git a/src/main/daemon/daemon-foreground-confirmation-protocol.test.ts b/src/main/daemon/daemon-foreground-confirmation-protocol.test.ts
index 8a7421b35c1..545732da4ff 100644
--- a/src/main/daemon/daemon-foreground-confirmation-protocol.test.ts
+++ b/src/main/daemon/daemon-foreground-confirmation-protocol.test.ts
@@ -3,7 +3,7 @@ import { PREVIOUS_DAEMON_PROTOCOL_VERSIONS, PROTOCOL_VERSION } from './types'
 
 describe('foreground-confirmation daemon protocol', () => {
   it('rejects daemons from before the fresh-confirmation RPC', () => {
-    expect(PROTOCOL_VERSION).toBe(39)
+    expect(PROTOCOL_VERSION).toBe(40)
     expect(PREVIOUS_DAEMON_PROTOCOL_VERSIONS).toContain(19)
     expect(PREVIOUS_DAEMON_PROTOCOL_VERSIONS).toContain(22)
     expect(PREVIOUS_DAEMON_PROTOCOL_VERSIONS).toContain(23)
diff --git a/src/main/daemon/daemon-protocol-version.test.ts b/src/main/daemon/daemon-protocol-version.test.ts
index 15b7cb8068c..1b77b8c20b5 100644
--- a/src/main/daemon/daemon-protocol-version.test.ts
+++ b/src/main/daemon/daemon-protocol-version.test.ts
@@ -22,7 +22,7 @@ import {
 
 describe('daemon protocol version', () => {
   it('ships bounded history transfer after the 2031-unsubscribe fact', () => {
-    expect(PROTOCOL_VERSION).toBe(39)
+    expect(PROTOCOL_VERSION).toBe(40)
     expect(COLOR_QUERY_REPLY_COLORS_DAEMON_PROTOCOL_VERSION).toBe(38)
     expect(CODEX_NO_DAEMON_SHELL_LAUNCH_DAEMON_PROTOCOL_VERSION).toBe(37)
     expect(CONTENT_ADDRESSED_SHELL_WRAPPER_DAEMON_PROTOCOL_VERSION).toBe(36)
@@ -38,7 +38,7 @@ describe('daemon protocol version', () => {
     expect(AGENT_SESSION_CLAIM_DAEMON_PROTOCOL_VERSION).toBe(26)
     expect(AGENT_SESSION_CREATE_OPERATION_DAEMON_PROTOCOL_VERSION).toBe(26)
     expect(PREVIOUS_DAEMON_PROTOCOL_VERSIONS).toEqual(
-      Array.from({ length: 38 }, (_, index) => index + 1)
+      Array.from({ length: 39 }, (_, index) => index + 1)
     )
   })
 
diff --git a/src/main/daemon/daemon-protocol-version.ts b/src/main/daemon/daemon-protocol-version.ts
index 7f9f911c647..9a0cf8c6a6d 100644
--- a/src/main/daemon/daemon-protocol-version.ts
+++ b/src/main/daemon/daemon-protocol-version.ts
@@ -1,6 +1,7 @@
 // Why: daemons survive app updates, so wire behavior must be version-gated.
-// v39 gives plain fish panes Orca's codex function through XDG_DATA_DIRS; older owners stay attachable.
-export const PROTOCOL_VERSION = 39
+// v40 rolls the #25130/#24636 shell-wrapper changes and the wider agent list (jcode, qoder-cn,
+// dsb; resume claims for qoder-cn/qwen-code/cursor/jcode) into a fresh daemon; older owners stay attachable.
+export const PROTOCOL_VERSION = 40
 export const CODEX_FISH_SHELL_FUNCTION_DAEMON_PROTOCOL_VERSION = 39
 // Why: older daemons reject `setColorQueryReplyColors` as an unknown request type.
 export const COLOR_QUERY_REPLY_COLORS_DAEMON_PROTOCOL_VERSION = 38
@@ -34,7 +35,7 @@ export const CLEAN_DISCONNECT_PROTOCOL_VERSION = 24
 export const MODE_2031_UNSUBSCRIBE_FACT_PROTOCOL_VERSION = 29
 export const PREVIOUS_DAEMON_PROTOCOL_VERSIONS = [
   1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
-  28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38
+  28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39
 ] as const
 
 export function supportsColorQueryReplyColors(protocolVersion: number): boolean {
diff --git a/src/main/daemon/daemon-pty-startup-delivery.test.ts b/src/main/daemon/daemon-pty-startup-delivery.test.ts
index 4b72070bb42..3cffff8dec2 100644
--- a/src/main/daemon/daemon-pty-startup-delivery.test.ts
+++ b/src/main/daemon/daemon-pty-startup-delivery.test.ts
@@ -52,7 +52,7 @@ describe('DaemonPtyAdapter startup delivery', () => {
       await vi.advanceTimersByTimeAsync(299)
       expect(lastSubprocess.write).not.toHaveBeenCalled()
       await vi.advanceTimersByTimeAsync(1)
-      expect(lastSubprocess.write).toHaveBeenCalledExactlyOnceWith('codex\n')
+      expect(lastSubprocess.write).toHaveBeenCalledExactlyOnceWith('codex\r')
       expect(lastSpawnOpts).not.toEqual(
         expect.objectContaining({ startupCommandDelivery: 'shell-ready' })
       )
@@ -82,7 +82,7 @@ describe('DaemonPtyAdapter startup delivery', () => {
       )
       lastSubprocess._simulateData('\x1b]777;orca-shell-ready\x07\r\nuser@host $ ')
       await waitFor(() => vi.mocked(lastSubprocess.write).mock.calls.length > 0)
-      expect(lastSubprocess.write).toHaveBeenCalledExactlyOnceWith('codex\n')
+      expect(lastSubprocess.write).toHaveBeenCalledExactlyOnceWith('codex\r')
     }
   )
 
@@ -102,6 +102,6 @@ describe('DaemonPtyAdapter startup delivery', () => {
     lastSubprocess._simulateData('\r\nuser@host $ ')
 
     await waitFor(() => vi.mocked(lastSubprocess.write).mock.calls.length > 0)
-    expect(lastSubprocess.write).toHaveBeenCalledExactlyOnceWith(`${startup.command}\n`)
+    expect(lastSubprocess.write).toHaveBeenCalledExactlyOnceWith(`${startup.command}\r`)
   })
 })
diff --git a/src/main/daemon/terminal-host-session-create.ts b/src/main/daemon/terminal-host-session-create.ts
index 15e86a70a72..f490c5d5722 100644
--- a/src/main/daemon/terminal-host-session-create.ts
+++ b/src/main/daemon/terminal-host-session-create.ts
@@ -197,11 +197,9 @@ async function spawnAndPublishSession(
     // Diagnostics must never turn a live PTY into a failed create.
   }
   if (startupCommandWritten && opts.command) {
-    const submit = process.platform === 'win32' ? '\r' : '\n'
     // Why: only Orca-wrapped shells advertise the paste-safe startup barrier.
     session.write(
       buildStartupCommandSubmission(opts.command, {
-        submit,
         bracketedPasteSafe: shellReadySupported
       })
     )
diff --git a/src/main/daemon/terminal-host-startup.test.ts b/src/main/daemon/terminal-host-startup.test.ts
index c6817b1e758..830bf0c40bd 100644
--- a/src/main/daemon/terminal-host-startup.test.ts
+++ b/src/main/daemon/terminal-host-startup.test.ts
@@ -19,11 +19,8 @@ function mockSubprocess(): SubprocessHandle {
   } as SubprocessHandle
 }
 
-// Why: Windows shells (PowerShell/cmd.exe) submit on CR, not LF. Without CR
-// the startup command sits typed at the prompt but unexecuted — forcing the
-// user to press Enter after "claude" (or a setup script) is injected.
-// POSIX shells (bash/zsh) keep the LF behaviour. A caller-supplied terminator
-// must not be doubled.
+// Why: without CR (Enter) the startup command sits typed at the prompt but
+// unexecuted (#23250). A caller-supplied terminator is replaced, not doubled.
 describe('TerminalHost startup command terminator', () => {
   const origPlatform = process.platform
   afterEach(() => {
@@ -39,9 +36,11 @@ describe('TerminalHost startup command terminator', () => {
 
   it.each([
     ['win32', 'claude', 'claude\r'],
-    ['darwin', 'claude', 'claude\n'],
+    ['darwin', 'claude', 'claude\r'],
+    ['linux', 'claude', 'claude\r'],
     ['win32', 'claude\r', 'claude\r'],
-    ['darwin', 'claude\n', 'claude\n']
+    ['darwin', 'claude\n', 'claude\r'],
+    ['win32', 'claude\r\n', 'claude\r']
   ])('submits startup with correct terminator on %s', async (platform, cmd, sent) => {
     Object.defineProperty(process, 'platform', { value: platform })
     await host.createOrAttach({
@@ -128,6 +127,6 @@ describe('TerminalHost startup command delivery logging', () => {
         streamClient: { onData: vi.fn(), onExit: vi.fn() }
       })
     ).resolves.toMatchObject({ isNew: true })
-    expect(sub.write).toHaveBeenCalledWith(`codex${process.platform === 'win32' ? '\r' : '\n'}`)
+    expect(sub.write).toHaveBeenCalledWith('codex\r')
   })
 })
diff --git a/src/main/daemon/terminal-host.test.ts b/src/main/daemon/terminal-host.test.ts
index 7ffaadec06d..f7330b3525c 100644
--- a/src/main/daemon/terminal-host.test.ts
+++ b/src/main/daemon/terminal-host.test.ts
@@ -189,9 +189,7 @@ describe('TerminalHost', () => {
 
       lastSubprocess._onDataCb?.('\r\nuser@host $ ')
       await new Promise((r) => setTimeout(r, 40))
-      expect(lastSubprocess.write).toHaveBeenCalledWith(
-        process.platform === 'win32' ? 'echo hello\r' : 'echo hello\n'
-      )
+      expect(lastSubprocess.write).toHaveBeenCalledWith('echo hello\r')
     })
 
     it('uses the short daemon settle path when marker and prompt arrive together', async () => {
@@ -211,9 +209,7 @@ describe('TerminalHost', () => {
         expect(lastSubprocess.write).not.toHaveBeenCalled()
 
         vi.advanceTimersByTime(1)
-        expect(lastSubprocess.write).toHaveBeenCalledWith(
-          process.platform === 'win32' ? 'echo hello\r' : 'echo hello\n'
-        )
+        expect(lastSubprocess.write).toHaveBeenCalledWith('echo hello\r')
       } finally {
         vi.useRealTimers()
       }
@@ -242,9 +238,7 @@ describe('TerminalHost', () => {
         streamClient: { onData: vi.fn(), onExit: vi.fn() }
       })
 
-      expect(lastSubprocess.write).toHaveBeenCalledWith(
-        process.platform === 'win32' ? 'echo hello\r' : 'echo hello\n'
-      )
+      expect(lastSubprocess.write).toHaveBeenCalledWith('echo hello\r')
     })
 
     it('does not bracketed-paste-wrap multiline commands for a fallback shell without paste mode', async () => {
@@ -272,7 +266,8 @@ describe('TerminalHost', () => {
 
       const written = (lastSubprocess.write as ReturnType<typeof vi.fn>).mock.calls[0]?.[0]
       expect(written).not.toContain('\x1b[200~')
-      expect(written).toContain('line one\nline two')
+      // Why CR between the lines: without bracketed paste each break submits its own line.
+      expect(written).toContain('line one\rline two')
     })
 
     it('keeps the shell-ready barrier when the spawned shell supports the marker', async () => {
diff --git a/src/main/ipc/pty-login-shell-startup-commands.test.ts b/src/main/ipc/pty-login-shell-startup-commands.test.ts
index 7ccb0386b9f..a89aca38ea5 100644
--- a/src/main/ipc/pty-login-shell-startup-commands.test.ts
+++ b/src/main/ipc/pty-login-shell-startup-commands.test.ts
@@ -233,7 +233,7 @@ describe('registerPtyHandlers', () => {
         mockProc.emitData('\x1b]133;A\x07% ')
         await Promise.resolve()
         vi.runAllTimers()
-        expect(mockProc.proc.write).toHaveBeenCalledWith('claude\n')
+        expect(mockProc.proc.write).toHaveBeenCalledWith('claude\r')
       } finally {
         vi.useRealTimers()
       }
@@ -396,7 +396,7 @@ describe('registerPtyHandlers', () => {
       vi.advanceTimersByTime(1)
       await Promise.resolve()
       vi.runAllTimers()
-      expect(mockProc.proc.write).toHaveBeenCalledWith('printf "hello"\n')
+      expect(mockProc.proc.write).toHaveBeenCalledWith('printf "hello"\r')
     } finally {
       vi.useRealTimers()
     }
diff --git a/src/main/ipc/pty-spawn-env-codex-resume-provenance.test.ts b/src/main/ipc/pty-spawn-env-codex-resume-provenance.test.ts
index a2a6153e99a..f3b30321c55 100644
--- a/src/main/ipc/pty-spawn-env-codex-resume-provenance.test.ts
+++ b/src/main/ipc/pty-spawn-env-codex-resume-provenance.test.ts
@@ -278,7 +278,7 @@ describe('registerPtyHandlers', () => {
             await Promise.resolve()
             vi.runAllTimers()
 
-            expect(mockProc.proc.write).toHaveBeenCalledWith(`${command}\n`)
+            expect(mockProc.proc.write).toHaveBeenCalledWith(`${command}\r`)
             expect(spawned.agentResumeUnavailable).toBeUndefined()
           } finally {
             vi.useRealTimers()
diff --git a/src/main/native-chat/agent-session-journal/journal-dispatch-answered-turn.test.ts b/src/main/native-chat/agent-session-journal/journal-dispatch-answered-turn.test.ts
new file mode 100644
index 00000000000..bba80293967
--- /dev/null
+++ b/src/main/native-chat/agent-session-journal/journal-dispatch-answered-turn.test.ts
@@ -0,0 +1,78 @@
+// How a stored dispatch row's answered turn reads onto its submission: a named turn, none stated,
+// or absent on a row written before the field existed.
+
+import { describe, expect, it } from 'vitest'
+import { applyJournalRow, createJournalReducerState } from './journal-reducer'
+import type { JournalRow } from './journal-row-schema'
+
+const EPOCH = 'epoch-1'
+
+function base(seq: number): { v: number; epoch: string; seq: number; fence: number; ts: number } {
+  return { v: 1, epoch: EPOCH, seq, fence: 1, ts: 1_000 + seq }
+}
+
+/** The submission after a send and one dispatch row, stored with the given extra keys. */
+function readAfter(dispatch: Partial<Extract<JournalRow, { kind: 'dispatch' }>>) {
+  const state = createJournalReducerState('session-1', EPOCH)
+  applyJournalRow(state, {
+    kind: 'submission',
+    clientMessageId: 'cm_1',
+    payloadFingerprint: 'fp_1',
+    providerHandle: { kind: 'codex', threadId: 'thread-1' },
+    body: { kind: 'message', role: 'user', blocks: [{ type: 'text', text: 'hi' }] },
+    ...base(1)
+  })
+  applyJournalRow(state, {
+    kind: 'dispatch',
+    clientMessageId: 'cm_1',
+    state: 'rejected',
+    providerItemId: null,
+    reason: 'This message was withdrawn before the agent started it.',
+    ...base(2),
+    ...dispatch
+  })
+  return state.submissions.get('cm_1')
+}
+
+describe("a rejected dispatch row's answered turn", () => {
+  it('is the turn it names', () => {
+    expect(readAfter({ answeredInTurn: { turnItemId: 'turn-1', via: 'steer' } })).toMatchObject({
+      answeredInTurn: { turnItemId: 'turn-1', via: 'steer' }
+    })
+  })
+
+  it('is none when the row states none', () => {
+    expect(readAfter({ answeredInTurn: null })).toMatchObject({ answeredInTurn: null })
+  })
+
+  it('is absent on a row written before the field existed', () => {
+    const submission = readAfter({})
+
+    expect(submission).toMatchObject({ dispatchState: 'rejected' })
+    expect(submission).not.toHaveProperty('answeredInTurn')
+  })
+
+  it('reads as none, keeping the row, when it names a way of joining this build does not know', () => {
+    expect(readAfter({ answeredInTurn: { turnItemId: 'turn-1', via: 'resume' } })).toMatchObject({
+      dispatchState: 'rejected',
+      answeredInTurn: null
+    })
+  })
+
+  it('reads as none, keeping the row, when it names no turn id', () => {
+    expect(readAfter({ answeredInTurn: { turnItemId: '', via: 'start' } })).toMatchObject({
+      dispatchState: 'rejected',
+      answeredInTurn: null
+    })
+  })
+
+  it('is absent on any other dispatch state', () => {
+    const submission = readAfter({
+      state: 'unknown',
+      answeredInTurn: { turnItemId: 'turn-1', via: 'start' }
+    })
+
+    expect(submission).toMatchObject({ dispatchState: 'unknown' })
+    expect(submission).not.toHaveProperty('answeredInTurn')
+  })
+})
diff --git a/src/main/native-chat/agent-session-journal/journal-dispatch-reducer.ts b/src/main/native-chat/agent-session-journal/journal-dispatch-reducer.ts
index c7c2a671654..3625982a24f 100644
--- a/src/main/native-chat/agent-session-journal/journal-dispatch-reducer.ts
+++ b/src/main/native-chat/agent-session-journal/journal-dispatch-reducer.ts
@@ -6,6 +6,7 @@ import {
   type UnreadAgentSessionFailureFact
 } from '../../../shared/agent-session-failure'
 import { agentJournalSubmissionKey } from '../../../shared/agent-session-journal-item-key'
+import type { AgentJournalAnsweredTurn } from '../../../shared/agent-session-journal-types'
 import { journalDispatchRowApplies } from './journal-dispatch-settlement'
 import type { JournalReducerState } from './journal-reducer'
 import {
@@ -34,6 +35,11 @@ export function applyJournalDispatchRow(
   } else {
     delete submission.rejection
   }
+  if (row.state === 'rejected' && row.answeredInTurn !== undefined) {
+    submission.answeredInTurn = readAnsweredTurn(row.answeredInTurn)
+  } else {
+    delete submission.answeredInTurn
+  }
   submission.resolvedAt = row.state === 'pending' ? null : row.ts
   if (row.state === 'pending') {
     submission.handedOverAt = row.ts
@@ -61,6 +67,19 @@ export function applyJournalDispatchRow(
   })
 }
 
+/** A stored answered turn. One malformed, or naming a way of joining this build does not know, is
+ *  read as no turn: it was written knowing the field, so it is not an older row. */
+function readAnsweredTurn(value: unknown): AgentJournalAnsweredTurn | null {
+  if (typeof value !== 'object' || value === null) {
+    return null
+  }
+  const turnItemId = 'turnItemId' in value ? value.turnItemId : undefined
+  const via = 'via' in value ? value.via : undefined
+  return typeof turnItemId === 'string' && turnItemId && (via === 'start' || via === 'steer')
+    ? { turnItemId, via }
+    : null
+}
+
 /** A stored rejection fact, read where it can be placed; a kind it cannot place is kept as
  *  written, so the classifier still knows a fact was there without this build claiming what it
  *  says. Shared with the queued-draft table, whose returned card mirrors its submission. */
diff --git a/src/main/native-chat/agent-session-journal/journal-queued-messages.ts b/src/main/native-chat/agent-session-journal/journal-queued-messages.ts
index 0828740ca6f..8c190196bdf 100644
--- a/src/main/native-chat/agent-session-journal/journal-queued-messages.ts
+++ b/src/main/native-chat/agent-session-journal/journal-queued-messages.ts
@@ -33,6 +33,7 @@ import {
   type QueuedMessageHoldReason,
   type QueuedMessageRow
 } from './queued-message-table'
+import type { AgentSessionMessageSource } from '../../../shared/agent-session-message-source'
 import { draftsDeliveredByAppliedEcho } from './queued-message-delivered-echo'
 import { pruneQueuedMessages, retainedSubmissionVerdict } from './queued-message-retention'
 import {
@@ -110,6 +111,7 @@ export class JournalQueuedMessages {
       fingerprint: string
       hostInstance: string
       carriedFrom?: string
+      source: AgentSessionMessageSource
     },
     receipt?: JournalOperationReceipt
   ): Promise<QueuedMessageRow> {
diff --git a/src/main/native-chat/agent-session-journal/journal-row-builders.ts b/src/main/native-chat/agent-session-journal/journal-row-builders.ts
index ed40d490951..36a7d7262e8 100644
--- a/src/main/native-chat/agent-session-journal/journal-row-builders.ts
+++ b/src/main/native-chat/agent-session-journal/journal-row-builders.ts
@@ -112,6 +112,17 @@ export function journalDispatchRowBuilder(
     providerItemId,
     reason: boundedDispatchReason(input),
     ...(input.state === 'rejected' ? { rejection: input.rejection } : {}),
+    // Every rejection states its turn, null for none, so a reader tells it from an older row.
+    ...(input.state === 'rejected'
+      ? {
+          answeredInTurn: input.answeredInTurn
+            ? {
+                turnItemId: agentJournalItemKey(input.answeredInTurn.turn),
+                via: input.answeredInTurn.via
+              }
+            : null
+        }
+      : {}),
     ...journalRowBase(state().epoch, seq, input.fence, ts),
     ...(input.recovered ? { recovered: input.recovered } : {}),
     ...(input.state === 'pending' ? { turnScope: input.turnScope } : {})
diff --git a/src/main/native-chat/agent-session-journal/journal-row-schema.ts b/src/main/native-chat/agent-session-journal/journal-row-schema.ts
index 847c99734a2..9d436e1eb54 100644
--- a/src/main/native-chat/agent-session-journal/journal-row-schema.ts
+++ b/src/main/native-chat/agent-session-journal/journal-row-schema.ts
@@ -160,6 +160,11 @@ export type JournalDispatchRow = JournalRowBase & {
   /** On `rejected`: why, typed. Older readers keep the key and ignore it; a malformed one is
    *  dropped when read, never the row. */
   rejection?: AgentSessionFailureFact
+  /** On `rejected`: the turn a Codex send was answered into, and how it joined it, when that
+   *  turn's end settled the send; null on every other rejection. Absent on other rows and on rows
+   *  written before it. `via` stays a string: a newer build may write another. Older readers keep
+   *  the key and ignore it; one this build cannot read is read as null, never dropping the row. */
+  answeredInTurn?: { turnItemId: string; via: string } | null
 }
 
 /** An item mutation may name its own producer, because one batch can CREATE
diff --git a/src/main/native-chat/agent-session-journal/journal-store-contracts.ts b/src/main/native-chat/agent-session-journal/journal-store-contracts.ts
index cb86a7a8e5d..4232e805bbe 100644
--- a/src/main/native-chat/agent-session-journal/journal-store-contracts.ts
+++ b/src/main/native-chat/agent-session-journal/journal-store-contracts.ts
@@ -1,5 +1,6 @@
 import type { AgentJournalDispatchRejection } from '../../../shared/agent-session-failure-words'
 import type {
+  AgentJournalAnsweredTurnIdentity,
   AgentJournalCursor,
   AgentJournalItemBody,
   AgentJournalItemIdentity,
@@ -40,7 +41,10 @@ export type ResolveDispatchInput = {
     | { state: 'pending'; turnScope: AgentJournalTurnScope }
     /** `reason` is what released clients print, `rejection` what newer ones read: both from
      *  `agentSessionFailureWords`, never written by hand. */
-    | ({ state: 'rejected' } & AgentJournalDispatchRejection)
+    | ({
+        state: 'rejected'
+        answeredInTurn?: AgentJournalAnsweredTurnIdentity
+      } & AgentJournalDispatchRejection)
     | { state: 'unknown'; reason?: string | null }
   )
 
diff --git a/src/main/native-chat/agent-session-journal/journal-submission-fold.ts b/src/main/native-chat/agent-session-journal/journal-submission-fold.ts
index 80e4e2c93e9..b00bdd36de2 100644
--- a/src/main/native-chat/agent-session-journal/journal-submission-fold.ts
+++ b/src/main/native-chat/agent-session-journal/journal-submission-fold.ts
@@ -25,6 +25,7 @@ export function applyJournalSubmission(
     reason: null,
     submittedAt: row.ts,
     resolvedAt: null,
+    submittedSequence: row.seq,
     ...(row.handoverRecorded ? { handoverRecorded: true, acceptedSequence: row.seq } : {}),
     // A malformed stored link is dropped, never the row.
     ...(typeof row.queuedMessageId === 'string' && row.queuedMessageId.length > 0
diff --git a/src/main/native-chat/agent-session-journal/journal-submission-positions.test.ts b/src/main/native-chat/agent-session-journal/journal-submission-positions.test.ts
new file mode 100644
index 00000000000..37416378605
--- /dev/null
+++ b/src/main/native-chat/agent-session-journal/journal-submission-positions.test.ts
@@ -0,0 +1,171 @@
+// Each submission carries where the journal wrote its row. A rejected send's own row moves to its
+// rejection, so this is the only journal-order record of where it was sent. Derived on every fold: a
+// replay of the same rows gives the same value, and a history page carries it. A rejection a turn's
+// end made also names that turn.
+
+import { mkdtemp, rm } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, describe, expect, it } from 'vitest'
+import { agentSessionFailureFact } from '../../../shared/agent-session-failure'
+import { agentSessionFailureWords } from '../../../shared/agent-session-failure-words'
+import {
+  agentJournalItemKey,
+  agentJournalSubmissionKey
+} from '../../../shared/agent-session-journal-item-key'
+import {
+  AGENT_JOURNAL_THREAD_SCOPE,
+  type AgentJournalMessageItem,
+  type AgentSessionJournalIdentity
+} from '../../../shared/agent-session-journal-types'
+import { codexProviderHandle } from '../../../shared/agent-session-provider-handle-encoding'
+import { readAgentSessionHydrationPage } from '../agent-session-wire/agent-session-history-page'
+import { createTrackedJournalOpener } from './journal-host-database-test-support'
+
+const IDENTITY: AgentSessionJournalIdentity = {
+  sessionId: 'session-1',
+  workspaceId: 'workspace-1',
+  hostId: 'host-1',
+  agent: 'codex',
+  providerHandle: codexProviderHandle('thread-1')
+}
+const BODY: AgentJournalMessageItem = {
+  kind: 'message',
+  role: 'user',
+  blocks: [{ type: 'text', text: 'look around' }]
+}
+
+let root: string | null = null
+const journals = createTrackedJournalOpener()
+
+afterEach(async () => {
+  await journals.closeAll()
+  if (root) {
+    await rm(root, { recursive: true, force: true })
+    root = null
+  }
+})
+
+/** A send accepted for later handover, handed over, then taken back. */
+async function sendHandedOverThenWithdrawn() {
+  root = await mkdtemp(join(tmpdir(), 'orca-submission-positions-'))
+  const journal = await journals.open({ identity: IDENTITY, stateDirectory: root })
+  const submitted = await journal.appendSubmission({
+    clientMessageId: 'send-1',
+    payloadFingerprint: 'send-1',
+    body: BODY,
+    fence: 1,
+    handoverRecorded: true
+  })
+  const handedOver = await journal.resolveDispatch({
+    clientMessageId: 'send-1',
+    state: 'pending',
+    fence: 1,
+    turnScope: AGENT_JOURNAL_THREAD_SCOPE
+  })
+  const pending = { ...journal.submission('send-1') }
+  const withdrawn = await journal.resolveDispatch({
+    clientMessageId: 'send-1',
+    state: 'rejected',
+    ...agentSessionFailureWords(agentSessionFailureFact('cancelled'), { surface: 'rejection' }),
+    fence: 1,
+    recovered: true
+  })
+  return { journal, submitted, handedOver, pending, withdrawn }
+}
+
+const TURN = {
+  provider: 'legacy',
+  agent: 'codex',
+  sessionId: 'session-1',
+  recordId: 'turn-lifecycle:turn-1'
+} as const
+
+/** A send its turn ended without taking: the rejection names that turn. */
+async function sendWithdrawnByItsTurnEnd() {
+  root = await mkdtemp(join(tmpdir(), 'orca-submission-positions-'))
+  const journal = await journals.open({ identity: IDENTITY, stateDirectory: root })
+  await journal.appendSubmission({
+    clientMessageId: 'send-1',
+    payloadFingerprint: 'send-1',
+    body: BODY,
+    fence: 1
+  })
+  await journal.resolveDispatch({
+    clientMessageId: 'send-1',
+    state: 'rejected',
+    ...agentSessionFailureWords(agentSessionFailureFact('cancelled'), { surface: 'rejection' }),
+    answeredInTurn: { turn: TURN, via: 'start' },
+    fence: 1
+  })
+  return journal
+}
+
+describe('the turn a rejected submission was answered into', () => {
+  it('is the turn record its rejection named, on the snapshot, a replay, and the page', async () => {
+    const journal = await sendWithdrawnByItsTurnEnd()
+    const turnItemId = agentJournalItemKey(TURN)
+
+    expect(journal.submission('send-1')).toMatchObject({
+      dispatchState: 'rejected',
+      answeredInTurn: { turnItemId, via: 'start' }
+    })
+    expect(readAgentSessionHydrationPage(journal).submissions).toEqual([
+      expect.objectContaining({ answeredInTurn: { turnItemId, via: 'start' } })
+    ])
+    await journals.closeAll()
+    const replayed = await journals.open({ identity: IDENTITY, stateDirectory: root! })
+    expect(replayed.submission('send-1')).toMatchObject({
+      answeredInTurn: { turnItemId, via: 'start' }
+    })
+  })
+
+  it('is stated as none on a take-back that names no turn, so it reads apart from an older row', async () => {
+    const { journal } = await sendHandedOverThenWithdrawn()
+
+    expect(journal.submission('send-1')).toMatchObject({
+      dispatchState: 'rejected',
+      answeredInTurn: null
+    })
+    expect(readAgentSessionHydrationPage(journal).submissions[0]).toMatchObject({
+      answeredInTurn: null
+    })
+  })
+})
+
+describe("a submission's journal position", () => {
+  it('is its own row, which a take-back does not move', async () => {
+    const { journal, submitted, handedOver, pending, withdrawn } =
+      await sendHandedOverThenWithdrawn()
+
+    expect(pending).toMatchObject({ submittedSequence: submitted.sequence })
+    expect(handedOver.sequence).toBeGreaterThan(submitted.sequence)
+    expect(journal.submission('send-1')).toMatchObject({
+      dispatchState: 'rejected',
+      submittedSequence: submitted.sequence
+    })
+    // Anti-vacuous: the send's own row moved to its rejection, so only this field says where it was sent.
+    expect(
+      journal.snapshot().items.find((item) => item.itemId === agentJournalSubmissionKey('send-1'))
+        ?.sequence
+    ).toBe(withdrawn.sequence)
+  })
+
+  it('comes back the same from a replay of the stored rows', async () => {
+    const { journal, submitted } = await sendHandedOverThenWithdrawn()
+    await journals.closeAll()
+
+    const replayed = await journals.open({ identity: IDENTITY, stateDirectory: root! })
+
+    expect(replayed.submission('send-1')).toMatchObject({ submittedSequence: submitted.sequence })
+    expect(journal).not.toBe(replayed)
+  })
+
+  it('reaches a client on the history page', async () => {
+    const { journal, submitted } = await sendHandedOverThenWithdrawn()
+
+    expect(readAgentSessionHydrationPage(journal).submissions).toEqual([
+      expect.objectContaining({ clientMessageId: 'send-1', submittedSequence: submitted.sequence })
+    ])
+  })
+})
diff --git a/src/main/native-chat/agent-session-journal/journal-submission-queued-link.test.ts b/src/main/native-chat/agent-session-journal/journal-submission-queued-link.test.ts
index f9588b71ba3..d0306fa9467 100644
--- a/src/main/native-chat/agent-session-journal/journal-submission-queued-link.test.ts
+++ b/src/main/native-chat/agent-session-journal/journal-submission-queued-link.test.ts
@@ -51,7 +51,8 @@ async function handOff(journal: AgentSessionJournal, draftId: string, submission
     messageId: draftId,
     body: BODY,
     fingerprint: 'fp',
-    hostInstance: 'p'
+    hostInstance: 'p',
+    source: { kind: 'user' }
   })
   await journal.appendSubmission(
     { clientMessageId: submissionId, payloadFingerprint: 'fp', body: BODY, fence: 0 },
@@ -100,7 +101,8 @@ describe('the submission names the queued draft it hands off', () => {
       messageId: 'draft-1',
       body: BODY,
       fingerprint: 'fp',
-      hostInstance: 'p'
+      hostInstance: 'p',
+      source: { kind: 'user' }
     })
     await expect(
       journal.appendSubmission(
diff --git a/src/main/native-chat/agent-session-journal/queued-message-bookkeeping-failure.test.ts b/src/main/native-chat/agent-session-journal/queued-message-bookkeeping-failure.test.ts
index 5f9a95a53d2..60b613ea307 100644
--- a/src/main/native-chat/agent-session-journal/queued-message-bookkeeping-failure.test.ts
+++ b/src/main/native-chat/agent-session-journal/queued-message-bookkeeping-failure.test.ts
@@ -65,7 +65,8 @@ async function queueAndConsume(journal: AgentSessionJournal, messageId: string):
     messageId,
     body,
     fingerprint: `fp-${messageId}`,
-    hostInstance: 'proc-1'
+    hostInstance: 'proc-1',
+    source: { kind: 'user' }
   })
   await journal.appendSubmission(
     {
@@ -172,7 +173,8 @@ describe('draft bookkeeping inside a journal append', () => {
         messageId: 'draft-1',
         body: BODY,
         fingerprint: 'fp-draft-1',
-        hostInstance: 'proc-1'
+        hostInstance: 'proc-1',
+        source: { kind: 'user' }
       })
       expect(journal.queuedMessages.list()).toMatchObject([{ state: 'waiting' }])
       const commit = failNextCommit()
diff --git a/src/main/native-chat/agent-session-journal/queued-message-delivered-echo.test.ts b/src/main/native-chat/agent-session-journal/queued-message-delivered-echo.test.ts
index a12630d6566..88caf16949a 100644
--- a/src/main/native-chat/agent-session-journal/queued-message-delivered-echo.test.ts
+++ b/src/main/native-chat/agent-session-journal/queued-message-delivered-echo.test.ts
@@ -77,7 +77,8 @@ async function handOffAndReject(
     messageId: 'draft-1',
     body,
     fingerprint,
-    hostInstance: 'p'
+    hostInstance: 'p',
+    source: { kind: 'user' }
   })
   await journal.appendSubmission(
     {
diff --git a/src/main/native-chat/agent-session-journal/queued-message-pause.test.ts b/src/main/native-chat/agent-session-journal/queued-message-pause.test.ts
index a2fa19a6a5c..5989a10e967 100644
--- a/src/main/native-chat/agent-session-journal/queued-message-pause.test.ts
+++ b/src/main/native-chat/agent-session-journal/queued-message-pause.test.ts
@@ -63,6 +63,7 @@ function queueDraft(journal: AgentSessionJournal, messageId: string, carriedFrom
     body: message(messageId),
     fingerprint: `fp-${messageId}`,
     hostInstance: HOST,
+    source: { kind: 'user' },
     ...(carriedFrom ? { carriedFrom } : {})
   })
 }
@@ -495,7 +496,8 @@ describe("a restart's pause", () => {
       messageId: 'draft-restart',
       body: message('written before the restart'),
       fingerprint: 'fp-draft-restart',
-      hostInstance: 'proc-0'
+      hostInstance: 'proc-0',
+      source: { kind: 'user' }
     })
     expect(reason(journal)).toBe('restarted')
     await queueDraft(journal, 'draft-legacy')
diff --git a/src/main/native-chat/agent-session-journal/queued-message-schema.ts b/src/main/native-chat/agent-session-journal/queued-message-schema.ts
index 3f9d0122fda..d19c2e09a2d 100644
--- a/src/main/native-chat/agent-session-journal/queued-message-schema.ts
+++ b/src/main/native-chat/agent-session-journal/queued-message-schema.ts
@@ -12,7 +12,8 @@ const NULLABLE_COLUMNS: readonly (readonly [name: string, type: string])[] = [
   ['consumed_as', 'TEXT'],
   ['carried_from', 'TEXT'],
   ['queued_epoch', 'TEXT'],
-  ['queued_sequence', 'INTEGER']
+  ['queued_sequence', 'INTEGER'],
+  ['source_json', 'TEXT']
 ]
 
 /**
@@ -43,6 +44,7 @@ CREATE TABLE IF NOT EXISTS queued_messages (
   carried_from    TEXT,
   queued_epoch    TEXT,
   queued_sequence INTEGER,
+  source_json     TEXT,
   PRIMARY KEY (session_id, message_id)
 );
 `)
diff --git a/src/main/native-chat/agent-session-journal/queued-message-store.test.ts b/src/main/native-chat/agent-session-journal/queued-message-store.test.ts
index abad56fa6dd..a9c0ef7c70c 100644
--- a/src/main/native-chat/agent-session-journal/queued-message-store.test.ts
+++ b/src/main/native-chat/agent-session-journal/queued-message-store.test.ts
@@ -22,6 +22,7 @@ import {
   QueuedMessageNotConsumableError
 } from './journal-queued-messages'
 import type { AgentSessionJournal } from './journal-store'
+import type { AgentSessionMessageSource } from '../../../shared/agent-session-message-source'
 import {
   closeTestJournalHostDatabases,
   createTrackedJournalOpener
@@ -81,7 +82,8 @@ async function queueDraft(journal: AgentSessionJournal, messageId: string, text
     messageId,
     body: message(text),
     fingerprint: `fp-${messageId}`,
-    hostInstance: 'proc-1'
+    hostInstance: 'proc-1',
+    source: { kind: 'user' }
   })
 }
 
@@ -174,6 +176,53 @@ describe('draft rows', () => {
     expect(journal.queuedMessages.list()).toHaveLength(1)
   })
 
+  it("keeps who queued a card across reopen; a card with no readable sender is the person's", async () => {
+    const agent: AgentSessionMessageSource = {
+      kind: 'agent',
+      senders: [
+        {
+          party: {
+            address: 'structworker_1',
+            terminalHandle: 'structworker_1',
+            orcaSessionId: null
+          }
+        }
+      ],
+      orchestration: {
+        message: 'mail-notice',
+        mailbox: 'run:r1',
+        dispatchId: 'd1',
+        messages: [{ messageId: 'm1', runId: 'r1', from: 'structworker_1' }]
+      }
+    }
+    const first = await open()
+    await first.queuedMessages.insert({
+      messageId: 'agent-card',
+      body: message('You have 1 orchestration message. Run `orca orchestration check --run r1`.'),
+      fingerprint: 'fp-agent-card',
+      hostInstance: 'proc-1',
+      source: agent
+    })
+    await queueDraft(first, 'before-the-column')
+    await queueDraft(first, 'unreadable')
+    await first.close()
+    closeTestJournalHostDatabases()
+    const db = new Database(journalDatabasePath(root))
+    db.prepare('UPDATE queued_messages SET source_json = NULL WHERE message_id = ?').run(
+      'before-the-column'
+    )
+    db.prepare('UPDATE queued_messages SET source_json = \'{"v":9}\' WHERE message_id = ?').run(
+      'unreadable'
+    )
+    db.close()
+    const reopened = await open()
+    expect(reopened.queuedMessages.list().map((row) => [row.messageId, row.source])).toEqual([
+      ['agent-card', agent],
+      ['before-the-column', { kind: 'user' }],
+      ['unreadable', { kind: 'user' }]
+    ])
+  })
+
   it('drafts survive epoch replacement, which deletes only journal rows', async () => {
     const journal = await open()
     await queueDraft(journal, 'draft-1')
diff --git a/src/main/native-chat/agent-session-journal/queued-message-table.ts b/src/main/native-chat/agent-session-journal/queued-message-table.ts
index a2bd9c3e05a..1a82925f1f9 100644
--- a/src/main/native-chat/agent-session-journal/queued-message-table.ts
+++ b/src/main/native-chat/agent-session-journal/queued-message-table.ts
@@ -13,6 +13,11 @@ import type {
   AgentJournalCursor,
   AgentJournalMessageItem
 } from '../../../shared/agent-session-journal-types'
+import {
+  readAgentSessionMessageSource,
+  serializeAgentSessionMessageSource,
+  type AgentSessionMessageSource
+} from '../../../shared/agent-session-message-source'
 import { rejectedDraftSettlement } from './journal-dispatch-settlement'
 import { readStoredRejectionFact } from './journal-dispatch-reducer'
 
@@ -59,10 +64,12 @@ export type QueuedMessageRow = {
   /** Where the journal stood when it was queued: a Stop's pause holds only cards queued before
    *  it. Null on rows from builds before it was recorded, which read as queued before any Stop. */
   queuedAt: AgentJournalCursor | null
+  /** Who it is from: the person, or another agent through Orca. */
+  source: AgentSessionMessageSource
 }
 
 const COLUMNS =
-  'session_id, message_id, position, body_json, fingerprint, created_at, host_instance, state, hold_reason, returned_reason, returned_rejection, settled_at, settled_by_op, consumed_as, carried_from, queued_epoch, queued_sequence'
+  'session_id, message_id, position, body_json, fingerprint, created_at, host_instance, state, hold_reason, returned_reason, returned_rejection, settled_at, settled_by_op, consumed_as, carried_from, queued_epoch, queued_sequence, source_json'
 
 export function insertQueuedMessage(
   db: Database.Database,
@@ -74,6 +81,7 @@ export function insertQueuedMessage(
     hostInstance: string
     carriedFrom?: string
     queuedAt: AgentJournalCursor
+    source: AgentSessionMessageSource
     now: number
   }
 ): QueuedMessageRow {
@@ -84,7 +92,7 @@ export function insertQueuedMessage(
   const position = Number(highest?.p ?? 0) + 1
   db.prepare(
     `INSERT INTO queued_messages (${COLUMNS})
-     VALUES (?, ?, ?, ?, ?, ?, ?, 'waiting', NULL, NULL, NULL, NULL, NULL, NULL, ?, ?, ?)`
+     VALUES (?, ?, ?, ?, ?, ?, ?, 'waiting', NULL, NULL, NULL, NULL, NULL, NULL, ?, ?, ?, ?)`
   ).run(
     input.sessionId,
     input.messageId,
@@ -95,7 +103,8 @@ export function insertQueuedMessage(
     input.hostInstance,
     input.carriedFrom ?? null,
     input.queuedAt.epoch,
-    input.queuedAt.sequence
+    input.queuedAt.sequence,
+    serializeAgentSessionMessageSource(input.source)
   )
   return {
     sessionId: input.sessionId,
@@ -113,7 +122,8 @@ export function insertQueuedMessage(
     settledByOp: null,
     consumedAs: null,
     carriedFrom: input.carriedFrom ?? null,
-    queuedAt: input.queuedAt
+    queuedAt: input.queuedAt,
+    source: input.source
   }
 }
 
@@ -295,6 +305,7 @@ function toStoredRow(row: unknown): QueuedMessageRow | null {
     carried_from: string | null
     queued_epoch: string | null
     queued_sequence: number | null
+    source_json: string | null
   }
   let body: AgentJournalMessageItem
   try {
@@ -333,10 +344,21 @@ function toStoredRow(row: unknown): QueuedMessageRow | null {
     queuedAt:
       record.queued_epoch !== null && typeof record.queued_sequence === 'number'
         ? { epoch: record.queued_epoch, sequence: record.queued_sequence }
-        : null
+        : null,
+    source: storedSource(record.source_json)
   }
 }
 
+function storedSource(json: string | null): AgentSessionMessageSource {
+  let stored: unknown = null
+  try {
+    stored = json === null ? null : JSON.parse(json)
+  } catch {
+    // An unreadable value is read as no value; the source reader decides what that means.
+  }
+  return readAgentSessionMessageSource(stored)
+}
+
 function storedRejection(json: string | null): UnreadAgentSessionFailureFact | null {
   if (json === null) {
     return null
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-adapter.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-adapter.ts
index 9c34c184104..9975701e704 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-adapter.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-adapter.ts
@@ -12,6 +12,7 @@ import type {
 
 import type { AgentSessionBackgroundTaskStops } from '../../../shared/agent-child-work-stop-targets'
 import type {
+  AgentJournalAnsweredTurnIdentity,
   AgentJournalItemIdentity,
   AgentJournalItemBody,
   AgentJournalMessageItem,
@@ -176,8 +177,12 @@ export type AgentSessionDispatchOutcome =
    * anything and never promotes this to `unknown`.
    */
   | { state: 'admitted' }
-  /** Words from `agentSessionFailureWords`, never written by hand. */
-  | ({ state: 'rejected' } & AgentJournalDispatchRejection)
+  /** Words from `agentSessionFailureWords`, never written by hand. `answeredInTurn`: the turn the
+   *  provider answered the send into, which ended before the answer was read. */
+  | ({
+      state: 'rejected'
+      answeredInTurn?: AgentJournalAnsweredTurnIdentity
+    } & AgentJournalDispatchRejection)
   /** The call did not settle. Never re-send on the user's behalf. */
   | { state: 'unknown'; reason: string }
 
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-host-mutations.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-host-mutations.ts
index 1133342270d..bceb95e4dbd 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-host-mutations.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-host-mutations.ts
@@ -37,6 +37,7 @@ import {
   setOptionPlan
 } from './structured-agent-session-mutation-plans'
 import { runQueueableStructuredAgentSessionSend } from './structured-agent-session-queued-send'
+import type { AgentMessageSource } from '../../../shared/agent-session-message-source'
 import { cancelStructuredAgentSessionPrompt } from './structured-agent-session-prompt-cancel'
 import { mutateWithChatStop } from './structured-agent-session-chat-stop'
 export type { StructuredAgentSessionMutationContext } from './structured-agent-session-mutation-context'
@@ -60,6 +61,9 @@ export function sendStructuredAgentSessionTurn(
      *  Orchestration mail, a restart continuation and `agent.launch`'s host-sent
      *  prompt never set it. */
     userSend?: true
+    /** Host-local, never on the wire: who a host-side `queue-if-active` send queues for, recorded
+     *  on its card. A client's send is always its person's (`userSend`). */
+    source?: AgentMessageSource
     beforeRun?: () => void
   },
   arrival?: Parameters<typeof sendPreparation>[2]
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-late-dispatch.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-late-dispatch.ts
index ba0ab923126..3d38494fea9 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-late-dispatch.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-late-dispatch.ts
@@ -1,4 +1,7 @@
-import type { AgentJournalItemIdentity } from '../../../shared/agent-session-journal-types'
+import type {
+  AgentJournalAnsweredTurnIdentity,
+  AgentJournalItemIdentity
+} from '../../../shared/agent-session-journal-types'
 import type { AgentJournalDispatchRejection } from '../../../shared/agent-session-failure-words'
 import type { StructuredAgentSessionMutationContext } from './structured-agent-session-host-mutations'
 import { structuredAgentSessionConversationFence } from './structured-agent-session-provider-child'
@@ -12,7 +15,10 @@ export async function settleStructuredAgentSessionLateDispatch(
     clientMessageId: string
   } & (
     | { providerIdentity: AgentJournalItemIdentity }
-    | ({ state: 'rejected' } & AgentJournalDispatchRejection)
+    | ({
+        state: 'rejected'
+        answeredInTurn?: AgentJournalAnsweredTurnIdentity
+      } & AgentJournalDispatchRejection)
     | { state: 'unknown'; reason: string }
   )
 ): Promise<void> {
@@ -43,6 +49,7 @@ export async function settleStructuredAgentSessionLateDispatch(
             state: 'rejected',
             reason: input.reason,
             rejection: input.rejection,
+            ...(input.answeredInTurn ? { answeredInTurn: input.answeredInTurn } : {}),
             fence
           }
   )
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-message-rig.test-fixture.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-message-rig.test-fixture.ts
index f1271f4e339..00319720942 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-message-rig.test-fixture.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-message-rig.test-fixture.ts
@@ -10,6 +10,7 @@ import { agentSessionFailureWords } from '../../../shared/agent-session-failure-
 import { computeAgentSessionPayloadFingerprint } from '../../../shared/agent-session-mutation-envelope'
 import type { AgentJournalSubmission } from '../../../shared/agent-session-journal-types'
 import type { AgentSessionQueuePause } from '../../../shared/agent-session-wire'
+import type { AgentMessageSource } from '../../../shared/agent-session-message-source'
 import { openTestAgentSessionRecordStore } from '../../runtime/agent-session-record-store-test-harness'
 import type { StructuredAgentSessionAdapter } from './structured-agent-session-adapter'
 import type { StructuredAgentSessionEventSink } from './structured-agent-session-event-sink'
@@ -30,6 +31,7 @@ import { createStructuredAgentSessionLogger } from './structured-agent-session-l
 import { codexProviderHandle } from '../../../shared/agent-session-provider-handle-encoding'
 
 export const QUEUED_RIG_CALLER = { callerKey: 'client-1' }
+type RigSendOptions = { internal?: true; source?: AgentMessageSource }
 
 export function eventually(assertion: () => void | Promise<void>): Promise<void> {
   return vi.waitFor(assertion, { timeout: 10_000 })
@@ -140,16 +142,16 @@ export async function createQueuedMessageTestRig(
   }
 
   /** A client's send, as the `agentSession.send` RPC hands it to the host;
-   *  `internal` is a host-side sender (orchestration mail, a restart continuation). */
-  function send(text: string, delivery?: 'queue-if-active', options?: { internal?: true }) {
+   *  `internal` is a host-side sender (orchestration mail, a restart continuation), and `source`
+   *  who it is from. */
+  function send(text: string, delivery?: 'queue-if-active', options?: RigSendOptions) {
     const body = hostTestMessage(text)
     const clientOperationId = hostTestOperationId()
     const fields = { body, ...(delivery ? { delivery } : {}) }
     const result = host.send(QUEUED_RIG_CALLER, {
       envelope: envelope(fields, 'agentSession.send', clientOperationId),
-      body,
-      ...(delivery ? { delivery } : {}),
-      ...(options?.internal ? {} : { userSend: true as const })
+      ...fields,
+      ...(options?.internal ? { source: options.source } : { userSend: true as const })
     })
     return { id: clientOperationId, result }
   }
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-messages.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-messages.test.ts
index 8a7c5c4c3d3..eefd106b3ea 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-messages.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-messages.test.ts
@@ -12,6 +12,7 @@ import {
   type AgentSessionSubscribeEvent
 } from '../../../shared/agent-session-wire'
 import { ConversationCommandParams } from '../../../shared/rpc-contract/structured-agent-session-params'
+import type { AgentMessageSource } from '../../../shared/agent-session-message-source'
 import { AgentSessionJournal } from '../agent-session-journal/journal-store'
 import { JournalQueuedMessages } from '../agent-session-journal/journal-queued-messages'
 import {
@@ -636,6 +637,31 @@ describe('/clear', () => {
     })
   })
 
+  it('carries who each card is from', async () => {
+    const notice = {
+      message: 'mail-notice',
+      mailbox: 'run:r1',
+      dispatchId: null,
+      messages: []
+    } as const
+    const source: AgentMessageSource = { kind: 'agent', senders: [], orchestration: notice }
+    const working = await workingSend()
+    await send('pointer', 'queue-if-active', { internal: true, source }).result
+    await send('typed', 'queue-if-active').result
+    await stop()
+    await settleAccepted(working, 'a')
+    const cleared = await clear(hostTestOperationId())
+    const replacementId = cleared.ok ? cleared.value.replacementSessionId : undefined
+    if (!replacementId) {
+      throw new Error('expected a replacement session')
+    }
+    const journal = host.collaboratorsForTests().sessions.get(replacementId)?.journal
+    expect(journal?.queuedMessages.list().map((row) => row.source)).toEqual([
+      source,
+      { kind: 'user' }
+    ])
+  })
+
   it("the replacement's 'cleared' pause lifts through Resume exactly like a Stop's", async () => {
     const [firstId] = await pausedDrafts()
     const cleared = await clear(hostTestOperationId())
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-messages.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-messages.ts
index 248534097b8..d4c7c470f12 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-messages.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-messages.ts
@@ -8,6 +8,10 @@
 
 import { randomUUID } from 'node:crypto'
 import type { AgentJournalMessageItem } from '../../../shared/agent-session-journal-types'
+import {
+  USER_MESSAGE_SOURCE,
+  type AgentMessageSource
+} from '../../../shared/agent-session-message-source'
 import {
   QUEUED_MESSAGE_PAUSED_SEND_FAILED,
   type AgentSessionSendResult,
@@ -191,6 +195,10 @@ export async function maybeQueueStructuredAgentSessionSend(
     envelope: { clientOperationId: string }
     body: AgentJournalMessageItem
     delivery?: 'queue-if-active'
+    /** A person's send at a chat surface; it outranks any `source`. */
+    userSend?: true
+    /** Who a host-side send is from. */
+    source?: AgentMessageSource
   }
 ): Promise<
   | { ok: true; value: AgentSessionSendResult }
@@ -231,7 +239,8 @@ export async function maybeQueueStructuredAgentSessionSend(
       messageId: clientMessageId,
       body: params.body,
       fingerprint: queuedMessageFingerprint(ctx.sessionId, params.body),
-      hostInstance: structuredAgentSessionHostInstance()
+      hostInstance: structuredAgentSessionHostInstance(),
+      source: params.userSend ? USER_MESSAGE_SOURCE : (params.source ?? USER_MESSAGE_SOURCE)
     },
     ctx.operationReceipt
   )
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-mutations.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-mutations.ts
index ee32b3648a9..8554bb08154 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-mutations.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-mutations.ts
@@ -117,7 +117,8 @@ export async function carryQueuedMessagesToClearReplacement(
         body: row.body,
         fingerprint: queuedMessageFingerprint(input.replacementSessionId, row.body),
         hostInstance: structuredAgentSessionHostInstance(),
-        carriedFrom: ctx.sessionId
+        carriedFrom: ctx.sessionId,
+        source: row.source
       })
     }
     await withdrawQueuedMessagesForOperation(ctx.journal, {
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-send.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-send.ts
index d411efc4239..9abdc713f0e 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-queued-send.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-queued-send.ts
@@ -4,6 +4,7 @@
 
 import type { AgentSessionSendResult } from '../../../shared/agent-session-wire'
 import type { AgentJournalMessageItem } from '../../../shared/agent-session-journal-types'
+import type { AgentMessageSource } from '../../../shared/agent-session-message-source'
 import type { StructuredAgentSessionMutationContext } from './structured-agent-session-host-mutations'
 import { maybeQueueStructuredAgentSessionSend } from './structured-agent-session-queued-messages'
 import type { AgentSessionTurnContext, TurnOutcome } from './structured-agent-session-turns'
@@ -16,6 +17,7 @@ export async function runQueueableStructuredAgentSessionSend(
     body: AgentJournalMessageItem
     delivery?: 'queue-if-active'
     userSend?: true
+    source?: AgentMessageSource
   },
   immediate: () => Promise<TurnOutcome<AgentSessionSendResult>>
 ): Promise<TurnOutcome<AgentSessionSendResult>> {
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-restore-without-import.test.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-restore-without-import.test.ts
index 20cd3b298d5..a1bb644d84e 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-restore-without-import.test.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-restore-without-import.test.ts
@@ -519,7 +519,8 @@ describe('startup restore of chats still in their per-chat files', () => {
       messageId: 'draft-1',
       body: { kind: 'message', role: 'user', blocks: [{ type: 'text', text: 'later' }] },
       fingerprint: 'fp-draft-1',
-      hostInstance: 'proc-1'
+      hostInstance: 'proc-1',
+      source: { kind: 'user' }
     })
 
     expect(journal.importPending).toBe(false)
diff --git a/src/main/native-chat/agent-session-wire/structured-agent-session-turns.ts b/src/main/native-chat/agent-session-wire/structured-agent-session-turns.ts
index 629d7e71790..a291943fc0f 100644
--- a/src/main/native-chat/agent-session-wire/structured-agent-session-turns.ts
+++ b/src/main/native-chat/agent-session-wire/structured-agent-session-turns.ts
@@ -231,6 +231,7 @@ export async function handOverSubmission(
               state: 'rejected',
               reason: outcome.reason,
               rejection: outcome.rejection,
+              ...(outcome.answeredInTurn ? { answeredInTurn: outcome.answeredInTurn } : {}),
               fence: ctx.fence
             }
           : { clientMessageId, state: 'unknown', reason: outcome.reason, fence: ctx.fence }
diff --git a/src/main/persistence-ui-state.test.ts b/src/main/persistence-ui-state.test.ts
index 10bea531533..4324e61cdf5 100644
--- a/src/main/persistence-ui-state.test.ts
+++ b/src/main/persistence-ui-state.test.ts
@@ -92,6 +92,19 @@ describe('Store', () => {
     expect(ui.dismissedUpdateVersion).toBeNull()
   })
 
+  it.each([false, true])(
+    'restores sidebarOpen=%s from disk without changing the right sidebar',
+    async (sidebarOpen) => {
+      const store = await createStore()
+      store.updateUI({ sidebarOpen, rightSidebarOpen: false })
+      store.flush()
+
+      const reloaded = await createStore()
+      expect(reloaded.getUI().sidebarOpen).toBe(sidebarOpen)
+      expect(reloaded.getUI().rightSidebarOpen).toBe(false)
+    }
+  )
+
   it('round-trips and normalizes the host-qualified manual repo order', async () => {
     const store = await createStore()
     store.updateUI({
diff --git a/src/main/pi/agent-status-extension-async-subagents.test.ts b/src/main/pi/agent-status-extension-async-subagents.test.ts
index a9145cce874..89d5eebcf72 100644
--- a/src/main/pi/agent-status-extension-async-subagents.test.ts
+++ b/src/main/pi/agent-status-extension-async-subagents.test.ts
@@ -60,6 +60,32 @@ describe('Pi async subagent roster', () => {
     vi.useRealTimers()
   })
 
+  it('settles again when an async child starts after the turn settled', async () => {
+    const harness = createAgentStatusExtensionHarness({ kind: 'pi' })
+    await harness.callHook('agent_start')
+    await endTurn(harness)
+    startChild(harness, 'late-child', 'tool-call-1')
+    complete(harness, 'late-child')
+    await vi.advanceTimersByTimeAsync(0)
+
+    expect(agentEndCount(harness)).toBe(2)
+  })
+
+  it("does not spend a run's done on a child that starts before it is posted", async () => {
+    const harness = createAgentStatusExtensionHarness({ kind: 'pi' })
+    let idle = false
+    const context = { isIdle: () => idle }
+    await harness.callHook('agent_start')
+    await harness.callHook('agent_end', {}, context)
+    startChild(harness, 'quick-child', 'tool-call-1')
+    complete(harness, 'quick-child')
+    await harness.callHook('tool_execution_start', { toolName: 'bash' }, context)
+    idle = true
+    await vi.advanceTimersByTimeAsync(1_000)
+
+    expect(postedHookNames(harness).at(-1)).toBe('agent_end')
+  })
+
   it('settles after an async workflow whose awaited children never report completion', async () => {
     const harness = createAgentStatusExtensionHarness({ kind: 'pi' })
     await harness.callHook('agent_start')
diff --git a/src/main/pi/agent-status-extension-omp-lifecycle.test.ts b/src/main/pi/agent-status-extension-omp-lifecycle.test.ts
index 5d89d31aec1..03408a3ba6b 100644
--- a/src/main/pi/agent-status-extension-omp-lifecycle.test.ts
+++ b/src/main/pi/agent-status-extension-omp-lifecycle.test.ts
@@ -1,6 +1,9 @@
-import { describe, expect, it, vi } from 'vitest'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 
-import { createAgentStatusExtensionHarness } from './agent-status-extension-test-harness'
+import {
+  createAgentStatusExtensionHarness,
+  type AgentStatusExtensionHarness
+} from './agent-status-extension-test-harness'
 
 function postedHookNames(fetchMock: ReturnType<typeof vi.fn>): string[] {
   return fetchMock.mock.calls.map(
@@ -152,3 +155,143 @@ describe('OMP agent_end contract', () => {
     }
   })
 })
+
+function ompSession(id: string, parentSession?: string) {
+  return {
+    sessionManager: {
+      getSessionId: () => id,
+      getSessionFile: () => `/sessions/${id}.jsonl`,
+      getHeader: () => ({ parentSession })
+    }
+  }
+}
+
+describe('OMP subagent settlement', () => {
+  beforeEach(() => {
+    vi.useFakeTimers()
+  })
+  afterEach(() => {
+    vi.useRealTimers()
+  })
+
+  async function lifecycle(harness: AgentStatusExtensionHarness, id: string, status: string) {
+    harness.emitPiEvent('task:subagent:lifecycle', { id, status })
+    await vi.advanceTimersByTimeAsync(0)
+  }
+
+  async function hook(harness: AgentStatusExtensionHarness, name: string) {
+    await harness.callHook(name)
+    await vi.advanceTimersByTimeAsync(0)
+  }
+
+  it.each(OMP_RUNTIME_CASES)(
+    'settles %s again when a child starts after the run ended',
+    async (_name, args) => {
+      const harness = createAgentStatusExtensionHarness(args)
+
+      await hook(harness, 'agent_start')
+      await hook(harness, 'agent_end')
+      await lifecycle(harness, 'wake-1', 'started')
+      await lifecycle(harness, 'wake-1', 'completed')
+
+      expect(postedHookNames(harness.fetchMock)).toEqual([
+        'agent_start',
+        'agent_end',
+        'agent_start',
+        'agent_end'
+      ])
+    }
+  )
+
+  it.each(OMP_RUNTIME_CASES)(
+    'keeps %s working while a child outlives the next run',
+    async (_name, args) => {
+      const harness = createAgentStatusExtensionHarness(args)
+
+      await hook(harness, 'agent_start')
+      await lifecycle(harness, 'helper', 'started')
+      await hook(harness, 'agent_end')
+      await hook(harness, 'agent_start')
+      await hook(harness, 'agent_end')
+      expect(postedHookNames(harness.fetchMock)).not.toContain('agent_end')
+
+      await lifecycle(harness, 'helper', 'completed')
+      expect(postedHookNames(harness.fetchMock).at(-1)).toBe('agent_end')
+    }
+  )
+
+  it.each(OMP_RUNTIME_CASES)(
+    'keeps %s working while a late child outlives the next run',
+    async (_name, args) => {
+      const harness = createAgentStatusExtensionHarness(args)
+
+      await hook(harness, 'agent_start')
+      await hook(harness, 'agent_end')
+      await lifecycle(harness, 'wake-1', 'started')
+      await hook(harness, 'agent_start')
+      await hook(harness, 'agent_end')
+      expect(postedHookNames(harness.fetchMock).at(-1)).not.toBe('agent_end')
+
+      await lifecycle(harness, 'wake-1', 'completed')
+      expect(postedHookNames(harness.fetchMock).at(-1)).toBe('agent_end')
+    }
+  )
+
+  it('does not settle OMP when a child finishes mid-run', async () => {
+    const harness = createAgentStatusExtensionHarness({ kind: 'omp' })
+
+    await hook(harness, 'agent_start')
+    await lifecycle(harness, 'child-1', 'started')
+    await lifecycle(harness, 'child-1', 'completed')
+
+    expect(postedHookNames(harness.fetchMock)).not.toContain('agent_end')
+  })
+
+  it('settles a child woken before the resumed root has run a turn', async () => {
+    const harness = createAgentStatusExtensionHarness({ kind: 'omp' })
+
+    await harness.callHook('session_start', {}, ompSession('root'))
+    await lifecycle(harness, 'revived', 'started')
+    await lifecycle(harness, 'revived', 'completed')
+
+    expect(postedHookNames(harness.fetchMock)).toEqual(['agent_start', 'agent_end'])
+  })
+
+  it("ignores children seen by an OMP task session's copy of the extension", async () => {
+    const harness = createAgentStatusExtensionHarness({ kind: 'omp' })
+
+    await harness.callHook('agent_start', {}, ompSession('child', '/sessions/root.jsonl'))
+    await lifecycle(harness, 'grandchild', 'started')
+    await lifecycle(harness, 'grandchild', 'completed')
+
+    expect(harness.fetchMock).not.toHaveBeenCalled()
+  })
+
+  it('does not settle a reload that lands while the root run is still in flight', async () => {
+    const harness = createAgentStatusExtensionHarness({ kind: 'omp' })
+    await harness.callHook('session_start', {}, ompSession('root'))
+    await hook(harness, 'agent_start')
+    harness.reload()
+
+    await lifecycle(harness, 'child-1', 'started')
+    await lifecycle(harness, 'child-1', 'completed')
+    expect(postedHookNames(harness.fetchMock)).not.toContain('agent_end')
+
+    await hook(harness, 'agent_end')
+    expect(postedHookNames(harness.fetchMock).at(-1)).toBe('agent_end')
+  })
+
+  it('keeps OMP pane ownership across an extension reload', async () => {
+    const harness = createAgentStatusExtensionHarness({ kind: 'omp' })
+    await harness.callHook('session_start', {}, ompSession('root'))
+    await hook(harness, 'agent_start')
+    await lifecycle(harness, 'child-1', 'started')
+    await hook(harness, 'agent_end')
+    harness.reload()
+    expect(postedHookNames(harness.fetchMock)).not.toContain('agent_end')
+
+    await lifecycle(harness, 'child-1', 'completed')
+
+    expect(postedHookNames(harness.fetchMock).at(-1)).toBe('agent_end')
+  })
+})
diff --git a/src/main/pi/agent-status-handler-source.ts b/src/main/pi/agent-status-handler-source.ts
index a88490cf6ae..76eff628731 100644
--- a/src/main/pi/agent-status-handler-source.ts
+++ b/src/main/pi/agent-status-handler-source.ts
@@ -136,7 +136,7 @@ export function getPiAgentStatusHandlerSourceLines(kind: PiAgentKind): string[]
     ...getPiSubagentRosterSetupSourceLines(),
     ...(kind !== 'pi'
       ? [
-          "  pi.on('session_shutdown', () => { lifecycleState.active.clear(); lifecycleState.exited?.clear(); lifecycleState.waiting = false; resetPostQueue(); clearPendingAgentEndCheck() })"
+          "  pi.on('session_shutdown', () => { lifecycleState.active.clear(); lifecycleState.exited?.clear(); lifecycleState.waiting = false; lifecycleState.rootRunInFlight = false; resetPostQueue(); clearPendingAgentEndCheck() })"
         ]
       : []),
     ...(kind !== 'prime-agent'
@@ -146,6 +146,7 @@ export function getPiAgentStatusHandlerSourceLines(kind: PiAgentKind): string[]
           '    lifecycleState.active.clear()',
           '    lifecycleState.exited?.clear()',
           '    lifecycleState.waiting = false',
+          '    lifecycleState.rootRunInFlight = false',
           '    resetPostQueue()',
           '    clearPendingAgentEndCheck()',
           '    updateRuntimeOmpSessionMetadata(ctx)',
@@ -165,6 +166,7 @@ export function getPiAgentStatusHandlerSourceLines(kind: PiAgentKind): string[]
     ...captureSessionMetadata,
     '    clearPendingAgentEndCheck()',
     '    lifecycleState.waiting = false',
+    '    lifecycleState.rootRunInFlight = true',
     '    runGeneration += 1',
     // Why: a turn cannot begin under a dialog holding input focus, so this is the one
     // boundary that can recover a modal whose close never arrived.
@@ -287,6 +289,7 @@ export function getPiAgentStatusHandlerSourceLines(kind: PiAgentKind): string[]
     '      clearPendingAgentEndCheck()',
     '      return',
     '    }',
+    '    lifecycleState.rootRunInFlight = false',
     '    endedRunGeneration = runGeneration',
     '    if (isOmpRuntime()) {',
     '      postAgentEndOnce()',
diff --git a/src/main/pi/agent-status-subagent-roster-source.ts b/src/main/pi/agent-status-subagent-roster-source.ts
index 2901e5fe9c8..106d49a7533 100644
--- a/src/main/pi/agent-status-subagent-roster-source.ts
+++ b/src/main/pi/agent-status-subagent-roster-source.ts
@@ -5,7 +5,7 @@
 export function getPiSubagentRosterSetupSourceLines(): string[] {
   return [
     '  const piEventBus = (pi as { events?: { on?: (name: string, handler: (event: unknown) => void) => void } }).events',
-    '  const lifecycleState = (piEventBus as { __orcaPiSubagents?: { active: Set<string>; exited?: Set<string>; waiting: boolean; onEvent?: (event: unknown, forcedStatus?: string) => void; listener?: (event: unknown) => void; onRunnerExit?: (event: unknown) => void; runnerExitListener?: (event: unknown) => void } } | undefined)?.__orcaPiSubagents ?? { active: new Set<string>(), waiting: false }',
+    '  const lifecycleState = (piEventBus as { __orcaPiSubagents?: { active: Set<string>; exited?: Set<string>; waiting: boolean; ownsPane?: boolean; rootRunInFlight?: boolean; onEvent?: (event: unknown, forcedStatus?: string) => void; listener?: (event: unknown) => void; onRunnerExit?: (event: unknown) => void; runnerExitListener?: (event: unknown) => void } } | undefined)?.__orcaPiSubagents ?? { active: new Set<string>(), waiting: false }',
     '  if (piEventBus) (piEventBus as { __orcaPiSubagents?: unknown }).__orcaPiSubagents = lifecycleState',
     '  if (piEventBus?.on && !(lifecycleState as { listener?: unknown }).listener) {',
     '    const listener = (event: unknown) => lifecycleState.onEvent?.(event)',
@@ -23,8 +23,8 @@ export function getPiSubagentRosterSetupSourceLines(): string[] {
   ]
 }
 
-// Expects post() and postAgentEndOnce() from the handler scope; the latter prunes
-// exited runners before deciding whether children still hold the pane.
+// Expects post(), the run generations and postAgentEndOnce() from the handler scope;
+// the latter prunes exited runners before deciding whether children still hold the pane.
 export function getPiSubagentRosterEventSourceLines(): string[] {
   return [
     // Why: a run that reports its own completion does so ~150ms after its runner exits;
@@ -37,7 +37,20 @@ export function getPiSubagentRosterEventSourceLines(): string[] {
     "    const id = typeof record.id === 'string' && record.id ? record.id : typeof record.runId === 'string' ? record.runId : ''",
     '    const status = forcedStatus ?? (event as { status?: unknown }).status',
     '    if (!id) return',
-    "    if (status === 'started') { lifecycleState.active.add(id); post('agent_start'); return }",
+    // Why: each OMP task session runs its own copy on its own bus; only the pane's bus tracks children.
+    '    if (isOmpRuntime() && !lifecycleState.ownsPane) return',
+    "    if (status === 'started') {",
+    '      lifecycleState.active.add(id)',
+    // Why: a child starting after the run's done owes a fresh done. Under OMP the same holds
+    // before the first turn of this factory run (a resumed root, or a reload), but only when no
+    // root run is in flight -- a reload mid-turn resets these counters while the root still works.
+    '      if (completionPostedGeneration === runGeneration || (isOmpRuntime() && runGeneration === 0 && !lifecycleState.rootRunInFlight)) {',
+    '        lifecycleState.waiting = true',
+    '        completionPostedGeneration = -1',
+    '      }',
+    "      post('agent_start')",
+    '      return',
+    '    }',
     "    if (status !== 'completed' && status !== 'failed' && status !== 'aborted') return",
     '    lifecycleState.active.delete(id)',
     '    lifecycleState.exited?.delete(id)',
diff --git a/src/main/pi/omp-session-status-owner-source.ts b/src/main/pi/omp-session-status-owner-source.ts
index 9e29126f014..daf1a4078bf 100644
--- a/src/main/pi/omp-session-status-owner-source.ts
+++ b/src/main/pi/omp-session-status-owner-source.ts
@@ -55,6 +55,7 @@ export function getOmpSessionOwnerHandlerSourceLines(): string[] {
     '  function onStatus(name, handler): void {',
     '    pi.on(name, (event, ctx) => {',
     '      if (!ownsSessionStatus(ctx)) return',
+    '      lifecycleState.ownsPane = true',
     '      return handler(event, ctx)',
     '    })',
     '  }',
diff --git a/src/main/providers/local-pty-provider-shell-readiness.test.ts b/src/main/providers/local-pty-provider-shell-readiness.test.ts
index 6a46261e793..e33a681ed8c 100644
--- a/src/main/providers/local-pty-provider-shell-readiness.test.ts
+++ b/src/main/providers/local-pty-provider-shell-readiness.test.ts
@@ -217,7 +217,7 @@ describe('LocalPtyProvider', () => {
         expect(mockProc.write).not.toHaveBeenCalled()
 
         await vi.advanceTimersByTimeAsync(200)
-        expect(mockProc.write).toHaveBeenCalledWith(`${command}\n`)
+        expect(mockProc.write).toHaveBeenCalledWith(`${command}\r`)
       } finally {
         vi.useRealTimers()
       }
@@ -269,7 +269,7 @@ describe('LocalPtyProvider', () => {
 
         vi.advanceTimersByTime(1)
         await Promise.resolve()
-        expect(mockProc.write).toHaveBeenCalledWith("printf 'linked issue context'\n")
+        expect(mockProc.write).toHaveBeenCalledWith("printf 'linked issue context'\r")
       } finally {
         vi.useRealTimers()
       }
@@ -298,7 +298,7 @@ describe('LocalPtyProvider', () => {
 
         vi.advanceTimersByTime(200)
         await Promise.resolve()
-        expect(mockProc.write).toHaveBeenCalledWith('printf ready\n')
+        expect(mockProc.write).toHaveBeenCalledWith('printf ready\r')
       } finally {
         vi.useRealTimers()
       }
diff --git a/src/main/providers/local-pty-shell-ready-startup-command.test.ts b/src/main/providers/local-pty-shell-ready-startup-command.test.ts
index da843c6e42a..9b7c50ef521 100644
--- a/src/main/providers/local-pty-shell-ready-startup-command.test.ts
+++ b/src/main/providers/local-pty-shell-ready-startup-command.test.ts
@@ -58,8 +58,8 @@ describe('writeStartupCommandWhenShellReady', () => {
     Object.defineProperty(process, 'platform', { value: origPlatform })
   })
 
-  it('appends LF on POSIX so bash/zsh submit the line', async () => {
-    Object.defineProperty(process, 'platform', { value: 'darwin' })
+  it.each(['darwin', 'linux', 'win32'])('submits with CR on %s', async (platform) => {
+    Object.defineProperty(process, 'platform', { value: platform })
     const proc = createMockProc()
     const ready = Promise.resolve()
     writeStartupCommandWhenShellReady(ready, proc, 'claude', () => {})
@@ -69,39 +69,23 @@ describe('writeStartupCommandWhenShellReady', () => {
     vi.advanceTimersByTime(30)
     await Promise.resolve()
 
-    expect(proc._writes).toEqual(['claude\n'])
+    expect(proc._writes).toEqual(['claude\r'])
   })
 
-  it('appends CR on Windows so PowerShell/cmd.exe submit the line', async () => {
-    Object.defineProperty(process, 'platform', { value: 'win32' })
+  it('replaces a caller-supplied LF terminator with CR', async () => {
     const proc = createMockProc()
     const ready = Promise.resolve()
-    writeStartupCommandWhenShellReady(ready, proc, 'claude', () => {})
+    writeStartupCommandWhenShellReady(ready, proc, 'claude\n', () => {})
 
     await ready
-    proc._emitData('\r\nPS> ')
+    proc._emitData('\r\nuser@host % ')
     vi.advanceTimersByTime(30)
     await Promise.resolve()
 
     expect(proc._writes).toEqual(['claude\r'])
   })
 
-  it('does not re-append a submit byte if the command already ends in CR or LF', async () => {
-    Object.defineProperty(process, 'platform', { value: 'win32' })
-    const proc = createMockProc()
-    const ready = Promise.resolve()
-    writeStartupCommandWhenShellReady(ready, proc, 'claude\n', () => {})
-
-    await ready
-    proc._emitData('\r\nPS> ')
-    vi.advanceTimersByTime(30)
-    await Promise.resolve()
-
-    expect(proc._writes).toEqual(['claude\n'])
-  })
-
   it('keeps the no-prompt fallback conservative to avoid duplicate shell echo', async () => {
-    Object.defineProperty(process, 'platform', { value: 'darwin' })
     const proc = createMockProc()
     const ready = Promise.resolve()
     writeStartupCommandWhenShellReady(ready, proc, 'codex', () => {})
@@ -115,11 +99,10 @@ describe('writeStartupCommandWhenShellReady', () => {
     vi.advanceTimersByTime(150)
     await Promise.resolve()
 
-    expect(proc._writes).toEqual(['codex\n'])
+    expect(proc._writes).toEqual(['codex\r'])
   })
 
   it('uses the short settle delay when marker scan already observed post-marker bytes', async () => {
-    Object.defineProperty(process, 'platform', { value: 'darwin' })
     const proc = createMockProc()
     const ready = Promise.resolve({ postMarkerBytesObserved: true })
     writeStartupCommandWhenShellReady(ready, proc, 'codex', () => {})
@@ -131,12 +114,11 @@ describe('writeStartupCommandWhenShellReady', () => {
 
     vi.advanceTimersByTime(1)
     await Promise.resolve()
-    expect(proc._writes).toEqual(['codex\n'])
+    expect(proc._writes).toEqual(['codex\r'])
   })
 
   // Why: multiline startup commands must be bracketed-paste wrapped (ESC[200~ … ESC[201~) so shells insert them literally instead of treating each LF as Enter.
   it('wraps a multiline startup command in bracketed paste when the shell supports it', async () => {
-    Object.defineProperty(process, 'platform', { value: 'darwin' })
     const proc = createMockProc()
     const ready = Promise.resolve()
     const command = "claude '--dangerously-skip-permissions' 'line one\nline two'"
@@ -149,11 +131,10 @@ describe('writeStartupCommandWhenShellReady', () => {
     vi.advanceTimersByTime(30)
     await Promise.resolve()
 
-    expect(proc._writes).toEqual([`\x1b[200~${command}\x1b[201~\n`])
+    expect(proc._writes).toEqual([`\x1b[200~${command}\x1b[201~\r`])
   })
 
   it('leaves a single-line command on the raw submit path even when bracketed paste is safe', async () => {
-    Object.defineProperty(process, 'platform', { value: 'darwin' })
     const proc = createMockProc()
     const ready = Promise.resolve()
     writeStartupCommandWhenShellReady(ready, proc, 'claude', () => {}, {
@@ -165,14 +146,14 @@ describe('writeStartupCommandWhenShellReady', () => {
     vi.advanceTimersByTime(30)
     await Promise.resolve()
 
-    expect(proc._writes).toEqual(['claude\n'])
+    expect(proc._writes).toEqual(['claude\r'])
   })
 
   it('does not bracket-wrap a multiline command when the shell lacks bracketed paste', async () => {
-    Object.defineProperty(process, 'platform', { value: 'darwin' })
     const proc = createMockProc()
     const ready = Promise.resolve()
     const command = 'echo one\necho two'
+    // Why CR between the lines: without bracketed paste each break submits its own line.
     // Why: bracketedPasteSafe defaults false, so keep the raw path to avoid echoing ESC[200~ on shells without bracketed paste.
     writeStartupCommandWhenShellReady(ready, proc, command, () => {})
 
@@ -181,6 +162,6 @@ describe('writeStartupCommandWhenShellReady', () => {
     vi.advanceTimersByTime(30)
     await Promise.resolve()
 
-    expect(proc._writes).toEqual([`${command}\n`])
+    expect(proc._writes).toEqual(['echo one\recho two\r'])
   })
 })
diff --git a/src/main/providers/local-pty-shell-ready-startup-command.ts b/src/main/providers/local-pty-shell-ready-startup-command.ts
index bf7f73c19d7..5fefb5db5fa 100644
--- a/src/main/providers/local-pty-shell-ready-startup-command.ts
+++ b/src/main/providers/local-pty-shell-ready-startup-command.ts
@@ -46,12 +46,9 @@ export function writeStartupCommandWhenShellReady(
       postReadyTimer = null
     }
     // Why: run in the same interactive shell (not `shell -c`) so the session survives after the agent exits.
-    // Why CR on Windows: PSReadLine/cmd.exe submit on `\r`, not LF; POSIX treats either as Enter under ICRNL.
-    const submit = process.platform === 'win32' ? '\r' : '\n'
     // Why: single write after the ready barrier avoids incremental-paste char drops; multiline is bracketed-paste wrapped so newlines don't submit early.
     proc.write(
       buildStartupCommandSubmission(startupCommand, {
-        submit,
         bracketedPasteSafe: options.bracketedPasteSafe === true
       })
     )
diff --git a/src/main/runtime/orchestration/agent-facing-parity.test.ts b/src/main/runtime/orchestration/agent-facing-parity.test.ts
index f682dfc7ce2..ac765825e69 100644
--- a/src/main/runtime/orchestration/agent-facing-parity.test.ts
+++ b/src/main/runtime/orchestration/agent-facing-parity.test.ts
@@ -113,7 +113,7 @@ async function renderPreamble(worker: 'chat' | 'terminal'): Promise<string> {
 /** The turn text the structured lane sends a chat for one message on `mailbox`. */
 async function renderChatPointer(mailbox: string): Promise<string> {
   const texts: string[] = []
-  db.insertMessage({ from: 'term_peer', to: mailbox, subject: 'hi' })
+  const message = db.insertMessage({ from: 'term_peer', to: mailbox, subject: 'hi' })
   const delivery = new OrchestrationStructuredMailboxPointerDelivery({
     getDb: () => db,
     getMessageWaiters: () => undefined,
@@ -121,7 +121,7 @@ async function renderChatPointer(mailbox: string): Promise<string> {
     // The runtime's wiring of the structured lane.
     getCliCommand: localOrchestrationCliCommand,
     host: {
-      readGateFacts: async () => ({ turnRunning: false, awaitingHuman: false, submissions: [] }),
+      readSessionFacts: async () => ({ submissions: [] }),
       currentFence: () => 1,
       send: async (input) => {
         for (const block of input.body.blocks) {
@@ -133,6 +133,8 @@ async function renderChatPointer(mailbox: string): Promise<string> {
   })
   delivery.deliverForHandle(mailbox)
   await vi.waitFor(() => expect(texts).toHaveLength(1))
+  // Read, as the agent's `check` reads it, so this mailbox's next mail is pointed too.
+  db.markAsRead([message.id])
   return texts[0]!
 }
 
diff --git a/src/main/runtime/orchestration/orchestration-caller-identity.ts b/src/main/runtime/orchestration/orchestration-caller-identity.ts
index 9e34634ff3e..6909ac7cf65 100644
--- a/src/main/runtime/orchestration/orchestration-caller-identity.ts
+++ b/src/main/runtime/orchestration/orchestration-caller-identity.ts
@@ -2,23 +2,10 @@ import type { RunRow } from './types'
 import { isEquivalentPaneKey } from './db/pane-key-match'
 import { currentRunCoordinatorOrcaSessionId } from './db/runs/run-coordinator-orca-session'
 import { formatOrcaSessionAddress, type OrcaSessionId } from '../../../shared/orca-session-address'
+import type { OrchestrationPartyIdentity } from '../../../shared/orchestration-party-identity'
 
-/**
- * Who an orchestration caller is, as Run binding and mail routing match it.
- *
- * A PTY agent is its terminal: a handle and a pane key, no Orca session id. An agent that is a
- * structured session is its Orca session id, addressed as `orca_session_id:<id>`; a structured worker also
- * has the handle and pane key it was minted, and an ordinary chat has neither. Methods pass this
- * through whole and never branch on which fields are set; the lookups below own that.
- */
-export type OrchestrationCallerIdentity = Readonly<{
-  /** Mailbox address the caller sends from and reads: its terminal handle, else its session address. */
-  address: string
-  terminalHandle: string | null
-  paneKey: string | null
-  /** The bare Orca session id the caller is addressed by; mail spells it `orca_session_id:<id>`. */
-  orcaSessionId: OrcaSessionId | null
-}>
+/** Who an orchestration caller is; shared so a queued message can name its sender the same way. */
+export type OrchestrationCallerIdentity = OrchestrationPartyIdentity
 
 /** The part of a caller a Run binding stores and matches. */
 export type OrchestrationCoordinatorKey = Pick<
diff --git a/src/main/runtime/orchestration/send-agent-turn-host.test.ts b/src/main/runtime/orchestration/send-agent-turn-host.test.ts
index 5eb76ee1a55..0f92d95cee8 100644
--- a/src/main/runtime/orchestration/send-agent-turn-host.test.ts
+++ b/src/main/runtime/orchestration/send-agent-turn-host.test.ts
@@ -2,6 +2,7 @@
 // host's own admission: a fingerprint over other fields than the send carries is refused there.
 
 import { afterEach, beforeEach, describe, expect, it } from 'vitest'
+import type { AgentMessageSource } from '../../../shared/agent-session-message-source'
 import {
   createQueuedMessageTestRig,
   eventually,
@@ -20,6 +21,25 @@ import {
 
 let rig: QueuedMessageTestRig
 
+const MAIL_SOURCE: AgentMessageSource = {
+  kind: 'agent',
+  senders: [
+    {
+      party: {
+        address: 'term_peer',
+        terminalHandle: 'term_peer',
+        orcaSessionId: null
+      }
+    }
+  ],
+  orchestration: {
+    message: 'mail-notice',
+    mailbox: 'dispatch:d1',
+    dispatchId: 'd1',
+    messages: [{ messageId: 'm1', runId: 'r1', from: 'term_peer' }]
+  }
+}
+
 beforeEach(async () => {
   rig = await createQueuedMessageTestRig()
 })
@@ -36,7 +56,12 @@ function sendTurn(
     host,
     sessionId: SESSION,
     callerKey: 'trusted-local:orchestration:d1',
-    turn: { body: hostTestMessage('mail'), delivery, operationId, expectedRuntimeFence: 1 }
+    turn: {
+      body: hostTestMessage('mail'),
+      operationId,
+      expectedRuntimeFence: 1,
+      ...(delivery === 'queue' ? { delivery, source: MAIL_SOURCE } : { delivery })
+    }
   })
 }
 
@@ -47,6 +72,15 @@ describe('sendAgentTurn through the real host', () => {
       kind: 'queued',
       queued: { position: 1, state: 'waiting' }
     })
+    // Stored with the card, read back whole: who it is from survives the round trip.
+    expect(
+      rig.host
+        .collaboratorsForTests()
+        .sessions.get(SESSION)
+        ?.journal.queuedMessages.list()
+        .map(({ state, source }) => ({ state, source }))
+    ).toEqual([{ state: 'waiting', source: MAIL_SOURCE }])
+    // Shown in the chat's queue like the person's own card.
     expect(await rig.drafts()).toMatchObject([{ state: 'waiting' }])
   })
 
diff --git a/src/main/runtime/orchestration/send-agent-turn.test.ts b/src/main/runtime/orchestration/send-agent-turn.test.ts
index c018f27d28b..599ef009ae5 100644
--- a/src/main/runtime/orchestration/send-agent-turn.test.ts
+++ b/src/main/runtime/orchestration/send-agent-turn.test.ts
@@ -2,6 +2,7 @@ import { describe, expect, it, vi } from 'vitest'
 import type { AgentJournalSubmission } from '../../../shared/agent-session-journal-types'
 import { computeAgentSessionPayloadFingerprint } from '../../../shared/agent-session-mutation-envelope'
 import type { AgentSessionSendResult } from '../../../shared/agent-session-wire'
+import type { AgentMessageSource } from '../../../shared/agent-session-message-source'
 import { ORCHESTRATION_READINESS_TIMEOUT_MS } from '../../../shared/orchestration-timing-budgets'
 import { dispatchPreambleSendOptions } from './preamble'
 import {
@@ -52,6 +53,17 @@ function structuredHost(answer: HostSendAnswer, settled?: AgentJournalSubmission
   return { host, send, waitForSendSettlement }
 }
 
+const MAIL_SOURCE: AgentMessageSource = {
+  kind: 'agent',
+  senders: [],
+  orchestration: {
+    message: 'mail-notice',
+    mailbox: 'dispatch:d1',
+    dispatchId: 'd1',
+    messages: [{ messageId: 'm1', runId: 'r1', from: 'term_peer' }]
+  }
+}
+
 const turn: StructuredSessionTurn = {
   body: { kind: 'message', role: 'user', blocks: [{ type: 'text', text: 'hello' }] },
   delivery: 'now',
@@ -142,7 +154,7 @@ describe('sendAgentTurn to a structured session', () => {
       })
     )
     await expect(
-      sendAgentTurn(structured(fake.host, { ...turn, delivery: 'queue' }))
+      sendAgentTurn(structured(fake.host, { ...turn, delivery: 'queue', source: MAIL_SOURCE }))
     ).resolves.toEqual({
       kind: 'queued',
       clientMessageId: 'op-1',
@@ -158,7 +170,9 @@ describe('sendAgentTurn to a structured session', () => {
           payloadFingerprint: hostFingerprint({ body: turn.body, delivery: 'queue-if-active' })
         },
         body: turn.body,
-        delivery: 'queue-if-active'
+        delivery: 'queue-if-active',
+        // Host-local: who the card is from rides beside the envelope, outside its fingerprint.
+        source: MAIL_SOURCE
       }
     )
     expect(fake.waitForSendSettlement).not.toHaveBeenCalled()
@@ -172,7 +186,7 @@ describe('sendAgentTurn to a structured session', () => {
       })
     )
     await expect(
-      sendAgentTurn(structured(fake.host, { ...turn, delivery: 'queue' }))
+      sendAgentTurn(structured(fake.host, { ...turn, delivery: 'queue', source: MAIL_SOURCE }))
     ).resolves.toMatchObject({ kind: 'queued', queued: { state: 'returned' } })
   })
 })
diff --git a/src/main/runtime/orchestration/send-agent-turn.ts b/src/main/runtime/orchestration/send-agent-turn.ts
index 0a1921b96ba..340bcc82e87 100644
--- a/src/main/runtime/orchestration/send-agent-turn.ts
+++ b/src/main/runtime/orchestration/send-agent-turn.ts
@@ -17,6 +17,7 @@ import {
   type AgentSessionQueuedSendReceipt
 } from '../../../shared/agent-session-wire'
 import type { AgentSessionWireRefusal } from '../../../shared/agent-session-wire-refusals'
+import type { AgentMessageSource } from '../../../shared/agent-session-message-source'
 import { ORCHESTRATION_READINESS_TIMEOUT_MS } from '../../../shared/orchestration-timing-budgets'
 import { structuredAgentSessionMessageSendMutation } from '../../../shared/structured-agent-session-send-mutation'
 import type { StructuredAgentSessionHost } from '../../native-chat/agent-session-wire/structured-agent-session-host'
@@ -36,11 +37,14 @@ export type StructuredAgentTurnHost = Pick<
 
 export type StructuredSessionTurn = {
   body: AgentJournalMessageItem
-  delivery: AgentTurnDelivery
   /** Reused on a retry, so the host replays its recorded answer instead of sending twice. */
   operationId: string
   expectedRuntimeFence: number
-}
+} & (
+  | { delivery: 'now' }
+  /** A queued card records who it is from. */
+  | { delivery: 'queue'; source: AgentMessageSource }
+)
 
 export type StructuredSessionTurnSend = {
   kind: 'structured-session'
@@ -123,15 +127,17 @@ async function sendStructuredSessionTurn(
   send: StructuredSessionTurnSend
 ): Promise<StructuredSessionTurnOutcome> {
   const { turn } = send
+  const message = structuredAgentSessionMessageSendMutation({
+    sessionId: send.sessionId,
+    clientOperationId: turn.operationId,
+    expectedRuntimeFence: turn.expectedRuntimeFence,
+    body: turn.body,
+    delivery: turn.delivery === 'queue' ? 'queue-if-active' : undefined
+  })
   const result = await send.host.send(
     { callerKey: send.callerKey },
-    structuredAgentSessionMessageSendMutation({
-      sessionId: send.sessionId,
-      clientOperationId: turn.operationId,
-      expectedRuntimeFence: turn.expectedRuntimeFence,
-      body: turn.body,
-      delivery: turn.delivery === 'queue' ? 'queue-if-active' : undefined
-    })
+    // The source is host-local and outside the fingerprint: a retry under the same id replays.
+    turn.delivery === 'queue' ? { ...message, source: turn.source } : message
   )
   if (!result.ok) {
     return { kind: 'refused', refusal: result.refusal }
diff --git a/src/main/runtime/orchestration/structured-mail-source.test.ts b/src/main/runtime/orchestration/structured-mail-source.test.ts
new file mode 100644
index 00000000000..f6f394d722e
--- /dev/null
+++ b/src/main/runtime/orchestration/structured-mail-source.test.ts
@@ -0,0 +1,43 @@
+import { describe, expect, it } from 'vitest'
+import { structuredMailSource } from './structured-mail-source'
+
+const SESSION = '4a1f6c2e-8b3d-4e7a-9c15-0d2b6e8f1a37'
+
+describe('who delivered mail is from', () => {
+  it("names each sender once, without the pane key that would open its mailbox, and each message's own sender", () => {
+    // No database: a terminal handle and a session address name their party by themselves.
+    const source = structuredMailSource({
+      db: null,
+      mailboxHandle: 'run:r1',
+      dispatchId: null,
+      batch: [
+        { id: 'm1', from_handle: 'term_a', run_id: 'r1' },
+        { id: 'm2', from_handle: `orca_session_id:${SESSION}`, run_id: 'r2' },
+        { id: 'm3', from_handle: 'term_a', run_id: 'r1' }
+      ]
+    })
+    expect(source).toEqual({
+      kind: 'agent',
+      senders: [
+        { party: { address: 'term_a', terminalHandle: 'term_a', orcaSessionId: null } },
+        {
+          party: {
+            address: `orca_session_id:${SESSION}`,
+            terminalHandle: null,
+            orcaSessionId: SESSION
+          }
+        }
+      ],
+      orchestration: {
+        message: 'mail-notice',
+        mailbox: 'run:r1',
+        dispatchId: null,
+        messages: [
+          { messageId: 'm1', runId: 'r1', from: 'term_a' },
+          { messageId: 'm2', runId: 'r2', from: `orca_session_id:${SESSION}` },
+          { messageId: 'm3', runId: 'r1', from: 'term_a' }
+        ]
+      }
+    })
+  })
+})
diff --git a/src/main/runtime/orchestration/structured-mail-source.ts b/src/main/runtime/orchestration/structured-mail-source.ts
new file mode 100644
index 00000000000..ad26c3b8be0
--- /dev/null
+++ b/src/main/runtime/orchestration/structured-mail-source.ts
@@ -0,0 +1,53 @@
+/**
+ * Who the mail a chat is pointed at is from: every distinct sender, named the
+ * way orchestration names a party, and each message's own sender and records. The run, dispatch
+ * and message ids join back to orchestration's own rows while those exist.
+ */
+
+import { parseOrcaSessionAddress } from '../../../shared/orca-session-address'
+import type {
+  AgentMessageSource,
+  AgentMessageSender
+} from '../../../shared/agent-session-message-source'
+import type { MessageRow, OrchestrationDb } from './db'
+import { resolveOrchestrationParty } from './orchestration-party'
+
+export type MailSourceMessage = Pick<MessageRow, 'id' | 'from_handle' | 'run_id'>
+
+export function structuredMailSource(input: {
+  db: OrchestrationDb | null
+  mailboxHandle: string
+  dispatchId: string | null
+  batch: readonly MailSourceMessage[]
+}): AgentMessageSource {
+  const senders = new Map<string, AgentMessageSender>()
+  for (const { from_handle: address } of input.batch) {
+    if (!senders.has(address)) {
+      senders.set(address, { party: senderParty(address, input.db) })
+    }
+  }
+  return {
+    kind: 'agent',
+    senders: [...senders.values()],
+    orchestration: {
+      message: 'mail-notice',
+      mailbox: input.mailboxHandle,
+      dispatchId: input.dispatchId,
+      messages: input.batch.map((message) => ({
+        messageId: message.id,
+        runId: message.run_id,
+        from: message.from_handle
+      }))
+    }
+  }
+}
+
+function senderParty(address: string, db: OrchestrationDb | null): AgentMessageSender['party'] {
+  try {
+    const { paneKey: _credential, ...party } = resolveOrchestrationParty(address, db)
+    return party
+  } catch {
+    // A worker this host lost the identity of: what the address itself says.
+    return { address, terminalHandle: null, orcaSessionId: parseOrcaSessionAddress(address) }
+  }
+}
diff --git a/src/main/runtime/orchestration/structured-mailbox-pointer-delivery.test.ts b/src/main/runtime/orchestration/structured-mailbox-pointer-delivery.test.ts
index 9b40bc08b0d..46090094c0d 100644
--- a/src/main/runtime/orchestration/structured-mailbox-pointer-delivery.test.ts
+++ b/src/main/runtime/orchestration/structured-mailbox-pointer-delivery.test.ts
@@ -1,5 +1,4 @@
 import { describe, expect, it, vi } from 'vitest'
-import type { AgentJournalRenderItem } from '../../../shared/agent-session-journal-types'
 import {
   OrchestrationStructuredMailboxPointerDelivery,
   type StructuredMailboxPointerHost
@@ -9,7 +8,6 @@ import {
   structuredPointerBatchFingerprint,
   type StructuredPointerSubmission
 } from './structured-pointer-operation-id'
-import { structuredSessionGateFacts } from './structured-session-pointer-delivery'
 import type { StructuredWorkerIdentity } from '../structured-worker-identity'
 
 const IDENTITY: StructuredWorkerIdentity = {
@@ -22,63 +20,12 @@ const IDENTITY: StructuredWorkerIdentity = {
   hostScope: { kind: 'local', hostId: 'local' }
 }
 
-function idleJournal(): AgentJournalRenderItem[] {
-  return [
-    {
-      itemId: 'i1',
-      observedAt: 1,
-      body: { kind: 'status', text: 'done', turnLifecycle: { state: 'completed', turnId: 't1' } }
-    } as unknown as AgentJournalRenderItem
-  ]
-}
-
-function runningJournal(): AgentJournalRenderItem[] {
-  return [
-    {
-      itemId: 'i1',
-      observedAt: 1,
-      body: { kind: 'status', text: 'working', turnLifecycle: { state: 'running', turnId: 't1' } }
-    } as unknown as AgentJournalRenderItem
-  ]
-}
-
-/** What a worker's journal looks like once it has finished a substantial turn: history, and no
- *  turnLifecycle row anywhere, because settlement tombstones it. */
-function settledLongJournal(): AgentJournalRenderItem[] {
-  return Array.from(
-    { length: 120 },
-    (_unused, index) =>
-      ({
-        itemId: `tool-${index}`,
-        observedAt: index,
-        body: { kind: 'tool-call', name: 'Bash', input: {}, state: 'completed' }
-      }) as unknown as AgentJournalRenderItem
-  )
-}
-
-/** A prompt raised at the very start of a long turn, far outside any bounded tail window. */
-function staleAttentionJournal(): AgentJournalRenderItem[] {
-  return [...attentionJournal(), ...settledLongJournal()]
-}
-
-function attentionJournal(): AgentJournalRenderItem[] {
-  return [
-    {
-      itemId: 'i1',
-      observedAt: 1,
-      body: {
-        kind: 'question',
-        question: 'which?',
-        options: [],
-        resolution: { state: 'pending' }
-      }
-    } as unknown as AgentJournalRenderItem
-  ]
-}
-
 function harness(options: {
-  journal: AgentJournalRenderItem[] | null
+  /** False: the session cannot be read (not attached). */
+  attached?: boolean
   dispatchState?: 'accepted' | 'rejected' | 'unknown'
+  /** The chat was busy: its queue holds the pointer as a card. */
+  queued?: true
   /** The coordinator of this worker's Run is mid-batch: it checked and has not acked yet. */
   outstandingRunDelivery?: boolean
   outstandingOwnDelivery?: boolean
@@ -88,14 +35,24 @@ function harness(options: {
 }) {
   const mailbox = options.mailbox ?? 'dispatch:d1'
   const dispatchId = options.dispatchId === undefined ? 'd1' : options.dispatchId
-  let journal = options.journal
+  let attached = options.attached ?? true
   // The session's recorded sends, as its journal reports them.
   let submissions: StructuredPointerSubmission[] = []
-  const markAsDelivered = vi.fn()
-  const send: StructuredMailboxPointerHost['send'] = vi.fn(async () => ({
-    kind: 'sent' as const,
-    state: options.dispatchState ?? ('accepted' as const)
-  }))
+  // The mailbox's unread mail; a pointed message is no longer selected for a pointer.
+  const mail = [
+    { id: 'm1', type: 'status', sequence: 3, from_handle: 'term_coord', run_id: 'run_1' }
+  ]
+  const pointed = new Set<string>()
+  const markAsDelivered = vi.fn((ids: string[]) => {
+    for (const id of ids) {
+      pointed.add(id)
+    }
+  })
+  const send: StructuredMailboxPointerHost['send'] = vi.fn(async () =>
+    options.queued
+      ? { kind: 'queued' as const }
+      : { kind: 'sent' as const, state: options.dispatchState ?? ('accepted' as const) }
+  )
   const sendMock = vi.mocked(send)
   const stored = new Map<string, StructuredPointerOperationRow>()
   const db = {
@@ -103,7 +60,7 @@ function harness(options: {
     hasOutstandingMailboxDelivery: (handle: string) =>
       ((options.outstandingRunDelivery ?? false) && handle.startsWith('run:')) ||
       ((options.outstandingOwnDelivery ?? false) && !handle.startsWith('run:')),
-    getUndeliveredUnreadMessages: () => [{ id: 'm1', type: 'status', sequence: 3 }],
+    getUndeliveredUnreadMessages: () => mail.filter((message) => !pointed.has(message.id)),
     markAsDelivered,
     getStructuredPointerOperation: (key: string) => stored.get(key),
     putStructuredPointerOperation: (row: StructuredPointerOperationRow) =>
@@ -117,8 +74,7 @@ function harness(options: {
       mailboxHandle === mailbox ? { sessionId: IDENTITY.sessionId, dispatchId } : null,
     getCliCommand: () => 'orca-dev',
     host: {
-      readGateFacts: async () =>
-        journal === null ? null : { ...structuredSessionGateFacts(journal), submissions },
+      readSessionFacts: async () => (attached ? { submissions } : null),
       currentFence: () => 4,
       send
     }
@@ -128,8 +84,11 @@ function harness(options: {
     markAsDelivered,
     send: sendMock,
     stored,
-    setJournal: (next: AgentJournalRenderItem[] | null) => {
-      journal = next
+    setAttached: (next: boolean) => {
+      attached = next
+    },
+    receive: (id: string, sequence: number) => {
+      mail.push({ id, type: 'status', sequence, from_handle: 'term_coord', run_id: 'run_1' })
     },
     setSubmissions: (next: StructuredPointerSubmission[]) => {
       submissions = next
@@ -141,13 +100,13 @@ const flush = () => new Promise((resolve) => setTimeout(resolve, 0))
 
 describe('structured mailbox pointer delivery', () => {
   it('claims only mailboxes whose assignee is a structured worker', () => {
-    const { delivery } = harness({ journal: idleJournal() })
+    const { delivery } = harness({})
     expect(delivery.deliverForHandle('dispatch:d1')).toBe(true)
     expect(delivery.deliverForHandle('run:run_1')).toBe(false)
   })
 
   it('sends the pointer as a turn and consumes mail on an accepted dispatch', async () => {
-    const { delivery, markAsDelivered, send } = harness({ journal: idleJournal() })
+    const { delivery, markAsDelivered, send } = harness({})
     delivery.deliverForHandle('dispatch:d1')
     await flush()
     expect(send).toHaveBeenCalledTimes(1)
@@ -157,7 +116,6 @@ describe('structured mailbox pointer delivery', () => {
 
   it('nudges through the worker`s own handle for direct peer mail outside a dispatch', async () => {
     const { delivery, send, markAsDelivered } = harness({
-      journal: idleJournal(),
       mailbox: IDENTITY.handle,
       dispatchId: null
     })
@@ -176,7 +134,6 @@ describe('structured mailbox pointer delivery', () => {
 
   it('retains mail when the dispatch settles unknown', async () => {
     const { delivery, markAsDelivered } = harness({
-      journal: idleJournal(),
       dispatchState: 'unknown'
     })
     delivery.deliverForHandle('dispatch:d1')
@@ -184,40 +141,8 @@ describe('structured mailbox pointer delivery', () => {
     expect(markAsDelivered).not.toHaveBeenCalled()
   })
 
-  it('retains mail while a turn is running', async () => {
-    const { delivery, send, markAsDelivered } = harness({ journal: runningJournal() })
-    delivery.deliverForHandle('dispatch:d1')
-    await flush()
-    expect(send).not.toHaveBeenCalled()
-    expect(markAsDelivered).not.toHaveBeenCalled()
-  })
-
-  it('retains mail while a prompt is waiting for a human', async () => {
-    const { delivery, send } = harness({ journal: attentionJournal() })
-    delivery.deliverForHandle('dispatch:d1')
-    await flush()
-    expect(send).not.toHaveBeenCalled()
-  })
-
-  it('delivers to a worker whose finished turn left a long history and no lifecycle row', async () => {
-    // The steady state after a worker's first substantial turn. Gating on a bounded tail page read
-    // this as permanently busy, so every later nudge parked forever and the worker went unnudged.
-    const { delivery, send, markAsDelivered } = harness({ journal: settledLongJournal() })
-    delivery.deliverForHandle('dispatch:d1')
-    await flush()
-    expect(send).toHaveBeenCalledTimes(1)
-    expect(markAsDelivered).toHaveBeenCalledWith(['m1'])
-  })
-
-  it('retains mail for a prompt that scrolled out of the tail window', async () => {
-    const { delivery, send } = harness({ journal: staleAttentionJournal() })
-    delivery.deliverForHandle('dispatch:d1')
-    await flush()
-    expect(send).not.toHaveBeenCalled()
-  })
-
   it('retains mail when the session is not attached', async () => {
-    const { delivery, send } = harness({ journal: null })
+    const { delivery, send } = harness({ attached: false })
     delivery.deliverForHandle('dispatch:d1')
     await flush()
     expect(send).not.toHaveBeenCalled()
@@ -226,27 +151,54 @@ describe('structured mailbox pointer delivery', () => {
   it('redrives a detached session when the journal replays on re-attach', async () => {
     // A transient detach parks nothing to be woken unless `session-not-attached` waits for the
     // journal edge, and the dispatch preamble tells the worker not to poll.
-    const { delivery, send, setJournal, markAsDelivered } = harness({ journal: null })
+    const { delivery, send, setAttached, markAsDelivered } = harness({ attached: false })
     delivery.deliverForHandle('dispatch:d1')
     await flush()
     expect(send).not.toHaveBeenCalled()
-    setJournal(idleJournal())
+    setAttached(true)
     delivery.onJournalActivity('session-1')
     await flush()
     expect(send).toHaveBeenCalledTimes(1)
     expect(markAsDelivered).toHaveBeenCalledWith(['m1'])
   })
 
-  it('retries a parked pointer when the journal moves', async () => {
-    const { delivery, send, setJournal, markAsDelivered } = harness({ journal: runningJournal() })
+  it('sends the pointer through the chat, with who it is from, and counts it pointed once queued', async () => {
+    const { delivery, send, markAsDelivered, stored } = harness({ queued: true })
     delivery.deliverForHandle('dispatch:d1')
     await flush()
-    expect(send).not.toHaveBeenCalled()
-    setJournal(idleJournal())
-    delivery.onJournalActivity('session-1')
+    expect(send).toHaveBeenCalledTimes(1)
+    expect(send.mock.calls[0]![0].body.blocks[0]).toMatchObject({
+      text: expect.stringContaining('orca-dev orchestration check')
+    })
+    expect(send.mock.calls[0]![0].source).toMatchObject({
+      kind: 'agent',
+      senders: [{ party: { address: 'term_coord' } }],
+      orchestration: {
+        message: 'mail-notice',
+        mailbox: 'dispatch:d1',
+        messages: [{ messageId: 'm1', runId: 'run_1', from: 'term_coord' }]
+      }
+    })
+    // The chat's queue holds it now, as it holds the person's: the same mail is not pointed again.
+    expect(markAsDelivered).toHaveBeenCalledWith(['m1'])
+    expect(stored.has('dispatch:d1')).toBe(false)
+  })
+
+  it('points mail that arrives while earlier pointed mail is still unread, counting only the new mail', async () => {
+    const { delivery, send, receive } = harness({})
+    delivery.deliverForHandle('dispatch:d1')
     await flush()
     expect(send).toHaveBeenCalledTimes(1)
-    expect(markAsDelivered).toHaveBeenCalledWith(['m1'])
+    delivery.deliverForHandle('dispatch:d1')
+    await flush()
+    expect(send).toHaveBeenCalledTimes(1)
+    receive('m2', 4)
+    delivery.deliverForHandle('dispatch:d1')
+    await flush()
+    expect(send).toHaveBeenCalledTimes(2)
+    expect(send.mock.calls[1]![0].body.blocks[0]).toMatchObject({
+      text: expect.stringContaining('You have 1 orchestration message.')
+    })
   })
 
   it('nudges the worker while its coordinator holds an unacked Run delivery', async () => {
@@ -255,7 +207,6 @@ describe('structured mailbox pointer delivery', () => {
     // coordinator's `run:` delivery is invisible here — gating the WORKER's dispatch mailbox on it
     // dropped the nudge with nothing parked, and the worker sat idle on mail it was never told of.
     const { delivery, send, markAsDelivered } = harness({
-      journal: idleJournal(),
       outstandingRunDelivery: true
     })
     delivery.deliverForHandle('dispatch:d1')
@@ -267,7 +218,7 @@ describe('structured mailbox pointer delivery', () => {
   it('does not re-nudge a mailbox still holding its own unacked batch', async () => {
     // The other half of the same gate: the consumer already has this batch, so a second nudge
     // spends a whole provider turn telling it something it was told.
-    const { delivery, send } = harness({ journal: idleJournal(), outstandingOwnDelivery: true })
+    const { delivery, send } = harness({ outstandingOwnDelivery: true })
     delivery.deliverForHandle('dispatch:d1')
     await flush()
     expect(send).not.toHaveBeenCalled()
@@ -278,7 +229,6 @@ describe('structured mailbox pointer delivery', () => {
     // stranded the worker until unrelated mail happened to arrive. The retry keeps the id: the host
     // replays a recorded refusal rather than starting the agent again.
     const { delivery, send, markAsDelivered } = harness({
-      journal: idleJournal(),
       dispatchState: 'rejected'
     })
     delivery.deliverForHandle('dispatch:d1')
@@ -294,7 +244,6 @@ describe('structured mailbox pointer delivery', () => {
 
   it('points again under a new id once a later send ran', async () => {
     const { delivery, send, setSubmissions } = harness({
-      journal: idleJournal(),
       dispatchState: 'unknown'
     })
     delivery.deliverForHandle('dispatch:d1')
@@ -312,7 +261,6 @@ describe('structured mailbox pointer delivery', () => {
 
   it('points once more under a new id for a send an earlier process left in doubt', async () => {
     const { delivery, send, stored, setSubmissions } = harness({
-      journal: idleJournal(),
       dispatchState: 'unknown'
     })
     stored.set('dispatch:d1', {
@@ -344,7 +292,6 @@ describe('structured mailbox pointer delivery', () => {
     vi.useFakeTimers({ toFake: ['Date'] })
     try {
       const { delivery, send, setSubmissions } = harness({
-        journal: idleJournal(),
         dispatchState: 'unknown'
       })
       // The wall clock steps back an hour after the lane started: its own row is still its own.
@@ -374,7 +321,6 @@ describe('structured mailbox pointer delivery', () => {
     vi.useFakeTimers({ toFake: ['Date'] })
     try {
       const { delivery, send, setSubmissions } = harness({
-        journal: idleJournal(),
         dispatchState: 'unknown'
       })
       const personTurn = {
@@ -408,7 +354,6 @@ describe('structured mailbox pointer delivery', () => {
 
   it('stamps a pointer whose echo arrived after the lane stopped waiting, sending nothing more', async () => {
     const { delivery, send, markAsDelivered, stored, setSubmissions } = harness({
-      journal: idleJournal(),
       dispatchState: 'unknown'
     })
     delivery.deliverForHandle('dispatch:d1')
@@ -428,7 +373,6 @@ describe('structured mailbox pointer delivery', () => {
 
   it('reuses one operation id for the same batch and re-mints when it grows', async () => {
     const { delivery, send, stored } = harness({
-      journal: idleJournal(),
       dispatchState: 'unknown'
     })
     delivery.deliverForHandle('dispatch:d1')
@@ -445,10 +389,10 @@ describe('structured mailbox pointer delivery', () => {
 })
 
 describe('forgetting one settled worker', () => {
-  /** Two workers, each mid-turn and so each parked on its OWN session's journal edge. */
+  /** Two workers, each detached and so each parked on its OWN session's journal edge. */
   function twoWorkerHarness() {
     let resolves = true
-    let journal = runningJournal()
+    let attached = false
     const sessionByMailbox: Record<string, string> = {
       'dispatch:d1': 'session-1',
       'dispatch:d2': 'session-2'
@@ -460,7 +404,9 @@ describe('forgetting one settled worker', () => {
     const db = {
       getDispatchContextById: () => ({ run_id: 'run_1' }),
       hasOutstandingMailboxDelivery: () => false,
-      getUndeliveredUnreadMessages: () => [{ id: 'm1', type: 'status', sequence: 3 }],
+      getUndeliveredUnreadMessages: () => [
+        { id: 'm1', type: 'status', sequence: 3, from_handle: 'term_coord', run_id: 'run_1' }
+      ],
       markAsDelivered: vi.fn(),
       getStructuredPointerOperation: () => undefined,
       putStructuredPointerOperation: () => {},
@@ -477,7 +423,7 @@ describe('forgetting one settled worker', () => {
       },
       getCliCommand: () => 'orca',
       host: {
-        readGateFacts: async () => ({ ...structuredSessionGateFacts(journal), submissions: [] }),
+        readSessionFacts: async () => (attached ? { submissions: [] } : null),
         currentFence: () => 4,
         send
       }
@@ -485,8 +431,8 @@ describe('forgetting one settled worker', () => {
     return {
       delivery,
       send: vi.mocked(send),
-      goIdle: () => {
-        journal = idleJournal()
+      attach: () => {
+        attached = true
       },
       stopResolving: () => {
         resolves = false
@@ -501,7 +447,7 @@ describe('forgetting one settled worker', () => {
     // The bug: `forgetSession` re-resolved every parked mailbox and pruned the ones that answered
     // null. A momentarily null DB reference or a session mid-teardown made that EVERY worker, so
     // the sibling's mail stayed durable but lost the edge that would have woken it.
-    const { delivery, send, goIdle, stopResolving, resumeResolving } = twoWorkerHarness()
+    const { delivery, send, attach, stopResolving, resumeResolving } = twoWorkerHarness()
     delivery.deliverForHandle('dispatch:d1')
     delivery.deliverForHandle('dispatch:d2')
     await flush()
@@ -511,7 +457,7 @@ describe('forgetting one settled worker', () => {
     delivery.forgetSession('session-1')
     resumeResolving()
 
-    goIdle()
+    attach()
     delivery.onJournalActivity('session-2')
     await flush()
     expect(send).toHaveBeenCalledTimes(1)
@@ -519,7 +465,7 @@ describe('forgetting one settled worker', () => {
   })
 
   it('still drops what the settled worker itself had parked', async () => {
-    const { delivery, send, goIdle, stopResolving } = twoWorkerHarness()
+    const { delivery, send, attach, stopResolving } = twoWorkerHarness()
     delivery.deliverForHandle('dispatch:d1')
     await flush()
     expect(send).not.toHaveBeenCalled()
@@ -529,7 +475,7 @@ describe('forgetting one settled worker', () => {
     stopResolving()
     delivery.forgetSession('session-1')
 
-    goIdle()
+    attach()
     delivery.onJournalActivity('session-1')
     await flush()
     expect(send).not.toHaveBeenCalled()
diff --git a/src/main/runtime/orchestration/structured-mailbox-pointer-delivery.ts b/src/main/runtime/orchestration/structured-mailbox-pointer-delivery.ts
index e84aa8e30e9..f442c520d4b 100644
--- a/src/main/runtime/orchestration/structured-mailbox-pointer-delivery.ts
+++ b/src/main/runtime/orchestration/structured-mailbox-pointer-delivery.ts
@@ -3,9 +3,9 @@
  *
  * The PTY lane types the nudge into a live pane and reads the idle edge off the terminal title.
  * Neither exists here, so this is a sibling of `OrchestrationMailboxPointerDelivery` rather than a
- * branch inside it: batch selection is literally shared (`selectOrchestrationPointerBatch`), and
- * everything below it is different — the nudge is a session turn, the idle edge is the journal,
- * and only an `accepted` dispatch may consume mail.
+ * branch inside it: batch selection and the pointer text are literally shared, and everything
+ * below it is different — the nudge goes through the chat's own send, as a person's message does,
+ * and the retry edge is the journal.
  *
  * Coordinators are in scope here, unlike the PTY lane's reasoning: a PTY coordinator blocks in
  * `check --wait`, where a waiter preempts pointer delivery, but a structured coordinator is a chat
@@ -13,7 +13,8 @@
  */
 
 import type { AgentJournalMessageItem } from '../../../shared/agent-session-journal-types'
-import type { OrchestrationDb } from './db'
+import type { AgentMessageSource } from '../../../shared/agent-session-message-source'
+import type { MessageRow, OrchestrationDb } from './db'
 import { formatMessagePointer } from './formatter'
 import type { OrchestrationCliCommand } from './cli-command'
 import {
@@ -24,13 +25,12 @@ import {
   resolveStructuredPointerOperation,
   type StructuredPointerSubmission
 } from './structured-pointer-operation-id'
+import { structuredMailSource } from './structured-mail-source'
 import {
-  decideStructuredSessionPointerDelivery,
   retainReasonForDispatch,
   structuredDispatchDelivered,
   type StructuredDispatchState,
-  type StructuredPointerRetainReason,
-  type StructuredSessionGateFacts
+  type StructuredPointerRetainReason
 } from './structured-session-pointer-delivery'
 
 export type StructuredPointerTarget = {
@@ -50,22 +50,25 @@ type ParkedPointerDelivery = {
 
 export type StructuredPointerSendOutcome =
   | { kind: 'sent'; state: StructuredDispatchState }
+  /** The chat's queue took it, as it takes a person's message. */
+  | { kind: 'queued' }
   | { kind: 'unattached' }
 
-export type StructuredPointerGateFacts = StructuredSessionGateFacts & {
+export type StructuredPointerSessionFacts = {
   /** Every send the session recorded, oldest first: what the lane's own sends settled as. */
   submissions: readonly StructuredPointerSubmission[]
 }
 
 export type StructuredMailboxPointerHost = {
-  /** The idle gate, read off the session's full reduced timeline; `null` when it cannot be read. */
-  readGateFacts: (sessionId: string) => Promise<StructuredPointerGateFacts | null>
+  /** `null` when the session cannot be read. */
+  readSessionFacts: (sessionId: string) => Promise<StructuredPointerSessionFacts | null>
   send: (input: {
     sessionId: string
     dispatchId: string | null
     operationId: string
     expectedRuntimeFence: number
     body: AgentJournalMessageItem
+    source: AgentMessageSource
   }) => Promise<StructuredPointerSendOutcome>
   /** Current lease fence; `null` when no record backs the session any more. */
   currentFence: (sessionId: string) => number | null
@@ -194,14 +197,13 @@ export class OrchestrationStructuredMailboxPointerDelivery<
     db: OrchestrationDb,
     mailboxHandle: string,
     target: StructuredPointerTarget,
-    unread: readonly { id: string; type: string; sequence: number }[],
+    unread: readonly MessageRow[],
     reservedTypes: ReadonlySet<string> | undefined
   ): Promise<void> {
     const sessionId = target.sessionId
-    const session = await this.deps.host.readGateFacts(sessionId)
-    const decision = decideStructuredSessionPointerDelivery({ session })
-    if (!decision.deliver) {
-      this.retain(mailboxHandle, sessionId, decision.retain, reservedTypes)
+    const session = await this.deps.host.readSessionFacts(sessionId)
+    if (!session) {
+      this.retain(mailboxHandle, sessionId, 'session-not-attached', reservedTypes)
       return
     }
     const fence = this.deps.host.currentFence(sessionId)
@@ -225,7 +227,7 @@ export class OrchestrationStructuredMailboxPointerDelivery<
       mailboxHandle,
       sessionId,
       messageIds: staged,
-      submissions: session?.submissions ?? [],
+      submissions: session.submissions,
       sentByThisProcess: this.sentOperationIds.get(mailboxHandle)
     })
     if (operation.kind === 'stamp') {
@@ -245,13 +247,20 @@ export class OrchestrationStructuredMailboxPointerDelivery<
       dispatchId: target.dispatchId,
       operationId: operation.operationId,
       expectedRuntimeFence: fence,
-      body
+      body,
+      source: structuredMailSource({
+        db,
+        mailboxHandle,
+        dispatchId: target.dispatchId,
+        batch: unread
+      })
     })
     if (outcome.kind === 'unattached') {
       this.retain(mailboxHandle, sessionId, 'session-not-attached', reservedTypes)
       return
     }
-    if (!structuredDispatchDelivered(outcome.state)) {
+    // A queued pointer is the chat's queue's to send, as a person's queued message is.
+    if (outcome.kind === 'sent' && !structuredDispatchDelivered(outcome.state)) {
       // The row stays: resending under its id replays this verdict and starts nothing.
       this.retain(mailboxHandle, sessionId, retainReasonForDispatch(outcome.state), reservedTypes)
       return
@@ -264,7 +273,8 @@ export class OrchestrationStructuredMailboxPointerDelivery<
   }
 
   /**
-   * No `markAsUndelivered` is owed: rows are marked delivered only after an accepted dispatch.
+   * No `markAsUndelivered` is owed: rows are marked delivered only after an accepted dispatch, or
+   * once the chat's queue holds the pointer.
    *
    * Every reason parks for the session's next journal edge. `unknown` may mean the nudge already
    * sits in the provider's input queue, so an immediate retry can stack duplicate nudges;
diff --git a/src/main/runtime/orchestration/structured-mailbox-pointer-host.test.ts b/src/main/runtime/orchestration/structured-mailbox-pointer-host.test.ts
index 72953f1e904..1d1700e76bc 100644
--- a/src/main/runtime/orchestration/structured-mailbox-pointer-host.test.ts
+++ b/src/main/runtime/orchestration/structured-mailbox-pointer-host.test.ts
@@ -1,5 +1,6 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import type { AgentJournalRenderItem } from '../../../shared/agent-session-journal-types'
+import type { AgentMessageSource } from '../../../shared/agent-session-message-source'
 
 const hostRef: { current: unknown } = { current: null }
 
@@ -9,6 +10,7 @@ vi.mock('../../native-chat/agent-session-wire/structured-agent-session-registry'
 
 const {
   createStructuredMailboxPointerHost,
+  readStructuredSessionGateFacts,
   structuredPointerCallerKey,
   structuredSessionPointerCallerKey
 } = await import('./structured-mailbox-pointer-host')
@@ -33,6 +35,12 @@ function transcript(count: number): AgentJournalRenderItem[] {
   )
 }
 
+const NOTICE_SOURCE: AgentMessageSource = {
+  kind: 'agent',
+  senders: [],
+  orchestration: { message: 'mail-notice', mailbox: 'dispatch:d1', dispatchId: 'd1', messages: [] }
+}
+
 describe('structured mailbox pointer host', () => {
   beforeEach(() => {
     hostRef.current = null
@@ -41,30 +49,33 @@ describe('structured mailbox pointer host', () => {
   it('reads the gate facts from the FULL timeline, never a bounded tail', async () => {
     // The defect this pins: a running turn is announced by ONE lifecycle item, and settlement
     // tombstones it rather than rewriting it. A long tool-calling turn pushes that item arbitrarily
-    // far from the tail, so any page-sized read reports a busy worker as idle — and the pointer is
-    // then delivered mid-turn, which Codex coalesces into the running turn and Claude folds into
-    // it -- either way folded into work already in flight rather than read as a new instruction.
+    // far from the tail, so any page-sized read reports a busy worker as idle — and `@idle` then
+    // wakes it mid-turn.
     const items = [runningTurn(), ...transcript(500)]
-    const submissions = [{ clientMessageId: 'op1', dispatchState: 'unknown' }]
-    hostRef.current = { journalSnapshot: () => ({ items, submissions }) }
-    // The recorded sends ride along: the lane reads what its own operation id settled as.
-    expect(await createStructuredMailboxPointerHost().readGateFacts('s1')).toEqual({
+    hostRef.current = { journalSnapshot: () => ({ items, submissions: [] }) }
+    expect(await readStructuredSessionGateFacts('s1')).toEqual({
       turnRunning: true,
-      awaitingHuman: false,
+      awaitingHuman: false
+    })
+  })
+
+  it("reads what the session's sends settled as", async () => {
+    const submissions = [{ clientMessageId: 'op1', dispatchState: 'unknown' }]
+    hostRef.current = { journalSnapshot: () => ({ items: [], submissions }) }
+    expect(await createStructuredMailboxPointerHost().readSessionFacts('s1')).toEqual({
       submissions
     })
   })
 
-  it('answers null rather than idle when the session cannot be read', async () => {
-    // Null retains the pointer; `{turnRunning:false}` would deliver a nudge into a session this
-    // runtime cannot see at all.
-    expect(await createStructuredMailboxPointerHost().readGateFacts('s1')).toBeNull()
+  it('answers null rather than nothing recorded when the session cannot be read', async () => {
+    // Null retains the pointer; an empty answer would send into a session this runtime cannot see.
+    expect(await createStructuredMailboxPointerHost().readSessionFacts('s1')).toBeNull()
     hostRef.current = {
       journalSnapshot: () => {
         throw new Error('agent_session_ownership_unknown')
       }
     }
-    expect(await createStructuredMailboxPointerHost().readGateFacts('s1')).toBeNull()
+    expect(await createStructuredMailboxPointerHost().readSessionFacts('s1')).toBeNull()
   })
 
   it('reports an unattached host rather than a rejection when nothing can be sent', async () => {
@@ -108,25 +119,31 @@ describe('structured mailbox pointer host', () => {
     expect(send.mock.calls[0]![1]!.retryUnknown).toBeUndefined()
   })
 
-  it('reads a queued answer as unknown, so the pointer is retained', async () => {
-    hostRef.current = {
-      send: async () => ({
+  it('asks a busy chat to queue the pointer as a card, with who it is from', async () => {
+    const send = vi.fn(
+      async (_caller: unknown, _payload: { delivery?: string; source?: unknown }) => ({
         ok: true,
         value: {
           clientMessageId: 'op1',
           queued: { messageId: 'op1', position: 0, state: 'waiting' }
         }
       })
-    }
+    )
+    hostRef.current = { send }
     await expect(
       createStructuredMailboxPointerHost().send({
         sessionId: 's1',
         dispatchId: 'd1',
         operationId: 'op1',
         expectedRuntimeFence: 1,
-        body: { kind: 'message', role: 'user', blocks: [] }
-      } as never)
-    ).resolves.toEqual({ kind: 'sent', state: 'unknown' })
+        body: { kind: 'message', role: 'user', blocks: [] },
+        source: NOTICE_SOURCE
+      })
+    ).resolves.toEqual({ kind: 'queued' })
+    expect(send.mock.calls[0]![1]).toMatchObject({
+      delivery: 'queue-if-active',
+      source: NOTICE_SOURCE
+    })
   })
 
   it('consumes mail once an accepted nudge is delivered while the worker starts (W10)', async () => {
diff --git a/src/main/runtime/orchestration/structured-mailbox-pointer-host.ts b/src/main/runtime/orchestration/structured-mailbox-pointer-host.ts
index c948a169a89..7bb79d01e3e 100644
--- a/src/main/runtime/orchestration/structured-mailbox-pointer-host.ts
+++ b/src/main/runtime/orchestration/structured-mailbox-pointer-host.ts
@@ -10,7 +10,7 @@ import { AGENT_SESSION_NOT_ATTACHED } from '../../native-chat/agent-session-wire
 import { getStructuredAgentSessionHost } from '../../native-chat/agent-session-wire/structured-agent-session-registry'
 import type {
   StructuredMailboxPointerHost,
-  StructuredPointerGateFacts
+  StructuredPointerSessionFacts
 } from './structured-mailbox-pointer-delivery'
 import type { AgentJournalSnapshot } from '../../../shared/agent-session-journal-types'
 import {
@@ -36,12 +36,12 @@ export function structuredSessionPointerCallerKey(sessionId: string): string {
 }
 
 /**
- * The idle gate for a structured session, read off its FULL reduced timeline.
+ * Whether a structured session is idle, for group addressing (`@idle`), read off its FULL reduced
+ * timeline.
  *
  * Never a bounded page. A settled turn's lifecycle item is revised in place, so on any tail window
  * an idle session and a busy one whose lifecycle item scrolled off look identical — and
- * idle-with-history is the normal steady state of a working agent. Shared so the pointer lane and
- * group addressing cannot disagree about it.
+ * idle-with-history is the normal steady state of a working agent.
  */
 export async function readStructuredSessionGateFacts(
   sessionId: string
@@ -50,12 +50,12 @@ export async function readStructuredSessionGateFacts(
   return snapshot ? structuredSessionGateFacts(snapshot.items) : null
 }
 
-/** The pointer lane's gate: the shared idle facts, plus what each recorded send settled as. */
-async function readPointerGateFacts(sessionId: string): Promise<StructuredPointerGateFacts | null> {
+/** What each recorded send settled as. */
+async function readPointerSessionFacts(
+  sessionId: string
+): Promise<StructuredPointerSessionFacts | null> {
   const snapshot = await readSessionJournal(sessionId)
-  return snapshot
-    ? { ...structuredSessionGateFacts(snapshot.items), submissions: snapshot.submissions }
-    : null
+  return snapshot ? { submissions: snapshot.submissions } : null
 }
 
 async function readSessionJournal(sessionId: string): Promise<AgentJournalSnapshot | null> {
@@ -77,8 +77,8 @@ async function readSessionJournal(sessionId: string): Promise<AgentJournalSnapsh
 
 export function createStructuredMailboxPointerHost(): StructuredMailboxPointerHost {
   return {
-    readGateFacts(sessionId) {
-      return readPointerGateFacts(sessionId)
+    readSessionFacts(sessionId) {
+      return readPointerSessionFacts(sessionId)
     },
 
     currentFence(sessionId) {
@@ -101,7 +101,9 @@ export function createStructuredMailboxPointerHost(): StructuredMailboxPointerHo
           : structuredSessionPointerCallerKey(input.sessionId),
         turn: {
           body: input.body,
-          delivery: 'now',
+          // As a person's message is: a busy chat queues it as a card, sent when the turn ends.
+          delivery: 'queue',
+          source: input.source,
           operationId: input.operationId,
           expectedRuntimeFence: input.expectedRuntimeFence
         }
@@ -112,9 +114,7 @@ export function createStructuredMailboxPointerHost(): StructuredMailboxPointerHo
             ? { kind: 'unattached' }
             : { kind: 'sent', state: 'rejected' }
         case 'queued':
-          // Never for a `now` send. A draft would hand off under a fresh id, which this lane's
-          // operation row cannot see, so reading it needs its own rule before this lane queues.
-          return { kind: 'sent', state: 'unknown' }
+          return { kind: 'queued' }
         case 'sent': {
           // `pending` is not yet an acknowledgement; only `accepted` may consume mail. A send still
           // pending after the wait parks for the next journal edge.
diff --git a/src/main/runtime/orchestration/structured-session-pointer-delivery.test.ts b/src/main/runtime/orchestration/structured-session-pointer-delivery.test.ts
index e2f8b4f6b24..43a803bf506 100644
--- a/src/main/runtime/orchestration/structured-session-pointer-delivery.test.ts
+++ b/src/main/runtime/orchestration/structured-session-pointer-delivery.test.ts
@@ -1,7 +1,6 @@
 import { describe, expect, it } from 'vitest'
 import type { AgentJournalRenderItem } from '../../../shared/agent-session-journal-types'
 import {
-  decideStructuredSessionPointerDelivery,
   retainReasonForDispatch,
   structuredDispatchDelivered,
   structuredSessionGateFacts
@@ -80,37 +79,6 @@ describe('structured session gate facts', () => {
   })
 })
 
-describe('decideStructuredSessionPointerDelivery', () => {
-  it('delivers to an attached, idle session', () => {
-    expect(decideStructuredSessionPointerDelivery({ session: IDLE })).toEqual({
-      deliver: true
-    })
-  })
-
-  it('retains when the session is not attached on this host', () => {
-    expect(decideStructuredSessionPointerDelivery({ session: null })).toEqual({
-      deliver: false,
-      retain: 'session-not-attached'
-    })
-  })
-
-  it('retains mid-turn rather than delegating the race to the provider', () => {
-    expect(
-      decideStructuredSessionPointerDelivery({
-        session: { turnRunning: true, awaitingHuman: false }
-      })
-    ).toEqual({ deliver: false, retain: 'turn-unsettled' })
-  })
-
-  it('names the human prompt ahead of the turn, so the retain reason is the actionable one', () => {
-    expect(
-      decideStructuredSessionPointerDelivery({
-        session: { turnRunning: true, awaitingHuman: true }
-      })
-    ).toEqual({ deliver: false, retain: 'awaiting-human' })
-  })
-})
-
 describe('dispatch outcome classification', () => {
   it('marks mail delivered only on an accepted dispatch', () => {
     expect(structuredDispatchDelivered('accepted')).toBe(true)
diff --git a/src/main/runtime/orchestration/structured-session-pointer-delivery.ts b/src/main/runtime/orchestration/structured-session-pointer-delivery.ts
index 4e838e313f8..fc7758e07a1 100644
--- a/src/main/runtime/orchestration/structured-session-pointer-delivery.ts
+++ b/src/main/runtime/orchestration/structured-session-pointer-delivery.ts
@@ -1,13 +1,10 @@
 /**
- * Delivery decisions for an orchestration mail pointer aimed at a host-owned
- * structured ("native") agent session.
+ * What orchestration mail delivery reads of a host-owned structured ("native") agent session.
  *
- * A structured session has no PTY the pointer can be typed into, so the nudge
- * travels as a session turn instead of as bytes. Everything here is pure: the
- * caller supplies the session's gate facts, and gets back a decision it can
- * act on. Orchestration's database stays the source of truth —
- * no decision here ever consumes mail, it only says whether the nudge may be
- * attempted now.
+ * A structured session has no PTY the pointer can be typed into, so the nudge travels as a session
+ * turn instead of as bytes, and a busy session's own queue holds it until the turn ends.
+ * Everything here is pure. Orchestration's database stays the source of truth: nothing here
+ * consumes mail.
  */
 
 import type { AgentJournalRenderItem } from '../../../shared/agent-session-journal-types'
@@ -20,22 +17,18 @@ import {
 export type StructuredPointerRetainReason =
   | 'session-not-attached'
   | 'turn-unsettled'
-  | 'awaiting-human'
   | 'dispatch-rejected'
   | 'dispatch-unknown'
 
-export type StructuredPointerDecision =
-  | { deliver: true }
-  | { deliver: false; retain: StructuredPointerRetainReason }
-
 /** The dispatch states both provider adapters converge on. */
 export type StructuredDispatchState = 'accepted' | 'rejected' | 'unknown'
 
 /**
- * What the delivery gate needs to know about a session, read once per attempt.
+ * Whether a session is busy, in the vocabulary group addressing (`@idle`) matches on.
  *
  * Deliberately two booleans rather than the journal: the caller reads the FULL reduced timeline
- * (see `readGateFacts`), so nothing downstream can be tempted to re-derive them from a page.
+ * (see `readStructuredSessionGateFacts`), so nothing downstream can be tempted to re-derive them
+ * from a page.
  */
 export type StructuredSessionGateFacts = {
   turnRunning: boolean
@@ -46,7 +39,7 @@ export type StructuredSessionGateFacts = {
 /**
  * Projects the gate facts off a session's live items.
  *
- * Reuses the projection the chat view already reads, so the delivery gate and the visible
+ * Reuses the projection the chat view already reads, so `@idle` and the visible
  * "working" state can never disagree. Both must be answered from the fully reduced timeline: a
  * settled turn is TOMBSTONED rather than rewritten to `completed`, so on a bounded tail page an
  * idle session and a running turn whose lifecycle item was pushed off the end look identical —
@@ -61,37 +54,6 @@ export function structuredSessionGateFacts(
   }
 }
 
-/**
- * Decide whether the nudge may be sent right now.
- *
- * Mid-turn delivery is refused for both providers rather than delegated to
- * them. Neither refuses the frame: Codex COALESCES a mid-turn `turn/start` into
- * the running turn -- measured on codex-cli 0.147.0, 0.150.1 and 0.153.4, none
- * of which refuse it and none of which fire a second `turn/started` -- and
- * Claude folds it into the running turn (or runs it as the next turn when the
- * turn ends first). Both therefore
- * fold the nudge into work already in flight, where it reads as part of the
- * running turn rather than a new instruction. Waiting for the turn to settle is
- * the one contract that holds for both, and it preserves orchestration's
- * existing idle-edge-only delivery policy.
- */
-export function decideStructuredSessionPointerDelivery(input: {
-  session: StructuredSessionGateFacts | null
-}): StructuredPointerDecision {
-  if (!input.session) {
-    return { deliver: false, retain: 'session-not-attached' }
-  }
-  // Checked before the turn gate: a pending prompt has no running turn, so the turn test alone
-  // reads it as idle, and sending there queues a nudge behind something only a human can clear.
-  if (input.session.awaitingHuman) {
-    return { deliver: false, retain: 'awaiting-human' }
-  }
-  if (input.session.turnRunning) {
-    return { deliver: false, retain: 'turn-unsettled' }
-  }
-  return { deliver: true }
-}
-
 /**
  * Only an accepted dispatch may mark mail delivered.
  *
diff --git a/src/main/runtime/rpc/methods/client-ui-pairing-local-fields.test.ts b/src/main/runtime/rpc/methods/client-ui-pairing-local-fields.test.ts
index 4e3beb3a771..9bb125d6065 100644
--- a/src/main/runtime/rpc/methods/client-ui-pairing-local-fields.test.ts
+++ b/src/main/runtime/rpc/methods/client-ui-pairing-local-fields.test.ts
@@ -46,6 +46,7 @@ describe('client UI RPC pairing-local field seams', () => {
       { hostId: 'runtime:web-11111111-2222-3333-4444-555555555555', repoId: 'repo-a' }
     ],
     workspaceHostOrder: ['runtime:web-11111111-2222-3333-4444-555555555555', 'local'],
+    sidebarOpen: false,
     agentsVisibleHostIds: ['runtime:web-11111111-2222-3333-4444-555555555555'],
     agentsFilterRepoIds: ['repo-a'],
     agentsHideWorkspacesFromOtherDevices: true,
diff --git a/src/main/runtime/structured-agent-session-codex-turn-end-settlement.test.ts b/src/main/runtime/structured-agent-session-codex-turn-end-settlement.test.ts
index 6ce700a8435..712e0555221 100644
--- a/src/main/runtime/structured-agent-session-codex-turn-end-settlement.test.ts
+++ b/src/main/runtime/structured-agent-session-codex-turn-end-settlement.test.ts
@@ -345,6 +345,79 @@ describe('a Codex send its turn ended without taking it', () => {
   })
 })
 
+describe('the turn a withdrawn Codex send was answered into', () => {
+  async function answeredInto(clientMessageId: string) {
+    await host.flushStreamedEvents(SESSION)
+    const snapshot = await host.journalSnapshot(SESSION)
+    const page = await host.history({ sessionId: SESSION, direction: 'tail' })
+    const onPage = page.ok
+      ? page.page.submissions.find((entry) => entry.clientMessageId === clientMessageId)
+      : undefined
+    return {
+      turnRecords: snapshot.items.flatMap((item) =>
+        item.body.kind === 'turn' ? [item.itemId] : []
+      ),
+      named: snapshot.submissions.find((entry) => entry.clientMessageId === clientMessageId)
+        ?.answeredInTurn,
+      onPage: onPage?.answeredInTurn
+    }
+  }
+
+  it("is that turn's record, started by the send that opened it and steered by a later one", async () => {
+    const opening = await send('look around')
+    await vi.waitFor(() => expect(answers).toBe(1))
+    turns.start()
+    const steered = await send('and check the tests')
+    await vi.waitFor(() => expect(steers).toBe(1))
+
+    await stop('turn-1')
+    await vi.waitFor(async () =>
+      expect(verdictOf((await settled()).submissions, steered)).toBe('withdrawn')
+    )
+
+    const { turnRecords } = await answeredInto(opening)
+    expect(turnRecords).toHaveLength(1)
+    const started = { turnItemId: turnRecords[0], via: 'start' }
+    const steeredIn = { turnItemId: turnRecords[0], via: 'steer' }
+    expect(await answeredInto(opening)).toEqual({ turnRecords, named: started, onPage: started })
+    expect(await answeredInto(steered)).toEqual({
+      turnRecords,
+      named: steeredIn,
+      onPage: steeredIn
+    })
+  })
+
+  it('is not named on a send the turn took', async () => {
+    const opening = await send('look around')
+    await vi.waitFor(() => expect(answers).toBe(1))
+    turns.start()
+    turns.echo(opening)
+
+    await stop('turn-1')
+    await vi.waitFor(async () =>
+      expect(verdictOf((await settled()).submissions, opening)).toBe('accepted')
+    )
+
+    expect(await answeredInto(opening)).toMatchObject({ named: undefined, onPage: undefined })
+  })
+
+  it('is named when the answer is read after that turn ended', async () => {
+    const release = turns.holdNextAnswer()
+    const sent = await send('look around')
+    await vi.waitFor(() => expect(turns.turnId).toBe('turn-1'))
+    turns.start()
+    turns.end('interrupted')
+    release()
+
+    await vi.waitFor(async () =>
+      expect(verdictOf((await settled()).submissions, sent)).toBe('withdrawn')
+    )
+    const { turnRecords, named } = await answeredInto(sent)
+    expect(turnRecords).toHaveLength(1)
+    expect(named).toEqual({ turnItemId: turnRecords[0], via: 'start' })
+  })
+})
+
 describe('a queued card sent now into the turn a Stop ends', () => {
   async function handoffs(messageId: string): Promise<AgentJournalSubmission[]> {
     return (await settled()).submissions.filter((entry) => entry.queuedMessageId === messageId)
diff --git a/src/main/runtime/structured-chat-coordinator-mail-queue.test.ts b/src/main/runtime/structured-chat-coordinator-mail-queue.test.ts
new file mode 100644
index 00000000000..104f767e333
--- /dev/null
+++ b/src/main/runtime/structured-chat-coordinator-mail-queue.test.ts
@@ -0,0 +1,139 @@
+import './rpc/unused-default-rpc-methods.test-fixture'
+// A busy structured chat holds the orchestration pointer as a card in its own queue, sent when the
+// turn ends, as it holds a message the person sends then; the queue does nothing else with it. End
+// to end on the coordinator-mail rig.
+
+import { describe, expect, it, vi } from 'vitest'
+import type { FakeConnection } from './structured-chat-coordinator-fake-codex-fixture'
+import { idOf } from './rpc/orchestration-session-caller-test-fixture'
+import {
+  COORDINATOR,
+  WORKER_2_PANE,
+  WAIT,
+  call,
+  coordinatorRunAndTask,
+  db,
+  finishWorker,
+  host,
+  openChat,
+  ptyPointer,
+  queuedCardTexts,
+  runtime,
+  sendUserMessage,
+  settleTurn,
+  turnText
+} from './structured-chat-coordinator-mail-rig.test-fixture'
+
+/** The person's turn, started and still running; resolves to its end. */
+async function runningUserTurn(chat: FakeConnection): Promise<() => Promise<void>> {
+  expect(await sendUserMessage(COORDINATOR, 'go')).toMatchObject({ ok: true })
+  await vi.waitFor(() => expect(chat.turns).toHaveLength(1), WAIT)
+  const notify = (method: string, params: unknown) => chat.handlers.onNotification?.(method, params)
+  notify('turn/started', { turn: { id: 'turn-1' } })
+  notify('item/completed', {
+    item: {
+      type: 'userMessage',
+      id: 'echo-go',
+      clientId: chat.turns[0]!.clientUserMessageId,
+      content: [{ type: 'text', text: 'go' }]
+    }
+  })
+  await host.flushStreamedEvents(COORDINATOR)
+  return async () => {
+    notify('turn/completed', { turn: { id: 'turn-1' } })
+    await host.flushStreamedEvents(COORDINATOR)
+  }
+}
+
+/** Idle edges with nothing owed: whatever they would send gets the time to show. */
+async function idleEdgesSettled(): Promise<void> {
+  for (let edge = 0; edge < 3; edge += 1) {
+    runtime.onStructuredSessionStatusForMail({ sessionId: COORDINATOR, status: 'idle' })
+    await new Promise((resolve) => setTimeout(resolve, 100))
+  }
+}
+
+/** The chat's queue as its journal stores it. */
+function queuedRows() {
+  return host.collaboratorsForTests().sessions.get(COORDINATOR)?.journal.queuedMessages.list() ?? []
+}
+
+/** A second task, for a second worker result. */
+async function secondTask(): Promise<string> {
+  return idOf(
+    (await call('orchestration.taskCreate', { spec: 'more' }, { sessionId: COORDINATOR })).task
+  )
+}
+
+describe("a busy chat's orchestration pointer waits in its queue", () => {
+  it('queues the pointer as a card, with who it is from, and sends it once when the turn ends', async () => {
+    const chat = await openChat(COORDINATOR)
+    const { runId, taskId } = await coordinatorRunAndTask()
+    const endTurn = await runningUserTurn(chat)
+    await finishWorker(taskId)
+    await vi.waitFor(
+      async () => expect(await queuedCardTexts()).toEqual([ptyPointer(`run:${runId}`)]),
+      WAIT
+    )
+    expect(chat.turns).toHaveLength(1)
+    const [card] = queuedRows()
+    const [mail] = db.getAllMessages(`run:${runId}`)
+    expect(card?.source).toEqual({
+      kind: 'agent',
+      senders: [
+        { party: { address: 'term_worker', terminalHandle: 'term_worker', orcaSessionId: null } }
+      ],
+      orchestration: {
+        message: 'mail-notice',
+        mailbox: `run:${runId}`,
+        dispatchId: null,
+        messages: [{ messageId: mail!.id, runId, from: 'term_worker' }]
+      }
+    })
+
+    await endTurn()
+    await vi.waitFor(() => expect(chat.turns).toHaveLength(2), WAIT)
+    expect(turnText(chat.turns[1]!)).toBe(ptyPointer(`run:${runId}`))
+    expect(await queuedCardTexts()).toEqual([])
+    await settleTurn(COORDINATOR, 1)
+    await idleEdgesSettled()
+    expect(chat.turns).toHaveLength(2)
+  })
+
+  it('queues a second card for mail that arrives while the first waits, each counting its own mail', async () => {
+    const chat = await openChat(COORDINATOR)
+    const { runId, taskId } = await coordinatorRunAndTask()
+    const second = await secondTask()
+    const endTurn = await runningUserTurn(chat)
+    await finishWorker(taskId)
+    await vi.waitFor(async () => expect(await queuedCardTexts()).toHaveLength(1), WAIT)
+    await finishWorker(second, { handle: 'term_worker_2', paneKey: WORKER_2_PANE })
+    const pointer = ptyPointer(`run:${runId}`)
+    await vi.waitFor(async () => expect(await queuedCardTexts()).toEqual([pointer, pointer]), WAIT)
+
+    await endTurn()
+    await vi.waitFor(() => expect(chat.turns).toHaveLength(2), WAIT)
+    await settleTurn(COORDINATOR, 1)
+    await vi.waitFor(() => expect(chat.turns).toHaveLength(3), WAIT)
+    expect(turnText(chat.turns[2]!)).toBe(pointer)
+    await settleTurn(COORDINATOR, 2)
+    await idleEdgesSettled()
+    expect(chat.turns).toHaveLength(3)
+    expect(await queuedCardTexts()).toEqual([])
+  })
+
+  it("leaves the chat's own `check` as it is: the mail stays readable, and the card stays", async () => {
+    const chat = await openChat(COORDINATOR)
+    const { runId, taskId } = await coordinatorRunAndTask()
+    const endTurn = await runningUserTurn(chat)
+    await finishWorker(taskId)
+    await vi.waitFor(async () => expect(await queuedCardTexts()).toHaveLength(1), WAIT)
+    const [mail] = db.getAllMessages(`run:${runId}`)
+    expect(await call('orchestration.check', {}, { sessionId: COORDINATOR })).toMatchObject({
+      count: 1,
+      messages: [{ id: mail!.id }]
+    })
+    expect(await queuedCardTexts()).toEqual([ptyPointer(`run:${runId}`)])
+    await endTurn()
+  })
+})
diff --git a/src/main/runtime/structured-chat-coordinator-mail-rig.test-fixture.ts b/src/main/runtime/structured-chat-coordinator-mail-rig.test-fixture.ts
new file mode 100644
index 00000000000..6fadd54a13b
--- /dev/null
+++ b/src/main/runtime/structured-chat-coordinator-mail-rig.test-fixture.ts
@@ -0,0 +1,324 @@
+// The coordinator-mail rig, shared by every suite that drives a worker's result into a structured
+// chat end to end in one process.
+//
+// Real: the structured agent-session host, its record store, journal, lease and Codex adapter; the
+// orchestration database, RPC dispatcher and methods; the runtime's pointer lanes. Fake: only the
+// Codex app-server child, which answers the JSON-RPC calls the real one does. Importing it
+// registers the rig's own beforeEach/afterEach for the importing file.
+
+import { mkdtemp, rm } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { afterEach, beforeEach, expect, vi } from 'vitest'
+import type { AgentJournalRenderItem } from '../../shared/agent-session-journal-types'
+import { computeAgentSessionPayloadFingerprint } from '../../shared/agent-session-mutation-envelope'
+import { ORCHESTRATION_CONTRACT_VERSION } from '../../shared/protocol-version'
+import type { StructuredAgentSessionHost } from '../native-chat/agent-session-wire/structured-agent-session-host'
+import { agentSessionProviderHandleChainHead } from '../../shared/agent-session-provider-handle'
+import { OrcaRuntimeService } from './orca-runtime'
+import { OrchestrationDb } from './orchestration/db'
+import { localOrchestrationCliCommand } from './orchestration/cli-command'
+import { formatMessagePointer } from './orchestration/formatter'
+import { RpcDispatcher } from './rpc/dispatcher'
+import { ORCHESTRATION_METHODS } from './rpc/methods/orchestration'
+import { idOf, isRecord, resultOf } from './rpc/orchestration-session-caller-test-fixture'
+import {
+  ensureStructuredAgentSessionHost,
+  stopStructuredAgentSessionRuntime
+} from './structured-agent-session-runtime'
+import { createCoordinatorMailObservationClock } from './structured-chat-coordinator-observation-clock.test-fixture'
+import {
+  attachParams,
+  fakeCodex,
+  operationId,
+  resetProviderFaults,
+  type FakeConnection
+} from './structured-chat-coordinator-fake-codex-fixture'
+import { createStructuredAgentSessionLogger } from '../native-chat/agent-session-wire/structured-agent-session-logger'
+
+export const COORDINATOR = '4a1f6c2e-8b3d-4e7a-9c15-0d2b6e8f1a37'
+export const PEER_CHAT = '7e3b9d15-2c4a-4f86-a0b1-5c9e2d7f3b64'
+export const WORKER_PANE = 'tab_worker:bbbbbbbb-bbbb-4bbb-8bbb-bbbbbbbbbbbb'
+export const WORKER_2_PANE = 'tab_worker2:cccccccc-cccc-4ccc-8ccc-cccccccccccc'
+
+export let codex: ReturnType<typeof fakeCodex>
+export let root: string
+export let runtime: OrcaRuntimeService
+export let db: OrchestrationDb
+export let host: StructuredAgentSessionHost
+export let dispatcher: RpcDispatcher
+export let requests = 0
+export const observationClock = createCoordinatorMailObservationClock(() => host, COORDINATOR)
+
+export function request(
+  method: string,
+  params: Record<string, unknown>,
+  options: { sessionId?: string } = {}
+): Parameters<RpcDispatcher['dispatch']>[0] {
+  requests += 1
+  return {
+    id: `rpc-${requests}`,
+    authToken: 'test',
+    method,
+    params,
+    orchestrationContractVersion: ORCHESTRATION_CONTRACT_VERSION,
+    orchestrationRequestId: `req-${requests}`,
+    ...(options.sessionId
+      ? { orchestrationCompatibilityEvidence: { agentSessionId: options.sessionId } }
+      : {})
+  }
+}
+
+export async function call(
+  method: string,
+  params: Record<string, unknown>,
+  options?: { sessionId?: string }
+): Promise<Record<string, unknown>> {
+  const response = await dispatcher.dispatch(request(method, params, options))
+  if (!response.ok) {
+    throw new Error(`${method} failed: ${JSON.stringify(response)}`)
+  }
+  return resultOf(response)
+}
+
+export async function openChat(sessionId: string): Promise<FakeConnection> {
+  const attached = await host.attach({ callerKey: 'test-surface' }, attachParams(sessionId))
+  expect(attached, JSON.stringify(attached)).toMatchObject({ ok: true })
+  await host.setSessionTabVisibility(sessionId, true)
+  threadBySession.set(sessionId, codex.connections.at(-1)!.threadId!)
+  return connectionFor(sessionId)
+}
+
+export const threadBySession = new Map<string, string>()
+
+export function connectionFor(sessionId: string): FakeConnection {
+  // A cleared chat's successor starts on its first message; its record then names its thread.
+  const head = agentSessionProviderHandleChainHead(
+    host.deps.store.getRecord(sessionId)?.providerHandleChain ?? []
+  )
+  const thread = threadBySession.get(sessionId) ?? head?.handle.nativeId
+  const connection = codex.connections.findLast((candidate) => candidate.threadId === thread)
+  if (!connection) {
+    throw new Error(`no app-server for ${sessionId}`)
+  }
+  return connection
+}
+
+/** Codex's own sequence for a turn: it starts, echoes the user message, and completes. */
+export async function settleTurn(sessionId: string, turnIndex: number): Promise<void> {
+  const connection = connectionFor(sessionId)
+  const turn = connection.turns[turnIndex]!
+  const turnId = `turn-${turnIndex + 1}`
+  const notify = (method: string, params: unknown) =>
+    connection.handlers.onNotification?.(method, params)
+  notify('turn/started', { turn: { id: turnId } })
+  notify('item/completed', {
+    item: {
+      type: 'userMessage',
+      id: `echo-${turn.clientUserMessageId}`,
+      clientId: turn.clientUserMessageId,
+      content: [{ type: 'text', text: 'pointer' }]
+    }
+  })
+  notify('turn/completed', { turn: { id: turnId } })
+  await host.flushStreamedEvents(sessionId)
+}
+
+/** A user message typed into the chat, as the chat surface sends it. */
+export function sendUserMessage(sessionId: string, text: string) {
+  const body = {
+    kind: 'message' as const,
+    role: 'user' as const,
+    blocks: [{ type: 'text' as const, text }]
+  }
+  return host.send(
+    { callerKey: 'test-surface' },
+    {
+      envelope: {
+        sessionId,
+        clientOperationId: operationId(),
+        expectedRuntimeFence: host.deps.store.getRecord(sessionId)!.lease.runtimeFence,
+        payloadFingerprint: computeAgentSessionPayloadFingerprint({
+          method: 'agentSession.send',
+          sessionId,
+          fields: { body }
+        })
+      },
+      body
+    }
+  )
+}
+
+export async function userTexts(sessionId: string): Promise<string[]> {
+  return (await host.journalSnapshot(sessionId)).items.flatMap((item: AgentJournalRenderItem) =>
+    item.body?.kind === 'message' && item.body.role === 'user'
+      ? item.body.blocks.map((block) => (block.type === 'text' ? block.text : ''))
+      : []
+  )
+}
+
+/** A supervised terminal worker under the coordinator's Run, and its worker_done. */
+export async function finishWorker(
+  taskId: string,
+  worker: { handle: string; paneKey: string } = { handle: 'term_worker', paneKey: WORKER_PANE }
+): Promise<void> {
+  const started = db.createStartingWorkerDispatch({
+    creator: { kind: 'system' },
+    maxDepth: Number.MAX_SAFE_INTEGER,
+    taskId,
+    startOptions: {}
+  })
+  db.prepareStartingWorkerAuthority({
+    dispatchId: started.dispatch.id,
+    handle: worker.handle,
+    paneKey: worker.paneKey,
+    processIncarnation: `runtime_test:${worker.handle}:1`,
+    worktreeId: 'repo::worker',
+    effects: [],
+    setupState: 'not_applicable'
+  })
+  db.markWorkerDispatchReady(started.dispatch.id)
+  await call('orchestration.send', {
+    from: worker.handle,
+    subject: 'Done',
+    type: 'worker_done',
+    payload: JSON.stringify({ taskId, dispatchId: started.dispatch.id, outcome: 'succeeded' })
+  })
+}
+
+export async function coordinatorRunAndTask(): Promise<{ runId: string; taskId: string }> {
+  const created = await call(
+    'orchestration.runCreate',
+    { objective: 'ship' },
+    {
+      sessionId: COORDINATOR
+    }
+  )
+  const runId = idOf(created.run)
+  const task = await call(
+    'orchestration.taskCreate',
+    { spec: 'build it' },
+    {
+      sessionId: COORDINATOR
+    }
+  )
+  return { runId, taskId: idOf(task.task) }
+}
+
+/** `/clear` as the chat surface runs it: the conversation continues in a new session. */
+export async function clearChat(sessionId: string): Promise<string> {
+  const command = 'clear' as const
+  const cleared = await host.conversationCommand(
+    { callerKey: 'test-surface' },
+    {
+      command,
+      envelope: {
+        sessionId,
+        clientOperationId: operationId(),
+        expectedRuntimeFence: host.deps.store.getRecord(sessionId)!.lease.runtimeFence,
+        payloadFingerprint: computeAgentSessionPayloadFingerprint({
+          method: 'agentSession.conversationCommand',
+          sessionId,
+          fields: { command }
+        })
+      }
+    }
+  )
+  const successor = cleared.ok ? cleared.value.replacementSessionId : undefined
+  if (!successor) {
+    throw new Error(`clear failed: ${JSON.stringify(cleared)}`)
+  }
+  // The surface swaps the tab over to the session that continues the chat.
+  await host.setSessionTabVisibility(sessionId, false)
+  await host.setSessionTabVisibility(successor, true)
+  return successor
+}
+
+/** A cleared chat's successor runs once the user writes to it; only then can its agent act. */
+export async function startSuccessor(successor: string): Promise<void> {
+  expect(await sendUserMessage(successor, 'hello')).toMatchObject({ ok: true })
+  await vi.waitFor(() => expect(connectionFor(successor).turns).toHaveLength(1), WAIT)
+  await settleTurn(successor, 0)
+}
+
+beforeEach(async () => {
+  resetProviderFaults()
+  root = await mkdtemp(join(tmpdir(), 'orca-structured-coordinator-mail-'))
+  codex = fakeCodex()
+  db = new OrchestrationDb(':memory:')
+  runtime = startRuntime()
+  host = await ensureStructuredAgentSessionHost({
+    logger: createStructuredAgentSessionLogger(),
+    stateDirectory: root,
+    hostId: 'local',
+    claimKeyId: 'key-1',
+    resolveWorkspacePath: async (workspaceId) => `/repos/${workspaceId}`,
+    resolveCodexCommand: () => '/usr/local/bin/codex',
+    resolveClaudeAuthPolicy: () => ({ stripAuthEnv: true }),
+    resolveEnvironment: async () => ({ PATH: '/usr/bin' }),
+    openCodexConnection: codex.openConnection,
+    readProcessStartTime: async () => 1_700_000_000_000,
+    // The same calls the runtime's own host install makes.
+    onSessionStatusChanged: (summary) => runtime.onStructuredSessionStatusForMail(summary)
+  })
+  dispatcher = new RpcDispatcher({ runtime, methods: ORCHESTRATION_METHODS })
+})
+
+/** The runtime over the shared database; a second call is what an Orca restart leaves behind. */
+export function startRuntime(): OrcaRuntimeService {
+  const started = new OrcaRuntimeService()
+  started.setOrchestrationDb(db)
+  vi.spyOn(started, 'ensureStructuredAgentSessionHost').mockResolvedValue()
+  vi.spyOn(started, 'getTerminalPaneKey').mockImplementation((handle) =>
+    handle === 'term_worker' ? WORKER_PANE : handle === 'term_worker_2' ? WORKER_2_PANE : null
+  )
+  return started
+}
+
+afterEach(async () => {
+  try {
+    await stopStructuredAgentSessionRuntime()
+    db.close()
+    await observationClock.drainClosedDatabaseRepair()
+    vi.restoreAllMocks()
+    await rm(root, { recursive: true, force: true })
+  } finally {
+    observationClock.restore()
+  }
+})
+
+// Pointers are sent on asynchronous edges; the default 1s wait is too tight under a loaded parallel run.
+export const WAIT = { timeout: 10_000 }
+
+export const POINTER =
+  /You have 1 orchestration message\. Run `orca(-dev)? orchestration check --run run_\w+`\./
+
+/** The text the PTY lane types into a local terminal for this mailbox, byte for byte. */
+export function ptyPointer(mailboxHandle: string): string {
+  return formatMessagePointer(1, mailboxHandle, localOrchestrationCliCommand()).trim()
+}
+
+/** The text of a turn the fake provider received. */
+export function turnText(turn: { text: string }): string {
+  const input: unknown = JSON.parse(turn.text)
+  return Array.isArray(input)
+    ? input.map((item: unknown) => (isRecord(item) ? String(item.text) : '')).join('')
+    : ''
+}
+
+/** What an Orca restart leaves behind: a new runtime over the same database and host. */
+export function restartRuntime(): void {
+  runtime = startRuntime()
+  dispatcher = new RpcDispatcher({ runtime, methods: ORCHESTRATION_METHODS })
+}
+
+/** The text of every card the chat lists in its queue, as the person sees it. */
+export async function queuedCardTexts(sessionId = COORDINATOR): Promise<string[]> {
+  const page = await host.history({ sessionId, direction: 'tail' })
+  if (!page.ok) {
+    throw new Error('history refused')
+  }
+  return (page.page.queuedMessages ?? []).flatMap((card) =>
+    card.body.blocks.map((block) => (block.type === 'text' ? block.text : ''))
+  )
+}
diff --git a/src/main/runtime/structured-chat-coordinator-mail.test.ts b/src/main/runtime/structured-chat-coordinator-mail.test.ts
index 29a2d5bb79f..5eb0f57209c 100644
--- a/src/main/runtime/structured-chat-coordinator-mail.test.ts
+++ b/src/main/runtime/structured-chat-coordinator-mail.test.ts
@@ -1,319 +1,51 @@
 import './rpc/unused-default-rpc-methods.test-fixture'
-// A worker's result reaching the structured chat that coordinates it, end to end in one process.
-//
-// Real: the structured agent-session host, its record store, journal, lease and Codex adapter; the
-// orchestration database, RPC dispatcher and methods; the runtime's pointer lanes. Fake: only the
-// Codex app-server child, which answers the JSON-RPC calls the real one does.
+// A worker's result reaching the structured chat that coordinates it, end to end in one process,
+// on the coordinator-mail rig.
 
-import { mkdtemp, rm } from 'node:fs/promises'
-import { tmpdir } from 'node:os'
-import { join } from 'node:path'
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import type { AgentJournalRenderItem } from '../../shared/agent-session-journal-types'
+import { describe, expect, it, vi } from 'vitest'
 import { agentJournalSubmissionKey } from '../../shared/agent-session-journal-item-key'
 import { computeAgentSessionPayloadFingerprint } from '../../shared/agent-session-mutation-envelope'
-import { ORCHESTRATION_CONTRACT_VERSION } from '../../shared/protocol-version'
 import {
   AgentSessionAcquisitionRefusal,
   AgentSessionPreSpawnError
 } from '../native-chat/agent-session-wire/structured-agent-session-adapter'
-import type { StructuredAgentSessionHost } from '../native-chat/agent-session-wire/structured-agent-session-host'
 import type { AgentSessionJournal } from '../native-chat/agent-session-journal/journal-store'
 import { AGENT_SESSION_MAX_NEW_OPERATION_AGE_MS } from '../../shared/agent-session-host-authority'
 import { refuse } from '../../shared/agent-session-wire-refusals'
-import { agentSessionProviderHandleChainHead } from '../../shared/agent-session-provider-handle'
-import { OrcaRuntimeService } from './orca-runtime'
-import { OrchestrationDb } from './orchestration/db'
 import { localOrchestrationCliCommand } from './orchestration/cli-command'
 import { formatMessagePointer } from './orchestration/formatter'
 import { currentRunCoordinatorOrcaSessionId } from './orchestration/db/runs/run-coordinator-orca-session'
-import { RpcDispatcher } from './rpc/dispatcher'
-import { ORCHESTRATION_METHODS } from './rpc/methods/orchestration'
-import { idOf, isRecord, resultOf } from './rpc/orchestration-session-caller-test-fixture'
+import { idOf } from './rpc/orchestration-session-caller-test-fixture'
+import { operationId, providerFaults } from './structured-chat-coordinator-fake-codex-fixture'
+
 import {
-  ensureStructuredAgentSessionHost,
-  stopStructuredAgentSessionRuntime
-} from './structured-agent-session-runtime'
-import { createCoordinatorMailObservationClock } from './structured-chat-coordinator-observation-clock.test-fixture'
-import {
-  attachParams,
-  fakeCodex,
-  operationId,
-  providerFaults,
-  resetProviderFaults,
-  type FakeConnection
-} from './structured-chat-coordinator-fake-codex-fixture'
-import { createStructuredAgentSessionLogger } from '../native-chat/agent-session-wire/structured-agent-session-logger'
-
-const COORDINATOR = '4a1f6c2e-8b3d-4e7a-9c15-0d2b6e8f1a37'
-const PEER_CHAT = '7e3b9d15-2c4a-4f86-a0b1-5c9e2d7f3b64'
-const WORKER_PANE = 'tab_worker:bbbbbbbb-bbbb-4bbb-8bbb-bbbbbbbbbbbb'
-const WORKER_2_PANE = 'tab_worker2:cccccccc-cccc-4ccc-8ccc-cccccccccccc'
-
-let codex: ReturnType<typeof fakeCodex>
-let root: string
-let runtime: OrcaRuntimeService
-let db: OrchestrationDb
-let host: StructuredAgentSessionHost
-let dispatcher: RpcDispatcher
-let requests = 0
-const observationClock = createCoordinatorMailObservationClock(() => host, COORDINATOR)
-
-function request(
-  method: string,
-  params: Record<string, unknown>,
-  options: { sessionId?: string } = {}
-): Parameters<RpcDispatcher['dispatch']>[0] {
-  requests += 1
-  return {
-    id: `rpc-${requests}`,
-    authToken: 'test',
-    method,
-    params,
-    orchestrationContractVersion: ORCHESTRATION_CONTRACT_VERSION,
-    orchestrationRequestId: `req-${requests}`,
-    ...(options.sessionId
-      ? { orchestrationCompatibilityEvidence: { agentSessionId: options.sessionId } }
-      : {})
-  }
-}
-
-async function call(
-  method: string,
-  params: Record<string, unknown>,
-  options?: { sessionId?: string }
-): Promise<Record<string, unknown>> {
-  const response = await dispatcher.dispatch(request(method, params, options))
-  if (!response.ok) {
-    throw new Error(`${method} failed: ${JSON.stringify(response)}`)
-  }
-  return resultOf(response)
-}
-
-async function openChat(sessionId: string): Promise<FakeConnection> {
-  const attached = await host.attach({ callerKey: 'test-surface' }, attachParams(sessionId))
-  expect(attached, JSON.stringify(attached)).toMatchObject({ ok: true })
-  await host.setSessionTabVisibility(sessionId, true)
-  threadBySession.set(sessionId, codex.connections.at(-1)!.threadId!)
-  return connectionFor(sessionId)
-}
-
-const threadBySession = new Map<string, string>()
-
-function connectionFor(sessionId: string): FakeConnection {
-  // A cleared chat's successor starts on its first message; its record then names its thread.
-  const head = agentSessionProviderHandleChainHead(
-    host.deps.store.getRecord(sessionId)?.providerHandleChain ?? []
-  )
-  const thread = threadBySession.get(sessionId) ?? head?.handle.nativeId
-  const connection = codex.connections.findLast((candidate) => candidate.threadId === thread)
-  if (!connection) {
-    throw new Error(`no app-server for ${sessionId}`)
-  }
-  return connection
-}
-
-/** Codex's own sequence for a turn: it starts, echoes the user message, and completes. */
-async function settleTurn(sessionId: string, turnIndex: number): Promise<void> {
-  const connection = connectionFor(sessionId)
-  const turn = connection.turns[turnIndex]!
-  const turnId = `turn-${turnIndex + 1}`
-  const notify = (method: string, params: unknown) =>
-    connection.handlers.onNotification?.(method, params)
-  notify('turn/started', { turn: { id: turnId } })
-  notify('item/completed', {
-    item: {
-      type: 'userMessage',
-      id: `echo-${turn.clientUserMessageId}`,
-      clientId: turn.clientUserMessageId,
-      content: [{ type: 'text', text: 'pointer' }]
-    }
-  })
-  notify('turn/completed', { turn: { id: turnId } })
-  await host.flushStreamedEvents(sessionId)
-}
-
-/** A user message typed into the chat, as the chat surface sends it. */
-function sendUserMessage(sessionId: string, text: string) {
-  const body = {
-    kind: 'message' as const,
-    role: 'user' as const,
-    blocks: [{ type: 'text' as const, text }]
-  }
-  return host.send(
-    { callerKey: 'test-surface' },
-    {
-      envelope: {
-        sessionId,
-        clientOperationId: operationId(),
-        expectedRuntimeFence: host.deps.store.getRecord(sessionId)!.lease.runtimeFence,
-        payloadFingerprint: computeAgentSessionPayloadFingerprint({
-          method: 'agentSession.send',
-          sessionId,
-          fields: { body }
-        })
-      },
-      body
-    }
-  )
-}
-
-async function userTexts(sessionId: string): Promise<string[]> {
-  return (await host.journalSnapshot(sessionId)).items.flatMap((item: AgentJournalRenderItem) =>
-    item.body?.kind === 'message' && item.body.role === 'user'
-      ? item.body.blocks.map((block) => (block.type === 'text' ? block.text : ''))
-      : []
-  )
-}
-
-/** A supervised terminal worker under the coordinator's Run, and its worker_done. */
-async function finishWorker(
-  taskId: string,
-  worker: { handle: string; paneKey: string } = { handle: 'term_worker', paneKey: WORKER_PANE }
-): Promise<void> {
-  const started = db.createStartingWorkerDispatch({
-    creator: { kind: 'system' },
-    maxDepth: Number.MAX_SAFE_INTEGER,
-    taskId,
-    startOptions: {}
-  })
-  db.prepareStartingWorkerAuthority({
-    dispatchId: started.dispatch.id,
-    handle: worker.handle,
-    paneKey: worker.paneKey,
-    processIncarnation: `runtime_test:${worker.handle}:1`,
-    worktreeId: 'repo::worker',
-    effects: [],
-    setupState: 'not_applicable'
-  })
-  db.markWorkerDispatchReady(started.dispatch.id)
-  await call('orchestration.send', {
-    from: worker.handle,
-    subject: 'Done',
-    type: 'worker_done',
-    payload: JSON.stringify({ taskId, dispatchId: started.dispatch.id, outcome: 'succeeded' })
-  })
-}
-
-async function coordinatorRunAndTask(): Promise<{ runId: string; taskId: string }> {
-  const created = await call(
-    'orchestration.runCreate',
-    { objective: 'ship' },
-    {
-      sessionId: COORDINATOR
-    }
-  )
-  const runId = idOf(created.run)
-  const task = await call(
-    'orchestration.taskCreate',
-    { spec: 'build it' },
-    {
-      sessionId: COORDINATOR
-    }
-  )
-  return { runId, taskId: idOf(task.task) }
-}
-
-/** `/clear` as the chat surface runs it: the conversation continues in a new session. */
-async function clearChat(sessionId: string): Promise<string> {
-  const command = 'clear' as const
-  const cleared = await host.conversationCommand(
-    { callerKey: 'test-surface' },
-    {
-      command,
-      envelope: {
-        sessionId,
-        clientOperationId: operationId(),
-        expectedRuntimeFence: host.deps.store.getRecord(sessionId)!.lease.runtimeFence,
-        payloadFingerprint: computeAgentSessionPayloadFingerprint({
-          method: 'agentSession.conversationCommand',
-          sessionId,
-          fields: { command }
-        })
-      }
-    }
-  )
-  const successor = cleared.ok ? cleared.value.replacementSessionId : undefined
-  if (!successor) {
-    throw new Error(`clear failed: ${JSON.stringify(cleared)}`)
-  }
-  // The surface swaps the tab over to the session that continues the chat.
-  await host.setSessionTabVisibility(sessionId, false)
-  await host.setSessionTabVisibility(successor, true)
-  return successor
-}
-
-/** A cleared chat's successor runs once the user writes to it; only then can its agent act. */
-async function startSuccessor(successor: string): Promise<void> {
-  expect(await sendUserMessage(successor, 'hello')).toMatchObject({ ok: true })
-  await vi.waitFor(() => expect(connectionFor(successor).turns).toHaveLength(1), WAIT)
-  await settleTurn(successor, 0)
-}
-
-beforeEach(async () => {
-  resetProviderFaults()
-  root = await mkdtemp(join(tmpdir(), 'orca-structured-coordinator-mail-'))
-  codex = fakeCodex()
-  db = new OrchestrationDb(':memory:')
-  runtime = startRuntime()
-  host = await ensureStructuredAgentSessionHost({
-    logger: createStructuredAgentSessionLogger(),
-    stateDirectory: root,
-    hostId: 'local',
-    claimKeyId: 'key-1',
-    resolveWorkspacePath: async (workspaceId) => `/repos/${workspaceId}`,
-    resolveCodexCommand: () => '/usr/local/bin/codex',
-    resolveClaudeAuthPolicy: () => ({ stripAuthEnv: true }),
-    resolveEnvironment: async () => ({ PATH: '/usr/bin' }),
-    openCodexConnection: codex.openConnection,
-    readProcessStartTime: async () => 1_700_000_000_000,
-    // The same call the runtime's own host install makes on every status change.
-    onSessionStatusChanged: (summary) => runtime.onStructuredSessionStatusForMail(summary)
-  })
-  dispatcher = new RpcDispatcher({ runtime, methods: ORCHESTRATION_METHODS })
-})
-
-/** The runtime over the shared database; a second call is what an Orca restart leaves behind. */
-function startRuntime(): OrcaRuntimeService {
-  const started = new OrcaRuntimeService()
-  started.setOrchestrationDb(db)
-  vi.spyOn(started, 'ensureStructuredAgentSessionHost').mockResolvedValue()
-  vi.spyOn(started, 'getTerminalPaneKey').mockImplementation((handle) =>
-    handle === 'term_worker' ? WORKER_PANE : handle === 'term_worker_2' ? WORKER_2_PANE : null
-  )
-  return started
-}
-
-afterEach(async () => {
-  try {
-    await stopStructuredAgentSessionRuntime()
-    db.close()
-    await observationClock.drainClosedDatabaseRepair()
-    vi.restoreAllMocks()
-    await rm(root, { recursive: true, force: true })
-  } finally {
-    observationClock.restore()
-  }
-})
-
-// Pointers are sent on asynchronous edges; the default 1s wait is too tight under a loaded parallel run.
-const WAIT = { timeout: 10_000 }
-
-const POINTER =
-  /You have 1 orchestration message\. Run `orca(-dev)? orchestration check --run run_\w+`\./
-
-/** The text the PTY lane types into a local terminal for this mailbox, byte for byte. */
-function ptyPointer(mailboxHandle: string): string {
-  return formatMessagePointer(1, mailboxHandle, localOrchestrationCliCommand()).trim()
-}
-
-/** The text of a turn the fake provider received. */
-function turnText(turn: { text: string }): string {
-  const input: unknown = JSON.parse(turn.text)
-  return Array.isArray(input)
-    ? input.map((item: unknown) => (isRecord(item) ? String(item.text) : '')).join('')
-    : ''
-}
+  COORDINATOR,
+  PEER_CHAT,
+  WORKER_2_PANE,
+  codex,
+  runtime,
+  db,
+  host,
+  dispatcher,
+  observationClock,
+  request,
+  call,
+  openChat,
+  connectionFor,
+  settleTurn,
+  sendUserMessage,
+  userTexts,
+  finishWorker,
+  coordinatorRunAndTask,
+  clearChat,
+  startSuccessor,
+  WAIT,
+  POINTER,
+  ptyPointer,
+  turnText,
+  queuedCardTexts,
+  restartRuntime
+} from './structured-chat-coordinator-mail-rig.test-fixture'
 
 describe('a worker result reaches the structured chat that coordinates it', () => {
   it('lands as a turn in the coordinator journal, and a flagless check returns the worker_done', async () => {
@@ -522,8 +254,7 @@ describe('a worker result reaches the structured chat that coordinates it', () =
 
     // The next process: a fresh runtime over the same database redrives restored mail. The
     // provider still dies, so exactly one start proves it is pointed once, not in a loop.
-    runtime = startRuntime()
-    dispatcher = new RpcDispatcher({ runtime, methods: ORCHESTRATION_METHODS })
+    restartRuntime()
     const before = providerFaults.starts
     await vi.waitFor(() => expect(providerFaults.turnStarts).toBe(2), WAIT)
     await observationClock.observe(1_500)
@@ -658,9 +389,10 @@ describe('a worker result reaches the structured chat that coordinates it', () =
     }
   })
 
-  it('holds mail a refused turn left in doubt until the next result, then points it once', async () => {
+  it("holds mail a refused turn left in doubt, then queues the next pointer behind it as the person's message would wait", async () => {
     // A failed turn/start cannot prove the turn never started, so the host records it `unknown`
-    // and a resend under its id replays that; new mail is a new send.
+    // and a resend under its id replays that. A live doubt counts as work still owed, so the next
+    // result's pointer waits in the chat's queue, as a message the person sent then would.
     const chat = await openChat(COORDINATOR)
     const { runId, taskId } = await coordinatorRunAndTask()
     const second = await call(
@@ -676,10 +408,14 @@ describe('a worker result reaches the structured chat that coordinates it', () =
     expect(chat.turns).toHaveLength(0)
 
     await finishWorker(idOf(second.task), { handle: 'term_worker_2', paneKey: WORKER_2_PANE })
-    await vi.waitFor(() => expect(chat.turns).toHaveLength(1), WAIT)
-    expect(turnText(chat.turns[0]!)).toBe(
-      formatMessagePointer(2, `run:${runId}`, localOrchestrationCliCommand()).trim()
+    await vi.waitFor(
+      async () =>
+        expect(await queuedCardTexts()).toEqual([
+          formatMessagePointer(2, `run:${runId}`, localOrchestrationCliCommand()).trim()
+        ]),
+      WAIT
     )
+    expect(chat.turns).toHaveLength(0)
     expect(codex.connections.length).toBe(before)
   })
 
@@ -879,10 +615,11 @@ describe('a /clear keeps the chat its orchestration address', () => {
       expect(sent).toMatchObject({ message: { to_handle: `orca_session_id:${PEER_CHAT}` } })
       await vi.waitFor(() => expect(connectionFor(successor).turns).toHaveLength(index + 1), WAIT)
       await settleTurn(successor, index)
+      // Read each ping before the next is sent, so each check holds exactly one.
+      const checked = await call('orchestration.check', {}, { sessionId: successor })
+      expect(checked).toMatchObject({ count: 1, messages: [{ subject: `ping ${index}` }] })
+      await call('orchestration.check', { ack: checked.deliveryId }, { sessionId: successor })
     }
-    await expect(call('orchestration.check', {}, { sessionId: successor })).resolves.toMatchObject({
-      count: 3
-    })
   })
 })
 
diff --git a/src/main/window/clipboard-dashboard-popout-access.test.ts b/src/main/window/clipboard-dashboard-popout-access.test.ts
index 9a9c50bd3af..99144519d58 100644
--- a/src/main/window/clipboard-dashboard-popout-access.test.ts
+++ b/src/main/window/clipboard-dashboard-popout-access.test.ts
@@ -109,6 +109,9 @@ describe('dashboard popout clipboard access', () => {
     expect(() => handlers.get('clipboard:readFilePaths')?.(popoutEvent)).toThrow(
       'Unauthorized clipboard IPC sender'
     )
+    expect(() =>
+      handlers.get('clipboard:restoreNativeChatPastes')?.(popoutEvent, ['/etc/passwd'])
+    ).toThrow('Unauthorized clipboard IPC sender')
     expect(() =>
       handlers.get('clipboard:writeFile')?.(popoutEvent, {
         filePath: '/tmp/copied-file.txt',
diff --git a/src/main/window/clipboard-image-temp-file.test.ts b/src/main/window/clipboard-image-temp-file.test.ts
index e6fdd9f900b..7e479a9ecba 100644
--- a/src/main/window/clipboard-image-temp-file.test.ts
+++ b/src/main/window/clipboard-image-temp-file.test.ts
@@ -1,12 +1,16 @@
+import { dirname, join } from 'node:path'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
-const { writeFileMock, getPathMock, writeFileBase64Mock } = vi.hoisted(() => ({
+const { writeFileMock, mkdirMock, getPathMock, writeFileBase64Mock } = vi.hoisted(() => ({
   writeFileMock: vi.fn(),
-  getPathMock: vi.fn(() => '/var/folders/ab/T'),
+  mkdirMock: vi.fn(),
+  getPathMock: vi.fn((name: string) =>
+    name === 'temp' ? '/os/temp' : '/Users/me/Library/Application Support/orca'
+  ),
   writeFileBase64Mock: vi.fn()
 }))
 
-vi.mock('node:fs/promises', () => ({ default: { writeFile: writeFileMock } }))
+vi.mock('node:fs/promises', () => ({ default: { writeFile: writeFileMock, mkdir: mkdirMock } }))
 vi.mock('node:crypto', () => ({ randomUUID: () => 'uuid-1' }))
 vi.mock('../../shared/app-environment', () => ({
   getAppEnvironment: () => ({ getPath: getPathMock })
@@ -25,10 +29,28 @@ beforeEach(() => {
 })
 
 describe('saveClipboardImageBufferAsTempFile', () => {
-  it('writes the pasted image to the local temp folder', async () => {
+  it('keeps a terminal, editor or phone paste in OS temp, as before', async () => {
     const savedPath = await saveClipboardImageBufferAsTempFile(Buffer.from([1, 2, 3]))
 
-    expect(savedPath.startsWith('/var/folders/ab/T')).toBe(true)
+    expect(getPathMock).toHaveBeenCalledWith('temp')
+    expect(getPathMock).not.toHaveBeenCalledWith('userData')
+    expect(mkdirMock).not.toHaveBeenCalled()
+    expect(dirname(savedPath)).toBe('/os/temp')
+    expect(writeFileMock).toHaveBeenCalledWith(savedPath, Buffer.from([1, 2, 3]))
+  })
+
+  it('writes a native-chat composer paste into the paste folder, where its draft can find it', async () => {
+    const savedPath = await saveClipboardImageBufferAsTempFile(Buffer.from([1, 2, 3]), {
+      forNativeChatDraft: true
+    })
+
+    expect(mkdirMock).toHaveBeenCalledWith(
+      join('/Users/me/Library/Application Support/orca', 'native-chat-pastes'),
+      { recursive: true }
+    )
+    expect(dirname(savedPath)).toBe(
+      join('/Users/me/Library/Application Support/orca', 'native-chat-pastes')
+    )
     expect(writeFileMock).toHaveBeenCalledWith(savedPath, Buffer.from([1, 2, 3]))
   })
 
diff --git a/src/main/window/clipboard-image-temp-file.ts b/src/main/window/clipboard-image-temp-file.ts
index cadbd677650..3a599e4ac5e 100644
--- a/src/main/window/clipboard-image-temp-file.ts
+++ b/src/main/window/clipboard-image-temp-file.ts
@@ -2,14 +2,17 @@ import fs from 'node:fs/promises'
 import path from 'node:path'
 import { randomUUID } from 'node:crypto'
 
-import { getAppEnvironment } from '../../shared/app-environment'
 import { requireSshFilesystemProvider } from '../providers/ssh-filesystem-dispatch'
+import { getAppEnvironment } from '../../shared/app-environment'
 import { isWindowsAbsolutePathLike } from '../../shared/cross-platform-path'
 import { assertClipboardImageByteLengthWithinLimit } from '../../shared/clipboard-image'
+import { nativeChatPasteFolder } from './native-chat-paste-files'
 
 export type SaveClipboardImageAsTempFileArgs = {
   connectionId?: string | null
   runtimeEnvironmentId?: string | null
+  /** A native-chat composer paste: kept in Orca's paste folder so its draft can bring it back. */
+  forNativeChatDraft?: boolean
 }
 
 const REMOTE_CLIPBOARD_IMAGE_TEMP_DIR = '/tmp'
@@ -39,7 +42,14 @@ export async function saveClipboardImageBufferAsTempFile(
     return remotePath
   }
 
-  const tempPath = path.join(getAppEnvironment().getPath('temp'), fileName)
+  // Why only a composer paste goes to the paste folder: its draft can bring it back after a
+  // restart, while terminal, editor and phone pastes stay in OS temp, as they always have.
+  let folder = getAppEnvironment().getPath('temp')
+  if (args?.forNativeChatDraft === true) {
+    folder = nativeChatPasteFolder()
+    await fs.mkdir(folder, { recursive: true })
+  }
+  const tempPath = path.join(folder, fileName)
   await fs.writeFile(tempPath, buffer)
   return tempPath
 }
diff --git a/src/main/window/clipboard-ipc-handlers.test.ts b/src/main/window/clipboard-ipc-handlers.test.ts
index 79f9eabc066..2d283a50de2 100644
--- a/src/main/window/clipboard-ipc-handlers.test.ts
+++ b/src/main/window/clipboard-ipc-handlers.test.ts
@@ -84,9 +84,7 @@ vi.mock('node:fs/promises', () => ({
   stat: fsStatMock,
   realpath: vi.fn(), // unused here; only satisfies filesystem-path-containment's named import
   writeFile: fsWriteFileMock,
-  default: {
-    writeFile: fsWriteFileMock
-  }
+  default: { writeFile: fsWriteFileMock, mkdir: fsMkdirMock }
 }))
 
 vi.mock('../ipc/filesystem-auth', () => ({
diff --git a/src/main/window/clipboard-ipc-handlers.ts b/src/main/window/clipboard-ipc-handlers.ts
index 7873316ef3d..f5fb9032f2d 100644
--- a/src/main/window/clipboard-ipc-handlers.ts
+++ b/src/main/window/clipboard-ipc-handlers.ts
@@ -44,6 +44,7 @@ import { readClipboardCopiedFilePaths } from './clipboard-copied-file-paths'
 import { buildClipboardImageThumbnail } from './clipboard-image-thumbnail'
 import { writeClipboardTextAndVerify } from './clipboard-text-write-verify'
 import { isDashboardPopoutRenderer } from './dashboard-popout-window'
+import { restoreNativeChatPastes, sweepExpiredNativeChatPastes } from './native-chat-paste-files'
 
 let trustedClipboardRendererWebContentsId: number | null = null
 
@@ -101,8 +102,10 @@ export function registerClipboardHandlers(store: Store): void {
   ipcMain.removeHandler('clipboard:readImageThumbnail')
   ipcMain.removeHandler('clipboard:hasImage')
   ipcMain.removeHandler('clipboard:readFilePaths')
+  ipcMain.removeHandler('clipboard:restoreNativeChatPastes')
 
   void cleanupExpiredRemoteClipboardFiles()
+  void sweepExpiredNativeChatPastes()
   scheduleLegacyRemoteClipboardFileCleanup()
 
   ipcMain.handle('clipboard:readText', async (event, options?: ReadClipboardTextOptions) => {
@@ -116,6 +119,10 @@ export function registerClipboardHandlers(store: Store): void {
       return assertClipboardTextWithinLimitWithYield(clipboard.readText('selection'), options)
     }
   )
+  ipcMain.handle('clipboard:restoreNativeChatPastes', (event, paths: unknown) => {
+    assertTrustedClipboardSender(event)
+    return restoreNativeChatPastes(paths)
+  })
   // Why: an unanswered paste reads as a dropped paste, so the composer probes
   // the clipboard in memory before the (slower) save lands.
   ipcMain.handle('clipboard:readImageThumbnail', (event): ClipboardImageThumbnail | null => {
diff --git a/src/main/window/clipboard-runtime-owned-ssh-paste.test.ts b/src/main/window/clipboard-runtime-owned-ssh-paste.test.ts
index 979c5b7d413..1bc2915508f 100644
--- a/src/main/window/clipboard-runtime-owned-ssh-paste.test.ts
+++ b/src/main/window/clipboard-runtime-owned-ssh-paste.test.ts
@@ -39,7 +39,7 @@ vi.mock('node:fs/promises', () => ({
   stat: vi.fn(),
   realpath: vi.fn(),
   writeFile: fsWriteFileMock,
-  default: { writeFile: fsWriteFileMock }
+  default: { writeFile: fsWriteFileMock, mkdir: vi.fn() }
 }))
 vi.mock('../ipc/filesystem-auth', () => ({
   PATH_ACCESS_DENIED_MESSAGE: 'denied',
diff --git a/src/main/window/native-chat-paste-files.test.ts b/src/main/window/native-chat-paste-files.test.ts
new file mode 100644
index 00000000000..05599675c7c
--- /dev/null
+++ b/src/main/window/native-chat-paste-files.test.ts
@@ -0,0 +1,290 @@
+import {
+  existsSync,
+  lutimesSync,
+  mkdirSync,
+  mkdtempSync,
+  realpathSync,
+  rmSync,
+  symlinkSync,
+  utimesSync,
+  writeFileSync
+} from 'node:fs'
+import { tmpdir } from 'node:os'
+import path from 'node:path'
+import { afterEach, beforeEach, describe, expect, it } from 'vitest'
+import { installFakeAppEnvironment } from '../../../config/scripts/vitest-host-ports-setup'
+import { AGENT_SESSION_MAX_NEW_OPERATION_AGE_MS } from '../../shared/agent-session-host-authority'
+
+import type { Store } from '../persistence'
+import { resolveLocalFileRequestPath } from '../ipc/local-file-access-resolution'
+import { readLocalFileContent } from '../ipc/filesystem/filesystem-file-content-inspection'
+import {
+  NATIVE_CHAT_PASTE_TTL_MS,
+  isInsideNativeChatPasteFolder,
+  restoreNativeChatPastes,
+  sweepExpiredNativeChatPastes
+} from './native-chat-paste-files'
+
+// A store with no projects: nothing but an access kind decides what a read may reach.
+const NO_PROJECTS: Store = Object.assign(Object.create(null), {
+  getRepos: () => [],
+  getProjects: () => [],
+  getProjectGroups: () => [],
+  getFolderWorkspaces: () => [],
+  getSettings: () => ({ nestWorkspaces: false, workspaceDir: '' })
+})
+
+/** Whether the composer preview's chat-image access can read `target`. */
+async function chatImageReadable(target: string): Promise<boolean> {
+  try {
+    await readLocalFileContent(
+      await resolveLocalFileRequestPath(target, { kind: 'chat-image' }, NO_PROJECTS)
+    )
+    return true
+  } catch {
+    return false
+  }
+}
+
+describe('isInsideNativeChatPasteFolder', () => {
+  const posixFolder = '/data/native-chat-pastes'
+  const winFolder = 'C:\\Users\\Me\\AppData\\Roaming\\Orca\\native-chat-pastes'
+
+  it.each([
+    ['a file inside', `${posixFolder}/orca-paste-1.png`, true],
+    ['a name that only starts with dots', `${posixFolder}/..orca-paste-1.png`, true],
+    ['the folder itself', posixFolder, false],
+    ['the parent', '/data', false],
+    ['a sibling reached through ..', `${posixFolder}/../secret.png`, false],
+    ['a sibling folder sharing the prefix', '/data/native-chat-pastes-evil/x.png', false],
+    ['an unrelated absolute path', '/etc/passwd', false]
+  ])('posix: %s', (_label, target, inside) => {
+    expect(isInsideNativeChatPasteFolder(posixFolder, target, path.posix, 'darwin')).toBe(inside)
+  })
+
+  it.each([
+    ['a file inside', `${winFolder}\\orca-paste-1.png`, true],
+    ['a file inside in other letter case', `${winFolder.toLowerCase()}\\ORCA-PASTE-1.PNG`, true],
+    ['a \\\\?\\ prefixed file inside', `\\\\?\\${winFolder}\\orca-paste-1.png`, true],
+    ['another drive', 'D:\\native-chat-pastes\\orca-paste-1.png', false],
+    ['a \\\\?\\UNC share', '\\\\?\\UNC\\server\\share\\orca-paste-1.png', false],
+    ['a sibling reached through ..', `${winFolder}\\..\\secret.png`, false],
+    ['the folder itself', winFolder, false]
+  ])('win32: %s', (_label, target, inside) => {
+    expect(isInsideNativeChatPasteFolder(winFolder, target, path.win32, 'win32')).toBe(inside)
+  })
+
+  it('compares a \\\\?\\ prefixed folder like its plain form', () => {
+    expect(
+      isInsideNativeChatPasteFolder(
+        `\\\\?\\${winFolder}`,
+        `${winFolder}\\orca-paste-1.png`,
+        path.win32,
+        'win32'
+      )
+    ).toBe(true)
+  })
+})
+
+describe('native-chat paste folder on disk', () => {
+  let root: string
+  let folder: string
+
+  beforeEach(() => {
+    root = mkdtempSync(path.join(tmpdir(), 'orca-native-chat-pastes-'))
+    folder = path.join(root, 'native-chat-pastes')
+    mkdirSync(folder)
+    installFakeAppEnvironment({ getPath: () => root })
+  })
+
+  afterEach(() => {
+    rmSync(root, { recursive: true, force: true })
+  })
+
+  it('keeps only files really inside the folder, and never throws on a bad path', async () => {
+    const kept = path.join(folder, 'orca-paste-1.png')
+    writeFileSync(kept, 'png')
+    const outside = path.join(root, 'outside.png')
+    writeFileSync(outside, 'png')
+    const linkOut = path.join(folder, 'orca-paste-2.png')
+    symlinkSync(outside, linkOut)
+    mkdirSync(path.join(folder, 'orca-paste-dir.png'))
+
+    const results = await restoreNativeChatPastes([
+      kept,
+      linkOut,
+      path.join(folder, '..', 'outside.png'),
+      path.join(folder, 'orca-paste-dir.png'),
+      path.join(folder, 'orca-paste-missing.png'),
+      'relative/orca-paste-3.png',
+      '',
+      42
+    ])
+
+    expect(results).toEqual([
+      { path: kept, kept: true, exists: true },
+      { path: linkOut, kept: false, exists: false },
+      { path: path.join(folder, '..', 'outside.png'), kept: false, exists: false },
+      { path: path.join(folder, 'orca-paste-dir.png'), kept: false, exists: false },
+      { path: path.join(folder, 'orca-paste-missing.png'), kept: false, exists: false },
+      { path: 'relative/orca-paste-3.png', kept: false, exists: false },
+      { path: '', kept: false, exists: false }
+    ])
+    await expect(restoreNativeChatPastes('not a list')).resolves.toEqual([])
+  })
+
+  it('leaves a kept paste readable by the composer preview, with no grant', async () => {
+    const kept = path.join(folder, 'orca-paste-1.png')
+    writeFileSync(kept, 'png')
+    await expect(restoreNativeChatPastes([kept])).resolves.toEqual([
+      { path: kept, kept: true, exists: true }
+    ])
+    const readable = await resolveLocalFileRequestPath(kept, { kind: 'chat-image' }, NO_PROJECTS)
+    await expect(readLocalFileContent(readable)).resolves.toMatchObject({ mimeType: 'image/png' })
+  })
+
+  it('keeps a paste reached through a symlinked alias of the folder, as /var is of /private/var', async () => {
+    const kept = path.join(folder, 'orca-paste-1.png')
+    writeFileSync(kept, 'png')
+    const alias = path.join(tmpdir(), `orca-native-chat-pastes-alias-${process.pid}`)
+    rmSync(alias, { force: true })
+    symlinkSync(root, alias)
+    try {
+      installFakeAppEnvironment({ getPath: () => alias })
+      const viaAlias = path.join(alias, 'native-chat-pastes', 'orca-paste-1.png')
+
+      await expect(restoreNativeChatPastes([viaAlias, realpathSync(kept)])).resolves.toEqual([
+        { path: viaAlias, kept: true, exists: true },
+        { path: realpathSync(kept), kept: true, exists: true }
+      ])
+      // The preview reads by the stored spelling, through chat-image access.
+      expect(await chatImageReadable(viaAlias)).toBe(true)
+    } finally {
+      rmSync(alias, { force: true })
+    }
+  })
+
+  it('refuses a path that names an outside file as text while its real path is inside', async () => {
+    const secret = path.join(root, 'outside', 'id_rsa')
+    mkdirSync(path.dirname(secret), { recursive: true })
+    writeFileSync(secret, 'PRIVATE KEY')
+    const paste = path.join(folder, 'orca-paste-1.png')
+    writeFileSync(paste, 'png')
+    // `s/..` resolves through a link for real, but by text it climbs to the secret.
+    const workspace = path.join(root, 'ws')
+    const depth = workspace.split(path.sep).filter(Boolean).length + 1
+    const deep = path.join(workspace, ...Array.from({ length: depth }, (_, i) => `d${i}`))
+    mkdirSync(deep, { recursive: true })
+    symlinkSync(deep, path.join(workspace, 's'))
+    const tail = secret.slice(1)
+    mkdirSync(path.dirname(path.join(workspace, tail)), { recursive: true })
+    symlinkSync(paste, path.join(workspace, tail))
+    const crafted = `${workspace}/s/${'../'.repeat(depth)}${tail}`
+    expect(path.resolve(crafted)).toBe(secret)
+
+    await expect(restoreNativeChatPastes([crafted])).resolves.toEqual([
+      { path: crafted, kept: false, exists: false }
+    ])
+    // An outside file never becomes readable: nothing is granted, and chat-image reads only images.
+    expect(await chatImageReadable(secret)).toBe(false)
+    expect(await chatImageReadable(crafted)).toBe(false)
+  })
+
+  it('keeps a paste by its real path, and never makes the file its stored spelling names readable', async () => {
+    const secret = path.join(root, 'outside', 'id_rsa')
+    mkdirSync(path.dirname(secret), { recursive: true })
+    writeFileSync(secret, 'PRIVATE KEY')
+    // `folder/link/../y` reaches a real paste through `link`, while `folder/y` by text is a link out.
+    const sub = path.join(folder, 'sub')
+    mkdirSync(sub)
+    mkdirSync(path.join(sub, 'deeper'))
+    writeFileSync(path.join(sub, 'orca-paste-y.png'), 'png')
+    symlinkSync(path.join(sub, 'deeper'), path.join(folder, 'link'))
+    symlinkSync(secret, path.join(folder, 'orca-paste-y.png'))
+    const restored = `${folder}/link/../orca-paste-y.png`
+    expect(realpathSync.native(restored)).toBe(realpathSync(path.join(sub, 'orca-paste-y.png')))
+
+    await expect(restoreNativeChatPastes([restored])).resolves.toEqual([
+      { path: restored, kept: true, exists: true }
+    ])
+    expect(await chatImageReadable(secret)).toBe(false)
+    expect(await chatImageReadable(realpathSync(secret))).toBe(false)
+    expect(await chatImageReadable(path.join(folder, 'orca-paste-y.png'))).toBe(false)
+  })
+
+  it('neither restores from nor sweeps a paste folder that is itself a link', async () => {
+    const outside = path.join(root, 'Documents')
+    mkdirSync(outside)
+    const old = (Date.now() - NATIVE_CHAT_PASTE_TTL_MS - 60_000) / 1000
+    for (const name of ['orca-paste-1.png', 'tax-return.pdf']) {
+      writeFileSync(path.join(outside, name), 'x')
+      utimesSync(path.join(outside, name), old, old)
+    }
+    rmSync(folder, { recursive: true })
+    symlinkSync(outside, folder)
+
+    await expect(restoreNativeChatPastes([path.join(folder, 'orca-paste-1.png')])).resolves.toEqual(
+      [{ path: path.join(folder, 'orca-paste-1.png'), kept: false, exists: false }]
+    )
+    await sweepExpiredNativeChatPastes()
+    expect(existsSync(path.join(outside, 'orca-paste-1.png'))).toBe(true)
+    expect(existsSync(path.join(outside, 'tax-return.pdf'))).toBe(true)
+  })
+
+  it('expires only Orca paste files, whatever else is in the folder', async () => {
+    const old = (Date.now() - NATIVE_CHAT_PASTE_TTL_MS - 60_000) / 1000
+    for (const name of ['orca-paste-old.png', 'notes.txt']) {
+      writeFileSync(path.join(folder, name), 'x')
+      utimesSync(path.join(folder, name), old, old)
+    }
+
+    await sweepExpiredNativeChatPastes()
+
+    expect(existsSync(path.join(folder, 'orca-paste-old.png'))).toBe(false)
+    expect(existsSync(path.join(folder, 'notes.txt'))).toBe(true)
+  })
+
+  it('reports nothing kept when the folder does not exist yet', async () => {
+    rmSync(folder, { recursive: true })
+    await expect(restoreNativeChatPastes([path.join(folder, 'orca-paste-1.png')])).resolves.toEqual(
+      [{ path: path.join(folder, 'orca-paste-1.png'), kept: false, exists: false }]
+    )
+  })
+
+  it('expires old pastes only, and never follows a symlink or enters a folder', async () => {
+    const now = Date.now()
+    const old = (now - NATIVE_CHAT_PASTE_TTL_MS - 60_000) / 1000
+    const oldPaste = path.join(folder, 'orca-paste-old.png')
+    const newPaste = path.join(folder, 'orca-paste-new.png')
+    writeFileSync(oldPaste, 'png')
+    writeFileSync(newPaste, 'png')
+    utimesSync(oldPaste, old, old)
+    const outsideOld = path.join(root, 'outside-old.png')
+    writeFileSync(outsideOld, 'png')
+    utimesSync(outsideOld, old, old)
+    symlinkSync(outsideOld, path.join(folder, 'orca-paste-link.png'))
+    lutimesSync(path.join(folder, 'orca-paste-link.png'), old, old)
+    const nested = path.join(folder, 'nested')
+    mkdirSync(nested)
+    const nestedOld = path.join(nested, 'orca-paste-nested.png')
+    writeFileSync(nestedOld, 'png')
+    utimesSync(nestedOld, old, old)
+
+    await sweepExpiredNativeChatPastes(now)
+
+    expect(existsSync(oldPaste)).toBe(false)
+    expect(existsSync(newPaste)).toBe(true)
+    expect(existsSync(outsideOld)).toBe(true)
+    expect(existsSync(path.join(folder, 'orca-paste-link.png'))).toBe(true)
+    expect(existsSync(nestedOld)).toBe(true)
+  })
+
+  it('does nothing, and does not throw, when the folder is missing', async () => {
+    rmSync(folder, { recursive: true })
+    await expect(sweepExpiredNativeChatPastes()).resolves.toBeUndefined()
+  })
+
+  it('keeps a paste longer than one send id stays valid on the host', () => {
+    expect(NATIVE_CHAT_PASTE_TTL_MS).toBeGreaterThan(AGENT_SESSION_MAX_NEW_OPERATION_AGE_MS)
+  })
+})
diff --git a/src/main/window/native-chat-paste-files.ts b/src/main/window/native-chat-paste-files.ts
new file mode 100644
index 00000000000..a2ef9682426
--- /dev/null
+++ b/src/main/window/native-chat-paste-files.ts
@@ -0,0 +1,138 @@
+// Local native-chat pastes live in an Orca-owned folder, so a restored draft can show and send them:
+// a restore keeps only files that really are inside it, and old files expire.
+
+import { lstat, readdir, realpath, stat, unlink } from 'node:fs/promises'
+import path from 'node:path'
+import { getAppEnvironment } from '../../shared/app-environment'
+import { NATIVE_CHAT_PASTE_FOLDER } from '../../shared/native-chat-paste-folder'
+
+// Why 30 days: no age bounds what can still name a paste (a queued send is retried with a new id
+// after the host's 24 h id window), so this is a judgment. A draft or outbox entry kept longer meets
+// its image as a placeholder or a failed send, and a sent paste's file lingers until then.
+export const NATIVE_CHAT_PASTE_TTL_MS = 30 * 24 * 60 * 60 * 1000
+const PASTE_FILE_NAME = /^orca-paste-.+\.png$/i
+const MAX_RESTORED_PASTES = 256
+
+type PathApi = typeof path.posix
+
+export type RestoredNativeChatPaste = { path: string; kept: boolean; exists: boolean }
+
+export function nativeChatPasteFolder(): string {
+  return path.join(getAppEnvironment().getPath('userData'), NATIVE_CHAT_PASTE_FOLDER)
+}
+
+/** A path as compared for containment: no `\\?\` prefix, and case-folded where the platform is. */
+function comparablePath(value: string, pathApi: PathApi, platform: string): string {
+  const unprefixed = value.replace(/^\\\\\?\\UNC\\/i, '\\\\').replace(/^\\\\\?\\/, '')
+  const normalized = pathApi.normalize(unprefixed)
+  return platform === 'win32' ? normalized.toLowerCase() : normalized
+}
+
+/** True when `target` names something strictly inside `folder`; both must already be real paths. */
+export function isInsideNativeChatPasteFolder(
+  folder: string,
+  target: string,
+  pathApi: PathApi = path,
+  platform: string = process.platform
+): boolean {
+  const relative = pathApi.relative(
+    comparablePath(folder, pathApi, platform),
+    comparablePath(target, pathApi, platform)
+  )
+  return (
+    relative !== '' &&
+    relative !== '..' &&
+    !relative.startsWith(`..${pathApi.sep}`) &&
+    !pathApi.isAbsolute(relative)
+  )
+}
+
+/**
+ * For each restored local paste: kept only when its real path is a file inside the real paste
+ * folder (symlinks and junctions resolved). Anything else comes back as a placeholder. Nothing is
+ * granted: the preview reads a paste with chat-image access. Never throws.
+ */
+export async function restoreNativeChatPastes(paths: unknown): Promise<RestoredNativeChatPaste[]> {
+  if (!Array.isArray(paths)) {
+    return []
+  }
+  const folders = await realPasteFolder()
+  return Promise.all(
+    paths
+      .slice(0, MAX_RESTORED_PASTES)
+      .flatMap((value) =>
+        typeof value === 'string' ? [restoreNativeChatPaste(folders, value)] : []
+      )
+  )
+}
+
+/** The paste folder as configured and as real path; null when missing or itself a link. */
+async function realPasteFolder(): Promise<{ named: string; real: string } | null> {
+  try {
+    const named = path.resolve(nativeChatPasteFolder())
+    const info = await lstat(named)
+    return info.isDirectory() && !info.isSymbolicLink()
+      ? { named, real: await realpath(named) }
+      : null
+  } catch {
+    return null
+  }
+}
+
+async function restoreNativeChatPaste(
+  folders: { named: string; real: string } | null,
+  restored: string
+): Promise<RestoredNativeChatPaste> {
+  const refused = { path: restored, kept: false, exists: false }
+  if (folders === null || restored === '' || !path.isAbsolute(restored)) {
+    return refused
+  }
+  // Why both: the text the draft stores and the file it really names must each be inside.
+  const named = path.resolve(restored)
+  if (
+    !isInsideNativeChatPasteFolder(folders.named, named) &&
+    !isInsideNativeChatPasteFolder(folders.real, named)
+  ) {
+    return refused
+  }
+  try {
+    const real = await realpath(restored)
+    if (!isInsideNativeChatPasteFolder(folders.real, real) || !(await stat(real)).isFile()) {
+      return refused
+    }
+    return { path: restored, kept: true, exists: true }
+  } catch {
+    // Missing or unreadable: not kept, and nothing about an outside path is reported.
+    return refused
+  }
+}
+
+/** Deletes pastes older than the TTL: only Orca's paste files, never a link, a folder, or anything
+ *  in a paste folder that is itself a link. Failures are logged and never block startup. */
+export async function sweepExpiredNativeChatPastes(now = Date.now()): Promise<void> {
+  const folders = await realPasteFolder()
+  if (!folders) {
+    return
+  }
+  const folder = folders.named
+  let entries
+  try {
+    entries = await readdir(folder, { withFileTypes: true })
+  } catch {
+    return
+  }
+  for (const entry of entries) {
+    if (!entry.isFile() || !PASTE_FILE_NAME.test(entry.name)) {
+      continue
+    }
+    const file = path.join(folder, entry.name)
+    try {
+      const info = await lstat(file)
+      if (info.isFile() && now - info.mtimeMs > NATIVE_CHAT_PASTE_TTL_MS) {
+        await unlink(file)
+      }
+    } catch (error) {
+      console.warn('[native-chat-pastes] could not expire a paste:', error)
+    }
+  }
+}
diff --git a/src/preload/api/ui-bridge-clipboard-and-window-controls.ts b/src/preload/api/ui-bridge-clipboard-and-window-controls.ts
index 51957a5eec5..b7d9345daf7 100644
--- a/src/preload/api/ui-bridge-clipboard-and-window-controls.ts
+++ b/src/preload/api/ui-bridge-clipboard-and-window-controls.ts
@@ -93,9 +93,15 @@ export const uiClipboardAndWindowControlsApi = {
   saveClipboardImageAsTempFile: (args?: {
     connectionId?: string | null
     runtimeEnvironmentId?: string | null
+    /** A native-chat composer paste, kept where its draft can bring it back. */
+    forNativeChatDraft?: boolean
   }): Promise<string | null> => ipcRenderer.invoke('clipboard:saveImageAsTempFile', args),
   clipboardHasImage: (): Promise<boolean> => ipcRenderer.invoke('clipboard:hasImage'),
   readClipboardFilePaths: (): Promise<string[]> => ipcRenderer.invoke('clipboard:readFilePaths'),
+  restoreNativeChatPastes: (
+    paths: string[]
+  ): Promise<{ path: string; kept: boolean; exists: boolean }[]> =>
+    ipcRenderer.invoke('clipboard:restoreNativeChatPastes', paths),
   readClipboardImageThumbnail: (): Promise<ClipboardImageThumbnail | null> =>
     ipcRenderer.invoke('clipboard:readImageThumbnail'),
   writeClipboardText: (text: string): Promise<void> =>
diff --git a/src/preload/api/ui-window-api.ts b/src/preload/api/ui-window-api.ts
index c36896a2481..e18fa151394 100644
--- a/src/preload/api/ui-window-api.ts
+++ b/src/preload/api/ui-window-api.ts
@@ -12,10 +12,16 @@ export type UiWindowApi = {
   saveClipboardImageAsTempFile: (args?: {
     connectionId?: string | null
     runtimeEnvironmentId?: string | null
+    /** A native-chat composer paste, kept where its draft can bring it back. */
+    forNativeChatDraft?: boolean
   }) => Promise<string | null>
   clipboardHasImage: () => Promise<boolean | null>
   /** Paths of files a file manager copied; empty when there are none or the host cannot list them. */
   readClipboardFilePaths: () => Promise<string[]>
+  /** Which restored draft pastes are still kept: files really in Orca's paste folder. */
+  restoreNativeChatPastes: (
+    paths: string[]
+  ) => Promise<{ path: string; kept: boolean; exists: boolean }[]>
   readClipboardImageThumbnail: () => Promise<ClipboardImageThumbnail | null>
   writeClipboardText: (text: string) => Promise<void>
   writeTerminalClipboardText: (text: string) => Promise<void>
diff --git a/src/relay/pty-handler-startup-command-delivery.test.ts b/src/relay/pty-handler-startup-command-delivery.test.ts
index 2215eff9d76..a8d812ed89a 100644
--- a/src/relay/pty-handler-startup-command-delivery.test.ts
+++ b/src/relay/pty-handler-startup-command-delivery.test.ts
@@ -89,8 +89,7 @@ describe('PtyHandler', () => {
     expect(term.write).not.toHaveBeenCalled()
 
     vi.advanceTimersByTime(1)
-    const submit = process.platform === 'win32' ? '\r' : '\n'
-    expect(term.write).toHaveBeenCalledWith(`echo provider-owned${submit}`)
+    expect(term.write).toHaveBeenCalledWith('echo provider-owned\r')
     expect(handler.retainedStartupCommandCount).toBe(0)
   })
 
@@ -364,7 +363,7 @@ describe('PtyHandler', () => {
       expect(term.write).not.toHaveBeenCalled()
       vi.advanceTimersByTime(1)
 
-      expect(term.write).toHaveBeenCalledWith('echo after-ready\n')
+      expect(term.write).toHaveBeenCalledWith('echo after-ready\r')
       expect(handler.retainedStartupCommandCount).toBe(0)
       vi.advanceTimersByTime(8)
       expect(dispatcher.notify).toHaveBeenCalledWith('pty.data', {
@@ -421,7 +420,7 @@ describe('PtyHandler', () => {
       promptOptions.onPromptReady()
       await vi.advanceTimersByTimeAsync(50)
 
-      expect(term.write).toHaveBeenCalledWith('echo after-exec\n')
+      expect(term.write).toHaveBeenCalledWith('echo after-exec\r')
       expect(handler.retainedStartupCommandCount).toBe(0)
     }
   )
@@ -635,7 +634,7 @@ describe('PtyHandler', () => {
       dataCallback?.('\x1b]777;orca-shell-ready')
       vi.advanceTimersByTime(1500)
 
-      expect(term.write).toHaveBeenCalledWith('echo fallback\n')
+      expect(term.write).toHaveBeenCalledWith('echo fallback\r')
       vi.advanceTimersByTime(8)
       expect(dispatcher.notify).toHaveBeenCalledWith('pty.data', {
         id: PTY_1,
diff --git a/src/relay/pty-handler.ts b/src/relay/pty-handler.ts
index b96781818e7..162553fe613 100644
--- a/src/relay/pty-handler.ts
+++ b/src/relay/pty-handler.ts
@@ -1025,10 +1025,8 @@ export class PtyHandler {
     if (heldBytes) {
       managed.startupIngress?.accept(heldBytes)
     }
-    const submit = process.platform === 'win32' ? '\r' : '\n'
     // Why: only the shell-ready wrapper arms bracketed-paste; other shells use raw submit so ESC[200~ markers aren't echoed.
     const payload = buildStartupCommandSubmission(startup.command, {
-      submit,
       bracketedPasteSafe: startup.waitForShellReady
     })
     managed.startupCommand = undefined
diff --git a/src/renderer/src/App.tsx b/src/renderer/src/App.tsx
index 903c8b81447..1c1f72e5db8 100644
--- a/src/renderer/src/App.tsx
+++ b/src/renderer/src/App.tsx
@@ -24,6 +24,7 @@ import { useAppChromeLayout } from './app-shell/use-app-chrome-layout'
 import { useAppSessionPersistence } from './app-shell/use-app-session-persistence'
 import { useAppShellServices } from './app-shell/use-app-shell-services'
 import { useAppStartupHydration } from './app-shell/use-app-startup-hydration'
+import { startNativeChatDraftLoad } from './app-shell/native-chat-draft-startup'
 import { useDocumentAppearance } from './app-shell/use-document-appearance'
 import { useFloatingWorkspacePanel } from './app-shell/use-floating-workspace-panel'
 import { useGlobalKeybindings } from './app-shell/use-global-keybindings'
@@ -43,6 +44,8 @@ function App(): React.JSX.Element {
   useAppShellServices({
     floatingPanelVisible: floatingWorkspace.enabled && floatingWorkspace.open
   })
+  // Why before the startup chain: its effect runs first, and no startup step can skip the load.
+  useEffect(startNativeChatDraftLoad, [])
   useAppStartupHydration(onboardingGate.applyStartupOnboardingState)
   useAppSessionPersistence()
   useRuntimeGraphSync()
diff --git a/src/renderer/src/app-shell/native-chat-draft-startup.ts b/src/renderer/src/app-shell/native-chat-draft-startup.ts
new file mode 100644
index 00000000000..4d64bdd708f
--- /dev/null
+++ b/src/renderer/src/app-shell/native-chat-draft-startup.ts
@@ -0,0 +1,25 @@
+import { useAppStore } from '../store'
+import { resolveNativeChatDraftOwner } from '../lib/native-chat-draft-owner'
+import {
+  hydrateNativeChatComposerDrafts,
+  setNativeChatComposerDraftOwnerResolver,
+  waitForNativeChatComposerDrafts
+} from '@/components/native-chat/native-chat-composer-draft-store'
+
+// Why bounded: loading drafts is bookkeeping and must never hold startup; a slower load still
+// fills in every draft not edited meanwhile when it lands.
+const DRAFT_LOAD_WAIT_MS = 1_500
+
+/** Before any startup step, so a step that fails can't leave the drafts unloaded. */
+export function startNativeChatDraftLoad(): void {
+  setNativeChatComposerDraftOwnerResolver((scopeKey) =>
+    resolveNativeChatDraftOwner(useAppStore.getState(), scopeKey)
+  )
+  void hydrateNativeChatComposerDrafts()
+}
+
+/** Startup waits for the drafts alongside the session read, so a composer shows its draft from
+ *  its first frame. */
+export function waitForNativeChatDraftsAtStartup(): Promise<void> {
+  return waitForNativeChatComposerDrafts(DRAFT_LOAD_WAIT_MS)
+}
diff --git a/src/renderer/src/app-shell/use-app-startup-hydration.ts b/src/renderer/src/app-shell/use-app-startup-hydration.ts
index 4186481e7fa..0c0ab0dd543 100644
--- a/src/renderer/src/app-shell/use-app-startup-hydration.ts
+++ b/src/renderer/src/app-shell/use-app-startup-hydration.ts
@@ -5,6 +5,7 @@ import { installCodexDetachedPaneRestartExecutor } from '@/components/terminal-p
 import { useAppStore } from '../store'
 import { reconcileHydratedWorkspaceTabModels } from './reconcile-hydrated-workspace-tab-models'
 import { useStartupActions } from './use-app-startup-actions'
+import { waitForNativeChatDraftsAtStartup } from './native-chat-draft-startup'
 import { WORKTREE_REFRESH_CONCURRENCY } from '../store/slices/worktrees'
 import { sweepRestoredCodexPanesForStaleAccounts } from '../lib/codex-stale-pane-sweep'
 import { fetchWorkspaceSessionWithRuntimeHostOwners } from '../lib/workspace-session-host-hydration'
@@ -180,7 +181,8 @@ export function useAppStartupHydration(onOnboardingLoaded: (state: OnboardingSta
         // Why: wait for both writers to settle before recovery so neither can mutate hydrated state afterward.
         const [sessionOutcome, catalogOutcome] = await Promise.allSettled([
           hydrationSessionChain,
-          localCatalogChain
+          localCatalogChain,
+          timeRendererStartupStep('native-chat-drafts', waitForNativeChatDraftsAtStartup)
         ])
         if (sessionOutcome.status === 'rejected') {
           throw sessionOutcome.reason
diff --git a/src/renderer/src/app-shell/use-persisted-ui-writer.ts b/src/renderer/src/app-shell/use-persisted-ui-writer.ts
index 168fb87f302..3b0556a161e 100644
--- a/src/renderer/src/app-shell/use-persisted-ui-writer.ts
+++ b/src/renderer/src/app-shell/use-persisted-ui-writer.ts
@@ -145,6 +145,7 @@ export function usePersistedUIWriter(): void {
   const ui = useAppStore(
     useShallow((s): PersistedUIWriteBaseline => ({
       sidebarWidth: s.sidebarWidth,
+      sidebarOpen: s.sidebarOpen,
       rightSidebarOpen: s.rightSidebarOpen,
       rightSidebarTab: s.rightSidebarTab,
       rightSidebarExplorerView: s.rightSidebarExplorerView,
diff --git a/src/renderer/src/app-shell/workspace-view-cross-client-sync.test.tsx b/src/renderer/src/app-shell/workspace-view-cross-client-sync.test.tsx
index f5d404b4e10..be236272bf4 100644
--- a/src/renderer/src/app-shell/workspace-view-cross-client-sync.test.tsx
+++ b/src/renderer/src/app-shell/workspace-view-cross-client-sync.test.tsx
@@ -270,6 +270,40 @@ describe('workspace view preferences: cross-client persistence (STA-5781)', () =
     expect(after.hideCliCreatedWorkspaces).toBe(before.hideCliCreatedWorkspaces)
   })
 
+  it('persists a left sidebar close across an unrelated sync and restores it on startup', async () => {
+    act(() => {
+      store.getState().toggleSidebar()
+      authority.set({ sidebarWidth: 320 })
+    })
+    deliverBroadcasts()
+    expect(store.getState().sidebarOpen).toBe(false)
+    await flushDesktopDebounce()
+    expect(authority.get().sidebarOpen).toBe(false)
+
+    const restarted = createUIStore()
+    restarted.getState().hydratePersistedUI(authority.get(), 'startup')
+    expect(restarted.getState().sidebarOpen).toBe(false)
+    expect(restarted.getState().sidebarWidth).toBe(320)
+  })
+
+  it('persists a left sidebar reopen while the close acknowledgement is still pending', async () => {
+    holdAcks = true
+    act(() => store.getState().toggleSidebar())
+    await flushDesktopDebounce()
+    expect(authority.get().sidebarOpen).toBe(false)
+
+    act(() => store.getState().toggleSidebar())
+    deliverBroadcasts()
+    expect(store.getState().sidebarOpen).toBe(true)
+    await resolveAcks()
+    await flushDesktopDebounce()
+    await resolveAcks()
+    deliverBroadcasts()
+    expect(authority.get().sidebarOpen).toBe(true)
+    expect(store.getState().sidebarOpen).toBe(true)
+    expect(store.getState().persistedUIWriteInFlightCounts).toEqual({})
+  })
+
   it('a mobile tap must not revert a desktop change the mobile mirror has not seen', async () => {
     const mobile = createMobileClient(authority)
     mobile.sync()
diff --git a/src/renderer/src/components/browser-pane/annotate/GrabConfirmationSheet.tsx b/src/renderer/src/components/browser-pane/annotate/GrabConfirmationSheet.tsx
index 5761705affc..0a9e4b661e8 100644
--- a/src/renderer/src/components/browser-pane/annotate/GrabConfirmationSheet.tsx
+++ b/src/renderer/src/components/browser-pane/annotate/GrabConfirmationSheet.tsx
@@ -196,7 +196,10 @@ export default function GrabConfirmationSheet({
               </div>
               {target.accessibility.accessibleName ? (
                 <div className="mt-1 text-muted-foreground">
-                  {translate('auto.components.browser.pane.GrabConfirmationSheet.eb98a0971a', '"')}
+                  {translate(
+                    'auto.components.browser.pane.GrabConfirmationSheet.accessibleNameOpenQuote',
+                    '"'
+                  )}
                   <EscapedText text={target.accessibility.accessibleName} />
                   {translate('auto.components.browser.pane.GrabConfirmationSheet.eb98a0971a', '"')}
                 </div>
diff --git a/src/renderer/src/components/browser-pane/annotate/MarkupOverlay.test.tsx b/src/renderer/src/components/browser-pane/annotate/MarkupOverlay.test.tsx
new file mode 100644
index 00000000000..23055c77086
--- /dev/null
+++ b/src/renderer/src/components/browser-pane/annotate/MarkupOverlay.test.tsx
@@ -0,0 +1,71 @@
+// @vitest-environment happy-dom
+
+import { act, cleanup, fireEvent, render } from '@testing-library/react'
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { MarkupOverlay } from './MarkupOverlay'
+
+afterEach(cleanup)
+
+function renderOverlay() {
+  const view = render(
+    <MarkupOverlay
+      baseImage={{ dataUrl: 'data:image/png;base64,', width: 10, height: 10 }}
+      busy={false}
+      onComplete={vi.fn()}
+      onCancel={vi.fn()}
+    />
+  )
+  const canvas = view.container.querySelector('canvas')
+  if (!canvas) {
+    throw new Error('markup canvas not rendered')
+  }
+  canvas.setPointerCapture = vi.fn()
+  const undoButton = view.getByRole('button', { name: 'Undo' })
+  const redoButton = view.getByRole('button', { name: 'Redo' })
+  return { canvas, undoButton, redoButton }
+}
+
+// Every ending is followed by the lost capture the browser fires after it.
+function stroke(
+  canvas: HTMLCanvasElement,
+  end: 'pointerUp' | 'pointerCancel' | 'lostPointerCapture'
+): void {
+  act(() => {
+    fireEvent.pointerDown(canvas, { pointerId: 1, button: 0, clientX: 0, clientY: 0 })
+    fireEvent.pointerMove(canvas, { pointerId: 1, clientX: 50, clientY: 0 })
+    if (end !== 'lostPointerCapture') {
+      fireEvent[end](canvas, { pointerId: 1, clientX: 50, clientY: 0 })
+    }
+    fireEvent.lostPointerCapture(canvas, { pointerId: 1 })
+  })
+}
+
+describe('MarkupOverlay canvas pointer wiring', () => {
+  it('commits a stroke on release', () => {
+    const { canvas, undoButton } = renderOverlay()
+
+    stroke(canvas, 'pointerUp')
+
+    expect(undoButton).toHaveProperty('disabled', false)
+  })
+
+  it('commits a stroke whose release never arrived once the canvas loses the pointer', () => {
+    const { canvas, undoButton, redoButton } = renderOverlay()
+
+    stroke(canvas, 'lostPointerCapture')
+    act(() => {
+      fireEvent.click(undoButton)
+    })
+
+    // Only a committed stroke leaves something to redo; a still-held one is just dropped.
+    expect(redoButton).toHaveProperty('disabled', false)
+  })
+
+  it('discards a stroke whose pointer was cancelled', () => {
+    const { canvas, undoButton } = renderOverlay()
+
+    stroke(canvas, 'pointerCancel')
+
+    expect(undoButton).toHaveProperty('disabled', true)
+  })
+})
diff --git a/src/renderer/src/components/browser-pane/annotate/MarkupOverlay.tsx b/src/renderer/src/components/browser-pane/annotate/MarkupOverlay.tsx
index 4f8a02dbd91..39e86da89d7 100644
--- a/src/renderer/src/components/browser-pane/annotate/MarkupOverlay.tsx
+++ b/src/renderer/src/components/browser-pane/annotate/MarkupOverlay.tsx
@@ -66,7 +66,9 @@ export function MarkupOverlay({
         onPointerDown={editor.onPointerDown}
         onPointerMove={editor.onPointerMove}
         onPointerUp={editor.onPointerUp}
-        onPointerCancel={editor.onPointerUp}
+        onPointerCancel={editor.onPointerCancel}
+        // Why: commits a gesture whose release never arrived, so one can never be left open.
+        onLostPointerCapture={editor.onPointerUp}
       />
 
       {pendingText ? (
@@ -121,7 +123,8 @@ export function MarkupOverlay({
       ) : null}
 
       <div className="pointer-events-none absolute inset-x-0 bottom-3 flex flex-col items-center gap-2 px-3">
-        <div className="pointer-events-auto">
+        {/* Why: cap at the overlay width so the toolbar wraps in a narrow viewport instead of clipping. */}
+        <div className="pointer-events-auto max-w-full">
           <MarkupToolbar
             tool={editor.tool}
             onToolChange={editor.setTool}
diff --git a/src/renderer/src/components/browser-pane/annotate/MarkupToolbar.tsx b/src/renderer/src/components/browser-pane/annotate/MarkupToolbar.tsx
index ee616b0ce28..101d6f462b2 100644
--- a/src/renderer/src/components/browser-pane/annotate/MarkupToolbar.tsx
+++ b/src/renderer/src/components/browser-pane/annotate/MarkupToolbar.tsx
@@ -2,6 +2,7 @@ import React from 'react'
 import {
   ArrowUpRight,
   Circle,
+  Eraser,
   Highlighter,
   Pencil,
   Redo2,
@@ -59,6 +60,11 @@ function toolItems(): ToolItem[] {
       kind: 'text',
       icon: Type,
       label: translate('auto.components.browser-pane.markup.tool.text', 'Text')
+    },
+    {
+      kind: 'eraser',
+      icon: Eraser,
+      label: translate('auto.components.browser-pane.markup.tool.eraser', 'Eraser')
     }
   ]
 }
@@ -96,7 +102,7 @@ export const MarkupToolbar = React.memo(function MarkupToolbar({
 }: MarkupToolbarProps) {
   return (
     <TooltipProvider delayDuration={300}>
-      <div className="flex items-center gap-1 rounded-md border border-border bg-card/95 px-1.5 py-1 shadow-md backdrop-blur">
+      <div className="flex flex-wrap items-center justify-center gap-1 rounded-md border border-border bg-card/95 px-1.5 py-1 shadow-md backdrop-blur">
         {toolItems().map((item) => (
           <IconButton
             key={item.kind}
diff --git a/src/renderer/src/components/browser-pane/annotate/markup-canvas-render.ts b/src/renderer/src/components/browser-pane/annotate/markup-canvas-render.ts
index 77d5d4b1255..8fe787da8ac 100644
--- a/src/renderer/src/components/browser-pane/annotate/markup-canvas-render.ts
+++ b/src/renderer/src/components/browser-pane/annotate/markup-canvas-render.ts
@@ -29,8 +29,8 @@ function sceneDevicePixels(
 }
 
 // Rasterizes the committed shapes into an offscreen layer. Called only when the
-// committed shape list, the size, or the dpr changes — never on the pointermove
-// path.
+// visible shape list, the size, or the dpr changes — on the pointermove path only
+// when an erase drag hits a new mark.
 export function renderCommittedLayer(
   layer: HTMLCanvasElement,
   shapes: readonly MarkupShape[],
diff --git a/src/renderer/src/components/browser-pane/annotate/markup-drawing-model.ts b/src/renderer/src/components/browser-pane/annotate/markup-drawing-model.ts
index 790065bf60a..ce74331ae7b 100644
--- a/src/renderer/src/components/browser-pane/annotate/markup-drawing-model.ts
+++ b/src/renderer/src/components/browser-pane/annotate/markup-drawing-model.ts
@@ -5,9 +5,9 @@
 
 export type MarkupToolKind = 'pen' | 'highlight' | 'arrow' | 'rect' | 'ellipse' | 'text'
 
-// Toolbar selection. Draw-only: markup is a throwaway scribble the user copies
-// once, so there is no select/move/restyle cursor.
-export type MarkupTool = MarkupToolKind
+// Toolbar selection. Marks can be drawn or erased whole: markup is a throwaway
+// scribble the user copies once, so there is no select/move/restyle cursor.
+export type MarkupTool = MarkupToolKind | 'eraser'
 
 export type MarkupPoint = { x: number; y: number }
 
@@ -211,3 +211,13 @@ export function arrowHeadGeometry(
 export function highlightWidth(width: number): number {
   return width * HIGHLIGHT_WIDTH_MULTIPLIER
 }
+
+// Radius of the dot a single-point stroke (a tap) leaves.
+export function strokeDotRadius(width: number): number {
+  return Math.max(width / 2, 1)
+}
+
+// Line width of the contrasting halo stroked around text.
+export function textHaloWidth(fontSize: number): number {
+  return Math.max(fontSize / 6, 2)
+}
diff --git a/src/renderer/src/components/browser-pane/annotate/markup-gesture.test.ts b/src/renderer/src/components/browser-pane/annotate/markup-gesture.test.ts
new file mode 100644
index 00000000000..85e18e0449e
--- /dev/null
+++ b/src/renderer/src/components/browser-pane/annotate/markup-gesture.test.ts
@@ -0,0 +1,477 @@
+import { describe, expect, it } from 'vitest'
+import {
+  clearShapes,
+  commitShape,
+  createMarkupDocument,
+  redoShape,
+  undoShape,
+  type MarkupPoint,
+  type PenShape,
+  type TextShape
+} from './markup-drawing-model'
+import {
+  applyDocumentCommand,
+  beginDrawGesture,
+  beginEraseGesture,
+  cancelGesture,
+  canUndoMarkup,
+  endGesture,
+  moveGesture,
+  redoMarkup,
+  undoMarkup,
+  type DraggedShape,
+  type MarkupEditorState
+} from './markup-gesture'
+
+const noText = () => null
+
+// A short horizontal pen stroke at height `y`, 100px wide.
+function line(id: string, y: number): PenShape {
+  return {
+    id,
+    kind: 'pen',
+    color: '#ef4444',
+    width: 2,
+    points: [
+      { x: 0, y },
+      { x: 100, y }
+    ]
+  }
+}
+
+function editorWith(...shapes: PenShape[]): MarkupEditorState {
+  return { doc: shapes.reduce(commitShape, createMarkupDocument()), gesture: null }
+}
+
+function erase(state: MarkupEditorState, path: MarkupPoint[], pointerId = 1): MarkupEditorState {
+  const [first, ...rest] = path
+  const begun = beginEraseGesture(state, pointerId, first, noText)
+  return rest.reduce((current, point) => moveGesture(current, pointerId, point, noText), begun)
+}
+
+// A rectangle, ellipse or arrow as pressed: no drag yet, so from === to.
+function pressedShape(kind: 'rect' | 'ellipse' | 'arrow', at: MarkupPoint): DraggedShape {
+  return { id: kind, kind, color: '#ef4444', width: 4, from: at, to: at }
+}
+
+const ids = (state: MarkupEditorState) => state.doc.shapes.map((shape) => shape.id)
+const erasedIds = (state: MarkupEditorState) =>
+  state.gesture?.kind === 'erase' ? state.gesture.erasedIds : undefined
+
+describe('erase gesture', () => {
+  it('removes only the clicked mark, leaving the ones drawn after it', () => {
+    const state = endGesture(
+      erase(editorWith(line('a', 0), line('b', 100), line('c', 200)), [{ x: 50, y: 0 }]),
+      1
+    )
+
+    expect(ids(state)).toEqual(['b', 'c'])
+    expect(state.gesture).toBeNull()
+  })
+
+  it('erases only the newest of two overlapping marks on a click', () => {
+    const before = editorWith(line('older', 0), line('newer', 0))
+    const pressed = erase(before, [{ x: 50, y: 0 }])
+    // The pointer is still down at the press point: only what a release commits is hidden.
+    expect(erasedIds(pressed)).toEqual(new Set(['newer']))
+
+    const after = endGesture(pressed, 1)
+    expect(ids(after)).toEqual(['older'])
+    expect(undoShape(after.doc).shapes.map((shape) => shape.id)).toEqual(['older', 'newer'])
+  })
+
+  it('keeps a click a click when a tap jitters by a fraction of a pixel', () => {
+    const pressed = erase(editorWith(line('older', 0), line('newer', 0)), [{ x: 50, y: 0 }])
+    const jittered = moveGesture(pressed, 1, { x: 50.6, y: 0.4 }, noText)
+
+    expect(jittered).toBe(pressed)
+    expect(ids(endGesture(jittered, 1))).toEqual(['older'])
+  })
+
+  it('keeps a click a click when the pointer wanders inside the slop and back', () => {
+    const before = editorWith(line('older', 0), line('newer', 0), line('near', 12))
+    // `near` is out of reach of the press point but within reach 3.5px below it.
+    const wandered = erase(before, [
+      { x: 50, y: 0 },
+      { x: 50, y: 3.5 },
+      { x: 50, y: 0 }
+    ])
+
+    expect(erasedIds(wandered)).toEqual(new Set(['newer']))
+    expect(ids(endGesture(wandered, 1))).toEqual(['older', 'near'])
+  })
+
+  it('becomes a drag once the pointer leaves the slop', () => {
+    const dragged = erase(editorWith(line('older', 0), line('newer', 0)), [
+      { x: 50, y: 0 },
+      { x: 54, y: 0 }
+    ])
+
+    expect(erasedIds(dragged)).toEqual(new Set(['older', 'newer']))
+  })
+
+  it('erases every mark under the press point once the click becomes a drag', () => {
+    const before = editorWith(line('older', 0), line('newer', 0), line('away', 200))
+    // The drag leaves the marks behind straight away, so only the press point touched them.
+    const dragged = erase(before, [
+      { x: 50, y: 0 },
+      { x: 50, y: 60 }
+    ])
+    expect(erasedIds(dragged)).toEqual(new Set(['older', 'newer']))
+
+    const after = endGesture(dragged, 1)
+    expect(ids(after)).toEqual(['away'])
+    expect(undoShape(after.doc).shapes.map((shape) => shape.id)).toEqual(['older', 'newer', 'away'])
+  })
+
+  it('records a whole drag as one undo step that redo replays', () => {
+    const before = editorWith(line('a', 0), line('b', 100), line('c', 200))
+    const after = endGesture(
+      erase(before, [
+        { x: 50, y: -50 },
+        { x: 50, y: 150 }
+      ]),
+      1
+    )
+
+    expect(ids(after)).toEqual(['c'])
+    const undone = undoShape(after.doc)
+    expect(undone.shapes.map((shape) => shape.id)).toEqual(['a', 'b', 'c'])
+    expect(redoShape(undone).shapes.map((shape) => shape.id)).toEqual(['c'])
+  })
+
+  it('leaves the document and its history untouched when nothing was hit', () => {
+    const before = editorWith(line('a', 0))
+    const after = endGesture(erase(before, [{ x: 50, y: 300 }]), 1)
+
+    expect(after.doc).toBe(before.doc)
+  })
+
+  it('does not erase a mark the pointer curved around between events', () => {
+    // Down left of the stroke, around its end, to its far side: the chord from the
+    // first to the last point crosses it, but no swept segment does.
+    const after = endGesture(
+      erase(editorWith(line('a', 0)), [
+        { x: 50, y: -40 },
+        { x: 160, y: -40 },
+        { x: 160, y: 40 },
+        { x: 50, y: 40 }
+      ]),
+      1
+    )
+
+    expect(ids(after)).toEqual(['a'])
+  })
+
+  it('keeps the same erased set while a drag hits nothing new', () => {
+    const begun = beginEraseGesture(editorWith(line('a', 0)), 1, { x: 50, y: 0 }, noText)
+    const moved = moveGesture(begun, 1, { x: 50, y: 300 }, noText)
+
+    expect(erasedIds(begun)).toEqual(new Set(['a']))
+    expect(erasedIds(moved)).toBe(erasedIds(begun))
+  })
+
+  it('erases a text label the drag passes through', () => {
+    const label: TextShape = {
+      id: 'label',
+      kind: 'text',
+      color: '#111827',
+      at: { x: 200, y: 200 },
+      text: 'note',
+      fontSize: 18
+    }
+    const inkBox = () => ({ x: 200, y: 200, width: 60, height: 20 })
+    const before: MarkupEditorState = {
+      doc: commitShape(createMarkupDocument(), label),
+      gesture: null
+    }
+    const begun = beginEraseGesture(before, 1, { x: 100, y: 210 }, inkBox)
+    const after = endGesture(moveGesture(begun, 1, { x: 230, y: 210 }, inkBox), 1)
+
+    expect(erasedIds(begun)).toEqual(new Set())
+    expect(ids(after)).toEqual([])
+  })
+
+  it('ignores a second pointer while a gesture is in flight', () => {
+    const first = erase(editorWith(line('a', 0), line('b', 100)), [{ x: 50, y: 0 }], 1)
+
+    const secondDown = beginEraseGesture(first, 2, { x: 50, y: 100 }, noText)
+    expect(secondDown).toBe(first)
+    expect(moveGesture(first, 2, { x: 50, y: 100 }, noText)).toBe(first)
+    expect(endGesture(first, 2)).toBe(first)
+
+    expect(ids(endGesture(first, 1))).toEqual(['b'])
+  })
+
+  it('settles an erase whose release was lost when the same pointer presses again', () => {
+    const swept = erase(editorWith(line('a', 0), line('b', 100), line('c', 200)), [{ x: 50, y: 0 }])
+
+    // No release for pointer 1; it presses again below every mark and drags a little.
+    const after = endGesture(
+      erase(swept, [
+        { x: 50, y: 300 },
+        { x: 60, y: 300 }
+      ]),
+      1
+    )
+
+    // The new press must not sweep from the stale point, which would cross b and c.
+    expect(ids(after)).toEqual(['b', 'c'])
+    expect(undoShape(after.doc).shapes.map((shape) => shape.id)).toEqual(['a', 'b', 'c'])
+  })
+
+  it('commits against the document as it is on release', () => {
+    const swept = erase(editorWith(line('a', 0)), [{ x: 50, y: 0 }])
+    // The document moved under the gesture and no longer holds the mark.
+    const without = { ...swept, doc: undoShape(swept.doc) }
+    const after = endGesture(without, 1)
+
+    expect(after.doc).toBe(without.doc)
+    expect(after.gesture).toBeNull()
+  })
+})
+
+describe('draw gesture', () => {
+  it('keeps every point of a freehand stroke', () => {
+    const begun = beginDrawGesture(editorWith(), 1, {
+      id: 'pen',
+      kind: 'highlight',
+      color: '#eab308',
+      width: 4,
+      points: [{ x: 0, y: 0 }]
+    })
+    const moved = [
+      { x: 10, y: 5 },
+      { x: 20, y: 0 }
+    ].reduce((state, point) => moveGesture(state, 1, point, noText), begun)
+
+    expect(endGesture(moved, 1).doc.shapes).toMatchObject([
+      {
+        points: [
+          { x: 0, y: 0 },
+          { x: 10, y: 5 },
+          { x: 20, y: 0 }
+        ]
+      }
+    ])
+  })
+
+  it('commits a stroke whose release was lost and starts afresh on the next press', () => {
+    const stale = moveGesture(
+      beginDrawGesture(editorWith(), 1, line('old', 0)),
+      1,
+      { x: 120, y: 0 },
+      noText
+    )
+
+    const next = beginDrawGesture(stale, 1, {
+      id: 'new',
+      kind: 'pen',
+      color: '#ef4444',
+      width: 2,
+      points: [{ x: 0, y: 300 }]
+    })
+    const ended = endGesture(moveGesture(next, 1, { x: 50, y: 300 }, noText), 1)
+
+    expect(ended.doc.shapes.map((shape) => shape.id)).toEqual(['old', 'new'])
+    expect(ended.doc.shapes[1]).toMatchObject({
+      points: [
+        { x: 0, y: 300 },
+        { x: 50, y: 300 }
+      ]
+    })
+  })
+
+  it('extends the shape on move and commits it once on release', () => {
+    const begun = beginDrawGesture(editorWith(), 1, {
+      id: 'new',
+      kind: 'rect',
+      color: '#ef4444',
+      width: 4,
+      from: { x: 10, y: 10 },
+      to: { x: 10, y: 10 }
+    })
+    // A second pointer landing mid-stroke must not replace it.
+    expect(beginDrawGesture(begun, 2, line('other', 0))).toBe(begun)
+    const moved = moveGesture(begun, 1, { x: 60, y: 40 }, noText)
+    const ended = endGesture(moved, 1)
+
+    expect(ended.doc.shapes).toEqual([
+      {
+        id: 'new',
+        kind: 'rect',
+        color: '#ef4444',
+        width: 4,
+        from: { x: 10, y: 10 },
+        to: { x: 60, y: 40 }
+      }
+    ])
+    // A stray second release has no gesture left to commit.
+    expect(endGesture(ended, 1)).toBe(ended)
+  })
+
+  it.each(['rect', 'ellipse', 'arrow'] as const)(
+    'saves no %s released without being dragged, so it adds no undo step',
+    (kind) => {
+      const before = editorWith(line('a', 0))
+      const pressed = beginDrawGesture(before, 1, pressedShape(kind, { x: 50, y: 0 }))
+      // Undo with only the unmoved press held goes straight to the last mark.
+      expect(ids(undoMarkup(pressed))).toEqual([])
+
+      expect(endGesture(pressed, 1).doc).toBe(before.doc)
+    }
+  )
+
+  it('lets an eraser click take a mark where a shape was pressed without dragging', () => {
+    const at = { x: 50, y: 0 }
+    const clicked = endGesture(
+      beginDrawGesture(editorWith(line('a', 0)), 1, pressedShape('rect', at)),
+      1
+    )
+
+    expect(ids(endGesture(erase(clicked, [at]), 1))).toEqual([])
+  })
+
+  it('still saves a pen tap, which leaves a visible dot', () => {
+    const tapped = endGesture(
+      beginDrawGesture(editorWith(), 1, { ...line('dot', 0), points: [{ x: 50, y: 0 }] }),
+      1
+    )
+
+    expect(ids(tapped)).toEqual(['dot'])
+  })
+})
+
+describe('cancelled pointer', () => {
+  it('discards a stroke in progress without adding history', () => {
+    const before = editorWith(line('a', 0))
+    const held = moveGesture(
+      beginDrawGesture(before, 1, line('held', 300)),
+      1,
+      { x: 50, y: 300 },
+      noText
+    )
+
+    const cancelled = cancelGesture(held, 1)
+    expect(cancelled.doc).toBe(before.doc)
+    expect(cancelled.gesture).toBeNull()
+  })
+
+  it('discards an erase, so the marks it hid stay, and a later lost capture does nothing', () => {
+    const before = editorWith(line('a', 0), line('b', 100))
+    const held = erase(before, [
+      { x: 50, y: -50 },
+      { x: 50, y: 150 }
+    ])
+    expect(erasedIds(held)).toEqual(new Set(['a', 'b']))
+
+    const cancelled = cancelGesture(held, 1)
+    expect(cancelled.doc).toBe(before.doc)
+    // lostpointercapture follows pointercancel and ends the same pointer's gesture.
+    expect(endGesture(cancelled, 1)).toBe(cancelled)
+  })
+
+  it('ignores a cancel from a pointer that does not own the gesture', () => {
+    const held = erase(editorWith(line('a', 0)), [{ x: 50, y: 0 }], 1)
+
+    expect(cancelGesture(held, 2)).toBe(held)
+  })
+})
+
+describe('history commands mid-gesture', () => {
+  // A stroke from (0, 300) to (50, 300), still held down.
+  function drawing(state: MarkupEditorState): MarkupEditorState {
+    return moveGesture(beginDrawGesture(state, 1, line('held', 300)), 1, { x: 50, y: 300 }, noText)
+  }
+
+  // The rest of the held drag, which must neither draw nor erase.
+  function finishDrag(state: MarkupEditorState): MarkupEditorState {
+    return endGesture(moveGesture(state, 1, { x: 50, y: 100 }, noText), 1)
+  }
+
+  it('undo mid-stroke drops only the stroke, and the next undo takes the last mark', () => {
+    const before = editorWith(line('a', 0), line('b', 100))
+    const held = drawing(before)
+    expect(canUndoMarkup(held)).toBe(true)
+
+    const undone = undoMarkup(held)
+    expect(undone.doc).toBe(before.doc)
+    expect(undone.gesture).toBeNull()
+
+    const released = finishDrag(undone)
+    expect(released.doc).toBe(before.doc)
+    expect(released.gesture).toBeNull()
+    expect(ids(undoMarkup(released))).toEqual(['a'])
+  })
+
+  it('undo mid-erase restores the hidden marks and leaves the document alone', () => {
+    const before = editorWith(line('a', 0), line('b', 100))
+    const held = erase(before, [{ x: 50, y: 0 }])
+    expect(erasedIds(held)).toEqual(new Set(['a']))
+
+    const released = finishDrag(undoMarkup(held))
+    expect(released.doc).toBe(before.doc)
+    expect(ids(undoMarkup(released))).toEqual(['a'])
+  })
+
+  it('undo during an erase that hides nothing undoes the last mark and ends the erase', () => {
+    const before = editorWith(line('a', 0), line('b', 100))
+    const held = erase(before, [{ x: 50, y: 300 }])
+    expect(erasedIds(held)).toEqual(new Set())
+    expect(canUndoMarkup(held)).toBe(true)
+
+    const undone = undoMarkup(held)
+    expect(ids(undone)).toEqual(['a'])
+    expect(undone.gesture).toBeNull()
+    // The rest of the drag crosses the restored `b`, but must not erase it.
+    expect(ids(finishDrag(undone))).toEqual(['a'])
+  })
+
+  it('undo during an erase that hides nothing, with no history, keeps the erase', () => {
+    const held = erase(editorWith(), [{ x: 50, y: 300 }])
+    expect(canUndoMarkup(held)).toBe(false)
+
+    expect(undoMarkup(held)).toBe(held)
+  })
+
+  it('an unmoved shape press on an empty canvas leaves undo disabled and is kept', () => {
+    const held = beginDrawGesture(editorWith(), 1, pressedShape('ellipse', { x: 50, y: 0 }))
+    expect(canUndoMarkup(held)).toBe(false)
+    expect(undoMarkup(held)).toBe(held)
+
+    // Dragging it out still draws the ellipse.
+    const ended = endGesture(moveGesture(held, 1, { x: 90, y: 40 }, noText), 1)
+    expect(ids(ended)).toEqual(['ellipse'])
+  })
+
+  it('a second undo while the pointer is still down undoes the last committed mark', () => {
+    const held = undoMarkup(drawing(editorWith(line('a', 0), line('b', 100))))
+
+    const again = undoMarkup(held)
+    expect(ids(again)).toEqual(['a'])
+    expect(ids(finishDrag(again))).toEqual(['a'])
+  })
+
+  it('redo mid-gesture cancels the gesture, then redoes', () => {
+    const undone = undoMarkup(editorWith(line('a', 0), line('b', 100)))
+
+    const redone = redoMarkup(drawing(undone))
+    expect(ids(redone)).toEqual(['a', 'b'])
+    expect(ids(finishDrag(redone))).toEqual(['a', 'b'])
+  })
+
+  it('redo with nothing to redo keeps the held gesture', () => {
+    const held = erase(editorWith(line('a', 0), line('b', 100)), [{ x: 50, y: 0 }])
+
+    expect(redoMarkup(held)).toBe(held)
+    expect(ids(endGesture(held, 1))).toEqual(['b'])
+  })
+
+  it('clear mid-erase cancels the erase, then clears as one undo step', () => {
+    const held = erase(editorWith(line('a', 0), line('b', 100)), [{ x: 50, y: 0 }])
+
+    const released = finishDrag(applyDocumentCommand(held, clearShapes))
+    expect(ids(released)).toEqual([])
+    expect(ids(undoMarkup(released))).toEqual(['a', 'b'])
+  })
+})
diff --git a/src/renderer/src/components/browser-pane/annotate/markup-gesture.ts b/src/renderer/src/components/browser-pane/annotate/markup-gesture.ts
new file mode 100644
index 00000000000..2a134490d70
--- /dev/null
+++ b/src/renderer/src/components/browser-pane/annotate/markup-gesture.ts
@@ -0,0 +1,213 @@
+// The markup editor's document plus its in-flight pointer gesture, advanced by
+// pure transitions. Keeping both in one value lets a release commit from the
+// latest state, and keeps the transitions safe to run twice under StrictMode.
+
+import {
+  canRedo,
+  canUndo,
+  commitShape,
+  redoShape,
+  setShapes,
+  undoShape,
+  type MarkupDocument,
+  type MarkupPoint,
+  type MarkupShape,
+  type TextShape
+} from './markup-drawing-model'
+import {
+  shapesTouchedBySweep,
+  topmostShapeAt,
+  type TextInkBoxMeasurer
+} from './markup-shape-hit-test'
+
+export type DraggedShape = Exclude<MarkupShape, TextShape>
+
+// Why pointerId: a second pointer (another finger) must not restart or steer a
+// gesture the first one owns.
+export type MarkupGesture =
+  | { kind: 'draw'; pointerId: number; shape: DraggedShape }
+  | {
+      kind: 'erase'
+      pointerId: number
+      origin: MarkupPoint
+      // A 'pressed' erase is still a click; it becomes 'dragging' past ERASER_CLICK_SLOP.
+      phase: 'pressed' | 'dragging'
+      last: MarkupPoint
+      erasedIds: ReadonlySet<string>
+    }
+
+export type MarkupEditorState = { doc: MarkupDocument; gesture: MarkupGesture | null }
+
+// How far (CSS px) an erase press may travel and stay a click: touch and pen taps jitter.
+const ERASER_CLICK_SLOP = 4
+
+export function beginDrawGesture(
+  state: MarkupEditorState,
+  pointerId: number,
+  shape: DraggedShape
+): MarkupEditorState {
+  const settled = settleMissedRelease(state, pointerId)
+  return settled.gesture ? settled : { ...settled, gesture: { kind: 'draw', pointerId, shape } }
+}
+
+export function beginEraseGesture(
+  state: MarkupEditorState,
+  pointerId: number,
+  point: MarkupPoint,
+  measureTextInkBox: TextInkBoxMeasurer
+): MarkupEditorState {
+  const settled = settleMissedRelease(state, pointerId)
+  if (settled.gesture) {
+    return settled
+  }
+  // Why: a click takes only the mark on top. Leaving the slop makes it a drag,
+  // and that sweep starts at the press point, so it takes the rest under it too.
+  const topmost = topmostShapeAt(settled.doc.shapes, point, measureTextInkBox)
+  return {
+    ...settled,
+    gesture: {
+      kind: 'erase',
+      pointerId,
+      origin: point,
+      phase: 'pressed',
+      last: point,
+      erasedIds: new Set(topmost ? [topmost.id] : [])
+    }
+  }
+}
+
+// Why: a pointer cannot press twice without releasing, so a press from the
+// gesture's own pointer means its release was lost; settle it as that release
+// would have, instead of letting it block the new press and steer from a stale point.
+function settleMissedRelease(state: MarkupEditorState, pointerId: number): MarkupEditorState {
+  return state.gesture?.pointerId === pointerId ? endGesture(state, pointerId) : state
+}
+
+export function moveGesture(
+  state: MarkupEditorState,
+  pointerId: number,
+  point: MarkupPoint,
+  measureTextInkBox: TextInkBoxMeasurer
+): MarkupEditorState {
+  const { gesture } = state
+  if (gesture?.pointerId !== pointerId) {
+    return state
+  }
+  if (gesture.kind === 'erase') {
+    if (gesture.phase === 'pressed') {
+      const { origin } = gesture
+      if (Math.hypot(point.x - origin.x, point.y - origin.y) < ERASER_CLICK_SLOP) {
+        return state
+      }
+      // `last` is still the origin here, so the first sweep starts at the press point.
+      const dragging: EraseGesture = { ...gesture, phase: 'dragging' }
+      return {
+        ...state,
+        gesture: sweepEraser(dragging, state.doc.shapes, point, measureTextInkBox)
+      }
+    }
+    return { ...state, gesture: sweepEraser(gesture, state.doc.shapes, point, measureTextInkBox) }
+  }
+  return { ...state, gesture: { ...gesture, shape: dragShapeTo(gesture.shape, point) } }
+}
+
+// Commits the gesture as one undoable step. A gesture with no visible result
+// leaves history untouched so Undo never has a step with no visible effect.
+export function endGesture(state: MarkupEditorState, pointerId: number): MarkupEditorState {
+  const { doc, gesture } = state
+  if (gesture?.pointerId !== pointerId) {
+    return state
+  }
+  if (gesture.kind === 'draw') {
+    return { doc: hasNoSize(gesture.shape) ? doc : commitShape(doc, gesture.shape), gesture: null }
+  }
+  const remaining = doc.shapes.filter((shape) => !gesture.erasedIds.has(shape.id))
+  return {
+    doc: remaining.length === doc.shapes.length ? doc : setShapes(doc, remaining),
+    gesture: null
+  }
+}
+
+// Why: a cancelled pointer (an OS gesture or palm rejection took it) was not a
+// deliberate release, so its gesture is discarded rather than committed.
+export function cancelGesture(state: MarkupEditorState, pointerId: number): MarkupEditorState {
+  return state.gesture?.pointerId === pointerId ? { ...state, gesture: null } : state
+}
+
+// Why: Undo mid-gesture takes back only that gesture, as the newest step, so the
+// next Undo takes back the last committed mark rather than both at once. A gesture
+// that shows nothing yet (an erase hiding nothing, an unmoved shape press) is no
+// step, so Undo goes to the document. Either way the gesture is dropped, so the
+// rest of that drag does nothing until the next press.
+export function undoMarkup(state: MarkupEditorState): MarkupEditorState {
+  if (gestureHasEffect(state.gesture)) {
+    return { ...state, gesture: null }
+  }
+  return canUndo(state.doc) ? { doc: undoShape(state.doc), gesture: null } : state
+}
+
+export function canUndoMarkup(state: MarkupEditorState): boolean {
+  return gestureHasEffect(state.gesture) || canUndo(state.doc)
+}
+
+// Whether releasing the gesture would change the document.
+function gestureHasEffect(gesture: MarkupGesture | null): boolean {
+  if (gesture === null) {
+    return false
+  }
+  return gesture.kind === 'draw' ? !hasNoSize(gesture.shape) : gesture.erasedIds.size > 0
+}
+
+// Why: a rectangle, ellipse or arrow pressed without dragging paints nothing; saved,
+// it would be an invisible topmost mark that soaks up the next eraser click there.
+function hasNoSize(shape: DraggedShape): boolean {
+  return (
+    shape.kind !== 'pen' &&
+    shape.kind !== 'highlight' &&
+    shape.from.x === shape.to.x &&
+    shape.from.y === shape.to.y
+  )
+}
+
+// Why: with nothing to redo the document stays put, so a held gesture is kept.
+export function redoMarkup(state: MarkupEditorState): MarkupEditorState {
+  return canRedo(state.doc) ? applyDocumentCommand(state, redoShape) : state
+}
+
+// Redo and Clear replace the document, so the gesture made against it is dropped.
+export function applyDocumentCommand(
+  state: MarkupEditorState,
+  command: (doc: MarkupDocument) => MarkupDocument
+): MarkupEditorState {
+  return { doc: command(state.doc), gesture: null }
+}
+
+type EraseGesture = Extract<MarkupGesture, { kind: 'erase' }>
+
+function sweepEraser(
+  gesture: EraseGesture,
+  shapes: readonly MarkupShape[],
+  point: MarkupPoint,
+  measureTextInkBox: TextInkBoxMeasurer
+): EraseGesture {
+  const touched = shapesTouchedBySweep(
+    shapes.filter((shape) => !gesture.erasedIds.has(shape.id)),
+    gesture.last,
+    point,
+    measureTextInkBox
+  )
+  // Why: keep the same Set when nothing new was hit so the cached canvas layer
+  // is not re-rasterized on every pointermove.
+  const erasedIds =
+    touched.length === 0
+      ? gesture.erasedIds
+      : new Set([...gesture.erasedIds, ...touched.map((shape) => shape.id)])
+  return { ...gesture, last: point, erasedIds }
+}
+
+function dragShapeTo(shape: DraggedShape, point: MarkupPoint): DraggedShape {
+  if (shape.kind === 'pen' || shape.kind === 'highlight') {
+    return { ...shape, points: [...shape.points, point] }
+  }
+  return { ...shape, to: point }
+}
diff --git a/src/renderer/src/components/browser-pane/annotate/markup-shape-hit-test.test.ts b/src/renderer/src/components/browser-pane/annotate/markup-shape-hit-test.test.ts
new file mode 100644
index 00000000000..67cbc10e497
--- /dev/null
+++ b/src/renderer/src/components/browser-pane/annotate/markup-shape-hit-test.test.ts
@@ -0,0 +1,204 @@
+import { describe, expect, it } from 'vitest'
+import { arrowHeadGeometry, type MarkupPoint, type MarkupShape } from './markup-drawing-model'
+import { shapesTouchedBySweep, topmostShapeAt } from './markup-shape-hit-test'
+
+// Pinned here on purpose: how close the pointer must come is part of the behaviour.
+const ERASER_RADIUS = 8
+
+const base = { id: 's', color: '#ef4444' }
+const noText = () => null
+
+function touches(shape: MarkupShape, from: MarkupPoint, to: MarkupPoint = from): boolean {
+  return shapesTouchedBySweep([shape], from, to, noText).length === 1
+}
+
+describe('shapesTouchedBySweep', () => {
+  it('hits a pen stroke within its half-width plus the eraser radius, and not beyond', () => {
+    const pen: MarkupShape = {
+      ...base,
+      kind: 'pen',
+      width: 4,
+      points: [
+        { x: 0, y: 0 },
+        { x: 100, y: 0 }
+      ]
+    }
+    const reach = 2 + ERASER_RADIUS
+    expect(touches(pen, { x: 50, y: reach })).toBe(true)
+    expect(touches(pen, { x: 50, y: reach + 1 })).toBe(false)
+    // Past the end of the stroke the round cap still counts.
+    expect(touches(pen, { x: 100 + reach, y: 0 })).toBe(true)
+    expect(touches(pen, { x: 100 + reach + 1, y: 0 })).toBe(false)
+    // A sweep that passes the end without crossing the stroke or ending near it.
+    expect(touches(pen, { x: 105, y: -50 }, { x: 105, y: 50 })).toBe(true)
+    expect(touches(pen, { x: -5, y: -50 }, { x: -5, y: 50 })).toBe(true)
+    // A drag that stops beside the stroke without crossing it.
+    expect(touches(pen, { x: 50, y: -50 }, { x: 50, y: -reach })).toBe(true)
+    expect(touches(pen, { x: 50, y: -50 }, { x: 50, y: -reach - 1 })).toBe(false)
+  })
+
+  it('hits a thin stroke that a fast drag crosses between two pointer events', () => {
+    const pen: MarkupShape = {
+      ...base,
+      kind: 'pen',
+      width: 2,
+      points: [
+        { x: 50, y: -100 },
+        { x: 50, y: 100 }
+      ]
+    }
+    expect(touches(pen, { x: 0, y: 0 }, { x: 100, y: 0 })).toBe(true)
+    expect(touches(pen, { x: 0, y: 0 })).toBe(false)
+    expect(touches(pen, { x: 100, y: 0 })).toBe(false)
+  })
+
+  it('hits the dot a single tap leaves', () => {
+    const dot: MarkupShape = { ...base, kind: 'pen', width: 8, points: [{ x: 10, y: 10 }] }
+    expect(touches(dot, { x: 10 + 4 + ERASER_RADIUS, y: 10 })).toBe(true)
+    expect(touches(dot, { x: 10 + 4 + ERASER_RADIUS + 1, y: 10 })).toBe(false)
+  })
+
+  it('treats a highlight as the fat stroke it is drawn as', () => {
+    const points = [
+      { x: 0, y: 0 },
+      { x: 100, y: 0 }
+    ]
+    const highlight: MarkupShape = { ...base, kind: 'highlight', width: 4, points }
+    // A width-4 highlight is drawn 16px wide, so its ink reaches 8px from the centre line.
+    const edge = { x: 50, y: 8 + ERASER_RADIUS }
+    expect(touches(highlight, edge)).toBe(true)
+    expect(touches(highlight, { x: 50, y: 8 + ERASER_RADIUS + 1 })).toBe(false)
+    expect(touches({ ...base, kind: 'pen', width: 4, points }, edge)).toBe(false)
+  })
+
+  it('hits an arrow on its head wings as well as its shaft', () => {
+    const from = { x: 0, y: 0 }
+    const to = { x: 200, y: 0 }
+    const arrow: MarkupShape = { ...base, kind: 'arrow', width: 8, from, to }
+    const head = arrowHeadGeometry(from, to, 8)
+    expect(head).not.toBeNull()
+    // The wing tips sit well off the shaft, so only the head geometry can match them.
+    for (const wing of head ? [head.left, head.right] : []) {
+      expect(Math.abs(wing.y)).toBeGreaterThan(4 + ERASER_RADIUS)
+      expect(touches(arrow, wing)).toBe(true)
+    }
+    expect(touches(arrow, { x: 100, y: 4 + ERASER_RADIUS })).toBe(true)
+    expect(touches(arrow, { x: 100, y: 4 + ERASER_RADIUS + 1 })).toBe(false)
+  })
+
+  it('hits a rectangle on its border but not in its hollow interior', () => {
+    const rect: MarkupShape = {
+      ...base,
+      kind: 'rect',
+      width: 4,
+      from: { x: 300, y: 200 },
+      to: { x: 100, y: 100 }
+    }
+    expect(touches(rect, { x: 100 - 2 - ERASER_RADIUS, y: 150 })).toBe(true)
+    expect(touches(rect, { x: 100 - 2 - ERASER_RADIUS - 1, y: 150 })).toBe(false)
+    for (const onEdge of [
+      { x: 200, y: 100 },
+      { x: 300, y: 150 },
+      { x: 200, y: 200 }
+    ]) {
+      expect(touches(rect, onEdge)).toBe(true)
+    }
+    expect(touches(rect, { x: 200, y: 150 })).toBe(false)
+    expect(touches(rect, { x: 150, y: 150 }, { x: 250, y: 150 })).toBe(false)
+  })
+
+  it('hits a large ellipse anywhere on its outline but not inside it', () => {
+    const ellipse: MarkupShape = {
+      ...base,
+      kind: 'ellipse',
+      width: 2,
+      from: { x: 200, y: 100 },
+      to: { x: 1400, y: 700 }
+    }
+    const outline = (degrees: number, grow = 0): MarkupPoint => {
+      const angle = (degrees * Math.PI) / 180
+      return { x: 800 + (600 + grow) * Math.cos(angle), y: 400 + (300 + grow) * Math.sin(angle) }
+    }
+    // Odd angles on purpose: a coarse polygon approximation drifts furthest from
+    // the true outline between its vertices.
+    for (const degrees of [0, 11.25, 33.75, 101.25, 137, 222, 303.75]) {
+      expect(touches(ellipse, outline(degrees))).toBe(true)
+    }
+    expect(touches(ellipse, outline(0, 1 + ERASER_RADIUS))).toBe(true)
+    expect(touches(ellipse, outline(0, 1 + ERASER_RADIUS + 1))).toBe(false)
+    expect(touches(ellipse, { x: 800, y: 400 })).toBe(false)
+    expect(touches(ellipse, outline(0, -30))).toBe(false)
+  })
+
+  it('follows the curve of a small ellipse', () => {
+    const circle: MarkupShape = {
+      ...base,
+      kind: 'ellipse',
+      width: 2,
+      from: { x: 0, y: 0 },
+      to: { x: 20, y: 20 }
+    }
+    const reach = 1 + ERASER_RADIUS
+    // 30 degrees is mid-side for the hexagon the chord limit alone would give this circle.
+    const at = (radius: number): MarkupPoint => ({
+      x: 10 + radius * Math.cos(Math.PI / 6),
+      y: 10 + radius * Math.sin(Math.PI / 6)
+    })
+    expect(touches(circle, at(10 + reach - 0.5))).toBe(true)
+    expect(touches(circle, at(10 + reach + 0.5))).toBe(false)
+  })
+
+  it('hits text anywhere in its measured ink box, including a sweep that ends inside it', () => {
+    const text: MarkupShape = {
+      ...base,
+      kind: 'text',
+      at: { x: 100, y: 100 },
+      text: 'note',
+      fontSize: 18
+    }
+    const box = () => ({ x: 98, y: 97, width: 60, height: 26 })
+    const hit = (from: MarkupPoint, to: MarkupPoint = from) =>
+      shapesTouchedBySweep([text], from, to, box).length === 1
+    expect(hit({ x: 128, y: 110 })).toBe(true)
+    expect(hit({ x: 0, y: 110 }, { x: 128, y: 110 })).toBe(true)
+    expect(hit({ x: 98 + 60 + ERASER_RADIUS, y: 110 })).toBe(true)
+    expect(hit({ x: 98 + 60 + ERASER_RADIUS + 1, y: 110 })).toBe(false)
+    expect(hit({ x: 98 - ERASER_RADIUS - 1, y: 110 })).toBe(false)
+    expect(hit({ x: 128, y: 97 - ERASER_RADIUS - 1 })).toBe(false)
+    expect(hit({ x: 128, y: 97 + 26 + ERASER_RADIUS + 1 })).toBe(false)
+    // Without a canvas to measure on there is no drawn ink to hit.
+    expect(touches(text, { x: 128, y: 110 })).toBe(false)
+  })
+
+  it('returns every touched shape, not only the topmost', () => {
+    const points = [
+      { x: 0, y: 0 },
+      { x: 100, y: 0 }
+    ]
+    const shapes: MarkupShape[] = [
+      { id: 'under', color: '#eab308', kind: 'highlight', width: 4, points },
+      { id: 'over', color: '#ef4444', kind: 'pen', width: 2, points },
+      { id: 'away', color: '#ef4444', kind: 'pen', width: 2, points: [{ x: 0, y: 300 }] }
+    ]
+    const ids = shapesTouchedBySweep(shapes, { x: 50, y: 0 }, { x: 50, y: 0 }, noText).map(
+      (shape) => shape.id
+    )
+    expect(ids).toEqual(['under', 'over'])
+  })
+})
+
+describe('topmostShapeAt', () => {
+  it('returns the mark drawn last among those under the point', () => {
+    const points = [
+      { x: 0, y: 0 },
+      { x: 100, y: 0 }
+    ]
+    const shapes: MarkupShape[] = [
+      { id: 'under', color: '#eab308', kind: 'highlight', width: 4, points },
+      { id: 'over', color: '#ef4444', kind: 'pen', width: 2, points },
+      { id: 'away', color: '#ef4444', kind: 'pen', width: 2, points: [{ x: 0, y: 300 }] }
+    ]
+    expect(topmostShapeAt(shapes, { x: 50, y: 0 }, noText)?.id).toBe('over')
+    expect(topmostShapeAt(shapes, { x: 50, y: 150 }, noText)).toBeUndefined()
+  })
+})
diff --git a/src/renderer/src/components/browser-pane/annotate/markup-shape-hit-test.ts b/src/renderer/src/components/browser-pane/annotate/markup-shape-hit-test.ts
new file mode 100644
index 00000000000..ca3dbf8f58f
--- /dev/null
+++ b/src/renderer/src/components/browser-pane/annotate/markup-shape-hit-test.ts
@@ -0,0 +1,187 @@
+// Hit testing for the markup eraser. Pure geometry over the same model helpers
+// the renderer strokes with, so "the ink you touch" matches what is drawn.
+
+import {
+  arrowHeadGeometry,
+  highlightWidth,
+  normalizeRect,
+  strokeDotRadius,
+  type MarkupPoint,
+  type MarkupShape,
+  type NormalizedRect,
+  type TextShape
+} from './markup-drawing-model'
+
+// How close (CSS px) the pointer must come to a mark's ink to erase it.
+const ERASER_RADIUS = 8
+
+// Longest chord used to approximate an ellipse; keeps the error far below ERASER_RADIUS.
+const ELLIPSE_MAX_CHORD = 12
+const ELLIPSE_MIN_SEGMENTS = 16
+
+/** Ink box of a drawn text shape, or null when there is no canvas to measure with. */
+export type TextInkBoxMeasurer = (shape: TextShape) => NormalizedRect | null
+
+type StrokedShape = Exclude<MarkupShape, TextShape>
+type StrokedInk = { paths: MarkupPoint[][]; halfWidth: number }
+
+// Why a swept segment rather than a point: pointermove events are sparse, so a
+// fast drag would otherwise jump over a thin stroke.
+export function shapesTouchedBySweep(
+  shapes: readonly MarkupShape[],
+  from: MarkupPoint,
+  to: MarkupPoint,
+  measureTextInkBox: TextInkBoxMeasurer
+): MarkupShape[] {
+  return shapes.filter((shape) => sweepTouchesShape(shape, from, to, measureTextInkBox))
+}
+
+// The mark drawn last among those under `point`, i.e. the one painted on top.
+export function topmostShapeAt(
+  shapes: readonly MarkupShape[],
+  point: MarkupPoint,
+  measureTextInkBox: TextInkBoxMeasurer
+): MarkupShape | undefined {
+  for (let i = shapes.length - 1; i >= 0; i -= 1) {
+    if (sweepTouchesShape(shapes[i], point, point, measureTextInkBox)) {
+      return shapes[i]
+    }
+  }
+  return undefined
+}
+
+function sweepTouchesShape(
+  shape: MarkupShape,
+  from: MarkupPoint,
+  to: MarkupPoint,
+  measureTextInkBox: TextInkBoxMeasurer
+): boolean {
+  return shape.kind === 'text'
+    ? sweepTouchesBox(from, to, measureTextInkBox(shape))
+    : sweepTouchesStroke(from, to, strokedInk(shape))
+}
+
+function sweepTouchesStroke(from: MarkupPoint, to: MarkupPoint, ink: StrokedInk): boolean {
+  const reach = ink.halfWidth + ERASER_RADIUS
+  return ink.paths.some((path) => sweepDistanceToPath(from, to, path) <= reach)
+}
+
+function sweepTouchesBox(from: MarkupPoint, to: MarkupPoint, box: NormalizedRect | null): boolean {
+  if (!box) {
+    return false
+  }
+  // A sweep that never crosses the outline is entirely inside or entirely outside.
+  const inside =
+    from.x >= box.x &&
+    from.x <= box.x + box.width &&
+    from.y >= box.y &&
+    from.y <= box.y + box.height
+  return inside || sweepDistanceToPath(from, to, rectOutline(box)) <= ERASER_RADIUS
+}
+
+// The polylines a shape is stroked along. Rect and ellipse are hollow, so only
+// their outline is ink.
+function strokedInk(shape: StrokedShape): StrokedInk {
+  switch (shape.kind) {
+    case 'pen':
+      return { paths: [shape.points], halfWidth: strokeDotRadius(shape.width) }
+    case 'highlight':
+      return { paths: [shape.points], halfWidth: strokeDotRadius(highlightWidth(shape.width)) }
+    case 'arrow': {
+      const head = arrowHeadGeometry(shape.from, shape.to, shape.width)
+      const shaft = [shape.from, shape.to]
+      return {
+        paths: head ? [shaft, [head.left, head.tip, head.right]] : [shaft],
+        halfWidth: shape.width / 2
+      }
+    }
+    case 'rect':
+      return {
+        paths: [rectOutline(normalizeRect(shape.from, shape.to))],
+        halfWidth: shape.width / 2
+      }
+    case 'ellipse':
+      return {
+        paths: [ellipseOutline(normalizeRect(shape.from, shape.to))],
+        halfWidth: shape.width / 2
+      }
+  }
+}
+
+function rectOutline(rect: NormalizedRect): MarkupPoint[] {
+  const right = rect.x + rect.width
+  const bottom = rect.y + rect.height
+  return [
+    { x: rect.x, y: rect.y },
+    { x: right, y: rect.y },
+    { x: right, y: bottom },
+    { x: rect.x, y: bottom },
+    { x: rect.x, y: rect.y }
+  ]
+}
+
+function ellipseOutline(rect: NormalizedRect): MarkupPoint[] {
+  const rx = rect.width / 2
+  const ry = rect.height / 2
+  const segments = Math.max(
+    ELLIPSE_MIN_SEGMENTS,
+    Math.ceil((2 * Math.PI * Math.max(rx, ry)) / ELLIPSE_MAX_CHORD)
+  )
+  const outline: MarkupPoint[] = []
+  for (let i = 0; i <= segments; i += 1) {
+    const angle = (i / segments) * 2 * Math.PI
+    outline.push({ x: rect.x + rx + rx * Math.cos(angle), y: rect.y + ry + ry * Math.sin(angle) })
+  }
+  return outline
+}
+
+function sweepDistanceToPath(from: MarkupPoint, to: MarkupPoint, path: MarkupPoint[]): number {
+  // A single-point path is a dot, which has no segment to iterate.
+  let nearest = path.length === 1 ? pointToSegmentDistance(path[0], from, to) : Infinity
+  for (let i = 1; i < path.length; i += 1) {
+    nearest = Math.min(nearest, segmentDistance(from, to, path[i - 1], path[i]))
+  }
+  return nearest
+}
+
+function segmentDistance(
+  a1: MarkupPoint,
+  a2: MarkupPoint,
+  b1: MarkupPoint,
+  b2: MarkupPoint
+): number {
+  if (segmentsCross(a1, a2, b1, b2)) {
+    return 0
+  }
+  return Math.min(
+    pointToSegmentDistance(a1, b1, b2),
+    pointToSegmentDistance(a2, b1, b2),
+    pointToSegmentDistance(b1, a1, a2),
+    pointToSegmentDistance(b2, a1, a2)
+  )
+}
+
+// Strict crossing only; touching and collinear cases fall out of the endpoint distances.
+function segmentsCross(
+  a1: MarkupPoint,
+  a2: MarkupPoint,
+  b1: MarkupPoint,
+  b2: MarkupPoint
+): boolean {
+  return cross(a1, a2, b1) * cross(a1, a2, b2) < 0 && cross(b1, b2, a1) * cross(b1, b2, a2) < 0
+}
+
+function cross(origin: MarkupPoint, a: MarkupPoint, b: MarkupPoint): number {
+  return (a.x - origin.x) * (b.y - origin.y) - (a.y - origin.y) * (b.x - origin.x)
+}
+
+function pointToSegmentDistance(point: MarkupPoint, a: MarkupPoint, b: MarkupPoint): number {
+  const dx = b.x - a.x
+  const dy = b.y - a.y
+  const lengthSquared = dx * dx + dy * dy
+  const t =
+    lengthSquared === 0
+      ? 0
+      : Math.min(1, Math.max(0, ((point.x - a.x) * dx + (point.y - a.y) * dy) / lengthSquared))
+  return Math.hypot(point.x - (a.x + t * dx), point.y - (a.y + t * dy))
+}
diff --git a/src/renderer/src/components/browser-pane/annotate/markup-shape-render.test.ts b/src/renderer/src/components/browser-pane/annotate/markup-shape-render.test.ts
index 444f8d01265..295ab6c5b94 100644
--- a/src/renderer/src/components/browser-pane/annotate/markup-shape-render.test.ts
+++ b/src/renderer/src/components/browser-pane/annotate/markup-shape-render.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it } from 'vitest'
-import { drawShape } from './markup-shape-render'
+import { drawShape, textInkBox } from './markup-shape-render'
 import { HIGHLIGHT_ALPHA, type MarkupShape } from './markup-drawing-model'
 
 // Minimal recording stand-in for CanvasRenderingContext2D — drawShape only uses
@@ -24,6 +24,16 @@ function makeRecordingCtx() {
     strokeRect: record('strokeRect'),
     fillText: record('fillText'),
     strokeText: record('strokeText'),
+    // Records the style in force when measuring, and returns fixed ink metrics.
+    measureText: () => {
+      calls.push({ method: 'measureText', args: [ctx.font, ctx.textBaseline] })
+      return {
+        actualBoundingBoxLeft: 1,
+        actualBoundingBoxRight: 40,
+        actualBoundingBoxAscent: -2,
+        actualBoundingBoxDescent: 20
+      }
+    },
     lineCap: '',
     lineJoin: '',
     strokeStyle: '',
@@ -151,3 +161,24 @@ describe('drawShape dispatch', () => {
     expect(methods('restore')).toHaveLength(1)
   })
 })
+
+describe('textInkBox', () => {
+  it('covers the measured glyphs plus the halo, measured in the style text is drawn with', () => {
+    const { ctx, methods } = makeRecordingCtx()
+
+    const box = textInkBox(ctx, {
+      id: 't',
+      kind: 'text',
+      color: '#111827',
+      at: { x: 100, y: 200 },
+      text: 'gy',
+      fontSize: 18
+    })
+
+    const [font, textBaseline] = methods('measureText')[0].args
+    expect(font).toContain('18px')
+    expect(textBaseline).toBe('top')
+    // The halo is 3px wide at 18px type, so it adds 1.5px on every side.
+    expect(box).toEqual({ x: 97.5, y: 200.5, width: 44, height: 21 })
+  })
+})
diff --git a/src/renderer/src/components/browser-pane/annotate/markup-shape-render.ts b/src/renderer/src/components/browser-pane/annotate/markup-shape-render.ts
index 1df81a939f9..8e7d65da654 100644
--- a/src/renderer/src/components/browser-pane/annotate/markup-shape-render.ts
+++ b/src/renderer/src/components/browser-pane/annotate/markup-shape-render.ts
@@ -6,10 +6,13 @@ import {
   arrowHeadGeometry,
   highlightWidth,
   normalizeRect,
+  strokeDotRadius,
+  textHaloWidth,
   HIGHLIGHT_ALPHA,
   type ArrowShape,
   type EllipseShape,
   type MarkupShape,
+  type NormalizedRect,
   type PenShape,
   type HighlightShape,
   type RectShape,
@@ -80,7 +83,7 @@ function strokePolyline(
     // Why: a tap (single point) still leaves a visible dot.
     const point = points[0]
     ctx.beginPath()
-    ctx.arc(point.x, point.y, Math.max(width / 2, 1), 0, Math.PI * 2)
+    ctx.arc(point.x, point.y, strokeDotRadius(width), 0, Math.PI * 2)
     ctx.fill()
     return
   }
@@ -125,19 +128,39 @@ function drawEllipse(ctx: CanvasRenderingContext2D, shape: EllipseShape): void {
   ctx.stroke()
 }
 
-function drawText(ctx: CanvasRenderingContext2D, shape: TextShape): void {
+// Shared by draw and measure so the measured ink box matches the drawn glyphs.
+function applyTextStyle(ctx: CanvasRenderingContext2D, shape: TextShape): void {
   ctx.font = `600 ${shape.fontSize}px ${TEXT_FONT_FAMILY}`
   ctx.textBaseline = 'top'
   // Why: a thin contrasting halo keeps text legible over busy screenshots
   // regardless of the underlying pixels.
-  ctx.lineWidth = Math.max(shape.fontSize / 6, 2)
-  ctx.strokeStyle = haloColor(shape.color)
+  ctx.lineWidth = textHaloWidth(shape.fontSize)
   ctx.lineJoin = 'round'
+}
+
+function drawText(ctx: CanvasRenderingContext2D, shape: TextShape): void {
+  applyTextStyle(ctx, shape)
+  ctx.strokeStyle = haloColor(shape.color)
   // Text comes from a single-line input, so there are no newlines to lay out.
   ctx.strokeText(shape.text, shape.at.x, shape.at.y)
   ctx.fillText(shape.text, shape.at.x, shape.at.y)
 }
 
+// The box the drawn text (glyphs plus halo) actually covers.
+export function textInkBox(ctx: CanvasRenderingContext2D, shape: TextShape): NormalizedRect {
+  ctx.save()
+  applyTextStyle(ctx, shape)
+  const metrics = ctx.measureText(shape.text)
+  ctx.restore()
+  const halo = textHaloWidth(shape.fontSize)
+  return {
+    x: shape.at.x - metrics.actualBoundingBoxLeft - halo / 2,
+    y: shape.at.y - metrics.actualBoundingBoxAscent - halo / 2,
+    width: metrics.actualBoundingBoxLeft + metrics.actualBoundingBoxRight + halo,
+    height: metrics.actualBoundingBoxAscent + metrics.actualBoundingBoxDescent + halo
+  }
+}
+
 // White text gets a dark halo, everything else a light halo.
 function haloColor(color: string): string {
   return color.toLowerCase() === '#ffffff' ? 'rgba(0,0,0,0.65)' : 'rgba(255,255,255,0.85)'
diff --git a/src/renderer/src/components/browser-pane/annotate/useMarkupEditor.test.ts b/src/renderer/src/components/browser-pane/annotate/useMarkupEditor.test.ts
index 6e6ba294028..95f8712fd91 100644
--- a/src/renderer/src/components/browser-pane/annotate/useMarkupEditor.test.ts
+++ b/src/renderer/src/components/browser-pane/annotate/useMarkupEditor.test.ts
@@ -1,12 +1,13 @@
 // @vitest-environment happy-dom
 
+import { StrictMode } from 'react'
 import { act, renderHook } from '@testing-library/react'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { useMarkupEditor } from './useMarkupEditor'
 
 const realCrypto = globalThis.crypto
 
-function pointerDownEvent(clientX: number, clientY: number): React.PointerEvent<HTMLCanvasElement> {
+function pointerEvent(clientX: number, clientY: number): React.PointerEvent<HTMLCanvasElement> {
   return {
     button: 0,
     clientX,
@@ -17,6 +18,13 @@ function pointerDownEvent(clientX: number, clientY: number): React.PointerEvent<
   } as unknown as React.PointerEvent<HTMLCanvasElement>
 }
 
+function secondPointerEvent(
+  clientX: number,
+  clientY: number
+): React.PointerEvent<HTMLCanvasElement> {
+  return { ...pointerEvent(clientX, clientY), pointerId: 2 }
+}
+
 describe('useMarkupEditor.commitPendingText in a non-secure browser context', () => {
   beforeEach(() => {
     // Match a non-secure browser context (LAN web client over plain HTTP):
@@ -35,7 +43,7 @@ describe('useMarkupEditor.commitPendingText in a non-secure browser context', ()
     const { result } = renderHook(() => useMarkupEditor(false, vi.fn()))
 
     act(() => result.current.setTool('text'))
-    act(() => result.current.onPointerDown(pointerDownEvent(5, 5)))
+    act(() => result.current.onPointerDown(pointerEvent(5, 5)))
     expect(result.current.pendingText).not.toBeNull()
 
     expect(() => act(() => result.current.commitPendingText('hello'))).not.toThrow()
@@ -45,3 +53,164 @@ describe('useMarkupEditor.commitPendingText in a non-secure browser context', ()
     expect(shape?.id).toMatch(/^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[0-9a-f]{4}-[0-9a-f]{12}$/)
   })
 })
+
+describe('useMarkupEditor gestures', () => {
+  type Editor = ReturnType<typeof useMarkupEditor>
+
+  // A horizontal pen stroke from (0, y) to (100, y).
+  function drawLine(editor: { current: Editor }, y: number): void {
+    act(() => editor.current.onPointerDown(pointerEvent(0, y)))
+    act(() => editor.current.onPointerMove(pointerEvent(100, y)))
+    act(() => editor.current.onPointerUp(pointerEvent(100, y)))
+  }
+
+  // Pointer positions are read relative to the canvas, so the editor needs one.
+  function renderEditor(options?: { wrapper: typeof StrictMode }): { current: Editor } {
+    const { result } = renderHook(() => useMarkupEditor(false, vi.fn()), options)
+    result.current.canvasRef.current = document.createElement('canvas')
+    return result
+  }
+
+  it('commits a drawn stroke exactly once under StrictMode', () => {
+    const result = renderEditor({ wrapper: StrictMode })
+
+    drawLine(result, 0)
+
+    expect(result.current.shapes).toHaveLength(1)
+  })
+
+  it('erases the touched mark, hiding it from the export before release, and undo restores it', () => {
+    const result = renderEditor({ wrapper: StrictMode })
+    drawLine(result, 0)
+    drawLine(result, 200)
+    const [first, second] = result.current.shapes
+
+    act(() => result.current.setTool('eraser'))
+    act(() => result.current.onPointerDown(pointerEvent(50, 0)))
+    expect(result.current.shapes).toEqual([second])
+
+    act(() => result.current.onPointerUp(pointerEvent(50, 0)))
+    expect(result.current.shapes).toEqual([second])
+
+    act(() => result.current.undo())
+    expect(result.current.shapes).toEqual([first, second])
+  })
+
+  it('shows a click on overlapping marks taking only the newest, and a drag taking both', () => {
+    const result = renderEditor({ wrapper: StrictMode })
+    drawLine(result, 0)
+    drawLine(result, 0)
+    const [older, newer] = result.current.shapes
+
+    act(() => result.current.setTool('eraser'))
+    act(() => result.current.onPointerDown(pointerEvent(50, 0)))
+    expect(result.current.shapes).toEqual([older])
+    act(() => result.current.onPointerUp(pointerEvent(50, 0)))
+    expect(result.current.shapes).toEqual([older])
+
+    act(() => result.current.undo())
+    act(() => result.current.onPointerDown(pointerEvent(50, 0)))
+    act(() => result.current.onPointerMove(pointerEvent(50, 40)))
+    expect(result.current.shapes).toEqual([])
+    act(() => result.current.onPointerUp(pointerEvent(50, 40)))
+
+    act(() => result.current.undo())
+    expect(result.current.shapes).toEqual([older, newer])
+  })
+
+  it('adds no undo step for an eraser click on empty space', () => {
+    const result = renderEditor()
+    drawLine(result, 0)
+
+    act(() => result.current.setTool('eraser'))
+    act(() => result.current.onPointerDown(pointerEvent(50, 300)))
+    act(() => result.current.onPointerUp(pointerEvent(50, 300)))
+    act(() => result.current.undo())
+
+    expect(result.current.shapes).toEqual([])
+  })
+
+  it('lets only the finger that started an erase steer and end it', () => {
+    const result = renderEditor()
+    drawLine(result, 0)
+    drawLine(result, 200)
+    const [first, second] = result.current.shapes
+
+    act(() => result.current.setTool('eraser'))
+    act(() => result.current.onPointerDown(pointerEvent(50, 0)))
+    act(() => result.current.onPointerMove(secondPointerEvent(50, 200)))
+    expect(result.current.shapes).toEqual([second])
+
+    act(() => result.current.onPointerUp(secondPointerEvent(50, 200)))
+    act(() => result.current.onPointerMove(pointerEvent(50, 200)))
+    act(() => result.current.onPointerUp(pointerEvent(50, 200)))
+    expect(result.current.shapes).toEqual([])
+
+    // Both marks went in one gesture, so one undo brings both back.
+    act(() => result.current.undo())
+    expect(result.current.shapes).toEqual([first, second])
+  })
+
+  it('takes back only an in-flight erase on undo, and ignores the rest of that drag', () => {
+    const result = renderEditor({ wrapper: StrictMode })
+    drawLine(result, 0)
+    drawLine(result, 200)
+    const [first, second] = result.current.shapes
+
+    act(() => result.current.setTool('eraser'))
+    act(() => result.current.onPointerDown(pointerEvent(50, 0)))
+    expect(result.current.shapes).toEqual([second])
+    act(() => result.current.undo())
+    expect(result.current.shapes).toEqual([first, second])
+
+    // The held pointer sweeps across the second mark, then lifts.
+    act(() => result.current.onPointerMove(pointerEvent(50, 200)))
+    act(() => result.current.onPointerUp(pointerEvent(50, 200)))
+    expect(result.current.shapes).toEqual([first, second])
+
+    act(() => result.current.undo())
+    expect(result.current.shapes).toEqual([first])
+  })
+
+  it('takes back only an in-flight stroke on undo, even the first one', () => {
+    const result = renderEditor({ wrapper: StrictMode })
+    expect(result.current.canUndo).toBe(false)
+
+    act(() => result.current.onPointerDown(pointerEvent(0, 0)))
+    expect(result.current.canUndo).toBe(true)
+    act(() => result.current.undo())
+    act(() => result.current.onPointerMove(pointerEvent(100, 0)))
+    act(() => result.current.onPointerUp(pointerEvent(100, 0)))
+    expect(result.current.shapes).toEqual([])
+    expect(result.current.canUndo).toBe(false)
+
+    drawLine(result, 50)
+    expect(result.current.shapes).toHaveLength(1)
+  })
+
+  it('keeps an in-flight erase when redo has nothing to redo', () => {
+    const result = renderEditor()
+    drawLine(result, 0)
+    drawLine(result, 200)
+    const [, second] = result.current.shapes
+
+    act(() => result.current.setTool('eraser'))
+    act(() => result.current.onPointerDown(pointerEvent(50, 0)))
+    act(() => result.current.redo())
+    act(() => result.current.onPointerUp(pointerEvent(50, 0)))
+
+    expect(result.current.shapes).toEqual([second])
+  })
+
+  it('drops an in-flight stroke when everything is cleared', () => {
+    const result = renderEditor()
+
+    act(() => result.current.onPointerDown(pointerEvent(0, 0)))
+    act(() => result.current.onPointerMove(pointerEvent(100, 0)))
+    act(() => result.current.clear())
+    act(() => result.current.onPointerMove(pointerEvent(150, 0)))
+    act(() => result.current.onPointerUp(pointerEvent(150, 0)))
+
+    expect(result.current.shapes).toEqual([])
+  })
+})
diff --git a/src/renderer/src/components/browser-pane/annotate/useMarkupEditor.ts b/src/renderer/src/components/browser-pane/annotate/useMarkupEditor.ts
index 91f1a4c0961..ecf8c78e992 100644
--- a/src/renderer/src/components/browser-pane/annotate/useMarkupEditor.ts
+++ b/src/renderer/src/components/browser-pane/annotate/useMarkupEditor.ts
@@ -1,28 +1,32 @@
-import { useCallback, useEffect, useRef, useState } from 'react'
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { createBrowserUuid } from '@/lib/browser-uuid'
 import { blitMarkupScene, renderCommittedLayer } from './markup-canvas-render'
 import { useMarkupKeyboardShortcuts, type PendingText } from './useMarkupKeyboardShortcuts'
 import { useMarkupPointerHandlers } from './useMarkupPointerHandlers'
+import {
+  applyDocumentCommand,
+  canUndoMarkup,
+  redoMarkup,
+  undoMarkup,
+  type MarkupEditorState
+} from './markup-gesture'
+import type { TextInkBoxMeasurer } from './markup-shape-hit-test'
+import { textInkBox } from './markup-shape-render'
 import {
   canRedo,
-  canUndo,
   clearShapes,
   commitShape,
   createMarkupDocument,
   DEFAULT_MARKUP_COLOR,
   DEFAULT_MARKUP_FONT_SIZE,
   DEFAULT_MARKUP_WIDTH,
-  redoShape,
-  undoShape,
-  type MarkupDocument,
-  type MarkupShape,
   type MarkupTool
 } from './markup-drawing-model'
 
 type Size = { width: number; height: number; dpr: number }
 
 // Owns the markup surface: document, active tool/style, the pending text box, and
-// the canvas paint effect. Draw-only — committed shapes are not re-editable.
+// the canvas paint effect. Committed shapes can be erased but not re-edited.
 export function useMarkupEditor(busy: boolean, onCancel: () => void) {
   const rootRef = useRef<HTMLDivElement | null>(null)
   const canvasRef = useRef<HTMLCanvasElement | null>(null)
@@ -35,8 +39,21 @@ export function useMarkupEditor(busy: boolean, onCancel: () => void) {
   }
 
   const [size, setSize] = useState<Size>({ width: 0, height: 0, dpr: 1 })
-  const [doc, setDoc] = useState<MarkupDocument>(() => createMarkupDocument())
-  const [inProgress, setInProgress] = useState<MarkupShape | null>(null)
+  const [{ doc, gesture }, setState] = useState<MarkupEditorState>(() => ({
+    doc: createMarkupDocument(),
+    gesture: null
+  }))
+  const drawing = gesture?.kind === 'draw' ? gesture.shape : null
+  const erasedIds = gesture?.kind === 'erase' ? gesture.erasedIds : null
+  // Why: one list drives both the canvas and the export, so marks hidden by an
+  // in-flight erase can never end up in the copied PNG.
+  const shapes = useMemo(
+    () =>
+      erasedIds && erasedIds.size > 0
+        ? doc.shapes.filter((shape) => !erasedIds.has(shape.id))
+        : doc.shapes,
+    [doc.shapes, erasedIds]
+  )
   const [tool, setTool] = useState<MarkupTool>('pen')
   const [color, setColor] = useState<string>(DEFAULT_MARKUP_COLOR)
   const [width, setWidth] = useState<number>(DEFAULT_MARKUP_WIDTH)
@@ -80,8 +97,8 @@ export function useMarkupEditor(busy: boolean, onCancel: () => void) {
     if (!layer) {
       return
     }
-    renderCommittedLayer(layer, doc.shapes, size.width, size.height, size.dpr)
-  }, [doc.shapes, size])
+    renderCommittedLayer(layer, shapes, size.width, size.height, size.dpr)
+  }, [shapes, size])
 
   // Blit the cached layer + the in-progress shape, coalesced to one paint per
   // frame so a burst of pointermove events can't queue redundant full repaints.
@@ -92,10 +109,10 @@ export function useMarkupEditor(busy: boolean, onCancel: () => void) {
       return undefined
     }
     const handle = requestAnimationFrame(() => {
-      blitMarkupScene(canvas, layer, inProgress, size.width, size.height, size.dpr)
+      blitMarkupScene(canvas, layer, drawing, size.width, size.height, size.dpr)
     })
     return () => cancelAnimationFrame(handle)
-  }, [doc.shapes, inProgress, size])
+  }, [shapes, drawing, size])
 
   // Why: focus the text input on mount — a placement click can beat autoFocus.
   useEffect(() => {
@@ -106,14 +123,18 @@ export function useMarkupEditor(busy: boolean, onCancel: () => void) {
     return () => cancelAnimationFrame(handle)
   }, [pendingText])
 
-  const undo = useCallback(() => setDoc((current) => undoShape(current)), [])
-  const redo = useCallback(() => setDoc((current) => redoShape(current)), [])
+  const undo = useCallback(() => setState(undoMarkup), [])
+  const redo = useCallback(() => setState(redoMarkup), [])
   const clear = useCallback(() => {
-    // Why: also drop any open text input / in-progress stroke so a clear leaves a
-    // truly clean slate — otherwise a pending input blur can re-add text.
+    // Why: also drop any open text input so a clear leaves a truly clean slate —
+    // otherwise a pending input blur can re-add text.
     setPendingText(null)
-    setInProgress(null)
-    setDoc((current) => clearShapes(current))
+    setState((state) => applyDocumentCommand(state, clearShapes))
+  }, [])
+
+  const measureTextInkBox = useCallback<TextInkBoxMeasurer>((shape) => {
+    const ctx = committedLayerRef.current?.getContext('2d')
+    return ctx ? textInkBox(ctx, shape) : null
   }, [])
 
   useMarkupKeyboardShortcuts({ pendingText, setPendingText, undo, redo, onCancel })
@@ -124,11 +145,10 @@ export function useMarkupEditor(busy: boolean, onCancel: () => void) {
     color,
     width,
     pendingText,
-    inProgress,
     canvasRef,
-    setInProgress,
+    measureTextInkBox,
     setPendingText,
-    setDoc
+    setState
   })
 
   const commitPendingText = useCallback(
@@ -139,8 +159,9 @@ export function useMarkupEditor(busy: boolean, onCancel: () => void) {
       if (!at || trimmed.length === 0) {
         return
       }
-      setDoc((document) =>
-        commitShape(document, {
+      setState((state) => ({
+        ...state,
+        doc: commitShape(state.doc, {
           id: createBrowserUuid(),
           kind: 'text',
           color,
@@ -148,7 +169,7 @@ export function useMarkupEditor(busy: boolean, onCancel: () => void) {
           text: trimmed,
           fontSize
         })
-      )
+      }))
     },
     [color, fontSize, pendingText]
   )
@@ -164,8 +185,8 @@ export function useMarkupEditor(busy: boolean, onCancel: () => void) {
     width,
     fontSize,
     pendingText,
-    shapes: doc.shapes,
-    canUndo: canUndo(doc),
+    shapes,
+    canUndo: canUndoMarkup({ doc, gesture }),
     canRedo: canRedo(doc),
     setTool,
     setColor,
diff --git a/src/renderer/src/components/browser-pane/annotate/useMarkupPointerHandlers.test.ts b/src/renderer/src/components/browser-pane/annotate/useMarkupPointerHandlers.test.ts
index 4aa6a928719..f51a563ba66 100644
--- a/src/renderer/src/components/browser-pane/annotate/useMarkupPointerHandlers.test.ts
+++ b/src/renderer/src/components/browser-pane/annotate/useMarkupPointerHandlers.test.ts
@@ -3,7 +3,8 @@
 import { act, renderHook } from '@testing-library/react'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { useMarkupPointerHandlers, type MarkupPointerParams } from './useMarkupPointerHandlers'
-import type { MarkupShape } from './markup-drawing-model'
+import { createMarkupDocument } from './markup-drawing-model'
+import type { MarkupEditorState } from './markup-gesture'
 
 const realCrypto = globalThis.crypto
 
@@ -24,15 +25,14 @@ function baseParams(overrides: Partial<MarkupPointerParams> = {}): MarkupPointer
     color: '#ef4444',
     width: 4,
     pendingText: null,
-    inProgress: null,
     canvasRef: {
       current: {
         getBoundingClientRect: () => ({ left: 0, top: 0 })
       } as unknown as HTMLCanvasElement
     },
-    setInProgress: vi.fn(),
+    measureTextInkBox: () => null,
     setPendingText: vi.fn(),
-    setDoc: vi.fn(),
+    setState: vi.fn(),
     ...overrides
   }
 }
@@ -52,50 +52,19 @@ describe('useMarkupPointerHandlers in a non-secure browser context', () => {
   })
 
   it('starts a pen stroke with a valid id instead of throwing', () => {
-    const setInProgress = vi.fn()
-    const { result } = renderHook(() => useMarkupPointerHandlers(baseParams({ setInProgress })))
+    let state: MarkupEditorState = { doc: createMarkupDocument(), gesture: null }
+    const setState: MarkupPointerParams['setState'] = (update) => {
+      state = typeof update === 'function' ? update(state) : update
+    }
+    const { result } = renderHook(() => useMarkupPointerHandlers(baseParams({ setState })))
 
     expect(() => act(() => result.current.onPointerDown(pointerDownEvent(10, 10)))).not.toThrow()
 
-    expect(setInProgress).toHaveBeenCalledTimes(1)
-    const shape = setInProgress.mock.calls[0][0] as MarkupShape
-    expect(shape.id).toMatch(/^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[0-9a-f]{4}-[0-9a-f]{12}$/)
-  })
-})
-
-describe('useMarkupPointerHandlers pointer up', () => {
-  const inProgress: MarkupShape = {
-    id: 'shape-1',
-    kind: 'pen',
-    color: '#ef4444',
-    width: 4,
-    points: [{ x: 0, y: 0 }]
-  } as MarkupShape
-
-  it('commits outside the setInProgress updater so a double-invoked updater cannot duplicate the shape', () => {
-    const setInProgress = vi.fn()
-    const setDoc = vi.fn()
-    const { result } = renderHook(() =>
-      useMarkupPointerHandlers(baseParams({ inProgress, setInProgress, setDoc }))
-    )
-
-    act(() => result.current.onPointerUp())
-
-    expect(setDoc).toHaveBeenCalledTimes(1)
-    // The clear must be a plain value, not an updater that also commits.
-    expect(setInProgress).toHaveBeenCalledWith(null)
-  })
-
-  it('does not commit when no shape is in progress', () => {
-    const setInProgress = vi.fn()
-    const setDoc = vi.fn()
-    const { result } = renderHook(() =>
-      useMarkupPointerHandlers(baseParams({ inProgress: null, setInProgress, setDoc }))
-    )
-
-    act(() => result.current.onPointerUp())
-
-    expect(setDoc).not.toHaveBeenCalled()
-    expect(setInProgress).toHaveBeenCalledWith(null)
+    expect(state.gesture).toMatchObject({
+      kind: 'draw',
+      shape: {
+        id: expect.stringMatching(/^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[0-9a-f]{4}-[0-9a-f]{12}$/)
+      }
+    })
   })
 })
diff --git a/src/renderer/src/components/browser-pane/annotate/useMarkupPointerHandlers.ts b/src/renderer/src/components/browser-pane/annotate/useMarkupPointerHandlers.ts
index 9c681fe2f52..e07a097975a 100644
--- a/src/renderer/src/components/browser-pane/annotate/useMarkupPointerHandlers.ts
+++ b/src/renderer/src/components/browser-pane/annotate/useMarkupPointerHandlers.ts
@@ -2,13 +2,16 @@ import { useCallback } from 'react'
 import type React from 'react'
 import { createBrowserUuid } from '@/lib/browser-uuid'
 import type { PendingText } from './useMarkupKeyboardShortcuts'
+import type { MarkupPoint, MarkupTool } from './markup-drawing-model'
 import {
-  commitShape,
-  type MarkupDocument,
-  type MarkupPoint,
-  type MarkupShape,
-  type MarkupTool
-} from './markup-drawing-model'
+  beginDrawGesture,
+  beginEraseGesture,
+  cancelGesture,
+  endGesture,
+  moveGesture,
+  type MarkupEditorState
+} from './markup-gesture'
+import type { TextInkBoxMeasurer } from './markup-shape-hit-test'
 
 export type MarkupPointerParams = {
   busy: boolean
@@ -16,15 +19,14 @@ export type MarkupPointerParams = {
   color: string
   width: number
   pendingText: PendingText | null
-  inProgress: MarkupShape | null
   canvasRef: React.RefObject<HTMLCanvasElement | null>
-  setInProgress: React.Dispatch<React.SetStateAction<MarkupShape | null>>
+  measureTextInkBox: TextInkBoxMeasurer
   setPendingText: (value: PendingText | null) => void
-  setDoc: React.Dispatch<React.SetStateAction<MarkupDocument>>
+  setState: React.Dispatch<React.SetStateAction<MarkupEditorState>>
 }
 
-// Canvas pointer interactions: draw a new shape, or place text. Split out of
-// useMarkupEditor to keep that hook focused.
+// Canvas pointer interactions: draw a new shape, erase touched ones, or place
+// text. Split out of useMarkupEditor to keep that hook focused.
 export function useMarkupPointerHandlers(params: MarkupPointerParams) {
   const {
     busy,
@@ -32,11 +34,10 @@ export function useMarkupPointerHandlers(params: MarkupPointerParams) {
     color,
     width,
     pendingText,
-    inProgress,
     canvasRef,
-    setInProgress,
+    measureTextInkBox,
     setPendingText,
-    setDoc
+    setState
   } = params
 
   const pointFromEvent = useCallback(
@@ -69,43 +70,55 @@ export function useMarkupPointerHandlers(params: MarkupPointerParams) {
         return
       }
       event.currentTarget.setPointerCapture(event.pointerId)
-      const id = createBrowserUuid()
-      if (tool === 'pen' || tool === 'highlight') {
-        setInProgress({ id, kind: tool, color, width, points: [point] })
-      } else {
-        setInProgress({ id, kind: tool, color, width, from: point, to: point })
+      const { pointerId } = event
+      if (tool === 'eraser') {
+        setState((state) => beginEraseGesture(state, pointerId, point, measureTextInkBox))
+        return
       }
+      const id = createBrowserUuid()
+      const shape =
+        tool === 'pen' || tool === 'highlight'
+          ? { id, kind: tool, color, width, points: [point] }
+          : { id, kind: tool, color, width, from: point, to: point }
+      setState((state) => beginDrawGesture(state, pointerId, shape))
     },
-    [busy, color, pendingText, pointFromEvent, setInProgress, setPendingText, tool, width]
+    [
+      busy,
+      color,
+      measureTextInkBox,
+      pendingText,
+      pointFromEvent,
+      setPendingText,
+      setState,
+      tool,
+      width
+    ]
   )
 
   const onPointerMove = useCallback(
     (event: React.PointerEvent<HTMLCanvasElement>) => {
-      setInProgress((current) => {
-        if (!current) {
-          return current
-        }
-        const point = pointFromEvent(event)
-        if (current.kind === 'pen' || current.kind === 'highlight') {
-          return { ...current, points: [...current.points, point] }
-        }
-        if (current.kind === 'text') {
-          return current
-        }
-        return { ...current, to: point }
-      })
+      const point = pointFromEvent(event)
+      const { pointerId } = event
+      setState((state) => moveGesture(state, pointerId, point, measureTextInkBox))
     },
-    [pointFromEvent, setInProgress]
+    [measureTextInkBox, pointFromEvent, setState]
   )
 
-  // Why: committing inside the setInProgress updater made it impure, so StrictMode's
-  // double-invoke appended the shape twice (commitShape does not dedupe by id).
-  const onPointerUp = useCallback(() => {
-    if (inProgress) {
-      setDoc((document) => commitShape(document, inProgress))
-    }
-    setInProgress(null)
-  }, [inProgress, setDoc, setInProgress])
+  const onPointerUp = useCallback(
+    (event: React.PointerEvent<HTMLCanvasElement>) => {
+      const { pointerId } = event
+      setState((state) => endGesture(state, pointerId))
+    },
+    [setState]
+  )
 
-  return { onPointerDown, onPointerMove, onPointerUp }
+  const onPointerCancel = useCallback(
+    (event: React.PointerEvent<HTMLCanvasElement>) => {
+      const { pointerId } = event
+      setState((state) => cancelGesture(state, pointerId))
+    },
+    [setState]
+  )
+
+  return { onPointerDown, onPointerMove, onPointerUp, onPointerCancel }
 }
diff --git a/src/renderer/src/components/editor/rich-markdown-local-image.test.ts b/src/renderer/src/components/editor/rich-markdown-local-image.test.ts
index d6c74e235a3..7e46821999d 100644
--- a/src/renderer/src/components/editor/rich-markdown-local-image.test.ts
+++ b/src/renderer/src/components/editor/rich-markdown-local-image.test.ts
@@ -4,8 +4,28 @@ import { Editor } from '@tiptap/core'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { createRichMarkdownExtensions } from './rich-markdown-extensions'
 import { createRichMarkdownEditorCodec } from './rich-markdown-source-transport'
-import { releaseLocalImageSrc, resetLocalImageSrcStateForTests } from './useLocalImageSrc'
+import {
+  getLocalImageSrcCacheKey,
+  releaseLocalImageSrcByKey,
+  resetLocalImageSrcStateForTests
+} from './useLocalImageSrc'
 import { setRichMarkdownImageResolverContext } from './rich-markdown-image-context'
+import { documentResourceAccess } from '@/lib/local-file-access'
+
+// The key the editor leases: rich markdown reads images as resources of their document.
+function diagramCacheKey(): string {
+  const key = getLocalImageSrcCacheKey(
+    'diagram.png',
+    '/repo/docs/readme.md',
+    undefined,
+    undefined,
+    documentResourceAccess('/repo/docs/readme.md')
+  )
+  if (!key) {
+    throw new Error('diagram.png has no local image cache key')
+  }
+  return key
+}
 
 async function flushPromises(): Promise<void> {
   for (let index = 0; index < 5; index += 1) {
@@ -81,7 +101,7 @@ describe('rich markdown local images', () => {
       setRichMarkdownImageResolverContext(editor, { filePath: '/repo/docs/readme.md' })
       await flushPromises()
 
-      releaseLocalImageSrc('diagram.png', '/repo/docs/readme.md')
+      releaseLocalImageSrcByKey(diagramCacheKey())
 
       expect(URL.revokeObjectURL).not.toHaveBeenCalledWith('blob:rich-local-image')
       expect(host.querySelector('img')?.src).toBe('blob:rich-local-image')
diff --git a/src/renderer/src/components/editor/useLocalImageSrc.test.ts b/src/renderer/src/components/editor/useLocalImageSrc.test.ts
index 26ebe4de483..d4b0cdcb173 100644
--- a/src/renderer/src/components/editor/useLocalImageSrc.test.ts
+++ b/src/renderer/src/components/editor/useLocalImageSrc.test.ts
@@ -1,16 +1,18 @@
 // @vitest-environment happy-dom
 
-import { act, createElement, Fragment } from 'react'
+import { act, createElement, Fragment, useEffect } from 'react'
 import { createRoot, type Root } from 'react-dom/client'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import {
   getLocalImageCacheKey,
+  getLocalImageSrcCacheKey,
   invalidateLocalImageSrcCacheForTests,
   loadLocalImageSrc,
-  releaseLocalImageSrc,
+  releaseLocalImageSrcByKey,
   resetLocalImageSrcStateForTests,
   useLocalImageSrc
 } from './useLocalImageSrc'
+import type { RuntimeFileOperationArgs } from '@/runtime/runtime-file-client'
 import {
   blobUrlCache,
   cacheLocalImageBlob,
@@ -48,6 +50,14 @@ function setReadFile(readFile: ReturnType<typeof vi.fn>): void {
   } as unknown as Window['api']
 }
 
+function releaseByPath(rawSrc: string, filePath: string): void {
+  const key = getLocalImageSrcCacheKey(rawSrc, filePath)
+  if (!key) {
+    throw new Error(`${rawSrc} has no local image cache key`)
+  }
+  releaseLocalImageSrcByKey(key)
+}
+
 async function flushPromises(): Promise<void> {
   await Promise.resolve()
   await Promise.resolve()
@@ -275,7 +285,7 @@ describe('loadLocalImageSrc', () => {
     setReadFile(readFile)
 
     const pending = loadLocalImageSrc('diagram.png', '/repo/docs/readme.md')
-    releaseLocalImageSrc('diagram.png', '/repo/docs/readme.md')
+    releaseByPath('diagram.png', '/repo/docs/readme.md')
     read.resolve(binaryPreview())
 
     await expect(pending).resolves.toBeNull()
@@ -296,7 +306,7 @@ describe('loadLocalImageSrc', () => {
     setReadFile(readFile)
 
     const stale = loadLocalImageSrc('diagram.png', '/repo/docs/readme.md')
-    releaseLocalImageSrc('diagram.png', '/repo/docs/readme.md')
+    releaseByPath('diagram.png', '/repo/docs/readme.md')
     const fresh = loadLocalImageSrc('diagram.png', '/repo/docs/readme.md')
     expect(readFile).toHaveBeenCalledTimes(2)
 
@@ -311,7 +321,7 @@ describe('loadLocalImageSrc', () => {
   it('cleans version metadata for released unique paths', () => {
     for (let index = 0; index < 500; index += 1) {
       const path = `/repo/docs/image-${index}.png`
-      releaseLocalImageSrc(path, '/repo/docs/readme.md')
+      releaseByPath(path, '/repo/docs/readme.md')
       expect(getLocalImageCacheKeyVersion(getLocalImageCacheKey(path, undefined, undefined))).toBe(
         0
       )
@@ -437,3 +447,126 @@ describe('loadLocalImageSrc', () => {
     )
   })
 })
+
+describe('useLocalImageSrc runtime owner', () => {
+  const imageSrc = 'diagram.png'
+  const documentPath = '/repo/docs/readme.md'
+
+  function sshOwner(overrides: Partial<RuntimeFileOperationArgs> = {}): RuntimeFileOperationArgs {
+    return {
+      settings: { activeRuntimeEnvironmentId: null },
+      worktreeId: 'wt-1',
+      worktreePath: '/repo',
+      connectionId: 'ssh-1',
+      expectedSshTargetId: 'ssh-1',
+      expectedSshConnectionGeneration: 1,
+      ...overrides
+    }
+  }
+
+  function OwnerProbe({
+    onRender,
+    runtimeContext
+  }: {
+    onRender: (displaySrc: string | undefined) => void
+    runtimeContext: RuntimeFileOperationArgs
+  }): null {
+    onRender(useLocalImageSrc(imageSrc, documentPath, null, runtimeContext))
+    return null
+  }
+
+  // Stands in for a surface that drops its copy whenever the owner object changes; only the
+  // probe's pin keeps the shown URL alive through that release.
+  function ReleaseOnOwnerObject({
+    runtimeContext
+  }: {
+    runtimeContext: RuntimeFileOperationArgs
+  }): null {
+    useEffect(() => {
+      const key = getLocalImageSrcCacheKey(imageSrc, documentPath, null, runtimeContext)
+      return () => {
+        if (key) {
+          releaseLocalImageSrcByKey(key)
+        }
+      }
+    }, [runtimeContext])
+    return null
+  }
+
+  function renderOwner(
+    root: Root,
+    runtimeContext: RuntimeFileOperationArgs,
+    onRender: (displaySrc: string | undefined) => void
+  ): void {
+    root.render(
+      createElement(
+        Fragment,
+        null,
+        createElement(OwnerProbe, { onRender, runtimeContext }),
+        createElement(ReleaseOnOwnerObject, { runtimeContext })
+      )
+    )
+  }
+
+  it('keeps its pin and URL when an equal runtime context is rebuilt', async () => {
+    const readFile = vi.fn().mockResolvedValue(binaryPreview())
+    let nextUrl = 0
+    vi.spyOn(URL, 'createObjectURL').mockImplementation(() => `blob:owner-${++nextUrl}`)
+    setReadFile(readFile)
+    const renders: (string | undefined)[] = []
+    const onRender = (displaySrc: string | undefined): void => {
+      renders.push(displaySrc)
+    }
+
+    const container = document.createElement('div')
+    const root: Root = createRoot(container)
+    await act(async () => {
+      renderOwner(root, sshOwner(), onRender)
+      await flushPromises()
+    })
+    expect(renders.at(-1)).toBe('blob:owner-1')
+
+    for (let update = 0; update < 3; update += 1) {
+      await act(async () => {
+        renderOwner(root, sshOwner(), onRender)
+        await flushPromises()
+      })
+    }
+
+    expect(readFile).toHaveBeenCalledOnce()
+    expect(URL.revokeObjectURL).not.toHaveBeenCalled()
+    expect(new Set(renders.filter(Boolean))).toEqual(new Set(['blob:owner-1']))
+    root.unmount()
+  })
+
+  it.each([
+    ['an SSH reconnect', { expectedSshConnectionGeneration: 2 }],
+    ['another worktree', { worktreeId: 'wt-2', worktreePath: '/repo-2' }]
+  ])('re-reads the image after %s changes its owner', async (_label, change) => {
+    const readFile = vi.fn().mockResolvedValue(binaryPreview())
+    let nextUrl = 0
+    vi.spyOn(URL, 'createObjectURL').mockImplementation(() => `blob:owner-${++nextUrl}`)
+    setReadFile(readFile)
+    const renders: (string | undefined)[] = []
+    const onRender = (displaySrc: string | undefined): void => {
+      renders.push(displaySrc)
+    }
+
+    const container = document.createElement('div')
+    const root: Root = createRoot(container)
+    await act(async () => {
+      renderOwner(root, sshOwner(), onRender)
+      await flushPromises()
+    })
+    expect(renders.at(-1)).toBe('blob:owner-1')
+
+    await act(async () => {
+      renderOwner(root, sshOwner(change), onRender)
+      await flushPromises()
+    })
+
+    expect(readFile).toHaveBeenCalledTimes(2)
+    expect(renders.at(-1)).toBe('blob:owner-2')
+    root.unmount()
+  })
+})
diff --git a/src/renderer/src/components/editor/useLocalImageSrc.ts b/src/renderer/src/components/editor/useLocalImageSrc.ts
index 2e1224ecb97..f256b173552 100644
--- a/src/renderer/src/components/editor/useLocalImageSrc.ts
+++ b/src/renderer/src/components/editor/useLocalImageSrc.ts
@@ -1,4 +1,4 @@
-import { useEffect, useState } from 'react'
+import { useEffect, useEffectEvent, useState } from 'react'
 import { resolveImageAbsolutePath } from './markdown-preview-links'
 import type { RuntimeFileOperationArgs } from '@/runtime/runtime-file-client'
 import { readLocalImagePreview } from './local-image-src-reader'
@@ -62,6 +62,27 @@ function isExternalUrl(src: string): boolean {
   return /^(?:https?|data|blob):/i.test(src)
 }
 
+type LocalImageRuntimeContext = Omit<RuntimeFileOperationArgs, 'connectionId'> & {
+  connectionId?: string | null
+}
+
+/** The cache identity of a local image, or null when it is external or has no owner yet. */
+export function getLocalImageSrcCacheKey(
+  rawSrc: string | undefined,
+  filePath: string,
+  connectionId?: string | null,
+  runtimeContext?: LocalImageRuntimeContext | null,
+  access?: LocalFileAccess
+): string | null {
+  if (!rawSrc || isExternalUrl(rawSrc) || runtimeContext === null) {
+    return null
+  }
+  const absolutePath = resolveImageAbsolutePath(rawSrc, filePath)
+  return absolutePath
+    ? getLocalImageCacheKey(absolutePath, connectionId, runtimeContext, access)
+    : null
+}
+
 /**
  * Resolves a raw markdown image src to a displayable URL. For local images,
  * reads the file via IPC and returns a blob URL. For http/https/data URLs,
@@ -72,64 +93,52 @@ export function useLocalImageSrc(
   rawSrc: string | undefined,
   filePath: string,
   connectionId?: string | null,
-  runtimeContext?:
-    | (Omit<RuntimeFileOperationArgs, 'connectionId'> & { connectionId?: string | null })
-    | null,
+  runtimeContext?: LocalImageRuntimeContext | null,
   access?: LocalFileAccess
 ): string | undefined {
   const [generation, setGeneration] = useState(getLocalImageCacheGeneration())
+  const externalSrc =
+    rawSrc && runtimeContext !== null && isExternalUrl(rawSrc) ? rawSrc : undefined
+  // Why key effects on the cache key: callers rebuild equal context objects on unrelated store
+  // updates, and re-leasing on each one revoked the URL an <img> was still showing.
+  const cacheKey = getLocalImageSrcCacheKey(rawSrc, filePath, connectionId, runtimeContext, access)
+  const readImage = useEffectEvent((): Promise<string | null> => {
+    const absolutePath = rawSrc ? resolveImageAbsolutePath(rawSrc, filePath) : null
+    return absolutePath
+      ? loadLocalImageAbsolutePath(absolutePath, connectionId, runtimeContext, access)
+      : Promise.resolve(null)
+  })
 
   useEffect(() => {
-    return acquireLocalImageSrcLease(rawSrc, filePath, connectionId, runtimeContext, access)
-  }, [rawSrc, filePath, connectionId, runtimeContext, access])
+    if (!cacheKey) {
+      return
+    }
+    pinLocalImageCache(cacheKey)
+    return () => unpinLocalImageCache(cacheKey)
+  }, [cacheKey])
 
   useEffect(() => {
     return onImageCacheInvalidated(() => setGeneration(getLocalImageCacheGeneration()))
   }, [])
 
-  const [displaySrc, setDisplaySrc] = useState<string | undefined>(() => {
-    if (!rawSrc || runtimeContext === null) {
-      return undefined
-    }
-    if (isExternalUrl(rawSrc)) {
-      return rawSrc
-    }
-    const absolutePath = resolveImageAbsolutePath(rawSrc, filePath)
-    if (absolutePath) {
-      const cacheKey = getLocalImageCacheKey(absolutePath, connectionId, runtimeContext, access)
-      if (blobUrlCache.has(cacheKey)) {
-        return blobUrlCache.get(cacheKey)
-      }
-    }
-    return undefined
-  })
+  const [displaySrc, setDisplaySrc] = useState<string | undefined>(
+    () => externalSrc ?? (cacheKey ? blobUrlCache.get(cacheKey) : undefined)
+  )
 
   useEffect(() => {
-    if (!rawSrc || runtimeContext === null) {
-      setDisplaySrc(undefined)
+    if (externalSrc || !cacheKey) {
+      setDisplaySrc(externalSrc)
       return
     }
-
-    if (isExternalUrl(rawSrc)) {
-      setDisplaySrc(rawSrc)
-      return
-    }
-
-    const absolutePath = resolveImageAbsolutePath(rawSrc, filePath)
-    if (!absolutePath) {
-      setDisplaySrc(undefined)
-      return
-    }
-
-    const cacheKey = getLocalImageCacheKey(absolutePath, connectionId, runtimeContext, access)
-    if (blobUrlCache.has(cacheKey)) {
-      setDisplaySrc(blobUrlCache.get(cacheKey))
+    const cached = blobUrlCache.get(cacheKey)
+    if (cached) {
+      setDisplaySrc(cached)
       return
     }
 
     let cancelled = false
     const effectGeneration = generation
-    loadLocalImageAbsolutePath(absolutePath, connectionId, runtimeContext, access)
+    readImage()
       .then((url) => {
         if (cancelled) {
           return
@@ -145,7 +154,7 @@ export function useLocalImageSrc(
     return () => {
       cancelled = true
     }
-  }, [rawSrc, filePath, generation, connectionId, runtimeContext, access])
+  }, [cacheKey, externalSrc, generation])
 
   return displaySrc
 }
@@ -248,40 +257,16 @@ export function acquireLocalImageSrcLease(
   rawSrc: string | undefined,
   filePath: string,
   connectionId?: string | null,
-  runtimeContext?:
-    | (Omit<RuntimeFileOperationArgs, 'connectionId'> & { connectionId?: string | null })
-    | null,
+  runtimeContext?: LocalImageRuntimeContext | null,
   access?: LocalFileAccess
 ): (() => void) | undefined {
-  if (!rawSrc || isExternalUrl(rawSrc) || runtimeContext === null) {
+  const key = getLocalImageSrcCacheKey(rawSrc, filePath, connectionId, runtimeContext, access)
+  if (!key) {
     return undefined
   }
-  const absolutePath = resolveImageAbsolutePath(rawSrc, filePath)
-  if (!absolutePath) {
-    return undefined
-  }
-  const key = getLocalImageCacheKey(absolutePath, connectionId, runtimeContext, access)
   pinLocalImageCache(key)
   return () => unpinLocalImageCache(key)
 }
 
-/** Evict one no-longer-visible transcript preview immediately. */
-export function releaseLocalImageSrc(
-  rawSrc: string,
-  filePath: string,
-  connectionId?: string | null,
-  runtimeContext?:
-    | (Omit<RuntimeFileOperationArgs, 'connectionId'> & { connectionId?: string | null })
-    | null,
-  access?: LocalFileAccess
-): void {
-  if (!rawSrc || isExternalUrl(rawSrc) || runtimeContext === null) {
-    return
-  }
-  const absolutePath = resolveImageAbsolutePath(rawSrc, filePath)
-  if (!absolutePath) {
-    return
-  }
-  const key = getLocalImageCacheKey(absolutePath, connectionId, runtimeContext, access)
-  releaseLocalImageBlob(key)
-}
+/** Evict the image cached under a `getLocalImageSrcCacheKey` key unless a preview pins it. */
+export const releaseLocalImageSrcByKey = releaseLocalImageBlob
diff --git a/src/renderer/src/components/native-chat/NativeChatComposer.tsx b/src/renderer/src/components/native-chat/NativeChatComposer.tsx
index 29f7b099109..f0f138ff9c1 100644
--- a/src/renderer/src/components/native-chat/NativeChatComposer.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatComposer.tsx
@@ -1,6 +1,5 @@
 import type { NativeChatComposerInput } from './native-chat-composer-input'
 import { forwardRef, useCallback, useState } from 'react'
-import { useAppStore } from '../../store'
 import { useNativeChatComposerInterrupt } from './use-native-chat-composer-interrupt'
 import { useNativeChatContextUsageSummary } from './use-native-chat-context-usage-summary'
 import { getSettingsForAgentTabRuntimeOwner } from '@/lib/agent-paste-draft'
@@ -14,13 +13,14 @@ import { useNativeChatLaunchDraftAdoption } from './use-native-chat-launch-draft
 import { NativeChatComposerField } from './NativeChatComposerField'
 import type { NativeChatResolvedTarget } from './native-chat-composer-target'
 import { useNativeChatComposerAttachments } from './use-native-chat-composer-attachments'
+import { nativeChatImageSendBlock } from './native-chat-image-reattach'
 import { useNativeChatComposerHandle } from './use-native-chat-composer-handle'
 import { useNativeChatExternalAttachments } from './use-native-chat-external-attachments'
 import { useNativeChatComposerKeyDown } from './use-native-chat-composer-keydown'
 import { useNativeChatSendLifecycle } from './use-native-chat-send-lifecycle'
 import { useNativeChatSessionOptions } from './use-native-chat-session-options'
 import { useNativeChatFileAttachmentActions } from './use-native-chat-file-attachment-actions'
-import { useNativeChatDictationActions } from './use-native-chat-dictation-actions'
+import { useNativeChatDictation } from './use-native-chat-dictation'
 import { useNativeChatSessionOptionCommand } from './use-native-chat-session-option-command'
 import { useNativeChatComposerCatalog } from './use-native-chat-composer-catalog'
 import { useNativeChatPickerState } from './use-native-chat-picker-state'
@@ -54,6 +54,7 @@ const NativeChatComposerPane = forwardRef<NativeChatComposerHandle, NativeChatCo
     {
       terminalTabId,
       paneKey,
+      draftScopeKey = paneKey,
       targetPtyId,
       agent,
       canSend = true,
@@ -75,10 +76,10 @@ const NativeChatComposerPane = forwardRef<NativeChatComposerHandle, NativeChatCo
     // Scope key shared with image attachments so an unsent draft + its attached
     // images survive both TUI/GUI toggles and PTY replacement on reconnect.
     // Why: local, SSH, and runtime reconnects can replace or temporarily clear
-    // the PTY id. Pane identity is the stable ownership key for unsent input.
+    // the PTY id. Pane (or conversation) identity is the stable owner of unsent input.
     const imeEnterGesture = useImeEnterGestureOwnership()
     const { draft, setDraft, flushDraftAppends } = useNativeChatDraft(
-      paneKey,
+      draftScopeKey,
       imeEnterGesture.isComposing
     )
     const [caret, setCaret] = useState(draft.length)
@@ -95,21 +96,12 @@ const NativeChatComposerPane = forwardRef<NativeChatComposerHandle, NativeChatCo
     const [history, setHistory] = useState<HistoryState>(EMPTY_HISTORY)
     const [activeSuggestion, setActiveSuggestion] = useState(0)
     const [notice, setNotice] = useState<string | null>(null)
-    const [dictationPressed, setDictationPressed] = useState(false)
     const { textareaRef } = useNativeChatComposerAppMenuSelection(imeEnterGesture.isComposing)
     const { cancelPendingSends, trackPendingSend } = useNativeChatSendLifecycle(
       terminalTabId,
       targetPtyId,
       onOptimisticSendCanceled
     )
-    const dictationState = useAppStore((store) => store.dictationState)
-    const voiceSettings = useAppStore((store) => store.settings?.voice)
-    const dictationDisabled = voiceSettings?.enabled !== true || !voiceSettings.sttModel
-    const isDictating =
-      dictationPressed ||
-      dictationState === 'starting' ||
-      dictationState === 'listening' ||
-      dictationState === 'stopping'
 
     const { agentCommands, sessionSkillNames } = useNativeChatComposerCatalog(
       agent,
@@ -155,7 +147,7 @@ const NativeChatComposerPane = forwardRef<NativeChatComposerHandle, NativeChatCo
     }, [])
 
     const attachments = useNativeChatComposerAttachments({
-      attachmentScopeKey: paneKey,
+      attachmentScopeKey: draftScopeKey,
       allowWithoutTarget: Boolean(structuredTransport),
       caret,
       disabled,
@@ -183,12 +175,10 @@ const NativeChatComposerPane = forwardRef<NativeChatComposerHandle, NativeChatCo
       attachResolvedPaths,
       setNotice
     })
-    // A pasted image has no agent-readable path until its save lands; sending
-    // mid-save would ship the message without the image the chip promises.
-    const hasPendingAttachment = imageAttachments.some((attachment) => attachment.pending)
+    const imageBlock = nativeChatImageSendBlock(imageAttachments)
     const sendButtonDisabled = isWorking
       ? !hasPty || !onStop
-      : disabled || hasPendingAttachment || (draft.trim() === '' && imageAttachments.length === 0)
+      : disabled || imageBlock.holdsSend || (draft.trim() === '' && imageAttachments.length === 0)
 
     const { attachExternalPaths, resolveAttachmentOwner } = useNativeChatExternalAttachments({
       terminalTabId,
@@ -224,8 +214,7 @@ const NativeChatComposerPane = forwardRef<NativeChatComposerHandle, NativeChatCo
     })
 
     const { pickAttachment } = useNativeChatFileAttachmentActions(paneKey, attachExternalPaths)
-    const { toggleDictation, startHoldDictation, stopHoldDictation } =
-      useNativeChatDictationActions({ textareaRef, setDictationPressed })
+    const dictation = useNativeChatDictation(textareaRef)
     const { dispatch: dispatchSessionOptionCommand, isDispatching: isDispatchingSessionOption } =
       useNativeChatSessionOptionCommand({
         agent,
@@ -251,10 +240,10 @@ const NativeChatComposerPane = forwardRef<NativeChatComposerHandle, NativeChatCo
 
     const sendStructured = useNativeChatStructuredComposerSend({
       agent,
-      draft,
+      draftScopeKey,
       imageAttachments,
       structuredTransport,
-      clearImageAttachments,
+      isComposing: imeEnterGesture.isComposing,
       clearSkillOrigin,
       setHistory,
       setDraft,
@@ -288,6 +277,7 @@ const NativeChatComposerPane = forwardRef<NativeChatComposerHandle, NativeChatCo
     })
     const { send, goalMode } = useNativeChatComposerSubmit({
       structuredTransport,
+      draftScopeKey,
       draft,
       caret,
       imageAttachments,
@@ -363,7 +353,8 @@ const NativeChatComposerPane = forwardRef<NativeChatComposerHandle, NativeChatCo
 
     return (
       <NativeChatComposerField
-        composerScopeKey={paneKey}
+        dropScopeKey={paneKey}
+        draftScopeKey={draftScopeKey}
         textareaRef={textareaRef}
         draft={draft}
         disabled={disabled}
@@ -374,11 +365,12 @@ const NativeChatComposerPane = forwardRef<NativeChatComposerHandle, NativeChatCo
         notice={notice}
         imageAttachments={imageAttachments}
         sendButtonDisabled={sendButtonDisabled}
+        sendBlockedReason={imageBlock.reason}
         isWorking={isWorking}
         attachDisabled={disabled}
-        dictationDisabled={dictationDisabled}
-        isDictating={isDictating}
-        isDictationHoldMode={voiceSettings?.dictationMode === 'hold'}
+        dictationDisabled={dictation.dictationDisabled}
+        isDictating={dictation.isDictating}
+        isDictationHoldMode={dictation.isDictationHoldMode}
         imeEnterGesture={imeEnterGesture}
         onDraftChange={handleDraftChange}
         onTextareaSelect={(element) => {
@@ -412,9 +404,9 @@ const NativeChatComposerPane = forwardRef<NativeChatComposerHandle, NativeChatCo
         }}
         onRemoveImageAttachment={(id) => removeImageAttachment(id)}
         onAttach={pickAttachment}
-        onDictationToggle={toggleDictation}
-        onDictationHoldStart={startHoldDictation}
-        onDictationHoldEnd={stopHoldDictation}
+        onDictationToggle={dictation.toggleDictation}
+        onDictationHoldStart={dictation.startHoldDictation}
+        onDictationHoldEnd={dictation.stopHoldDictation}
         onSend={send}
         onStop={interrupt}
         sessionOptionsSurface={sessionOptionsSurface}
diff --git a/src/renderer/src/components/native-chat/NativeChatComposerActions.test.tsx b/src/renderer/src/components/native-chat/NativeChatComposerActions.test.tsx
index 99db859aab5..44f2f806e48 100644
--- a/src/renderer/src/components/native-chat/NativeChatComposerActions.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatComposerActions.test.tsx
@@ -114,4 +114,55 @@ describe('NativeChatComposerActions', () => {
     expect(onSend).not.toHaveBeenCalled()
     expect(onStop).not.toHaveBeenCalled()
   })
+
+  it('says on the disabled send button what to do to send', () => {
+    render(
+      <NativeChatComposerActions
+        attachDisabled={false}
+        dictationDisabled={false}
+        sendDisabled
+        sendBlockedReason="An image couldn't be brought back. Remove it to send."
+        isWorking={false}
+        isDictating={false}
+        isDictationHoldMode={false}
+        onAttach={vi.fn()}
+        onDictationToggle={vi.fn()}
+        onDictationHoldStart={vi.fn()}
+        onDictationHoldEnd={vi.fn()}
+        onSend={vi.fn()}
+        sessionOptionsSurface={null}
+        sessionOptionsSnapshot={[]}
+      />
+    )
+
+    const send = screen.getByRole('button', {
+      name: "An image couldn't be brought back. Remove it to send."
+    })
+    expect(send.hasAttribute('disabled')).toBe(true)
+  })
+
+  it('marks a draft that could not be saved only after storage refused it', () => {
+    const props = {
+      attachDisabled: false,
+      dictationDisabled: false,
+      sendDisabled: false,
+      isWorking: false,
+      isDictating: false,
+      isDictationHoldMode: false,
+      onAttach: vi.fn(),
+      onDictationToggle: vi.fn(),
+      onDictationHoldStart: vi.fn(),
+      onDictationHoldEnd: vi.fn(),
+      onSend: vi.fn(),
+      sessionOptionsSurface: null,
+      sessionOptionsSnapshot: []
+    }
+    const explanation = "This draft couldn't be saved yet. Orca keeps trying."
+    const { rerender } = render(<NativeChatComposerActions {...props} />)
+    expect(screen.queryByRole('img', { name: explanation })).toBeNull()
+
+    rerender(<NativeChatComposerActions {...props} draftNotSaved />)
+    expect(screen.getByRole('img', { name: explanation })).toBeTruthy()
+    expect(screen.getByRole('button', { name: 'Send' }).hasAttribute('disabled')).toBe(false)
+  })
 })
diff --git a/src/renderer/src/components/native-chat/NativeChatComposerActions.tsx b/src/renderer/src/components/native-chat/NativeChatComposerActions.tsx
index 3012aa28cc4..a8fed079f69 100644
--- a/src/renderer/src/components/native-chat/NativeChatComposerActions.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatComposerActions.tsx
@@ -1,4 +1,4 @@
-import { ArrowUp, Mic, Plus, Square } from 'lucide-react'
+import { ArrowUp, CircleAlert, Mic, Plus, Square } from 'lucide-react'
 import { Button } from '@/components/ui/button'
 import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
 import { translate } from '@/i18n/i18n'
@@ -16,6 +16,10 @@ export type NativeChatComposerActionsProps = {
   attachDisabled: boolean
   dictationDisabled: boolean
   sendDisabled: boolean
+  /** Shown on the disabled send button: what the user can do to send. */
+  sendBlockedReason?: string | null
+  /** Storage refused this draft; it is held in memory only. */
+  draftNotSaved?: boolean
   isWorking: boolean
   isDictating: boolean
   isDictationHoldMode: boolean
@@ -38,6 +42,8 @@ export function NativeChatComposerActions({
   attachDisabled,
   dictationDisabled,
   sendDisabled,
+  sendBlockedReason,
+  draftNotSaved,
   isWorking,
   isDictating,
   isDictationHoldMode,
@@ -68,6 +74,26 @@ export function NativeChatComposerActions({
   const dictationLabel = isDictating
     ? translate('components.native-chat.composer.stopDictation', 'Stop dictation')
     : translate('components.native-chat.composer.startDictation', 'Start dictation')
+  const sendReason = isWorking ? null : (sendBlockedReason ?? null)
+  const sendButton = (
+    <Button
+      type="button"
+      data-native-chat-critical-action={isWorking ? 'stop' : undefined}
+      aria-label={
+        isWorking
+          ? translate('components.native-chat.stop', 'Stop the agent')
+          : (sendReason ?? translate('components.native-chat.composer.send', 'Send'))
+      }
+      disabled={sendDisabled}
+      onClick={handleCriticalAction}
+      variant={isWorking ? 'secondary' : 'default'}
+      size="icon"
+      className="size-8 rounded-full pointer-coarse:size-10"
+    >
+      {isWorking ? <Square className="size-3.5 fill-current" /> : <ArrowUp className="size-4" />}
+    </Button>
+  )
+
   return (
     <div className="flex w-full items-center justify-between gap-2">
       <div className="flex min-w-0 items-center gap-0.5">
@@ -145,27 +171,44 @@ export function NativeChatComposerActions({
             {dictationLabel}
           </TooltipContent>
         </Tooltip>
-        <Button
-          type="button"
-          data-native-chat-critical-action={isWorking ? 'stop' : undefined}
-          aria-label={
-            isWorking
-              ? translate('components.native-chat.stop', 'Stop the agent')
-              : translate('components.native-chat.composer.send', 'Send')
-          }
-          disabled={sendDisabled}
-          onClick={handleCriticalAction}
-          variant={isWorking ? 'secondary' : 'default'}
-          size="icon"
-          className="size-8 rounded-full pointer-coarse:size-10"
-        >
-          {isWorking ? (
-            <Square className="size-3.5 fill-current" />
-          ) : (
-            <ArrowUp className="size-4" />
-          )}
-        </Button>
+        <DraftNotSavedIcon shown={draftNotSaved === true} />
+        {sendReason ? (
+          <Tooltip>
+            <TooltipTrigger asChild>
+              {/* A disabled button gets no pointer events, so the wrapper carries the hover. */}
+              <span className="inline-flex">{sendButton}</span>
+            </TooltipTrigger>
+            <TooltipContent side="top" sideOffset={4}>
+              {sendReason}
+            </TooltipContent>
+          </Tooltip>
+        ) : (
+          sendButton
+        )}
       </div>
     </div>
   )
 }
+
+/** Shown only after storage refused the draft, so it never appears on a normal save. */
+function DraftNotSavedIcon({ shown }: { shown: boolean }): React.JSX.Element | null {
+  if (!shown) {
+    return null
+  }
+  const explanation = translate(
+    'components.native-chat.composer.draftNotSaved',
+    "This draft couldn't be saved yet. Orca keeps trying."
+  )
+  return (
+    <Tooltip>
+      <TooltipTrigger asChild>
+        <span role="img" aria-label={explanation} className="inline-flex text-status-warning">
+          <CircleAlert className="size-4" />
+        </span>
+      </TooltipTrigger>
+      <TooltipContent side="top" sideOffset={4}>
+        {explanation}
+      </TooltipContent>
+    </Tooltip>
+  )
+}
diff --git a/src/renderer/src/components/native-chat/NativeChatComposerField.tsx b/src/renderer/src/components/native-chat/NativeChatComposerField.tsx
index ccbd38afe84..77f33c63334 100644
--- a/src/renderer/src/components/native-chat/NativeChatComposerField.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatComposerField.tsx
@@ -19,11 +19,14 @@ import type { NativeChatOptionPickerRequest } from './native-chat-composer-types
 import { NativeChatImageAttachmentPreview } from './NativeChatImageAttachmentPreview'
 import type { NativeChatComposerGoalMode } from './use-native-chat-composer-submit'
 import { translate } from '@/i18n/i18n'
+import { useNativeChatComposerDraftUnsaved } from './use-native-chat-draft-unsaved'
 
 export type NativeChatComposerFieldProps = {
   /** Pane identity published to the drop pipeline so a native file drop lands
    *  only in the composer it was dropped on. */
-  composerScopeKey: string
+  dropScopeKey: string
+  /** Owner of the draft the editor's document is saved with. */
+  draftScopeKey: string
   textareaRef: RefObject<NativeChatComposerInput | null>
   draft: string
   disabled: boolean
@@ -34,6 +37,8 @@ export type NativeChatComposerFieldProps = {
   notice: string | null
   imageAttachments: readonly NativeChatComposerImageAttachment[]
   sendButtonDisabled: boolean
+  /** Why the send button is disabled, when the user can do something about it. */
+  sendBlockedReason?: string | null
   isWorking: boolean
   attachDisabled: boolean
   dictationDisabled: boolean
@@ -73,6 +78,8 @@ export type NativeChatComposerImageAttachment = {
   previewUrl?: string
   /** True while the pasted image is still being written to disk or uploaded. */
   pending?: boolean
+  /** Set on an image the draft names but can't send: the file to attach again. */
+  unavailableName?: string
 }
 
 /**
@@ -97,7 +104,8 @@ function imeComposedSegment(base: string, settled: string): string {
 }
 
 export function NativeChatComposerField({
-  composerScopeKey,
+  dropScopeKey,
+  draftScopeKey,
   textareaRef,
   draft,
   disabled,
@@ -108,6 +116,7 @@ export function NativeChatComposerField({
   notice,
   imageAttachments,
   sendButtonDisabled,
+  sendBlockedReason,
   isWorking,
   attachDisabled,
   dictationDisabled,
@@ -136,6 +145,7 @@ export function NativeChatComposerField({
   sessionOptionsPickerRequest,
   goalMode
 }: NativeChatComposerFieldProps): React.JSX.Element {
+  const draftNotSaved = useNativeChatComposerDraftUnsaved(draftScopeKey)
   // Value the IME started from, and whether a programmatic clear was dropped on top of it.
   const compositionBaseRef = useRef('')
   const droppedDraftClearRef = useRef(false)
@@ -193,7 +203,7 @@ export function NativeChatComposerField({
           ) : null}
           <div
             data-native-file-drop-target={NATIVE_FILE_DROP_TARGET.composer}
-            data-composer-scope-key={composerScopeKey}
+            data-composer-scope-key={dropScopeKey}
             className={cn(
               // Why: always-on hairline (token-level border, not focus ring) —
               // no focus/click border flash. The box is a container, not a
@@ -222,8 +232,8 @@ export function NativeChatComposerField({
               </div>
             ) : null}
             <NativeChatPromptEditor
-              key={composerScopeKey}
-              scopeKey={composerScopeKey}
+              key={draftScopeKey}
+              scopeKey={draftScopeKey}
               inputRef={textareaRef}
               initialValue={draft}
               disabled={disabled}
@@ -285,6 +295,8 @@ export function NativeChatComposerField({
                 attachDisabled={attachDisabled}
                 dictationDisabled={dictationDisabled}
                 sendDisabled={sendButtonDisabled}
+                sendBlockedReason={sendBlockedReason}
+                draftNotSaved={draftNotSaved}
                 isWorking={isWorking}
                 isDictating={isDictating}
                 isDictationHoldMode={isDictationHoldMode}
diff --git a/src/renderer/src/components/native-chat/NativeChatImageAttachmentPreview.test.tsx b/src/renderer/src/components/native-chat/NativeChatImageAttachmentPreview.test.tsx
index 068592d16c4..6577b4d1fff 100644
--- a/src/renderer/src/components/native-chat/NativeChatImageAttachmentPreview.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatImageAttachmentPreview.test.tsx
@@ -10,7 +10,8 @@ const mocks = vi.hoisted(() => ({
 }))
 
 vi.mock('@/i18n/i18n', () => ({
-  translate: (_key: string, fallback: string) => fallback
+  translate: (_key: string, fallback: string, options?: Record<string, string>) =>
+    fallback.replace(/\{\{(\w+)\}\}/g, (_match, name: string) => options?.[name] ?? '')
 }))
 
 vi.mock('@/components/editor/useLocalImageSrc', () => ({
@@ -54,4 +55,45 @@ describe('NativeChatImageAttachmentPreview', () => {
       kind: 'chat-image'
     })
   })
+
+  it('shows a pasted image that could not come back by name, says it was not kept, and lets it be removed', () => {
+    mocks.useLocalImageSrc.mockReturnValue(undefined)
+    const onRemove = vi.fn()
+    vi.stubGlobal('IntersectionObserver', undefined)
+    render(
+      <NativeChatImageAttachmentPreview
+        attachment={{ id: 'm1', path: '', unavailableName: 'orca-paste-1-ab.png' }}
+        onRemove={onRemove}
+      />
+    )
+
+    expect(
+      screen.getByRole('img', {
+        name: "This pasted image couldn't be brought back with this draft. Remove it, and paste it again if you still need it."
+      })
+    ).toBeTruthy()
+    expect(screen.getByText('Pasted image')).toBeTruthy()
+    expect(screen.getByText('Not kept')).toBeTruthy()
+    screen.getByRole('button', { name: 'Remove attachment' }).click()
+    expect(onRemove).toHaveBeenCalledWith('m1')
+  })
+
+  it('shows a file that could not come back by name, with a visible attach-again hint', () => {
+    mocks.useLocalImageSrc.mockReturnValue(undefined)
+    vi.stubGlobal('IntersectionObserver', undefined)
+    render(
+      <NativeChatImageAttachmentPreview
+        attachment={{ id: 'm2', path: '', unavailableName: 'diagram.png' }}
+        onRemove={vi.fn()}
+      />
+    )
+
+    expect(
+      screen.getByRole('img', {
+        name: "diagram.png couldn't be brought back with this draft. Attach it again or remove it."
+      })
+    ).toBeTruthy()
+    expect(screen.getByText('diagram.png')).toBeTruthy()
+    expect(screen.getByText('Attach again')).toBeTruthy()
+  })
 })
diff --git a/src/renderer/src/components/native-chat/NativeChatImageAttachmentPreview.tsx b/src/renderer/src/components/native-chat/NativeChatImageAttachmentPreview.tsx
index 819cfaeaf9e..1a928c7c8ad 100644
--- a/src/renderer/src/components/native-chat/NativeChatImageAttachmentPreview.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatImageAttachmentPreview.tsx
@@ -1,5 +1,5 @@
 import { useEffect, useRef, useState } from 'react'
-import { Image as ImageIcon, Loader2, X } from 'lucide-react'
+import { Image as ImageIcon, ImageOff, Loader2, X } from 'lucide-react'
 import { Dialog, DialogContent, DialogDescription, DialogTitle } from '@/components/ui/dialog'
 import { translate } from '@/i18n/i18n'
 import { basename } from '@/lib/path'
@@ -18,6 +18,86 @@ export function NativeChatImageAttachmentPreview({
   attachment,
   onRemove
 }: Props): React.JSX.Element {
+  if (attachment.unavailableName !== undefined) {
+    return (
+      <NativeChatUnavailableImageChip
+        id={attachment.id}
+        name={attachment.unavailableName}
+        onRemove={onRemove}
+      />
+    )
+  }
+  return <NativeChatImageThumbnail attachment={attachment} onRemove={onRemove} />
+}
+
+function attachmentLabel(path: string): string {
+  return isNativeChatPastedImagePath(path)
+    ? translate('components.native-chat.composer.pastedImageLabel', 'Pasted image')
+    : basename(path)
+}
+
+function RemoveAttachmentButton({ onRemove }: { onRemove: () => void }): React.JSX.Element {
+  return (
+    <button
+      type="button"
+      onClick={onRemove}
+      aria-label={translate(
+        'components.native-chat.composer.removeAttachment',
+        'Remove attachment'
+      )}
+      className="absolute -right-1.5 -top-1.5 flex size-4 items-center justify-center rounded-full border border-border bg-background text-muted-foreground shadow-xs transition-colors hover:bg-accent hover:text-accent-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring"
+    >
+      <X className="size-3" />
+    </button>
+  )
+}
+
+/** An image the draft names but couldn't bring back. A file can be attached again in its place; a
+ *  pasted image can't be matched by a new paste, so its copy asks only for removal. */
+function NativeChatUnavailableImageChip({
+  id,
+  name,
+  onRemove
+}: {
+  id: string
+  name: string
+  onRemove: (id: string) => void
+}): React.JSX.Element {
+  const pasted = isNativeChatPastedImagePath(name)
+  const label = attachmentLabel(name)
+  const explanation = pasted
+    ? translate(
+        'components.native-chat.composer.pastedImageNotBroughtBack',
+        "This pasted image couldn't be brought back with this draft. Remove it, and paste it again if you still need it."
+      )
+    : translate(
+        'components.native-chat.composer.imageNotBroughtBack',
+        "{{name}} couldn't be brought back with this draft. Attach it again or remove it.",
+        { name: label }
+      )
+  const hint = pasted
+    ? translate('components.native-chat.composer.pastedImageNotKeptLabel', 'Not kept')
+    : translate('components.native-chat.composer.imageAttachAgainLabel', 'Attach again')
+  return (
+    <div className="relative h-14 max-w-40 shrink-0">
+      <div
+        role="img"
+        aria-label={explanation}
+        title={explanation}
+        className="flex h-full items-center gap-2 rounded-md border border-dashed border-border bg-background px-2"
+      >
+        <ImageOff className="size-4 shrink-0 text-muted-foreground" />
+        <div className="flex min-w-0 flex-col text-xs">
+          <span className="truncate text-foreground">{label}</span>
+          <span className="truncate text-muted-foreground">{hint}</span>
+        </div>
+      </div>
+      <RemoveAttachmentButton onRemove={() => onRemove(id)} />
+    </div>
+  )
+}
+
+function NativeChatImageThumbnail({ attachment, onRemove }: Props): React.JSX.Element {
   const [isOpen, setIsOpen] = useState(false)
   const [isNearViewport, setIsNearViewport] = useState(false)
   const thumbnailRef = useRef<HTMLDivElement>(null)
@@ -55,9 +135,7 @@ export function NativeChatImageAttachmentPreview({
   // round-trip; the on-disk file only wins for the full-size dialog.
   const thumbnailSrc = attachment.previewUrl ?? localSrc
   const fullSizeSrc = localSrc ?? attachment.previewUrl
-  const filename = isNativeChatPastedImagePath(attachment.path)
-    ? translate('components.native-chat.composer.pastedImageLabel', 'Pasted image')
-    : basename(attachment.path)
+  const filename = attachmentLabel(attachment.path)
   const pendingLabel = translate(
     'components.native-chat.composer.imageSaving',
     'Saving pasted image…'
@@ -94,17 +172,7 @@ export function NativeChatImageAttachmentPreview({
             <Loader2 className="size-4 animate-spin text-muted-foreground" />
           </span>
         ) : null}
-        <button
-          type="button"
-          onClick={() => onRemove(attachment.id)}
-          aria-label={translate(
-            'components.native-chat.composer.removeAttachment',
-            'Remove attachment'
-          )}
-          className="absolute -right-1.5 -top-1.5 flex size-4 items-center justify-center rounded-full border border-border bg-background text-muted-foreground shadow-xs transition-colors hover:bg-accent hover:text-accent-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring"
-        >
-          <X className="size-3" />
-        </button>
+        <RemoveAttachmentButton onRemove={() => onRemove(attachment.id)} />
       </div>
       <Dialog open={isOpen} onOpenChange={setIsOpen}>
         <DialogContent className="flex max-h-[90vh] max-w-[90vw] flex-col gap-3 border-border bg-background p-3 sm:max-w-4xl">
diff --git a/src/renderer/src/components/native-chat/NativeChatPromptEditor.tsx b/src/renderer/src/components/native-chat/NativeChatPromptEditor.tsx
index ceb812e6291..66d5870e1e1 100644
--- a/src/renderer/src/components/native-chat/NativeChatPromptEditor.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatPromptEditor.tsx
@@ -2,6 +2,7 @@ import {
   readNativeChatDraftDocument,
   writeNativeChatDraftDocument
 } from './native-chat-draft-cache'
+import { hasUnsavedNativeChatComposerDraftChange } from './native-chat-composer-draft-store'
 import { closeHistory } from '@tiptap/pm/history'
 import { Slice } from '@tiptap/pm/model'
 import {
@@ -104,7 +105,15 @@ export function NativeChatPromptEditor({
           )
       },
       onTransaction: ({ editor: current, transaction }) => {
-        if (scopeKey && transaction.docChanged) {
+        // Why: a value set from the store with no change of this window behind it (another
+        // window's draft, a late load) is already saved; saving it back would make it one. A
+        // value this window just set keeps its document, skill chips included.
+        if (
+          scopeKey &&
+          transaction.docChanged &&
+          (!transaction.getMeta('preventUpdate') ||
+            hasUnsavedNativeChatComposerDraftChange(scopeKey))
+        ) {
           writeNativeChatDraftDocument(
             scopeKey,
             promptTextMap(current.state.doc).text,
@@ -148,6 +157,12 @@ export function NativeChatPromptEditor({
               if (old.text === value) {
                 return
               }
+              // A draft loaded or adopted whole keeps its skill chips: its stored document wins.
+              const stored = scopeKey ? readNativeChatDraftDocument(scopeKey, value) : undefined
+              if (stored) {
+                editor.commands.setContent(stored, { emitUpdate: false })
+                return
+              }
               if (!value) {
                 editor.commands.setContent(promptTextContent(''), { emitUpdate: false })
                 return
@@ -231,7 +246,7 @@ export function NativeChatPromptEditor({
             }
           }
         : null,
-    [editor]
+    [editor, scopeKey]
   )
   useImperativeHandle(inputRef, () => input!, [input])
 
diff --git a/src/renderer/src/components/native-chat/NativeChatStructuredSession.test.tsx b/src/renderer/src/components/native-chat/NativeChatStructuredSession.test.tsx
index e2c4c6ff030..c29afa08fa6 100644
--- a/src/renderer/src/components/native-chat/NativeChatStructuredSession.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatStructuredSession.test.tsx
@@ -28,6 +28,7 @@ vi.mock('./NativeChatQuestionCard', () => moduleFactories.nativeChatQuestionCard
 
 import { NativeChatStructuredSession } from './NativeChatStructuredSession'
 import { structuredAgentSessionPaneKey } from '../../../../shared/structured-agent-session-projection'
+import { structuredAgentSessionDraftScopeKey } from './native-chat-composer-draft-store'
 
 describe('NativeChatStructuredSession', () => {
   afterEach(() => {
@@ -35,7 +36,7 @@ describe('NativeChatStructuredSession', () => {
     resetStructuredSessionMocks()
   })
 
-  it('gives what a Stop withdrew back to the composer this pane shows', () => {
+  it("gives the composer this pane shows the conversation's own draft, and Stop returns text there", () => {
     render(
       <NativeChatStructuredSession
         isVisible
@@ -47,8 +48,14 @@ describe('NativeChatStructuredSession', () => {
       />
     )
     const paneKey = structuredAgentSessionPaneKey('structured-tab-1', 'session-1')
-    expect(mocks.composerProps).toMatchObject({ paneKey })
-    expect(mocks.controllerProps).toMatchObject({ composerScopeKey: paneKey })
+    // The pane routes drops and pickers; the draft belongs to the conversation, whatever pane shows it.
+    expect(mocks.composerProps).toMatchObject({
+      paneKey,
+      draftScopeKey: structuredAgentSessionDraftScopeKey('session-1')
+    })
+    expect(mocks.controllerProps).toMatchObject({
+      composerScopeKey: structuredAgentSessionDraftScopeKey('session-1')
+    })
   })
 
   it('routes the launch draft and app-menu paste to the structured composer', () => {
diff --git a/src/renderer/src/components/native-chat/NativeChatStructuredSession.tsx b/src/renderer/src/components/native-chat/NativeChatStructuredSession.tsx
index a81019456b5..b89546d8a42 100644
--- a/src/renderer/src/components/native-chat/NativeChatStructuredSession.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatStructuredSession.tsx
@@ -5,6 +5,7 @@ import { structuredAgentSessionPaneKey } from '../../../../shared/structured-age
 import type { NativeChatLiveSession } from './use-native-chat-live-session'
 import { NativeChatApprovalCard } from './NativeChatApprovalCard'
 import { NativeChatComposer, type NativeChatComposerHandle } from './NativeChatComposer'
+import { structuredAgentSessionDraftScopeKey } from './native-chat-composer-draft-store'
 import { NativeChatEmptyState } from './NativeChatEmptyState'
 import { NativeChatLoadingCue } from './NativeChatLoadingCue'
 import { NativeChatMessageList } from './NativeChatMessageList'
@@ -51,7 +52,8 @@ export function NativeChatStructuredSession(
   const queueFollowUps = useAppStore((store) => store.settings?.nativeChatQueueFollowUps !== false)
   const controller = useStructuredAgentSession({
     ...props,
-    composerScopeKey: paneKey,
+    // Why: Stop and a queued card's Edit give text back to the conversation's draft, as the composer keeps it.
+    composerScopeKey: structuredAgentSessionDraftScopeKey(props.sessionId),
     queueFollowUps,
     providerStarting: startupPhase === 'starting',
     transportEnabled: provisionalLaunch.transportEnabled,
@@ -375,6 +377,7 @@ export function NativeChatStructuredSession(
               ref={composerRef}
               terminalTabId={props.tabId}
               paneKey={paneKey}
+              draftScopeKey={structuredAgentSessionDraftScopeKey(props.sessionId)}
               targetPtyId={null}
               agent={props.agent}
               isWorking={controller.canStop}
diff --git a/src/renderer/src/components/native-chat/NativeChatTranscriptChrome.test.tsx b/src/renderer/src/components/native-chat/NativeChatTranscriptChrome.test.tsx
index 2ba15a08d4c..e2b0433d73d 100644
--- a/src/renderer/src/components/native-chat/NativeChatTranscriptChrome.test.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatTranscriptChrome.test.tsx
@@ -6,8 +6,10 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import type { RuntimeFileOperationArgs } from '@/runtime/runtime-file-client'
 import {
   invalidateLocalImageSrcCacheForTests,
+  loadLocalImageSrc,
   resetLocalImageSrcStateForTests
 } from '@/components/editor/useLocalImageSrc'
+import { chatImageAccess } from '@/lib/local-file-access'
 import { NativeChatImageAttachments } from './NativeChatTranscriptChrome'
 
 globalThis.IS_REACT_ACT_ENVIRONMENT = true
@@ -136,6 +138,88 @@ describe('NativeChatImageAttachments', () => {
     root.unmount()
   })
 
+  it('keeps the shown image when an equal runtime context is rebuilt', async () => {
+    const container = document.createElement('div')
+    const root = createRoot(container)
+    const blocks = [{ type: 'image-ref' as const, path: '/repo/image.png' }]
+
+    await act(async () => {
+      root.render(
+        createElement(NativeChatImageAttachments, {
+          blocks,
+          runtimeContext: runtimeContext('wt-1')
+        })
+      )
+      await flushPromises()
+    })
+    const img = container.querySelector('img')
+    expect(img?.getAttribute('src')).toBe('blob:owner-1')
+
+    for (let update = 0; update < 3; update += 1) {
+      await act(async () => {
+        root.render(
+          createElement(NativeChatImageAttachments, {
+            blocks,
+            runtimeContext: runtimeContext('wt-1')
+          })
+        )
+        await flushPromises()
+      })
+    }
+
+    expect(URL.revokeObjectURL).not.toHaveBeenCalled()
+    expect(window.api.fs.readFile).toHaveBeenCalledOnce()
+    expect(container.querySelector('img')).toBe(img)
+    expect(img?.getAttribute('src')).toBe('blob:owner-1')
+
+    root.unmount()
+  })
+
+  it('keeps an off-screen image cached when an equal runtime context is rebuilt', async () => {
+    class FakeIntersectionObserver {
+      readonly observe = vi.fn()
+      readonly unobserve = vi.fn()
+      readonly disconnect = vi.fn()
+    }
+    vi.stubGlobal('IntersectionObserver', FakeIntersectionObserver)
+    const container = document.createElement('div')
+    const root = createRoot(container)
+    const blocks = [{ type: 'image-ref' as const, path: '/repo/image.png' }]
+    const renderWith = (context: RuntimeFileOperationArgs): void =>
+      root.render(createElement(NativeChatImageAttachments, { blocks, runtimeContext: context }))
+    const loadSameEntry = (): Promise<string | null> =>
+      loadLocalImageSrc(
+        '/repo/image.png',
+        '/repo/image.png',
+        undefined,
+        runtimeContext('wt-1'),
+        chatImageAccess()
+      )
+
+    try {
+      await act(async () => {
+        renderWith(runtimeContext('wt-1'))
+        await flushPromises()
+      })
+      // Off-screen nothing pins the entry, so only the release effect's deps decide whether it survives.
+      await expect(loadSameEntry()).resolves.toBe('blob:owner-1')
+
+      for (let update = 0; update < 3; update += 1) {
+        await act(async () => {
+          renderWith(runtimeContext('wt-1'))
+          await flushPromises()
+        })
+      }
+
+      expect(URL.revokeObjectURL).not.toHaveBeenCalled()
+      await expect(loadSameEntry()).resolves.toBe('blob:owner-1')
+      expect(window.api.fs.readFile).toHaveBeenCalledOnce()
+    } finally {
+      // The visibility observer is module-wide; a leaked one breaks later tests.
+      root.unmount()
+    }
+  })
+
   it('retries a failed thumbnail after the image cache refreshes', async () => {
     const container = document.createElement('div')
     const root = createRoot(container)
diff --git a/src/renderer/src/components/native-chat/NativeChatTranscriptChrome.tsx b/src/renderer/src/components/native-chat/NativeChatTranscriptChrome.tsx
index 402c82816a8..bd93d0c2ee7 100644
--- a/src/renderer/src/components/native-chat/NativeChatTranscriptChrome.tsx
+++ b/src/renderer/src/components/native-chat/NativeChatTranscriptChrome.tsx
@@ -10,8 +10,9 @@ import { nativeChatProviderFrameSummary } from '../../../../shared/native-chat-p
 import { Dialog, DialogContent, DialogDescription, DialogTitle } from '@/components/ui/dialog'
 import {
   getLocalImageCacheKey,
+  getLocalImageSrcCacheKey,
   useLocalImageSrc,
-  releaseLocalImageSrc
+  releaseLocalImageSrcByKey
 } from '@/components/editor/useLocalImageSrc'
 import type { RuntimeFileOperationArgs } from '@/runtime/runtime-file-client'
 import { isNativeChatPastedImagePath } from './native-chat-image-paste'
@@ -75,6 +76,25 @@ function transcriptImageIdentity(
 // load on scroll with no click, so main only serves local image files by their real type.
 const TRANSCRIPT_IMAGE_ACCESS = chatImageAccess()
 
+// Why the cache key, not the context object: the owner hook rebuilds an equal context on
+// unrelated store updates, and releasing on each one revoked the URL the <img> was showing.
+function transcriptImageReleaseKey(
+  source: string | undefined,
+  filePath: string,
+  runtimeContext: RuntimeFileOperationArgs | null | undefined
+): string | null {
+  if (!runtimeContext) {
+    return null
+  }
+  return getLocalImageSrcCacheKey(
+    source,
+    filePath,
+    runtimeContext.connectionId,
+    runtimeContext,
+    TRANSCRIPT_IMAGE_ACCESS
+  )
+}
+
 function TranscriptImagePreview({
   block,
   runtimeContext
@@ -124,17 +144,16 @@ function TranscriptImagePreview({
     }
     return observeTranscriptVisibility(element, setNear)
   }, [])
+  const releaseKey = transcriptImageReleaseKey(source, filePath, runtimeContext)
   useEffect(() => {
-    const context = runtimeContext
-    if (!source || external || context === undefined || context === null) {
+    if (!releaseKey) {
       return
     }
     if (!leaseActive) {
-      releaseLocalImageSrc(source, filePath, context.connectionId, context, TRANSCRIPT_IMAGE_ACCESS)
+      releaseLocalImageSrcByKey(releaseKey)
     }
-    return () =>
-      releaseLocalImageSrc(source, filePath, context.connectionId, context, TRANSCRIPT_IMAGE_ACCESS)
-  }, [external, filePath, leaseActive, runtimeContext, source])
+    return () => releaseLocalImageSrcByKey(releaseKey)
+  }, [leaseActive, releaseKey])
 
   const showPreview =
     leaseActive &&
diff --git a/src/renderer/src/components/native-chat/native-chat-composer-autogrow.test.tsx b/src/renderer/src/components/native-chat/native-chat-composer-autogrow.test.tsx
index 826121db975..52b1e09346f 100644
--- a/src/renderer/src/components/native-chat/native-chat-composer-autogrow.test.tsx
+++ b/src/renderer/src/components/native-chat/native-chat-composer-autogrow.test.tsx
@@ -46,7 +46,8 @@ function TestField({
   const imeEnterGesture = useImeEnterGestureOwnership()
   return (
     <NativeChatComposerField
-      composerScopeKey="pane-test"
+      dropScopeKey="pane-test"
+      draftScopeKey="pane-test"
       textareaRef={createRef<HTMLTextAreaElement>()}
       draft={draft}
       disabled={false}
diff --git a/src/renderer/src/components/native-chat/native-chat-composer-composition.test.tsx b/src/renderer/src/components/native-chat/native-chat-composer-composition.test.tsx
index 8749d20ad39..c1f6dd24cb5 100644
--- a/src/renderer/src/components/native-chat/native-chat-composer-composition.test.tsx
+++ b/src/renderer/src/components/native-chat/native-chat-composer-composition.test.tsx
@@ -35,7 +35,8 @@ function TestField(props: TestFieldProps): React.JSX.Element {
 
 function fieldProps(overrides: Partial<TestFieldProps> = {}): TestFieldProps {
   return {
-    composerScopeKey: 'pane-test',
+    dropScopeKey: 'pane-test',
+    draftScopeKey: 'pane-test',
     textareaRef: createRef<HTMLTextAreaElement>(),
     draft: '',
     disabled: false,
@@ -79,8 +80,12 @@ function textarea(): HTMLTextAreaElement {
 describe('native chat composer drop-scope marker', () => {
   // The drop pipeline stops walking at the drop-target marker, so a scope key on
   // any other element would never reach the payload.
-  it('publishes the scope key on the same element as the drop-target marker', () => {
-    const view = render(<TestField {...fieldProps({ composerScopeKey: 'tab-7:pane-9' })} />)
+  it('publishes the pane key, not the draft key, on the same element as the drop-target marker', () => {
+    const view = render(
+      <TestField
+        {...fieldProps({ dropScopeKey: 'tab-7:pane-9', draftScopeKey: 'agent-session:session-9' })}
+      />
+    )
     const marker = view.container.querySelector('[data-native-file-drop-target="composer"]')
     expect(marker).not.toBeNull()
     expect(marker?.getAttribute('data-composer-scope-key')).toBe('tab-7:pane-9')
diff --git a/src/renderer/src/components/native-chat/native-chat-composer-draft-addition.test.ts b/src/renderer/src/components/native-chat/native-chat-composer-draft-addition.test.ts
new file mode 100644
index 00000000000..25782727d40
--- /dev/null
+++ b/src/renderer/src/components/native-chat/native-chat-composer-draft-addition.test.ts
@@ -0,0 +1,118 @@
+// @vitest-environment happy-dom
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type * as DraftStore from './native-chat-composer-draft-store'
+import type * as DraftCache from './native-chat-draft-cache'
+import { withNativeChatComposerDraftAddition } from './native-chat-composer-draft-addition'
+import {
+  createMemoryNativeChatComposerDraftStorage,
+  type NativeChatComposerDraftStorage
+} from './native-chat-composer-draft-storage'
+
+type DraftModules = { drafts: typeof DraftCache; store: typeof DraftStore }
+
+let storage: ReturnType<typeof createMemoryNativeChatComposerDraftStorage>
+const loaded: DraftModules[] = []
+
+/** A fresh renderer: module memory is gone, the drafts' storage is not. */
+async function reload(
+  options: { using?: NativeChatComposerDraftStorage; hydrate?: boolean } = {}
+): Promise<DraftModules> {
+  vi.resetModules()
+  const storageModule = await import('./native-chat-composer-draft-storage')
+  storageModule.setNativeChatComposerDraftStorageForTests(options.using ?? storage)
+  const modules = {
+    drafts: await import('./native-chat-draft-cache'),
+    store: await import('./native-chat-composer-draft-store')
+  }
+  loaded.push(modules)
+  if (options.hydrate !== false) {
+    await modules.store.hydrateNativeChatComposerDrafts()
+  }
+  return modules
+}
+
+/** Storage whose load waits for `land()`, with what it held when the load began reading. */
+function slowLoading(): { using: NativeChatComposerDraftStorage; land: () => void } {
+  let land: () => void = () => {}
+  const using = {
+    ...storage,
+    loadAll: () => {
+      const snapshot = new Map(storage.drafts)
+      return new Promise<ReadonlyMap<string, unknown>>((resolve) => {
+        land = () => resolve(snapshot)
+      })
+    }
+  }
+  return { using, land: () => land() }
+}
+
+const SCOPE = 'agent-session:s1'
+
+beforeEach(() => {
+  localStorage.clear()
+  storage = createMemoryNativeChatComposerDraftStorage()
+})
+
+afterEach(() => {
+  for (const instance of loaded.splice(0)) {
+    instance.store.clearNativeChatComposerDraftsForTests()
+  }
+})
+
+describe('native-chat composer draft addition', () => {
+  it('adds text to a whitespace-only draft without leading blank lines', () => {
+    const add = (text: string): string =>
+      withNativeChatComposerDraftAddition({ text, images: [] }, { text: 'go' }).text
+    expect(add('  \n\n')).toBe('go')
+    expect(add('please\n')).toBe('please\n\ngo')
+  })
+
+  it('adds text only where the draft does not already end with it as its own paragraph', () => {
+    const add = (text: string): string =>
+      withNativeChatComposerDraftAddition({ text, images: [] }, { text: 'go' }, { once: true }).text
+    expect(add('please go')).toBe('please go\n\ngo')
+    expect(add('please\n\ngo')).toBe('please\n\ngo')
+    expect(add('go\n')).toBe('go\n')
+  })
+
+  it('gives "go" back onto "please go" after a crash before storage commits it', async () => {
+    storage.drafts.set(SCOPE, { text: 'please go', images: [], savedAt: 1 })
+    const crashing = { ...storage, write: () => new Promise<void>(() => {}) }
+    const crashed = await reload({ using: crashing })
+    expect(crashed.drafts.appendNativeChatDraftCache(SCOPE, 'go')).toBe(true)
+    crashed.store.clearNativeChatComposerDraftsForTests()
+
+    const next = await reload()
+    expect(next.drafts.readNativeChatDraftCache(SCOPE)).toBe('please go\n\ngo')
+  })
+
+  it('keeps a hand-back the draft already ends with when that draft was never saved', async () => {
+    const crashing = { ...storage, write: () => new Promise<void>(() => {}) }
+    const crashed = await reload({ using: crashing })
+    crashed.drafts.writeNativeChatDraftCache(SCOPE, 'hello')
+    expect(crashed.drafts.appendNativeChatDraftCache(SCOPE, 'hello')).toBe(true)
+    crashed.store.clearNativeChatComposerDraftsForTests()
+
+    const next = await reload()
+    expect(next.drafts.readNativeChatDraftCache(SCOPE)).toBe('hello')
+  })
+
+  it('makes text given back before the load lands again only where the loaded draft lacks it', async () => {
+    // An earlier run gave "go" back, then crashed before its copy was deleted.
+    storage.drafts.set(SCOPE, { text: 'typed earlier\n\ngo', images: [], savedAt: 1 })
+    storage.drafts.set('agent-session:s2', { text: 'please go', images: [], savedAt: 1 })
+    const { using, land } = slowLoading()
+    const next = await reload({ using, hydrate: false })
+    await next.store.waitForNativeChatComposerDrafts(1)
+    next.drafts.appendNativeChatDraftCache(SCOPE, 'go')
+    next.drafts.appendNativeChatDraftCache('agent-session:s2', 'go')
+    land()
+    await next.store.waitForNativeChatComposerDrafts(1_000)
+    await next.store.nativeChatComposerDraftWritesSettled()
+
+    expect(next.drafts.readNativeChatDraftCache(SCOPE)).toBe('typed earlier\n\ngo')
+    expect(storage.drafts.get(SCOPE)?.text).toBe('typed earlier\n\ngo')
+    expect(next.drafts.readNativeChatDraftCache('agent-session:s2')).toBe('please go\n\ngo')
+    expect(storage.drafts.get('agent-session:s2')?.text).toBe('please go\n\ngo')
+  })
+})
diff --git a/src/renderer/src/components/native-chat/native-chat-composer-draft-addition.ts b/src/renderer/src/components/native-chat/native-chat-composer-draft-addition.ts
new file mode 100644
index 00000000000..76b82af5393
--- /dev/null
+++ b/src/renderer/src/components/native-chat/native-chat-composer-draft-addition.ts
@@ -0,0 +1,46 @@
+// What is added to a draft without replacing it: text given back (Stop, a queued card's Edit) and
+// images given back or attached. Kept as data, so the same addition can be made again on a draft
+// loaded later, or replayed from the journal after a crash.
+
+import { appendReturnedDraftText } from '../../../../shared/returned-draft-text'
+import { basename } from '@/lib/path'
+import type {
+  NativeChatComposerDraft,
+  NativeChatComposerDraftImage
+} from './native-chat-composer-draft-storage'
+
+export type NativeChatComposerDraftAddition = {
+  readonly text?: string
+  readonly images?: readonly NativeChatComposerDraftImage[]
+  /** Only an image the user attaches takes the place of a placeholder with its file name. */
+  readonly fromUser?: boolean
+}
+
+/**
+ * The draft's text and images with the addition made. Text follows the shared returned-text rule,
+ * which never adds a paragraph the draft already ends with. `once` does the same for images (an id
+ * the draft holds): a replay after a crash meets a draft that may already have been saved with it.
+ */
+export function withNativeChatComposerDraftAddition(
+  draft: NativeChatComposerDraft,
+  addition: NativeChatComposerDraftAddition,
+  options: { once?: boolean } = {}
+): Pick<NativeChatComposerDraft, 'text' | 'images'> {
+  const text = appendReturnedDraftText(draft.text, addition.text ?? '')
+  const images = [...draft.images]
+  for (const { id, path, connectionId } of addition.images ?? []) {
+    if (options.once && images.some((held) => held.id === id)) {
+      continue
+    }
+    const image = { id, path, ...(connectionId ? { connectionId } : {}) }
+    const placeholder = addition.fromUser
+      ? images.findIndex((held) => held.unavailableName === basename(path))
+      : -1
+    if (placeholder === -1) {
+      images.push(image)
+    } else {
+      images[placeholder] = image
+    }
+  }
+  return { text, images }
+}
diff --git a/src/renderer/src/components/native-chat/native-chat-composer-draft-comparison.test.ts b/src/renderer/src/components/native-chat/native-chat-composer-draft-comparison.test.ts
new file mode 100644
index 00000000000..55ed8516227
--- /dev/null
+++ b/src/renderer/src/components/native-chat/native-chat-composer-draft-comparison.test.ts
@@ -0,0 +1,39 @@
+import { describe, expect, it } from 'vitest'
+import { nativeChatComposerDraftLeftAfterSend } from './native-chat-composer-draft-comparison'
+
+const SHOT = { id: 'a-1', path: '/repo/shot.png' }
+const DIAGRAM = { id: 'a-2', path: '/repo/diagram.png' }
+const SENT = { text: 'abcd', images: [SHOT] }
+
+describe('nativeChatComposerDraftLeftAfterSend', () => {
+  it('leaves nothing of a draft still as sent', () => {
+    expect(nativeChatComposerDraftLeftAfterSend(SENT, SENT)).toEqual({ text: '', images: [] })
+  })
+
+  it('keeps text typed after, and images attached, since the send', () => {
+    expect(
+      nativeChatComposerDraftLeftAfterSend({ text: 'abcd more', images: [SHOT, DIAGRAM] }, SENT)
+    ).toEqual({ text: ' more', images: [DIAGRAM] })
+  })
+
+  it('keeps text composed inside the sent text, away from its end', () => {
+    expect(nativeChatComposerDraftLeftAfterSend({ text: 'ab가cd', images: [] }, SENT)).toEqual({
+      text: '가',
+      images: []
+    })
+  })
+
+  it('leaves a draft replaced or edited inside the sent text alone', () => {
+    expect(nativeChatComposerDraftLeftAfterSend({ text: 'new', images: [SHOT] }, SENT)).toBeNull()
+    expect(nativeChatComposerDraftLeftAfterSend({ text: 'abXd', images: [] }, SENT)).toBeNull()
+  })
+
+  it('keeps the whole text when only images were sent', () => {
+    expect(
+      nativeChatComposerDraftLeftAfterSend(
+        { text: 'typed', images: [SHOT] },
+        { text: '', images: [SHOT] }
+      )
+    ).toEqual({ text: 'typed', images: [] })
+  })
+})
diff --git a/src/renderer/src/components/native-chat/native-chat-composer-draft-comparison.ts b/src/renderer/src/components/native-chat/native-chat-composer-draft-comparison.ts
new file mode 100644
index 00000000000..53ef375c854
--- /dev/null
+++ b/src/renderer/src/components/native-chat/native-chat-composer-draft-comparison.ts
@@ -0,0 +1,59 @@
+// How two copies of a composer draft compare, such as the draft now against the one that was sent.
+
+import type { JSONContent } from '@tiptap/react'
+import type {
+  NativeChatComposerDraft,
+  NativeChatComposerDraftImage
+} from './native-chat-composer-draft-storage'
+
+/** Equal documents count as unchanged even as new objects: an editor applying the stored draft
+ *  produces its own copy, which must not read as a change to save. */
+export function sameNativeChatComposerDraftDocument(
+  left: JSONContent | undefined,
+  right: JSONContent | undefined
+): boolean {
+  return (
+    left === right ||
+    (left !== undefined && right !== undefined && JSON.stringify(left) === JSON.stringify(right))
+  )
+}
+
+export function sameNativeChatComposerDraftImages(
+  left: readonly NativeChatComposerDraftImage[],
+  right: readonly NativeChatComposerDraftImage[]
+): boolean {
+  return (
+    left.length === right.length &&
+    left.every(
+      (image, index) =>
+        image.id === right[index].id &&
+        image.path === right[index].path &&
+        image.connectionId === right[index].connectionId &&
+        image.unavailableName === right[index].unavailableName
+    )
+  )
+}
+
+/**
+ * What a draft keeps once its send is accepted: anything added since, meaning text inserted into
+ * the sent text (typing or a composition begun before the send settled) and images attached
+ * meanwhile. Null when the draft was otherwise changed since (replaced, or edited inside the sent
+ * text), which is then left as it is.
+ */
+export function nativeChatComposerDraftLeftAfterSend(
+  current: NativeChatComposerDraft,
+  sent: NativeChatComposerDraft
+): NativeChatComposerDraft | null {
+  let prefix = 0
+  while (prefix < sent.text.length && sent.text[prefix] === current.text[prefix]) {
+    prefix += 1
+  }
+  const rest = sent.text.slice(prefix)
+  if (current.text.length < sent.text.length || !current.text.endsWith(rest)) {
+    return null
+  }
+  return {
+    text: current.text.slice(prefix, current.text.length - rest.length),
+    images: current.images.filter((image) => !sent.images.some((held) => held.id === image.id))
+  }
+}
diff --git a/src/renderer/src/components/native-chat/native-chat-composer-draft-image-check.ts b/src/renderer/src/components/native-chat/native-chat-composer-draft-image-check.ts
new file mode 100644
index 00000000000..37c7d0124f8
--- /dev/null
+++ b/src/renderer/src/components/native-chat/native-chat-composer-draft-image-check.ts
@@ -0,0 +1,109 @@
+// Which restored draft images are known to be gone. A paste in Orca's paste folder asks main
+// whether it is still kept, which holds only for a file really inside that folder; any other image
+// goes through the existing existence check (the workspace's read rules locally, the host over SSH).
+
+import { useEffect, useSyncExternalStore } from 'react'
+import type { NativeChatComposerDraftImage } from './native-chat-composer-draft-storage'
+import {
+  isKeptLocalPaste,
+  readNativeChatComposerDraft,
+  isNativeChatComposerDraftUnverified,
+  markNativeChatComposerDraftVerified,
+  unavailableNativeChatComposerDraftImage,
+  updateNativeChatComposerDraft
+} from './native-chat-composer-draft-store'
+
+/** Ids of images whose file is gone. One that cannot be checked (no read permission for that
+ *  path, host not connected) counts as present: the send's own check still guards it. */
+export async function findMissingNativeChatComposerDraftImages(
+  images: readonly NativeChatComposerDraftImage[]
+): Promise<Set<string>> {
+  const api = typeof window === 'undefined' ? undefined : window.api
+  const missing = new Set<string>()
+  const checkable = images.filter((image) => image.unavailableName === undefined && image.path)
+  const pastes = checkable.filter(isKeptLocalPaste)
+  if (pastes.length > 0 && api?.ui?.restoreNativeChatPastes) {
+    try {
+      const restored = await api.ui.restoreNativeChatPastes(pastes.map(({ path }) => path))
+      const kept = new Set(restored.filter((r) => r.kept && r.exists).map(({ path }) => path))
+      pastes.filter(({ path }) => !kept.has(path)).forEach(({ id }) => missing.add(id))
+    } catch {
+      // Unknown, not gone.
+    }
+  }
+  const pathExists = api?.fs?.pathExists
+  if (!pathExists) {
+    return missing
+  }
+  await Promise.all(
+    checkable
+      .filter((image) => !isKeptLocalPaste(image))
+      .map(async (image) => {
+        try {
+          const exists = await pathExists({
+            filePath: image.path,
+            ...(image.connectionId ? { connectionId: image.connectionId } : {})
+          })
+          if (!exists) {
+            missing.add(image.id)
+          }
+        } catch {
+          // Unknown, not gone.
+        }
+      })
+  )
+  return missing
+}
+
+const checking = new Set<string>()
+
+/** Once per restored draft: an image whose file is gone comes back as one to attach again. */
+export async function verifyRestoredNativeChatComposerDraftImages(scopeKey: string): Promise<void> {
+  if (!isNativeChatComposerDraftUnverified(scopeKey) || checking.has(scopeKey)) {
+    return
+  }
+  checking.add(scopeKey)
+  try {
+    await replaceMissingImages(scopeKey)
+  } finally {
+    checking.delete(scopeKey)
+    markNativeChatComposerDraftVerified(scopeKey)
+  }
+}
+
+async function replaceMissingImages(scopeKey: string): Promise<void> {
+  const checked = readNativeChatComposerDraft(scopeKey).images
+  const missing = await findMissingNativeChatComposerDraftImages(checked)
+  if (missing.size === 0) {
+    return
+  }
+  const gone = new Set(checked.filter((image) => missing.has(image.id)).map(({ path }) => path))
+  updateNativeChatComposerDraft(
+    scopeKey,
+    {
+      images: readNativeChatComposerDraft(scopeKey).images.map((image) =>
+        missing.has(image.id) && gone.has(image.path)
+          ? unavailableNativeChatComposerDraftImage(image)
+          : image
+      )
+    },
+    'immediate'
+  )
+}
+
+/** Whether the scope's restored images still wait on their check, which runs as they arrive: at
+ *  mount, or later when the startup load or another window brings new ones. */
+export function useRestoredNativeChatComposerDraftImageCheck(
+  scopeKey: string,
+  subscribe: (listener: () => void) => () => void
+): boolean {
+  const restoring = useSyncExternalStore(subscribe, () =>
+    isNativeChatComposerDraftUnverified(scopeKey)
+  )
+  useEffect(() => {
+    if (restoring) {
+      void verifyRestoredNativeChatComposerDraftImages(scopeKey)
+    }
+  }, [scopeKey, restoring])
+  return restoring
+}
diff --git a/src/renderer/src/components/native-chat/native-chat-composer-draft-indexeddb.test.ts b/src/renderer/src/components/native-chat/native-chat-composer-draft-indexeddb.test.ts
new file mode 100644
index 00000000000..af2b7cf889d
--- /dev/null
+++ b/src/renderer/src/components/native-chat/native-chat-composer-draft-indexeddb.test.ts
@@ -0,0 +1,164 @@
+// A write counts as saved only once IndexedDB has committed it (the transaction's `complete`), not
+// when its `put` is queued: a crash in between would otherwise lose a draft reported as saved.
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { createIndexedDbNativeChatComposerDraftStorage } from './native-chat-composer-draft-indexeddb'
+
+type FakeTransaction = {
+  oncomplete: (() => void) | null
+  onerror: (() => void) | null
+  onabort: (() => void) | null
+  error: Error | null
+  objectStore: () => FakeStore
+  commit: () => void
+}
+type FakeStore = {
+  put: (value: unknown, key: string) => object
+  delete: (key: string) => object
+  get: (key: string) => { result: unknown; onsuccess: (() => void) | null }
+}
+
+function fakeDatabase(): {
+  factory: IDBFactory
+  transactions: FakeTransaction[]
+  puts: unknown[]
+} {
+  const transactions: FakeTransaction[] = []
+  const puts: unknown[] = []
+  const database = {
+    objectStoreNames: { contains: () => true },
+    transaction: () => {
+      const store: FakeStore = {
+        put: (value) => {
+          puts.push(value)
+          return {}
+        },
+        delete: () => ({}),
+        get: () => {
+          const request: { result: unknown; onsuccess: (() => void) | null } = {
+            result: undefined,
+            onsuccess: null
+          }
+          queueMicrotask(() => request.onsuccess?.())
+          return request
+        }
+      }
+      const transaction: FakeTransaction = {
+        oncomplete: null,
+        onerror: null,
+        onabort: null,
+        error: null,
+        objectStore: () => store,
+        commit: () => {}
+      }
+      transactions.push(transaction)
+      return transaction
+    }
+  }
+  const factory = {
+    open: () => {
+      const request: { result: typeof database; onsuccess: (() => void) | null } = {
+        result: database,
+        onsuccess: null
+      }
+      queueMicrotask(() => request.onsuccess?.())
+      return request
+    }
+  }
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: a stand-in exposing only the calls the adapter makes.
+  return { factory: factory as unknown as IDBFactory, transactions, puts }
+}
+
+const DRAFT = { text: 'unsent', images: [], savedAt: 1 }
+const settledYet = async (promise: Promise<void>): Promise<boolean> => {
+  let settled = false
+  void promise.then(() => (settled = true))
+  await new Promise((resolve) => setTimeout(resolve, 0))
+  return settled
+}
+
+describe('the IndexedDB draft storage', () => {
+  it('settles a write only when its transaction completes', async () => {
+    const { factory, transactions, puts } = fakeDatabase()
+    const write = createIndexedDbNativeChatComposerDraftStorage(factory).write('scope', DRAFT)
+
+    expect(await settledYet(write)).toBe(false)
+    expect(puts).toEqual([DRAFT])
+    transactions[0]!.oncomplete?.()
+    await expect(write).resolves.toBeUndefined()
+  })
+
+  it('settles a read-modify-write only when its transaction completes', async () => {
+    const { factory, transactions, puts } = fakeDatabase()
+    const update = createIndexedDbNativeChatComposerDraftStorage(factory).update(
+      'scope',
+      () => DRAFT
+    )
+
+    expect(await settledYet(update)).toBe(false)
+    expect(puts).toEqual([DRAFT])
+    transactions[0]!.oncomplete?.()
+    await expect(update).resolves.toBeUndefined()
+  })
+
+  it('rejects a write whose transaction aborts, as on a full disk', async () => {
+    const { factory, transactions } = fakeDatabase()
+    const write = createIndexedDbNativeChatComposerDraftStorage(factory).write('scope', DRAFT)
+    await new Promise((resolve) => setTimeout(resolve, 0))
+    transactions[0]!.error = new Error('QuotaExceededError')
+    transactions[0]!.onabort?.()
+
+    await expect(write).rejects.toThrow('QuotaExceededError')
+  })
+
+  describe('through the draft store', () => {
+    const loaded: { clearNativeChatComposerDraftsForTests: () => void }[] = []
+    afterEach(() => {
+      for (const store of loaded.splice(0)) {
+        store.clearNativeChatComposerDraftsForTests()
+      }
+    })
+
+    async function storeOn(factory: IDBFactory) {
+      vi.resetModules()
+      const storageModule = await import('./native-chat-composer-draft-storage')
+      storageModule.setNativeChatComposerDraftStorageForTests(
+        createIndexedDbNativeChatComposerDraftStorage(factory)
+      )
+      const store = await import('./native-chat-composer-draft-store')
+      loaded.push(store)
+      return { store, drafts: await import('./native-chat-draft-cache') }
+    }
+
+    it('reports a scope’s write settled true only at its transaction’s complete', async () => {
+      const { factory, transactions } = fakeDatabase()
+      const { store, drafts } = await storeOn(factory)
+      // The stand-in has no reads, so the startup load fails and stays pending a retry: this is an
+      // append before the load landed, which reads and writes the stored draft in one transaction.
+      void store.hydrateNativeChatComposerDrafts()
+      drafts.appendNativeChatDraftCache('agent-session:s1', 'returned by Stop')
+      const settled = store.nativeChatComposerDraftWriteSettled('agent-session:s1')
+
+      await new Promise((resolve) => setTimeout(resolve, 0))
+      expect(await settledYet(settled.then(() => {}))).toBe(false)
+      const write = transactions.at(-1)!
+      write.oncomplete?.()
+      await expect(settled).resolves.toBe(true)
+    })
+
+    it('reports false when the scope’s transaction aborts', async () => {
+      const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
+      const { factory, transactions } = fakeDatabase()
+      const { store, drafts } = await storeOn(factory)
+      void store.hydrateNativeChatComposerDrafts()
+      drafts.appendNativeChatDraftCache('agent-session:s1', 'returned by Stop')
+      const settled = store.nativeChatComposerDraftWriteSettled('agent-session:s1')
+
+      await new Promise((resolve) => setTimeout(resolve, 0))
+      const write = transactions.at(-1)!
+      write.error = new Error('QuotaExceededError')
+      write.onabort?.()
+      await expect(settled).resolves.toBe(false)
+      warn.mockRestore()
+    })
+  })
+})
diff --git a/src/renderer/src/components/native-chat/native-chat-composer-draft-indexeddb.ts b/src/renderer/src/components/native-chat/native-chat-composer-draft-indexeddb.ts
new file mode 100644
index 00000000000..32864af94ce
--- /dev/null
+++ b/src/renderer/src/components/native-chat/native-chat-composer-draft-indexeddb.ts
@@ -0,0 +1,114 @@
+// Composer drafts in IndexedDB: one record per scope, keyed by the scope. Kept thin on purpose;
+// the draft store holds every rule, and unit tests drive it through the in-memory storage.
+
+import type {
+  NativeChatComposerDraftStorage,
+  StoredNativeChatComposerDraft
+} from './native-chat-composer-draft-storage'
+
+const DATABASE_NAME = 'orca-native-chat-composer-drafts'
+const DATABASE_VERSION = 1
+const DRAFTS = 'drafts'
+
+function settled(request: IDBRequest): Promise<unknown> {
+  return new Promise((resolve, reject) => {
+    request.onsuccess = () => resolve(request.result)
+    request.onerror = () => reject(request.error)
+  })
+}
+
+/** Resolves once the transaction is on disk; rejects when it aborts (a full disk included). */
+function committed(transaction: IDBTransaction): Promise<void> {
+  return new Promise((resolve, reject) => {
+    transaction.oncomplete = () => resolve()
+    transaction.onerror = () => reject(transaction.error)
+    transaction.onabort = () => reject(transaction.error ?? new Error('draft write aborted'))
+  })
+}
+
+export function createIndexedDbNativeChatComposerDraftStorage(
+  factory: IDBFactory
+): NativeChatComposerDraftStorage {
+  let opened: Promise<IDBDatabase> | null = null
+  const database = (): Promise<IDBDatabase> => {
+    opened ??= new Promise<IDBDatabase>((resolve, reject) => {
+      const request = factory.open(DATABASE_NAME, DATABASE_VERSION)
+      request.onupgradeneeded = () => {
+        if (!request.result.objectStoreNames.contains(DRAFTS)) {
+          request.result.createObjectStore(DRAFTS)
+        }
+      }
+      request.onsuccess = () => {
+        const db = request.result
+        // Why: a newer Orca upgrading the database, or the browser closing it, must not leave
+        // every later write failing against a dead connection.
+        db.onversionchange = () => db.close()
+        db.onclose = () => {
+          opened = null
+        }
+        resolve(db)
+      }
+      request.onerror = () => reject(request.error)
+      request.onblocked = () => reject(new Error('draft database is blocked'))
+    }).catch((error: unknown) => {
+      opened = null
+      throw error
+    })
+    return opened
+  }
+
+  const change = async (apply: (drafts: IDBObjectStore) => void): Promise<void> => {
+    const transaction = (await database()).transaction(DRAFTS, 'readwrite')
+    const done = committed(transaction)
+    apply(transaction.objectStore(DRAFTS))
+    // Why: commit now rather than when the task ends, so a quit right after still lands it.
+    transaction.commit?.()
+    await done
+  }
+
+  return {
+    loadAll: async () => {
+      const drafts = (await database()).transaction(DRAFTS, 'readonly').objectStore(DRAFTS)
+      const [keys, values] = await Promise.all([
+        settled(drafts.getAllKeys()),
+        settled(drafts.getAll())
+      ])
+      const loaded = new Map<string, unknown>()
+      if (Array.isArray(keys) && Array.isArray(values)) {
+        keys.forEach((key, index) => {
+          if (typeof key === 'string') {
+            loaded.set(key, values[index])
+          }
+        })
+      }
+      return loaded
+    },
+    read: async (scopeKey) =>
+      settled((await database()).transaction(DRAFTS, 'readonly').objectStore(DRAFTS).get(scopeKey)),
+    write: (scopeKey, draft: StoredNativeChatComposerDraft) =>
+      change((drafts) => drafts.put(draft, scopeKey)),
+    remove: (scopeKeys) =>
+      change((drafts) => {
+        for (const scopeKey of scopeKeys) {
+          drafts.delete(scopeKey)
+        }
+      }),
+    update: async (scopeKey, apply) => {
+      const transaction = (await database()).transaction(DRAFTS, 'readwrite')
+      const done = committed(transaction)
+      const drafts = transaction.objectStore(DRAFTS)
+      const read = drafts.get(scopeKey)
+      // Why inside the read's callback: the write must land in the same transaction as the read.
+      read.onsuccess = () => {
+        const next = apply(read.result)
+        if (next) {
+          drafts.put(next, scopeKey)
+        } else {
+          drafts.delete(scopeKey)
+        }
+        transaction.commit?.()
+      }
+      await done
+    }
+  }
+}
diff --git a/src/renderer/src/components/native-chat/native-chat-composer-draft-journal.ts b/src/renderer/src/components/native-chat/native-chat-composer-draft-journal.ts
new file mode 100644
index 00000000000..7dde1cb4fca
--- /dev/null
+++ b/src/renderer/src/components/native-chat/native-chat-composer-draft-journal.ts
@@ -0,0 +1,215 @@
+// The unload journal: changes storage had not confirmed when a window went away, written
+// synchronously to localStorage and replayed by the next load. Every window of the app shares it,
+// so each entry is pruned the moment any window confirms a change to that draft.
+//
+// Two kinds of entry: a whole draft (or its removal) journaled when the window goes away, and an
+// addition (text or images given back) journaled the moment it is made, because the copy it came
+// from is deleted right after and a crash fires no unload event.
+
+import type { UnconfirmedDraftChange } from './native-chat-composer-draft-memory'
+import {
+  withNativeChatComposerDraftAddition,
+  type NativeChatComposerDraftAddition
+} from './native-chat-composer-draft-addition'
+import {
+  parseStoredNativeChatComposerDraft,
+  type StoredNativeChatComposerDraft
+} from './native-chat-composer-draft-storage'
+
+const JOURNAL_KEY = 'orca:nativeChatComposerDraftJournal:v1'
+// Why: localStorage also holds the send outbox, and a send is refused when its entry can't be
+// saved, so the journal stays small: whole drafts together stop at the first cap, and additions,
+// at most one message each with their source deleted right after, at the second, which fits the
+// largest. A removal is never capped: it is tiny, and it is what keeps a sent draft from coming
+// back.
+export const MAX_JOURNAL_CHARS = 256_000
+export const MAX_JOURNAL_ADDITIONS_CHARS = 800_000
+
+// Why: a load replays only what earlier runs left, never this run's own entries, which its
+// memory already holds.
+const THIS_RUN = `${Date.now()}-${Math.random()}`
+
+type EntryBase = { readonly scopeKey: string; readonly at: number; readonly run?: string }
+type DraftEntry = EntryBase & { readonly draft: StoredNativeChatComposerDraft | null }
+type AdditionEntry = EntryBase & { readonly addition: NativeChatComposerDraftAddition }
+type JournalEntry = DraftEntry | AdditionEntry
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return typeof value === 'object' && value !== null && !Array.isArray(value)
+}
+
+function isAddition(entry: JournalEntry): entry is AdditionEntry {
+  return 'addition' in entry
+}
+
+function parseEntry(entry: unknown): JournalEntry[] {
+  if (!isRecord(entry)) {
+    return []
+  }
+  const { scopeKey, draft, at, addition } = entry
+  if (typeof scopeKey !== 'string' || typeof at !== 'number') {
+    return []
+  }
+  const run = typeof entry.run === 'string' ? entry.run : undefined
+  if (!isRecord(addition)) {
+    return [{ scopeKey, draft: parseStoredNativeChatComposerDraft(draft), at, run }]
+  }
+  // Parsed as a draft, so its text and images are checked the same way.
+  const parsed = parseStoredNativeChatComposerDraft({
+    text: typeof addition.text === 'string' ? addition.text : '',
+    images: Array.isArray(addition.images) ? addition.images : [],
+    savedAt: at
+  })
+  return parsed
+    ? [
+        {
+          scopeKey,
+          at,
+          run,
+          addition: {
+            text: parsed.text,
+            images: parsed.images,
+            ...(addition.fromUser === true ? { fromUser: true } : {})
+          }
+        }
+      ]
+    : []
+}
+
+function readEntries(): JournalEntry[] {
+  try {
+    const raw = localStorage.getItem(JOURNAL_KEY)
+    const entries: unknown = raw === null ? [] : JSON.parse(raw)
+    return Array.isArray(entries) ? entries.flatMap(parseEntry) : []
+  } catch {
+    return []
+  }
+}
+
+function writeEntries(entries: readonly JournalEntry[]): boolean {
+  try {
+    if (entries.length === 0) {
+      localStorage.removeItem(JOURNAL_KEY)
+    } else {
+      localStorage.setItem(JOURNAL_KEY, JSON.stringify(entries))
+    }
+    return true
+  } catch {
+    // A full localStorage loses only what storage itself had not yet confirmed.
+    return false
+  }
+}
+
+export type NativeChatComposerDraftJournalSnapshot = readonly JournalEntry[]
+
+/** Other runs' entries as a load begins reading storage. Why then: an entry journaled later is a
+ *  live window's, whose own write is ordered after this read and must not be overwritten by it. */
+export function snapshotNativeChatComposerDraftJournal(): NativeChatComposerDraftJournalSnapshot {
+  return readEntries().filter((entry) => entry.run !== THIS_RUN)
+}
+
+/**
+ * Replays a snapshot onto the loaded drafts: a whole draft newer than the stored one replaces it,
+ * then each addition newer than the draft it meets is made again, once. Returns the drafts it
+ * changed, which must be written; entries already older than storage are dropped.
+ */
+export function replayNativeChatComposerDraftJournal(
+  drafts: Map<string, StoredNativeChatComposerDraft | null>,
+  entries: NativeChatComposerDraftJournalSnapshot
+): Set<string> {
+  const changed = new Set<string>()
+  const removedAt = new Map<string, number>()
+  for (const entry of entries) {
+    if (isAddition(entry)) {
+      continue
+    }
+    const stored = drafts.get(entry.scopeKey)
+    if (stored && stored.savedAt >= entry.at) {
+      pruneNativeChatComposerDraftJournal(entry.scopeKey, entry.at)
+      continue
+    }
+    drafts.set(entry.scopeKey, entry.draft)
+    if (!entry.draft) {
+      removedAt.set(entry.scopeKey, entry.at)
+    }
+    changed.add(entry.scopeKey)
+  }
+  const additions = entries.filter(isAddition).sort((left, right) => left.at - right.at)
+  for (const { scopeKey, at, addition } of additions) {
+    const base = drafts.get(scopeKey) ?? null
+    if ((base?.savedAt ?? removedAt.get(scopeKey) ?? 0) >= at) {
+      pruneNativeChatComposerDraftJournal(scopeKey, at)
+      continue
+    }
+    const from = base ?? { text: '', images: [], savedAt: 0 }
+    const next = withNativeChatComposerDraftAddition(from, addition, { once: true })
+    drafts.set(scopeKey, {
+      ...from,
+      ...next,
+      ...(next.text === from.text ? {} : { document: undefined }),
+      savedAt: at
+    })
+    changed.add(scopeKey)
+  }
+  return changed
+}
+
+/** Adds this window's unconfirmed changes, keeping other entries, with whole drafts within the
+ *  cap. A draft that doesn't fit is left out; its change was still issued to storage. */
+export function journalNativeChatComposerDraftChanges(
+  changes: ReadonlyMap<string, UnconfirmedDraftChange>
+): void {
+  if (changes.size === 0) {
+    return
+  }
+  const kept = readEntries().filter((entry) => isAddition(entry) || !changes.has(entry.scopeKey))
+  let used = JSON.stringify(kept.filter((entry) => !isAddition(entry) && entry.draft)).length
+  const added: JournalEntry[] = []
+  const bySize = [...changes]
+    .map(([scopeKey, change]) => ({ scopeKey, ...change, run: THIS_RUN }))
+    .map((entry) => ({ entry, size: JSON.stringify(entry).length + 1 }))
+    .sort((left, right) => left.size - right.size)
+  for (const { entry, size } of bySize) {
+    if (!entry.draft) {
+      added.push(entry)
+      continue
+    }
+    if (used + size > MAX_JOURNAL_CHARS) {
+      continue
+    }
+    added.push(entry)
+    used += size
+  }
+  if (added.length > 0) {
+    writeEntries([...kept, ...added])
+  }
+}
+
+/** Journals an addition the moment it is made; false when it doesn't fit or localStorage
+ *  refused it, and the addition is then durable only once storage confirms it. */
+export function journalNativeChatComposerDraftAddition(
+  scopeKey: string,
+  addition: NativeChatComposerDraftAddition,
+  at: number
+): boolean {
+  const entries: JournalEntry[] = [...readEntries(), { scopeKey, at, run: THIS_RUN, addition }]
+  const additions = JSON.stringify(entries.filter(isAddition)).length
+  return additions <= MAX_JOURNAL_ADDITIONS_CHARS && writeEntries(entries)
+}
+
+/** Drops a draft's entries once a change to it at least as new is confirmed, by any window, so a
+ *  replay never brings back what was sent or replaced since. */
+export function pruneNativeChatComposerDraftJournal(scopeKey: string, confirmedAt: number): void {
+  try {
+    if (localStorage.getItem(JOURNAL_KEY) === null) {
+      return
+    }
+  } catch {
+    return
+  }
+  const entries = readEntries()
+  const kept = entries.filter((entry) => entry.scopeKey !== scopeKey || entry.at > confirmedAt)
+  if (kept.length !== entries.length) {
+    writeEntries(kept)
+  }
+}
diff --git a/src/renderer/src/components/native-chat/native-chat-composer-draft-lifecycle.test.tsx b/src/renderer/src/components/native-chat/native-chat-composer-draft-lifecycle.test.tsx
new file mode 100644
index 00000000000..13e4bde8503
--- /dev/null
+++ b/src/renderer/src/components/native-chat/native-chat-composer-draft-lifecycle.test.tsx
@@ -0,0 +1,722 @@
+// @vitest-environment happy-dom
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { act, createElement, Fragment, useState } from 'react'
+import { createRoot, type Root } from 'react-dom/client'
+import type { NativeChatLaunchDraft } from '@/lib/native-chat-launch-prompt'
+import type * as DraftHook from './use-native-chat-draft'
+import type * as AttachmentsHook from './use-native-chat-composer-attachments'
+import type * as SendHook from './use-native-chat-structured-composer-send'
+import type { NativeChatStructuredComposerTransport } from './native-chat-composer-types'
+import { createMemoryNativeChatComposerDraftStorage } from './native-chat-composer-draft-storage'
+
+vi.mock('@/i18n/i18n', () => ({ translate: (_key: string, fallback: string) => fallback }))
+vi.mock('@/runtime/runtime-terminal-inspection', () => ({ isRemoteRuntimePtyId: () => false }))
+vi.mock('@/lib/native-chat-telemetry', () => ({ emitNativeChatMessageSent: vi.fn() }))
+vi.mock('@/lib/worker-terminal-takeover-report', () => ({
+  reportStructuredSessionUserInput: vi.fn()
+}))
+const mocks = vi.hoisted(() => {
+  const launchDrafts: Record<string, NativeChatLaunchDraft> = {}
+  return { launchDrafts }
+})
+vi.mock('../../store', () => ({
+  useAppStore: Object.assign(
+    (selector: (state: unknown) => unknown) =>
+      selector({ nativeChatLaunchDraftByTabId: mocks.launchDrafts }),
+    {
+      getState: () => ({
+        nativeChatLaunchDraftByTabId: mocks.launchDrafts,
+        markNativeChatLaunchDraftAdopted: (tabId: string) => {
+          const current = mocks.launchDrafts[tabId]
+          if (current) {
+            mocks.launchDrafts[tabId] = { ...current, adopted: true }
+          }
+        },
+        clearNativeChatLaunchDraft: (tabId: string) => {
+          delete mocks.launchDrafts[tabId]
+        }
+      })
+    }
+  )
+}))
+
+let storage = createMemoryNativeChatComposerDraftStorage()
+
+type ComposerApi = {
+  draft: string
+  setDraft: ReturnType<typeof DraftHook.useNativeChatDraft>['setDraft']
+  attachments: ReturnType<typeof AttachmentsHook.useNativeChatComposerAttachments>
+  send: (text: string) => void
+}
+
+type Dispatched = { handled: boolean; accepted: boolean; error: string | null }
+
+/** A transport whose next send settles only when the test says so. */
+function heldTransport(hostCommand = false): {
+  transport: NativeChatStructuredComposerTransport
+  settle: () => Promise<void>
+} {
+  let resolve: (value: Dispatched) => void = () => {}
+  const dispatched = new Promise<Dispatched>((settle) => {
+    resolve = settle
+  })
+  return {
+    transport: {
+      send: vi.fn(() => true),
+      dispatchCommand: vi.fn(() => dispatched),
+      optionsSurface: {
+        getSnapshot: () => [],
+        setOption: vi.fn(),
+        invokeAction: vi.fn(),
+        subscribe: () => () => {}
+      },
+      optionSnapshot: [],
+      onError: vi.fn(),
+      runtime: 'local',
+      sessionId: 'session-test',
+      runtimeEnvironmentId: null
+    },
+    settle: async () => {
+      await act(async () => {
+        resolve(
+          hostCommand
+            ? { handled: true, accepted: true, error: null }
+            : { handled: false, accepted: false, error: null }
+        )
+        await dispatched
+      })
+    }
+  }
+}
+
+let root: Root | null = null
+let host: HTMLElement | null = null
+
+async function mount(element: React.ReactElement): Promise<void> {
+  host = document.createElement('div')
+  document.body.appendChild(host)
+  root = createRoot(host)
+  await act(async () => root?.render(element))
+}
+
+async function unmount(): Promise<void> {
+  await act(async () => root?.unmount())
+  root = null
+  host?.remove()
+  host = null
+}
+
+function storedDraft(scopeKey: string): unknown {
+  return storage.drafts.get(scopeKey) ?? null
+}
+
+const loadedStores: { clearNativeChatComposerDraftsForTests: () => void }[] = []
+
+/** A fresh renderer: module memory is gone, the drafts' storage is not. */
+async function loadHooks(): Promise<{
+  draftHook: typeof DraftHook
+  attachmentsHook: typeof AttachmentsHook
+  sendHook: typeof SendHook
+}> {
+  vi.resetModules()
+  const storageModule = await import('./native-chat-composer-draft-storage')
+  storageModule.setNativeChatComposerDraftStorageForTests(storage)
+  const store = await import('./native-chat-composer-draft-store')
+  loadedStores.push(store)
+  await store.hydrateNativeChatComposerDrafts()
+  return {
+    draftHook: await import('./use-native-chat-draft'),
+    attachmentsHook: await import('./use-native-chat-composer-attachments'),
+    sendHook: await import('./use-native-chat-structured-composer-send')
+  }
+}
+
+function composer(
+  hooks: Awaited<ReturnType<typeof loadHooks>>,
+  onRender: (api: ComposerApi) => void,
+  transport?: NativeChatStructuredComposerTransport
+): (props: { scopeKey: string }) => null {
+  return function Composer({ scopeKey }) {
+    const { draft, setDraft } = hooks.draftHook.useNativeChatDraft(scopeKey, () => false)
+    const [, setCaret] = useState(0)
+    const attachments = hooks.attachmentsHook.useNativeChatComposerAttachments({
+      attachmentScopeKey: scopeKey,
+      allowWithoutTarget: true,
+      caret: 0,
+      disabled: false,
+      isComposing: () => false,
+      resolveTarget: () => null,
+      textareaRef: { current: null },
+      setCaret,
+      setDraft: () => {},
+      setNotice: () => {}
+    })
+    const send = hooks.sendHook.useNativeChatStructuredComposerSend({
+      agent: 'claude',
+      draftScopeKey: scopeKey,
+      imageAttachments: attachments.imageAttachments,
+      structuredTransport: transport,
+      isComposing: () => false,
+      clearSkillOrigin: () => {},
+      setHistory: () => {},
+      setDraft,
+      setCaret
+    })
+    onRender({ draft, setDraft, attachments, send })
+    return null
+  }
+}
+
+beforeEach(() => {
+  localStorage.clear()
+  storage = createMemoryNativeChatComposerDraftStorage()
+  mocks.launchDrafts = {}
+})
+
+afterEach(async () => {
+  await unmount()
+  vi.useRealTimers()
+  for (const store of loadedStores.splice(0)) {
+    store.clearNativeChatComposerDraftsForTests()
+  }
+})
+
+describe('native-chat composer draft lifecycle', () => {
+  it('clears the saved draft when a send settles after the composer unmounted', async () => {
+    const hooks = await loadHooks()
+    const seen: { api?: ComposerApi } = {}
+    await mount(
+      createElement(
+        composer(hooks, (next) => {
+          seen.api = next
+        }),
+        { scopeKey: 'tab-1:pane' }
+      )
+    )
+    await act(async () => {
+      seen.api?.setDraft('/goal ship it')
+      hooks.attachmentsHook.appendNativeChatAttachmentCache('tab-1:pane', [
+        { id: 'i1', path: '/tmp/orca-paste-1.png' }
+      ])
+    })
+    window.dispatchEvent(new Event('pagehide'))
+    expect(storedDraft('tab-1:pane')).toMatchObject({ text: '/goal ship it' })
+    const held = seen.api
+
+    // A question prompt replaces the composer while the host accepts the command.
+    await unmount()
+    held?.setDraft('')
+    held?.attachments.clearImageAttachments()
+
+    expect(storedDraft('tab-1:pane')).toBeNull()
+    const reloaded = await loadHooks()
+    const restored: { api?: ComposerApi } = {}
+    await mount(
+      createElement(
+        composer(reloaded, (next) => {
+          restored.api = next
+        }),
+        { scopeKey: 'tab-1:pane' }
+      )
+    )
+    expect(restored.api).toMatchObject({ draft: '', attachments: { imageAttachments: [] } })
+  })
+
+  it('clears a saved sent draft when its send settles after the composer unmounted', async () => {
+    const hooks = await loadHooks()
+    const held = heldTransport()
+    const first: { api?: ComposerApi } = {}
+    await mount(
+      createElement(
+        composer(hooks, (next) => (first.api = next), held.transport),
+        {
+          scopeKey: 'tab-1:pane'
+        }
+      )
+    )
+    await act(async () => first.api?.setDraft('sent text'))
+    window.dispatchEvent(new Event('pagehide'))
+    expect(storedDraft('tab-1:pane')).toMatchObject({ text: 'sent text' })
+    await act(async () => first.api?.send('sent text'))
+    await unmount()
+
+    await held.settle()
+
+    expect(storedDraft('tab-1:pane')).toBeNull()
+  })
+
+  it('keeps what was typed in a replacement composer when the old composer’s send settles', async () => {
+    const hooks = await loadHooks()
+    const held = heldTransport()
+    const first: { api?: ComposerApi } = {}
+    await mount(
+      createElement(
+        composer(hooks, (next) => (first.api = next), held.transport),
+        {
+          scopeKey: 'tab-1:pane'
+        }
+      )
+    )
+    await act(async () => first.api?.setDraft('sent text'))
+    await act(async () => first.api?.send('sent text'))
+    await unmount()
+    const second: { api?: ComposerApi } = {}
+    await mount(
+      createElement(
+        composer(hooks, (next) => (second.api = next)),
+        { scopeKey: 'tab-1:pane' }
+      )
+    )
+    await act(async () => second.api?.setDraft('new text'))
+
+    await held.settle()
+
+    expect(second.api?.draft).toBe('new text')
+    window.dispatchEvent(new Event('pagehide'))
+    expect(storedDraft('tab-1:pane')).toMatchObject({ text: 'new text' })
+  })
+
+  it('keeps an image pasted while a host command was on its way', async () => {
+    const hooks = await loadHooks()
+    const held = heldTransport(true)
+    const seen: { api?: ComposerApi } = {}
+    await mount(
+      createElement(
+        composer(hooks, (next) => (seen.api = next), held.transport),
+        {
+          scopeKey: 'tab-1:pane'
+        }
+      )
+    )
+    await act(async () => seen.api?.setDraft('/compact'))
+    await act(async () => seen.api?.send('/compact'))
+    const pending: { id?: string | null } = {}
+    await act(async () => {
+      pending.id = seen.api?.attachments.beginPendingImageAttachment('data:image/png;base64,AA')
+    })
+    expect(pending.id).toBeTruthy()
+
+    await held.settle()
+    await act(async () =>
+      seen.api?.attachments.resolvePendingImageAttachment(pending.id ?? '', '/repo/shot.png')
+    )
+
+    expect(seen.api?.draft).toBe('')
+    expect(seen.api?.attachments.imageAttachments.map(({ path }) => path)).toEqual([
+      '/repo/shot.png'
+    ])
+  })
+
+  it('clears an accepted send’s text and images from the shown composer', async () => {
+    const hooks = await loadHooks()
+    const held = heldTransport()
+    const seen: { api?: ComposerApi } = {}
+    await mount(
+      createElement(
+        composer(hooks, (next) => (seen.api = next), held.transport),
+        { scopeKey: 'agent-session:s1' }
+      )
+    )
+    await act(async () => {
+      seen.api?.setDraft('sent text')
+      seen.api?.attachments.attachResolvedPaths(['/repo/a.png'])
+    })
+    await act(async () => seen.api?.send('sent text'))
+
+    await held.settle()
+
+    expect(seen.api?.draft).toBe('')
+    expect(seen.api?.attachments.imageAttachments).toEqual([])
+    expect(storedDraft('agent-session:s1')).toBeNull()
+  })
+
+  it('leaves a draft replaced before the send was accepted as it is', async () => {
+    const hooks = await loadHooks()
+    const held = heldTransport()
+    const seen: { api?: ComposerApi } = {}
+    await mount(
+      createElement(
+        composer(hooks, (next) => (seen.api = next), held.transport),
+        { scopeKey: 'agent-session:s1' }
+      )
+    )
+    await act(async () => seen.api?.setDraft('sent text'))
+    await act(async () => seen.api?.send('sent text'))
+    await act(async () => seen.api?.setDraft('typed while it was on its way'))
+
+    await held.settle()
+
+    expect(seen.api?.draft).toBe('typed while it was on its way')
+  })
+
+  it('shares one conversation’s draft between its composers, and keeps what the other added', async () => {
+    const hooks = await loadHooks()
+    const held = heldTransport()
+    const sender: { api?: ComposerApi } = {}
+    const other: { api?: ComposerApi } = {}
+    await mount(
+      createElement(
+        Fragment,
+        null,
+        createElement(
+          composer(hooks, (next) => (sender.api = next), held.transport),
+          {
+            scopeKey: 'agent-session:s1'
+          }
+        ),
+        createElement(
+          composer(hooks, (next) => (other.api = next)),
+          {
+            scopeKey: 'agent-session:s1'
+          }
+        )
+      )
+    )
+    await act(async () => sender.api?.setDraft('sent text'))
+    expect(other.api?.draft).toBe('sent text')
+    await act(async () => sender.api?.send('sent text'))
+    await act(async () => other.api?.setDraft((previous) => `${previous} and more`))
+
+    await held.settle()
+
+    expect(sender.api?.draft).toBe(' and more')
+    expect(other.api?.draft).toBe(' and more')
+  })
+
+  it('leaves nothing saved when a send clears a draft whose typing was still deferred', async () => {
+    vi.useFakeTimers()
+    const hooks = await loadHooks()
+    const seen: { api?: ComposerApi } = {}
+    await mount(
+      createElement(
+        composer(hooks, (next) => {
+          seen.api = next
+        }),
+        { scopeKey: 'tab-1:pane' }
+      )
+    )
+    await act(async () => {
+      seen.api?.attachments.attachResolvedPaths(['/repo/a.png'])
+    })
+    await act(async () => {
+      seen.api?.setDraft('hello')
+    })
+    await act(async () => {
+      seen.api?.setDraft('')
+      seen.api?.attachments.clearImageAttachments()
+    })
+    expect(storedDraft('tab-1:pane')).toBeNull()
+
+    await act(async () => {
+      vi.advanceTimersByTime(1_000)
+    })
+    window.dispatchEvent(new Event('pagehide'))
+    expect(storedDraft('tab-1:pane')).toBeNull()
+  })
+
+  it('does not bring back a sent image when a paste from a replaced composer is dropped late', async () => {
+    const hooks = await loadHooks()
+    const first: { api?: ComposerApi } = {}
+    await mount(
+      createElement(
+        composer(hooks, (next) => {
+          first.api = next
+        }),
+        { scopeKey: 'tab-1:pane' }
+      )
+    )
+    await act(async () => first.api?.attachments.attachResolvedPaths(['/repo/x.png']))
+    const pending: { id?: string | null } = {}
+    await act(async () => {
+      pending.id = first.api?.attachments.beginPendingImageAttachment('data:image/png;base64,AA')
+    })
+    expect(pending.id).toBeTruthy()
+    const stale = first.api
+    // The composer is replaced while the paste is still being saved.
+    await unmount()
+    const second: { api?: ComposerApi } = {}
+    await mount(
+      createElement(
+        composer(hooks, (next) => {
+          second.api = next
+        }),
+        { scopeKey: 'tab-1:pane' }
+      )
+    )
+    expect(second.api?.attachments.imageAttachments.map(({ path }) => path)).toEqual([
+      '/repo/x.png'
+    ])
+    await act(async () => second.api?.attachments.clearImageAttachments())
+    await unmount()
+
+    // The paste's save fails late in the replaced composer, which drops its placeholder.
+    stale?.attachments.dropPendingImageAttachment(pending.id ?? '')
+
+    expect(storedDraft('tab-1:pane')).toBeNull()
+    const third: { api?: ComposerApi } = {}
+    await mount(
+      createElement(
+        composer(hooks, (next) => {
+          third.api = next
+        }),
+        { scopeKey: 'tab-1:pane' }
+      )
+    )
+    expect(third.api?.attachments.imageAttachments).toEqual([])
+  })
+
+  it('adds a late image from a replaced composer to the current draft, not to its old one', async () => {
+    const hooks = await loadHooks()
+    const first: { api?: ComposerApi } = {}
+    await mount(
+      createElement(
+        composer(hooks, (next) => (first.api = next)),
+        { scopeKey: 'tab-1:pane' }
+      )
+    )
+    await act(async () => first.api?.attachments.attachResolvedPaths(['/repo/x.png']))
+    const stale = first.api
+    await unmount()
+    const second: { api?: ComposerApi } = {}
+    await mount(
+      createElement(
+        composer(hooks, (next) => (second.api = next)),
+        { scopeKey: 'tab-1:pane' }
+      )
+    )
+    await act(async () => second.api?.attachments.clearImageAttachments())
+    await unmount()
+
+    // An SSH upload started in the first composer finishes now.
+    stale?.attachments.attachResolvedPaths(['/repo/late.png'])
+
+    expect(storedDraft('tab-1:pane')).toMatchObject({ images: [{ path: '/repo/late.png' }] })
+  })
+
+  it('inserts a late file reference from a replaced composer into the current text', async () => {
+    const hooks = await loadHooks()
+    const first: { api?: ComposerApi } = {}
+    await mount(
+      createElement(
+        composer(hooks, (next) => (first.api = next)),
+        { scopeKey: 'tab-1:pane' }
+      )
+    )
+    await act(async () => first.api?.setDraft('already sent text'))
+    const stale = first.api
+    await unmount()
+    const second: { api?: ComposerApi } = {}
+    await mount(
+      createElement(
+        composer(hooks, (next) => (second.api = next)),
+        { scopeKey: 'tab-1:pane' }
+      )
+    )
+    await act(async () => second.api?.setDraft(''))
+    await unmount()
+
+    stale?.setDraft((previous) => `${previous}@late.txt `)
+    window.dispatchEvent(new Event('pagehide'))
+
+    expect(storedDraft('tab-1:pane')).toMatchObject({ text: '@late.txt ' })
+  })
+
+  it('turns a restored image whose file is gone into one to attach again', async () => {
+    const pathExists = vi.fn(async ({ filePath }: { filePath: string }) => {
+      if (filePath === '/Users/me/Desktop/elsewhere.png') {
+        throw new Error('Access denied: path resolves outside allowed directories.')
+      }
+      return filePath !== '/repo/gone.png'
+    })
+    vi.stubGlobal('api', { fs: { pathExists } })
+    storage.drafts.set('tab-1:pane', {
+      text: 'see these',
+      images: [
+        { id: 'a', path: '/repo/gone.png' },
+        { id: 'b', path: '/repo/here.png' },
+        { id: 'c', path: '/Users/me/Desktop/elsewhere.png' }
+      ],
+      savedAt: 1
+    })
+    const hooks = await loadHooks()
+    const seen: { api?: ComposerApi } = {}
+    try {
+      await mount(
+        createElement(
+          composer(hooks, (next) => (seen.api = next)),
+          { scopeKey: 'tab-1:pane' }
+        )
+      )
+      await act(async () => {})
+    } finally {
+      vi.unstubAllGlobals()
+    }
+
+    expect(seen.api?.attachments.imageAttachments).toEqual([
+      { id: 'a', path: '', unavailableName: 'gone.png' },
+      { id: 'b', path: '/repo/here.png' },
+      { id: 'c', path: '/Users/me/Desktop/elsewhere.png' }
+    ])
+  })
+
+  it('shows a restored paste from Orca’s paste folder once main confirms it is kept, and marks the rest', async () => {
+    const folder = '/Users/me/Library/Application Support/orca/native-chat-pastes'
+    let answer: () => void = () => {}
+    const answered = new Promise<void>((resolve) => {
+      answer = resolve
+    })
+    const restoreNativeChatPastes = vi.fn(async (paths: string[]) => {
+      await answered
+      return paths.map((path) => ({
+        path,
+        kept: path.endsWith('orca-paste-1-ab.png'),
+        exists: path.endsWith('orca-paste-1-ab.png')
+      }))
+    })
+    vi.stubGlobal('api', {
+      fs: { pathExists: vi.fn(async () => true) },
+      ui: { restoreNativeChatPastes }
+    })
+    storage.drafts.set('tab-1:pane', {
+      text: 'see',
+      images: [
+        { id: 'kept', path: `${folder}/orca-paste-1-ab.png` },
+        { id: 'swept', path: `${folder}/orca-paste-2-ab.png` }
+      ],
+      savedAt: 1
+    })
+    const hooks = await loadHooks()
+    const seen: { api?: ComposerApi } = {}
+    try {
+      await mount(
+        createElement(
+          composer(hooks, (next) => (seen.api = next)),
+          { scopeKey: 'tab-1:pane' }
+        )
+      )
+      // Until main answers, the restored paste waits, so its preview is not read before the grant.
+      expect(seen.api?.attachments.imageAttachments[0]?.pending).toBe(true)
+      await act(async () => {
+        answer()
+        await answered
+      })
+    } finally {
+      vi.unstubAllGlobals()
+    }
+
+    expect(restoreNativeChatPastes).toHaveBeenCalledWith([
+      `${folder}/orca-paste-1-ab.png`,
+      `${folder}/orca-paste-2-ab.png`
+    ])
+    expect(seen.api?.attachments.imageAttachments).toEqual([
+      { id: 'kept', path: `${folder}/orca-paste-1-ab.png` },
+      { id: 'swept', path: '', unavailableName: 'orca-paste-2-ab.png' }
+    ])
+  })
+
+  it('takes another window’s send of the same draft, unless an edit here is still unsaved', async () => {
+    storage.drafts.set('tab-1:pane', { text: 'sent in the other tab', images: [], savedAt: 1 })
+    const hooks = await loadHooks()
+    const seen: { api?: ComposerApi } = {}
+    await mount(
+      createElement(
+        composer(hooks, (next) => (seen.api = next)),
+        { scopeKey: 'tab-1:pane' }
+      )
+    )
+    expect(seen.api?.draft).toBe('sent in the other tab')
+
+    // The other tab sends: it removes the draft, and this window hears of it.
+    await loadHooks()
+    const otherDrafts = await import('./native-chat-draft-cache')
+    otherDrafts.writeNativeChatDraftCache('tab-1:pane', '')
+    await act(async () => {
+      await vi.waitFor(() => expect(seen.api?.draft).toBe(''))
+    })
+    await act(async () => seen.api?.setDraft((previous) => `${previous}next`))
+    window.dispatchEvent(new Event('pagehide'))
+    expect(storedDraft('tab-1:pane')).toMatchObject({ text: 'next' })
+
+    // An edit here not yet saved wins over the other window's write.
+    await act(async () => seen.api?.setDraft('mine, unsaved'))
+    otherDrafts.appendNativeChatDraftCache('tab-1:pane', 'theirs')
+    await act(async () => {
+      await new Promise((resolve) => setTimeout(resolve, 20))
+    })
+    expect(seen.api?.draft).toBe('mine, unsaved')
+  })
+
+  it('shows a composer its draft was refused, keeps it, and clears the mark once a retry lands', async () => {
+    const hooks = await loadHooks()
+    const { useNativeChatComposerDraftUnsaved } = await import('./use-native-chat-draft-unsaved')
+    const store = await import('./native-chat-composer-draft-store')
+    const seen: { api?: ComposerApi; unsaved?: boolean } = {}
+    const Draft = composer(hooks, (next) => (seen.api = next))
+    function Marked({ scopeKey }: { scopeKey: string }): React.JSX.Element {
+      seen.unsaved = useNativeChatComposerDraftUnsaved(scopeKey)
+      return createElement(Draft, { scopeKey })
+    }
+    await mount(createElement(Marked, { scopeKey: 'tab-1:pane' }))
+
+    storage.refuseWrites = true
+    await act(async () => {
+      seen.api?.setDraft('typed on a full disk')
+      store.flushNativeChatComposerDrafts()
+      await store.nativeChatComposerDraftWritesSettled()
+    })
+    expect(seen.unsaved).toBe(true)
+    expect(seen.api?.draft).toBe('typed on a full disk')
+
+    storage.refuseWrites = false
+    await act(async () => {
+      window.dispatchEvent(new Event('pagehide'))
+      await store.nativeChatComposerDraftWritesSettled()
+    })
+    expect(seen.unsaved).toBe(false)
+    expect(storedDraft('tab-1:pane')).toMatchObject({ text: 'typed on a full disk' })
+  })
+
+  it('does not bring back an untouched launch link after a reload, when no seed is left to replace it', async () => {
+    const link = 'https://github.com/o/r/issues/12'
+    const seed: NativeChatLaunchDraft = {
+      tabId: 'tab-1',
+      agent: 'claude',
+      text: link,
+      createdAt: 1
+    }
+    mocks.launchDrafts['tab-1'] = seed
+    const hooks = await loadHooks()
+    const { useNativeChatLaunchDraftAdoption } =
+      await import('./use-native-chat-launch-draft-adoption')
+    let shown = ''
+    function Composer({ launchDraft }: { launchDraft: NativeChatLaunchDraft }): null {
+      const { draft, setDraft } = hooks.draftHook.useNativeChatDraft('tab-1:leaf', () => false)
+      useNativeChatLaunchDraftAdoption({
+        terminalTabId: 'tab-1',
+        agent: 'claude',
+        launchDraft,
+        launchDraftResolved: false,
+        draft,
+        setDraft,
+        setCaret: () => {},
+        ownsTabWideLaunchDraft: true
+      })
+      shown = draft
+      return null
+    }
+    await mount(createElement(Composer, { launchDraft: seed }))
+    expect(shown).toBe(link)
+    window.dispatchEvent(new Event('pagehide'))
+    await unmount()
+
+    mocks.launchDrafts = {}
+    const reloaded = await loadHooks()
+    const restored: { draft?: string } = {}
+    function Reloaded(): null {
+      restored.draft = reloaded.draftHook.useNativeChatDraft('tab-1:leaf', () => false).draft
+      return null
+    }
+    await mount(createElement(Reloaded))
+    expect(restored.draft).toBe('')
+  })
+})
diff --git a/src/renderer/src/components/native-chat/native-chat-composer-draft-load.ts b/src/renderer/src/components/native-chat/native-chat-composer-draft-load.ts
new file mode 100644
index 00000000000..02de2aa92bf
--- /dev/null
+++ b/src/renderer/src/components/native-chat/native-chat-composer-draft-load.ts
@@ -0,0 +1,159 @@
+// Loads every saved draft into memory once at startup, with the journal's unconfirmed changes
+// replayed on top. A change made before the load lands is kept: an edit wins over the loaded
+// draft, and an append is applied again on top of it.
+
+import {
+  dirtyScopes,
+  load,
+  nextSavedAt,
+  notifyScope,
+  records,
+  unverifiedScopes
+} from './native-chat-composer-draft-memory'
+import {
+  flushNativeChatComposerDrafts,
+  installNativeChatComposerDraftBroadcast
+} from './native-chat-composer-draft-persistence'
+import {
+  replayNativeChatComposerDraftJournal,
+  snapshotNativeChatComposerDraftJournal,
+  type NativeChatComposerDraftJournalSnapshot
+} from './native-chat-composer-draft-journal'
+import {
+  nativeChatComposerDraftStorage,
+  parseStoredNativeChatComposerDraft,
+  removeLegacyLocalStorageNativeChatComposerDrafts,
+  type StoredNativeChatComposerDraft
+} from './native-chat-composer-draft-storage'
+
+// Why bounded: a database that will not open must not be retried for the whole run; after the
+// last try the drafts stay in memory and a refused save shows as one.
+const RETRY_DELAYS_MS = [1_000, 5_000, 30_000]
+
+let hydration: Promise<void> | null = null
+let started = false
+let failedLoads = 0
+let retryTimer: ReturnType<typeof setTimeout> | null = null
+
+/** The appends this load could not have read: made after it began reading, or never written. */
+function withAppends(
+  scopeKey: string,
+  loaded: StoredNativeChatComposerDraft,
+  readAtSequence: number
+): DraftLoadResult {
+  const missing = (load.appendsBeforeLoad.get(scopeKey) ?? []).filter(
+    (entry) => !entry.committed || entry.sequence > readAtSequence
+  )
+  if (missing.length === 0) {
+    return { draft: loaded, changed: false }
+  }
+  const merged = missing.reduce((draft, entry) => entry.append(draft), loaded)
+  return { draft: { ...merged, savedAt: nextSavedAt() }, changed: true }
+}
+
+type DraftLoadResult = { draft: StoredNativeChatComposerDraft; changed: boolean }
+
+function applyLoaded(
+  loaded: ReadonlyMap<string, unknown>,
+  readAtSequence: number,
+  journal: NativeChatComposerDraftJournalSnapshot
+): void {
+  const drafts = new Map<string, StoredNativeChatComposerDraft | null>()
+  for (const [scopeKey, value] of loaded) {
+    drafts.set(scopeKey, parseStoredNativeChatComposerDraft(value))
+  }
+  for (const scopeKey of replayNativeChatComposerDraftJournal(drafts, journal)) {
+    dirtyScopes.add(scopeKey)
+  }
+  for (const [scopeKey, appends] of load.appendsBeforeLoad) {
+    // Appended with nothing saved before: an empty draft is what the load would have read.
+    if (!drafts.has(scopeKey) && appends.some((entry) => !entry.committed)) {
+      drafts.set(scopeKey, { text: '', images: [], savedAt: 0 })
+    }
+  }
+  for (const [scopeKey, stored] of drafts) {
+    if (load.editedBeforeLoad.has(scopeKey)) {
+      continue
+    }
+    if (!stored || load.deletionsBeforeLoad.some((matches) => matches(scopeKey, stored))) {
+      // An unreadable record, a journaled removal, or one deleted here while loading.
+      dirtyScopes.add(scopeKey)
+      continue
+    }
+    const { draft, changed } = withAppends(scopeKey, stored, readAtSequence)
+    records.set(scopeKey, draft)
+    unverifiedScopes.add(scopeKey)
+    if (changed) {
+      dirtyScopes.add(scopeKey)
+    }
+    notifyScope(scopeKey)
+  }
+  load.hydrated = true
+  load.editedBeforeLoad.clear()
+  load.appendsBeforeLoad.clear()
+  load.deletionsBeforeLoad.length = 0
+  flushNativeChatComposerDrafts()
+}
+
+function retryLater(error: unknown): void {
+  if (failedLoads === 0) {
+    console.warn('[native-chat-drafts] saved drafts could not be loaded', error)
+  }
+  const delay = RETRY_DELAYS_MS[failedLoads]
+  failedLoads += 1
+  if (delay === undefined) {
+    // Given up: what was changed meanwhile is all there is, so nothing waits on a load any more.
+    load.hydrated = true
+    load.editedBeforeLoad.clear()
+    load.appendsBeforeLoad.clear()
+    load.deletionsBeforeLoad.length = 0
+    return
+  }
+  retryTimer = setTimeout(() => {
+    retryTimer = null
+    hydration = null
+    void hydrateNativeChatComposerDrafts()
+  }, delay)
+}
+
+/** Loads every saved draft into memory, once; a failed load is retried a few times, then left. */
+export function hydrateNativeChatComposerDrafts(): Promise<void> {
+  started = true
+  hydration ??= (async () => {
+    removeLegacyLocalStorageNativeChatComposerDrafts()
+    installNativeChatComposerDraftBroadcast()
+    // Why read here: storage applies changes in order, so this load reads every append made so far.
+    const readAtSequence = load.appendSequence
+    const journal = snapshotNativeChatComposerDraftJournal()
+    applyLoaded(await nativeChatComposerDraftStorage().loadAll(), readAtSequence, journal)
+  })().catch(retryLater)
+  return hydration
+}
+
+/** Startup waits this long at most; a load still running fills its drafts in when it lands. */
+export async function waitForNativeChatComposerDrafts(timeoutMs: number): Promise<void> {
+  let timer: ReturnType<typeof setTimeout> | undefined
+  await Promise.race([
+    hydrateNativeChatComposerDrafts(),
+    new Promise<void>((resolve) => {
+      timer = setTimeout(resolve, timeoutMs)
+    })
+  ])
+  clearTimeout(timer)
+}
+
+/** The load of saved drafts has started and not landed (nor been given up): a draft may exist that
+ *  memory doesn't hold yet. */
+export function isNativeChatComposerDraftLoadPending(): boolean {
+  return started && !load.hydrated
+}
+
+export function resetNativeChatComposerDraftLoadForTests(): void {
+  started = false
+  if (retryTimer !== null) {
+    clearTimeout(retryTimer)
+    retryTimer = null
+  }
+  hydration = null
+  failedLoads = 0
+}
diff --git a/src/renderer/src/components/native-chat/native-chat-composer-draft-memory.ts b/src/renderer/src/components/native-chat/native-chat-composer-draft-memory.ts
new file mode 100644
index 00000000000..96ba8bc26af
--- /dev/null
+++ b/src/renderer/src/components/native-chat/native-chat-composer-draft-memory.ts
@@ -0,0 +1,89 @@
+// The draft store's memory, shared by its API (the store module) and its persistence. Memory is
+// the owner of every draft; storage only keeps a copy of it.
+
+import type { StoredNativeChatComposerDraft } from './native-chat-composer-draft-storage'
+
+// Why unsavedText: an adopted launch seed is also parked in the agent's input line, and only this
+// run's seed knows to replace it, so a reload must not bring the copy back.
+export type DraftRecord = StoredNativeChatComposerDraft & { readonly unsavedText?: string }
+
+/** A write or removal handed to storage and not yet confirmed; `draft` is null for a removal. */
+export type UnconfirmedDraftChange = {
+  readonly draft: StoredNativeChatComposerDraft | null
+  readonly at: number
+}
+
+export const records = new Map<string, DraftRecord>()
+// Changed in memory with no write issued yet; a refused write comes back here for the next flush.
+export const dirtyScopes = new Set<string>()
+export const unconfirmed = new Map<string, UnconfirmedDraftChange>()
+// Drafts whose last write storage refused; shown so the user knows they are held in memory only.
+export const refusedScopes = new Set<string>()
+// Records read back from storage this run whose image files have not been checked yet.
+export const unverifiedScopes = new Set<string>()
+export const scopeListeners = new Map<string, Set<() => void>>()
+
+/** How a change before the startup load lands meets the loaded draft: an edit replaces it, an
+ *  append (text or images given back, a paste) is applied again on top of it. */
+export type DraftAppend = (draft: StoredNativeChatComposerDraft) => StoredNativeChatComposerDraft
+
+/** An append made before the load landed: written onto the stored draft in one change, and made
+ *  again on the loaded draft when that load could not have read it. */
+export type AppendBeforeLoad = {
+  /** In-run order, compared with the order at which a load attempt read storage. */
+  readonly sequence: number
+  readonly append: DraftAppend
+  committed: boolean
+}
+
+type LoadBookkeeping = {
+  hydrated: boolean
+  /** Sequence of the last append made before the load landed. */
+  appendSequence: number
+  readonly editedBeforeLoad: Set<string>
+  readonly appendsBeforeLoad: Map<string, AppendBeforeLoad[]>
+  readonly deletionsBeforeLoad: ((
+    scopeKey: string,
+    draft: StoredNativeChatComposerDraft
+  ) => boolean)[]
+}
+
+// The startup load's bookkeeping, emptied once it lands.
+export const load: LoadBookkeeping = {
+  hydrated: false,
+  appendSequence: 0,
+  editedBeforeLoad: new Set(),
+  appendsBeforeLoad: new Map(),
+  deletionsBeforeLoad: []
+}
+
+let lastSavedAt = 0
+
+/** Monotonic within a run, so drafts changed in the same millisecond still age in order. */
+export function nextSavedAt(): number {
+  lastSavedAt = Math.max(Date.now(), lastSavedAt + 1)
+  return lastSavedAt
+}
+
+export function notifyScope(scopeKey: string): void {
+  scopeListeners.get(scopeKey)?.forEach((listener) => listener())
+}
+
+/** A local change not yet in storage, which a write from another window must not replace. */
+export function hasLocalChange(scopeKey: string): boolean {
+  return dirtyScopes.has(scopeKey) || unconfirmed.has(scopeKey)
+}
+
+export function clearDraftMemoryForTests(): void {
+  records.clear()
+  dirtyScopes.clear()
+  unconfirmed.clear()
+  refusedScopes.clear()
+  unverifiedScopes.clear()
+  lastSavedAt = 0
+  load.hydrated = false
+  load.appendSequence = 0
+  load.editedBeforeLoad.clear()
+  load.appendsBeforeLoad.clear()
+  load.deletionsBeforeLoad.length = 0
+}
diff --git a/src/renderer/src/components/native-chat/native-chat-composer-draft-persistence.ts b/src/renderer/src/components/native-chat/native-chat-composer-draft-persistence.ts
new file mode 100644
index 00000000000..cd4a11faf77
--- /dev/null
+++ b/src/renderer/src/components/native-chat/native-chat-composer-draft-persistence.ts
@@ -0,0 +1,326 @@
+// Keeps storage a copy of the draft store's memory: writes each changed draft whole, journals what
+// storage has not confirmed when the window goes away, and follows other windows' writes.
+
+import { basename } from '@/lib/path'
+import { isNativeChatKeptPastePath, isNativeChatPastedImagePath } from './native-chat-image-paste'
+import {
+  dirtyScopes,
+  hasLocalChange,
+  load,
+  nextSavedAt,
+  notifyScope,
+  records,
+  refusedScopes,
+  unconfirmed,
+  unverifiedScopes,
+  type AppendBeforeLoad,
+  type DraftAppend,
+  type DraftRecord,
+  type UnconfirmedDraftChange
+} from './native-chat-composer-draft-memory'
+import {
+  journalNativeChatComposerDraftChanges,
+  pruneNativeChatComposerDraftJournal
+} from './native-chat-composer-draft-journal'
+import {
+  nativeChatComposerDraftStorage,
+  parseStoredNativeChatComposerDraft,
+  type NativeChatComposerDraftImage,
+  type StoredNativeChatComposerDraft
+} from './native-chat-composer-draft-storage'
+
+const PERSIST_DEBOUNCE_MS = 250
+const CHANNEL_NAME = 'orca-native-chat-composer-drafts'
+
+let flushTimer: ReturnType<typeof setTimeout> | null = null
+let flushOnHideInstalled = false
+const inFlight = new Set<Promise<boolean>>()
+// Per scope, the writes not yet settled: each resolves true once committed, false when refused.
+const scopeWrites = new Map<string, Set<Promise<boolean>>>()
+let channel: BroadcastChannel | null = null
+
+/** An image the draft names but can no longer send, so the user can attach it again. */
+export function unavailableNativeChatComposerDraftImage(
+  image: NativeChatComposerDraftImage
+): NativeChatComposerDraftImage {
+  return image.unavailableName === undefined
+    ? { id: image.id, path: '', unavailableName: basename(image.path) }
+    : image
+}
+
+/** A local paste in Orca's paste folder: it outlives the run, so a restore can show and send it. */
+export function isKeptLocalPaste(image: NativeChatComposerDraftImage): boolean {
+  return !image.connectionId && isNativeChatKeptPastePath(image.path)
+}
+
+/** What storage keeps: not an unsaved launch-seed copy, and a paste outside Orca's paste folder
+ *  (over SSH, or from before it) only by name. Null when nothing is left. */
+function savedForm(record: DraftRecord): StoredNativeChatComposerDraft | null {
+  const { unsavedText, ...saved } = record
+  const images = saved.images.map((image) =>
+    isNativeChatPastedImagePath(image.path) && !isKeptLocalPaste(image)
+      ? unavailableNativeChatComposerDraftImage(image)
+      : image
+  )
+  const text = saved.text === unsavedText ? '' : saved.text
+  if (text === '' && images.length === 0) {
+    return null
+  }
+  return { ...saved, text, images }
+}
+
+function confirm(scopeKey: string, change: UnconfirmedDraftChange): void {
+  if (unconfirmed.get(scopeKey) === change) {
+    unconfirmed.delete(scopeKey)
+    if (refusedScopes.delete(scopeKey)) {
+      notifyScope(scopeKey)
+    }
+  }
+  pruneNativeChatComposerDraftJournal(scopeKey, change.at)
+  channel?.postMessage({ scopeKey })
+}
+
+function refuse(scopeKey: string, change: UnconfirmedDraftChange, error: unknown): void {
+  if (unconfirmed.get(scopeKey) !== change) {
+    return
+  }
+  unconfirmed.delete(scopeKey)
+  dirtyScopes.add(scopeKey)
+  if (!refusedScopes.has(scopeKey)) {
+    console.warn('[native-chat-drafts] a draft could not be saved; it is kept in memory', error)
+    refusedScopes.add(scopeKey)
+    notifyScope(scopeKey)
+  }
+}
+
+function persist(scopeKey: string): void {
+  const record = records.get(scopeKey)
+  const draft = record ? savedForm(record) : null
+  const change: UnconfirmedDraftChange = { draft, at: draft?.savedAt ?? nextSavedAt() }
+  unconfirmed.set(scopeKey, change)
+  const storage = nativeChatComposerDraftStorage()
+  const written = (draft ? storage.write(scopeKey, draft) : storage.remove([scopeKey])).then(
+    () => {
+      confirm(scopeKey, change)
+      return true
+    },
+    (error: unknown) => {
+      refuse(scopeKey, change, error)
+      return false
+    }
+  )
+  track(scopeKey, written)
+}
+
+function track(scopeKey: string, written: Promise<boolean>): void {
+  inFlight.add(written)
+  const pending = scopeWrites.get(scopeKey) ?? new Set()
+  scopeWrites.set(scopeKey, pending)
+  pending.add(written)
+  void written.finally(() => {
+    inFlight.delete(written)
+    pending.delete(written)
+    if (pending.size === 0 && scopeWrites.get(scopeKey) === pending) {
+      scopeWrites.delete(scopeKey)
+    }
+  })
+}
+
+export function flushNativeChatComposerDrafts(): void {
+  if (flushTimer !== null) {
+    clearTimeout(flushTimer)
+    flushTimer = null
+  }
+  for (const scopeKey of dirtyScopes) {
+    dirtyScopes.delete(scopeKey)
+    persist(scopeKey)
+  }
+}
+
+/** Why: storage commits after this task, so what it has not confirmed when the window goes away
+ *  is also written synchronously and replayed by the next load, a refused draft included. */
+function journalUnconfirmed(): void {
+  flushNativeChatComposerDrafts()
+  journalNativeChatComposerDraftChanges(unconfirmed)
+}
+
+function journalWhenHidden(): void {
+  if (document.visibilityState === 'hidden') {
+    journalUnconfirmed()
+  }
+}
+
+function installFlushOnHide(): void {
+  if (
+    flushOnHideInstalled ||
+    typeof window === 'undefined' ||
+    typeof window.addEventListener !== 'function' ||
+    typeof document === 'undefined'
+  ) {
+    return
+  }
+  flushOnHideInstalled = true
+  window.addEventListener('pagehide', journalUnconfirmed)
+  window.addEventListener('beforeunload', journalUnconfirmed)
+  document.addEventListener('visibilitychange', journalWhenHidden)
+}
+
+/** Before the load lands, memory may not hold the saved draft, so an append is written onto what
+ *  storage holds, read and written as one change. The loaded draft gets it again on landing. */
+function appendBeforeLoad(scopeKey: string, append: DraftAppend): void {
+  load.appendSequence += 1
+  const entry: AppendBeforeLoad = { sequence: load.appendSequence, append, committed: false }
+  load.appendsBeforeLoad.set(scopeKey, [...(load.appendsBeforeLoad.get(scopeKey) ?? []), entry])
+  const owner = records.get(scopeKey)?.owner
+  const appendedAt = records.get(scopeKey)?.savedAt ?? 0
+  const empty: StoredNativeChatComposerDraft = { text: '', images: [], savedAt: 0 }
+  const written = nativeChatComposerDraftStorage()
+    .update(scopeKey, (stored) => {
+      const base = parseStoredNativeChatComposerDraft(stored) ?? empty
+      return savedForm({
+        ...append({ ...base, ...(base.owner || !owner ? {} : { owner }) }),
+        savedAt: nextSavedAt()
+      })
+    })
+    .then(
+      () => {
+        entry.committed = true
+        pruneNativeChatComposerDraftJournal(scopeKey, appendedAt)
+        channel?.postMessage({ scopeKey })
+        return true
+      },
+      (error: unknown) => {
+        if (!refusedScopes.has(scopeKey)) {
+          console.warn(
+            '[native-chat-drafts] a draft could not be saved; it is kept in memory',
+            error
+          )
+          refusedScopes.add(scopeKey)
+          notifyScope(scopeKey)
+        }
+        return false
+      }
+    )
+  track(scopeKey, written)
+}
+
+/** Marks a scope changed in memory: `deferred` coalesces typing into one write, `immediate`
+ *  writes now. Before the startup load lands, an edit wins over the loaded draft and an append
+ *  is applied again on top of it. */
+export function persistNativeChatComposerDraft(
+  scopeKey: string,
+  persist: 'immediate' | 'deferred',
+  append?: DraftAppend
+): void {
+  installFlushOnHide()
+  if (!load.hydrated && append && !load.editedBeforeLoad.has(scopeKey)) {
+    appendBeforeLoad(scopeKey, append)
+    return
+  }
+  dirtyScopes.add(scopeKey)
+  if (!load.hydrated) {
+    load.editedBeforeLoad.add(scopeKey)
+  }
+  if (persist === 'immediate') {
+    flushNativeChatComposerDrafts()
+    return
+  }
+  flushTimer ??= setTimeout(flushNativeChatComposerDrafts, PERSIST_DEBOUNCE_MS)
+}
+
+/** A deletion also applies to drafts a load still in flight brings back. */
+export function deleteLoadingNativeChatComposerDraftsWhere(
+  matches: (scopeKey: string, draft: StoredNativeChatComposerDraft) => boolean
+): void {
+  if (!load.hydrated) {
+    load.deletionsBeforeLoad.push(matches)
+  }
+}
+
+function addsAnImage(
+  draft: StoredNativeChatComposerDraft,
+  previous: DraftRecord | undefined
+): boolean {
+  const held = new Set(previous?.images.map((image) => `${image.id}\0${image.path}`))
+  return draft.images.some((image) => !held.has(`${image.id}\0${image.path}`))
+}
+
+// Why: another window of the same app (two web-client tabs) can send or edit this draft; its write
+// replaces what this window holds unless this window has a change of its own not yet saved.
+function adoptForeignChange(message: unknown): void {
+  const scopeKey =
+    typeof message === 'object' && message !== null && 'scopeKey' in message
+      ? message.scopeKey
+      : null
+  if (typeof scopeKey !== 'string' || hasLocalChange(scopeKey)) {
+    return
+  }
+  void nativeChatComposerDraftStorage()
+    .read(scopeKey)
+    .then((value) => {
+      if (hasLocalChange(scopeKey)) {
+        return
+      }
+      const draft = parseStoredNativeChatComposerDraft(value)
+      if (draft) {
+        // Why: images this window already checked stay checked, so their chips don't flash.
+        if (addsAnImage(draft, records.get(scopeKey))) {
+          unverifiedScopes.add(scopeKey)
+        }
+        records.set(scopeKey, draft)
+      } else {
+        records.delete(scopeKey)
+      }
+      notifyScope(scopeKey)
+    })
+    .catch(() => {})
+}
+
+export function installNativeChatComposerDraftBroadcast(): void {
+  if (channel || typeof BroadcastChannel === 'undefined') {
+    return
+  }
+  channel = new BroadcastChannel(CHANNEL_NAME)
+  channel.onmessage = (event) => adoptForeignChange(event.data)
+  // Why: Node's channel (unit tests) would otherwise keep the process alive.
+  if ('unref' in channel && typeof channel.unref === 'function') {
+    channel.unref()
+  }
+}
+
+/**
+ * Settles once every write of this scope issued before the call has: true only when IndexedDB
+ * completed each transaction, false when one was refused or failed. A change still waiting for its
+ * deferred write is issued first, so it is included. Never settles on a timeout.
+ */
+export async function nativeChatComposerDraftWriteSettled(scopeKey: string): Promise<boolean> {
+  if (dirtyScopes.has(scopeKey)) {
+    flushNativeChatComposerDrafts()
+  }
+  const pending = scopeWrites.get(scopeKey)
+  return pending ? (await Promise.all(pending)).every(Boolean) : true
+}
+
+/** Settles once every write issued so far has been confirmed or refused. */
+export async function nativeChatComposerDraftWritesSettled(): Promise<void> {
+  while (inFlight.size > 0) {
+    await Promise.allSettled(inFlight)
+  }
+}
+
+export function resetNativeChatComposerDraftPersistenceForTests(): void {
+  if (flushTimer !== null) {
+    clearTimeout(flushTimer)
+    flushTimer = null
+  }
+  channel?.close()
+  channel = null
+  if (flushOnHideInstalled) {
+    flushOnHideInstalled = false
+    window.removeEventListener('pagehide', journalUnconfirmed)
+    window.removeEventListener('beforeunload', journalUnconfirmed)
+    document.removeEventListener('visibilitychange', journalWhenHidden)
+  }
+  inFlight.clear()
+  scopeWrites.clear()
+}
diff --git a/src/renderer/src/components/native-chat/native-chat-composer-draft-storage.ts b/src/renderer/src/components/native-chat/native-chat-composer-draft-storage.ts
new file mode 100644
index 00000000000..83323315c83
--- /dev/null
+++ b/src/renderer/src/components/native-chat/native-chat-composer-draft-storage.ts
@@ -0,0 +1,186 @@
+// The stored form of composer drafts and the storage they live in. Drafts are kept in their own
+// store (IndexedDB), not localStorage, so they never compete with the send outbox for its quota
+// and need no budget: every draft comes back.
+
+import type { JSONContent } from '@tiptap/react'
+import { parseExecutionHostId, type ExecutionHostId } from '../../../../shared/execution-host'
+import { createIndexedDbNativeChatComposerDraftStorage } from './native-chat-composer-draft-indexeddb'
+
+export type NativeChatComposerDraftImage = {
+  id: string
+  /** Empty for an image Orca could not keep. */
+  path: string
+  connectionId?: string
+  /** Set on an image Orca could not keep: the file name the user must attach again. */
+  unavailableName?: string
+}
+
+export type NativeChatComposerDraft = {
+  readonly text: string
+  /** The editor's document for exactly `text`; dropped when the text changes without one. */
+  readonly document?: JSONContent
+  readonly images: readonly NativeChatComposerDraftImage[]
+}
+
+/** The workspace whose chat the draft was written in; its removal deletes the draft. */
+export type NativeChatComposerDraftOwner = {
+  readonly workspaceId: string
+  readonly executionHostId: ExecutionHostId
+}
+
+export type StoredNativeChatComposerDraft = NativeChatComposerDraft & {
+  readonly savedAt: number
+  readonly owner?: NativeChatComposerDraftOwner
+}
+
+/** Where drafts are kept. Every write and removal settles once storage has committed it, and
+ *  rejects when storage refused it. */
+export type NativeChatComposerDraftStorage = {
+  loadAll(): Promise<ReadonlyMap<string, unknown>>
+  read(scopeKey: string): Promise<unknown>
+  write(scopeKey: string, draft: StoredNativeChatComposerDraft): Promise<void>
+  remove(scopeKeys: readonly string[]): Promise<void>
+  /** Reads the stored record and writes what `apply` makes of it, as one change. */
+  update(
+    scopeKey: string,
+    apply: (stored: unknown) => StoredNativeChatComposerDraft | null
+  ): Promise<void>
+}
+
+/** Drafts kept for this run only: the storage of an environment without IndexedDB (unit tests),
+ *  and the fake those tests drive. */
+export function createMemoryNativeChatComposerDraftStorage(): NativeChatComposerDraftStorage & {
+  readonly drafts: Map<string, StoredNativeChatComposerDraft>
+  refuseWrites: boolean
+} {
+  const drafts = new Map<string, StoredNativeChatComposerDraft>()
+  const storage = {
+    drafts,
+    refuseWrites: false,
+    loadAll: async () => new Map(drafts),
+    read: async (scopeKey: string) => drafts.get(scopeKey),
+    write: (scopeKey: string, draft: StoredNativeChatComposerDraft) => {
+      if (storage.refuseWrites) {
+        return Promise.reject(new DOMException('refused', 'QuotaExceededError'))
+      }
+      drafts.set(scopeKey, draft)
+      return Promise.resolve()
+    },
+    remove: (scopeKeys: readonly string[]) => {
+      for (const scopeKey of scopeKeys) {
+        drafts.delete(scopeKey)
+      }
+      return Promise.resolve()
+    },
+    update: (
+      scopeKey: string,
+      apply: (stored: unknown) => StoredNativeChatComposerDraft | null
+    ) => {
+      if (storage.refuseWrites) {
+        return Promise.reject(new DOMException('refused', 'QuotaExceededError'))
+      }
+      const next = apply(drafts.get(scopeKey))
+      if (next) {
+        drafts.set(scopeKey, next)
+      } else {
+        drafts.delete(scopeKey)
+      }
+      return Promise.resolve()
+    }
+  }
+  return storage
+}
+
+let storage: NativeChatComposerDraftStorage | null = null
+
+export function nativeChatComposerDraftStorage(): NativeChatComposerDraftStorage {
+  storage ??=
+    typeof indexedDB === 'undefined'
+      ? createMemoryNativeChatComposerDraftStorage()
+      : createIndexedDbNativeChatComposerDraftStorage(indexedDB)
+  return storage
+}
+
+export function setNativeChatComposerDraftStorageForTests(
+  next: NativeChatComposerDraftStorage | null
+): void {
+  storage = next
+}
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return typeof value === 'object' && value !== null && !Array.isArray(value)
+}
+
+/** Only the editor's own root node is restored; anything else falls back to the plain text. */
+function isEditorDocument(value: unknown): value is JSONContent {
+  return isRecord(value) && value.type === 'doc'
+}
+
+function parseImage(value: unknown): NativeChatComposerDraftImage | null {
+  if (!isRecord(value)) {
+    return null
+  }
+  const { id, path, connectionId, unavailableName } = value
+  if (typeof id !== 'string') {
+    return null
+  }
+  if (typeof unavailableName === 'string') {
+    return { id, path: '', unavailableName }
+  }
+  if (typeof path !== 'string' || path === '') {
+    return null
+  }
+  return { id, path, ...(typeof connectionId === 'string' ? { connectionId } : {}) }
+}
+
+function parseOwner(value: unknown): NativeChatComposerDraftOwner | undefined {
+  if (!isRecord(value)) {
+    return undefined
+  }
+  const { workspaceId, executionHostId } = value
+  const host = typeof executionHostId === 'string' ? parseExecutionHostId(executionHostId) : null
+  return typeof workspaceId === 'string' && host
+    ? { workspaceId, executionHostId: host.id }
+    : undefined
+}
+
+/** A stored value as a draft, or null when it isn't one (a newer or damaged record). */
+export function parseStoredNativeChatComposerDraft(
+  value: unknown
+): StoredNativeChatComposerDraft | null {
+  if (!isRecord(value)) {
+    return null
+  }
+  const { text, document, images, savedAt } = value
+  if (typeof text !== 'string' || typeof savedAt !== 'number' || !Array.isArray(images)) {
+    return null
+  }
+  const owner = parseOwner(value.owner)
+  return {
+    text,
+    ...(isEditorDocument(document) ? { document } : {}),
+    images: images.flatMap((image) => parseImage(image) ?? []),
+    savedAt,
+    ...(owner ? { owner } : {})
+  }
+}
+
+const LEGACY_LOCAL_STORAGE_PREFIX = 'orca:nativeChatComposerDraft:v1:'
+
+/** Drafts this change kept in localStorage before it moved them; never released, so they go. */
+export function removeLegacyLocalStorageNativeChatComposerDrafts(): void {
+  try {
+    const keys: string[] = []
+    for (let position = 0; position < localStorage.length; position += 1) {
+      const key = localStorage.key(position)
+      if (key?.startsWith(LEGACY_LOCAL_STORAGE_PREFIX)) {
+        keys.push(key)
+      }
+    }
+    for (const key of keys) {
+      localStorage.removeItem(key)
+    }
+  } catch {
+    // No localStorage: nothing was kept there either.
+  }
+}
diff --git a/src/renderer/src/components/native-chat/native-chat-composer-draft-store.test.ts b/src/renderer/src/components/native-chat/native-chat-composer-draft-store.test.ts
new file mode 100644
index 00000000000..e0da93ddcd1
--- /dev/null
+++ b/src/renderer/src/components/native-chat/native-chat-composer-draft-store.test.ts
@@ -0,0 +1,901 @@
+// @vitest-environment happy-dom
+import { afterEach, beforeAll, beforeEach, describe, expect, it, vi } from 'vitest'
+import type * as DraftStore from './native-chat-composer-draft-store'
+import type * as DraftCache from './native-chat-draft-cache'
+import type * as ComposerAttachments from './use-native-chat-composer-attachments'
+import { MAX_PROMPT_BYTES } from '../../../../shared/rpc-contract/structured-agent-session-params'
+import {
+  createMemoryNativeChatComposerDraftStorage,
+  type NativeChatComposerDraftStorage
+} from './native-chat-composer-draft-storage'
+
+type DraftModules = {
+  drafts: typeof DraftCache
+  attachments: typeof ComposerAttachments
+  store: typeof DraftStore
+}
+
+let storage: ReturnType<typeof createMemoryNativeChatComposerDraftStorage>
+const loaded: DraftModules[] = []
+
+/** A fresh renderer: module memory is gone, the drafts' storage is not. */
+async function reload(
+  options: { using?: NativeChatComposerDraftStorage; hydrate?: boolean } = {}
+): Promise<DraftModules> {
+  vi.resetModules()
+  const storageModule = await import('./native-chat-composer-draft-storage')
+  storageModule.setNativeChatComposerDraftStorageForTests(options.using ?? storage)
+  const modules = {
+    drafts: await import('./native-chat-draft-cache'),
+    attachments: await import('./use-native-chat-composer-attachments'),
+    store: await import('./native-chat-composer-draft-store')
+  }
+  loaded.push(modules)
+  if (options.hydrate !== false) {
+    await modules.store.hydrateNativeChatComposerDrafts()
+  }
+  return modules
+}
+
+function storedDraft(scopeKey: string): Record<string, unknown> | null {
+  return storage.drafts.get(scopeKey) ?? null
+}
+
+const IMAGES = [
+  { id: 'a-1', path: '/repo/shot.png' },
+  { id: 'a-2', path: '/remote/repo/diagram.png', connectionId: 'ssh-1' }
+]
+
+const SKILL_DOCUMENT = {
+  type: 'doc',
+  content: [{ type: 'paragraph', content: [{ type: 'text', text: 'with /skill' }] }]
+}
+
+let modules: DraftModules
+
+// The attachment module's import graph is slow to transform cold; later reloads reuse it.
+beforeAll(async () => {
+  storage = createMemoryNativeChatComposerDraftStorage()
+  await reload()
+}, 300_000)
+
+beforeEach(async () => {
+  localStorage.clear()
+  storage = createMemoryNativeChatComposerDraftStorage()
+  modules = await reload()
+})
+
+afterEach(() => {
+  vi.useRealTimers()
+  // Each loaded renderer closes its channel, so it hears nothing from the next test.
+  for (const instance of loaded.splice(0)) {
+    instance.store.clearNativeChatComposerDraftsForTests()
+  }
+})
+
+describe('native-chat composer draft store', () => {
+  it('gives back the text, its editor document and the images after a reload', async () => {
+    vi.useFakeTimers()
+    modules.attachments.appendNativeChatAttachmentCache('tab-1:pane', IMAGES)
+    modules.drafts.writeNativeChatDraftDocument('tab-1:pane', 'with /skill', SKILL_DOCUMENT)
+    modules.drafts.writeNativeChatDraftCache('tab-1:pane', 'with /skill')
+    expect(storedDraft('tab-1:pane')?.text).toBe('')
+    vi.advanceTimersByTime(250)
+    vi.useRealTimers()
+
+    const reloaded = await reload()
+    expect(reloaded.drafts.readNativeChatDraftCache('tab-1:pane')).toBe('with /skill')
+    expect(reloaded.drafts.readNativeChatDraftDocument('tab-1:pane', 'with /skill')).toEqual(
+      SKILL_DOCUMENT
+    )
+    expect(reloaded.attachments.readNativeChatAttachmentCache('tab-1:pane')).toEqual(IMAGES)
+  })
+
+  it('writes a still-deferred draft when the window goes away', async () => {
+    vi.useFakeTimers()
+    modules.drafts.writeNativeChatDraftCache('tab-1:pane', 'typed just before reload')
+    window.dispatchEvent(new Event('pagehide'))
+    vi.useRealTimers()
+
+    const reloaded = await reload()
+    expect(reloaded.drafts.readNativeChatDraftCache('tab-1:pane')).toBe('typed just before reload')
+  })
+
+  it('replays a change storage had not confirmed when the window went away', async () => {
+    const uncommitted = createMemoryNativeChatComposerDraftStorage()
+    // A write the backend never finished: its promise never settles, and nothing lands.
+    uncommitted.write = () => new Promise(() => {})
+    const lost = await reload({ using: uncommitted })
+    lost.drafts.writeNativeChatDraftCache('tab-1:pane', 'typed, then Orca quit')
+    window.dispatchEvent(new Event('pagehide'))
+    expect(uncommitted.drafts.size).toBe(0)
+
+    const reloaded = await reload()
+    expect(reloaded.drafts.readNativeChatDraftCache('tab-1:pane')).toBe('typed, then Orca quit')
+    await reloaded.store.nativeChatComposerDraftWritesSettled()
+    expect(storedDraft('tab-1:pane')?.text).toBe('typed, then Orca quit')
+    expect(localStorage.length).toBe(0)
+  })
+
+  it('reports a scope’s writes settled only once storage completes them, and false when refused', async () => {
+    const pending: (() => void)[] = []
+    const slow = {
+      ...storage,
+      write: (scopeKey: string, draft: Parameters<typeof storage.write>[1]) =>
+        new Promise<void>((resolve) => {
+          pending.push(() => {
+            storage.drafts.set(scopeKey, draft)
+            resolve()
+          })
+        })
+    }
+    const reloaded = await reload({ using: slow })
+    reloaded.drafts.appendNativeChatDraftCache('agent-session:s1', 'returned by Stop')
+    // Typing still waiting for its deferred write is included too.
+    reloaded.drafts.writeNativeChatDraftCache('agent-session:s1', 'returned by Stop, edited')
+    let settled: boolean | undefined
+    void reloaded.store
+      .nativeChatComposerDraftWriteSettled('agent-session:s1')
+      .then((outcome) => (settled = outcome))
+    await new Promise((resolve) => setTimeout(resolve, 20))
+    expect(settled).toBeUndefined()
+    expect(pending).toHaveLength(2)
+
+    pending.shift()?.()
+    await new Promise((resolve) => setTimeout(resolve, 0))
+    expect(settled).toBeUndefined()
+    pending.shift()?.()
+    await vi.waitFor(() => expect(settled).toBe(true))
+
+    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
+    storage.refuseWrites = true
+    modules.drafts.appendNativeChatDraftCache('agent-session:s2', 'refused')
+    await expect(
+      modules.store.nativeChatComposerDraftWriteSettled('agent-session:s2')
+    ).resolves.toBe(false)
+    warn.mockRestore()
+  })
+
+  it('reports an append made before the load landed settled only once its write completes', async () => {
+    storage.drafts.set('agent-session:s1', { text: 'typed earlier', images: [], savedAt: 1 })
+    let complete: () => void = () => {}
+    const slow = {
+      ...storage,
+      loadAll: () => new Promise<ReadonlyMap<string, unknown>>(() => {}),
+      update: (scopeKey: string, apply: Parameters<typeof storage.update>[1]) =>
+        new Promise<void>((resolve) => {
+          complete = () => {
+            void storage.update(scopeKey, apply).then(resolve)
+          }
+        })
+    }
+    const reloaded = await reload({ using: slow, hydrate: false })
+    await reloaded.store.waitForNativeChatComposerDrafts(1)
+    reloaded.drafts.appendNativeChatDraftCache('agent-session:s1', 'returned by Stop')
+    let settled: boolean | undefined
+    void reloaded.store
+      .nativeChatComposerDraftWriteSettled('agent-session:s1')
+      .then((outcome) => (settled = outcome))
+    await new Promise((resolve) => setTimeout(resolve, 20))
+    expect(settled).toBeUndefined()
+
+    complete()
+    await vi.waitFor(() => expect(settled).toBe(true))
+    expect(storedDraft('agent-session:s1')?.text).toBe('typed earlier\n\nreturned by Stop')
+  })
+
+  it('never brings back a draft sent while storage refused, however much was given back to it', async () => {
+    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
+    storage.drafts.set('agent-session:s1', { text: 'old saved', images: [], savedAt: 1 })
+    const refuse = () => Promise.reject(new DOMException('refused', 'UnknownError'))
+    const broken = { ...storage, write: refuse, remove: refuse, update: refuse }
+    const refusing = await reload({ using: broken })
+    refusing.drafts.appendNativeChatDraftCache('agent-session:s1', 'a'.repeat(150_000))
+    refusing.drafts.appendNativeChatDraftCache('agent-session:s1', 'b'.repeat(150_000))
+    // The user sends it: the draft is cleared, and storage refuses that too.
+    refusing.drafts.writeNativeChatDraftCache('agent-session:s1', '')
+    await refusing.store.nativeChatComposerDraftWritesSettled()
+    window.dispatchEvent(new Event('pagehide'))
+    refusing.store.clearNativeChatComposerDraftsForTests()
+
+    const next = await reload()
+    expect(next.drafts.readNativeChatDraftCache('agent-session:s1')).toBe('')
+    warn.mockRestore()
+  })
+
+  it('does not replay a live window’s addition journaled after this load began reading', async () => {
+    storage.drafts.set('agent-session:s1', { text: 'saved', images: [], savedAt: 1 })
+    let commitA: () => void = () => {}
+    let aCommitted: () => void = () => {}
+    const aDone = new Promise<void>((resolve) => (aCommitted = resolve))
+    const aStorage = {
+      ...storage,
+      write: (scopeKey: string, draft: Parameters<typeof storage.write>[1]) =>
+        new Promise<void>((resolve) => {
+          commitA = () => {
+            storage.drafts.set(scopeKey, draft)
+            resolve()
+            aCommitted()
+          }
+        })
+    }
+    const a = await reload({ using: aStorage })
+    let land: () => void = () => {}
+    const bStorage = {
+      ...storage,
+      loadAll: () => {
+        const snapshot = new Map(storage.drafts)
+        return new Promise<ReadonlyMap<string, unknown>>((resolve) => {
+          land = () => resolve(snapshot)
+        })
+      },
+      // IndexedDB orders B's write after A's, which was issued first.
+      write: async (scopeKey: string, draft: Parameters<typeof storage.write>[1]) => {
+        await aDone
+        storage.drafts.set(scopeKey, draft)
+      }
+    }
+    const b = await reload({ using: bStorage, hydrate: false })
+    const bLoad = b.store.hydrateNativeChatComposerDrafts()
+    a.drafts.writeNativeChatDraftCache('agent-session:s1', 'saved typed in A')
+    a.drafts.appendNativeChatDraftCache('agent-session:s1', 'returned')
+    land()
+    await bLoad
+    commitA()
+    await a.store.nativeChatComposerDraftWritesSettled()
+    await b.store.nativeChatComposerDraftWritesSettled()
+    await new Promise((resolve) => setTimeout(resolve, 50))
+
+    expect(storedDraft('agent-session:s1')?.text).toBe('saved typed in A\n\nreturned')
+    expect(a.drafts.readNativeChatDraftCache('agent-session:s1')).toBe(
+      'saved typed in A\n\nreturned'
+    )
+  })
+
+  it('keeps text given back through a crash before storage commits it, once', async () => {
+    storage.drafts.set('agent-session:s1', { text: 'typed earlier', images: [], savedAt: 1 })
+    const crashing = { ...storage, write: () => new Promise<void>(() => {}) }
+    const crashed = await reload({ using: crashing })
+    // Stop gives a message back; its outbox entry is deleted right after, then Orca crashes.
+    expect(crashed.drafts.appendNativeChatDraftCache('agent-session:s1', 'returned by Stop')).toBe(
+      true
+    )
+    crashed.store.clearNativeChatComposerDraftsForTests()
+
+    const next = await reload()
+    expect(next.drafts.readNativeChatDraftCache('agent-session:s1')).toBe(
+      'typed earlier\n\nreturned by Stop'
+    )
+    await next.store.nativeChatComposerDraftWritesSettled()
+    expect(storedDraft('agent-session:s1')?.text).toBe('typed earlier\n\nreturned by Stop')
+    expect(localStorage.getItem('orca:nativeChatComposerDraftJournal:v1')).toBeNull()
+  })
+
+  it('does not give text back twice when storage committed it but the window died first', async () => {
+    storage.drafts.set('agent-session:s1', { text: 'typed earlier', images: [], savedAt: 1 })
+    const landsUnconfirmed = {
+      ...storage,
+      write: (scopeKey: string, draft: Parameters<typeof storage.write>[1]) => {
+        storage.drafts.set(scopeKey, draft)
+        return new Promise<void>(() => {})
+      }
+    }
+    const crashed = await reload({ using: landsUnconfirmed })
+    crashed.drafts.appendNativeChatDraftCache('agent-session:s1', 'returned by Stop')
+    crashed.attachments.appendNativeChatAttachmentCache('agent-session:s1', [IMAGES[0]])
+    crashed.store.clearNativeChatComposerDraftsForTests()
+
+    const next = await reload()
+    expect(next.drafts.readNativeChatDraftCache('agent-session:s1')).toBe(
+      'typed earlier\n\nreturned by Stop'
+    )
+    expect(next.attachments.readNativeChatAttachmentCache('agent-session:s1')).toEqual([IMAGES[0]])
+  })
+
+  it('keeps text given back before the load lands through a crash, without losing the saved draft', async () => {
+    storage.drafts.set('agent-session:s1', { text: 'typed earlier', images: [], savedAt: 1 })
+    let land: () => void = () => {}
+    const crashing = {
+      ...storage,
+      loadAll: () => {
+        const snapshot = new Map(storage.drafts)
+        return new Promise<ReadonlyMap<string, unknown>>((resolve) => {
+          land = () => resolve(snapshot)
+        })
+      },
+      update: () => new Promise<void>(() => {})
+    }
+    const crashed = await reload({ using: crashing, hydrate: false })
+    await crashed.store.waitForNativeChatComposerDrafts(1)
+    crashed.drafts.appendNativeChatDraftCache('agent-session:s1', 'returned by Stop')
+    crashed.store.clearNativeChatComposerDraftsForTests()
+    land()
+
+    const next = await reload()
+    expect(next.drafts.readNativeChatDraftCache('agent-session:s1')).toBe(
+      'typed earlier\n\nreturned by Stop'
+    )
+  })
+
+  it('saves text and images given back to the composer at once, before their other copy goes', async () => {
+    vi.useFakeTimers()
+    // No timer advanced: a crash right after either restore still keeps it.
+    modules.drafts.appendNativeChatDraftCache('tab-1:pane', 'withdrawn by Stop')
+    expect(storedDraft('tab-1:pane')?.text).toBe('withdrawn by Stop')
+    modules.attachments.appendNativeChatAttachmentCache('tab-1:pane', IMAGES)
+    vi.useRealTimers()
+
+    const reloaded = await reload()
+    expect(reloaded.drafts.readNativeChatDraftCache('tab-1:pane')).toBe('withdrawn by Stop')
+    expect(reloaded.attachments.readNativeChatAttachmentCache('tab-1:pane')).toEqual(IMAGES)
+  })
+
+  it('brings a pasted image back after a reload as one to attach again, by name', async () => {
+    const pasted = { id: 'p-1', path: '/var/folders/T/orca-paste-1-0f.png' }
+    modules.attachments.appendNativeChatAttachmentCache('tab-1:pane', [pasted, IMAGES[0]])
+    modules.drafts.writeNativeChatDraftCache('tab-1:pane', 'caption')
+    modules.store.flushNativeChatComposerDrafts()
+
+    expect(modules.attachments.readNativeChatAttachmentCache('tab-1:pane')).toEqual([
+      pasted,
+      IMAGES[0]
+    ])
+    const reloaded = await reload()
+    expect(reloaded.attachments.readNativeChatAttachmentCache('tab-1:pane')).toEqual([
+      { id: 'p-1', path: '', unavailableName: 'orca-paste-1-0f.png' },
+      IMAGES[0]
+    ])
+  })
+
+  it('keeps a draft that holds only a pasted image, as one to attach again', async () => {
+    modules.attachments.appendNativeChatAttachmentCache('tab-1:pane', [
+      { id: 'p-1', path: '/tmp/orca-paste-1-0f.png', connectionId: 'ssh-1' }
+    ])
+
+    const reloaded = await reload()
+    expect(reloaded.attachments.readNativeChatAttachmentCache('tab-1:pane')).toEqual([
+      { id: 'p-1', path: '', unavailableName: 'orca-paste-1-0f.png' }
+    ])
+  })
+
+  it('saves a paste kept in Orca’s paste folder as the real image, but not one over SSH', async () => {
+    const kept = {
+      id: 'p-1',
+      path: '/Users/me/Library/Application Support/orca/native-chat-pastes/orca-paste-1-0f.png'
+    }
+    const remote = {
+      id: 'p-2',
+      path: '/remote/native-chat-pastes/orca-paste-2-0f.png',
+      connectionId: 'ssh-1'
+    }
+    modules.attachments.appendNativeChatAttachmentCache('tab-1:pane', [kept, remote])
+
+    const reloaded = await reload()
+    expect(reloaded.attachments.readNativeChatAttachmentCache('tab-1:pane')).toEqual([
+      kept,
+      { id: 'p-2', path: '', unavailableName: 'orca-paste-2-0f.png' }
+    ])
+  })
+
+  it('puts a re-attached image in the place of the one to attach again', async () => {
+    storage.drafts.set('tab-1:pane', {
+      text: 'see',
+      images: [{ id: 'm', path: '', unavailableName: 'shot.png' }, IMAGES[0]],
+      savedAt: 1
+    })
+    const reloaded = await reload()
+
+    reloaded.attachments.appendNativeChatAttachmentCache(
+      'tab-1:pane',
+      [{ id: 'again', path: '/Users/me/Desktop/shot.png' }],
+      { fromUser: true }
+    )
+    expect(reloaded.attachments.readNativeChatAttachmentCache('tab-1:pane')).toEqual([
+      { id: 'again', path: '/Users/me/Desktop/shot.png' },
+      IMAGES[0]
+    ])
+  })
+
+  it('adds an image Stop gives back next to a placeholder with its name, never in its place', async () => {
+    storage.drafts.set('tab-1:pane', {
+      text: 'compare with this',
+      images: [{ id: 'm', path: '', unavailableName: 'image.png' }],
+      savedAt: 1
+    })
+    const reloaded = await reload()
+
+    reloaded.attachments.appendNativeChatAttachmentCache('tab-1:pane', [
+      { id: 'withdrawn-cm-1-1', path: '/Users/me/Downloads/image.png' }
+    ])
+    expect(reloaded.attachments.readNativeChatAttachmentCache('tab-1:pane')).toEqual([
+      { id: 'm', path: '', unavailableName: 'image.png' },
+      { id: 'withdrawn-cm-1-1', path: '/Users/me/Downloads/image.png' }
+    ])
+  })
+
+  it('appends a given-back message after a draft restored from a reload', async () => {
+    modules.drafts.writeNativeChatDraftCache('tab-1:pane', 'mine')
+    modules.store.flushNativeChatComposerDrafts()
+
+    const reloaded = await reload()
+    reloaded.drafts.appendNativeChatDraftCache('tab-1:pane', 'returned')
+    expect(reloaded.drafts.readNativeChatDraftCache('tab-1:pane')).toBe('mine\n\nreturned')
+  })
+
+  it('removes the saved draft as soon as it is sent, even with a typed change still deferred', async () => {
+    vi.useFakeTimers()
+    modules.attachments.appendNativeChatAttachmentCache('tab-1:pane', IMAGES)
+    modules.drafts.writeNativeChatDraftCache('tab-1:pane', 'about to send')
+    modules.store.flushNativeChatComposerDrafts()
+    modules.drafts.writeNativeChatDraftCache('tab-1:pane', 'about to send!')
+
+    // The send clears the text, then the images; the text clear lands before any timer.
+    modules.drafts.writeNativeChatDraftCache('tab-1:pane', '')
+    expect(storedDraft('tab-1:pane')).toMatchObject({ text: '', images: IMAGES })
+    modules.store.updateNativeChatComposerDraft('tab-1:pane', { images: [] }, 'immediate')
+    expect(storage.drafts.size).toBe(0)
+
+    vi.advanceTimersByTime(1_000)
+    expect(storage.drafts.size).toBe(0)
+    vi.useRealTimers()
+    const reloaded = await reload()
+    expect(reloaded.drafts.readNativeChatDraftCache('tab-1:pane')).toBe('')
+    expect(reloaded.attachments.readNativeChatAttachmentCache('tab-1:pane')).toEqual([])
+  })
+
+  it('removes an emptied draft without waiting for a flush', () => {
+    vi.useFakeTimers()
+    modules.drafts.writeNativeChatDraftCache('tab-1:pane', 'about to send')
+    modules.store.flushNativeChatComposerDrafts()
+    modules.drafts.writeNativeChatDraftCache('tab-1:pane', '')
+
+    expect(storage.drafts.size).toBe(0)
+  })
+
+  it('loses nothing past the old budget: 200 drafts and over 5M characters all come back', async () => {
+    for (let index = 0; index < 200; index += 1) {
+      modules.drafts.writeNativeChatDraftCache(`tab-${index}:pane`, `${index}`.padEnd(26_000, 'd'))
+    }
+    modules.store.flushNativeChatComposerDrafts()
+    const returned = 'r'.repeat(MAX_PROMPT_BYTES)
+    modules.drafts.appendNativeChatDraftCache('tab-0:pane', returned)
+
+    const reloaded = await reload()
+    for (let index = 0; index < 200; index += 1) {
+      expect(reloaded.drafts.readNativeChatDraftCache(`tab-${index}:pane`)).toHaveLength(
+        index === 0 ? 26_000 + 2 + returned.length : 26_000
+      )
+    }
+    const total = [...storage.drafts.values()].reduce((sum, draft) => sum + draft.text.length, 0)
+    expect(total).toBeGreaterThan(5_000_000)
+  })
+
+  it('shows a refused draft as not saved, retries it on the next flush, and clears that once it lands', async () => {
+    modules.attachments.appendNativeChatAttachmentCache('tab-1:pane', IMAGES)
+    modules.store.flushNativeChatComposerDrafts()
+    await modules.store.nativeChatComposerDraftWritesSettled()
+    const listener = vi.fn()
+    modules.store.subscribeToNativeChatComposerDraft('tab-1:pane', listener)
+
+    storage.refuseWrites = true
+    modules.drafts.writeNativeChatDraftCache('tab-1:pane', 'refused')
+    modules.store.flushNativeChatComposerDrafts()
+    await modules.store.nativeChatComposerDraftWritesSettled()
+    expect(modules.store.isNativeChatComposerDraftUnsaved('tab-1:pane')).toBe(true)
+    expect(listener).toHaveBeenCalled()
+    expect(modules.drafts.readNativeChatDraftCache('tab-1:pane')).toBe('refused')
+    expect(storedDraft('tab-1:pane')?.text).toBe('')
+
+    storage.refuseWrites = false
+    // The next flush, here from the window hiding, retries it with no new change.
+    window.dispatchEvent(new Event('pagehide'))
+    await modules.store.nativeChatComposerDraftWritesSettled()
+    expect(modules.store.isNativeChatComposerDraftUnsaved('tab-1:pane')).toBe(false)
+    const reloaded = await reload()
+    expect(reloaded.drafts.readNativeChatDraftCache('tab-1:pane')).toBe('refused')
+    expect(reloaded.attachments.readNativeChatAttachmentCache('tab-1:pane')).toEqual(IMAGES)
+  })
+
+  it('shows an unsaved text without storing it, and stores it once the user changes it', async () => {
+    modules.attachments.appendNativeChatAttachmentCache('tab-1:pane', IMAGES)
+    modules.drafts.writeNativeChatDraftCache('tab-1:pane', 'https://example.com/issue/1', {
+      unsaved: true
+    })
+    modules.drafts.writeNativeChatDraftDocument('tab-1:pane', 'https://example.com/issue/1', {
+      type: 'doc'
+    })
+    modules.store.flushNativeChatComposerDrafts()
+
+    expect(modules.drafts.readNativeChatDraftCache('tab-1:pane')).toBe(
+      'https://example.com/issue/1'
+    )
+    expect(storedDraft('tab-1:pane')).toMatchObject({ text: '', images: IMAGES })
+    modules.drafts.writeNativeChatDraftCache('tab-1:pane', 'https://example.com/issue/1 please')
+    modules.store.flushNativeChatComposerDrafts()
+    const reloaded = await reload()
+    expect(reloaded.drafts.readNativeChatDraftCache('tab-1:pane')).toBe(
+      'https://example.com/issue/1 please'
+    )
+  })
+
+  it('writes nothing when a change leaves the draft as it was', () => {
+    modules.drafts.writeNativeChatDraftCache('tab-1:pane', 'same')
+    modules.store.flushNativeChatComposerDrafts()
+    const write = vi.spyOn(storage, 'write')
+
+    modules.drafts.writeNativeChatDraftCache('tab-1:pane', 'same')
+    modules.store.updateNativeChatComposerDraft('tab-1:pane', { images: [] }, 'immediate')
+    modules.store.flushNativeChatComposerDrafts()
+    expect(write).not.toHaveBeenCalled()
+  })
+
+  it('drops a stored record that is not a draft', async () => {
+    storage.drafts.set('broken', JSON.parse('{"text":5}'))
+    storage.drafts.set('tab-1:pane', { text: 'fine', images: [], savedAt: 1 })
+
+    const reloaded = await reload()
+    await reloaded.store.nativeChatComposerDraftWritesSettled()
+    expect(storage.drafts.has('broken')).toBe(false)
+    expect(reloaded.drafts.readNativeChatDraftCache('tab-1:pane')).toBe('fine')
+  })
+
+  it('keeps what was typed before a slow load lands, and fills in the rest when it does', async () => {
+    storage.drafts.set('tab-1:pane', { text: 'saved earlier', images: [], savedAt: 1 })
+    storage.drafts.set('tab-2:pane', { text: 'other chat', images: [], savedAt: 1 })
+    let land: () => void = () => {}
+    const slow = {
+      ...storage,
+      loadAll: () =>
+        new Promise<ReadonlyMap<string, unknown>>((resolve) => {
+          land = () => resolve(new Map(storage.drafts))
+        })
+    }
+    const reloaded = await reload({ using: slow, hydrate: false })
+    // Startup gives up waiting; the load is still running.
+    await reloaded.store.waitForNativeChatComposerDrafts(1)
+    reloaded.drafts.writeNativeChatDraftCache('tab-1:pane', 'typed before the load')
+
+    land()
+    await reloaded.store.hydrateNativeChatComposerDrafts()
+    expect(reloaded.drafts.readNativeChatDraftCache('tab-1:pane')).toBe('typed before the load')
+    expect(reloaded.drafts.readNativeChatDraftCache('tab-2:pane')).toBe('other chat')
+  })
+
+  it('adds what is given back before a slow load lands to the saved draft, instead of replacing it', async () => {
+    storage.drafts.set('agent-session:s1', {
+      text: 'saved earlier',
+      images: [IMAGES[0]],
+      savedAt: 1
+    })
+    let land: () => void = () => {}
+    // Storage reads as of the load's start, as IndexedDB does for a transaction begun first.
+    const slow = {
+      ...storage,
+      loadAll: () => {
+        const snapshot = new Map(storage.drafts)
+        return new Promise<ReadonlyMap<string, unknown>>((resolve) => {
+          land = () => resolve(snapshot)
+        })
+      }
+    }
+    const reloaded = await reload({ using: slow, hydrate: false })
+    await reloaded.store.waitForNativeChatComposerDrafts(1)
+    // Stop's restore, and a paste, before the load lands.
+    reloaded.drafts.appendNativeChatDraftCache('agent-session:s1', 'returned by Stop')
+    reloaded.attachments.appendNativeChatAttachmentCache('agent-session:s1', [IMAGES[1]], {
+      fromUser: true
+    })
+
+    land()
+    await reloaded.store.hydrateNativeChatComposerDrafts()
+    await reloaded.store.nativeChatComposerDraftWritesSettled()
+    expect(reloaded.drafts.readNativeChatDraftCache('agent-session:s1')).toBe(
+      'saved earlier\n\nreturned by Stop'
+    )
+    expect(reloaded.attachments.readNativeChatAttachmentCache('agent-session:s1')).toEqual(IMAGES)
+    expect(storedDraft('agent-session:s1')).toMatchObject({
+      text: 'saved earlier\n\nreturned by Stop',
+      images: IMAGES
+    })
+  })
+
+  it('keeps the saved draft when a load that failed once reads after text was given back', async () => {
+    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
+    storage.drafts.set('agent-session:s1', { text: 'saved typing', images: [], savedAt: 1 })
+    let failures = 1
+    const flaky = {
+      ...storage,
+      loadAll: () =>
+        failures-- > 0 ? Promise.reject(new Error('backing store')) : storage.loadAll()
+    }
+    const reloaded = await reload({ using: flaky, hydrate: false })
+    await reloaded.store.waitForNativeChatComposerDrafts(1)
+    reloaded.drafts.appendNativeChatDraftCache('agent-session:s1', 'given back')
+    await reloaded.store.nativeChatComposerDraftWritesSettled()
+    await new Promise((resolve) => setTimeout(resolve, 1_200))
+    await reloaded.store.hydrateNativeChatComposerDrafts()
+    await reloaded.store.nativeChatComposerDraftWritesSettled()
+
+    expect(reloaded.drafts.readNativeChatDraftCache('agent-session:s1')).toBe(
+      'saved typing\n\ngiven back'
+    )
+    expect(storedDraft('agent-session:s1')?.text).toBe('saved typing\n\ngiven back')
+    warn.mockRestore()
+  })
+
+  it('keeps an append made after a retried load began reading', async () => {
+    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
+    let failures = 1
+    let land: () => void = () => {}
+    const flaky = {
+      ...storage,
+      loadAll: () => {
+        if (failures-- > 0) {
+          return Promise.reject(new Error('backing store'))
+        }
+        const snapshot = new Map(storage.drafts)
+        return new Promise<ReadonlyMap<string, unknown>>((resolve) => {
+          land = () => resolve(snapshot)
+        })
+      }
+    }
+    const reloaded = await reload({ using: flaky, hydrate: false })
+    await reloaded.store.waitForNativeChatComposerDrafts(1)
+    reloaded.drafts.appendNativeChatDraftCache('agent-session:s1', 'first')
+    await reloaded.store.nativeChatComposerDraftWritesSettled()
+    await new Promise((resolve) => setTimeout(resolve, 1_200))
+    reloaded.drafts.appendNativeChatDraftCache('agent-session:s1', 'second')
+    await reloaded.store.nativeChatComposerDraftWritesSettled()
+
+    land()
+    await reloaded.store.hydrateNativeChatComposerDrafts()
+    await reloaded.store.nativeChatComposerDraftWritesSettled()
+    expect(reloaded.drafts.readNativeChatDraftCache('agent-session:s1')).toBe('first\n\nsecond')
+    expect(storedDraft('agent-session:s1')?.text).toBe('first\n\nsecond')
+    warn.mockRestore()
+  })
+
+  it('starts the load on its first write when startup never did', async () => {
+    storage.drafts.set('agent-session:other', { text: 'saved elsewhere', images: [], savedAt: 1 })
+    const counted = { ...storage, loadAll: vi.fn(() => storage.loadAll()) }
+    const reloaded = await reload({ using: counted, hydrate: false })
+    reloaded.drafts.writeNativeChatDraftCache('tab-1:pane', 'typed')
+
+    expect(counted.loadAll).toHaveBeenCalledTimes(1)
+    await vi.waitFor(() =>
+      expect(reloaded.drafts.readNativeChatDraftCache('agent-session:other')).toBe(
+        'saved elsewhere'
+      )
+    )
+  })
+
+  it('retries a failed load a few times, warns once, and then stops', async () => {
+    vi.useFakeTimers()
+    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
+    const broken = {
+      ...storage,
+      loadAll: vi.fn(() => Promise.reject(new Error('no backing store')))
+    }
+    const reloaded = await reload({ using: broken, hydrate: false })
+    await reloaded.store.hydrateNativeChatComposerDrafts()
+    for (let tick = 0; tick < 10; tick += 1) {
+      reloaded.drafts.writeNativeChatDraftCache('tab-1:pane', `typing ${tick}`)
+      await vi.advanceTimersByTimeAsync(60_000)
+    }
+
+    expect(broken.loadAll).toHaveBeenCalledTimes(4)
+    expect(warn.mock.calls.filter(([message]) => String(message).includes('loaded'))).toHaveLength(
+      1
+    )
+    expect(reloaded.drafts.readNativeChatDraftCache('tab-1:pane')).toBe('typing 9')
+    warn.mockRestore()
+  })
+
+  it('does not echo a draft adopted from another window as a change of its own', async () => {
+    const other = await reload()
+    const doc = (text: string) => ({
+      type: 'doc',
+      content: [{ type: 'paragraph', content: [{ type: 'text', text }] }]
+    })
+    other.drafts.writeNativeChatDraftDocument('agent-session:s3', 'abc', doc('abc'))
+    other.store.flushNativeChatComposerDrafts()
+    await vi.waitFor(() =>
+      expect(modules.drafts.readNativeChatDraftCache('agent-session:s3')).toBe('abc')
+    )
+    // The editor here shows the adopted draft and hands back an equal document of its own.
+    modules.drafts.writeNativeChatDraftDocument('agent-session:s3', 'abc', doc('abc'))
+    other.drafts.writeNativeChatDraftDocument('agent-session:s3', 'abcd', doc('abcd'))
+    other.store.flushNativeChatComposerDrafts()
+    await other.store.nativeChatComposerDraftWritesSettled()
+    await new Promise((resolve) => setTimeout(resolve, 20))
+    modules.store.flushNativeChatComposerDrafts()
+    await modules.store.nativeChatComposerDraftWritesSettled()
+    await new Promise((resolve) => setTimeout(resolve, 50))
+
+    expect(other.drafts.readNativeChatDraftCache('agent-session:s3')).toBe('abcd')
+    expect(storedDraft('agent-session:s3')?.text).toBe('abcd')
+  })
+
+  it('never replays a closed window’s journal over a draft another window sent since', async () => {
+    const tabB = modules
+    // Tab A's write lands, but the page goes away before it is confirmed.
+    const landsUnconfirmed = {
+      ...storage,
+      write: (scopeKey: string, draft: Parameters<typeof storage.write>[1]) => {
+        storage.drafts.set(scopeKey, draft)
+        return new Promise<void>(() => {})
+      }
+    }
+    const tabA = await reload({ using: landsUnconfirmed })
+    tabA.drafts.writeNativeChatDraftCache('agent-session:s1', 'typed in A, then A closed')
+    window.dispatchEvent(new Event('pagehide'))
+    expect(localStorage.getItem('orca:nativeChatComposerDraftJournal:v1')).toContain('typed in A')
+    tabA.store.clearNativeChatComposerDraftsForTests()
+
+    tabB.drafts.writeNativeChatDraftCache('agent-session:s1', 'written in B')
+    tabB.store.clearNativeChatComposerDraftIfUnchanged('agent-session:s1', {
+      text: 'written in B',
+      images: []
+    })
+    await tabB.store.nativeChatComposerDraftWritesSettled()
+
+    const tabC = await reload()
+    expect(tabC.drafts.readNativeChatDraftCache('agent-session:s1')).toBe('')
+    expect(localStorage.getItem('orca:nativeChatComposerDraftJournal:v1')).toBeNull()
+  })
+
+  it('keeps a refused draft in the journal for the next run', async () => {
+    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
+    storage.refuseWrites = true
+    modules.drafts.writeNativeChatDraftCache('agent-session:s1', 'typed while storage refuses')
+    modules.store.flushNativeChatComposerDrafts()
+    await modules.store.nativeChatComposerDraftWritesSettled()
+    window.dispatchEvent(new Event('pagehide'))
+    await modules.store.nativeChatComposerDraftWritesSettled()
+    modules.store.clearNativeChatComposerDraftsForTests()
+
+    storage.refuseWrites = false
+    const next = await reload()
+    expect(next.drafts.readNativeChatDraftCache('agent-session:s1')).toBe(
+      'typed while storage refuses'
+    )
+    warn.mockRestore()
+  })
+
+  it('keeps the journal under its cap while storage refuses', async () => {
+    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
+    storage.refuseWrites = true
+    const durable: boolean[] = []
+    for (let index = 0; index < 10; index += 1) {
+      durable.push(
+        modules.store.appendToNativeChatComposerDraft(`agent-session:big-${index}`, {
+          text: 'x'.repeat(200_000)
+        })
+      )
+      modules.drafts.writeNativeChatDraftCache(`tab-${index}:pane`, 'y'.repeat(60_000))
+    }
+    modules.store.flushNativeChatComposerDrafts()
+    await modules.store.nativeChatComposerDraftWritesSettled()
+    window.dispatchEvent(new Event('pagehide'))
+
+    const journal = localStorage.getItem('orca:nativeChatComposerDraftJournal:v1') ?? ''
+    // Additions keep to their own cap, whole drafts to theirs.
+    expect(journal.length).toBeLessThanOrEqual(800_000 + 256_000)
+    // What no longer fits is reported, so its source is kept until storage confirms it.
+    expect(durable).toContain(false)
+    warn.mockRestore()
+  })
+
+  it('keeps a restored image checked when another window saves the draft with the same image', async () => {
+    const other = await reload()
+    other.attachments.appendNativeChatAttachmentCache('tab-1:pane', [IMAGES[0]])
+    await vi.waitFor(() =>
+      expect(modules.attachments.readNativeChatAttachmentCache('tab-1:pane')).toEqual([IMAGES[0]])
+    )
+    modules.store.markNativeChatComposerDraftVerified('tab-1:pane')
+
+    other.drafts.appendNativeChatDraftCache('tab-1:pane', 'caption')
+    await vi.waitFor(() =>
+      expect(modules.drafts.readNativeChatDraftCache('tab-1:pane')).toBe('caption')
+    )
+    expect(modules.store.isNativeChatComposerDraftUnverified('tab-1:pane')).toBe(false)
+
+    other.attachments.appendNativeChatAttachmentCache('tab-1:pane', [IMAGES[1]])
+    await vi.waitFor(() =>
+      expect(modules.store.isNativeChatComposerDraftUnverified('tab-1:pane')).toBe(true)
+    )
+  })
+
+  it('follows another window’s save of a draft, unless a change here is not saved yet', async () => {
+    const other = await reload()
+    other.drafts.appendNativeChatDraftCache('tab-1:pane', 'from the other tab')
+    await vi.waitFor(() =>
+      expect(modules.drafts.readNativeChatDraftCache('tab-1:pane')).toBe('from the other tab')
+    )
+
+    other.drafts.writeNativeChatDraftCache('tab-1:pane', '')
+    await vi.waitFor(() => expect(modules.drafts.readNativeChatDraftCache('tab-1:pane')).toBe(''))
+
+    vi.useFakeTimers()
+    modules.drafts.writeNativeChatDraftCache('tab-1:pane', 'mine, not saved yet')
+    other.drafts.appendNativeChatDraftCache('tab-1:pane', 'theirs')
+    vi.useRealTimers()
+    await new Promise((resolve) => setTimeout(resolve, 20))
+    expect(modules.drafts.readNativeChatDraftCache('tab-1:pane')).toBe('mine, not saved yet')
+  })
+
+  it('records the workspace a draft was written in, and deletes a closed chat’s draft with it', async () => {
+    const owner = { workspaceId: 'repo::/wt', executionHostId: 'local' as const }
+    modules.store.setNativeChatComposerDraftOwnerResolver((scopeKey) =>
+      scopeKey === 'agent-session:closed' ? owner : undefined
+    )
+    modules.drafts.writeNativeChatDraftCache('agent-session:closed', 'unsent')
+    modules.drafts.writeNativeChatDraftCache('agent-session:other', 'kept')
+    modules.store.flushNativeChatComposerDrafts()
+    expect(storedDraft('agent-session:closed')?.owner).toEqual(owner)
+
+    const reloaded = await reload()
+    reloaded.store.deleteNativeChatComposerDraftsOwnedBy({ ...owner, executionHostId: 'ssh:box' })
+    expect(reloaded.drafts.readNativeChatDraftCache('agent-session:closed')).toBe('unsent')
+    reloaded.store.deleteNativeChatComposerDraftsOwnedBy(owner)
+    expect(reloaded.drafts.readNativeChatDraftCache('agent-session:closed')).toBe('')
+    expect(storedDraft('agent-session:closed')).toBeNull()
+    expect(storedDraft('agent-session:other')?.text).toBe('kept')
+  })
+
+  it('drops the drafts of a closed tab and leaves other tabs alone', async () => {
+    modules.drafts.writeNativeChatDraftCache('tab-1:pane-a', 'a')
+    modules.drafts.writeNativeChatDraftCache('tab-1:pane-b', 'b')
+    modules.drafts.writeNativeChatDraftCache('tab-10:pane', 'other tab')
+    modules.store.flushNativeChatComposerDrafts()
+    modules.drafts.writeNativeChatDraftCache('tab-1:pane-a', 'a, still deferred')
+
+    modules.store.deleteNativeChatComposerDraftsForTab('tab-1')
+    expect(modules.drafts.readNativeChatDraftCache('tab-1:pane-a')).toBe('')
+    modules.store.flushNativeChatComposerDrafts()
+    const reloaded = await reload()
+    expect(reloaded.drafts.readNativeChatDraftCache('tab-1:pane-a')).toBe('')
+    expect(reloaded.drafts.readNativeChatDraftCache('tab-1:pane-b')).toBe('')
+    expect(reloaded.drafts.readNativeChatDraftCache('tab-10:pane')).toBe('other tab')
+  })
+
+  it('keeps a conversation’s draft when a tab is closed, and drops it when deleted by its key', async () => {
+    const conversation = modules.store.structuredAgentSessionDraftScopeKey('session-1')
+    expect(conversation).toBe('agent-session:session-1')
+    modules.drafts.writeNativeChatDraftCache(conversation, 'unsent')
+    modules.drafts.writeNativeChatDraftCache('tab-1:pane', 'pane draft')
+    modules.store.flushNativeChatComposerDrafts()
+    // The prefix before the conversation key's ':' must never read as a tab id.
+    modules.store.deleteNativeChatComposerDraftsForTab('agent-session')
+    modules.store.deleteNativeChatComposerDraftsForTab('tab-1')
+    expect(modules.drafts.readNativeChatDraftCache(conversation)).toBe('unsent')
+
+    const listener = vi.fn()
+    modules.store.subscribeToNativeChatComposerDraft(conversation, listener)
+    modules.drafts.writeNativeChatDraftCache(conversation, 'unsent, still deferred')
+    modules.store.deleteNativeChatComposerDraft(conversation)
+    expect(listener).toHaveBeenCalled()
+    expect(modules.drafts.readNativeChatDraftCache(conversation)).toBe('')
+    modules.store.flushNativeChatComposerDrafts()
+    const reloaded = await reload()
+    expect(reloaded.drafts.readNativeChatDraftCache(conversation)).toBe('')
+  })
+
+  it('keeps the drafts of a tab whose id extends the closed one', async () => {
+    // A second chat for one session gets `<tab id>:history-1`, so a prefix match would reach it.
+    const closed = 'structured-agent-session-claude_1'
+    const kept = `${closed}:history-1`
+    modules.drafts.writeNativeChatDraftCache(`${closed}:0a1b2c3d-0000-4000-a000-000000000001`, 'a')
+    modules.drafts.writeNativeChatDraftCache(`${kept}:0a1b2c3d-0000-4000-a000-000000000002`, 'b')
+    modules.store.flushNativeChatComposerDrafts()
+
+    modules.store.deleteNativeChatComposerDraftsForTab(closed)
+    const reloaded = await reload()
+    expect(
+      reloaded.drafts.readNativeChatDraftCache(`${closed}:0a1b2c3d-0000-4000-a000-000000000001`)
+    ).toBe('')
+    expect(
+      reloaded.drafts.readNativeChatDraftCache(`${kept}:0a1b2c3d-0000-4000-a000-000000000002`)
+    ).toBe('b')
+  })
+})
diff --git a/src/renderer/src/components/native-chat/native-chat-composer-draft-store.ts b/src/renderer/src/components/native-chat/native-chat-composer-draft-store.ts
new file mode 100644
index 00000000000..b8ca9d888b0
--- /dev/null
+++ b/src/renderer/src/components/native-chat/native-chat-composer-draft-store.ts
@@ -0,0 +1,301 @@
+// The one owner of each composer scope's unsent message: its text, the editor document for that
+// text and its settled image refs. Every writer changes the whole record here in memory, and
+// storage is written from that record, so a reload or quit gives the draft back and a failed or
+// skipped write is repaired by the next one.
+
+import type { JSONContent } from '@tiptap/react'
+import {
+  sameNativeChatComposerDraftDocument,
+  sameNativeChatComposerDraftImages
+} from './native-chat-composer-draft-comparison'
+import {
+  withNativeChatComposerDraftAddition,
+  type NativeChatComposerDraftAddition
+} from './native-chat-composer-draft-addition'
+import { journalNativeChatComposerDraftAddition } from './native-chat-composer-draft-journal'
+import {
+  clearDraftMemoryForTests,
+  dirtyScopes,
+  hasLocalChange,
+  load,
+  nextSavedAt,
+  notifyScope,
+  records,
+  refusedScopes,
+  scopeListeners,
+  unverifiedScopes,
+  type DraftAppend,
+  type DraftRecord
+} from './native-chat-composer-draft-memory'
+import {
+  deleteLoadingNativeChatComposerDraftsWhere,
+  persistNativeChatComposerDraft,
+  resetNativeChatComposerDraftPersistenceForTests
+} from './native-chat-composer-draft-persistence'
+import {
+  hydrateNativeChatComposerDrafts,
+  resetNativeChatComposerDraftLoadForTests
+} from './native-chat-composer-draft-load'
+import {
+  setNativeChatComposerDraftStorageForTests,
+  type NativeChatComposerDraft,
+  type NativeChatComposerDraftImage,
+  type NativeChatComposerDraftOwner,
+  type StoredNativeChatComposerDraft
+} from './native-chat-composer-draft-storage'
+
+export {
+  flushNativeChatComposerDrafts,
+  isKeptLocalPaste,
+  nativeChatComposerDraftWriteSettled,
+  nativeChatComposerDraftWritesSettled,
+  unavailableNativeChatComposerDraftImage
+} from './native-chat-composer-draft-persistence'
+export {
+  hydrateNativeChatComposerDrafts,
+  isNativeChatComposerDraftLoadPending,
+  waitForNativeChatComposerDrafts
+} from './native-chat-composer-draft-load'
+
+/** This window has changed the draft and storage has not confirmed it yet. */
+export function hasUnsavedNativeChatComposerDraftChange(scopeKey: string): boolean {
+  return hasLocalChange(scopeKey)
+}
+
+export type NativeChatComposerDraftChange = {
+  text?: string
+  /** Present, even as undefined, to replace the document. */
+  document?: JSONContent
+  images?: readonly NativeChatComposerDraftImage[]
+  /** Text shown but never saved while the draft still holds exactly it. */
+  unsavedText?: string
+}
+
+const EMPTY_DRAFT: DraftRecord = { text: '', images: [], savedAt: 0 }
+
+let resolveOwner: ((scopeKey: string) => NativeChatComposerDraftOwner | undefined) | null = null
+
+/** Names the workspace a scope's chat belongs to, so a new draft can record its owner. */
+export function setNativeChatComposerDraftOwnerResolver(
+  resolver: (scopeKey: string) => NativeChatComposerDraftOwner | undefined
+): void {
+  resolveOwner = resolver
+}
+
+/** Composers render from the store; this tells one that its pane's draft changed. */
+export function subscribeToNativeChatComposerDraft(
+  scopeKey: string,
+  listener: () => void
+): () => void {
+  const listeners = scopeListeners.get(scopeKey) ?? new Set()
+  scopeListeners.set(scopeKey, listeners)
+  listeners.add(listener)
+  return () => {
+    listeners.delete(listener)
+    if (listeners.size === 0 && scopeListeners.get(scopeKey) === listeners) {
+      scopeListeners.delete(scopeKey)
+    }
+  }
+}
+
+/** A draft read back from storage this run whose image files have not been checked yet. */
+export function isNativeChatComposerDraftUnverified(scopeKey: string): boolean {
+  return unverifiedScopes.has(scopeKey)
+}
+
+export function markNativeChatComposerDraftVerified(scopeKey: string): void {
+  if (unverifiedScopes.delete(scopeKey)) {
+    notifyScope(scopeKey)
+  }
+}
+
+/** A draft storage refused to save: it is kept in memory only until a later write lands. */
+export function isNativeChatComposerDraftUnsaved(scopeKey: string): boolean {
+  return refusedScopes.has(scopeKey) && records.has(scopeKey)
+}
+
+function isEmptyDraft(draft: NativeChatComposerDraft): boolean {
+  return draft.text === '' && draft.images.length === 0
+}
+
+export function readNativeChatComposerDraft(scopeKey: string): NativeChatComposerDraft {
+  return records.get(scopeKey) ?? EMPTY_DRAFT
+}
+
+/**
+ * Changes fields of the scope's draft. `deferred` is for typing, coalesced into one write;
+ * `immediate` saves now: text or images given back from a copy about to be deleted, and clears.
+ * An emptied draft is removed at once, so a sent message never comes back.
+ */
+export function updateNativeChatComposerDraft(
+  scopeKey: string,
+  change: NativeChatComposerDraftChange,
+  persist: 'immediate' | 'deferred',
+  append?: DraftAppend
+): void {
+  const current = records.get(scopeKey) ?? EMPTY_DRAFT
+  const text = change.text ?? current.text
+  const document = 'document' in change ? change.document : current.document
+  const images = change.images ?? current.images
+  const unsavedText = change.unsavedText ?? current.unsavedText
+  if (
+    text === current.text &&
+    sameNativeChatComposerDraftDocument(document, current.document) &&
+    unsavedText === current.unsavedText &&
+    sameNativeChatComposerDraftImages(images, current.images)
+  ) {
+    if (persist === 'immediate' && dirtyScopes.has(scopeKey)) {
+      persistNativeChatComposerDraft(scopeKey, 'immediate')
+    }
+    return
+  }
+  if (isEmptyDraft({ text, images })) {
+    records.delete(scopeKey)
+    notifyScope(scopeKey)
+    persistNativeChatComposerDraft(scopeKey, 'immediate', append)
+    return
+  }
+  // Why stamped once: a conversation never moves to another workspace, so its owner stays true.
+  const owner = current.owner ?? resolveOwner?.(scopeKey)
+  const record: DraftRecord = {
+    text,
+    ...(document ? { document } : {}),
+    images: [...images],
+    savedAt: nextSavedAt(),
+    ...(owner ? { owner } : {}),
+    ...(unsavedText === undefined ? {} : { unsavedText })
+  }
+  records.set(scopeKey, record)
+  notifyScope(scopeKey)
+  persistNativeChatComposerDraft(scopeKey, persist, append)
+  if (!load.hydrated) {
+    // Why: a window whose startup never started the load still gets its saved drafts.
+    void hydrateNativeChatComposerDrafts()
+  }
+}
+
+function withAddition<T extends NativeChatComposerDraft>(
+  draft: T,
+  addition: NativeChatComposerDraftAddition,
+  options: { once?: boolean } = {}
+): T {
+  const next = withNativeChatComposerDraftAddition(draft, addition, options)
+  return { ...draft, ...next, ...(next.text === draft.text ? {} : { document: undefined }) }
+}
+
+/**
+ * Adds to the scope's draft as it is now: text or images given back, or attached. Before the
+ * startup load lands, the same addition is made again to the loaded draft, so nothing saved
+ * earlier is replaced by it, unless that draft already holds it (a hand-back repeated after a
+ * crash before its copy was deleted). True once the addition is durable: storage commits later,
+ * so it is also journaled at once, and the copy it came from may then be deleted.
+ */
+export function appendToNativeChatComposerDraft(
+  scopeKey: string,
+  addition: NativeChatComposerDraftAddition
+): boolean {
+  const before = records.get(scopeKey)
+  const current = readNativeChatComposerDraft(scopeKey)
+  const { text, images } = withAddition(current, addition)
+  updateNativeChatComposerDraft(
+    scopeKey,
+    { text, images, ...(text === current.text ? {} : { document: undefined }) },
+    'immediate',
+    (loaded) => withAddition(loaded, addition, { once: true })
+  )
+  const after = records.get(scopeKey)
+  if (!after) {
+    return true
+  }
+  // Why: a hand-back the draft already holds changes nothing, but that draft may not be saved yet.
+  if (after === before && !hasLocalChange(scopeKey) && !refusedScopes.has(scopeKey)) {
+    return true
+  }
+  return journalNativeChatComposerDraftAddition(scopeKey, addition, after.savedAt)
+}
+
+/**
+ * Clears a sent draft only while it is still what was sent, so a send settling late never wipes
+ * what was typed or attached since, even from a composer that was replaced meanwhile.
+ */
+export function clearNativeChatComposerDraftIfUnchanged(
+  scopeKey: string,
+  sent: NativeChatComposerDraft
+): boolean {
+  const current = readNativeChatComposerDraft(scopeKey)
+  if (
+    current.text !== sent.text ||
+    !sameNativeChatComposerDraftImages(current.images, sent.images)
+  ) {
+    return false
+  }
+  updateNativeChatComposerDraft(scopeKey, { text: '', images: [] }, 'immediate')
+  return true
+}
+
+const STRUCTURED_AGENT_SESSION_DRAFT_SCOPE_PREFIX = 'agent-session:'
+
+/** A structured chat's draft belongs to its conversation, so it outlives the tab showing it. */
+export function structuredAgentSessionDraftScopeKey(sessionId: string): string {
+  return `${STRUCTURED_AGENT_SESSION_DRAFT_SCOPE_PREFIX}${sessionId}`
+}
+
+function deleteDraftsWhere(
+  matches: (scopeKey: string, draft: StoredNativeChatComposerDraft | undefined) => boolean
+): void {
+  deleteLoadingNativeChatComposerDraftsWhere(matches)
+  for (const scopeKey of new Set([...records.keys(), ...scopeListeners.keys()])) {
+    const draft = records.get(scopeKey)
+    if (matches(scopeKey, draft)) {
+      records.delete(scopeKey)
+      notifyScope(scopeKey)
+      if (draft) {
+        persistNativeChatComposerDraft(scopeKey, 'immediate')
+      }
+    }
+  }
+}
+
+/** Drops one scope's draft, for an owner that is gone for good. */
+export function deleteNativeChatComposerDraft(scopeKey: string): void {
+  deleteDraftsWhere((key) => key === scopeKey)
+}
+
+/** The conversation a structured chat's draft belongs to, or null for a pane's draft. */
+export function structuredAgentSessionIdOfDraftScope(scopeKey: string): string | null {
+  return scopeKey.startsWith(STRUCTURED_AGENT_SESSION_DRAFT_SCOPE_PREFIX)
+    ? scopeKey.slice(STRUCTURED_AGENT_SESSION_DRAFT_SCOPE_PREFIX.length)
+    : null
+}
+
+/** A pane key is `<tabId>:<leaf>`; the leaf is a UUID, while a tab id may hold ':' itself. */
+export function nativeChatDraftScopeTabId(scopeKey: string): string {
+  return scopeKey.slice(0, scopeKey.lastIndexOf(':'))
+}
+
+/** Drops the drafts of every pane in a tab the user closed; its pane keys never come back. A
+ *  conversation's draft is never a tab's. */
+export function deleteNativeChatComposerDraftsForTab(tabId: string): void {
+  deleteDraftsWhere(
+    (scopeKey) =>
+      !scopeKey.startsWith(STRUCTURED_AGENT_SESSION_DRAFT_SCOPE_PREFIX) &&
+      nativeChatDraftScopeTabId(scopeKey) === tabId
+  )
+}
+
+/** Drops every draft written in a workspace the user removed, open and closed chats alike. */
+export function deleteNativeChatComposerDraftsOwnedBy(owner: NativeChatComposerDraftOwner): void {
+  deleteDraftsWhere(
+    (_scopeKey, draft) =>
+      draft?.owner?.workspaceId === owner.workspaceId &&
+      draft.owner.executionHostId === owner.executionHostId
+  )
+}
+
+export function clearNativeChatComposerDraftsForTests(): void {
+  clearDraftMemoryForTests()
+  resetNativeChatComposerDraftPersistenceForTests()
+  resetNativeChatComposerDraftLoadForTests()
+  setNativeChatComposerDraftStorageForTests(null)
+  resolveOwner = null
+}
diff --git a/src/renderer/src/components/native-chat/native-chat-composer-drop-scope.test.tsx b/src/renderer/src/components/native-chat/native-chat-composer-drop-scope.test.tsx
index f25d5d86381..90029987cf4 100644
--- a/src/renderer/src/components/native-chat/native-chat-composer-drop-scope.test.tsx
+++ b/src/renderer/src/components/native-chat/native-chat-composer-drop-scope.test.tsx
@@ -53,11 +53,20 @@ import {
 } from '../../../../preload/preload-runtime-support'
 
 // Uses the production drop listener, subscriber fan-out, attachment hook, and scope cache.
-function ComposerProbe({ pane, hidden = false }: { pane: string; hidden?: boolean }) {
+function ComposerProbe({
+  pane,
+  draft = pane,
+  hidden = false
+}: {
+  pane: string
+  /** The draft's owner; a structured chat's composers share their conversation's. */
+  draft?: string
+  hidden?: boolean
+}) {
   const textareaRef = useRef<NativeChatComposerInput>(null)
   const [notice, setNotice] = useState<string | null>(null)
   const attachments = useNativeChatComposerAttachments({
-    attachmentScopeKey: pane,
+    attachmentScopeKey: draft,
     allowWithoutTarget: true,
     caret: 0,
     disabled: false,
@@ -79,7 +88,7 @@ function ComposerProbe({ pane, hidden = false }: { pane: string; hidden?: boolea
     <div data-pane={pane} style={{ display: hidden ? 'none' : 'block' }}>
       <div data-native-file-drop-target="composer" data-composer-scope-key={pane}>
         <NativeChatPromptEditor
-          scopeKey={pane}
+          scopeKey={draft}
           inputRef={textareaRef}
           initialValue="untouched draft"
           disabled={false}
@@ -242,6 +251,36 @@ describe('native chat composer drop scoping', () => {
     expect(returned.container.querySelector('output')?.textContent).toBe('[]')
   })
 
+  it('attaches a drop once, from the pane it landed on, when two panes share a conversation’s draft', async () => {
+    const view = render(
+      <>
+        <ComposerProbe pane="chat-a" draft="agent-session:s1" />
+        <ComposerProbe pane="chat-b" draft="agent-session:s1" />
+      </>
+    )
+
+    await dropTwoImages(view.container.querySelector('[data-pane="chat-a"] .ProseMirror')!)
+    await settleAttachments()
+
+    expect(electron.send).toHaveBeenCalledExactlyOnceWith('terminal:file-dropped-from-preload', {
+      target: 'composer',
+      scopeKey: 'chat-a',
+      paths: ['/repro/first.png', '/repro/second.png']
+    })
+    expect(readNativeChatAttachmentCache('agent-session:s1').map(({ path }) => path)).toEqual([
+      '/repro/first.png',
+      '/repro/second.png'
+    ])
+    // Both panes show the one shared draft.
+    const shown = [...view.container.querySelectorAll('output:not([data-notice])')].map(
+      (output) => output.textContent
+    )
+    expect(shown).toEqual([
+      JSON.stringify(['/repro/first.png', '/repro/second.png']),
+      JSON.stringify(['/repro/first.png', '/repro/second.png'])
+    ])
+  })
+
   it('keeps a drop into an unscoped composer out of every chat pane', async () => {
     const view = render(
       <>
diff --git a/src/renderer/src/components/native-chat/native-chat-composer-types.ts b/src/renderer/src/components/native-chat/native-chat-composer-types.ts
index 3ecde4cc22f..f89b90cfe0a 100644
--- a/src/renderer/src/components/native-chat/native-chat-composer-types.ts
+++ b/src/renderer/src/components/native-chat/native-chat-composer-types.ts
@@ -51,6 +51,9 @@ export type NativeChatComposerProps = {
   terminalTabId: string
   /** Stable split-leaf identity; unlike a PTY id, this survives reconnects. */
   paneKey: string
+  /** Owner of the unsent draft; defaults to `paneKey`. A structured chat's is its conversation,
+   *  shared by every composer showing it. */
+  draftScopeKey?: string
   /** Specific split-pane PTY this chat view owns. */
   targetPtyId: string | null
   agent: AgentType
diff --git a/src/renderer/src/components/native-chat/native-chat-composer-workspace-file-drop.test.tsx b/src/renderer/src/components/native-chat/native-chat-composer-workspace-file-drop.test.tsx
index 898119801ab..d79740e38fd 100644
--- a/src/renderer/src/components/native-chat/native-chat-composer-workspace-file-drop.test.tsx
+++ b/src/renderer/src/components/native-chat/native-chat-composer-workspace-file-drop.test.tsx
@@ -165,7 +165,8 @@ function ComposerProbe({
           on a bare wrapper so the drop logic is exercised on its own. */}
       <div {...workspaceFileDropHandlers}>
         <NativeChatComposerField
-          composerScopeKey={`pane:${workspaceId}`}
+          dropScopeKey={`pane:${workspaceId}`}
+          draftScopeKey={`pane:${workspaceId}`}
           textareaRef={inputRef}
           draft={draft}
           disabled={disabled}
diff --git a/src/renderer/src/components/native-chat/native-chat-draft-cache.test.ts b/src/renderer/src/components/native-chat/native-chat-draft-cache.test.ts
index 7aa0f658517..563c414f737 100644
--- a/src/renderer/src/components/native-chat/native-chat-draft-cache.test.ts
+++ b/src/renderer/src/components/native-chat/native-chat-draft-cache.test.ts
@@ -28,20 +28,13 @@ describe('native-chat draft cache', () => {
     expect(readNativeChatDraftCache('pty-1')).toBe('')
   })
 
-  it('bounds the cache so unsent drafts for removed panes cannot accumulate', () => {
-    writeNativeChatDraftCache('keep', 'hot')
-
+  it('keeps every draft however many there are, since a draft that is pushed out is lost', () => {
     const total = NATIVE_CHAT_COMPOSER_SCOPE_CACHE_MAX + 40
     for (let i = 0; i < total; i += 1) {
       writeNativeChatDraftCache(`scope-${i}`, `draft-${i}`)
-      if (i % 20 === 0) {
-        writeNativeChatDraftCache('keep', 'hot')
-      }
     }
 
-    // Oldest untouched draft evicted; the actively-edited and most-recent survive.
-    expect(readNativeChatDraftCache('scope-0')).toBe('')
-    expect(readNativeChatDraftCache('keep')).toBe('hot')
+    expect(readNativeChatDraftCache('scope-0')).toBe('draft-0')
     expect(readNativeChatDraftCache(`scope-${total - 1}`)).toBe(`draft-${total - 1}`)
   })
 })
diff --git a/src/renderer/src/components/native-chat/native-chat-draft-cache.ts b/src/renderer/src/components/native-chat/native-chat-draft-cache.ts
index 7787c97019d..a50f1c600c1 100644
--- a/src/renderer/src/components/native-chat/native-chat-draft-cache.ts
+++ b/src/renderer/src/components/native-chat/native-chat-draft-cache.ts
@@ -1,52 +1,57 @@
 import type { JSONContent } from '@tiptap/react'
-// Module-level cache for the composer's in-progress draft text, keyed by the
-// same stable pane scope as image attachments. The composer unmounts when the
-// pane toggles back to the hosted terminal, so without this the typed-but-unsent
-// draft would be lost on every TUI/GUI round-trip. Mirrors the attachment cache
-// so both halves of an unsent message survive toggles and reconnects.
+// The composer's in-progress draft text and its editor document, keyed by the same stable pane
+// scope as image attachments. The composer unmounts when the pane toggles back to the hosted
+// terminal, so without this the typed-but-unsent draft would be lost on every TUI/GUI round-trip.
+// A view of native-chat-composer-draft-store, which owns the whole draft and keeps it across a
+// reload or quit.
 
-import { appendReturnedDraftText } from '../../../../shared/returned-draft-text'
-import { setBoundedScopeCacheEntry } from './native-chat-composer-scope-cache'
-
-const draftCache = new Map<string, { text: string; document?: JSONContent }>()
+import {
+  appendToNativeChatComposerDraft,
+  clearNativeChatComposerDraftsForTests,
+  readNativeChatComposerDraft,
+  updateNativeChatComposerDraft
+} from './native-chat-composer-draft-store'
 
 export function readNativeChatDraftCache(scopeKey: string): string {
-  return draftCache.get(scopeKey)?.text ?? ''
+  return readNativeChatComposerDraft(scopeKey).text
 }
 
-export function writeNativeChatDraftCache(scopeKey: string, draft: string): void {
-  // An empty draft carries no state worth retaining; drop the entry so a stale
-  // scope key never resurrects cleared text.
-  if (draft === '') {
-    draftCache.delete(scopeKey)
+/** `unsaved` shows text this run without saving it while the draft is still exactly that text. */
+export function writeNativeChatDraftCache(
+  scopeKey: string,
+  draft: string,
+  options?: { unsaved?: boolean }
+): void {
+  if (readNativeChatComposerDraft(scopeKey).text === draft) {
     return
   }
-  // LRU-bounded so unsent drafts for permanently-removed panes can't accumulate.
-  setBoundedScopeCacheEntry(draftCache, scopeKey, {
-    text: draft,
-    document:
-      draftCache.get(scopeKey)?.text === draft ? draftCache.get(scopeKey)?.document : undefined
-  })
-}
-
-// Only a write from outside the composer notifies; its own writes already hold the text.
-const appendListeners = new Map<string, Set<(text: string) => void>>()
-
-/** Puts text back after whatever is typed, and tells a mounted composer to show it. */
-export function appendNativeChatDraftCache(scopeKey: string, text: string): void {
-  if (text === '') {
-    return
-  }
-  writeNativeChatDraftCache(
+  // Cleared at once, so a sent or emptied draft never resurfaces.
+  updateNativeChatComposerDraft(
     scopeKey,
-    appendReturnedDraftText(readNativeChatDraftCache(scopeKey), text)
+    { text: draft, document: undefined, ...(options?.unsaved ? { unsavedText: draft } : {}) },
+    draft === '' ? 'immediate' : 'deferred'
   )
-  appendListeners.get(scopeKey)?.forEach((listener) => listener(text))
+}
+
+// Why: a composer mid-IME-composition keeps showing what it had, so it is told what was appended.
+const appendListeners = new Map<string, Set<(text: string, previous: string) => void>>()
+
+/** Puts text back after whatever is typed, and tells a mounted composer to show it. True once it
+ *  is durable, so the copy it came from may go. */
+export function appendNativeChatDraftCache(scopeKey: string, text: string): boolean {
+  if (text === '') {
+    return true
+  }
+  const previous = readNativeChatDraftCache(scopeKey)
+  // Durable now: the copy it came from (an outbox entry, a queued card) goes right after this.
+  const durable = appendToNativeChatComposerDraft(scopeKey, { text })
+  appendListeners.get(scopeKey)?.forEach((listener) => listener(text, previous))
+  return durable
 }
 
 export function subscribeToNativeChatDraftAppend(
   scopeKey: string,
-  listener: (text: string) => void
+  listener: (text: string, previous: string) => void
 ): () => void {
   const listeners = appendListeners.get(scopeKey) ?? new Set()
   appendListeners.set(scopeKey, listeners)
@@ -60,15 +65,15 @@ export function subscribeToNativeChatDraftAppend(
 }
 
 export function clearNativeChatDraftCacheForTests(): void {
-  draftCache.clear()
+  clearNativeChatComposerDraftsForTests()
 }
 
 export function readNativeChatDraftDocument(
   scopeKey: string,
   text: string
 ): JSONContent | undefined {
-  const cached = draftCache.get(scopeKey)
-  return cached?.text === text ? cached.document : undefined
+  const draft = readNativeChatComposerDraft(scopeKey)
+  return draft.text === text ? draft.document : undefined
 }
 
 export function writeNativeChatDraftDocument(
@@ -77,8 +82,8 @@ export function writeNativeChatDraftDocument(
   document: JSONContent
 ): void {
   if (!text) {
-    draftCache.delete(scopeKey)
+    writeNativeChatDraftCache(scopeKey, '')
     return
   }
-  setBoundedScopeCacheEntry(draftCache, scopeKey, { text, document })
+  updateNativeChatComposerDraft(scopeKey, { text, document }, 'deferred')
 }
diff --git a/src/renderer/src/components/native-chat/native-chat-image-paste.ts b/src/renderer/src/components/native-chat/native-chat-image-paste.ts
index 15f68900c84..3eb6689b034 100644
--- a/src/renderer/src/components/native-chat/native-chat-image-paste.ts
+++ b/src/renderer/src/components/native-chat/native-chat-image-paste.ts
@@ -1,4 +1,5 @@
 import { isImageDropPath } from '../terminal-pane/terminal-drop-image-path'
+import { NATIVE_CHAT_PASTE_FOLDER } from '../../../../shared/native-chat-paste-folder'
 export {
   getAgentImageHandling,
   type AgentImageHandling
@@ -15,3 +16,10 @@ export function isNativeChatPastedImagePath(path: string): boolean {
   const base = path.split(/[\\/]/).findLast(Boolean) ?? path
   return /^orca-paste-.+\.png$/i.test(base)
 }
+
+/** True for a local paste Orca keeps in its paste folder, judged from the path alone; main checks
+ *  the real file before a restore keeps it. */
+export function isNativeChatKeptPastePath(path: string): boolean {
+  const parts = path.split(/[\\/]/).filter(Boolean)
+  return parts.at(-2) === NATIVE_CHAT_PASTE_FOLDER && isNativeChatPastedImagePath(path)
+}
diff --git a/src/renderer/src/components/native-chat/native-chat-image-reattach.ts b/src/renderer/src/components/native-chat/native-chat-image-reattach.ts
new file mode 100644
index 00000000000..29d35cf90e9
--- /dev/null
+++ b/src/renderer/src/components/native-chat/native-chat-image-reattach.ts
@@ -0,0 +1,42 @@
+import { translate } from '@/i18n/i18n'
+import type { NativeChatComposerImageAttachment } from './NativeChatComposerField'
+
+/** Why the composer can't send while it holds images that couldn't be brought back; null when it
+ *  holds none. Removing always works; re-attaching only for a file, so the reason names removing. */
+export function nativeChatAttachImagesAgainReason(
+  attachments: readonly NativeChatComposerImageAttachment[]
+): string | null {
+  const count = attachments.filter((attachment) => attachment.unavailableName !== undefined).length
+  if (count === 0) {
+    return null
+  }
+  return count === 1
+    ? translate(
+        'components.native-chat.composer.removeImageToSend',
+        "An image couldn't be brought back. Remove it to send."
+      )
+    : translate(
+        'components.native-chat.composer.removeImagesToSend',
+        "Some images couldn't be brought back. Remove them to send."
+      )
+}
+
+/** A chip still saving, or one to attach again, has no path the agent can read yet. */
+export function nativeChatImagesHoldSend(
+  attachments: readonly NativeChatComposerImageAttachment[]
+): boolean {
+  return attachments.some(
+    (attachment) => attachment.pending || attachment.unavailableName !== undefined
+  )
+}
+
+/** Whether the composer's images keep it from sending, and the reason to show when the user can
+ *  fix it. */
+export function nativeChatImageSendBlock(
+  attachments: readonly NativeChatComposerImageAttachment[]
+): { holdsSend: boolean; reason: string | null } {
+  return {
+    holdsSend: nativeChatImagesHoldSend(attachments),
+    reason: nativeChatAttachImagesAgainReason(attachments)
+  }
+}
diff --git a/src/renderer/src/components/native-chat/native-chat-prompt-editor-store-value.test.tsx b/src/renderer/src/components/native-chat/native-chat-prompt-editor-store-value.test.tsx
new file mode 100644
index 00000000000..4aa15f40350
--- /dev/null
+++ b/src/renderer/src/components/native-chat/native-chat-prompt-editor-store-value.test.tsx
@@ -0,0 +1,170 @@
+// @vitest-environment happy-dom
+// A value the field sets on the editor comes from the draft store, so the editor never saves it
+// back: an echo would make another window's draft, or a late-loaded one, a change of this window.
+import { createElement, createRef } from 'react'
+import { act, cleanup, render } from '@testing-library/react'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type * as DraftStore from './native-chat-composer-draft-store'
+import type * as DraftCache from './native-chat-draft-cache'
+import type { NativeChatComposerInput } from './native-chat-composer-input'
+import { createMemoryNativeChatComposerDraftStorage } from './native-chat-composer-draft-storage'
+
+type Renderer = { drafts: typeof DraftCache; store: typeof DraftStore }
+
+const SCOPE = 'agent-session:s1'
+let storage = createMemoryNativeChatComposerDraftStorage()
+const loaded: Renderer[] = []
+
+async function open(options: { hydrate?: boolean } = {}): Promise<Renderer> {
+  vi.resetModules()
+  const storageModule = await import('./native-chat-composer-draft-storage')
+  storageModule.setNativeChatComposerDraftStorageForTests(storage)
+  const renderer = {
+    drafts: await import('./native-chat-draft-cache'),
+    store: await import('./native-chat-composer-draft-store')
+  }
+  loaded.push(renderer)
+  if (options.hydrate !== false) {
+    await renderer.store.hydrateNativeChatComposerDrafts()
+  }
+  return renderer
+}
+
+/** The editor, plus the field's effect that sets the store's draft on it. */
+async function mountEditor(
+  renderer: Renderer
+): Promise<{ stopSync: () => void; input: () => NativeChatComposerInput; unmount: () => void }> {
+  const { NativeChatPromptEditor } = await import('./NativeChatPromptEditor')
+  const inputRef = createRef<NativeChatComposerInput>()
+  const view = render(
+    createElement(NativeChatPromptEditor, {
+      scopeKey: SCOPE,
+      inputRef,
+      initialValue: renderer.drafts.readNativeChatDraftCache(SCOPE),
+      disabled: false,
+      placeholder: 'Message',
+      onChange: () => {},
+      onSelect: () => {}
+    })
+  )
+  await vi.waitFor(() => expect(inputRef.current).not.toBeNull())
+  const stopSync = renderer.store.subscribeToNativeChatComposerDraft(SCOPE, () => {
+    // Like the field's layout effect, after the store change returns.
+    queueMicrotask(() => {
+      const draft = renderer.drafts.readNativeChatDraftCache(SCOPE)
+      if (inputRef.current && inputRef.current.value !== draft) {
+        inputRef.current.value = draft
+      }
+    })
+  })
+  return { stopSync, input: () => inputRef.current!, unmount: view.unmount }
+}
+
+const SKILL_DOCUMENT = {
+  type: 'doc',
+  content: [
+    {
+      type: 'paragraph',
+      content: [
+        { type: 'nativeChatSkill', attrs: { token: '$review' } },
+        { type: 'text', text: ' this' }
+      ]
+    }
+  ]
+}
+
+const pause = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms))
+
+beforeEach(() => {
+  localStorage.clear()
+  storage = createMemoryNativeChatComposerDraftStorage()
+})
+
+afterEach(() => {
+  cleanup()
+  for (const renderer of loaded.splice(0)) {
+    renderer.store.clearNativeChatComposerDraftsForTests()
+  }
+})
+
+describe('the editor and the draft store', () => {
+  it('saves nothing when a draft that loads late is set on the editor', async () => {
+    storage.drafts.set(SCOPE, { text: 'saved before the restart', images: [], savedAt: 1 })
+    const renderer = await open({ hydrate: false })
+    const { stopSync, input } = await mountEditor(renderer)
+    const write = vi.spyOn(storage, 'write')
+
+    await act(async () => renderer.store.hydrateNativeChatComposerDrafts())
+    await act(async () => pause(400))
+    await renderer.store.nativeChatComposerDraftWritesSettled()
+    stopSync()
+    expect(input().value).toBe('saved before the restart')
+    expect(write).not.toHaveBeenCalled()
+  })
+
+  it('keeps the skill chip when the composer itself changes the text, across a remount', async () => {
+    const renderer = await open()
+    renderer.drafts.writeNativeChatDraftDocument(SCOPE, '$review this', SKILL_DOCUMENT)
+    renderer.store.flushNativeChatComposerDrafts()
+    const first = await mountEditor(renderer)
+    await vi.waitFor(() =>
+      expect(window.document.querySelector('[data-native-chat-skill]')).not.toBeNull()
+    )
+    // A mention accepted: the composer writes the text, then the field sets it on the editor.
+    const next = '$review this @src/a.ts '
+    act(() => {
+      renderer.drafts.writeNativeChatDraftCache(SCOPE, next)
+      first.input().value = next
+    })
+    await act(async () => pause(400))
+    await renderer.store.nativeChatComposerDraftWritesSettled()
+    expect(JSON.stringify(storage.drafts.get(SCOPE)?.document ?? null)).toContain('nativeChatSkill')
+
+    first.stopSync()
+    first.unmount()
+    const second = await mountEditor(renderer)
+    await pause(50)
+    second.stopSync()
+    expect(window.document.querySelector('[data-native-chat-skill]')).not.toBeNull()
+  })
+
+  it('lets another window’s send stand, instead of echoing back the draft it showed', async () => {
+    const receiving = await open()
+    const { stopSync } = await mountEditor(receiving)
+    const sending = await open()
+    sending.drafts.writeNativeChatDraftCache(SCOPE, 'hello')
+    sending.store.flushNativeChatComposerDrafts()
+    await act(async () => {
+      await vi.waitFor(() => expect(receiving.drafts.readNativeChatDraftCache(SCOPE)).toBe('hello'))
+    })
+
+    sending.drafts.writeNativeChatDraftCache(SCOPE, '')
+    await sending.store.nativeChatComposerDraftWritesSettled()
+    await act(async () => pause(600))
+    await receiving.store.nativeChatComposerDraftWritesSettled()
+    await act(async () => pause(50))
+    stopSync()
+
+    expect(storage.drafts.has(SCOPE)).toBe(false)
+    expect(sending.drafts.readNativeChatDraftCache(SCOPE)).toBe('')
+    expect(receiving.drafts.readNativeChatDraftCache(SCOPE)).toBe('')
+  })
+
+  it('shows a draft that arrives later with its skill chip, from its saved document', async () => {
+    const document = SKILL_DOCUMENT
+    const receiving = await open()
+    const { stopSync } = await mountEditor(receiving)
+    const sending = await open()
+    sending.drafts.writeNativeChatDraftDocument(SCOPE, '$review this', document)
+    sending.store.flushNativeChatComposerDrafts()
+    await act(async () => {
+      await vi.waitFor(() =>
+        expect(receiving.drafts.readNativeChatDraftCache(SCOPE)).toBe('$review this')
+      )
+    })
+    stopSync()
+
+    expect(window.document.querySelector('[data-native-chat-skill]')).not.toBeNull()
+    expect(storage.drafts.get(SCOPE)?.document).toEqual(document)
+  })
+})
diff --git a/src/renderer/src/components/native-chat/native-chat-runtime-image-send.ts b/src/renderer/src/components/native-chat/native-chat-runtime-image-send.ts
index 283a437e449..a4e79323317 100644
--- a/src/renderer/src/components/native-chat/native-chat-runtime-image-send.ts
+++ b/src/renderer/src/components/native-chat/native-chat-runtime-image-send.ts
@@ -10,6 +10,8 @@ import {
   NATIVE_CHAT_SUBMIT
 } from './native-chat-send'
 import { enqueueNativeChatPtySend } from './native-chat-pty-send-queue'
+import { formatImageDropPasteText } from '../terminal-pane/terminal-drop-image-path'
+import { isTerminalDropWindowsPathLike } from '../terminal-pane/terminal-drop-shell'
 import {
   clearConfirmDurationMs,
   clearThenWrite,
@@ -22,6 +24,17 @@ export const NATIVE_CHAT_IMAGE_ATTACHMENT_SETTLE_MS = 300
 
 type RuntimeSettings = ReturnType<typeof getSettingsForAgentTabRuntimeOwner>
 
+/** The path text an agent detects as an image. One with spaces or shell characters is escaped as a
+ *  terminal image drop is, which agent TUIs undo before checking the file exists. */
+export function agentImagePastePath(agent: AgentType, path: string): string {
+  const formatted = formatAgentImagePath(agent, path)
+  if (formatted !== path) {
+    return formatted
+  }
+  const targetShell = isTerminalDropWindowsPathLike(path) ? 'windows' : 'posix'
+  return formatImageDropPasteText(path, targetShell) ?? path
+}
+
 export function sendNativeChatMessageWithImageAttachments(
   agent: AgentType,
   settings: RuntimeSettings,
@@ -37,7 +50,7 @@ export function sendNativeChatMessageWithImageAttachments(
   if (options?.onWriteRejected) {
     const writes = agentImagePasteWrites(
       agent,
-      imagePaths.map((path) => buildNativeChatImagePasteBytes(formatAgentImagePath(agent, path))),
+      imagePaths.map((path) => buildNativeChatImagePasteBytes(agentImagePastePath(agent, path))),
       trimmedText.length > 0
     ).map((data) => ({ data, delayBeforeMs: 0 }))
     if (trimmedText) {
@@ -67,7 +80,7 @@ export function sendNativeChatMessageWithImageAttachments(
         for (const payload of agentImagePasteWrites(
           agent,
           imagePaths.map((path) =>
-            buildNativeChatImagePasteBytes(formatAgentImagePath(agent, path))
+            buildNativeChatImagePasteBytes(agentImagePastePath(agent, path))
           ),
           trimmedText.length > 0
         )) {
diff --git a/src/renderer/src/components/native-chat/native-chat-runtime-send.test.ts b/src/renderer/src/components/native-chat/native-chat-runtime-send.test.ts
index 9e6a8ff2b0f..a2b7aa92b57 100644
--- a/src/renderer/src/components/native-chat/native-chat-runtime-send.test.ts
+++ b/src/renderer/src/components/native-chat/native-chat-runtime-send.test.ts
@@ -338,6 +338,16 @@ describe('sendNativeChatMessageWithImageAttachments', () => {
     resetNativeChatPtySendQueuesForTests()
   })
 
+  it('escapes a pasted image path with spaces, so an attachment agent sees one path', () => {
+    sendNativeChatMessageWithImageAttachments('codex', SETTINGS, PTY, '', [
+      '/Users/me/Library/Application Support/orca/native-chat-pastes/orca-paste-1-ab.png'
+    ])
+    expectWriteOrder(sendRuntimePtyInput.mock.calls, [
+      NATIVE_CHAT_CLEAR_UNSUBMITTED_INPUT,
+      '\x1b[200~/Users/me/Library/Application\\ Support/orca/native-chat-pastes/orca-paste-1-ab.png\x1b[201~'
+    ])
+  })
+
   it.each(['', 'describe'])('separates every OMP image reference before %j', (text) => {
     sendNativeChatMessageWithImageAttachments('omp', SETTINGS, PTY, text, [
       '/tmp/a.png',
diff --git a/src/renderer/src/components/native-chat/structured-session-takeover-report.test.tsx b/src/renderer/src/components/native-chat/structured-session-takeover-report.test.tsx
index b44df6c8304..e684899737d 100644
--- a/src/renderer/src/components/native-chat/structured-session-takeover-report.test.tsx
+++ b/src/renderer/src/components/native-chat/structured-session-takeover-report.test.tsx
@@ -50,9 +50,10 @@ function send(structuredTransport: NativeChatStructuredComposerTransport): (text
   const { result } = renderHook(() =>
     useNativeChatStructuredComposerSend({
       agent: 'claude',
+      draftScopeKey: 'tab-1:pane',
       imageAttachments: [],
       structuredTransport,
-      clearImageAttachments: vi.fn(),
+      isComposing: () => false,
       clearSkillOrigin: vi.fn(),
       setHistory: vi.fn(),
       setDraft: vi.fn(),
diff --git a/src/renderer/src/components/native-chat/use-native-chat-composer-attachments.ts b/src/renderer/src/components/native-chat/use-native-chat-composer-attachments.ts
index 088763d835d..0d49b35d17f 100644
--- a/src/renderer/src/components/native-chat/use-native-chat-composer-attachments.ts
+++ b/src/renderer/src/components/native-chat/use-native-chat-composer-attachments.ts
@@ -1,12 +1,28 @@
 import type { NativeChatComposerInput } from './native-chat-composer-input'
-import { useCallback, useEffect, useRef, useState, type RefObject } from 'react'
+import {
+  useCallback,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+  useSyncExternalStore,
+  type RefObject
+} from 'react'
 import { translate } from '@/i18n/i18n'
 import {
   nativeChatComposerTargetIsRemote,
   type NativeChatResolvedTarget
 } from './native-chat-composer-target'
 import type { NativeChatComposerImageAttachment } from './NativeChatComposerField'
-import { setBoundedScopeCacheEntry } from './native-chat-composer-scope-cache'
+import {
+  appendToNativeChatComposerDraft,
+  clearNativeChatComposerDraftsForTests,
+  isKeptLocalPaste,
+  readNativeChatComposerDraft,
+  subscribeToNativeChatComposerDraft,
+  updateNativeChatComposerDraft
+} from './native-chat-composer-draft-store'
+import { useRestoredNativeChatComposerDraftImageCheck } from './native-chat-composer-draft-image-check'
 import type { NativeChatResolvedPathOptions } from './native-chat-resolved-path-ownership'
 import { useNativeChatResolvedPathAttachments } from './use-native-chat-resolved-path-attachments'
 
@@ -48,34 +64,56 @@ export function useNativeChatComposerAttachments({
   resolvePendingImageAttachment: (id: string, path: string, connectionId?: string | null) => void
   dropPendingImageAttachment: (id: string) => void
 } {
-  const [imageAttachments, setImageAttachments] = useState<NativeChatComposerImageAttachment[]>(
-    () => readNativeChatAttachmentCache(attachmentScopeKey)
+  const subscribe = useCallback(
+    (listener: () => void) => subscribeToNativeChatComposerDraft(attachmentScopeKey, listener),
+    [attachmentScopeKey]
   )
+  const settled = useSyncExternalStore(
+    subscribe,
+    () => readNativeChatComposerDraft(attachmentScopeKey).images
+  )
+  // Why: a restored paste shows only once main confirms it is still kept, so until the restore
+  // check is done it waits like a chip still saving, instead of flashing before a placeholder.
+  const restoring = useRestoredNativeChatComposerDraftImageCheck(attachmentScopeKey, subscribe)
+  // Chips still being written, and the clipboard previews this composer minted, are its own.
+  const [local, setLocal] = useState<LocalAttachments>(NO_LOCAL_ATTACHMENTS)
+  // Read by callbacks between renders; only they change it, always together with the state.
+  const localRef = useRef(local)
+  const updateLocal = useCallback((next: LocalAttachments) => {
+    localRef.current = next
+    setLocal(next)
+  }, [])
+  const imageAttachments = useMemo(
+    () => [
+      ...settled.map((image) => {
+        const previewUrl = local.previews.get(image.id)
+        if (restoring && isKeptLocalPaste(image)) {
+          return { ...image, pending: true }
+        }
+        return previewUrl ? { ...image, previewUrl } : image
+      }),
+      ...local.pending
+    ],
+    [local, restoring, settled]
+  )
+  // A preview whose image left the draft (sent, or removed elsewhere) is released.
+  useEffect(() => {
+    const current = localRef.current
+    const gone = [...current.previews.keys()].filter(
+      (id) => !settled.some((image) => image.id === id)
+    )
+    if (gone.length === 0) {
+      return
+    }
+    const previews = new Map(current.previews)
+    for (const id of gone) {
+      releasePreviewUrl(previews.get(id))
+      previews.delete(id)
+    }
+    updateLocal({ ...current, previews })
+  }, [settled, updateLocal])
   const imageAttachmentCounter = useRef(0)
 
-  useEffect(
-    () =>
-      subscribeToNativeChatAttachmentAppend(attachmentScopeKey, (appended) =>
-        setImageAttachments((prev) => [...prev, ...appended])
-      ),
-    [attachmentScopeKey]
-  )
-
-  const updateImageAttachments = useCallback(
-    (
-      updater: (
-        previous: NativeChatComposerImageAttachment[]
-      ) => NativeChatComposerImageAttachment[]
-    ) => {
-      setImageAttachments((prev) => {
-        const next = updater(prev)
-        writeNativeChatAttachmentCache(attachmentScopeKey, next)
-        return next
-      })
-    },
-    [attachmentScopeKey]
-  )
-
   const nextAttachmentId = useCallback((): string => {
     imageAttachmentCounter.current += 1
     return `${Date.now()}-${imageAttachmentCounter.current}`
@@ -105,19 +143,17 @@ export function useNativeChatComposerAttachments({
 
   const appendImageAttachments = useCallback(
     (paths: { path: string; connectionId?: string | null }[]) => {
-      if (paths.length === 0) {
-        return
-      }
-      updateImageAttachments((prev) => [
-        ...prev,
-        ...paths.map(({ path, connectionId }) => ({
+      appendNativeChatAttachmentCache(
+        attachmentScopeKey,
+        paths.map(({ path, connectionId }) => ({
           id: nextAttachmentId(),
           path,
-          connectionId: connectionId ?? undefined
-        }))
-      ])
+          ...(connectionId ? { connectionId } : {})
+        })),
+        { fromUser: true }
+      )
     },
-    [nextAttachmentId, updateImageAttachments]
+    [attachmentScopeKey, nextAttachmentId]
   )
 
   const { attachResolvedPaths, disabledRef, flushPendingAttachments } =
@@ -146,7 +182,11 @@ export function useNativeChatComposerAttachments({
         return null
       }
       const id = nextAttachmentId()
-      updateImageAttachments((prev) => [...prev, { id, path: '', previewUrl, pending: true }])
+      const current = localRef.current
+      updateLocal({
+        ...current,
+        pending: [...current.pending, { id, path: '', previewUrl, pending: true }]
+      })
       return id
     },
     [
@@ -154,133 +194,127 @@ export function useNativeChatComposerAttachments({
       disabledRef,
       nextAttachmentId,
       noteAttachmentTargetBlocked,
-      updateImageAttachments
+      updateLocal
     ]
   )
 
+  /** Drops this composer's own copy of a chip; the store is not touched. */
+  const forgetLocalAttachment = useCallback(
+    (id: string, keepPreview = false): NativeChatComposerImageAttachment | undefined => {
+      const current = localRef.current
+      const pending = current.pending.find((attachment) => attachment.id === id)
+      const previewUrl = pending?.previewUrl ?? current.previews.get(id)
+      if (!pending && previewUrl === undefined) {
+        return undefined
+      }
+      const previews = new Map(current.previews)
+      previews.delete(id)
+      if (keepPreview && previewUrl) {
+        previews.set(id, previewUrl)
+      } else {
+        releasePreviewUrl(previewUrl)
+      }
+      updateLocal({
+        pending: current.pending.filter((attachment) => attachment.id !== id),
+        previews
+      })
+      return pending
+    },
+    [updateLocal]
+  )
+
   const resolvePendingImageAttachment = useCallback(
     (id: string, path: string, connectionId?: string | null) => {
-      updateImageAttachments((prev) =>
-        prev.map((attachment) =>
-          attachment.id === id
-            ? {
-                ...attachment,
-                path,
-                connectionId: connectionId ?? undefined,
-                pending: undefined
-              }
-            : attachment
+      if (forgetLocalAttachment(id, true)) {
+        appendNativeChatAttachmentCache(
+          attachmentScopeKey,
+          [{ id, path, ...(connectionId ? { connectionId } : {}) }],
+          { fromUser: true }
         )
-      )
+      }
     },
-    [updateImageAttachments]
+    [attachmentScopeKey, forgetLocalAttachment]
   )
 
+  // A pending chip was never saved, so dropping one, even late from a replaced composer, leaves
+  // the store alone.
   const dropPendingImageAttachment = useCallback(
     (id: string) => {
-      updateImageAttachments((prev) => removeAttachmentById(prev, id))
+      forgetLocalAttachment(id)
     },
-    [updateImageAttachments]
+    [forgetLocalAttachment]
   )
 
   return {
     imageAttachments,
     attachResolvedPaths,
-    clearImageAttachments: () =>
-      updateImageAttachments((prev) => {
-        prev.forEach(releaseAttachmentPreview)
-        return []
-      }),
+    clearImageAttachments: () => {
+      const current = localRef.current
+      current.pending.forEach((attachment) => releasePreviewUrl(attachment.previewUrl))
+      current.previews.forEach(releasePreviewUrl)
+      updateLocal(NO_LOCAL_ATTACHMENTS)
+      updateNativeChatComposerDraft(attachmentScopeKey, { images: [] }, 'immediate')
+    },
     flushPendingAttachments,
-    removeImageAttachment: (id) => updateImageAttachments((prev) => removeAttachmentById(prev, id)),
+    removeImageAttachment: (id) => {
+      if (forgetLocalAttachment(id)) {
+        return
+      }
+      const images = readNativeChatComposerDraft(attachmentScopeKey).images
+      updateNativeChatComposerDraft(
+        attachmentScopeKey,
+        { images: images.filter((image) => image.id !== id) },
+        'immediate'
+      )
+    },
     beginPendingImageAttachment,
     resolvePendingImageAttachment,
     dropPendingImageAttachment
   }
 }
 
+type LocalAttachments = {
+  pending: NativeChatComposerImageAttachment[]
+  previews: ReadonlyMap<string, string>
+}
+
+const NO_LOCAL_ATTACHMENTS: LocalAttachments = { pending: [], previews: new Map() }
+
 /** Object URLs minted from a clipboard blob leak until revoked; data URLs don't. */
-function releaseAttachmentPreview(attachment: NativeChatComposerImageAttachment): void {
-  if (attachment.previewUrl?.startsWith('blob:')) {
-    URL.revokeObjectURL(attachment.previewUrl)
+function releasePreviewUrl(previewUrl: string | undefined): void {
+  if (previewUrl?.startsWith('blob:')) {
+    URL.revokeObjectURL(previewUrl)
   }
 }
 
-function removeAttachmentById(
-  attachments: readonly NativeChatComposerImageAttachment[],
-  id: string
-): NativeChatComposerImageAttachment[] {
-  const removed = attachments.find((attachment) => attachment.id === id)
-  if (removed) {
-    releaseAttachmentPreview(removed)
-  }
-  return attachments.filter((attachment) => attachment.id !== id)
-}
-
-const attachmentCache = new Map<string, NativeChatComposerImageAttachment[]>()
-
 export function readNativeChatAttachmentCache(
   scopeKey: string
 ): NativeChatComposerImageAttachment[] {
-  return [...(attachmentCache.get(scopeKey) ?? [])]
+  return readNativeChatComposerDraft(scopeKey).images.map((image) => ({ ...image }))
 }
 
-function writeNativeChatAttachmentCache(
-  scopeKey: string,
-  cacheable: readonly NativeChatComposerImageAttachment[]
-): void {
-  // A pending chip's save resolves into THIS hook instance; restoring one into a
-  // remount would strand it pending forever, so only settled chips are cached.
-  const attachments = cacheable
-    .filter((attachment) => !attachment.pending)
-    // Preview URLs can retain the full clipboard Blob (or a large data URL) for
-    // the lifetime of the scope cache. Settled attachments reload from their
-    // on-disk path after a remount, so never retain the transient preview.
-    .map(({ previewUrl: _previewUrl, ...attachment }) => attachment)
-  if (attachments.length === 0) {
-    attachmentCache.delete(scopeKey)
-    return
-  }
-  // LRU-bounded so pending attachments for permanently-removed panes can't accumulate.
-  setBoundedScopeCacheEntry(attachmentCache, scopeKey, [...attachments])
-}
-
-// Only a write from outside the composer notifies; its own writes already hold the chips.
-const appendListeners = new Map<
-  string,
-  Set<(appended: readonly NativeChatComposerImageAttachment[]) => void>
->()
-
-/** Puts settled images back after whatever is attached, and shows them in a mounted composer. */
+/** Adds settled images after the ones the draft holds now, durably at once: when Stop gives images
+ *  back, the copy they came from goes right after this. Only an image the user attaches
+ *  (`fromUser`) takes the place of a placeholder with its file name, as a re-pick does. */
 export function appendNativeChatAttachmentCache(
   scopeKey: string,
-  appended: readonly NativeChatComposerImageAttachment[]
+  appended: readonly NativeChatComposerImageAttachment[],
+  options?: { fromUser?: boolean }
 ): void {
   if (appended.length === 0) {
     return
   }
-  writeNativeChatAttachmentCache(scopeKey, [
-    ...readNativeChatAttachmentCache(scopeKey),
-    ...appended
-  ])
-  appendListeners.get(scopeKey)?.forEach((listener) => listener(appended))
-}
-
-function subscribeToNativeChatAttachmentAppend(
-  scopeKey: string,
-  listener: (appended: readonly NativeChatComposerImageAttachment[]) => void
-): () => void {
-  const listeners = appendListeners.get(scopeKey) ?? new Set()
-  appendListeners.set(scopeKey, listeners)
-  listeners.add(listener)
-  return () => {
-    listeners.delete(listener)
-    if (listeners.size === 0 && appendListeners.get(scopeKey) === listeners) {
-      appendListeners.delete(scopeKey)
-    }
-  }
+  // Preview URLs can retain the full clipboard Blob, so only the path is kept.
+  appendToNativeChatComposerDraft(scopeKey, {
+    images: appended.map(({ id, path, connectionId }) => ({
+      id,
+      path,
+      ...(connectionId ? { connectionId } : {})
+    })),
+    ...(options?.fromUser ? { fromUser: true } : {})
+  })
 }
 
 export function clearNativeChatAttachmentCacheForTests(): void {
-  attachmentCache.clear()
+  clearNativeChatComposerDraftsForTests()
 }
diff --git a/src/renderer/src/components/native-chat/use-native-chat-composer-paste.test.tsx b/src/renderer/src/components/native-chat/use-native-chat-composer-paste.test.tsx
index 44c1f59c3c3..cca232c9140 100644
--- a/src/renderer/src/components/native-chat/use-native-chat-composer-paste.test.tsx
+++ b/src/renderer/src/components/native-chat/use-native-chat-composer-paste.test.tsx
@@ -269,6 +269,17 @@ describe('useNativeChatComposerPaste', () => {
     }
   )
 
+  it('saves a local paste where its draft can bring it back after a restart', async () => {
+    mocks.saveClipboardImageAsTempFile.mockResolvedValue(
+      '/Users/me/Library/Application Support/orca/native-chat-pastes/orca-paste-1.png'
+    )
+    const probe = await renderProbe({ resolveAttachmentOwner: () => ({ kind: 'local' }) })
+    await act(async () => {
+      probe.latest().handlePaste(imagePasteEvent())
+    })
+    expect(mocks.saveClipboardImageAsTempFile).toHaveBeenCalledWith({ forNativeChatDraft: true })
+  })
+
   it('saves on the SSH host and settles the chip on the returned remote path', async () => {
     mocks.saveClipboardImageAsTempFile.mockResolvedValue('/remote/tmp/orca-paste-1.png')
     const store = createChipStore()
diff --git a/src/renderer/src/components/native-chat/use-native-chat-composer-paste.ts b/src/renderer/src/components/native-chat/use-native-chat-composer-paste.ts
index 6899ee76905..a5cd254590d 100644
--- a/src/renderer/src/components/native-chat/use-native-chat-composer-paste.ts
+++ b/src/renderer/src/components/native-chat/use-native-chat-composer-paste.ts
@@ -104,7 +104,7 @@ export function useNativeChatComposerPaste({
         // SSH panes save the image on the remote host (SFTP) so the attached
         // path is readable by the remote agent, matching terminal image paste.
         const tempPath = await window.api.ui.saveClipboardImageAsTempFile(
-          owner.kind === 'ssh' ? { connectionId: owner.connectionId } : undefined
+          owner.kind === 'ssh' ? { connectionId: owner.connectionId } : { forNativeChatDraft: true }
         )
         return tempPath ? { status: 'saved', tempPath } : { status: 'empty' }
       } catch (error) {
diff --git a/src/renderer/src/components/native-chat/use-native-chat-composer-submit.test.tsx b/src/renderer/src/components/native-chat/use-native-chat-composer-submit.test.tsx
index bbbf99d2a5d..7ec967b6f0e 100644
--- a/src/renderer/src/components/native-chat/use-native-chat-composer-submit.test.tsx
+++ b/src/renderer/src/components/native-chat/use-native-chat-composer-submit.test.tsx
@@ -1,10 +1,21 @@
 // @vitest-environment happy-dom
 import { act, renderHook } from '@testing-library/react'
-import { describe, expect, it, vi } from 'vitest'
+import { afterEach, describe, expect, it, vi } from 'vitest'
 import type { NativeChatStructuredComposerTransport } from './native-chat-composer-types'
 import type { NativeChatPickerItem } from './native-chat-picker-items'
 import type { NativeChatComposerImageAttachment } from './NativeChatComposerField'
 import { useNativeChatComposerSubmit } from './use-native-chat-composer-submit'
+import {
+  clearNativeChatDraftCacheForTests,
+  readNativeChatDraftCache,
+  writeNativeChatDraftCache
+} from './native-chat-draft-cache'
+
+const SCOPE = 'tab-1:pane'
+
+afterEach(() => {
+  clearNativeChatDraftCacheForTests()
+})
 
 const GOAL_ITEM: NativeChatPickerItem = {
   kind: 'command',
@@ -41,10 +52,12 @@ function harness(options: {
     setCaret: vi.fn(),
     setHistory: vi.fn()
   }
+  writeNativeChatDraftCache(SCOPE, options.draft)
   const hook = renderHook(
     (props: { draft: string; caret: number }) =>
       useNativeChatComposerSubmit({
         structuredTransport: options.lane === 'pty' ? undefined : structuredTransport,
+        draftScopeKey: SCOPE,
         draft: props.draft,
         caret: props.caret,
         imageAttachments: options.imageAttachments ?? [],
@@ -53,7 +66,12 @@ function harness(options: {
       }),
     { initialProps: { draft: options.draft, caret: options.caret ?? options.draft.length } }
   )
-  return { hook, calls, onError }
+  /** The user's typing: the draft store and the rendered draft move together. */
+  const type = (draft: string, caret: number): void => {
+    writeNativeChatDraftCache(SCOPE, draft)
+    hook.rerender({ draft, caret })
+  }
+  return { hook, calls, onError, type }
 }
 
 describe('composer goal mode', () => {
@@ -86,24 +104,24 @@ describe('composer goal mode', () => {
 
   it('sets the draft as the goal instead of sending it, then leaves goal mode', async () => {
     const setObjective = vi.fn(async () => true)
-    const { hook, calls } = harness({ draft: '/go', threadGoal: { setObjective } })
+    const { hook, calls, type } = harness({ draft: '/go', threadGoal: { setObjective } })
     act(() => hook.result.current.goalMode.interceptPick(vi.fn())(GOAL_ITEM))
-    hook.rerender({ draft: '  Ship the parser  ', caret: 0 })
+    type('  Ship the parser  ', 0)
 
     await act(async () => hook.result.current.send())
 
     expect(setObjective).toHaveBeenCalledWith('Ship the parser')
     expect(calls.sendStructured).not.toHaveBeenCalled()
-    expect(calls.setDraft).toHaveBeenLastCalledWith('')
+    expect(readNativeChatDraftCache(SCOPE)).toBe('')
     expect(hook.result.current.goalMode.active).toBe(false)
   })
 
   it('keeps the draft and goal mode when the goal is refused', async () => {
     const setObjective = vi.fn(async () => false)
-    const { hook, calls } = harness({ draft: '/go', threadGoal: { setObjective } })
+    const { hook, calls, type } = harness({ draft: '/go', threadGoal: { setObjective } })
     act(() => hook.result.current.goalMode.interceptPick(vi.fn())(GOAL_ITEM))
     calls.setDraft.mockClear()
-    hook.rerender({ draft: 'Ship the parser', caret: 0 })
+    type('Ship the parser', 0)
 
     await act(async () => hook.result.current.send())
 
@@ -114,13 +132,13 @@ describe('composer goal mode', () => {
 
   it('refuses attachments in goal mode rather than dropping them', () => {
     const setObjective = vi.fn(async () => true)
-    const { hook, onError } = harness({
+    const { hook, onError, type } = harness({
       draft: '/go',
       threadGoal: { setObjective },
       imageAttachments: [{ id: 'a1', path: '/tmp/shot.png' }]
     })
     act(() => hook.result.current.goalMode.interceptPick(vi.fn())(GOAL_ITEM))
-    hook.rerender({ draft: 'Ship the parser', caret: 0 })
+    type('Ship the parser', 0)
 
     act(() => hook.result.current.send())
 
@@ -147,10 +165,10 @@ describe('composer goal mode', () => {
 
   it('keeps a bare /goal typed inside goal mode as the entrance, not the objective', () => {
     const setObjective = vi.fn(async () => true)
-    const { hook, calls } = harness({ draft: '/go', threadGoal: { setObjective } })
+    const { hook, calls, type } = harness({ draft: '/go', threadGoal: { setObjective } })
     act(() => hook.result.current.goalMode.interceptPick(vi.fn())(GOAL_ITEM))
     calls.setDraft.mockClear()
-    hook.rerender({ draft: '/goal', caret: 5 })
+    type('/goal', 5)
 
     act(() => hook.result.current.send())
 
@@ -161,9 +179,9 @@ describe('composer goal mode', () => {
 
   it('sets the objective a /goal typed inside goal mode names, not the literal command', async () => {
     const setObjective = vi.fn(async () => true)
-    const { hook } = harness({ draft: '/go', threadGoal: { setObjective } })
+    const { hook, type } = harness({ draft: '/go', threadGoal: { setObjective } })
     act(() => hook.result.current.goalMode.interceptPick(vi.fn())(GOAL_ITEM))
-    hook.rerender({ draft: '/goal  fix the parser ', caret: 0 })
+    type('/goal  fix the parser ', 0)
 
     await act(async () => hook.result.current.send())
 
@@ -174,21 +192,30 @@ describe('composer goal mode', () => {
   it('keeps a draft edited while the goal was in flight, and stays in goal mode', async () => {
     let settle: (accepted: boolean) => void = () => undefined
     const setObjective = vi.fn(() => new Promise<boolean>((resolve) => (settle = resolve)))
-    const { hook, calls } = harness({ draft: '/go', threadGoal: { setObjective } })
+    const { hook, calls, type } = harness({ draft: '/go', threadGoal: { setObjective } })
     act(() => hook.result.current.goalMode.interceptPick(vi.fn())(GOAL_ITEM))
-    hook.rerender({ draft: 'Ship the parser', caret: 0 })
+    type('Ship the parser', 0)
     calls.setDraft.mockClear()
 
     act(() => hook.result.current.send())
-    hook.rerender({ draft: 'Ship the parser and its tests', caret: 0 })
+    type('Ship the parser and its tests', 0)
     await act(async () => settle(true))
 
     expect(setObjective).toHaveBeenCalledWith('Ship the parser')
     expect(calls.setHistory).toHaveBeenCalledOnce()
-    expect(calls.setDraft).not.toHaveBeenCalled()
+    expect(readNativeChatDraftCache(SCOPE)).toBe('Ship the parser and its tests')
     expect(hook.result.current.goalMode.active).toBe(true)
   })
 
+  it('does not send while an image waits to be attached again', () => {
+    const { hook, calls } = harness({
+      draft: 'see the screenshot',
+      imageAttachments: [{ id: 'm1', path: '', unavailableName: 'orca-paste-1-ab.png' }]
+    })
+    act(() => hook.result.current.send())
+    expect(calls.sendStructured).not.toHaveBeenCalled()
+  })
+
   it('sends an ordinary message outside goal mode', () => {
     const { hook, calls } = harness({ draft: 'hello', threadGoal: { setObjective: vi.fn() } })
     act(() => hook.result.current.send())
diff --git a/src/renderer/src/components/native-chat/use-native-chat-composer-submit.ts b/src/renderer/src/components/native-chat/use-native-chat-composer-submit.ts
index 7bf8ea7f870..65d7c515a4b 100644
--- a/src/renderer/src/components/native-chat/use-native-chat-composer-submit.ts
+++ b/src/renderer/src/components/native-chat/use-native-chat-composer-submit.ts
@@ -1,9 +1,14 @@
-import { useCallback, useLayoutEffect, useMemo, useRef, useState } from 'react'
+import { useCallback, useMemo, useState } from 'react'
 import { translate } from '@/i18n/i18n'
 import { applyPickerSuggestion, type NativeChatPickerItem } from './native-chat-picker-items'
 import { pushHistory, type HistoryState } from './native-chat-composer-state'
 import type { NativeChatStructuredComposerTransport } from './native-chat-composer-types'
 import type { NativeChatComposerImageAttachment } from './NativeChatComposerField'
+import { nativeChatImagesHoldSend } from './native-chat-image-reattach'
+import {
+  clearNativeChatComposerDraftIfUnchanged,
+  readNativeChatComposerDraft
+} from './native-chat-composer-draft-store'
 import {
   isBareStructuredAgentSessionGoalCommand,
   structuredAgentSessionGoalObjective
@@ -28,6 +33,7 @@ export type NativeChatComposerGoalMode = {
  */
 export function useNativeChatComposerSubmit(args: {
   structuredTransport?: NativeChatStructuredComposerTransport
+  draftScopeKey: string
   draft: string
   caret: number
   imageAttachments: readonly NativeChatComposerImageAttachment[]
@@ -38,7 +44,7 @@ export function useNativeChatComposerSubmit(args: {
   setCaret: (caret: number) => void
   setHistory: (updater: (previous: HistoryState) => HistoryState) => void
 }): { send: () => void; goalMode: NativeChatComposerGoalMode } {
-  const { caret, disabled, draft, imageAttachments, sendPty, sendStructured } = args
+  const { caret, disabled, draft, draftScopeKey, imageAttachments, sendPty, sendStructured } = args
   const { setCaret, setDraft, setHistory, structuredTransport } = args
   const threadGoal = structuredTransport?.threadGoal
   const [entered, setEntered] = useState(false)
@@ -63,11 +69,6 @@ export function useNativeChatComposerSubmit(args: {
 
   // Setting a goal is a host round trip; the draft is cleared only if it is still
   // the one that was submitted, as with any other host command.
-  const composition = useRef(draft)
-  useLayoutEffect(() => {
-    composition.current = draft
-  }, [draft])
-
   // In-flight changes are serialized by the session's goal controller, which
   // answers false to a second submit while the first is unsettled.
   const setGoal = useCallback(() => {
@@ -84,31 +85,31 @@ export function useNativeChatComposerSubmit(args: {
       )
       return
     }
+    const submitted = readNativeChatComposerDraft(draftScopeKey)
     void threadGoal.setObjective(objective).then((accepted) => {
       if (!accepted) {
         return
       }
       structuredTransport.onError(null)
       setHistory((previous) => pushHistory(previous, draft))
-      if (composition.current !== draft) {
+      if (!clearNativeChatComposerDraftIfUnchanged(draftScopeKey, submitted)) {
         return
       }
-      setDraft('')
       setCaret(0)
       setEntered(false)
     })
   }, [
     draft,
+    draftScopeKey,
     imageAttachments.length,
     setCaret,
-    setDraft,
     setHistory,
     structuredTransport,
     threadGoal
   ])
 
   const send = useCallback(() => {
-    if (imageAttachments.some((attachment) => attachment.pending)) {
+    if (nativeChatImagesHoldSend(imageAttachments)) {
       return
     }
     if (threadGoal && structuredTransport && isBareStructuredAgentSessionGoalCommand(draft)) {
diff --git a/src/renderer/src/components/native-chat/use-native-chat-dictation-actions.ts b/src/renderer/src/components/native-chat/use-native-chat-dictation-actions.ts
deleted file mode 100644
index 5c3d1e7b646..00000000000
--- a/src/renderer/src/components/native-chat/use-native-chat-dictation-actions.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import type { NativeChatComposerInput } from './native-chat-composer-input'
-import { useCallback, type Dispatch, type RefObject, type SetStateAction } from 'react'
-import { dispatchDictationControl } from '../dictation/dictation-control-events'
-
-export function useNativeChatDictationActions(args: {
-  textareaRef: RefObject<NativeChatComposerInput | null>
-  setDictationPressed: Dispatch<SetStateAction<boolean>>
-}): {
-  toggleDictation: () => void
-  startHoldDictation: () => void
-  stopHoldDictation: () => void
-} {
-  const { setDictationPressed, textareaRef } = args
-  const focusForDictation = useCallback(() => textareaRef.current?.focus(), [textareaRef])
-  const toggleDictation = useCallback(() => {
-    focusForDictation()
-    dispatchDictationControl('toggle')
-  }, [focusForDictation])
-  const startHoldDictation = useCallback(() => {
-    setDictationPressed(true)
-    focusForDictation()
-    dispatchDictationControl('start')
-  }, [focusForDictation, setDictationPressed])
-  const stopHoldDictation = useCallback(() => {
-    setDictationPressed(false)
-    dispatchDictationControl('stop')
-  }, [setDictationPressed])
-  return { toggleDictation, startHoldDictation, stopHoldDictation }
-}
diff --git a/src/renderer/src/components/native-chat/use-native-chat-dictation.ts b/src/renderer/src/components/native-chat/use-native-chat-dictation.ts
new file mode 100644
index 00000000000..8a57c0b723c
--- /dev/null
+++ b/src/renderer/src/components/native-chat/use-native-chat-dictation.ts
@@ -0,0 +1,44 @@
+import type { NativeChatComposerInput } from './native-chat-composer-input'
+import { useCallback, useState, type RefObject } from 'react'
+import { useAppStore } from '../../store'
+import { dispatchDictationControl } from '../dictation/dictation-control-events'
+
+/** Whether the composer can dictate and is dictating now, and the controls that start and stop it. */
+export function useNativeChatDictation(textareaRef: RefObject<NativeChatComposerInput | null>): {
+  dictationDisabled: boolean
+  isDictating: boolean
+  isDictationHoldMode: boolean
+  toggleDictation: () => void
+  startHoldDictation: () => void
+  stopHoldDictation: () => void
+} {
+  const [dictationPressed, setDictationPressed] = useState(false)
+  const dictationState = useAppStore((store) => store.dictationState)
+  const voiceSettings = useAppStore((store) => store.settings?.voice)
+  const focusForDictation = useCallback(() => textareaRef.current?.focus(), [textareaRef])
+  const toggleDictation = useCallback(() => {
+    focusForDictation()
+    dispatchDictationControl('toggle')
+  }, [focusForDictation])
+  const startHoldDictation = useCallback(() => {
+    setDictationPressed(true)
+    focusForDictation()
+    dispatchDictationControl('start')
+  }, [focusForDictation])
+  const stopHoldDictation = useCallback(() => {
+    setDictationPressed(false)
+    dispatchDictationControl('stop')
+  }, [])
+  return {
+    dictationDisabled: voiceSettings?.enabled !== true || !voiceSettings.sttModel,
+    isDictating:
+      dictationPressed ||
+      dictationState === 'starting' ||
+      dictationState === 'listening' ||
+      dictationState === 'stopping',
+    isDictationHoldMode: voiceSettings?.dictationMode === 'hold',
+    toggleDictation,
+    startHoldDictation,
+    stopHoldDictation
+  }
+}
diff --git a/src/renderer/src/components/native-chat/use-native-chat-draft-unsaved.ts b/src/renderer/src/components/native-chat/use-native-chat-draft-unsaved.ts
new file mode 100644
index 00000000000..df7b28f427e
--- /dev/null
+++ b/src/renderer/src/components/native-chat/use-native-chat-draft-unsaved.ts
@@ -0,0 +1,14 @@
+import { useCallback, useSyncExternalStore } from 'react'
+import {
+  isNativeChatComposerDraftUnsaved,
+  subscribeToNativeChatComposerDraft
+} from './native-chat-composer-draft-store'
+
+/** Whether storage refused this scope's draft, which then lasts only until Orca closes. */
+export function useNativeChatComposerDraftUnsaved(scopeKey: string): boolean {
+  const subscribe = useCallback(
+    (listener: () => void) => subscribeToNativeChatComposerDraft(scopeKey, listener),
+    [scopeKey]
+  )
+  return useSyncExternalStore(subscribe, () => isNativeChatComposerDraftUnsaved(scopeKey))
+}
diff --git a/src/renderer/src/components/native-chat/use-native-chat-draft.ts b/src/renderer/src/components/native-chat/use-native-chat-draft.ts
index a5b5d99a143..297fd3ecb9b 100644
--- a/src/renderer/src/components/native-chat/use-native-chat-draft.ts
+++ b/src/renderer/src/components/native-chat/use-native-chat-draft.ts
@@ -1,82 +1,89 @@
-import { useCallback, useEffect, useRef, useState } from 'react'
+import { useCallback, useEffect, useRef, useState, useSyncExternalStore } from 'react'
 import { appendReturnedDraftText } from '../../../../shared/returned-draft-text'
+import { subscribeToNativeChatComposerDraft } from './native-chat-composer-draft-store'
 import {
   readNativeChatDraftCache,
   subscribeToNativeChatDraftAppend,
   writeNativeChatDraftCache
 } from './native-chat-draft-cache'
 
+/** Text appended mid-IME-composition: saved at once, shown once the composition settles. */
+type CompositionHold = { scopeKey: string; shown: string; appended: string }
+
 /**
- * Composer draft state backed by the scope cache so a typed-but-unsent message
- * survives the composer unmounting on a TUI/GUI toggle. `scopeKey` is the stable
- * pane key also used for image attachments; when it changes (the composer is
- * reused for a different pane) the cached draft is reloaded.
+ * The composer's draft text, read from the draft store so a typed-but-unsent message survives
+ * the composer unmounting on a TUI/GUI toggle, a reload or a quit. Every change is made to the
+ * store's current draft, never to a copy this composer holds. `scopeKey` is the stable pane key
+ * also used for image attachments.
  */
 export function useNativeChatDraft(
   scopeKey: string,
   isComposing: () => boolean
 ): {
   draft: string
-  setDraft: (next: string | ((previous: string) => string)) => void
+  setDraft: (next: string | ((previous: string) => string), options?: { unsaved?: boolean }) => void
   /** Shows text appended during an IME composition, which owns the field until it settles. */
   flushDraftAppends: () => void
 } {
-  const [draft, setDraftState] = useState(() => readNativeChatDraftCache(scopeKey))
-  // Appended while composing: the editor's own writes would erase it, so the cache keeps it after them.
-  const pendingAppendRef = useRef<{ scopeKey: string; text: string } | null>(null)
-
-  // Reload the cached draft when reused for a different pane (scope change),
-  // adjusting state during render rather than in an effect so the restored draft
-  // is visible on the first paint after the switch.
-  const lastScopeKey = useRef(scopeKey)
-  if (lastScopeKey.current !== scopeKey) {
-    lastScopeKey.current = scopeKey
-    setDraftState(readNativeChatDraftCache(scopeKey))
-  }
+  const subscribe = useCallback(
+    (listener: () => void) => subscribeToNativeChatComposerDraft(scopeKey, listener),
+    [scopeKey]
+  )
+  const stored = useSyncExternalStore(subscribe, () => readNativeChatDraftCache(scopeKey))
+  const [hold, setHold] = useState<CompositionHold | null>(null)
+  // Read by callbacks between renders; only they change it, always together with the state.
+  const holdRef = useRef<CompositionHold | null>(null)
+  const updateHold = useCallback((next: CompositionHold | null) => {
+    holdRef.current = next
+    setHold(next)
+  }, [])
+  useEffect(
+    () => () => {
+      holdRef.current = null
+    },
+    []
+  )
 
   useEffect(
     () =>
-      subscribeToNativeChatDraftAppend(scopeKey, (text) => {
+      subscribeToNativeChatDraftAppend(scopeKey, (text, previous) => {
         if (!isComposing()) {
-          setDraftState(readNativeChatDraftCache(scopeKey))
           return
         }
-        const pending = pendingAppendRef.current
-        pendingAppendRef.current = {
+        const held = holdRef.current?.scopeKey === scopeKey ? holdRef.current : null
+        updateHold({
           scopeKey,
-          text:
-            pending?.scopeKey === scopeKey ? appendReturnedDraftText(pending.text, text) : text
-        }
+          shown: held ? held.shown : previous,
+          appended: held ? appendReturnedDraftText(held.appended, text) : text
+        })
       }),
-    [isComposing, scopeKey]
+    [isComposing, scopeKey, updateHold]
   )
 
-  // Persist every mutation through the cache. Accepts the same value/updater
-  // forms as a useState setter so call sites are drop-in.
+  // Accepts the same value/updater forms as a useState setter so call sites are drop-in.
   const setDraft = useCallback(
-    (next: string | ((previous: string) => string)) => {
-      setDraftState((previous) => {
-        const resolved = typeof next === 'function' ? next(previous) : next
-        const pending = pendingAppendRef.current
-        writeNativeChatDraftCache(
-          scopeKey,
-          pending?.scopeKey === scopeKey
-            ? appendReturnedDraftText(resolved, pending.text)
-            : resolved
-        )
-        return resolved
-      })
+    (next: string | ((previous: string) => string), options?: { unsaved?: boolean }) => {
+      const held = holdRef.current?.scopeKey === scopeKey ? holdRef.current : null
+      const previous = held ? held.shown : readNativeChatDraftCache(scopeKey)
+      const resolved = typeof next === 'function' ? next(previous) : next
+      if (held) {
+        updateHold({ ...held, shown: resolved })
+      }
+      writeNativeChatDraftCache(
+        scopeKey,
+        held ? appendReturnedDraftText(resolved, held.appended) : resolved,
+        options
+      )
     },
-    [scopeKey]
+    [scopeKey, updateHold]
   )
 
   const flushDraftAppends = useCallback(() => {
-    const pending = pendingAppendRef.current
-    pendingAppendRef.current = null
-    if (pending?.scopeKey === scopeKey) {
-      setDraft((previous) => appendReturnedDraftText(previous, pending.text))
+    if (holdRef.current?.scopeKey === scopeKey) {
+      updateHold(null)
     }
-  }, [scopeKey, setDraft])
+  }, [scopeKey, updateHold])
 
-  return { draft, setDraft, flushDraftAppends }
+  const shownHold = hold?.scopeKey === scopeKey ? hold : null
+  return { draft: shownHold ? shownHold.shown : stored, setDraft, flushDraftAppends }
 }
diff --git a/src/renderer/src/components/native-chat/use-native-chat-launch-draft-adoption.test.tsx b/src/renderer/src/components/native-chat/use-native-chat-launch-draft-adoption.test.tsx
index 71da8b11b60..a341150ce0e 100644
--- a/src/renderer/src/components/native-chat/use-native-chat-launch-draft-adoption.test.tsx
+++ b/src/renderer/src/components/native-chat/use-native-chat-launch-draft-adoption.test.tsx
@@ -222,7 +222,7 @@ describe('useNativeChatLaunchDraftAdoption', () => {
     const { setDraft, setCaret } = setup({ launchDraft: entry })
 
     expect(mocks.markNativeChatLaunchDraftAdopted).toHaveBeenCalledWith('tab-1')
-    expect(setDraft).toHaveBeenCalledWith(entry.text)
+    expect(setDraft).toHaveBeenCalledWith(entry.text, { unsaved: true })
     expect(setCaret).toHaveBeenCalledWith(entry.text.length)
     expect(mocks.clearNativeChatLaunchDraft).not.toHaveBeenCalled()
   })
@@ -353,7 +353,7 @@ describe('launch draft adoption across a split', () => {
   it('still mirrors the launch draft into the owning pane composer', () => {
     const { setDraft } = renderPaneComposer({ ownsTabWideLaunchDraft: true })
 
-    expect(setDraft).toHaveBeenCalledWith(SEED_TEXT)
+    expect(setDraft).toHaveBeenCalledWith(SEED_TEXT, { unsaved: true })
   })
 
   it('clears the adopted copy after a split once the transcript resolves the seed', () => {
diff --git a/src/renderer/src/components/native-chat/use-native-chat-launch-draft-adoption.ts b/src/renderer/src/components/native-chat/use-native-chat-launch-draft-adoption.ts
index 2b2e176a30b..54d6af8319c 100644
--- a/src/renderer/src/components/native-chat/use-native-chat-launch-draft-adoption.ts
+++ b/src/renderer/src/components/native-chat/use-native-chat-launch-draft-adoption.ts
@@ -81,7 +81,7 @@ export function useNativeChatLaunchDraftAdoption(args: {
   launchDraft: NativeChatLaunchDraft | null | undefined
   launchDraftResolved: boolean
   draft: string
-  setDraft: (next: string) => void
+  setDraft: (next: string, options?: { unsaved?: boolean }) => void
   setCaret: (next: number) => void
   /** This pane is the tab-wide evidence's owner (`nativeChatLeafOwnsTabWideEvidence`).
    *  Splitting drops it for every pane, so it gates pickup, never cleanup. */
@@ -128,7 +128,8 @@ export function useNativeChatLaunchDraftAdoption(args: {
     // declines the seed permanently instead of resurrecting it on a later clear.
     useAppStore.getState().markNativeChatLaunchDraftAdopted(terminalTabId)
     if (draft === '') {
-      setDraft(launchDraft.text)
+      // Not saved untouched: after a reload no seed is left to replace the copy in the input line.
+      setDraft(launchDraft.text, { unsaved: true })
       setCaret(launchDraft.text.length)
     }
   }, [
diff --git a/src/renderer/src/components/native-chat/use-native-chat-structured-composer-send.test.tsx b/src/renderer/src/components/native-chat/use-native-chat-structured-composer-send.test.tsx
index 39892a49219..ccd7b378585 100644
--- a/src/renderer/src/components/native-chat/use-native-chat-structured-composer-send.test.tsx
+++ b/src/renderer/src/components/native-chat/use-native-chat-structured-composer-send.test.tsx
@@ -41,10 +41,10 @@ function harness(
   const { result } = renderHook(() =>
     useNativeChatStructuredComposerSend({
       agent,
-      draft: '',
+      draftScopeKey: 'tab-1:pane',
       imageAttachments: [ATTACHMENT],
       structuredTransport,
-      clearImageAttachments: vi.fn(),
+      isComposing: () => false,
       clearSkillOrigin: vi.fn(),
       setHistory: vi.fn(),
       setDraft: vi.fn(),
diff --git a/src/renderer/src/components/native-chat/use-native-chat-structured-composer-send.ts b/src/renderer/src/components/native-chat/use-native-chat-structured-composer-send.ts
index f208e6cb4a9..25a824b8626 100644
--- a/src/renderer/src/components/native-chat/use-native-chat-structured-composer-send.ts
+++ b/src/renderer/src/components/native-chat/use-native-chat-structured-composer-send.ts
@@ -1,4 +1,4 @@
-import { useCallback, useLayoutEffect, useRef } from 'react'
+import { useCallback } from 'react'
 import { emitNativeChatMessageSent } from '@/lib/native-chat-telemetry'
 import { reportStructuredSessionUserInput } from '@/lib/worker-terminal-takeover-report'
 import {
@@ -10,13 +10,19 @@ import { dispatchNativeChatStructuredComposerText } from './native-chat-structur
 import { pushHistory, type HistoryState } from './native-chat-composer-state'
 import type { NativeChatStructuredComposerTransport } from './native-chat-composer-types'
 import type { NativeChatComposerImageAttachment } from './NativeChatComposerField'
+import { nativeChatAttachImagesAgainReason } from './native-chat-image-reattach'
+import {
+  readNativeChatComposerDraft,
+  updateNativeChatComposerDraft
+} from './native-chat-composer-draft-store'
+import { nativeChatComposerDraftLeftAfterSend } from './native-chat-composer-draft-comparison'
 
 export type UseNativeChatStructuredComposerSendArgs = {
   agent: AgentType
-  draft?: string
+  draftScopeKey: string
   imageAttachments: readonly NativeChatComposerImageAttachment[]
   structuredTransport?: NativeChatStructuredComposerTransport
-  clearImageAttachments: () => void
+  isComposing: () => boolean
   clearSkillOrigin: () => void
   setHistory: (updater: (previous: HistoryState) => HistoryState) => void
   setDraft: (value: string) => void
@@ -27,10 +33,10 @@ export type UseNativeChatStructuredComposerSendArgs = {
  *  once the transport accepts (the PTY path has its own sibling hook). */
 export function useNativeChatStructuredComposerSend({
   agent,
-  draft,
+  draftScopeKey,
   imageAttachments,
   structuredTransport,
-  clearImageAttachments,
+  isComposing,
   clearSkillOrigin,
   setHistory,
   setDraft,
@@ -39,10 +45,6 @@ export function useNativeChatStructuredComposerSend({
   text: string,
   attachments?: readonly NativeChatComposerImageAttachment[]
 ) => void {
-  const composition = useRef({ draft, imageAttachments })
-  useLayoutEffect(() => {
-    composition.current = { draft, imageAttachments }
-  }, [draft, imageAttachments])
   return useCallback(
     (text: string, attachments = imageAttachments): void => {
       if (!structuredTransport) {
@@ -51,11 +53,17 @@ export function useNativeChatStructuredComposerSend({
       const hostCommand =
         isStructuredAgentSessionComposerCommand(text, agent) ||
         (structuredTransport.threadGoal !== undefined && isStructuredAgentSessionGoalCommand(text))
+      // A command picked while images await re-attaching would send them without a file.
+      const attachAgain = nativeChatAttachImagesAgainReason(attachments)
+      if (attachAgain) {
+        structuredTransport.onError(attachAgain)
+        return
+      }
       if (attachments.length > 0 && hostCommand) {
         structuredTransport.onError('Remove attachments before using a chat-session command.')
         return
       }
-      const submitted = composition.current
+      const submitted = readNativeChatComposerDraft(draftScopeKey)
       void dispatchNativeChatStructuredComposerText(structuredTransport, text, attachments)
         .then(({ accepted, error }) => {
           structuredTransport.onError(error)
@@ -71,17 +79,21 @@ export function useNativeChatStructuredComposerSend({
             structuredTransport.runtimeEnvironmentId
           )
           setHistory((previous) => pushHistory(previous, text))
-          if (
-            hostCommand &&
-            (composition.current.draft !== submitted.draft ||
-              composition.current.imageAttachments !== submitted.imageAttachments)
-          ) {
+          // Why: the send settles after a round trip, while this or another composer of the same
+          // conversation may have changed the draft; only what was sent leaves it.
+          const left = nativeChatComposerDraftLeftAfterSend(
+            readNativeChatComposerDraft(draftScopeKey),
+            submitted
+          )
+          if (!left) {
             return
           }
-          setDraft('')
-          setCaret(0)
+          updateNativeChatComposerDraft(draftScopeKey, { images: left.images }, 'immediate')
+          // A live composition owns the field, which keeps only what it composed once cleared.
+          const composing = isComposing()
+          setDraft(composing ? '' : left.text)
+          setCaret(composing ? 0 : left.text.length)
           clearSkillOrigin()
-          clearImageAttachments()
         })
         .catch((error) =>
           structuredTransport.onError(error instanceof Error ? error.message : String(error))
@@ -89,9 +101,10 @@ export function useNativeChatStructuredComposerSend({
     },
     [
       agent,
-      clearImageAttachments,
       clearSkillOrigin,
+      draftScopeKey,
       imageAttachments,
+      isComposing,
       setCaret,
       setDraft,
       setHistory,
diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-queued-messages.test.tsx b/src/renderer/src/components/native-chat/use-structured-agent-session-queued-messages.test.tsx
index 5fdfc0a95c7..2c5257725a5 100644
--- a/src/renderer/src/components/native-chat/use-structured-agent-session-queued-messages.test.tsx
+++ b/src/renderer/src/components/native-chat/use-structured-agent-session-queued-messages.test.tsx
@@ -17,6 +17,10 @@ import {
   readNativeChatDraftCache
 } from './native-chat-draft-cache'
 import { useStructuredAgentSessionQueuedMessages } from './use-structured-agent-session-queued-messages'
+import {
+  createMemoryNativeChatComposerDraftStorage,
+  setNativeChatComposerDraftStorageForTests
+} from './native-chat-composer-draft-storage'
 import type { StructuredAgentSessionMutate } from './use-structured-agent-session-mutate'
 
 type MutateCall = [string, string, Record<string, unknown>]
@@ -150,6 +154,25 @@ describe('queued message actions', () => {
     expect(toast.error).toHaveBeenCalledWith('Already sent — your text is still in the composer.')
   })
 
+  it('Edit deletes the card only once storage holds the text, and keeps it when storage refuses', async () => {
+    const warn = vi.spyOn(console, 'warn').mockImplementation(() => {})
+    const storage = createMemoryNativeChatComposerDraftStorage()
+    storage.refuseWrites = true
+    setNativeChatComposerDraftStorageForTests(storage)
+    try {
+      const harness = createHarness()
+      await act(() => harness.result.current.edit('draft-1'))
+      expect(readNativeChatDraftCache(SCOPE)).toBe('text of draft-1')
+      expect(harness.mutate).not.toHaveBeenCalled()
+
+      storage.refuseWrites = false
+      await act(() => harness.result.current.edit('draft-2'))
+      expect(harness.mutate).toHaveBeenCalledTimes(1)
+    } finally {
+      warn.mockRestore()
+    }
+  })
+
   it('Edit with no composer to hold the text deletes nothing', async () => {
     const harness = createHarness({ composerScopeKey: undefined })
     await act(() => harness.result.current.edit('draft-1'))
diff --git a/src/renderer/src/components/native-chat/use-structured-agent-session-queued-messages.ts b/src/renderer/src/components/native-chat/use-structured-agent-session-queued-messages.ts
index 4596fb67180..bd445b6e2ce 100644
--- a/src/renderer/src/components/native-chat/use-structured-agent-session-queued-messages.ts
+++ b/src/renderer/src/components/native-chat/use-structured-agent-session-queued-messages.ts
@@ -16,6 +16,7 @@ import type {
   AgentSessionSendResult
 } from '../../../../shared/agent-session-wire'
 import { appendNativeChatDraftCache } from './native-chat-draft-cache'
+import { nativeChatComposerDraftWriteSettled } from './native-chat-composer-draft-store'
 import {
   newestSteerableQueuedMessageCard,
   projectQueuedMessageCards,
@@ -128,6 +129,10 @@ export function useStructuredAgentSessionQueuedMessages(args: {
           return
         }
         appendNativeChatDraftCache(composerScopeKey, card.text)
+        // The card goes only once storage holds the draft; a refused save keeps it.
+        if (!(await nativeChatComposerDraftWriteSettled(composerScopeKey))) {
+          return
+        }
         const result = await mutate<AgentSessionQueuedMessageDeleteResult>(
           'agentSession.queuedMessageDelete',
           'agentSession.queuedMessageDelete',
diff --git a/src/renderer/src/components/right-sidebar/ai-vault-session-launch-actions.ts b/src/renderer/src/components/right-sidebar/ai-vault-session-launch-actions.ts
index d9e2b3e1d4d..8929540443a 100644
--- a/src/renderer/src/components/right-sidebar/ai-vault-session-launch-actions.ts
+++ b/src/renderer/src/components/right-sidebar/ai-vault-session-launch-actions.ts
@@ -2,12 +2,16 @@ import { useCallback, useState } from 'react'
 import { toast } from 'sonner'
 import {
   buildAiVaultResumeCopyCommandForWorktree,
-  buildAiVaultResumeStartupForWorktree
+  buildAiVaultResumeStartupForWorktree,
+  type AiVaultResumeCommandSession
 } from '@/lib/ai-vault-resume-command'
 import { launchAiVaultSessionInNewTab } from '@/lib/launch-ai-vault-session'
 import { useAppStore } from '@/store'
 import type { AiVaultAgent, AiVaultSession } from '../../../../shared/ai-vault-types'
-import { prepareAiVaultSessionForResume } from '@/lib/ai-vault-session-resume-preparation'
+import {
+  dropDeletedSshResumeCwd,
+  prepareAiVaultSessionForResume
+} from '@/lib/ai-vault-session-resume-preparation'
 import type { Worktree } from '../../../../shared/worktree/types'
 import { translate } from '@/i18n/i18n'
 import { agentLabel } from './ai-vault-session-filters'
@@ -53,7 +57,7 @@ export function useAiVaultSessionLaunchActions({
   )
 
   const buildResumeStartup = useCallback(
-    (session: AiVaultSession, worktreeId?: string | null) =>
+    (session: AiVaultResumeCommandSession, worktreeId?: string | null) =>
       buildAiVaultResumeStartupForWorktree({
         state: useAppStore.getState(),
         worktreeId: worktreeId ?? activeWorktreeId ?? activeWorktree?.id ?? null,
@@ -111,6 +115,7 @@ export function useAiVaultSessionLaunchActions({
         )
       }
       void prepareAiVaultSessionForResume(session)
+        .then(dropDeletedSshResumeCwd)
         .then((preparedSession) => {
           const launchResult = launchAiVaultSessionInNewTab({
             agent: session.agent,
diff --git a/src/renderer/src/components/tab-bar/TabStripScrollIndicator.test.tsx b/src/renderer/src/components/tab-bar/TabStripScrollIndicator.test.tsx
index 6aae0441237..c89c8a21087 100644
--- a/src/renderer/src/components/tab-bar/TabStripScrollIndicator.test.tsx
+++ b/src/renderer/src/components/tab-bar/TabStripScrollIndicator.test.tsx
@@ -4,37 +4,20 @@ import React, { createRef } from 'react'
 import { afterEach, describe, expect, it, vi } from 'vitest'
 import { cleanup, fireEvent, render } from '@testing-library/react'
 import { TabStripScrollIndicator } from './TabStripScrollIndicator'
-import type { TabStripScrollMetrics } from './tab-strip-scroll-metrics'
 
 afterEach(() => {
   cleanup()
   vi.restoreAllMocks()
 })
 
-const OVERFLOW_METRICS: TabStripScrollMetrics = {
-  hasOverflow: true,
-  canScrollStart: false,
-  canScrollEnd: true,
-  thumbSizeFraction: 0.4,
-  thumbOffsetFraction: 0
-}
-
-const NO_OVERFLOW_METRICS: TabStripScrollMetrics = {
-  hasOverflow: false,
-  canScrollStart: false,
-  canScrollEnd: false,
-  thumbSizeFraction: 1,
-  thumbOffsetFraction: 0
-}
-
 describe('TabStripScrollIndicator', () => {
   it('renders null when there is no overflow', () => {
-    const { container } = render(<TabStripScrollIndicator metrics={NO_OVERFLOW_METRICS} />)
+    const { container } = render(<TabStripScrollIndicator hasOverflow={false} />)
     expect(container.firstChild).toBeNull()
   })
 
   it('renders under the tabs with bottom-0 and idle 3px height', () => {
-    const { getByTestId } = render(<TabStripScrollIndicator metrics={OVERFLOW_METRICS} />)
+    const { getByTestId } = render(<TabStripScrollIndicator hasOverflow />)
     const indicator = getByTestId('tab-strip-scroll-indicator')
     expect(indicator).toBeTruthy()
     expect(indicator.className).toContain('bottom-0')
@@ -48,7 +31,7 @@ describe('TabStripScrollIndicator', () => {
   })
 
   it('expands to 4px and becomes opaque on pointer hover, restores on leave', () => {
-    const { getByTestId } = render(<TabStripScrollIndicator metrics={OVERFLOW_METRICS} />)
+    const { getByTestId } = render(<TabStripScrollIndicator hasOverflow />)
     const indicator = getByTestId('tab-strip-scroll-indicator')
     expect(indicator.className).toContain('h-[3px]')
     expect(indicator.className).toContain('opacity-0')
@@ -70,7 +53,7 @@ describe('TabStripScrollIndicator', () => {
     ;(scrollContainerRef as React.MutableRefObject<HTMLElement>).current = scrollContainer
 
     const { getByTestId } = render(
-      <TabStripScrollIndicator metrics={OVERFLOW_METRICS} scrollContainerRef={scrollContainerRef} />
+      <TabStripScrollIndicator hasOverflow scrollContainerRef={scrollContainerRef} />
     )
     const indicator = getByTestId('tab-strip-scroll-indicator')
     Object.defineProperty(indicator, 'clientWidth', { value: 400, configurable: true })
@@ -100,18 +83,14 @@ describe('TabStripScrollIndicator', () => {
   })
 
   it('applies pointer-events-none when disabled', () => {
-    const { getByTestId } = render(
-      <TabStripScrollIndicator metrics={OVERFLOW_METRICS} disabled={true} />
-    )
+    const { getByTestId } = render(<TabStripScrollIndicator hasOverflow disabled={true} />)
     const indicator = getByTestId('tab-strip-scroll-indicator')
     expect(indicator.className).toContain('pointer-events-none')
     expect(indicator.className).not.toContain('group-hover/tab-strip:pointer-events-auto')
   })
 
   it('stays hidden and unexpanded on hover when disabled', () => {
-    const { getByTestId } = render(
-      <TabStripScrollIndicator metrics={OVERFLOW_METRICS} disabled={true} />
-    )
+    const { getByTestId } = render(<TabStripScrollIndicator hasOverflow disabled={true} />)
     const indicator = getByTestId('tab-strip-scroll-indicator')
     fireEvent.pointerEnter(indicator)
     expect(indicator.className).toContain('opacity-0')
@@ -127,7 +106,7 @@ describe('TabStripScrollIndicator', () => {
 
     const { getByTestId } = render(
       <TabStripScrollIndicator
-        metrics={OVERFLOW_METRICS}
+        hasOverflow
         scrollContainerRef={scrollContainerRef}
         disabled={true}
       />
@@ -144,7 +123,7 @@ describe('TabStripScrollIndicator', () => {
     ;(scrollContainerRef as React.MutableRefObject<HTMLElement>).current = scrollContainer
 
     const { getByTestId } = render(
-      <TabStripScrollIndicator metrics={OVERFLOW_METRICS} scrollContainerRef={scrollContainerRef} />
+      <TabStripScrollIndicator hasOverflow scrollContainerRef={scrollContainerRef} />
     )
     const indicator = getByTestId('tab-strip-scroll-indicator')
     fireEvent.wheel(indicator, { deltaX: 40, deltaY: 0 })
@@ -164,7 +143,7 @@ describe('TabStripScrollIndicator', () => {
     ;(scrollContainerRef as React.MutableRefObject<HTMLElement>).current = scrollContainer
 
     const { getByTestId } = render(
-      <TabStripScrollIndicator metrics={OVERFLOW_METRICS} scrollContainerRef={scrollContainerRef} />
+      <TabStripScrollIndicator hasOverflow scrollContainerRef={scrollContainerRef} />
     )
     const indicator = getByTestId('tab-strip-scroll-indicator')
     Object.defineProperty(indicator, 'clientWidth', { value: 400, configurable: true })
@@ -200,13 +179,7 @@ describe('TabStripScrollIndicator', () => {
     ;(scrollContainerRef as React.MutableRefObject<HTMLElement>).current = scrollContainer
 
     const { getByTestId } = render(
-      <TabStripScrollIndicator
-        metrics={{
-          ...OVERFLOW_METRICS,
-          thumbSizeFraction: 0.4
-        }}
-        scrollContainerRef={scrollContainerRef}
-      />
+      <TabStripScrollIndicator hasOverflow scrollContainerRef={scrollContainerRef} />
     )
     const indicator = getByTestId('tab-strip-scroll-indicator')
     Object.defineProperty(indicator, 'clientWidth', { value: 400, configurable: true })
@@ -216,9 +189,9 @@ describe('TabStripScrollIndicator', () => {
     fireEvent.pointerDown(thumb, { button: 0, clientX: 50 })
     expect(indicator.className).toContain('h-[4px]')
 
-    // Move pointer by 60px
+    // 60px of a 240px thumb travel scrolls 60/240 of the 600px scroll range
     fireEvent(window, new MouseEvent('pointermove', { clientX: 110 }))
-    expect(scrollContainer.scrollLeft).toBeGreaterThan(0)
+    expect(scrollContainer.scrollLeft).toBe(150)
 
     // Release drag
     fireEvent(window, new MouseEvent('pointerup'))
@@ -235,7 +208,7 @@ describe('TabStripScrollIndicator', () => {
     ;(scrollContainerRef as React.MutableRefObject<HTMLElement>).current = scrollContainer
 
     const { getByTestId, rerender } = render(
-      <TabStripScrollIndicator metrics={OVERFLOW_METRICS} scrollContainerRef={scrollContainerRef} />
+      <TabStripScrollIndicator hasOverflow scrollContainerRef={scrollContainerRef} />
     )
     const indicator = getByTestId('tab-strip-scroll-indicator')
     Object.defineProperty(indicator, 'clientWidth', { value: 400, configurable: true })
@@ -245,7 +218,7 @@ describe('TabStripScrollIndicator', () => {
 
     rerender(
       <TabStripScrollIndicator
-        metrics={OVERFLOW_METRICS}
+        hasOverflow
         scrollContainerRef={scrollContainerRef}
         disabled={true}
       />
@@ -257,4 +230,62 @@ describe('TabStripScrollIndicator', () => {
     fireEvent(window, new MouseEvent('pointermove', { clientX: 300 }))
     expect(scrollContainer.scrollLeft).toBe(0)
   })
+
+  it('sizes the thumb when overflow appears and keeps it in step with scrolling and tab changes', () => {
+    const scrollContainer = document.createElement('div')
+    Object.defineProperty(scrollContainer, 'scrollWidth', { value: 1000, configurable: true })
+    Object.defineProperty(scrollContainer, 'clientWidth', { value: 400, configurable: true })
+    const scrollContainerRef = createRef<HTMLElement>()
+    ;(scrollContainerRef as React.MutableRefObject<HTMLElement>).current = scrollContainer
+    const clientWidth = Object.getOwnPropertyDescriptor(HTMLElement.prototype, 'clientWidth')!
+    vi.spyOn(HTMLElement.prototype, 'clientWidth', 'get').mockImplementation(function (
+      this: HTMLElement
+    ) {
+      return this.dataset.testid === 'tab-strip-scroll-indicator'
+        ? 400
+        : clientWidth.get!.call(this)
+    })
+
+    const stripResizeListeners = new Set<() => void>()
+    const subscribeToStripResize = (listener: () => void): (() => void) => {
+      stripResizeListeners.add(listener)
+      return () => stripResizeListeners.delete(listener)
+    }
+
+    const { getByTestId, rerender, unmount } = render(
+      <TabStripScrollIndicator
+        hasOverflow={false}
+        scrollContainerRef={scrollContainerRef}
+        subscribeToStripResize={subscribeToStripResize}
+      />
+    )
+    rerender(
+      <TabStripScrollIndicator
+        hasOverflow
+        scrollContainerRef={scrollContainerRef}
+        subscribeToStripResize={subscribeToStripResize}
+      />
+    )
+    const thumb = getByTestId('tab-strip-scroll-thumb')
+    expect(thumb.style.width).toBe('160px')
+    expect(thumb.style.transform).toBe('translateX(0px)')
+
+    scrollContainer.scrollLeft = 300
+    fireEvent.scroll(scrollContainer)
+    expect(thumb.style.transform).toBe('translateX(120px)')
+
+    // The thumb's geometry is not a React prop, so a re-render for hover must not reset it.
+    fireEvent.pointerEnter(getByTestId('tab-strip-scroll-indicator'))
+    expect(getByTestId('tab-strip-scroll-thumb')).toBe(thumb)
+    expect(thumb.style.width).toBe('160px')
+    expect(thumb.style.transform).toBe('translateX(120px)')
+
+    // A tab opening grows the strip without a scroll event.
+    Object.defineProperty(scrollContainer, 'scrollWidth', { value: 2000, configurable: true })
+    stripResizeListeners.forEach((listener) => listener())
+    expect(thumb.style.width).toBe('80px')
+
+    unmount()
+    expect(stripResizeListeners.size).toBe(0)
+  })
 })
diff --git a/src/renderer/src/components/tab-bar/TabStripScrollIndicator.tsx b/src/renderer/src/components/tab-bar/TabStripScrollIndicator.tsx
index d3b1c4672fd..4e586159a7b 100644
--- a/src/renderer/src/components/tab-bar/TabStripScrollIndicator.tsx
+++ b/src/renderer/src/components/tab-bar/TabStripScrollIndicator.tsx
@@ -1,52 +1,52 @@
-import React, { useCallback, useEffect, useLayoutEffect, useRef, useState } from 'react'
-import {
-  computeTabStripThumbLayout,
-  type TabStripScrollMetrics,
-  type TabStripThumbLayout
-} from './tab-strip-scroll-metrics'
-
-const EMPTY_THUMB_LAYOUT: TabStripThumbLayout = { widthPx: 0, leftPx: 0 }
+import React, { useEffect, useLayoutEffect, useRef, useState } from 'react'
+import { computeTabStripThumbLayout } from './tab-strip-scroll-metrics'
 
 export type TabStripScrollIndicatorProps = {
-  metrics: TabStripScrollMetrics
+  hasOverflow: boolean
   scrollContainerRef?: React.RefObject<HTMLElement | null>
+  /** Called when tabs change the strip's size without a scroll event; returns an unsubscribe. */
+  subscribeToStripResize?: (listener: () => void) => () => void
   disabled?: boolean
 }
 
 export function TabStripScrollIndicator({
-  metrics,
+  hasOverflow,
   scrollContainerRef,
+  subscribeToStripResize,
   disabled = false
 }: TabStripScrollIndicatorProps): React.JSX.Element | null {
   const trackRef = useRef<HTMLDivElement>(null)
+  const thumbRef = useRef<HTMLDivElement>(null)
   const cleanupDragRef = useRef<(() => void) | null>(null)
-  const [thumbLayout, setThumbLayout] = useState<TabStripThumbLayout>(EMPTY_THUMB_LAYOUT)
   const [isHovered, setIsHovered] = useState(false)
   const [isDragging, setIsDragging] = useState(false)
   const [isScrolling, setIsScrolling] = useState(false)
   const scrollTimeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null)
 
-  const remeasureThumb = useCallback((): void => {
-    const track = trackRef.current
-    if (!track) {
-      return
-    }
-    setThumbLayout(computeTabStripThumbLayout(track.clientWidth, metrics))
-  }, [metrics])
-
-  useLayoutEffect(() => {
-    remeasureThumb()
-  }, [remeasureThumb])
-
+  // Why write the thumb's style directly: it moves every scroll frame, and React state would re-render per frame.
   useLayoutEffect(() => {
     const track = trackRef.current
-    if (!track) {
+    const thumb = thumbRef.current
+    const scrollContainer = scrollContainerRef?.current
+    if (!track || !thumb || !scrollContainer) {
       return
     }
-    const resizeObserver = new ResizeObserver(remeasureThumb)
-    resizeObserver.observe(track)
-    return () => resizeObserver.disconnect()
-  }, [remeasureThumb])
+    const syncThumb = (): void => {
+      const layout = computeTabStripThumbLayout(track.clientWidth, scrollContainer)
+      thumb.style.width = `${layout.widthPx}px`
+      thumb.style.transform = `translateX(${layout.leftPx}px)`
+    }
+    syncThumb()
+    scrollContainer.addEventListener('scroll', syncThumb, { passive: true })
+    const trackResizeObserver = new ResizeObserver(syncThumb)
+    trackResizeObserver.observe(track)
+    const unsubscribeStripResize = subscribeToStripResize?.(syncThumb)
+    return () => {
+      scrollContainer.removeEventListener('scroll', syncThumb)
+      trackResizeObserver.disconnect()
+      unsubscribeStripResize?.()
+    }
+  }, [hasOverflow, scrollContainerRef, subscribeToStripResize])
 
   useEffect(() => {
     const scrollContainer = scrollContainerRef?.current
@@ -79,10 +79,10 @@ export function TabStripScrollIndicator({
 
   // Why: hiding the indicator mid-drag would otherwise leave window listeners and body cursor/user-select stuck.
   useEffect(() => {
-    if (disabled || !metrics.hasOverflow) {
+    if (disabled || !hasOverflow) {
       cleanupDragRef.current?.()
     }
-  }, [disabled, metrics.hasOverflow])
+  }, [disabled, hasOverflow])
 
   const handleThumbPointerDown = (e: React.PointerEvent<HTMLDivElement>): void => {
     if (e.button !== 0 || disabled) {
@@ -100,7 +100,8 @@ export function TabStripScrollIndicator({
     const startX = e.clientX
     const startScrollLeft = scrollContainer.scrollLeft
     const trackWidth = track.clientWidth
-    const maxLeft = Math.max(1, trackWidth - thumbLayout.widthPx)
+    const thumbWidth = computeTabStripThumbLayout(trackWidth, scrollContainer).widthPx
+    const maxLeft = Math.max(1, trackWidth - thumbWidth)
     const maxScrollLeft = Math.max(0, scrollContainer.scrollWidth - scrollContainer.clientWidth)
 
     if (maxScrollLeft <= 0 || maxLeft <= 0) {
@@ -157,7 +158,7 @@ export function TabStripScrollIndicator({
     const trackRect = track.getBoundingClientRect()
     const clickX = e.clientX - trackRect.left
     const trackWidth = track.clientWidth
-    const thumbWidth = thumbLayout.widthPx
+    const thumbWidth = computeTabStripThumbLayout(trackWidth, scrollContainer).widthPx
     const maxLeft = Math.max(1, trackWidth - thumbWidth)
     const maxScrollLeft = Math.max(0, scrollContainer.scrollWidth - scrollContainer.clientWidth)
 
@@ -184,7 +185,7 @@ export function TabStripScrollIndicator({
     scrollContainer.scrollLeft += delta
   }
 
-  if (!metrics.hasOverflow) {
+  if (!hasOverflow) {
     return null
   }
 
@@ -214,18 +215,15 @@ export function TabStripScrollIndicator({
       aria-hidden
     >
       <div
+        ref={thumbRef}
         data-testid="tab-strip-scroll-thumb"
-        className={`absolute bottom-0 h-full rounded-full transition-colors duration-150 ease-out ${
+        className={`absolute bottom-0 left-0 h-full rounded-full will-change-transform transition-colors duration-150 ease-out ${
           isDragging
             ? 'bg-foreground/70 cursor-grabbing'
             : isHovered
               ? 'bg-muted-foreground/80 cursor-grab'
               : 'bg-muted-foreground/60 cursor-default'
         }`}
-        style={{
-          width: `${thumbLayout.widthPx}px`,
-          left: `${thumbLayout.leftPx}px`
-        }}
         onPointerDown={handleThumbPointerDown}
       />
     </div>
diff --git a/src/renderer/src/components/tab-bar/tab-bar-surface.tsx b/src/renderer/src/components/tab-bar/tab-bar-surface.tsx
index 8a6ad5be964..693691a5b80 100644
--- a/src/renderer/src/components/tab-bar/tab-bar-surface.tsx
+++ b/src/renderer/src/components/tab-bar/tab-bar-surface.tsx
@@ -88,8 +88,13 @@ export function renderTabBarSurface({
   } = createMenu
   const { orderedItems, sortableIds, dropIndicatorByVisibleId } = itemProjection
   const clientHostedBrowserRows = props.clientHostedBrowserRows ?? EMPTY_CLIENT_HOSTED_ROWS
-  const { tabStripRef, tabStripOverflowState, activeTabDockSide, scrollTabStrip } =
-    tabStripNavigation
+  const {
+    tabStripRef,
+    tabStripOverflowState,
+    activeTabDockSide,
+    scrollTabStrip,
+    subscribeToStripResize
+  } = tabStripNavigation
   const includeTopTabBorder = tabStripChrome !== 'floating-panel'
   const renderedItems = renderTabBarItems({
     items: orderedItems,
@@ -166,8 +171,9 @@ export function renderTabBarSurface({
             ) : null}
           </div>
           <TabStripScrollIndicator
-            metrics={tabStripOverflowState}
+            hasOverflow={tabStripOverflowState.hasOverflow}
             scrollContainerRef={tabStripRef}
+            subscribeToStripResize={subscribeToStripResize}
             disabled={tabStripDragScroll.isTabDragActive}
           />
         </div>
diff --git a/src/renderer/src/components/tab-bar/tab-strip-growth-scroll.test.tsx b/src/renderer/src/components/tab-bar/tab-strip-growth-scroll.test.tsx
index c6d80d4d2f1..dee09fec386 100644
--- a/src/renderer/src/components/tab-bar/tab-strip-growth-scroll.test.tsx
+++ b/src/renderer/src/components/tab-bar/tab-strip-growth-scroll.test.tsx
@@ -1,6 +1,6 @@
 // @vitest-environment happy-dom
 import { act, cleanup, render } from '@testing-library/react'
-import { afterEach, beforeEach, describe, expect, it } from 'vitest'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { useTabStripOverflowNavigation } from './tab-strip-overflow-navigation'
 
 const TAB_WIDTH = 100
@@ -80,6 +80,8 @@ function restoreStripLayout(): void {
 }
 
 const NO_HOSTED_ROWS: string[] = []
+let stripRenderCount = 0
+let subscribeToStripResize: ((listener: () => void) => () => void) | null = null
 
 /** `hostedRows` render like client-hosted browser rows: a strip slot with no `data-tab-id`. */
 function Strip({
@@ -93,12 +95,14 @@ function Strip({
   hostedRows?: string[]
   activeHostedRow?: string | null
 }): React.JSX.Element {
+  stripRenderCount++
   const navigation = useTabStripOverflowNavigation({
     activeVisibleTabId: active,
     activeDockSlotId: activeHostedRow ?? active,
     layoutKey: [...tabs, ...hostedRows].join(','),
     worktreeId: 'wt-1'
   })
+  subscribeToStripResize = navigation.subscribeToStripResize
   return (
     <div
       data-strip=""
@@ -301,3 +305,30 @@ describe('tab strip with a docked active tab', () => {
     expect(tabX(strip, 'N')).toBe(100)
   })
 })
+
+describe('tab strip while scrolling', () => {
+  beforeEach(installStripLayout)
+  afterEach(() => {
+    cleanup()
+    restoreStripLayout()
+  })
+
+  it('does not re-render the strip for a scroll that stays between the edges', () => {
+    const { strip } = mountScrolled('E', 300)
+    const rendersBefore = stripRenderCount
+    act(() => {
+      strip.scrollLeft = 400
+      strip.dispatchEvent(new Event('scroll'))
+    })
+    expect(stripRenderCount).toBe(rendersBefore)
+  })
+
+  it('tells resize subscribers when tabs change the strip without a scroll', async () => {
+    const { rerender } = mountScrolled('J', 700)
+    const listener = vi.fn()
+    subscribeToStripResize!(listener)
+    rerender(<Strip tabs={[...TABS, 'N']} active="J" />)
+    await Promise.resolve()
+    expect(listener).toHaveBeenCalled()
+  })
+})
diff --git a/src/renderer/src/components/tab-bar/tab-strip-overflow-navigation.ts b/src/renderer/src/components/tab-bar/tab-strip-overflow-navigation.ts
index 29508efb3e6..df1f292bfb4 100644
--- a/src/renderer/src/components/tab-bar/tab-strip-overflow-navigation.ts
+++ b/src/renderer/src/components/tab-bar/tab-strip-overflow-navigation.ts
@@ -1,9 +1,9 @@
 import { useCallback, useEffect, useLayoutEffect, useRef, useState, type RefObject } from 'react'
 import { bindTabStripContentResizeObservers } from './tab-strip-content-resize-observers'
 import {
-  computeTabStripScrollMetrics,
-  sameTabStripScrollMetrics,
-  type TabStripScrollMetrics
+  computeTabStripOverflowState,
+  sameTabStripOverflowState,
+  type TabStripOverflowState
 } from './tab-strip-scroll-metrics'
 import { isTabStripPointerGestureActive } from './tab-strip-pointer-gesture'
 import {
@@ -44,12 +44,10 @@ function isTabStripScrolledToEnd(el: HTMLElement): boolean {
   return el.scrollLeft >= max - 2
 }
 
-const EMPTY_TAB_STRIP_OVERFLOW_STATE: TabStripScrollMetrics = {
+const EMPTY_TAB_STRIP_OVERFLOW_STATE: TabStripOverflowState = {
   hasOverflow: false,
   canScrollStart: false,
-  canScrollEnd: false,
-  thumbSizeFraction: 1,
-  thumbOffsetFraction: 0
+  canScrollEnd: false
 }
 
 export function useTabStripOverflowNavigation({
@@ -65,11 +63,13 @@ export function useTabStripOverflowNavigation({
   worktreeId: string
 }): {
   tabStripRef: RefObject<HTMLDivElement | null>
-  tabStripOverflowState: TabStripScrollMetrics
+  tabStripOverflowState: TabStripOverflowState
   activeTabDockSide: ActiveTabDockSide | null
   scrollTabStrip: (direction: 'start' | 'end', behavior?: ScrollBehavior) => void
+  subscribeToStripResize: (listener: () => void) => () => void
 } {
   const tabStripRef = useRef<HTMLDivElement>(null)
+  const stripResizeListenersRef = useRef<Set<() => void>>(new Set())
   const prevStripRef = useRef<{ worktreeId: string; tabIds: ReadonlySet<string> } | null>(null)
   const stickToEndRef = useRef(false)
   const tabClosedThisCommitRef = useRef(false)
@@ -79,7 +79,8 @@ export function useTabStripOverflowNavigation({
     activeTabId: string | null
     anchor: TabStripScrollAnchor | null
   } | null>(null)
-  const [tabStripOverflowState, setTabStripOverflowState] = useState<TabStripScrollMetrics>(
+  // Why no thumb position here: it changes every scroll frame, and every tab would re-render with it.
+  const [tabStripOverflowState, setTabStripOverflowState] = useState<TabStripOverflowState>(
     EMPTY_TAB_STRIP_OVERFLOW_STATE
   )
   const [activeTabDockSide, setActiveTabDockSide] = useState<ActiveTabDockSide | null>(null)
@@ -88,9 +89,9 @@ export function useTabStripOverflowNavigation({
     if (!el) {
       return
     }
-    const next = computeTabStripScrollMetrics(el)
+    const next = computeTabStripOverflowState(el)
     setTabStripOverflowState((previous) =>
-      sameTabStripScrollMetrics(previous, next) ? previous : next
+      sameTabStripOverflowState(previous, next) ? previous : next
     )
     setActiveTabDockSide(getActiveTabDockSide(el))
   }, [])
@@ -151,6 +152,9 @@ export function useTabStripOverflowNavigation({
         el.scrollLeft = Math.max(0, el.scrollWidth - el.clientWidth)
       }
       recordScrollAnchor()
+      for (const listener of stripResizeListenersRef.current) {
+        listener()
+      }
     }
 
     const disconnectResizeObservers = bindTabStripContentResizeObservers(el, handleStripResize)
@@ -300,5 +304,19 @@ export function useTabStripOverflowNavigation({
     tabClosedThisCommitRef.current = false
   })
 
-  return { tabStripRef, tabStripOverflowState, activeTabDockSide, scrollTabStrip }
+  // Why share these observers: each one watches every tab, so a second set doubles that work.
+  const subscribeToStripResize = useCallback((listener: () => void): (() => void) => {
+    stripResizeListenersRef.current.add(listener)
+    return () => {
+      stripResizeListenersRef.current.delete(listener)
+    }
+  }, [])
+
+  return {
+    tabStripRef,
+    tabStripOverflowState,
+    activeTabDockSide,
+    scrollTabStrip,
+    subscribeToStripResize
+  }
 }
diff --git a/src/renderer/src/components/tab-bar/tab-strip-scroll-metrics.test.ts b/src/renderer/src/components/tab-bar/tab-strip-scroll-metrics.test.ts
index cbaa69603a5..8ede8fdd39e 100644
--- a/src/renderer/src/components/tab-bar/tab-strip-scroll-metrics.test.ts
+++ b/src/renderer/src/components/tab-bar/tab-strip-scroll-metrics.test.ts
@@ -1,14 +1,14 @@
 import { describe, expect, it } from 'vitest'
 import {
-  computeTabStripScrollMetrics,
+  computeTabStripOverflowState,
   computeTabStripThumbLayout,
   getTabStripScrollMaskClassName
 } from './tab-strip-scroll-metrics'
 
-describe('computeTabStripScrollMetrics', () => {
+describe('computeTabStripOverflowState', () => {
   it('reports no overflow when all tabs fit', () => {
     expect(
-      computeTabStripScrollMetrics({
+      computeTabStripOverflowState({
         scrollWidth: 400,
         clientWidth: 400,
         scrollLeft: 0
@@ -16,38 +16,20 @@ describe('computeTabStripScrollMetrics', () => {
     ).toEqual({
       hasOverflow: false,
       canScrollStart: false,
-      canScrollEnd: false,
-      thumbSizeFraction: 1,
-      thumbOffsetFraction: 0
-    })
-  })
-
-  it('tracks thumb size and offset while scrolled', () => {
-    expect(
-      computeTabStripScrollMetrics({
-        scrollWidth: 800,
-        clientWidth: 400,
-        scrollLeft: 200
-      })
-    ).toEqual({
-      hasOverflow: true,
-      canScrollStart: true,
-      canScrollEnd: true,
-      thumbSizeFraction: 0.5,
-      thumbOffsetFraction: 0.5
+      canScrollEnd: false
     })
   })
 
   it('marks the start and end scroll edges', () => {
     expect(
-      computeTabStripScrollMetrics({
+      computeTabStripOverflowState({
         scrollWidth: 800,
         clientWidth: 400,
         scrollLeft: 0
       }).canScrollStart
     ).toBe(false)
     expect(
-      computeTabStripScrollMetrics({
+      computeTabStripOverflowState({
         scrollWidth: 800,
         clientWidth: 400,
         scrollLeft: 0
@@ -55,14 +37,14 @@ describe('computeTabStripScrollMetrics', () => {
     ).toBe(true)
 
     expect(
-      computeTabStripScrollMetrics({
+      computeTabStripOverflowState({
         scrollWidth: 800,
         clientWidth: 400,
         scrollLeft: 400
       }).canScrollStart
     ).toBe(true)
     expect(
-      computeTabStripScrollMetrics({
+      computeTabStripOverflowState({
         scrollWidth: 800,
         clientWidth: 400,
         scrollLeft: 400
@@ -74,22 +56,16 @@ describe('computeTabStripScrollMetrics', () => {
 describe('computeTabStripThumbLayout', () => {
   it('clamps thumb width and keeps the thumb inside the track', () => {
     expect(
-      computeTabStripThumbLayout(200, {
-        thumbSizeFraction: 0.04,
-        thumbOffsetFraction: 1
-      })
+      computeTabStripThumbLayout(200, { scrollWidth: 10_000, clientWidth: 400, scrollLeft: 9_600 })
     ).toEqual({
       widthPx: 18,
       leftPx: 182
     })
   })
 
-  it('uses the raw width when it is already above the minimum', () => {
+  it('sizes and offsets the thumb from the strip scroll position', () => {
     expect(
-      computeTabStripThumbLayout(400, {
-        thumbSizeFraction: 0.5,
-        thumbOffsetFraction: 0.25
-      })
+      computeTabStripThumbLayout(400, { scrollWidth: 800, clientWidth: 400, scrollLeft: 100 })
     ).toEqual({
       widthPx: 200,
       leftPx: 50
diff --git a/src/renderer/src/components/tab-bar/tab-strip-scroll-metrics.ts b/src/renderer/src/components/tab-bar/tab-strip-scroll-metrics.ts
index 39489e21a74..9f467c06d3c 100644
--- a/src/renderer/src/components/tab-bar/tab-strip-scroll-metrics.ts
+++ b/src/renderer/src/components/tab-bar/tab-strip-scroll-metrics.ts
@@ -1,13 +1,9 @@
 import type { ActiveTabDockSide } from './tab-strip-slot-geometry'
 
-export type TabStripScrollMetrics = {
+export type TabStripOverflowState = {
   hasOverflow: boolean
   canScrollStart: boolean
   canScrollEnd: boolean
-  /** Portion of total tab width currently visible in the strip viewport. */
-  thumbSizeFraction: number
-  /** 0 = scrolled to start, 1 = scrolled to end. */
-  thumbOffsetFraction: number
 }
 
 export type TabStripThumbLayout = {
@@ -15,48 +11,49 @@ export type TabStripThumbLayout = {
   leftPx: number
 }
 
+type TabStripScrollBox = Pick<HTMLElement, 'scrollWidth' | 'clientWidth' | 'scrollLeft'>
+
 export const TAB_STRIP_THUMB_MIN_WIDTH_PX = 18
 
 const OVERFLOW_EPSILON_PX = 1
 
-export function computeTabStripScrollMetrics(
-  el: Pick<HTMLElement, 'scrollWidth' | 'clientWidth' | 'scrollLeft'>
-): TabStripScrollMetrics {
+export function computeTabStripOverflowState(el: TabStripScrollBox): TabStripOverflowState {
   const maxScrollLeft = Math.max(0, el.scrollWidth - el.clientWidth)
   const hasOverflow = maxScrollLeft > OVERFLOW_EPSILON_PX
-  const thumbSizeFraction = el.scrollWidth > 0 ? Math.min(1, el.clientWidth / el.scrollWidth) : 1
-  const thumbOffsetFraction = hasOverflow && maxScrollLeft > 0 ? el.scrollLeft / maxScrollLeft : 0
 
   return {
     hasOverflow,
     canScrollStart: hasOverflow && el.scrollLeft > OVERFLOW_EPSILON_PX,
-    canScrollEnd: hasOverflow && el.scrollLeft < maxScrollLeft - OVERFLOW_EPSILON_PX,
-    thumbSizeFraction,
-    thumbOffsetFraction
+    canScrollEnd: hasOverflow && el.scrollLeft < maxScrollLeft - OVERFLOW_EPSILON_PX
   }
 }
 
 export function computeTabStripThumbLayout(
   trackWidthPx: number,
-  metrics: Pick<TabStripScrollMetrics, 'thumbSizeFraction' | 'thumbOffsetFraction'>
+  el: TabStripScrollBox
 ): TabStripThumbLayout {
   if (trackWidthPx <= 0) {
     return { widthPx: 0, leftPx: 0 }
   }
 
-  const rawWidthPx = metrics.thumbSizeFraction * trackWidthPx
-  const widthPx = Math.min(trackWidthPx, Math.max(TAB_STRIP_THUMB_MIN_WIDTH_PX, rawWidthPx))
+  const maxScrollLeft = Math.max(0, el.scrollWidth - el.clientWidth)
+  const sizeFraction = el.scrollWidth > 0 ? Math.min(1, el.clientWidth / el.scrollWidth) : 1
+  const offsetFraction = maxScrollLeft > OVERFLOW_EPSILON_PX ? el.scrollLeft / maxScrollLeft : 0
+  const widthPx = Math.min(
+    trackWidthPx,
+    Math.max(TAB_STRIP_THUMB_MIN_WIDTH_PX, sizeFraction * trackWidthPx)
+  )
   const maxLeftPx = Math.max(0, trackWidthPx - widthPx)
 
   return {
     widthPx,
-    leftPx: metrics.thumbOffsetFraction * maxLeftPx
+    leftPx: offsetFraction * maxLeftPx
   }
 }
 
 /** `dockedSide` skips that edge's fade, which would otherwise wash out the active tab docked there. */
 export function getTabStripScrollMaskClassName(
-  metrics: Pick<TabStripScrollMetrics, 'canScrollStart' | 'canScrollEnd' | 'hasOverflow'>,
+  metrics: TabStripOverflowState,
   dockedSide: ActiveTabDockSide | null = null
 ): string {
   if (!metrics.hasOverflow) {
@@ -73,15 +70,13 @@ export function getTabStripScrollMaskClassName(
   return classes.join(' ')
 }
 
-export function sameTabStripScrollMetrics(
-  left: TabStripScrollMetrics,
-  right: TabStripScrollMetrics
+export function sameTabStripOverflowState(
+  left: TabStripOverflowState,
+  right: TabStripOverflowState
 ): boolean {
   return (
     left.hasOverflow === right.hasOverflow &&
     left.canScrollStart === right.canScrollStart &&
-    left.canScrollEnd === right.canScrollEnd &&
-    Math.abs(left.thumbSizeFraction - right.thumbSizeFraction) < 0.002 &&
-    Math.abs(left.thumbOffsetFraction - right.thumbOffsetFraction) < 0.002
+    left.canScrollEnd === right.canScrollEnd
   )
 }
diff --git a/src/renderer/src/env.d.ts b/src/renderer/src/env.d.ts
index 63a0b063ddd..a4359ea87d2 100644
--- a/src/renderer/src/env.d.ts
+++ b/src/renderer/src/env.d.ts
@@ -12,6 +12,11 @@ declare module 'monaco-editor/esm/vs/basic-languages/python/python.js' {
   export const language: languages.IMonarchLanguage
 }
 
+declare module 'monaco-editor/esm/vs/basic-languages/markdown/markdown.js' {
+  export const conf: languages.LanguageConfiguration
+  export const language: languages.IMonarchLanguage
+}
+
 // Monaco ships these contributions without public type declarations. We only
 // touch the paste-override surface, so declare the minimal shape we use.
 declare module 'monaco-editor/esm/vs/editor/contrib/clipboard/browser/clipboard.js' {
diff --git a/src/renderer/src/hooks/remote-workspace-deferred-placement-retry.ts b/src/renderer/src/hooks/remote-workspace-deferred-placement-retry.ts
index 97534955f69..c3139f85f47 100644
--- a/src/renderer/src/hooks/remote-workspace-deferred-placement-retry.ts
+++ b/src/renderer/src/hooks/remote-workspace-deferred-placement-retry.ts
@@ -9,7 +9,8 @@ import {
 /** How long a conflicted target keeps watching the catalog for the rows it could not place. The
  *  catalog for a remote host often only fills in when the user opens the worktree, which is minutes
  *  after connect, and `conflict` has no other exit: it suppresses uploads and holds terminal
- *  authority at `unverifiable` until a reconnect or an unsolicited host push happens to arrive. */
+ *  authority for those paths at `unverifiable` until a reconnect or an unsolicited host push
+ *  happens to arrive. */
 const DEFERRED_SNAPSHOT_PLACEMENT_TIMEOUT_MS = 600_000
 
 /** A retry's own apply can report paths it still could not place, which arms the next watch. If the
diff --git a/src/renderer/src/hooks/remote-workspace-snapshot-apply.ts b/src/renderer/src/hooks/remote-workspace-snapshot-apply.ts
index 5ca493251ec..9dbe57cf0bc 100644
--- a/src/renderer/src/hooks/remote-workspace-snapshot-apply.ts
+++ b/src/renderer/src/hooks/remote-workspace-snapshot-apply.ts
@@ -229,7 +229,8 @@ export async function applyDirectSshRemoteWorkspaceSnapshot({
       //     replaces the host snapshot - it would delete the very tabs we failed to adopt;
       //   - workspace-terminal-host-authority.ts treats `offline`/`error` on an un-hydrated target
       //     as `none`, its bounded floor, which authorises seeding AND sleeping-agent resume.
-      //     `conflict` is deliberately not in that set, so authority stays `unverifiable`.
+      //     `conflict` is deliberately not in that set: the unplaced paths stay `unverifiable`,
+      //     and only the worktrees this apply did place read `none`.
       // Hydration is cleared, not merely withheld: the set is add-only, so a target that synced
       // cleanly before would otherwise keep uploading from this incomplete picture (STA-3593).
       currentStore.clearRemoteWorkspaceHydrated(authority.targetId)
@@ -238,7 +239,8 @@ export async function applyDirectSshRemoteWorkspaceSnapshot({
         direction: 'pull',
         revision: snapshot.revision,
         updatedAt: snapshot.updatedAt,
-        hostObservationToken: snapshot.hostObservationToken
+        hostObservationToken: snapshot.hostObservationToken,
+        unplacedTabWorktreePaths: [...unplacedTabWorktreePaths]
       })
     }
     const reconnectAbort = new AbortController()
diff --git a/src/renderer/src/hooks/remote-workspace-snapshot-unplaced-tab-adoption.test.ts b/src/renderer/src/hooks/remote-workspace-snapshot-unplaced-tab-adoption.test.ts
index 391bdf10693..7d8fc937cc9 100644
--- a/src/renderer/src/hooks/remote-workspace-snapshot-unplaced-tab-adoption.test.ts
+++ b/src/renderer/src/hooks/remote-workspace-snapshot-unplaced-tab-adoption.test.ts
@@ -330,6 +330,19 @@ describe('a host snapshot whose terminal tabs cannot be placed locally', () => {
     ).toBe('unverifiable')
   })
 
+  it('answers for the worktrees it placed when the host names another path it cannot place', async () => {
+    const store = createStore()
+    // A second machine left a tab on beta; this client only has alpha.
+    landAlphaLineage(store)
+    await applySnapshot(store, snapshot(1))
+
+    expect(syncPhase(store)).toBe('conflict')
+    expect(isHydrated(store)).toBe(false)
+    expect(adoptedTabIds(store)).toEqual(['T1', 'T2'])
+    expect(resolveWorkspaceTerminalHostAuthority(store.getState(), ALPHA_ID)).toBe('none')
+    expect(resolveWorkspaceTerminalHostAuthority(store.getState(), BETA_ID)).toBe('unverifiable')
+  })
+
   it('adopts every host tab and declares the target hydrated once the catalog is present', async () => {
     const store = createStore()
     landHostLineage(store)
diff --git a/src/renderer/src/i18n/locales/en.json b/src/renderer/src/i18n/locales/en.json
index d8ec80ee95d..ae22b22d0ed 100644
--- a/src/renderer/src/i18n/locales/en.json
+++ b/src/renderer/src/i18n/locales/en.json
@@ -16239,6 +16239,7 @@
             "effd75e330": "Nearby Context",
             "7d1480fbf1": "HTML",
             "9098b118ab": "Page",
+            "accessibleNameOpenQuote": "\"",
             "eb98a0971a": "\"",
             "d053db279d": "role=",
             "a759d8f866": "Selected Element",
@@ -17361,6 +17362,7 @@
           "tool": {
             "arrow": "Arrow",
             "ellipse": "Ellipse",
+            "eraser": "Eraser",
             "highlight": "Highlighter",
             "pen": "Pen",
             "rect": "Rectangle",
@@ -17909,6 +17911,13 @@
         "localAttachmentUnsupported": "Local attachments are not available for remote sessions.",
         "removeAttachment": "Remove attachment",
         "pastedImageLabel": "Pasted image",
+        "draftNotSaved": "This draft couldn't be saved yet. Orca keeps trying.",
+        "imageNotBroughtBack": "{{name}} couldn't be brought back with this draft. Attach it again or remove it.",
+        "pastedImageNotBroughtBack": "This pasted image couldn't be brought back with this draft. Remove it, and paste it again if you still need it.",
+        "removeImageToSend": "An image couldn't be brought back. Remove it to send.",
+        "removeImagesToSend": "Some images couldn't be brought back. Remove them to send.",
+        "imageAttachAgainLabel": "Attach again",
+        "pastedImageNotKeptLabel": "Not kept",
         "imagePasteFailed": "Image paste failed.",
         "imageSaving": "Saving pasted image…",
         "worktreeNotReady": "Worktree not ready — try again in a moment.",
diff --git a/src/renderer/src/i18n/locales/es.json b/src/renderer/src/i18n/locales/es.json
index 5cc5c47173e..51c892096b8 100644
--- a/src/renderer/src/i18n/locales/es.json
+++ b/src/renderer/src/i18n/locales/es.json
@@ -4010,6 +4010,15 @@
             "contact_note": "Es posible que el host todavía esté ejecutándose; sólo la conexión Orca no está disponible.",
             "last_connected": "Última conexión {{value0}}",
             "reconnect_attempt": "Intento {{value0}}"
+          },
+          "provider": {
+            "extra": {
+              "usage": {
+                "section": {
+                  "135d51c19f": "Límite {{value0}}"
+                }
+              }
+            }
           }
         }
       },
@@ -6454,8 +6463,8 @@
           "96f3649526": "Usar credenciales de Gemini CLI (experimental)",
           "d676c41fc6": "Extrae credenciales OAuth de tu instalación local de Gemini CLI para autenticarse con Google. Usa credenciales emitidas para la app Gemini CLI, no para Orca. Puede romperse si Google actualiza la CLI. Úsalo bajo tu propio riesgo.",
           "0c7f915b01": "Usar credenciales de Gemini CLI",
-          "973741a871": "Configura los ajustes del proveedor Gemini.",
-          "0c64dc2a64": "Gemini",
+          "973741a871": "Mantén disponibles las sesiones existentes de Gemini CLI. Las credenciales de Gemini no sirven para iniciar sesión en Antigravity.",
+          "0c64dc2a64": "Gemini CLI (heredado)",
           "db209ee572": "Eliminar",
           "8a0f870153": "Volver a autenticar",
           "3d245ef7d9": "Codex informó que este inicio de sesión no está actualizado",
@@ -7135,8 +7144,8 @@
             "shellEnvToggleLabel": "Alternar el uso del entorno de tu shell",
             "resumeCopy": "Cuando Orca se cierra o instala una actualización, los chats que estaban trabajando se reanudan automáticamente al volver a abrir Orca.",
             "structuredTitle": "Utilice el chat nativo estructurado actualizado",
-            "structuredCopy": "Abra nuevos agentes de Codex y Claude como chats estructurados. Off los abre en el chat respaldado por la terminal. Los chats que ya existen permanecen como están.",
-            "structuredScope": "Se ejecuta en esta máquina y en servidores Orca emparejados que ejecutan una versión que lo admita; Los servidores más antiguos mantienen el chat del terminal. Los hosts WSL y SSH continúan usando el chat de terminal y Windows recurre a él a menos que Orca pueda leer las horas de inicio del proceso.",
+            "structuredCopy": "Abra nuevos agentes de Codex y Claude como chats estructurados. Si está desactivado, los abre en el chat respaldado por la terminal. Los chats que ya existen permanecen como están.",
+            "structuredScope": "Se ejecuta en esta máquina y en servidores Orca emparejados que ejecutan una versión que lo admita; los servidores más antiguos mantienen el chat de terminal. Los hosts WSL y SSH continúan usando el chat de terminal y Windows recurre a él a menos que Orca pueda leer las horas de inicio del proceso.",
             "structuredToggleLabel": "Alternar chat nativo estructurado actualizado",
             "resumeTitle": "Reanudar los chats de trabajo automáticamente después de reiniciar",
             "resumeToggleLabel": "Alternar reanudación automática después de un reinicio"
@@ -7181,7 +7190,7 @@
         "GeneralEditorSettingsSection": {
           "f80603d293": "Muestra controles de notas Markdown en todas las vistas Markdown e incluye esas notas en las acciones de handoff de agentes.",
           "4edc104f0f": "Notas Markdown de revisión",
-          "5f02e6fb21": "Muestra controles de notas Markdown locales en archivos Markdown.",
+          "5f02e6fb21": "Muestra controles de notas de revisión de Markdown locales en archivos Markdown.",
           "51161d1647": "Muestra la vista general del minimapa al editar un archivo.",
           "6690b1ffb9": "Minimapa",
           "5a1ea6eaa2": "Oculto",
@@ -13799,7 +13808,7 @@
           "69af7e9c1c": "aún no está en tu PATH. Orca lo configurará como predeterminado y podrás instalarlo en cualquier momento.",
           "1eee1c7bd8": "No se detectaron agentes en tu PATH. Elige uno para instalarlo más tarde o continúa con una terminal en blanco.",
           "hideAgents": "Ocultar agentes",
-          "showMoreAgents": "Mostrar {{value0}} agentes más→",
+          "showMoreAgents": "Mostrar {{value0}} agentes más →",
           "yoloModeLabel": "Modo Yolo",
           "yoloPermissionsDescription": "Los agentes ejecutan comandos y editan archivos sin preguntar, y algunos también omiten su sandbox. Úsalo solo en proyectos de confianza."
         },
@@ -16016,6 +16025,7 @@
             "effd75e330": "Contexto cercano",
             "7d1480fbf1": "HTML",
             "9098b118ab": "Página",
+            "accessibleNameOpenQuote": "\"",
             "eb98a0971a": "\"",
             "d053db279d": "rol=",
             "a759d8f866": "Elemento seleccionado",
@@ -16699,11 +16709,17 @@
             "permission": "Requiere atención"
           },
           "filtersSection": "Filtros",
-          "viewSection": "Vista"
+          "viewSection": "Vista",
+          "threadListOptionsActive": "Opciones de lista de hilos ({{value0}} activos)",
+          "activityOptionsActive": "Opciones de actividad ({{value0}})"
         },
         "ActivityScopeFilterControls": {
           "resetScope": "Mostrar todos los hosts y proyectos",
-          "hiddenCount": "{{value0}} oculto"
+          "hiddenCount": "{{value0}} oculto",
+          "hideAutomationCreated": "Ocultar creados por automatizaciones",
+          "hideCliCreated": "Ocultar creados por el CLI",
+          "hideOtherClientsAria": "Ocultar agentes en espacios de trabajo creados desde otros clientes de Orca en servidores remotos compartidos",
+          "hideOtherClients": "Ocultar agentes de otros clientes"
         },
         "ActivityThreadRow": {
           "clearNotification": "Borrar notificación"
@@ -16728,6 +16744,25 @@
         "standaloneWorktree": {
           "floatingTerminal": "Terminal flotante",
           "standaloneTerminal": "Terminal independiente"
+        },
+        "ActivityThreadContextMenu": {
+          "copyTitle": "Copiar título",
+          "copyPath": "Copiar ruta",
+          "open": "Abrir",
+          "markRead": "Marcar como leído",
+          "markUnread": "Marcar como no leído",
+          "goToWorkspace": "Ir al espacio de trabajo",
+          "clear": "Quitar de la lista",
+          "agentSection": "Agente",
+          "markManyRead_one": "Marcar {{count}} agente como leído",
+          "markManyRead_other": "Marcar {{count}} agentes como leídos",
+          "markManyUnread_one": "Marcar {{count}} agente como no leído",
+          "markManyUnread_other": "Marcar {{count}} agentes como no leídos",
+          "clearMany_one": "Quitar {{count}} agente de la lista",
+          "clearMany_other": "Quitar {{count}} agentes de la lista",
+          "markManyRead": "Marcar {{count}} agentes como leídos",
+          "markManyUnread": "Marcar {{count}} agentes como no leídos",
+          "clearMany": "Quitar {{count}} agentes de la lista"
         }
       },
       "confirmation": {
@@ -17107,6 +17142,7 @@
           "tool": {
             "arrow": "Flecha",
             "ellipse": "Elipse",
+            "eraser": "Borrador",
             "highlight": "Resaltador",
             "pen": "Lápiz",
             "rect": "Rectángulo",
@@ -17611,6 +17647,13 @@
         "localAttachmentUnsupported": "Los archivos adjuntos locales no están disponibles para sesiones remotas.",
         "removeAttachment": "Quitar archivo adjunto",
         "pastedImageLabel": "Imagen pegada",
+        "draftNotSaved": "Este borrador aún no se ha podido guardar. Orca lo sigue intentando.",
+        "imageNotBroughtBack": "No se pudo recuperar la imagen {{name}} con este borrador. Vuelve a adjuntarla o quítala.",
+        "pastedImageNotBroughtBack": "No se pudo recuperar esta imagen pegada con este borrador. Quítala y vuelve a pegarla si aún la necesitas.",
+        "removeImageToSend": "No se pudo recuperar una imagen. Quítala para enviar.",
+        "removeImagesToSend": "No se pudieron recuperar algunas imágenes. Quítalas para enviar.",
+        "imageAttachAgainLabel": "Adjuntar de nuevo",
+        "pastedImageNotKeptLabel": "No se conservó",
         "imagePasteFailed": "Error al pegar imagen.",
         "worktreeNotReady": "Worktree no está listo — intenta de nuevo en un momento.",
         "pasteUnavailable": "No se puede pegar — este chat no acepta entradas en este momento.",
@@ -18242,6 +18285,16 @@
         "workspaceReadyToast": "El espacio de trabajo {{name}} está listo",
         "goToWorktree": "Ir al worktree",
         "goToWorkspace": "Ir al espacio de trabajo"
+      },
+      "delete": {
+        "changes": {
+          "permanentLoss": "Los cambios sin confirmar o sin seguimiento en los espacios de trabajo de Git se eliminarán de forma permanente.",
+          "clean": "No hay cambios sin confirmar ni sin seguimiento",
+          "unavailable": "No se pudieron comprobar los cambios",
+          "checking": "Comprobando si hay cambios…",
+          "checkingDetails": "Comprobando…",
+          "unavailableDetails": "Detalles no disponibles"
+        }
       }
     },
     "agentSessionContinuation": {
@@ -18359,6 +18412,11 @@
         "days": "{{value0}} d",
         "underOneMinute": "<1 min"
       }
+    },
+    "jiraIssueAssigneeField": {
+      "label": "Asignado",
+      "automatic": "Automático",
+      "assignToMe": "Asignármelo ({{name}})"
     }
   },
   "dashboardPopout": {
@@ -18966,5 +19024,54 @@
   },
   "fileSearch": {
     "failed": "La búsqueda falló. Reintenta."
+  },
+  "csv": {
+    "detectingDelimiter": "Detectando delimitador…",
+    "indexProgress": "Indexando CSV… {{percent}}%",
+    "loadingCell": "Cargando…",
+    "nextRows": "Filas siguientes",
+    "previousRows": "Filas anteriores",
+    "readOnlyPreview": "Vista previa de archivo grande · Solo lectura",
+    "resizeColumn": "Cambiar el ancho de la columna {{column}}",
+    "rowWindow": "Filas {{first}}–{{last}}",
+    "editor": "Editor de CSV",
+    "editCell": "Editar fila {{row}}, columna {{column}}",
+    "filterRows": "Filtrar filas",
+    "edit": "Editar celda",
+    "copy": "Copiar",
+    "paste": "Pegar",
+    "rows": "Filas",
+    "insertRowAbove": "Insertar fila arriba",
+    "insertRowBelow": "Insertar fila abajo",
+    "deleteRows": "Eliminar las filas seleccionadas",
+    "columns": "Columnas",
+    "newColumn": "Columna {{column}}",
+    "insertColumnBefore": "Insertar columna delante",
+    "insertColumnAfter": "Insertar columna detrás",
+    "moveColumnLeft": "Mover columna a la izquierda",
+    "moveColumnRight": "Mover columna a la derecha",
+    "deleteColumns": "Eliminar las columnas seleccionadas",
+    "sort": "Ordenar",
+    "sortAscending": "Ordenar la columna seleccionada de forma ascendente",
+    "sortDescending": "Ordenar la columna seleccionada de forma descendente",
+    "originalOrder": "Orden de filas original",
+    "save": "Guardar",
+    "inspectionOnly": "Solo inspección · Se mantiene el orden de filas del archivo"
+  },
+  "worktree": {
+    "nestedRemoval": {
+      "refreshFailed": "No se pudo actualizar la lista de espacios de trabajo",
+      "review": "Eliminar con worktrees anidados…",
+      "title": "¿Eliminar el espacio de trabajo y los worktrees anidados?",
+      "description": "Esto elimina de forma permanente \"{{name}}\", todos los worktrees anidados que se indican a continuación y todos los archivos que contienen, incluidos los cambios sin confirmar. Se detendrán sus terminales y agentes.",
+      "detached": "HEAD desacoplado",
+      "loading": "Comprobando worktrees anidados…",
+      "order": "Los worktrees anidados se eliminan primero. Si uno falla, la eliminación se detiene y se conserva el principal. Las ramas siguen tu configuración de eliminación existente.",
+      "cancel": "Cancelar",
+      "retry": "Revisar de nuevo",
+      "deleting": "Eliminando…",
+      "confirm": "Eliminar todos los worktrees indicados",
+      "preservedBranches": "Se conservaron algunas ramas de worktrees anidados"
+    }
   }
 }
diff --git a/src/renderer/src/i18n/locales/fr.json b/src/renderer/src/i18n/locales/fr.json
index e7e8e30b3c4..bad9b9c0b13 100644
--- a/src/renderer/src/i18n/locales/fr.json
+++ b/src/renderer/src/i18n/locales/fr.json
@@ -4113,6 +4113,15 @@
             "resumingAriaOne": "Reprise d’1 conversation. Cliquez pour voir les détails.",
             "resumingAria": "Reprise de {{value0}} conversations. Cliquez pour voir les détails.",
             "resumingTooltip": "Restauration des conversations interrompues et demande de poursuite…"
+          },
+          "provider": {
+            "extra": {
+              "usage": {
+                "section": {
+                  "135d51c19f": "Limite {{value0}}"
+                }
+              }
+            }
           }
         }
       },
@@ -6557,8 +6566,8 @@
           "96f3649526": "Utiliser les identifiants Gemini CLI (expérimental)",
           "d676c41fc6": "Extrait les identifiants OAuth de votre installation locale de Gemini CLI pour vous authentifier auprès de Google. Utilise les identifiants émis pour l'app Gemini CLI, pas pour Orca. Peut cesser de fonctionner si Google met à jour la CLI. À utiliser à vos risques et périls.",
           "0c7f915b01": "Utiliser les identifiants Gemini CLI",
-          "973741a871": "Configurer les paramètres du fournisseur Gemini.",
-          "0c64dc2a64": "Gemini",
+          "973741a871": "Conserver les sessions Gemini CLI existantes disponibles. Les identifiants Gemini ne vous connectent pas à Antigravity.",
+          "0c64dc2a64": "Gemini CLI (hérité)",
           "db209ee572": "Supprimer",
           "8a0f870153": "Réauthentifier",
           "3d245ef7d9": "Codex signale que cette connexion est périmée",
@@ -13902,7 +13911,7 @@
           "69af7e9c1c": "n'est pas encore dans votre PATH. Orca le définira comme valeur par défaut et vous pourrez l'installer à tout moment.",
           "1eee1c7bd8": "Aucun agent détecté dans votre PATH. Choisissez-en un à installer plus tard, ou continuez avec un terminal vide.",
           "hideAgents": "Masquer les agents",
-          "showMoreAgents": "Afficher {{value0}} autres agents→",
+          "showMoreAgents": "Afficher {{value0}} autres agents →",
           "yoloModeLabel": "Mode Yolo",
           "yoloPermissionsDescription": "Les agents exécutent des commandes et modifient des fichiers sans demander, et certains contournent aussi leur sandbox. À utiliser uniquement dans des projets de confiance."
         },
@@ -16119,6 +16128,7 @@
             "effd75e330": "Contexte proche",
             "7d1480fbf1": "HTML",
             "9098b118ab": "Page",
+            "accessibleNameOpenQuote": "\"",
             "eb98a0971a": "\"",
             "d053db279d": "role=",
             "a759d8f866": "Élément sélectionné",
@@ -16802,11 +16812,17 @@
             "unverifiable": "Aucune mise à jour récente",
             "unconfirmed": "Impossible de confirmer",
             "permission": "A besoin d'attention"
-          }
+          },
+          "threadListOptionsActive": "Options de la liste des fils ({{value0}} actifs)",
+          "activityOptionsActive": "Options d'activité ({{value0}})"
         },
         "ActivityScopeFilterControls": {
           "resetScope": "Afficher tous les hôtes et projets",
-          "hiddenCount": "{{value0}} masqué"
+          "hiddenCount": "{{value0}} masqué",
+          "hideAutomationCreated": "Masquer ceux créés par l'automatisation",
+          "hideCliCreated": "Masquer ceux créés par le CLI",
+          "hideOtherClientsAria": "Masquer les agents dans les espaces de travail créés par d'autres clients Orca sur des serveurs distants partagés",
+          "hideOtherClients": "Masquer les agents d'autres clients"
         },
         "ActivityThreadRow": {
           "clearNotification": "Effacer la notification"
@@ -16831,6 +16847,25 @@
           "workspace": "Espace de travail",
           "copyPath": "Copier le chemin",
           "jumpToWorkspace": "Accéder à l'espace de travail"
+        },
+        "ActivityThreadContextMenu": {
+          "copyTitle": "Copier le titre",
+          "copyPath": "Copier le chemin",
+          "open": "Ouvrir",
+          "markRead": "Marquer comme lu",
+          "markUnread": "Marquer comme non lu",
+          "goToWorkspace": "Aller à l'espace de travail",
+          "clear": "Retirer de la liste",
+          "agentSection": "Agent",
+          "markManyRead_one": "Marquer {{count}} agent comme lu",
+          "markManyRead_other": "Marquer {{count}} agents comme lus",
+          "markManyUnread_one": "Marquer {{count}} agent comme non lu",
+          "markManyUnread_other": "Marquer {{count}} agents comme non lus",
+          "clearMany_one": "Retirer {{count}} agent de la liste",
+          "clearMany_other": "Retirer {{count}} agents de la liste",
+          "markManyRead": "Marquer {{count}} agents comme lus",
+          "markManyUnread": "Marquer {{count}} agents comme non lus",
+          "clearMany": "Retirer {{count}} agents de la liste"
         }
       },
       "confirmation": {
@@ -17210,6 +17245,7 @@
           "tool": {
             "arrow": "Flèche",
             "ellipse": "Ellipse",
+            "eraser": "Gomme",
             "highlight": "Surligneur",
             "pen": "Stylo",
             "rect": "Rectangle",
@@ -17725,6 +17761,13 @@
         "localAttachmentUnsupported": "Les pièces jointes locales ne sont pas disponibles pour les sessions distantes.",
         "removeAttachment": "Retirer la pièce jointe",
         "pastedImageLabel": "Image collée",
+        "draftNotSaved": "Ce brouillon n'a pas encore pu être enregistré. Orca continue d'essayer.",
+        "imageNotBroughtBack": "L'image {{name}} n'a pas pu être récupérée avec ce brouillon. Joignez-la à nouveau ou retirez-la.",
+        "pastedImageNotBroughtBack": "Cette image collée n'a pas pu être récupérée avec ce brouillon. Retirez-la, puis collez-la à nouveau si vous en avez encore besoin.",
+        "removeImageToSend": "Une image n'a pas pu être récupérée. Retirez-la pour envoyer.",
+        "removeImagesToSend": "Certaines images n'ont pas pu être récupérées. Retirez-les pour envoyer.",
+        "imageAttachAgainLabel": "Joindre à nouveau",
+        "pastedImageNotKeptLabel": "Non conservée",
         "imagePasteFailed": "Échec du collage de l'image.",
         "worktreeNotReady": "Worktree pas encore prêt — réessayez dans un instant.",
         "pasteUnavailable": "Impossible de coller — ce chat n'accepte pas de saisie pour le moment.",
@@ -18341,6 +18384,16 @@
         "workspaceReadyToast": "L'espace de travail {{name}} est prêt",
         "goToWorktree": "Aller au worktree",
         "goToWorkspace": "Aller à l'espace de travail"
+      },
+      "delete": {
+        "changes": {
+          "permanentLoss": "Toutes les modifications non validées ou non suivies dans les espaces de travail Git seront définitivement supprimées.",
+          "clean": "Aucune modification non validée ou non suivie",
+          "unavailable": "Impossible de vérifier les modifications",
+          "checking": "Recherche de modifications…",
+          "checkingDetails": "Vérification…",
+          "unavailableDetails": "Détails indisponibles"
+        }
       }
     },
     "agentSessionContinuation": {
@@ -18458,6 +18511,11 @@
     },
     "agentChildRow": {
       "ended": "Terminé"
+    },
+    "jiraIssueAssigneeField": {
+      "label": "Assigné",
+      "automatic": "Automatique",
+      "assignToMe": "M'assigner ({{name}})"
     }
   },
   "dashboardPopout": {
@@ -18966,5 +19024,54 @@
   },
   "fileSearch": {
     "failed": "La recherche a échoué. Essayer à nouveau."
+  },
+  "csv": {
+    "detectingDelimiter": "Détection du délimiteur…",
+    "indexProgress": "Indexation du CSV… {{percent}} %",
+    "loadingCell": "Chargement…",
+    "nextRows": "Lignes suivantes",
+    "previousRows": "Lignes précédentes",
+    "readOnlyPreview": "Aperçu de fichier volumineux · Lecture seule",
+    "resizeColumn": "Redimensionner la colonne {{column}}",
+    "rowWindow": "Lignes {{first}}–{{last}}",
+    "editor": "Éditeur CSV",
+    "editCell": "Modifier la ligne {{row}}, colonne {{column}}",
+    "filterRows": "Filtrer les lignes",
+    "edit": "Modifier la cellule",
+    "copy": "Copier",
+    "paste": "Coller",
+    "rows": "Lignes",
+    "insertRowAbove": "Insérer une ligne au-dessus",
+    "insertRowBelow": "Insérer une ligne en dessous",
+    "deleteRows": "Supprimer les lignes sélectionnées",
+    "columns": "Colonnes",
+    "newColumn": "Colonne {{column}}",
+    "insertColumnBefore": "Insérer une colonne avant",
+    "insertColumnAfter": "Insérer une colonne après",
+    "moveColumnLeft": "Déplacer la colonne vers la gauche",
+    "moveColumnRight": "Déplacer la colonne vers la droite",
+    "deleteColumns": "Supprimer les colonnes sélectionnées",
+    "sort": "Trier",
+    "sortAscending": "Trier la colonne sélectionnée par ordre croissant",
+    "sortDescending": "Trier la colonne sélectionnée par ordre décroissant",
+    "originalOrder": "Ordre d'origine des lignes",
+    "save": "Enregistrer",
+    "inspectionOnly": "Inspection uniquement · Ordre des lignes du fichier inchangé"
+  },
+  "worktree": {
+    "nestedRemoval": {
+      "refreshFailed": "Impossible d'actualiser la liste des espaces de travail",
+      "review": "Supprimer avec les worktrees imbriqués…",
+      "title": "Supprimer l'espace de travail et les worktrees imbriqués ?",
+      "description": "Cela supprime définitivement « {{name}} », chaque worktree imbriqué listé ci-dessous et tous les fichiers qu'il contient, y compris les modifications non validées. Leurs terminaux et agents seront arrêtés.",
+      "detached": "HEAD détaché",
+      "loading": "Vérification des worktrees imbriqués…",
+      "order": "Les worktrees imbriqués sont supprimés en premier. Si l'un échoue, la suppression s'arrête et le parent est conservé. Les branches suivent vos paramètres de suppression existants.",
+      "cancel": "Annuler",
+      "retry": "Vérifier à nouveau",
+      "deleting": "Suppression…",
+      "confirm": "Supprimer tous les worktrees listés",
+      "preservedBranches": "Certaines branches de worktrees imbriqués ont été conservées"
+    }
   }
 }
diff --git a/src/renderer/src/i18n/locales/ja.json b/src/renderer/src/i18n/locales/ja.json
index 5a751131a89..27dfd5c912a 100644
--- a/src/renderer/src/i18n/locales/ja.json
+++ b/src/renderer/src/i18n/locales/ja.json
@@ -4010,6 +4010,15 @@
             "resumingAriaOne": "1 件のチャットを再開中。詳細はクリックしてください。",
             "resumingAria": "{{value0}} 件のチャットを再開中。詳細はクリックしてください。",
             "resumingTooltip": "中断されたチャットを復元し、続行を依頼しています…"
+          },
+          "provider": {
+            "extra": {
+              "usage": {
+                "section": {
+                  "135d51c19f": "上限 {{value0}}"
+                }
+              }
+            }
           }
         }
       },
@@ -6439,8 +6448,8 @@
           "96f3649526": "Gemini CLI 認証情報を使用する (実験的機能)",
           "d676c41fc6": "ローカルの Gemini CLI インストールから OAuth 認証情報を抽出して、Google で認証します。これは、Orca ではなく、Gemini CLI アプリに発行された認証情報を使用します。 Google が CLI を更新すると壊れる可能性があります。ご自身の責任でご使用ください。",
           "0c7f915b01": "Gemini CLI 認証情報を使用する",
-          "973741a871": "Gemini プロバイダー設定を構成します。",
-          "0c64dc2a64": "Gemini",
+          "973741a871": "既存の Gemini CLI セッションを利用可能な状態に保ちます。Gemini の認証情報では Antigravity にサインインできません。",
+          "0c64dc2a64": "Gemini CLI (レガシー)",
           "db209ee572": "削除",
           "8a0f870153": "再認証",
           "3d245ef7d9": "Codex はこのサインインが古いと報告しました",
@@ -6858,7 +6867,7 @@
           "1199258ace": "コピー",
           "1188e56af4": "プロンプトの例をコピーする",
           "b84807f228": "」",
-          "59722f31b4": "」",
+          "59722f31b4": "「",
           "c5325e91f6": "これらのいずれかを、スキルがインストールされているプロジェクトの Claude Code、Codex、または別の Agent に貼り付けます。",
           "2a180694f7": "試してみてください — プロンプトの例",
           "5ec620ccc4": "コピーに失敗しました。",
@@ -7164,7 +7173,7 @@
           "80c454e8a6": "これをプロバイダーのキャッシュ TTL と一致させます。"
         },
         "GeneralEditorSettingsSection": {
-          "f80603d293": "すべての markdown ビューで markdown ノートコントロールを表示し、Agent のハンドオフ 操作にそれらのノートを含めます。",
+          "f80603d293": "すべての markdown ビューで markdown ノートコントロールを表示し、Agent のハンドオフ操作にそれらのノートを含めます。",
           "4edc104f0f": "Markdown レビューノート",
           "5f02e6fb21": "markdown ファイルでローカル markdown レビューノートコントロールを表示します。",
           "51161d1647": "ファイルの編集時にミニマップの概要を表示します。",
@@ -7558,7 +7567,7 @@
           "edf13dd03b": "コピー",
           "c12b253997": "プロンプトの例をコピーする",
           "d151e25078": "」",
-          "b525ff2b12": "」",
+          "b525ff2b12": "「",
           "4daa95f25a": "これらのいずれかを、Orca CLI スキルがインストールされているプロジェクトの Claude Code、Codex、または別の Agent に貼り付けます。",
           "0820b3f84f": "試してみてください — プロンプトの例",
           "1f608e7d60": "プロンプトのコピーに失敗しました。",
@@ -13799,7 +13808,7 @@
           "69af7e9c1c": "はまだ PATH 上にありません。 Orca はこれをデフォルトとして設定し、いつでもインストールできます。",
           "1eee1c7bd8": "PATH 上に Agent が検出されませんでした。後でインストールするものを選択するか、空のターミナルを使用して続行します。",
           "hideAgents": "Agent を非表示にする",
-          "showMoreAgents": "{{value0}} 件の Agent をさらに表示→",
+          "showMoreAgents": "{{value0}} 件の Agent をさらに表示 →",
           "yoloModeLabel": "Yolo モード",
           "yoloPermissionsDescription": "Agent は確認なしでコマンドを実行しファイルを編集します。一部はサンドボックスも回避します。信頼できるプロジェクトでのみ使用してください。"
         },
@@ -13960,10 +13969,10 @@
         "workspace": {
           "SmartWorkspaceNameField": {
             "2a0d535f69": "新規ブランチを作成する",
-            "a44229ce4d": "ワークスペース名として",
+            "a44229ce4d": "を使用",
             "766083a596": "」",
-            "34ca97bce3": "」",
-            "b1a7d679ba": "使用",
+            "34ca97bce3": "「",
+            "b1a7d679ba": "ワークスペース名として",
             "e57c53727c": "プロジェクトを追加…",
             "a76fcb4fa0": "切り替え先",
             "eadf877af5": "保持",
@@ -16016,6 +16025,7 @@
             "effd75e330": "近くのコンテキスト",
             "7d1480fbf1": "HTML",
             "9098b118ab": "ページ",
+            "accessibleNameOpenQuote": "「",
             "eb98a0971a": "」",
             "d053db279d": "役割=",
             "a759d8f866": "選択した要素",
@@ -16699,11 +16709,17 @@
             "permission": "要対応"
           },
           "filtersSection": "フィルター",
-          "viewSection": "表示"
+          "viewSection": "表示",
+          "threadListOptionsActive": "スレッドリストのオプション（{{value0}} 件アクティブ）",
+          "activityOptionsActive": "アクティビティのオプション（{{value0}}）"
         },
         "ActivityScopeFilterControls": {
           "resetScope": "すべてのホストとプロジェクトを表示",
-          "hiddenCount": "{{value0}} 非表示"
+          "hiddenCount": "{{value0}} 非表示",
+          "hideAutomationCreated": "自動化で作成されたワークスペースを非表示",
+          "hideCliCreated": "CLI が作成したものを非表示",
+          "hideOtherClientsAria": "共有リモートサーバー上の他の Orca クライアントで作成されたワークスペース内の Agent を非表示",
+          "hideOtherClients": "他のクライアントの Agent を非表示"
         },
         "ActivityThreadRow": {
           "clearNotification": "通知を消去"
@@ -16728,6 +16744,25 @@
           "workspace": "ワークスペース",
           "copyPath": "パスをコピーする",
           "jumpToWorkspace": "ワークスペースにジャンプ"
+        },
+        "ActivityThreadContextMenu": {
+          "copyTitle": "タイトルをコピー",
+          "copyPath": "パスのコピー",
+          "open": "オープン",
+          "markRead": "既読マークを付ける",
+          "markUnread": "未読としてマークする",
+          "goToWorkspace": "ワークスペースへ移動",
+          "clear": "リストから消去",
+          "agentSection": "Agent",
+          "markManyRead_one": "{{count}} 件の Agent に既読マークを付ける",
+          "markManyRead_other": "{{count}} 件の Agent に既読マークを付ける",
+          "markManyUnread_one": "{{count}} 件の Agent を未読としてマークする",
+          "markManyUnread_other": "{{count}} 件の Agent を未読としてマークする",
+          "clearMany_one": "{{count}} 件の Agent をリストから消去",
+          "clearMany_other": "{{count}} 件の Agent をリストから消去",
+          "markManyRead": "{{count}} 件の Agent に既読マークを付ける",
+          "markManyUnread": "{{count}} 件の Agent を未読としてマークする",
+          "clearMany": "{{count}} 件の Agent をリストから消去"
         }
       },
       "confirmation": {
@@ -17107,6 +17142,7 @@
           "tool": {
             "arrow": "矢印",
             "ellipse": "楕円",
+            "eraser": "消しゴム",
             "highlight": "ハイライト",
             "pen": "ペン",
             "rect": "四角形",
@@ -17646,6 +17682,13 @@
         "localAttachmentUnsupported": "ローカル添付ファイルはリモートセッションでは使用できません。",
         "removeAttachment": "添付ファイルを削除する",
         "pastedImageLabel": "貼り付けた画像",
+        "draftNotSaved": "この下書きはまだ保存できていません。Orca は保存を再試行し続けます。",
+        "imageNotBroughtBack": "{{name}} をこの下書きと一緒に復元できませんでした。もう一度添付するか、削除してください。",
+        "pastedImageNotBroughtBack": "この貼り付けた画像をこの下書きと一緒に復元できませんでした。削除して、必要であればもう一度貼り付けてください。",
+        "removeImageToSend": "復元できなかった画像があります。送信するには削除してください。",
+        "removeImagesToSend": "復元できなかった画像があります。送信するには削除してください。",
+        "imageAttachAgainLabel": "もう一度添付",
+        "pastedImageNotKeptLabel": "保持されていません",
         "imagePasteFailed": "画像の貼り付けに失敗しました。",
         "worktreeNotReady": "ワークツリーが準備できていません — しばらくしてから再試行してください。",
         "pasteUnavailable": "貼り付けできません — このチャットは現在入力を受け付けていません。",
@@ -18277,6 +18320,16 @@
         "workspaceReadyToast": "ワークスペース {{name}} の準備ができました",
         "goToWorktree": "ワークツリーに移動",
         "goToWorkspace": "ワークスペースに移動"
+      },
+      "delete": {
+        "changes": {
+          "permanentLoss": "Git ワークスペース内のコミットされていない変更または未追跡の変更は完全に削除されます。",
+          "clean": "コミットされていない変更または未追跡の変更はありません",
+          "unavailable": "変更を確認できませんでした",
+          "checking": "変更を確認中…",
+          "checkingDetails": "確認中…",
+          "unavailableDetails": "詳細を利用できません"
+        }
       }
     },
     "agentSessionContinuation": {
@@ -18359,6 +18412,11 @@
     },
     "agentChildRow": {
       "ended": "終了"
+    },
+    "jiraIssueAssigneeField": {
+      "label": "担当者",
+      "automatic": "自動",
+      "assignToMe": "自分に割り当てる（{{name}}）"
     }
   },
   "dashboardPopout": {
@@ -18966,5 +19024,54 @@
   },
   "fileSearch": {
     "failed": "検索失敗。もう一度お試しください"
+  },
+  "csv": {
+    "detectingDelimiter": "デリミタを検出中…",
+    "indexProgress": "CSV をインデックス作成中… {{percent}}%",
+    "loadingCell": "読み込み中…",
+    "nextRows": "次の行",
+    "previousRows": "前の行",
+    "readOnlyPreview": "大きなファイルのプレビュー · 読み取り専用",
+    "resizeColumn": "列 {{column}} のサイズを変更",
+    "rowWindow": "行 {{first}}–{{last}}",
+    "editor": "CSV エディター",
+    "editCell": "行 {{row}}、列 {{column}} を編集",
+    "filterRows": "行を絞り込む",
+    "edit": "セルを編集",
+    "copy": "コピー",
+    "paste": "貼り付け",
+    "rows": "行",
+    "insertRowAbove": "上に行を挿入",
+    "insertRowBelow": "下に行を挿入",
+    "deleteRows": "選択した行を削除",
+    "columns": "列",
+    "newColumn": "列 {{column}}",
+    "insertColumnBefore": "前に列を挿入",
+    "insertColumnAfter": "後に列を挿入",
+    "moveColumnLeft": "列を左に移動",
+    "moveColumnRight": "列を右に移動",
+    "deleteColumns": "選択した列を削除",
+    "sort": "並べ替え",
+    "sortAscending": "選択した列を昇順に並べ替え",
+    "sortDescending": "選択した列を降順に並べ替え",
+    "originalOrder": "元の行順",
+    "save": "保存",
+    "inspectionOnly": "検査のみ · ファイルの行順は変更されません"
+  },
+  "worktree": {
+    "nestedRemoval": {
+      "refreshFailed": "ワークスペースリストを更新できませんでした",
+      "review": "ネストされたワークツリーと共に削除…",
+      "title": "ワークスペースとネストされたワークツリーを削除しますか？",
+      "description": "これにより「{{name}}」、以下に表示されるすべてのネストされたワークツリー、およびそれら内のすべてのファイル（コミットされていない変更を含む）が完全に削除されます。それらのターミナルと Agent は停止されます。",
+      "detached": "分離 HEAD",
+      "loading": "ネストされたワークツリーを確認中…",
+      "order": "ネストされたワークツリーが先に削除されます。1つでも失敗すると削除は停止し、親は保持されます。ブランチは既存の削除設定に従います。",
+      "cancel": "キャンセル",
+      "retry": "再確認",
+      "deleting": "削除中…",
+      "confirm": "一覧表示されたすべてのワークツリーを削除",
+      "preservedBranches": "一部のネストされたワークツリーブランチは保持されました"
+    }
   }
 }
diff --git a/src/renderer/src/i18n/locales/ko.json b/src/renderer/src/i18n/locales/ko.json
index 3fca8db41b2..d37069b0d4a 100644
--- a/src/renderer/src/i18n/locales/ko.json
+++ b/src/renderer/src/i18n/locales/ko.json
@@ -4010,6 +4010,15 @@
             "resumingAriaOne": "채팅 1개 재개 중. 자세히 보려면 클릭하세요.",
             "resumingAria": "채팅 {{value0}}개 재개 중. 자세히 보려면 클릭하세요.",
             "resumingTooltip": "중단된 채팅을 복원하고 계속하도록 요청하는 중…"
+          },
+          "provider": {
+            "extra": {
+              "usage": {
+                "section": {
+                  "135d51c19f": "한도 {{value0}}"
+                }
+              }
+            }
           }
         }
       },
@@ -6439,8 +6448,8 @@
           "96f3649526": "Gemini CLI 자격 증명 사용(실험적)",
           "d676c41fc6": "Google 인증을 위해 로컬 Gemini CLI 설치에서 OAuth 자격 증명을 추출합니다. 이는 Orca가 아닌 Gemini CLI 앱에 발급된 자격 증명을 사용합니다. Google이 CLI를 업데이트하면 중단될 수 있습니다. 자신의 책임하에 사용하십시오.",
           "0c7f915b01": "Gemini CLI 자격 증명 사용",
-          "973741a871": "Gemini 공급자 설정을 구성합니다.",
-          "0c64dc2a64": "Gemini",
+          "973741a871": "기존 Gemini CLI 세션은 계속 사용할 수 있습니다. Gemini 자격 증명으로는 Antigravity에 로그인되지 않습니다.",
+          "0c64dc2a64": "Gemini CLI (레거시)",
           "db209ee572": "제거",
           "8a0f870153": "재인증",
           "3d245ef7d9": "Codex에서 이 로그인이 오래되었다고 보고했습니다.",
@@ -7119,8 +7128,8 @@
             "shellEnvCopy": "Codex 및 Claude 채팅은 터미널과 마찬가지로 로그인 셸이 내보내는 모든 변수를 가지고 시작합니다. 끄면 전달할 변수를 선택할 수 있습니다.",
             "shellEnvToggleLabel": "셸 환경 사용 전환",
             "structuredTitle": "업데이트된 구조화된 기본 채팅 사용",
-            "structuredCopy": "새 Codex 및 Claude 에이전트를 구조화된 채팅으로 엽니다. 끄면 터미널 지원 채팅으로 엽니다. 이미 있는 채팅은 그대로 유지됩니다.",
-            "structuredScope": "이 컴퓨터와 이를 지원하는 버전을 실행하는 페어링된 Orca 서버에서 실행됩니다. 이전 서버는 터미널 채팅을 유지합니다. WSL 및 SSH 호스트는 계속해서 터미널 채팅을 사용하며 Orca가 프로세스 시작 시간을 읽을 수 없으면 Windows는 이 채팅을 사용합니다.",
+            "structuredCopy": "새 Codex 및 Claude 에이전트를 구조화된 채팅으로 엽니다. 끄면 터미널 기반 채팅으로 엽니다. 이미 있는 채팅은 그대로 유지됩니다.",
+            "structuredScope": "이 컴퓨터와 이를 지원하는 버전을 실행하는 페어링된 Orca 서버에서 실행됩니다. 이전 서버는 터미널 채팅을 유지합니다. WSL 및 SSH 호스트는 계속해서 터미널 채팅을 사용하며 Orca가 프로세스 시작 시간을 읽을 수 없으면 Windows는 터미널 채팅으로 대체됩니다.",
             "structuredToggleLabel": "업데이트된 구조화된 기본 채팅 전환",
             "resumeTitle": "다시 시작한 후 작업 중인 채팅을 자동으로 재개합니다.",
             "resumeCopy": "Orca가 종료되거나 업데이트를 설치하면 Orca가 다시 열릴 때 작업 중이던 채팅이 자동으로 재개됩니다.",
@@ -7164,7 +7173,7 @@
           "80c454e8a6": "이를 공급자의 캐시 TTL과 일치시킵니다."
         },
         "GeneralEditorSettingsSection": {
-          "f80603d293": "모든 markdown 보기에서 markdown 메모 컨트롤을 표시하고 agent 전달 작업에 해당 메모를 포함합니다.",
+          "f80603d293": "모든 markdown 보기에서 markdown 메모 컨트롤을 표시하고 에이전트 전달 작업에 해당 메모를 포함합니다.",
           "4edc104f0f": "Markdown 리뷰 노트",
           "5f02e6fb21": "markdown 파일에서 로컬 markdown 리뷰 노트 컨트롤을 표시합니다.",
           "51161d1647": "파일을 편집할 때 미니맵 개요를 표시합니다.",
@@ -16016,6 +16025,7 @@
             "effd75e330": "주변 컨텍스트",
             "7d1480fbf1": "HTML",
             "9098b118ab": "페이지",
+            "accessibleNameOpenQuote": "\"",
             "eb98a0971a": "\"",
             "d053db279d": "역할=",
             "a759d8f866": "선택된 요소",
@@ -16699,11 +16709,17 @@
             "permission": "주의 필요"
           },
           "filtersSection": "필터",
-          "viewSection": "보기"
+          "viewSection": "보기",
+          "threadListOptionsActive": "스레드 목록 옵션 ({{value0}} 활성)",
+          "activityOptionsActive": "활동 옵션 ({{value0}})"
         },
         "ActivityScopeFilterControls": {
           "resetScope": "모든 호스트 및 프로젝트 표시",
-          "hiddenCount": "{{value0}} 숨김"
+          "hiddenCount": "{{value0}} 숨김",
+          "hideAutomationCreated": "자동화로 생성된 워크스페이스 숨기기",
+          "hideCliCreated": "CLI로 생성된 워크스페이스 숨기기",
+          "hideOtherClientsAria": "공유 원격 서버에서 다른 Orca 클라이언트로 만든 워크스페이스의 에이전트 숨기기",
+          "hideOtherClients": "다른 클라이언트 에이전트 숨기기"
         },
         "ActivityThreadRow": {
           "clearNotification": "알림 지우기"
@@ -16728,6 +16744,25 @@
           "workspace": "워크스페이스",
           "copyPath": "경로 복사",
           "jumpToWorkspace": "워크스페이스로 이동"
+        },
+        "ActivityThreadContextMenu": {
+          "copyTitle": "제목 복사",
+          "copyPath": "경로 복사",
+          "open": "열기",
+          "markRead": "읽음으로 표시",
+          "markUnread": "읽지 않은 것으로 표시",
+          "goToWorkspace": "워크스페이스로 이동",
+          "clear": "목록에서 지우기",
+          "agentSection": "에이전트",
+          "markManyRead_one": "에이전트 {{count}}개 읽음으로 표시",
+          "markManyRead_other": "에이전트 {{count}}개 읽음으로 표시",
+          "markManyUnread_one": "에이전트 {{count}}개 읽지 않은 것으로 표시",
+          "markManyUnread_other": "에이전트 {{count}}개 읽지 않은 것으로 표시",
+          "clearMany_one": "목록에서 에이전트 {{count}}개 지우기",
+          "clearMany_other": "목록에서 에이전트 {{count}}개 지우기",
+          "markManyRead": "에이전트 {{count}}개 읽음으로 표시",
+          "markManyUnread": "에이전트 {{count}}개 읽지 않은 것으로 표시",
+          "clearMany": "목록에서 에이전트 {{count}}개 지우기"
         }
       },
       "confirmation": {
@@ -17107,6 +17142,7 @@
           "tool": {
             "arrow": "화살표",
             "ellipse": "타원",
+            "eraser": "지우개",
             "highlight": "형광펜",
             "pen": "펜",
             "rect": "사각형",
@@ -17646,6 +17682,13 @@
         "localAttachmentUnsupported": "원격 세션에는 로컬 첨부 파일을 사용할 수 없습니다.",
         "removeAttachment": "첨부파일 삭제",
         "pastedImageLabel": "붙여넣은 이미지",
+        "draftNotSaved": "이 초안을 아직 저장하지 못했습니다. Orca가 계속 다시 시도합니다.",
+        "imageNotBroughtBack": "{{name}}을(를) 이 초안과 함께 복원하지 못했습니다. 다시 첨부하거나 제거하세요.",
+        "pastedImageNotBroughtBack": "이 붙여넣은 이미지를 이 초안과 함께 복원하지 못했습니다. 제거한 후 필요하면 다시 붙여넣으세요.",
+        "removeImageToSend": "복원하지 못한 이미지가 있습니다. 보내려면 제거하세요.",
+        "removeImagesToSend": "복원하지 못한 이미지가 있습니다. 보내려면 제거하세요.",
+        "imageAttachAgainLabel": "다시 첨부",
+        "pastedImageNotKeptLabel": "보존되지 않음",
         "imagePasteFailed": "이미지 붙여넣기 실패.",
         "worktreeNotReady": "워크트리가 준비되지 않았습니다 — 잠시 후 다시 시도하세요.",
         "pasteUnavailable": "붙여넣을 수 없습니다 — 이 채팅은 지금 입력을 받을 수 없습니다.",
@@ -18277,6 +18320,16 @@
         "workspaceReadyToast": "워크스페이스 {{name}} 준비 완료",
         "goToWorktree": "작업 트리로 이동",
         "goToWorkspace": "워크스페이스로 이동"
+      },
+      "delete": {
+        "changes": {
+          "permanentLoss": "Git 워크스페이스의 커밋되지 않은 변경 사항이나 추적되지 않은 변경 사항은 영구적으로 삭제됩니다.",
+          "clean": "커밋되지 않았거나 추적되지 않은 변경 사항 없음",
+          "unavailable": "변경 사항을 확인할 수 없습니다",
+          "checking": "변경 사항 확인 중…",
+          "checkingDetails": "확인 중…",
+          "unavailableDetails": "세부 정보를 사용할 수 없음"
+        }
       }
     },
     "agentSessionContinuation": {
@@ -18359,6 +18412,11 @@
     },
     "agentChildRow": {
       "ended": "종료됨"
+    },
+    "jiraIssueAssigneeField": {
+      "label": "담당자",
+      "automatic": "자동",
+      "assignToMe": "나에게 할당 ({{name}})"
     }
   },
   "dashboardPopout": {
@@ -18966,5 +19024,54 @@
   },
   "fileSearch": {
     "failed": "검색에 실패했습니다. 다시 시도하세요."
+  },
+  "csv": {
+    "detectingDelimiter": "분리자 감지 중…",
+    "indexProgress": "CSV 인덱싱 중… {{percent}}%",
+    "loadingCell": "로드 중…",
+    "nextRows": "다음 행",
+    "previousRows": "이전 행",
+    "readOnlyPreview": "대용량 파일 미리보기 · 읽기 전용",
+    "resizeColumn": "열 {{column}} 크기 조정",
+    "rowWindow": "행 {{first}}–{{last}}",
+    "editor": "CSV 편집기",
+    "editCell": "행 {{row}}, 열 {{column}} 편집",
+    "filterRows": "행 필터",
+    "edit": "셀 편집",
+    "copy": "복사",
+    "paste": "붙여넣기",
+    "rows": "행",
+    "insertRowAbove": "위에 행 삽입",
+    "insertRowBelow": "아래에 행 삽입",
+    "deleteRows": "선택한 행 삭제",
+    "columns": "열",
+    "newColumn": "열 {{column}}",
+    "insertColumnBefore": "앞에 열 삽입",
+    "insertColumnAfter": "뒤에 열 삽입",
+    "moveColumnLeft": "열 왼쪽으로 이동",
+    "moveColumnRight": "열 오른쪽으로 이동",
+    "deleteColumns": "선택한 열 삭제",
+    "sort": "정렬",
+    "sortAscending": "선택한 열을 오름차순으로 정렬",
+    "sortDescending": "선택한 열을 내림차순으로 정렬",
+    "originalOrder": "원래 행 순서",
+    "save": "저장",
+    "inspectionOnly": "검사 전용 · 파일 행 순서 변경 없음"
+  },
+  "worktree": {
+    "nestedRemoval": {
+      "refreshFailed": "워크스페이스 목록을 새로고침하지 못했습니다",
+      "review": "중첩 워크트리와 함께 삭제…",
+      "title": "워크스페이스와 중첩 워크트리를 삭제할까요?",
+      "description": "\"{{name}}\", 아래에 나열된 모든 중첩 워크트리, 그리고 커밋되지 않은 변경 사항을 포함한 그 안의 모든 파일이 영구적으로 삭제됩니다. 해당 터미널과 에이전트는 중지됩니다.",
+      "detached": "분리된 HEAD",
+      "loading": "중첩 워크트리 확인 중…",
+      "order": "중첩 워크트리가 먼저 삭제됩니다. 하나가 실패하면 삭제가 중단되고 상위 워크트리는 유지됩니다. 브랜치는 기존 삭제 설정을 따릅니다.",
+      "cancel": "취소",
+      "retry": "다시 검토",
+      "deleting": "삭제 중…",
+      "confirm": "나열된 모든 워크트리 삭제",
+      "preservedBranches": "일부 중첩 워크트리 브랜치가 유지되었습니다"
+    }
   }
 }
diff --git a/src/renderer/src/i18n/locales/zh.json b/src/renderer/src/i18n/locales/zh.json
index c75d784f90f..f281c9fc6ce 100644
--- a/src/renderer/src/i18n/locales/zh.json
+++ b/src/renderer/src/i18n/locales/zh.json
@@ -4010,6 +4010,15 @@
             "resumingAriaOne": "正在恢复 1 个聊天。点击查看详情。",
             "resumingAria": "正在恢复 {{value0}} 个聊天。点击查看详情。",
             "resumingTooltip": "正在恢复中断的聊天并请它们继续…"
+          },
+          "provider": {
+            "extra": {
+              "usage": {
+                "section": {
+                  "135d51c19f": "限额 {{value0}}"
+                }
+              }
+            }
           }
         }
       },
@@ -6439,8 +6448,8 @@
           "96f3649526": "使用 Gemini CLI 凭据（实验）",
           "d676c41fc6": "从本地 Gemini CLI 安装中提取 OAuth 凭据以通过 Google 认证。这将使用颁发给 Gemini CLI 应用的凭据，而非 Orca。若 Google 更新 CLI，可能会失效。请自行承担风险。",
           "0c7f915b01": "使用 Gemini CLI 凭据",
-          "973741a871": "配置 Gemini 提供商设置。",
-          "0c64dc2a64": "Gemini",
+          "973741a871": "保留现有的 Gemini CLI 会话可用。Gemini 凭据不会让您登录 Antigravity。",
+          "0c64dc2a64": "Gemini CLI（旧版）",
           "db209ee572": "移除",
           "8a0f870153": "重新验证",
           "3d245ef7d9": "Codex 报告此登录已过时",
@@ -6858,7 +6867,7 @@
           "1199258ace": "复制",
           "1188e56af4": "复制示例提示",
           "b84807f228": "”",
-          "59722f31b4": "”",
+          "59722f31b4": "“",
           "c5325e91f6": "将其中任何内容粘贴到 Claude Code、Codex 或安装该技能的项目中的其他智能体中。",
           "2a180694f7": "尝试一下 - 示例提示",
           "5ec620ccc4": "复制失败。",
@@ -7119,7 +7128,7 @@
             "shellEnvCopy": "Codex 和 Claude 聊天启动时会带上登录 shell 导出的所有变量，与终端一致。关闭后可选择传递哪些变量。",
             "shellEnvToggleLabel": "切换使用 shell 环境",
             "structuredTitle": "使用更新的结构化本机聊天",
-            "structuredCopy": "将新的 Codex 和 Claude 代理作为结构化聊天打开。关闭时会在终端支持的聊天中打开。已有的聊天保持不变。",
+            "structuredCopy": "将新的 Codex 和 Claude 代理作为结构化聊天打开。关闭时会在基于终端的聊天中打开。已有的聊天保持不变。",
             "structuredScope": "在本机和运行支持该功能版本的已配对 Orca 服务器上运行；较旧的服务器保留终端聊天。WSL 和 SSH 主机继续使用终端聊天，Windows 会回退到它，除非 Orca 可以读取进程启动时间。",
             "structuredToggleLabel": "切换更新的结构化本机聊天",
             "resumeTitle": "重启后自动恢复工作聊天",
@@ -7164,7 +7173,7 @@
           "80c454e8a6": "将此与您的提供商的缓存 TTL 相匹配。"
         },
         "GeneralEditorSettingsSection": {
-          "f80603d293": "在所有 Markdown 视图中显示 Markdown 注释控件，并在智能体切换操作中包含这些注释。",
+          "f80603d293": "在所有 Markdown 视图中显示 Markdown 笔记控件，并在代理交接操作中包含这些笔记。",
           "4edc104f0f": "Markdown 评审笔记",
           "5f02e6fb21": "在 Markdown 文件中显示本地 Markdown 评审笔记控件。",
           "51161d1647": "编辑文件时显示小地图概述。",
@@ -7521,7 +7530,7 @@
           "edf13dd03b": "复制",
           "c12b253997": "复制示例提示",
           "d151e25078": "”",
-          "b525ff2b12": "”",
+          "b525ff2b12": "“",
           "4daa95f25a": "将其中任何内容粘贴到安装了 Orca CLI 技能的项目中的 Claude Code、Codex 或其他智能体中。",
           "0820b3f84f": "尝试一下 - 示例提示",
           "1f608e7d60": "复制提示失败。",
@@ -13799,7 +13808,7 @@
           "69af7e9c1c": "尚未加入 PATH。Orca 会将其设为默认，你可随时安装。",
           "1eee1c7bd8": "PATH 中未检测到智能体。可选择一个稍后安装，或使用空白终端继续。",
           "hideAgents": "隐藏智能体",
-          "showMoreAgents": "显示另外 {{value0}} 个智能体→",
+          "showMoreAgents": "显示另外 {{value0}} 个代理 →",
           "yoloModeLabel": "Yolo 模式",
           "yoloPermissionsDescription": "智能体会在不询问的情况下运行命令和编辑文件，部分智能体还会绕过沙箱。仅在你信任的项目中使用。"
         },
@@ -13962,7 +13971,7 @@
             "2a0d535f69": "创建新分支",
             "a44229ce4d": "作为工作区名称",
             "766083a596": "”",
-            "34ca97bce3": "”",
+            "34ca97bce3": "“",
             "b1a7d679ba": "使用",
             "e57c53727c": "添加项目...",
             "a76fcb4fa0": "切换到",
@@ -16016,6 +16025,7 @@
             "effd75e330": "附近的环境",
             "7d1480fbf1": "超文本标记语言",
             "9098b118ab": "页",
+            "accessibleNameOpenQuote": "“",
             "eb98a0971a": "”",
             "d053db279d": "角色=",
             "a759d8f866": "选定的元素",
@@ -16699,11 +16709,17 @@
             "permission": "需注意"
           },
           "filtersSection": "筛选",
-          "viewSection": "视图"
+          "viewSection": "视图",
+          "threadListOptionsActive": "线程列表选项（{{value0}} 个生效）",
+          "activityOptionsActive": "活动选项（{{value0}}）"
         },
         "ActivityScopeFilterControls": {
           "resetScope": "显示所有主机和项目",
-          "hiddenCount": "{{value0}} 隐藏"
+          "hiddenCount": "{{value0}} 隐藏",
+          "hideAutomationCreated": "隐藏自动化创建的工作区",
+          "hideCliCreated": "隐藏 CLI 创建的工作区",
+          "hideOtherClientsAria": "隐藏共享远程服务器上由其他 Orca 客户端创建的工作区中的代理",
+          "hideOtherClients": "隐藏其他客户端的代理"
         },
         "ActivityThreadRow": {
           "clearNotification": "清除通知"
@@ -16728,6 +16744,25 @@
           "workspace": "工作区",
           "copyPath": "复制路径",
           "jumpToWorkspace": "跳转到工作区"
+        },
+        "ActivityThreadContextMenu": {
+          "copyTitle": "复制标题",
+          "copyPath": "复制路径",
+          "open": "打开",
+          "markRead": "标记为已读",
+          "markUnread": "标记为未读",
+          "goToWorkspace": "转到工作区",
+          "clear": "从列表中清除",
+          "agentSection": "代理",
+          "markManyRead_one": "将 {{count}} 个代理标记为已读",
+          "markManyRead_other": "将 {{count}} 个代理标记为已读",
+          "markManyUnread_one": "将 {{count}} 个代理标记为未读",
+          "markManyUnread_other": "将 {{count}} 个代理标记为未读",
+          "clearMany_one": "从列表中清除 {{count}} 个代理",
+          "clearMany_other": "从列表中清除 {{count}} 个代理",
+          "markManyRead": "将 {{count}} 个代理标记为已读",
+          "markManyUnread": "将 {{count}} 个代理标记为未读",
+          "clearMany": "从列表中清除 {{count}} 个代理"
         }
       },
       "confirmation": {
@@ -17107,6 +17142,7 @@
           "tool": {
             "arrow": "箭头",
             "ellipse": "椭圆",
+            "eraser": "橡皮擦",
             "highlight": "高亮",
             "pen": "画笔",
             "rect": "矩形",
@@ -17611,6 +17647,13 @@
         "localAttachmentUnsupported": "远程会话不支持本地附件。",
         "removeAttachment": "移除附件",
         "pastedImageLabel": "粘贴的图片",
+        "draftNotSaved": "此草稿尚未保存成功。Orca 会继续尝试。",
+        "imageNotBroughtBack": "无法随此草稿恢复 {{name}}。请重新附加或将其移除。",
+        "pastedImageNotBroughtBack": "无法随此草稿恢复这张粘贴的图片。请将其移除，如仍需要请重新粘贴。",
+        "removeImageToSend": "有一张图片无法恢复。请将其移除后再发送。",
+        "removeImagesToSend": "有些图片无法恢复。请将其移除后再发送。",
+        "imageAttachAgainLabel": "重新附加",
+        "pastedImageNotKeptLabel": "未保留",
         "imagePasteFailed": "图片粘贴失败。",
         "worktreeNotReady": "工作树未就绪 — 请稍后重试。",
         "pasteUnavailable": "无法粘贴 — 此聊天当前不接受输入。",
@@ -18242,6 +18285,16 @@
         "workspaceReadyToast": "工作区 {{name}} 已就绪",
         "goToWorktree": "转到工作树",
         "goToWorkspace": "转到工作区"
+      },
+      "delete": {
+        "changes": {
+          "permanentLoss": "Git 工作区中任何未提交或未跟踪的更改都将被永久删除。",
+          "clean": "没有未提交或未跟踪的更改",
+          "unavailable": "无法检查更改",
+          "checking": "正在检查更改…",
+          "checkingDetails": "检查…",
+          "unavailableDetails": "详细信息不可用"
+        }
       }
     },
     "agentSessionContinuation": {
@@ -18359,6 +18412,11 @@
     },
     "agentChildRow": {
       "ended": "已结束"
+    },
+    "jiraIssueAssigneeField": {
+      "label": "负责人",
+      "automatic": "自动",
+      "assignToMe": "分配给我（{{name}}）"
     }
   },
   "dashboardPopout": {
@@ -18966,5 +19024,54 @@
   },
   "fileSearch": {
     "failed": "搜索失败。再试一次。"
+  },
+  "csv": {
+    "detectingDelimiter": "正在检测分隔符…",
+    "indexProgress": "正在为 CSV 建立索引… {{percent}}%",
+    "loadingCell": "加载中…",
+    "nextRows": "下一批行",
+    "previousRows": "上一批行",
+    "readOnlyPreview": "大文件预览 · 只读",
+    "resizeColumn": "调整列 {{column}} 的大小",
+    "rowWindow": "行 {{first}}–{{last}}",
+    "editor": "CSV 编辑器",
+    "editCell": "编辑第 {{row}} 行，第 {{column}} 列",
+    "filterRows": "筛选行",
+    "edit": "编辑单元格",
+    "copy": "复制",
+    "paste": "粘贴",
+    "rows": "行",
+    "insertRowAbove": "在上方插入行",
+    "insertRowBelow": "在下方插入行",
+    "deleteRows": "删除选中的行",
+    "columns": "列",
+    "newColumn": "第 {{column}} 列",
+    "insertColumnBefore": "在左侧插入列",
+    "insertColumnAfter": "在右侧插入列",
+    "moveColumnLeft": "向左移动列",
+    "moveColumnRight": "向右移动列",
+    "deleteColumns": "删除选中的列",
+    "sort": "排序",
+    "sortAscending": "对选中的列升序排序",
+    "sortDescending": "对选中的列降序排序",
+    "originalOrder": "原始行顺序",
+    "save": "保存",
+    "inspectionOnly": "仅查看 · 文件行顺序不变"
+  },
+  "worktree": {
+    "nestedRemoval": {
+      "refreshFailed": "无法刷新工作区列表",
+      "review": "连同嵌套工作树一起删除…",
+      "title": "删除工作区和嵌套工作树？",
+      "description": "这将永久删除“{{name}}”、下面列出的每个嵌套工作树及其中的所有文件（包括未提交的更改）。它们的终端和代理将被停止。",
+      "detached": "分离 HEAD",
+      "loading": "正在检查嵌套工作树…",
+      "order": "嵌套工作树会先被删除。如果其中一个失败，删除将停止并保留父工作树。分支遵循您现有的删除设置。",
+      "cancel": "取消",
+      "retry": "重新检查",
+      "deleting": "正在删除…",
+      "confirm": "删除所有列出的工作树",
+      "preservedBranches": "部分嵌套工作树分支已保留"
+    }
   }
 }
diff --git a/src/renderer/src/lib/ai-vault-resume-command.test.ts b/src/renderer/src/lib/ai-vault-resume-command.test.ts
index 048a4daf3ef..c8c04c68456 100644
--- a/src/renderer/src/lib/ai-vault-resume-command.test.ts
+++ b/src/renderer/src/lib/ai-vault-resume-command.test.ts
@@ -1,15 +1,20 @@
-import { describe, expect, it, vi } from 'vitest'
+import { afterEach, describe, expect, it, vi } from 'vitest'
 import type { AppState } from '@/store/types'
 import {
   getAiVaultAgentProviderSession,
   buildAiVaultResumeCopyCommandForWorktree,
   buildAiVaultResumeStartupForWorktree
 } from './ai-vault-resume-command'
+import { dropDeletedSshResumeCwd } from './ai-vault-session-resume-preparation'
 
 vi.mock('@/lib/new-workspace', () => ({
   CLIENT_PLATFORM: 'win32'
 }))
 
+afterEach(() => {
+  vi.unstubAllGlobals()
+})
+
 type RuntimePreference = { kind: 'windows-host' } | { kind: 'wsl'; distro: string }
 
 type AiVaultResumeCommandState = Pick<
@@ -303,7 +308,7 @@ describe('ai vault resume command runtime', () => {
         }
       })
     ).toBe(
-      "Remove-Item Env:CODEX_HOME -ErrorAction SilentlyContinue; Remove-Item Env:ORCA_CODEX_HOME -ErrorAction SilentlyContinue; Set-Location -LiteralPath 'C:\\Users\\alice\\repo'; codex 'resume' 'session one'"
+      "Remove-Item Env:CODEX_HOME -ErrorAction SilentlyContinue; Remove-Item Env:ORCA_CODEX_HOME -ErrorAction SilentlyContinue; Set-Location -LiteralPath 'C:\\Users\\alice\\repo'; codex '-c' 'tui.resume_cwd=current' 'resume' 'session one'"
     )
   })
 
@@ -324,7 +329,7 @@ describe('ai vault resume command runtime', () => {
         }
       })
     ).toBe(
-      'set "CODEX_HOME=" & set "ORCA_CODEX_HOME=" & cd /d "C:\\Users\\alice\\repo" && codex "resume" "session one"'
+      'set "CODEX_HOME=" & set "ORCA_CODEX_HOME=" & cd /d "C:\\Users\\alice\\repo" && codex "-c" "tui.resume_cwd=current" "resume" "session one"'
     )
   })
 
@@ -345,7 +350,7 @@ describe('ai vault resume command runtime', () => {
         }
       })
     ).toBe(
-      `cd '/home/alice/repo' && env -u CODEX_HOME -u ORCA_CODEX_HOME codex 'resume' 'session one'`
+      `cd '/home/alice/repo' && env -u CODEX_HOME -u ORCA_CODEX_HOME codex '-c' 'tui.resume_cwd=current' 'resume' 'session one'`
     )
   })
 
@@ -366,7 +371,7 @@ describe('ai vault resume command runtime', () => {
     })
 
     expect(command).toBe(
-      "cd '/home/alice/repo' && CODEX_HOME='/home/alice/custom-codex' codex 'resume' 'session one'"
+      "cd '/home/alice/repo' && CODEX_HOME='/home/alice/custom-codex' codex '-c' 'tui.resume_cwd=current' 'resume' 'session one'"
     )
     expect(command).not.toContain('unset CODEX_HOME')
   })
@@ -422,7 +427,9 @@ describe('ai vault resume command runtime', () => {
           codexHome: '\\\\wsl.localhost\\Ubuntu\\home\\alice\\.codex'
         }
       })
-    ).toBe("CODEX_HOME='/home/alice/.codex' codex 'resume' 'session one'")
+    ).toBe(
+      "CODEX_HOME='/home/alice/.codex' codex '-c' 'tui.resume_cwd=current' 'resume' 'session one'"
+    )
   })
 
   it('converts WSL UNC OMP transcript paths before building Linux resume commands', () => {
@@ -461,12 +468,43 @@ describe('ai vault resume command runtime', () => {
         }
       })
     ).toMatchObject({
-      command: "codex 'resume' 'session one'",
+      command: "codex '-c' 'tui.resume_cwd=current' 'resume' 'session one'",
       cwd: '/home/alice/repo',
       envToDelete: ['CODEX_HOME', 'ORCA_CODEX_HOME']
     })
   })
 
+  it('resumes an SSH session at the workspace root once the host reports its folder deleted', async () => {
+    const pathExists = vi.fn().mockResolvedValue(false)
+    vi.stubGlobal('window', { api: { fs: { pathExists } } })
+    const session = {
+      agent: 'codex' as const,
+      sessionId: 'session one',
+      cwd: '/home/alice/wt/feat-x',
+      codexHome: '/home/alice/.codex',
+      executionHostId: 'ssh:dev-box' as const,
+      executionHostPlatform: 'linux' as const,
+      resumeCommand:
+        "cd '/home/alice/wt/feat-x' && CODEX_HOME='/home/alice/.codex' codex resume 'session one'"
+    }
+
+    const startup = buildAiVaultResumeStartupForWorktree({
+      state: makeState({ worktreePath: '/home/alice/wt/main' }),
+      worktreeId: 'repo-1::worktree-1',
+      session: await dropDeletedSshResumeCwd(session)
+    })
+
+    // Why: typing `cd <deleted folder> && …` into the SSH shell stopped the agent, and Codex
+    // resumed at the root would still prompt with the deleted folder preselected (#17745).
+    expect(startup.command).not.toContain('feat-x')
+    expect(startup.command).toContain("'-c' 'tui.resume_cwd=current' 'resume'")
+    expect(startup.cwd).toBeUndefined()
+    expect(pathExists).toHaveBeenCalledWith({
+      filePath: '/home/alice/wt/feat-x',
+      connectionId: 'dev-box'
+    })
+  })
+
   it('rebuilds remote real-home Codex commands without a stored home assignment', () => {
     const state = makeState({ worktreePath: '/home/alice/repo' })
     state.repos = [{ id: 'repo-1', path: '/home/alice/repo', connectionId: 'ssh-1' }] as never
@@ -485,7 +523,7 @@ describe('ai vault resume command runtime', () => {
         }
       })
     ).toMatchObject({
-      command: "codex 'resume' 'session one'",
+      command: "codex '-c' 'tui.resume_cwd=current' 'resume' 'session one'",
       cwd: '/home/alice/repo',
       envToDelete: ['CODEX_HOME', 'ORCA_CODEX_HOME'],
       providerSession: { key: 'session_id', id: 'session one' }
@@ -510,7 +548,7 @@ describe('ai vault resume command runtime', () => {
           resumeCommand: "CODEX_HOME='/root/.codex' codex resume 'session one'"
         }
       })
-    ).toBe("codex 'resume' 'session one'")
+    ).toBe("codex '-c' 'tui.resume_cwd=current' 'resume' 'session one'")
   })
 
   it('copies remote real-home Codex commands with explicit environment cleanup', () => {
@@ -532,7 +570,7 @@ describe('ai vault resume command runtime', () => {
     })
 
     expect(command).toBe(
-      `cd '/home/alice/repo' && env -u CODEX_HOME -u ORCA_CODEX_HOME codex 'resume' 'session one'`
+      `cd '/home/alice/repo' && env -u CODEX_HOME -u ORCA_CODEX_HOME codex '-c' 'tui.resume_cwd=current' 'resume' 'session one'`
     )
     expect(command).not.toContain('/retired/shared-home')
   })
@@ -555,7 +593,7 @@ describe('ai vault resume command runtime', () => {
           resumeCommand: "CODEX_HOME='/root/.codex' codex resume 'session one'"
         }
       })
-    ).toBe("my-codex 'resume' 'session one'")
+    ).toBe("my-codex '-c' 'tui.resume_cwd=current' 'resume' 'session one'")
   })
 
   it('rebuilds overridden remote commands with the recorded remote host platform', () => {
@@ -581,7 +619,9 @@ describe('ai vault resume command runtime', () => {
             'cmd /d /s /c "cd /d ""C:/Users/alice/repo"" && set ""CODEX_HOME=C:/Users/alice/.codex"" && codex resume ""session one"""'
         }
       })
-    ).toBe("$env:CODEX_HOME='C:/Users/alice/.codex'; my-codex 'resume' 'session one'")
+    ).toBe(
+      "$env:CODEX_HOME='C:/Users/alice/.codex'; my-codex '-c' 'tui.resume_cwd=current' 'resume' 'session one'"
+    )
   })
 
   it('applies the user default args to local Copilot AI Vault resumes', () => {
@@ -639,6 +679,6 @@ describe('ai vault resume command runtime', () => {
           resumeCommand: "CODEX_HOME='/root/.codex' codex resume 'session one'"
         }
       })
-    ).toBe("codex 'resume' 'session one'")
+    ).toBe("codex '-c' 'tui.resume_cwd=current' 'resume' 'session one'")
   })
 })
diff --git a/src/renderer/src/lib/ai-vault-resume-command.ts b/src/renderer/src/lib/ai-vault-resume-command.ts
index 6e5b5ce86c4..f6192d31e99 100644
--- a/src/renderer/src/lib/ai-vault-resume-command.ts
+++ b/src/renderer/src/lib/ai-vault-resume-command.ts
@@ -33,7 +33,7 @@ import {
   resolveAiVaultResumeStartupShell
 } from '@/lib/ai-vault-resume-shell'
 
-type AiVaultResumeCommandSession = Pick<
+export type AiVaultResumeCommandSession = Pick<
   AiVaultSession,
   'agent' | 'sessionId' | 'cwd' | 'codexHome'
 > &
@@ -195,6 +195,7 @@ function buildAiVaultResumeForWorktree(
         args.state.settings?.agentDefaultArgs
       ),
       agentEnv: resolveTuiAgentLaunchEnv(args.session.agent, args.state.settings?.agentDefaultEnv),
+      resumeInLaunchCwd: true,
       ...(args.session.agent === 'omp' && resumeFilePath
         ? { ompResumeFilePath: resumeFilePath }
         : {})
diff --git a/src/renderer/src/lib/ai-vault-resume-shell.test.ts b/src/renderer/src/lib/ai-vault-resume-shell.test.ts
index bf2ba1151b5..f1538df180b 100644
--- a/src/renderer/src/lib/ai-vault-resume-shell.test.ts
+++ b/src/renderer/src/lib/ai-vault-resume-shell.test.ts
@@ -50,7 +50,7 @@ describe('copied real-home Codex resume command', () => {
         session
       })
     ).toBe(
-      `cd '/home/alice/repo' && env -u CODEX_HOME -u ORCA_CODEX_HOME codex 'resume' 'session one'`
+      `cd '/home/alice/repo' && env -u CODEX_HOME -u ORCA_CODEX_HOME codex '-c' 'tui.resume_cwd=current' 'resume' 'session one'`
     )
   })
 })
diff --git a/src/renderer/src/lib/ai-vault-session-resume-preparation.test.ts b/src/renderer/src/lib/ai-vault-session-resume-preparation.test.ts
index 53842d9b749..d3a9b9e5b6d 100644
--- a/src/renderer/src/lib/ai-vault-session-resume-preparation.test.ts
+++ b/src/renderer/src/lib/ai-vault-session-resume-preparation.test.ts
@@ -1,6 +1,9 @@
 import { afterEach, describe, expect, it, vi } from 'vitest'
 import type { AiVaultSession } from '../../../shared/ai-vault-types'
-import { prepareAiVaultSessionForResume } from './ai-vault-session-resume-preparation'
+import {
+  dropDeletedSshResumeCwd,
+  prepareAiVaultSessionForResume
+} from './ai-vault-session-resume-preparation'
 
 afterEach(() => {
   vi.unstubAllGlobals()
@@ -95,6 +98,49 @@ describe('prepareAiVaultSessionForResume', () => {
   })
 })
 
+describe('dropDeletedSshResumeCwd', () => {
+  it('leaves a live SSH session alone, scanner command and all', async () => {
+    const pathExists = vi.fn().mockResolvedValue(true)
+    vi.stubGlobal('window', { api: { fs: { pathExists } } })
+    const remote = session({ executionHostId: 'ssh:server-1', cwd: '/home/ada/wt/feat-x' })
+
+    // Why: dropping the cwd here would strand every ordinary remote resume at the workspace root.
+    await expect(dropDeletedSshResumeCwd(remote)).resolves.toBe(remote)
+    expect(pathExists).toHaveBeenCalledWith({
+      filePath: '/home/ada/wt/feat-x',
+      connectionId: 'server-1'
+    })
+  })
+
+  it('never probes a host for a local session', async () => {
+    const pathExists = vi.fn()
+    vi.stubGlobal('window', { api: { fs: { pathExists } } })
+    const local = session({ cwd: '/repo' })
+
+    await expect(dropDeletedSshResumeCwd(local)).resolves.toBe(local)
+    expect(pathExists).not.toHaveBeenCalled()
+  })
+
+  it('keeps the recorded folder when the SSH host cannot answer', async () => {
+    const pathExists = vi.fn().mockRejectedValue(new Error('CONNECTION_LOST'))
+    vi.stubGlobal('window', { api: { fs: { pathExists } } })
+    const remote = session({ executionHostId: 'ssh:server-1', cwd: '/home/ada/wt/feat-x' })
+
+    // Why: losing the host is not evidence the folder is gone (ssh-execution-boundary.md).
+    await expect(dropDeletedSshResumeCwd(remote)).resolves.toBe(remote)
+    expect(pathExists).toHaveBeenCalled()
+  })
+
+  it('keeps the recorded folder for an agent that can only resume there', async () => {
+    const pathExists = vi.fn().mockResolvedValue(false)
+    vi.stubGlobal('window', { api: { fs: { pathExists } } })
+    const kimi = session({ agent: 'kimi', executionHostId: 'ssh:server-1', cwd: '/home/ada/wt/x' })
+
+    // Why: kimi-cli 1.52 silently opens a new empty session with the same id from any other folder.
+    await expect(dropDeletedSshResumeCwd(kimi)).resolves.toBe(kimi)
+  })
+})
+
 function stubPreparation(prepareSessionResume: ReturnType<typeof vi.fn>): void {
   vi.stubGlobal('window', { api: { aiVault: { prepareSessionResume } } })
 }
diff --git a/src/renderer/src/lib/ai-vault-session-resume-preparation.ts b/src/renderer/src/lib/ai-vault-session-resume-preparation.ts
index da2514dd38a..5ce4500ee5e 100644
--- a/src/renderer/src/lib/ai-vault-session-resume-preparation.ts
+++ b/src/renderer/src/lib/ai-vault-session-resume-preparation.ts
@@ -3,7 +3,11 @@ import {
   isLegacySharedCodexHome,
   isPerAccountManagedCodexHome
 } from '../../../shared/ai-vault-resume-preparation'
-import { LOCAL_EXECUTION_HOST_ID } from '../../../shared/execution-host'
+import {
+  getSshTargetIdForExecutionHost,
+  LOCAL_EXECUTION_HOST_ID
+} from '../../../shared/execution-host'
+import type { AiVaultResumeCommandSession } from './ai-vault-resume-command'
 
 export async function prepareAiVaultSessionForResume(
   session: AiVaultSession
@@ -43,3 +47,31 @@ export function aiVaultSessionNeedsResumePreparation(
     (!session.executionHostId || session.executionHostId === LOCAL_EXECUTION_HOST_ID)
   )
 }
+
+// Why: these sessions are keyed by their folder. Elsewhere Kimi rejects the resume or (1.52+) opens
+// a new empty session under the same id, so the visible `cd` failure is the honest outcome.
+const RESUMES_ONLY_IN_RECORDED_CWD: ReadonlySet<AiVaultSession['agent']> = new Set(['kimi', 'muse'])
+
+/**
+ * Drops an SSH session's recorded folder once its host confirms the folder is gone, so the resume
+ * opens at the target workspace root, as local resumes already do (#17745). Also drops the
+ * scanner-built command, whose `cd` into that folder would stop the agent from starting.
+ */
+export async function dropDeletedSshResumeCwd(
+  session: AiVaultResumeCommandSession
+): Promise<AiVaultResumeCommandSession> {
+  const connectionId = getSshTargetIdForExecutionHost(session.executionHostId)
+  if (!connectionId || !session.cwd || RESUMES_ONLY_IN_RECORDED_CWD.has(session.agent)) {
+    return session
+  }
+  try {
+    if (await window.api.fs.pathExists({ filePath: session.cwd, connectionId })) {
+      return session
+    }
+  } catch {
+    // Why: only a definite ENOENT proves the folder is gone; losing the host proves nothing.
+    return session
+  }
+  const { resumeCommand: _scannerCommand, ...rest } = session
+  return { ...rest, cwd: null }
+}
diff --git a/src/renderer/src/lib/file-type-icon-extension-table.ts b/src/renderer/src/lib/file-type-icon-extension-table.ts
index 8ecd418ddb2..94774618a84 100644
--- a/src/renderer/src/lib/file-type-icon-extension-table.ts
+++ b/src/renderer/src/lib/file-type-icon-extension-table.ts
@@ -142,9 +142,12 @@ export const FILE_ICON_BY_EXTENSION: Record<string, LucideIcon> = {
   psd: FileImage,
   pub: FileKey,
   py: FileCode,
+  qmd: FileText,
   r: FileCode,
   rar: FileArchive,
   rb: FileCode,
+  rmarkdown: FileText,
+  rmd: FileText,
   rst: FileText,
   rs: FileCode,
   rtf: FileText,
diff --git a/src/renderer/src/lib/language-detect.test.ts b/src/renderer/src/lib/language-detect.test.ts
index b8cd6e45353..ec8a79ce80f 100644
--- a/src/renderer/src/lib/language-detect.test.ts
+++ b/src/renderer/src/lib/language-detect.test.ts
@@ -77,6 +77,14 @@ describe('detectLanguage', () => {
     expect(detectLanguage('api/v1/service.proto')).toBe('proto')
   })
 
+  it('maps Quarto and R Markdown files to the quarto language id', () => {
+    expect(detectLanguage('slides/talk.qmd')).toBe('quarto')
+    expect(detectLanguage('analysis/report.Rmd')).toBe('quarto')
+    expect(detectLanguage('/home/remote/report.rmarkdown')).toBe('quarto')
+    expect(detectLanguage('C:\\repo\\NOTES.QMD')).toBe('quarto')
+    expect(detectLanguage('README.md')).toBe('markdown')
+  })
+
   it('maps .jsonl files to the dedicated jsonl language id (case-insensitive)', () => {
     expect(detectLanguage('/home/user/.claude/sessions/transcript.jsonl')).toBe('jsonl')
     expect(detectLanguage('C:\\Users\\alice\\.codex\\LOG.JSONL')).toBe('jsonl')
diff --git a/src/renderer/src/lib/language-detect.ts b/src/renderer/src/lib/language-detect.ts
index b90b5a36ae2..a58c0e8e5c7 100644
--- a/src/renderer/src/lib/language-detect.ts
+++ b/src/renderer/src/lib/language-detect.ts
@@ -31,6 +31,11 @@ const EXT_TO_LANGUAGE: Record<string, string> = {
   '.ipynb': 'notebook',
   '.md': 'markdown',
   '.mdx': 'markdown',
+  // Why: Quarto/R Markdown are Markdown plus a YAML header and executable
+  // cells; the 'markdown' grammar leaves ```{r}/```{python} cells uncolored.
+  '.qmd': 'quarto',
+  '.rmd': 'quarto',
+  '.rmarkdown': 'quarto',
   '.mmd': 'mermaid',
   '.mermaid': 'mermaid',
   '.css': 'css',
diff --git a/src/renderer/src/lib/monaco-languages/register-quarto-adversarial.test.ts b/src/renderer/src/lib/monaco-languages/register-quarto-adversarial.test.ts
new file mode 100644
index 00000000000..c70f5bbe943
--- /dev/null
+++ b/src/renderer/src/lib/monaco-languages/register-quarto-adversarial.test.ts
@@ -0,0 +1,78 @@
+import { describe, expect, it } from 'vitest'
+import {
+  createMonarchTokenizer,
+  endEmbeddedLanguages,
+  measureNestedDepth,
+  tokenizeMonarchDocument,
+  tokenTypeAt
+} from './monarch-tokenizer-test-harness'
+import { EMBED_ENTRY_REST_OF_LINE_BUDGET } from './monarch-embed-entry-budget'
+import { QUARTO_LANGUAGE_ID, quartoMonarchLanguage } from './register-quarto'
+
+const FENCE = '```'
+
+function tokenize(source: string[]) {
+  return tokenizeMonarchDocument(QUARTO_LANGUAGE_ID, quartoMonarchLanguage, source.join('\n'))
+}
+
+describe('Quarto adversarial documents', () => {
+  it('bounds inherited Markdown script and style embed recursion', () => {
+    for (const tag of ['script', 'style']) {
+      const tokenizer = createMonarchTokenizer(QUARTO_LANGUAGE_ID, quartoMonarchLanguage)
+      const { error, maxNestedDepth } = measureNestedDepth(tokenizer, [
+        `<${tag}>x</${tag}>`.repeat(800)
+      ])
+      expect(error).toBeUndefined()
+      expect(maxNestedDepth).toBeLessThanOrEqual(EMBED_ENTRY_REST_OF_LINE_BUDGET)
+    }
+  })
+
+  it('preserves ordinary inline script and style highlighting', () => {
+    for (const tag of ['script', 'style']) {
+      const lines = tokenize([`<${tag}>x</${tag}>`, '# After'])
+      expect(lines[0].tokens.some((token) => token.language !== QUARTO_LANGUAGE_ID)).toBe(true)
+      expect(tokenTypeAt(lines[1], 0)).toBe('keyword')
+    }
+  })
+
+  it('does not treat front matter after a blank first line as YAML', () => {
+    expect(endEmbeddedLanguages(tokenize(['', '---', 'title: demo', '---']))).toEqual([
+      null,
+      null,
+      null,
+      null
+    ])
+  })
+
+  it('keeps malformed cell headers out of embedded languages', () => {
+    for (const header of ['{python', '{=}', '{}', '{{python}']) {
+      expect(endEmbeddedLanguages(tokenize([`${FENCE}${header}`, 'x', FENCE]))).not.toContain(
+        'python'
+      )
+    }
+  })
+
+  it('does not close cells on fence-like code or trailing text', () => {
+    expect(
+      endEmbeddedLanguages(
+        tokenize([`${FENCE}{python}`, `${FENCE} python`, `${FENCE} # comment`, FENCE, '# After'])
+      )
+    ).toEqual(['python', 'python', 'python', null, null])
+  })
+
+  it('closes unknown engines and escaped long fences without swallowing headings', () => {
+    for (const header of ['{unknown-engine}', '{{python}}']) {
+      const lines = tokenize([`\`\`\`\`${header}`, FENCE, 'inside', '`````', '# After'])
+      expect(lines[3].endEmbeddedLanguageId).toBeNull()
+      expect(tokenTypeAt(lines[4], 0)).toBe('keyword')
+    }
+  })
+
+  it('accepts YAML end markers and whitespace after closing fences', () => {
+    expect(
+      endEmbeddedLanguages(
+        tokenize(['---', 'title: demo', '...', `${FENCE}{r}`, 'x <- 1', `${FENCE}  \t`, '# After'])
+      )
+    ).toEqual(['yaml', 'yaml', null, 'r', 'r', null, null])
+  })
+})
diff --git a/src/renderer/src/lib/monaco-languages/register-quarto.test.ts b/src/renderer/src/lib/monaco-languages/register-quarto.test.ts
new file mode 100644
index 00000000000..63f4c0fe15a
--- /dev/null
+++ b/src/renderer/src/lib/monaco-languages/register-quarto.test.ts
@@ -0,0 +1,163 @@
+import { describe, expect, it, vi } from 'vitest'
+import {
+  endEmbeddedLanguages,
+  tokenizeMonarchDocument,
+  tokenTypeAt
+} from './monarch-tokenizer-test-harness'
+import {
+  QUARTO_LANGUAGE_ID,
+  quartoLanguageConfiguration,
+  quartoMonarchLanguage,
+  registerQuartoLanguage
+} from './register-quarto'
+
+const FENCE = '```'
+const LONG_FENCE = '````'
+
+function tokenizeQuarto(source: string) {
+  return tokenizeMonarchDocument(QUARTO_LANGUAGE_ID, quartoMonarchLanguage, source)
+}
+
+function embedsFor(source: string): (string | null)[] {
+  return endEmbeddedLanguages(tokenizeQuarto(source))
+}
+
+function createMonacoMock(existingLanguageIds: string[] = ['markdown']) {
+  const languages = existingLanguageIds.map((id) => ({ id }))
+  return {
+    languages: {
+      getLanguages: vi.fn(() => languages),
+      register: vi.fn((entry: { id: string }) => {
+        languages.push({ id: entry.id })
+      }),
+      setLanguageConfiguration: vi.fn(),
+      setMonarchTokensProvider: vi.fn()
+    }
+  }
+}
+
+describe('registerQuartoLanguage', () => {
+  it('registers the quarto language, tokenizer, and configuration once', () => {
+    const monaco = createMonacoMock()
+
+    registerQuartoLanguage(monaco)
+    registerQuartoLanguage(monaco)
+
+    expect(monaco.languages.register).toHaveBeenCalledTimes(1)
+    expect(monaco.languages.register).toHaveBeenCalledWith(
+      expect.objectContaining({
+        id: QUARTO_LANGUAGE_ID,
+        extensions: ['.qmd', '.rmd', '.rmarkdown']
+      })
+    )
+    expect(monaco.languages.setMonarchTokensProvider).toHaveBeenCalledWith(
+      QUARTO_LANGUAGE_ID,
+      quartoMonarchLanguage
+    )
+    expect(monaco.languages.setLanguageConfiguration).toHaveBeenCalledWith(
+      QUARTO_LANGUAGE_ID,
+      quartoLanguageConfiguration
+    )
+  })
+
+  it('hands a leading --- block to yaml and returns to markdown', () => {
+    expect(embedsFor(['---', 'format: revealjs', '---', '# Title'].join('\n'))).toEqual([
+      'yaml',
+      'yaml',
+      null,
+      null
+    ])
+  })
+
+  it('treats a mid-document --- as markdown, not front matter', () => {
+    // Why: revealjs decks use `---` as a slide separator, so only line 1 may open YAML.
+    expect(embedsFor(['# Title', '', '---', '', '## Next slide'].join('\n'))).toEqual([
+      null,
+      null,
+      null,
+      null,
+      null
+    ])
+  })
+
+  it('colors executable cells with the engine language', () => {
+    expect(
+      embedsFor([`${FENCE}{r setup, include=FALSE}`, 'x <- 1', FENCE, 'after'].join('\n'))
+    ).toEqual(['r', 'r', null, null])
+    expect(embedsFor([`${FENCE}{python}`, 'print(1)', FENCE].join('\n'))).toEqual([
+      'python',
+      'python',
+      null
+    ])
+    expect(embedsFor([`${FENCE}{=html}`, '<b>x</b>', FENCE].join('\n'))[0]).toBe('html')
+    // {ojs} and {d3} are JavaScript dialects Monaco has no language id for.
+    expect(embedsFor([`${FENCE}{ojs}`, 'x = 1', FENCE].join('\n'))[0]).toBe('javascript')
+  })
+
+  it('leaves an engine Monaco does not know uncolored instead of failing', () => {
+    expect(embedsFor([`${FENCE}{tikz}`, '\\draw;', FENCE, 'after'].join('\n'))).toEqual([
+      'tikz',
+      'tikz',
+      null,
+      null
+    ])
+  })
+
+  it('keeps an escaped ```{{python}} cell out of the engine tokenizer', () => {
+    // Why: Quarto's double-brace form shows a cell without running it.
+    const lines = tokenizeQuarto([`${FENCE}{{python}}`, 'print(1)', FENCE, '## After'].join('\n'))
+    expect(endEmbeddedLanguages(lines)).toEqual([null, null, null, null])
+    expect(tokenTypeAt(lines[3], 0)).toBe('keyword')
+  })
+
+  it('closes a cell only on a fence at least as long as the one that opened it', () => {
+    // Why: markdown's own code-block states close on exactly three backticks, so a
+    // ````-fenced cell used to run to the end of the file.
+    expect(
+      embedsFor(
+        [
+          `${LONG_FENCE}{python}`,
+          `print("${FENCE}")`,
+          FENCE,
+          'still inside',
+          LONG_FENCE,
+          '# After'
+        ].join('\n')
+      )
+    ).toEqual(['python', 'python', 'python', 'python', null, null])
+    // A closing fence longer than the opener still closes, as CommonMark requires.
+    expect(embedsFor([`${FENCE}{r}`, 'x', LONG_FENCE, '# After'].join('\n'))).toEqual([
+      'r',
+      'r',
+      null,
+      null
+    ])
+  })
+
+  it('routes long plain fences through the same fence-aware states', () => {
+    // Why: ````-fenced blocks are how a Quarto document shows a ``` fence, and
+    // markdown's own fence rules stop at three backticks.
+    const lines = tokenizeQuarto(
+      [LONG_FENCE, `${FENCE}r`, 'x', FENCE, LONG_FENCE, '## After'].join('\n')
+    )
+    expect(endEmbeddedLanguages(lines)).toEqual([null, null, null, null, null, null])
+    expect(tokenTypeAt(lines[5], 0)).toBe('keyword')
+  })
+
+  it('keeps plain markdown fences and headings working', () => {
+    expect(embedsFor([`${FENCE}python`, 'print(1)', FENCE, 'text'].join('\n'))).toEqual([
+      'python',
+      'python',
+      null,
+      null
+    ])
+    const heading = tokenizeQuarto('## Slide title')[0]
+    expect(tokenTypeAt(heading, 0)).toBe('keyword')
+  })
+
+  it('marks pandoc fenced divs', () => {
+    const lines = tokenizeQuarto(['::: {.callout-note}', 'text', ':::'].join('\n'))
+    expect(tokenTypeAt(lines[0], 0)).toBe('meta.separator')
+    expect(tokenTypeAt(lines[2], 0)).toBe('meta.separator')
+  })
+})
diff --git a/src/renderer/src/lib/monaco-languages/register-quarto.ts b/src/renderer/src/lib/monaco-languages/register-quarto.ts
new file mode 100644
index 00000000000..bc0c7ea6122
--- /dev/null
+++ b/src/renderer/src/lib/monaco-languages/register-quarto.ts
@@ -0,0 +1,104 @@
+import type * as Monaco from 'monaco-editor'
+import {
+  conf as markdownConf,
+  language as markdownLanguage
+} from 'monaco-editor/esm/vs/basic-languages/markdown/markdown.js'
+
+import { tagCloseWithinEmbedBudget } from './monarch-embed-entry-budget'
+
+type QuartoMonaco = {
+  languages: Pick<
+    typeof Monaco.languages,
+    'getLanguages' | 'register' | 'setLanguageConfiguration' | 'setMonarchTokensProvider'
+  >
+}
+
+export const QUARTO_LANGUAGE_ID = 'quarto'
+
+// Quarto files are edited as Markdown: same comment syntax and bracket pairs.
+export const quartoLanguageConfiguration: Monaco.languages.LanguageConfiguration = markdownConf
+
+const markdownTokenizer = markdownLanguage.tokenizer
+
+// `$S2` substitutes the opening fence; a regex literal would interpret `$` as an anchor.
+const CLOSING_FENCE = '^\\s*$S2`*\\s*$'
+
+// Extend Markdown so bundled rules and embedded tokenizers stay authoritative.
+export const quartoMonarchLanguage: Monaco.languages.IMonarchLanguage = {
+  ...markdownLanguage,
+  tokenPostfix: '.qmd',
+  start: 'quartoStart',
+  tokenizer: {
+    ...markdownTokenizer,
+    // Inline script/style embeds inherit Markdown's recursion risk.
+    tag: [
+      ...markdownTokenizer.tag.map((rule): Monaco.languages.IMonarchLanguageRule =>
+        Array.isArray(rule) && rule[0] instanceof RegExp && rule[0].source === '>'
+          ? [tagCloseWithinEmbedBudget, rule[1]]
+          : rule
+      ),
+      [/>/, 'tag', '@pop']
+    ],
+    // Only the initial state may interpret `---` as YAML front matter.
+    quartoStart: [
+      [
+        /^---\s*$/,
+        { token: 'meta.separator', switchTo: '@quartoFrontMatter', nextEmbedded: 'yaml' }
+      ],
+      [/.*/, { token: '@rematch', switchTo: '@root' }]
+    ],
+    quartoFrontMatter: [
+      [/^(?:---|\.\.\.)\s*$/, { token: 'meta.separator', switchTo: '@root', nextEmbedded: '@pop' }],
+      [/.*$/, 'variable.source']
+    ],
+    root: [
+      // Escaped cells must consume their closing fence without starting an embed.
+      [/^\s*(`{3,})\s*\{\{[^}]*\}\}.*$/, { token: 'string', next: '@quartoRawCell.$1' }],
+      // ```{ojs} / ```{d3} are JavaScript dialects Monaco has no language id for.
+      [
+        /^\s*(`{3,})\s*\{\s*(?:ojs|d3)\b[^}]*\}.*$/,
+        { token: 'string', next: '@quartoCell.$1', nextEmbedded: 'javascript' }
+      ],
+      // Unknown engine ids fall back to uncolored content in Monaco.
+      [
+        /^\s*(`{3,})\s*\{=?\s*([A-Za-z][\w.+-]*)[^}]*\}.*$/,
+        { token: 'string', next: '@quartoCell.$1', nextEmbedded: '$2' }
+      ],
+      // Long plain fences must keep shorter inner fences inside the block.
+      [
+        /^\s*(`{4,})\s*((?:\w|[/\-#])+).*$/,
+        { token: 'string', next: '@quartoCell.$1', nextEmbedded: '$2' }
+      ],
+      [/^\s*(`{4,})\s*$/, { token: 'string', next: '@quartoRawCell.$1' }],
+      // Pandoc fenced divs: ::: {.callout-note}
+      [/^\s*:{3,}.*$/, 'meta.separator'],
+      ...markdownTokenizer.root
+    ],
+    // Embedded-language exits match the pattern alone; guards cannot enforce fence length.
+    quartoCell: [
+      [CLOSING_FENCE, { token: 'string', next: '@pop', nextEmbedded: '@pop' }],
+      [/.*$/, 'variable.source']
+    ],
+    quartoRawCell: [
+      [CLOSING_FENCE, { token: 'string', next: '@pop' }],
+      [/.*$/, 'variable.source']
+    ]
+  }
+}
+
+export function registerQuartoLanguage(monaco: QuartoMonaco): void {
+  const languageAlreadyRegistered = monaco.languages
+    .getLanguages()
+    .some((language) => language.id === QUARTO_LANGUAGE_ID)
+  if (languageAlreadyRegistered) {
+    return
+  }
+
+  monaco.languages.register({
+    id: QUARTO_LANGUAGE_ID,
+    extensions: ['.qmd', '.rmd', '.rmarkdown'],
+    aliases: ['Quarto', 'quarto', 'R Markdown']
+  })
+  monaco.languages.setLanguageConfiguration(QUARTO_LANGUAGE_ID, quartoLanguageConfiguration)
+  monaco.languages.setMonarchTokensProvider(QUARTO_LANGUAGE_ID, quartoMonarchLanguage)
+}
diff --git a/src/renderer/src/lib/monaco-setup.ts b/src/renderer/src/lib/monaco-setup.ts
index 5c2c69d24cb..be9b001adf4 100644
--- a/src/renderer/src/lib/monaco-setup.ts
+++ b/src/renderer/src/lib/monaco-setup.ts
@@ -11,6 +11,7 @@ import tsWorker from 'monaco-editor/esm/vs/language/typescript/ts.worker?worker'
 import { registerAstroLanguage } from './monaco-languages/register-astro'
 import { registerJsonlLanguage } from './monaco-languages/register-jsonl'
 import { registerNimLanguage } from './monaco-languages/register-nim'
+import { registerQuartoLanguage } from './monaco-languages/register-quarto'
 import { registerShellMarkdownAliases } from './monaco-languages/register-shell-markdown-aliases'
 import { registerSvelteLanguage } from './monaco-languages/register-svelte'
 import { registerTypstLanguage } from './monaco-languages/register-typst'
@@ -85,6 +86,7 @@ runMonacoSetupSteps([
   ['Nim language registration', () => registerNimLanguage(monaco)],
   ['Typst language registration', () => registerTypstLanguage(monaco)],
   ['JSONL language registration', () => registerJsonlLanguage(monaco)],
+  ['Quarto language registration', () => registerQuartoLanguage(monaco)],
   ['shell Markdown alias registration', () => registerShellMarkdownAliases(monaco)],
   ['delayer cancellation guard', installMonacoDelayerCancellationGuard],
   ['diff editor disposal guard', () => installMonacoDiffEditorDisposalGuard(monaco)],
diff --git a/src/renderer/src/lib/native-chat-draft-owner.ts b/src/renderer/src/lib/native-chat-draft-owner.ts
new file mode 100644
index 00000000000..36923536669
--- /dev/null
+++ b/src/renderer/src/lib/native-chat-draft-owner.ts
@@ -0,0 +1,42 @@
+import type { AppState } from '../store/types'
+import type { NativeChatComposerDraftOwner } from '@/components/native-chat/native-chat-composer-draft-storage'
+import {
+  nativeChatDraftScopeTabId,
+  structuredAgentSessionIdOfDraftScope
+} from '@/components/native-chat/native-chat-composer-draft-store'
+import { resolveWorktreeOperationRoute } from './worktree-operation-route'
+
+function workspaceOfDraftScope(
+  state: Pick<AppState, 'tabsByWorktree' | 'unifiedTabsByWorktree'>,
+  scopeKey: string
+): string | null {
+  const sessionId = structuredAgentSessionIdOfDraftScope(scopeKey)
+  if (sessionId !== null) {
+    for (const [workspaceId, tabs] of Object.entries(state.unifiedTabsByWorktree)) {
+      if (tabs.some((tab) => tab.contentType === 'agent-session' && tab.entityId === sessionId)) {
+        return workspaceId
+      }
+    }
+    return null
+  }
+  const tabId = nativeChatDraftScopeTabId(scopeKey)
+  for (const [workspaceId, tabs] of Object.entries(state.tabsByWorktree)) {
+    if (tabs.some((tab) => tab.id === tabId)) {
+      return workspaceId
+    }
+  }
+  return null
+}
+
+/** The workspace, and the host it runs on, whose open chat a new draft is written in; the same
+ *  route a removal of that workspace resolves, so the removal finds the draft. */
+export function resolveNativeChatDraftOwner(
+  state: AppState,
+  scopeKey: string
+): NativeChatComposerDraftOwner | undefined {
+  const workspaceId = workspaceOfDraftScope(state, scopeKey)
+  const executionHostId = workspaceId
+    ? resolveWorktreeOperationRoute(state, workspaceId)?.executionHostId
+    : null
+  return workspaceId && executionHostId ? { workspaceId, executionHostId } : undefined
+}
diff --git a/src/renderer/src/lib/resume-sleeping-agent-session-direct-ssh-hydration-gap.test.ts b/src/renderer/src/lib/resume-sleeping-agent-session-direct-ssh-hydration-gap.test.ts
index be73993c49c..0b9404d1da4 100644
--- a/src/renderer/src/lib/resume-sleeping-agent-session-direct-ssh-hydration-gap.test.ts
+++ b/src/renderer/src/lib/resume-sleeping-agent-session-direct-ssh-hydration-gap.test.ts
@@ -117,6 +117,21 @@ describe('sleeping-agent resume across the direct-SSH hydration gap', () => {
     expect(state.sleepingAgentSessionsByPaneKey[record.paneKey]).toBeUndefined()
   })
 
+  it.each([
+    ['wakes it when the host named tabs only on another path', '/srv/proj/another-machines', 1],
+    ['keeps waiting when the host named tabs here it could not place', PATH, 0]
+  ])('after a snapshot that could not place every tab, %s', (_label, unplacedPath, expected) => {
+    seedColdDirectSshStart()
+    useAppStore.getState().setRemoteWorkspaceSyncStatus(TARGET_ID, {
+      phase: 'conflict',
+      direction: 'pull',
+      unplacedTabWorktreePaths: [unplacedPath]
+    })
+
+    expect(resumeSleepingAgentSessionsForWorktree(WORKTREE_ID)).toBe(expected)
+    expect(resumedTabCount(WORKTREE_ID)).toBe(expected)
+  })
+
   it('leaves a purely local workspace resuming with no added latency', () => {
     seedColdDirectSshStart()
     const localRecord = {
diff --git a/src/renderer/src/lib/ssh-background-startup-delivery.ts b/src/renderer/src/lib/ssh-background-startup-delivery.ts
index 0e1c08c70ff..239bf6326a5 100644
--- a/src/renderer/src/lib/ssh-background-startup-delivery.ts
+++ b/src/renderer/src/lib/ssh-background-startup-delivery.ts
@@ -139,12 +139,10 @@ export function createSshBackgroundStartupDelivery(
       // PTYs; hidden automation tabs still submit the command themselves.
       // Why bracketed paste: multiline prompts are pasted literally only when we
       // synchronized on the Orca shell-ready marker — that is the bash/zsh overlay
-      // with bracketed-paste mode armed. Submit with CR since the relay drives a
-      // remote shell.
+      // with bracketed-paste mode armed.
       options.write(
         ptyId,
         buildStartupCommandSubmission(command, {
-          submit: '\r',
           bracketedPasteSafe: markerObserved
         })
       )
diff --git a/src/renderer/src/lib/structured-agent-session-empty-chat-reuse.test.ts b/src/renderer/src/lib/structured-agent-session-empty-chat-reuse.test.ts
index 9f4f2b0c459..004de247a84 100644
--- a/src/renderer/src/lib/structured-agent-session-empty-chat-reuse.test.ts
+++ b/src/renderer/src/lib/structured-agent-session-empty-chat-reuse.test.ts
@@ -115,10 +115,15 @@ import {
   clearNativeChatDraftCacheForTests,
   writeNativeChatDraftCache
 } from '@/components/native-chat/native-chat-draft-cache'
+import { structuredAgentSessionTabId } from '../../../shared/structured-agent-session-projection'
 import {
-  structuredAgentSessionPaneKey,
-  structuredAgentSessionTabId
-} from '../../../shared/structured-agent-session-projection'
+  hydrateNativeChatComposerDrafts,
+  structuredAgentSessionDraftScopeKey
+} from '@/components/native-chat/native-chat-composer-draft-store'
+import {
+  createMemoryNativeChatComposerDraftStorage,
+  setNativeChatComposerDraftStorageForTests
+} from '@/components/native-chat/native-chat-composer-draft-storage'
 import { adoptAgentSessionLaunchVerdict } from './agent-session-launch-plan'
 import {
   beginStructuredAgentSessionProvisionalLaunch,
@@ -278,8 +283,8 @@ describe('a second "new chat" with no text', () => {
   it('opens a new chat when the idle chat has a typed draft', async () => {
     pick('plus-pick-1')
     await publishIdle(first.sessionId)
-    const tabId = structuredAgentSessionTabId(first.sessionId)
-    writeNativeChatDraftCache(structuredAgentSessionPaneKey(tabId, first.sessionId), 'half a q')
+    // Under the conversation's key, which the composer and every hand-back write.
+    writeNativeChatDraftCache(structuredAgentSessionDraftScopeKey(first.sessionId), 'half a q')
 
     expect(pick('plus-pick-2').sessionId).toBe(second.sessionId)
   })
@@ -287,8 +292,7 @@ describe('a second "new chat" with no text', () => {
   it('opens a new chat when the idle chat has an image in its composer', async () => {
     pick('plus-pick-1')
     await publishIdle(first.sessionId)
-    const tabId = structuredAgentSessionTabId(first.sessionId)
-    appendNativeChatAttachmentCache(structuredAgentSessionPaneKey(tabId, first.sessionId), [
+    appendNativeChatAttachmentCache(structuredAgentSessionDraftScopeKey(first.sessionId), [
       { id: 'shot', path: '/tmp/shot.png' }
     ])
 
@@ -483,6 +487,45 @@ describe('a "new chat" with text', () => {
     )
   })
 
+  it('leaves a starting chat whose draft holds text, given back or typed, to its user', () => {
+    mocks.launch.mockImplementation(() => new Promise(() => undefined))
+    const blank = pick('plus-pick-1')
+    writeNativeChatDraftCache(structuredAgentSessionDraftScopeKey(blank.sessionId), 'my words')
+
+    expect(pick('notes-send', { prompt: 'review notes' }).sessionId).toBe(second.sessionId)
+    expect(readOutbox(blank.sessionId)).toEqual([])
+  })
+
+  it('never takes over or reuses a chat whose saved draft holds text or only an image', async () => {
+    mocks.launch.mockImplementation(() => new Promise(() => undefined))
+    const typed = pick('plus-pick-1')
+    writeNativeChatDraftCache(structuredAgentSessionDraftScopeKey(typed.sessionId), 'my words')
+    // The saved drafts have loaded, so only the draft itself keeps this chat from looking empty.
+    await hydrateNativeChatComposerDrafts()
+    const taken = pick('notes-send', { prompt: 'review notes' })
+    expect(taken.sessionId).not.toBe(typed.sessionId)
+    expect(readOutbox(typed.sessionId)).toEqual([])
+
+    appendNativeChatAttachmentCache(structuredAgentSessionDraftScopeKey(taken.sessionId), [
+      { id: 'shot', path: '/tmp/shot.png' }
+    ])
+    await hydrateNativeChatComposerDrafts()
+    expect(pick('notes-send-2', { prompt: 'more notes' }).sessionId).not.toBe(taken.sessionId)
+  })
+
+  it('takes no chat while saved drafts are still loading, since one may hold a draft', () => {
+    mocks.launch.mockImplementation(() => new Promise(() => undefined))
+    const blank = pick('plus-pick-1')
+    const loading = createMemoryNativeChatComposerDraftStorage()
+    setNativeChatComposerDraftStorageForTests({
+      ...loading,
+      loadAll: () => new Promise<ReadonlyMap<string, unknown>>(() => undefined)
+    })
+    void hydrateNativeChatComposerDrafts()
+
+    expect(pick('notes-send', { prompt: 'review notes' }).sessionId).not.toBe(blank.sessionId)
+  })
+
   it('takes an empty chat still starting, as before', () => {
     mocks.launch.mockImplementation(() => new Promise(() => undefined))
     const blank = pick('plus-pick-1')
diff --git a/src/renderer/src/lib/structured-agent-session-launch-different-request.test.ts b/src/renderer/src/lib/structured-agent-session-launch-different-request.test.ts
index 253a91c85bf..338e5ec8ad6 100644
--- a/src/renderer/src/lib/structured-agent-session-launch-different-request.test.ts
+++ b/src/renderer/src/lib/structured-agent-session-launch-different-request.test.ts
@@ -67,10 +67,7 @@ import {
   readNativeChatDraftCache,
   writeNativeChatDraftCache
 } from '@/components/native-chat/native-chat-draft-cache'
-import {
-  structuredAgentSessionPaneKey,
-  structuredAgentSessionTabId
-} from '../../../shared/structured-agent-session-projection'
+import { structuredAgentSessionDraftScopeKey } from '@/components/native-chat/native-chat-composer-draft-store'
 import { StructuredAgentSessionCreateRefusalError } from '@/lib/launch-structured-agent-session'
 import {
   getStructuredAgentSessionLaunchLifecycle,
@@ -520,10 +517,8 @@ describe('an empty chat still starting', () => {
 
   it('leaves a chat its user is typing into to them, and opens a new chat for the notes', async () => {
     const blank = startStructuredAgentLaunch(WORKTREE_ID, 'codex', { requestId: 'plus-pick' })
-    const paneKey = structuredAgentSessionPaneKey(
-      structuredAgentSessionTabId(blank.sessionId),
-      blank.sessionId
-    )
+    // The conversation's draft, which its composer writes.
+    const paneKey = structuredAgentSessionDraftScopeKey(blank.sessionId)
     writeNativeChatDraftCache(paneKey, 'half a question')
 
     const notes = startStructuredAgentLaunch(WORKTREE_ID, 'codex', notesSend)
diff --git a/src/renderer/src/lib/structured-agent-session-launch-empty-chat.ts b/src/renderer/src/lib/structured-agent-session-launch-empty-chat.ts
index 57efb3fedc8..fb2fd2f9e41 100644
--- a/src/renderer/src/lib/structured-agent-session-launch-empty-chat.ts
+++ b/src/renderer/src/lib/structured-agent-session-launch-empty-chat.ts
@@ -1,18 +1,22 @@
-import {
-  structuredAgentSessionPaneKey,
-  structuredAgentSessionTabId
-} from '../../../shared/structured-agent-session-projection'
 import { getStructuredAgentSessionOutbox } from '@/components/native-chat/structured-agent-session-outbox-storage'
 import { readNativeChatDraftCache } from '@/components/native-chat/native-chat-draft-cache'
-import { readNativeChatAttachmentCache } from '@/components/native-chat/use-native-chat-composer-attachments'
+// The draft store, not the composer hook: the launch must not load the composer (a store cycle).
+import {
+  isNativeChatComposerDraftLoadPending,
+  readNativeChatComposerDraft,
+  structuredAgentSessionDraftScopeKey
+} from '@/components/native-chat/native-chat-composer-draft-store'
 
-/** A starting chat is empty until its user sends into it or puts text or images in its composer;
- *  after that it is theirs, and another request never goes into it. */
+/** A starting chat is empty until its user sends into it or puts text or images in its draft (typed,
+ *  or given back); after that it is theirs, and another request never goes into it. Read by the
+ *  conversation's key, which the composer and every hand-back write. While the startup load of saved
+ *  drafts has not landed, no chat is empty: it may hold a draft memory doesn't have yet. */
 export function isStructuredLaunchChatEmpty(sessionId: string): boolean {
-  const paneKey = structuredAgentSessionPaneKey(structuredAgentSessionTabId(sessionId), sessionId)
+  const scopeKey = structuredAgentSessionDraftScopeKey(sessionId)
   return (
+    !isNativeChatComposerDraftLoadPending() &&
     getStructuredAgentSessionOutbox(sessionId).length === 0 &&
-    readNativeChatDraftCache(paneKey).trim() === '' &&
-    readNativeChatAttachmentCache(paneKey).length === 0
+    readNativeChatDraftCache(scopeKey).trim() === '' &&
+    readNativeChatComposerDraft(scopeKey).images.length === 0
   )
 }
diff --git a/src/renderer/src/lib/workspace-terminal-host-authority.test.ts b/src/renderer/src/lib/workspace-terminal-host-authority.test.ts
index c7c5bc60f7e..806b7840ce5 100644
--- a/src/renderer/src/lib/workspace-terminal-host-authority.test.ts
+++ b/src/renderer/src/lib/workspace-terminal-host-authority.test.ts
@@ -160,6 +160,84 @@ describe('workspace terminal seeding authority', () => {
     expect(terminalTabCount(store, SSH_WORKTREE_ID)).toBe(0)
   })
 
+  it('seeds a worktree the conflicting snapshot placed, and only that one', () => {
+    const store = createTestStore()
+    seedDirectSsh(store)
+    store.getState().setRemoteWorkspaceSyncStatus(TARGET_ID, {
+      phase: 'conflict',
+      direction: 'pull',
+      unplacedTabWorktreePaths: ['/srv/proj/another-machines-worktree']
+    })
+
+    expect(resolveWorkspaceTerminalHostAuthority(store.getState(), SSH_WORKTREE_ID)).toBe('none')
+    expect(ensureWorktreeHasInitialTerminal(store.getState(), SSH_WORKTREE_ID)).toBeTruthy()
+    expect(terminalTabCount(store, SSH_WORKTREE_ID)).toBe(1)
+  })
+
+  it('leaves a worktree emptied on purpose empty at startup, even once the host answered for it', () => {
+    const store = createTestStore()
+    seedDirectSsh(store)
+    store.getState().setRemoteWorkspaceSyncStatus(TARGET_ID, {
+      phase: 'conflict',
+      direction: 'pull',
+      unplacedTabWorktreePaths: ['/srv/proj/another-machines-worktree']
+    })
+    store.setState({
+      tabsByWorktree: { [SSH_WORKTREE_ID]: [] },
+      closedTerminalTabTombstonesByTabId: {
+        closed: { closedAt: Date.now(), worktreeId: SSH_WORKTREE_ID }
+      }
+    })
+
+    // Startup restore passes no reseed option; only an explicit activation does.
+    expect(ensureWorktreeHasInitialTerminal(store.getState(), SSH_WORKTREE_ID)).toBeNull()
+    expect(terminalTabCount(store, SSH_WORKTREE_ID)).toBe(0)
+    expect(
+      ensureWorktreeHasInitialTerminal(
+        store.getState(),
+        SSH_WORKTREE_ID,
+        undefined,
+        undefined,
+        undefined,
+        undefined,
+        { reseedEmptiedWorkspace: true }
+      )
+    ).toBeTruthy()
+  })
+
+  it.each([
+    ['its own path', '/srv/proj/feature'],
+    ['another spelling of its path', '/srv/proj//feature/']
+  ])('keeps waiting when the host named tabs it could not place on %s', (_label, unplacedPath) => {
+    const store = createTestStore()
+    seedDirectSsh(store)
+    store.getState().setRemoteWorkspaceSyncStatus(TARGET_ID, {
+      phase: 'conflict',
+      direction: 'pull',
+      unplacedTabWorktreePaths: [unplacedPath]
+    })
+
+    expect(resolveWorkspaceTerminalHostAuthority(store.getState(), SSH_WORKTREE_ID)).toBe(
+      'unverifiable'
+    )
+  })
+
+  it('stops trusting a placed worktree once a later sync event replaces the conflict', () => {
+    const store = createTestStore()
+    seedDirectSsh(store)
+    store.getState().setRemoteWorkspaceSyncStatus(TARGET_ID, {
+      phase: 'conflict',
+      direction: 'pull',
+      unplacedTabWorktreePaths: []
+    })
+    // What a snapshot that could not be applied, or a rejected upload, writes.
+    store.getState().setRemoteWorkspaceSyncStatus(TARGET_ID, { phase: 'conflict' })
+
+    expect(resolveWorkspaceTerminalHostAuthority(store.getState(), SSH_WORKTREE_ID)).toBe(
+      'unverifiable'
+    )
+  })
+
   it('leaves terminal creation to the host of a paired runtime workspace', () => {
     const store = createTestStore()
     store.setState({
diff --git a/src/renderer/src/lib/workspace-terminal-host-authority.ts b/src/renderer/src/lib/workspace-terminal-host-authority.ts
index ad535e94563..9068280c437 100644
--- a/src/renderer/src/lib/workspace-terminal-host-authority.ts
+++ b/src/renderer/src/lib/workspace-terminal-host-authority.ts
@@ -1,6 +1,8 @@
 import { FLOATING_TERMINAL_WORKTREE_ID } from '../../../shared/constants'
 import { parseExecutionHostId } from '../../../shared/execution-host'
+import { normalizeRuntimePathForComparison } from '../../../shared/cross-platform-path'
 import { parseWorkspaceKey } from '../../../shared/workspace-scope'
+import { splitWorktreeId } from '../../../shared/worktree/id'
 import type { HostLiveTerminalProbeVerdict } from '@/runtime/host-live-terminal-probe'
 import type { RemoteWorkspaceSyncStatus } from '@/store/slices/ssh'
 import { isWebRuntimeSessionActive } from '@/runtime/web-runtime-session'
@@ -16,9 +18,10 @@ import {
  * than restated so the two cannot drift:
  *
  * - `live` — a remote execution host owns terminal creation here. It supplies the surface itself.
- * - `unverifiable` — the workspace has a remote execution host with a sync still in flight or not
- *   yet attempted. It is bounded: a sync that terminates without an answer resolves `none` rather
- *   than refusing forever (see resolveDirectSshAuthority).
+ * - `unverifiable` — the workspace has a remote execution host that has not answered for it: a sync
+ *   still in flight or not yet attempted, or a snapshot naming tabs here that could not be placed.
+ *   It is bounded: a sync that terminates without an answer resolves `none` rather than refusing
+ *   forever (see resolveDirectSshAuthority).
  * - `none` — no remote host holds terminals here: either the workspace is local (this client *is*
  *   the execution host, and its own tab rows are the whole truth) or the host answered and holds
  *   nothing.
@@ -57,9 +60,11 @@ const TERMINATED_WITHOUT_ANSWER_PHASES = new Set(['offline', 'error'])
 
 function resolveDirectSshAuthority(
   state: WorkspaceTerminalHostAuthorityState,
-  targetId: string
+  targetId: string,
+  worktreeId: string
 ): WorkspaceTerminalHostAuthority {
-  const phase = state.remoteWorkspaceSyncStatusByTargetId?.[targetId]?.phase
+  const status = state.remoteWorkspaceSyncStatusByTargetId?.[targetId]
+  const phase = status?.phase
   if (state.remoteWorkspaceHydratedTargetIds?.has(targetId)) {
     // Why: the same pair use-app-session-persistence.ts gates uploads on. A conflicting snapshot
     // means the client's picture is not the host's, so it is no basis for deciding the host holds
@@ -73,6 +78,16 @@ function resolveDirectSshAuthority(
     // seed is meant to be a wait, not a permanent refusal.
     return 'none'
   }
+  const unplacedPaths = status?.unplacedTabWorktreePaths
+  const worktreePath = splitWorktreeId(worktreeId)?.worktreePath
+  if (phase === 'conflict' && unplacedPaths && worktreePath) {
+    // Why: that snapshot was applied to every worktree it could place, so the host has answered for
+    // this one. Refusing the whole target strands it on one path this client never had (#22015).
+    const comparablePath = normalizeRuntimePathForComparison(worktreePath)
+    return unplacedPaths.some((path) => normalizeRuntimePathForComparison(path) === comparablePath)
+      ? 'unverifiable'
+      : 'none'
+  }
   // Not connected, still pulling, or not yet attempted — "we could not ask", never "nothing there".
   return 'unverifiable'
 }
@@ -104,7 +119,7 @@ export function resolveWorkspaceTerminalHostAuthority(
     // Why the git-worktree narrowing: the snapshot replaces exactly DirectSshTargetScope.gitWorktreeIds
     // (remote-workspace-snapshot-apply.ts). A folder workspace's rows are never replaced by the host,
     // so waiting on an answer that will never name them would leave it terminal-less for good.
-    return resolveDirectSshAuthority(state, host.targetId)
+    return resolveDirectSshAuthority(state, host.targetId, worktreeId)
   }
   // Local, or outside the host's replace scope: this client is the execution host and its own rows are
   // the whole truth. Absence of a catalog row is not evidence of a remote owner, and refusing to act
diff --git a/src/renderer/src/store/folder-workspaces/folder-workspace-mutations.ts b/src/renderer/src/store/folder-workspaces/folder-workspace-mutations.ts
index b9eefe424a8..5f7b5de7a0c 100644
--- a/src/renderer/src/store/folder-workspaces/folder-workspace-mutations.ts
+++ b/src/renderer/src/store/folder-workspaces/folder-workspace-mutations.ts
@@ -28,6 +28,10 @@ import {
   getFolderWorkspaceUpdateIdentity,
   reconcileFailedFolderWorkspaceUpdate
 } from './folder-workspace-catalog'
+import {
+  captureWorkspaceChatDraftKeys,
+  deleteWorkspaceChatDrafts
+} from '../slices/worktrees/teardown/removed-worktree-chat-drafts'
 
 export type FolderWorkspaceUpdateField = keyof FolderWorkspaceUpdates
 
@@ -230,6 +234,11 @@ export function createFolderWorkspaceMutationActions(
         folderWorkspaceId,
         executionHostId
       )
+      const workspaceKey = folderWorkspaceKey(folderWorkspaceId)
+      // Why before the host call: its announcement can start a refresh that drops these tabs.
+      const chatDraftKeys = captureWorkspaceChatDraftKeys(state, [
+        { workspaceId: workspaceKey, executionHostId: ownerHostId }
+      ])
       try {
         // Why: deletion targets the folder's owner; focus may be on a different host.
         const target = getActiveRuntimeTarget({ activeRuntimeEnvironmentId: runtimeEnvironmentId })
@@ -247,7 +256,6 @@ export function createFolderWorkspaceMutationActions(
         if (!deleted) {
           return false
         }
-        const workspaceKey = folderWorkspaceKey(folderWorkspaceId)
         set((s) => ({
           folderWorkspaces: s.folderWorkspaces.filter(
             (workspace) =>
@@ -261,6 +269,7 @@ export function createFolderWorkspaceMutationActions(
           // tear down Chromium guests before purging the remaining renderer state.
           await get().shutdownWorktreeBrowsers(workspaceKey)
           get().purgeWorktreeTerminalState([workspaceKey])
+          deleteWorkspaceChatDrafts(chatDraftKeys)
         }
         return true
       } catch (err) {
diff --git a/src/renderer/src/store/repos/repo-removal.ts b/src/renderer/src/store/repos/repo-removal.ts
index 43525c3bba8..572e8a78180 100644
--- a/src/renderer/src/store/repos/repo-removal.ts
+++ b/src/renderer/src/store/repos/repo-removal.ts
@@ -22,6 +22,10 @@ import type { RepoSlice } from './repo-state'
 import { ERROR_TOAST_DURATION } from './repo-state'
 import { mergeProjectCompatibilityForHostRepoChange } from './repo-catalog-identity'
 import { settingsForRepoOwner } from './owner-routing'
+import {
+  captureWorkspaceChatDraftKeys,
+  deleteWorkspaceChatDrafts
+} from '../slices/worktrees/teardown/removed-worktree-chat-drafts'
 
 export function worktreeBelongsToHost(worktree: { hostId?: string }, hostId: string): boolean {
   return (worktree.hostId ?? LOCAL_EXECUTION_HOST_ID) === hostId
@@ -83,6 +87,14 @@ export function createRepoRemovalActions(
         const idExistsOnOtherHost = get().repos.some(
           (repo) => repo.id === projectId && getRepoExecutionHostId(repo) !== ownerHostId
         )
+        // Why before the host call: its announcement can start a listing refresh that drops these tabs.
+        const chatDraftKeys = captureWorkspaceChatDraftKeys(
+          get(),
+          getKnownRepoWorktreeIds(get(), projectId, ownerHostId).map((workspaceId) => ({
+            workspaceId,
+            executionHostId: ownerHostId
+          }))
+        )
         try {
           await (target.kind === 'local'
             ? idExistsOnOtherHost
@@ -156,6 +168,7 @@ export function createRepoRemovalActions(
 
         // Why: use the canonical per-worktree purge to evict all worktree-scoped maps (hand-deletion leaked most); runs before the set() below so it still sees tabsByWorktree.
         get().purgeWorktreeTerminalState(purgeTargets)
+        deleteWorkspaceChatDrafts(chatDraftKeys)
         get().clearLocalDetectedAgentContextsForProjects(localAgentContextProjectIds)
 
         set((s) => {
diff --git a/src/renderer/src/store/slices/native-chat-launch-draft-teardown.test.ts b/src/renderer/src/store/slices/native-chat-launch-draft-teardown.test.ts
index d87c283ad23..915ef64300e 100644
--- a/src/renderer/src/store/slices/native-chat-launch-draft-teardown.test.ts
+++ b/src/renderer/src/store/slices/native-chat-launch-draft-teardown.test.ts
@@ -38,7 +38,19 @@ const mockApi = {
 // @ts-expect-error -- minimal window.api stub for the store under test
 globalThis.window = { api: mockApi }
 
-import { createTestStore, seedStore, makeWorktree, makeTab } from './store-test-helpers'
+import {
+  createTestStore,
+  seedStore,
+  makeWorktree,
+  makeTab,
+  makeTabGroup,
+  makeUnifiedTab
+} from './store-test-helpers'
+import {
+  readNativeChatComposerDraft,
+  structuredAgentSessionDraftScopeKey,
+  updateNativeChatComposerDraft
+} from '@/components/native-chat/native-chat-composer-draft-store'
 
 const WT1 = 'repo1::/path/wt1'
 const WT2 = 'repo1::/path/wt2'
@@ -151,4 +163,87 @@ describe('nativeChatLaunchDraftByTabId teardown', () => {
     expect(patch.nativeChatLaunchDraftByTabId[TAB1]).toBeUndefined()
     expect(patch.nativeChatLaunchDraftByTabId[TAB2]).toBeDefined()
   })
+
+  it('removing a worktree drops the unsent composer drafts of its tabs only', async () => {
+    const store = createTestStore()
+    seedDrafts(store)
+    updateNativeChatComposerDraft(`${TAB1}:leaf-a`, { text: 'unsent' }, 'immediate')
+    updateNativeChatComposerDraft(`${TAB2}:leaf-a`, { text: 'kept' }, 'immediate')
+
+    const result = await store.getState().removeWorktree({ id: WT1, executionHostId: null })
+
+    expect(result).toEqual({ ok: true })
+    expect(readNativeChatComposerDraft(`${TAB1}:leaf-a`).text).toBe('')
+    expect(readNativeChatComposerDraft(`${TAB2}:leaf-a`).text).toBe('kept')
+  })
+
+  it('a user tab close drops the unsent composer drafts of that tab’s panes only', () => {
+    const store = createTestStore()
+    seedDrafts(store)
+    updateNativeChatComposerDraft(`${TAB1}:leaf-a`, { text: 'unsent' }, 'immediate')
+    updateNativeChatComposerDraft(`${TAB2}:leaf-a`, { text: 'kept' }, 'immediate')
+
+    store.getState().closeTab(TAB2, { reason: 'pty-exit' })
+    store.getState().closeTab(TAB1)
+
+    expect(readNativeChatComposerDraft(`${TAB1}:leaf-a`).text).toBe('')
+    expect(readNativeChatComposerDraft(`${TAB2}:leaf-a`).text).toBe('kept')
+  })
+
+  function seedStructuredChat(store: ReturnType<typeof createTestStore>) {
+    const chat = makeUnifiedTab({
+      id: 'chat-tab',
+      entityId: 'session-1',
+      contentType: 'agent-session',
+      worktreeId: WT1,
+      groupId: 'group-1'
+    })
+    seedStore(store, {
+      worktreesByRepo: {
+        repo1: [
+          makeWorktree({ id: WT1, repoId: 'repo1', path: '/path/wt1' }),
+          makeWorktree({ id: WT2, repoId: 'repo1', path: '/path/wt2' })
+        ]
+      },
+      unifiedTabsByWorktree: { [WT1]: [chat] },
+      groupsByWorktree: {
+        [WT1]: [
+          makeTabGroup({
+            id: 'group-1',
+            worktreeId: WT1,
+            activeTabId: chat.id,
+            tabOrder: [chat.id]
+          })
+        ]
+      }
+    })
+    return chat
+  }
+
+  it('closing a structured chat tab keeps its conversation’s unsent draft', () => {
+    const store = createTestStore()
+    const chat = seedStructuredChat(store)
+    const conversation = structuredAgentSessionDraftScopeKey('session-1')
+    updateNativeChatComposerDraft(conversation, { text: 'unsent' }, 'immediate')
+
+    store.getState().closeUnifiedTab(chat.id)
+
+    expect(store.getState().unifiedTabsByWorktree[WT1]).toEqual([])
+    expect(readNativeChatComposerDraft(conversation).text).toBe('unsent')
+  })
+
+  it('removing a worktree drops its structured chats’ conversation drafts only', async () => {
+    const store = createTestStore()
+    seedStructuredChat(store)
+    const removed = structuredAgentSessionDraftScopeKey('session-1')
+    const other = structuredAgentSessionDraftScopeKey('session-2')
+    updateNativeChatComposerDraft(removed, { text: 'unsent' }, 'immediate')
+    updateNativeChatComposerDraft(other, { text: 'kept' }, 'immediate')
+
+    const result = await store.getState().removeWorktree({ id: WT1, executionHostId: null })
+
+    expect(result).toEqual({ ok: true })
+    expect(readNativeChatComposerDraft(removed).text).toBe('')
+    expect(readNativeChatComposerDraft(other).text).toBe('kept')
+  })
 })
diff --git a/src/renderer/src/store/slices/persisted-ui-write-baseline.test.ts b/src/renderer/src/store/slices/persisted-ui-write-baseline.test.ts
index f39ef11b03f..0efae37ca0c 100644
--- a/src/renderer/src/store/slices/persisted-ui-write-baseline.test.ts
+++ b/src/renderer/src/store/slices/persisted-ui-write-baseline.test.ts
@@ -10,6 +10,7 @@ import {
 function makeBaseline(overrides: Partial<PersistedUIWriteBaseline> = {}): PersistedUIWriteBaseline {
   return {
     sidebarWidth: 280,
+    sidebarOpen: true,
     rightSidebarOpen: true,
     rightSidebarTab: 'explorer',
     rightSidebarExplorerView: 'files',
@@ -145,3 +146,10 @@ describe('persistedUIWriteFieldsToWireUpdate', () => {
     expect(update).toEqual({ hideDefaultBranchWorkspace: true, groupBy: 'none' })
   })
 })
+
+describe('sidebarOpen write round-trip', () => {
+  it('sends a left sidebar close to main under its persisted key', () => {
+    const changed = diffPersistedUIWriteFields(makeBaseline({ sidebarOpen: false }), makeBaseline())
+    expect(persistedUIWriteFieldsToWireUpdate(changed)).toEqual({ sidebarOpen: false })
+  })
+})
diff --git a/src/renderer/src/store/slices/persisted-ui-write-baseline.ts b/src/renderer/src/store/slices/persisted-ui-write-baseline.ts
index 158e1b31bf2..47cd8a46b3f 100644
--- a/src/renderer/src/store/slices/persisted-ui-write-baseline.ts
+++ b/src/renderer/src/store/slices/persisted-ui-write-baseline.ts
@@ -10,6 +10,7 @@ import type { PersistedUIState } from '../../../../shared/persisted-ui-state-typ
  */
 export type PersistedUIWriteBaseline = {
   sidebarWidth: number
+  sidebarOpen: boolean
   rightSidebarOpen: boolean
   rightSidebarTab: PersistedUIState['rightSidebarTab']
   rightSidebarExplorerView: PersistedUIState['rightSidebarExplorerView']
@@ -40,6 +41,7 @@ export type PersistedUIWriteBaseline = {
 // this module exists to close (see ui-state-schema-parity.ts for the same lesson).
 const PERSISTED_UI_WRITE_BASELINE_FIELD_SET = {
   sidebarWidth: true,
+  sidebarOpen: true,
   rightSidebarOpen: true,
   rightSidebarTab: true,
   rightSidebarExplorerView: true,
diff --git a/src/renderer/src/store/slices/ssh.ts b/src/renderer/src/store/slices/ssh.ts
index ddeaf415fd5..640d95f79d9 100644
--- a/src/renderer/src/store/slices/ssh.ts
+++ b/src/renderer/src/store/slices/ssh.ts
@@ -22,6 +22,9 @@ export type RemoteWorkspaceSyncStatus = {
   hostObservationToken?: string
   lastSyncedAt?: number
   message?: string
+  /** Set only by an applied pull that ends in `conflict`: the host paths whose tabs this client
+   *  could not place. Every other worktree on the target holds the host's rows from that snapshot. */
+  unplacedTabWorktreePaths?: readonly string[]
 }
 
 export type SshCredentialRequest = {
diff --git a/src/renderer/src/store/slices/tabs/tabs-close-actions.ts b/src/renderer/src/store/slices/tabs/tabs-close-actions.ts
index f4cd23a01d7..910dd1bce53 100644
--- a/src/renderer/src/store/slices/tabs/tabs-close-actions.ts
+++ b/src/renderer/src/store/slices/tabs/tabs-close-actions.ts
@@ -73,6 +73,7 @@ export function createTabsCloseActions(
           console.warn('[structured-agent-session] close found no owning host', tab.entityId)
         }
         get().clearNativeChatLaunchDraft(structuredAgentSessionTabId(tab.entityId))
+        // The unsent draft stays: it belongs to the conversation, which can be reopened from history.
       }
       // Why: on closing the active tab, walk the MRU stack to the previously-active tab; pickNextActiveTab falls back to the neighbor.
       const nextActiveTabId =
diff --git a/src/renderer/src/store/slices/ui-contextual-tours.test.ts b/src/renderer/src/store/slices/ui-contextual-tours.test.ts
index 7a9adc8af7b..3db02f6e587 100644
--- a/src/renderer/src/store/slices/ui-contextual-tours.test.ts
+++ b/src/renderer/src/store/slices/ui-contextual-tours.test.ts
@@ -384,8 +384,7 @@ describe('createUISlice contextual tours', () => {
     stubContextualTourTargets([
       '[data-contextual-tour-target="terminal-pane-split-target"], [data-contextual-tour-target="workspace-agent-terminal-tip"]'
     ])
-    store.setState({ sidebarOpen: false })
-    store.getState().hydratePersistedUI(makeAutoTourEligibleUI())
+    store.getState().hydratePersistedUI(makeAutoTourEligibleUI({ sidebarOpen: false }))
     store
       .getState()
       .requestContextualTour('workspace-agent-sessions', 'setup_guide_parallel_work', false, {
diff --git a/src/renderer/src/store/slices/ui-hydration-view-layout.test.ts b/src/renderer/src/store/slices/ui-hydration-view-layout.test.ts
index fd01ee2d2a7..7173826d473 100644
--- a/src/renderer/src/store/slices/ui-hydration-view-layout.test.ts
+++ b/src/renderer/src/store/slices/ui-hydration-view-layout.test.ts
@@ -225,6 +225,43 @@ describe('createUISlice hydratePersistedUI', () => {
     expect(store.getState().rightSidebarWidth).toBe(360)
   })
 
+  it('hydrates a persisted closed left sidebar preference', () => {
+    const store = createUIStore()
+
+    store.getState().hydratePersistedUI(makePersistedUI({ sidebarOpen: false }))
+
+    expect(store.getState().sidebarOpen).toBe(false)
+  })
+
+  it('hydrates a persisted open left sidebar preference', () => {
+    const store = createUIStore()
+
+    store.getState().hydratePersistedUI(makePersistedUI({ sidebarOpen: true }))
+
+    expect(store.getState().sidebarOpen).toBe(true)
+  })
+
+  it('hydrates a missing left sidebar preference as open', () => {
+    const store = createUIStore()
+
+    store.setState({ sidebarOpen: false })
+    store.getState().hydratePersistedUI({ ...makePersistedUI(), sidebarOpen: undefined })
+
+    expect(store.getState().sidebarOpen).toBe(true)
+  })
+
+  it('keeps an unsaved left sidebar close when a sync omits the left sidebar preference', () => {
+    const store = createUIStore()
+    store.getState().hydratePersistedUI(makePersistedUI(), 'startup')
+
+    store.getState().setSidebarOpen(false)
+    store.getState().hydratePersistedUI({ ...makePersistedUI(), sidebarOpen: undefined }, 'sync')
+
+    // Why: the baseline must stay open or the writer sees no diff and the close never persists.
+    expect(store.getState().sidebarOpen).toBe(false)
+    expect(store.getState().persistedUIWriteBaseline?.sidebarOpen).toBe(true)
+  })
+
   it('hydrates a persisted closed right sidebar preference', () => {
     const store = createUIStore()
 
diff --git a/src/renderer/src/store/slices/ui/ui-slice-hydration-actions.ts b/src/renderer/src/store/slices/ui/ui-slice-hydration-actions.ts
index c8da9a29dcc..9df5868597d 100644
--- a/src/renderer/src/store/slices/ui/ui-slice-hydration-actions.ts
+++ b/src/renderer/src/store/slices/ui/ui-slice-hydration-actions.ts
@@ -88,10 +88,6 @@ export function createUiHydrationActions(set: UISliceSet, _get: UISliceGet): Par
         // Migration: one-shot old-'recent'→'smart' runs in main (_sortBySmartMigrated), not here, so a deliberate 'recent' choice survives restart.
         const sortBy = ui.sortBy
         const statusBarItemsWithGrok = hydrateStatusBarItems(ui)
-        const rightSidebarRoute = normalizeRightSidebarRoute(
-          ui.rightSidebarTab,
-          ui.rightSidebarExplorerView
-        )
         const hydrated = {
           // Why: persisted widths may be stale/corrupt/hand-edited; clamp during hydration so invalid values can't break layout.
           sidebarWidth: sanitizePersistedSidebarWidth(
@@ -114,9 +110,9 @@ export function createUiHydrationActions(set: UISliceSet, _get: UISliceGet): Par
             undefined,
             s.combinedDiffFileTreeWidth
           ),
+          sidebarOpen: typeof ui.sidebarOpen === 'boolean' ? ui.sidebarOpen : true,
           rightSidebarOpen: typeof ui.rightSidebarOpen === 'boolean' ? ui.rightSidebarOpen : true,
-          rightSidebarTab: rightSidebarRoute.rightSidebarTab,
-          rightSidebarExplorerView: rightSidebarRoute.rightSidebarExplorerView,
+          ...normalizeRightSidebarRoute(ui.rightSidebarTab, ui.rightSidebarExplorerView),
           groupBy: (ui.groupBy as UISlice['groupBy'] | 'parent') === 'parent' ? 'repo' : ui.groupBy,
           sortBy,
           // Why: main-process getUI() already normalized this (defaulting to 'manual'); read it through without migrating.
diff --git a/src/renderer/src/store/slices/workspace-chat-draft-removal.test.ts b/src/renderer/src/store/slices/workspace-chat-draft-removal.test.ts
new file mode 100644
index 00000000000..0f81e7f6c57
--- /dev/null
+++ b/src/renderer/src/store/slices/workspace-chat-draft-removal.test.ts
@@ -0,0 +1,267 @@
+/**
+ * A workspace's unsent chat drafts die only with a user's delete, by keys read before the host
+ * round trip. The host announces a removal before it replies, and a listing purge that lands first
+ * must not hide them; a purge that is not a user's delete must not erase them.
+ */
+import { describe, it, expect, vi, beforeEach } from 'vitest'
+import type * as AgentStatusModule from '@/lib/agent-status'
+import type { FolderWorkspace } from '../../../../shared/folder-workspace-types'
+import type { PublicKnownRuntimeEnvironment } from '../../../../shared/runtime-environments'
+import { toRuntimeExecutionHostId } from '../../../../shared/execution-host'
+import { folderWorkspaceKey } from '../../../../shared/workspace-scope'
+
+vi.mock('sonner', () => ({
+  toast: { info: vi.fn(), success: vi.fn(), error: vi.fn(), warning: vi.fn() }
+}))
+vi.mock('@/components/terminal-pane/pty-dispatcher', () => ({
+  restorePtyDataHandlersAfterFailedShutdown: vi.fn(),
+  unregisterPtyDataHandlers: vi.fn()
+}))
+vi.mock('@/lib/agent-status', async (importOriginal) => {
+  const actual = await importOriginal<typeof AgentStatusModule>()
+  return { ...actual, detectAgentStatusFromTitle: vi.fn().mockReturnValue(null) }
+})
+
+const mockApi = {
+  worktrees: { list: vi.fn(), remove: vi.fn(), updateMeta: vi.fn().mockResolvedValue({}) },
+  repos: { remove: vi.fn() },
+  folderWorkspaces: { delete: vi.fn() },
+  pty: { kill: vi.fn() },
+  runtimeEnvironments: { call: vi.fn().mockResolvedValue({ ok: true, result: {} }) }
+}
+// @ts-expect-error -- minimal window.api stub for the store under test
+globalThis.window = { api: mockApi }
+
+import {
+  createTestStore,
+  seedStore,
+  makeWorktree,
+  makeTab,
+  makeTabGroup,
+  makeUnifiedTab,
+  TEST_REPO
+} from './store-test-helpers'
+import {
+  clearNativeChatComposerDraftsForTests,
+  readNativeChatComposerDraft,
+  setNativeChatComposerDraftOwnerResolver,
+  structuredAgentSessionDraftScopeKey,
+  updateNativeChatComposerDraft
+} from '@/components/native-chat/native-chat-composer-draft-store'
+import { resolveNativeChatDraftOwner } from '@/lib/native-chat-draft-owner'
+
+const WT1 = 'repo1::/path/wt1'
+const WT2 = 'repo1::/path/wt2'
+const CHAT = structuredAgentSessionDraftScopeKey('session-1')
+const PANE = 'tab-wt1:leaf-a'
+const OTHER = 'tab-wt2:leaf-a'
+
+function seedWorkspace(store: ReturnType<typeof createTestStore>, workspaceId: string): void {
+  const chat = makeUnifiedTab({
+    id: 'chat-tab',
+    entityId: 'session-1',
+    contentType: 'agent-session',
+    worktreeId: workspaceId,
+    groupId: 'group-1'
+  })
+  seedStore(store, {
+    tabsByWorktree: {
+      [workspaceId]: [makeTab({ id: 'tab-wt1', worktreeId: workspaceId })],
+      [WT2]: [makeTab({ id: 'tab-wt2', worktreeId: WT2 })]
+    },
+    unifiedTabsByWorktree: { [workspaceId]: [chat] },
+    groupsByWorktree: {
+      [workspaceId]: [
+        makeTabGroup({
+          id: 'group-1',
+          worktreeId: workspaceId,
+          activeTabId: chat.id,
+          tabOrder: [chat.id]
+        })
+      ]
+    }
+  })
+  updateNativeChatComposerDraft(CHAT, { text: 'chat' }, 'immediate')
+  updateNativeChatComposerDraft(PANE, { text: 'pane' }, 'immediate')
+  updateNativeChatComposerDraft(OTHER, { text: 'other' }, 'immediate')
+}
+
+function seedWorktree(store: ReturnType<typeof createTestStore>): void {
+  seedStore(store, {
+    worktreesByRepo: {
+      repo1: [
+        makeWorktree({ id: WT1, repoId: 'repo1', path: '/path/wt1' }),
+        makeWorktree({ id: WT2, repoId: 'repo1', path: '/path/wt2' })
+      ]
+    }
+  })
+  seedWorkspace(store, WT1)
+}
+
+function draftTexts(): string[] {
+  return [CHAT, PANE, OTHER].map((key) => readNativeChatComposerDraft(key).text)
+}
+
+describe('workspace chat drafts on removal', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    mockApi.worktrees.remove.mockResolvedValue(undefined)
+    mockApi.repos.remove.mockResolvedValue(undefined)
+    clearNativeChatComposerDraftsForTests()
+  })
+
+  it('removing a worktree deletes its drafts even when a listing purge lands mid-removal', async () => {
+    const store = createTestStore()
+    seedWorktree(store)
+    mockApi.worktrees.remove.mockImplementation(async () => {
+      store.getState().purgeWorktreeTerminalState([WT1])
+    })
+
+    const result = await store.getState().removeWorktree({ id: WT1, executionHostId: null }, true)
+
+    expect(result).toEqual({ ok: true })
+    expect(draftTexts()).toEqual(['', '', 'other'])
+  })
+
+  it('removing a worktree deletes the draft of a chat whose tab was closed earlier', async () => {
+    const store = createTestStore()
+    seedWorktree(store)
+    setNativeChatComposerDraftOwnerResolver((scopeKey) =>
+      resolveNativeChatDraftOwner(store.getState(), scopeKey)
+    )
+    const closed = structuredAgentSessionDraftScopeKey('session-closed')
+    seedStore(store, {
+      unifiedTabsByWorktree: {
+        [WT1]: [
+          ...(store.getState().unifiedTabsByWorktree[WT1] ?? []),
+          makeUnifiedTab({
+            id: 'closed-tab',
+            entityId: 'session-closed',
+            contentType: 'agent-session',
+            worktreeId: WT1,
+            groupId: 'group-1'
+          })
+        ]
+      }
+    })
+    updateNativeChatComposerDraft(closed, { text: 'written, then its tab closed' }, 'immediate')
+    store.getState().closeUnifiedTab('closed-tab')
+    expect(readNativeChatComposerDraft(closed).text).toBe('written, then its tab closed')
+
+    const result = await store.getState().removeWorktree({ id: WT1, executionHostId: null }, true)
+
+    expect(result).toEqual({ ok: true })
+    expect(readNativeChatComposerDraft(closed).text).toBe('')
+    expect(draftTexts()).toEqual(['', '', 'other'])
+  })
+
+  it('a removal the host refuses keeps the drafts', async () => {
+    vi.spyOn(console, 'warn').mockImplementation(() => {})
+    const store = createTestStore()
+    seedWorktree(store)
+    mockApi.worktrees.remove.mockRejectedValue(new Error('Permission denied'))
+
+    const result = await store.getState().removeWorktree({ id: WT1, executionHostId: null }, true)
+
+    expect(result.ok).toBe(false)
+    expect(draftTexts()).toEqual(['chat', 'pane', 'other'])
+  })
+
+  it('a listing purge alone keeps the drafts', () => {
+    const store = createTestStore()
+    seedWorktree(store)
+
+    store.getState().purgeWorktreeTerminalState([WT1])
+
+    expect(store.getState().unifiedTabsByWorktree[WT1]).toBeUndefined()
+    expect(draftTexts()).toEqual(['chat', 'pane', 'other'])
+  })
+
+  it('re-pairing a server under the same id keeps the drafts of chats it restores', () => {
+    const runtime = toRuntimeExecutionHostId('env-a')
+    const environment = (pairingRevision: number): PublicKnownRuntimeEnvironment => ({
+      id: 'env-a',
+      name: 'Server',
+      createdAt: 1,
+      updatedAt: 1,
+      pairingRevision,
+      lastUsedAt: null,
+      runtimeId: null,
+      endpoints: [{ id: 'e', kind: 'websocket', label: 'Server', endpoint: 'ws://server' }],
+      preferredEndpointId: 'e'
+    })
+    const store = createTestStore()
+    seedStore(store, {
+      runtimeEnvironments: [environment(1)],
+      repos: [TEST_REPO, { ...TEST_REPO, id: 'repoA', path: '/repoA', executionHostId: runtime }],
+      worktreesByRepo: {
+        repoA: [makeWorktree({ id: WT1, repoId: 'repoA', path: '/path/wt1', hostId: runtime })]
+      }
+    })
+    seedWorkspace(store, WT1)
+
+    store.getState().setRuntimeEnvironments([environment(2)])
+
+    expect(store.getState().unifiedTabsByWorktree[WT1]).toBeUndefined()
+    expect(draftTexts()).toEqual(['chat', 'pane', 'other'])
+  })
+
+  it('removing a project deletes its worktrees’ drafts only', async () => {
+    const store = createTestStore()
+    seedStore(store, { repos: [{ ...TEST_REPO, id: 'repo1' }] })
+    seedWorktree(store)
+    seedStore(store, {
+      worktreesByRepo: {
+        repo1: [makeWorktree({ id: WT1, repoId: 'repo1', path: '/path/wt1' })],
+        repo2: [makeWorktree({ id: WT2, repoId: 'repo2', path: '/path/wt2' })]
+      }
+    })
+
+    await store.getState().removeProject('repo1')
+
+    expect(draftTexts()).toEqual(['', '', 'other'])
+  })
+
+  it('deleting a folder workspace deletes its drafts', async () => {
+    const folder: FolderWorkspace = {
+      id: 'folder-1',
+      projectGroupId: 'group-a',
+      name: 'Folder',
+      folderPath: '/workspace/folder',
+      linkedTask: null,
+      comment: '',
+      isArchived: false,
+      isUnread: false,
+      isPinned: false,
+      sortOrder: 1,
+      lastActivityAt: 0,
+      createdAt: 1,
+      updatedAt: 1
+    }
+    mockApi.folderWorkspaces.delete.mockResolvedValue(true)
+    const store = createTestStore()
+    store.setState({
+      projectGroups: [
+        {
+          id: 'group-a',
+          name: 'A',
+          parentPath: '/workspace',
+          parentGroupId: null,
+          createdFrom: 'manual',
+          tabOrder: 0,
+          isCollapsed: false,
+          color: null,
+          createdAt: 1,
+          updatedAt: 1,
+          executionHostId: 'local'
+        }
+      ],
+      folderWorkspaces: [folder]
+    })
+    seedWorkspace(store, folderWorkspaceKey(folder.id))
+
+    await expect(store.getState().deleteFolderWorkspace(folder.id)).resolves.toBe(true)
+
+    expect(draftTexts()).toEqual(['', '', 'other'])
+  })
+})
diff --git a/src/renderer/src/store/slices/worktrees/teardown/remove-worktree.ts b/src/renderer/src/store/slices/worktrees/teardown/remove-worktree.ts
index 3ca041aeb75..626aeacc2bf 100644
--- a/src/renderer/src/store/slices/worktrees/teardown/remove-worktree.ts
+++ b/src/renderer/src/store/slices/worktrees/teardown/remove-worktree.ts
@@ -41,6 +41,7 @@ import { recordRemovedWorktreeSnapshotPrune } from './removed-worktree-snapshot-
 import { clearSessionCommitDraftForWorktree } from '@/lib/source-control-commit-draft-session'
 import { dispatchWorktreeRemoval } from './dispatch-worktree-removal'
 import { tearDownRemovedWorktreeRendererState } from './removed-worktree-renderer-teardown'
+import { captureWorktreeStateBeforeRemoval } from './worktree-state-before-removal'
 
 export function createRemoveWorktree(
   set: WorktreeSliceSet,
@@ -108,9 +109,7 @@ export function createRemoveWorktree(
         worktreeId,
         requiredExecutionHostId
       )
-      const terminalPtyIdsBeforeRemoval = (get().tabsByWorktree[worktreeId] ?? []).flatMap(
-        (tab) => get().ptyIdsByTabId[tab.id] ?? []
-      )
+      const beforeRemoval = captureWorktreeStateBeforeRemoval(get(), worktreeId, hostId)
       if (!forgetLocalOnly) {
         removalGenerationGuard?.assertCurrent()
       }
@@ -252,7 +251,7 @@ export function createRemoveWorktree(
         worktreeId,
         hostId,
         requiredExecutionHostId,
-        terminalPtyIdsBeforeRemoval,
+        beforeRemoval,
         catalogVersion: removalResult?.catalogVersion
       })
       // Why: Source Control may be unmounted during deletion, so it can't be the only stale-draft cleanup path.
diff --git a/src/renderer/src/store/slices/worktrees/teardown/removed-worktree-chat-drafts.ts b/src/renderer/src/store/slices/worktrees/teardown/removed-worktree-chat-drafts.ts
new file mode 100644
index 00000000000..14ae90b6e74
--- /dev/null
+++ b/src/renderer/src/store/slices/worktrees/teardown/removed-worktree-chat-drafts.ts
@@ -0,0 +1,61 @@
+import type { AppState } from '../../../types'
+import type { ExecutionHostId } from '../../../../../../shared/execution-host'
+import type { NativeChatComposerDraftOwner } from '@/components/native-chat/native-chat-composer-draft-storage'
+import {
+  deleteNativeChatComposerDraft,
+  deleteNativeChatComposerDraftsForTab,
+  deleteNativeChatComposerDraftsOwnedBy,
+  structuredAgentSessionDraftScopeKey
+} from '@/components/native-chat/native-chat-composer-draft-store'
+
+/** Which unsent chat drafts a workspace owns: every draft that recorded it as its owner, open and
+ *  closed chats alike, plus its open tabs' conversation keys and terminal tab ids (each tab's pane
+ *  drafts) for drafts written before their owner could be named. */
+export type WorkspaceChatDraftKeys = {
+  readonly owners: readonly NativeChatComposerDraftOwner[]
+  readonly conversations: readonly string[]
+  readonly terminalTabIds: readonly string[]
+}
+
+/**
+ * Read before a user's delete goes to the host: the host announces the removal before it replies,
+ * and the listing refresh that starts can drop the tab lists these keys are found through.
+ */
+export function captureWorkspaceChatDraftKeys(
+  state: Pick<AppState, 'tabsByWorktree' | 'unifiedTabsByWorktree'>,
+  workspaces: readonly {
+    readonly workspaceId: string
+    readonly executionHostId: ExecutionHostId | null | undefined
+  }[]
+): WorkspaceChatDraftKeys {
+  const owners: NativeChatComposerDraftOwner[] = []
+  const conversations: string[] = []
+  const terminalTabIds: string[] = []
+  for (const { workspaceId, executionHostId } of workspaces) {
+    if (executionHostId) {
+      owners.push({ workspaceId, executionHostId })
+    }
+    for (const tab of state.unifiedTabsByWorktree[workspaceId] ?? []) {
+      if (tab.contentType === 'agent-session') {
+        conversations.push(structuredAgentSessionDraftScopeKey(tab.entityId))
+      }
+    }
+    for (const tab of state.tabsByWorktree[workspaceId] ?? []) {
+      terminalTabIds.push(tab.id)
+    }
+  }
+  return { owners, conversations, terminalTabIds }
+}
+
+/** Only after the delete succeeded: a refused or failed one keeps the drafts. */
+export function deleteWorkspaceChatDrafts(keys: WorkspaceChatDraftKeys): void {
+  for (const owner of keys.owners) {
+    deleteNativeChatComposerDraftsOwnedBy(owner)
+  }
+  for (const key of keys.conversations) {
+    deleteNativeChatComposerDraft(key)
+  }
+  for (const tabId of keys.terminalTabIds) {
+    deleteNativeChatComposerDraftsForTab(tabId)
+  }
+}
diff --git a/src/renderer/src/store/slices/worktrees/teardown/removed-worktree-renderer-teardown.ts b/src/renderer/src/store/slices/worktrees/teardown/removed-worktree-renderer-teardown.ts
index ab8309338c5..4a4c0a4a2e6 100644
--- a/src/renderer/src/store/slices/worktrees/teardown/removed-worktree-renderer-teardown.ts
+++ b/src/renderer/src/store/slices/worktrees/teardown/removed-worktree-renderer-teardown.ts
@@ -11,6 +11,8 @@ import { disposeRemovedWorktreeParkedTerminalWatchers } from '../../../../compon
 import { detachedHeadAutoDerivedDisplayNames } from '../metadata/detached-head-display-name'
 import { applyRemoveWorktreeSuccessState } from './remove-worktree-store-cleanup'
 import { purgeOrphanedRuntimeSshProjects } from './orphaned-runtime-ssh-project-purge'
+import { deleteWorkspaceChatDrafts } from './removed-worktree-chat-drafts'
+import type { WorktreeStateBeforeRemoval } from './worktree-state-before-removal'
 
 /**
  * Renderer-side teardown after the backend removal succeeded.
@@ -25,12 +27,11 @@ export async function tearDownRemovedWorktreeRendererState(args: {
   worktreeId: string
   hostId: ExecutionHostId | undefined
   requiredExecutionHostId: ExecutionHostId | null
-  terminalPtyIdsBeforeRemoval: readonly string[]
+  beforeRemoval: WorktreeStateBeforeRemoval
   /** The catalog the host's removal produced, when the host stamps it. */
   catalogVersion?: WorktreeCatalogVersion
 }): Promise<void> {
-  const { set, get, worktreeId, hostId, requiredExecutionHostId, terminalPtyIdsBeforeRemoval } =
-    args
+  const { set, get, worktreeId, hostId, requiredExecutionHostId, beforeRemoval } = args
   // Why first: a listing scanned before this removal must not be applied after it and bring
   // the row back, so the version is on record before any await below yields.
   if (hostId && args.catalogVersion) {
@@ -44,6 +45,9 @@ export async function tearDownRemovedWorktreeRendererState(args: {
       )
     )
   }
+  // Why the captured keys: closing a structured chat keeps its conversation's draft, and a listing
+  // refresh may already have dropped these tabs.
+  deleteWorkspaceChatDrafts(beforeRemoval.chatDraftKeys)
   for (const tab of get().unifiedTabsByWorktree[worktreeId] ?? []) {
     if (tab.contentType === 'agent-session') {
       get().closeUnifiedTab(tab.id, {
@@ -84,7 +88,7 @@ export async function tearDownRemovedWorktreeRendererState(args: {
   requestVirtualizedScrollAnchorRecord('[data-worktree-sidebar]')
 
   // Why: dispose parked terminal watchers only on explicit deletion; identity migration/remounts must keep buffered PTY state.
-  disposeRemovedWorktreeParkedTerminalWatchers(worktreeId, terminalPtyIdsBeforeRemoval)
+  disposeRemovedWorktreeParkedTerminalWatchers(worktreeId, beforeRemoval.terminalPtyIds)
   applyRemoveWorktreeSuccessState(set, worktreeId, tabIds, requiredExecutionHostId ?? hostId)
   get().removeWorkspaceSpaceWorktrees?.(
     hostId ? [{ id: worktreeId, executionHostId: hostId }] : [worktreeId]
diff --git a/src/renderer/src/store/slices/worktrees/teardown/worktree-state-before-removal.ts b/src/renderer/src/store/slices/worktrees/teardown/worktree-state-before-removal.ts
new file mode 100644
index 00000000000..6866089abc1
--- /dev/null
+++ b/src/renderer/src/store/slices/worktrees/teardown/worktree-state-before-removal.ts
@@ -0,0 +1,28 @@
+import type { AppState } from '../../../types'
+import type { ExecutionHostId } from '../../../../../../shared/execution-host'
+import {
+  captureWorkspaceChatDraftKeys,
+  type WorkspaceChatDraftKeys
+} from './removed-worktree-chat-drafts'
+
+/** What the teardown needs from the worktree's tab lists, which a listing refresh started during
+ *  the removal round trip can drop before the teardown runs. */
+export type WorktreeStateBeforeRemoval = {
+  readonly terminalPtyIds: readonly string[]
+  readonly chatDraftKeys: WorkspaceChatDraftKeys
+}
+
+export function captureWorktreeStateBeforeRemoval(
+  state: Pick<AppState, 'tabsByWorktree' | 'unifiedTabsByWorktree' | 'ptyIdsByTabId'>,
+  worktreeId: string,
+  executionHostId: ExecutionHostId | undefined
+): WorktreeStateBeforeRemoval {
+  return {
+    terminalPtyIds: (state.tabsByWorktree[worktreeId] ?? []).flatMap(
+      (tab) => state.ptyIdsByTabId[tab.id] ?? []
+    ),
+    chatDraftKeys: captureWorkspaceChatDraftKeys(state, [
+      { workspaceId: worktreeId, executionHostId }
+    ])
+  }
+}
diff --git a/src/renderer/src/store/terminals/terminal-tab-close.ts b/src/renderer/src/store/terminals/terminal-tab-close.ts
index 8227521d2ec..254a8c51c4e 100644
--- a/src/renderer/src/store/terminals/terminal-tab-close.ts
+++ b/src/renderer/src/store/terminals/terminal-tab-close.ts
@@ -17,6 +17,7 @@ import { commitTerminalSurfaceClose } from './terminal-surface-close-intent'
 import { omitUnverifiedPtyLossTabIds } from './terminal-unverified-pty-loss'
 import { removePaneKeysByTabPrefix } from '../slices/agent-status-pane-keyed-records'
 import { omitRecordKeys } from '../slices/worktrees/teardown/record-key-omission'
+import { deleteNativeChatComposerDraftsForTab } from '@/components/native-chat/native-chat-composer-draft-store'
 
 export function createTerminalTabCloseActions(
   set: TerminalStoreSet,
@@ -250,6 +251,11 @@ export function createTerminalTabCloseActions(
       if (intentReason && closingWorktreeId && opts?.remoteCloseOwnedByHost !== true) {
         commitTerminalSurfaceClose(closingWorktreeId, { kind: 'tab', tabId }, intentReason)
       }
+      // Why only a user close: it is the explicit abandon. Other closes keep the drafts until their
+      // workspace is removed in Orca; drafts have no budget that retires them.
+      if (closeReason === 'user') {
+        deleteNativeChatComposerDraftsForTab(tabId)
+      }
       // Why shared with the paired snapshot apply: every path that removes a tab owes it the same sweep, and a second copy of the list is how one path silently misses a new entry.
       sweepRetiredTerminalTabState(get(), tabId, closingWorktreeId)
       for (const tabs of Object.values(get().unifiedTabsByWorktree)) {
diff --git a/src/renderer/src/web/preload-api/web-preference-normalization.ts b/src/renderer/src/web/preload-api/web-preference-normalization.ts
index 37b57d0e401..1b805b3c223 100644
--- a/src/renderer/src/web/preload-api/web-preference-normalization.ts
+++ b/src/renderer/src/web/preload-api/web-preference-normalization.ts
@@ -69,6 +69,7 @@ export function mergeHostWebUIState(
     hideWorkspacesFromOtherDevices: local.hideWorkspacesFromOtherDevices === true,
     manualRepoOrder: local.manualRepoOrder,
     workspaceHostOrder: local.workspaceHostOrder,
+    sidebarOpen: local.sidebarOpen,
     agentsVisibleHostIds: local.agentsVisibleHostIds,
     agentsFilterRepoIds: local.agentsFilterRepoIds,
     agentsHideWorkspacesFromOtherDevices: local.agentsHideWorkspacesFromOtherDevices === true,
diff --git a/src/renderer/src/web/preload-api/web-ui-api.ts b/src/renderer/src/web/preload-api/web-ui-api.ts
index c92f741ba38..6672649c9a6 100644
--- a/src/renderer/src/web/preload-api/web-ui-api.ts
+++ b/src/renderer/src/web/preload-api/web-ui-api.ts
@@ -162,6 +162,8 @@ export function createWebUiApi(): NonNullable<Partial<PreloadApi>['ui']> {
     clipboardHasImage,
     // Browsers expose copied files only inside a paste event.
     readClipboardFilePaths: async () => [],
+    // Why empty: a browser has no local paste folder, so restored pastes stay to attach again.
+    restoreNativeChatPastes: async () => [],
     readClipboardImageThumbnail: () => readClipboardImageThumbnail().catch(() => null),
     writeClipboardText: writeWebClipboardText,
     writeTerminalClipboardText: writeWebClipboardText,
diff --git a/src/renderer/src/web/web-preload-api-ui-pairing-local-fields.test.ts b/src/renderer/src/web/web-preload-api-ui-pairing-local-fields.test.ts
index e1f9ede3818..7a1cffeaedf 100644
--- a/src/renderer/src/web/web-preload-api-ui-pairing-local-fields.test.ts
+++ b/src/renderer/src/web/web-preload-api-ui-pairing-local-fields.test.ts
@@ -21,14 +21,13 @@ describe('web UI preload API pairing-local fields', () => {
     vi.doUnmock('./web-runtime-client')
   })
 
-  // Census-driven, matching the host-side seam tests: a field added to PAIRING_LOCAL_UI_FIELDS
-  // without wiring the web read seam fails here rather than shipping. The host sample differs from
-  // the browser's for every field, so only the pin makes this pass.
+  // Different host samples expose any missing browser-local pin.
   const browserLocalUiSamples: Record<PairingLocalUiField, unknown> = {
     automationHostFilter: { kind: 'host', hostKey: 'browser-local-host-key' },
     hideWorkspacesFromOtherDevices: true,
     manualRepoOrder: [{ hostId: 'runtime:web-env-1', repoId: 'repo-b' }],
     workspaceHostOrder: ['runtime:web-env-1', 'local'],
+    sidebarOpen: false,
     agentsVisibleHostIds: ['runtime:web-env-1'],
     agentsFilterRepoIds: ['repo-b'],
     agentsHideWorkspacesFromOtherDevices: true,
@@ -47,6 +46,7 @@ describe('web UI preload API pairing-local fields', () => {
     hideWorkspacesFromOtherDevices: false,
     manualRepoOrder: [{ hostId: 'local', repoId: 'repo-a' }],
     workspaceHostOrder: ['local', 'ssh:box'],
+    sidebarOpen: true,
     agentsVisibleHostIds: ['local'],
     agentsFilterRepoIds: ['repo-a'],
     agentsHideWorkspacesFromOtherDevices: false,
@@ -61,9 +61,13 @@ describe('web UI preload API pairing-local fields', () => {
     manuallyUnreadTurnsByPaneKey: { 'tab-2:leaf-2': 654 }
   }
 
-  it.each(PAIRING_LOCAL_UI_FIELDS.map((field) => [field] as const))(
-    'keeps the browser-local %s and never sends it to the host',
-    async (field) => {
+  it.each(
+    PAIRING_LOCAL_UI_FIELDS.flatMap((field) =>
+      (['set', 'setWithAck'] as const).map((method) => [field, method] as const)
+    )
+  )(
+    'keeps the browser-local %s and never sends it to the host through %s',
+    async (field, method) => {
       const runtimeCalls: { method: string; params: unknown }[] = []
       vi.doMock('./web-runtime-client', () => ({
         WebRuntimeClient: class {
@@ -81,14 +85,18 @@ describe('web UI preload API pairing-local fields', () => {
         }
       }))
 
-      const browserLocal = { [field]: browserLocalUiSamples[field] } as Partial<PersistedUIState>
+      const browserLocal: Partial<PersistedUIState> = { [field]: browserLocalUiSamples[field] }
       const globals = installBrowserGlobals('Linux')
       writeStoredRuntimeEnvironment(globals.storage)
-      globals.storage.setItem('orca.web.ui.v1', JSON.stringify(browserLocal))
       const { installWebPreloadApi } = await import('./web-preload-api')
       installWebPreloadApi()
 
-      await globals.window.api.ui.set({ ...browserLocal, sidebarWidth: 280 })
+      const write = globals.window.api.ui[method]
+      expect(write).toBeTypeOf('function')
+      if (!write) {
+        throw new Error('Missing UI write method')
+      }
+      await write({ ...browserLocal, sidebarWidth: 280 })
 
       expect(runtimeCalls[0]).toEqual({ method: 'ui.set', params: { sidebarWidth: 280 } })
       await expect(globals.window.api.ui.get()).resolves.toMatchObject(browserLocal)
diff --git a/src/shared/agent-resume-argv-drop.test.ts b/src/shared/agent-resume-argv-drop.test.ts
index a1703274d9a..7006497ec43 100644
--- a/src/shared/agent-resume-argv-drop.test.ts
+++ b/src/shared/agent-resume-argv-drop.test.ts
@@ -36,6 +36,24 @@ describe('dropAgentResumeArgvFromCommand', () => {
     }
   })
 
+  it('leaves the Codex folder setting behind when dropping an AI Vault resume', () => {
+    const plan = buildAgentResumeStartupPlan({
+      agent: 'codex',
+      providerSession: CODEX_SESSION,
+      cmdOverrides: {},
+      platform: 'darwin',
+      resumeInLaunchCwd: true
+    })
+
+    expect(
+      dropAgentResumeArgvFromCommand({
+        command: plan?.launchCommand ?? '',
+        agent: 'codex',
+        providerSession: CODEX_SESSION
+      })
+    ).toEqual({ status: 'dropped', command: "codex '-c' 'tui.resume_cwd=current'" })
+  })
+
   it('keeps the user CLI args that precede the resume argv', () => {
     expect(
       dropAgentResumeArgvFromCommand({
diff --git a/src/shared/agent-session-answered-turn-schema.ts b/src/shared/agent-session-answered-turn-schema.ts
new file mode 100644
index 00000000000..44f574d9ec1
--- /dev/null
+++ b/src/shared/agent-session-answered-turn-schema.ts
@@ -0,0 +1,7 @@
+import { z } from 'zod'
+
+/** A submission's answered turn as published. `via` is a string, as `dispatchState` is: a newer
+ *  host may name another way of joining. null: the host recorded no turn. */
+export const AgentJournalAnsweredTurnSchema = z
+  .object({ turnItemId: z.string().min(1), via: z.string().min(1) })
+  .nullable()
diff --git a/src/shared/agent-session-failure-fact-schema.ts b/src/shared/agent-session-failure-fact-schema.ts
new file mode 100644
index 00000000000..c8e57449066
--- /dev/null
+++ b/src/shared/agent-session-failure-fact-schema.ts
@@ -0,0 +1,10 @@
+import { z } from 'zod'
+
+/** A failure fact as a journal row carries it. Open like a row's `state`: a kind, audience or
+ *  refusal detail a newer host writes must not turn the row malformed; the fact reader is where an
+ *  unplaceable one is dropped. */
+export const AgentSessionFailureFactSchema = z.object({
+  kind: z.string().min(1),
+  detail: z.object({ text: z.string(), audience: z.string().min(1) }).optional(),
+  refusal: z.object({ code: z.string().min(1), details: z.looseObject({}).optional() }).optional()
+})
diff --git a/src/shared/agent-session-journal-schemas.ts b/src/shared/agent-session-journal-schemas.ts
index 701589e8565..813d099264b 100644
--- a/src/shared/agent-session-journal-schemas.ts
+++ b/src/shared/agent-session-journal-schemas.ts
@@ -28,6 +28,8 @@
 import { z } from 'zod'
 import { AgentSessionContextUsageSchema } from './agent-session-context-usage-schema'
 import { AgentJournalThreadGoalStateSchema } from './agent-session-journal-thread-goal-schema'
+import { AgentSessionFailureFactSchema } from './agent-session-failure-fact-schema'
+import { AgentJournalAnsweredTurnSchema } from './agent-session-answered-turn-schema'
 import { knownTags, openDiscriminatedUnion } from './agent-session-journal-open-union'
 import type {
   AgentJournalItemBody,
@@ -187,14 +189,6 @@ const MessageBody = z.object({
   completedAt: z.number().finite().optional()
 })
 
-/** Open like `state`: a kind, audience or refusal detail a newer host writes must not turn the row
- *  malformed; the fact reader is where an unplaceable one is dropped. */
-const FailureFact = z.object({
-  kind: z.string().min(1),
-  detail: z.object({ text: z.string(), audience: z.string().min(1) }).optional(),
-  refusal: z.object({ code: z.string().min(1), details: z.looseObject({}).optional() }).optional()
-})
-
 const KnownItemBody = z.discriminatedUnion('kind', [
   MessageBody,
   z.object({
@@ -248,7 +242,7 @@ const KnownItemBody = z.discriminatedUnion('kind', [
       .optional(),
     providerFrame: ProviderFrame.optional(),
     threadGoal: AgentJournalThreadGoalStateSchema.optional(),
-    failure: FailureFact.optional()
+    failure: AgentSessionFailureFactSchema.optional()
   }),
   z.object({
     kind: z.literal('turn'),
@@ -315,10 +309,12 @@ export const AgentJournalSubmissionSchema = z.object({
   reason: z.string().nullable(),
   submittedAt: z.number(),
   resolvedAt: z.number().nullable(),
+  submittedSequence: z.number().int().optional(),
+  answeredInTurn: AgentJournalAnsweredTurnSchema.optional(),
   recovered: z.literal(true).optional(),
   handoverRecorded: z.literal(true).optional(),
   handedOverAt: z.number().optional(),
-  rejection: FailureFact.optional(),
+  rejection: AgentSessionFailureFactSchema.optional(),
   // Listed, or the parse strips it: this schema drops unknown keys.
   queuedMessageId: z.string().min(1).optional()
 })
diff --git a/src/shared/agent-session-journal-types.ts b/src/shared/agent-session-journal-types.ts
index 323e22fda50..0bd8d2a8c92 100644
--- a/src/shared/agent-session-journal-types.ts
+++ b/src/shared/agent-session-journal-types.ts
@@ -419,6 +419,19 @@ export type AgentJournalRenderItem = AgentJournalProducerLinkage & {
 
 // ─── Submissions ────────────────────────────────────────────────────────────
 
+/** The turn a send was answered into: its record's item id, and how the send joined it. `start`:
+ *  the provider answered the send's start request with that turn; `steer`: Orca steered it into
+ *  that running turn. Known limit: a start the provider silently folds into a running turn reads
+ *  as `start`, including into a turn no user entry opened. A newer host may name another way,
+ *  which a reader leaves unclaimed. */
+export type AgentJournalAnsweredTurn = { turnItemId: string; via: AgentJournalTurnJoin }
+export type AgentJournalTurnJoin = 'start' | 'steer'
+/** The same, as a writer names it: the turn record's identity, keyed when the row is written. */
+export type AgentJournalAnsweredTurnIdentity = {
+  turn: AgentJournalItemIdentity
+  via: AgentJournalTurnJoin
+}
+
 export const AGENT_JOURNAL_DISPATCH_STATES = ['pending', 'accepted', 'rejected', 'unknown'] as const
 export type AgentJournalDispatchState = (typeof AGENT_JOURNAL_DISPATCH_STATES)[number]
 
@@ -439,6 +452,15 @@ export type AgentJournalSubmission = {
   rejection?: UnreadAgentSessionFailureFact
   submittedAt: number
   resolvedAt: number | null
+  /** Where the journal wrote this submission's row: its sequence, recomputed on every fold and
+   *  never stored. Needed because a rejected send's own row moves to its rejection, which erases
+   *  where it was sent. Absent from hosts that predate it. */
+  submittedSequence?: number
+  /** On `rejected`: the turn a Codex send was answered into, when that turn ended without taking
+   *  it. null: the host recorded that it was answered into no turn, as every other rejection is
+   *  (Claude, a queued message taken back before handover, restart recovery). Absent: written
+   *  before this field existed, or not rejected. A stored value this build cannot read is null. */
+  answeredInTurn?: AgentJournalAnsweredTurn | null
   /** Set when crash reconciliation resolved the dispatch, not the provider. A live
    *  `unknown` is a send still outstanding; a recovered one outlived its writer. */
   recovered?: true
@@ -447,13 +469,16 @@ export type AgentJournalSubmission = {
   handoverRecorded?: true
   /** When the host handed it to the provider (its `dispatch{pending}` row). */
   handedOverAt?: number
-  /** Host-only: the submission row's sequence, which tells which host process accepted it. */
+  /** Host-only: the submission row's sequence, which tells which host process accepted it. Set
+   *  only on a send accepted for later handover. The snapshot still carries it, but the submission
+   *  schema omits it; no released client reads it, and clients read `submittedSequence` instead. */
   acceptedSequence?: number
   /** The queued draft this submission hands off; absent for a direct send. Read this, never
    *  a draft id compared with `clientMessageId`. */
   queuedMessageId?: string
   /** Host-only: who asked for this turn — a person over the client send RPC, or Orca itself.
-   *  A person's turn is what ends a Stop's queue pause. */
+   *  A person's turn is what ends a Stop's queue pause. The snapshot still carries it; no released
+   *  client reads it. */
   origin?: 'client' | 'host'
 }
 
diff --git a/src/shared/agent-session-message-source.ts b/src/shared/agent-session-message-source.ts
new file mode 100644
index 00000000000..f0ab9a71f13
--- /dev/null
+++ b/src/shared/agent-session-message-source.ts
@@ -0,0 +1,88 @@
+// Who a chat message is from: the person at the composer, or another agent through Orca.
+// Persisted with a queued card (`queued_messages.source_json`), so the chat can name each sender.
+
+import { z } from 'zod'
+import { isOrcaSessionId, type OrcaSessionId } from './orca-session-address'
+import type { OrchestrationPartyIdentity } from './orchestration-party-identity'
+
+/**
+ * An agent a message is from, named by the orchestration database of the host that stores the
+ * message: the only host whose agents can send today. A relayed sender adds its host here. No pane
+ * key: it reads and consumes that agent's mailbox, so the host resolves it from the handle.
+ */
+export type AgentMessageSender = Readonly<{ party: Omit<OrchestrationPartyIdentity, 'paneKey'> }>
+
+/** One orchestration message a notice points at: its record, and its sender's `senders` address. */
+export type OrchestrationMailMessage = Readonly<{ messageId: string; runId: string; from: string }>
+
+/** "You have N orchestration messages": the pointer a terminal agent is typed, for a mailbox's
+ *  unread mail, which the agent reads with `check`. */
+export type OrchestrationMailNotice = Readonly<{
+  message: 'mail-notice'
+  mailbox: string
+  dispatchId: string | null
+  messages: readonly OrchestrationMailMessage[]
+}>
+
+/** What Orca delivers for other agents, one shape per message kind. */
+export type OrchestrationAgentMessage = OrchestrationMailNotice
+
+export type AgentMessageSource = Readonly<{
+  kind: 'agent'
+  /** Every distinct sender of the messages it carries, in mail order. */
+  senders: readonly AgentMessageSender[]
+  orchestration: OrchestrationAgentMessage
+}>
+
+export type AgentSessionMessageSource = Readonly<{ kind: 'user' }> | AgentMessageSource
+
+export const USER_MESSAGE_SOURCE: AgentSessionMessageSource = { kind: 'user' }
+
+const MESSAGE_SOURCE_VERSION = 1
+
+const orcaSessionIdSchema = z.custom<OrcaSessionId>(
+  (value) => typeof value === 'string' && isOrcaSessionId(value)
+)
+
+const mailNoticeSchema = z.object({
+  message: z.literal('mail-notice'),
+  mailbox: z.string(),
+  dispatchId: z.string().nullable(),
+  messages: z.array(z.object({ messageId: z.string(), runId: z.string(), from: z.string() }))
+})
+
+// Not strict: a newer build may add a field, which this one keeps no use for and must not reject.
+const storedSourceSchema = z.discriminatedUnion('kind', [
+  z.object({ v: z.literal(MESSAGE_SOURCE_VERSION), kind: z.literal('user') }),
+  z.object({
+    v: z.literal(MESSAGE_SOURCE_VERSION),
+    kind: z.literal('agent'),
+    senders: z.array(
+      z.object({
+        party: z.object({
+          address: z.string(),
+          terminalHandle: z.string().nullable(),
+          orcaSessionId: orcaSessionIdSchema.nullable()
+        })
+      })
+    ),
+    orchestration: z.discriminatedUnion('message', [mailNoticeSchema])
+  })
+])
+
+export function serializeAgentSessionMessageSource(source: AgentSessionMessageSource): string {
+  return JSON.stringify({ v: MESSAGE_SOURCE_VERSION, ...source })
+}
+
+/**
+ * The stored value read back. Absent (a card from before the column) is the person's: only the
+ * composer queued then. So is a value this build cannot read; either way it is sent as written.
+ */
+export function readAgentSessionMessageSource(stored: unknown): AgentSessionMessageSource {
+  const parsed = storedSourceSchema.safeParse(stored)
+  if (!parsed.success) {
+    return USER_MESSAGE_SOURCE
+  }
+  const { v: _version, ...source } = parsed.data
+  return source
+}
diff --git a/src/shared/local-build-compatibility-contract.json b/src/shared/local-build-compatibility-contract.json
index 205171615ca..0e90a402914 100644
--- a/src/shared/local-build-compatibility-contract.json
+++ b/src/shared/local-build-compatibility-contract.json
@@ -3,9 +3,9 @@
   "appId": "com.stablyai.orca",
   "stateSchemaVersion": 1,
   "readableStateSchemaVersions": [1],
-  "daemonProtocolVersion": 39,
+  "daemonProtocolVersion": 40,
   "attachableDaemonProtocolVersions": [
     1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
-    27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39
+    27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40
   ]
 }
diff --git a/src/shared/local-build-compatibility-contract.ts b/src/shared/local-build-compatibility-contract.ts
index 441dba09c4b..75a414b2a5f 100644
--- a/src/shared/local-build-compatibility-contract.ts
+++ b/src/shared/local-build-compatibility-contract.ts
@@ -3,9 +3,9 @@ export const LOCAL_BUILD_COMPATIBILITY_CONTRACT = {
   appId: 'com.stablyai.orca',
   stateSchemaVersion: 1,
   readableStateSchemaVersions: [1],
-  daemonProtocolVersion: 39,
+  daemonProtocolVersion: 40,
   attachableDaemonProtocolVersions: [
     1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
-    27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39
+    27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40
   ]
 } as const
diff --git a/src/shared/native-chat-paste-folder.ts b/src/shared/native-chat-paste-folder.ts
new file mode 100644
index 00000000000..4fac1ba86a8
--- /dev/null
+++ b/src/shared/native-chat-paste-folder.ts
@@ -0,0 +1,3 @@
+/** The folder under the app's user data where local native-chat pastes are kept, so a draft that
+ *  names one can show and send it after a restart. */
+export const NATIVE_CHAT_PASTE_FOLDER = 'native-chat-pastes'
diff --git a/src/shared/orchestration-party-identity.ts b/src/shared/orchestration-party-identity.ts
new file mode 100644
index 00000000000..8bbce97e9f7
--- /dev/null
+++ b/src/shared/orchestration-party-identity.ts
@@ -0,0 +1,18 @@
+import type { OrcaSessionId } from './orca-session-address'
+
+/**
+ * Who an orchestration party is, as Run binding and mail routing match it.
+ *
+ * A PTY agent is its terminal: a handle and a pane key, no Orca session id. An agent that is a
+ * structured session is its Orca session id, addressed as `orca_session_id:<id>`; a structured worker also
+ * has the handle and pane key it was minted, and an ordinary chat has neither. Methods pass this
+ * through whole and never branch on which fields are set; the lookups that build it own that.
+ */
+export type OrchestrationPartyIdentity = Readonly<{
+  /** Mailbox address the party sends from and reads: its terminal handle, else its session address. */
+  address: string
+  terminalHandle: string | null
+  paneKey: string | null
+  /** The bare Orca session id the party is addressed by; mail spells it `orca_session_id:<id>`. */
+  orcaSessionId: OrcaSessionId | null
+}>
diff --git a/src/shared/pairing-local-ui-fields.test.ts b/src/shared/pairing-local-ui-fields.test.ts
index 780b471a1ca..24042ffaa50 100644
--- a/src/shared/pairing-local-ui-fields.test.ts
+++ b/src/shared/pairing-local-ui-fields.test.ts
@@ -10,6 +10,7 @@ describe('pairing-local UI fields', () => {
       'hideWorkspacesFromOtherDevices',
       'manualRepoOrder',
       'workspaceHostOrder',
+      'sidebarOpen',
       'agentsVisibleHostIds',
       'agentsFilterRepoIds',
       'agentsHideWorkspacesFromOtherDevices',
diff --git a/src/shared/pairing-local-ui-fields.ts b/src/shared/pairing-local-ui-fields.ts
index 65e036699ac..b514db0a3b9 100644
--- a/src/shared/pairing-local-ui-fields.ts
+++ b/src/shared/pairing-local-ui-fields.ts
@@ -12,6 +12,8 @@ export const PAIRING_LOCAL_UI_FIELDS = [
   'hideWorkspacesFromOtherDevices',
   'manualRepoOrder',
   'workspaceHostOrder',
+  // A phone-width browser and a desktop window each choose their own left sidebar, and old hosts reject the unknown key.
+  'sidebarOpen',
   // Agent View filters and presentation belong to each client's host catalog and viewport.
   'agentsVisibleHostIds',
   'agentsFilterRepoIds',
diff --git a/src/shared/persisted-ui-state-types.ts b/src/shared/persisted-ui-state-types.ts
index f7708d50206..ecd51429533 100644
--- a/src/shared/persisted-ui-state-types.ts
+++ b/src/shared/persisted-ui-state-types.ts
@@ -32,6 +32,7 @@ export type PersistedUIState = {
   /** Active top-level view at save time, restored on relaunch; sanitized to 'terminal' if unknown or now-gated. */
   activeView: TopLevelView
   sidebarWidth: number
+  sidebarOpen?: boolean
   rightSidebarOpen: boolean
   rightSidebarTab: RightSidebarTab
   rightSidebarExplorerView: RightSidebarExplorerView
diff --git a/src/shared/powershell-native-argument.test.ts b/src/shared/powershell-native-argument.test.ts
index b8e1feb8aa2..33d396dc8b0 100644
--- a/src/shared/powershell-native-argument.test.ts
+++ b/src/shared/powershell-native-argument.test.ts
@@ -9,10 +9,27 @@ describe('PowerShell native argument quoting', () => {
     )
   })
 
+  it('keeps a value with a line break on one physical line', () => {
+    expect(quotePowerShellLiteral('line one\nline two')).toBe('"line one`nline two"')
+    expect(quotePowerShellLiteral('a\r\nb\rc')).toBe('"a`r`nb`rc"')
+  })
+
+  it('escapes the double-quoted specials in a multi-line value', () => {
+    expect(
+      quotePowerShellLiteral('$(Remove-Item x) `t "q" \u201Cl\u201D \u201Elow \'single\'\nend')
+    ).toBe('"`$(Remove-Item x) ``t `"q`" `\u201Cl`\u201D `\u201Elow \'single\'`nend"')
+  })
+
+  it('leaves single-line values on the single-quoted form', () => {
+    expect(quotePowerShellLiteral('a $b `c "d"')).toBe('\'a $b `c "d"\'')
+  })
+
   it('pre-escapes embedded quotes for Windows native argv parsing', () => {
     expect(quotePowerShellNativeArgument('eval "decoded"')).toBe(String.raw`'eval \"decoded\"'`)
     expect(quotePowerShellNativeArgument(String.raw`before\"after`)).toBe(
       String.raw`'before\\\"after'`
     )
+    // Why: the argv pre-escape survives the multi-line form, so 5.1 still passes `\"` to argv.
+    expect(quotePowerShellNativeArgument('say "hi"\nbye')).toBe('"say \\`"hi\\`"`nbye"')
   })
 })
diff --git a/src/shared/powershell-native-argument.ts b/src/shared/powershell-native-argument.ts
index f357a8e8fb7..23e517505f0 100644
--- a/src/shared/powershell-native-argument.ts
+++ b/src/shared/powershell-native-argument.ts
@@ -1,8 +1,24 @@
 export function quotePowerShellLiteral(value: string): string {
+  if (/[\r\n]/.test(value)) {
+    return quotePowerShellMultilineLiteral(value)
+  }
   // Why: PowerShell also ends single-quoted strings at typographic single quotes.
   return `'${value.replace(/['\u2018\u2019\u201A\u201B]/g, '$&$&')}'`
 }
 
+/**
+ * Why one physical line: a raw line break typed into PowerShell submits the line, and Windows
+ * PowerShell 5.1 without PSReadLine then waits at `>>` for an empty line that never comes.
+ * Backtick escapes keep every byte, so `\r\n` stays `\r\n` exactly as the single-quoted form
+ * delivered it.
+ */
+function quotePowerShellMultilineLiteral(value: string): string {
+  const escaped = value.replace(/[`$"\u201C\u201D\u201E\r\n]/g, (char) =>
+    char === '\r' ? '`r' : char === '\n' ? '`n' : `\`${char}`
+  )
+  return `"${escaped}"`
+}
+
 export function quotePowerShellNativeArgument(value: string): string {
   // Why: Windows PowerShell 5.1 drops unescaped embedded quotes when it
   // constructs argv for native executables such as wsl.exe.
diff --git a/src/shared/powershell-native-argument.windows.test.ts b/src/shared/powershell-native-argument.windows.test.ts
new file mode 100644
index 00000000000..1bd81a27721
--- /dev/null
+++ b/src/shared/powershell-native-argument.windows.test.ts
@@ -0,0 +1,50 @@
+import { mkdtemp, readFile, rm, writeFile } from 'node:fs/promises'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { expect, it } from 'vitest'
+import { runProcess } from './child-process/run-process'
+import { quotePowerShellLiteral } from './powershell-native-argument'
+
+async function captureNativeArgv(root: string, quotedArg: string): Promise<string[]> {
+  const capturePath = join(root, 'argv.json')
+  const scriptPath = join(root, 'capture.js')
+  await writeFile(
+    scriptPath,
+    `require('node:fs').writeFileSync(${JSON.stringify(capturePath)}, JSON.stringify(process.argv.slice(2)))`
+  )
+  const result = await runProcess({
+    program: 'powershell.exe',
+    args: [
+      '-NoProfile',
+      '-NonInteractive',
+      '-Command',
+      `& ${quotePowerShellLiteral(process.execPath)} ${quotePowerShellLiteral(scriptPath)} ${quotedArg}`
+    ],
+    cwd: root
+  })
+  expect(result.code, JSON.stringify(result)).toBe(0)
+  const argv: string[] = JSON.parse(await readFile(capturePath, 'utf8'))
+  return argv
+}
+
+// Why native: argv marshalling, not the generated text, is what a launched agent actually receives.
+it.skipIf(process.platform !== 'win32')(
+  'passes a multi-line value to a native program exactly as the single-quoted form did',
+  async () => {
+    const root = await mkdtemp(join(tmpdir(), 'orca-ps-multiline-'))
+    try {
+      const plain = 'line one\r\nline two $HOME `tick\nO\u2019Brien \u201Cdouble\u201D end'
+      expect(await captureNativeArgv(root, quotePowerShellLiteral(plain))).toEqual([plain])
+
+      // Why compare with the old raw single-quoted form: 5.1 drops embedded `"` from native argv
+      // either way, and the one-line form must not change what reaches the program.
+      const withQuotes = 'say "hi"\nbye'
+      const legacy = `'${withQuotes.replace(/'/g, "''")}'`
+      expect(await captureNativeArgv(root, quotePowerShellLiteral(withQuotes))).toEqual(
+        await captureNativeArgv(root, legacy)
+      )
+    } finally {
+      await rm(root, { recursive: true, force: true })
+    }
+  }
+)
diff --git a/src/shared/rpc-contract/client-ui-params.ts b/src/shared/rpc-contract/client-ui-params.ts
index 08113208e23..9f41e92674e 100644
--- a/src/shared/rpc-contract/client-ui-params.ts
+++ b/src/shared/rpc-contract/client-ui-params.ts
@@ -127,6 +127,7 @@ export const UiUpdateFields = z
     // Why: sync hydration ignores this persisted startup view, so paired windows stay put.
     activeView: TopLevelViewSchema.optional(),
     sidebarWidth: z.number().finite().optional(),
+    sidebarOpen: z.boolean().optional(),
     rightSidebarOpen: z.boolean().optional(),
     rightSidebarTab: RightSidebarTabParam.optional(),
     rightSidebarExplorerView: z.enum(['files', 'search']).optional(),
diff --git a/src/shared/startup-command-submission.test.ts b/src/shared/startup-command-submission.test.ts
index e25ee4c4105..6d85f4d14bc 100644
--- a/src/shared/startup-command-submission.test.ts
+++ b/src/shared/startup-command-submission.test.ts
@@ -5,46 +5,52 @@ import {
 } from './startup-command-submission'
 
 describe('buildStartupCommandSubmission', () => {
-  it('appends the submit byte to a single-line command unchanged', () => {
-    expect(
-      buildStartupCommandSubmission('claude', { submit: '\n', bracketedPasteSafe: true })
-    ).toBe('claude\n')
-    expect(
-      buildStartupCommandSubmission('claude', { submit: '\r', bracketedPasteSafe: true })
-    ).toBe('claude\r')
+  it('submits a single-line command with CR', () => {
+    expect(buildStartupCommandSubmission('claude', { bracketedPasteSafe: true })).toBe('claude\r')
+    expect(buildStartupCommandSubmission('claude', { bracketedPasteSafe: false })).toBe('claude\r')
   })
 
-  it('preserves a caller-supplied trailing submit byte on single-line commands', () => {
-    expect(
-      buildStartupCommandSubmission('claude\n', { submit: '\r', bracketedPasteSafe: true })
-    ).toBe('claude\n')
-  })
-
-  it('treats a CRLF-terminated single-line command as single-line', () => {
-    expect(
-      buildStartupCommandSubmission('claude\r\n', { submit: '\r', bracketedPasteSafe: true })
-    ).toBe('claude\r\n')
+  it('replaces a caller-supplied trailing terminator with CR', () => {
+    for (const command of ['claude\n', 'claude\r', 'claude\r\n']) {
+      expect(buildStartupCommandSubmission(command, { bracketedPasteSafe: true })).toBe('claude\r')
+    }
   })
 
   it('wraps a multiline command in bracketed paste with a trailing submit byte', () => {
     const command = "claude 'first\nsecond'"
-    expect(buildStartupCommandSubmission(command, { submit: '\n', bracketedPasteSafe: true })).toBe(
-      `\x1b[200~${command}\x1b[201~\n`
+    expect(buildStartupCommandSubmission(command, { bracketedPasteSafe: true })).toBe(
+      `\x1b[200~${command}\x1b[201~\r`
     )
   })
 
   it('strips a trailing submit byte before bracket-wrapping the multiline body', () => {
     const body = "claude 'first\nsecond'"
-    expect(
-      buildStartupCommandSubmission(`${body}\n`, { submit: '\r', bracketedPasteSafe: true })
-    ).toBe(`\x1b[200~${body}\x1b[201~\r`)
+    expect(buildStartupCommandSubmission(`${body}\n`, { bracketedPasteSafe: true })).toBe(
+      `\x1b[200~${body}\x1b[201~\r`
+    )
   })
 
   it('keeps the raw path for multiline commands when bracketed paste is unsafe', () => {
-    const command = 'echo one\necho two'
-    expect(
-      buildStartupCommandSubmission(command, { submit: '\n', bracketedPasteSafe: false })
-    ).toBe(`${command}\n`)
+    expect(buildStartupCommandSubmission('echo one\necho two', { bracketedPasteSafe: false })).toBe(
+      'echo one\recho two\r'
+    )
+  })
+
+  // Why: on the raw path every line break submits a line, so an interior LF is the same
+  // remappable Ctrl+J the trailing terminator was (#23250).
+  it('submits every line of a raw multiline command with CR', () => {
+    for (const command of ['echo one\necho two', 'echo one\r\necho two', 'echo one\recho two']) {
+      expect(buildStartupCommandSubmission(command, { bracketedPasteSafe: false })).toBe(
+        'echo one\recho two\r'
+      )
+    }
+  })
+
+  it('leaves interior line breaks intact inside a bracketed-paste payload', () => {
+    const command = "claude 'first\nsecond'"
+    expect(buildStartupCommandSubmission(command, { bracketedPasteSafe: true })).toBe(
+      `\x1b[200~${command}\x1b[201~\r`
+    )
   })
 })
 
diff --git a/src/shared/startup-command-submission.ts b/src/shared/startup-command-submission.ts
index 33d84cd82b2..5b8b225614a 100644
--- a/src/shared/startup-command-submission.ts
+++ b/src/shared/startup-command-submission.ts
@@ -3,12 +3,12 @@
  * submit a startup command (agent launch, setup script, etc.).
  *
  * Why bracketed paste: agent launch prompts are single-quoted, but their
- * literal embedded newlines survive quoting. bash readline / zsh zle read every
- * raw LF as accept-line (Enter), so the first newline inside a multiline prompt
+ * literal embedded newlines survive quoting. bash readline / zsh zle read a raw
+ * LF as accept-line by default, so the first newline inside a multiline prompt
  * submits an unterminated single-quoted command and drops the shell into PS2
  * continuation — the prompt is executed piecemeal and mangled. Wrapping the
  * payload in bracketed-paste markers (ESC[200~ … ESC[201~) tells the line
- * editor to insert the whole multiline text literally; only the trailing CR/LF
+ * editor to insert the whole multiline text literally; only the trailing CR
  * written after the end marker submits it. Single-line commands keep the proven
  * raw-write path unchanged so the fast path never regresses.
  */
@@ -16,12 +16,11 @@
 // DEC 2004 bracketed-paste bracket sequences.
 const BRACKETED_PASTE_START = '\x1b[200~'
 const BRACKETED_PASTE_END = '\x1b[201~'
+// Why CR on every platform: it is the byte the Enter key sends. A line editor reads
+// the tty raw, so LF arrives as Ctrl+J — a key users rebind (e.g. vi-mode newline).
+const STARTUP_COMMAND_SUBMIT = '\r'
 
 export type StartupCommandSubmissionOptions = {
-  /** Byte that submits the line: CR on Windows (PSReadLine/cmd.exe), LF on
-   *  POSIX; SSH relays remote shells with CR. A caller-supplied trailing submit
-   *  byte on `command` is preserved as-is. */
-  submit: string
   /** Whether the target line editor has bracketed-paste mode active (Orca's
    *  wrapped bash/zsh/fish). Only wrap multiline payloads when true — a shell
    *  without bracketed paste would echo the ESC[200~ markers as literal garbage. */
@@ -52,15 +51,14 @@ export function isBracketedPasteSafeShell(args: {
 
 export function buildStartupCommandSubmission(
   command: string,
-  { submit, bracketedPasteSafe }: StartupCommandSubmissionOptions
+  { bracketedPasteSafe }: StartupCommandSubmissionOptions
 ): string {
-  // Strip a full CRLF (or lone CR/LF) terminator so a single-line command ending
-  // in \r\n isn't misread as multiline by the \r/\n body check below.
-  const trailingTerminator = /\r\n$|\r$|\n$/.exec(command)?.[0] ?? ''
-  const endsWithSubmit = trailingTerminator.length > 0
-  const body = endsWithSubmit ? command.slice(0, -trailingTerminator.length) : command
+  // Why replace a caller's terminator: a trailing LF is Ctrl+J again, and CRLF submits twice.
+  const body = command.replace(/\r\n$|\r$|\n$/, '')
   if (bracketedPasteSafe && (body.includes('\n') || body.includes('\r'))) {
-    return `${BRACKETED_PASTE_START}${body}${BRACKETED_PASTE_END}${submit}`
+    return `${BRACKETED_PASTE_START}${body}${BRACKETED_PASTE_END}${STARTUP_COMMAND_SUBMIT}`
   }
-  return endsWithSubmit ? command : `${command}${submit}`
+  // Why normalise interior breaks too: without bracketed paste each line submits itself, and an
+  // interior LF is the same remappable Ctrl+J as a trailing one.
+  return `${body.replace(/\r?\n/g, STARTUP_COMMAND_SUBMIT)}${STARTUP_COMMAND_SUBMIT}`
 }
diff --git a/src/shared/tui-agent-resume-startup.ts b/src/shared/tui-agent-resume-startup.ts
index f4924b83c47..173aabf1aa7 100644
--- a/src/shared/tui-agent-resume-startup.ts
+++ b/src/shared/tui-agent-resume-startup.ts
@@ -25,11 +25,19 @@ export function buildAgentResumeStartupPlan(args: {
   sessionOptions?: Record<string, SessionOptionValue>
   sessionOptionsOverrideAgentArgs?: boolean
   isRemote?: boolean
+  /** The caller chose the terminal folder on purpose, so Codex must not ask for the recorded one. */
+  resumeInLaunchCwd?: boolean
 }): AgentStartupPlan | null {
-  const argv = getAgentResumeArgv(args.agent, args.providerSession, args.ompResumeFilePath)
-  if (!argv) {
+  const resumeArgv = getAgentResumeArgv(args.agent, args.providerSession, args.ompResumeFilePath)
+  if (!resumeArgv) {
     return null
   }
+  // Why: Codex otherwise prompts for the folder, defaulting to the recorded one even once it was
+  // deleted (#17745). Kept before `resume` so dropAgentResumeArgvFromCommand strips only that.
+  const argv =
+    args.agent === 'codex' && args.resumeInLaunchCwd
+      ? [resumeArgv[0], '-c', 'tui.resume_cwd=current', ...resumeArgv.slice(1)]
+      : resumeArgv
   const shell = resolveStartupShell(args.platform, args.shell)
   const resolvedAgentCommand = args.agentCommand?.trim()
   const baseCommand = resolvedAgentCommand
diff --git a/src/shared/tui-agent-startup.test.ts b/src/shared/tui-agent-startup.test.ts
index 31690889e9f..c9a62b747b6 100644
--- a/src/shared/tui-agent-startup.test.ts
+++ b/src/shared/tui-agent-startup.test.ts
@@ -85,6 +85,19 @@ describe('tui agent startup plans', () => {
     expect(plan?.launchCommand).toBe("claude 'fix Bob''s \"quoted\" branch'")
   })
 
+  // Why: a typed line break submits early, and PowerShell 5.1 without PSReadLine then hangs at `>>`.
+  it('keeps a multi-line PowerShell launch on one physical line', () => {
+    const plan = buildAgentStartupPlan({
+      agent: 'claude',
+      prompt: 'first line\nsecond $line',
+      cmdOverrides: {},
+      platform: 'win32'
+    })
+
+    expect(plan?.launchCommand).not.toMatch(/[\r\n]/)
+    expect(plan?.launchCommand).toBe('claude "first line`nsecond `$line"')
+  })
+
   it('invokes fully quoted argv commands in PowerShell', () => {
     expect(buildShellCommandFromArgv(['codex', 'resume', 's1'], 'powershell')).toBe(
       "& 'codex' 'resume' 's1'"
diff --git a/tests/e2e/cross-version-wire/submission-positions-downgrade.unit.test.ts b/tests/e2e/cross-version-wire/submission-positions-downgrade.unit.test.ts
new file mode 100644
index 00000000000..0945d6a7728
--- /dev/null
+++ b/tests/e2e/cross-version-wire/submission-positions-downgrade.unit.test.ts
@@ -0,0 +1,203 @@
+import { mkdtempSync, rmSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { expect, test } from 'vitest'
+import { agentSessionFailureFact } from '../../../src/shared/agent-session-failure'
+import { agentSessionFailureWords } from '../../../src/shared/agent-session-failure-words'
+import type {
+  AgentJournalSubmission,
+  AgentSessionJournalIdentity
+} from '../../../src/shared/agent-session-journal-types'
+import type { AgentSessionHistoryPage } from '../../../src/shared/agent-session-wire'
+import {
+  createTrackedJournalOpener,
+  type TrackedJournalOpener
+} from '../../../src/main/native-chat/agent-session-journal/journal-host-database-test-support'
+import { projectJournalBatch } from '../../../src/main/native-chat/agent-session-wire/agent-session-journal-batch'
+import { readAgentSessionHydrationPage } from '../../../src/main/native-chat/agent-session-wire/agent-session-history-page'
+import { importReleaseCheckoutModule, materializeReleaseCheckout } from './release-checkout'
+
+// Released clients that predate the published submission position and answered turn: each must
+// fold and draw a history page and an incremental batch carrying them exactly as it draws the same
+// without them, whether the turn is named or stated as none.
+const BASELINE_REFS = ['v1.4.219', 'v1.4.220'] as const
+
+const IDENTITY: AgentSessionJournalIdentity = {
+  sessionId: 'session-positions',
+  workspaceId: 'ws-1',
+  hostId: 'host-1',
+  agent: 'codex',
+  providerHandle: { kind: 'codex', threadId: 'thread-1' }
+}
+
+/** A function the pinned release exports, typed as the caller calls it. */
+function releaseExport<T>(module: Record<string, unknown>, name: string): T {
+  const value = module[name]
+  if (typeof value !== 'function' && (typeof value !== 'object' || value === null)) {
+    throw new Error(`the pinned release exports no ${name}`)
+  }
+  // oxlint-disable-next-line typescript/consistent-type-assertions -- SAFETY: a value the pinned release exports; each caller names the shape it uses, and a changed one fails the test.
+  return value as T
+}
+
+type OldState = { submissions: Record<string, unknown>[]; items: unknown[] }
+
+/** Submissions as an older host would carry them. */
+function withoutNewFields(
+  submissions: readonly AgentJournalSubmission[]
+): AgentJournalSubmission[] {
+  return submissions.map(
+    ({ submittedSequence: _submitted, answeredInTurn: _turn, ...rest }) => rest
+  )
+}
+
+/** A chat before and after three rejections: a queued send taken back, one its turn's end
+ *  rejected, and one refused outright. */
+async function journalWithRejections(directory: string, journals: TrackedJournalOpener) {
+  const journal = await journals.open({ identity: IDENTITY, stateDirectory: directory })
+  const message = (text: string) => ({
+    kind: 'message' as const,
+    role: 'user' as const,
+    blocks: [{ type: 'text' as const, text }]
+  })
+  for (const id of ['taken-back', 'still-queued']) {
+    await journal.appendSubmission({
+      clientMessageId: id,
+      payloadFingerprint: id,
+      body: message(id),
+      fence: 1,
+      handoverRecorded: true
+    })
+  }
+  for (const id of ['turn-ended', 'refused']) {
+    await journal.appendSubmission({
+      clientMessageId: id,
+      payloadFingerprint: id,
+      body: message(id),
+      fence: 1
+    })
+  }
+  const before = readAgentSessionHydrationPage(journal, 1)
+  const seen = journal.snapshot().cursor
+  const cancelled = agentSessionFailureWords(agentSessionFailureFact('cancelled'), {
+    surface: 'rejection'
+  })
+  await journal.resolveDispatch({
+    clientMessageId: 'taken-back',
+    state: 'rejected',
+    ...cancelled,
+    fence: 1,
+    recovered: true
+  })
+  await journal.resolveDispatch({
+    clientMessageId: 'turn-ended',
+    state: 'rejected',
+    ...cancelled,
+    answeredInTurn: {
+      turn: {
+        provider: 'legacy',
+        agent: 'codex',
+        sessionId: IDENTITY.sessionId,
+        recordId: 'turn-lifecycle:turn-1'
+      },
+      via: 'start'
+    },
+    fence: 1
+  })
+  await journal.resolveDispatch({
+    clientMessageId: 'refused',
+    state: 'rejected',
+    ...agentSessionFailureWords(agentSessionFailureFact('queueFull'), { surface: 'rejection' }),
+    fence: 1
+  })
+  const since = journal.readSince(seen)
+  const batch = since.ok
+    ? projectJournalBatch({
+        rows: since.rows,
+        snapshot: journal.snapshot(),
+        afterSequence: seen.sequence
+      })
+    : null
+  if (!batch?.ok) {
+    throw new Error('the batch did not project')
+  }
+  return { before, after: readAgentSessionHydrationPage(journal, 1), batch: batch.batch }
+}
+
+// Loads real release checkouts, cold extraction and transforms included.
+test.each(BASELINE_REFS)(
+  'a released client (%s) draws a page and a batch carrying journal positions and answered turns as it draws them without',
+  async (ref) => {
+    const directory = mkdtempSync(join(tmpdir(), 'orca-submission-positions-downgrade-'))
+    const journals = createTrackedJournalOpener()
+    try {
+      const { before, after, batch } = await journalWithRejections(directory, journals)
+      // Anti-vacuous: what this build publishes carries a position, a named turn, and stated none.
+      expect(after.submissions).toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({ clientMessageId: 'taken-back', answeredInTurn: null }),
+          expect.objectContaining({
+            clientMessageId: 'turn-ended',
+            submittedSequence: expect.any(Number),
+            answeredInTurn: { turnItemId: expect.any(String), via: 'start' }
+          }),
+          expect.objectContaining({ clientMessageId: 'refused', answeredInTurn: null })
+        ])
+      )
+      expect(batch.submissions.map((entry) => entry.answeredInTurn)).toContain(null)
+
+      const checkout = await materializeReleaseCheckout(ref)
+      const reducer = await importReleaseCheckoutModule(
+        checkout,
+        'src/shared/structured-agent-session-reducer.ts'
+      )
+      const projection = await importReleaseCheckoutModule(
+        checkout,
+        'src/shared/structured-agent-session-message-projection.ts'
+      )
+      const reduce = releaseExport<(state: unknown, action: unknown) => OldState>(
+        reducer,
+        'reduceStructuredAgentSession'
+      )
+      const empty = releaseExport<unknown>(reducer, 'EMPTY_STRUCTURED_AGENT_SESSION')
+      const project = releaseExport<
+        (items: unknown[], outbox: unknown[], submissions: unknown[]) => unknown[]
+      >(projection, 'projectStructuredAgentSessionMessages')
+      const draw = (state: OldState) => ({
+        submissions: state.submissions.map(
+          ({ submittedSequence: _s, answeredInTurn: _t, ...rest }) => rest
+        ),
+        messages: project(state.items, [], state.submissions)
+      })
+      const fromPage = (page: AgentSessionHistoryPage) =>
+        draw(reduce(empty, { type: 'history-page', page }))
+      const fromBatch = (stripped: boolean) =>
+        draw(
+          reduce(reduce(empty, { type: 'history-page', page: before }), {
+            type: 'event',
+            event: {
+              type: 'batch',
+              sessionId: IDENTITY.sessionId,
+              batch: stripped
+                ? { ...batch, submissions: withoutNewFields(batch.submissions) }
+                : batch,
+              fence: 1
+            }
+          })
+        )
+
+      expect(fromPage(after)).toEqual(
+        fromPage({ ...after, submissions: withoutNewFields(after.submissions) })
+      )
+      expect(fromBatch(false)).toEqual(fromBatch(true))
+      // Anti-vacuous: the batch reached the old client's submissions.
+      expect(fromBatch(false).submissions).toEqual(
+        expect.arrayContaining([expect.objectContaining({ dispatchState: 'rejected' })])
+      )
+    } finally {
+      await journals.closeAll()
+      rmSync(directory, { recursive: true, force: true })
+    }
+  },
+  180_000
+)
diff --git a/tests/e2e/helpers/docker-ssh-relay-workspace-snapshot.ts b/tests/e2e/helpers/docker-ssh-relay-workspace-snapshot.ts
new file mode 100644
index 00000000000..872abd0f02b
--- /dev/null
+++ b/tests/e2e/helpers/docker-ssh-relay-workspace-snapshot.ts
@@ -0,0 +1,41 @@
+import { expect, type Page } from '@stablyai/playwright-test'
+
+import {
+  execDockerSshRelayTargetControlCommand,
+  type DockerSshRelayTarget
+} from './docker-ssh-relay-target'
+
+/** Where the relay persists a target's workspace snapshot inside the fixture container. */
+const REMOTE_SNAPSHOT_DIR = '/root/.orca/sessions'
+
+export async function readTargetSyncPhase(
+  page: Page,
+  targetId: string
+): Promise<string | undefined> {
+  return page.evaluate(
+    (id) => window.__store?.getState().remoteWorkspaceSyncStatusByTargetId[id]?.phase,
+    targetId
+  )
+}
+
+function findRemoteSnapshotPath(target: DockerSshRelayTarget): string | null {
+  const listing = execDockerSshRelayTargetControlCommand(
+    target,
+    `ls -1 ${REMOTE_SNAPSHOT_DIR}/*.json 2>/dev/null || true`
+  ).trim()
+  return listing.split('\n').find((line) => line.endsWith('.json')) ?? null
+}
+
+export async function waitForUploadedRemoteSnapshot(target: DockerSshRelayTarget): Promise<string> {
+  let snapshotPath: string | null = null
+  await expect
+    .poll(
+      () => {
+        snapshotPath = findRemoteSnapshotPath(target)
+        return snapshotPath
+      },
+      { timeout: 60_000, message: 'the relay never persisted a workspace snapshot' }
+    )
+    .not.toBeNull()
+  return snapshotPath!
+}
diff --git a/tests/e2e/paired-client-hosted-browser-markup.spec.ts b/tests/e2e/paired-client-hosted-browser-markup.spec.ts
index 519d7530b71..2e7c6aba5a4 100644
--- a/tests/e2e/paired-client-hosted-browser-markup.spec.ts
+++ b/tests/e2e/paired-client-hosted-browser-markup.spec.ts
@@ -61,7 +61,48 @@ test('draws and copies a screenshot from a client-hosted browser without replaci
     await client.page.mouse.down()
     await client.page.mouse.move(bounds.x + 240, bounds.y + 60, { steps: 10 })
     await client.page.mouse.up()
-    await expect(overlay.getByRole('button', { name: 'Undo', exact: true })).toBeEnabled()
+    const undo = overlay.getByRole('button', { name: 'Undo', exact: true })
+    await expect(undo).toBeEnabled()
+
+    // A later stroke and a text label, then erase only the first stroke and the label.
+    await client.page.mouse.move(bounds.x + 40, bounds.y + 140)
+    await client.page.mouse.down()
+    await client.page.mouse.move(bounds.x + 240, bounds.y + 140, { steps: 10 })
+    await client.page.mouse.up()
+    await overlay.getByRole('button', { name: 'Text', exact: true }).click()
+    await client.page.mouse.click(bounds.x + 40, bounds.y + 200)
+    await overlay.getByRole('textbox', { name: 'Annotation text', exact: true }).fill('gy')
+    await client.page.keyboard.press('Enter')
+    const firstStroke = { x: 30, y: 50, width: 220, height: 20 }
+    const laterStroke = { x: 30, y: 130, width: 220, height: 20 }
+    const label = { x: 30, y: 190, width: 80, height: 40 }
+    const hasInk = (region: typeof firstStroke): Promise<boolean> =>
+      canvas.evaluate((element, rect) => {
+        if (!(element instanceof HTMLCanvasElement)) {
+          throw new Error('Markup overlay canvas is not a canvas element')
+        }
+        const scale = element.width / element.getBoundingClientRect().width
+        const pixels = element
+          .getContext('2d')
+          ?.getImageData(rect.x * scale, rect.y * scale, rect.width * scale, rect.height * scale)
+        return pixels ? pixels.data.some((value, index) => index % 4 === 3 && value > 0) : false
+      }, region)
+    await expect.poll(() => hasInk(label)).toBe(true)
+
+    await overlay.getByRole('button', { name: 'Eraser', exact: true }).click()
+    await client.page.mouse.click(bounds.x + 140, bounds.y + 60)
+    await client.page.mouse.click(bounds.x + 48, bounds.y + 216)
+    await expect.poll(() => hasInk(firstStroke)).toBe(false)
+    await expect.poll(() => hasInk(label)).toBe(false)
+    expect(await hasInk(laterStroke)).toBe(true)
+    await testInfo.attach('client-hosted-markup-erased', {
+      body: await client.page.screenshot({ path: testInfo.outputPath('markup-erased.png') }),
+      contentType: 'image/png'
+    })
+    await undo.click()
+    await undo.click()
+    await expect.poll(() => hasInk(firstStroke)).toBe(true)
+    await expect.poll(() => hasInk(label)).toBe(true)
     await testInfo.attach('client-hosted-markup', {
       body: await client.page.screenshot({ path: testInfo.outputPath('markup.png') }),
       contentType: 'image/png'
diff --git a/tests/e2e/ssh-ai-vault-session-history.spec.ts b/tests/e2e/ssh-ai-vault-session-history.spec.ts
index 0cb6a485ca4..4bed085f595 100644
--- a/tests/e2e/ssh-ai-vault-session-history.spec.ts
+++ b/tests/e2e/ssh-ai-vault-session-history.spec.ts
@@ -9,6 +9,8 @@ import {
 import { connectDockerRemote } from './ssh-codex-reconnect-replay-driver'
 import { dockerExec, dockerWriteFile } from './ssh-codex-repro-remote-fixtures'
 import { waitForActiveWorktree, waitForSessionReady } from './helpers/store'
+import { getTerminalContent } from './helpers/terminal-pane-identity'
+import { waitForTerminalOutput } from './helpers/terminal-pane-operations'
 
 const RUN_DOCKER_SSH = process.env.ORCA_E2E_SSH_DOCKER === '1'
 
@@ -123,6 +125,82 @@ test.describe('SSH Agent Session History', () => {
       cleanupDockerSshRelayTarget(target)
     }
   })
+
+  test('resumes a Codex session whose recorded worktree was deleted at the SSH workspace root', async ({
+    orcaPage
+  }, testInfo: TestInfo) => {
+    test.slow()
+    let target: DockerSshRelayTarget | null = null
+    const stamp = Date.now()
+    const sessionId = `remote-ai-vault-deleted-${stamp}`
+    const title = `Remote Deleted Worktree ${stamp}`
+    const deletedCwd = `/tmp/orca-deleted-worktree-${stamp}`
+
+    try {
+      target = startDockerSshRelayTarget(testInfo)
+      dockerExec(target, 'mkdir -p /root/.codex/sessions/2026/07/04')
+      dockerWriteFile(
+        target,
+        '/root/.codex/session_index.jsonl',
+        jsonLines([{ id: sessionId, thread_name: title }]),
+        '600'
+      )
+      // Why: the recorded folder never exists on the host, like a worktree removed after the session.
+      dockerWriteFile(
+        target,
+        `/root/.codex/sessions/2026/07/04/${sessionId}.jsonl`,
+        codexTranscript({
+          sessionId,
+          title,
+          cwd: deletedCwd,
+          timestamp: '2026-07-04T01:00:00.000Z'
+        }),
+        '600'
+      )
+      // Why: a stand-in agent reports where the resume really ran and with which argv.
+      dockerWriteFile(
+        target,
+        '/usr/local/bin/codex',
+        '#!/bin/sh\necho "FAKE_CODEX pwd=$(pwd) args=$*"\n',
+        '755'
+      )
+
+      await waitForSessionReady(orcaPage)
+      await waitForActiveWorktree(orcaPage)
+      await connectDockerRemote(orcaPage, target)
+      await openAiVaultSidebar(orcaPage)
+      const hostButton = orcaPage.getByRole('button', { name: /Session History host:/ })
+      await hostButton.click()
+      await orcaPage
+        .getByRole('menuitemradio')
+        .filter({ hasNotText: /Local|All hosts/ })
+        .click()
+      // Why: the deleted folder is outside every workspace, so the default Workspace scope hides it.
+      await orcaPage.getByRole('radio', { name: 'All' }).click()
+      const sessionTitle = orcaPage.getByText(title, { exact: true })
+      await expect(sessionTitle.first()).toBeVisible({ timeout: 30_000 })
+
+      await installStartupQueueProbe(orcaPage)
+      await sessionTitle.first().click()
+      await expect(orcaPage.getByText('Unavailable worktree').first()).toBeVisible()
+      await orcaPage.getByText('Resume in New Tab', { exact: true }).click()
+
+      await expect
+        .poll(() => readLastQueuedStartupCommand(orcaPage), { timeout: 30_000 })
+        .toContain(`'resume' '${sessionId}'`)
+      expect(await readLastQueuedStartupCommand(orcaPage)).not.toContain(deletedCwd)
+      await waitForTerminalOutput(
+        orcaPage,
+        `FAKE_CODEX pwd=${DOCKER_SSH_RELAY_REMOTE_REPO_PATH} args=`,
+        30_000
+      )
+      expect(await getTerminalContent(orcaPage)).toContain(
+        `-c tui.resume_cwd=current resume ${sessionId}`
+      )
+    } finally {
+      cleanupDockerSshRelayTarget(target)
+    }
+  })
 })
 
 function seedRemoteAiVaultHistory(
diff --git a/tests/e2e/ssh-cold-hydration-gap-tab-seeding.spec.ts b/tests/e2e/ssh-cold-hydration-gap-tab-seeding.spec.ts
index 93b16df0a11..22ba97c488d 100644
--- a/tests/e2e/ssh-cold-hydration-gap-tab-seeding.spec.ts
+++ b/tests/e2e/ssh-cold-hydration-gap-tab-seeding.spec.ts
@@ -12,12 +12,14 @@ import {
   type DockerSshRelayTarget
 } from './helpers/docker-ssh-relay-target'
 import { connectDockerSshRelayTarget } from './helpers/docker-ssh-relay-connection'
+import {
+  readTargetSyncPhase,
+  waitForUploadedRemoteSnapshot
+} from './helpers/docker-ssh-relay-workspace-snapshot'
 import { createRestartSession } from './helpers/orca-restart'
 
 const RUN_DOCKER_SSH = process.env.ORCA_E2E_SSH_DOCKER === '1'
 const BASELINE_TAB_COUNT = 3
-/** Where the relay persists a target's workspace snapshot inside the fixture container. */
-const REMOTE_SNAPSHOT_DIR = '/root/.orca/sessions'
 
 test.use({ seedTestRepo: false })
 
@@ -35,13 +37,6 @@ async function isTargetHydrated(page: Page, targetId: string): Promise<boolean>
   )
 }
 
-async function readTargetSyncPhase(page: Page, targetId: string): Promise<string | undefined> {
-  return page.evaluate(
-    (id) => window.__store?.getState().remoteWorkspaceSyncStatusByTargetId[id]?.phase,
-    targetId
-  )
-}
-
 /** Poll until the worktree's tabs stop changing, so a late seed cannot slip past the sample. */
 async function waitForSettledTabIds(page: Page, worktreeId: string): Promise<string[]> {
   let latest: string[] = []
@@ -62,28 +57,6 @@ async function waitForSettledTabIds(page: Page, worktreeId: string): Promise<str
   return latest
 }
 
-function findRemoteSnapshotPath(target: DockerSshRelayTarget): string | null {
-  const listing = execDockerSshRelayTargetControlCommand(
-    target,
-    `ls -1 ${REMOTE_SNAPSHOT_DIR}/*.json 2>/dev/null || true`
-  ).trim()
-  return listing.split('\n').find((line) => line.endsWith('.json')) ?? null
-}
-
-async function waitForUploadedRemoteSnapshot(target: DockerSshRelayTarget): Promise<string> {
-  let snapshotPath: string | null = null
-  await expect
-    .poll(
-      () => {
-        snapshotPath = findRemoteSnapshotPath(target)
-        return snapshotPath
-      },
-      { timeout: 60_000, message: 'the relay never persisted a workspace snapshot' }
-    )
-    .not.toBeNull()
-  return snapshotPath!
-}
-
 /**
  * Replace the relay's snapshot file with a FIFO so `workspace.get` blocks on open.
  *
diff --git a/tests/e2e/ssh-emptied-worktree-reactivation.spec.ts b/tests/e2e/ssh-emptied-worktree-reactivation.spec.ts
new file mode 100644
index 00000000000..73982655256
--- /dev/null
+++ b/tests/e2e/ssh-emptied-worktree-reactivation.spec.ts
@@ -0,0 +1,123 @@
+import type { Page } from '@stablyai/playwright-test'
+import { test, expect } from './helpers/orca-app'
+import { waitForActiveWorktree, waitForSessionReady } from './helpers/store'
+import { waitForActivePanePtyId, waitForActiveTerminalManager } from './helpers/terminal'
+import {
+  cleanupDockerSshRelayTarget,
+  execDockerSshRelayTargetControlCommand,
+  shellQuote,
+  startDockerSshRelayTarget,
+  type DockerSshRelayTarget
+} from './helpers/docker-ssh-relay-target'
+import {
+  connectDockerSshRelayTarget,
+  disconnectDockerSshRelayTarget,
+  reconnectDisconnectedDockerSshRelayTarget
+} from './helpers/docker-ssh-relay-connection'
+import {
+  readTargetSyncPhase,
+  waitForUploadedRemoteSnapshot
+} from './helpers/docker-ssh-relay-workspace-snapshot'
+import { worktreeRowSurface } from './worktree-row-locators'
+
+const RUN_DOCKER_SSH = process.env.ORCA_E2E_SSH_DOCKER === '1'
+const FOREIGN_WORKTREE_PATH = '/tmp/another-machines-worktree'
+
+test.use({ seedTestRepo: false })
+
+type HostSnapshot = {
+  revision: number
+  updatedAt: number
+  session: { tabsByWorktreePath: Record<string, { id: string }[]> }
+}
+
+async function readTabCount(page: Page, worktreeId: string): Promise<number> {
+  return page.evaluate(
+    (id) => (window.__store?.getState().tabsByWorktree[id] ?? []).length,
+    worktreeId
+  )
+}
+
+/** Close the worktree's only tab the way a user does, then reopen the worktree from the sidebar. */
+async function closeLastTabAndClickWorktree(page: Page, worktreeId: string): Promise<void> {
+  const tabId = await page.evaluate(
+    (id) => window.__store?.getState().tabsByWorktree[id]?.[0]?.id ?? null,
+    worktreeId
+  )
+  expect(tabId, 'the worktree has no tab to close').not.toBeNull()
+  const tab = page.locator(`[data-testid="sortable-tab"][data-tab-id="${tabId}"]`).first()
+  await tab.hover()
+  await tab.locator('button[aria-label^="Close tab"]').first().click()
+  await expect.poll(() => readTabCount(page, worktreeId), { timeout: 15_000 }).toBe(0)
+  await worktreeRowSurface(page, worktreeId).click()
+}
+
+/**
+ * Give the host one tab on a folder this client has no worktree for — what a second machine using
+ * the same host leaves behind. Edits the relay's own snapshot file, so the next `workspace.get`
+ * serves it through the real path.
+ */
+function addForeignTabToHostSnapshot(target: DockerSshRelayTarget, snapshotPath: string): void {
+  const snapshot: HostSnapshot = JSON.parse(
+    execDockerSshRelayTargetControlCommand(target, `cat ${shellQuote(snapshotPath)}`)
+  )
+  const ownTab = Object.values(snapshot.session.tabsByWorktreePath).flat()[0]
+  expect(ownTab, 'the host snapshot never recorded this client tab').toBeTruthy()
+  snapshot.session.tabsByWorktreePath[FOREIGN_WORKTREE_PATH] = [
+    { ...ownTab, id: 'foreign-tab-from-another-machine' }
+  ]
+  snapshot.revision += 1
+  snapshot.updatedAt = Date.now()
+  execDockerSshRelayTargetControlCommand(
+    target,
+    `printf '%s' ${shellQuote(JSON.stringify(snapshot))} > ${shellQuote(snapshotPath)}`
+  )
+}
+
+test.describe('SSH emptied worktree reactivation', () => {
+  test.skip(!RUN_DOCKER_SSH, 'Set ORCA_E2E_SSH_DOCKER=1 to run Docker-backed SSH tests.')
+  test.skip(process.platform === 'win32', 'Docker SSH uses POSIX SSH tooling.')
+
+  // #22015: one host tab this client cannot place put the whole target in `conflict`, and every
+  // worktree on it then refused a terminal — including ones whose own tabs had been applied.
+  test('clicking an emptied worktree opens a terminal while the host holds a tab this client cannot place', async ({
+    orcaPage
+  }, testInfo) => {
+    test.setTimeout(600_000)
+    let target: DockerSshRelayTarget | null = null
+    try {
+      target = startDockerSshRelayTarget(testInfo)
+      await waitForSessionReady(orcaPage)
+      const remote = await connectDockerSshRelayTarget(orcaPage, target)
+      await expect
+        .poll(() => waitForActiveWorktree(orcaPage), { timeout: 30_000 })
+        .toBe(remote.worktreeId)
+      await waitForActiveTerminalManager(orcaPage, 60_000)
+      await waitForActivePanePtyId(orcaPage, 60_000)
+      const snapshotPath = await waitForUploadedRemoteSnapshot(target)
+
+      await disconnectDockerSshRelayTarget(orcaPage, remote.targetId)
+      addForeignTabToHostSnapshot(target, snapshotPath)
+      await reconnectDisconnectedDockerSshRelayTarget(orcaPage, remote.targetId)
+      // Proves the intended branch was taken: the placement wait has ended in a pull conflict.
+      await expect
+        .poll(() => readTargetSyncPhase(orcaPage, remote.targetId), {
+          timeout: 60_000,
+          message: 'the unplaceable host tab never put the target in conflict'
+        })
+        .toBe('conflict')
+
+      await closeLastTabAndClickWorktree(orcaPage, remote.worktreeId)
+
+      await expect
+        .poll(() => readTabCount(orcaPage, remote.worktreeId), {
+          timeout: 20_000,
+          message: 'no terminal came back after clicking the emptied worktree'
+        })
+        .toBe(1)
+      await waitForActivePanePtyId(orcaPage, 60_000)
+    } finally {
+      cleanupDockerSshRelayTarget(target)
+    }
+  })
+})
diff --git a/tests/e2e/tab-strip-scroll-render-isolation.spec.ts b/tests/e2e/tab-strip-scroll-render-isolation.spec.ts
new file mode 100644
index 00000000000..ca1336203d5
--- /dev/null
+++ b/tests/e2e/tab-strip-scroll-render-isolation.spec.ts
@@ -0,0 +1,250 @@
+/**
+ * E2E test for scrolling an overflowing tab strip: the scroll must not re-render the tabs, and the
+ * scroll thumb must still track the strip.
+ *
+ * Why E2E: only real Chromium lays out the strip and delivers the scroll and resize callbacks the
+ * thumb follows, and only the whole app shows every React commit a scroll step causes.
+ */
+
+import type { Locator, Page } from '@stablyai/playwright-test'
+import { test, expect } from './helpers/orca-app'
+import { waitForSessionReady, waitForActiveWorktree, ensureTerminalVisible } from './helpers/store'
+
+const STRIP = '.terminal-tab-strip'
+const START_SCROLL_LEFT_PX = 400
+const WHEEL_STEPS = 20
+const WHEEL_DELTA_PX = 50
+const MIN_SCROLL_RANGE_PX = 2_000
+
+type CommitFiber = {
+  tag: number
+  flags: number
+  child: CommitFiber | null
+  sibling: CommitFiber | null
+  stateNode: unknown
+}
+
+declare global {
+  // oxlint-disable-next-line typescript-eslint/consistent-type-definitions -- declaration merging requires interface
+  interface Window {
+    __REACT_DEVTOOLS_GLOBAL_HOOK__?: {
+      onCommitFiberRoot?: (
+        rendererId: unknown,
+        root: { current: CommitFiber },
+        ...rest: unknown[]
+      ) => unknown
+    }
+    __tabsRenderedPerCommit?: number[]
+  }
+}
+
+async function addBackgroundTerminalTabs(
+  page: Page,
+  worktreeId: string,
+  count: number
+): Promise<string[]> {
+  return page.evaluate(
+    ({ wId, tabCount }) =>
+      Array.from(
+        { length: tabCount },
+        () =>
+          window.__store!.getState().createTab(wId, undefined, undefined, { activate: false }).id
+      ),
+    { wId: worktreeId, tabCount: count }
+  )
+}
+
+/**
+ * Records how many tabs each React commit re-renders, the way React DevTools highlights updates:
+ * through the commit hook the renderer always installs. Commits that render no tab (the sidebar,
+ * terminals starting up) are left out.
+ */
+async function startRecordingTabRenders(page: Page): Promise<void> {
+  await page.evaluate(() => {
+    // Function, class, forwardRef and memo components; bit 1 is React's PerformedWork flag.
+    const componentTags = new Set([0, 1, 11, 14, 15])
+    const performedWork = 1
+    const hook = window.__REACT_DEVTOOLS_GLOBAL_HOOK__!
+    const original = hook.onCommitFiberRoot
+    // A subtree React skipped keeps last commit's fiber objects, whose flags are stale.
+    let previousFibers = new Set<CommitFiber>()
+    window.__tabsRenderedPerCommit = []
+    hook.onCommitFiberRoot = function (rendererId, root, ...rest) {
+      const fibers = new Set<CommitFiber>()
+      const renderedTabIds = new Set<string>()
+      const stack: CommitFiber[] = [root.current]
+      while (stack.length > 0) {
+        const fiber = stack.pop()!
+        fibers.add(fiber)
+        if (
+          componentTags.has(fiber.tag) &&
+          (fiber.flags & performedWork) === performedWork &&
+          !previousFibers.has(fiber)
+        ) {
+          let host: CommitFiber | null = fiber
+          while (host && host.tag !== 5) {
+            host = host.child
+          }
+          const element = host?.stateNode
+          const tabId =
+            element instanceof Element
+              ? element.closest('[data-tab-strip-slot]')?.getAttribute('data-tab-strip-slot')
+              : undefined
+          if (tabId) {
+            renderedTabIds.add(tabId)
+          }
+        }
+        if (fiber.sibling) {
+          stack.push(fiber.sibling)
+        }
+        if (fiber.child) {
+          stack.push(fiber.child)
+        }
+      }
+      previousFibers = fibers
+      if (renderedTabIds.size > 0) {
+        window.__tabsRenderedPerCommit?.push(renderedTabIds.size)
+      }
+      return original?.call(this, rendererId, root, ...rest)
+    }
+  })
+}
+
+async function takeTabRenders(page: Page): Promise<number[]> {
+  return page.evaluate(() => {
+    const recorded = window.__tabsRenderedPerCommit ?? []
+    window.__tabsRenderedPerCommit = []
+    return recorded
+  })
+}
+
+/** Thumb geometry next to where the strip's scroll position and size say it should be. */
+async function readThumb(strip: Locator) {
+  return strip.evaluate((el) => {
+    const track = el.parentElement!.querySelector<HTMLElement>(
+      '[data-testid="tab-strip-scroll-indicator"]'
+    )!
+    const trackRect = track.getBoundingClientRect()
+    const thumbRect = track
+      .querySelector<HTMLElement>('[data-testid="tab-strip-scroll-thumb"]')!
+      .getBoundingClientRect()
+    const maxScrollLeft = el.scrollWidth - el.clientWidth
+    const expectedWidth = Math.max(18, (el.clientWidth / el.scrollWidth) * trackRect.width)
+    return {
+      width: thumbRect.width,
+      expectedWidth,
+      left: thumbRect.left - trackRect.left,
+      expectedLeft: (el.scrollLeft / maxScrollLeft) * (trackRect.width - expectedWidth)
+    }
+  })
+}
+
+/** Polls rather than waiting frames: CI's hidden window can draw as little as one frame a second. */
+async function expectThumbToTrackStrip(strip: Locator): Promise<void> {
+  await expect
+    .poll(async () => {
+      const thumb = await readThumb(strip)
+      return Math.max(
+        Math.abs(thumb.width - thumb.expectedWidth),
+        Math.abs(thumb.left - thumb.expectedLeft)
+      )
+    })
+    .toBeLessThanOrEqual(1)
+}
+
+test.describe('Tab strip scroll render isolation', () => {
+  test.beforeEach(async ({ orcaPage }) => {
+    await waitForSessionReady(orcaPage)
+    await waitForActiveWorktree(orcaPage)
+    await ensureTerminalVisible(orcaPage)
+  })
+
+  test('scrolls a long strip without re-rendering its tabs, and the thumb keeps up', async ({
+    orcaPage
+  }) => {
+    const worktreeId = await waitForActiveWorktree(orcaPage)
+    const strip = orcaPage.locator(STRIP).first()
+    await expect(strip).toBeVisible()
+    const tabIds: string[] = []
+    for (let i = 0; i < 12; i++) {
+      const range = await strip.evaluate((el) => el.scrollWidth - el.clientWidth)
+      if (range >= MIN_SCROLL_RANGE_PX) {
+        break
+      }
+      tabIds.push(...(await addBackgroundTerminalTabs(orcaPage, worktreeId, 10)))
+      await expect
+        .poll(() => strip.evaluate((el) => el.querySelectorAll('[data-tab-strip-slot]').length))
+        .toBeGreaterThan(tabIds.length)
+    }
+
+    await startRecordingTabRenders(orcaPage)
+    // New terminals retitle their tabs after opening, longer on a loaded machine; wait for quiet.
+    await expect
+      .poll(
+        async () => {
+          await takeTabRenders(orcaPage)
+          await orcaPage.waitForTimeout(1_500)
+          return (await takeTabRenders(orcaPage)).length
+        },
+        { timeout: 45_000 }
+      )
+      .toBe(0)
+    expect(await strip.evaluate((el) => el.scrollWidth - el.clientWidth)).toBeGreaterThanOrEqual(
+      MIN_SCROLL_RANGE_PX
+    )
+
+    // Start and end mid-strip so neither scroll edge flips the arrows, fades or dock. Why set it
+    // here and hold until it sticks: opening the tabs left the strip pinned to its end, and the
+    // scroll event that releases that pin only lands with the next frame — about a second in CI's
+    // hidden window. A tab retitling inside that window re-pins the strip to the end.
+    await expect
+      .poll(
+        async () => {
+          await strip.evaluate((el, left) => {
+            el.scrollLeft = left
+          }, START_SCROLL_LEFT_PX)
+          await orcaPage.waitForTimeout(1_500)
+          return strip.evaluate((el) => el.scrollLeft)
+        },
+        { timeout: 30_000 }
+      )
+      .toBe(START_SCROLL_LEFT_PX)
+    // That scroll flipped the end-edge flags; the commit it caused is not the scroll under test.
+    await takeTabRenders(orcaPage)
+    // Why wheel events dispatched in the page: real input waits for a frame per step, and CI's hidden
+    // window draws about one a second. The strip's own wheel handler still does the scrolling.
+    await strip.evaluate(
+      async (el, { steps, delta }) => {
+        for (let i = 0; i < steps; i++) {
+          el.dispatchEvent(new WheelEvent('wheel', { deltaY: delta, cancelable: true }))
+          await new Promise((resolve) => setTimeout(resolve, 20))
+        }
+        // The scroll events arrive with the next frame; let React commit what they cause.
+        await new Promise(requestAnimationFrame)
+        await new Promise((resolve) => setTimeout(resolve, 20))
+      },
+      { steps: WHEEL_STEPS, delta: WHEEL_DELTA_PX }
+    )
+    expect(await strip.evaluate((el) => el.scrollLeft)).toBe(
+      START_SCROLL_LEFT_PX + WHEEL_STEPS * WHEEL_DELTA_PX
+    )
+    // Why "many tabs": before the fix every scroll step re-rendered all of them in one commit;
+    // a single tab can still update itself (a late retitle).
+    expect((await takeTabRenders(orcaPage)).filter((tabs) => tabs >= 3)).toEqual([])
+    await expectThumbToTrackStrip(strip)
+
+    // Control: switching tabs re-renders at least the tab it activates, so the recorder sees tabs.
+    await orcaPage.evaluate((tabId) => window.__store!.getState().setActiveTab(tabId), tabIds[0])
+    await expect.poll(async () => (await takeTabRenders(orcaPage)).length).toBeGreaterThan(0)
+
+    // Tabs opening grow the strip without a scroll event.
+    await addBackgroundTerminalTabs(orcaPage, worktreeId, 10)
+    await expectThumbToTrackStrip(strip)
+
+    // A narrower pane shrinks the strip and the track without a scroll event.
+    await strip.evaluate((el) => {
+      el.closest<HTMLElement>('[data-native-file-drop-target]')!.style.maxWidth = '700px'
+    })
+    await expectThumbToTrackStrip(strip)
+  })
+})